OSDN Git Service

Merge branch 'skinnable-master' master
authorsakamocchi <o-takashi@sakamocchi.jp>
Mon, 17 Sep 2012 11:10:23 +0000 (20:10 +0900)
committersakamocchi <o-takashi@sakamocchi.jp>
Mon, 17 Sep 2012 11:10:23 +0000 (20:10 +0900)
Conflicts:
action.php
index.php
install/index.php
nucleus/bookmarklet.php
nucleus/convert/functions.inc.php
nucleus/convert/wordpress.php
nucleus/index.php
nucleus/libs/ACTION.php
nucleus/libs/ACTIONLOG.php
nucleus/libs/ACTIONS.php
nucleus/libs/ADMIN.php
nucleus/libs/BAN.php
nucleus/libs/BLOG.php
nucleus/libs/BODYACTIONS.php
nucleus/libs/BaseActions.php
nucleus/libs/COMMENT.php
nucleus/libs/COMMENTACTIONS.php
nucleus/libs/COMMENTS.php
nucleus/libs/ITEM.php
nucleus/libs/ITEMACTIONS.php
nucleus/libs/KARMA.php
nucleus/libs/MANAGER.php
nucleus/libs/MEDIA.php
nucleus/libs/MEMBER.php
nucleus/libs/NOTIFICATION.php
nucleus/libs/PAGEFACTORY.php
nucleus/libs/PARSER.php
nucleus/libs/PLUGIN.php
nucleus/libs/PLUGINADMIN.php
nucleus/libs/SEARCH.php
nucleus/libs/SKIN.php
nucleus/libs/TEMPLATE.php
nucleus/libs/backup.php
nucleus/libs/globalfunctions.php
nucleus/libs/i18n.php
nucleus/libs/include/admin-add.template
nucleus/libs/include/admin-edit.template
nucleus/libs/include/bookmarklet-add.template
nucleus/libs/include/bookmarklet-edit.template
nucleus/libs/showlist.php
nucleus/libs/skinie.php
nucleus/libs/sql/DB.php
nucleus/libs/sql/MYSQLPDO.php
nucleus/libs/sql/sql.php
nucleus/locales/bg_Cyrl_BG.ISO-8859-5.php
nucleus/locales/bg_Cyrl_BG.UTF-8.php
nucleus/locales/ca_Latn_ES.ISO-8859-1.php
nucleus/locales/ca_Latn_ES.UTF-8.php
nucleus/locales/cs_Latn_CZ.UTF-8.php
nucleus/locales/cs_Latn_CZ.WINDOWS-1250.php
nucleus/locales/de_Latn_DE.ISO-8859-1.php
nucleus/locales/de_Latn_DE.UTF-8.php
nucleus/locales/en_Latn_US.ISO-8859-1.php
nucleus/locales/en_Latn_US.UTF-8.php
nucleus/locales/es_Latn_ES.ISO-8859-1.php
nucleus/locales/es_Latn_ES.UTF-8.php
nucleus/locales/fa_Arab_IR.UTF-8.php
nucleus/locales/fi_Latn_FI.ISO-8859-1.php
nucleus/locales/fi_Latn_FI.UTF-8.php
nucleus/locales/fr_Latn_FR.ISO-8859-15.php
nucleus/locales/fr_Latn_FR.UTF-8.php
nucleus/locales/gl_Latn_ES.ISO-8859-1.php
nucleus/locales/gl_Latn_ES.UTF-8.php
nucleus/locales/hr_Latn_HR.UTF-8.php
nucleus/locales/hr_Latn_HR.WINDOWS-1250.php
nucleus/locales/hu_Latn_HU.ISO-8859-2.php
nucleus/locales/hu_Latn_HU.UTF-8.php
nucleus/locales/id_Latn_ID.ISO-8859-1.php
nucleus/locales/id_Latn_ID.UTF-8.php
nucleus/locales/it_Latn_IT.ISO-8859-1.php
nucleus/locales/it_Latn_IT.UTF-8.php
nucleus/locales/ja_Jpan_JP.EUC-JP.php
nucleus/locales/ja_Jpan_JP.UTF-8.php
nucleus/locales/ko_Kore_KR.EUC-KR.php
nucleus/locales/ko_Kore_KR.UTF-8.php
nucleus/locales/ku_Arab_TR.UTF-8.php
nucleus/locales/lv_Latn_LV.ISO-8859-13.php
nucleus/locales/lv_Latn_LV.UTF-8.php
nucleus/locales/nl_Latn_NL.ISO-8859-15.php
nucleus/locales/nl_Latn_NL.UTF-8.php
nucleus/locales/pl_Latn_PL.UTF-8.php
nucleus/locales/pt_Latn_BR.ISO-8859-1.php
nucleus/locales/pt_Latn_BR.UTF-8.php
nucleus/locales/ro_Latn_RO.ISO-8859-1.php
nucleus/locales/ro_Latn_RO.UTF-8.php
nucleus/locales/ru_Cyrl_RU.UTF-8.php
nucleus/locales/ru_Cyrl_RU.WINDOWS-1251.php
nucleus/locales/sk_Latn_SK.ISO-8859-2.php
nucleus/locales/sk_Latn_SK.UTF-8.php
nucleus/locales/sr_Cyrl_RS.UTF-8.php
nucleus/locales/ur_Arab_PK.UTF-8.php
nucleus/locales/vi_Latn_VN.UTF-8.php
nucleus/locales/zh_Hans_CN.GB2312.php
nucleus/locales/zh_Hans_CN.UTF-8.php
nucleus/locales/zh_Hant_TW.UTF-8.php
nucleus/media.php
nucleus/plugins/NP_SecurityEnforcer.php
nucleus/plugins/NP_SkinFiles.php
nucleus/upgrades/upgrade.functions.php
nucleus/upgrades/upgrade4.0.php
nucleus/xmlrpc/server.php
skins/admin/bookmarklet/styles/addedit.css
skins/default/nicetitle.js

117 files changed:
.buildpath [new file with mode: 0644]
.project [new file with mode: 0644]
.settings/org.eclipse.core.resources.prefs [new file with mode: 0644]
.settings/org.eclipse.php.core.prefs [new file with mode: 0644]
action.php
index.php
install/index.php
nucleus/bookmarklet.php
nucleus/convert/functions.inc.php
nucleus/convert/wordpress.php
nucleus/index.php
nucleus/libs/ACTION.php
nucleus/libs/ACTIONLOG.php
nucleus/libs/ACTIONS.php
nucleus/libs/ADMIN.php
nucleus/libs/BAN.php
nucleus/libs/BLOG.php
nucleus/libs/BODYACTIONS.php
nucleus/libs/BaseActions.php
nucleus/libs/COMMENT.php
nucleus/libs/COMMENTACTIONS.php
nucleus/libs/COMMENTS.php
nucleus/libs/ITEM.php
nucleus/libs/ITEMACTIONS.php
nucleus/libs/KARMA.php
nucleus/libs/MANAGER.php
nucleus/libs/MEDIA.php
nucleus/libs/MEMBER.php
nucleus/libs/NOTIFICATION.php
nucleus/libs/PAGEFACTORY.php [new file with mode: 0644]
nucleus/libs/PARSER.php
nucleus/libs/PLUGIN.php
nucleus/libs/PLUGINADMIN.php
nucleus/libs/SEARCH.php
nucleus/libs/SKIN.php
nucleus/libs/TEMPLATE.php
nucleus/libs/backup.php
nucleus/libs/globalfunctions.php
nucleus/libs/i18n.php
nucleus/libs/include/admin-add.template [new file with mode: 0644]
nucleus/libs/include/admin-edit.template [new file with mode: 0644]
nucleus/libs/include/bookmarklet-add.template [new file with mode: 0644]
nucleus/libs/include/bookmarklet-edit.template [new file with mode: 0644]
nucleus/libs/showlist.php
nucleus/libs/skinie.php
nucleus/libs/sql/DB.php
nucleus/libs/sql/MYSQLPDO.php
nucleus/libs/sql/sql.php
nucleus/locales/bg_Cyrl_BG.ISO-8859-5.php
nucleus/locales/bg_Cyrl_BG.UTF-8.php
nucleus/locales/ca_Latn_ES.ISO-8859-1.php
nucleus/locales/ca_Latn_ES.UTF-8.php
nucleus/locales/cs_Latn_CZ.UTF-8.php
nucleus/locales/cs_Latn_CZ.WINDOWS-1250.php
nucleus/locales/de_Latn_DE.ISO-8859-1.php
nucleus/locales/de_Latn_DE.UTF-8.php
nucleus/locales/el_Latn_GR.UTF-8.php [new file with mode: 0644]
nucleus/locales/el_Latn_GR.WINDOWS-1253.php [new file with mode: 0644]
nucleus/locales/en_Latn_US.ISO-8859-1.php
nucleus/locales/en_Latn_US.UTF-8.php
nucleus/locales/es_Latn_ES.ISO-8859-1.php
nucleus/locales/es_Latn_ES.UTF-8.php
nucleus/locales/fa_Arab_IR.UTF-8.php
nucleus/locales/fi_Latn_FI.ISO-8859-1.php
nucleus/locales/fi_Latn_FI.UTF-8.php
nucleus/locales/fr_Latn_FR.ISO-8859-15.php
nucleus/locales/fr_Latn_FR.UTF-8.php
nucleus/locales/gl_Latn_ES.ISO-8859-1.php
nucleus/locales/gl_Latn_ES.UTF-8.php
nucleus/locales/hr_Latn_HR.UTF-8.php
nucleus/locales/hr_Latn_HR.WINDOWS-1250.php
nucleus/locales/hu_Latn_HU.ISO-8859-2.php
nucleus/locales/hu_Latn_HU.UTF-8.php
nucleus/locales/id_Latn_ID.ISO-8859-1.php
nucleus/locales/id_Latn_ID.UTF-8.php
nucleus/locales/it_Latn_IT.ISO-8859-1.php
nucleus/locales/it_Latn_IT.UTF-8.php
nucleus/locales/ja_Jpan_JP.EUC-JP.php
nucleus/locales/ja_Jpan_JP.UTF-8.php
nucleus/locales/ko_Kore_KR.EUC-KR.php
nucleus/locales/ko_Kore_KR.UTF-8.php
nucleus/locales/ku_Arab_TR.UTF-8.php
nucleus/locales/lv_Latn_LV.ISO-8859-13.php
nucleus/locales/lv_Latn_LV.UTF-8.php
nucleus/locales/nl_Latn_NL.ISO-8859-15.php
nucleus/locales/nl_Latn_NL.UTF-8.php
nucleus/locales/pl_Latn_PL.UTF-8.php
nucleus/locales/pt_Latn_BR.ISO-8859-1.php
nucleus/locales/pt_Latn_BR.UTF-8.php
nucleus/locales/ro_Latn_RO.ISO-8859-1.php
nucleus/locales/ro_Latn_RO.UTF-8.php
nucleus/locales/ru_Cyrl_RU.UTF-8.php
nucleus/locales/ru_Cyrl_RU.WINDOWS-1251.php
nucleus/locales/sk_Latn_SK.ISO-8859-2.php
nucleus/locales/sk_Latn_SK.UTF-8.php
nucleus/locales/sr_Cyrl_RS.UTF-8.php
nucleus/locales/ur_Arab_PK.UTF-8.php
nucleus/locales/vi_Latn_VN.UTF-8.php
nucleus/locales/zh_Hans_CN.GB2312.php
nucleus/locales/zh_Hans_CN.UTF-8.php
nucleus/locales/zh_Hant_TW.UTF-8.php
nucleus/media.php [new file with mode: 0644]
nucleus/plugins/NP_SecurityEnforcer.php
nucleus/plugins/NP_SkinFiles.php
nucleus/upgrades/upgrade.functions.php
nucleus/upgrades/upgrade0.96.php
nucleus/upgrades/upgrade1.0.php
nucleus/upgrades/upgrade1.1.php
nucleus/upgrades/upgrade1.5.php
nucleus/upgrades/upgrade2.5.php
nucleus/upgrades/upgrade3.3.php
nucleus/upgrades/upgrade4.0.php
nucleus/xmlrpc/server.php
skins/admin/bookmarklet/javascripts/edit.js
skins/admin/bookmarklet/styles/addedit.css
skins/admin/default/styles/admin_original.css
skins/default/nicetitle.js

diff --git a/.buildpath b/.buildpath
new file mode 100644 (file)
index 0000000..8bcb4b5
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<buildpath>
+       <buildpathentry kind="src" path=""/>
+       <buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
+</buildpath>
diff --git a/.project b/.project
new file mode 100644 (file)
index 0000000..7e1a46c
--- /dev/null
+++ b/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>nucleus-next</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.wst.validation.validationbuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.dltk.core.scriptbuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.php.core.PHPNature</nature>
+       </natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644 (file)
index 0000000..730e5d2
--- /dev/null
@@ -0,0 +1,24 @@
+eclipse.preferences.version=1
+encoding//nucleus/locales/bg_Cyrl_BG.ISO-8859-5.php=ISO-8859-5
+encoding//nucleus/locales/ca_Latn_ES.ISO-8859-1.php=ISO-8859-1
+encoding//nucleus/locales/cs_Latn_CZ.WINDOWS-1250.php=WINDOWS-1250
+encoding//nucleus/locales/de_Latn_DE.ISO-8859-1.php=ISO-8859-1
+encoding//nucleus/locales/el_Grek_GR.WINDOWS-1253.php=WINDOWS-1253
+encoding//nucleus/locales/en_Latn_US.ISO-8859-1.php=ISO-8859-1
+encoding//nucleus/locales/es_Latn_ES.ISO-8859-1.php=ISO-8859-1
+encoding//nucleus/locales/fi_Latn_FI.ISO-8859-1.php=ISO-8859-1
+encoding//nucleus/locales/fr_Latn_FR.ISO-8859-15.php=ISO-8859-15
+encoding//nucleus/locales/gl_Latn_ES.ISO-8859-1.php=ISO-8859-1
+encoding//nucleus/locales/hr_Latn_HR.WINDOWS-1250.php=WINDOWS-1250
+encoding//nucleus/locales/hu_Latn_HU.ISO-8859-2.php=ISO-8859-2
+encoding//nucleus/locales/id_Latn_ID.ISO-8859-1.php=ISO-8859-1
+encoding//nucleus/locales/it_Latn_IT.ISO-8859-1.php=ISO-8859-1
+encoding//nucleus/locales/ja_Jpan_JP.EUC-JP.php=EUC-JP
+encoding//nucleus/locales/ko_Kore_KR.EUC-KR.php=EUC-KR
+encoding//nucleus/locales/lv_Latn_LV.ISO-8859-13.php=ISO-8859-13
+encoding//nucleus/locales/nl_Latn_NL.ISO-8859-15.php=ISO-8859-15
+encoding//nucleus/locales/pt_Latn_BR.ISO-8859-1.php=ISO-8859-1
+encoding//nucleus/locales/ro_Latn_RO.ISO-8859-1.php=ISO-8859-1
+encoding//nucleus/locales/ru_Cyrl_RU.WINDOWS-1251.php=WINDOWS-1251
+encoding//nucleus/locales/sk_Latn_SK.ISO-8859-2.php=ISO-8859-2
+encoding//nucleus/locales/zh_Hans_CN.GB2312.php=GB2312
diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs
new file mode 100644 (file)
index 0000000..5f7d896
--- /dev/null
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+include_path=
index 56d18a8..33529ec 100644 (file)
@@ -1,3 +1,39 @@
+<<<<<<< HEAD
+<?php\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2009 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+\r
+/**\r
+ * File containing actions that can be performed by visitors of the site,\r
+ * like adding comments, etc...\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group\r
+ * @version $Id: action.php 1721 2012-03-31 10:18:25Z sakamocchi $\r
+ */\r
+\r
+$CONF = array();\r
+require('./config.php');\r
+include_libs('ACTION.php');\r
+\r
+$action = requestVar('action');\r
+$a = new Action();\r
+$errorInfo = $a->doAction($action);\r
+\r
+if ( $errorInfo )\r
+{\r
+       $skin = new SKIN($errorInfo['skinid']);\r
+       doError($errorInfo['message'], $skin);\r
+}\r
+\r
+=======
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
@@ -32,4 +68,5 @@ if ( $errorInfo )
        doError($errorInfo['message'], $skin);
 }
 
+>>>>>>> skinnable-master
 exit;
\ No newline at end of file
index e824f67..17c1577 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,3 +1,13 @@
+<<<<<<< HEAD
+<?php\r
+// This file will generate and return the main page of the site\r
+$CONF = array();\r
+$CONF['Self'] = 'index.php';\r
+\r
+include('./config.php');\r
+\r
+selector();\r
+=======
 <?php
 // This file will generate and return the main page of the site
 $CONF = array();
@@ -7,3 +17,4 @@ include('./config.php');
 
 selector();
 
+>>>>>>> skinnable-master
index 04288ee..13fd7be 100644 (file)
+<<<<<<< HEAD
+<?php\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ *\r
+ * This script will install the Nucleus tables in your SQL-database,\r
+ * and initialize the data in those tables.\r
+ */\r
+\r
+/**\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
+ * @version $Id: index.php 1745 2012-04-12 23:45:47Z sakamocchi $\r
+ */\r
+\r
+/* global values initialize */\r
+$CONF = array();\r
+\r
+/* reporting all errors for support */\r
+error_reporting(E_ALL);\r
+\r
+$minimum_php_version = '5.0.6';\r
+$minimum_mysql_version = '3.23';\r
+\r
+$page_footer_copyright = '&copy; 2001-2012 The Nucleus Groupe . Running Nucleus CMS v4.00';\r
+\r
+// begin if: server's PHP version is below the minimum; halt installation\r
+if ( version_compare(PHP_VERSION, $minimum_php_version, '<') )\r
+{\r
+       exit('<div style="font-size: xx-large;"> Nucleus requires at least PHP version ' . $minimum_php_version . '</div>');\r
+}\r
+\r
+// make sure there's no unnecessary escaping: # set_magic_quotes_runtime(0);\r
+if ( version_compare(PHP_VERSION, '5.3.0', '<') )\r
+{\r
+       ini_set('magic_quotes_runtime', '0');\r
+}\r
+\r
+/* default installed plugins and skins */\r
+$aConfPlugsToInstall = array('NP_SecurityEnforcer', 'NP_SkinFiles');\r
+$aConfSkinsToImport = array('atom', 'rss2.0', 'rsd', 'default');\r
+\r
+// Check if some important files\r
+do_check_files();\r
+\r
+/* i18n class is needed for internationalization */\r
+include_once('../nucleus/libs/i18n.php');\r
+if ( !i18n::init('UTF-8', '../nucleus/locales') )\r
+{\r
+       exit('<div style="font-size: xx-large;"> Failed to initialize iconv or mbstring extension. Would you please contact the administrator of your PHP server? </div>');\r
+}\r
+\r
+// include core classes that are needed for login & plugin handling\r
+\r
+// added for 3.5 sql_* wrapper\r
+global $MYSQL_HANDLER;\r
+\r
+if ( !isset($MYSQL_HANDLER) )\r
+{\r
+       $MYSQL_HANDLER = array('mysql', '');\r
+       \r
+       // check if mysql support is installed; this check may not make sense, as is, in a version past 3.5x\r
+       if ( !function_exists('mysql_query') && !function_exists('mysqli_query') )\r
+       {\r
+               exit('<div style="font-size: xx-large;"> Your PHP version does not have support for MySQL :( </div>');\r
+       }\r
+}\r
+include_once('../nucleus/libs/sql/sql.php');\r
+\r
+session_start();\r
+if ( count($_GET) == 0 && count($_POST) == 0 )\r
+{\r
+       unset($_SESSION['param_manager']);\r
+}\r
+\r
+// restore the $param from the session\r
+if ( array_key_exists('param_manager', $_SESSION) )\r
+{\r
+       $param = $_SESSION['param_manager'];\r
+}\r
+else\r
+{\r
+       $param = new ParamManager();\r
+}\r
+\r
+// include translation file\r
+if ( array_key_exists('locale', $_POST) ) $param->set_locale();\r
+i18n::set_current_locale($param->locale);\r
+$translation_file = './locales/' . i18n::get_current_locale() . '.' . i18n::get_current_charset() . '.php';\r
+if ( !file_exists($translation_file) )\r
+{\r
+       $translation_file = './locales/en_Latn_US.UTF-8.php';\r
+}\r
+include($translation_file);\r
+\r
+do_action();\r
+\r
+// $param is saved to the session\r
+if ( isset($param) )\r
+{\r
+       $_SESSION['param_manager'] = $param;\r
+}\r
+else\r
+{\r
+       unset($_SESSION['param_manager']);\r
+}\r
+exit;\r
+\r
+/**\r
+ * installer action\r
+ */\r
+function do_action()\r
+{\r
+       global $param;\r
+\r
+       if ( array_key_exists('action', $_POST) )\r
+       {\r
+               $isPostback = true;\r
+       }\r
+       else\r
+       {\r
+               $isPostback = false;\r
+       }\r
+\r
+       // mode change\r
+       if ( array_key_exists('mode', $_REQUEST) )\r
+       {\r
+               if ( $_REQUEST['mode'] == 'detail' )\r
+               {\r
+                       $param->set_state('detail');\r
+               }\r
+               elseif ( $_REQUEST['mode'] == 'simple' )\r
+               {\r
+                       $param->set_state('mysql');\r
+               }\r
+       }\r
+\r
+       // input parameter check\r
+       if ( $isPostback )\r
+       {\r
+               switch ( $param->state )\r
+               {\r
+                       case 'locale':\r
+                               $param->set_locale();\r
+                               $param->set_state('mysql');\r
+                               $isPostback = false;\r
+                               break;\r
+                       case 'mysql':\r
+                               if ( count($param->check_mysql_parameters()) == 0 )\r
+                               {\r
+                                       $param->set_state('weblog');\r
+                                       $isPostback = false;\r
+                               }\r
+                               break;\r
+                       case 'weblog':\r
+                               if ( count($param->check_user_parameters()) == 0\r
+                                       && count($param->check_weblog_parameters()) == 0 )\r
+                               {\r
+                                       $param->set_state('install');\r
+                                       $isPostback = false;\r
+                               }\r
+                               break;\r
+                       case 'detail':\r
+                               if ( $param->check_all_parameters() )\r
+                               {\r
+                                       $param->set_state('install');\r
+                                       $isPostback = false;\r
+                               }\r
+                               break;\r
+               }\r
+       }\r
+\r
+       // page render\r
+       show_header();\r
+       switch ( $param->state )\r
+       {\r
+               case 'locale':\r
+                       show_select_locale_form();\r
+                       break;\r
+               case 'mysql':\r
+                       show_database_setting_form($isPostback);\r
+                       break;\r
+               case 'weblog':\r
+                       show_blog_setting_form($isPostback);\r
+                       break;\r
+               case 'detail':\r
+                       show_detail_setting_form($isPostback);\r
+                       break;\r
+               case 'install':\r
+                       show_install_complete_form();\r
+                       break;\r
+       }\r
+       show_footer();\r
+}\r
+\r
+/**\r
+ * header tag of the installation screens\r
+ **/\r
+function show_header()\r
+{\r
+       global $param;\r
+\r
+       /* HTTP 1.1 application for no caching */\r
+       header("Cache-Control: no-cache, must-revalidate");\r
+       header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");\r
+       header('Content-Type: text/html; charset=' . i18n::get_current_charset());\r
+?>\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml">\r
+       <head>\r
+               <title><?php echo _TITLE; ?></title>\r
+               <link rel="stylesheet" type="text/css" href="./styles/inst.css" />\r
+               <style type="text/css">\r
+               <!--\r
+               <?php echo _BODYFONTSTYLE; ?>\r
+               -->\r
+               </style>\r
+               <script type="text/javascript">\r
+                       function SelectText( element ) {\r
+                               window.setTimeout( function() { element.select() }, 0 );\r
+                       }\r
+                       var isSubmit = false;\r
+                       function OnceSubmit() {\r
+                               if (!isSubmit) {\r
+                                       isSubmit = true;\r
+                                       window.setTimeout( function() { isSubmit = false; }, 10000 );\r
+                                       return true;\r
+                               }\r
+                               return false;\r
+                       }\r
+               </script>\r
+       </head>\r
+       <body>\r
+               <div id="header">\r
+                       <div id="navigation">\r
+                               <h1><img src="./styles/nucleus_rogo.png" alt="NucleusCMS" /></h1>\r
+                               <ul>\r
+<?php\r
+       if ( in_array($param->state, array('mysql', 'weblog', 'install')) )\r
+       {\r
+               echo '<li>', _STEP1, '</li><li';\r
+               if ( $param->state == 'mysql' )\r
+               {\r
+                       echo ' class="gry"';\r
+               }\r
+               echo '>&nbsp; &gt; &nbsp;', _STEP2, '</li><li';\r
+               if ( in_array($param->state, array('mysql', 'weblog')) )\r
+               {\r
+                       echo ' class="gry"';\r
+               }\r
+               echo '>&nbsp; &gt; &nbsp;', _STEP3, "</li>\n";\r
+       }\r
+       if ( in_array($param->state, array('mysql', 'weblog', 'detail')) )\r
+       {\r
+               echo '<li class="rightbox">';\r
+               if ( in_array($param->state, array('mysql', 'weblog')) )\r
+               {\r
+                       echo '<a href="./?mode=detail">', _MODE2, '</a>';\r
+               }\r
+               else\r
+               {\r
+                       echo '<a href="./?mode=simple">', _MODE1, '</a>';\r
+               }\r
+               echo '</li>';\r
+       }\r
+?>\r
+                               </ul>\r
+                       </div>\r
+               </div>\r
+<?php\r
+}\r
+\r
+/**\r
+ * footer tag of the installation screens\r
+ **/\r
+function show_footer()\r
+{\r
+       global $page_footer_copyright;\r
+?>\r
+               <div id="footer">\r
+                       <?php echo $page_footer_copyright; ?>\r
+               </div>\r
+       </body>\r
+</html>\r
+<?php\r
+}\r
+\r
+/**\r
+ * Display the form for language select\r
+ */\r
+function show_select_locale_form()\r
+{\r
+       // get locale list\r
+       $localelist = i18n::get_available_locale_list();\r
+       $locales = array();\r
+       foreach ( $localelist as $locale ) {\r
+               $checkfile = './locales/' . $locale . '.' . i18n::get_current_charset() . '.php';\r
+               $locales[] = array( $locale, (!file_exists($checkfile) ? '*&nbsp;' : '') . $locale );\r
+       }\r
+?>\r
+               <div id="container">\r
+                       <p style="font-size:152%;font-weight:bold;">\r
+                               Select your locale:\r
+                       </p>\r
+                       <form method="post" action="./index.php">\r
+\r
+                               <div class="prt">\r
+                                       <select name="locale">\r
+<?php\r
+       // Get the browser language that can be displayed\r
+       // TODO: default locale select simple implementation\r
+       $languages = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);\r
+       $language = (is_array($languages) && count($languages) > 0) ? preg_replace('#^([\w]+).*$#', '$1', $languages[0]) : '';\r
+\r
+       foreach ( $locales as $locale )\r
+       {\r
+               echo "<option value=\"$locale[0]\"";\r
+               if ( i18n::strpos($locale[0], $language) === 0 )\r
+               {\r
+                       echo ' selected';\r
+               }\r
+               echo ">$locale[1]</option>\n";\r
+       }\r
+?>\r
+                                       </select>\r
+                                       <p>Nucleus is installed in the selected locale, the locale of the Asterisk prefixed will be displayed in English because there is no translation of the installer file.</p>\r
+                                       <p>We will wait for the translator by volunteers!</p>\r
+                                       </p>\r
+                                       <p class="sbt">\r
+                                               <button type="submit" name="action" value="locale" class="sbt_arw">START</button>\r
+                                       </p>\r
+                               </div>\r
+                       </form>\r
+               </div>\r
+<?php\r
+}\r
+\r
+/**\r
+ * Display the form to set up a database\r
+ * @param bool $isPostback\r
+ */\r
+function show_database_setting_form($isPostback)\r
+{\r
+       global $param, $minimum_mysql_version;\r
+\r
+       $config_writable = canConfigFileWritable();\r
+       $mysql_version = getMySqlVersion();\r
+?>\r
+               <div id="container">\r
+                       <p class="msg">\r
+<?php\r
+       echo _SIMPLE_NAVI1;\r
+       if ( $config_writable != '' )\r
+       {\r
+               echo '<span class="err">', $config_writable, '</span>';\r
+       }\r
+       if ( $mysql_version == '0.0.0' )\r
+       {\r
+               echo '<span class="err">', _DBVERSION_UNKOWN, '</span>';\r
+       }\r
+       elseif ( version_compare($mysql_version, $minimum_mysql_version, '<') )\r
+       {\r
+               echo '<span class="err">', sprintf(_DBVERSION_TOOLOW, $minimum_mysql_version), '</span>';\r
+       }\r
+?>\r
+                       </p>\r
+                       <form method="post" action="./index.php">\r
+                               <div class="prt">\r
+                                       <h2><?php echo _DB_HEADER; ?></h2>\r
+                                       <p class="msg">\r
+<?php\r
+       if ( $isPostback )\r
+       {\r
+               $errors = $param->check_mysql_parameters();\r
+               if ( is_array($errors) )\r
+               {\r
+                       foreach ( $errors as $error )\r
+                       {\r
+                               echo '<span class="err">', $error, "</span>\n";\r
+                       }\r
+               }\r
+       }\r
+?>\r
+                                       </p>\r
+                                       <table>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _DB_FIELD1; ?></span><span class="sub"><?php echo _DB_FIELD1_DESC; ?></span></th>\r
+                                                               <td><input type="text" name="mysql_host" value="<?php echo $param->mysql_host; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _DB_FIELD2; ?></span><span class="sub"><?php echo _DB_FIELD2_DESC; ?></span></th>\r
+                                                               <td><input type="text" name="mysql_user" value="<?php echo $param->mysql_user; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _DB_FIELD3; ?></span></th>\r
+                                                               <td><input type="text" name="mysql_password" value="<?php echo $param->mysql_password; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _DB_FIELD4; ?></span><span class="sub"><?php echo _DB_FIELD4_DESC; ?></span></th>\r
+                                                               <td><input type="text" name="mysql_database" value="<?php echo $param->mysql_database; ?>" /></td>\r
+                                               </tr>\r
+                                       </table>\r
+                                       <p class="sbt">\r
+                                               <button type="submit" name="mode" value="detail" class="sbt_sqr"><?php echo _MODE2; ?></button>\r
+                                               <button type="submit" name="action" value="mysql" class="sbt_arw"><?php echo _NEXT; ?></button>\r
+                                       </p>\r
+                                       <p class="msg">\r
+                                               <?php echo _DB_TEXT1; ?>\r
+                                       </p>\r
+                               </div>\r
+                       </form>\r
+               </div>\r
+<?php\r
+}\r
+\r
+/**\r
+ * Displays a form to the blog settings\r
+ * @param bool $isPostback\r
+ */\r
+function show_blog_setting_form($isPostback)\r
+{\r
+       global $param;\r
+?>\r
+               <div id="container">\r
+                       <p class="msg">\r
+                               <?php echo _SIMPLE_NAVI2; ?>\r
+                       </p>\r
+                       <form method="post" action="./index.php">\r
+                               <div class="prt">\r
+                                       <h2><?php echo _BLOG_HEADER; ?></h2>\r
+                                       <p class="msg">\r
+<?php\r
+       if ( $isPostback )\r
+       {\r
+               $errors = $param->check_weblog_parameters();\r
+               if ( is_array($errors) )\r
+               {\r
+                       foreach ( $errors as $error )\r
+                       {\r
+                               echo '<span class="err">', $error, "</span>\n";\r
+                       }\r
+               }\r
+       }\r
+?>\r
+                                       </p>\r
+                                       <table>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _BLOG_FIELD1; ?></span></th>\r
+                                                               <td><input type="text" name="blog_name" value="<?php echo $param->blog_name; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _BLOG_FIELD2; ?></span><span class="sub"><?php echo _BLOG_FIELD2_DESC; ?></span></th>\r
+                                                               <td><input type="text" name="blog_shortname" value="<?php echo $param->blog_shortname; ?>" /></td>\r
+                                               </tr>\r
+                                       </table>\r
+                               </div>\r
+\r
+                               <div class="prt">\r
+                                       <h2><?php echo _ADMIN_HEADER; ?></h2>\r
+                                       <p class="msg">\r
+<?php\r
+       if ( $isPostback )\r
+       {\r
+               $errors = $param->check_user_parameters();\r
+               if ( is_array($errors) )\r
+               {\r
+                       foreach ( $errors as $error )\r
+                       {\r
+                               echo '<span class="err">', $error, "</span>\n";\r
+                       }\r
+               }\r
+       }\r
+?>\r
+                                       </p>\r
+                                       <table>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _ADMIN_FIELD1; ?></span></th>\r
+                                                               <td><input type="text" name="user_realname" value="<?php echo $param->user_realname; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _ADMIN_FIELD2; ?></span><span class="sub"><?php echo _ADMIN_FIELD2_DESC; ?></span></th>\r
+                                                               <td><input type="text" name="user_name" value="<?php echo $param->user_name; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _ADMIN_FIELD3; ?></span></th>\r
+                                                               <td><input type="password" name="user_password" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _ADMIN_FIELD4; ?></span></th>\r
+                                                               <td><input type="password" name="user_password2" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _ADMIN_FIELD5; ?></span></th>\r
+                                                               <td><input type="text" name="user_email" value="<?php echo $param->user_email; ?>" /></td>\r
+                                               </tr>\r
+                                       </table>\r
+                                       <p class="sbt">\r
+                                               <button type="submit" name="action" value="weblog" class="sbt_arw" onclick="OnceSubmit()"><?php echo _INSTALL; ?></button>\r
+                                       </p>\r
+                               </div>\r
+                       </form>\r
+               </div>\r
+<?php\r
+}\r
+\r
+/**\r
+ * Displays a form to the detail settings\r
+ * @param bool $isPostback\r
+ */\r
+function show_detail_setting_form($isPostback)\r
+{\r
+       global $param, $minimum_mysql_version;\r
+\r
+       $mysql_version = getMySqlVersion();\r
+?>\r
+               <div id="container_detailed">\r
+                       <p class="msg">\r
+                               <?php echo _DETAIL_NAVI1; ?>\r
+<?php\r
+       if ( $isPostback && !$param->check_all_parameters() )\r
+       {\r
+               echo '<span class="err">', _VALID_ERROR, "</span>\n";\r
+       }\r
+?>\r
+                       </p>\r
+                       <ul class="msg">\r
+                               <li>PHP: <?php echo phpversion(); ?></li>\r
+                               <li>MySQL:\r
+<?php\r
+       echo ($mysql_version == '0.0.0') ? _DBVERSION_UNKOWN : $mysql_version;\r
+       if ( version_compare($mysql_version, $minimum_mysql_version, '<') )\r
+       {\r
+               echo '<span class="err">', sprintf(_DBVERSION_TOOLOW, $minimum_mysql_version), '</span>';\r
+       }\r
+?></li>\r
+                       </ul>\r
+                       <form method="post" action="">\r
+\r
+                               <div class="prt">\r
+                                       <h2><?php echo _DETAIL_HEADER1; ?></h2>\r
+                                       <p class="msg">\r
+<?php\r
+       if ( $isPostback )\r
+       {\r
+               $errors = $param->check_mysql_parameters();\r
+               if ( is_array($errors) )\r
+               {\r
+                       foreach ( $errors as $error )\r
+                       {\r
+                               echo '<span class="err">', $error, "</span>\n";\r
+                       }\r
+               }\r
+       }\r
+?>\r
+                                       </p>\r
+                                       <table>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _DB_FIELD1; ?></span><span class="sub"><?php echo _DB_FIELD1_DESC; ?></span></th>\r
+                                                               <td><input type="text" name="mysql_host" value="<?php echo $param->mysql_host; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _DB_FIELD2; ?></span><span class="sub"><?php echo _DB_FIELD2_DESC; ?></span></th>\r
+                                                               <td><input type="text" name="mysql_user" value="<?php echo $param->mysql_user; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _DB_FIELD3; ?></span></th>\r
+                                                               <td><input type="text" name="mysql_password" value="<?php echo $param->mysql_password; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _DB_FIELD4; ?></span><span class="sub"><?php echo _DB_FIELD4_DESC; ?></span></th>\r
+                                                               <td><input type="text" name="mysql_database" value="<?php echo $param->mysql_database; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _DB_FIELD5; ?></span><span class="sub"><?php echo _DB_FIELD5_DESC; ?></span></th>\r
+                                                               <td><input type="text" name="mysql_tablePrefix" value="<?php echo $param->mysql_tablePrefix; ?>" /></td>\r
+                                               </tr>\r
+                                       </table>\r
+\r
+                                       <h2><?php echo _DETAIL_HEADER2; ?></h2>\r
+                                       <p class="msg">\r
+<?php\r
+       if ( $isPostback )\r
+       {\r
+               $errors = $param->check_uri_parameters();\r
+               if ( is_array($errors) )\r
+               {\r
+                       foreach ( $errors as $error )\r
+                       {\r
+                               echo '<span class="err">', $error, "</span>\n";\r
+                       }\r
+               }\r
+               $errors = $param->check_path_parameters();\r
+               if ( is_array($errors) )\r
+               {\r
+                       foreach ( $errors as $error )\r
+                       {\r
+                               echo '<span class="err">', $error, "</span>\n";\r
+                       }\r
+               }\r
+       }\r
+?>\r
+                                       </p>\r
+                                       <table>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _PATH_FIELD1; ?></span></th>\r
+                                                               <td><input type="text" name="IndexURL" value="<?php echo $param->IndexURL; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _PATH_FIELD2; ?></span></th>\r
+                                                               <td><input type="text" name="AdminURL" value="<?php echo $param->AdminURL; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _PATH_FIELD3; ?></span></th>\r
+                                                               <td><input type="text" name="AdminPath" value="<?php echo $param->AdminPath; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _PATH_FIELD4; ?></span></th>\r
+                                                               <td><input type="text" name="MediaURL" value="<?php echo $param->MediaURL; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _PATH_FIELD5; ?></span></th>\r
+                                                               <td><input type="text" name="MediaPath" value="<?php echo $param->MediaPath; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _PATH_FIELD6; ?></span></th>\r
+                                                               <td><input type="text" name="SkinsURL" value="<?php echo $param->SkinsURL; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _PATH_FIELD7; ?></span></th>\r
+                                                               <td><input type="text" name="SkinsPath" value="<?php echo $param->SkinsPath; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _PATH_FIELD8; ?></span></th>\r
+                                                               <td><input type="text" name="PluginURL" value="<?php echo $param->PluginURL; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _PATH_FIELD9; ?></span></th>\r
+                                                               <td><input type="text" name="ActionURL" value="<?php echo $param->ActionURL; ?>" /></td>\r
+                                               </tr>\r
+                                       </table>\r
+                                       <p class="msg">\r
+                                               <?php echo _DETAIL_TEXT3; ?>\r
+                                       </p>\r
+\r
+                                       <h2><?php echo _DETAIL_HEADER3; ?></h2>\r
+                                       <p class="msg">\r
+<?php\r
+       echo _DETAIL_TEXT4;\r
+       if ( $isPostback )\r
+       {\r
+               $errors = $param->check_user_parameters();\r
+               if ( is_array($errors) )\r
+               {\r
+                       foreach ( $errors as $error )\r
+                       {\r
+                               echo '<span class="err">', $error, "</span>\n";\r
+                       }\r
+               }\r
+       }\r
+?>\r
+                                       </p>\r
+                                       <table>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _ADMIN_FIELD1; ?></span></th>\r
+                                                               <td><input type="text" name="user_realname" value="<?php echo $param->user_realname; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _ADMIN_FIELD2; ?></span><span class="sub"><?php echo _ADMIN_FIELD2_DESC; ?></span></th>\r
+                                                               <td><input type="text" name="user_name" value="<?php echo $param->user_name; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _ADMIN_FIELD3; ?></span></th>\r
+                                                               <td><input type="password" name="user_password" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _ADMIN_FIELD4; ?></span></th>\r
+                                                               <td><input type="password" name="user_password2" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _ADMIN_FIELD5; ?></span></th>\r
+                                                               <td><input type="text" name="user_email" value="<?php echo $param->user_email; ?>" /></td>\r
+                                               </tr>\r
+                                       </table>\r
+\r
+                                       <h2><?php echo _DETAIL_HEADER4; ?></h2>\r
+                                       <p class="msg">\r
+<?php\r
+       echo _DETAIL_TEXT5;\r
+       if ( $isPostback )\r
+       {\r
+               $errors = $param->check_weblog_parameters();\r
+               if ( is_array($errors) )\r
+               {\r
+                       foreach ( $errors as $error )\r
+                       {\r
+                               echo '<span class="err">', $error, "</span>\n";\r
+                       }\r
+               }\r
+       }\r
+?>\r
+                                       </p>\r
+                                       <table>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _BLOG_FIELD1; ?></span></th>\r
+                                                               <td><input type="text" name="blog_name" value="<?php echo $param->blog_name; ?>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <th><span class="nam"><?php echo _BLOG_FIELD2; ?></span><span class="sub"><?php echo _BLOG_FIELD2_DESC; ?></span></th>\r
+                                                               <td><input type="text" name="blog_shortname" value="<?php echo $param->blog_shortname; ?>" /></td>\r
+                                               </tr>\r
+                                       </table>\r
+\r
+                                       <p class="msg">\r
+                                               <?php echo _DETAIL_TEXT6; ?>\r
+                                       </p>\r
+\r
+                                       <p class="sbt">\r
+                                               <button type="submit" name="action" value="detail" class="sbt_arw" onclick="OnceSubmit()"><?php echo _INSTALL; ?></button>\r
+                                       </p>\r
+                               </div>\r
+                       </form>\r
+               </div>\r
+<?php\r
+}\r
+\r
+/**\r
+ * Displays a screen to signal the completion of the installation\r
+ */\r
+function show_install_complete_form()\r
+{\r
+       global $MYSQL_HANDLER, $param;\r
+       $errors = do_install();\r
+?>\r
+               <div id="container">\r
+                       <p class="msg">\r
+<?php\r
+       if ( is_array($errors) && count($errors) > 0 )\r
+       {\r
+               echo _INST_ERROR;\r
+               foreach ( $errors as $error )\r
+               {\r
+                       echo '<span class="err">', $error, "</span>\n";\r
+               }\r
+       }\r
+       else\r
+       {\r
+               echo _INST_TEXT;\r
+               if ( array_key_exists('config_data', $_SESSION) )\r
+               {\r
+                       echo '<span class="err">', _INST_TEXT4, '</span>';\r
+?>\r
+<textarea id="config_text" readonly="readonly" onfocus="SelectText(this);"><?php echo htmlentities($_SESSION['config_data'], null, i18n::get_current_charset()) ?></textarea>\r
+<?php\r
+               }\r
+               else\r
+               {\r
+                       echo '<span class="err">', _INST_TEXT5, '</span>';\r
+               }\r
+?>\r
+                       </p>\r
+                       <form method="post" action="./index.php">\r
+                               <div class="prt">\r
+                                       <h2><?php echo _INST_HEADER1; ?></h2>\r
+                                       <p class="msg">\r
+                                               <?php echo sprintf(_INST_TEXT1, $param->blog_name); ?>\r
+                                       </p>\r
+                                       <p class="sbt">\r
+                                               <button type="button" name="toBlog" onclick="location.href='<?php echo $param->IndexURL; ?>';" class="sbt_arw"><?php echo _INST_BUTTON1; ?></button>\r
+                                       </p>\r
+                               </div>\r
+\r
+                               <div class="prt">\r
+                                       <h2><?php echo _INST_HEADER2; ?></h2>\r
+                                       <p class="msg">\r
+                                               <?php echo _INST_TEXT2; ?>\r
+                                       </p>\r
+                                       <p class="sbt">\r
+                                               <button type="button" name="toMng" onclick="location.href='<?php echo $param->AdminURL; ?>';" class="sbt_arw"><?php echo _INST_BUTTON2; ?></button>\r
+                                       </p>\r
+                               </div>\r
+\r
+                               <div class="prt">\r
+                                       <h2><?php echo _INST_HEADER3; ?></h2>\r
+                                       <p class="msg">\r
+                                               <?php echo _INST_TEXT3; ?>\r
+                                       </p>\r
+                                       <p class="sbt">\r
+                                               <button type="button" name="toAddBlog" onclick="location.href='<?php echo $param->AdminURL; ?>index.php?action=createnewlog';" class="sbt_arw"><?php echo _INST_BUTTON3; ?></button>\r
+                                       </p>\r
+                               </div>\r
+                       </form>\r
+<?php\r
+       }\r
+?>\r
+               </div>\r
+<?php\r
+       unset($param);\r
+}\r
+\r
+/**\r
+ * The installation process itself\r
+ * @return array error messages\r
+ */\r
+function do_install()\r
+{\r
+       global $param;\r
+       global $MYSQL_HANDLER, $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE, $MYSQL_PREFIX, $MYSQL_CONN;\r
+       global $DIR_NUCLEUS, $DIR_MEDIA, $DIR_SKINS, $DIR_PLUGINS, $DIR_LANG, $DIR_LIBS;\r
+       $errors = array();\r
+\r
+       /*\r
+        * 1. put all param-vars into vars\r
+        */\r
+       $MYSQL_HOST             = $param->mysql_host;\r
+       $MYSQL_USER             = $param->mysql_user;\r
+       $MYSQL_PASSWORD = $param->mysql_password;\r
+       $MYSQL_DATABASE = $param->mysql_database;\r
+       $MYSQL_PREFIX   = $param->mysql_tablePrefix;\r
+\r
+       $DIR_NUCLEUS    = $param->AdminPath;\r
+       $DIR_MEDIA              = $param->MediaPath;\r
+       $DIR_SKINS              = $param->SkinsPath;\r
+       $DIR_PLUGINS    = $DIR_NUCLEUS . 'plugins/';\r
+       $DIR_LOCALES    = $DIR_NUCLEUS . 'locales/';\r
+       $DIR_LIBS               = $DIR_NUCLEUS . 'libs/';\r
+\r
+       /*\r
+        * 2.open mySQL connection\r
+        */\r
+       $MYSQL_CONN = @DB::setConnectionInfo($MYSQL_HANDLER[1], $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD);\r
+       if ( $MYSQL_CONN == FALSE )\r
+       {\r
+               $errors[] = _DBCONNECT_ERROR;\r
+               return $errors;\r
+       }\r
+\r
+       /*\r
+        * 3. try to create database if needed\r
+        */\r
+       if ( DB::execute("CREATE DATABASE IF NOT EXISTS {$MYSQL_DATABASE}") === FALSE )\r
+       {\r
+               $errinfo = DB::getError();\r
+               $errors[] = _INST_ERROR1 . ': ' . $errinfo[2];\r
+       }\r
+\r
+       /*\r
+        * 4. try to select database\r
+        */\r
+       $MYSQL_CONN = @DB::setConnectionInfo($MYSQL_HANDLER[1], $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE);\r
+       if ( !$MYSQL_CONN )\r
+       {\r
+               $errors[] = _INST_ERROR2;\r
+       }\r
+\r
+       if ( count($errors) > 0 )\r
+       {\r
+               return $errors;\r
+       }\r
+\r
+       /*\r
+        * 5. execute queries\r
+        */\r
+       $table_names = array(\r
+               'nucleus_actionlog',\r
+               'nucleus_ban',\r
+               'nucleus_blog',\r
+               'nucleus_category',\r
+               'nucleus_comment',\r
+               'nucleus_config',\r
+               'nucleus_item',\r
+               'nucleus_karma',\r
+               'nucleus_member',\r
+               'nucleus_plugin',\r
+               'nucleus_skin',\r
+               'nucleus_template',\r
+               'nucleus_team',\r
+               'nucleus_activation',\r
+               'nucleus_tickets'\r
+       );\r
+\r
+       $prefixed_table_names = array();\r
+       foreach ( $table_names as $table_name )\r
+       {\r
+               $prefixed_table_names[] = $MYSQL_PREFIX . $table_name;\r
+       }\r
+\r
+       // table exists check\r
+       $result = DB::getResult('SHOW TABLES');\r
+       foreach ( $result as $row )\r
+       {\r
+               if ( in_array($row[0], $prefixed_table_names) )\r
+               {\r
+                       $errors[] = _INST_ERROR3;\r
+                       break;\r
+               }\r
+       }\r
+       if ( count($errors) > 0 )\r
+       {\r
+               return $errors;\r
+       }\r
+\r
+       $filename = 'install.sql';\r
+       $fd = fopen($filename, 'r');\r
+       $queries = fread($fd, filesize($filename));\r
+       fclose($fd);\r
+\r
+       $queries = preg_split('#(;\n|;\r)#', $queries);\r
+\r
+       foreach ( $queries as $query )\r
+       {\r
+               if ( preg_match('/\w+/', $query) )\r
+               {\r
+                       if ( $MYSQL_PREFIX )\r
+                       {\r
+                               $query = str_replace($table_names, $prefixed_table_names, $query);\r
+                       }\r
+\r
+                       if ( DB::execute($query) === FALSE )\r
+                       {\r
+                               $errinfo = DB::getError();\r
+                               $errors[] = _INST_ERROR4 . ' (<small>' . $query . '</small>): ' . $errinfo[2];\r
+                       }\r
+               }\r
+       }\r
+\r
+       /*\r
+        * 6. put needed records\r
+        */\r
+       /* push first post */\r
+       $query = "INSERT INTO %s VALUES (1, %s, %s, %s, 1, 1, %s, 0, 0, 0, 1, 0, 1)";\r
+       $query = sprintf($query,\r
+               tableName('nucleus_item'),\r
+               DB::quoteValue(_1ST_POST_TITLE),\r
+               DB::quoteValue(_1ST_POST),\r
+               DB::quoteValue(_1ST_POST2),\r
+               DB::formatDateTime()\r
+       );\r
+       if ( DB::execute($query) === FALSE )\r
+       {\r
+               $errinfo = DB::getError();\r
+               $errors[] = _INST_ERROR4 . ' (<small>' . $query . '</small>): ' . $errinfo[2];\r
+       }\r
+\r
+       /* push configurations */\r
+       array_merge($errors, updateConfig('IndexURL', $param->IndexURL));\r
+       array_merge($errors, updateConfig('AdminURL', $param->AdminURL));\r
+       array_merge($errors, updateConfig('MediaURL', $param->MediaURL));\r
+       array_merge($errors, updateConfig('SkinsURL', $param->SkinsURL));\r
+       array_merge($errors, updateConfig('PluginURL', $param->PluginURL));\r
+       array_merge($errors, updateConfig('ActionURL', $param->ActionURL));\r
+       array_merge($errors, updateConfig('AdminEmail', $param->user_email));\r
+       array_merge($errors, updateConfig('SiteName', $param->blog_name));\r
+       array_merge($errors, updateConfig('Locale', i18n::get_current_locale()));\r
+\r
+       /* push super admin */\r
+       $query = "UPDATE %s SET mname = %s, mrealname = %s, mpassword = %s, memail = %s, murl = %s, madmin = 1, mcanlogin = 1 WHERE mnumber = 1";\r
+       $query = sprintf($query,\r
+               tableName('nucleus_member'),\r
+               DB::quoteValue($param->user_name),\r
+               DB::quoteValue($param->user_realname),\r
+               DB::quoteValue(md5($param->user_password)),\r
+               DB::quoteValue($param->user_email),\r
+               DB::quoteValue($param->IndexURL)\r
+       );\r
+       if ( DB::execute($query) === FALSE )\r
+       {\r
+               $errinfo = DB::getError();\r
+               $errors[] = _INST_ERROR5 . ': ' . $errinfo[2];\r
+       }\r
+\r
+       /* push new weblog */\r
+       $query = "UPDATE %s SET bname = %s, bshortname = %s, burl = %s WHERE bnumber = 1";\r
+       $query = sprintf($query,\r
+               tableName('nucleus_blog'),\r
+               DB::quoteValue($param->blog_name),\r
+               DB::quoteValue($param->blog_shortname),\r
+               DB::quoteValue($param->IndexURL)\r
+       );\r
+       if ( DB::execute($query) === FALSE )\r
+       {\r
+               $errinfo = DB::getError();\r
+               $errors[] = _INST_ERROR6 . ': ' . $errinfo[2];\r
+       }\r
+\r
+       /* push default category */\r
+       $query = "UPDATE %s SET cname = %s, cdesc = %s WHERE catid = 1";\r
+       $query = sprintf($query,\r
+               tableName('nucleus_category'),\r
+               DB::quoteValue(_GENERALCAT_NAME),\r
+               DB::quoteValue(_GENERALCAT_DESC)\r
+       );\r
+       if ( DB::execute($query) === FALSE )\r
+       {\r
+               $errinfo = DB::getError();\r
+               $errors[] = _INST_ERROR6 . ': ' . $errinfo[2];\r
+       }\r
+\r
+       /*\r
+        * 7. install default plugins and skins\r
+        */\r
+       global $aConfPlugsToInstall, $aConfSkinsToImport;\r
+       $aSkinErrors = array();\r
+       $aPlugErrors = array();\r
+\r
+       if ( (count($aConfPlugsToInstall) > 0) || (count($aConfSkinsToImport) > 0) )\r
+       {\r
+               include_once($DIR_LIBS . 'globalfunctions.php');\r
+               global $manager;\r
+               if ( !isset($manager) )\r
+               {\r
+                       $manager = new Manager();\r
+               }\r
+\r
+               include_once($DIR_LIBS . 'skinie.php');\r
+               \r
+               $aSkinErrors = installCustomSkins();\r
+               if ( count($aSkinErrors) > 0 )\r
+               {\r
+                       array_merge($errors, $aSkinErrors);\r
+               }\r
+\r
+               $query          = "SELECT sdnumber FROM %s WHERE sdname='default'";\r
+               $query          = sprintf($query, tableName('nucleus_skin_desc'));\r
+               $defSkinID      = intval(DB::getValue($query));\r
+\r
+               $query = "UPDATE %s SET bdefskin=%d WHERE bnumber=1";\r
+               $query = sprintf($query, tableName('nucleus_blog'), $defSkinID);\r
+               DB::execute($query);\r
+               \r
+               $query = "UPDATE %s SET value=%d WHERE name='BaseSkin'";\r
+               $query = sprintf($query, tableName('nucleus_config'), $defSkinID);\r
+               DB::execute($query);\r
+\r
+               $aPlugErrors = installCustomPlugs();\r
+               if ( count($aPlugErrors) > 0 )\r
+               {\r
+                       array_merge($errors, $aPlugErrors);\r
+               }\r
+       }\r
+\r
+       /*\r
+        * 8. Write config file ourselves (if possible)\r
+        */\r
+       $config_data = '<' . '?php' . "\n";\r
+       $config_data .= "// mySQL connection information\n";\r
+       $config_data .= "\$MYSQL_HOST = '" . $MYSQL_HOST . "';\n";\r
+       $config_data .= "\$MYSQL_USER = '" . $MYSQL_USER . "';\n";\r
+       $config_data .= "\$MYSQL_PASSWORD = '" . $MYSQL_PASSWORD . "';\n";\r
+       $config_data .= "\$MYSQL_DATABASE = '" . $MYSQL_DATABASE . "';\n";\r
+       $config_data .= "\$MYSQL_PREFIX = '" . $MYSQL_PREFIX . "';\n";\r
+       $config_data .= "// new in 3.50. first element is db handler, the second is the db driver used by the handler\n";\r
+       $config_data .= "// default is \$MYSQL_HANDLER = array('mysql','mysql');\n";\r
+       $config_data .= "//\$MYSQL_HANDLER = array('mysql','mysql');\n";\r
+       $config_data .= "//\$MYSQL_HANDLER = array('pdo','mysql');\n";\r
+       $config_data .= "\$MYSQL_HANDLER = array('" . $MYSQL_HANDLER[0] . "','" . $MYSQL_HANDLER[1] . "');\n";\r
+       $config_data .= "\n";\r
+       $config_data .= "// main nucleus directory\n";\r
+       $config_data .= "\$DIR_NUCLEUS = '" . $DIR_NUCLEUS . "';\n";\r
+       $config_data .= "\n";\r
+       $config_data .= "// path to media dir\n";\r
+       $config_data .= "\$DIR_MEDIA = '" . $DIR_MEDIA . "';\n";\r
+       $config_data .= "\n";\r
+       $config_data .= "// extra skin files for imported skins\n";\r
+       $config_data .= "\$DIR_SKINS = '" . $DIR_SKINS . "';\n";\r
+       $config_data .= "\n";\r
+       $config_data .= "// these dirs are normally sub dirs of the nucleus dir, but \n";\r
+       $config_data .= "// you can redefine them if you wish\n";\r
+       $config_data .= "\$DIR_PLUGINS = \$DIR_NUCLEUS . 'plugins/';\n";\r
+       $config_data .= "\$DIR_LOCALES = \$DIR_NUCLEUS . 'locales/';\n";\r
+       $config_data .= "\$DIR_LIBS = \$DIR_NUCLEUS . 'libs/';\n";\r
+       $config_data .= "\n";\r
+       $config_data .= "// include libs\n";\r
+       $config_data .= "include(\$DIR_LIBS.'globalfunctions.php');\n";\r
+       $config_data .= "?" . ">";\r
+\r
+       $result = false;\r
+       if ( @!file_exists('../config.php') || is_writable('../config.php') )\r
+       {\r
+               if ( $fp = @fopen('../config.php', 'w') )\r
+               {\r
+                       $result = @fwrite($fp, $config_data, i18n::strlen($config_data));\r
+                       fclose($fp);\r
+               }\r
+       }\r
+\r
+       if ( $result )\r
+       {\r
+               // try to change the read-only permission.\r
+               if ( strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN' )\r
+               {\r
+                       @chmod('../config.php', 0444);\r
+               }\r
+       }\r
+       else\r
+       {\r
+               $_SESSION['config_data'] = $config_data;\r
+       }\r
+\r
+       return $errors;\r
+}\r
+\r
+/**\r
+ * Confirm that you can write to the configuration file\r
+ * @return string error message\r
+ */\r
+function canConfigFileWritable()\r
+{\r
+       if ( @file_exists('../config.php') && @!is_writable('../config.php') )\r
+       {\r
+               // try to change the read-write permission.\r
+               if ( strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN' )\r
+               {\r
+                       @chmod('../config.php', 0666);\r
+               }\r
+\r
+               if ( @!is_writable('../config.php') )\r
+               {\r
+                       return _INST_ERROR8;\r
+               }\r
+       }\r
+       return '';\r
+}\r
+\r
+/**\r
+ * To obtain the version of MySQL\r
+ * @return string\r
+ */\r
+function getMySqlVersion()\r
+{\r
+       global $MYSQL_HANDLER, $minimum_mysql_version, $errors;\r
+       // Turn on output buffer\r
+       // Needed to repress the output of the sql function that are\r
+       // not part of php (in this case the @ operator doesn't work)\r
+       ob_start();\r
+\r
+       // note: this piece of code is taken from phpMyAdmin\r
+       $conn = @DB::setConnectionInfo($MYSQL_HANDLER[1], 'localhost', '', '');\r
+\r
+       if ( $conn )\r
+       {\r
+               $row = DB::getAttribute(PDO::ATTR_SERVER_VERSION);\r
+               $match = preg_split('#\.#', $row);\r
+       }\r
+       else\r
+       {\r
+               $row = @DB::getRow('SHOW VARIABLES LIKE \'version\'');\r
+\r
+               if ( $row )\r
+               {\r
+                       $match = preg_split('#\.#', $row[1]);\r
+               }\r
+               else\r
+               {\r
+                       $output = (function_exists('shell_exec')) ? @shell_exec('mysql -V') : '0.0.0';\r
+                       preg_match('@[0-9]+\.[0-9]+\.[0-9]+@', $output, $version);\r
+                       $match = preg_split('#\.#', $version[0]);\r
+\r
+                       if ( $match[0] == '' )\r
+                       {\r
+                               $match = array('0', '0', '0');\r
+                       }\r
+               }\r
+       }\r
+\r
+       @DB::disConnect();\r
+\r
+       //End and clean output buffer\r
+       ob_end_clean();\r
+\r
+       return implode($match, '.');\r
+}\r
+\r
+/**\r
+ * Add a table prefix if it is used\r
+ *\r
+ * @param string $input table name with prefix\r
+ * @return string\r
+ */\r
+function tableName($input)\r
+{\r
+       global $MYSQL_PREFIX;\r
+       if ( $MYSQL_PREFIX )\r
+       {\r
+               return $MYSQL_PREFIX . $input;\r
+       }\r
+       else\r
+       {\r
+               return $input;\r
+       }\r
+}\r
+\r
+/**\r
+ * Install custom plugins\r
+ */\r
+function installCustomPlugs()\r
+{\r
+       global $aConfPlugsToInstall, $DIR_LIBS, $manager;\r
+\r
+       $aErrors = array();\r
+       if ( count($aConfPlugsToInstall) == 0 )\r
+       {\r
+               return $aErrors;\r
+       }\r
+\r
+       $query = sprintf('SELECT * FROM %s', tableName('nucleus_plugin'));\r
+       $res = DB::getResult($query);\r
+       $numCurrent = $res->rowCount();\r
+\r
+       foreach ( $aConfPlugsToInstall as $plugName )\r
+       {\r
+               $query = sprintf('INSERT INTO %s (porder, pfile) VALUES (%d, %s)',\r
+                       tableName('nucleus_plugin'),\r
+                       (++$numCurrent),\r
+                       DB::quoteValue($plugName));\r
+               DB::execute($query);\r
+\r
+               $manager->clearCachedInfo('installedPlugins');\r
+               $plugin =& $manager->getPlugin($plugName);\r
+               $plugin->setID($numCurrent);\r
+\r
+               if ( !$plugin )\r
+               {\r
+                       $query = sprintf('DELETE FROM %s WHERE pfile = %s',\r
+                               tableName('nucleus_plugin'),\r
+                               DB::quoteValue($plugName));\r
+                       DB::execute($query);\r
+                       $numCurrent--;\r
+                       array_push($aErrors, sprintf(_INST_ERROR9, $plugName));\r
+                       continue;\r
+               }\r
+               $plugin->install();\r
+       }\r
+\r
+       $query = sprintf('DELETE FROM %s', tableName('nucleus_plugin_event'));\r
+       DB::execute($query);\r
+       $query = sprintf('SELECT pid, pfile FROM %s', tableName('nucleus_plugin'));\r
+       $res = DB::getResult($query);\r
+\r
+       foreach ( $res as $row )\r
+       {\r
+               $plug =& $manager->getPlugin($row['pfile']);\r
+\r
+               if ( $plug )\r
+               {\r
+                       $eventList = $plug->getEventList();\r
+                       foreach ( $eventList as $eventName )\r
+                       {\r
+                               $query = sprintf('INSERT INTO %s (pid, event) VALUES (%d, %s)',\r
+                                       tableName('nucleus_plugin_event'),\r
+                                       intval($row['pid']),\r
+                                       DB::quoteValue($eventName));\r
+                               DB::execute($query);\r
+                       }\r
+               }\r
+       }\r
+       return $aErrors;\r
+}\r
+\r
+/**\r
+ * Install custom skins\r
+ * Prepares the installation of custom skins\r
+ */\r
+function installCustomSkins()\r
+{\r
+       global $aConfSkinsToImport, $DIR_LIBS, $DIR_SKINS;\r
+\r
+       $aErrors = array();\r
+       if ( count($aConfSkinsToImport) == 0 )\r
+       {\r
+               return $aErrors;\r
+       }\r
+\r
+       $importer = new SkinImport();\r
+\r
+       foreach ( $aConfSkinsToImport as $skinName )\r
+       {\r
+               $importer->reset();\r
+               $skinFile = $DIR_SKINS . $skinName . '/skinbackup.xml';\r
+\r
+               if ( !@file_exists($skinFile) )\r
+               {\r
+                       array_push($aErrors, sprintf(_INST_ERROR10, $skinFile));\r
+                       continue;\r
+               }\r
+\r
+               $error = $importer->readFile($skinFile);\r
+\r
+               if ( $error )\r
+               {\r
+                       array_push($aErrors, sprintf(_INST_ERROR11, $skinName) . ' : ' . $error);\r
+                       continue;\r
+               }\r
+\r
+               $error = $importer->writeToDatabase(1);\r
+\r
+               if ( $error )\r
+               {\r
+                       array_push($aErrors, sprintf(_INST_ERROR12, $skinName) . ' : ' . $error);\r
+                       continue;\r
+               }\r
+       }\r
+       return $aErrors;\r
+}\r
+\r
+/**\r
+ * Check if some important files of the Nucleus CMS installation are available\r
+ * Give an error if one or more files are not accessible\r
+ */\r
+function do_check_files()\r
+{\r
+       $missingfiles = array();\r
+       $files = array(\r
+               './install.sql',\r
+               '../index.php',\r
+               '../action.php',\r
+               '../nucleus/index.php',\r
+               '../nucleus/media.php',\r
+               '../nucleus/libs/ACTION.php',\r
+               '../nucleus/libs/ACTIONLOG.php',\r
+               '../nucleus/libs/ACTIONS.php',\r
+               '../nucleus/libs/ADMIN.php',\r
+               '../nucleus/libs/BaseActions.php',\r
+               '../nucleus/libs/BLOG.php',\r
+               '../nucleus/libs/BODYACTIONS.php',\r
+               '../nucleus/libs/COMMENT.php',\r
+               '../nucleus/libs/COMMENTACTIONS.php',\r
+               '../nucleus/libs/COMMENTS.php',\r
+               '../nucleus/libs/ENCAPSULATE.php',\r
+               '../nucleus/libs/ENTITY.php',\r
+               '../nucleus/libs/globalfunctions.php',\r
+               '../nucleus/libs/i18n.php',\r
+               '../nucleus/libs/ITEM.php',\r
+               '../nucleus/libs/ITEMACTIONS.php',\r
+               '../nucleus/libs/LINK.php',\r
+               '../nucleus/libs/MANAGER.php',\r
+               '../nucleus/libs/MEDIA.php',\r
+               '../nucleus/libs/MEMBER.php',\r
+               '../nucleus/libs/NOTIFICATION.php',\r
+               '../nucleus/libs/PAGEFACTORY.php',\r
+               '../nucleus/libs/PARSER.php',\r
+               '../nucleus/libs/PLUGIN.php',\r
+               '../nucleus/libs/PLUGINADMIN.php',\r
+               '../nucleus/libs/SEARCH.php',\r
+               '../nucleus/libs/showlist.php',\r
+               '../nucleus/libs/SKIN.php',\r
+               '../nucleus/libs/TEMPLATE.php',\r
+               '../nucleus/libs/vars4.1.0.php',\r
+               '../nucleus/libs/xmlrpc.inc.php',\r
+               '../nucleus/libs/xmlrpcs.inc.php',\r
+               '../nucleus/libs/sql/DB.php',\r
+               '../nucleus/libs/sql/MYSQLPDO.php'\r
+       );\r
+\r
+       $count = count($files);\r
+       for ( $i = 0; $i < $count; $i++ )\r
+       {\r
+               if ( !is_readable($files[$i]) )\r
+               {\r
+                       array_push($missingfiles, 'File <b>' . $files[$i] . '</b> is missing or not readable.<br />');\r
+               }\r
+       }\r
+\r
+       if ( count($missingfiles) > 0 )\r
+       {\r
+               exit(implode("\n", $missingfiles));\r
+       }\r
+}\r
+\r
+/**\r
+ * Updates the configuration in the database\r
+ *\r
+ * @param string $name name of the config var\r
+ * @param string $value new value of the config var\r
+ * @return array\r
+ */\r
+function updateConfig($name, $value)\r
+{\r
+       $errors = array();\r
+\r
+       $query = "UPDATE %s SET value = %s WHERE name = %s";\r
+       $query = sprintf($query, tableName('nucleus_config'), DB::quoteValue(trim($value)), DB::quoteValue($name));\r
+\r
+       if ( DB::execute($query) === FALSE )\r
+       {\r
+               $errinfo = DB::getError();\r
+               $errors[] = _INST_ERROR4 . ': ' . $errinfo[2];\r
+       }\r
+       return $errors;\r
+}\r
+\r
+class ParamManager\r
+{\r
+       /* process parameter */\r
+       public $state;\r
+       public $locale;\r
+\r
+       /* mysql connection parameters */\r
+       public $mysql_host;\r
+       public $mysql_user;\r
+       public $mysql_password;\r
+       public $mysql_database;\r
+       public $mysql_tablePrefix;\r
+\r
+       /* weblog configuration parameters */\r
+       public $blog_name;\r
+       public $blog_shortname;\r
+\r
+       /* member configuration parameters */\r
+       public $user_name;\r
+       public $user_realname;\r
+       public $user_password;\r
+       private $user_password2;\r
+       public $user_email;\r
+\r
+       /* URI parameters  */\r
+       private $root_url;\r
+       public $IndexURL;\r
+       public $AdminURL;\r
+       public $MediaURL;\r
+       public $SkinsURL;\r
+       public $PluginURL;\r
+       public $ActionURL;\r
+\r
+       /* path parameters */\r
+       private $root_path;\r
+       public $AdminPath;\r
+       public $MediaPath;\r
+       public $SkinsPath;\r
+\r
+       /**\r
+        * constructor\r
+        */\r
+       public function __construct()\r
+       {\r
+               $this->init();\r
+       }\r
+\r
+       public function init()\r
+       {\r
+               // set default values\r
+               $this->state = 'locale';\r
+               $this->install_mode = 'simple';\r
+               $this->locale = 'en_Latn_US';\r
+               $this->mysql_host = @ini_get('mysql.default_host');\r
+               $this->blog_name = 'My Nucleus CMS';\r
+               $this->blog_shortname = 'mynucleuscms';\r
+\r
+               /* root path */\r
+               $directory_separator = preg_quote(DIRECTORY_SEPARATOR, '|');\r
+               $this->root_path = implode('/', preg_split("|$directory_separator|", realpath(dirname(__FILE__) . '/..')));\r
+               if ( substr($this->root_path, -1, 1) !== '/' )\r
+               {\r
+                       $this->root_path .= '/';\r
+               }\r
+               $base_path_pcre = preg_quote($this->root_path, '|');\r
+\r
+               /* current directry name */\r
+               $directory_name = preg_replace("#{$base_path_pcre}#", '', implode('/', preg_split("#{$directory_separator}#", realpath(dirname(__FILE__)))));\r
+               $directory_name_pcre = preg_quote($directory_name, '|');\r
+\r
+               /* root uri */\r
+               $root_url = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];\r
+               $this->root_url = preg_replace("|$directory_name_pcre(.*)$|", '', $root_url);\r
+\r
+               $this->AdminPath = $this->root_path . 'nucleus/';\r
+               $this->MediaPath = $this->root_path . 'media/';\r
+               $this->SkinsPath = $this->root_path . 'skins/';\r
+\r
+               $this->IndexURL  = $this->root_url;\r
+               $this->AdminURL  = $this->root_url . 'nucleus/';\r
+               $this->MediaURL  = $this->root_url . 'media/';\r
+               $this->SkinsURL  = $this->root_url . 'skins/';\r
+               $this->PluginURL = $this->root_url . 'nucleus/plugins/';\r
+               $this->ActionURL = $this->root_url . 'action.php';\r
+       }\r
+\r
+       private function read_parameter($parameter)\r
+       {\r
+               foreach ( $parameter as $element )\r
+               {\r
+                       if ( array_key_exists($element, $_POST) )\r
+                       {\r
+                               $this->$element = $_POST[$element];\r
+                       }\r
+               }\r
+       }\r
+\r
+       public function set_state($state)\r
+       {\r
+               $states = array('locale', 'mysql', 'weblog', 'detail', 'install');\r
+               if ( in_array($state, $states) )\r
+               {\r
+                       $this->state = $state;\r
+               }\r
+       }\r
+\r
+       public function set_locale()\r
+       {\r
+               $this->read_parameter(array('locale'));\r
+\r
+               if ( !in_array($this->locale, i18n::get_available_locale_list()) )\r
+               {\r
+                       $this->locale = 'en_Latn_US';\r
+               }\r
+       }\r
+\r
+       public function check_mysql_parameters()\r
+       {\r
+               global $MYSQL_HANDLER;\r
+               \r
+               $parameters = array('mysql_host', 'mysql_user', 'mysql_password', 'mysql_database', 'mysql_tablePrefix');\r
+               $this->read_parameter($parameters);\r
+\r
+               $errors = array();\r
+               if ( $this->mysql_host == '' )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR1, _DB_FIELD1);\r
+               }\r
+\r
+               if ( $this->mysql_user == '' )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR1, _DB_FIELD2);\r
+               }\r
+               \r
+               if ( $this->mysql_user != ''\r
+                       && !preg_match('/^[a-z0-9_\-]+$/i', $this->mysql_user) )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR2, _DB_FIELD2);\r
+               }\r
+               \r
+               if ( $this->mysql_database == '' )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR1, _DB_FIELD4);\r
+               }\r
+\r
+               if ( $this->mysql_database != ''\r
+                       && !preg_match('/^[a-z0-9_\-]+$/i', $this->mysql_database) )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR2, _DB_FIELD4);\r
+               }\r
+\r
+               if ( $this->mysql_tablePrefix != ''\r
+                       && !preg_match('/^[a-z0-9_]+$/i', $this->mysql_tablePrefix) )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR3, _DB_FIELD5);\r
+               }\r
+               \r
+               if ( count($errors) == 0 )\r
+               {\r
+                       $mysql_conn = @DB::setConnectionInfo($MYSQL_HANDLER[1], $this->mysql_host, $this->mysql_user, $this->mysql_password);\r
+                       if ( $mysql_conn == false )\r
+                       {\r
+                               $errors[] = _DBCONNECT_ERROR;\r
+                       }\r
+                       else\r
+                       {\r
+                               @DB::disConnect();\r
+                       }\r
+               }\r
+\r
+               return $errors;\r
+       }\r
+\r
+       public function check_user_parameters()\r
+       {\r
+               $parameters = array('user_name', 'user_realname', 'user_password', 'user_password2', 'user_email');\r
+               $this->read_parameter($parameters);\r
+\r
+               $errors = array();\r
+               if ( $this->user_realname == '' )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR1, _ADMIN_FIELD1);\r
+               }\r
+\r
+               if ( $this->user_name == '' )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR1, _ADMIN_FIELD2);\r
+               }\r
+               elseif ( !preg_match("/^[a-z0-9]+([ a-z0-9]*[a-z0-9]+)?$/i", $this->user_name) )\r
+               {\r
+                       $errors[] = _VALID_ERROR5;\r
+               }\r
+\r
+               if ( $this->user_password == '' || $this->user_password2 == '' )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR1, _ADMIN_FIELD3);\r
+                       $this->user_password = '';\r
+               }\r
+               elseif ( $this->user_password != $this->user_password2 )\r
+               {\r
+                       $errors[] = _VALID_ERROR6;\r
+                       $this->user_password = '';\r
+               }\r
+\r
+               if ( !preg_match("/^[a-z0-9\._+\-]+@[a-z0-9\._\-]+\.[a-z]{2,6}$/i", $this->user_email) )\r
+               {\r
+                       $errors[] = _VALID_ERROR7;\r
+               }\r
+\r
+               return $errors;\r
+       }\r
+\r
+       public function check_weblog_parameters()\r
+       {\r
+               $parameters = array('blog_name', 'blog_shortname');\r
+               $this->read_parameter($parameters);\r
+\r
+               $errors = array();\r
+               if ( $this->blog_name == '' )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR1, _BLOG_FIELD1);\r
+               }\r
+\r
+               if ( $this->blog_shortname == '' )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR1, _BLOG_FIELD2);\r
+               }\r
+\r
+               if ( !preg_match("/^[a-z0-9]+$/i", $this->blog_shortname) )\r
+               {\r
+                       $errors[] = _VALID_ERROR4;\r
+               }\r
+\r
+               return $errors;\r
+       }\r
+\r
+       public function check_uri_parameters()\r
+       {\r
+               $parameters = array('IndexURL', 'AdminURL', 'MediaURL', 'SkinsURL', 'PluginURL', 'ActionURL');\r
+               $this->read_parameter($parameters);\r
+\r
+               $errors = array();\r
+               if ( substr($this->IndexURL, -1, 1) !== '/' )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR8, _PATH_FIELD1);\r
+               }\r
+\r
+               if ( substr($this->AdminURL, -1, 1) !== '/' )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR8, _PATH_FIELD2);\r
+               }\r
+\r
+               if ( substr($this->MediaURL, -1, 1) !== '/' )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR8, _PATH_FIELD4);\r
+               }\r
+\r
+               if ( substr($this->SkinsURL, -1, 1) !== '/' )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR8, _PATH_FIELD6);\r
+               }\r
+\r
+               if ( substr($this->PluginURL, -1, 1) !== '/' )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR8, _PATH_FIELD8);\r
+               }\r
+\r
+               if ( strrchr($this->ActionURL, '/') != '/action.php' )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR9, _PATH_FIELD9);\r
+               }\r
+\r
+               return $errors;\r
+       }\r
+\r
+       public function check_path_parameters()\r
+       {\r
+               $parameters = array('AdminPath', 'MediaPath', 'SkinsPath');\r
+               $this->read_parameter($parameters);\r
+\r
+               $separators = array('/', DIRECTORY_SEPARATOR);\r
+               $errors = array();\r
+               if ( !in_array(substr($this->AdminPath, -1, 1), $separators) )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR10, _PATH_FIELD3);\r
+               }\r
+               elseif ( !file_exists($this->AdminPath) )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR11, _PATH_FIELD3);\r
+               }\r
+\r
+               if ( !in_array(substr($this->MediaPath, -1, 1), $separators) )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR10, _PATH_FIELD5);\r
+               }\r
+               elseif ( !file_exists($this->MediaPath) )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR11, _PATH_FIELD5);\r
+               }\r
+\r
+               if ( !in_array(substr($this->SkinsPath, -1, 1), $separators) )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR10, _PATH_FIELD7);\r
+               }\r
+               elseif ( !file_exists($this->SkinsPath) )\r
+               {\r
+                       $errors[] = sprintf(_VALID_ERROR11, _PATH_FIELD7);\r
+               }\r
+\r
+               return $errors;\r
+       }\r
+\r
+       /**\r
+        * check all parameters\r
+        * @return bool\r
+        */\r
+       public function check_all_parameters()\r
+       {\r
+               $this->set_locale();\r
+\r
+               $isValid = true;\r
+               $isValid &= (count($this->check_mysql_parameters()) == 0);\r
+               $isValid &= (count($this->check_user_parameters()) == 0);\r
+               $isValid &= (count($this->check_weblog_parameters()) == 0);\r
+               $isValid &= (count($this->check_uri_parameters()) == 0);\r
+               $isValid &= (count($this->check_path_parameters()) == 0);\r
+\r
+               return $isValid;\r
+       }\r
+}\r
+=======
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
@@ -1815,3 +3543,4 @@ class ParamManager
                return $isValid;
        }
 }
+>>>>>>> skinnable-master
index 61af96c..836b920 100644 (file)
@@ -25,6 +25,8 @@ $CONF['UsingAdminArea'] = 1;
 // include all classes and config data
 include('../config.php');
 
+<<<<<<< HEAD
+=======
 // get skin object
 $skinid = $member->bookmarklet;
 if ( !Skin::existsID($skinid) )
@@ -39,11 +41,16 @@ if ( !Skin::existsID($skinid) )
 }
 $skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');
 
+>>>>>>> skinnable-master
 // check logged-in or pass through
 $action = requestVar('action');
 if ( !$member->isLoggedIn() )
 {
+<<<<<<< HEAD
+       bm_loginAndPassThrough($action);
+=======
        bm_loginAndPassThrough($skin, $action);
+>>>>>>> skinnable-master
        exit;
 }
 else if ( $action == 'login')
@@ -63,6 +70,12 @@ else if ( $action == '' )
        $action = 'add';
 }
 
+<<<<<<< HEAD
+// send HTTP 1.1 message header for Content-Type
+sendContentType('text/html', 'bookmarklet-' . $action);
+
+=======
+>>>>>>> skinnable-master
 // check ticket
 $aActionsNotToCheck = array('login', 'add', 'edit');
 if ( !in_array($action, $aActionsNotToCheck) )
@@ -129,7 +142,11 @@ function bm_doAddItem($skin)
                $extrahead = '';
        }
        
+<<<<<<< HEAD
+       bm_message(_ITEM_ADDED, _ITEM_ADDED, $message,$extrahead);
+=======
        bm_message($skin, _ITEM_ADDED, $message,$extrahead);
+>>>>>>> skinnable-master
        
        return;
 }
@@ -221,12 +238,19 @@ function bm_doEditItem($skin)
                $message = _ITEM_ADDED;
        }
        
+<<<<<<< HEAD
+       return;
+}
+
+function bm_loginAndPassThrough($action='add')
+=======
        // show success message
        bm_message($skin, _ITEM_ADDED, $message, '');
        return;
 }
 
 function bm_loginAndPassThrough($skin, $action='add')
+>>>>>>> skinnable-master
 {
        /*
         * TODO: これを出力させる
@@ -236,15 +260,41 @@ function bm_loginAndPassThrough($skin, $action='add')
        $log_link = requestVar('loglink');
        $log_linktitle = requestVar('loglinktitle');
        
+<<<<<<< HEAD
+       echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
+       echo "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n";
+       echo "<head>\n";
+       echo "<title>Nucleus CMS Bookmarklet</title>\n";
+       
+       bm_style();
+       
+       echo "</head>\n";
+       echo "<body>\n";
+       echo '<h1>' . _LOGIN_PLEASE . "</h1>\n";
+       echo "<form method=\"post\" action=\"bookmarklet.php\">\n";
+       echo "<p>\n";
+       echo _LOGINFORM_NAME . "<input type=\"text\" name=\"login\" value=\"\" /><br />\n";
+       echo _LOGINFORM_PWD . "<input type=\"password\" name=\"password\" value=\"\" /><br />\n";
+=======
+>>>>>>> skinnable-master
        echo '<input type="hidden" name="blogid" value="' . Entity::hsc($blogid). '" />' . "\n";
        echo '<input type="hidden" name="itemid" value="' . Entity::hsc($itemid). '" />' . "\n";
        echo '<input type="hidden" name="logtext" value="' . Entity::hsc($log_text) . '" />' . "\n";
        echo '<input type="hidden" name="loglink" value="' . Entity::hsc($log_link) . '" />' . "\n";
        echo '<input type="hidden" name="loglinktitle" value="' . Entity::hsc($log_linktitle) . '" />' . "\n";
        echo "<input type=\"hidden\" name=\"nextaction\" value=\"{$action}\" />\n";
+<<<<<<< HEAD
+       echo '<button type="submit" name="action" value="login">' . _LOGIN . "</button>\n";
+       echo "</p>\n";
+       echo "</form>\n";
+       echo '<p><a href="bookmarklet.php" onclick="window.close();">' . _POPUP_CLOSE . "</a></p>\n";
+       echo "</body>\n";
+       echo "</html>\n";
+=======
        */
        
        $skin->parse('showlogin');
+>>>>>>> skinnable-master
        
        return;
 }
@@ -262,7 +312,16 @@ function bm_doShowForm($skin)
        {
                bm_doError($skin, _ERROR_NOSUCHBLOG);
        }
+<<<<<<< HEAD
+       else
+       {
+               $blog =& $manager->getBlog($blogid);
+       }
+       
+       if ( !$member->isTeamMember($blogid) )
+=======
        else if ( !$member->isTeamMember($blogid) )
+>>>>>>> skinnable-master
        {
                bm_doError($skin, _ERROR_NOTONTEAM);
        }
@@ -286,6 +345,21 @@ function bm_doShowForm($skin)
                $logje .= '<a href="' . Entity::hsc($log_link) . '">' . Entity::hsc($log_linktitle) . '</a>';
        }
        
+<<<<<<< HEAD
+       $variables = array();
+       $variables['body'] = $logje;
+       $variables['title'] = Entity::hsc($log_linktitle);
+       
+       $handler = new PageFactory($blog);
+       $handler->setVariables($variables);
+       
+       $contents = $handler->getTemplateFor('bookmarklet', 'add');
+       $manager->notify('PreAddItemForm', array('contents' => &$contents, 'blog' => &$blog));
+       
+       $parser = new Parser($handler);
+       $parser->parse($contents);
+       
+=======
        $item = array();
        $item['body'] = $logje;
        $item['title'] = Entity::hsc($log_linktitle);
@@ -308,6 +382,7 @@ function bm_doShowForm($skin)
        Admin::$action = 'createitem';
        $skin->parse('createitem');
        
+>>>>>>> skinnable-master
        return;
 }
 
@@ -326,21 +401,41 @@ function bm_doEditForm($skin)
                bm_doError($skin, _ERROR_DISALLOWED);
        }
        
+<<<<<<< HEAD
+       $variables =& $manager->getItem($itemid, 1, 1);
+=======
+>>>>>>> skinnable-master
        $blog =& $manager->getBlog(getBlogIDFromItemID($itemid) );
        $item =& $manager->getItem($itemid, 1, 1);
        
+<<<<<<< HEAD
+       $manager->notify('PrepareItemForEdit', array('item' => &$variables) );
+=======
        $data = array(
                'blog' => &$blog,
                'item' => &$item
        );
        $manager->notify('PrepareItemForEdit', $data);
+>>>>>>> skinnable-master
        
        if ( $blog->convertBreaks() )
        {
-               $item['body'] = removeBreaks($item['body']);
-               $item['more'] = removeBreaks($item['more']);
+               $variables['body'] = removeBreaks($variables['body']);
+               $variables['more'] = removeBreaks($variables['more']);
        }
        
+<<<<<<< HEAD
+       $handler = new PageFactory($blog);
+       $handler->setVariables($variables);
+       
+       $contents = $handler->getTemplateFor('bookmarklet', 'edit');
+       
+       $parser = new Parser($handler);
+       $parser->parse($contents);
+       
+       return;
+}
+=======
        Admin::$blog = &$blog;
        Admin::$contents = &$item;
        
@@ -348,6 +443,7 @@ function bm_doEditForm($skin)
        $skin->parse('itemedit');
        
        return;}
+>>>>>>> skinnable-master
 
 function bm_doError($skin, $msg)
 {
@@ -357,16 +453,46 @@ function bm_doError($skin, $msg)
 
 function bm_message($skin, $title, $msg, $extrahead = '')
 {
+<<<<<<< HEAD
+       echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
+       echo "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n";
+       echo "<head>\n";
+       echo "<title>{$title}</title>\n";
+       
+       bm_style();
+       
+       echo $extrahead . "\n";
+       echo "</head>\n";
+       echo "<body>\n";
+       echo "<h1>{$head}</h1>\n";
+       echo "<p>{$msg}</p>\n";
+       echo '<p><a href="bookmarklet.php" onclick="window.close();window.opener.location.reload();">' . _POPUP_CLOSE . "</a></p>\n";
+       echo "</body>\n";
+       echo "</html>\n";
+=======
        Admin::$extrahead = $extrahead;
        Admin::$headMess = $msg;
        $skin->parse('adminerrorpage');
+>>>>>>> skinnable-master
        
        return;
 }
 
 function bm_doContextMenuCode($width=600, $height=500)
 {
+<<<<<<< HEAD
+       echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"styles/bookmarklet.css\" />\n";
+       echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"styles/addedit.css\" />\n";
+       return;
+}
+
+function bm_doContextMenuCode($width=600, $height=500)
+{
+       global $CONF;
+       
+=======
        global $CONF;   
+>>>>>>> skinnable-master
        $blogid = (integer) intGetVar('blogid');
        
        echo "<script type=\"text/javascript\" defer=\"defer\">\n";
index be81999..6f27dfd 100644 (file)
@@ -808,7 +808,11 @@ class BlogImport {
 
                if ( DB::execute($query) === FALSE )
                {
+<<<<<<< HEAD
+                       die("Error while executing query: " . $query);
+=======
                        die('Error while executing query: ' . $query);
+>>>>>>> skinnable-master
                }
 
                return DB::getInsertId();
@@ -822,10 +826,17 @@ class BlogImport {
                DB::execute('INSERT INTO '.sql_table('category')." (CNAME, CDESC) VALUES ('General','Items that do not fit in another category')");
                $defcat = DB::getInsertId();
 
+<<<<<<< HEAD
+               $query = 'INSERT INTO '.sql_table('blog')." (BNAME, BSHORTNAME, BCOMMENTS, BMAXCOMMENTS, BDEFCAT) VALUES ('$name','$shortname',1 ,0, $defcat)";
+               if ( DB::execute($query) === FALSE )
+               {
+                       die("Error while executing query: " . $query);
+=======
                $query = 'INSERT INTO '.sql_table('blog')." (BNAME, BSHORTNAME, BCOMMENTS, BMAXCOMMENTS, BDEFCAT) VALUES ($name, $shortname, 1, 0, $defcat)";
                if ( DB::execute($query) === FALSE )
                {
                        die('Error while executing query: ' . $query);
+>>>>>>> skinnable-master
                }
                $id = DB::getInsertId();
 
@@ -852,7 +863,11 @@ class BlogImport {
 
                if ( DB::execute($query) === FALSE )
                {
+<<<<<<< HEAD
+                       die("Error while executing query: " . $query);
+=======
                        die('Error while executing query: ' . $query);
+>>>>>>> skinnable-master
                }
 
                return DB::getInsertId();
@@ -865,7 +880,11 @@ class BlogImport {
 
                if ( DB::execute($query) === FALSE )
                {
+<<<<<<< HEAD
+                       die("Error while executing query: " . $query);
+=======
                        die('Error while executing query: ' . $query);
+>>>>>>> skinnable-master
                }
 
                return DB::getInsertId();
@@ -904,7 +923,11 @@ if ($ver > 250)
 
                if ( DB::execute($query) === FALSE )
                {
+<<<<<<< HEAD
+                       die("Error while executing query: " . $query);
+=======
                        die('Error while executing query: ' . $query);
+>>>>>>> skinnable-master
                }
 
                return DB::getInsertId();
@@ -920,10 +943,17 @@ if ($ver > 250)
                DB::execute('INSERT INTO '.sql_table('category')." (CNAME, CDESC) VALUES ('General','Items that do not fit in another categort')");
                $defcat = DB::getInsertId();
 
+<<<<<<< HEAD
+               $query = 'INSERT INTO '.sql_table('blog')." (BNAME, BSHORTNAME, BCOMMENTS, BMAXCOMMENTS, BDEFCAT) VALUES ('$name','$shortname',1 ,0, $defcat)";
+               if ( DB::execute($query) === FALSE )
+               {
+                       die("Error while executing query: " . $query);
+=======
                $query = 'INSERT INTO '.sql_table('blog')." (BNAME, BSHORTNAME, BCOMMENTS, BMAXCOMMENTS, BDEFCAT) VALUES ($name, $shortname, 1, 0, $defcat)";
                if ( DB::execute($query) === FALSE )
                {
                        die('Error while executing query: ' . $query);
+>>>>>>> skinnable-master
                }
                $id = DB::getInsertId();
 
index 9e5a78c..3d933c4 100644 (file)
 
 include("../../config.php");
 
+<<<<<<< HEAD
+function def($s)
+{
+       if ( isset($_POST[$s]) )
+               echo addslashes(stripslashes($_POST[$s]));
+       else
+       {
+               if ( i18n::strpos($s, 'host') !== FALSE ) echo "localhost";
+               if ( i18n::strpos($s, 'username') !== FALSE ) echo "root";
+               if ( i18n::strpos($s, 'wpprefix') !== FALSE ) echo "wp_";
+       }
+}
+
+function error($s)
+{
+       global $isok;
+       $isok = false;
+       echo "<h3>Error: $s</h3>";
+}
+
+// line breaks into properly formatted paragraphs
+function paragraph($text, $br = false)
+{
+       $text = trim($text);
+       $text = str_replace("\r", '', $text);
+       $text = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&amp;$1', $text);
+       if ( $text == "" ) return "";
+       $text = $text . "\n"; // just to make things a little easier, pad the end
+       $text = preg_replace('|<br/>\s*<br/>|', "\n\n", $text);
+       $text = preg_replace('!(<(?:table|ul|ol|li|pre|form|blockquote|h[1-6])[^>]*>)!', "\n$1", $text); // Space things out a little
+       $text = preg_replace('!(</(?:table|ul|ol|li|pre|form|blockquote|h[1-6])>)!', "$1\n", $text); // Space things out a little
+       $text = preg_replace("/(\r\n|\r)/", "\n", $text); // cross-platform newlines 
+       $text = preg_replace("/\n\n+/", "\n\n", $text); // take care of duplicates
+       $text = preg_replace('/\n?(.+?)(?:\n\s*\n|\z)/s', "\t<p>$1</p>\n", $text); // make paragraphs, including one at the end 
+       $text = preg_replace('|<p>\s*?</p>|', '', $text); // under certain strange conditions it could create a P of entirely whitespace 
+       $text = preg_replace("|<p>(<li.+?)</p>|", "$1", $text); // problem with nested lists
+       // blockquote
+       $text = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $text);
+       $text = str_replace('</blockquote></p>', '</p></blockquote>', $text);
+       // now the hard work
+       $text = preg_replace('!<p>\s*(</?(?:table|tr|td|th|div|ul|ol|li|pre|select|form|blockquote|p|h[1-6])[^>]*>)!', "$1", $text);
+       $text = preg_replace('!(</?(?:table|tr|td|th|div|ul|ol|li|pre|select|form|blockquote|p|h[1-6])[^>]*>)\s*</p>|</div>"!', "$1", $text);
+       if ( $br ) $text = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $text);
+       // optionally make line breaks
+       $text = preg_replace('!(</?(?:table|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|p|h[1-6])[^>]*>)\s*<br/>!', "$1", $text);
+       $text = preg_replace('!<br/>(\s*</?(?:p|li|div|th|pre|td|ul|ol)>)!', '$1', $text);
+       // some cleanup
+       $text = str_replace('</p><br />', '</p>', $text);
+       $text = str_replace("<br />\n</p>", '</p>', $text);
+       return $text;
+}
+
+function encoding($s)
+{
+       global $input;
+       if ( is_callable("iconv") )
+               return iconv($input, 'utf-8', $s);
+       else
+               return $s;
+}
+=======
   function def($s){ 
     if (isset($_POST[$s])) 
       echo Entity::hsc($_POST[$s]); 
@@ -70,15 +131,8 @@ include("../../config.php");
     $text = str_replace("<br />\n</p>",'</p>',$text);
     return $text; 
   }
+>>>>>>> skinnable-master
 
-  function encoding($s){
-    global $input;
-    if (is_callable("iconv"))
-      return iconv($input,'utf-8',$s);
-    else 
-      return $s;
-  }
-  
 ?>
 <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
 <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='cs' lang='cs'>
@@ -124,6 +178,67 @@ else
        {
                @mysql_select_db($_POST['wpdatabase'], $linkwp) or error("Cannot select WordPress DB...");
        }
+<<<<<<< HEAD
+
+       // connect to Nucleus CMS database
+       /*
+       $linkblogcms = @mysql_connect($_POST['blogcmshost'],$_POST['blogcmsusername'],$_POST['blogcmspassword'],true);
+       if($linkblogcms==false) 
+         error("Cannot connect to Nucleus DB..");
+       else {
+         @mysql_select_db($_POST['blogcmsdatabase'],$linkblogcms) or error("Cannot select Nucleus DB...");
+       }
+        */
+
+       if ( !$isok )
+       {
+               echo "<p>Please correct these errors first!</p><hr />";
+       }
+       else
+       {
+               /*                 */
+               /* transfer data ! */
+               /*                 */
+               $prefixwp = $_POST['wpprefix'];
+
+               /* *********************************************** */
+               echo "<h2>Getting encoding...</h2>";
+               $query = "SELECT option_value FROM " . $prefixwp . "options WHERE option_name='blog_charset'";
+               $querywp = mysql_query($query, $linkwp) or die($query);
+               if ( $row = mysql_fetch_object($querywp) )
+                       $input = $row->option_value;
+               else
+                       $input = "utf-8";
+               echo "<p>Encoding: $input</p>";
+
+               /* *********************************************** */
+               echo "<h2>Transfering categories...</h2>";
+               DB::execute("DELETE FROM " . sql_table('category') . " WHERE cdesc='@wordpress'");
+               $total_num = DB::getValue("SELECT count(*) as result FROM " . sql_table('category'));
+               $catdd = $total_num;
+               $total_num++;
+
+               $query = "SELECT * FROM " . $prefixwp . "term_taxonomy , " . $prefixwp . "terms WHERE " . $prefixwp . "term_taxonomy.term_taxonomy_id = "
+                       . $prefixwp . "terms.term_id AND " . $prefixwp . "term_taxonomy.taxonomy='category'";
+               $querywp = mysql_query($query, $linkwp) or die($query);
+               echo "<p>rows to transfer: " . mysql_num_rows($querywp) . "</p>";
+               echo "<p>";
+               $cate_map = array();
+               while ( $row = mysql_fetch_object($querywp) )
+               {
+                       echo $total_num . ", ";
+                       $cate_map[$row->term_id] = $total_num;
+                       $query = sprintf("INSERT INTO %s (catid,cblog,cname,cdesc) VALUES (%d,1,'%s','@wordpress')"
+                               , sql_table('category'), intval($total_num), encoding($row->name));
+                       if ( DB::execute($query) === FALSE )
+                       {
+                               die($query);
+                       }
+                       $total_num++;
+               }
+               echo "</p>";
+
+=======
 
        // connect to Nucleus CMS database
        /*
@@ -183,6 +298,7 @@ else
                }
                echo "</p>";
 
+>>>>>>> skinnable-master
                /* *********************************************** */
                echo "<h2>Transfering posts and comments...</h2>";
                DB::execute("DELETE FROM " . sql_table('comment') . " WHERE chost='@wordpress'");
index 89d14ec..fed8f8d 100644 (file)
  */
 /**
  * @license http://nucleuscms.org/license.txt GNU General Public License
+<<<<<<< HEAD
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group
+ * @version $Id: index.php 1748 2012-04-13 13:27:57Z sakamocchi $
+=======
  * @copyright Copyright (C) 2002-2009 The Nucleus Group
  * @version $Id: index.php 1888 2012-06-17 08:38:54Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 // we are using admin stuff:
index e7dbc0a..a7b3363 100644 (file)
@@ -1,3 +1,576 @@
+<<<<<<< HEAD
+<?php\r
+\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2009 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * Actions that can be called via action.php\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group\r
+ * @version $Id: ACTION.php 1646 2012-01-29 10:47:32Z sakamocchi $\r
+ */\r
+class Action\r
+{\r
+       /**\r
+        * Action::__construct()\r
+        *  Constructor for an new ACTION object\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       public function __construct()\r
+       {\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Action::doAction()\r
+        *  Calls functions that handle an action called from action.php\r
+        * \r
+        * @param       string  $action action type\r
+        * @return      mixed\r
+        */\r
+       public function doAction($action)\r
+       {\r
+               switch ( $action )\r
+               {\r
+                       case 'autodraft':\r
+                               return $this->autoDraft();\r
+                               break;\r
+                       case 'updateticket':\r
+                               return $this->updateTicket();\r
+                               break;\r
+                       case 'addcomment':\r
+                               return $this->addComment();\r
+                               break;\r
+                       case 'sendmessage':\r
+                               return $this->sendMessage();\r
+                               break;\r
+                       case 'createaccount':\r
+                               return $this->createAccount();\r
+                               break;\r
+                       case 'forgotpassword':\r
+                               return $this->forgotPassword();\r
+                               break;\r
+                       case 'votepositive':\r
+                               return $this->doKarma('pos');\r
+                               break;\r
+                       case 'votenegative':\r
+                               return $this->doKarma('neg');\r
+                               break;\r
+                       case 'plugin':\r
+                               return $this->callPlugin();\r
+                               break;\r
+                       default:\r
+                               doError(_ERROR_BADACTION);\r
+                               break;\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Action::addComment()\r
+        * Adds a new comment to an item (if IP isn't banned)\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       private function addComment()\r
+       {\r
+               global $CONF, $errormessage, $manager;\r
+               \r
+               $post['itemid'] = intPostVar('itemid');\r
+               $post['user']   = postVar('user');\r
+               $post['userid'] = postVar('userid');\r
+               $post['email']  = postVar('email');\r
+               $post['body']   = postVar('body');\r
+               $post['remember'] = intPostVar('remember');\r
+               \r
+               // begin if: "Remember Me" box checked\r
+               if ( $post['remember'] == 1 )\r
+               {\r
+                       $lifetime = time() + 2592000;\r
+                       setcookie($CONF['CookiePrefix'] . 'comment_user', $post['user'], $lifetime, '/', '', 0);\r
+                       setcookie($CONF['CookiePrefix'] . 'comment_userid', $post['userid'], $lifetime, '/', '', 0);\r
+                       setcookie($CONF['CookiePrefix'] . 'comment_email', $post['email'], $lifetime, '/', '', 0);\r
+               }\r
+               \r
+               $comments = new Comments($post['itemid']);\r
+               \r
+               $blog_id = getBlogIDFromItemID($post['itemid']);\r
+               $this->checkban($blog_id);\r
+               $blog =& $manager->getBlog($blog_id);\r
+               \r
+               // note: PreAddComment and PostAddComment gets called somewhere inside addComment\r
+               $errormessage = $comments->addComment($blog->getCorrectTime(), $post);\r
+               \r
+               if ( $errormessage != '1' )\r
+               {\r
+                       // show error message using default skin for blo\r
+                       return array(\r
+                               'message'       => $errormessage,\r
+                               'skinid'        => $blog->getDefaultSkin()\r
+                       );\r
+               }\r
+               else\r
+               {\r
+                       // redirect when adding comments succeeded\r
+                       if ( postVar('url') )\r
+                       {\r
+                               redirect(postVar('url') );\r
+                       }\r
+                       else\r
+                       {\r
+                               $url = Link::create_item_link($post['itemid']);\r
+                               redirect($url);\r
+                       }\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Action::sendMessage()\r
+        * Sends a message from the current member to the member given as argument\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       private function sendMessage()\r
+       {\r
+               global $CONF, $member;\r
+               \r
+               $error = $this->validateMessage();\r
+               \r
+               if ( $error != '' )\r
+               {\r
+                       return array('message' => $error);\r
+               }\r
+               \r
+               if ( !$member->isLoggedIn() )\r
+               {\r
+                       $fromMail = postVar('frommail');\r
+                       $fromName = _MMAIL_FROMANON;\r
+               }\r
+               else\r
+               {\r
+                       $fromMail = $member->getEmail();\r
+                       $fromName = $member->getDisplayName();\r
+               }\r
+               \r
+               /* TODO: validation */\r
+               $memberid = postVar('memberid');\r
+               $tomem = new Member();\r
+               $tomem->readFromId($memberid);\r
+               \r
+               /* TODO: validation */\r
+               $message = postVar('message');\r
+               $message  = _MMAIL_MSG . ' ' . $fromName . "\n"\r
+                       . '(' . _MMAIL_FROMNUC. ' ' . $CONF['IndexURL'] .") \n\n"\r
+                       . _MMAIL_MAIL . " \n\n"\r
+                       . $message;\r
+               $message .= Notification::get_mail_footer();\r
+               \r
+               $title = _MMAIL_TITLE . ' ' . $fromName;\r
+               Notification::mail($tomem->getEmail(), $title, $message, $fromMail, i18n::get_current_charset());\r
+               \r
+               /* TODO: validation */\r
+               $url = postVar('url');\r
+               if ( empty($url) )\r
+               {\r
+                       $CONF['MemberURL'] = $CONF['IndexURL'];\r
+                       \r
+                       if ( $CONF['URLMode'] == 'pathinfo' )\r
+                       {\r
+                               $data = array(\r
+                                       'memberid'      => $tomem->getID(),\r
+                                       'name'          => $tomem->getDisplayName()\r
+                               );\r
+                               $url = Link::create_link('member', $data);\r
+                       }\r
+                       else\r
+                       {\r
+                               $url = $CONF['IndexURL'] . Link::create_member_link($tomem->getID());\r
+                       }\r
+               }\r
+               redirect($url );\r
+               \r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Action::validateMessage()\r
+        *  Checks if a mail to a member is allowed\r
+        *  Returns a string with the error message if the mail is disallowed\r
+        * \r
+        * @param               void\r
+        * @return      String  Null character string\r
+        */\r
+       private function validateMessage()\r
+       {\r
+               global $CONF, $member, $manager;\r
+               \r
+               if ( !$CONF['AllowMemberMail'] )\r
+               {\r
+                       return _ERROR_MEMBERMAILDISABLED;\r
+               }\r
+               \r
+               if ( !$member->isLoggedIn() && !$CONF['NonmemberMail'] )\r
+               {\r
+                       return _ERROR_DISALLOWED;\r
+               }\r
+               \r
+               if ( !$member->isLoggedIn() && !Notification::address_validation(postVar('frommail')) )\r
+               {\r
+                       return _ERROR_BADMAILADDRESS;\r
+               }\r
+               \r
+               /*\r
+                * let plugins do verification (any plugin which thinks the comment is\r
+                * invalid can change 'error' to something other than '')\r
+                */\r
+               $result = '';\r
+               $data = array(\r
+                       'type'  => 'membermail',\r
+                       'error' => &$result\r
+               );\r
+               $manager->notify('ValidateForm', $data);\r
+               \r
+               return $result;\r
+       }\r
+       \r
+       /**\r
+        * Action::createAccount()\r
+        * Creates a new user account\r
+        *  \r
+        * @param       void\r
+        * @return      mixed\r
+        */\r
+       private function createAccount()\r
+       {\r
+               global $CONF, $manager;\r
+               \r
+               if ( array_key_exists('AllowMemberCreate', $CONF) && !$CONF['AllowMemberCreate'] )\r
+               {\r
+                       doError(_ERROR_MEMBERCREATEDISABLED);\r
+               }\r
+               \r
+               // evaluate content from FormExtra\r
+               $result = 1;\r
+               $data = array(\r
+                       'type'  => 'membermail',\r
+                       'error' => &$result\r
+               );\r
+               $manager->notify('ValidateForm', $data);\r
+               \r
+               if ( $result != 1 )\r
+               {\r
+                       return $result;\r
+               }\r
+               \r
+               // even though the member can not log in, set some random initial password. One never knows.\r
+               srand((double) microtime() * 1000000);\r
+               $initialPwd = md5(uniqid(rand(), TRUE) );\r
+               \r
+               // create member (non admin/can not login/no notes/random string as password)\r
+               $name           = Entity::shorten(postVar('name'), 32, '');\r
+               $relname        = postVar('realname');\r
+               $email          = postVar('email');\r
+               $url            = postVar('url');\r
+               \r
+               $r = Member::create($name, $realname, $initialPwd, $email, $url, 0, 0, '');\r
+               \r
+               if ( $r != 1 )\r
+               {\r
+                       return $r;\r
+               }\r
+               \r
+               // send message containing password.\r
+               $newmem = new Member();\r
+               $newmem->readFromName($name);\r
+               $newmem->sendActivationLink('register');\r
+               \r
+               $manager->notify('PostRegister', array('member' => &$newmem) );\r
+               \r
+               if ( postVar('desturl') )\r
+               {\r
+                       redirect(postVar('desturl') );\r
+               }\r
+               \r
+               return 1;\r
+       }\r
+       \r
+       /**\r
+        * Action::forgotPassword()\r
+        * Sends a new password\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       private function forgotPassword()\r
+       {\r
+               $membername = trim(postVar('name') );\r
+               \r
+               if ( !Member::exists($membername) )\r
+               {\r
+                       doError(_ERROR_NOSUCHMEMBER);\r
+               }\r
+               \r
+               $mem = Member::createFromName($membername);\r
+               \r
+               // check if e-mail address is correct\r
+               $email = postVar('email');\r
+               if ( $mem->getEmail() != $email )\r
+               {\r
+                       doError(_ERROR_INCORRECTEMAIL);\r
+               }\r
+               \r
+               // send activation link\r
+               $mem->sendActivationLink('forgot');\r
+               \r
+               // redirection\r
+               $url = postVar('url');\r
+               if ( !empty($url) )\r
+               {\r
+                       redirect(postVar('url') );\r
+               }\r
+               else\r
+               {\r
+                       echo _MSG_ACTIVATION_SENT;\r
+                       echo "<br />"\r
+                           . "<br />"\r
+                           . "Return to <a href=\"{$CONF['IndexURL']}\" title=\"{$CONF['SiteName']}\">{$CONF['SiteName']}</a>\n";\r
+               }\r
+               \r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Action::doKarma()\r
+        * Handle karma votes\r
+        * \r
+        * @param       string  $type   pos or neg\r
+        * @return      Void\r
+        */\r
+       private function doKarma($type)\r
+       {\r
+               global $itemid, $member, $CONF, $manager;\r
+               \r
+               // check if itemid exists\r
+               if ( !$manager->existsItem($itemid, 0, 0) )\r
+               {\r
+                       doError(_ERROR_NOSUCHITEM);\r
+               }\r
+               \r
+               $blogid = getBlogIDFromItemID($itemid);\r
+               $this->checkban($blogid);\r
+               \r
+               $karma =& $manager->getKarma($itemid);\r
+               \r
+               // check if not already voted\r
+               if ( !$karma->isVoteAllowed(serverVar('REMOTE_ADDR') ) )\r
+               {\r
+                       doError(_ERROR_VOTEDBEFORE);\r
+               }\r
+               \r
+               // check if item does allow voting\r
+               $item =& $manager->getItem($itemid, 0, 0);\r
+               \r
+               if ( $item['closed'] )\r
+               {\r
+                       doError(_ERROR_ITEMCLOSED);\r
+               }\r
+               \r
+               switch ( $type )\r
+               {\r
+                       case 'pos':\r
+                               $karma->votePositive();\r
+                       break;\r
+                       \r
+                       case 'neg':\r
+                               $karma->voteNegative();\r
+                       break;\r
+               }\r
+               \r
+               $blog =& $manager->getBlog($blogid);\r
+               \r
+               // send email to notification address, if any\r
+               if ( $blog->getNotifyAddress() && $blog->notifyOnVote() )\r
+               {\r
+                       $message = _NOTIFY_KV_MSG . ' ' . $itemid . "\n";\r
+                       $itemLink = Link::create_item_link((integer)$itemid);\r
+                       $temp = parse_url($itemLink);\r
+                       \r
+                       if ( !$temp['scheme'] )\r
+                       {\r
+                               $itemLink = $CONF['IndexURL'] . $itemLink;\r
+                       }\r
+                       \r
+                       $message .= $itemLink . "\n\n";\r
+                       \r
+                       if ( $member->isLoggedIn() )\r
+                       {\r
+                               $message .= _NOTIFY_MEMBER . ' ' . $member->getDisplayName() . ' (ID=' . $member->getID() . ")\n";\r
+                       }\r
+                       \r
+                       $message .= _NOTIFY_IP . ' ' . serverVar('REMOTE_ADDR') . "\n";\r
+                       $message .= _NOTIFY_HOST . ' ' .  gethostbyaddr(serverVar('REMOTE_ADDR'))  . "\n";\r
+                       $message .= _NOTIFY_VOTE . "\n " . $type . "\n";\r
+                       $message .= Notification::get_mail_footer();\r
+                       \r
+                       $subject = _NOTIFY_KV_TITLE . ' ' . strip_tags($item['title']) . ' (' . $itemid . ')';\r
+                       \r
+                       $from = $member->getNotifyFromMailAddress();\r
+                       \r
+                       Notification::mail($blog->getNotifyAddress(), $subject, $message, $from, i18n::get_current_charset());\r
+               }\r
+               \r
+               $refererUrl = serverVar('HTTP_REFERER');\r
+               \r
+               if ( !$refererUrl )\r
+               {\r
+                       $url = $itemLink;\r
+               }\r
+               else\r
+               {\r
+                       $url = $refererUrl;\r
+               }\r
+               \r
+               redirect($url);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Action::callPlugin()\r
+        * Calls a plugin action\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       private function callPlugin()\r
+       {\r
+               global $manager;\r
+               \r
+               $name = requestVar('name');\r
+               $pluginName = "NP_{$name}";\r
+               $actionType = requestVar('type');\r
+               \r
+               // 1: check if plugin is installed\r
+               if ( !$manager->pluginInstalled($pluginName) )\r
+               {\r
+                       doError(_ERROR_NOSUCHPLUGIN);\r
+               }\r
+               \r
+               // 2: call plugin\r
+               $pluginObject =& $manager->getPlugin($pluginName);\r
+               if ( !$pluginObject )\r
+               {\r
+                       $error = 'Could not load plugin (see actionlog)';\r
+               }\r
+               else\r
+               {\r
+                       $error = $pluginObject->doAction($actionType);\r
+               }\r
+               \r
+               /*\r
+                * doAction returns error when:\r
+                *  - an error occurred (duh)\r
+                *  - no actions are allowed (doAction is not implemented)\r
+                */\r
+               if ( $error )\r
+               {\r
+                       doError($error);\r
+               }\r
+               \r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Action::checkban()\r
+        *  Checks if an IP or IP range is banned\r
+        * \r
+        * @param       integer $blogid\r
+        * @return      void\r
+        */\r
+       private function checkban($blogid)\r
+       {\r
+               // check if banned\r
+               $ban = Ban::isBanned($blogid, serverVar('REMOTE_ADDR') );\r
+               \r
+               if ( $ban != 0 )\r
+               {\r
+                       doError(_ERROR_BANNED1 . $ban->iprange . _ERROR_BANNED2 . $ban->message . _ERROR_BANNED3);\r
+               }\r
+               \r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Action::updateTicket()\r
+        * Gets a new ticket\r
+        * \r
+        * @param       void\r
+        * @return      boolean FALSE\r
+        */\r
+       private function updateTicket()\r
+       {\r
+               global $manager;\r
+               \r
+               if ( !$manager->checkTicket() )\r
+               {\r
+                       echo _ERROR . ':' . _ERROR_BADTICKET;\r
+               }\r
+               else\r
+               {\r
+                       echo $manager->getNewTicket();\r
+               }\r
+               \r
+               return FALSE;\r
+       }\r
+       \r
+       /**\r
+        * Action::autoDraft()\r
+        * Handles AutoSaveDraft\r
+        * \r
+        * @param       void\r
+        * @return      boolean FALSE\r
+        */\r
+       private function autoDraft()\r
+       {\r
+               global $manager;\r
+               \r
+               if ( !$manager->checkTicket() )\r
+               {\r
+                       echo _ERROR . ':' . _ERROR_BADTICKET;\r
+               }\r
+               else\r
+               {\r
+                       $manager->loadClass('ITEM');\r
+                       $info = Item::createDraftFromRequest();\r
+                       \r
+                       if ( $info['status'] != 'error' )\r
+                       {\r
+                               echo $info['draftid'];\r
+                       }\r
+                       else\r
+                       {\r
+                               echo $info['message'];\r
+                       }\r
+               }\r
+               \r
+               return FALSE;\r
+       }\r
+}\r
+\r
+=======
 <?php
 
 /*
@@ -578,3 +1151,4 @@ class Action
        }
 }
 
+>>>>>>> skinnable-master
index fe738d0..8c4f1e0 100644 (file)
@@ -1,3 +1,107 @@
+<<<<<<< HEAD
+<?php\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * Actionlog class for Nucleus\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
+ * @version $Id: ACTIONLOG.php 1470 2010-11-29 22:10:16Z ftruscot $\r
+ */\r
+define('ERROR',1);             // only errors\r
+define('WARNING',2);   // errors and warnings\r
+define('INFO',3);              // info, errors and warnings\r
+define('DEBUG',4);             // everything\r
+$CONF['LogLevel'] = INFO;\r
+\r
+class ActionLog\r
+{\r
+       /**\r
+        * ActionLog::add()\r
+        * Method to add a message to the action log\r
+        * \r
+        * @static\r
+        * @param       Integer $level  log level\r
+        * @param       String  $message        log message\r
+        * @return      \r
+        * \r
+        */\r
+       function add($level, $message)\r
+       {\r
+               global $member, $CONF;\r
+               \r
+               if ( $CONF['LogLevel'] < $level )\r
+               {\r
+                       return;\r
+               }\r
+               \r
+               if ( $member && $member->isLoggedIn() )\r
+               {\r
+                       $message = "[" . $member->getDisplayName() . "] " . $message;\r
+               }\r
+               \r
+               $query = "INSERT INTO %s (timestamp, message) VALUES (%s, %s)";\r
+               $query = sprintf($query, sql_table('actionlog'), DB::formatDateTime(), DB::quoteValue($message));\r
+               DB::execute($query);\r
+               \r
+               self::trimLog();\r
+               return;\r
+       }\r
+       \r
+       /**\r
+         * (Static) Method to clear the whole action log\r
+         */\r
+       function clear() {\r
+               global $manager;\r
+\r
+               $query = sprintf('DELETE FROM %s', sql_table('actionlog'));\r
+\r
+               $manager->notify('ActionLogCleared',array());\r
+\r
+               return DB::execute($query) !== FALSE;\r
+       }\r
+\r
+       /**\r
+         * (Static) Method to trim the action log (from over 500 back to 250 entries)\r
+         */\r
+       function trimLog() {\r
+               static $checked = 0;\r
+\r
+               // only check once per run\r
+               if ($checked) return;\r
+\r
+               // trim\r
+               $checked = 1;\r
+\r
+               $query = sprintf('SELECT COUNT(*) AS result FROM %s', sql_table('actionlog'));\r
+               $iTotal = DB::getValue($query);\r
+\r
+               // if size > 500, drop back to about 250\r
+               $iMaxSize = 500;\r
+               $iDropSize = 250;\r
+               if ($iTotal > $iMaxSize) {\r
+                       $query = sprintf('SELECT timestamp as result FROM %s ORDER BY timestamp DESC LIMIT %d,1',\r
+                               sql_table('actionlog'), intval($iDropSize));\r
+                       $tsChop = DB::getValue($query);\r
+                       $query = sprintf("DELETE FROM %s WHERE timestamp < '%s'", sql_table('actionlog'), $tsChop);\r
+                       DB::execute($query);\r
+               }\r
+\r
+       }\r
+\r
+}\r
+\r
+?>\r
+=======
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
@@ -100,4 +204,5 @@ class ActionLog
 
 }
 
-?>
\ No newline at end of file
+?>
+>>>>>>> skinnable-master
index 5e865a5..db41cfc 100644 (file)
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: ACTIONS.php 1863 2012-05-19 10:50:27Z sakamocchi $
+=======
  * @version $Id: ACTIONS.php 1886 2012-06-17 08:27:27Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 class Actions extends BaseActions
@@ -69,10 +73,17 @@ class Actions extends BaseActions
        );
        
        /**
+<<<<<<< HEAD
+        * Actions::$skin_type_friendly_names
+        * friendly name for wrapped page types
+        */
+       static public $default_skin_types = array(
+=======
         * Actions::$normal_skin_types
         * friendly name for wrapped page types
         */
        static public $normal_skin_types = array(
+>>>>>>> skinnable-master
                'index'                 => _SKIN_PART_MAIN,
                'item'                  => _SKIN_PART_ITEM,
                'archivelist'   => _SKIN_PART_ALIST,
@@ -84,15 +95,25 @@ class Actions extends BaseActions
        );
        
        /**
+<<<<<<< HEAD
+        * Actions::getAvailableSkinTypes()
+=======
         * Actions::getNormalSkinTypes()
+>>>>>>> skinnable-master
         * 
         * @static
         * @param       void
         * @return      array   list of friendly names for page actions
         */
+<<<<<<< HEAD
+       static public function getAvailableSkinTypes()
+       {
+               return self::$default_skin_types;
+=======
        static public function getNormalSkinTypes()
        {
                return self::$normal_skin_types;
+>>>>>>> skinnable-master
        }
        
        /**
@@ -405,7 +426,11 @@ class Actions extends BaseActions
                $params = func_get_args();
                array_shift($params);
                
+<<<<<<< HEAD
+               return call_user_func_array(array(&$plugin, 'doIf'), $params);
+=======
                return call_user_func_array(array($plugin, 'doIf'), $params);
+>>>>>>> skinnable-master
        }
        
        /**
@@ -552,8 +577,13 @@ class Actions extends BaseActions
                // TODO: Move request uri to linkparams. this is ugly. sorry for that.
                $startpos       = (integer) $startpos;
                $parsed         = parse_url(serverVar('REQUEST_URI'));
+<<<<<<< HEAD
+               $path           = $parsed['path'];
+               $parsed         = $parsed['query'];
+=======
                $path           = ( in_array('path', $parsed) ) ? $parsed['path'] : '';
                $parsed         = ( in_array('query', $parsed) ) ? $parsed['query'] : '';
+>>>>>>> skinnable-master
                $url            = '';
                
                if ( $direction == 'prev' )
@@ -709,8 +739,12 @@ class Actions extends BaseActions
        private function preBlogContent($type, &$blog)
        {
                global $manager;
+<<<<<<< HEAD
+               $manager->notify('PreBlogContent',array('blog' => &$blog, 'type' => $type));
+=======
                $data = array('blog' => &$blog, 'type' => $type);
                $manager->notify('PreBlogContent', $data);
+>>>>>>> skinnable-master
                return;
        }
 
@@ -725,8 +759,12 @@ class Actions extends BaseActions
        private function postBlogContent($type, &$blog)
        {
                global $manager;
+<<<<<<< HEAD
+               $manager->notify('PostBlogContent', array('blog' => &$blog, 'type' => $type));
+=======
                $data = array('blog' => &$blog, 'type' => $type);
                $manager->notify('PostBlogContent', $data);
+>>>>>>> skinnable-master
                return;
        }
        
@@ -815,6 +853,27 @@ class Actions extends BaseActions
         * Actions::parse_archivedate()
         * %archivedate(locale,date format)%
         * 
+<<<<<<< HEAD
+        * @param       string  $locale
+        * @return      void
+        */
+       public function parse_archivedate($locale = '-def-')
+       {
+               global $archive;
+               
+               /* 
+                * TODO: these lines are no meaning because there is no $template.
+               if ( $locale == '-def-' )
+               {
+                       setlocale(LC_TIME, $template['LOCALE']);
+               }
+               else
+               {
+                       setlocale(LC_TIME, $locale);
+               }
+                */
+               
+=======
         * @param       deprecated      $locale 
         * @return      void
         */
@@ -822,6 +881,7 @@ class Actions extends BaseActions
        {
                global $archive;
                
+>>>>>>> skinnable-master
                // get archive date
                sscanf($archive,'%d-%d-%d',$y,$m,$d);
                
@@ -1032,8 +1092,12 @@ class Actions extends BaseActions
        public function parse_callback($eventName, $type)
        {
                global $manager;
+<<<<<<< HEAD
+               $manager->notify($eventName, array('type' => $type));
+=======
                $data = array('type' => $type);
                $manager->notify($eventName, $data);
+>>>>>>> skinnable-master
                return;
        }
        
@@ -1212,7 +1276,11 @@ class Actions extends BaseActions
                global $manager, $blog, $highlight, $itemid;
                
                $template =& $manager->getTemplate($template);
+<<<<<<< HEAD
+               $item =& $manager->getItem($itemid, 0, 0);
+=======
                $item =& $manager->getitem($itemid, 0, 0);
+>>>>>>> skinnable-master
                
                // create parser object & action handler
                $handler = new ItemActions($blog);
@@ -1413,7 +1481,11 @@ class Actions extends BaseActions
        public function parse_itemtitle($format = '')
        {
                global $manager, $itemid;
+<<<<<<< HEAD
+               $item =& $manager->getItem($itemid,0,0);
+=======
                $item =& $manager->getItem($itemid, 1, 1);
+>>>>>>> skinnable-master
                
                switch ( $format )
                {
@@ -1865,7 +1937,11 @@ class Actions extends BaseActions
                // add skin type on front
                array_unshift($params, $this->skintype);
                
+<<<<<<< HEAD
+               call_user_func_array(array(&$plugin,'doSkinVar'), $params);
+=======
                call_user_func_array(array($plugin,'doSkinVar'), $params);
+>>>>>>> skinnable-master
                return;
        }
        
@@ -2195,6 +2271,19 @@ class Actions extends BaseActions
         * @param       string  $template       name of template
         * @return      void
         */
+<<<<<<< HEAD
+       public function parse_sticky($itemnumber = 0, $template = '')
+       {
+               global $manager;
+               
+               $itemnumber = intval($itemnumber);
+               $itemarray = array($itemnumber);
+               
+               $b =& $manager->getBlog(getBlogIDFromItemID($itemnumber));
+               $this->preBlogContent('sticky',$b);
+               $this->amountfound = $b->readLogFromList($itemarray, $template);
+               $this->postBlogContent('sticky',$b);
+=======
        public function parse_sticky($itemid = 0, $template = '')
        {
                global $manager;
@@ -2208,6 +2297,7 @@ class Actions extends BaseActions
                $this->preBlogContent('sticky', $blog);
                $this->amountfound = $blog->readLogFromList($itemarray, $template);
                $this->postBlogContent('sticky', $blog);
+>>>>>>> skinnable-master
                return;
        }
 }
index 8ecdb28..2bbcc40 100644 (file)
@@ -22,6 +22,323 @@ require_once dirname(__FILE__) . '/showlist.php';
 
 class Admin
 {
+<<<<<<< HEAD
+       private $xml_version_info = '1.0';
+       private $formal_public_identifier = '-//W3C//DTD XHTML 1.0 Strict//EN';
+       private $system_identifier = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd';
+       private $xhtml_namespace = 'http://www.w3.org/1999/xhtml';
+       
+    /**
+     * @var string $action action currently being executed ($action=xxxx -> action_xxxx method)
+     */
+    var $action;
+
+    /**
+     * Class constructor
+     */
+    function ADMIN() {
+
+    }
+
+    /**
+     * Executes an action
+     *
+     * @param string $action action to be performed
+     */
+    function action($action) {
+        global $CONF, $manager;
+
+        // list of action aliases
+        $alias = array(
+            'login' => 'overview',
+            '' => 'overview'
+        );
+
+        if (isset($alias[$action]))
+            $action = $alias[$action];
+
+        $methodName = 'action_' . $action;
+
+        $this->action = strtolower($action);
+
+        // check ticket. All actions need a ticket, unless they are considered to be safe (a safe action
+        // is an action that requires user interaction before something is actually done)
+        // all safe actions are in this array:
+        $aActionsNotToCheck = array(
+            'showlogin',
+            'login',
+            'overview',
+            'itemlist',
+            'blogcommentlist',
+            'bookmarklet',
+            'blogsettings',
+            'banlist',
+            'deleteblog',
+            'editmembersettings',
+            'browseownitems',
+            'browseowncomments',
+            'createitem',
+            'itemedit',
+            'itemmove',
+            'categoryedit',
+            'categorydelete',
+            'manage',
+            'actionlog',
+            'settingsedit',
+            'backupoverview',
+            'pluginlist',
+            'createnewlog',
+            'usermanagement',
+            'skinoverview',
+            'templateoverview',
+            'skinieoverview',
+            'itemcommentlist',
+            'commentedit',
+            'commentdelete',
+            'banlistnewfromitem',
+            'banlistdelete',
+            'itemdelete',
+            'manageteam',
+            'teamdelete',
+            'banlistnew',
+            'memberedit',
+            'memberdelete',
+            'pluginhelp',
+            'pluginoptions',
+            'plugindelete',
+            'skinedittype',
+            'skinremovetype',
+            'skindelete',
+            'skinedit',
+            'templateedit',
+            'templatedelete',
+            'activate',
+            'systemoverview'
+        );
+/*
+        // the rest of the actions needs to be checked
+        $aActionsToCheck = array('additem', 'itemupdate', 'itemmoveto', 'categoryupdate', 'categorydeleteconfirm', 'itemdeleteconfirm', 'commentdeleteconfirm', 'teamdeleteconfirm', 'memberdeleteconfirm', 'templatedeleteconfirm', 'skindeleteconfirm', 'banlistdeleteconfirm', 'plugindeleteconfirm', 'batchitem', 'batchcomment', 'batchmember', 'batchcategory', 'batchteam', 'commentupdate', 'banlistadd', 'changemembersettings', 'clearactionlog', 'settingsupdate', 'blogsettingsupdate', 'categorynew', 'teamchangeadmin', 'teamaddmember', 'memberadd', 'addnewlog', 'addnewlog2', 'backupcreate', 'backuprestore', 'pluginup', 'plugindown', 'pluginupdate', 'pluginadd', 'pluginoptionsupdate', 'skinupdate', 'skinclone', 'skineditgeneral', 'templateclone', 'templatenew', 'templateupdate', 'skinieimport', 'skinieexport', 'skiniedoimport', 'skinnew', 'deleteblogconfirm', 'activatesetpwd');
+*/
+        if (!in_array($this->action, $aActionsNotToCheck))
+        {
+            if (!$manager->checkTicket())
+                $this->error(_ERROR_BADTICKET);
+        }
+
+        if (method_exists($this, $methodName))
+            call_user_func(array(&$this, $methodName));
+        else
+            $this->error(_BADACTION . Entity::hsc(" ($action)"));
+
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_showlogin() {
+        global $error;
+        $this->action_login($error);
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_login($msg = '', $passvars = 1) {
+        global $member;
+
+        // skip to overview when allowed
+        if ($member->isLoggedIn() && $member->canLogin()) {
+            $this->action_overview();
+            exit;
+        }
+
+        $this->pagehead();
+
+        echo '<h2>', _LOGIN ,'</h2>';
+        if ($msg) echo _MESSAGE , ': ', Entity::hsc($msg);
+        ?>
+
+        <form action="index.php" method="post"><p>
+        <?php echo _LOGIN_NAME; ?> <br /><input name="login"  tabindex="10" />
+        <br />
+        <?php echo _LOGIN_PASSWORD; ?> <br /><input name="password"  tabindex="20" type="password" />
+        <br />
+        <input name="action" value="login" type="hidden" />
+        <br />
+        <input type="submit" value="<?php echo _LOGIN ?>" tabindex="30" />
+        <br />
+        <small>
+            <input type="checkbox" value="1" name="shared" tabindex="40" id="shared" /><label for="shared"><?php echo _LOGIN_SHARED ?></label>
+            <br /><a href="forgotpassword.html"><?php echo _LOGIN_FORGOT ?></a>
+        </small>
+        <?php           // pass through vars
+
+            $oldaction = postVar('oldaction');
+            if (  ($oldaction != 'logout')  && ($oldaction != 'login')  && $passvars ) {
+                passRequestVars();
+            }
+
+
+        ?>
+        </p></form>
+        <?php       $this->pagefoot();
+    }
+
+
+    /**
+     * provides a screen with the overview of the actions available
+     * @todo document parameter
+     */
+    function action_overview($msg = '') {
+        global $member;
+
+        $this->pagehead();
+
+        if ($msg)
+            echo _MESSAGE , ': ', $msg;
+
+        /* ---- add items ---- */
+        echo '<h2>' . _OVERVIEW_YRBLOGS . '</h2>';
+
+        $showAll = requestVar('showall');
+
+        if (($member->isAdmin()) && ($showAll == 'yes')) {
+            // Super-Admins have access to all blogs! (no add item support though)
+            $query =  'SELECT bnumber, bname, 1 as tadmin, burl, bshortname'
+                   . ' FROM ' . sql_table('blog')
+                   . ' ORDER BY bname';
+        } else {
+            $query =  'SELECT bnumber, bname, tadmin, burl, bshortname'
+                   . ' FROM ' . sql_table('blog') . ', ' . sql_table('team')
+                   . ' WHERE tblog=bnumber and tmember=' . $member->getID()
+                   . ' ORDER BY bname';
+        }
+        $template['content'] = 'bloglist';
+        $template['superadmin'] = $member->isAdmin();
+        $amount = showlist($query,'table',$template);
+
+        if (($showAll != 'yes') && ($member->isAdmin())) {
+            $total = DB::getValue('SELECT COUNT(*) as result FROM ' . sql_table('blog'));
+            if ($total > $amount)
+                echo '<p><a href="index.php?action=overview&amp;showall=yes">' . _OVERVIEW_SHOWALL . '</a></p>';
+        }
+
+        if ($amount == 0)
+            echo _OVERVIEW_NOBLOGS;
+
+        if ($amount != 0) {
+            echo '<h2>' . _OVERVIEW_YRDRAFTS . '</h2>';
+            $query =  'SELECT ititle, inumber, bshortname'
+                   . ' FROM ' . sql_table('item'). ', ' . sql_table('blog')
+                   . ' WHERE iauthor='.$member->getID().' and iblog=bnumber and idraft=1';
+            $template['content'] = 'draftlist';
+            $amountdrafts = showlist($query, 'table', $template);
+            if ($amountdrafts == 0)
+                echo _OVERVIEW_NODRAFTS;
+        }
+                               
+               if ($amount != 0) {
+                       $yrBlogs = $member->getAdminBlogs();
+                       if ($showAll != 'yes') {
+                               $admBlogs = array();
+                               foreach ($yrBlogs as $value) {
+                                       if ($member->isBlogAdmin(intval($value))) {
+                                               $admBlogs[] = intval($value);
+                                       }
+                               }
+                               $yrBlogs = $admBlogs;
+                       }
+                       
+                       if (count($yrBlogs) > 0) {
+                               echo '<h2>' . _OVERVIEW_OTHER_DRAFTS . '</h2>';
+                               $query =  'SELECT ititle, inumber, bshortname, mname'
+                                          . ' FROM ' . sql_table('item'). ', ' . sql_table('blog'). ', ' . sql_table('member')
+                                          . ' WHERE iauthor<>'.$member->getID().' and iblog IN ('.implode(",",$yrBlogs).') and iblog=bnumber and iauthor=mnumber and idraft=1'
+                                          . ' ORDER BY iblog ASC';
+                               $template['content'] = 'otherdraftlist';
+                               $amountdrafts = showlist($query, 'table', $template);
+                               if ($amountdrafts == 0)
+                                       echo _OVERVIEW_NODRAFTS;
+                       }
+        }
+
+        /* ---- user settings ---- */
+        echo '<h2>' . _OVERVIEW_YRSETTINGS . '</h2>';
+        echo '<ul>';
+        echo '<li><a href="index.php?action=editmembersettings">' . _OVERVIEW_EDITSETTINGS. '</a></li>';
+        echo '<li><a href="index.php?action=browseownitems">' . _OVERVIEW_BROWSEITEMS.'</a></li>';
+        echo '<li><a href="index.php?action=browseowncomments">'._OVERVIEW_BROWSECOMM.'</a></li>';
+        echo '</ul>';
+
+        /* ---- general settings ---- */
+        if ($member->isAdmin()) {
+            echo '<h2>' . _OVERVIEW_MANAGEMENT. '</h2>';
+            echo '<ul>';
+            echo '<li><a href="index.php?action=manage">',_OVERVIEW_MANAGE,'</a></li>';
+            echo '</ul>';
+        }
+
+
+        $this->pagefoot();
+    }
+
+    /**
+     * Returns a link to a weblog
+     * @param object BLOG
+     */
+    function bloglink(&$blog) {
+        return '<a href="'.Entity::hsc($blog->getURL()).'" title="'._BLOGLIST_TT_VISIT.'">'. Entity::hsc( $blog->getName() ) .'</a>';
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_manage($msg = '') {
+        global $member;
+
+        $member->isAdmin() or $this->disallow();
+
+        $this->pagehead();
+
+        echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
+
+        if ($msg)
+            echo '<p>' , _MESSAGE , ': ', $msg , '</p>';
+
+
+        echo '<h2>' . _MANAGE_GENERAL. '</h2>';
+
+        echo '<ul>';
+        echo '<li><a href="index.php?action=createnewlog">'._OVERVIEW_NEWLOG.'</a></li>';
+        echo '<li><a href="index.php?action=settingsedit">'._OVERVIEW_SETTINGS.'</a></li>';
+        echo '<li><a href="index.php?action=usermanagement">'._OVERVIEW_MEMBERS.'</a></li>';
+        echo '<li><a href="index.php?action=actionlog">'._OVERVIEW_VIEWLOG.'</a></li>';
+        echo '</ul>';
+
+        echo '<h2>' . _MANAGE_SKINS . '</h2>';
+        echo '<ul>';
+        echo '<li><a href="index.php?action=skinoverview">'._OVERVIEW_SKINS.'</a></li>';
+        echo '<li><a href="index.php?action=templateoverview">'._OVERVIEW_TEMPLATES.'</a></li>';
+        echo '<li><a href="index.php?action=skinieoverview">'._OVERVIEW_SKINIMPORT.'</a></li>';
+        echo '</ul>';
+
+        echo '<h2>' . _MANAGE_EXTRA . '</h2>';
+        echo '<ul>';
+        echo '<li><a href="index.php?action=backupoverview">'._OVERVIEW_BACKUP.'</a></li>';
+        echo '<li><a href="index.php?action=pluginlist">'._OVERVIEW_PLUGINS.'</a></li>';
+        echo '</ul>';
+
+        $this->pagefoot();
+    }
+
+       /**
+        * Admin::action_itemlist()
+        * 
+        * @param       integer $blogid ID for weblog
+        * @return      void
+        */
+       public function action_itemlist($blogid = '')
+=======
        static private $skin;
        
        static public $action;
@@ -369,6 +686,7 @@ class Admin
         * @return      void
         */
        static private function action_itemlist($blogid = '')
+>>>>>>> skinnable-master
        {
                global $member, $manager, $CONF;
                
@@ -377,6 +695,629 @@ class Admin
                        $blogid = intRequestVar('blogid');
                }
                
+<<<<<<< HEAD
+               $member->teamRights($blogid) or $member->isAdmin() or $this->disallow();
+               
+               $this->pagehead();
+               $blog =& $manager->getBlog($blogid);
+               
+               echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
+               echo '<h2>' . _ITEMLIST_BLOG . ' ' . $this->bloglink($blog) . '</h2>';
+               
+               // start index
+               if ( postVar('start') )
+               {
+                       $start = intPostVar('start');
+               }
+               else
+               {
+                       $start = 0;
+               }
+               
+               if ( $start == 0 )
+               {
+                       echo '<p><a href="index.php?action=createitem&amp;blogid='.$blogid.'">' . _ITEMLIST_ADDNEW . "</a></p>\n";
+               }
+               
+               // amount of items to show
+               if ( postVar('amount') )
+               {
+                       $amount = intPostVar('amount');
+               }
+               else
+               {
+                       $amount = intval($CONF['DefaultListSize']);
+                       if ( $amount < 1 )
+                       {
+                               $amount = 10;
+                       }
+               }
+               
+               $search = postVar('search');    // search through items
+               
+               $query = 'SELECT bshortname, cname, mname, ititle, ibody, inumber, idraft, itime'
+                      . ' FROM ' . sql_table('item') . ', ' . sql_table('blog') . ', ' . sql_table('member') . ', ' . sql_table('category')
+                      . ' WHERE iblog=bnumber and iauthor=mnumber and icat=catid and iblog=' . $blogid;
+               
+               if ( $search )
+               {
+                       $query .= " AND ((ititle LIKE " . DB::quoteValue('%'.$search.'%') . ") OR (ibody LIKE " . DB::quoteValue('%'.$search.'%') . ") OR (imore LIKE " . DB::quoteValue('%'.$search.'%') . "))";
+               }
+               
+               // non-blog-admins can only edit/delete their own items
+               if ( !$member->blogAdminRights($blogid) )
+               {
+                       $query .= ' and iauthor=' . $member->getID();
+               }
+               
+               $query .= ' ORDER BY itime DESC'
+                       . " LIMIT $start, $amount";
+               
+               $template['content'] = 'itemlist';
+               $template['now'] = $blog->getCorrectTime(time());
+               
+               $manager->loadClass("ENCAPSULATE");
+               $navList = new NavList('itemlist', $start, $amount, 0, 1000, $blogid, $search, 0);
+               $navList->showBatchList('item',$query,'table',$template);
+               
+               $this->pagefoot();
+               return;
+       }
+
+    /**
+     * @todo document this
+     */
+    function action_batchitem() {
+        global $member, $manager;
+
+        // check if logged in
+        $member->isLoggedIn() or $this->disallow();
+
+        // more precise check will be done for each performed operation
+
+        // get array of itemids from request
+        $selected = requestIntArray('batch');
+        $action = requestVar('batchaction');
+
+        // Show error when no items were selected
+        if (!is_array($selected) || sizeof($selected) == 0)
+            $this->error(_BATCH_NOSELECTION);
+
+        // On move: when no destination blog/category chosen, show choice now
+        $destCatid = intRequestVar('destcatid');
+        if (($action == 'move') && (!$manager->existsCategory($destCatid)))
+            $this->batchMoveSelectDestination('item',$selected);
+
+        // On delete: check if confirmation has been given
+        if (($action == 'delete') && (requestVar('confirmation') != 'yes'))
+            $this->batchAskDeleteConfirmation('item',$selected);
+
+        $this->pagehead();
+
+        echo '<a href="index.php?action=overview">(',_BACKHOME,')</a>';
+        echo '<h2>',_BATCH_ITEMS,'</h2>';
+        echo '<p>',_BATCH_EXECUTING,' <b>',Entity::hsc($action),'</b></p>';
+        echo '<ul>';
+
+
+        // walk over all itemids and perform action
+        foreach ($selected as $itemid) {
+            $itemid = intval($itemid);
+            echo '<li>',_BATCH_EXECUTING,' <b>',Entity::hsc($action),'</b> ',_BATCH_ONITEM,' <b>', $itemid, '</b>...';
+
+            // perform action, display errors if needed
+            switch($action) {
+                case 'delete':
+                    $error = $this->deleteOneItem($itemid);
+                    break;
+                case 'move':
+                    $error = $this->moveOneItem($itemid, $destCatid);
+                    break;
+                default:
+                    $error = _BATCH_UNKNOWN . Entity::hsc($action);
+            }
+
+            echo '<b>',($error ? $error : _BATCH_SUCCESS),'</b>';
+            echo '</li>';
+        }
+
+        echo '</ul>';
+        echo '<b>',_BATCH_DONE,'</b>';
+
+        $this->pagefoot();
+
+
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_batchcomment() {
+        global $member;
+
+        // check if logged in
+        $member->isLoggedIn() or $this->disallow();
+
+        // more precise check will be done for each performed operation
+
+        // get array of itemids from request
+        $selected = requestIntArray('batch');
+        $action = requestVar('batchaction');
+
+        // Show error when no items were selected
+        if (!is_array($selected) || sizeof($selected) == 0)
+            $this->error(_BATCH_NOSELECTION);
+
+        // On delete: check if confirmation has been given
+        if (($action == 'delete') && (requestVar('confirmation') != 'yes'))
+            $this->batchAskDeleteConfirmation('comment',$selected);
+
+        $this->pagehead();
+
+        echo '<a href="index.php?action=overview">(',_BACKHOME,')</a>';
+        echo '<h2>',_BATCH_COMMENTS,'</h2>';
+        echo '<p>',_BATCH_EXECUTING,' <b>',Entity::hsc($action),'</b></p>';
+        echo '<ul>';
+
+        // walk over all itemids and perform action
+        foreach ($selected as $commentid) {
+            $commentid = intval($commentid);
+            echo '<li>',_BATCH_EXECUTING,' <b>',Entity::hsc($action),'</b> ',_BATCH_ONCOMMENT,' <b>', $commentid, '</b>...';
+
+            // perform action, display errors if needed
+            switch($action) {
+                case 'delete':
+                    $error = $this->deleteOneComment($commentid);
+                    break;
+                default:
+                    $error = _BATCH_UNKNOWN . Entity::hsc($action);
+            }
+
+            echo '<b>',($error ? $error : _BATCH_SUCCESS),'</b>';
+            echo '</li>';
+        }
+
+        echo '</ul>';
+        echo '<b>',_BATCH_DONE,'</b>';
+
+        $this->pagefoot();
+
+
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_batchmember() {
+        global $member;
+
+        // check if logged in and admin
+        ($member->isLoggedIn() && $member->isAdmin()) or $this->disallow();
+
+        // get array of itemids from request
+        $selected = requestIntArray('batch');
+        $action = requestVar('batchaction');
+
+        // Show error when no members selected
+        if (!is_array($selected) || sizeof($selected) == 0)
+            $this->error(_BATCH_NOSELECTION);
+
+        // On delete: check if confirmation has been given
+        if (($action == 'delete') && (requestVar('confirmation') != 'yes'))
+            $this->batchAskDeleteConfirmation('member',$selected);
+
+        $this->pagehead();
+
+        echo '<a href="index.php?action=usermanagement">(',_MEMBERS_BACKTOOVERVIEW,')</a>';
+        echo '<h2>',_BATCH_MEMBERS,'</h2>';
+        echo '<p>',_BATCH_EXECUTING,' <b>',Entity::hsc($action),'</b></p>';
+        echo '<ul>';
+
+        // walk over all itemids and perform action
+        foreach ($selected as $memberid) {
+            $memberid = intval($memberid);
+            echo '<li>',_BATCH_EXECUTING,' <b>',Entity::hsc($action),'</b> ',_BATCH_ONMEMBER,' <b>', $memberid, '</b>...';
+
+            // perform action, display errors if needed
+            switch($action) {
+                case 'delete':
+                    $error = $this->deleteOneMember($memberid);
+                    break;
+                case 'setadmin':
+                    // always succeeds
+                    DB::execute('UPDATE ' . sql_table('member') . ' SET madmin=1 WHERE mnumber='.$memberid);
+                    $error = '';
+                    break;
+                case 'unsetadmin':
+                    // there should always remain at least one super-admin
+                    $r = DB::getResult('SELECT * FROM '.sql_table('member'). ' WHERE madmin=1 and mcanlogin=1');
+                    if ($r->rowCount() < 2)
+                        $error = _ERROR_ATLEASTONEADMIN;
+                    else
+                        DB::execute('UPDATE ' . sql_table('member') .' SET madmin=0 WHERE mnumber='.$memberid);
+                    break;
+                default:
+                    $error = _BATCH_UNKNOWN . Entity::hsc($action);
+            }
+
+            echo '<b>',($error ? $error : _BATCH_SUCCESS),'</b>';
+            echo '</li>';
+        }
+
+        echo '</ul>';
+        echo '<b>',_BATCH_DONE,'</b>';
+
+        $this->pagefoot();
+
+
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_batchteam() {
+        global $member;
+
+        $blogid = intRequestVar('blogid');
+
+        // check if logged in and admin
+        ($member->isLoggedIn() && $member->blogAdminRights($blogid)) or $this->disallow();
+
+        // get array of itemids from request
+        $selected = requestIntArray('batch');
+        $action = requestVar('batchaction');
+
+        // Show error when no members selected
+        if (!is_array($selected) || sizeof($selected) == 0)
+            $this->error(_BATCH_NOSELECTION);
+
+        // On delete: check if confirmation has been given
+        if (($action == 'delete') && (requestVar('confirmation') != 'yes'))
+            $this->batchAskDeleteConfirmation('team',$selected);
+
+        $this->pagehead();
+
+        echo '<p><a href="index.php?action=manageteam&amp;blogid=',$blogid,'">(',_BACK,')</a></p>';
+
+        echo '<h2>',_BATCH_TEAM,'</h2>';
+        echo '<p>',_BATCH_EXECUTING,' <b>',Entity::hsc($action),'</b></p>';
+        echo '<ul>';
+
+        // walk over all itemids and perform action
+        foreach ($selected as $memberid) {
+            $memberid = intval($memberid);
+            echo '<li>',_BATCH_EXECUTING,' <b>',Entity::hsc($action),'</b> ',_BATCH_ONTEAM,' <b>', $memberid, '</b>...';
+
+            // perform action, display errors if needed
+            switch($action) {
+                case 'delete':
+                    $error = $this->deleteOneTeamMember($blogid, $memberid);
+                    break;
+                case 'setadmin':
+                    // always succeeds
+                    DB::execute('UPDATE '.sql_table('team').' SET tadmin=1 WHERE tblog='.$blogid.' and tmember='.$memberid);
+                    $error = '';
+                    break;
+                case 'unsetadmin':
+                    // there should always remain at least one admin
+                    $r = DB::getResult('SELECT * FROM '.sql_table('team').' WHERE tadmin=1 and tblog='.$blogid);
+                    if ($r->rowCount() < 2)
+                        $error = _ERROR_ATLEASTONEBLOGADMIN;
+                    else
+                        DB::execute('UPDATE '.sql_table('team').' SET tadmin=0 WHERE tblog='.$blogid.' and tmember='.$memberid);
+                    break;
+                default:
+                    $error = _BATCH_UNKNOWN . Entity::hsc($action);
+            }
+
+            echo '<b>',($error ? $error : _BATCH_SUCCESS),'</b>';
+            echo '</li>';
+        }
+
+        echo '</ul>';
+        echo '<b>',_BATCH_DONE,'</b>';
+
+        $this->pagefoot();
+
+
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_batchcategory() {
+        global $member, $manager;
+
+        // check if logged in
+        $member->isLoggedIn() or $this->disallow();
+
+        // more precise check will be done for each performed operation
+
+        // get array of itemids from request
+        $selected = requestIntArray('batch');
+        $action = requestVar('batchaction');
+
+        // Show error when no items were selected
+        if (!is_array($selected) || sizeof($selected) == 0)
+            $this->error(_BATCH_NOSELECTION);
+
+        // On move: when no destination blog chosen, show choice now
+        $destBlogId = intRequestVar('destblogid');
+        if (($action == 'move') && (!$manager->existsBlogID($destBlogId)))
+            $this->batchMoveCategorySelectDestination('category',$selected);
+
+        // On delete: check if confirmation has been given
+        if (($action == 'delete') && (requestVar('confirmation') != 'yes'))
+            $this->batchAskDeleteConfirmation('category',$selected);
+
+        $this->pagehead();
+
+        echo '<a href="index.php?action=overview">(',_BACKHOME,')</a>';
+        echo '<h2>',BATCH_CATEGORIES,'</h2>';
+        echo '<p>',_BATCH_EXECUTING,' <b>',Entity::hsc($action),'</b></p>';
+        echo '<ul>';
+
+        // walk over all itemids and perform action
+        foreach ($selected as $catid) {
+            $catid = intval($catid);
+            echo '<li>',_BATCH_EXECUTING,' <b>',Entity::hsc($action),'</b> ',_BATCH_ONCATEGORY,' <b>', $catid, '</b>...';
+
+            // perform action, display errors if needed
+            switch($action) {
+                case 'delete':
+                    $error = $this->deleteOneCategory($catid);
+                    break;
+                case 'move':
+                    $error = $this->moveOneCategory($catid, $destBlogId);
+                    break;
+                default:
+                    $error = _BATCH_UNKNOWN . Entity::hsc($action);
+            }
+
+            echo '<b>',($error ? _ERROR . ': '.$error : _BATCH_SUCCESS),'</b>';
+            echo '</li>';
+        }
+
+        echo '</ul>';
+        echo '<b>',_BATCH_DONE,'</b>';
+
+        $this->pagefoot();
+
+    }
+
+    /**
+     * @todo document this
+     */
+    function batchMoveSelectDestination($type, $ids) {
+        global $manager;
+        $this->pagehead();
+        ?>
+        <h2><?php echo _MOVE_TITLE ?></h2>
+        <form method="post" action="index.php"><div>
+
+            <input type="hidden" name="action" value="batch<?php echo $type ?>" />
+            <input type="hidden" name="batchaction" value="move" />
+            <?php
+                $manager->addTicketHidden();
+
+                // insert selected item numbers
+                $idx = 0;
+                foreach ($ids as $id)
+                    echo '<input type="hidden" name="batch[',($idx++),']" value="',intval($id),'" />';
+
+                // show blog/category selection list
+                $this->selectBlogCategory('destcatid');
+
+            ?>
+
+
+            <input type="submit" value="<?php echo _MOVE_BTN ?>" onclick="return checkSubmit();" />
+
+        </div></form>
+        <?php       $this->pagefoot();
+        exit;
+    }
+
+    /**
+     * @todo document this
+     */
+    function batchMoveCategorySelectDestination($type, $ids) {
+        global $manager;
+        $this->pagehead();
+        ?>
+        <h2><?php echo _MOVECAT_TITLE ?></h2>
+        <form method="post" action="index.php"><div>
+
+            <input type="hidden" name="action" value="batch<?php echo $type ?>" />
+            <input type="hidden" name="batchaction" value="move" />
+            <?php
+                $manager->addTicketHidden();
+
+                // insert selected item numbers
+                $idx = 0;
+                foreach ($ids as $id)
+                    echo '<input type="hidden" name="batch[',($idx++),']" value="',intval($id),'" />';
+
+                // show blog/category selection list
+                $this->selectBlog('destblogid');
+
+            ?>
+
+
+            <input type="submit" value="<?php echo _MOVECAT_BTN ?>" onclick="return checkSubmit();" />
+
+        </div></form>
+        <?php       $this->pagefoot();
+        exit;
+    }
+
+    /**
+     * @todo document this
+     */
+    function batchAskDeleteConfirmation($type, $ids) {
+        global $manager;
+
+        $this->pagehead();
+        ?>
+        <h2><?php echo _BATCH_DELETE_CONFIRM ?></h2>
+        <form method="post" action="index.php"><div>
+
+            <input type="hidden" name="action" value="batch<?php echo $type ?>" />
+            <?php $manager->addTicketHidden() ?>
+            <input type="hidden" name="batchaction" value="delete" />
+            <input type="hidden" name="confirmation" value="yes" />
+            <?php               // insert selected item numbers
+                $idx = 0;
+                foreach ($ids as $id)
+                    echo '<input type="hidden" name="batch[',($idx++),']" value="',intval($id),'" />';
+
+                // add hidden vars for team & comment
+                if ($type == 'team')
+                {
+                    echo '<input type="hidden" name="blogid" value="',intRequestVar('blogid'),'" />';
+                }
+                if ($type == 'comment')
+                {
+                    echo '<input type="hidden" name="itemid" value="',intRequestVar('itemid'),'" />';
+                }
+
+            ?>
+
+            <input type="submit" value="<?php echo _BATCH_DELETE_CONFIRM_BTN ?>" onclick="return checkSubmit();" />
+
+        </div></form>
+        <?php       $this->pagefoot();
+        exit;
+    }
+
+
+    /**
+     * Inserts a HTML select element with choices for all categories to which the current
+     * member has access
+     * @see function selectBlog
+     */
+    function selectBlogCategory($name, $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1) {
+        Admin::selectBlog($name, 'category', $selected, $tabindex, $showNewCat, $iForcedBlogInclude);
+    }
+
+       /**
+        * Admin::selectBlog()
+        * Inserts a HTML select element with choices for all blogs to which the user has access
+        *  mode = 'blog' => shows blognames and values are blogids
+        *  mode = 'category' => show category names and values are catids
+        * 
+        * @param       string  $name                           name of 
+        * @param       string  $mode                           blog/category
+        * @param       integer $selected                       category ID to be selected
+        * @param       integer $tabindex                       tab index value
+        * @param       integer $showNewCat                     show category to newly be created
+        * @param       integer $iForcedBlogInclude     ID of a blog that always needs to be included,
+        *                                              without checking if the member is on the blog team (-1 = none)
+        * @return      void
+        */
+       public function selectBlog($name, $mode='blog', $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1)
+       {
+               global $member, $CONF;
+               
+               // 0. get IDs of blogs to which member can post items (+ forced blog)
+               $aBlogIds = array();
+               if ( $iForcedBlogInclude != -1 )
+               {
+                       $aBlogIds[] = intval($iForcedBlogInclude);
+               }
+               
+               if ( !$member->isAdmin() || !array_key_exists('ShowAllBlogs', $CONF) || !$CONF['ShowAllBlogs'] )
+               {
+                       $query = "SELECT bnumber FROM %s,%s WHERE tblog=bnumber and tmember=%d;";
+                       $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID());
+               }
+               else
+               {
+                       $query = "SELECT bnumber FROM %s ORDER BY bname;";
+                       $query = sprintf($query, sql_table('blog'));
+               }
+               
+               $rblogids = DB::getResult($query);
+               foreach ( $rblogids as $row )
+               {
+                       if ( $row['bnumber'] != $iForcedBlogInclude )
+                       {
+                               $aBlogIds[] = (integer) $row['bnumber'];
+                       }
+               }
+               if ( count($aBlogIds) == 0 )
+               {
+                       return;
+               }
+               
+               echo "<select name=\"{$name}\" tabindex=\"{$tabindex}\">\n";
+               
+               // 1. select blogs (we'll create optiongroups)
+               // (only select those blogs that have the user on the team)
+               $query = "SELECT bnumber, bname FROM %s WHERE bnumber in (%s) ORDER BY bname;";
+               $query = sprintf($query, sql_table('blog'), implode(',',$aBlogIds));
+               $blogs = DB::getResult($query);
+               
+               if ( $mode == 'category' )
+               {
+                       $multipleBlogs = ($blogs->rowCount() > 1);
+                       
+                       foreach ( $blogs as $row )
+                       {
+                               if ( $multipleBlogs )
+                               {
+                                       echo '<optgroup label="' . Entity::hsc($row['bname']) . '">' . "\n";
+                               }
+                               
+                               // show selection to create new category when allowed/wanted
+                               if ( $showNewCat )
+                               {
+                                       // check if allowed to do so
+                                       if ( $member->blogAdminRights($row['bnumber']) )
+                                       {
+                                               echo "<option value=\"newcat-{$row['bnumber']}\">" . _ADD_NEWCAT . "</option>\n";
+                                       }
+                               }
+                               
+                               // 2. for each category in that blog
+                               $query = "SELECT cname, catid FROM %s WHERE cblog=%d ORDER BY cname ASC;";
+                               $query = sprintf($query, sql_table('category'), (integer) $row['bnumber']);
+                               $categories = DB::getResult($query);
+                               foreach ( $categories as $cat )
+                               {
+                                       if ( $cat['catid'] != $selected )
+                                       {
+                                       echo "<option value=\"{$cat['catid']}\" {$selectText} >" . Entity::hsc($cat['cname']) . "</option>\n";
+                                       }
+                                       else
+                                       {
+                                       echo "<option value=\"{$cat['catid']}\" selected=\"selected\" >" . Entity::hsc($cat['cname']) . "</option>\n";
+                                       }
+                               }
+                               
+                               if ( $multipleBlogs )
+                               {
+                                       echo "</optgroup>\n";
+                               }
+                       }
+               }
+               else
+               {
+                       // blog mode
+                       foreach ( $blogs as $row )
+                       {
+                               if ( $row['bnumber'] != $selected )
+                               {
+                                       echo "<option value=\"{$row['bnumber']}\">" . Entity::hsc($row['bname']) . "</option>\n";
+                               }
+                               else
+                               {
+                                       echo "<option value=\"{$row['bnumber']}\" selected=\"selected\">" . Entity::hsc($row['bname']) . "</option>\n";
+                               }
+                       }
+               }
+               echo "</select>\n";
+=======
                $member->teamRights($blogid) or $member->isAdmin() or self::disallow();
                
                self::$skin->parse('itemlist');
@@ -2225,18 +3166,80 @@ class Admin
                }
                
                self::$skin->parse('categorydelete');
+>>>>>>> skinnable-master
                return;
        }
        
        /**
+<<<<<<< HEAD
+        * Admin::action_browseownitems()
+=======
         * Admin::action_categorydeleteconfirm()
+>>>>>>> skinnable-master
         * 
         * @param       void
         * @return      void
         */
-       static private function action_categorydeleteconfirm()
+<<<<<<< HEAD
+       public function action_browseownitems()
        {
-               global $member, $manager;
+               global $member, $manager, $CONF;
+               
+               $this->pagehead();
+               
+               echo '<p><a href="index.php?action=overview">(' . _BACKHOME . ")</a></p>\n";
+               echo '<h2>' . _ITEMLIST_YOUR . "</h2>\n";
+               
+               // start index
+               if ( postVar('start') )
+               {
+                       $start = intPostVar('start');
+               }
+               else
+               {
+                       $start = 0;
+               }
+               
+               // amount of items to show
+               if ( postVar('amount') )
+               {
+                       $amount = intPostVar('amount');
+               }
+               else
+               {
+                       $amount = (integer) $CONF['DefaultListSize'];
+                       if ( $amount < 1 )
+                       {
+                               $amount = 10;
+                       }
+               }
+               
+               $search = postVar('search');    // search through items
+               
+               $query = 'SELECT bshortname, cname, mname, ititle, ibody, idraft, inumber, itime'
+                      . ' FROM '.sql_table('item').', '.sql_table('blog') . ', '.sql_table('member') . ', '.sql_table('category')
+                      . ' WHERE iauthor='. $member->getID() .' and iauthor=mnumber and iblog=bnumber and icat=catid';
+               
+               if ( $search )
+               {
+                       $query .= " and ((ititle LIKE " . DB::quoteValue('%'.$search.'%') . ") or (ibody LIKE " . DB::quoteValue('%'.$search.'%') . ") or (imore LIKE " . DB::quoteValue('%'.$search.'%') . "))";
+               }
+               
+               $query .= ' ORDER BY itime DESC'
+                       . " LIMIT $start, $amount";
+               
+               $template['content'] = 'itemlist';
+               $template['now'] = time();
+               
+               $manager->loadClass("ENCAPSULATE");
+               $navList = new NavList('browseownitems', $start, $amount, 0, 1000, /*$blogid*/ 0, $search, 0);
+               $navList->showBatchList('item',$query,'table',$template);
+               
+               $this->pagefoot();
+=======
+       static private function action_categorydeleteconfirm()
+       {
+               global $member, $manager;
                
                $blogid = intRequestVar('blogid');
                $catid  = intRequestVar('catid');
@@ -2318,10 +3321,82 @@ class Admin
                
                $data = array('catid' => $catid);
                $manager->notify('PostDeleteCategory', $data);
+>>>>>>> skinnable-master
                return;
        }
        
        /**
+<<<<<<< HEAD
+        * Admin::action_itemcommentlist()
+        * 
+        * Show all the comments for a given item
+        * @param       integer $itemid ID for item
+        * @return      void
+        */
+       public function action_itemcommentlist($itemid = '')
+       {
+               global $member, $manager, $CONF;
+               
+               if ( $itemid == '' )
+               {
+                       $itemid = intRequestVar('itemid');
+               }
+               
+               // only allow if user is allowed to alter item
+               $member->canAlterItem($itemid) or $this->disallow();
+               
+               $blogid = getBlogIdFromItemId($itemid);
+               
+               $this->pagehead();
+               
+               // start index
+               if ( postVar('start') )
+               {
+                       $start = intPostVar('start');
+               }
+               else
+               {
+                       $start = 0;
+               }
+               
+               // amount of items to show
+               if ( postVar('amount') )
+               {
+                       $amount = intPostVar('amount');
+               }
+               else
+               {
+                       $amount = (integer) $CONF['DefaultListSize'];
+                       if ( $amount < 1 )
+                       {
+                               $amount = 10;
+                       }
+               }
+               
+               $search = postVar('search');
+               
+               echo '<p>(<a href="index.php?action=itemlist&amp;blogid=' . $blogid . '">' . _BACKTOOVERVIEW . "</a>)</p>\n";
+               echo '<h2>',_COMMENTS,'</h2>';
+               
+               $query = 'SELECT cbody, cuser, cmail, cemail, mname, ctime, chost, cnumber, cip, citem FROM ' . sql_table('comment') . ' LEFT OUTER JOIN ' . sql_table('member') . ' ON mnumber = cmember WHERE citem = ' . $itemid;
+               
+               if ( $search )
+               {
+                       $query .= " and cbody LIKE " . DB::quoteValue('%'.$search.'%');
+               }
+               
+               $query .= ' ORDER BY ctime ASC'
+                       . " LIMIT $start,$amount";
+               
+               $template['content'] = 'commentlist';
+               $template['canAddBan'] = $member->blogAdminRights(getBlogIDFromItemID($itemid));
+               
+               $manager->loadClass("ENCAPSULATE");
+               $navList = new NavList('itemcommentlist', $start, $amount, 0, 1000, 0, $search, $itemid);
+               $navList->showBatchList('comment',$query,'table',$template,_NOCOMMENTS);
+               
+               $this->pagefoot();
+=======
         * Admin::moveOneCategory()
         * Delete a category by its id
         * 
@@ -2502,15 +3577,76 @@ class Admin
                $manager->notify('PostPluginOptionsUpdate', $data);
                
                self::action_overview(_MSG_SETTINGSCHANGED);
+>>>>>>> skinnable-master
                return;
        }
        
        /**
+<<<<<<< HEAD
+        * Admin::action_browseowncomments()
+        * Browse own comments
+=======
         * Admin::action_deleteblog()
+>>>>>>> skinnable-master
         * 
         * @param       void
         * @return      void
         */
+<<<<<<< HEAD
+       public function action_browseowncomments()
+       {
+               global $member, $manager, $CONF;
+               
+               // start index
+               if ( postVar('start') )
+               {
+                       $start = intPostVar('start');
+               }
+               else
+               {
+                       $start = 0;
+               }
+               
+               // amount of items to show
+               if ( postVar('amount') )
+               {
+                       $amount = intPostVar('amount');
+               }
+               else
+               {
+                       $amount = intval($CONF['DefaultListSize']);
+                       if ( $amount < 1 )
+                       {
+                               $amount = 10;
+                       }
+               }
+               
+               $search = postVar('search');
+               
+               $query =  'SELECT cbody, cuser, cmail, mname, ctime, chost, cnumber, cip, citem FROM '.sql_table('comment').' LEFT OUTER JOIN '.sql_table('member').' ON mnumber=cmember WHERE cmember=' . $member->getID();
+               
+               if ( $search )
+               {
+                       $query .= " and cbody LIKE " . DB::quoteValue('%'.$search.'%');
+               }
+               
+               $query .= ' ORDER BY ctime DESC'
+                       . " LIMIT $start,$amount";
+               
+               $this->pagehead();
+               
+               echo '<p><a href="index.php?action=overview">(' . _BACKHOME . ")</a></p>\n";
+               echo '<h2>' . _COMMENTS_YOUR . "</h2>\n";
+               
+               $template['content'] = 'commentlist';
+               $template['canAddBan'] = 0; // doesn't make sense to allow banning yourself
+               
+               $manager->loadClass("ENCAPSULATE");
+               $navList = new NavList('browseowncomments', $start, $amount, 0, 1000, 0, $search, 0);
+               $navList->showBatchList('comment',$query,'table',$template,_NOCOMMENTS_YOUR);
+               
+               $this->pagefoot();
+=======
        static private function action_deleteblog()
        {
                global $member, $CONF, $manager;
@@ -2588,10 +3724,85 @@ class Admin
                $manager->notify('PostDeleteBlog', $data);
                
                self::action_overview(_DELETED_BLOG);
+>>>>>>> skinnable-master
                return;
        }
        
        /**
+<<<<<<< HEAD
+        * Admin::action_blogcommentlist()
+        * 
+        * Browse all comments for a weblog
+        * @param       integer $blogid ID for weblog
+        * @return      void
+        */
+       function action_blogcommentlist($blogid = '')
+       {
+               global $member, $manager, $CONF;
+               
+               if ( $blogid == '' )
+               {
+                       $blogid = intRequestVar('blogid');
+               }
+               else
+               {
+                       $blogid = intval($blogid);
+               }
+               
+               $member->teamRights($blogid) or $member->isAdmin() or $this->disallow();
+               
+               // start index
+               if ( postVar('start') )
+               {
+                       $start = intPostVar('start');
+               }
+               else
+               {
+                       $start = 0;
+               }
+               
+               // amount of items to show
+               if ( postVar('amount') )
+               {
+                       $amount = intPostVar('amount');
+               }
+               else
+               {
+                       $amount = intval($CONF['DefaultListSize']);
+                       if ( $amount < 1 )
+                       {
+                               $amount = 10;
+                       }
+               }
+               
+               $search = postVar('search');            // search through comments
+               
+               $query =  'SELECT cbody, cuser, cemail, cmail, mname, ctime, chost, cnumber, cip, citem FROM '.sql_table('comment').' LEFT OUTER JOIN '.sql_table('member').' ON mnumber=cmember WHERE cblog=' . intval($blogid);
+               
+               if ( $search != '' )
+               {
+                       $query .= " and cbody LIKE " . DB::quoteValue('%'.$search.'%');
+               }
+               
+               $query .= ' ORDER BY ctime DESC'
+                       . " LIMIT $start,$amount";
+               
+               $blog =& $manager->getBlog($blogid);
+               
+               $this->pagehead();
+               
+               echo '<p><a href="index.php?action=overview">(' . _BACKHOME . ")</a></p>\n";
+               echo '<h2>', _COMMENTS_BLOG , ' ' , $this->bloglink($blog), '</h2>';
+               
+               $template['content'] = 'commentlist';
+               $template['canAddBan'] = $member->blogAdminRights($blogid);
+               
+               $manager->loadClass("ENCAPSULATE");
+               $navList = new NavList('blogcommentlist', $start, $amount, 0, 1000, $blogid, $search, 0);
+               $navList->showBatchList('comment',$query,'table',$template, _NOCOMMENTS_BLOG);
+               
+               $this->pagefoot();
+=======
         * Admin::action_memberdelete()
         * 
         * @param       void
@@ -2813,15 +4024,48 @@ class Admin
                $_REQUEST['blogid'] = $blogid;
                $_REQUEST['catid']  = $catid;
                self::$skin->parse('addnewlog');
+>>>>>>> skinnable-master
                return;
        }
        
        /**
+<<<<<<< HEAD
+        * Admin::action_createitem()
+        * Provide a page to item a new item to the given blog
+=======
         * Admin::action_addnewlog2()
+>>>>>>> skinnable-master
         * 
         * @param       void
         * @return      void
         */
+<<<<<<< HEAD
+       public function action_createitem()
+       {
+               global $member, $manager;
+               
+               $blogid = intRequestVar('blogid');
+               
+               // check if allowed
+               $member->teamRights($blogid) or $this->disallow();
+               
+               $memberid = $member->getID();
+               
+               $blog =& $manager->getBlog($blogid);
+               
+               // generate the add-item form
+               $handler = new PageFactory($blog);
+               
+               $contents = $handler->getTemplateFor('admin', 'add');
+               $manager->notify('PreAddItemForm', array('contents' => &$contents, 'blog' => &$blog));
+               
+               $parser = new Parser($handler);
+               
+               $this->pagehead();
+               $parser->parse($contents);
+               $this->pagefoot();
+               
+=======
        static private function action_addnewlog2()
        {
                global $member, $manager;
@@ -2854,15 +4098,147 @@ class Admin
                include_once($DIR_LIBS . 'skinie.php');
                
                self::$skin->parse('skinieoverview');
+>>>>>>> skinnable-master
                return;
        }
        
        /**
+<<<<<<< HEAD
+        * Admin::action_itemedit()
+=======
         * Admin::action_skinieimport()
+>>>>>>> skinnable-master
         * 
         * @param       void
         * @return      void
         */
+<<<<<<< HEAD
+       public function action_itemedit()
+       {
+               global $member, $manager;
+               
+               $itemid = intRequestVar('itemid');
+               
+               // only allow if user is allowed to alter item
+               $member->canAlterItem($itemid) or $this->disallow();
+               
+               $variables =& $manager->getItem($itemid, 1, 1);
+               $blog =& $manager->getBlog(getBlogIDFromItemID($itemid));
+               
+               $manager->notify('PrepareItemForEdit', array('item' => &$variables));
+               
+               if ( $blog->convertBreaks() )
+               {
+                       $variables['body'] = removeBreaks($variables['body']);
+                       $variables['more'] = removeBreaks($variables['more']);
+               }
+               
+               // form to edit blog items
+               $handler = new PageFactory($blog);
+               $handler->setVariables($variables);
+               
+               $content = $handler->getTemplateFor('admin', 'edit');
+               
+               $parser = new Parser($handler);
+               
+               $this->pagehead();
+               $parser->parse($content);
+               $this->pagefoot();
+               return;
+       }
+       
+    /**
+     * @todo document this
+     */
+    function action_itemupdate() {
+        global $member, $manager, $CONF;
+
+        $itemid = intRequestVar('itemid');
+        $catid = postVar('catid');
+
+        // only allow if user is allowed to alter item
+        $member->canUpdateItem($itemid, $catid) or $this->disallow();
+
+        $actiontype = postVar('actiontype');
+
+        // delete actions are handled by itemdelete (which has confirmation)
+        if ($actiontype == 'delete') {
+            $this->action_itemdelete();
+            return;
+        }
+
+        $body   = postVar('body');
+        $title  = postVar('title');
+        $more   = postVar('more');
+        $closed = intPostVar('closed');
+        $draftid = intPostVar('draftid');
+
+        // default action = add now
+        if (!$actiontype)
+            $actiontype='addnow';
+
+        // create new category if needed
+        if ( i18n::strpos($catid,'newcat') === 0 ) {
+            // get blogid
+            list($blogid) = sscanf($catid,"newcat-%d");
+
+            // create
+            $blog =& $manager->getBlog($blogid);
+            $catid = $blog->createNewCategory();
+
+            // show error when sth goes wrong
+            if (!$catid)
+                $this->doError(_ERROR_CATCREATEFAIL);
+        }
+
+        /*
+            set some variables based on actiontype
+
+            actiontypes:
+                draft items -> addnow, addfuture, adddraft, delete
+                non-draft items -> edit, changedate, delete
+
+            variables set:
+                $timestamp: set to a nonzero value for future dates or date changes
+                $wasdraft: set to 1 when the item used to be a draft item
+                $publish: set to 1 when the edited item is not a draft
+        */
+        $blogid =  getBlogIDFromItemID($itemid);
+        $blog   =& $manager->getBlog($blogid);
+
+        $wasdrafts = array('adddraft', 'addfuture', 'addnow');
+        $wasdraft  = in_array($actiontype, $wasdrafts) ? 1 : 0;
+        $publish   = ($actiontype != 'adddraft' && $actiontype != 'backtodrafts') ? 1 : 0;
+        if ($actiontype == 'addfuture' || $actiontype == 'changedate') {
+            $timestamp = mktime(intPostVar('hour'), intPostVar('minutes'), 0, intPostVar('month'), intPostVar('day'), intPostVar('year'));
+        } else {
+            $timestamp =0;
+        }
+
+        // edit the item for real
+        Item::update($itemid, $catid, $title, $body, $more, $closed, $wasdraft, $publish, $timestamp);
+
+        $this->updateFuturePosted($blogid);
+
+        if ($draftid > 0) {
+            // delete permission is checked inside Item::delete()
+            Item::delete($draftid);
+        }
+
+        // show category edit window when we created a new category
+        // ($catid will then be a new category ID, while postVar('catid') will be 'newcat-x')
+        if ($catid != intPostVar('catid')) {
+            $this->action_categoryedit(
+                $catid,
+                $blog->getID(),
+                $CONF['AdminURL'] . 'index.php?action=itemlist&blogid=' . getBlogIDFromItemID($itemid)
+            );
+        } else {
+            // TODO: set start item correctly for itemlist
+            $this->action_itemlist(getBlogIDFromItemID($itemid));
+        }
+    }
+=======
        static private function action_skinieimport()
        {
                global $member;
@@ -3109,6 +4485,7 @@ class Admin
                self::$skin->parse('templatedelete');
                return;
        }
+>>>>>>> skinnable-master
        
        /**
         * Admin::action_templatedeleteconfirm()
@@ -3153,10 +4530,18 @@ class Admin
                
                $member->isAdmin() or self::disallow();
                
+<<<<<<< HEAD
+               $query = "SELECT * FROM %s WHERE iblog=%d AND iposted=0 AND itime>%s";
+               $query = sprintf($query, sql_table('item'), (integer) $blogid, DB::formatDateTime($currenttime));
+               $result = DB::getResult($query);
+               
+               if ( $result->rowCount() > 0 )
+=======
                $name = postVar('name');
                $desc = postVar('desc');
                
                if ( !isValidTemplateName($name) )
+>>>>>>> skinnable-master
                {
                        self::error(_ERROR_BADTEMPLATENAME);
                        return;
@@ -3173,6 +4558,222 @@ class Admin
                self::action_templateoverview();
                return;
        }
+<<<<<<< HEAD
+
+    /**
+     * @todo document this
+     */
+    function action_itemmove() {
+        global $member, $manager;
+
+        $itemid = intRequestVar('itemid');
+
+        // only allow if user is allowed to alter item
+        $member->canAlterItem($itemid) or $this->disallow();
+
+        $item =& $manager->getItem($itemid,1,1);
+
+        $this->pagehead();
+        ?>
+            <h2><?php echo _MOVE_TITLE ?></h2>
+            <form method="post" action="index.php"><div>
+                <input type="hidden" name="action" value="itemmoveto" />
+                <input type="hidden" name="itemid" value="<?php echo  $itemid; ?>" />
+
+                <?php
+
+                    $manager->addTicketHidden();
+                    $this->selectBlogCategory('catid',$item['catid'],10,1);
+                ?>
+
+                <input type="submit" value="<?php echo _MOVE_BTN ?>" tabindex="10000" onclick="return checkSubmit();" />
+            </div></form>
+        <?php
+        $this->pagefoot();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_itemmoveto() {
+        global $member, $manager;
+
+        $itemid = intRequestVar('itemid');
+        $catid = requestVar('catid');
+
+        // create new category if needed
+        if ( i18n::strpos($catid,'newcat') === 0 ) {
+            // get blogid
+            list($blogid) = sscanf($catid,'newcat-%d');
+
+            // create
+            $blog =& $manager->getBlog($blogid);
+            $catid = $blog->createNewCategory();
+
+            // show error when sth goes wrong
+            if (!$catid)
+                $this->doError(_ERROR_CATCREATEFAIL);
+        }
+
+        // only allow if user is allowed to alter item
+        $member->canUpdateItem($itemid, $catid) or $this->disallow();
+
+        $old_blogid = getBlogIDFromItemId($itemid);
+
+        Item::move($itemid, $catid);
+
+        // set the futurePosted flag on the blog
+        $this->updateFuturePosted(getBlogIDFromItemId($itemid));
+
+        // reset the futurePosted in case the item is moved from one blog to another
+        $this->updateFuturePosted($old_blogid);
+
+        if ($catid != intRequestVar('catid'))
+            $this->action_categoryedit($catid, $blog->getID());
+        else
+            $this->action_itemlist(getBlogIDFromCatID($catid));
+    }
+
+    /**
+     * Moves one item to a given category (category existance should be checked by caller)
+     * errors are returned
+     * @param int $itemid
+     * @param int $destCatid category ID to which the item will be moved
+     */
+    function moveOneItem($itemid, $destCatid) {
+        global $member;
+
+        // only allow if user is allowed to move item
+        if (!$member->canUpdateItem($itemid, $destCatid))
+            return _ERROR_DISALLOWED;
+
+        Item::move($itemid, $destCatid);
+    }
+
+    /**
+     * Adds a item to the chosen blog
+     */
+    function action_additem() {
+        global $manager, $CONF;
+
+        $manager->loadClass('ITEM');
+
+        $result = Item::createFromRequest();
+
+        if ($result['status'] == 'error')
+            $this->error($result['message']);
+
+        $blogid = getBlogIDFromItemID($result['itemid']);
+        $blog =& $manager->getBlog($blogid);
+        $btimestamp = $blog->getCorrectTime();
+        $item       = $manager->getItem(intval($result['itemid']), 1, 1);
+
+        if ($result['status'] == 'newcategory') {
+            $distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=itemList&blogid=' . intval($blogid));
+            $this->action_categoryedit($result['catid'], $blogid, $distURI);
+        } else {
+            $methodName = 'action_itemList';
+            call_user_func(array(&$this, $methodName), $blogid);
+        }
+    }
+
+       /**
+        * Allows to edit previously made comments
+        **/
+       function action_commentedit() {
+
+               global $member, $manager;
+
+               $commentid = intRequestVar('commentid');
+
+               $member->canAlterComment($commentid) or $this->disallow();
+
+               $comment = Comment::getComment($commentid);
+
+               $manager->notify('PrepareCommentForEdit', array('comment' => &$comment) );
+
+               // change <br /> to \n
+               $comment['body'] = str_replace('<br />', '', $comment['body']);
+
+               // replaced eregi_replace() below with preg_replace(). ereg* functions are deprecated in PHP 5.3.0
+               /* original eregi_replace: eregi_replace("<a href=['\"]([^'\"]+)['\"]( rel=\"nofollow\") ?>[^<]*</a>", "\\1", $comment['body']) */
+
+        $comment['body'] = preg_replace("#<a href=['\"]([^'\"]+)['\"]( rel=\"nofollow\") ?>[^<]*</a>#i", "\\1", $comment['body']);
+
+        $this->pagehead();
+
+        ?>
+        <h2><?php echo _EDITC_TITLE ?></h2>
+
+        <form action="index.php" method="post"><div>
+
+        <input type="hidden" name="action" value="commentupdate" />
+        <?php $manager->addTicketHidden(); ?>
+        <input type="hidden" name="commentid" value="<?php echo  $commentid; ?>" />
+        <table><tr>
+            <th colspan="2"><?php echo _EDITC_TITLE ?></th>
+        </tr><tr>
+            <td><?php echo _EDITC_WHO ?></td>
+            <td>
+            <?php               if ($comment['member'])
+                    echo $comment['member'] . " (" . _EDITC_MEMBER . ")";
+                else
+                    echo $comment['user'] . " (" . _EDITC_NONMEMBER . ")";
+            ?>
+            </td>
+        </tr><tr>
+            <td><?php echo _EDITC_WHEN ?></td>
+            <td><?php echo  date("Y-m-d @ H:i",$comment['timestamp']); ?></td>
+        </tr><tr>
+            <td><?php echo _EDITC_HOST ?></td>
+            <td><?php echo  $comment['host']; ?></td>
+        </tr>
+        <tr>
+            <td><?php echo _EDITC_URL; ?></td>
+            <td><input type="text" name="url" size="30" tabindex="6" value="<?php echo $comment['userid']; ?>" /></td>
+        </tr>
+        <tr>
+            <td><?php echo _EDITC_EMAIL; ?></td>
+            <td><input type="text" name="email" size="30" tabindex="8" value="<?php echo $comment['email']; ?>" /></td>
+        </tr>
+        <tr>
+            <td><?php echo _EDITC_TEXT ?></td>
+            <td>
+                <textarea name="body" tabindex="10" rows="10" cols="50"><?php                   // htmlspecialchars not needed (things should be escaped already)
+                    echo $comment['body'];
+                ?></textarea>
+            </td>
+        </tr><tr>
+            <td><?php echo _EDITC_EDIT ?></td>
+            <td><input type="submit"  tabindex="20" value="<?php echo _EDITC_EDIT ?>" onclick="return checkSubmit();" /></td>
+        </tr></table>
+
+        </div></form>
+        <?php
+        $this->pagefoot();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_commentupdate() {
+        global $member, $manager;
+
+        $commentid = intRequestVar('commentid');
+
+        $member->canAlterComment($commentid) or $this->disallow();
+
+        $url = postVar('url');
+        $email = postVar('email');
+        $body = postVar('body');
+
+               # replaced eregi() below with preg_match(). ereg* functions are deprecated in PHP 5.3.0
+               # original eregi: eregi("[a-zA-Z0-9|\.,;:!\?=\/\\]{90,90}", $body) != FALSE
+               # important note that '\' must be matched with '\\\\' in preg* expressions
+
+               // intercept words that are too long
+               if (preg_match('#[a-zA-Z0-9|\.,;:!\?=\/\\\\]{90,90}#', $body) != FALSE)
+=======
        
        /**
         * Admin::action_templateclone()
@@ -3197,6 +4798,7 @@ class Admin
                
                // if a template with that name already exists:
                if ( Template::exists($name) )
+>>>>>>> skinnable-master
                {
                        $i = 1;
                        while (Template::exists($name . $i))
@@ -3250,14 +4852,39 @@ class Admin
                {
                        self::$headMess = $msg;
                }
-               $member->isAdmin() or self::disallow();
-               
+<<<<<<< HEAD
+
+               // prepare body
+               $body = Comment::prepareBody($body);
+
+               // call plugins
+               $manager->notify('PreUpdateComment',array('body' => &$body));
+
+               $query = 'UPDATE ' . sql_table('comment')
+                       . ' SET cmail = ' . DB::quoteValue($url) . ', cemail = ' . DB::quoteValue($email) . ', cbody = ' . DB::quoteValue($body)
+                       . ' WHERE cnumber = ' . $commentid;
+               DB::execute($query);
+
+               // get itemid
+               $res = DB::getValue('SELECT citem FROM '.sql_table('comment').' WHERE cnumber=' . $commentid);
+               $itemid = $res;
+
+               if ($member->canAlterItem($itemid))
+                       $this->action_itemcommentlist($itemid);
+               else
+                       $this->action_browseowncomments();
+
+    }
+=======
+               $member->isAdmin() or self::disallow();
+               
                self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/templateEdit.js)%>\"></script>\n";
                self::$extrahead .= '<script type="text/javascript">setTemplateEditText("' . Entity::hsc(_EDITTEMPLATE_EMPTY) . '");</script>' . "\n";
                
                self::$skin->parse('admintemplateedit');
                return;
        }
+>>>>>>> skinnable-master
        
        /**
         * Admin::action_admintemplateupdate()
@@ -3434,6 +5061,160 @@ class Admin
                return;
        }
        
+<<<<<<< HEAD
+    /**
+     * @todo document this
+     */
+    function action_commentdeleteconfirm() {
+        global $member;
+
+        $commentid = intRequestVar('commentid');
+
+        // get item id first
+        $res = DB::getValue('SELECT citem FROM '.sql_table('comment') .' WHERE cnumber=' . $commentid);
+        $itemid = $res;
+
+        $error = $this->deleteOneComment($commentid);
+        if ($error)
+            $this->doError($error);
+
+        if ($member->canAlterItem($itemid))
+            $this->action_itemcommentlist($itemid);
+        else
+            $this->action_browseowncomments();
+    }
+
+    /**
+     * @todo document this
+     */
+    function deleteOneComment($commentid) {
+        global $member, $manager;
+
+        $commentid = intval($commentid);
+
+        if (!$member->canAlterComment($commentid))
+            return _ERROR_DISALLOWED;
+
+        $manager->notify('PreDeleteComment', array('commentid' => $commentid));
+
+        // delete the comments associated with the item
+        $query = 'DELETE FROM '.sql_table('comment').' WHERE cnumber=' . $commentid;
+        DB::execute($query);
+
+        $manager->notify('PostDeleteComment', array('commentid' => $commentid));
+
+        return '';
+    }
+
+       /**
+        * Admin::action_usermanagement()
+        * 
+        * Usermanagement main
+        * @param       void
+        * @return      void
+        */
+       public function action_usermanagement()
+       {
+               global $member, $manager;
+               
+               // check if allowed
+               $member->isAdmin() or $this->disallow();
+               
+               $this->pagehead();
+               
+               echo '<p><a href="index.php?action=manage">(' . _BACKTOMANAGE . ")</a></p>\n";
+               
+               echo '<h2>' . _MEMBERS_TITLE . "</h2>\n";
+               
+               echo '<h3>' . _MEMBERS_CURRENT . "</h3>\n";
+               
+               // show list of members with actions
+               $query =  'SELECT * FROM '.sql_table('member');
+               $template['content'] = 'memberlist';
+               $template['tabindex'] = 10;
+               
+               $manager->loadClass("ENCAPSULATE");
+               $batch = new Batch('member');
+               $batch->showlist($query,'table',$template);
+               
+               echo '<h3>' . _MEMBERS_NEW .'</h3>';
+               echo "<form method=\"post\" action=\"index.php\" name=\"memberedit\">\n";
+               echo "<div>\n";
+               echo "<input type=\"hidden\" name=\"action\" value=\"memberadd\" />\n";
+               $manager->addTicketHidden();
+               
+               echo '<table frame="box" rules="rules" summary="' . _MEMBERS_NEW . '">' ."\n";
+               echo "<tr>\n";
+               echo '<th colspan="2">' . _MEMBERS_NEW . "</th>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_DISPLAY;
+               help('shortnames');
+               echo '<br />';
+               echo '<small>' . _MEMBERS_DISPLAY_INFO . '</small>';
+               echo "</td>\n";
+               echo "<td><input tabindex=\"10010\" name=\"name\" size=\"32\" maxlength=\"32\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_REALNAME . "</td>\n";
+               echo "<td><input name=\"realname\" tabindex=\"10020\" size=\"40\" maxlength=\"60\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_PWD . "</td>\n";
+               echo "<td><input name=\"password\" tabindex=\"10030\" size=\"16\" maxlength=\"40\" type=\"password\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_REPPWD . "</td>\n";
+               echo "<td><input name=\"repeatpassword\" tabindex=\"10035\" size=\"16\" maxlength=\"40\" type=\"password\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_EMAIL . "</td>\n";
+               echo "<td><input name=\"email\" tabindex=\"10040\" size=\"40\" maxlength=\"60\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_URL . "</td>\n";
+               echo "<td><input name=\"url\" tabindex=\"10050\" size=\"40\" maxlength=\"100\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_SUPERADMIN;
+               help('superadmin');
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('admin',0,10060);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_CANLOGIN;
+               help('canlogin');
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('canlogin',1,10070);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_NOTES . "</td>\n";
+               echo "<td><input name=\"notes\" maxlength=\"100\" size=\"40\" tabindex=\"10080\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _MEMBERS_NEW . "</td>\n";
+               echo '<td><input type="submit" value="' . _MEMBERS_NEW_BTN . '" tabindex="10090" onclick="return checkSubmit();" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "</table>\n";
+               echo "</div>\n";
+               echo "</form>\n";
+               $this->pagefoot();
+               return;
+       }
+       
+    /**
+     * Edit member settings
+     */
+    function action_memberedit() {
+        $this->action_editmembersettings(intRequestVar('memberid'));
+    }
+
+=======
+>>>>>>> skinnable-master
        /**
         * Admin::action_admintemplatedeleteconfirm()
         * 
@@ -3455,6 +5236,134 @@ class Admin
                $query = sprintf($query, sql_table('template_desc'), (integer) $templateid);
                DB::execute($query);
                
+<<<<<<< HEAD
+               // show message to go back to member overview (only for admins)
+               if ($member->isAdmin())
+               {
+                       echo '<a href="index.php?action=usermanagement">(' ._MEMBERS_BACKTOOVERVIEW. ')</a>';
+               }
+               else
+               {
+                       echo '<a href="index.php?action=overview">(' ._BACKHOME. ')</a>';
+               }
+               echo '<h2>' . _MEMBERS_EDIT . '</h2>';
+               
+               $mem =& $manager->getMember($memberid);
+               ?>
+               <form method="post" action="index.php" name="memberedit"><div>
+               
+               <input type="hidden" name="action" value="changemembersettings" />
+               <input type="hidden" name="memberid" value="<?php echo  $memberid; ?>" />
+               <?php $manager->addTicketHidden() ?>
+               
+               <table><tr>
+                       <th colspan="2"><?php echo _MEMBERS_EDIT ?></th>
+               </tr><tr>
+                       <td><?php echo _MEMBERS_DISPLAY ?> <?php help('shortnames'); ?>
+                               <br /><small><?php echo _MEMBERS_DISPLAY_INFO ?></small>
+                       </td>
+                       <td>
+                       <?php if ($CONF['AllowLoginEdit'] || $member->isAdmin()) { ?>
+                               <input name="name" tabindex="10" maxlength="32" size="32" value="<?php echo  Entity::hsc($mem->getDisplayName()); ?>" />
+                       <?php } else {
+                               echo Entity::hsc($member->getDisplayName());
+                          }
+                       ?>
+                       </td>
+               </tr><tr>
+                       <td><?php echo _MEMBERS_REALNAME ?></td>
+                       <td><input name="realname" tabindex="20" maxlength="60" size="40" value="<?php echo  Entity::hsc($mem->getRealName()); ?>" /></td>
+               </tr><tr>
+               <?php if ($CONF['AllowLoginEdit'] || $member->isAdmin()) { ?>
+                       <td><?php echo _MEMBERS_PWD ?></td>
+                       <td><input type="password" tabindex="30" maxlength="40" size="16" name="password" /></td>
+               </tr><tr>
+                       <td><?php echo _MEMBERS_REPPWD ?></td>
+                       <td><input type="password" tabindex="35" maxlength="40" size="16" name="repeatpassword" /></td>
+               <?php } ?>
+               </tr><tr>
+                       <td><?php echo _MEMBERS_EMAIL ?>
+                               <br /><small><?php echo _MEMBERS_EMAIL_EDIT ?></small>
+                       </td>
+                       <td><input name="email" tabindex="40" size="40" maxlength="60" value="<?php echo  Entity::hsc($mem->getEmail()); ?>" /></td>
+               </tr><tr>
+                       <td><?php echo _MEMBERS_URL ?></td>
+                       <td><input name="url" tabindex="50" size="40" maxlength="100" value="<?php echo  Entity::hsc($mem->getURL()); ?>" /></td>
+               <?php // only allow to change this by super-admins
+                  // we don't want normal users to 'upgrade' themselves to super-admins, do we? ;-)
+                  if ($member->isAdmin()) {
+               ?>
+                       </tr><tr>
+                               <td><?php echo _MEMBERS_SUPERADMIN ?> <?php help('superadmin'); ?></td>
+                               <td><?php $this->input_yesno('admin',$mem->isAdmin(),60); ?></td>
+                       </tr><tr>
+                               <td><?php echo _MEMBERS_CANLOGIN ?> <?php help('canlogin'); ?></td>
+                               <td><?php $this->input_yesno('canlogin',$mem->canLogin(),70,1,0,_YES,_NO,$mem->isAdmin()); ?></td>
+               <?php } ?>
+               </tr><tr>
+                       <td><?php echo _MEMBERS_NOTES ?></td>
+                       <td><input name="notes" tabindex="80" size="40" maxlength="100" value="<?php echo  Entity::hsc($mem->getNotes()); ?>" /></td>
+               </tr><tr>
+                       <td><?php echo _MEMBERS_LOCALE ?> <?php help('locale'); ?>
+                       </td>
+                       <td>
+                       
+                               <select name="locale" tabindex="85">
+                               <?php
+                               $locales = i18n::get_available_locale_list();
+                               if ( !$mem->getLocale() || !in_array($mem->getLocale(), $locales) )
+                               {
+                                       echo "<option value=\"\" selected=\"selected\">" . Entity::hsc(_MEMBERS_USESITELANG) . "</option>\n";
+                               }
+                               else
+                               {
+                                       echo "<option value=\"\">" . Entity::hsc(_MEMBERS_USESITELANG) . "</option>\n";
+                               }
+                               
+                               foreach( $locales as $locale )
+                               {
+                                       if( $locale == $mem->getLocale() )
+                                       {
+                                               echo "<option value=\"{$locale}\" selected=\"selected\">{$locale}</option>\n";
+                                       }
+                                       else
+                                       {
+                                               echo "<option value=\"{$locale}\">{$locale}</option>\n";
+                                       }
+                               }
+                               ?>
+                               </select>
+                               
+                       </td>
+               </tr>
+               <tr>
+                       <td><?php echo _MEMBERS_USEAUTOSAVE ?> <?php help('autosave'); ?></td>
+                       <td><?php $this->input_yesno('autosave', $mem->getAutosave(), 87); ?></td>
+               </tr>
+               <?php
+                       // plugin options
+                       $this->_insertPluginOptions('member',$memberid);
+               ?>
+               <tr>
+                       <th colspan="2"><?php echo _MEMBERS_EDIT ?></th>
+               </tr><tr>
+                       <td><?php echo _MEMBERS_EDIT ?></td>
+                       <td><input type="submit" tabindex="90" value="<?php echo _MEMBERS_EDIT_BTN ?>" onclick="return checkSubmit();" /></td>
+               </tr></table>
+               
+               </div></form>
+               
+               <?php
+                       echo '<h3>',_PLUGINS_EXTRA,'</h3>';
+                       
+                       $manager->notify(
+                               'MemberSettingsFormExtras',
+                               array(
+                                       'member' => &$mem
+                               )
+                       );
+               $this->pagefoot();
+=======
                // 2. delete parts
                $query = "DELETE FROM %s WHERE tdesc=%d;";
                $query = sprintf($query, sql_table('template'), (integer) $templateid);
@@ -3465,6 +5374,7 @@ class Admin
                
                self::action_admintemplateoverview();
                return;
+>>>>>>> skinnable-master
        }
        
        /**
@@ -3482,8 +5392,43 @@ class Admin
                
                if ( !isValidTemplateName($name) )
                {
+<<<<<<< HEAD
+                       $url = 'http://' . $url;
+               }
+
+        $admin          = postVar('admin');
+        $canlogin       = postVar('canlogin');
+        $notes          = strip_tags(postVar('notes'));
+        $locale        = postVar('locale');
+
+        $mem =& $manager->getMember($memberid);
+
+        if ($CONF['AllowLoginEdit'] || $member->isAdmin()) {
+
+            if (!isValidDisplayName($name))
+                $this->error(_ERROR_BADNAME);
+
+            if (($name != $mem->getDisplayName()) && Member::exists($name))
+                $this->error(_ERROR_NICKNAMEINUSE);
+
+            if ($password != $repeatpassword)
+                $this->error(_ERROR_PASSWORDMISMATCH);
+
+            if ($password && (i18n::strlen($password) < 6))
+                $this->error(_ERROR_PASSWORDTOOSHORT);
+                
+            if ($password) {
+                               $pwdvalid = true;
+                               $pwderror = '';
+                               $manager->notify('PrePasswordSet',array('password' => $password, 'errormessage' => &$pwderror, 'valid' => &$pwdvalid));
+                               if (!$pwdvalid) {
+                                       $this->error($pwderror);
+                               }
+                       }
+=======
                        self::error(_ERROR_BADTEMPLATENAME);
                        return;
+>>>>>>> skinnable-master
                }
                else if ( !preg_match('#^admin/#', $name) )
                {
@@ -3495,12 +5440,86 @@ class Admin
                        self::error(_ERROR_DUPTEMPLATENAME);
                        return;
                }
+<<<<<<< HEAD
+        if ( ($locale != '') && (!in_array($locale, i18n::get_available_locale_list())) )
+            $this->error(_ERROR_NOSUCHTRANSLATION);
+
+        // check if there will remain at least one site member with both the logon and admin rights
+        // (check occurs when taking away one of these rights from such a member)
+        if (    (!$admin && $mem->isAdmin() && $mem->canLogin())
+             || (!$canlogin && $mem->isAdmin() && $mem->canLogin())
+           )
+        {
+            $r = DB::getResult('SELECT * FROM '.sql_table('member').' WHERE madmin=1 and mcanlogin=1');
+            if ($r->rowCount() < 2)
+                $this->error(_ERROR_ATLEASTONEADMIN);
+        }
+
+        if ($CONF['AllowLoginEdit'] || $member->isAdmin()) {
+            $mem->setDisplayName($name);
+            if ($password)
+                $mem->setPassword($password);
+        }
+
+        $oldEmail = $mem->getEmail();
+
+        $mem->setRealName($realname);
+        $mem->setEmail($email);
+        $mem->setURL($url);
+        $mem->setNotes($notes);
+        $mem->setLocale($locale);
+
+
+        // only allow super-admins to make changes to the admin status
+        if ($member->isAdmin()) {
+            $mem->setAdmin($admin);
+            $mem->setCanLogin($canlogin);
+        }
+
+        $autosave = postVar ('autosave');
+        $mem->setAutosave($autosave);
+
+        $mem->write();
+
+        // store plugin options
+        $aOptions = requestArray('plugoption');
+        NucleusPlugin::apply_plugin_options($aOptions);
+        $manager->notify('PostPluginOptionsUpdate',array('context' => 'member', 'memberid' => $memberid, 'member' => &$mem));
+
+        // if email changed, generate new password
+        if ($oldEmail != $mem->getEmail())
+        {
+            $mem->sendActivationLink('addresschange', $oldEmail);
+            // logout member
+            $mem->newCookieKey();
+
+            // only log out if the member being edited is the current member.
+            if ($member->getID() == $memberid)
+                $member->logout();
+            $this->action_login(_MSG_ACTIVATION_SENT, 0);
+            return;
+        }
+
+
+        if (  ( $mem->getID() == $member->getID() )
+           && ( $mem->getDisplayName() != $member->getDisplayName() )
+           ) {
+            $mem->newCookieKey();
+            $member->logout();
+            $this->action_login(_MSG_LOGINAGAIN, 0);
+        } else {
+            $this->action_overview(_MSG_SETTINGSCHANGED);
+        }
+    }
+
+=======
                
                $newTemplateId = Template::createNew($name, $desc);
                self::action_admintemplateoverview();
                return;
        }
        
+>>>>>>> skinnable-master
        /**
         * Admin::action_admintemplateclone()
         * 
@@ -3595,114 +5614,982 @@ class Admin
                self::action_skinoverview();
                return;
        }
-       
+<<<<<<< HEAD
+
+    /**
+     * Account activation
+     *
+     * @author dekarma
+     */
+    function action_activate() {
+
+        $key = getVar('key');
+        $this->_showActivationPage($key);
+    }
+
+    /**
+     * @todo document this
+     */
+    function _showActivationPage($key, $message = '')
+    {
+        global $manager;
+
+        // clean up old activation keys
+        Member::cleanupActivationTable();
+
+        // get activation info
+        $info = Member::getActivationInfo($key);
+
+        if (!$info)
+            $this->error(_ERROR_ACTIVATE);
+
+        $mem =& $manager->getMember($info['vmember']);
+
+        if (!$mem)
+            $this->error(_ERROR_ACTIVATE);
+
+        $text = '';
+        $title = '';
+        $bNeedsPasswordChange = true;
+
+        switch ($info['vtype'])
+        {
+            case 'forgot':
+                $title = _ACTIVATE_FORGOT_TITLE;
+                $text = _ACTIVATE_FORGOT_TEXT;
+                break;
+            case 'register':
+                $title = _ACTIVATE_REGISTER_TITLE;
+                $text = _ACTIVATE_REGISTER_TEXT;
+                break;
+            case 'addresschange':
+                $title = _ACTIVATE_CHANGE_TITLE;
+                $text = _ACTIVATE_CHANGE_TEXT;
+                $bNeedsPasswordChange = false;
+                Member::activate($key);
+                break;
+        }
+
+        $aVars = array(
+            'memberName' => Entity::hsc($mem->getDisplayName())
+        );
+        $title = Template::fill($title, $aVars);
+        $text = Template::fill($text, $aVars);
+
+        $this->pagehead();
+
+            echo '<h2>' , $title, '</h2>';
+            echo '<p>' , $text, '</p>';
+
+            if ($message != '')
+            {
+                echo '<p class="error">',$message,'</p>';
+            }
+
+            if ($bNeedsPasswordChange)
+            {
+                ?>
+                    <div><form action="index.php" method="post">
+
+                        <input type="hidden" name="action" value="activatesetpwd" />
+                        <?php $manager->addTicketHidden() ?>
+                        <input type="hidden" name="key" value="<?php echo Entity::hsc($key) ?>" />
+
+                        <table><tr>
+                            <td><?php echo _MEMBERS_PWD ?></td>
+                            <td><input type="password" maxlength="40" size="16" name="password" /></td>
+                        </tr><tr>
+                            <td><?php echo _MEMBERS_REPPWD ?></td>
+                            <td><input type="password" maxlength="40" size="16" name="repeatpassword" /></td>
+                        <?php
+
+                            global $manager;
+                            $manager->notify('FormExtra', array('type' => 'activation', 'member' => $mem));
+
+                        ?>
+                        </tr><tr>
+                            <td><?php echo _MEMBERS_SETPWD ?></td>
+                            <td><input type='submit' value='<?php echo _MEMBERS_SETPWD_BTN ?>' /></td>
+                        </tr></table>
+
+
+                    </form></div>
+
+                <?php
+
+            }
+
+        $this->pagefoot();
+
+    }
+
+    /**
+     * Account activation - set password part
+     *
+     * @author dekarma
+     */
+    function action_activatesetpwd()
+    {
+               global $manager;
+        $key = postVar('key');
+
+        // clean up old activation keys
+        Member::cleanupActivationTable();
+
+        // get activation info
+        $info = Member::getActivationInfo($key);
+
+        if (!$info || ($info['type'] == 'addresschange'))
+            return $this->_showActivationPage($key, _ERROR_ACTIVATE);
+
+        $mem =& $manager->getMember($info['vmember']);
+
+        if (!$mem)
+            return $this->_showActivationPage($key, _ERROR_ACTIVATE);
+
+        $password       = postVar('password');
+        $repeatpassword = postVar('repeatpassword');
+
+        if ($password != $repeatpassword)
+            return $this->_showActivationPage($key, _ERROR_PASSWORDMISMATCH);
+
+        if ($password && (i18n::strlen($password) < 6))
+            return $this->_showActivationPage($key, _ERROR_PASSWORDTOOSHORT);
+            
+        if ($password) {
+                       $pwdvalid = true;
+                       $pwderror = '';
+                       global $manager;
+                       $manager->notify('PrePasswordSet',array('password' => $password, 'errormessage' => &$pwderror, 'valid' => &$pwdvalid));
+                       if (!$pwdvalid) {
+                               return $this->_showActivationPage($key,$pwderror);
+                       }
+               }
+
+        $error = '';
+        
+        $manager->notify('ValidateForm', array('type' => 'activation', 'member' => $mem, 'error' => &$error));
+        if ($error != '')
+            return $this->_showActivationPage($key, $error);
+
+
+        // set password
+        $mem->setPassword($password);
+        $mem->write();
+
+        // do the activation
+        Member::activate($key);
+
+        $this->pagehead();
+            echo '<h2>',_ACTIVATE_SUCCESS_TITLE,'</h2>';
+            echo '<p>',_ACTIVATE_SUCCESS_TEXT,'</p>';
+        $this->pagefoot();
+    }
+
        /**
-        * Admin::action_skinedit()
+        * Admin::action_manageteam()
         * 
+        * Manage team
         * @param       void
         * @return      void
         */
-       static private function action_skinedit()
+       public function action_manageteam()
        {
-               global $member;
+               global $member, $manager;
                
-               $member->isAdmin() or self::disallow();
+               $blogid = intRequestVar('blogid');
                
-               self::$skin->parse('skinedit');
-               return;
-       }
-       
-       /**
-        * Admin::action_skineditgeneral()
-        * 
-        * @param       void
-        * @return      void
-        */
-       static private function action_skineditgeneral()
-       {
-               global $member;
+               // check if allowed
+               $member->blogAdminRights($blogid) or $this->disallow();
                
-               $skinid = intRequestVar('skinid');
+               $this->pagehead();
                
-               $member->isAdmin() or self::disallow();
+               echo "<p><a href='index.php?action=blogsettings&amp;blogid=$blogid'>(" . _BACK_TO_BLOGSETTINGS . ")</a></p>\n";
                
-               $error = self::skineditgeneral($skinid);
-               if ( $error )
-               {
-                       self::error($error);
-                       return;
-               }
+               echo '<h2>' . _TEAM_TITLE . getBlogNameFromID($blogid) . "</h2>\n";
                
-               self::action_skinedit();
-               return;
-       }
-       
-       static private function action_skinedittype($msg = '')
-       {
-               global $member;
+               echo '<h3>' . _TEAM_CURRENT . "</h3>\n";
                
-               $member->isAdmin() or self::disallow();
+               $query = 'SELECT tblog, tmember, mname, mrealname, memail, tadmin'
+                      . ' FROM '.sql_table('member').', '.sql_table('team')
+                      . ' WHERE tmember=mnumber and tblog=' . $blogid;
                
-               if ( $msg )
-               {
-                       self::$headMess = $msg;
-               }
+               $template['content'] = 'teamlist';
+               $template['tabindex'] = 10;
                
-               $type = requestVar('type');
-               $type = trim($type);
-               $type = strtolower($type);
+               $manager->loadClass("ENCAPSULATE");
+               $batch = new Batch('team');
+               $batch->showlist($query, 'table', $template);
                
-               if ( !isValidShortName($type) )
-               {
-                       self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);
-                       return;
-               }
+               echo '<h3>' . _TEAM_ADDNEW . "</h3>\n";
+                       
+               echo "<form method=\"post\" action=\"index.php\">\n";
+               echo "<div>\n";
                
-               self::$skin->parse('skinedittype');
-               return;
-       }
+               echo "<input type=\"hidden\" name=\"action\" value=\"teamaddmember\" />\n";
+               echo "<input type=\"hidden\" name=\"blogid\" value=\"{$blogid}\" />\n";
+               $manager->addTicketHidden();
+                       
+               echo '<table frame="box" rules="all" summary="' . _TEAM_ADDNEW . '">' . "\n";
+               echo "<tr>\n";
+               echo '<td>' . _TEAM_CHOOSEMEMBER . "</td>\n";
+               
+               // TODO: try to make it so only non-team-members are listed
+               echo "<td>\n";
+               
+               $query =  'SELECT mname as text, mnumber as value FROM '.sql_table('member');
+               $template['name'] = 'memberid';
+               $template['tabindex'] = 10000;
+               showlist($query,'select',$template);
+               
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _TEAM_ADMIN;
+               help('teamadmin');
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('admin',0,10020);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _TEAM_ADD . "</td>\n";
+               echo '<td><input type="submit" value="' . _TEAM_ADD_BTN . '" tabindex="10030" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "</table>\n";
+               
+               echo "</div>\n";
+               echo "</form>\n";
+               
+               $this->pagefoot();
+               return;
+       }
+       
+    /**
+     * Add member to team
+     */
+    function action_teamaddmember() {
+        global $member, $manager;
+
+        $memberid = intPostVar('memberid');
+        $blogid = intPostVar('blogid');
+        $admin = intPostVar('admin');
+
+        // check if allowed
+        $member->blogAdminRights($blogid) or $this->disallow();
+
+        $blog =& $manager->getBlog($blogid);
+        if (!$blog->addTeamMember($memberid, $admin))
+            $this->error(_ERROR_ALREADYONTEAM);
+
+        $this->action_manageteam();
+
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_teamdelete() {
+        global $member, $manager;
+
+        $memberid = intRequestVar('memberid');
+        $blogid = intRequestVar('blogid');
+
+        // check if allowed
+        $member->blogAdminRights($blogid) or $this->disallow();
+
+        $teammem =& $manager->getMember($memberid);
+        $blog =& $manager->getBlog($blogid);
+
+        $this->pagehead();
+        ?>
+            <h2><?php echo _DELETE_CONFIRM ?></h2>
+
+            <p><?php echo _CONFIRMTXT_TEAM1 ?><b><?php echo  Entity::hsc($teammem->getDisplayName()) ?></b><?php echo _CONFIRMTXT_TEAM2 ?><b><?php echo  Entity::hsc(strip_tags($blog->getName())) ?></b>
+            </p>
+
+
+            <form method="post" action="index.php"><div>
+            <input type="hidden" name="action" value="teamdeleteconfirm" />
+            <?php $manager->addTicketHidden() ?>
+            <input type="hidden" name="memberid" value="<?php echo  $memberid; ?>" />
+            <input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />
+            <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
+            </div></form>
+        <?php
+        $this->pagefoot();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_teamdeleteconfirm() {
+        global $member;
+
+        $memberid = intRequestVar('memberid');
+        $blogid = intRequestVar('blogid');
+
+        $error = $this->deleteOneTeamMember($blogid, $memberid);
+        if ($error)
+            $this->error($error);
+
+
+        $this->action_manageteam();
+    }
+
+    /**
+     * @todo document this
+     */
+    function deleteOneTeamMember($blogid, $memberid) {
+        global $member, $manager;
+
+        $blogid = intval($blogid);
+        $memberid = intval($memberid);
+
+        // check if allowed
+        if (!$member->blogAdminRights($blogid))
+            return _ERROR_DISALLOWED;
+
+        // check if: - there remains at least one blog admin
+        //           - (there remains at least one team member)
+        $tmem =& $manager->getMember($memberid);
+
+        $manager->notify('PreDeleteTeamMember', array('member' => &$tmem, 'blogid' => $blogid));
+
+        if ($tmem->isBlogAdmin($blogid)) {
+            // check if there are more blog members left and at least one admin
+            // (check for at least two admins before deletion)
+            $query = 'SELECT * FROM '.sql_table('team') . ' WHERE tblog='.$blogid.' and tadmin=1';
+            $r = DB::getResult($query);
+            if ($r->rowCount() < 2)
+                return _ERROR_ATLEASTONEBLOGADMIN;
+        }
+
+        $query = 'DELETE FROM '.sql_table('team')." WHERE tblog=$blogid and tmember=$memberid";
+        DB::execute($query);
+
+        $manager->notify('PostDeleteTeamMember', array('member' => &$tmem, 'blogid' => $blogid));
+
+        return '';
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_teamchangeadmin() {
+        global $manager, $member;
+
+        $blogid = intRequestVar('blogid');
+        $memberid = intRequestVar('memberid');
+
+        // check if allowed
+        $member->blogAdminRights($blogid) or $this->disallow();
+
+        $mem =& $manager->getMember($memberid);
+
+        // don't allow when there is only one admin at this moment
+        if ($mem->isBlogAdmin($blogid)) {
+            $r = DB::getResult('SELECT * FROM '.sql_table('team') . " WHERE tblog=$blogid and tadmin=1");
+            if ($r->rowCount() == 1)
+                $this->error(_ERROR_ATLEASTONEBLOGADMIN);
+        }
+
+        if ($mem->isBlogAdmin($blogid))
+            $newval = 0;
+        else
+            $newval = 1;
+
+        $query = 'UPDATE '.sql_table('team') ." SET tadmin=$newval WHERE tblog=$blogid and tmember=$memberid";
+        DB::execute($query);
+
+        // only show manageteam if member did not change its own admin privileges
+        if ($member->isBlogAdmin($blogid))
+            $this->action_manageteam();
+        else
+            $this->action_overview(_MSG_ADMINCHANGED);
+    }
        
        /**
-        * Admin::action_skinupdate()
+        * Admin::action_blogsettings()
         * 
         * @param       void
         * @return      void
         */
-       static private function action_skinupdate()
+       public function action_blogsettings()
        {
-               global $manager, $member;
+               global $member, $manager;
                
-               $skinid = intRequestVar('skinid');
-               $content = trim(postVar('content'));
-               $type = postVar('type');
+               $blogid = intRequestVar('blogid');
                
-               $member->isAdmin() or self::disallow();
+               // check if allowed
+               $member->blogAdminRights($blogid) or $this->disallow();
                
-               $skin =& $manager->getSKIN($skinid);
-               $skin->update($type, $content);
+               $blog =& $manager->getBlog($blogid);
                
-               self::action_skinedittype(_SKIN_UPDATED);
-               return;
-       }
-       
-       /**
-        * Admin::action_skindelete()
-        * 
-        * @param       void
-        * @return      void
-        */
-       static private function action_skindelete()
-       {
-               global $CONF, $member;
+               $extrahead = "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";
+               $this->pagehead($extrahead);
                
-               $member->isAdmin() or self::disallow();
+               echo '<p><a href="index.php?action=overview">(' . _BACKHOME . ")</a></p>\n";
+               echo '<h2>' . _EBLOG_TITLE . ": '{$this->bloglink($blog)}'</h2>\n";
                
-               $skinid = intRequestVar('skinid');
+               echo '<h3>' . _EBLOG_TEAM_TITLE . "</h3>\n";
                
-               // don't allow default skin to be deleted
-               if ( $skinid == $CONF['BaseSkin'] )
-               {
-                       self::error(_ERROR_DEFAULTSKIN);
+               echo '<p>' . _EBLOG_CURRENT_TEAM_MEMBER;
+               
+               $query = "SELECT mname, mrealname FROM %s, %s WHERE mnumber=tmember AND tblog=%d;";
+               $query = sprintf($query, sql_table('member'), sql_table('team'), (integer) $blogid);
+               $res = DB::getResult($query);
+               $aMemberNames = array();
+               foreach ( $res as $row )
+               {
+                       $aMemberNames[] = Entity::hsc($row['mname']) . ' (' . Entity::hsc($row['mrealname']). ')';
+               }
+               echo implode(',', $aMemberNames);
+                       
+               echo "</p>\n";
+               echo '<p>';
+               echo '<a href="index.php?action=manageteam&amp;blogid=' . $blogid . '">' . _EBLOG_TEAM_TEXT . '</a>';
+               echo "</p>\n";
+               
+               echo '<h3>' . _EBLOG_SETTINGS_TITLE . "</h3>\n";
+               
+               echo "<form method=\"post\" action=\"index.php\">\n";
+               echo "<div>\n";
+               
+               echo "<input type=\"hidden\" name=\"action\" value=\"blogsettingsupdate\" />\n";
+               $manager->addTicketHidden() . "\n";
+               echo "<input type=\"hidden\" name=\"blogid\" value=\"{$blogid}\" />\n";
+               
+               echo '<table frame="box" rules="all" summary="' . _EBLOG_SETTINGS_TITLE . '">' . "\n";
+               echo "<tfoot>\n";
+               echo "<tr>\n";
+               echo '<th colspan="2">' . _EBLOG_CHANGE . "</th>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_CHANGE . "</td>\n";
+               echo '<td><input type="submit" tabindex="130" value="' . _EBLOG_CHANGE_BTN . '" onclick="return checkSubmit();" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "</tfoot>\n";
+               echo "<tbody>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_NAME . "</td>\n";
+               echo '<td><input name="name" tabindex="10" size="40" maxlength="60" value="' . Entity::hsc($blog->getName()) . '" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_SHORTNAME;
+               help('shortblogname');
+               echo _EBLOG_SHORTNAME_EXTRA;
+               echo "</td>\n";
+               echo '<td><input name="shortname" tabindex="20" maxlength="15" size="15" value="' . Entity::hsc($blog->getShortName()) .'" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_DESC . "</td>\n";
+               echo '<td><input name="desc" tabindex="30" maxlength="200" size="40" value="' . Entity::hsc($blog->getDescription()) . '" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_URL . "</td>\n";
+               echo '<td><input name="url" tabindex="40" size="40" maxlength="100" value="' . Entity::hsc($blog->getURL()) . '" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_DEFSKIN;
+               help('blogdefaultskin');
+               echo "</td>\n";
+               echo "<td>\n";
+               
+               $query = 'SELECT sdname as text, sdnumber as value FROM ' . sql_table('skin_desc');
+               $template['name'] = 'defskin';
+               $template['selected'] = $blog->getDefaultSkin();
+               $template['tabindex'] = 50;
+               showlist($query, 'select', $template);
+               
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_LINEBREAKS;
+               help('convertbreaks');
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('convertbreaks',$blog->convertBreaks(),55);
+               echo "</td>\n";
+               echo "</tr>\n";
+               
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_ALLOWPASTPOSTING;
+               help('allowpastposting');
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('allowpastposting',$blog->allowPastPosting(),57);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_DISABLECOMMENTS;
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('comments', $blog->commentsEnabled(), 60);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_ANONYMOUS . "</td>\n";
+               echo '<td>';
+               $this->input_yesno('public',$blog->isPublic(),70);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_REQUIREDEMAIL . "</td>\n";
+               echo '<td>';
+               $this->input_yesno('reqemail', $blog->emailRequired(),72);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_NOTIFY;
+               help('blognotify');
+               echo "</td>\n";
+               echo '<td><input name="notify" tabindex="80" maxlength="128" size="40" value="' . Entity::hsc($blog->getNotifyAddress()) . '" />' . "</td>\n";
+               echo "</tr>\n";
+               
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_NOTIFY_ON . "</td>\n";
+               echo "<td>\n";
+               
+               if ( !$blog->notifyOnComment() )
+               {
+                       echo "<input name=\"notifyComment\" value=\"3\" type=\"checkbox\" tabindex=\"81\" id=\"notifyComment\" />\n";
+               }
+               else
+               {
+                       echo "<input name=\"notifyComment\" value=\"3\" type=\"checkbox\" tabindex=\"81\" id=\"notifyComment\" checked=\"checked\"/>\n";
+               }
+               echo '<label for="notifyComment">' . _EBLOG_NOTIFY_COMMENT . "</label><br />\n";
+               
+               if ( !$blog->notifyOnVote() )
+               {
+                       echo "<input name=\"notifyVote\" value=\"5\" type=\"checkbox\" tabindex=\"82\" id=\"notifyVote\" />\n";
+               }
+               else
+               {
+                       echo "<input name=\"notifyVote\" value=\"5\" type=\"checkbox\" tabindex=\"82\" id=\"notifyVote\" checked=\"checked\" />\n";
+               }
+               
+               echo '<label for="notifyVote">' . _EBLOG_NOTIFY_KARMA . "</label><br />\n";
+               
+               if ( !$blog->notifyOnNewItem() )
+               {
+                       echo "<input name=\"notifyNewItem\" value=\"7\" type=\"checkbox\" tabindex=\"83\" id=\"notifyNewItem\" />\n";
+               
+               }
+               else
+               {
+                       echo "<input name=\"notifyNewItem\" value=\"7\" type=\"checkbox\" tabindex=\"83\" id=\"notifyNewItem\" checked=\"checked\" />\n";
+               }
+               
+               echo '<label for="notifyNewItem">' . _EBLOG_NOTIFY_ITEM . "</label>\n";
+               
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_MAXCOMMENTS;
+               help('blogmaxcomments');
+               echo "</td>\n";
+               echo '<td><input name="maxcomments" tabindex="90" size="3" value="' . Entity::hsc($blog->getMaxComments()) . '" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_UPDATE;
+               help('blogupdatefile');
+               echo "</td>\n";
+               echo '<td><input name="update" tabindex="100" size="40" maxlength="60" value="' . Entity::hsc($blog->getUpdateFile()) .'" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_DEFCAT . "</td>\n";
+               echo "<td>\n";
+               $query =  "SELECT cname as text, catid as value FROM %s WHERE cblog=%d;";
+               $query = sprintf($query, sql_table('category'), (integer) $blog->getID());
+               $template['name'] = 'defcat';
+               $template['selected'] = $blog->getDefaultCategory();
+               $template['tabindex'] = 110;
+               showlist($query, 'select', $template);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_OFFSET;
+               help('blogtimeoffset');
+               echo "<br />\n";
+               echo _EBLOG_STIME;
+               echo ' <b>' . i18n::formatted_datetime('%H:%M', time()) . '</b><br />';
+               echo _EBLOG_BTIME;
+               echo '<b>' . i18n::formatted_datetime('%H:%M', $blog->getCorrectTime()) . '</b>';
+               echo "</td>\n";
+               echo '<td><input name="timeoffset" tabindex="120" size="3" value="' . Entity::hsc($blog->getTimeOffset()) .'" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_SEARCH;
+               help('blogsearchable');
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('searchable', $blog->getSearchable(), 122);
+               echo "</td>\n";
+               echo "</tr>\n";
+               
+               // plugin options
+               $this->_insertPluginOptions('blog', $blogid);
+               
+               echo "</tbody>\n";
+               echo "</table>\n";
+               
+               echo "</div>\n";
+               echo "</form>\n";
+               
+               echo '<h3>' . _EBLOG_CAT_TITLE . "</h3>\n";
+               
+               $query = 'SELECT * FROM '.sql_table('category').' WHERE cblog='.$blog->getID().' ORDER BY cname';
+               $template['content'] = 'categorylist';
+               $template['tabindex'] = 200;
+               
+               $manager->loadClass("ENCAPSULATE");
+               $batch = new Batch('category');
+               $batch->showlist($query,'table',$template);
+               
+               echo "<form action=\"index.php\" method=\"post\">\n";
+               echo "<div>\n";
+               echo "<input name=\"action\" value=\"categorynew\" type=\"hidden\" />\n";
+               $manager->addTicketHidden() . "\n";
+               echo "<input name=\"blogid\" value=\"{$blog->getID()}\" type=\"hidden\" />\n";
+               
+               echo '<table frame="box" rules="all" summary="' . _EBLOG_CAT_CREATE . '">' . "\n";
+               echo "<thead>\n";
+               echo "<tr>\n";
+               echo '<th colspan="2">' . _EBLOG_CAT_CREATE . "</th>\n";
+               echo "</tr>\n";
+               echo "</thead>\n";
+               echo "<tbody>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_CAT_NAME . "</td>\n";
+               echo "<td><input name=\"cname\" size=\"40\" maxlength=\"40\" tabindex=\"300\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_CAT_DESC . "</td>\n";
+               echo "<td><input name=\"cdesc\" size=\"40\" maxlength=\"200\" tabindex=\"310\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _EBLOG_CAT_CREATE . "</td>\n";
+               echo '<td><input type="submit" value="' . _EBLOG_CAT_CREATE . '" tabindex="320" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "</tbody>\n";
+               echo "</table>\n";
+               echo "</div>\n";
+               echo "</form>\n";
+               
+               echo '<h3>' . _PLUGINS_EXTRA . "</h3>\n";
+               $manager->notify('BlogSettingsFormExtras', array('blog' => &$blog));
+               
+               $this->pagefoot();
+               return;
+       }
+
+    /**
+     * @todo document this
+     */
+    function action_categorynew() {
+        global $member, $manager;
+
+        $blogid = intRequestVar('blogid');
+
+        $member->blogAdminRights($blogid) or $this->disallow();
+
+        $cname = postVar('cname');
+        $cdesc = postVar('cdesc');
+
+        if (!isValidCategoryName($cname))
+            $this->error(_ERROR_BADCATEGORYNAME);
+
+        $query = 'SELECT * FROM '.sql_table('category') . ' WHERE cname=' . DB::quoteValue($cname).' and cblog=' . intval($blogid);
+        $res = DB::getResult($query);
+        if ($res->rowCount() > 0)
+            $this->error(_ERROR_DUPCATEGORYNAME);
+
+        $blog       =& $manager->getBlog($blogid);
+        $newCatID   =  $blog->createNewCategory($cname, $cdesc);
+
+        $this->action_blogsettings();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_categoryedit($catid = '', $blogid = '', $desturl = '') {
+        global $member, $manager;
+
+        if ($blogid == '')
+            $blogid = intGetVar('blogid');
+        else
+            $blogid = intval($blogid);
+        if ($catid == '')
+            $catid = intGetVar('catid');
+        else
+            $catid = intval($catid);
+
+        $member->blogAdminRights($blogid) or $this->disallow();
+
+        $res = DB::getRow('SELECT * FROM '.sql_table('category')." WHERE cblog=$blogid AND catid=$catid");
+
+        $cname = $res['cname'];
+        $cdesc = $res['cdesc'];
+
+        $extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';
+        $this->pagehead($extrahead);
+
+        echo "<p><a href='index.php?action=blogsettings&amp;blogid=$blogid'>(",_BACK_TO_BLOGSETTINGS,")</a></p>";
+
+        ?>
+        <h2><?php echo _EBLOG_CAT_UPDATE ?> '<?php echo Entity::hsc($cname) ?>'</h2>
+        <form method='post' action='index.php'><div>
+        <input name="blogid" type="hidden" value="<?php echo $blogid ?>" />
+        <input name="catid" type="hidden" value="<?php echo $catid ?>" />
+        <input name="desturl" type="hidden" value="<?php echo Entity::hsc($desturl) ?>" />
+        <input name="action" type="hidden" value="categoryupdate" />
+        <?php $manager->addTicketHidden(); ?>
+
+        <table><tr>
+            <th colspan="2"><?php echo _EBLOG_CAT_UPDATE ?></th>
+        </tr><tr>
+            <td><?php echo _EBLOG_CAT_NAME ?></td>
+            <td><input type="text" name="cname" value="<?php echo Entity::hsc($cname) ?>" size="40" maxlength="40" /></td>
+        </tr><tr>
+            <td><?php echo _EBLOG_CAT_DESC ?></td>
+            <td><input type="text" name="cdesc" value="<?php echo Entity::hsc($cdesc) ?>" size="40" maxlength="200" /></td>
+        </tr>
+        <?php
+            // insert plugin options
+            $this->_insertPluginOptions('category',$catid);
+        ?>
+        <tr>
+            <th colspan="2"><?php echo _EBLOG_CAT_UPDATE ?></th>
+        </tr><tr>
+            <td><?php echo _EBLOG_CAT_UPDATE ?></td>
+            <td><input type="submit" value="<?php echo _EBLOG_CAT_UPDATE_BTN ?>" /></td>
+        </tr></table>
+
+        </div></form>
+        <?php
+        $this->pagefoot();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_categoryupdate() {
+        global $member, $manager;
+
+        $blogid = intPostVar('blogid');
+        $catid = intPostVar('catid');
+        $cname = postVar('cname');
+        $cdesc = postVar('cdesc');
+        $desturl = postVar('desturl');
+
+        $member->blogAdminRights($blogid) or $this->disallow();
+
+        if (!isValidCategoryName($cname))
+            $this->error(_ERROR_BADCATEGORYNAME);
+
+        $query = 'SELECT * FROM '.sql_table('category').' WHERE cname=' . DB::quoteValue($cname).' and cblog=' . intval($blogid) . " and not(catid=$catid)";
+        $res = DB::getResult($query);
+        if ($res->rowCount() > 0)
+            $this->error(_ERROR_DUPCATEGORYNAME);
+
+        $query =  'UPDATE '.sql_table('category').' SET'
+               . ' cname=' . DB::quoteValue($cname) . ','
+               . ' cdesc=' . DB::quoteValue($cdesc)
+               . ' WHERE catid=' . $catid;
+
+        DB::execute($query);
+
+        // store plugin options
+        $aOptions = requestArray('plugoption');
+        NucleusPlugin::apply_plugin_options($aOptions);
+        $manager->notify('PostPluginOptionsUpdate',array('context' => 'category', 'catid' => $catid));
+
+
+        if ($desturl) {
+            redirect($desturl);
+            exit;
+        } else {
+            $this->action_blogsettings();
+        }
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_categorydelete() {
+        global $member, $manager;
+
+        $blogid = intRequestVar('blogid');
+        $catid = intRequestVar('catid');
+
+        $member->blogAdminRights($blogid) or $this->disallow();
+
+        $blog =& $manager->getBlog($blogid);
+
+        // check if the category is valid
+        if (!$blog->isValidCategory($catid))
+            $this->error(_ERROR_NOSUCHCATEGORY);
+
+        // don't allow deletion of default category
+        if ($blog->getDefaultCategory() == $catid)
+            $this->error(_ERROR_DELETEDEFCATEGORY);
+
+        // check if catid is the only category left for blogid
+        $query = 'SELECT catid FROM '.sql_table('category').' WHERE cblog=' . $blogid;
+        $res = DB::getResult($query);
+        if ($res->rowCount() == 1)
+            $this->error(_ERROR_DELETELASTCATEGORY);
+
+
+        $this->pagehead();
+        ?>
+            <h2><?php echo _DELETE_CONFIRM ?></h2>
+
+            <div>
+            <?php echo _CONFIRMTXT_CATEGORY ?><b><?php echo  Entity::hsc($blog->getCategoryName($catid)) ?></b>
+            </div>
+
+            <form method="post" action="index.php"><div>
+            <input type="hidden" name="action" value="categorydeleteconfirm" />
+            <?php $manager->addTicketHidden() ?>
+            <input type="hidden" name="blogid" value="<?php echo $blogid ?>" />
+            <input type="hidden" name="catid" value="<?php echo $catid ?>" />
+            <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
+            </div></form>
+        <?php
+        $this->pagefoot();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_categorydeleteconfirm() {
+        global $member, $manager;
+
+        $blogid = intRequestVar('blogid');
+        $catid = intRequestVar('catid');
+
+        $member->blogAdminRights($blogid) or $this->disallow();
+
+        $error = $this->deleteOneCategory($catid);
+        if ($error)
+            $this->error($error);
+
+        $this->action_blogsettings();
+    }
+=======
+       
+       /**
+        * Admin::action_skinedit()
+        * 
+        * @param       void
+        * @return      void
+        */
+       static private function action_skinedit()
+       {
+               global $member;
+               
+               $member->isAdmin() or self::disallow();
+               
+               self::$skin->parse('skinedit');
+               return;
+       }
+       
+       /**
+        * Admin::action_skineditgeneral()
+        * 
+        * @param       void
+        * @return      void
+        */
+       static private function action_skineditgeneral()
+       {
+               global $member;
+               
+               $skinid = intRequestVar('skinid');
+               
+               $member->isAdmin() or self::disallow();
+               
+               $error = self::skineditgeneral($skinid);
+               if ( $error )
+               {
+                       self::error($error);
+                       return;
+               }
+               
+               self::action_skinedit();
+               return;
+       }
+       
+       static private function action_skinedittype($msg = '')
+       {
+               global $member;
+               
+               $member->isAdmin() or self::disallow();
+               
+               if ( $msg )
+               {
+                       self::$headMess = $msg;
+               }
+               
+               $type = requestVar('type');
+               $type = trim($type);
+               $type = strtolower($type);
+               
+               if ( !isValidShortName($type) )
+               {
+                       self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);
+                       return;
+               }
+               
+               self::$skin->parse('skinedittype');
+               return;
+       }
+>>>>>>> skinnable-master
+       
+       /**
+        * Admin::action_skinupdate()
+        * 
+        * @param       void
+        * @return      void
+        */
+       static private function action_skinupdate()
+       {
+               global $manager, $member;
+               
+               $skinid = intRequestVar('skinid');
+               $content = trim(postVar('content'));
+               $type = postVar('type');
+               
+               $member->isAdmin() or self::disallow();
+               
+               $skin =& $manager->getSKIN($skinid);
+               $skin->update($type, $content);
+               
+               self::action_skinedittype(_SKIN_UPDATED);
+               return;
+       }
+       
+       /**
+        * Admin::action_skindelete()
+        * 
+        * @param       void
+        * @return      void
+        */
+       static private function action_skindelete()
+       {
+               global $CONF, $member;
+               
+               $member->isAdmin() or self::disallow();
+               
+               $skinid = intRequestVar('skinid');
+               
+               // don't allow default skin to be deleted
+               if ( $skinid == $CONF['BaseSkin'] )
+               {
+                       self::error(_ERROR_DEFAULTSKIN);
                        return;
                }
                
@@ -3742,6 +6629,12 @@ class Admin
                        return;
                }
                
+<<<<<<< HEAD
+               // check if catid is the only category left for blogid
+               $query = 'SELECT catid FROM '.sql_table('category').' WHERE cblog=' . $blogid;
+               $res = DB::getResult($query);
+               if ( $res->rowCount() == 1 )
+=======
                // don't allow deletion of default skins for blogs
                $query = "SELECT bname FROM %s WHERE bdefskin=%d;";
                $query = sprintf($query, sql_table('blog'), (integer) $skinid);
@@ -3775,6 +6668,7 @@ class Admin
                $skintype = requestVar('type');
                
                if ( !isValidShortName($skintype) )
+>>>>>>> skinnable-master
                {
                        self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
                        return;
@@ -3794,17 +6688,29 @@ class Admin
        {
                global $member;
                
+<<<<<<< HEAD
+               // change category for all items to the default category
+               $query = 'UPDATE '.sql_table('item')." SET icat=$destcatid WHERE icat=$catid";
+               DB::execute($query);
+=======
                $member->isAdmin() or self::disallow();
+>>>>>>> skinnable-master
                
                $skinid = intRequestVar('skinid');
                $skintype = requestVar('type');
                
+<<<<<<< HEAD
+               // delete category
+               $query = 'DELETE FROM '.sql_table('category').' WHERE catid=' .$catid;
+               DB::execute($query);
+=======
                $error = self::skinremovetypeconfirm($skinid, $skintype);
                if ( $error )
                {
                        self::error($error);
                        return;
                }
+>>>>>>> skinnable-master
                
                self::action_skinedit();
                return;
@@ -4082,6 +6988,46 @@ class Admin
                self::$skin->parse('adminskinremovetype');
                return;
        }
+<<<<<<< HEAD
+
+    /**
+     * @todo document this
+     */
+    function action_deleteblog() {
+        global $member, $CONF, $manager;
+
+        $blogid = intRequestVar('blogid');
+
+        $member->blogAdminRights($blogid) or $this->disallow();
+
+        // check if blog is default blog
+        if ($CONF['DefaultBlog'] == $blogid)
+            $this->error(_ERROR_DELDEFBLOG);
+
+        $blog =& $manager->getBlog($blogid);
+
+        $this->pagehead();
+        ?>
+            <h2><?php echo _DELETE_CONFIRM ?></h2>
+
+            <p><?php echo _WARNINGTXT_BLOGDEL ?>
+            </p>
+
+            <div>
+            <?php echo _CONFIRMTXT_BLOG ?><b><?php echo  Entity::hsc($blog->getName()) ?></b>
+            </div>
+
+            <form method="post" action="index.php"><div>
+            <input type="hidden" name="action" value="deleteblogconfirm" />
+            <?php $manager->addTicketHidden() ?>
+            <input type="hidden" name="blogid" value="<?php echo  $blogid; ?>" />
+            <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
+            </div></form>
+        <?php
+        $this->pagefoot();
+    }
+=======
+>>>>>>> skinnable-master
        
        /**
         * Admin::action_adminskinremovetypeconfirm()
@@ -4105,6 +7051,27 @@ class Admin
                        return;
                }
                
+<<<<<<< HEAD
+               // delete all comments
+               $query = 'DELETE FROM '.sql_table('comment').' WHERE cblog='.$blogid;
+               DB::execute($query);
+               
+               // delete all items
+               $query = 'DELETE FROM '.sql_table('item').' WHERE iblog='.$blogid;
+               DB::execute($query);
+               
+               // delete all team members
+               $query = 'DELETE FROM '.sql_table('team').' WHERE tblog='.$blogid;
+               DB::execute($query);
+               
+               // delete all bans
+               $query = 'DELETE FROM '.sql_table('ban').' WHERE blogid='.$blogid;
+               DB::execute($query);
+               
+               // delete all categories
+               $query = 'DELETE FROM '.sql_table('category').' WHERE cblog='.$blogid;
+               DB::execute($query);
+=======
                self::action_adminskinedit();
                return;
        }
@@ -4122,9 +7089,15 @@ class Admin
                $member->isAdmin() or self::disallow();
                
                $skinid = intRequestVar('skinid');
+>>>>>>> skinnable-master
                
                self::skinclone($skinid, 'AdminActions');
                
+<<<<<<< HEAD
+               // delete the blog itself
+               $query = 'DELETE FROM '.sql_table('blog').' WHERE bnumber='.$blogid;
+               DB::execute($query);
+=======
                self::action_adminskinoverview();
                return;
        }
@@ -4138,12 +7111,55 @@ class Admin
        static private function action_adminskinieoverview()
        {
                global $member;
+>>>>>>> skinnable-master
                
                $member->isAdmin() or self::disallow();
                
                self::$skin->parse('adminskinieoverview');
                return;
        }
+<<<<<<< HEAD
+       
+    /**
+     * @todo document this
+     */
+    function action_memberdelete() {
+        global $member, $manager;
+
+        $memberid = intRequestVar('memberid');
+
+        ($member->getID() == $memberid) or $member->isAdmin() or $this->disallow();
+
+        $mem =& $manager->getMember($memberid);
+
+        $this->pagehead();
+        ?>
+            <h2><?php echo _DELETE_CONFIRM ?></h2>
+
+            <p><?php echo _CONFIRMTXT_MEMBER ?><b><?php echo Entity::hsc($mem->getDisplayName()) ?></b>
+            </p>
+
+            <p>
+            <?php echo _WARNINGTXT_NOTDELMEDIAFILES ?>
+            </p>
+
+            <form method="post" action="index.php"><div>
+            <input type="hidden" name="action" value="memberdeleteconfirm" />
+            <?php $manager->addTicketHidden() ?>
+            <input type="hidden" name="memberid" value="<?php echo  $memberid; ?>" />
+            <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
+            </div></form>
+        <?php
+        $this->pagefoot();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_memberdeleteconfirm() {
+        global $member;
+=======
+>>>>>>> skinnable-master
 
        /**
         * Admin::action_adminskinieimport()
@@ -4155,7 +7171,17 @@ class Admin
        {
                global $member;
                
+<<<<<<< HEAD
+               $memberid = intval($memberid);
+               $mem =& $manager->getMember($memberid);
+               
+               if ( !$mem->canBeDeleted() )
+               {
+                       return _ERROR_DELETEMEMBER;
+               }
+=======
                $member->isAdmin() or self::disallow();
+>>>>>>> skinnable-master
                
                $skinFileRaw = postVar('skinfile');
                $mode = postVar('mode');
@@ -4163,44 +7189,1616 @@ class Admin
                $error = self::skinieimport($mode, $skinFileRaw);
                if ( $error )
                {
-                       self::error($error);
-                       return;
+<<<<<<< HEAD
+                       $query = "UPDATE %s SET cmember=0, cuser=%s WHERE cmember=%d";
+                       $query = sprintf($query, sql_table('comment'), DB::quoteValue($mem->getDisplayName()), $memberid);
+                       DB::execute($query);
                }
                
-               if ( !is_object(self::$skin) )
-               {
-                       self::action_adminskiniedoimport();
-               }
-               else
-               {
-                       self::$skin->parse('adminskinieimport');
-               }
-               return;
-       }
-       
-       /**
-        * Admin::action_adminskiniedoimport()
-        * 
-        * @param       void
-        * @return      void
-        */
-       static private function action_adminskiniedoimport()
-       {
-               global $DIR_SKINS, $member, $CONF;
+               $query = 'DELETE FROM '.sql_table('member').' WHERE mnumber='.$memberid;
+               DB::execute($query);
                
-               $member->isAdmin() or self::disallow();
+               $query = 'DELETE FROM '.sql_table('team').' WHERE tmember='.$memberid;
+               DB::execute($query);
                
-               $mode = postVar('mode');
-               $skinFileRaw = postVar('skinfile');
-               $allowOverwrite = intPostVar('overwrite');
+               $query = 'DELETE FROM '.sql_table('activation').' WHERE vmember='.$memberid;
+               DB::execute($query);
+               
+               // delete all associated plugin options
+               NucleusPlugin::delete_option_values('member', $memberid);
+               
+               $manager->notify('PostDeleteMember', array('member' => &$mem));
+               
+               return '';
+       }
+       
+    /**
+     * @todo document this
+     */
+    function action_createnewlog() {
+        global $member, $CONF, $manager;
+
+        // Only Super-Admins can do this
+        $member->isAdmin() or $this->disallow();
+
+        $this->pagehead();
+
+        echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
+        ?>
+        <h2><?php echo _EBLOG_CREATE_TITLE ?></h2>
+
+        <h3><?php echo _ADMIN_NOTABILIA ?></h3>
+
+        <p><?php echo _ADMIN_PLEASE_READ ?></p>
+
+        <p><?php echo _ADMIN_HOW_TO_ACCESS ?></p>
+
+        <ol>
+            <li><?php echo _ADMIN_SIMPLE_WAY ?></li>
+            <li><?php echo _ADMIN_ADVANCED_WAY ?></li>
+        </ol>
+
+        <h3><?php echo _ADMIN_HOW_TO_CREATE ?></h3>
+
+        <p>
+        <?php echo _EBLOG_CREATE_TEXT ?>
+        </p>
+
+        <form method="post" action="index.php"><div>
+
+        <input type="hidden" name="action" value="addnewlog" />
+        <?php $manager->addTicketHidden() ?>
+
+
+        <table><tr>
+            <td><?php echo _EBLOG_NAME ?></td>
+            <td><input name="name" tabindex="10" size="40" maxlength="60" /></td>
+        </tr><tr>
+            <td><?php echo _EBLOG_SHORTNAME ?>
+                <?php help('shortblogname'); ?>
+            </td>
+            <td><input name="shortname" tabindex="20" maxlength="15" size="15" /></td>
+        </tr><tr>
+            <td><?php echo _EBLOG_DESC ?></td>
+            <td><input name="desc" tabindex="30" maxlength="200" size="40" /></td>
+        </tr><tr>
+            <td><?php echo _EBLOG_DEFSKIN ?>
+                <?php help('blogdefaultskin'); ?>
+            </td>
+            <td>
+                <?php
+                    $query =  'SELECT sdname as text, sdnumber as value'
+                           . ' FROM '.sql_table('skin_desc');
+                    $template['name'] = 'defskin';
+                    $template['tabindex'] = 50;
+                    $template['selected'] = $CONF['BaseSkin'];  // set default selected skin to be globally defined base skin
+                    showlist($query,'select',$template);
+                ?>
+            </td>
+        </tr><tr>
+            <td><?php echo _EBLOG_OFFSET ?>
+                <?php help('blogtimeoffset'); ?>
+                <br /><?php echo _EBLOG_STIME ?> <b><?php echo i18n::formatted_datetime('%H:%M',time()); ?></b>
+            </td>
+            <td><input name="timeoffset" tabindex="110" size="3" value="0" /></td>
+        </tr><tr>
+            <td><?php echo _EBLOG_ADMIN ?>
+                <?php help('teamadmin'); ?>
+            </td>
+            <td><?php echo _EBLOG_ADMIN_MSG ?></td>
+        </tr><tr>
+            <td><?php echo _EBLOG_CREATE ?></td>
+            <td><input type="submit" tabindex="120" value="<?php echo _EBLOG_CREATE_BTN ?>" onclick="return checkSubmit();" /></td>
+        </tr></table>
+
+        </div></form>
+        <?php
+        $this->pagefoot();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_addnewlog() {
+        global $member, $manager, $CONF;
+
+        // Only Super-Admins can do this
+        $member->isAdmin() or $this->disallow();
+
+        $bname          = trim(postVar('name'));
+        $bshortname     = trim(postVar('shortname'));
+        $btimeoffset    = postVar('timeoffset');
+        $bdesc          = trim(postVar('desc'));
+        $bdefskin       = postVar('defskin');
+
+        if (!isValidShortName($bshortname))
+            $this->error(_ERROR_BADSHORTBLOGNAME);
+
+        if ($manager->existsBlog($bshortname))
+            $this->error(_ERROR_DUPSHORTBLOGNAME);
+
+        $manager->notify(
+            'PreAddBlog',
+            array(
+                'name' => &$bname,
+                'shortname' => &$bshortname,
+                'timeoffset' => &$btimeoffset,
+                'description' => &$bdesc,
+                'defaultskin' => &$bdefskin
+            )
+        );
+
+
+        // create blog
+               $query = sprintf('INSERT INTO %s (bname, bshortname, bdesc, btimeoffset, bdefskin) VALUES (%s, %s, %s, %s, %s)',
+                       sql_table('blog'),
+                       DB::quoteValue($bname),
+                       DB::quoteValue($bshortname),
+                       DB::quoteValue($bdesc),
+                       DB::quoteValue($btimeoffset),
+                       DB::quoteValue($bdefskin)
+               );
+        DB::execute($query);
+        $blogid = DB::getInsertId();
+        $blog   =& $manager->getBlog($blogid);
+
+        // create new category
+        $catdefname = (defined('_EBLOGDEFAULTCATEGORY_NAME') ? _EBLOGDEFAULTCATEGORY_NAME : 'General');
+        $catdefdesc = (defined('_EBLOGDEFAULTCATEGORY_DESC') ? _EBLOGDEFAULTCATEGORY_DESC : 'Items that do not fit in other categories');
+               $query = sprintf('INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, %s, %s)',
+                       sql_table('category'),
+                       $blogid,
+                       DB::quoteValue($catdefname),
+                       DB::quoteValue($catdefdesc)
+               );
+        DB::execute($query);
+        $catid = DB::getInsertId();
+
+        // set as default category
+        $blog->setDefaultCategory($catid);
+        $blog->writeSettings();
+
+        // create team member
+        $memberid = $member->getID();
+        $query = sprintf('INSERT INTO %s (tmember, tblog, tadmin) VALUES (%d, %d, 1)', sql_table('team'), $memberid, $blogid);
+        DB::execute($query);
+
+        $itemdeftitle = (defined('_EBLOG_FIRSTITEM_TITLE') ? _EBLOG_FIRSTITEM_TITLE : 'First Item');
+        $itemdefbody = (defined('_EBLOG_FIRSTITEM_BODY') ? _EBLOG_FIRSTITEM_BODY : 'This is the first item in your weblog. Feel free to delete it.');
+
+        $blog->additem($blog->getDefaultCategory(),$itemdeftitle,$itemdefbody,'',$blogid, $memberid,$blog->getCorrectTime(),0,0,0);
+
+        
+        $manager->notify(
+            'PostAddBlog',
+            array(
+                'blog' => &$blog
+            )
+        );
+
+        $manager->notify(
+            'PostAddCategory',
+            array(
+                'blog' => &$blog,
+                'name' => _EBLOGDEFAULTCATEGORY_NAME,
+                'description' => _EBLOGDEFAULTCATEGORY_DESC,
+                'catid' => $catid
+            )
+        );
+
+        $this->pagehead();
+        ?>
+        <h2><?php echo _BLOGCREATED_TITLE ?></h2>
+
+        <p><?php echo sprintf(_BLOGCREATED_ADDEDTXT, Entity::hsc($bname)) ?></p>
+
+        <ol>
+            <li><a href="#index_php"><?php echo sprintf(_BLOGCREATED_SIMPLEWAY, Entity::hsc($bshortname)) ?></a></li>
+            <li><a href="#skins"><?php echo _BLOGCREATED_ADVANCEDWAY ?></a></li>
+        </ol>
+
+        <h3><a id="index_php"><?php echo sprintf(_BLOGCREATED_SIMPLEDESC1, Entity::hsc($bshortname)) ?></a></h3>
+
+        <p><?php echo sprintf(_BLOGCREATED_SIMPLEDESC2, Entity::hsc($bshortname)) ?></p>
+<pre><code>&lt;?php
+
+$CONF['Self'] = '<b><?php echo Entity::hsc($bshortname) ?>.php</b>';
+
+include('<i>./config.php</i>');
+
+selectBlog('<b><?php echo Entity::hsc($bshortname) ?></b>');
+selector();
+
+?&gt;</code></pre>
+
+        <p><?php echo _BLOGCREATED_SIMPLEDESC3 ?></p>
+
+        <p><?php echo _BLOGCREATED_SIMPLEDESC4 ?></p>
+
+        <form action="index.php" method="post"><div>
+            <input type="hidden" name="action" value="addnewlog2" />
+            <?php $manager->addTicketHidden() ?>
+            <input type="hidden" name="blogid" value="<?php echo intval($blogid) ?>" />
+            <table><tr>
+                <td><?php echo _EBLOG_URL ?></td>
+                <td><input name="url" maxlength="100" size="40" value="<?php echo Entity::hsc($CONF['IndexURL'].$bshortname.'.php') ?>" /></td>
+            </tr><tr>
+                <td><?php echo _EBLOG_CREATE ?></td>
+                <td><input type="submit" value="<?php echo _EBLOG_CREATE_BTN ?>" onclick="return checkSubmit();" /></td>
+            </tr></table>
+        </div></form>
+
+        <h3><a id="skins"><?php echo _BLOGCREATED_ADVANCEDWAY2 ?></a></h3>
+
+        <p><?php echo _BLOGCREATED_ADVANCEDWAY3 ?></p>
+
+        <form action="index.php" method="post"><div>
+            <input type="hidden" name="action" value="addnewlog2" />
+            <?php $manager->addTicketHidden() ?>
+            <input type="hidden" name="blogid" value="<?php echo intval($blogid) ?>" />
+            <table><tr>
+                <td><?php echo _EBLOG_URL ?></td>
+                <td><input name="url" maxlength="100" size="40" /></td>
+            </tr><tr>
+                <td><?php echo _EBLOG_CREATE ?></td>
+                <td><input type="submit" value="<?php echo _EBLOG_CREATE_BTN ?>" onclick="return checkSubmit();" /></td>
+            </tr></table>
+        </div></form>
+
+        <?php       $this->pagefoot();
+
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_addnewlog2() {
+        global $member, $manager;
+
+        $member->blogAdminRights($blogid) or $this->disallow();
+
+        $burl   = requestVar('url');
+        $blogid = intRequestVar('blogid');
+
+        $blog =& $manager->getBlog($blogid);
+        $blog->setURL(trim($burl));
+        $blog->writeSettings();
+
+        $this->action_overview(_MSG_NEWBLOG);
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_skinieoverview() {
+        global $member, $DIR_LIBS, $manager;
+
+        $member->isAdmin() or $this->disallow();
+
+        // load skinie class
+        include_once($DIR_LIBS . 'skinie.php');
+
+        $this->pagehead();
+
+        echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
+
+    ?>
+        <h2><?php echo _SKINIE_TITLE_IMPORT ?></h2>
+
+                <p><label for="skinie_import_local"><?php echo _SKINIE_LOCAL ?></label>
+                <?php                   global $DIR_SKINS;
+
+                    $candidates = SkinImport::searchForCandidates($DIR_SKINS);
+
+                    if (sizeof($candidates) > 0) {
+                        ?>
+                            <form method="post" action="index.php"><div>
+                                <input type="hidden" name="action" value="skinieimport" />
+                                <?php $manager->addTicketHidden() ?>
+                                <input type="hidden" name="mode" value="file" />
+                                <select name="skinfile" id="skinie_import_local">
+                                <?php                                   foreach ($candidates as $skinname => $skinfile) {
+                                        $html = Entity::hsc($skinfile);
+                                        echo '<option value="',$html,'">',$skinname,'</option>';
+                                    }
+                                ?>
+                                </select>
+                                <input type="submit" value="<?php echo _SKINIE_BTN_IMPORT ?>" />
+                            </div></form>
+                        <?php                   } else {
+                        echo _SKINIE_NOCANDIDATES;
+                    }
+                ?>
+                </p>
+
+                <p><em><?php echo _OR ?></em></p>
+
+                <form method="post" action="index.php"><p>
+                    <?php $manager->addTicketHidden() ?>
+                    <input type="hidden" name="action" value="skinieimport" />
+                    <input type="hidden" name="mode" value="url" />
+                    <label for="skinie_import_url"><?php echo _SKINIE_FROMURL ?></label>
+                    <input type="text" name="skinfile" id="skinie_import_url" size="60" value="http://" />
+                    <input type="submit" value="<?php echo _SKINIE_BTN_IMPORT ?>" />
+                </p></form>
+
+
+        <h2><?php echo _SKINIE_TITLE_EXPORT ?></h2>
+        <form method="post" action="index.php"><div>
+            <input type="hidden" name="action" value="skinieexport" />
+            <?php $manager->addTicketHidden() ?>
+
+            <p><?php echo _SKINIE_EXPORT_INTRO ?></p>
+
+            <table><tr>
+                <th colspan="2"><?php echo _SKINIE_EXPORT_SKINS ?></th>
+            </tr><tr>
+    <?php       // show list of skins
+        $res = DB::getResult('SELECT * FROM '.sql_table('skin_desc'));
+        foreach ( $res as $row) {
+            $id = 'skinexp' . $row['sdnumber'];
+            echo '<td><input type="checkbox" name="skin[',$row['sdnumber'],']"  id="',$id,'" />';
+            echo '<label for="',$id,'">',Entity::hsc($row['sdname']),'</label></td>';
+            echo '<td>',Entity::hsc($row['sddesc']),'</td>';
+            echo '</tr><tr>';
+        }
+
+        echo '<th colspan="2">',_SKINIE_EXPORT_TEMPLATES,'</th></tr><tr>';
+
+        // show list of templates
+        $res = DB::getResult('SELECT * FROM '.sql_table('template_desc'));
+        foreach ( $res as $row ) {
+            $id = 'templateexp' . $row['tdnumber'];
+            echo '<td><input type="checkbox" name="template[',$row['tdnumber'],']" id="',$id,'" />';
+            echo '<label for="',$id,'">',Entity::hsc($row['tdname']),'</label></td>';
+            echo '<td>',Entity::hsc($row['tddesc']),'</td>';
+            echo '</tr><tr>';
+        }
+
+    ?>
+                <th colspan="2"><?php echo _SKINIE_EXPORT_EXTRA ?></th>
+            </tr><tr>
+                <td colspan="2"><textarea cols="40" rows="5" name="info"></textarea></td>
+            </tr><tr>
+                <th colspan="2"><?php echo _SKINIE_TITLE_EXPORT ?></th>
+            </tr><tr>
+                <td colspan="2"><input type="submit" value="<?php echo _SKINIE_BTN_EXPORT ?>" /></td>
+            </tr></table>
+        </div></form>
+
+    <?php
+        $this->pagefoot();
+
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_skinieimport() {
+        global $member, $DIR_LIBS, $DIR_SKINS, $manager;
+
+        $member->isAdmin() or $this->disallow();
+
+        // load skinie class
+        include_once($DIR_LIBS . 'skinie.php');
+
+        $skinFileRaw= postVar('skinfile');
+        $mode       = postVar('mode');
+
+        $importer = new SkinImport();
+
+        // get full filename
+        if ($mode == 'file')
+        {
+            $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';
+
+            // backwards compatibilty (in v2.0, exports were saved as skindata.xml)
+            if (!file_exists($skinFile))
+                $skinFile = $DIR_SKINS . $skinFileRaw . '/skindata.xml';
+        } else {
+            $skinFile = $skinFileRaw;
+        }
+
+        // read only metadata
+        $error = $importer->readFile($skinFile, 1);
+
+        // clashes
+        $skinNameClashes = $importer->checkSkinNameClashes();
+        $templateNameClashes = $importer->checkTemplateNameClashes();
+        $hasNameClashes = (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);
+
+        if ($error) $this->error($error);
+
+        $this->pagehead();
+
+        echo '<p><a href="index.php?action=skinieoverview">(',_BACK,')</a></p>';
+        ?>
+        <h2><?php echo _SKINIE_CONFIRM_TITLE ?></h2>
+
+        <ul>
+            <li><p><strong><?php echo _SKINIE_INFO_GENERAL ?></strong> <?php echo Entity::hsc($importer->getInfo()) ?></p></li>
+            <li><p><strong><?php echo _SKINIE_INFO_SKINS ?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getSkinNames()) ?></p></li>
+            <li><p><strong><?php echo _SKINIE_INFO_TEMPLATES ?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getTemplateNames()) ?></p></li>
+            <?php
+                if ($hasNameClashes)
+                {
+            ?>
+            <li><p><strong style="color: red;"><?php echo _SKINIE_INFO_SKINCLASH ?></strong> <?php echo implode(' <em>'._AND.'</em> ',$skinNameClashes) ?></p></li>
+            <li><p><strong style="color: red;"><?php echo _SKINIE_INFO_TEMPLCLASH ?></strong> <?php echo implode(' <em>'._AND.'</em> ',$templateNameClashes) ?></p></li>
+            <?php
+                } // if (hasNameClashes)
+            ?>
+        </ul>
+
+        <form method="post" action="index.php"><div>
+            <input type="hidden" name="action" value="skiniedoimport" />
+            <?php $manager->addTicketHidden() ?>
+            <input type="hidden" name="skinfile" value="<?php echo Entity::hsc(postVar('skinfile')) ?>" />
+            <input type="hidden" name="mode" value="<?php echo Entity::hsc($mode) ?>" />
+            <input type="submit" value="<?php echo _SKINIE_CONFIRM_IMPORT ?>" />
+            <?php
+                if ($hasNameClashes)
+                {
+            ?>
+            <br />
+            <input type="checkbox" name="overwrite" value="1" id="cb_overwrite" /><label for="cb_overwrite"><?php echo _SKINIE_CONFIRM_OVERWRITE ?></label>
+            <?php
+                } // if (hasNameClashes)
+            ?>
+        </div></form>
+
+
+        <?php
+        $this->pagefoot();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_skiniedoimport() {
+        global $member, $DIR_LIBS, $DIR_SKINS;
+
+        $member->isAdmin() or $this->disallow();
+
+        // load skinie class
+        include_once($DIR_LIBS . 'skinie.php');
+
+        $skinFileRaw= postVar('skinfile');
+        $mode       = postVar('mode');
+
+        $allowOverwrite = intPostVar('overwrite');
+
+        // get full filename
+        if ($mode == 'file')
+        {
+            $skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';
+
+            // backwards compatibilty (in v2.0, exports were saved as skindata.xml)
+            if (!file_exists($skinFile))
+                $skinFile = $DIR_SKINS . $skinFileRaw . '/skindata.xml';
+
+        } else {
+            $skinFile = $skinFileRaw;
+        }
+
+        $importer = new SkinImport();
+
+        $error = $importer->readFile($skinFile);
+
+        if ($error)
+            $this->error($error);
+
+        $error = $importer->writeToDatabase($allowOverwrite);
+
+        if ($error)
+            $this->error($error);
+
+        $this->pagehead();
+
+        echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
+    ?>
+        <h2><?php echo _SKINIE_DONE ?></h2>
+
+        <ul>
+            <li><p><strong><?php echo _SKINIE_INFO_GENERAL ?></strong> <?php echo Entity::hsc($importer->getInfo()) ?></p></li>
+            <li><p><strong><?php echo _SKINIE_INFO_IMPORTEDSKINS ?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getSkinNames()) ?></p></li>
+            <li><p><strong><?php echo _SKINIE_INFO_IMPORTEDTEMPLS ?></strong> <?php echo implode(' <em>'._AND.'</em> ',$importer->getTemplateNames()) ?></p></li>
+        </ul>
+
+    <?php       $this->pagefoot();
+
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_skinieexport() {
+        global $member, $DIR_LIBS;
+
+        $member->isAdmin() or $this->disallow();
+
+        // load skinie class
+        include_once($DIR_LIBS . 'skinie.php');
+
+        $aSkins = requestIntArray('skin');
+        $aTemplates = requestIntArray('template');
+
+        if (!is_array($aTemplates)) $aTemplates = array();
+        if (!is_array($aSkins)) $aSkins = array();
+
+        $skinList = array_keys($aSkins);
+        $templateList = array_keys($aTemplates);
+
+        $info = postVar('info');
+
+        $exporter = new SkinExport();
+        foreach ($skinList as $skinId) {
+            $exporter->addSkin($skinId);
+        }
+        foreach ($templateList as $templateId) {
+            $exporter->addTemplate($templateId);
+        }
+        $exporter->setInfo($info);
+
+        $exporter->export();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_templateoverview() {
+        global $member, $manager;
+
+        $member->isAdmin() or $this->disallow();
+
+        $this->pagehead();
+
+        echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
+
+        echo '<h2>' . _TEMPLATE_TITLE . '</h2>';
+        echo '<h3>' . _TEMPLATE_AVAILABLE_TITLE . '</h3>';
+
+        $query = 'SELECT * FROM '.sql_table('template_desc').' ORDER BY tdname';
+        $template['content'] = 'templatelist';
+        $template['tabindex'] = 10;
+        showlist($query,'table',$template);
+
+        echo '<h3>' . _TEMPLATE_NEW_TITLE . '</h3>';
+
+        ?>
+        <form method="post" action="index.php"><div>
+
+        <input name="action" value="templatenew" type="hidden" />
+        <?php $manager->addTicketHidden() ?>
+        <table><tr>
+            <td><?php echo _TEMPLATE_NAME ?> <?php help('shortnames'); ?></td>
+            <td><input name="name" tabindex="10010" maxlength="20" size="20" /></td>
+        </tr><tr>
+            <td><?php echo _TEMPLATE_DESC ?></td>
+            <td><input name="desc" tabindex="10020" maxlength="200" size="50" /></td>
+        </tr><tr>
+            <td><?php echo _TEMPLATE_CREATE ?></td>
+            <td><input type="submit" tabindex="10030" value="<?php echo _TEMPLATE_CREATE_BTN ?>" onclick="return checkSubmit();" /></td>
+        </tr></table>
+
+        </div></form>
+
+        <?php
+        $this->pagefoot();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_templateedit($msg = '') {
+        global $member, $manager;
+
+        $templateid = intRequestVar('templateid');
+
+        $member->isAdmin() or $this->disallow();
+
+        $extrahead = '<script type="text/javascript" src="javascript/templateEdit.js"></script>';
+        $extrahead .= '<script type="text/javascript">setTemplateEditText('.DB::quoteValue(_EDITTEMPLATE_EMPTY).');</script>';
+
+        $this->pagehead($extrahead);
+
+        $templatename = Template::getNameFromId($templateid);
+        $templatedescription = Template::getDesc($templateid);
+        $template =& $manager->getTemplate($templatename);
+
+        ?>
+        <p>
+        <a href="index.php?action=templateoverview">(<?php echo _TEMPLATE_BACK ?>)</a>
+        </p>
+
+        <h2><?php echo _TEMPLATE_EDIT_TITLE ?> '<?php echo  Entity::hsc($templatename); ?>'</h2>
+
+        <?php                   if ($msg) echo "<p>"._MESSAGE.": $msg</p>";
+        ?>
+
+        <p><?php echo _TEMPLATE_EDIT_MSG ?></p>
+
+        <form method="post" action="index.php">
+        <div>
+
+        <input type="hidden" name="action" value="templateupdate" />
+        <?php $manager->addTicketHidden() ?>
+        <input type="hidden" name="templateid" value="<?php echo  $templateid; ?>" />
+
+        <table><tr>
+            <th colspan="2"><?php echo _TEMPLATE_SETTINGS ?></th>
+        </tr><tr>
+            <td><?php echo _TEMPLATE_NAME ?> <?php help('shortnames'); ?></td>
+            <td><input name="tname" tabindex="4" size="20" maxlength="20" value="<?php echo  Entity::hsc($templatename) ?>" /></td>
+        </tr><tr>
+            <td><?php echo _TEMPLATE_DESC ?></td>
+            <td><input name="tdesc" tabindex="5" size="50" maxlength="200" value="<?php echo  Entity::hsc($templatedescription) ?>" /></td>
+        </tr><tr>
+            <th colspan="2"><?php echo _TEMPLATE_UPDATE ?></th>
+        </tr><tr>
+            <td><?php echo _TEMPLATE_UPDATE ?></td>
+            <td>
+                <input type="submit" tabindex="6" value="<?php echo _TEMPLATE_UPDATE_BTN ?>" onclick="return checkSubmit();" />
+                <input type="reset" tabindex="7" value="<?php echo _TEMPLATE_RESET_BTN ?>" />
+            </td>
+        </tr><tr>
+            <th colspan="2"><?php echo _TEMPLATE_ITEMS ?> <?php help('templateitems'); ?></th>
+<?php  $this->_templateEditRow($template, _TEMPLATE_ITEMHEADER, 'ITEM_HEADER', '', 8);
+    $this->_templateEditRow($template, _TEMPLATE_ITEMBODY, 'ITEM', '', 9, 1);
+    $this->_templateEditRow($template, _TEMPLATE_ITEMFOOTER, 'ITEM_FOOTER', '', 10);
+    $this->_templateEditRow($template, _TEMPLATE_MORELINK, 'MORELINK', 'morelink', 20);
+    $this->_templateEditRow($template, _TEMPLATE_EDITLINK, 'EDITLINK', 'editlink', 25);
+    $this->_templateEditRow($template, _TEMPLATE_NEW, 'NEW', 'new', 30);
+?>
+        </tr><tr>
+            <th colspan="2"><?php echo _TEMPLATE_COMMENTS_ANY ?> <?php help('templatecomments'); ?></th>
+<?php  $this->_templateEditRow($template, _TEMPLATE_CHEADER, 'COMMENTS_HEADER', 'commentheaders', 40);
+    $this->_templateEditRow($template, _TEMPLATE_CBODY, 'COMMENTS_BODY', 'commentbody', 50, 1);
+    $this->_templateEditRow($template, _TEMPLATE_CFOOTER, 'COMMENTS_FOOTER', 'commentheaders', 60);
+    $this->_templateEditRow($template, _TEMPLATE_CONE, 'COMMENTS_ONE', 'commentwords', 70);
+    $this->_templateEditRow($template, _TEMPLATE_CMANY, 'COMMENTS_MANY', 'commentwords', 80);
+    $this->_templateEditRow($template, _TEMPLATE_CMORE, 'COMMENTS_CONTINUED', 'commentcontinued', 90);
+    $this->_templateEditRow($template, _TEMPLATE_CMEXTRA, 'COMMENTS_AUTH', 'memberextra', 100);
+?>
+        </tr><tr>
+            <th colspan="2"><?php echo _TEMPLATE_COMMENTS_NONE ?> <?php help('templatecomments'); ?></th>
+<?php
+    $this->_templateEditRow($template, _TEMPLATE_CNONE, 'COMMENTS_NONE', '', 110);
+?>
+        </tr><tr>
+            <th colspan="2"><?php echo _TEMPLATE_COMMENTS_TOOMUCH ?> <?php help('templatecomments'); ?></th>
+<?php  $this->_templateEditRow($template, _TEMPLATE_CTOOMUCH, 'COMMENTS_TOOMUCH', '', 120);
+?>
+        </tr><tr>
+            <th colspan="2"><?php echo _TEMPLATE_ARCHIVELIST ?> <?php help('templatearchivelists'); ?></th>
+<?php  $this->_templateEditRow($template, _TEMPLATE_AHEADER, 'ARCHIVELIST_HEADER', '', 130);
+    $this->_templateEditRow($template, _TEMPLATE_AITEM, 'ARCHIVELIST_LISTITEM', '', 140);
+    $this->_templateEditRow($template, _TEMPLATE_AFOOTER, 'ARCHIVELIST_FOOTER', '', 150);
+?>
+        </tr><tr>
+            <th colspan="2"><?php echo _TEMPLATE_BLOGLIST ?> <?php help('templatebloglists'); ?></th>
+<?php  $this->_templateEditRow($template, _TEMPLATE_BLOGHEADER, 'BLOGLIST_HEADER', '', 160);
+    $this->_templateEditRow($template, _TEMPLATE_BLOGITEM, 'BLOGLIST_LISTITEM', '', 170);
+    $this->_templateEditRow($template, _TEMPLATE_BLOGFOOTER, 'BLOGLIST_FOOTER', '', 180);
+?>
+        </tr><tr>
+            <th colspan="2"><?php echo _TEMPLATE_CATEGORYLIST ?> <?php help('templatecategorylists'); ?></th>
+<?php  $this->_templateEditRow($template, _TEMPLATE_CATHEADER, 'CATLIST_HEADER', '', 190);
+    $this->_templateEditRow($template, _TEMPLATE_CATITEM, 'CATLIST_LISTITEM', '', 200);
+    $this->_templateEditRow($template, _TEMPLATE_CATFOOTER, 'CATLIST_FOOTER', '', 210);
+?>
+        </tr><tr>
+            <th colspan="2"><?php echo _TEMPLATE_DATETIME ?></th>
+<?php  $this->_templateEditRow($template, _TEMPLATE_DHEADER, 'DATE_HEADER', 'dateheads', 220);
+    $this->_templateEditRow($template, _TEMPLATE_DFOOTER, 'DATE_FOOTER', 'dateheads', 230);
+    $this->_templateEditRow($template, _TEMPLATE_DFORMAT, 'FORMAT_DATE', 'datetime', 240);
+    $this->_templateEditRow($template, _TEMPLATE_TFORMAT, 'FORMAT_TIME', 'datetime', 250);
+    $this->_templateEditRow($template, _TEMPLATE_LOCALE, 'LOCALE', 'locale', 260);
+?>
+        </tr><tr>
+            <th colspan="2"><?php echo _TEMPLATE_IMAGE ?> <?php help('templatepopups'); ?></th>
+<?php  $this->_templateEditRow($template, _TEMPLATE_PCODE, 'POPUP_CODE', '', 270);
+    $this->_templateEditRow($template, _TEMPLATE_ICODE, 'IMAGE_CODE', '', 280);
+    $this->_templateEditRow($template, _TEMPLATE_MCODE, 'MEDIA_CODE', '', 290);
+?>
+        </tr><tr>
+            <th colspan="2"><?php echo _TEMPLATE_SEARCH ?></th>
+<?php  $this->_templateEditRow($template, _TEMPLATE_SHIGHLIGHT, 'SEARCH_HIGHLIGHT', 'highlight',300);
+    $this->_templateEditRow($template, _TEMPLATE_SNOTFOUND, 'SEARCH_NOTHINGFOUND', 'nothingfound',310);
+?>
+        </tr><tr>
+            <th colspan="2"><?php echo _TEMPLATE_PLUGIN_FIELDS ?></th>
+<?php
+        $tab = 600;
+        $pluginfields = array();
+        $manager->notify('TemplateExtraFields',array('fields'=>&$pluginfields));
+
+        foreach ($pluginfields as $pfkey=>$pfvalue) {
+            echo "</tr><tr>\n";
+            echo '<th colspan="2">' . Entity::hen($pfkey) . "</th>\n";
+            foreach ($pfvalue as $pffield=>$pfdesc) {
+                $this->_templateEditRow($template, $pfdesc, $pffield, '',++$tab,0);
+            }
+        }
+?>
+        </tr><tr>
+            <th colspan="2"><?php echo _TEMPLATE_UPDATE ?></th>
+        </tr><tr>
+            <td><?php echo _TEMPLATE_UPDATE ?></td>
+            <td>
+                <input type="submit" tabindex="800" value="<?php echo _TEMPLATE_UPDATE_BTN ?>" onclick="return checkSubmit();" />
+                <input type="reset" tabindex="810" value="<?php echo _TEMPLATE_RESET_BTN ?>" />
+            </td>
+        </tr></table>
+
+        </div>
+        </form>
+        <?php
+        $this->pagefoot();
+    }
+
+    /**
+     * @todo document this
+     */
+    function _templateEditRow(&$template, $description, $name, $help = '', $tabindex = 0, $big = 0) {
+        static $count = 1;
+        if (!isset($template[$name])) $template[$name] = '';
+    ?>
+        </tr><tr>
+            <td><?php echo $description ?> <?php if ($help) help('template'.$help); ?></td>
+            <td id="td<?php echo $count ?>"><textarea class="templateedit" name="<?php echo $name ?>" tabindex="<?php echo $tabindex ?>" cols="50" rows="<?php echo $big?10:5 ?>" id="textarea<?php echo $count ?>"><?php echo  Entity::hsc($template[$name]); ?></textarea></td>
+    <?php       $count++;
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_templateupdate() {
+        global $member,$manager;
+
+        $templateid = intRequestVar('templateid');
+
+        $member->isAdmin() or $this->disallow();
+
+        $name = postVar('tname');
+        $desc = postVar('tdesc');
+
+        if (!isValidTemplateName($name))
+            $this->error(_ERROR_BADTEMPLATENAME);
+
+        if ((Template::getNameFromId($templateid) != $name) && Template::exists($name))
+            $this->error(_ERROR_DUPTEMPLATENAME);
+
+
+        $name = DB::quoteValue($name);
+        $desc = DB::quoteValue($desc);
+
+        // 1. Remove all template parts
+        $query = 'DELETE FROM '.sql_table('template').' WHERE tdesc=' . $templateid;
+        DB::execute($query);
+
+        // 2. Update description
+        $query =  'UPDATE '.sql_table('template_desc').' SET'
+               . ' tdname=' . $name . ','
+               . ' tddesc=' . $desc
+               . ' WHERE tdnumber=' . $templateid;
+        DB::execute($query);
+
+        // 3. Add non-empty template parts
+        $this->addToTemplate($templateid, 'ITEM_HEADER', postVar('ITEM_HEADER'));
+        $this->addToTemplate($templateid, 'ITEM', postVar('ITEM'));
+        $this->addToTemplate($templateid, 'ITEM_FOOTER', postVar('ITEM_FOOTER'));
+        $this->addToTemplate($templateid, 'MORELINK', postVar('MORELINK'));
+        $this->addToTemplate($templateid, 'EDITLINK', postVar('EDITLINK'));
+        $this->addToTemplate($templateid, 'NEW', postVar('NEW'));
+        $this->addToTemplate($templateid, 'COMMENTS_HEADER', postVar('COMMENTS_HEADER'));
+        $this->addToTemplate($templateid, 'COMMENTS_BODY', postVar('COMMENTS_BODY'));
+        $this->addToTemplate($templateid, 'COMMENTS_FOOTER', postVar('COMMENTS_FOOTER'));
+        $this->addToTemplate($templateid, 'COMMENTS_CONTINUED', postVar('COMMENTS_CONTINUED'));
+        $this->addToTemplate($templateid, 'COMMENTS_TOOMUCH', postVar('COMMENTS_TOOMUCH'));
+        $this->addToTemplate($templateid, 'COMMENTS_AUTH', postVar('COMMENTS_AUTH'));
+        $this->addToTemplate($templateid, 'COMMENTS_ONE', postVar('COMMENTS_ONE'));
+        $this->addToTemplate($templateid, 'COMMENTS_MANY', postVar('COMMENTS_MANY'));
+        $this->addToTemplate($templateid, 'COMMENTS_NONE', postVar('COMMENTS_NONE'));
+        $this->addToTemplate($templateid, 'ARCHIVELIST_HEADER', postVar('ARCHIVELIST_HEADER'));
+        $this->addToTemplate($templateid, 'ARCHIVELIST_LISTITEM', postVar('ARCHIVELIST_LISTITEM'));
+        $this->addToTemplate($templateid, 'ARCHIVELIST_FOOTER', postVar('ARCHIVELIST_FOOTER'));
+        $this->addToTemplate($templateid, 'BLOGLIST_HEADER', postVar('BLOGLIST_HEADER'));
+        $this->addToTemplate($templateid, 'BLOGLIST_LISTITEM', postVar('BLOGLIST_LISTITEM'));
+        $this->addToTemplate($templateid, 'BLOGLIST_FOOTER', postVar('BLOGLIST_FOOTER'));
+        $this->addToTemplate($templateid, 'CATLIST_HEADER', postVar('CATLIST_HEADER'));
+        $this->addToTemplate($templateid, 'CATLIST_LISTITEM', postVar('CATLIST_LISTITEM'));
+        $this->addToTemplate($templateid, 'CATLIST_FOOTER', postVar('CATLIST_FOOTER'));
+        $this->addToTemplate($templateid, 'DATE_HEADER', postVar('DATE_HEADER'));
+        $this->addToTemplate($templateid, 'DATE_FOOTER', postVar('DATE_FOOTER'));
+        $this->addToTemplate($templateid, 'FORMAT_DATE', postVar('FORMAT_DATE'));
+        $this->addToTemplate($templateid, 'FORMAT_TIME', postVar('FORMAT_TIME'));
+        $this->addToTemplate($templateid, 'LOCALE', postVar('LOCALE'));
+        $this->addToTemplate($templateid, 'SEARCH_HIGHLIGHT', postVar('SEARCH_HIGHLIGHT'));
+        $this->addToTemplate($templateid, 'SEARCH_NOTHINGFOUND', postVar('SEARCH_NOTHINGFOUND'));
+        $this->addToTemplate($templateid, 'POPUP_CODE', postVar('POPUP_CODE'));
+        $this->addToTemplate($templateid, 'MEDIA_CODE', postVar('MEDIA_CODE'));
+        $this->addToTemplate($templateid, 'IMAGE_CODE', postVar('IMAGE_CODE'));
+
+        $pluginfields = array();
+        $manager->notify('TemplateExtraFields',array('fields'=>&$pluginfields));
+        foreach ($pluginfields as $pfkey=>$pfvalue) {
+            foreach ($pfvalue as $pffield=>$pfdesc) {
+                $this->addToTemplate($templateid, $pffield, postVar($pffield));
+            }
+        }
+
+        // jump back to template edit
+        $this->action_templateedit(_TEMPLATE_UPDATED);
+
+    }
+
+=======
+                       self::error($error);
+                       return;
+               }
+               
+               if ( !is_object(self::$skin) )
+               {
+                       self::action_adminskiniedoimport();
+               }
+               else
+               {
+                       self::$skin->parse('adminskinieimport');
+               }
+               return;
+       }
+       
+>>>>>>> skinnable-master
+       /**
+        * Admin::action_adminskiniedoimport()
+        * 
+        * @param       void
+        * @return      void
+        */
+       static private function action_adminskiniedoimport()
+       {
+               global $DIR_SKINS, $member, $CONF;
+               
+               $member->isAdmin() or self::disallow();
+               
+               $mode = postVar('mode');
+               $skinFileRaw = postVar('skinfile');
+               $allowOverwrite = intPostVar('overwrite');
                
                $error = self::skiniedoimport($mode, $skinFileRaw, $allowOverwrite);
                if ( $error )
                {
-                       self::error($error);
-                       return;
+                       self::error($error);
+                       return;
+               }
+               
+<<<<<<< HEAD
+               $partname = DB::quoteValue($partname);
+               $content = DB::quoteValue($content);
+               
+               $query = "INSERT INTO %s (tdesc, tpartname, tcontent) VALUES (%d, %s, %s)";
+               $query = sprintf($query, sql_table('template'), (integer) $id, $partname, $content);
+               if ( DB::execute($query) === FALSE )
+               {
+                       $err = DB::getError();
+                       exit(_ADMIN_SQLDIE_QUERYERROR . $err[2]);
+               }
+               return DB::getInsertId();
+       }
+       
+    /**
+     * @todo document this
+     */
+    function action_templatedelete() {
+        global $member, $manager;
+
+        $member->isAdmin() or $this->disallow();
+
+        $templateid = intRequestVar('templateid');
+        // TODO: check if template can be deleted
+
+        $this->pagehead();
+
+        $name = Template::getNameFromId($templateid);
+        $desc = Template::getDesc($templateid);
+
+        ?>
+            <h2><?php echo _DELETE_CONFIRM ?></h2>
+
+            <p>
+            <?php echo _CONFIRMTXT_TEMPLATE ?><b><?php echo Entity::hsc($name) ?></b> (<?php echo  Entity::hsc($desc) ?>)
+            </p>
+
+            <form method="post" action="index.php"><div>
+                <input type="hidden" name="action" value="templatedeleteconfirm" />
+                <?php $manager->addTicketHidden() ?>
+                <input type="hidden" name="templateid" value="<?php echo  $templateid ?>" />
+                <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
+            </div></form>
+        <?php
+        $this->pagefoot();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_templatedeleteconfirm() {
+        global $member, $manager;
+
+        $templateid = intRequestVar('templateid');
+
+        $member->isAdmin() or $this->disallow();
+
+        $manager->notify('PreDeleteTemplate', array('templateid' => $templateid));
+
+        // 1. delete description
+        DB::execute('DELETE FROM '.sql_table('template_desc').' WHERE tdnumber=' . $templateid);
+
+        // 2. delete parts
+        DB::execute('DELETE FROM '.sql_table('template').' WHERE tdesc=' . $templateid);
+
+        $manager->notify('PostDeleteTemplate', array('templateid' => $templateid));
+
+        $this->action_templateoverview();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_templatenew() {
+        global $member;
+
+        $member->isAdmin() or $this->disallow();
+
+        $name = postVar('name');
+        $desc = postVar('desc');
+
+        if (!isValidTemplateName($name))
+            $this->error(_ERROR_BADTEMPLATENAME);
+
+        if (Template::exists($name))
+            $this->error(_ERROR_DUPTEMPLATENAME);
+
+        $newTemplateId = Template::createNew($name, $desc);
+
+        $this->action_templateoverview();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_templateclone() {
+        global $member;
+
+        $templateid = intRequestVar('templateid');
+
+        $member->isAdmin() or $this->disallow();
+
+        // 1. read old template
+        $name = Template::getNameFromId($templateid);
+        $desc = Template::getDesc($templateid);
+
+        // 2. create desc thing
+        $name = "cloned" . $name;
+
+        // if a template with that name already exists:
+        if (Template::exists($name)) {
+            $i = 1;
+            while (Template::exists($name . $i))
+                $i++;
+            $name .= $i;
+        }
+
+        $newid = Template::createNew($name, $desc);
+
+        // 3. create clone
+        // go through parts of old template and add them to the new one
+        $res = DB::getResult('SELECT tpartname, tcontent FROM '.sql_table('template').' WHERE tdesc=' . $templateid);
+        foreach ( $res as $row ) {
+            $this->addToTemplate($newid, $row['tpartname'], $row['tcontent']);
+        }
+
+        $this->action_templateoverview();
+    }
+       
+       /**
+        * Admin::action_skinoverview()
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function action_skinoverview()
+       {
+               global $member, $manager;
+               
+               $member->isAdmin() or $this->disallow();
+               
+               $this->pagehead();
+               
+               echo '<p><a href="index.php?action=manage">(' . _BACKTOMANAGE . ")</a></p>\n";
+               echo '<h2>' . _SKIN_EDIT_TITLE . "</h2>\n";
+               echo '<h3>' . _SKIN_AVAILABLE_TITLE . "</h3>\n";
+               
+               $query = 'SELECT * FROM '.sql_table('skin_desc').' ORDER BY sdname;';
+               $template['content'] = 'skinlist';
+               $template['tabindex'] = 10;
+               
+               showlist($query,'table',$template);
+               
+               echo '<h3>' . _SKIN_NEW_TITLE . "</h3>\n";
+               echo "<form method=\"post\" action=\"index.php\">\n";
+               echo "<div>\n";
+               echo "<input name=\"action\" value=\"skinnew\" type=\"hidden\" />\n";
+               
+               $manager->addTicketHidden() . "\n";
+               
+               echo "<table frame=\"box\" rules=\"all\" summary=\"skinoverview\">\n";
+               echo "<tr>\n";
+               echo "<td>" . _SKIN_NAME;
+               echo help('shortnames');
+               echo "</td>\n";
+               echo "<td><input name=\"name\" tabindex=\"10010\" maxlength=\"20\" size=\"20\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo "<td>" . _SKIN_DESC . "</td>\n";
+               echo "<td><input name=\"desc\" tabindex=\"10020\" maxlength=\"200\" size=\"50\" /></td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _SKIN_CREATE . "</td>\n";
+               echo '<td><input type="submit" tabindex="10030" value="' . _SKIN_CREATE_BTN . '" onclick="return checkSubmit();" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "</table>\n";
+               
+               echo "</div>\n";
+               echo "</form>\n";
+               
+               $this->pagefoot();
+               return;
+       }
+       
+    /**
+     * @todo document this
+     */
+    function action_skinnew() {
+        global $member;
+
+        $member->isAdmin() or $this->disallow();
+
+        $name = trim(postVar('name'));
+        $desc = trim(postVar('desc'));
+
+        if (!isValidSkinName($name))
+            $this->error(_ERROR_BADSKINNAME);
+
+        if (Skin::exists($name))
+            $this->error(_ERROR_DUPSKINNAME);
+
+        $newId = Skin::createNew($name, $desc);
+
+        $this->action_skinoverview();
+    }
+
+       /**
+        * Admin::action_skinedit()
+        * @param       void
+        * @return      void
+        */
+       public function action_skinedit()
+       {
+               global $member, $manager;
+               
+               $skinid = intRequestVar('skinid');
+               
+               $member->isAdmin() or $this->disallow();
+               
+               $skin = new SKIN($skinid);
+               $default_skin_types = $skin->getDefaultTypes();
+               $available_skin_types = $skin->getAvailableTypes();
+               
+               $this->pagehead();
+               
+               echo "<p>";
+               echo '( <a href="index.php?action=skinoverview">' . _SKIN_BACK . "</a> )";
+               echo "</p>\n";
+               echo '<h2>' . _SKIN_EDITONE_TITLE . $skin->getName() . "</h2>\n";
+               
+               echo '<h3>' . _SKIN_PARTS_TITLE . "</h3>\n";
+               echo _SKIN_PARTS_MSG . "\n";
+               echo "<ul>\n";
+               
+               $tabindex = 10;
+               foreach ( $default_skin_types as $type => $friendly_name )
+               {
+                       echo "<li>\n";
+                       echo "<a tabindex=\"{$tabindex}\" href=\"index.php?action=skinedittype&amp;skinid={$skinid}&amp;type={$type}\">";
+                       echo $friendly_name;
+                       echo "</a>\n";
+                       help("skinpart{$type}");
+                       echo "</li>\n";
+                       $tabindex++;
+               }
+               echo "</ul>\n";
+               
+               echo '<h3>' . _SKIN_PARTS_SPECIAL . '</h3>';
+               echo "<form method=\"get\" action=\"index.php\">\n";
+               echo "<input type=\"hidden\" name=\"action\" value=\"skinedittype\" />\n";
+               echo "<input type=\"hidden\" name=\"skinid\" value=\"{$skinid}\" />\n";
+               echo "<input type=\"text\" name=\"type\" tabindex=\"89\" size=\"20\" maxlength=\"20\" />\n";
+               echo '<input type="submit" tabindex="140" value="' . _SKIN_CREATE . "\" onclick=\"return checkSubmit();\" />\n";
+               echo "</form>\n";
+               
+               /* NOTE: special skin parts has FALSE in its value */
+               if ( in_array(FALSE, array_values($available_skin_types)) )
+               {
+                       $tabstart = 75;
+                       
+                       echo '<ul>';
+                       foreach ( $available_skin_types as $type => $friendly_name )
+                       {
+                               if ( !$friendly_name )
+                               {
+                                       $tabstart++;
+                                       echo "<li>\n";
+                                       echo "<a tabindex=\"{$tabstart}\" href=\"index.php?action=skinedittype&amp;skinid={$skinid}&amp;type=" . Entity::hsc(strtolower($type)) . '">';
+                                       echo Entity::hsc(ucfirst($type));
+                                       echo "</a>\n";
+                                       $tabstart++;
+                                       echo "(<a tabindex=\"{$tabstart}\" href=\"index.php?action=skinremovetype&amp;skinid={$skinid}&amp;type=" . Entity::hsc(strtolower($type)) . '">';
+                                       echo _LISTS_DELETE;
+                                       echo "</a>)\n";
+                                       echo "</li>\n";
+                               }
+                       }
+                       echo '</ul>';
+               }
+               
+               echo '<h3>' . _SKIN_GENSETTINGS_TITLE . "</h3>\n";
+               echo "<form method=\"post\" action=\"index.php\">\n";
+               echo "<div>\n";
+               echo "<input type=\"hidden\" name=\"action\" value=\"skineditgeneral\" />\n";
+               $manager->addTicketHidden() . "\n";
+               echo "<input type=\"hidden\" name=\"skinid\" value=\"{$skinid}\" />\n";
+               
+               echo '<table frame="box" rules="all" summary="' . _SKIN_GENSETTINGS_TITLE . '">' . "\n";
+               echo "<tr>\n";
+               echo '<td>';
+               echo _SKIN_NAME;
+               help('shortnames');
+               echo "</td>\n";
+               echo '<td><input type="text" name="name" tabindex="90" value="' . Entity::hsc($skin->getName()) . '" maxlength="20" size="20" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _SKIN_DESC . "</td>\n";
+               echo '<td><input type="text" name="desc" tabindex="100" value="' . Entity::hsc($skin->getDescription()) . '" maxlength="200" size="50" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _SKIN_TYPE . "</td>\n";
+               echo '<td><input type="text" name="type" tabindex="110" value="' . Entity::hsc($skin->getContentType()) . '" maxlength="40" size="20" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>';
+               echo _SKIN_INCLUDE_MODE;
+               help('includemode');
+               echo "</td>\n";
+               echo '<td>';
+               $this->input_yesno('inc_mode', $skin->getIncludeMode(), 120, 'skindir', 'normal', _PARSER_INCMODE_SKINDIR, _PARSER_INCMODE_NORMAL);
+               echo "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>';
+               echo _SKIN_INCLUDE_PREFIX;
+               help('includeprefix');
+               echo "</td>\n";
+               echo '<td><input type="text" name="inc_prefix" tabindex="130" value="' . Entity::hsc($skin->getIncludePrefix()) . '" maxlength="40" size="20" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "<tr>\n";
+               echo '<td>' . _SKIN_CHANGE . "</td>\n";
+               echo '<td><input type="submit" tabindex="140" value="' . _SKIN_CHANGE_BTN . '" onclick="return checkSubmit();" />' . "</td>\n";
+               echo "</tr>\n";
+               echo "</table>\n";
+               
+               echo "</div>\n";
+               echo "</form>\n";
+               $this->pagefoot();
+               return;
+       }
+
+    /**
+     * @todo document this
+     */
+    function action_skineditgeneral() {
+        global $member;
+
+        $skinid = intRequestVar('skinid');
+
+        $member->isAdmin() or $this->disallow();
+
+        $name = postVar('name');
+        $desc = postVar('desc');
+        $type = postVar('type');
+        $inc_mode = postVar('inc_mode');
+        $inc_prefix = postVar('inc_prefix');
+
+        $skin = new SKIN($skinid);
+
+        // 1. Some checks
+        if (!isValidSkinName($name))
+            $this->error(_ERROR_BADSKINNAME);
+
+        if (($skin->getName() != $name) && Skin::exists($name))
+            $this->error(_ERROR_DUPSKINNAME);
+
+        if (!$type) $type = 'text/html';
+        if (!$inc_mode) $inc_mode = 'normal';
+
+        // 2. Update description
+        $skin->updateGeneralInfo($name, $desc, $type, $inc_mode, $inc_prefix);
+
+        $this->action_skinedit();
+
+    }
+
+       /**
+        * Admin::action_skinedittype()
+        * 
+        * @param       string  $msg    message for pageheader
+        * @return      void
+        */
+       public function action_skinedittype($msg = '')
+       {
+               global $member, $manager;
+               
+               $skinid = intRequestVar('skinid');
+               $type = requestVar('type');
+               
+               $member->isAdmin() or $this->disallow();
+               
+               $type = trim($type);
+               $type = strtolower($type);
+               
+               if ( !isValidShortName($type) )
+               {
+                       $this->error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);
+               }
+               
+               $skin = new SKIN($skinid);
+               $skin_types = $skin->getAvailableTypes();
+               if ( !array_key_exists($type, $skin_types) || !$skin_types[$type] )
+               {
+                       $friendlyName = ucfirst($type);
+               }
+               else
+               {
+                       $friendlyName = $skin_types[$type];
+               }
+               
+               $this->pagehead();
+               
+               echo '<p>(<a href="index.php?action=skinoverview">' . _SKIN_GOBACK . "</a>)</p>\n";
+               
+               echo '<h2>' . _SKIN_EDITPART_TITLE . " '" . Entity::hsc($skin->getName()) . "': " . Entity::hsc($friendlyName) . "</h2>\n";
+               
+               if ( $msg != '')
+               {
+                       echo "<p>" . _MESSAGE . ": $msg</p>\n";
+               }
+               
+               echo "<form method=\"post\" action=\"index.php\">\n";
+               echo "<div>\n";
+               
+               echo "<input type=\"hidden\" name=\"action\" value=\"skinupdate\" />\n";
+               $manager->addTicketHidden() . "\n";
+               echo "<input type=\"hidden\" name=\"skinid\" value=\"{$skinid}\" />\n";
+               echo "<input type=\"hidden\" name=\"type\" value=\"{$type}\" />\n";
+               
+               echo '<input type="submit" value="' . _SKIN_UPDATE_BTN . '" onclick="return checkSubmit();" />' . "\n";
+               echo '<input type="reset" value="' . _SKIN_RESET_BTN . '" />' . "\n";
+               echo '(skin type: ' . Entity::hsc($friendlyName) . ")\n";
+               
+               if ( !array_key_exists($type, $skin_types) || !$skin_types[$type] )
+               {
+                       help('skinpartspecial');
+               }
+               else
+               {
+                       help('skinpart' . $type);
+               }
+               echo "<br />\n";
+               
+               echo "<textarea class=\"skinedit\" tabindex=\"10\" rows=\"20\" cols=\"80\" name=\"content\">\n";
+               echo Entity::hsc($skin->getContentFromDB($type)) . "\n";
+               echo "</textarea>\n";
+               
+               echo "<br />\n";
+               echo '<input type="submit" tabindex="20" value="' . _SKIN_UPDATE_BTN . '" onclick="return checkSubmit();" />' . "\n";
+               echo '<input type="reset" value="' . _SKIN_RESET_BTN . '" />' . "\n";
+               echo '(skin type: ' . Entity::hsc($friendlyName) . ")\n";
+               
+               echo "<br />\n";
+               echo "<br />\n";
+               echo _SKIN_ALLOWEDVARS;
+               
+               $actions = $skin->getAllowedActionsForType($type);
+               
+               sort($actions);
+               
+               while ( $current = array_shift($actions) )
+               {
+                       // skip deprecated vars
+                       if ( in_array($current, array('ifcat', 'imagetext', 'vars')) )
+                       {
+                               continue;
+                       }
+                       
+                       echo helplink("skinvar-{$current}") . "{$current}</a>\n";
+                       
+                       if ( count($actions) != 0 )
+                       {
+                               echo ", ";
+                       }
+               }
+               
+               echo "<br />\n";
+               echo "<br />\n";
+               echo _SKINEDIT_ALLOWEDBLOGS;
+               
+               $query = 'SELECT bshortname, bname FROM '.sql_table('blog');
+               showlist($query, 'table', array('content'=>'shortblognames'));
+               
+               echo "<br />\n";
+               echo _SKINEDIT_ALLOWEDTEMPLATESS;
+               
+               $query = 'SELECT tdname as name, tddesc as description FROM '.sql_table('template_desc');
+               showlist($query, 'table', array('content'=>'shortnames'));
+               
+               echo "</div>\n";
+               echo "</form>\n";
+               
+               $this->pagefoot();
+               
+               return;
+       }
+
+    /**
+     * @todo document this
+     */
+    function action_skinupdate() {
+        global $member;
+
+        $skinid = intRequestVar('skinid');
+        $content = trim(postVar('content'));
+        $type = postVar('type');
+
+        $member->isAdmin() or $this->disallow();
+
+        $skin = new SKIN($skinid);
+        $skin->update($type, $content);
+
+        $this->action_skinedittype(_SKIN_UPDATED);
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_skindelete() {
+        global $member, $manager, $CONF;
+
+        $skinid = intRequestVar('skinid');
+
+        $member->isAdmin() or $this->disallow();
+
+        // don't allow default skin to be deleted
+        if ($skinid == $CONF['BaseSkin'])
+            $this->error(_ERROR_DEFAULTSKIN);
+
+        // don't allow deletion of default skins for blogs
+        $query = 'SELECT bname FROM '.sql_table('blog').' WHERE bdefskin=' . $skinid;
+        $r = DB::getValue($query);
+        if ( $r )
+            $this->error(_ERROR_SKINDEFDELETE . Entity::hsc($r));
+
+        $this->pagehead();
+
+        $skin = new SKIN($skinid);
+        $name = $skin->getName();
+        $desc = $skin->getDescription();
+
+        ?>
+            <h2><?php echo _DELETE_CONFIRM ?></h2>
+
+            <p>
+                <?php echo _CONFIRMTXT_SKIN ?><b><?php echo Entity::hsc($name) ?></b> (<?php echo  Entity::hsc($desc) ?>)
+            </p>
+
+            <form method="post" action="index.php"><div>
+                <input type="hidden" name="action" value="skindeleteconfirm" />
+                <?php $manager->addTicketHidden() ?>
+                <input type="hidden" name="skinid" value="<?php echo  $skinid ?>" />
+                <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
+            </div></form>
+        <?php
+        $this->pagefoot();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_skindeleteconfirm() {
+        global $member, $CONF, $manager;
+
+        $skinid = intRequestVar('skinid');
+
+        $member->isAdmin() or $this->disallow();
+
+        // don't allow default skin to be deleted
+        if ($skinid == $CONF['BaseSkin'])
+            $this->error(_ERROR_DEFAULTSKIN);
+
+        // don't allow deletion of default skins for blogs
+        $query = 'SELECT bname FROM '.sql_table('blog').' WHERE bdefskin=' . $skinid;
+        $r = DB::getValue($query);
+        if ($r)
+            $this->error(_ERROR_SKINDEFDELETE .$r);
+
+        $manager->notify('PreDeleteSkin', array('skinid' => $skinid));
+
+        // 1. delete description
+        DB::execute('DELETE FROM '.sql_table('skin_desc').' WHERE sdnumber=' . $skinid);
+
+        // 2. delete parts
+        DB::execute('DELETE FROM '.sql_table('skin').' WHERE sdesc=' . $skinid);
+
+        $manager->notify('PostDeleteSkin', array('skinid' => $skinid));
+
+        $this->action_skinoverview();
+    }
+       
+       /**
+        * Admin::action_skinremovetype()
+        *
+        * @param       void
+        * @return      void
+        */
+       public function action_skinremovetype()
+       {
+               global $member, $manager, $CONF;
+               
+               $skinid = intRequestVar('skinid');
+               $skintype = requestVar('type');
+               
+               if ( !isValidShortName($skintype) )
+               {
+                       $this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
+               }
+               
+               $member->isAdmin() or $this->disallow();
+               
+               // don't allow default skinparts to be deleted
+               $skin = new Skin($skinid);
+               $default_skin_types = $skin->getDefaultTypes();
+               if ( array_key_exists($skintype, $default_skin_types) )
+               {
+                       $this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
+               }
+               
+               $name = $skin->getName();
+               $desc = $skin->getDescription();
+               
+               $this->pagehead();
+               
+               echo '<h2>' . _DELETE_CONFIRM . "</h2>\n";
+               echo "<p>\n";
+               echo _CONFIRMTXT_SKIN_PARTS_SPECIAL;
+               echo Entity::hsc($skintype);
+               echo  '(' . Entity::hsc($name) . ')</b>';
+               echo ' (' . Entity::hsc($desc) . ')';
+               echo "</p>\n";
+               
+               echo "<form method=\"post\" action=\"index.php\">\n";
+               echo "<div>\n";
+               echo "<input type=\"hidden\" name=\"action\" value=\"skinremovetypeconfirm\" />\n";
+               $manager->addTicketHidden();
+               echo "<input type=\"hidden\" name=\"skinid\" value=\"{$skinid}\" />\n";
+               echo '<input type="hidden" name="type" value="' . Entity::hsc($skintype) . '" />' . "\n";
+               echo '<input type="submit" tabindex="10" value="' . _DELETE_CONFIRM_BTN . '" />' . "\n";
+               echo "</div>\n";
+               echo "</form>\n";
+               $this->pagefoot();
+               return;
+       }
+       
+       /**
+        * Admin::action_skinremovetypeconfirm()
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function action_skinremovetypeconfirm()
+       {
+               global $member, $CONF, $manager;
+               
+               $skinid = intRequestVar('skinid');
+               $skintype = requestVar('type');
+               
+               if ( !isValidShortName($skintype) )
+               {
+                       $this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
+               }
+               
+               $member->isAdmin() or $this->disallow();
+               
+               // don't allow default skinparts to be deleted
+               $skin = new Skin($skinid);
+               $default_skin_types = $skin->getDefaultTypes();
+               if ( array_key_exists($skintype, $default_skin_types) )
+               {
+                       $this->error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
                }
                
+               $data = array(
+                       'skinid'        => $skinid,
+                       'skintype'      => $skintype
+               );
+               $manager->notify('PreDeleteSkinPart', $data);
+               
+               // delete part
+               $query = "DELETE FROM %s WHERE sdesc=%d AND stype='%s';";
+               $query = sprintf($query, sql_table('skin'), (integer) $skinid, $skintype);
+               DB::execute($query);
+               
+               $data = array(
+                       'skinid'        => $skinid,
+                       'skintype'      => $skintype
+               );
+               $manager->notify('PostDeleteSkinPart', $data);
+               
+               $this->action_skinedit();
+               return;
+       }
+       
+    /**
+     * @todo document this
+     */
+    function action_skinclone() {
+        global $member;
+
+        $skinid = intRequestVar('skinid');
+
+        $member->isAdmin() or $this->disallow();
+
+        // 1. read skin to clone
+        $skin = new SKIN($skinid);
+
+        $name = "clone_" . $skin->getName();
+
+        // if a skin with that name already exists:
+        if (Skin::exists($name)) {
+            $i = 1;
+            while (Skin::exists($name . $i))
+                $i++;
+            $name .= $i;
+        }
+
+        // 2. create skin desc
+        $newid = Skin::createNew(
+            $name,
+            $skin->getDescription(),
+            $skin->getContentType(),
+            $skin->getIncludeMode(),
+            $skin->getIncludePrefix()
+        );
+        
+        $query = "SELECT stype FROM " . sql_table('skin') . " WHERE sdesc = " . $skinid;
+        $res = DB::getResult($query);
+        foreach ( $res as $row) {
+            $this->skinclonetype($skin, $newid, $row['stype']);
+        }
+
+        $this->action_skinoverview();
+
+    }
+=======
                if ( !is_object(self::$skin) )
                {
                        global $DIR_SKINS;
@@ -4224,6 +8822,7 @@ class Admin
                }
                return;
        }
+>>>>>>> skinnable-master
 
        /**
         * Admin::action_adminskinieexport()
@@ -4233,6 +8832,17 @@ class Admin
         */
        static private function action_adminskinieexport()
        {
+<<<<<<< HEAD
+               $newid = intval($newid);
+               $content = $skin->getContentFromDB($type);
+               
+               if ( $content )
+               {
+                       $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, '%s', '%s')";
+                       $query = sprintf($query, sql_table('skin'), (integer) $newid, $content, $type);
+                       DB::execute($query);
+               }
+=======
                global $member;
                
                $member->isAdmin() or self::disallow();
@@ -4244,6 +8854,7 @@ class Admin
                
                self::skinieexport($aSkins, $aTemplates, $info);
                
+>>>>>>> skinnable-master
                return;
        }
        
@@ -4256,11 +8867,343 @@ class Admin
        static private function action_settingsedit()
        {
                global $member, $manager, $CONF, $DIR_NUCLEUS, $DIR_MEDIA;
+<<<<<<< HEAD
+
+               $member->isAdmin() or $this->disallow();
+
+               $this->pagehead();
+
+               echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
+               ?>
+
+               <h2><?php echo _SETTINGS_TITLE ?></h2>
+
+               <form action="index.php" method="post">
+               <div>
+
+               <input type="hidden" name="action" value="settingsupdate" />
+               <?php $manager->addTicketHidden() ?>
+
+               <table><tr>
+                       <th colspan="2"><?php echo _SETTINGS_SUB_GENERAL ?></th>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_DEFBLOG ?> <?php help('defaultblog'); ?></td>
+                       <td>
+                               <?php
+                                       $query =  'SELECT bname as text, bnumber as value'
+                                                  . ' FROM '.sql_table('blog');
+                                       $template['name'] = 'DefaultBlog';
+                                       $template['selected'] = $CONF['DefaultBlog'];
+                                       $template['tabindex'] = 10;
+                                       showlist($query,'select',$template);
+                               ?>
+                       </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_BASESKIN ?> <?php help('baseskin'); ?></td>
+                       <td>
+                               <?php
+                                       $query =  'SELECT sdname as text, sdnumber as value'
+                                                  . ' FROM '.sql_table('skin_desc');
+                                       $template['name'] = 'BaseSkin';
+                                       $template['selected'] = $CONF['BaseSkin'];
+                                       $template['tabindex'] = 1;
+                                       showlist($query,'select',$template);
+                               ?>
+                       </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_ADMINMAIL ?></td>
+                       <td><input name="AdminEmail" tabindex="10010" size="40" value="<?php echo  Entity::hsc($CONF['AdminEmail']) ?>" /></td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_SITENAME ?></td>
+                       <td><input name="SiteName" tabindex="10020" size="40" value="<?php echo  Entity::hsc($CONF['SiteName']) ?>" /></td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_SITEURL ?></td>
+                       <td><input name="IndexURL" tabindex="10030" size="40" value="<?php echo  Entity::hsc($CONF['IndexURL']) ?>" /></td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_ADMINURL ?></td>
+                       <td><input name="AdminURL" tabindex="10040" size="40" value="<?php echo  Entity::hsc($CONF['AdminURL']) ?>" /></td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_PLUGINURL ?> <?php help('pluginurl'); ?></td>
+                       <td><input name="PluginURL" tabindex="10045" size="40" value="<?php echo  Entity::hsc($CONF['PluginURL']) ?>" /></td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_SKINSURL ?> <?php help('skinsurl'); ?></td>
+                       <td><input name="SkinsURL" tabindex="10046" size="40" value="<?php echo  Entity::hsc($CONF['SkinsURL']) ?>" /></td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_ACTIONSURL ?> <?php help('actionurl'); ?></td>
+                       <td><input name="ActionURL" tabindex="10047" size="40" value="<?php echo  Entity::hsc($CONF['ActionURL']) ?>" /></td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_LOCALE ?> <?php help('locale'); ?>
+                       </td>
+                       <td>
+                               <select name="Locale" tabindex="10050">
+                       <?php
+                               $locales = i18n::get_available_locale_list();
+                               if ( !i18n::get_current_locale() || !in_array(i18n::get_current_locale(), $locales) )
+                               {
+                                       echo "<option value=\"\" selected=\"selected\">en_Latn_US</option>\n";
+                               }
+                               else
+                               {
+                                       echo "<option value=\"\">en_Latn_US</option>\n";
+                               }
+                               
+                               foreach ( $locales as $locale )
+                               {
+                                       if ( $locale == 'en_Latn_US' )
+                                       {
+                                               continue;
+                                       }
+                                       if ( $locale == i18n::get_current_locale() )
+                                       {
+                                               echo "<option value=\"{$locale}\" selected=\"selected\">{$locale}</option>\n";
+                                       }
+                                       else
+                                       {
+                                               echo "<option value=\"{$locale}\">{$locale}</option>\n";
+                                       }
+                               }
+                       ?>
+                       </select>
+
+                       </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_DISABLESITE ?> <?php help('disablesite'); ?>
+                       </td>
+                       <td><?php $this->input_yesno('DisableSite',$CONF['DisableSite'],10060); ?>
+                                       <br />
+                               <?php echo _SETTINGS_DISABLESITEURL ?> <input name="DisableSiteURL" tabindex="10070" size="40" value="<?php echo  Entity::hsc($CONF['DisableSiteURL']) ?>" />
+                       </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_DIRS ?></td>
+                       <td><?php echo  Entity::hsc($DIR_NUCLEUS) ?>
+                               <i><?php echo _SETTINGS_SEECONFIGPHP ?></i></td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_DBLOGIN ?></td>
+                       <td><i><?php echo _SETTINGS_SEECONFIGPHP ?></i></td>
+               </tr><tr>
+                       <td>
+                       <?php
+                               echo _SETTINGS_JSTOOLBAR
+                               /* =_SETTINGS_DISABLEJS
+
+                                       I temporary changed the meaning of DisableJsTools, until I can find a good
+                                       way to select the javascript version to use
+
+                                       now, its:
+                                               0 : IE
+                                               1 : all javascript disabled
+                                               2 : 'simpler' javascript (for mozilla/opera/mac)
+                               */
+                          ?>
+                       </td>
+                       <td><?php /* $this->input_yesno('DisableJsTools',$CONF['DisableJsTools'],10075); */ ?>
+                               <select name="DisableJsTools" tabindex="10075">
+                       <?php                              $extra = ($CONF['DisableJsTools'] == 1) ? 'selected="selected"' : '';
+                                       echo "<option $extra value='1'>",_SETTINGS_JSTOOLBAR_NONE,"</option>";
+                                       $extra = ($CONF['DisableJsTools'] == 2) ? 'selected="selected"' : '';
+                                       echo "<option $extra value='2'>",_SETTINGS_JSTOOLBAR_SIMPLE,"</option>";
+                                       $extra = ($CONF['DisableJsTools'] == 0) ? 'selected="selected"' : '';
+                                       echo "<option $extra value='0'>",_SETTINGS_JSTOOLBAR_FULL,"</option>";
+                       ?>
+                               </select>
+                       </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_URLMODE ?> <?php help('urlmode'); ?></td>
+                                          <td><?php
+
+                                          $this->input_yesno('URLMode',$CONF['URLMode'],10077,
+                                                         'normal','pathinfo',_SETTINGS_URLMODE_NORMAL,_SETTINGS_URLMODE_PATHINFO);
+
+                                          echo ' ', _SETTINGS_URLMODE_HELP;
+
+                                                        ?>
+
+                                          </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_DEBUGVARS ?> <?php help('debugvars'); ?></td>
+                                          <td><?php
+
+                                               $this->input_yesno('DebugVars',$CONF['DebugVars'],10078);
+
+                                                        ?>
+
+                                          </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_DEFAULTLISTSIZE ?> <?php help('defaultlistsize'); ?></td>
+                       <td>
+                       <?php
+                               if (!array_key_exists('DefaultListSize',$CONF)) {
+                                       DB::execute("INSERT INTO ".sql_table('config')." VALUES ('DefaultListSize', '10')");
+                                       $CONF['DefaultListSize'] = 10;
+                               }
+                       ?>
+                               <input name="DefaultListSize" tabindex="10079" size="40" value="<?php echo  Entity::hsc((intval($CONF['DefaultListSize']) < 1 ? '10' : $CONF['DefaultListSize'])) ?>" />
+                       </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_ADMINCSS ?> 
+                       </td>
+                       <td>
+
+                               <select name="AdminCSS" tabindex="10080">
+                               <?php                      // show a dropdown list of all available admin css files
+                               global $DIR_NUCLEUS;
+                               
+                               $dirhandle = opendir($DIR_NUCLEUS."styles/");
+
+                               while ($filename = readdir($dirhandle) )
+                               {
+
+                                       # replaced ereg() below with preg_match(). ereg* functions are deprecated in PHP 5.3.0
+                                       # original ereg: ereg("^(.*)\.php$",$filename,$matches)
+
+                                       if (preg_match('#^admin_(.*)\.css$#', $filename, $matches) )
+                                       {
+
+                                               $name = $matches[1];
+                                               echo "<option value=\"$name\"";
+
+                                               if ($name == $CONF['AdminCSS'])
+                                               {
+                                                       echo " selected=\"selected\"";
+                                               }
+
+                                               echo ">$name</option>";
+
+                                       }
+
+                               }
+
+                               closedir($dirhandle);
+
+                               ?>
+                               </select>
+
+                       </td>
+               </tr><tr>
+                       <th colspan="2"><?php echo _SETTINGS_MEDIA ?> <?php help('media'); ?></th>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_MEDIADIR ?></td>
+                       <td><?php echo  Entity::hsc($DIR_MEDIA) ?>
+                               <i><?php echo _SETTINGS_SEECONFIGPHP ?></i>
+                               <?php                              if (!is_dir($DIR_MEDIA))
+                                               echo "<br /><b>" . _WARNING_NOTADIR . "</b>";
+                                       if (!is_readable($DIR_MEDIA))
+                                               echo "<br /><b>" . _WARNING_NOTREADABLE . "</b>";
+                                       if (!is_writeable($DIR_MEDIA))
+                                               echo "<br /><b>" . _WARNING_NOTWRITABLE . "</b>";
+                               ?>
+                       </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_MEDIAURL ?></td>
+                       <td>
+                               <input name="MediaURL" tabindex="10090" size="40" value="<?php echo  Entity::hsc($CONF['MediaURL']) ?>" />
+                       </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_ALLOWUPLOAD ?></td>
+                       <td><?php $this->input_yesno('AllowUpload',$CONF['AllowUpload'],10090); ?></td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_ALLOWUPLOADTYPES ?></td>
+                       <td>
+                               <input name="AllowedTypes" tabindex="10100" size="40" value="<?php echo  Entity::hsc($CONF['AllowedTypes']) ?>" />
+                       </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_MAXUPLOADSIZE ?></td>
+                       <td>
+                               <input name="MaxUploadSize" tabindex="10105" size="40" value="<?php echo  Entity::hsc($CONF['MaxUploadSize']) ?>" />
+                       </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_MEDIAPREFIX ?></td>
+                       <td><?php $this->input_yesno('MediaPrefix',$CONF['MediaPrefix'],10110); ?></td>
+
+               </tr><tr>
+                       <th colspan="2"><?php echo _SETTINGS_MEMBERS ?></th>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_CHANGELOGIN ?></td>
+                       <td><?php $this->input_yesno('AllowLoginEdit',$CONF['AllowLoginEdit'],10120); ?></td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_ALLOWCREATE ?>
+                               <?php help('allowaccountcreation'); ?>
+                       </td>
+                       <td><?php $this->input_yesno('AllowMemberCreate',$CONF['AllowMemberCreate'],10130); ?>
+                       </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_NEWLOGIN ?> <?php help('allownewmemberlogin'); ?>
+                               <br /><?php echo _SETTINGS_NEWLOGIN2 ?>
+                       </td>
+                       <td><?php $this->input_yesno('NewMemberCanLogon',$CONF['NewMemberCanLogon'],10140); ?>
+                       </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_MEMBERMSGS ?>
+                               <?php help('messageservice'); ?>
+                       </td>
+                       <td><?php $this->input_yesno('AllowMemberMail',$CONF['AllowMemberMail'],10150); ?>
+                       </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_NONMEMBERMSGS ?>
+                               <?php help('messageservice'); ?>
+                       </td>
+                       <td><?php $this->input_yesno('NonmemberMail',$CONF['NonmemberMail'],10155); ?>
+                       </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_PROTECTMEMNAMES ?>
+                               <?php help('protectmemnames'); ?>
+                       </td>
+                       <td><?php $this->input_yesno('ProtectMemNames',$CONF['ProtectMemNames'],10156); ?>
+                       </td>
+
+
+
+               </tr><tr>
+                       <th colspan="2"><?php echo _SETTINGS_COOKIES_TITLE ?> <?php help('cookies'); ?></th>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_COOKIEPREFIX ?></td>
+                       <td><input name="CookiePrefix" tabindex="10159" size="40" value="<?php echo  Entity::hsc($CONF['CookiePrefix']) ?>" /></td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_COOKIEDOMAIN ?></td>
+                       <td><input name="CookieDomain" tabindex="10160" size="40" value="<?php echo  Entity::hsc($CONF['CookieDomain']) ?>" /></td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_COOKIEPATH ?></td>
+                       <td><input name="CookiePath" tabindex="10170" size="40" value="<?php echo  Entity::hsc($CONF['CookiePath']) ?>" /></td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_COOKIESECURE ?></td>
+                       <td><?php $this->input_yesno('CookieSecure',$CONF['CookieSecure'],10180); ?></td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_COOKIELIFE ?></td>
+                       <td><?php $this->input_yesno('SessionCookie',$CONF['SessionCookie'],10190,
+                                                         1,0,_SETTINGS_COOKIESESSION,_SETTINGS_COOKIEMONTH); ?>
+                       </td>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_LASTVISIT ?></td>
+                       <td><?php $this->input_yesno('LastVisit',$CONF['LastVisit'],10200); ?></td>
+
+
+
+               </tr><tr>
+                       <th colspan="2"><?php echo _SETTINGS_UPDATE ?></th>
+               </tr><tr>
+                       <td><?php echo _SETTINGS_UPDATE ?></td>
+                       <td><input type="submit" tabindex="10210" value="<?php echo _SETTINGS_UPDATE_BTN ?>" onclick="return checkSubmit();" /></td>
+               </tr></table>
+
+               </div>
+               </form>
+
+               <?php
+                       echo '<h2>',_PLUGINS_EXTRA,'</h2>';
+
+                       $manager->notify(
+                               'GeneralSettingsFormExtras',
+                               array()
+                       );
+
+               $this->pagefoot();
+=======
                
                $member->isAdmin() or self::disallow();
                
                self::$skin->parse('settingsedit');
                return;
+>>>>>>> skinnable-master
        }
        
        /**
@@ -4338,8 +9281,189 @@ class Admin
         */
        static private function action_systemoverview()
        {
+<<<<<<< HEAD
+               global $member, $nucleus, $CONF;
+               
+               $this->pagehead();
+               
+               echo '<h2>' . _ADMIN_SYSTEMOVERVIEW_HEADING . "</h2>\n";
+               
+               if ( $member->isLoggedIn() && $member->isAdmin() )
+               {
+                       // Information about the used PHP and MySQL installation
+                       echo '<h3>' . _ADMIN_SYSTEMOVERVIEW_PHPANDMYSQL . "</h3>\n\n";
+                       
+                       // Version of PHP MySQL
+                       echo '<table frame="box" rules="all" summary="' . _ADMIN_SYSTEMOVERVIEW_VERSIONS . "\" class=\"systemoverview\">\n";
+                       echo "<thead>\n";
+                       echo "<tr>\n";
+                       echo '<th colspan="2">' . _ADMIN_SYSTEMOVERVIEW_VERSIONS . "</th>\n";
+                       echo "</tr>\n";
+                       echo "</thead>\n";
+                       echo "<tbody>\n";
+                       echo "<tr>\n";
+                       echo '<td>' . _ADMIN_SYSTEMOVERVIEW_PHPVERSION . "</td>\n";
+                       echo '<td>' . phpversion() . "</td>\n";
+                       echo "</tr>\n";
+                       echo "<tr>\n";
+                       echo '<td>' . _ADMIN_SYSTEMOVERVIEW_MYSQLVERSION . "</td>\n";
+                       echo '<td>' . DB::getAttribute(PDO::ATTR_SERVER_VERSION) . ' (' . DB::getAttribute(PDO::ATTR_CLIENT_VERSION) . ')' . "</td>\n";
+                       echo "</tr>\n";
+                       echo "</tbody>\n";
+                       echo "</table>\n\n";
+                       
+                       // Important PHP settings
+                       echo '<table frame="box" rules="all" summary="' . _ADMIN_SYSTEMOVERVIEW_SETTINGS . "\" class=\"systemoverview\">\n";
+                       echo "<thead>\n";
+                       echo "<tr>\n";
+                       echo '<th colspan="2">' . _ADMIN_SYSTEMOVERVIEW_SETTINGS . "</th>\n";
+                       echo "</tr>\n";
+                       echo "</thead>\n";
+                       echo "<tbody>\n";
+                       echo "<tr>\n";
+                       echo '<td>magic_quotes_gpc' . "</td>\n";
+                       $mqg = get_magic_quotes_gpc() ? 'On' : 'Off';
+                       echo '<td>' . $mqg . "</td>\n";
+                       echo "</tr>\n";
+                       echo "<tr>\n";
+                       echo '<td>magic_quotes_runtime' . "</td>\n";
+                       $mqr = get_magic_quotes_runtime() ? 'On' : 'Off';
+                       echo '<td>' . $mqr . "</td>\n";
+                       echo "</tr>\n";
+                       echo "<tr>\n";
+                       echo '<td>register_globals' . "</td>\n";
+                       $rg = ini_get('register_globals') ? 'On' : 'Off';
+                       echo '<td>' . $rg . "</td>\n";
+                       echo "</tr>\n";
+                       echo "</tbody>\n";
+                       echo "</table>\n\n";
+                       
+                       // Information about GD library
+                       $gdinfo = gd_info();
+                       echo '<table frame="box" rules="all" summary="' . _ADMIN_SYSTEMOVERVIEW_GDLIBRALY . "\" class=\"systemoverview\">\n";
+                       echo "<thead>\n";
+                       echo "<tr>\n";
+                       echo '<th colspan="2">' . _ADMIN_SYSTEMOVERVIEW_GDLIBRALY . "</th>\n";
+                       echo "</tr>\n";
+                       echo "</thead>\n";
+                       echo "<tbody>\n";
+                       foreach ( $gdinfo as $key=>$value )
+                       {
+                               if ( is_bool($value) )
+                               {
+                                       $value = $value ? _ADMIN_SYSTEMOVERVIEW_ENABLE : _ADMIN_SYSTEMOVERVIEW_DISABLE;
+                               }
+                               else
+                               {
+                                       $value = Entity::hsc($value);
+                               }
+                               echo "<tr>\n";
+                               echo '<td>' . $key . "</td>\n";
+                               echo '<td>' . $value . "</td>\n";
+                               echo "</tr>\n";
+                       }
+                       echo "</tbody>\n";
+                       echo "</table>\n\n";
+
+                       // Check if special modules are loaded
+                       ob_start();
+                       phpinfo(INFO_MODULES);
+                       $im = ob_get_contents();
+                       ob_clean();
+                       echo '<table frame="box" rules="all" summary="' . _ADMIN_SYSTEMOVERVIEW_MODULES . "\" class=\"systemoverview\">\n";
+                       echo "<thead>\n";
+                       echo "<tr>";
+                       echo '<th colspan="2">' . _ADMIN_SYSTEMOVERVIEW_MODULES . "</th>\n";
+                       echo "</tr>\n";
+                       echo "<tbody>\n";
+                       echo "<tr>\n";
+                       echo '<td>mod_rewrite' . "</td>\n";
+                       $modrewrite = (i18n::strpos($im, 'mod_rewrite') !== FALSE) ?
+                                               _ADMIN_SYSTEMOVERVIEW_ENABLE :
+                                               _ADMIN_SYSTEMOVERVIEW_DISABLE;
+                       echo '<td>' . $modrewrite . "</td>\n";
+                       echo "</tr>\n";
+                       echo "</tbody>\n";
+                       echo "</table>\n\n";
+
+                       // Information about the used Nucleus CMS
+                       echo '<h3>' . _ADMIN_SYSTEMOVERVIEW_NUCLEUSSYSTEM . "</h3>\n";
+                       global $nucleus;
+                       $nv = getNucleusVersion() / 100 . '(' . $nucleus['version'] . ')';
+                       $np = getNucleusPatchLevel();
+                       echo "<table frame=\"box\" rules=\"all\" summary=\"Nucleus CMS\" class=\"systemoverview\" class=\"systemoverview\">\n";
+                       echo "<thead>\n";
+                       echo "<tr>\n";
+                       echo '<th colspan="2">Nucleus CMS' . "</th>\n";
+                       echo "</tr>\n";
+                       echo "</thead>\n";
+                       echo "<tbody>\n";
+                       echo "<tr>\n";
+                       echo '<td>' . _ADMIN_SYSTEMOVERVIEW_NUCLEUSVERSION . "</td>\n";
+                       echo '<td>' . $nv . "</td>\n";
+                       echo "</tr>\n";
+                       echo "<tr>\n";
+                       echo '<td>' . _ADMIN_SYSTEMOVERVIEW_NUCLEUSPATCHLEVEL . "</td>\n";
+                       echo '<td>' . $np . "</td>\n";
+                       echo "</tr>\n";
+                       echo "</tbody>\n";
+                       echo "</table>\n\n";
+
+                       // Important settings of the installation
+                       echo '<table frame="box" rules="all" summary="' . _ADMIN_SYSTEMOVERVIEW_NUCLEUSSETTINGS . "\" class=\"systemoverview\">\n";
+                       echo "<thead>\n";
+                       echo "<tr>\n";
+                       echo '<th colspan="2">' . _ADMIN_SYSTEMOVERVIEW_NUCLEUSSETTINGS . "</th>\n";
+                       echo "</tr>\n";
+                       echo "</thead>\n";
+                       echo "<tbody>\n";
+                       echo "<tr>\n";
+                       echo '<td>' . '$CONF[' . "'Self']</td>\n";
+                       echo '<td>' . $CONF['Self'] . "</td>\n";
+                       echo "</tr>\n";
+                       echo "<tr>\n";
+                       echo '<td>' . '$CONF[' . "'ItemURL']</td>\n";
+                       echo '<td>' . $CONF['ItemURL'] . "</td>\n";
+                       echo "</tr>\n";
+                       echo "<tr>\n";
+                       echo '<td>' . '$CONF[' . "'alertOnHeadersSent']</td>\n";
+                       $ohs = $CONF['alertOnHeadersSent'] ?
+                                               _ADMIN_SYSTEMOVERVIEW_ENABLE :
+                                               _ADMIN_SYSTEMOVERVIEW_DISABLE;
+                       echo '<td>' . $ohs . "</td>\n";
+                       echo "</tr>\n";
+                       echo "<tr>\n";
+                       echo "<td>i18n::get_current_charset()</td>\n";
+                       echo '<td>' . i18n::get_current_charset() . "</td>\n";
+                       echo "</tr>\n";
+                       echo "</tbody>\n";
+                       echo "</table>\n\n";
+
+                       // Link to the online version test at the Nucleus CMS website
+                       echo '<h3>' . _ADMIN_SYSTEMOVERVIEW_VERSIONCHECK . "</h3>\n";
+                       if ( $nucleus['codename'] != '')
+                       {
+                               $codenamestring = ' &quot;' . $nucleus['codename'] . '&quot;';
+                       }
+                       else
+                       {
+                               $codenamestring = '';
+                       }
+                       echo _ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TXT;
+                       $checkURL = sprintf(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_URL, getNucleusVersion(), getNucleusPatchLevel());
+                       echo '<a href="' . $checkURL . '" title="' . _ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE . '">';
+                       echo 'Nucleus CMS ' . $nv . $codenamestring;
+                       echo '</a>';
+               }
+               else
+               {
+                       echo _ADMIN_SYSTEMOVERVIEW_NOT_ADMIN;
+               }
+               $this->pagefoot();
+=======
                self::$skin->parse('systemoverview');
                return;
+>>>>>>> skinnable-master
        }
        
        /**
@@ -4351,12 +9475,24 @@ class Admin
         */
        static private function updateConfig($name, $val)
        {
+<<<<<<< HEAD
+               $name = DB::quoteValue($name);
+               $val = DB::quoteValue(trim($val));
+               
+               $query = "UPDATE %s SET value=%s WHERE name=%s";
+               $query = sprintf($query, sql_table('config'), $val, $name);
+               if ( DB::execute($query) === FALSE )
+               {
+                       $err = DB::getError();
+                       die("Query error: " . $err[2]);
+=======
                $query = "UPDATE %s SET value=%s WHERE name=%s";
                $query = sprintf($query, sql_table('config'), DB::quoteValue($val), DB::quoteValue($name));
                if ( DB::execute($query) === FALSE )
                {
                        $err = DB::getError();
                        die(_ADMIN_SQLDIE_QUERYERROR . $err[2]);
+>>>>>>> skinnable-master
                }
                return DB::getInsertId();
        }
@@ -4410,9 +9546,68 @@ class Admin
         * @param       void
         * @return      void
         */
+<<<<<<< HEAD
+       function pagehead($extrahead = '')
+       {
+               global $member, $nucleus, $CONF, $manager;
+               
+               $manager->notify(
+                       'AdminPrePageHead',
+                       array(
+                               'extrahead' => &$extrahead,
+                               'action' => $this->action));
+               
+               $baseUrl = Entity::hsc($CONF['AdminURL']);
+               if ( !array_key_exists('AdminCSS',$CONF) )
+               {
+                       DB::execute("INSERT INTO ".sql_table('config')." VALUES ('AdminCSS', 'original')");
+                       $CONF['AdminCSS'] = 'original';
+               }
+               
+               /* HTTP 1.1 application for no caching */
+               header("Cache-Control: no-cache, must-revalidate");
+               header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
+               
+               $root_element = 'html';
+               $charset = i18n::get_current_charset();
+               $locale = preg_replace('#_#', '-', i18n::get_current_locale());
+               
+               echo "<?xml version=\"{$this->xml_version_info}\" encoding=\"{$charset}\" ?>\n";
+               echo "<!DOCTYPE {$root_element} PUBLIC \"{$this->formal_public_identifier}\" \"{$this->system_identifier}\">\n";
+               echo "<{$root_element} xmlns=\"{$this->xhtml_namespace}\" xml:lang=\"{$locale}\" lang=\"{$locale}\">\n";
+               echo "<head>\n";
+               echo '<title>' . Entity::hsc($CONF['SiteName']) . " - Admin</title>\n";
+               echo "<link rel=\"stylesheet\" title=\"Nucleus Admin Default\" type=\"text/css\" href=\"{$baseUrl}styles/admin_{$CONF["AdminCSS"]}.css\" />\n";
+               echo "<link rel=\"stylesheet\" title=\"Nucleus Admin Default\" type=\"text/css\" href=\"{$baseUrl}styles/addedit.css\" />\n";
+               echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascript/edit.js\"></script>\n";
+               echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascript/admin.js\"></script>\n";
+               echo "<script type=\"text/javascript\" src=\"{$baseUrl}javascript/compatibility.js\"></script>\n";
+               echo "{$extrahead}\n";
+               echo "</head>\n\n";
+               echo "<body>\n";
+               echo "<div id=\"adminwrapper\">\n";
+               echo "<div class=\"header\">\n";
+               echo '<h1>' . Entity::hsc($CONF['SiteName']) . "</h1>\n";
+               echo "</div>\n";
+               echo "<div id=\"container\">\n";
+               echo "<div id=\"content\">\n";
+               echo "<div class=\"loginname\">\n";
+               if ( $member->isLoggedIn() )
+               {
+                       echo _LOGGEDINAS . ' ' . $member->getDisplayName() ." - <a href='index.php?action=logout'>" . _LOGOUT. "</a><br />\n";
+                       echo "<a href='index.php?action=overview'>" . _ADMINHOME . "</a> - ";
+               }
+               else
+               {
+                       echo '<a href="index.php?action=showlogin" title="Log in">' . _NOTLOGGEDIN . "</a><br />\n";
+               }
+               echo "<a href='".$CONF['IndexURL']."'>"._YOURSITE."</a><br />\n";
+               echo '(';
+=======
        static private function action_bookmarklet()
        {
                global $member, $manager;
+>>>>>>> skinnable-master
                
                $blogid = intRequestVar('blogid');
                $member->teamRights($blogid) or self::disallow();
@@ -4523,11 +9718,388 @@ class Admin
        }
        
        /**
+<<<<<<< HEAD
+        * Admin::action_bookmarklet()
+=======
         * Admin::action_banlistnewfromitem()
+>>>>>>> skinnable-master
         * 
         * @param       void
         * @return      void
         */
+<<<<<<< HEAD
+       public function action_bookmarklet()
+       {
+               global $member, $manager;
+               
+               $blogid = intRequestVar('blogid');
+               $member->teamRights($blogid) or $this->disallow();
+               $blog =& $manager->getBlog($blogid);
+               
+               $this->pagehead();
+               
+               echo '<p><a href="index.php?action=overview">(' . _BACKHOME . ")</a></p>\n";
+               
+               echo '<h2>' . _BOOKMARKLET_TITLE . "</h2>\n";
+               echo '<p>';
+               echo _BOOKMARKLET_DESC1 . _BOOKMARKLET_DESC2 . _BOOKMARKLET_DESC3 . _BOOKMARKLET_DESC4 . _BOOKMARKLET_DESC5;
+               echo "</p>\n";
+               
+               echo '<h3>' . _BOOKMARKLET_BOOKARKLET . "</h3>\n";
+               echo '<p>';
+               echo _BOOKMARKLET_BMARKTEXT . '<small>' . _BOOKMARKLET_BMARKTEST . '</small>';
+               echo "</p>\n";
+               echo '<p>';
+               echo '<a href="javascript:' . rawurlencode(getBookmarklet($blogid)) . '">' . sprintf(_BOOKMARKLET_ANCHOR, Entity::hsc($blog->getName())) . '</a>';
+               echo _BOOKMARKLET_BMARKFOLLOW;
+               echo "</p>\n";
+               
+               $this->pagefoot();
+               return;
+       }
+       
+    /**
+     * @todo document this
+     */
+    function action_actionlog() {
+        global $member, $manager;
+
+        $member->isAdmin() or $this->disallow();
+
+        $this->pagehead();
+
+        echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
+
+        $url = $manager->addTicketToUrl('index.php?action=clearactionlog');
+
+        ?>
+            <h2><?php echo _ACTIONLOG_CLEAR_TITLE ?></h2>
+            <p><a href="<?php echo Entity::hsc($url) ?>"><?php echo _ACTIONLOG_CLEAR_TEXT ?></a></p>
+        <?php
+        echo '<h2>' . _ACTIONLOG_TITLE . '</h2>';
+
+        $query =  'SELECT * FROM '.sql_table('actionlog').' ORDER BY timestamp DESC';
+        $template['content'] = 'actionlist';
+        $amount = showlist($query,'table',$template);
+
+        $this->pagefoot();
+
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_banlist() {
+        global $member, $manager;
+
+        $blogid = intRequestVar('blogid');
+
+        $member->blogAdminRights($blogid) or $this->disallow();
+
+        $blog =& $manager->getBlog($blogid);
+
+        $this->pagehead();
+
+        echo '<p><a href="index.php?action=overview">(',_BACKHOME,')</a></p>';
+
+        echo '<h2>' . _BAN_TITLE . " '". $this->bloglink($blog) ."'</h2>";
+
+        $query =  'SELECT * FROM '.sql_table('ban').' WHERE blogid='.$blogid.' ORDER BY iprange';
+        $template['content'] = 'banlist';
+        $amount = showlist($query,'table',$template);
+
+        if ($amount == 0)
+            echo _BAN_NONE;
+
+        echo '<h2>'._BAN_NEW_TITLE.'</h2>';
+        echo "<p><a href='index.php?action=banlistnew&amp;blogid=$blogid'>"._BAN_NEW_TEXT."</a></p>";
+
+
+        $this->pagefoot();
+
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_banlistdelete() {
+        global $member, $manager;
+
+        $blogid = intRequestVar('blogid');
+        $iprange = requestVar('iprange');
+
+        $member->blogAdminRights($blogid) or $this->disallow();
+
+        $blog =& $manager->getBlog($blogid);
+        $banBlogName =  Entity::hsc($blog->getName());
+
+        $this->pagehead();
+        ?>
+            <h2><?php echo _BAN_REMOVE_TITLE ?></h2>
+
+            <form method="post" action="index.php">
+
+            <h3><?php echo _BAN_IPRANGE ?></h3>
+
+            <p>
+                <?php echo _CONFIRMTXT_BAN ?> <?php echo Entity::hsc($iprange) ?>
+                <input name="iprange" type="hidden" value="<?php echo Entity::hsc($iprange) ?>" />
+            </p>
+
+            <h3><?php echo _BAN_BLOGS ?></h3>
+
+            <div>
+                <input type="hidden" name="blogid" value="<?php echo $blogid ?>" />
+                <input name="allblogs" type="radio" value="0" id="allblogs_one" />
+                <label for="allblogs_one"><?php echo sprintf(_BAN_BANBLOGNAME, $banBlogName) ?></label>
+                <br />
+                <input name="allblogs" type="radio" value="1" checked="checked" id="allblogs_all" /><label for="allblogs_all"><?php echo _BAN_ALLBLOGS ?></label>
+            </div>
+
+            <h3><?php echo _BAN_DELETE_TITLE ?></h3>
+
+            <div>
+                <?php $manager->addTicketHidden() ?>
+                <input type="hidden" name="action" value="banlistdeleteconfirm" />
+                <input type="submit" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
+            </div>
+
+            </form>
+        <?php
+        $this->pagefoot();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_banlistdeleteconfirm() {
+        global $member, $manager;
+
+        $blogid = intPostVar('blogid');
+        $allblogs = postVar('allblogs');
+        $iprange = postVar('iprange');
+
+        $member->blogAdminRights($blogid) or $this->disallow();
+
+        $deleted = array();
+
+        if (!$allblogs) {
+            if (Ban::removeBan($blogid, $iprange))
+                array_push($deleted, $blogid);
+        } else {
+            // get blogs fot which member has admin rights
+            $adminblogs = $member->getAdminBlogs();
+            foreach ($adminblogs as $blogje) {
+                if (Ban::removeBan($blogje, $iprange))
+                    array_push($deleted, $blogje);
+            }
+        }
+
+        if (sizeof($deleted) == 0)
+            $this->error(_ERROR_DELETEBAN);
+
+        $this->pagehead();
+
+        echo '<a href="index.php?action=banlist&amp;blogid=',$blogid,'">(',_BACK,')</a>';
+        echo '<h2>'._BAN_REMOVED_TITLE.'</h2>';
+        echo "<p>"._BAN_REMOVED_TEXT."</p>";
+
+        echo "<ul>";
+        foreach ($deleted as $delblog) {
+            $b =& $manager->getBlog($delblog);
+            echo "<li>" . Entity::hsc($b->getName()). "</li>";
+        }
+        echo "</ul>";
+
+        $this->pagefoot();
+
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_banlistnewfromitem() {
+        $this->action_banlistnew(getBlogIDFromItemID(intRequestVar('itemid')));
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_banlistnew($blogid = '') {
+        global $member, $manager;
+
+        if ($blogid == '')
+            $blogid = intRequestVar('blogid');
+
+        $ip = requestVar('ip');
+
+        $member->blogAdminRights($blogid) or $this->disallow();
+
+        $blog =& $manager->getBlog($blogid);
+
+        $this->pagehead();
+        ?>
+        <h2><?php echo _BAN_ADD_TITLE ?></h2>
+
+
+        <form method="post" action="index.php">
+
+        <h3><?php echo _BAN_IPRANGE ?></h3>
+
+        <p><?php echo _BAN_IPRANGE_TEXT ?></p>
+
+        <div class="note">
+            <strong><?php echo _BAN_EXAMPLE_TITLE ?></strong>
+            <?php echo _BAN_EXAMPLE_TEXT ?>
+        </div>
+
+        <div>
+        <?php
+        if ($ip) {
+            $iprangeVal = Entity::hsc($ip);
+        ?>
+            <input name="iprange" type="radio" value="<?php echo $iprangeVal ?>" checked="checked" id="ip_fixed" />
+            <label for="ip_fixed"><?php echo $iprangeVal ?></label>
+            <br />
+            <input name="iprange" type="radio" value="custom" id="ip_custom" />
+            <label for="ip_custom"><?php echo _BAN_IP_CUSTOM ?></label>
+            <input name='customiprange' value='<?php echo $iprangeVal ?>' maxlength='15' size='15' />
+        <?php
+        } else {
+            echo "<input name='iprange' value='custom' type='hidden' />";
+            echo "<input name='customiprange' value='' maxlength='15' size='15' />";
+        }
+        ?>
+        </div>
+
+        <h3><?php echo _BAN_BLOGS ?></h3>
+
+        <p><?php echo _BAN_BLOGS_TEXT ?></p>
+
+        <div>
+            <input type="hidden" name="blogid" value="<?php echo $blogid ?>" />
+            <input name="allblogs" type="radio" value="0" id="allblogs_one" /><label for="allblogs_one">'<?php echo Entity::hsc($blog->getName()) ?>'</label>
+            <br />
+            <input name="allblogs" type="radio" value="1" checked="checked" id="allblogs_all" /><label for="allblogs_all"><?php echo _BAN_ALLBLOGS ?></label>
+        </div>
+
+        <h3><?php echo _BAN_REASON_TITLE ?></h3>
+
+        <p><?php echo _BAN_REASON_TEXT ?></p>
+
+        <div><textarea name="reason" cols="40" rows="5"></textarea></div>
+
+        <h3><?php echo _BAN_ADD_TITLE ?></h3>
+
+        <div>
+            <input name="action" type="hidden" value="banlistadd" />
+            <?php $manager->addTicketHidden() ?>
+            <input type="submit" value="<?php echo _BAN_ADD_BTN ?>" />
+        </div>
+
+        </form>
+
+        <?php       $this->pagefoot();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_banlistadd() {
+        global $member;
+
+        $blogid =       intPostVar('blogid');
+        $allblogs =     postVar('allblogs');
+        $iprange =      postVar('iprange');
+        if ($iprange == "custom")
+            $iprange = postVar('customiprange');
+        $reason =       postVar('reason');
+
+        $member->blogAdminRights($blogid) or $this->disallow();
+
+        // TODO: check IP range validity
+
+        if (!$allblogs) {
+            if (!Ban::addBan($blogid, $iprange, $reason))
+                $this->error(_ERROR_ADDBAN);
+        } else {
+            // get blogs fot which member has admin rights
+            $adminblogs = $member->getAdminBlogs();
+            $failed = 0;
+            foreach ($adminblogs as $blogje) {
+                if (!Ban::addBan($blogje, $iprange, $reason))
+                    $failed = 1;
+            }
+            if ($failed)
+                $this->error(_ERROR_ADDBAN);
+        }
+
+        $this->action_banlist();
+
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_clearactionlog() {
+        global $member;
+
+        $member->isAdmin() or $this->disallow();
+
+        ActionLog::clear();
+
+        $this->action_manage(_MSG_ACTIONLOGCLEARED);
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_backupoverview() {
+        global $member, $manager;
+
+        $member->isAdmin() or $this->disallow();
+
+        $this->pagehead();
+
+        echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
+        ?>
+        <h2><?php echo _BACKUPS_TITLE ?></h2>
+
+        <h3><?php echo _BACKUP_TITLE ?></h3>
+
+        <p><?php echo _BACKUP_INTRO ?></p>
+
+        <form method="post" action="index.php"><p>
+        <input type="hidden" name="action" value="backupcreate" />
+        <?php $manager->addTicketHidden() ?>
+
+        <input type="radio" name="gzip" value="1" checked="checked" id="gzip_yes" tabindex="10" /><label for="gzip_yes"><?php echo _BACKUP_ZIP_YES ?></label>
+        <br />
+        <input type="radio" name="gzip" value="0" id="gzip_no" tabindex="10" /><label for="gzip_no" ><?php echo _BACKUP_ZIP_NO ?></label>
+        <br /><br />
+        <input type="submit" value="<?php echo _BACKUP_BTN ?>" tabindex="20" />
+
+        </p></form>
+
+        <div class="note"><?php echo _BACKUP_NOTE ?></div>
+
+
+        <h3><?php echo _RESTORE_TITLE ?></h3>
+
+        <div class="note"><?php echo _RESTORE_NOTE ?></div>
+
+        <p><?php echo _RESTORE_INTRO ?></p>
+
+        <form method="post" action="index.php" enctype="multipart/form-data"><p>
+            <input type="hidden" name="action" value="backuprestore" />
+            <?php $manager->addTicketHidden() ?>
+            <input name="backup_file" type="file" tabindex="30" />
+            <br /><br />
+            <input type="submit" value="<?php echo _RESTORE_BTN ?>" tabindex="40" />
+            <br /><input type="checkbox" name="letsgo" value="1" id="letsgo" tabindex="50" /><label for="letsgo"><?php echo _RESTORE_IMSURE ?></label>
+            <br /><?php echo _RESTORE_WARNING ?>
+        </p></form>
+=======
        static private function action_banlistnewfromitem()
        {
                global $manager;
@@ -4564,6 +10136,7 @@ class Admin
                
                return;
        }
+>>>>>>> skinnable-master
 
        /**
         * Admin::action_banlistadd()
@@ -4744,8 +10317,28 @@ class Admin
        {
                global $member, $manager, $DIR_PLUGINS, $CONF;
                
+<<<<<<< HEAD
+               while ( $filename = readdir($dirhandle) )
+               {
+                       if ( preg_match('#^NP_(.*)\.php$#', $filename, $matches) )
+                       {
+                               $name = $matches[1];
+                               
+                               // only show in list when not yet installed
+                               $query = 'SELECT * FROM %s WHERE pfile = %s';
+                               $query = sprintf($query, sql_table('plugin'), DB::quoteValue('NP_'.$name));
+                               $res = DB::getResult($query);
+                               
+                               if ( $res->rowCount() == 0 )
+                               {
+                                       array_push($candidates, $name);
+                               }
+                       }
+               }
+=======
                // check if allowed
                $member->isAdmin() or self::disallow();
+>>>>>>> skinnable-master
                
                $plugid = intGetVar('plugid');
                
@@ -4759,6 +10352,45 @@ class Admin
                return;
        }
        
+<<<<<<< HEAD
+    /**
+     * @todo document this
+     */
+    function action_pluginhelp() {
+        global $member, $manager, $DIR_PLUGINS, $CONF;
+
+        // check if allowed
+        $member->isAdmin() or $this->disallow();
+
+        $plugid = intGetVar('plugid');
+
+        if (!$manager->pidInstalled($plugid))
+            $this->error(_ERROR_NOSUCHPLUGIN);
+
+        $plugName = $manager->getPluginNameFromPid($plugid);
+
+        $this->pagehead();
+
+        echo '<p><a href="index.php?action=pluginlist">(',_PLUGS_BACK,')</a></p>';
+
+        echo '<h2>',_PLUGS_HELP_TITLE,': ',Entity::hsc($plugName),'</h2>';
+
+        $plug =& $manager->getPlugin($plugName);
+        $helpFile = $DIR_PLUGINS.$plug->getShortName().'/help.html';
+
+        if (($plug->supportsFeature('HelpPage') > 0) && (@file_exists($helpFile))) {
+            @readfile($helpFile);
+        } else {
+            echo '<p>Error: ', _ERROR_PLUGNOHELPFILE,'</p>';
+            echo '<p><a href="index.php?action=pluginlist">(',_BACK,')</a></p>';
+        }
+
+
+        $this->pagefoot();
+    }
+
+=======
+>>>>>>> skinnable-master
        /**
         * Admin::action_pluginadd()
         * 
@@ -4788,7 +10420,11 @@ class Admin
                }
                
                // get number of currently installed plugins
+<<<<<<< HEAD
+               $res = DB::getResult('SELECT * FROM '.sql_table('plugin'));
+=======
                $res = DB::getResult('SELECT * FROM ' . sql_table('plugin'));
+>>>>>>> skinnable-master
                $numCurrent = $res->rowCount();
                
                // plugin will be added as last one in the list
@@ -4798,8 +10434,12 @@ class Admin
                $manager->notify('PreAddPlugin', $data);
                
                // do this before calling getPlugin (in case the plugin id is used there)
+<<<<<<< HEAD
+               $query = 'INSERT INTO '.sql_table('plugin').' (porder, pfile) VALUES ('.$newOrder.','.DB::quoteValue($name).')';
+=======
                $query = "INSERT INTO %s (porder, pfile) VALUES (%d, %s);";
                $query = sprintf($query, sql_table('plugin'), (integer) $newOrder, DB::quoteValue($name));
+>>>>>>> skinnable-master
                DB::execute($query);
                $iPid = DB::getInsertId();
                
@@ -4811,11 +10451,15 @@ class Admin
                // check if it got loaded (could have failed)
                if ( !$plugin )
                {
+<<<<<<< HEAD
+                       DB::execute('DELETE FROM ' . sql_table('plugin') . ' WHERE pid='. intval($iPid));
+=======
                        $query = "DELETE FROM %s WHERE pid=%d;";
                        $query = sprintf($query, sql_table('plugin'), (integer) $iPid);
                        
                        DB::execute($query);
                        
+>>>>>>> skinnable-master
                        $manager->clearCachedInfo('installedPlugins');
                        self::error(_ERROR_PLUGIN_LOAD);
                        return;
@@ -5059,8 +10703,18 @@ class Admin
                
                if ( !$manager->pidInstalled($plugid) )
                {
+<<<<<<< HEAD
+                       $res = DB::getResult('SELECT * FROM '.sql_table('plugin') . ' WHERE pfile=' . DB::quoteValue($pluginName));
+                       if ($res->rowCount() == 0)
+                       {
+                               // uninstall plugin again...
+                               $this->deleteOnePlugin($plugin->getID());
+                               $this->error(sprintf(_ERROR_INSREQPLUGIN, Entity::hsc($pluginName)));
+                       }
+=======
                        self::error(_ERROR_NOSUCHPLUGIN);
                        return;
+>>>>>>> skinnable-master
                }
                
                // 1. get old order number
@@ -5090,6 +10744,29 @@ class Admin
                global $member, $manager, $CONF;
                
                // check if allowed
+<<<<<<< HEAD
+               $member->isAdmin() or $this->disallow();
+               
+               // delete everything from plugin_events
+               DB::execute('DELETE FROM '.sql_table('plugin_event'));
+               
+               // loop over all installed plugins
+               $res = DB::getResult('SELECT pid, pfile FROM '.sql_table('plugin'));
+               foreach ( $res as $row )
+               {
+                       $pid = $row['pid'];
+                       $plug =& $manager->getPlugin($row['pfile']);
+                       if ( $plug )
+                       {
+                               $eventList = $plug->getEventList();
+                               foreach ( $eventList as $eventName )
+                               {
+                                       $query = "INSERT INTO %s (pid, event) VALUES (%d, %s)";
+                                       $query = sprintf($query, sql_table('plugin_event'), (integer) $pid, DB::quoteValue($eventName));
+                                       DB::execute($query);
+                               }
+                       }
+=======
                $member->isAdmin() or self::disallow();
                
                $plugid = intGetVar('plugid');
@@ -5097,6 +10774,7 @@ class Admin
                {
                        self::error(_ERROR_NOSUCHPLUGIN);
                        return;
+>>>>>>> skinnable-master
                }
                
                // 1. get old order number
@@ -5118,6 +10796,192 @@ class Admin
                return;
        }
        
+<<<<<<< HEAD
+    /**
+     * @todo document this
+     */
+    function action_plugindelete() {
+        global $member, $manager;
+
+        // check if allowed
+        $member->isAdmin() or $this->disallow();
+
+        $pid = intGetVar('plugid');
+
+        if (!$manager->pidInstalled($pid))
+            $this->error(_ERROR_NOSUCHPLUGIN);
+
+        $this->pagehead();
+        ?>
+            <h2><?php echo _DELETE_CONFIRM ?></h2>
+
+            <p><?php echo _CONFIRMTXT_PLUGIN ?> <strong><?php echo $manager->getPluginNameFromPid($pid) ?></strong>?</p>
+
+            <form method="post" action="index.php"><div>
+            <?php $manager->addTicketHidden() ?>
+            <input type="hidden" name="action" value="plugindeleteconfirm" />
+            <input type="hidden" name="plugid" value="<?php echo $pid; ?>" />
+            <input type="submit" tabindex="10" value="<?php echo _DELETE_CONFIRM_BTN ?>" />
+            </div></form>
+        <?php
+        $this->pagefoot();
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_plugindeleteconfirm() {
+        global $member, $manager, $CONF;
+
+        // check if allowed
+        $member->isAdmin() or $this->disallow();
+
+        $pid = intPostVar('plugid');
+
+        $error = $this->deleteOnePlugin($pid, 1);
+        if ($error) {
+            $this->error($error);
+        }
+
+        redirect($CONF['AdminURL'] . '?action=pluginlist');
+//             $this->action_pluginlist();
+    }
+
+    /**
+     * @todo document this
+     */
+    function deleteOnePlugin($pid, $callUninstall = 0) {
+        global $manager;
+
+        $pid = intval($pid);
+
+        if (!$manager->pidInstalled($pid))
+            return _ERROR_NOSUCHPLUGIN;
+
+        $name = DB::getValue('SELECT pfile as result FROM '.sql_table('plugin').' WHERE pid='.$pid);
+
+/*             // call the unInstall method of the plugin
+        if ($callUninstall) {
+            $plugin =& $manager->getPlugin($name);
+            if ($plugin) $plugin->unInstall();
+        }*/
+
+        // check dependency before delete
+        $res = DB::getResult('SELECT pfile FROM '.sql_table('plugin'));
+        foreach ( $res as $row ) {
+            $plug =& $manager->getPlugin($row['pfile']);
+            if ($plug)
+            {
+                $depList = $plug->getPluginDep();
+                foreach ($depList as $depName)
+                {
+                    if ($name == $depName)
+                    {
+                        return sprintf(_ERROR_DELREQPLUGIN, $row['pfile']);
+                    }
+                }
+            }
+        }
+
+        $manager->notify('PreDeletePlugin', array('plugid' => $pid));
+
+        // call the unInstall method of the plugin
+        if ($callUninstall) {
+            $plugin =& $manager->getPlugin($name);
+            if ($plugin) $plugin->unInstall();
+        }
+
+        // delete all subscriptions
+        DB::execute('DELETE FROM '.sql_table('plugin_event').' WHERE pid=' . $pid);
+
+        // delete all options
+        // get OIDs from plugin_option_desc
+        $res = DB::getResult('SELECT oid FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid);
+        $aOIDs = array();
+        foreach ( $res as $row ) {
+            array_push($aOIDs, $row['oid']);
+        }
+
+        // delete from plugin_option and plugin_option_desc
+        DB::execute('DELETE FROM '.sql_table('plugin_option_desc').' WHERE opid=' . $pid);
+        if (count($aOIDs) > 0)
+            DB::execute('DELETE FROM '.sql_table('plugin_option').' WHERE oid in ('.implode(',',$aOIDs).')');
+
+        // update order numbers
+        $res = DB::getValue('SELECT porder FROM '.sql_table('plugin').' WHERE pid=' . $pid);
+        DB::execute('UPDATE '.sql_table('plugin').' SET porder=(porder - 1) WHERE porder>'.$res);
+
+        // delete row
+        DB::execute('DELETE FROM '.sql_table('plugin').' WHERE pid='.$pid);
+
+        $manager->clearCachedInfo('installedPlugins');
+        $manager->notify('PostDeletePlugin', array('plugid' => $pid));
+
+        return '';
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_pluginup() {
+        global $member, $manager, $CONF;
+
+        // check if allowed
+        $member->isAdmin() or $this->disallow();
+
+        $plugid = intGetVar('plugid');
+
+        if (!$manager->pidInstalled($plugid))
+            $this->error(_ERROR_NOSUCHPLUGIN);
+
+        // 1. get old order number
+        $oldOrder = DB::getValue('SELECT porder FROM '.sql_table('plugin').' WHERE pid='.$plugid);
+
+        // 2. calculate new order number
+        $newOrder = ($oldOrder > 1) ? ($oldOrder - 1) : 1;
+
+        // 3. update plug numbers
+        DB::execute('UPDATE '.sql_table('plugin').' SET porder='.$oldOrder.' WHERE porder='.$newOrder);
+        DB::execute('UPDATE '.sql_table('plugin').' SET porder='.$newOrder.' WHERE pid='.$plugid);
+
+        //$this->action_pluginlist();
+        // To avoid showing ticket in the URL, redirect to pluginlist, instead.
+        redirect($CONF['AdminURL'] . '?action=pluginlist');
+    }
+
+    /**
+     * @todo document this
+     */
+    function action_plugindown() {
+        global $member, $manager, $CONF;
+
+        // check if allowed
+        $member->isAdmin() or $this->disallow();
+
+        $plugid = intGetVar('plugid');
+        if (!$manager->pidInstalled($plugid))
+            $this->error(_ERROR_NOSUCHPLUGIN);
+
+        // 1. get old order number
+        $oldOrder = DB::getValue('SELECT porder FROM '.sql_table('plugin').' WHERE pid='.$plugid);
+
+        $res = DB::getResult('SELECT * FROM '.sql_table('plugin'));
+        $maxOrder = $res->rowCount();
+
+        // 2. calculate new order number
+        $newOrder = ($oldOrder < $maxOrder) ? ($oldOrder + 1) : $maxOrder;
+
+        // 3. update plug numbers
+        DB::execute('UPDATE '.sql_table('plugin').' SET porder='.$oldOrder.' WHERE porder='.$newOrder);
+        DB::execute('UPDATE '.sql_table('plugin').' SET porder='.$newOrder.' WHERE pid='.$plugid);
+
+        //$this->action_pluginlist();
+        // To avoid showing ticket in the URL, redirect to pluginlist, instead.
+        redirect($CONF['AdminURL'] . '?action=pluginlist');
+    }
+       
+=======
+>>>>>>> skinnable-master
        /**
         * Admin::action_pluginoptions()
         * 
@@ -5142,9 +11006,70 @@ class Admin
                        return;
                }
                
+<<<<<<< HEAD
+               $pname = $manager->getPluginNameFromPid($pid);
+               
+               /* NOTE: to include translation file */
+               $manager->getPlugin($pname);
+               
+               $extrahead = "<script type=\"text/javascript\" src=\"javascript/numbercheck.js\"></script>\n";
+               $this->pagehead($extrahead);
+               echo '<p><a href="index.php?action=pluginlist">(' . _PLUGS_BACK . ")</a></p>\n";
+               echo '<h2>' . sprintf(_PLUGIN_OPTIONS_TITLE, Entity::hsc($pname)) . "</h2>\n";
+               
+               if ( isset($message) )
+               {
+                       echo $message;
+               }
+               
+               echo "<form action=\"index.php\" method=\"post\">\n";
+               echo "<div>\n";
+               echo "<input type=\"hidden\" name=\"action\" value=\"pluginoptionsupdate\" />\n";
+               echo "<input type=\"hidden\" name=\"plugid\" value=\"{$pid}\" />\n";
+               $manager->addTicketHidden();
+               
+               $options = array();
+               $query = "SELECT * FROM %s WHERE ocontext='global' and opid=%d ORDER BY oid ASC";
+               $query = sprintf($query, sql_table('plugin_option_desc'), $pid);
+               $result = DB::getResult($query);
+               foreach ( $result as $row )
+               {
+                       $options[$row['oid']] = array(
+                               'oid'           => $row['oid'],
+                               'value'         => $row['odef'],
+                               'name'          => $row['oname'],
+                               'description' => $row['odesc'],
+                               'type'          => $row['otype'],
+                               'typeinfo'      => $row['oextra'],
+                               'contextid'     => 0
+                       );
+               }
+               // fill out actual values
+               if ( count($options) > 0 )
+               {
+                       $query = "SELECT oid, ovalue FROM %s WHERE oid in (%s)";
+                       $query = sprintf($query, sql_table('plugin_option'), implode(',',array_keys($options)));
+                       $result = DB::getResult($query);
+                       foreach ( $result as $row )
+                       {
+                               $options[$row['oid']]['value'] = $row['ovalue'];
+                       }
+               }
+               
+               // call plugins
+               $data = array('context' => 'global', 'plugid' => $pid, 'options'=>&$options);
+               $manager->notify('PrePluginOptionsEdit',$data);
+               
+               $template['content'] = 'plugoptionlist';
+               $amount = showlist($options,'table', $template);
+               if ( $amount == 0 )
+               {
+                       echo '<p>',_ERROR_NOPLUGOPTIONS,'</p>';
+=======
                if ( isset($message) )
                {
                        self::$headMess = $message;
+>>>>>>> skinnable-master
                }
                $plugname       = $manager->getPluginNameFromPid($pid);
                $plugin         = $manager->getPlugin($plugname);
@@ -5284,6 +11209,61 @@ class Admin
        {
                global $manager;
                
+<<<<<<< HEAD
+               /* get current registered plugin option list in this context even if it's not used */
+               $query = 'SELECT * FROM %s AS plugins, %s AS options LEFT OUTER JOIN %s AS added '
+                      . 'ON ( options.oid=added.oid ) '
+                      . 'WHERE plugins.pid=options.opid AND options.ocontext=%s AND added.ocontextid=%d '
+                      . 'ORDER BY options.oid ASC';
+               $query = sprintf($query, sql_table('plugin'), sql_table('plugin_option_desc'), sql_table('plugin_option'), DB::quoteValue($context), intval($contextid));
+               
+               $res = DB::getResult($query);
+               
+               $options = array();
+               foreach ( $res as $row )
+               {
+                       /* NOTE: to include translation file */
+                       $manager->getPlugin($row['pfile']);
+                       
+                       $options[] = array(
+                               'pid'           => $row['pid'],
+                               'pfile'         => $row['pfile'],
+                               'oid'           => $row['oid'],
+                               'value'         => ( !$row['ovalue'] ) ? $row['odef'] : $row['ovalue'],
+                               'name'          => $row['oname'],
+                               'description' => $row['odesc'],
+                               'type'          => $row['otype'],
+                               'typeinfo'      => $row['oextra'],
+                               'contextid'     => $contextid,
+                               'extra'         => ''
+                       );
+               }
+               
+               $manager->notify('PrePluginOptionsEdit',array('context' => $context, 'contextid' => $contextid, 'options'=>&$options));
+               
+               $iPrevPid = -1;
+               foreach ( $options as $option)
+               {
+                       // new plugin?
+                       if ( $iPrevPid != $option['pid'] )
+                       {
+                               $iPrevPid = $option['pid'];
+                               if ( !defined('_PLUGIN_OPTIONS_TITLE') )
+                               {
+                                       define('_PLUGIN_OPTIONS_TITLE', 'Options for %s');
+                               }
+                               echo "<tr>\n";
+                               echo '<th colspan="2">' . sprintf(_PLUGIN_OPTIONS_TITLE, Entity::hsc($option['pfile'])) . "</th>\n";
+                               echo "</tr>\n";
+                       }
+                       
+                       $meta = NucleusPlugin::getOptionMeta($option['typeinfo']);
+                       if ( @$meta['access'] != 'hidden' )
+                       {
+                               echo '<tr>';
+                               listplug_plugOptionRow($option);
+                               echo '</tr>';
+=======
                if ( !in_array(self::$action, self::$adminskin_actions) )
                {
                        $event_identifier = 'Skin';
@@ -5366,6 +11346,7 @@ class Admin
                                $query = "INSERT INTO %s (sdesc, scontent, stype) VALUES (%d, %s, %s)";
                                $query = sprintf($query, sql_table('skin'), (integer) $newid, DB::quoteValue($content), DB::quoteValue($row['stype']));
                                DB::execute($query);
+>>>>>>> skinnable-master
                        }
                }
                return;
index 18e034a..27f7af6 100644 (file)
@@ -1,3 +1,132 @@
+<<<<<<< HEAD
+<?php\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * PHP class responsible for ban-management.\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
+ * @version $Id: BAN.php 1525 2011-06-21 10:20:19Z sakamocchi $\r
+ */\r
+\r
+class Ban\r
+{\r
+       /**\r
+        * Checks if a given IP is banned from commenting/voting\r
+        *\r
+        * Returns 0 when not banned, or a BanInfo object containing the\r
+        * message and other information of the ban\r
+        */\r
+       public function isBanned($blogid, $ip)\r
+       {\r
+               $blogid = intval($blogid);\r
+               $query = sprintf('SELECT * FROM %s WHERE blogid=%d', sql_table('ban'), intval($blogid));\r
+               $res = DB::getResult($query);\r
+               foreach ( $res as $row )\r
+               {\r
+                       $found = i18n::strpos ($ip, $row['iprange']);\r
+                       if ( $found !== false )\r
+                       {\r
+                               // found a match!\r
+                               return new BanInfo($row['iprange'], $row['reason']);\r
+                       }\r
+               }\r
+               return 0;\r
+       }\r
+\r
+       /**\r
+        * Ban::addBan()\r
+        * Adds a new ban to the banlist. Returns 1 on success, 0 on error\r
+        * \r
+        * @param       Integer $blogid ID for weblog\r
+        * @param       String  $iprange        IP range\r
+        * @param       String  $reason reason for banning\r
+        * @return      Boolean\r
+        * \r
+        */\r
+       public function addBan($blogid, $iprange, $reason)\r
+       {\r
+               global $manager;\r
+               \r
+               $manager->notify(\r
+                       'PreAddBan',\r
+                       array(\r
+                               'blogid' => $blogid,\r
+                               'iprange' => &$iprange,\r
+                               'reason' => &$reason\r
+                       )\r
+               );\r
+               \r
+               $query = 'INSERT INTO %s (blogid, iprange, reason) VALUES (%d, %s, %s)';\r
+               $query = sprintf($query, sql_table('ban'), intval($blogid), DB::quoteValue($iprange), DB::quoteValue($reason));\r
+               $res = DB::execute($query);\r
+               \r
+               $manager->notify(\r
+                       'PostAddBan',\r
+                       array(\r
+                               'blogid' => $blogid,\r
+                               'iprange' => $iprange,\r
+                               'reason' => $reason\r
+                       )\r
+               );\r
+               \r
+               return $res !== FALSE ? 1 : 0;\r
+       }\r
+       \r
+       /**\r
+        * Removes a ban from the banlist (correct iprange is needed as argument)\r
+        * Returns 1 on success, 0 on error\r
+        */\r
+       public function removeBan($blogid, $iprange)\r
+       {\r
+               global $manager;\r
+               \r
+               $manager->notify(\r
+                       'PreDeleteBan',\r
+                       array(\r
+                               'blogid' => $blogid,\r
+                               'range' => $iprange\r
+                       )\r
+               );\r
+               \r
+               $query = 'DELETE FROM %s WHERE blogid=%d and iprange=%s';\r
+               $query = sprintf($query, sql_table('ban'), intval($blogid), DB::quoteValue($iprange));\r
+               $res = DB::execute($query);\r
+               \r
+               $manager->notify(\r
+                       'PostDeleteBan',\r
+                       array(\r
+                               'blogid' => $blogid,\r
+                               'range' => $iprange\r
+                       )\r
+               );\r
+               \r
+               return $res !== FALSE ? 1 : 0;\r
+       }\r
+}\r
+\r
+class BanInfo\r
+{\r
+       public $iprange;\r
+       public $message;\r
+       \r
+       public function __construct($iprange, $message)\r
+       {\r
+               $this->iprange = $iprange;\r
+               $this->message = $message;\r
+               return;\r
+       }\r
+}\r
+=======
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
@@ -108,3 +237,4 @@ class BanInfo
                return;
        }
 }
+>>>>>>> skinnable-master
index 64ea623..bede7bd 100644 (file)
+<<<<<<< HEAD
+<?php\r
+\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * A class representing a blog and containing functions to get that blog shown\r
+ * on the screen\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group\r
+ * @version $Id: BLOG.php 1624 2012-01-09 11:36:20Z sakamocchi $\r
+ */\r
+\r
+if ( !function_exists('requestVar') ) exit;\r
+require_once dirname(__FILE__) . '/ITEMACTIONS.php';\r
+\r
+class Blog\r
+{\r
+       // blog id\r
+       public $blogid;\r
+       \r
+       // After creating an object of the blog class, contains true if the BLOG object is\r
+       // valid (the blog exists)\r
+       public $isValid;\r
+       \r
+       // associative array, containing all blogsettings (use the get/set functions instead)\r
+       private $settings;\r
+       \r
+       // ID of currently selected category\r
+       private $selectedcatid;\r
+       \r
+       /**\r
+        * Blog::_\construct()\r
+        * Creates a new BLOG object for the given blog\r
+        *\r
+        * @param       integer $id     blogid\r
+        * @return      void\r
+        */\r
+       public function __construct($id)\r
+       {\r
+               global $catid;\r
+               \r
+               $this->blogid = (integer) $id;\r
+               $this->readSettings();\r
+               $this->setSelectedCategory($catid);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::readLog()\r
+        * Shows the given amount of items for this blog\r
+        *\r
+        * @param       string  $template       String representing the template _NAME_ (!)\r
+        * @param       integer $amountEntries  amount of entries to show\r
+        * @param       integer $startpos       offset from where items should be shown (e.g. 5 = start at fifth item)\r
+        * @return      integer amount of items shown\r
+        */\r
+       public function readLog($template, $amountEntries, $offset = 0, $startpos = 0)\r
+       {\r
+               return $this->readLogAmount($template,$amountEntries,'','',1,1,$offset, $startpos);\r
+       }\r
+       \r
+       /**\r
+        * Blog::showArchive()\r
+        * Shows an archive for a given month\r
+        *\r
+        * @param       integer $year           year\r
+        * @param       integer $month          month\r
+        * @param       string  $template       String representing the template name to be used\r
+        * @return      void\r
+        */\r
+       public function showArchive($templatename, $year, $month=0, $day=0)\r
+       {\r
+               // create extra where clause for select query\r
+               if ( $day == 0 && $month != 0 )\r
+               {\r
+                       $timestamp_start = mktime(0,0,0,$month,1,$year);\r
+                       // also works when $month==12\r
+                       $timestamp_end = mktime(0,0,0,$month+1,1,$year);\r
+               }\r
+               elseif ( $month == 0 )\r
+               {\r
+                       $timestamp_start = mktime(0,0,0,1,1,$year);\r
+                       // also works when $month==12\r
+                       $timestamp_end = mktime(0,0,0,12,31,$year);\r
+               }\r
+               else\r
+               {\r
+                       $timestamp_start = mktime(0,0,0,$month,$day,$year);\r
+                       $timestamp_end = mktime(0,0,0,$month,$day+1,$year);\r
+               }\r
+               $extra_query = " and i.itime>=%s and i.itime<%s";\r
+               $extra_query = sprintf($extra_query, DB::formatDateTime($timestamp_start), DB::formatDateTime($timestamp_end));\r
+               \r
+               $this->readLogAmount($templatename,0,$extra_query,'',1,1);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setSelectedCategory()\r
+        * Sets the selected category by id (only when category exists)\r
+        * \r
+        * @param       integer $catid  ID for category\r
+        * @return      void\r
+        */\r
+       public function setSelectedCategory($catid)\r
+       {\r
+               if ( $this->isValidCategory($catid) || (intval($catid) == 0) )\r
+               {\r
+                       $this->selectedcatid = intval($catid);\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setSelectedCategoryByName()\r
+        * Sets the selected category by name\r
+        * \r
+        * @param       string  $catname        name of category\r
+        * @return      void\r
+        */\r
+       public function setSelectedCategoryByName($catname)\r
+       {\r
+               $this->setSelectedCategory($this->getCategoryIdFromName($catname));\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::getSelectedCategory()\r
+        * Returns the selected category\r
+        * \r
+        * @param       void\r
+        * @return      integer\r
+        */\r
+       public function getSelectedCategory()\r
+       {\r
+               return $this->selectedcatid;\r
+       }\r
+       \r
+       /**\r
+        * Shows the given amount of items for this blog\r
+        *\r
+        * @param       string  $template               string representing the template _NAME_ (!)\r
+        * @param       integer $amountEntries  amount of entries to show (0 = no limit)\r
+        * @param       string  $extraQuery             extra conditions to be added to the query\r
+        * @param       string  $highlight              contains a query that should be highlighted\r
+        * @param       integer $comments               1=show comments 0=don't show comments\r
+        * @param       integer $dateheads              1=show dateheads 0=don't show dateheads\r
+        * @param       integer $offset                 offset\r
+        * @return      integer amount of items shown\r
+        */\r
+       private function readLogAmount($template, $amountEntries, $extraQuery, $highlight, $comments, $dateheads, $offset = 0, $startpos = 0)\r
+       {\r
+               $query = $this->getSqlBlog($extraQuery);\r
+               \r
+               if ( $amountEntries > 0 )\r
+               {\r
+                       // $offset zou moeten worden:\r
+                       // (($startpos / $amountentries) + 1) * $offset ... later testen ...\r
+                       $query .= ' LIMIT ' . intval($startpos + $offset).',' . intval($amountEntries);\r
+               }\r
+               return $this->showUsingQuery($template, $query, $highlight, $comments, $dateheads);\r
+       }\r
+       \r
+       /**\r
+        * Blog::showUsingQuery()\r
+        * Do the job for readLogAmmount\r
+        * \r
+        * @param       string  $templateName   template name\r
+        * @param       string  $query                  string for query\r
+        * @param       string  $highlight              string to be highlighted\r
+        * @param       integer $comments               the number of comments\r
+        * @param       boolean $dateheads              date header is needed or not\r
+        * @return      integer the number of rows as a result of mysql query\r
+        */\r
+       private function showUsingQuery($templateName, $query, $highlight = '', $comments = 0, $dateheads = 1)\r
+       {\r
+               global $CONF, $manager, $currentTemplateName;\r
+               \r
+               $lastVisit = cookieVar($CONF['CookiePrefix'] .'lastVisit');\r
+               if ( $lastVisit != 0 )\r
+               {\r
+                       $lastVisit = $this->getCorrectTime($lastVisit);\r
+               }\r
+               \r
+               // set templatename as global variable (so plugins can access it)\r
+               $currentTemplateName = $templateName;\r
+               $template =& $manager->getTemplate($templateName);\r
+               \r
+               // create parser object & action handler\r
+               $handler = new ItemActions($this);\r
+               $handler->setTemplate($template);\r
+               $handler->setHighlight($highlight);\r
+               $handler->setLastVisit($lastVisit);\r
+               $handler->setShowComments($comments);\r
+               \r
+               $parser = new Parser($handler);\r
+               \r
+               // execute query\r
+               $items = DB::getResult($query);\r
+               \r
+               // loop over all items\r
+               $old_date = 0;\r
+               foreach ( $items as $item )\r
+               {\r
+                       // string timestamp -> unix timestamp\r
+                       $item['timestamp'] = strtotime($item['itime']);\r
+                       \r
+                       // action handler needs to know the item we're handling\r
+                       $handler->setCurrentItem($item);\r
+                       \r
+                       // add date header if needed\r
+                       if ( $dateheads )\r
+                       {\r
+                               $new_date = date('dFY', $item['timestamp']);\r
+                               if ( $new_date != $old_date )\r
+                               {\r
+                                       // unless this is the first time, write date footer\r
+                                       $timestamp = $item['timestamp'];\r
+                                       if ( $old_date != 0 )\r
+                                       {\r
+                                               $oldTS = strtotime($old_date);\r
+                                               $manager->notify('PreDateFoot',array('blog' => &$this, 'timestamp' => $oldTS));\r
+                                               \r
+                                               if ( !in_array('DATE_FOOTER', $template) || empty($template['DATE_FOOTER']) )\r
+                                               {\r
+                                                       $tmp_footer = '';\r
+                                               }\r
+                                               else\r
+                                               {\r
+                                                       $tmp_footer = i18n::formatted_datetime($template['DATE_FOOTER'], $oldTS);\r
+                                               }\r
+                                               $parser->parse($tmp_footer);\r
+                                               $manager->notify('PostDateFoot',array('blog' => &$this, 'timestamp' => $oldTS));\r
+                                       }\r
+                                       \r
+                                       $manager->notify('PreDateHead',array('blog' => &$this, 'timestamp' => $timestamp));\r
+                                       \r
+                                       // note, to use templatvars in the dateheader, the %-characters need to be doubled in\r
+                                       // order to be preserved by strftime\r
+                                       if ( !in_array('DATE_HEADER', $template) || empty($template['DATE_HEADER']) )\r
+                                       {\r
+                                               $tmp_header = '';\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               $tmp_header = i18n::formatted_datetime($template['DATE_HEADER'], $timestamp);\r
+                                       }\r
+                                       $parser->parse($tmp_header);\r
+                                       $manager->notify('PostDateHead',array('blog' => &$this, 'timestamp' => $timestamp));\r
+                               }\r
+                               $old_date = $new_date;\r
+                       }\r
+                       \r
+                       // parse item\r
+                       $parser->parse($template['ITEM_HEADER']);\r
+                       $manager->notify('PreItem', array('blog' => &$this, 'item' => &$item));\r
+                       $parser->parse($template['ITEM']);\r
+                       $manager->notify('PostItem', array('blog' => &$this, 'item' => &$item));\r
+                       $parser->parse($template['ITEM_FOOTER']);\r
+               }\r
+               \r
+               $numrows = $items->rowCount();\r
+               \r
+               // add another date footer if there was at least one item\r
+               if ( ($numrows > 0) && $dateheads )\r
+               {\r
+                       $manager->notify('PreDateFoot',array('blog' => &$this, 'timestamp' => strtotime($old_date)));\r
+                       $parser->parse($template['DATE_FOOTER']);\r
+                       $manager->notify('PostDateFoot',array('blog' => &$this, 'timestamp' => strtotime($old_date)));\r
+               }\r
+               \r
+               $items->closeCursor();\r
+               return $numrows;\r
+       }\r
+       \r
+       /**\r
+        * Blog::showOneitem()\r
+        * Simplified function for showing only one item\r
+        * \r
+        * @param       integer $itemid         ID for item\r
+        * @param       array   $template       template for item\r
+        * @param       string  $highlight      string for highlight\r
+        * @return      integer 1\r
+        */\r
+       public function showOneitem($itemid, $template, $highlight)\r
+       {\r
+               $extraQuery = ' and inumber=' . intval($itemid);\r
+               \r
+               return $this->readLogAmount($template, 1, $extraQuery, $highlight, 0, 0);\r
+       }\r
+       \r
+       /**\r
+        * Blog::addItem()\r
+        * Adds an item to this blog\r
+        * \r
+        * @param       integer         $catid  ID for category\r
+        * @param       string          $title  ID for \r
+        * @param       string          $body   text for body\r
+        * @param       string          $more   text for more\r
+        * @param       integer         $blogid ID for blog\r
+        * @param       integer         $authorid       ID for author\r
+        * @param       timestamp       $timestamp      UNIX timestamp for post\r
+        * @param       boolean         $closed opened or closed\r
+        * @param       boolean         $draft  draft or not\r
+        * @param       boolean         $posted posted or not\r
+        * @return      integer ID for added item\r
+        */\r
+       function additem($catid, $title, $body, $more, $blogid, $authorid, $timestamp, $closed, $draft, $posted='1')\r
+       {\r
+               global $manager;\r
+               \r
+               $blogid         = (integer) $blogid;\r
+               $authorid       = (integer) $authorid;\r
+               $title          = $title;\r
+               $body           = $body;\r
+               $more           = $more;\r
+               $catid          = intval($catid);\r
+               \r
+               // convert newlines to <br />\r
+               if ( $this->convertBreaks() )\r
+               {\r
+                       $body = addBreaks($body);\r
+                       $more = addBreaks($more);\r
+               }\r
+\r
+               if ( $closed != '1' )\r
+               {\r
+                       $closed = '0';\r
+               }\r
+               if ( $draft != '0' )\r
+               {\r
+                       $draft = '1';\r
+               }\r
+               \r
+               if ( !$this->isValidCategory($catid) )\r
+               {\r
+                       $catid = $this->getDefaultCategory();\r
+               }\r
+               \r
+               $isFuture = 0;\r
+               if ( $timestamp > $this->getCorrectTime() )\r
+               {\r
+                       $isFuture = 1;\r
+               }\r
+               \r
+               $timestamp = date('Y-m-d H:i:s',$timestamp);\r
+               \r
+               $manager->notify('PreAddItem',array('title' => &$title, 'body' => &$body, 'more' => &$more, 'blog' => &$this, 'authorid' => &$authorid, 'timestamp' => &$timestamp, 'closed' => &$closed, 'draft' => &$draft, 'catid' => &$catid));\r
+               \r
+               $ititle = DB::quoteValue($title);\r
+               $ibody = DB::quoteValue($body);\r
+               $imore = DB::quoteValue($more);\r
+               $timestamp = DB::formatDateTime(strtotime($timestamp));\r
+               \r
+               $query = "INSERT INTO %s (ITITLE, IBODY, IMORE, IBLOG, IAUTHOR, ITIME, ICLOSED, IDRAFT, ICAT, IPOSTED) VALUES (%s, %s, %s, %d, %d, %s, %s, %s, %s, %s)";\r
+               $query = sprintf($query, sql_table('item'), $ititle, $ibody, $imore, $blogid, $authorid, $timestamp, $closed, $draft, $catid, $posted);\r
+               DB::execute($query);\r
+               $itemid = DB::getInsertId();\r
+               \r
+               $manager->notify('PostAddItem',array('itemid' => $itemid));\r
+               \r
+               if ( !$draft )\r
+               {\r
+                       $this->updateUpdateFile();\r
+               }\r
+               // send notification mail\r
+               if ( !$draft && !$isFuture && $this->getNotifyAddress() && $this->notifyOnNewItem() )\r
+               {\r
+                       $this->sendNewItemNotification($itemid, $title, $body);\r
+               }\r
+               return $itemid;\r
+       }\r
+       \r
+       /**\r
+        * Blog::sendNewItemNotification()\r
+        * Send a new item notification to the notification list\r
+        * \r
+        * @param       string  $itemid ID of the item\r
+        * @param       string  $title  title of the item\r
+        * @param       string  $body   body of the item\r
+        * @return      void\r
+        */\r
+       public function sendNewItemNotification($itemid, $title, $body)\r
+       {\r
+               global $CONF, $member;\r
+               \r
+               $ascii = Entity::anchor_footnoting($body);\r
+               \r
+               $message = _NOTIFY_NI_MSG . " \n";\r
+               $temp = parse_url($CONF['Self']);\r
+               if ( $temp['scheme'] )\r
+               {\r
+                       $message .= Link::create_item_link($itemid) . "\n\n";\r
+               }\r
+               else\r
+               {\r
+                       $tempurl = $this->getURL();\r
+                       if ( i18n::substr($tempurl, -1) == '/' || i18n::substr($tempurl, -4) == '.php' )\r
+                       {\r
+                               $message .= $tempurl . '?itemid=' . $itemid . "\n\n";\r
+                       }\r
+                       else\r
+                       {\r
+                               $message .= $tempurl . '/?itemid=' . $itemid . "\n\n";\r
+                       }\r
+               }\r
+               $message .= _NOTIFY_TITLE . ' ' . strip_tags($title) . "\n";\r
+               $message .= _NOTIFY_CONTENTS . "\n " . $ascii . "\n";\r
+               $message .= NOTIFICATION::get_mail_footer();\r
+               \r
+               $subject = $this->getName() . ': ' . _NOTIFY_NI_TITLE;\r
+               \r
+               $from = $member->getNotifyFromMailAddress();\r
+               \r
+               NOTIFICATION::mail($this->getNotifyAddress(), $subject, $message, $from, i18n::get_current_charset());\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::createNewCategory()\r
+        * Creates a new category for this blog\r
+        *\r
+        * @param       string  $catName                name of the new category. When empty, a name is generated automatically (starting with newcat)\r
+        * @param       string  $catDescription description of the new category. Defaults to 'New Category'\r
+        * @return      integer ID for new category on success. 0 on failure\r
+        */\r
+       public function createNewCategory($catName = '', $catDescription = _CREATED_NEW_CATEGORY_DESC)\r
+       {\r
+               global $member, $manager;\r
+               \r
+               if ( !$member->blogAdminRights($this->blogid) )\r
+               {\r
+                       return 0;\r
+               }\r
+               \r
+               // generate\r
+               if ( $catName == '' )\r
+               {\r
+                       $catName = _CREATED_NEW_CATEGORY_NAME;\r
+                       $i = 1;\r
+                       \r
+                       $res = DB::getResult('SELECT * FROM '.sql_table('category')." WHERE cname='".$catName.$i."' and cblog=".$this->blogid);\r
+                       while ( $res->rowCount() > 0 )\r
+                       {\r
+                               $i++;\r
+                               $res = DB::getResult('SELECT * FROM '.sql_table('category')." WHERE cname='".$catName.$i."' and cblog=".$this->blogid);\r
+                       }\r
+                       \r
+                       $catName = $catName . $i;\r
+               }\r
+               \r
+               $data = array(\r
+                       'blog'                  => &$this,\r
+                       'name'                  => &$catName,\r
+                       'description'   => $catDescription\r
+               );\r
+               $manager->notify('PreAddCategory', $data);\r
+               \r
+               $query = "INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, %s, %s)";\r
+               $query = sprintf($query, sql_table('category'), (integer) $this->blogid, DB::quoteValue($catName), DB::quoteValue($catDescription));\r
+               DB::execute($query);\r
+               $catid = DB::getInsertId();\r
+               \r
+               $data = array(\r
+                       'blog'                  => &$this,\r
+                       'name'                  => $catName,\r
+                       'description'   => $catDescription,\r
+                       'catid'                 => $catid\r
+               );\r
+               $manager->notify('PostAddCategory', $data);\r
+               \r
+               return $catid;\r
+       }\r
+       \r
+       /**\r
+        * Blog::search()\r
+        * Searches all months of this blog for the given query\r
+        *\r
+        * @param       string  $query                  search query\r
+        * @param       array   $template               template to be used (__NAME__ of the template)\r
+        * @param       integer $amountMonths   max amount of months to be search (0 = all)\r
+        * @param       integer $maxresults             max number of results to show\r
+        * @param       integer $startpos               offset\r
+        * @return      amount of hits found\r
+        */\r
+       public function search($query, $template, $amountMonths, $maxresults, $startpos) {\r
+               global $CONF, $manager;\r
+               \r
+               $highlight      = '';\r
+               $sqlquery       = $this->getSqlSearch($query, $amountMonths, $highlight);\r
+               \r
+               if ( $sqlquery == '' )\r
+               {\r
+                       // no query -> show everything\r
+                       $extraquery = '';\r
+                       $amountfound = $this->readLogAmount($template, $maxresults, $extraQuery, $query, 1, 1);\r
+               }\r
+               else\r
+               {\r
+                       // add LIMIT to query (to split search results into pages)\r
+                       if ( intval($maxresults > 0) )\r
+                       {\r
+                               $sqlquery .= ' LIMIT ' . intval($startpos) . ',' . intval($maxresults);\r
+                       }\r
+                       \r
+                       // show results\r
+                       $amountfound = $this->showUsingQuery($template, $sqlquery, $highlight, 1, 1);\r
+                       \r
+                       // when no results were found, show a message\r
+                       if ( $amountfound == 0 )\r
+                       {\r
+                               $template =& $manager->getTemplate($template);\r
+                               $vars = array(\r
+                                       'query'         => Entity::hsc($query),\r
+                                       'blogid'        => $this->blogid\r
+                               );\r
+                               echo Template::fill($template['SEARCH_NOTHINGFOUND'], $vars);\r
+                       }\r
+               }\r
+               return $amountfound;\r
+       }\r
+       \r
+       /**\r
+        * Blog::getSqlSearch()\r
+        * Returns an SQL query to use for a search query\r
+        * No LIMIT clause is added. (caller should add this if multiple pages are requested)\r
+        *\r
+        * @param       string  $query                  search query\r
+        * @param       integer $amountMonths   amount of months to search back. Default = 0 = unlimited\r
+        * @param       string  $mode                   either empty, or 'count'. In this case, the query will be a SELECT COUNT(*) query\r
+        * @return      string  $highlight              words to highlight (out parameter)\r
+        * @return      string  either a full SQL query, or an empty string (if querystring empty)\r
+        */\r
+       public function getSqlSearch($query, $amountMonths = 0, &$highlight, $mode = '')\r
+       {\r
+               $searchclass = new Search($query);\r
+               \r
+               $highlight       = $searchclass->inclusive;\r
+               \r
+               // if querystring is empty, return empty string\r
+               if ( $searchclass->inclusive == '' )\r
+               {\r
+                       return '';\r
+               }\r
+               \r
+               $where  = $searchclass->boolean_sql_where('ititle,ibody,imore');\r
+               $select = $searchclass->boolean_sql_select('ititle,ibody,imore');\r
+               \r
+               // get list of blogs to search\r
+               $blogs          = $searchclass->blogs;  // array containing blogs that always need to be included\r
+               $blogs[]        = $this->blogid;                // also search current blog (duh)\r
+               $blogs          = array_unique($blogs); // remove duplicates\r
+               $selectblogs = '';\r
+               if ( count($blogs) > 0 )\r
+               {\r
+                       $selectblogs = ' and i.iblog in (' . implode(',', $blogs) . ')';\r
+               }\r
+               \r
+               if ( $mode == '' )\r
+               {\r
+                       $query = 'SELECT i.inumber as itemid, i.ititle as title, i.ibody as body, i.itime, i.imore as more, i.icat as catid, i.iclosed as closed,\r
+                               m.mname as author, m.mrealname as authorname, m.mnumber as authorid, m.memail as authormail, m.murl as authorurl,\r
+                               c.cname as category';\r
+                       \r
+                       if ( $select )\r
+                       {\r
+                               $query .= ', '.$select. ' as score ';\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       $query = 'SELECT COUNT(*) as result ';\r
+               }\r
+               \r
+               $query .= ' FROM '.sql_table('item').' as i, '.sql_table('member').' as m, '.sql_table('category').' as c'\r
+                               . ' WHERE i.iauthor=m.mnumber'\r
+                               . ' and i.icat=c.catid'\r
+                               // exclude drafts\r
+                               . ' and i.idraft=0'\r
+                               . $selectblogs\r
+                                       // don't show future items\r
+                               . ' and i.itime<=' . DB::formatDateTime($this->getCorrectTime())\r
+                               . ' and '.$where;\r
+               \r
+               // take into account amount of months to search\r
+               if ( $amountMonths > 0 )\r
+               {\r
+                       $localtime = getdate($this->getCorrectTime());\r
+                       $timestamp_start = mktime(0,0,0,$localtime['mon'] - $amountMonths,1,$localtime['year']);\r
+                       $query .= ' and i.itime>' . DB::formatDateTime($timestamp_start);\r
+               }\r
+               \r
+               if ( $mode == '' )\r
+               {\r
+                       if ( $select )\r
+                       {\r
+                               $query .= ' ORDER BY score DESC';\r
+                       }\r
+                       else\r
+                       {\r
+                               $query .= ' ORDER BY i.itime DESC ';\r
+                       }\r
+               }\r
+               \r
+               return $query;\r
+       }\r
+       \r
+       /**\r
+        * Blog::getSqlBlog()\r
+        * Returns the SQL query that's normally used to display the blog items on the index type skins\r
+        * No LIMIT clause is added. (caller should add this if multiple pages are requested)\r
+        *\r
+        * @param       string  $extraQuery     extra query string\r
+        * @param       string  $mode           either empty, or 'count'. In this case, the query will be a SELECT COUNT(*) query\r
+        * @return      string  either a full SQL query, or an empty string\r
+        */\r
+       public function getSqlBlog($extraQuery, $mode = '')\r
+       {\r
+               if ( $mode == '' )\r
+               {\r
+                       $query = 'SELECT i.inumber as itemid, i.ititle as title, i.ibody as body, m.mname as author,\r
+                               m.mrealname as authorname, i.itime, i.imore as more, m.mnumber as authorid, m.memail as authormail,\r
+                               m.murl as authorurl, c.cname as category, i.icat as catid, i.iclosed as closed';\r
+               }\r
+               else\r
+               {\r
+                       $query = 'SELECT COUNT(*) as result ';\r
+               }\r
+               \r
+               $query  .= ' FROM '.sql_table('item').' as i, '.sql_table('member').' as m, '.sql_table('category').' as c'\r
+                               . ' WHERE i.iblog='.$this->blogid\r
+                               . ' and i.iauthor=m.mnumber'\r
+                               . ' and i.icat=c.catid'\r
+                               . ' and i.idraft=0' // exclude drafts\r
+                               . ' and i.itime<=' . DB::formatDateTime($this->getCorrectTime()); // don't show future items\r
+               \r
+               if ( $this->selectedcatid )\r
+               {\r
+                       $query .= ' and i.icat=' . $this->selectedcatid . ' ';\r
+               }\r
+               \r
+               $query .= $extraQuery;\r
+               \r
+               if ( $mode == '' )\r
+               {\r
+                       $query .= ' ORDER BY i.itime DESC';\r
+               }\r
+               return $query;\r
+       }\r
+       \r
+       /**\r
+        * Blog::showArchiveList()\r
+        * Shows the archivelist using the given template\r
+        * \r
+        * @param       string  $template       template name\r
+        * @param       string  $mode   year/month/day\r
+        * @param       integer $limit  limit of record count\r
+        * @return      void\r
+        */\r
+       public function showArchiveList($template, $mode = 'month', $limit = 0)\r
+       {\r
+               global $CONF, $catid, $manager;\r
+               \r
+               if ( !isset ($linkparams) )\r
+               {\r
+                       $linkparams = array();\r
+               }\r
+               \r
+               if ( $catid )\r
+               {\r
+                       $linkparams = array('catid' => $catid);\r
+               }\r
+               \r
+               $template =& $manager->getTemplate($template);\r
+               $data['blogid'] = $this->blogid;\r
+               \r
+               if ( !array_key_exists('ARCHIVELIST_HEADER', $template) || !$template['ARCHIVELIST_HEADER'] )\r
+               {\r
+                       $tplt = '';\r
+               }\r
+               else\r
+               {\r
+                       $tplt = $template['ARCHIVELIST_HEADER'];\r
+               }\r
+               \r
+               echo Template::fill($tplt, $data);\r
+               \r
+               $query = 'SELECT itime, SUBSTRING(itime,1,4) AS Year, SUBSTRING(itime,6,2) AS Month, SUBSTRING(itime,9,2) AS Day'\r
+                               . ' FROM '.sql_table('item')\r
+                               . ' WHERE iblog=' . $this->blogid\r
+                               . ' AND itime <=' . DB::formatDateTime($this->getCorrectTime()) // don't show future items!\r
+                               . ' AND idraft=0'; // don't show draft items\r
+               \r
+               if ( $catid )\r
+               {\r
+                       $query .= ' and icat=' . intval($catid);\r
+               }\r
+               \r
+               $query .= ' GROUP BY Year';\r
+               if ( $mode == 'month' || $mode == 'day' )\r
+               {\r
+                       $query .= ', Month';\r
+               }\r
+               if ( $mode == 'day' )\r
+               {\r
+                       $query .= ', Day';\r
+               }\r
+               \r
+               $query .= ' ORDER BY itime DESC';\r
+               \r
+               if ( $limit > 0 )\r
+               {\r
+                       $query .= ' LIMIT ' . intval($limit);\r
+               }\r
+               \r
+               $res = DB::getResult($query);\r
+               foreach ( $res as $current )\r
+               {\r
+                       /* string time -> unix timestamp */\r
+                       $current['itime'] = strtotime($current['itime']);\r
+                       \r
+                       if ( $mode == 'day' )\r
+                       {\r
+                               $archivedate = date('Y-m-d',$current['itime']);\r
+                               $archive['day'] = date('d',$current['itime']);\r
+                               $data['day'] = date('d',$current['itime']);\r
+                               $data['month'] = date('m',$current['itime']);\r
+                               $archive['month'] = $data['month'];\r
+                       }\r
+                       elseif ( $mode == 'year' )\r
+                       {\r
+                               $archivedate = date('Y',$current['itime']);\r
+                               $data['day'] = '';\r
+                               $data['month'] = '';\r
+                               $archive['day'] = '';\r
+                               $archive['month'] = '';\r
+                       }\r
+                       else\r
+                       {\r
+                               $archivedate = date('Y-m',$current['itime']);\r
+                               $data['month'] = date('m',$current['itime']);\r
+                               $archive['month'] = $data['month'];\r
+                               $data['day'] = '';\r
+                               $archive['day'] = '';\r
+                       }\r
+                       \r
+                       $data['year'] = date('Y',$current['itime']);\r
+                       $archive['year'] = $data['year'];\r
+                       $data['archivelink'] = Link::create_archive_link($this->blogid,$archivedate,$linkparams);\r
+                       \r
+                       $manager->notify('PreArchiveListItem', array('listitem' => &$data));\r
+                       \r
+                       $temp = Template::fill($template['ARCHIVELIST_LISTITEM'],$data);\r
+                       echo i18n::formatted_datetime($temp, $current['itime']);\r
+                       return;\r
+               }\r
+               \r
+               $res->closeCursor();\r
+               \r
+               if ( !array_key_exists('ARCHIVELIST_FOOTER', $template) || !$template['ARCHIVELIST_FOOTER'] )\r
+               {\r
+                       $tplt = '';\r
+               }\r
+               else\r
+               {\r
+                       $tplt = $template['ARCHIVELIST_FOOTER'];\r
+               }\r
+               \r
+               echo Template::fill($tplt, $data);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::showCategoryList()\r
+        * Shows the list of categories using a given template\r
+        * \r
+        * @param       string  $template       Template Name\r
+        * @return      void\r
+        */\r
+       public function showCategoryList($template)\r
+       {\r
+               global $CONF, $archive, $archivelist, $manager;\r
+               \r
+               /*\r
+                * determine arguments next to catids\r
+                * I guess this can be done in a better way, but it works\r
+                */\r
+               $linkparams = array();\r
+               if ( $archive )\r
+               {\r
+                       $blogurl = Link::create_archive_link($this->blogid, $archive, '');\r
+                       $linkparams['blogid'] = $this->blogid;\r
+                       $linkparams['archive'] = $archive;\r
+               }\r
+               else if ( $archivelist )\r
+               {\r
+                       $blogurl = Link::create_archivelist_link($this->blogid, '');\r
+                       $linkparams['archivelist'] = $archivelist;\r
+               }\r
+               else\r
+               {\r
+                       $blogurl = Link::create_blogid_link($this->blogid, '');\r
+                       $linkparams['blogid'] = $this->blogid;\r
+               }\r
+               \r
+               $template =& $manager->getTemplate($template);\r
+               \r
+               //: Change: Set nocatselected variable\r
+               if ( $this->selectedcatid )\r
+               {\r
+                       $nocatselected = 'no';\r
+               }\r
+               else\r
+               {\r
+                       $nocatselected = 'yes';\r
+               } \r
+               \r
+               $args = array(\r
+                       'blogid'        => $this->blogid,\r
+                       'blogurl'       => $blogurl,\r
+                       'self'          => $CONF['Self'],\r
+                       'catiscurrent'  => $nocatselected, // Change: Set catiscurrent template variable for header\r
+                       'currentcat'    => $nocatselected \r
+               );\r
+               \r
+               /* output header of category list item */\r
+               if ( !array_key_exists('CATLIST_HEADER', $template) || empty($template['CATLIST_HEADER']) )\r
+               {\r
+                       echo Template::fill(NULL, $args);\r
+               }\r
+               else\r
+               {\r
+                       echo Template::fill($template['CATLIST_HEADER'], $args);\r
+               }\r
+               \r
+               $query = "SELECT catid, cdesc as catdesc, cname as catname FROM %s WHERE cblog=%d ORDER BY cname ASC;";\r
+               $query = sprintf($query, sql_table('category'), (integer) $this->blogid);\r
+               $res = DB::getResult($query);\r
+               \r
+               foreach ( $res as $data )\r
+               {\r
+                       $args = array(\r
+                               'catid' => $data['catid'],\r
+                               'name'  => $data['catname'],\r
+                               'extra' => $linkparams\r
+                       );\r
+                       \r
+                       $data['blogid']         = $this->blogid;\r
+                       $data['blogurl']        = $blogurl;\r
+                       $data['catlink']        = Link::create_link('category', $args);\r
+                       $data['self']           = $CONF['Self'];\r
+                       \r
+                       // this gives catiscurrent = no when no category is selected.\r
+                       $data['catiscurrent'] = 'no';\r
+                       $data['currentcat'] = 'no';\r
+                       \r
+                       if ( $this->selectedcatid )\r
+                       {\r
+                               if ( $this->selectedcatid == $data['catid'] )\r
+                               {\r
+                                       $data['catiscurrent']   = 'yes';\r
+                                       $data['currentcat']             = 'yes';\r
+                               }\r
+                       }\r
+                       else\r
+                       {\r
+                               global $itemid;\r
+                               if ( intval($itemid) && $manager->existsItem(intval($itemid), 0, 0) )\r
+                               {\r
+                                       $iobj   =& $manager->getItem(intval($itemid), 0, 0);\r
+                                       $cid    = $iobj['catid'];\r
+                                       \r
+                                       if ( $cid == $data['catid'] )\r
+                                       {\r
+                                               $data['catiscurrent']   = 'yes';\r
+                                               $data['currentcat']             = 'yes';\r
+                                       }\r
+                               }\r
+                       }\r
+                       \r
+                       $manager->notify('PreCategoryListItem', array('listitem' => &$data));\r
+                       \r
+                       if ( !array_key_exists('CATLIST_LISTITEM', $template) || empty($template['CATLIST_LISTITEM']))\r
+                       {\r
+                               echo Template::fill(NULL, $data);\r
+                       }\r
+                       else\r
+                       {\r
+                               echo Template::fill($template['CATLIST_LISTITEM'], $data);\r
+                       }\r
+               }\r
+               \r
+               $res->closeCursor();\r
+               \r
+               $args = array(\r
+                       'blogid'                => $this->blogid,\r
+                       'blogurl'               => $blogurl,\r
+                       'self'                  => $CONF['Self'],\r
+                       'catiscurrent'  => $nocatselected, //: Change: Set catiscurrent template variable for footer\r
+                       'currentcat'    => $nocatselected\r
+               );\r
+               \r
+               if ( !array_key_exists('CATLIST_FOOTER', $template) || empty($template['CATLIST_FOOTER']))\r
+               {\r
+                       echo Template::fill(NULL, $args);\r
+               }\r
+               else\r
+               {\r
+                       echo Template::fill($template['CATLIST_FOOTER'], $args);\r
+               }\r
+               \r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::showBlogList()\r
+        * Shows a list of all blogs in the system using a given template\r
+        * ordered by number, name, shortname or description\r
+        * in ascending or descending order\r
+        * \r
+        * @param       string  $template       tempalte name\r
+        * @param       string  $bnametype      bname/bshortname\r
+        * @param       string  $orderby        string for 'ORDER BY' SQL\r
+        * @param       string  $direction      ASC/DESC\r
+        * @return      void\r
+        */\r
+       public function showBlogList($template, $bnametype, $orderby, $direction)\r
+       {\r
+               global $CONF, $manager;\r
+               \r
+               switch ( $orderby )\r
+               {\r
+                       case 'number':\r
+                               $orderby='bnumber';\r
+                               break;\r
+                       case 'name':\r
+                               $orderby='bname';\r
+                               break;\r
+                       case 'shortname':\r
+                               $orderby='bshortname';\r
+                               break;\r
+                       case 'description':\r
+                               $orderby='bdesc';\r
+                               break;\r
+                       default:\r
+                               $orderby='bnumber';\r
+                               break;\r
+               }\r
+               \r
+               $direction=strtolower($direction);\r
+               switch ( $direction )\r
+               {\r
+                       case 'asc':\r
+                               $direction='ASC';\r
+                               break;\r
+                       case 'desc':\r
+                               $direction='DESC';\r
+                               break;\r
+                       default:\r
+                               $direction='ASC';\r
+                               break;\r
+               }\r
+               \r
+               $template =& $manager->getTemplate($template);\r
+               \r
+               if ( array_key_exists('BLOGLIST_HEADER', $template) && !empty($template['BLOGLIST_HEADER']) )\r
+               {\r
+                       $vars = array(\r
+                               'sitename'      => $CONF['SiteName'],\r
+                               'siteurl'       => $CONF['IndexURL']\r
+                       );\r
+                       \r
+                       echo Template::fill($template['BLOGLIST_HEADER'], $vars);\r
+               }\r
+               \r
+               if ( array_key_exists('BLOGLIST_LISTITEM', $template) && !empty($template['BLOGLIST_LISTITEM']) )\r
+               {\r
+                       $query = 'SELECT bnumber, bname, bshortname, bdesc, burl FROM '.sql_table('blog').' ORDER BY '.$orderby.' '.$direction;\r
+                       $res = DB::getResult($query);\r
+                       \r
+                       foreach ( $res as $data )\r
+                       {\r
+                               $list = array();\r
+                               $list['bloglink'] = Link::create_blogid_link($data['bnumber']);\r
+                               $list['blogdesc'] = $data['bdesc'];\r
+                               $list['blogurl'] = $data['burl'];\r
+                               \r
+                               if ( $bnametype == 'shortname' )\r
+                               {\r
+                                       $list['blogname'] = $data['bshortname'];\r
+                               }\r
+                               else\r
+                               {\r
+                                       /* all other cases */\r
+                                       $list['blogname'] = $data['bname'];\r
+                               }\r
+                               \r
+                               $manager->notify('PreBlogListItem',array('listitem' => &$list));\r
+                               \r
+                               echo Template::fill($template['BLOGLIST_LISTITEM'], $list);\r
+                       }\r
+                       \r
+                       $res->closeCursor();\r
+               }\r
+               \r
+               \r
+               if ( array_key_exists('BLOGLIST_FOOTER', $template) && !empty($template['BLOGLIST_FOOTER']) )\r
+               {\r
+                       $vars = array(\r
+                               'sitename' => $CONF['SiteName'],\r
+                               'siteurl' => $CONF['IndexURL']\r
+                       );\r
+                       echo Template::fill($template['BLOGLIST_FOOTER']);\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::readSettings()\r
+        * Read the blog settings\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       public function readSettings()\r
+       {\r
+               $query =  'SELECT * FROM %s WHERE bnumber=%d;';\r
+               $query = sprintf($query, sql_table('blog'), (integer) $this->blogid);\r
+               $res = DB::getResult($query);\r
+               \r
+               $this->isValid = ($res->rowCount() > 0);\r
+               if ( $this->isValid )\r
+               {\r
+                       $this->settings = $res->fetch(PDO::FETCH_ASSOC);\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::writeSettings()\r
+        * Write the blog settings\r
+        */\r
+       public function writeSettings()\r
+       {\r
+               // (can't use floatval since not available prior to PHP 4.2)\r
+               $offset = $this->getTimeOffset();\r
+               if ( !is_float($offset) )\r
+               {\r
+                       $offset = (integer) $offset;\r
+               }\r
+               \r
+               $query =  'UPDATE '.sql_table('blog')\r
+                          . ' SET bname=' . DB::quoteValue($this->getName()) . ','\r
+                          . '     bshortname='. DB::quoteValue($this->getShortName()) . ','\r
+                          . '     bcomments='. intval($this->commentsEnabled()) . ','\r
+                          . '     bmaxcomments=' . intval($this->getMaxComments()) . ','\r
+                          . '     btimeoffset=' . $offset . ','\r
+                          . '     bpublic=' . intval($this->isPublic()) . ','\r
+                          . '     breqemail=' . intval($this->emailRequired()) . ','\r
+                          . '     bconvertbreaks=' . intval($this->convertBreaks()) . ','\r
+                          . '     ballowpast=' . intval($this->allowPastPosting()) . ','\r
+                          . '     bnotify=' . DB::quoteValue($this->getNotifyAddress()) . ','\r
+                          . '     bnotifytype=' . intval($this->getNotifyType()) . ','\r
+                          . '     burl=' . DB::quoteValue($this->getURL()) . ','\r
+                          . '     bupdate=' . DB::quoteValue($this->getUpdateFile()) . ','\r
+                          . '     bdesc=' . DB::quoteValue($this->getDescription()) . ','\r
+                          . '     bdefcat=' . intval($this->getDefaultCategory()) . ','\r
+                          . '     bdefskin=' . intval($this->getDefaultSkin()) . ','\r
+                          . '     bincludesearch=' . intval($this->getSearchable())\r
+                          . ' WHERE bnumber=' . intval($this->blogid);\r
+               DB::execute($query);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::updateUpdatefile()\r
+        * Update the update file if requested\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       public function updateUpdatefile()\r
+       {\r
+               if ( $this->getUpdateFile() )\r
+               {\r
+                       $f_update = fopen($this->getUpdateFile(), 'w');\r
+                       fputs($f_update,$this->getCorrectTime());\r
+                       fclose($f_update);\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::isValidCategory()\r
+        * Check if a category with a given catid is valid\r
+        * \r
+        * @param       integer $catid  ID for category\r
+        * @return      boolean exists or not\r
+        */\r
+       public function isValidCategory($catid)\r
+       {\r
+               $query = 'SELECT * FROM %s WHERE cblog=%d and catid=%d;';\r
+               $query = sprintf($query, sql_table('category'), (integer) $this->blogid, (integer) $catid);\r
+               $res = DB::getResult($query);\r
+               return ($res->rowCount() != 0);\r
+       }\r
+       \r
+       /**\r
+        * Blog::getCategoryName()\r
+        * Get the category name for a given catid\r
+        * \r
+        * @param       integer $catid  ID for category\r
+        * @return      string  name of category\r
+        */\r
+       public function getCategoryName($catid)\r
+       {\r
+               $query = 'SELECT cname FROM %s WHERE cblog=%d and catid=%d;';\r
+               $query = sprintf($query, sql_table('category'), (integer) $this->blogid, (integer) $catid);\r
+               $res = DB::getValue($query);\r
+               return $res;\r
+       }\r
+       \r
+       /**\r
+        * Blog::getCategoryDesc()\r
+        * Get the category description for a given catid\r
+        * \r
+        * @param $catid\r
+        *      category id\r
+        */\r
+       public function getCategoryDesc($catid)\r
+       {\r
+               $query = 'SELECT cdesc FROM %s WHERE cblog=%d and catid=%d;';\r
+               $query = sprintf($querym, sql_table('category'), (integer) $this->blogid, (integer) $catid);\r
+               $res = DB::getValue();\r
+               return $res;\r
+       }\r
+       \r
+       /**\r
+        * Blog::getCategoryIdFromName\r
+        * Get the category id for a given category name\r
+        * \r
+        * @param       string  $name   category name\r
+        * @return      ID for category\r
+        */\r
+       public function getCategoryIdFromName($name)\r
+       {\r
+               $query = 'SELECT catid FROM %s WHERE cblog=%d and cname=%s;';\r
+               $query = sprintf($query, sql_table('category'), (integer) $this->blogid, DB::quoteValue($name));\r
+               \r
+               $res = DB::getValue();\r
+               if ( !$res )\r
+               {\r
+                       return $this->getDefaultCategory();\r
+               }\r
+               return $res;\r
+       }\r
+       \r
+       /**\r
+        * Blog::insertJavaScriptInfo()\r
+        * Insert a javascript that includes information about the settings\r
+        * of an author:  ConvertBreaks, MediaUrl and AuthorId\r
+        * \r
+        * @param       $authorid       id of the author\r
+        */\r
+       public function insertJavaScriptInfo($authorid = '')\r
+       {\r
+               global $member, $CONF;\r
+               \r
+               if ( $authorid == '' )\r
+               {\r
+                       $authorid = $member->getID();\r
+               }\r
+               \r
+               echo "<script type=\"text/javascript\">\n";\r
+               \r
+               if ( !$this->convertBreaks() )\r
+               {\r
+                       echo "setConvertBreaks(false);\n";\r
+               }\r
+               else\r
+               {\r
+                       echo "setConvertBreaks(true);\n";\r
+               }\r
+               echo "setMediaUrl('{$CONF['MediaURL']}');\n";\r
+               echo "setAuthorId('{$authorid}');\n";\r
+               echo "</script>\n";\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setAllowPastPosting()\r
+        * Set the the setting for allowing to publish postings in the past\r
+        * \r
+        * @param       boolean $val    new value for ballowpast\r
+        * @return      void\r
+        */\r
+       public function setAllowPastPosting($val)\r
+       {\r
+               $this->setSetting('ballowpast', $val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::allowPastPosting()\r
+        * Get the the setting if it is allowed to publish postings in the past\r
+        * [should be named as getAllowPastPosting()]\r
+        * \r
+        * @param       void\r
+        * @return      boolean\r
+        */\r
+       public function allowPastPosting()\r
+       {\r
+               return $this->getSetting('ballowpast');\r
+       }\r
+       \r
+       /**\r
+        * Blog::getCorrectTime()\r
+        * \r
+        * @param       integer $t\r
+        * @return      integer\r
+        */\r
+       public function getCorrectTime($t=0)\r
+       {\r
+               if ( $t == 0 )\r
+               {\r
+                       $t = time();\r
+               }\r
+               return ($t + 3600 * $this->getTimeOffset());\r
+       }\r
+       \r
+       /**\r
+        * Blog::getName()\r
+        * \r
+        * @param       void\r
+        * @return      string name of this weblog\r
+        */\r
+       public function getName()\r
+       {\r
+               return $this->getSetting('bname');\r
+       }\r
+       \r
+       /**\r
+        * Blog::getShortName()\r
+        * \r
+        * @param       void\r
+        * @return      string  short name of this weblog\r
+        */\r
+       public function getShortName()\r
+       {\r
+               return $this->getSetting('bshortname');\r
+       }\r
+       \r
+       /**\r
+        * Blog::getMaxComments()\r
+        * \r
+        * @param       void\r
+        * @return      integer maximum number of comments\r
+        */\r
+       public function getMaxComments()\r
+       {\r
+               return $this->getSetting('bmaxcomments');\r
+       }\r
+       \r
+       /**\r
+        * Blog::getNotifyAddress()\r
+        * \r
+        * @param       void\r
+        * @return      string  mail address for notifying\r
+        */\r
+       public function getNotifyAddress()\r
+       {\r
+               return $this->getSetting('bnotify');\r
+       }\r
+       \r
+       /**\r
+        * Blog::getNotifyType()\r
+        * \r
+        * @param       void\r
+        * @return      integer notifycation type\r
+        */\r
+       public function getNotifyType()\r
+       {\r
+               return $this->getSetting('bnotifytype');\r
+       }\r
+       \r
+       /**\r
+        * Blog::notifyOnComment()\r
+        * \r
+        * @param       void\r
+        * @return      boolean\r
+        */\r
+       public function notifyOnComment()\r
+       {\r
+               $n = $this->getNotifyType();\r
+               return (($n != 0) && (($n % 3) == 0));\r
+       }\r
+       \r
+       /**\r
+        * Blog::notifyOnVote()\r
+        * \r
+        * @param       void\r
+        * @return      boolean\r
+        */\r
+       public function notifyOnVote()\r
+       {\r
+               $n = $this->getNotifyType();\r
+               return (($n != 0) && (($n % 5) == 0));\r
+       }\r
+       \r
+       /**\r
+        * Blog::notifyOnNewItem()\r
+        * \r
+        * @param       void\r
+        * @return      boolean\r
+        */\r
+       public function notifyOnNewItem()\r
+       {\r
+               $n = $this->getNotifyType();\r
+               return (($n != 0) && (($n % 7) == 0));\r
+       }\r
+       \r
+       /**\r
+        * Blog::setNotifyType()\r
+        * \r
+        * @param       integer $val\r
+        * @return      void\r
+        */\r
+       public function setNotifyType($val)\r
+       {\r
+               $this->setSetting('bnotifytype',$val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::getTimeOffset()\r
+        * @param       void\r
+        * @return      \r
+        */\r
+       public function getTimeOffset()\r
+       {\r
+               return $this->getSetting('btimeoffset');\r
+       }\r
+       \r
+       /**\r
+        * Blog::commentsEnabled()\r
+        * @param       void\r
+        * @return      integer enabled or not\r
+        */\r
+       public function commentsEnabled()\r
+       {\r
+               return $this->getSetting('bcomments');\r
+       }\r
+       \r
+       /**\r
+        * Blog::getURL()\r
+        * @param       void\r
+        * @return      string  URI for this weblog\r
+        */\r
+       public function getURL()\r
+       {\r
+               return $this->getSetting('burl');\r
+       }\r
+       \r
+       /**\r
+        * Blog::getDefaultSkin()\r
+        * @param       void\r
+        * @return      name of skin as default for this weblog\r
+        */\r
+       public function getDefaultSkin()\r
+       {\r
+               return $this->getSetting('bdefskin');\r
+       }\r
+       \r
+       /**\r
+        * Blog::getUpdateFile()\r
+        * @param       void\r
+        * @return      string  name of file to be updated when weblog is updated\r
+        */\r
+       public function getUpdateFile()\r
+       {\r
+               return $this->getSetting('bupdate');\r
+       }\r
+       \r
+       /**\r
+        * Blog::getDescription()\r
+        * @param       void\r
+        * @return      string  description for this weblog\r
+        */\r
+       public function getDescription()\r
+       {\r
+               return $this->getSetting('bdesc');\r
+       }\r
+       \r
+       /**\r
+        * Blog::isPublic()\r
+        * @param       void\r
+        * @return      integer publlic or not\r
+        */\r
+       public function isPublic()\r
+       {\r
+               return $this->getSetting('bpublic');\r
+       }\r
+       \r
+       /**\r
+        * Blog::emailRequired()\r
+        * @param       void\r
+        * @return      integer email is required when posting comment or not\r
+        */\r
+       public function emailRequired()\r
+       {\r
+               return $this->getSetting('breqemail');\r
+       }\r
+       \r
+       /**\r
+        * Blog::getSearchable()\r
+        * @param       void\r
+        * @return      integer searchable or not\r
+        */\r
+       public function getSearchable()\r
+       {\r
+               return $this->getSetting('bincludesearch');\r
+       }\r
+       \r
+       /**\r
+        * Blog::getDefaultCategory()\r
+        * @param       void\r
+        * @return      ID for category as a default\r
+        */\r
+       public function getDefaultCategory()\r
+       {\r
+               return $this->getSetting('bdefcat');\r
+       }\r
+       \r
+       /**\r
+        * Blog::setPublic()\r
+        * @param       integer $val    allow comments by non-registered members or not\r
+        * @return      void\r
+        */\r
+       public function setPublic($val)\r
+       {\r
+               $this->setSetting('bpublic', $val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setSearchable()\r
+        * @param       integer $val    searchable from the other blogs or not\r
+        * @return      void\r
+        */\r
+       public function setSearchable($val)\r
+       {\r
+               $this->setSetting('bincludesearch', $val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setDescription\r
+        * @param       string  $val    description for this weblog\r
+        * @return      void\r
+        */\r
+       public function setDescription($val)\r
+       {\r
+               $this->setSetting('bdesc',$val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setUpdateFile()\r
+        * @param       string  $val    name of file to beupdated when weblog is updated\r
+        * @return      \r
+        */\r
+       public function setUpdateFile($val)\r
+       {\r
+               $this->setSetting('bupdate',$val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setDefaultSkin()\r
+        * @param       integer $val    ID for default skin to use when displaying this weblog\r
+        * @return      void\r
+        */\r
+       public function setDefaultSkin($val)\r
+       {\r
+               $this->setSetting('bdefskin', $val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setURL()\r
+        * @param       string  $val    URI for this weblog\r
+        * @return      \r
+        */\r
+       public function setURL($val)\r
+       {\r
+               $this->setSetting('burl', $val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setName()\r
+        * @param       string  $val    name of this weblog\r
+        * @return      void\r
+        */\r
+       public function setName($val)\r
+       {\r
+               $this->setSetting('bname', $val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setShortName()\r
+        * @param       string  $val    short name for this weblog\r
+        * @return      void\r
+        */\r
+       public function setShortName($val)\r
+       {\r
+               $this->setSetting('bshortname', $val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setCommentsEnabled()\r
+        * @param       integer $val    enabling posting comment or not\r
+        * @return      void\r
+        */\r
+       public function setCommentsEnabled($val)\r
+       {\r
+               $this->setSetting('bcomments',$val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setMaxComments()\r
+        * @param       integer $val    maximum number of comments for this weblog\r
+        * @return      void\r
+        */\r
+       public function setMaxComments($val)\r
+       {\r
+               $this->setSetting('bmaxcomments', $val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setNotifyAddress()\r
+        * @param       string  $val    email to be notified if weblog updated\r
+        * @return      void\r
+        */\r
+       public function setNotifyAddress($val)\r
+       {\r
+               $this->setSetting('bnotify', $val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setEmailRequired()\r
+        * @param       string  requiring comments with email or not from non member\r
+        * @return      void\r
+        */\r
+       public function setEmailRequired($val)\r
+       {\r
+               $this->setSetting('breqemail', $val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setTimeOffset()\r
+        * @param       integer $val    time offset\r
+        * @return      void\r
+        */\r
+       public function setTimeOffset($val)\r
+       {\r
+               // check validity of value\r
+               // 1. replace , by . (common mistake)\r
+               $val = str_replace(',','.',$val);\r
+               \r
+               // 2. cast to float or int\r
+               if ( is_numeric($val) && (i18n::strpos($val, '.5') === (i18n::strlen($val) - 2)) )\r
+               {\r
+                       $val = (float) $val;\r
+               }\r
+               else\r
+               {\r
+                       $val = (integer) $val;\r
+               }\r
+               \r
+               $this->setSetting('btimeoffset',$val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::setDefaultCategory()\r
+        * @param       integer $val    ID for default category for this weblog\r
+        * @return      \r
+        */\r
+       public function setDefaultCategory($val)\r
+       {\r
+               $this->setSetting('bdefcat',$val);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::getSetting()\r
+        * @param       string  $key    key for setting of this weblog\r
+        * @return      mixed   value for the setting\r
+        */\r
+       public function getSetting($key)\r
+       {\r
+               return $this->settings[$key];\r
+       }\r
+       \r
+       /**\r
+        * Blog::setSetting()\r
+        * @param       string  $key    key for setting of this weblog\r
+        * @param       mixed   $value  value for the key\r
+        * @return      \r
+        */\r
+       public function setSetting($key, $value)\r
+       {\r
+               $this->settings[$key] = $value;\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::addTeamMember()\r
+        * Tries to add a member to the team. \r
+        * Returns false if the member was already on the team\r
+        * \r
+        * @param       integer $memberid       id for member\r
+        * @param       boolean $admin  super-admin or not\r
+        * @return      boolean Success/Fail\r
+        */\r
+       public function addTeamMember($memberid, $admin)\r
+       {\r
+               global $manager;\r
+               \r
+               $memberid = intval($memberid);\r
+               $admin = intval($admin);\r
+               \r
+               // check if member is already a member\r
+               $tmem =& $manager->getMember($memberid);\r
+               \r
+               if ( $tmem->isTeamMember($this->blogid) )\r
+               {\r
+                       return 0;\r
+               }\r
+               \r
+               $data = array(\r
+                       'blog'          => &$this,\r
+                       'member'        => &$tmem,\r
+                       'admin'         => &$admin\r
+               );\r
+               $manager->notify('PreAddTeamMember', $data);\r
+               \r
+               // add to team\r
+               $query = "INSERT INTO %s (TMEMBER, TBLOG, TADMIN) VALUES (%d, %d, %d);";\r
+               $query = sprintf($query, sql_table('team'), (integer) $memberid, (integer) $this->blogid, (integer) $admin);\r
+               DB::execute($query);\r
+               \r
+               $data = array(\r
+                       'blog'          => &$this,\r
+                       'member'        => &$tmem,\r
+                       'admin'         =>  $admin\r
+               );\r
+               $manager->notify('PostAddTeamMember', $data);\r
+               \r
+               $logMsg = sprintf(_TEAM_ADD_NEWTEAMMEMBER, $tmem->getDisplayName(), $memberid, $this->getName());\r
+               ActionLog::add(INFO, $logMsg);\r
+               \r
+               return 1;\r
+       }\r
+       \r
+       /**\r
+        * Blog::getID()\r
+        * @param       void\r
+        * @return      integer ID for this weblog\r
+        */\r
+       public function getID()\r
+       {\r
+               return (integer) $this->blogid;\r
+       }\r
+       \r
+       /**\r
+        * Checks if a blog with a given shortname exists \r
+        * Returns true if there is a blog with the given shortname (static)\r
+        * \r
+        * @param       string  $name           blog shortname\r
+        * @return      boolean exists or not\r
+        */\r
+       public function exists($name)\r
+       {\r
+               $r = DB::getResult('SELECT * FROM '.sql_table('blog').' WHERE bshortname='. DB::quoteValue($name));\r
+               return ($r->rowCount() != 0);\r
+       }\r
+       \r
+       /**\r
+        * Checks if a blog with a given id exists \r
+        * Returns true if there is a blog with the given ID (static)\r
+        * \r
+        * @param       integer $id     ID for searched weblog\r
+        * @return      boolean exists or not\r
+        */\r
+       public function existsID($id)\r
+       {\r
+               $r = DB::getResult('SELECT * FROM '.sql_table('blog').' WHERE bnumber='.intval($id));\r
+               return ($r->rowCount() != 0);\r
+       }\r
+       \r
+       /**\r
+        * Blog::setFuturePost()\r
+        * flag there is a future post pending\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       public function setFuturePost()\r
+       {\r
+               $query =  "UPDATE %s SET bfuturepost='1' WHERE bnumber=%d;";\r
+               $query = sprintf($query, sql_table('blog'), (integer) $this->blogid);\r
+               DB::execute($query);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::clearFuturePost()\r
+        * clear there is a future post pending\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       public function clearFuturePost()\r
+       {\r
+               $query =  "UPDATE %s SET bfuturepost='0' WHERE bnumber=%d;";\r
+               $query = sprintf($query, sql_table('blog'), (integer) $this->blogid);\r
+               DB::execute($query);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::checkJustPosted()\r
+        * check if we should throw justPosted event \r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       public function checkJustPosted()\r
+       {\r
+               global $manager;\r
+               \r
+               if ( $this->settings['bfuturepost'] == 1 )\r
+               {\r
+                       $query = "SELECT * FROM %s WHERE iposted=0 AND iblog=%d AND itime < NOW();";\r
+                       $query = sprintf($query, sql_table('item'), (integer) $this->blogid);\r
+                       \r
+                       $result = DB::getResult($query);\r
+                       if ( $result->rowCount() > 0 )\r
+                       {\r
+                               // This $pinged is allow a plugin to tell other hook to the event that a ping is sent already\r
+                               // Note that the plugins's calling order is subject to thri order in the plugin list\r
+                               $pinged = FALSE;\r
+                               $manager->notify('JustPosted', array('blogid' => $this->blogid, 'pinged' => &$pinged));\r
+                               \r
+                               // clear all expired future posts\r
+                               $query = "UPDATE %s SET iposted='1' WHERE iblog=%d AND itime < NOW();";\r
+                               $query = spriintf($query, sql_table('item'), (integer) $this->blogid);\r
+                               DB::execute($query);\r
+                               \r
+                               // check to see any pending future post, clear the flag is none\r
+                               $query = "SELECT * FROM %s WHERE iposted=0 AND iblog=%d;";\r
+                               $query = sprintf($query, sql_table('item'), (integer) $this->blogid);\r
+                               \r
+                               $result = DB::getResult($query);\r
+                               if ( $result->rowCount() == 0 )\r
+                               {\r
+                                       $this->clearFuturePost();\r
+                               }\r
+                       }\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Blog::readLogFromList()\r
+        * Shows the given list of items for this blog\r
+        *\r
+        * @param       array   $itemarray      array of item numbers to be displayed\r
+        * @param       string  $template       string representing the template _NAME_ (!)\r
+        * @param       string  $highlight      contains a query that should be highlighted\r
+        * @param       boolean $comments       1=show comments 0=don't show comments\r
+        * @param       boolean $dateheads      1=show dateheads 0=don't show dateheads\r
+        * @param       boolean $showDrafts     0=do not show drafts 1=show drafts\r
+        * @param       boolean $showFuture     0=do not show future posts 1=show future posts\r
+        * @return      integer amount of items shown\r
+        */\r
+       public function readLogFromList($itemarray, $template, $highlight = '', $comments = 1, $dateheads = 1,$showDrafts = 0, $showFuture = 0)\r
+       {\r
+               $query = $this->getSqlItemList($itemarray,$showDrafts,$showFuture);\r
+               return $this->showUsingQuery($template, $query, $highlight, $comments, $dateheads);\r
+       }\r
+       \r
+       /**\r
+        * Blog::getSqlItemList()\r
+        * Returns the SQL query used to fill out templates for a list of items\r
+        * No LIMIT clause is added. (caller should add this if multiple pages are requested)\r
+        *\r
+        * @param       array   $itemarray      an array holding the item numbers of the items to be displayed\r
+        * @param       integer $showDrafts     0=do not show drafts 1=show drafts\r
+        * @param       integer $showFuture     0=do not show future posts 1=show future posts\r
+        * @return      string  either a full SQL query, or an empty string\r
+        */\r
+       public function getSqlItemList($itemarray,$showDrafts = 0,$showFuture = 0)\r
+       {\r
+               if ( !is_array($itemarray) )\r
+               {\r
+                       return '';\r
+               }\r
+               \r
+               $showDrafts = intval($showDrafts);\r
+               $showFuture = intval($showFuture);\r
+               $items = array();\r
+               \r
+               foreach ( $itemarray as $value )\r
+               {\r
+                       if ( intval($value) )\r
+                       {\r
+                               $items[] = intval($value);\r
+                       }\r
+               }\r
+               if ( !count($items) )\r
+               {\r
+                       return '';\r
+               }\r
+               \r
+               $i = count($items);\r
+               $query = '';\r
+               foreach ( $items as $value )\r
+               {\r
+                       $query .= '('\r
+                                       .       'SELECT'\r
+                                       .       ' i.inumber as itemid,'\r
+                                       .       ' i.ititle as title,'\r
+                                       .       ' i.ibody as body,'\r
+                                       .       ' m.mname as author,'\r
+                                       .       ' m.mrealname as authorname,'\r
+                                       .       ' i.itime,'\r
+                                       .       ' i.imore as more,'\r
+                                       .       ' m.mnumber as authorid,'\r
+                                       .       ' m.memail as authormail,'\r
+                                       .       ' m.murl as authorurl,'\r
+                                       .       ' c.cname as category,'\r
+                                       .       ' i.icat as catid,'\r
+                                       .       ' i.iclosed as closed';\r
+                       \r
+                       $query .= ' FROM '\r
+                                       . sql_table('item') . ' as i, '\r
+                                       . sql_table('member') . ' as m, '\r
+                                       . sql_table('category') . ' as c'\r
+                                       . ' WHERE'\r
+                                   .    ' i.iblog='.$this->blogid\r
+                                  . ' and i.iauthor=m.mnumber'\r
+                                  . ' and i.icat=c.catid';\r
+                       \r
+                       // exclude drafts       \r
+                       if ( !$showDrafts )\r
+                       {\r
+                               $query .= ' and i.idraft=0';\r
+                       }\r
+                       if ( !$showFuture )\r
+                       {\r
+                               // don't show future items\r
+                               $query .= ' and i.itime<=' . DB::formatDateTime($this->getCorrectTime());\r
+                       }\r
+                       \r
+                       $query .= ' and i.inumber='.intval($value);\r
+                       $query .= ')';\r
+                       $i--;\r
+                       if ($i) $query .= ' UNION ';\r
+               }\r
+               \r
+               return $query;\r
+       }\r
+       \r
+       /**\r
+        * Blog::convertBreaks()\r
+        * Get the the setting for the line break handling\r
+        * [should be named as getConvertBreaks()]\r
+        * \r
+        * @deprecated\r
+        * @param       void\r
+        * @return      \r
+        */\r
+       public function convertBreaks()\r
+       {\r
+               return $this->getSetting('bconvertbreaks');\r
+       }\r
+       \r
+       /**\r
+        * Set the the setting for the line break handling\r
+        * \r
+        * @deprecated\r
+        * @param       boolean $val    new value for bconvertbreaks\r
+        * @return      void\r
+        */\r
+       public function setConvertBreaks($val)\r
+       {\r
+               $this->setSetting('bconvertbreaks', $val);\r
+               return;\r
+       }\r
+}\r
+=======
 <?php
 
 /*
@@ -1926,3 +3846,4 @@ class Blog
                return;
        }
 }
+>>>>>>> skinnable-master
index 06b4f9d..8464021 100644 (file)
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: BODYACTIONS.php 1757 2012-04-15 09:02:32Z sakamocchi $
+=======
  * @version $Id: BODYACTIONS.php 1886 2012-06-17 08:27:27Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 class BodyActions extends BaseActions
@@ -39,7 +43,11 @@ class BodyActions extends BaseActions
         */
        public function __construct()
        {
+<<<<<<< HEAD
+               parent::__construct();  
+=======
                parent::__construct();
+>>>>>>> skinnable-master
                return;
        }
        
@@ -107,10 +115,16 @@ class BodyActions extends BaseActions
                array_shift($params);
                
                // add item reference (array_unshift didn't work)
+<<<<<<< HEAD
+               $params = array_merge(array(&$this->currentItem), $params);
+               
+               call_user_func_array(array(&$plugin, 'doItemVar'), $params);
+=======
                $target = array(&$this->currentItem);
                $params = array_merge($target, $params);
                
                call_user_func_array(array($plugin, 'doItemVar'), $params);
+>>>>>>> skinnable-master
                return;
        }
        
@@ -127,7 +141,11 @@ class BodyActions extends BaseActions
                // image/popup calls have arguments separated by |
                $args = func_get_args();
                $args = preg_split('#\|#', implode($args, ', '));
+<<<<<<< HEAD
+               echo call_user_func_array(array(&$this, 'createImageCode'), $args);
+=======
                echo call_user_func_array(array($this, 'createImageCode'), $args);
+>>>>>>> skinnable-master
        }
        
        /**
@@ -175,7 +193,11 @@ class BodyActions extends BaseActions
                // image/popup calls have arguments separated by |
                $args = func_get_args();
                $args = preg_split('#\|#', implode($args, ', '));
+<<<<<<< HEAD
+               echo call_user_func_array(array(&$this, 'createMediaCode'), $args);
+=======
                echo call_user_func_array(array($this, 'createMediaCode'), $args);
+>>>>>>> skinnable-master
        }
        
        /**
@@ -216,7 +238,11 @@ class BodyActions extends BaseActions
                // image/popup calls have arguments separated by |
                $args = func_get_args();
                $args = preg_split('#\|#', implode($args, ', '));
+<<<<<<< HEAD
+               echo call_user_func_array(array(&$this, 'createPopupCode'), $args);
+=======
                echo call_user_func_array(array($this, 'createPopupCode'), $args);
+>>>>>>> skinnable-master
        }
        
        /**
@@ -281,7 +307,11 @@ class BodyActions extends BaseActions
                                $condition = ($blog && ($blog->getSetting($name) == $value));
                                break;
                        case 'itemblogsetting':
+<<<<<<< HEAD
+                               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));
+=======
                                $b =& $manager->getBlog($this->currentItem['blogid']);
+>>>>>>> skinnable-master
                                $condition = ($b && ($b->getSetting($name) == $value));
                                break;
                        case 'loggedin':
@@ -355,7 +385,11 @@ class BodyActions extends BaseActions
        {
                global $member, $manager;
                
+<<<<<<< HEAD
+               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));
+=======
                $b =& $manager->getBlog($this->currentItem['blogid']);
+>>>>>>> skinnable-master
                
                // when no parameter is defined, just check if author is current visitor
                if ( ($key != 'isadmin' && $key != 'name') || ($key == 'name' && $value == '') )
@@ -401,7 +435,11 @@ class BodyActions extends BaseActions
        {
                global $catid, $manager;
                
+<<<<<<< HEAD
+               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));
+=======
                $b =& $manager->getBlog($this->currentItem['blogid']);
+>>>>>>> skinnable-master
                
                // when no parameter is defined, just check if a category is selected
                if ( ($key != 'catname' && $key != 'catid') || ($value == '') )
@@ -559,6 +597,10 @@ class BodyActions extends BaseActions
                $params = func_get_args();
                array_shift($params);
                
+<<<<<<< HEAD
+               return call_user_func_array(array(&$plugin, 'doIf'), $params);
+=======
                return call_user_func_array(array($plugin, 'doIf'), $params);
+>>>>>>> skinnable-master
        }
 }
index 410804e..6ae996b 100644 (file)
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: BaseActions.php 1848 2012-05-16 12:17:00Z sakamocchi $
+=======
  * @version $Id: BaseActions.php 1882 2012-06-17 07:52:43Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 class BaseActions
@@ -139,14 +143,22 @@ class BaseActions
        
        /**
         * BaseActions::parse_locale()
+<<<<<<< HEAD
+        * Parse locale to language-script-region according to RFC 4646
+=======
         * Parse locale to language-region according to RFC 4646
+>>>>>>> skinnable-master
         * 
         * @param       void
         * @return      void
         */
        public function parse_locale()
        {
+<<<<<<< HEAD
+               echo preg_replace('#_#', '-', i18n::get_current_locale());
+=======
                echo preg_replace('#(.+)_(.+)_(.+)#', '$1-$3', i18n::get_current_locale());
+>>>>>>> skinnable-master
                return;
        }
        
@@ -434,7 +446,11 @@ class BaseActions
        {
                $this->addIfExecute();
                $args = func_get_args();
+<<<<<<< HEAD
+               $condition = call_user_func_array(array(&$this,'checkCondition'), $args);
+=======
                $condition = call_user_func_array(array($this,'checkCondition'), $args);
+>>>>>>> skinnable-master
                $this->addIfCondition($condition);
                return;
        }
@@ -505,7 +521,11 @@ class BaseActions
                {
                        ob_end_clean();
                        $args = func_get_args();
+<<<<<<< HEAD
+                       $condition = call_user_func_array(array(&$this,'checkCondition'), $args);
+=======
                        $condition = call_user_func_array(array($this,'checkCondition'), $args);
+>>>>>>> skinnable-master
                        $this->addIfCondition($condition);
                }
                return;
@@ -523,7 +543,11 @@ class BaseActions
                $this->addIfExecute();
                
                $args = func_get_args();
+<<<<<<< HEAD
+               $condition = call_user_func_array(array(&$this,'checkCondition'), $args);
+=======
                $condition = call_user_func_array(array($this,'checkCondition'), $args);
+>>>>>>> skinnable-master
                $this->addIfCondition(!$condition);
                return;
        }
@@ -559,7 +583,11 @@ class BaseActions
                {
                        ob_end_clean();
                        $args = func_get_args();
+<<<<<<< HEAD
+                       $condition = call_user_func_array(array(&$this,'checkCondition'), $args);
+=======
                        $condition = call_user_func_array(array($this,'checkCondition'), $args);
+>>>>>>> skinnable-master
                        $this->addIfCondition(!$condition);
                }
                return;
index 22f8926..3cb7daa 100644 (file)
@@ -1,3 +1,234 @@
+<<<<<<< HEAD
+<?php\r
+\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2007 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * A class representing a single comment\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2007 The Nucleus Group\r
+ * @version $Id: COMMENT.php 1844 2012-05-13 11:14:38Z sakamocchi $\r
+ */\r
+class Comment\r
+{\r
+       /**\r
+        * Comment::getComment()\r
+        * Returns the requested comment\r
+        *\r
+        * @static\r
+        * @param       integer $commentid      id for comment\r
+        * @return      array   comment information\r
+        * \r
+        */\r
+       static function getComment($commentid)\r
+       {\r
+               $query = 'SELECT cnumber AS commentid,'\r
+                             . ' cbody AS body,'\r
+                             . ' cuser AS user,'\r
+                             . ' cmail AS userid,'\r
+                             . ' cemail AS email,'\r
+                             . ' cmember AS memberid,'\r
+                             . ' ctime,'\r
+                             . ' chost AS host,'\r
+                             . ' mname AS member,'\r
+                             . ' cip AS ip,'\r
+                             . ' cblog AS blogid'\r
+                      . ' FROM %s LEFT OUTER JOIN %s ON cmember = mnumber'\r
+                      . ' WHERE cnumber = %d;';\r
+               \r
+               $query = sprintf($query, sql_table('comment'), sql_table('member'), (integer) $commentid);\r
+               $aCommentInfo = DB::getRow($query);\r
+               \r
+               if ( $aCommentInfo )\r
+               {\r
+                       $aCommentInfo['timestamp'] = strtotime($aCommentInfo['ctime']);\r
+               }\r
+               \r
+               return $aCommentInfo;\r
+       }\r
+       \r
+       /**\r
+        * Comment::prepare()\r
+        * Prepares a comment to be saved\r
+        *\r
+        * @static\r
+        * @param       array   $comment        comment data\r
+        * @return      array   comment date\r
+        * \r
+        */\r
+       static function prepare($comment)\r
+       {\r
+               $comment['user']        = strip_tags($comment['user']);\r
+               $comment['userid']      = strip_tags($comment['userid']);\r
+               $comment['email']       = strip_tags($comment['email']);\r
+               \r
+               // remove newlines from user; remove quotes and newlines from userid and email; trim whitespace from beginning and end\r
+               $comment['user']        = trim(strtr($comment['user'], "\n", ' ') );\r
+               $comment['userid']      = trim(strtr($comment['userid'], "\'\"\n", '-- ') );\r
+               $comment['email']       = trim(strtr($comment['email'], "\'\"\n", '-- ') );\r
+               \r
+               // begin if: a comment userid is supplied, but does not have an "http://" or "https://" at the beginning - prepend an "http://"\r
+               if ( array_key_exists('userid', $comment)\r
+                 && !empty($comment['userid'])\r
+                 && (i18n::strpos($comment['userid'], 'http://') !== 0)\r
+                 && (i18n::strpos($comment['userid'], 'https://') !== 0) )\r
+               {\r
+                       $comment['userid'] = 'http://' . $comment['userid'];\r
+               }\r
+               \r
+               $comment['body'] = Comment::prepareBody($comment['body']);\r
+               \r
+               return $comment;\r
+       }\r
+       \r
+       /**\r
+        * Comment::prepareBody()\r
+        * Prepares the body of a comment\r
+        *\r
+        * @static\r
+        * @param       string  $body   string for comment body\r
+        * @return      string  validate string for comment body\r
+        */\r
+       static public function prepareBody($body)\r
+       {\r
+               // convert Windows and Mac style 'returns' to *nix newlines\r
+               $body = preg_replace("/\r\n/", "\n", $body);\r
+               $body = preg_replace("/\r/", "\n", $body);\r
+               \r
+               // then remove newlines when too many in a row (3 or more newlines get converted to 1 newline)\r
+               $body = preg_replace("/\n{3,}/", "\n\n", $body);\r
+               \r
+               // encode special characters as entities\r
+               $body = Entity::hsc($body);\r
+               \r
+               // trim away whitespace and newlines at beginning and end\r
+               $body = trim($body);\r
+               \r
+               // add <br /> tags\r
+               $body = addBreaks($body);\r
+               \r
+               // create hyperlinks for http:// addresses\r
+               // there's a testcase for this in /build/testcases/urllinking.txt\r
+               $replace_from = array(\r
+                       '/([^:\/\/\w]|^)((https:\/\/)([\w\.-]+)([\/\w+\.~%&?@=_:;#,-]+))/i',\r
+                       '/([^:\/\/\w]|^)((http:\/\/|www\.)([\w\.-]+)([\/\w+\.~%&?@=_:;#,-]+))/i',\r
+                       '/([^:\/\/\w]|^)((ftp:\/\/|ftp\.)([\w\.-]+)([\/\w+\.~%&?@=_:;#,-]+))/i',\r
+                       '/([^:\/\/\w]|^)(mailto:(([a-zA-Z\@\%\.\-\+_])+))/i'\r
+               );\r
+               \r
+               return preg_replace_callback($replace_from, array(__CLASS__, 'prepareBody_cb'), $body);\r
+       }\r
+       \r
+       /**\r
+        * Comment::createLinkCode()\r
+        * Creates a link code for unlinked URLs with different protocols\r
+        *\r
+        * @static\r
+        * @param       string  $pre    Prefix of comment\r
+        * @param       string  $url    URL\r
+        * @param       string  $protocol       http, mailto and so on\r
+        * @return      string  string  including anchor element and child text\r
+        */\r
+       static private function createLinkCode($pre, $url, $protocol = 'http')\r
+       {\r
+               $post = '';\r
+               \r
+               // it's possible that $url ends contains entities we don't want,\r
+               // since htmlspecialchars is applied _before_ URL linking\r
+               // move the part of URL, starting from the disallowed entity to the 'post' link part\r
+               $aBadEntities = array('&quot;', '&gt;', '&lt;');\r
+               foreach ( $aBadEntities as $entity )\r
+               {\r
+                       $pos = i18n::strpos($url, $entity);\r
+                       \r
+                       if ( $pos )\r
+                       {\r
+                               $post = i18n::substr($url, $pos) . $post;\r
+                               $url = i18n::substr($url, 0, $pos);\r
+                       }\r
+               }\r
+               \r
+               // remove entities at end (&&&&)\r
+               if ( preg_match('/(&\w+;)+$/i', $url, $matches) )\r
+               {\r
+                       $post = $matches[0] . $post;    // found entities (1 or more)\r
+                       $url = i18n::substr($url, 0, i18n::strlen($url) - i18n::strlen($post) );\r
+               }\r
+               \r
+               // move ending comma from url to 'post' part\r
+               if ( i18n::substr($url, i18n::strlen($url) - 1) == ',' )\r
+               {\r
+                       $url = i18n::substr($url, 0, i18n::strlen($url) - 1);\r
+                       $post = ',' . $post;\r
+               }\r
+               \r
+               if ( !preg_match('#^' . $protocol . '://#', $url) )\r
+               {\r
+                       $linkedUrl = $protocol . ( ($protocol == 'mailto') ? ':' : '://') . $url;\r
+               }\r
+               else\r
+               {\r
+                       $linkedUrl = $url;\r
+               }\r
+               \r
+               if ( $protocol != 'mailto' )\r
+               {\r
+                       $displayedUrl = $linkedUrl;\r
+               }\r
+               else\r
+               {\r
+                       $displayedUrl = $url;\r
+               }\r
+               \r
+               return $pre . '<a href="' . $linkedUrl . '" rel="nofollow">' . Entity::hsc(Entity::shorten($displayedUrl,30,'...')) . '</a>' . $post;\r
+       }\r
+       \r
+       /**\r
+        * Comment::prepareBody_cb()\r
+        * This method is a callback for creating link codes\r
+        * \r
+        * @param       array   $match  elements for achor\r
+        * @return      string  including anchor element and child text\r
+        * \r
+        */\r
+       static public function prepareBody_cb($match)\r
+       {\r
+               if ( !preg_match('/^[a-z]+/i', $match[2], $protocol) )\r
+               {\r
+                       return $match[0];\r
+               }\r
+               \r
+               switch( strtolower($protocol[0]) )\r
+               {\r
+                       case 'https':\r
+                               return self::createLinkCode($match[1], $match[2], 'https');\r
+                       break;\r
+                       \r
+                       case 'ftp':\r
+                               return self::createLinkCode($match[1], $match[2], 'ftp');\r
+                       break;\r
+                       \r
+                       case 'mailto':\r
+                               return self::createLinkCode($match[1], $match[3], 'mailto');\r
+                       break;\r
+                       \r
+                       default:\r
+                               return self::createLinkCode($match[1], $match[2], 'http');\r
+                       break;\r
+               }\r
+               return;\r
+       }\r
+}\r
+=======
 <?php
 
 /*
@@ -227,3 +458,4 @@ class Comment
                return;
        }
 }
+>>>>>>> skinnable-master
index 96bdb10..8ef2afb 100644 (file)
@@ -232,8 +232,13 @@ class CommentActions extends BaseActions
        public function parse_blogurl()
        {
                global $manager;
+<<<<<<< HEAD
+               $blogid = getBlogIDFromItemID($this->commentsObj->itemid);
+               $blog =& $manager->getBlog($blogid);
+=======
                $item =& $manager->getItem($this->commentsObj->itemid, 1, 1);
                $blog =& $manager->getBlog($item['blogid']);
+>>>>>>> skinnable-master
                echo $blog->getURL();
                return;
        }
@@ -537,12 +542,19 @@ class CommentActions extends BaseActions
                array_shift($params);
                
                // pass info on current item and current comment as well
+<<<<<<< HEAD
+               $params = array_merge(array(&$this->currentComment), $params);
+               $params = array_merge(array(&$this->commentsObj->itemActions->currentItem), $params);
+               
+               call_user_func_array(array(&$plugin,'doTemplateCommentsVar'), $params);
+=======
                $target = array(&$this->currentComment);
                $params = array_merge($target, $params);
                $target = array(&$this->commentsObj->itemActions->currentItem);
                $params = array_merge($target, $params);
                
                call_user_func_array(array($plugin,'doTemplateCommentsVar'), $params);
+>>>>>>> skinnable-master
                return;
        }
        
@@ -643,7 +655,11 @@ class CommentActions extends BaseActions
         */
        public function parse_userlinkraw()
        {
+<<<<<<< HEAD
+               echo $this->currentComment['userlinkraw'];
+=======
                echo (array_key_exists('userlinkraw', $this->currentComment) && !empty($this->currentComment['userlinkraw'])) ? $this->currentComment['userlinkraw'] : '';
+>>>>>>> skinnable-master
                return;
        }
        
@@ -707,9 +723,14 @@ class CommentActions extends BaseActions
                                $condition = ($blog && ($blog->getSetting($name) == $value));
                                break;
                        case 'itemblogsetting':
+<<<<<<< HEAD
+                               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentComment['itemid']));
+                               $condition = ($b && ($b->getSetting($name) == $value));
+=======
                                $item =& $manager->getItem($this->currentComment['itemid'], 1, 1);
                                $blog =& $manager->getBlog($item['blogid']);
                                $condition = ($blog && ($blog->getSetting($name) == $value));
+>>>>>>> skinnable-master
                                break;
                        case 'loggedin':
                                $condition = $member->isLoggedIn();
@@ -784,6 +805,15 @@ class CommentActions extends BaseActions
                        return FALSE;
                }
                
+<<<<<<< HEAD
+               $mem =& $manager->getMember($this->currentComment['memberid']);
+               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentComment['itemid']));
+               $citem =& $manager->getItem($this->currentComment['itemid'], 1, 1);
+               
+               // when no parameter is defined, just check if item author is current visitor
+               if (($key != 'isadmin' && $key != 'name' && $key != 'isauthor' && $key != 'isonteam')) {
+                       return (intval($member->getID()) > 0 && intval($member->getID()) == intval($citem['authorid']));
+=======
                $member =& $manager->getMember($this->currentComment['memberid']);
                $item =& $manager->getItem($this->currentComment['itemid'], 1, 1);
                
@@ -791,6 +821,7 @@ class CommentActions extends BaseActions
                if ( ($key != 'isadmin' && $key != 'name' && $key != 'isauthor' && $key != 'isonteam') )
                {
                        return (intval($memberber->getID()) > 0 && intval($memberber->getID()) == (integer) $item['authorid']);
+>>>>>>> skinnable-master
                }
                
                // check comment author name
@@ -801,7 +832,11 @@ class CommentActions extends BaseActions
                        {
                                return FALSE;
                        }
+<<<<<<< HEAD
+                       if ( $value == strtolower($mem->getDisplayName()) )
+=======
                        if ( $value == strtolower($member->getDisplayName()) )
+>>>>>>> skinnable-master
                        {
                                return TRUE;
                        }
@@ -810,23 +845,40 @@ class CommentActions extends BaseActions
                // check if comment author is admin
                if ( $key == 'isadmin' )
                {
+<<<<<<< HEAD
+                       $blogid = intval($b->getID());
+                       if ( $mem->isAdmin() )
+                       {
+                               return TRUE;
+                       }
+                       return $mem->isBlogAdmin($blogid);
+=======
                        if ( $member->isAdmin() )
                        {
                                return TRUE;
                        }
                        return $member->isBlogAdmin($item['blogid']);
+>>>>>>> skinnable-master
                }
                
                // check if comment author is item author
                if ( $key == 'isauthor' )
                {
+<<<<<<< HEAD
+                       return (intval($citem['authorid']) == intval($this->currentComment['memberid']));
+=======
                        return ((integer) $item['authorid'] == (integer) $this->currentComment['memberid']);
+>>>>>>> skinnable-master
                }
                
                // check if comment author is on team
                if ( $key == 'isonteam' )
                {
+<<<<<<< HEAD
+                       return $mem->teamRights(intval($b->getID()));
+=======
                        return $member->teamRights((integer) $item['blogid']);
+>>>>>>> skinnable-master
                }
                return FALSE;
        }
@@ -842,6 +894,33 @@ class CommentActions extends BaseActions
        private function ifItemCategory($key = '', $value = '')
        {
                global $catid, $manager;
+<<<<<<< HEAD
+       
+               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentComment['itemid']));
+               $citem =& $manager->getItem($this->currentComment['itemid'],1,1);
+               $icatid = $citem['catid'];
+       
+               // when no parameter is defined, just check if a category is selected
+               if ( ($key != 'catname' && $key != 'catid') || ($value == '') )
+               {
+                       return $b->isValidCategory($icatid);
+               }
+       
+               // check category name
+               if ( $key == 'catname' )
+               {
+                       $value = $b->getCategoryIdFromName($value);
+                       if ( $value == $icatid )
+                       {
+                               return $b->isValidCategory($icatid);
+                       }
+               }
+       
+               // check category id
+               if ( ($key == 'catid') && ($value == $icatid) )
+               {
+                       return $b->isValidCategory($icatid);
+=======
                
                $item =& $manager->getItem($this->currentComment['itemid'],1,1);
                $blog =& $manager->getBlog($item['blogid']);
@@ -866,6 +945,7 @@ class CommentActions extends BaseActions
                if ( ($key == 'catid') && ($value == $item['catid']) )
                {
                        return $blog->isValidCategory($item['catid']);
+>>>>>>> skinnable-master
                }
                return FALSE;
        }
@@ -879,6 +959,14 @@ class CommentActions extends BaseActions
         */
        private function ifOnTeam($blogName = '')
        {
+<<<<<<< HEAD
+               global $blog, $member, $manager;
+               
+               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentComment['itemid']));
+               
+               // when no blog found
+               if ( ($blogName == '') && (!is_object($b)) )
+=======
                global $member, $manager;
                
                $item =& $manager->getItem($this->currentComment['itemid'], 1, 1);
@@ -886,6 +974,7 @@ class CommentActions extends BaseActions
                
                // when no blog found
                if ( ($blogName == '') && !is_object($blog) )
+>>>>>>> skinnable-master
                {
                        return 0;
                }
@@ -899,7 +988,11 @@ class CommentActions extends BaseActions
                // use current blog
                if ( ($blogName == '') || !$manager->existsBlogID($blogid) )
                {
+<<<<<<< HEAD
+                       $blogid = $b->getID();
+=======
                        $blogid = $blog->getID();
+>>>>>>> skinnable-master
                }
                
                return $member->teamRights($blogid);
@@ -914,6 +1007,14 @@ class CommentActions extends BaseActions
         */
        private function ifAdmin($blogName = '')
        {
+<<<<<<< HEAD
+               global $blog, $member, $manager;
+               
+               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentComment['itemid']));
+               
+               // when no blog found
+               if ( ($blogName == '') && (!is_object($b)) )
+=======
                global $member, $manager;
                
                $item =& $manager->getItem($this->currentComment['itemid'], 1, 1);
@@ -921,6 +1022,7 @@ class CommentActions extends BaseActions
                
                // when no blog found
                if ( ($blogName == '') && !is_object($blog) )
+>>>>>>> skinnable-master
                {
                        return 0;
                }
@@ -934,7 +1036,11 @@ class CommentActions extends BaseActions
                // use current blog
                if ( ($blogName == '') || !$manager->existsBlogID($blogid) )
                {
+<<<<<<< HEAD
+                       $blogid = $b->getID();
+=======
                        $blogid = $blog->getID();
+>>>>>>> skinnable-master
                }
                
                return $member->isBlogAdmin($blogid);
@@ -1007,6 +1113,10 @@ class CommentActions extends BaseActions
                $params = func_get_args();
                array_shift($params);
                
+<<<<<<< HEAD
+               return call_user_func_array(array(&$plugin, 'doIf'), $params);
+=======
                return call_user_func_array(array($plugin, 'doIf'), $params);
+>>>>>>> skinnable-master
        }
 }
index 4376f16..5eaf79d 100644 (file)
@@ -1,3 +1,447 @@
+<<<<<<< HEAD
+<?php\r
+\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * A class representing the comments (all of them) for a certain post on a ceratin blog\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
+ * @version $Id: COMMENTS.php 1527 2011-06-21 10:43:44Z sakamocchi $\r
+ */\r
+\r
+if ( !function_exists('requestVar') ) exit;\r
+require_once dirname(__FILE__) . '/COMMENTACTIONS.php';\r
+\r
+class Comments\r
+{\r
+       // reference to the itemActions object that is calling the showComments function\r
+       public $itemActions;\r
+       \r
+       // item for which comment are being displayed\r
+       public $itemid;\r
+       \r
+       // total amount of comments displayed\r
+       public $commentcount;\r
+       \r
+       /**\r
+        * Comments::__construct()\r
+        * Creates a new Comments object for the given blog and item\r
+        *\r
+        * @param       integer $itemid id of the item\r
+        * @return      void\r
+        */\r
+       public function __construct($itemid)\r
+       {\r
+               $this->itemid = (integer) $itemid;\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Comments::setItemActions()\r
+        * Used when parsing comments\r
+        *\r
+        * @param       object  $itemActions    itemActions object, that will take care of the parsing\r
+        * @return      void\r
+        */\r
+       public function setItemActions(&$itemActions)\r
+       {\r
+               $this->itemActions =& $itemActions;\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Comments::showComments()\r
+        * Shows maximum $max comments to the given item using the given template\r
+        * returns the amount of shown comments (if maxToShow = -1, then there is no limit)\r
+        *\r
+        * @param       array   template        template to use\r
+        * @param       integer maxToShow       max. comments to show\r
+        * @param       integer showNone        indicates if the 'no comments' thingie should be outputted\r
+        *                                                              when there are no comments (useful for closed items)\r
+        * @param       string  highlight       Highlight to use (if any)\r
+        * @return      integer number of comments\r
+        */\r
+       public function showComments($template, $maxToShow = -1, $showNone = 1, $highlight = '')\r
+       {\r
+               global $CONF, $manager;\r
+               \r
+               if ( $maxToShow == 0 )\r
+               {\r
+                       $this->commentcount = $this->amountComments();\r
+               }\r
+               else\r
+               {\r
+                       $query = 'SELECT citem as itemid, cnumber as commentid, cbody as body, cuser as user, cmail as userid, '\r
+                              . 'cemail as email, cmember as memberid, ctime, chost as host, cip as ip, cblog as blogid '\r
+                              . 'FROM %s as c WHERE citem=%d ORDER BY ctime';\r
+                       \r
+                       $query = sprintf($query, sql_table('comment'), (integer) $this->itemid);\r
+                       $comments = DB::getResult($query);\r
+                       $this->commentcount = $comments->rowCount();\r
+               }\r
+               \r
+               // create parser object & action handler\r
+               $handler = new CommentActions($this);\r
+               $handler->setTemplate($template);\r
+               \r
+               $parser = new Parser($handler);\r
+               \r
+               // if no result was found\r
+               if ( $this->commentcount == 0 )\r
+               {\r
+                       // note: when no reactions, COMMENTS_HEADER and COMMENTS_FOOTER are _NOT_ used\r
+                       if ( $showNone )\r
+                       {\r
+                               $parser->parse($template['COMMENTS_NONE']);\r
+                       }\r
+                       return 0;\r
+               }\r
+               \r
+               // if too many comments to show\r
+               if ( ($maxToShow != -1) && ($this->commentcount > $maxToShow) )\r
+               {\r
+                       $parser->parse($template['COMMENTS_TOOMUCH']);\r
+                       return 0;\r
+               }\r
+               \r
+               $parser->parse($template['COMMENTS_HEADER']);\r
+               \r
+               foreach ( $comments as $comment )\r
+               {\r
+                       $comment['timestamp'] = strtotime($comment['ctime']);\r
+                       $handler->setCurrentComment($comment);\r
+                       $handler->setHighlight($highlight);\r
+                       \r
+                       $manager->notify('PreComment', array('comment' => &$comment));\r
+                       $parser->parse($template['COMMENTS_BODY']);\r
+                       $manager->notify('PostComment', array('comment' => &$comment));\r
+               }\r
+               \r
+               $parser->parse($template['COMMENTS_FOOTER']);\r
+               \r
+               $comments->closeCursor();\r
+               \r
+               return $this->commentcount;\r
+       }\r
+       \r
+       /**\r
+        * Comments::amountComments()\r
+        * Returns the amount of comments for this itemid\r
+        * \r
+        * @param       void\r
+        * @return      integer number of comments\r
+        */\r
+       public function amountComments()\r
+       {\r
+               $query = 'SELECT COUNT(*) FROM %s WHERE citem=%d;';\r
+               $query = sprintf($query, sql_table('comment'), (integer) $this->itemid);\r
+               $res = DB::getValue($query);\r
+               \r
+               return $res;\r
+       }\r
+       \r
+       /**\r
+        * Comments::addComment()\r
+        * Adds a new comment to the database\r
+        * \r
+        * @param string $timestamp\r
+        * @param array $comment\r
+        * @return mixed\r
+        */\r
+       public function addComment($timestamp, $comment)\r
+       {\r
+               global $CONF, $member, $manager;\r
+               \r
+               $blogid = getBlogIDFromItemID($this->itemid);\r
+               \r
+               $settings =& $manager->getBlog($blogid);\r
+               $settings->readSettings();\r
+               \r
+               // begin if: comments disabled\r
+               if ( !$settings->commentsEnabled() )\r
+               {\r
+                       return _ERROR_COMMENTS_DISABLED;\r
+               }\r
+               \r
+               // begin if: public cannot comment\r
+               if ( !$settings->isPublic() && !$member->isLoggedIn() )\r
+               {\r
+                       return _ERROR_COMMENTS_NONPUBLIC;\r
+               }\r
+               \r
+               // begin if: comment uses a protected member name\r
+               if ( $CONF['ProtectMemNames'] && !$member->isLoggedIn() && Member::isNameProtected($comment['user']) )\r
+               {\r
+                       return _ERROR_COMMENTS_MEMBERNICK;\r
+               }\r
+               \r
+               // begin if: email required, but missing (doesn't apply to members)\r
+               if ( $settings->emailRequired() && i18n::strlen($comment['email']) == 0 && !$member->isLoggedIn() )\r
+               {\r
+                       return _ERROR_EMAIL_REQUIRED;\r
+               }\r
+               \r
+               // begin if: commenter's name is too long\r
+               if ( i18n::strlen($comment['user']) > 40 )\r
+               {\r
+                       return _ERROR_USER_TOO_LONG;\r
+               }\r
+               \r
+               // begin if: commenter's email is too long\r
+               if ( i18n::strlen($comment['email']) > 100 )\r
+               {\r
+                       return _ERROR_EMAIL_TOO_LONG;\r
+               }\r
+               \r
+               // begin if: commenter's url is too long\r
+               if ( i18n::strlen($comment['userid']) > 100 )\r
+               {\r
+                       return _ERROR_URL_TOO_LONG;\r
+               }\r
+               \r
+               $comment['timestamp'] = $timestamp;\r
+               $comment['host'] = gethostbyaddr(serverVar('REMOTE_ADDR') );\r
+               $comment['ip'] = serverVar('REMOTE_ADDR');\r
+               \r
+               // begin if: member is logged in, use that data\r
+               if ( $member->isLoggedIn() )\r
+               {\r
+                       $comment['memberid'] = $member->getID();\r
+                       $comment['user'] = '';\r
+                       $comment['userid'] = '';\r
+                       $comment['email'] = '';\r
+               }\r
+               else\r
+               {\r
+                       $comment['memberid'] = 0;\r
+               }\r
+               \r
+               // spam check\r
+               $continue = FALSE;\r
+               $plugins = array();\r
+               \r
+               if ( isset($manager->subscriptions['ValidateForm']) )\r
+               {\r
+                       $plugins = array_merge($plugins, $manager->subscriptions['ValidateForm']);\r
+               }\r
+               \r
+               if ( isset($manager->subscriptions['PreAddComment']) )\r
+               {\r
+                       $plugins = array_merge($plugins, $manager->subscriptions['PreAddComment']);\r
+               }\r
+               \r
+               if ( isset($manager->subscriptions['PostAddComment']) )\r
+               {\r
+                       $plugins = array_merge($plugins, $manager->subscriptions['PostAddComment']);\r
+               }\r
+               \r
+               $plugins = array_unique($plugins);\r
+               \r
+               while ( list(, $plugin) = each($plugins) )\r
+               {\r
+                       $p = $manager->getPlugin($plugin);\r
+                       $continue = $continue || $p->supportsFeature('handleSpam');\r
+               }\r
+               \r
+               $spamcheck = array(\r
+                       'type'          => 'comment',\r
+                       'body'          => $comment['body'],\r
+                       'id'            => $comment['itemid'],\r
+                       'live'          => TRUE,\r
+                       'return'        => $continue\r
+               );\r
+               \r
+               // begin if: member logged in\r
+               if ( $member->isLoggedIn() )\r
+               {\r
+                       $spamcheck['author'] = $member->displayname;\r
+                       $spamcheck['email'] = $member->email;\r
+               }\r
+               // else: public\r
+               else\r
+               {\r
+                       $spamcheck['author'] = $comment['user'];\r
+                       $spamcheck['email'] = $comment['email'];\r
+                       $spamcheck['url'] = $comment['userid'];\r
+               }\r
+               \r
+               $manager->notify('SpamCheck', array('spamcheck' => &$spamcheck) );\r
+               \r
+               if ( !$continue && isset($spamcheck['result']) && $spamcheck['result'] == TRUE )\r
+               {\r
+                       return _ERROR_COMMENTS_SPAM;\r
+               }\r
+               \r
+               // isValidComment returns either "1" or an error message\r
+               $isvalid = $this->isValidComment($comment, $spamcheck);\r
+               if ( $isvalid != 1 )\r
+               {\r
+                       return $isvalid;\r
+               }\r
+               \r
+               // begin if: send email to notification address\r
+               if ( $settings->getNotifyAddress() && $settings->notifyOnComment() )\r
+               {\r
+               \r
+                       $message = _NOTIFY_NC_MSG . ' ' . $this->itemid . "\n";\r
+                       $temp = parse_url($CONF['Self']);\r
+                       \r
+                       if ( $temp['scheme'] )\r
+                       {\r
+                               $message .= Link::create_item_link($this->itemid) . "\n\n";\r
+                       }\r
+                       else\r
+                       {\r
+                               $tempurl = $settings->getURL();\r
+                               \r
+                               if ( i18n::substr($tempurl, -1) == '/' || i18n::substr($tempurl, -4) == '.php' )\r
+                               {\r
+                                       $message .= $tempurl . '?itemid=' . $this->itemid . "\n\n";\r
+                               }\r
+                               else\r
+                               {\r
+                                       $message .= $tempurl . '/?itemid=' . $this->itemid . "\n\n";\r
+                               }\r
+                       }\r
+                       \r
+                       if ( $comment['memberid'] == 0 )\r
+                       {\r
+                               $message .= _NOTIFY_USER . ' ' . $comment['user'] . "\n";\r
+                               $message .= _NOTIFY_USERID . ' ' . $comment['userid'] . "\n";\r
+                       }\r
+                       else\r
+                       {\r
+                               $message .= _NOTIFY_MEMBER .' ' . $member->getDisplayName() . ' (ID=' . $member->getID() . ")\n";\r
+                       }\r
+                       \r
+                       $message .= _NOTIFY_HOST . ' ' . $comment['host'] . "\n";\r
+                       $message .= _NOTIFY_COMMENT . "\n " . $comment['body'] . "\n";\r
+                       $message .= NOTIFICATION::get_mail_footer();\r
+                       \r
+                       $item =& $manager->getItem($this->itemid, 0, 0);\r
+                       $subject = _NOTIFY_NC_TITLE . ' ' . strip_tags($item['title']) . ' (' . $this->itemid . ')';\r
+                       \r
+                       $from = $member->getNotifyFromMailAddress($comment['email']);\r
+                       \r
+                       NOTIFICATION::mail($settings->getNotifyAddress(), $subject, $message, $from, i18n::get_current_charset());\r
+               }\r
+               \r
+               $comment = Comment::prepare($comment);\r
+               \r
+               $manager->notify('PreAddComment', array('comment' => &$comment, 'spamcheck' => &$spamcheck) );\r
+               \r
+               $name           = DB::quoteValue($comment['user']);\r
+               $url            = DB::quoteValue($comment['userid']);\r
+               $email      = DB::quoteValue($comment['email']);\r
+               $body           = DB::quoteValue($comment['body']);\r
+               $host           = DB::quoteValue($comment['host']);\r
+               $ip                     = DB::quoteValue($comment['ip']);\r
+               $memberid       = intval($comment['memberid']);\r
+               $timestamp      = DB::formatDateTime($comment['timestamp']);\r
+               $itemid         = $this->itemid;\r
+               \r
+               $qSql = 'SELECT COUNT(*) AS result '\r
+                     . 'FROM ' . sql_table('comment')\r
+                     . ' WHERE '\r
+                     .      'cmail   = ' . $url\r
+                     . ' AND cmember = ' . $memberid\r
+                     . ' AND cbody   = ' . $body\r
+                     . ' AND citem   = ' . $itemid\r
+                     . ' AND cblog   = ' . $blogid;\r
+               $result = (integer) DB::getValue($qSql);\r
+               \r
+               if ( $result > 0 )\r
+               {\r
+                       return _ERROR_BADACTION;\r
+               }\r
+               \r
+               $query = sprintf('INSERT INTO %s (cuser, cmail, cemail, cmember, cbody, citem, ctime, chost, cip, cblog) '\r
+                       . 'VALUES (%s, %s, %s, %d, %s, %d, %s, %s, %s, %d)'\r
+                       , sql_table('comment'), $name, $url, $email, $memberid, $body, $itemid, $timestamp, $host, $ip, $blogid);\r
+               \r
+               DB::execute($query);\r
+               \r
+               // post add comment\r
+               $commentid = DB::getInsertId();\r
+               $manager->notify('PostAddComment', array('comment' => &$comment, 'commentid' => &$commentid, 'spamcheck' => &$spamcheck) );\r
+               \r
+               // succeeded !\r
+               return TRUE;\r
+       }\r
+       \r
+       /**\r
+        * Comments::isValidComment()\r
+        * Checks if a comment is valid and call plugins\r
+        * that can check if the comment is a spam comment        \r
+        * \r
+        * @param       array   $comment        array with comment elements\r
+        * @param       array   $spamcheck      array with spamcheck elements\r
+        * @return      boolean valid or not\r
+        */\r
+       private function isValidComment(&$comment, &$spamcheck)\r
+       {\r
+               global $member, $manager;\r
+               \r
+               // check if there exists a item for this date\r
+               $item =& $manager->getItem($this->itemid, 0, 0);\r
+               \r
+               if ( !$item )\r
+               {\r
+                       return _ERROR_NOSUCHITEM;\r
+               }\r
+               \r
+               if ( $item['closed'] )\r
+               {\r
+                       return _ERROR_ITEMCLOSED;\r
+               }\r
+               \r
+               // don't allow words that are too long\r
+               if ( preg_match('/[a-zA-Z0-9|\.,;:!\?=\/\\\\]{90,90}/', $comment['body']) != 0 )\r
+               {\r
+                       return _ERROR_COMMENT_LONGWORD;\r
+               }\r
+               \r
+               // check lengths of comment\r
+               if ( i18n::strlen($comment['body']) < 3 )\r
+               {\r
+                       return _ERROR_COMMENT_NOCOMMENT;\r
+               }\r
+               \r
+               if ( i18n::strlen($comment['body']) > 5000 )\r
+               {\r
+                       return _ERROR_COMMENT_TOOLONG;\r
+               }\r
+               \r
+               // only check username if no member logged in\r
+               if ( !$member->isLoggedIn() && (i18n::strlen($comment['user']) < 2) )\r
+               {\r
+                       return _ERROR_COMMENT_NOUSERNAME;\r
+               }\r
+               \r
+               if ( (i18n::strlen($comment['email']) != 0) && !NOTIFICATION::address_validation(trim($comment['email'])) )\r
+               {\r
+                       return _ERROR_BADMAILADDRESS;\r
+               }\r
+               \r
+               // let plugins do verification (any plugin which thinks the comment is invalid\r
+               // can change 'error' to something other than '1')\r
+               $result = 1;\r
+               $manager->notify('ValidateForm', array('type' => 'comment', 'comment' => &$comment, 'error' => &$result, 'spamcheck' => &$spamcheck) );\r
+               \r
+               return $result;\r
+       }\r
+}\r
+=======
 <?php
 
 /*
@@ -445,3 +889,4 @@ class Comments
                return $result;
        }
 }
+>>>>>>> skinnable-master
index a989ca9..0fce570 100644 (file)
@@ -1,3 +1,606 @@
+<<<<<<< HEAD
+<?php\r
+\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
+ * @version $Id: ITEM.php 1668 2012-02-19 14:36:44Z sakamocchi $\r
+ */\r
+\r
+/**\r
+ * A class representing an item\r
+ *\r
+ */\r
+class Item\r
+{\r
+       /**\r
+        * Item::$actiontypes\r
+        * actiontype list for handling items\r
+        * \r
+        * @static\r
+        */\r
+       static private $actiontypes = array(\r
+               'addnow', 'adddraft', 'addfuture', 'edit',\r
+               'changedate', 'backtodrafts', 'delete'\r
+       );\r
+       \r
+       /**\r
+        * Item::$itemid\r
+        * item id\r
+        * @deprecated\r
+        */\r
+       public $itemid;\r
+       \r
+       /**\r
+        * Item::__construct()\r
+        * Creates a new ITEM object\r
+        * \r
+        * @deprecated\r
+        * @param integer       $item_id        id for item\r
+        * @return void\r
+        */\r
+       public function __construct($item_id)\r
+       {\r
+               $this->itemid = $item_id;\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Item::getitem()\r
+        * Returns one item with the specific itemid\r
+        * \r
+        * @static\r
+        * @param int $item_id\r
+        * @param bool $allow_draft\r
+        * @param bool $allow_future\r
+        * @return mixed\r
+        */\r
+       static public function getitem($item_id, $allow_draft, $allow_future)\r
+       {\r
+               global $manager;\r
+               \r
+               $item_id = (integer) $item_id;\r
+               \r
+               $query = 'SELECT ' .\r
+                       'i.idraft AS draft, ' .\r
+                       'i.inumber AS itemid, ' .\r
+                       'i.iclosed AS closed, ' .\r
+                       'i.ititle AS title, ' .\r
+                       'i.ibody AS body, ' .\r
+                       'm.mname AS author, ' .\r
+                       'i.iauthor AS authorid, ' .\r
+                       'i.itime, ' .\r
+                       'i.imore AS more, ' .\r
+                       'i.ikarmapos AS karmapos, ' .\r
+                       'i.ikarmaneg AS karmaneg, ' .\r
+                       'i.icat AS catid, ' .\r
+                       'i.iblog AS blogid ' .\r
+                       'FROM %s AS i, %s AS m, %s AS b ' .\r
+                       'WHERE i.inumber = %d ' .\r
+                       'AND i.iauthor = m.mnumber ' .\r
+                       'AND i.iblog = b.bnumber ';\r
+               \r
+               $query = sprintf($query, sql_table('item'), sql_table('member'), sql_table('blog'), $item_id);\r
+               \r
+               if ( !$allow_draft )\r
+               {\r
+                       $query .= "AND i.idraft = 0 ";\r
+               }\r
+               \r
+               if ( !$allow_future )\r
+               {\r
+                       $blog =& $manager->getBlog(getBlogIDFromItemID($item_id));\r
+                       $query .= 'AND i.itime <= ' . DB::formatDateTime($blog->getCorrectTime());\r
+               }\r
+               \r
+               $query .= ' LIMIT 1';\r
+               $result = DB::getResult($query);\r
+               \r
+               if ( $result->rowCount() == 1 )\r
+               {\r
+                       $aItemInfo = $result->fetch(PDO::FETCH_ASSOC);\r
+                       $aItemInfo['timestamp'] = strtotime($aItemInfo['itime']);\r
+                       return $aItemInfo;\r
+               }\r
+               return 0;\r
+       }\r
+       \r
+       /**\r
+        * Item::createFromRequest()\r
+        * Tries to create an item from the data in the current request (comes from\r
+        * bookmarklet or admin area\r
+        *\r
+        * @static\r
+        * @param       void\r
+        * @return      array   (status = added/error/newcategory, message)\r
+        * \r
+        */\r
+       static public function createFromRequest()\r
+       {\r
+               global $member, $manager;\r
+               \r
+               /*\r
+                * TODO: these values from user agent should be validated but not implemented yet\r
+                */\r
+               $i_author               = $member->getID();\r
+               $i_body                 = postVar('body');\r
+               $i_title                = postVar('title');\r
+               $i_more                 = postVar('more');\r
+               $i_actiontype   = postVar('actiontype');\r
+               $i_closed               = intPostVar('closed');\r
+               $i_hour                 = intPostVar('hour');\r
+               $i_minutes              = intPostVar('minutes');\r
+               $i_month                = intPostVar('month');\r
+               $i_day                  = intPostVar('day');\r
+               $i_year                 = intPostVar('year');\r
+               $i_catid                = postVar('catid');\r
+               $i_draftid              = intPostVar('draftid');\r
+               \r
+               if ( !$member->canAddItem($i_catid) )\r
+               {\r
+                       return array('status' => 'error', 'message' => _ERROR_DISALLOWED);\r
+               }\r
+               \r
+               if ( !in_array($i_actiontype, self::$actiontypes) )\r
+               {\r
+                       $i_actiontype = 'addnow';\r
+               }\r
+               \r
+               $i_draft = (integer) ( $i_actiontype == 'adddraft' );\r
+               \r
+               if ( !trim($i_body) )\r
+               {\r
+                       return array('status' => 'error', 'message' => _ERROR_NOEMPTYITEMS);\r
+               }\r
+               \r
+               // create new category if needed\r
+               if ( i18n::strpos($i_catid, 'newcat') === 0 )\r
+               {\r
+                       // get blogid\r
+                       list($i_blogid) = sscanf($i_catid, "newcat-%d");\r
+                       \r
+                       // create\r
+                       $blog =& $manager->getBlog($i_blogid);\r
+                       $i_catid = $blog->createNewCategory();\r
+                       \r
+                       // show error when sth goes wrong\r
+                       if ( !$i_catid )\r
+                       {\r
+                               return array('status' => 'error','message' => 'Could not create new category');\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       // force blogid (must be same as category id)\r
+                       $i_blogid = getBlogIDFromCatID($i_catid);\r
+                       $blog =& $manager->getBlog($i_blogid);\r
+               }\r
+               \r
+               if ( $i_actiontype == 'addfuture' )\r
+               {\r
+                       $posttime = mktime($i_hour, $i_minutes, 0, $i_month, $i_day, $i_year);\r
+                       \r
+                       // make sure the date is in the future, unless we allow past dates\r
+                       if ( (!$blog->allowPastPosting()) && ($posttime < $blog->getCorrectTime()) )\r
+                       {\r
+                               $posttime = $blog->getCorrectTime();\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       if ( !$i_draft )\r
+                       {\r
+                               $posttime = $blog->getCorrectTime();\r
+                       }\r
+                       else\r
+                       {\r
+                               $posttime = 0;\r
+                       }\r
+               }\r
+               \r
+               if ( $posttime > $blog->getCorrectTime() )\r
+               {\r
+                       $posted = 0;\r
+                       $blog->setFuturePost();\r
+               }\r
+               else\r
+               {\r
+                       $posted = 1;\r
+               }\r
+               \r
+               $itemid = $blog->additem($i_catid, $i_title, $i_body, $i_more, $i_blogid, $i_author, $posttime, $i_closed, $i_draft, $posted);\r
+               \r
+               //Setting the itemOptions\r
+               $aOptions = requestArray('plugoption');\r
+               NucleusPlugin::apply_plugin_options($aOptions, $itemid);\r
+               $data = array(\r
+                       'context'       => 'item',\r
+                       'itemid'        => $itemid,\r
+                       'item'          => array(\r
+                               'title'         => $i_title,\r
+                               'body'          => $i_body,\r
+                               'more'          => $i_more,\r
+                               'closed'        => $i_closed,\r
+                               'catid'         => $i_catid\r
+                       )\r
+               );\r
+               \r
+               $manager->notify('PostPluginOptionsUpdate', $data);\r
+               \r
+               if ( $i_draftid > 0 )\r
+               {\r
+                       // delete permission is checked inside Item::delete()\r
+                       self::delete($i_draftid);\r
+               }\r
+               \r
+               // success\r
+               if ( $i_catid != intRequestVar('catid') )\r
+               {\r
+                       return array('status' => 'newcategory', 'itemid' => $itemid, 'catid' => $i_catid);\r
+               }\r
+               \r
+               return array('status' => 'added', 'itemid' => $itemid);\r
+       }\r
+       \r
+       /**\r
+        * Item::update()\r
+        * Updates an item\r
+        *\r
+        * @static\r
+        * @param       integer $itemid item id\r
+        * @param       integer $catid  category id\r
+        * @param       string  $title  title\r
+        * @param       string  $body   body text\r
+        * @param       string  $more   more text\r
+        * @param       boolean $closed closed or not\r
+        * @param       boolean $wasdraft       previously draft or not\r
+        * @param       boolean $publish        published or not\r
+        * @param       timestamp       $timestamp      timestamp\r
+        * @return      void\r
+        */\r
+       static public function update($itemid, $catid, $title, $body, $more, $closed, $wasdraft, $publish, $timestamp = 0)\r
+       {\r
+               global $manager;\r
+               \r
+               $itemid = (integer) $itemid;\r
+               $closed = (boolean) $closed;\r
+               \r
+               // get destination blogid\r
+               $new_blogid = getBlogIDFromCatID($catid);\r
+               $old_blogid = getBlogIDFromItemID($itemid);\r
+               \r
+               // move will be done on end of method\r
+               $moveNeeded = 0;\r
+               if ( $new_blogid != $old_blogid )\r
+               {\r
+                       $moveNeeded = 1;\r
+               }\r
+               \r
+               $blog =& $manager->getBlog($new_blogid);\r
+               \r
+               // begin if: convert line breaks to <br/>\r
+               if ( $blog->convertBreaks() )\r
+               {\r
+                       $body = addBreaks($body);\r
+                       $more = addBreaks($more);\r
+               }\r
+               \r
+               // call plugins\r
+               $data = array(\r
+                       'itemid'        => $itemid,\r
+                       'title'         => &$title,\r
+                       'body'          => &$body,\r
+                       'more'          => &$more,\r
+                       'blog'          => &$blog,\r
+                       'closed'        => &$closed,\r
+                       'catid'         => &$catid\r
+               );\r
+               $manager->notify('PreUpdateItem', $data);\r
+               \r
+               // update item itself\r
+               $query =  'UPDATE ' . sql_table('item')\r
+                               . ' SET'\r
+                               . ' ibody = ' . DB::quoteValue($body) . ','\r
+                               . ' ititle = ' . DB::quoteValue($title) . ','\r
+                               . ' imore = ' . DB::quoteValue($more) . ','\r
+                               . ' iclosed = ' . intval($closed) . ','\r
+                               . ' icat = ' . intval($catid);\r
+               \r
+               // if we received an updated timestamp that is in the past, but past posting is not allowed,\r
+               // reject that date change (timestamp = 0 will make sure the current date is kept)\r
+               if ( (!$blog->allowPastPosting()) && ($timestamp < $blog->getCorrectTime()) )\r
+               {\r
+                       $timestamp = 0;\r
+               }\r
+               \r
+               // begin if: post is in the future\r
+               if ( $timestamp > $blog->getCorrectTime(time()) )\r
+               {\r
+                       $isFuture = 1;\r
+                       $query .= ', iposted = 0';\r
+               }\r
+               else\r
+               {\r
+                       $isFuture = 0;\r
+                       $query .= ', iposted = 1';\r
+               }\r
+               \r
+               if ( $wasdraft && $publish )\r
+               {\r
+                       // set timestamp to current date only if it's not a future item\r
+                       // draft items have timestamp == 0\r
+                       // don't allow timestamps in the past (unless otherwise defined in blogsettings)\r
+                       $query .= ', idraft = 0';\r
+                       \r
+                       if ( $timestamp == 0 )\r
+                       {\r
+                               $timestamp = $blog->getCorrectTime();\r
+                       }\r
+                       \r
+                       // send new item notification\r
+                       if ( !$isFuture && $blog->getNotifyAddress() && $blog->notifyOnNewItem() )\r
+                       {\r
+                               $blog->sendNewItemNotification($itemid, $title, $body);\r
+                       }\r
+               }\r
+               \r
+               // save back to drafts\r
+               if ( !$wasdraft && !$publish )\r
+               {\r
+                       $query .= ', idraft = 1';\r
+                       // set timestamp back to zero for a draft\r
+                       $query .= ', itime = ' . DB::formatDateTime($timestamp);\r
+               }\r
+               \r
+               // update timestamp when needed\r
+               if ( $timestamp != 0 )\r
+               {\r
+                       $query .= ', itime = ' . DB::formatDateTime($timestamp);\r
+               }\r
+               \r
+               // make sure the correct item is updated\r
+               $query .= ' WHERE inumber = ' . $itemid;\r
+               \r
+               // off we go!\r
+               DB::execute($query);\r
+               \r
+               $manager->notify('PostUpdateItem', array('itemid' => $itemid));\r
+               \r
+               // when needed, move item and comments to new blog\r
+               if ( $moveNeeded )\r
+               {\r
+                       self::move($itemid, $catid);\r
+               }\r
+               \r
+               //update the itemOptions\r
+               $aOptions = requestArray('plugoption');\r
+               NucleusPlugin::apply_plugin_options($aOptions);\r
+               $data = array(\r
+                       'context'       => 'item',\r
+                       'itemid'        => $itemid,\r
+                       'item'          => array(\r
+                               'title'         => $title,\r
+                               'body'          => $body,\r
+                               'more'          => $more,\r
+                               'closed'        => $closed,\r
+                               'catid'         => $catid\r
+                       )\r
+               );\r
+               $manager->notify('PostPluginOptionsUpdate', $data);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Item::move()\r
+        * Move an item to another blog (no checks)\r
+        *\r
+        * @static\r
+        * @param       integer $itemid\r
+        * @param       integer $new_catid\r
+        * @return      void\r
+        */\r
+       static public function move($itemid, $new_catid)\r
+       {\r
+               global $manager;\r
+               \r
+               $itemid = (integer) $itemid;\r
+               $new_catid = (integer) $new_catid;\r
+               $new_blogid = getBlogIDFromCatID($new_catid);\r
+               \r
+               $data = array(\r
+                       'itemid'                => $itemid,\r
+                       'destblogid'    => $new_blogid,\r
+                       'destcatid'             => $new_catid\r
+               );\r
+               $manager->notify('PreMoveItem', $data);\r
+               \r
+               // update item table\r
+               $query = "UPDATE %s SET iblog=%d, icat=%d WHERE inumber=%d";\r
+               $query = sprintf($query, sql_table('item'), $new_blogid, $new_catid, $itemid);\r
+               DB::execute($query);\r
+               \r
+               // update comments\r
+               $query = "UPDATE %s SET cblog=%d WHERE citem=%d";\r
+               $query = sprintf($query, sql_table('comment'), $new_blogid, $itemid);\r
+               DB::execute($query);\r
+               \r
+               $data = array(\r
+                       'itemid'                => $itemid,\r
+                       'destblogid'    => $new_blogid,\r
+                       'destcatid'             => $new_catid\r
+               );\r
+               $manager->notify('PostMoveItem', $data);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Item::delete()\r
+        * Deletes an item\r
+        * \r
+        * @param       integer $itemid\r
+        * @return      void\r
+        */\r
+       static public function delete($itemid)\r
+       {\r
+               global $manager, $member;\r
+               \r
+               $itemid = (integer) $itemid;\r
+               \r
+               // check permission\r
+               if ( !$member->canAlterItem($itemid) )\r
+               {\r
+                       return 1;\r
+               }\r
+               \r
+               $manager->notify('PreDeleteItem', array('itemid' => $itemid));\r
+               \r
+               // delete item\r
+               $query = "DELETE FROM %s WHERE inumber=%d;";\r
+               $query = sprintf($query, sql_table('item'), $itemid);\r
+               DB::execute($query);\r
+               \r
+               // delete the comments associated with the item\r
+               $query = "DELETE FROM %s WHERE citem=%d;";\r
+               $query = sprintf($query, sql_table('comment'), $itemid);\r
+               DB::execute($query);\r
+               \r
+               // delete all associated plugin options\r
+               NucleusPlugin::delete_option_values('item', $itemid);\r
+               \r
+               $manager->notify('PostDeleteItem', array('itemid' => $itemid));\r
+               \r
+               return 0;\r
+       }\r
+       \r
+       /**\r
+        * Item::exists()\r
+        * Returns true if there is an item with the given ID\r
+        *\r
+        * @static\r
+        * @param       integer $itemid\r
+        * @param       boolean $future\r
+        * @param       boolean $draft\r
+        * @return      boolean exists or not\r
+        */\r
+       static public function exists($itemid, $future, $draft)\r
+       {\r
+               global $manager;\r
+               \r
+               $itemid = (integer) $itemid;\r
+               \r
+               $query = 'SELECT * FROM %s WHERE inumber=%d';\r
+               $query = sprintf($query, sql_table('item'), $itemid);\r
+               \r
+               if ( !$future )\r
+               {\r
+                       $blogid = getBlogIDFromItemID($itemid);\r
+                       if ( !$blogid )\r
+                       {\r
+                               return 0;\r
+                       }\r
+                       $blog =& $manager->getBlog($blogid);\r
+                       $query .= ' AND itime<=' . DB::formatDateTime($blog->getCorrectTime());\r
+               }\r
+               \r
+               if ( !$draft )\r
+               {\r
+                       $query .= ' AND idraft=0';\r
+               }\r
+               \r
+               $result = DB::getResult($query);\r
+               return ( $result->rowCount() != 0 );\r
+       }\r
+       \r
+       /**\r
+        * Item::createDraftFromRequest()\r
+        * Tries to create an draft from the data\r
+        *  in the current request (comes from bookmarklet or admin area)\r
+        *   Used by xmlHTTPRequest AutoDraft\r
+        *\r
+        * Returns an array with status info:\r
+        * status = 'added', 'error', 'newcategory'\r
+        *\r
+        * @static\r
+        * @param       void\r
+        * @return      array   (status = added/error/newcategory, message)\r
+        */\r
+       static public function createDraftFromRequest()\r
+       {\r
+               global $member, $manager;\r
+               \r
+               /*\r
+                * TODO: these values from user agent should be validated but not implemented yet\r
+                */\r
+               $i_author       = $member->getID();\r
+               $i_body         = postVar('body');\r
+               $i_title        = postVar('title');\r
+               $i_more         = postVar('more');\r
+               $i_closed       = intPostVar('closed');\r
+               $i_catid        = postVar('catid');\r
+               $i_draft        = 1;\r
+               $type           = postVar('type');\r
+               $i_draftid      = intPostVar('draftid');\r
+               \r
+               if ( $type == 'edit' )\r
+               {\r
+                       $itemid = intPostVar('itemid');\r
+                       $i_blogid = getBlogIDFromItemID($itemid);\r
+               }\r
+               else\r
+               {\r
+                       $i_blogid = intPostVar('blogid');\r
+               }\r
+               \r
+               if ( !$member->canAddItem($i_catid) )\r
+               {\r
+                       return array('status' => 'error', 'message' => _ERROR_DISALLOWED);\r
+               }\r
+               \r
+               if ( !trim($i_body) )\r
+               {\r
+                       return array('status' => 'error', 'message' => _ERROR_NOEMPTYITEMS);\r
+               }\r
+               \r
+               // create new category if needed\r
+               if ( i18n::strpos($i_catid,'newcat') === 0 )\r
+               {\r
+                       // Set in default category\r
+                       $blog =& $manager->getBlog($i_blogid);\r
+                       $i_catid = $blog->getDefaultCategory();\r
+               }\r
+               else\r
+               {\r
+                       // force blogid (must be same as category id)\r
+                       $i_blogid = getBlogIDFromCatID($i_catid);\r
+                       $blog =& $manager->getBlog($i_blogid);\r
+               }\r
+               \r
+               $posttime = 0;\r
+               \r
+               if ( $i_draftid > 0 )\r
+               {\r
+                       self::update($i_draftid, $i_catid, $i_title, $i_body, $i_more, $i_closed, 1, 0, 0);\r
+                       $itemid = $i_draftid;\r
+               }\r
+               else\r
+               {\r
+                       $itemid = $blog->additem($i_catid, $i_title, $i_body, $i_more, $i_blogid, $i_author, $posttime, $i_closed, $i_draft);\r
+               }\r
+               \r
+               return array('status' => 'added', 'draftid' => $itemid);\r
+       }\r
+}\r
+=======
 <?php
 
 /*
@@ -602,3 +1205,4 @@ class Item
                return array('status' => 'added', 'draftid' => $itemid);
        }
 }
+>>>>>>> skinnable-master
index 2306fa3..7db9281 100644 (file)
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: ITEMACTIONS.php 1757 2012-04-15 09:02:32Z sakamocchi $
+=======
  * @version $Id: ITEMACTIONS.php 1886 2012-06-17 08:27:27Z sakamocchi $
+>>>>>>> skinnable-master
  */
 class ItemActions extends BaseActions
 {
@@ -101,7 +105,11 @@ class ItemActions extends BaseActions
        /* actions defined in BodyAction class */
                'image',
                'media',
+<<<<<<< HEAD
+               'popup',
+=======
                'popup'
+>>>>>>> skinnable-master
                );
        
        /**
@@ -753,10 +761,16 @@ class ItemActions extends BaseActions
                array_shift($params);
                
                // add item reference (array_unshift didn't work)
+<<<<<<< HEAD
+               $params = array_merge(array(&$this->currentItem),$params);
+               
+               call_user_func_array(array(&$plugin,'doTemplateVar'), $params);
+=======
                $target = array(&$this->currentItem);
                $params = array_merge($target,$params);
                
                call_user_func_array(array($plugin,'doTemplateVar'), $params);
+>>>>>>> skinnable-master
                return;
        }
        
@@ -818,8 +832,12 @@ class ItemActions extends BaseActions
                $handler->setCurrentItem($this->currentItem);
                
                $parser = new Parser($handler);
+<<<<<<< HEAD
+               $parser->parse($handler->highlight($data));
+=======
                $highlight = $handler->highlight($data);
                $parser->parse($highlight);
+>>>>>>> skinnable-master
                return;
        }
        
@@ -849,9 +867,14 @@ class ItemActions extends BaseActions
                                $condition = ($blog && ($blog->getSetting($name) == $value));
                                break;
                        case 'itemblogsetting':
+<<<<<<< HEAD
+                               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));
+                               $condition = ($b && ($b->getSetting($name) == $value));
+=======
                                $item =& $manager->getItem($this->currentItem['itemid'], 1, 1);
                                $t_blog =& $manager->getBlog($item['blogid']);
                                $condition = ($t_blog && ($t_blog->getSetting($name) == $value));
+>>>>>>> skinnable-master
                                break;
                        case 'loggedin':
                                $condition = $member->isLoggedIn();
@@ -923,6 +946,11 @@ class ItemActions extends BaseActions
        {
                global $member, $manager;
                
+<<<<<<< HEAD
+               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));
+               
+=======
+>>>>>>> skinnable-master
                // when no parameter is defined, just check if author is current visitor
                if ( ($key != 'isadmin' && $key != 'name') || ($key == 'name' && $value == '') )
                {
@@ -942,12 +970,23 @@ class ItemActions extends BaseActions
                // check if author is admin
                if ( ($key == 'isadmin') )
                {
+<<<<<<< HEAD
+                       $aid = intval($this->currentItem['authorid']);
+                       $blogid = intval($b->getID());                  
+                       $amember =& $manager->getMember($aid);
+                       if ( $amember->isAdmin() )
+                       {
+                               return TRUE;
+                       }
+                       return (boolean) $amember->isBlogAdmin($blogid);
+=======
                        $i_author =& $manager->getMember($this->currentItem['authorid']);
                        if ( $i_author->isAdmin() )
                        {
                                return TRUE;
                        }
                        return (boolean) $i_author->isBlogAdmin($this->currentItem['blogid']);
+>>>>>>> skinnable-master
                }
                
                return FALSE;
@@ -965,12 +1004,20 @@ class ItemActions extends BaseActions
        {
                global $catid, $manager;
                
+<<<<<<< HEAD
+               $b =& $manager->getBlog(getBlogIDFromItemID($this->currentItem['itemid']));
+=======
                $blog =& $manager->getBlog($this->currentItem['blogid']);
+>>>>>>> skinnable-master
                
                // when no parameter is defined, just check if a category is selected
                if ( ($key != 'catname' && $key != 'catid') || ($value == '') )
                {
+<<<<<<< HEAD
+                       return (boolean) $b->isValidCategory($catid);
+=======
                        return (boolean) $blog->isValidCategory($catid);
+>>>>>>> skinnable-master
                }
                
                $icatid = $this->currentItem['catid'];
@@ -978,17 +1025,28 @@ class ItemActions extends BaseActions
                // check category name
                if ( $key == 'catname' )
                {
+<<<<<<< HEAD
+                       $value = $b->getCategoryIdFromName($value);
+                       if ( $value == $icatid )
+                       {
+                               return (boolean) $b->isValidCategory($icatid);
+=======
                        $value = $blog->getCategoryIdFromName($value);
                        if ( $value == $icatid )
                        {
                                return (boolean) $blog->isValidCategory($icatid);
+>>>>>>> skinnable-master
                        }
                }
                
                // check category id
                if ( ($key == 'catid') && ($value == $icatid) )
                {
+<<<<<<< HEAD
+                       return (boolean) $b->isValidCategory($icatid);
+=======
                        return (boolean) $blog->isValidCategory($icatid);
+>>>>>>> skinnable-master
                }
                return FALSE;
        }
@@ -1122,6 +1180,10 @@ class ItemActions extends BaseActions
                $params = func_get_args();
                array_shift($params);
                
+<<<<<<< HEAD
+               return (boolean) call_user_func_array(array(&$plugin, 'doIf'), $params);
+=======
                return (boolean) call_user_func_array(array($plugin, 'doIf'), $params);
+>>>>>>> skinnable-master
        }
 }
index 6370305..5471c04 100644 (file)
@@ -1,3 +1,121 @@
+<<<<<<< HEAD
+<?php\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * Class representing the karma votes for a certain item\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
+ * @version $Id: KARMA.php 1470 2010-11-29 22:10:16Z ftruscot $\r
+ */\r
+class Karma\r
+{\r
+       // id of item about which this object contains information\r
+       var $itemid;\r
+       \r
+       // indicates if the karma vote info has already been intialized from the DB\r
+       var $inforead;\r
+       \r
+       // amount of positive/negative votes\r
+       var $karmapos;\r
+       var $karmaneg;\r
+       \r
+       function KARMA($itemid, $initpos = 0, $initneg = 0, $initread = 0) {\r
+               // itemid\r
+               $this->itemid = intval($itemid);\r
+\r
+               // have we read the karma info yet?\r
+               $this->inforead = intval($initread);\r
+\r
+               // number of positive and negative votes\r
+               $this->karmapos = intval($initpos);\r
+               $this->karmaneg = intval($initneg);\r
+       }\r
+\r
+       function getNbPosVotes() {\r
+               if (!$this->inforead) $this->readFromDatabase();\r
+               return $this->karmapos;\r
+       }\r
+       function getNbNegVotes() {\r
+               if (!$this->inforead) $this->readFromDatabase();\r
+               return $this->karmaneg;\r
+       }\r
+       function getNbOfVotes() {\r
+               if (!$this->inforead) $this->readFromDatabase();\r
+               return ($this->karmapos + $this->karmaneg);\r
+       }\r
+       function getTotalScore() {\r
+               if (!$this->inforead) $this->readFromDatabase();\r
+               return ($this->karmapos - $this->karmaneg);\r
+       }\r
+\r
+       function setNbPosVotes($val) {\r
+               $this->karmapos = intval($val);\r
+       }\r
+       function setNbNegVotes($val) {\r
+               $this->karmaneg = intval($val);\r
+       }\r
+\r
+\r
+       // adds a positive vote\r
+       function votePositive() {\r
+               $newKarma = $this->getNbPosVotes() + 1;\r
+               $this->setNbPosVotes($newKarma);\r
+               $this->writeToDatabase();\r
+               $this->saveIP();\r
+       }\r
+\r
+       // adds a negative vote\r
+       function voteNegative() {\r
+               $newKarma = $this->getNbNegVotes() + 1;\r
+               $this->setNbNegVotes($newKarma);\r
+               $this->writeToDatabase();\r
+               $this->saveIP();\r
+       }\r
+\r
+\r
+\r
+       // these methods shouldn't be called directly\r
+       function readFromDatabase() {\r
+               $query = 'SELECT ikarmapos, ikarmaneg FROM '.sql_table('item').' WHERE inumber=' . $this->itemid;\r
+               $res = DB::getRow($query);\r
+\r
+               $this->karmapos = $res['ikarmapos'];\r
+               $this->karmaneg = $res['ikarmaneg'];\r
+               $this->inforead = 1;\r
+       }\r
+\r
+\r
+       function writeToDatabase() {\r
+               $query = 'UPDATE '.sql_table('item').' SET ikarmapos=' . $this->karmapos . ', ikarmaneg='.$this->karmaneg.' WHERE inumber=' . $this->itemid;\r
+               DB::execute($query);\r
+       }\r
+\r
+       // checks if a vote is still allowed for an IP\r
+       function isVoteAllowed($ip) {\r
+               $query = 'SELECT * FROM '.sql_table('karma')." WHERE itemid={$this->itemid} and ip=". DB::quoteValue($ip);\r
+               $res = DB::getResult($query);\r
+               return ($res->rowCount() == 0);\r
+       }\r
+\r
+       // save IP in database so no multiple votes are possible\r
+       function saveIP() {\r
+               $query = 'INSERT INTO ' . sql_table('karma') .' (itemid, ip) VALUES (' . $this->itemid . ','. DB::quoteValue(serverVar('REMOTE_ADDR')) .')';\r
+               DB::execute($query);\r
+       }\r
+}\r
+\r
+?>\r
+=======
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
@@ -113,4 +231,5 @@ class Karma
        }
 }
 
-?>
\ No newline at end of file
+?>
+>>>>>>> skinnable-master
index fa45dfa..d41bd3d 100644 (file)
@@ -1,3 +1,790 @@
+<<<<<<< HEAD
+<?php\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2009 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * This class makes sure each item/weblog/comment object gets requested from\r
+ * the database only once, by keeping them in a cache. The class also acts as\r
+ * a dynamic classloader, loading classes _only_ when they are first needed,\r
+ * hoping to diminish execution time\r
+ *\r
+ * The class is a singleton, meaning that there will be only one object of it\r
+ * active at all times. The object can be requested using Manager::instance()\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group\r
+ * @version $Id: MANAGER.php 1731 2012-04-08 15:10:35Z sakamocchi $\r
+ */\r
+class Manager\r
+{\r
+       /**\r
+        * Cached ITEM, BLOG, PLUGIN, KARMA and MEMBER objects. When these objects are requested\r
+        * through the global $manager object (getItem, getBlog, ...), only the first call\r
+        * will create an object. Subsequent calls will return the same object.\r
+        *\r
+        * The $items, $blogs, ... arrays map an id to an object (for plugins, the name is used\r
+        * rather than an ID)\r
+        */\r
+       private $items;\r
+       private $blogs;\r
+       private $plugins;\r
+       private $karma;\r
+       private $templates;\r
+       private $members;\r
+       \r
+       /**\r
+        * cachedInfo to avoid repeated SQL queries (see pidInstalled/pluginInstalled/getPidFromName)\r
+        * e.g. which plugins exists?\r
+        *\r
+        * $cachedInfo['installedPlugins'] = array($pid -> $name)\r
+        */\r
+       private $cachedInfo;\r
+       \r
+       /**\r
+        * The plugin subscriptionlist\r
+        *\r
+        * The subcription array has the following structure\r
+        *              $subscriptions[$EventName] = array containing names of plugin classes to be\r
+        *                                                                       notified when that event happens\r
+        * \r
+        * NOTE: this is referred by Comments::addComment() for spamcheck API\r
+        * TODO: we should add new methods to get this\r
+        */\r
+       public $subscriptions;\r
+       \r
+       /**\r
+        * Ticket functions. These are uses by the admin area to make it impossible to simulate certain GET/POST\r
+        * requests. tickets are user specific\r
+        */\r
+       private $currentRequestTicket = '';\r
+       \r
+       /**\r
+        * Returns the only instance of this class. Creates the instance if it\r
+        * does not yet exists. Users should use this function as\r
+        * $manager =& Manager::instance(); to get a reference to the object\r
+        * instead of a copy\r
+        */\r
+       public function &instance()\r
+       {\r
+               static $instance = array();\r
+               if ( empty($instance) )\r
+               {\r
+                       $instance[0] = new Manager();\r
+               }\r
+               return $instance[0];\r
+       }\r
+       \r
+       /**\r
+        * The constructor of this class initializes the object caches\r
+        */\r
+       public function __construct()\r
+       {\r
+               $this->items = array();\r
+               $this->blogs = array();\r
+               $this->plugins = array();\r
+               $this->karma = array();\r
+               $this->parserPrefs = array();\r
+               $this->cachedInfo = array();\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Returns the requested item object. If it is not in the cache, it will\r
+        * first be loaded and then placed in the cache.\r
+        * Intended use: $item =& $manager->getItem(1234)\r
+        */\r
+       public function &getItem($itemid, $allowdraft, $allowfuture)\r
+       {\r
+               $item =& $this->items[$itemid];\r
+               \r
+               // check the draft and future rules if the item was already cached\r
+               if ( $item )\r
+               {\r
+                       if ( (!$allowdraft) && ($item['draft']) )\r
+                       {\r
+                               return 0;\r
+                       }\r
+                       \r
+                       $blog =& $this->getBlog(getBlogIDFromItemID($itemid));\r
+                       \r
+                       if ( (!$allowfuture) && ($item['timestamp'] > $blog->getCorrectTime()) )\r
+                       {\r
+                               return 0;\r
+                       }\r
+               }\r
+               \r
+               if ( !$item )\r
+               {\r
+                       // load class if needed\r
+                       $this->loadClass('ITEM');\r
+                       // load item object\r
+                       $item = Item::getitem($itemid, $allowdraft, $allowfuture);\r
+                       $this->items[$itemid] = $item;\r
+               }\r
+               return $item;\r
+       }\r
+       \r
+       /**\r
+        * Loads a class if it has not yet been loaded\r
+        */\r
+       public function loadClass($name)\r
+       {\r
+               $this->_loadClass($name, $name . '.php');\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Checks if an item exists\r
+        */\r
+       public function existsItem($id,$future,$draft)\r
+       {\r
+               $this->_loadClass('ITEM','ITEM.php');\r
+               return Item::exists($id,$future,$draft);\r
+       }\r
+       \r
+       /**\r
+        * Checks if a category exists\r
+        */\r
+       public function existsCategory($id)\r
+       {\r
+               return (DB::getValue('SELECT COUNT(*) as result FROM '.sql_table('category').' WHERE catid='.intval($id)) > 0);\r
+       }\r
+       \r
+       /**\r
+        * Returns the blog object for a given blogid\r
+        */\r
+       public function &getBlog($blogid)\r
+       {\r
+               $blog =& $this->blogs[$blogid];\r
+               \r
+               if ( !$blog )\r
+               {\r
+                       // load class if needed\r
+                       $this->_loadClass('BLOG','BLOG.php');\r
+                       // load blog object\r
+                       $blog = new Blog($blogid);\r
+                       $this->blogs[$blogid] =& $blog;\r
+               }\r
+               return $blog;\r
+       }\r
+       \r
+       /**\r
+        * Checks if a blog exists\r
+        */\r
+       public function existsBlog($name)\r
+       {\r
+               $this->_loadClass('BLOG','BLOG.php');\r
+               return Blog::exists($name);\r
+       }\r
+       \r
+       /**\r
+        * Checks if a blog id exists\r
+        */\r
+       public function existsBlogID($id)\r
+       {\r
+               $this->_loadClass('BLOG','BLOG.php');\r
+               return Blog::existsID($id);\r
+       }\r
+       \r
+       /**\r
+        * Returns a previously read template\r
+        */\r
+       public function &getTemplate($templateName)\r
+       {\r
+               $template =& $this->templates[$templateName];\r
+               \r
+               if ( !$template )\r
+               {\r
+                       $template = Template::read($templateName);\r
+                       $this->templates[$templateName] =& $template;\r
+               }\r
+               return $template;\r
+       }\r
+       \r
+       /**\r
+        * Returns a KARMA object (karma votes)\r
+        */\r
+       public function &getKarma($itemid)\r
+       {\r
+               $karma =& $this->karma[$itemid];\r
+               \r
+               if ( !$karma )\r
+               {\r
+                       // load class if needed\r
+                       $this->_loadClass('KARMA','KARMA.php');\r
+                       // create KARMA object\r
+                       $karma = new Karma($itemid);\r
+                       $this->karma[$itemid] =& $karma;\r
+               }\r
+               return $karma;\r
+       }\r
+       \r
+       /**\r
+        * Returns a MEMBER object\r
+        */\r
+       public function &getMember($memberid)\r
+       {\r
+               $mem =& $this->members[$memberid];\r
+               \r
+               if ( !$mem )\r
+               {\r
+                       // load class if needed\r
+                       $this->_loadClass('MEMBER','MEMBER.php');\r
+                       // create MEMBER object\r
+                       $mem =& Member::createFromID($memberid);\r
+                       $this->members[$memberid] =& $mem;\r
+               }\r
+               return $mem;\r
+       }\r
+       \r
+       /**\r
+        * Set the global parser preferences\r
+        */\r
+       public function setParserProperty($name, $value)\r
+       {\r
+               $this->parserPrefs[$name] = $value;\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Get the global parser preferences\r
+        */\r
+       public function getParserProperty($name)\r
+       {\r
+               return $this->parserPrefs[$name];\r
+       }\r
+       \r
+       /**\r
+        * A helper function to load a class\r
+        * \r
+        *      private\r
+        */\r
+       private function _loadClass($name, $filename)\r
+       {\r
+               if ( !class_exists($name) )\r
+               {\r
+                               global $DIR_LIBS;\r
+                               include($DIR_LIBS . $filename);\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Manager::_loadPlugin()\r
+        * loading a certain plugin\r
+        * \r
+        * @param       string $name plugin name\r
+        * @return      void\r
+        */\r
+       private function _loadPlugin($name)\r
+       {\r
+               global $DIR_PLUGINS, $MYSQL_HANDLER, $MYSQL_PREFIX;\r
+               \r
+               if ( class_exists($name) )\r
+               {\r
+                       return;\r
+               }\r
+               \r
+               $fileName = "{$DIR_PLUGINS}{$name}.php";\r
+               \r
+               if ( !file_exists($fileName) )\r
+               {\r
+                       if ( !defined('_MANAGER_PLUGINFILE_NOTFOUND') )\r
+                       {\r
+                               define('_MANAGER_PLUGINFILE_NOTFOUND', 'Plugin %s was not loaded (File not found)');\r
+                       }\r
+                       ActionLog::add(WARNING, sprintf(_MANAGER_PLUGINFILE_NOTFOUND, $name)); \r
+                       return 0;\r
+               }\r
+               \r
+               // load plugin\r
+               include($fileName);\r
+               \r
+               // check if class exists (avoid errors in eval'd code)\r
+               if ( !class_exists($name) )\r
+               {\r
+                       ActionLog::add(WARNING, sprintf(_MANAGER_PLUGINFILE_NOCLASS, $name));\r
+                       return 0;\r
+               }\r
+               \r
+               // add to plugin array\r
+               $this->plugins[$name] = new $name();\r
+               \r
+               // get plugid\r
+               $this->plugins[$name]->setID($this->getPidFromName($name));\r
+               \r
+               // unload plugin if a prefix is used and the plugin cannot handle this\r
+               if ( ($MYSQL_PREFIX != '')\r
+                 && !$this->plugins[$name]->supportsFeature('SqlTablePrefix') )\r
+               {\r
+                       unset($this->plugins[$name]);\r
+                       ActionLog::add(WARNING, sprintf(_MANAGER_PLUGINTABLEPREFIX_NOTSUPPORT, $name));\r
+                       return 0;\r
+               }\r
+               \r
+               // unload plugin if using non-mysql handler and plugin does not support it \r
+               if ( (!in_array('mysql',$MYSQL_HANDLER))\r
+                 && !$this->plugins[$name]->supportsFeature('SqlApi') )\r
+               {\r
+                       unset($this->plugins[$name]);\r
+                       ActionLog::add(WARNING, sprintf(_MANAGER_PLUGINSQLAPI_NOTSUPPORT, $name));\r
+                       return 0;\r
+               }\r
+               \r
+               // call init method\r
+               $this->plugins[$name]->init();\r
+               \r
+               return;\r
+       }\r
+\r
+       /**\r
+        * Manager:getPlugin()\r
+        * Returns a PLUGIN object\r
+        * \r
+        * @param       string  $name   name of plugin\r
+        * @return      object  plugin object\r
+        */\r
+       public function &getPlugin($name)\r
+       {\r
+               // retrieve the name of the plugin in the right capitalisation\r
+               $name = $this->getUpperCaseName ($name);\r
+               \r
+               // get the plugin       \r
+               $plugin =& $this->plugins[$name]; \r
+               \r
+               if ( !$plugin )\r
+               {\r
+                       // load class if needed\r
+                       $this->_loadPlugin($name);\r
+                       $plugin =& $this->plugins[$name];\r
+               }\r
+               return $plugin;\r
+       }\r
+       \r
+       /**\r
+        * Manager::pluginLoaded()\r
+        * Checks if the given plugin IS loaded or not\r
+        * \r
+        * @param       string  $name   name of plugin\r
+        * @return      object  plugin object\r
+        */\r
+       public function &pluginLoaded($name)\r
+       {\r
+               $plugin =& $this->plugins[$name];\r
+               return $plugin;\r
+       }\r
+       \r
+       /**\r
+        * Manager::pidLoaded()\r
+        * \r
+        * @param       integer $pid    id for plugin\r
+        * @return      object  plugin object\r
+        */\r
+       public function &pidLoaded($pid)\r
+       {\r
+               $plugin=false;\r
+               reset($this->plugins);\r
+               while ( list($name) = each($this->plugins) )\r
+               {\r
+                       if ( $pid!=$this->plugins[$name]->getId() )\r
+                       {\r
+                               continue;\r
+                       }\r
+                       $plugin= & $this->plugins[$name];\r
+                       break;\r
+               }\r
+               return $plugin;\r
+       }\r
+       \r
+       /**\r
+        * Manager::pluginInstalled()\r
+        * checks if the given plugin IS installed or not\r
+        * \r
+        * @param       string  $name   name of plugin\r
+        * @return      boolean exists or not\r
+        */\r
+       public function pluginInstalled($name)\r
+       {\r
+               $this->_initCacheInfo('installedPlugins');\r
+               return ($this->getPidFromName($name) != -1);\r
+       }\r
+\r
+       /**\r
+        * Manager::pidInstalled()\r
+        * checks if the given plugin IS installed or not\r
+        * \r
+        * @param       integer $pid    id of plugin\r
+        * @return      boolean exists or not\r
+        */\r
+       public function pidInstalled($pid)\r
+       {\r
+               $this->_initCacheInfo('installedPlugins');\r
+               return ($this->cachedInfo['installedPlugins'][$pid] != '');\r
+       }\r
+       \r
+       /**\r
+        * Manager::getPidFromName()\r
+        * \r
+        * @param       string  $name   name of plugin\r
+        * @return      mixed   id for plugin or -1 if not exists\r
+        */\r
+       public function getPidFromName($name)\r
+       {\r
+               $this->_initCacheInfo('installedPlugins');\r
+               foreach ( $this->cachedInfo['installedPlugins'] as $pid => $pfile )\r
+               {\r
+                       if (strtolower($pfile) == strtolower($name))\r
+                       {\r
+                               return $pid;\r
+                       }\r
+               }\r
+               return -1;\r
+       }\r
+       \r
+       /**\r
+        * Manager::getPluginNameFromPid()\r
+        * \r
+        * @param       string  $pid    ID for plugin\r
+        * @return      string  name of plugin\r
+        */\r
+       public function getPluginNameFromPid($pid)\r
+       {\r
+               if ( !array_key_exists($pid, $this->cachedInfo['installedPlugins']) )\r
+               {\r
+                       $query = 'SELECT pfile FROM %s WHERE pid=%d;';\r
+                       $query = sprintf($query, sql_table('plugin'), (integer) $pid);\r
+                       return DB::getValue($query);\r
+               }\r
+               return $this->cachedInfo['installedPlugins'][$pid];\r
+       }\r
+       \r
+       /**\r
+        * Manager::getUpperCaseName()\r
+        * Retrieve the name of a plugin in the right capitalisation\r
+        * \r
+        * @param       string  $name   name of plugin\r
+        * @return      string  name according to UpperCamelCase\r
+        */\r
+       public function getUpperCaseName ($name)\r
+       {\r
+               $this->_initCacheInfo('installedPlugins');\r
+               foreach ( $this->cachedInfo['installedPlugins'] as $pid => $pfile )\r
+               {\r
+                       if ( strtolower($pfile) == strtolower($name) )\r
+                       {\r
+                               return $pfile;\r
+                       }\r
+               }\r
+               return -1;\r
+       }\r
+       \r
+       /**\r
+        * Manager::clearCachedInfo()\r
+        * \r
+        * @param       string  $what\r
+        * @return      void\r
+        */\r
+       public function clearCachedInfo($what)\r
+       {\r
+               unset($this->cachedInfo[$what]);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Manager::_initCacheInfo()\r
+        * Loads some info on the first call only\r
+        * \r
+        * @param       string  $what   'installedPlugins'\r
+        * @return      void\r
+        */\r
+       private function _initCacheInfo($what)\r
+       {\r
+               if ( array_key_exists($what, $this->cachedInfo)\r
+                 && is_array($this->cachedInfo[$what]) )\r
+               {\r
+                       return;\r
+               }\r
+               \r
+               switch ($what)\r
+               {\r
+                       // 'installedPlugins' = array ($pid => $name)\r
+                       case 'installedPlugins':\r
+                               $this->cachedInfo['installedPlugins'] = array();\r
+                               $res = DB::getResult('SELECT pid, pfile FROM ' . sql_table('plugin'));\r
+                               foreach ( $res as $row )\r
+                               {\r
+                                       $this->cachedInfo['installedPlugins'][$row['pid']] = $row['pfile'];\r
+                               }\r
+                               break;\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Manager::notify()\r
+        * A function to notify plugins that something has happened. Only the plugins\r
+        * that are subscribed to the event will get notified.\r
+        * Upon the first call, the list of subscriptions will be fetched from the\r
+        * database. The plugins itsself will only get loaded when they are first needed\r
+        *\r
+        * @param       string  $eventName      Name of the event (method to be called on plugins)\r
+        * @param       string  $data           Can contain any type of data,\r
+        *                                                              depending on the event type. Usually this is an itemid, blogid, ...\r
+        *                                                              but it can also be an array containing multiple values\r
+        * @return      void\r
+        */\r
+       public function notify($eventName, $data)\r
+       {\r
+               // load subscription list if needed\r
+               if ( !is_array($this->subscriptions) )\r
+               {\r
+                       $this->_loadSubscriptions();\r
+               }\r
+               \r
+               // get listening objects\r
+               $listeners = false;\r
+               if ( array_key_exists($eventName, $this->subscriptions)\r
+                 && !empty($this->subscriptions[$eventName]) )\r
+               {\r
+                       $listeners = $this->subscriptions[$eventName];\r
+               }\r
+               \r
+               // notify all of them\r
+               if ( is_array($listeners) )\r
+               {\r
+                       foreach( $listeners as $listener )\r
+                       {\r
+                               // load class if needed\r
+                               $this->_loadPlugin($listener);\r
+                               \r
+                               // do notify (if method exists)\r
+                               if ( array_key_exists($listener, $this->plugins)\r
+                                 && !empty($this->plugins[$listener])\r
+                                 && method_exists($this->plugins[$listener], 'event_' . $eventName) )\r
+                               {\r
+                                       call_user_func(array(&$this->plugins[$listener],'event_' . $eventName), $data);\r
+                               }\r
+                       }\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Manager::_loadSubscriptions()\r
+        * Loads plugin subscriptions\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       private function _loadSubscriptions()\r
+       {\r
+               // initialize as array\r
+               $this->subscriptions = array();\r
+               \r
+               $query = "SELECT p.pfile as pfile, e.event as event"\r
+                      . " FROM %s as e, %s as p"\r
+                      . " WHERE e.pid=p.pid ORDER BY p.porder ASC";\r
+               $query = sprintf($query, sql_table('plugin_event'), sql_table('plugin'));\r
+               $res = DB::getResult($query);\r
+               \r
+               foreach ( $res as $row )\r
+               {\r
+                       $pluginName = $row['pfile'];\r
+                       $eventName = $row['event'];\r
+                       $this->subscriptions[$eventName][] = $pluginName;\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Manager::getNumberOfSubscribers()\r
+        * \r
+        * @param       string  $event  name of events\r
+        * @return      integer number of event subscriber\r
+        */\r
+       public function getNumberOfSubscribers($event)\r
+       {\r
+               $query = 'SELECT COUNT(*) as count FROM %s WHERE event=%s;';\r
+               $query = sprintf($query, sql_table('plugin_event'), DB::quoteValue($event));\r
+               return (integer) DB::getValue($query);\r
+       }\r
+       \r
+       /**\r
+        * Manager::addTicketToUrl()\r
+        * GET requests: Adds ticket to URL (URL should NOT be html-encoded!, ticket is added at the end)\r
+        * \r
+        * @param       string  url     string for URI\r
+        * @return      void\r
+        */\r
+       public function addTicketToUrl($url)\r
+       {\r
+               $ticketCode = 'ticket=' . $this->_generateTicket();\r
+               if ( i18n::strpos($url, '?') === FALSE )\r
+               {\r
+                       $ticketCode = "{$url}?{$ticketCode}";\r
+               }\r
+               else\r
+               {\r
+                       $ticketCode = "{$url}&{$ticketCode}";\r
+               }\r
+               return $ticketCode;\r
+       }\r
+       \r
+       /**\r
+        * Manager::addTicketHidden()\r
+        * POST requests: Adds ticket as hidden formvar\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       public function addTicketHidden()\r
+       {\r
+               $ticket = $this->_generateTicket();\r
+               echo '<input type="hidden" name="ticket" value="', Entity::hsc($ticket), '" />';\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Manager::getNewTicket()\r
+        * Get a new ticket\r
+        * (xmlHTTPRequest AutoSaveDraft uses this to refresh the ticket)\r
+        * \r
+        * @param       void\r
+        * @return      string  string of ticket\r
+        */\r
+       public function getNewTicket()\r
+       {\r
+               $this->currentRequestTicket = '';\r
+               return $this->_generateTicket();\r
+       }\r
+       \r
+       /**\r
+        * Manager::checkTicket()\r
+        * Checks the ticket that was passed along with the current request\r
+        * \r
+        * @param       void\r
+        * @return      boolean correct or not\r
+        */\r
+       public function checkTicket()\r
+       {\r
+               global $member;\r
+               \r
+               // get ticket from request\r
+               $ticket = requestVar('ticket');\r
+               \r
+               // no ticket -> don't allow\r
+               if ( $ticket == '' )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               \r
+               // remove expired tickets first\r
+               $this->_cleanUpExpiredTickets();\r
+               \r
+               // get member id\r
+               if (!$member->isLoggedIn())\r
+               {\r
+                       $memberId = -1;\r
+               }\r
+               else\r
+               {\r
+                       $memberId = $member->getID();\r
+               }\r
+               \r
+               // check if ticket is a valid one\r
+               $query = sprintf('SELECT COUNT(*) as result FROM %s WHERE member=%d and ticket=%s',\r
+                       sql_table('tickets'),\r
+                       intval($memberId),\r
+                       DB::quoteValue($ticket)\r
+               );\r
+               \r
+               /*\r
+                * NOTE:\r
+                * [in the original implementation, the checked ticket was deleted. This would lead to invalid\r
+                * tickets when using the browsers back button and clicking another link/form\r
+                * leaving the keys in the database is not a real problem, since they're member-specific and\r
+                * only valid for a period of one hour]\r
+                */\r
+               if ( DB::getValue($query) != 1 )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               \r
+               return TRUE;\r
+       }\r
+\r
+       /**\r
+        * Manager::_cleanUpExpiredTickets()\r
+        * Removes the expired tickets\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       private function _cleanUpExpiredTickets()\r
+       {\r
+               // remove tickets older than 1 hour\r
+               $oldTime = time() - 60 * 60;\r
+               $query = 'DELETE FROM %s WHERE ctime < %s';\r
+               $query = sprintf($query, sql_table('tickets'), DB::formatDateTime($oldTime));\r
+               DB::execute($query);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Manager::_generateTicket()\r
+        * Generates/returns a ticket (one ticket per page request)\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       private function _generateTicket()\r
+       {\r
+               if ( $this->currentRequestTicket == '' )\r
+               {\r
+                       // generate new ticket (only one ticket will be generated per page request)\r
+                       // and store in database\r
+                       global $member;\r
+                       // get member id\r
+                       if ( !$member->isLoggedIn() )\r
+                       {\r
+                               $memberId = -1;\r
+                       }\r
+                       else\r
+                       {\r
+                               $memberId = $member->getID();\r
+                       }\r
+                       \r
+                       $ok = false;\r
+                       while ( !$ok )\r
+                       {\r
+                               // generate a random token\r
+                               srand((double)microtime()*1000000);\r
+                               $ticket = md5(uniqid(rand(), true));\r
+                               \r
+                               // add in database as non-active\r
+                               $query = 'INSERT INTO %s (ticket, member, ctime) VALUES (%s, %d, %s)';\r
+                               $query = sprintf($query, sql_table('tickets'), DB::quoteValue($ticket), (integer) $memberId, DB::formatDateTime());\r
+                               \r
+                               if ( DB::execute($query) !== FALSE )\r
+                               {\r
+                                       $ok = true;\r
+                               }\r
+                       }\r
+                       $this->currentRequestTicket = $ticket;\r
+               }\r
+               return $this->currentRequestTicket;\r
+       }\r
+}\r
+\r
+=======
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
@@ -785,3 +1572,4 @@ class Manager
        }
 }
 
+>>>>>>> skinnable-master
index 422fd16..66f8c66 100644 (file)
@@ -1,3 +1,794 @@
+<<<<<<< HEAD
+<?php\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * Media classes for nucleus\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
+ * @version $Id: MEDIA.php 1870 2012-05-22 14:57:15Z sakamocchi $\r
+ */\r
+\r
+define('PRIVATE_COLLECTION',           'Private Collection');\r
+define('READ_ONLY_MEDIA_FOLDER',       '(Read Only)');\r
+\r
+class Media\r
+{\r
+       static public $thumbdir = '.thumb';\r
+       static public $algorism = 'md5';\r
+       static public $image_mime = array(\r
+               'image/jpeg'    => '.jpeg',\r
+               'image/png'             => '.png',\r
+               'image/gif'             => '.gif',\r
+       );\r
+       \r
+       /**\r
+        * Media::getCollectionList()\r
+        * Gets the list of collections available to the currently logged\r
+        * in member\r
+        * \r
+        * @param       boolean $exceptReadOnly\r
+        * @return array        dirname => display name\r
+        */\r
+       static public function getCollectionList($exceptReadOnly = FALSE)\r
+       {\r
+               global $member, $DIR_MEDIA;\r
+               \r
+               $collections = array();\r
+               \r
+               // add private directory for member\r
+               $collections[$member->getID()] = PRIVATE_COLLECTION;\r
+               \r
+               // add global collections\r
+               if ( !is_dir($DIR_MEDIA) )\r
+               {\r
+                       return $collections;\r
+               }\r
+               \r
+               $dirhandle = opendir($DIR_MEDIA);\r
+               while ( $dirname = readdir($dirhandle) )\r
+               {\r
+                       // only add non-numeric (numeric=private) dirs\r
+                       if ( @is_dir($DIR_MEDIA . $dirname) &&\r
+                               ($dirname != '.') &&\r
+                               ($dirname != '..') &&\r
+                               ($dirname != self::$thumbdir) &&\r
+                               (!is_numeric($dirname)) )\r
+                               {\r
+                               if ( @is_writable($DIR_MEDIA . $dirname) )\r
+                               {\r
+                                       $collections[$dirname] = $dirname;\r
+                               }\r
+                               else if ( $exceptReadOnly == FALSE )\r
+                               {\r
+                                       $collections[$dirname] = $dirname . ' ' . READ_ONLY_MEDIA_FOLDER;\r
+                               }\r
+                       }\r
+               }\r
+               closedir($dirhandle);\r
+               \r
+               return $collections;\r
+       }\r
+       \r
+       /**\r
+        * Media::getMediaListByCollection()\r
+        * Returns an array of MediaObject objects for a certain collection\r
+        *\r
+        * @param       string  $collection     name of the collection\r
+        * @param       string  $filter         filter on filename (defaults to none)\r
+        * @return      void\r
+        */\r
+       static public function getMediaListByCollection($collection, $filter = '')\r
+       {\r
+               global $CONF, $DIR_MEDIA;\r
+               \r
+               $filelist = array();\r
+               \r
+               // 1. go through all objects and add them to the filelist\r
+               $mediadir = $DIR_MEDIA . $collection . '/';\r
+               \r
+               // return if dir does not exist\r
+               if ( !is_dir($mediadir) )\r
+               {\r
+                       return $filelist;\r
+               }\r
+               \r
+               $dirhandle = opendir($mediadir);\r
+               while ( $filename = readdir($dirhandle) )\r
+               {\r
+                       // only add files that match the filter\r
+                       if ( !is_dir($mediadir . $filename) && self::checkFilter($filename, $filter) )\r
+                       {\r
+                               array_push($filelist, new MediaObject($collection, $filename, $DIR_MEDIA));\r
+                       }\r
+               }\r
+               closedir($dirhandle);\r
+               \r
+               /* sort array */\r
+               if ( !$CONF['MediaPrefix'] )\r
+               {\r
+                       usort($filelist,  array(__CLASS__, 'sort_media_by_timestamp'));\r
+               }\r
+               else\r
+               {\r
+                       usort($filelist,  array(__CLASS__, 'sort_media_by_filename'));\r
+               }\r
+               \r
+               return $filelist;\r
+       }\r
+       \r
+       /**\r
+        * Media::checkFilter()\r
+        * \r
+        * @param       string  $strText\r
+        * @param       string  $strFilter\r
+        * @return      boolean\r
+        */\r
+       static public function checkFilter($strText, $strFilter)\r
+       {\r
+               if ( $strFilter == '' )\r
+               {\r
+                       return 1;\r
+               }\r
+               else\r
+               {\r
+                       return is_integer(i18n::strpos(strtolower($strText), strtolower($strFilter)));\r
+               }\r
+       }\r
+       \r
+       /**\r
+        * Media::isValidCollection()\r
+        * checks if a collection exists with the given name, and if it's\r
+        * allowed for the currently logged in member to upload files to it\r
+        * \r
+        * @param       string  $collectionName\r
+        * @param       string  $exceptReadOnly\r
+        * @return      boolean\r
+        */\r
+       static public function isValidCollection($collectionName, $exceptReadOnly = FALSE)\r
+       {\r
+               global $member, $DIR_MEDIA;\r
+               \r
+               // allow creating new private directory\r
+               if ( $collectionName === (string)$member->getID() )\r
+               {\r
+                       return TRUE;\r
+               }\r
+               \r
+               $collections = self::getCollectionList($exceptReadOnly);\r
+               $dirname = $collections[$collectionName];\r
+               \r
+               if ( $dirname == NULL || $dirname === PRIVATE_COLLECTION )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               \r
+               // other collections should exist and be writable\r
+               $collectionDir = $DIR_MEDIA . $collectionName;\r
+               if ( $exceptReadOnly )\r
+               {\r
+                       return ( @is_dir($collectionDir) && @is_writable($collectionDir) );\r
+               }\r
+               \r
+               // other collections should exist\r
+               return @is_dir($collectionDir);\r
+       }\r
+       \r
+       /**\r
+        * Media::addMediaObject()\r
+        * Adds an uploaded file to the media archive\r
+        *\r
+        * @param       string  $collection     collection\r
+        * @param       array   $uploadfile     the postFileInfo(..) array\r
+        * @param       string  $filename       the filename that should be used to save the file as\r
+        *                                                              (date prefix should be already added here)\r
+        * @return      string  blank if success, message if failed\r
+        */\r
+       static public function addMediaObject($collection, $uploadfile, $filename)\r
+       {\r
+               global $DIR_MEDIA, $manager;\r
+               \r
+               // clean filename of characters that may cause trouble in a filename using cleanFileName() function from globalfunctions.php\r
+               $filename = cleanFileName($filename);\r
+               \r
+               // should already have tested for allowable types before calling this method. This will only catch files with no extension at all\r
+               if ( $filename === FALSE )\r
+               {\r
+                       return _ERROR_BADFILETYPE;\r
+               }\r
+               \r
+               // trigger PreMediaUpload event\r
+               $manager->notify('PreMediaUpload',array('collection' => &$collection, 'uploadfile' => $uploadfile, 'filename' => &$filename));\r
+               \r
+               // don't allow uploads to unknown or forbidden collections\r
+               $exceptReadOnly = TRUE;\r
+               if ( !self::isValidCollection($collection,$exceptReadOnly) )\r
+               {\r
+                       return _ERROR_DISALLOWED;\r
+               }\r
+               \r
+               // check dir permissions (try to create dir if it does not exist)\r
+               $mediadir = $DIR_MEDIA . $collection;\r
+               \r
+               // try to create new private media directories if needed\r
+               if ( !@is_dir($mediadir) && is_numeric($collection) )\r
+               {\r
+                       $oldumask = umask(0000);\r
+                       if ( !@mkdir($mediadir, 0777) )\r
+                       {\r
+                               return _ERROR_BADPERMISSIONS;\r
+                       }\r
+                       umask($oldumask);\r
+               }\r
+               \r
+               // if dir still not exists, the action is disallowed\r
+               if ( !@is_dir($mediadir) )\r
+               {\r
+                       return _ERROR_DISALLOWED;\r
+               }\r
+               \r
+               if ( !is_writeable($mediadir) )\r
+               {\r
+                       return _ERROR_BADPERMISSIONS;\r
+               }\r
+               \r
+               // add trailing slash (don't add it earlier since it causes mkdir to fail on some systems)\r
+               $mediadir .= '/';\r
+               \r
+               if ( file_exists($mediadir . $filename) )\r
+               {\r
+                       return _ERROR_UPLOADDUPLICATE;\r
+               }\r
+               \r
+               // move file to directory\r
+               if ( is_uploaded_file($uploadfile) )\r
+               {\r
+                       if ( !@move_uploaded_file($uploadfile, $mediadir . $filename) )\r
+                       {\r
+                               return _ERROR_UPLOADMOVEP;\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       if ( !copy($uploadfile, $mediadir . $filename) )\r
+                       {\r
+                               return _ERROR_UPLOADCOPY ;\r
+                       }\r
+               }\r
+               \r
+               // chmod uploaded file\r
+               $oldumask = umask(0000);\r
+               @chmod($mediadir . $filename, 0644);\r
+               umask($oldumask);\r
+               \r
+               $manager->notify('PostMediaUpload',array('collection' => $collection, 'mediadir' => $mediadir, 'filename' => $filename));\r
+               \r
+               return '';\r
+       }\r
+       \r
+       /**\r
+        * Media::addMediaObjectRaw()\r
+        * Adds an uploaded file to the media dir.\r
+        * \r
+        * NOTE: does not check if $collection is valid.\r
+        * \r
+        * @param       string  $collection     collection to use\r
+        * @param       string  $filename       the filename that should be used to save the file\r
+        *                                                              as (date prefix should be already added here)\r
+        * @param       &$data  File data (binary)\r
+        * @return      string  blank if success, message if failed\r
+        */\r
+       static public function addMediaObjectRaw($collection, $filename, &$data)\r
+       {\r
+               global $DIR_MEDIA;\r
+               \r
+               // check dir permissions (try to create dir if it does not exist)\r
+               $mediadir = $DIR_MEDIA . $collection;\r
+               \r
+               // try to create new private media directories if needed\r
+               if ( !@is_dir($mediadir) && is_numeric($collection) )\r
+               {\r
+                       $oldumask = umask(0000);\r
+                       if ( !@mkdir($mediadir, 0777) )\r
+                       {\r
+                               return _ERROR_BADPERMISSIONS;\r
+                       }\r
+                       umask($oldumask);\r
+               }\r
+               \r
+               // if dir still not exists, the action is disallowed\r
+               if ( !@is_dir($mediadir) )\r
+               {\r
+                       return _ERROR_DISALLOWED;\r
+               }\r
+               \r
+               if ( !is_writeable($mediadir) )\r
+               {\r
+                       return _ERROR_BADPERMISSIONS;\r
+               }\r
+               \r
+               // add trailing slash (don't add it earlier since it causes mkdir to fail on some systems)\r
+               $mediadir .= '/';\r
+               \r
+               if ( file_exists($mediadir . $filename) )\r
+               {\r
+                       return _ERROR_UPLOADDUPLICATE;\r
+               }\r
+               \r
+               // create file\r
+               $fh = @fopen($mediadir . $filename, 'wb');\r
+               if ( !$fh )\r
+               {\r
+                       return _ERROR_UPLOADFAILED;\r
+               }\r
+               $ok = @fwrite($fh, $data);\r
+               @fclose($fh);\r
+               if ( !$ok )\r
+               {\r
+                       return _ERROR_UPLOADFAILED;\r
+               }\r
+               \r
+               // chmod uploaded file\r
+               $oldumask = umask(0000);\r
+               @chmod($mediadir . $filename, 0644);\r
+               umask($oldumask);\r
+               \r
+               return '';\r
+       }\r
+       \r
+       /**\r
+        * Media::responseResampledImage()\r
+        * send resampled image via HTTP\r
+        * \r
+        * @param       object  $medium         MediaObject Object\r
+        * @exit\r
+        */\r
+       static public function responseResampledImage($medium, $maxwidth=0, $maxheight=0)\r
+       {\r
+               if ( get_class($medium) !== 'MediaObject' )\r
+               {\r
+                       header("HTTP/1.1 500 Internal Server Error");\r
+                       exit('Nucleus CMS: Fail to generate resampled image');\r
+                       return;\r
+               }\r
+               \r
+               $resampledimage = $medium->getResampledBinary($maxwidth, $maxheight);\r
+               if ( $resampledimage === FALSE )\r
+               {\r
+                       unset($resampledimage);\r
+                       header("HTTP/1.1 503 Service Unavailable");\r
+                       exit('Nucleus CMS: Fail to generate resampled image');\r
+                       return;\r
+               }\r
+               \r
+               header("Content-type: {$medium->mime}");\r
+               echo $resampledimage;\r
+               \r
+               unset($resampledimage);\r
+               \r
+               exit;\r
+       }\r
+       \r
+       /**\r
+        * Media::storeResampledImage()\r
+        * Store resampled image binary to filesystem as file\r
+        * \r
+        * @param       object  $medium         MediaObject Object\r
+        * @param       integer $maxwidth       maximum width\r
+        * @param       integer $maxheight      maximum height\r
+        * @param       string  $path           directory path for destination\r
+        * @param       string  $name           file name for destination\r
+        * @return      boolean\r
+        */\r
+       static public function storeResampledImage($medium, $maxwidth=0, $maxheight=0, $path='', $name='')\r
+       {\r
+               global $DIR_MEDIA;\r
+               \r
+               if ( get_class($medium) !== 'MediaObject' )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               \r
+               if ( $path !== '' )\r
+               {\r
+                       $path = realpath($path);\r
+                       if ( !file_exists($path)\r
+                         || strpos($path, $DIR_MEDIA) !== 0 )\r
+                       {\r
+                               return FALSE;\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       $path = '$DIR_MEDIA/' . self::$thumbdir;\r
+               }\r
+               \r
+               if ( $name === '' )\r
+               {\r
+                       $name = $medium->getHashedname();\r
+               }\r
+               \r
+               $resampledimage = $medium->getResampledBinary($maxwidth, $maxheight);\r
+               if ( !$resampledimage )\r
+               {\r
+                       unset($resampledimage);\r
+                       return FALSE;\r
+               }\r
+               \r
+               $handle = @fopen("{$path}/{$name}", 'w');\r
+               if ( !$handle )\r
+               {\r
+                       unset ($resampledimage);\r
+                       return FALSE;\r
+               }\r
+               \r
+               if ( !@fwrite($handle, $resampledimage) )\r
+               {\r
+                       unset($resampledimage);\r
+                       @unlink("{$path}/{$name}");\r
+                       return FALSE;\r
+               }\r
+               \r
+               unset($resampledimage);\r
+               fclose($handle);\r
+               \r
+               if ( !@chmod("{$path}/{$name}", 0774) )\r
+               {\r
+                       @unlink("{$path}/{$name}");\r
+                       return FALSE;\r
+               }\r
+               \r
+               return TRUE;\r
+       }\r
+       \r
+       /**\r
+        * Media::sort_media_by_timestamp()\r
+        * User-defined sort method to sort an array of MediaObjects\r
+        * \r
+        * @param       object  $a\r
+        * @param       object  $b\r
+        * @return      boolean\r
+        */\r
+       static private function sort_media_by_timestamp($a, $b)\r
+       {\r
+               if ($a->timestamp == $b->timestamp) return 0;\r
+               return ($a->timestamp > $b->timestamp) ? -1 : 1;\r
+       }\r
+       \r
+       /**\r
+        * Media::sort_media_by_filename()\r
+        * User-defined sort method to sort an array of MediaObjects\r
+        * \r
+        * @param       object  $a\r
+        * @param       object  $b\r
+        * @return      boolean\r
+        */\r
+       static private function sort_media_by_filename($a, $b)\r
+       {\r
+               if ($a->filename == $b->filename) return 0;\r
+               return ($a->filename > $b->filename) ? -1 : 1;\r
+       }\r
+}\r
+\r
+class MediaObject\r
+{\r
+       public $mime = '';\r
+       \r
+       public $root = '';\r
+       public $path = '';\r
+       public $private;\r
+       public $collection;\r
+       public $filename = '';\r
+       \r
+       public $prefix = '';\r
+       public $name = '';\r
+       public $suffix = '';\r
+       \r
+       public $timestamp = 0;\r
+       public $size = 0;\r
+       \r
+       public $width = 0;\r
+       public $height = 0;\r
+       public $resampledwidth = 0;\r
+       public $resampledheight = 0;\r
+       \r
+       /**\r
+        * MediaObject::__construct()\r
+        * \r
+        * @param       string          $collection     \r
+        * @param       string          $filename       \r
+        * @param       string          $root           fullpath to media directory\r
+        */\r
+       public function __construct($collection, $filename, $root=0)\r
+       {\r
+               global $CONF, $DIR_MEDIA;\r
+               \r
+               /* for backward compatibility */\r
+               if ( is_numeric($root) )\r
+               {\r
+                       $root = $DIR_MEDIA;\r
+               }\r
+               \r
+               $root = preg_replace('#/*$#', '', $root);\r
+               \r
+               /* get and validate fullpath for the medium */\r
+               if ( !file_exists($root)\r
+                 || FALSE === ($fullpath = realpath("{$root}/{$collection}/{$filename}"))\r
+                 || strpos($fullpath, $root) !== 0\r
+                 || !file_exists($fullpath) )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               \r
+               /* store fundamentals */\r
+               $this->root = $root;\r
+               $this->private = (integer) $collection;\r
+               $this->collection = $collection;\r
+               $this->filename = basename($fullpath);\r
+               $this->timestamp = filemtime($fullpath);\r
+               \r
+               /* store relative directory path from root directory for media */\r
+               $this->path = preg_replace(array("#{$this->root}/#", "#/{$this->filename}#"), '', $fullpath);\r
+               if ( $this->path === $this->name )\r
+               {\r
+                       $this->path = ''; \r
+               }\r
+               \r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * MediaObject::refine()\r
+        * refine data\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       public function refine()\r
+       {\r
+               global $CONF;\r
+               \r
+               /* store size (byte order) */\r
+               $this->size = filesize("{$this->root}/{$this->path}/{$this->filename}");\r
+               \r
+               /* get width and height if this is image binary */\r
+               if ( FALSE === ($info = @getimagesize ("{$this->root}/{$this->path}/{$this->filename}")) )\r
+               {\r
+                       $this->mime = 'application/octet-stream';\r
+                       $this->width = 0;\r
+                       $this->height = 0;\r
+               }\r
+               else\r
+               {\r
+                       $this->mime = $info['mime'];\r
+                       $this->width = $info[0];\r
+                       $this->height = $info[1];\r
+               }\r
+               \r
+               /* utilise Fileinfo subsystem if available */\r
+               if ( defined('FILEINFO_MIME_TYPE') && function_exists ('finfo_open')\r
+                 && (FALSE !== ($info = finfo_open(FILEINFO_MIME_TYPE))) )\r
+               {\r
+                       $this->mime = finfo_file($info, "{$this->root}/{$this->path}/{$this->filename}");\r
+               }\r
+               \r
+               /* store data with parsed filename */\r
+               if ( preg_match('#^(.*)\.([a-zA-Z0-9]{2,})$#', $this->filename, $info) === 1 )\r
+               {\r
+                       $this->name = $info[1];\r
+                       $this->suffix = $info[2];\r
+                       \r
+                       if ( $CONF['MediaPrefix'] && preg_match('#^([0-9]{8})\-(.*)$#', $this->name, $info) == 1 )\r
+                       {\r
+                               $this->prefix = preg_replace('#^([0-9]{4})([0-9]{2})([0-9]{2})$#', '$1/$2/$3', $info[1]);\r
+                               $this->name = $info[2];\r
+                       }\r
+               }\r
+               \r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * MediaObject::setResampledSize()\r
+        * Set resampled size\r
+        * \r
+        * @param       integer $maxwidth\r
+        * @param       integer $maxheight\r
+        * @return      boolean\r
+        */\r
+       public function setResampledSize($maxwidth=0, $maxheight=0)\r
+       {\r
+               if ( ($maxwidth == 0) && ($maxheight == 0) )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               else if ( $this->width == 0 || $this->height  == 0 )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               else if ($this->width < $maxwidth && $this->height < $maxheight )\r
+               {\r
+                       $this->resampledwidth = $this->width;\r
+                       $this->resampledheight = $this->height;\r
+               }\r
+               else if ( $maxheight == 0 || $this->width > $this->height )\r
+               {\r
+                       $this->resampledheight = intval ($this->height * $maxwidth / $this->width);\r
+                       $this->resampledwidth = $maxwidth;\r
+               }\r
+               else if ( $maxwidth == 0 || $this->width <= $this->height )\r
+               {\r
+                       $this->resampledwidth = intval ($this->width * $maxheight / $this->height);\r
+                       $this->resampledheight = $maxheight;\r
+               }\r
+               return TRUE;\r
+       }\r
+       \r
+       /**\r
+        * MediaObject::getResampledBinary()\r
+        * Return resampled image binary\r
+        * \r
+        * @param       void\r
+        * @return      mixed   binary if success, FALSE if failed\r
+        */\r
+       public function getResampledBinary($maxwidth=0, $maxheight=0)\r
+       {\r
+               static $gdinfo = array();\r
+               static $original;\r
+               static $resampledimage;\r
+               \r
+               if ( !$this->setResampledSize($maxwidth, $maxheight) )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               \r
+               if ( $gdinfo = array() )\r
+               {\r
+                       $gdinfo = gd_info();\r
+               }\r
+               \r
+               if ( $this->path !== '' )\r
+               {\r
+                       $fullpath = "{$this->root}/{$this->path}/{$this->name}";\r
+               }\r
+               else\r
+               {\r
+                       $fullpath = "{$this->root}/{$this->name}";\r
+               }\r
+               if ( !file_exists($fullpath) )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               \r
+               if ( !array_key_exists($this->mime, Media::$image_mime)\r
+                 || $this->width == 0\r
+                 || $this->height == 0\r
+                 || $this->resampledwidth == 0\r
+                 || $this->resampledheight == 0 )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               \r
+               /* check current available memory */\r
+               $memorymax = trim(ini_get("memory_limit"));\r
+               switch ( strtolower ($memorymax[strlen($memorymax)-1]) )\r
+               {\r
+                       case 'g':\r
+                               $memorymax *= 1024;\r
+                       case 'm':\r
+                               $memorymax *= 1024;\r
+                       case 'k':\r
+                               $memorymax *= 1024;\r
+               }\r
+               \r
+               /*\r
+                * this code is based on analyze if gd.c in php source code\r
+                * if you can read C/C++, please check these elements and notify us if you have some ideas\r
+                */\r
+               if ( (memory_get_usage()\r
+                  + ($this->resampledwidth * $this->resampledheight * 5 + $this->resampledheight * 24 + 10000)\r
+                  + ($this->width * $this->height * 5 + $this->height * 24 + 10000))\r
+                 > $memorymax )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               \r
+               switch ( $this->mime )\r
+               {\r
+                       case 'image/gif':\r
+                               if ( (!array_key_exists('GIF Read Support', $gdinfo) || !isset($gdinfo['GIF Read Support']))\r
+                                 || (!array_key_exists('GIF Create Support', $gdinfo) || !isset($gdinfo['GIF Create Support'])) )\r
+                               {\r
+                                       return FALSE;\r
+                               }\r
+                               $function = 'imagecreatefromgif';\r
+                               break;\r
+                       case 'image/jpeg':\r
+                               if ( (!array_key_exists('JPEG Support', $gdinfo) || !isset($gdinfo['JPEG Support']))\r
+                                 && (!array_key_exists('JPG Support', $gdinfo) || !isset($gdinfo['JPG Support'])) )\r
+                               {\r
+                                       return FALSE;\r
+                               }\r
+                               $function = 'imagecreatefromjpeg';\r
+                               break;\r
+                       case 'image/png':\r
+                               if ( !array_key_exists('PNG Support', $gdinfo) || !isset($gdinfo['PNG Support']) )\r
+                               {\r
+                                       return FALSE;\r
+                               }\r
+                               $function = 'imagecreatefrompng';\r
+                               break;\r
+                       default:\r
+                               return FALSE;\r
+               }\r
+               \r
+               if ( !is_callable($function) )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               \r
+               $original = call_user_func_array($function, array(&$fullpath));\r
+               if ( !$original )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               \r
+               $resampledimage = imagecreatetruecolor($this->resampledwidth, $this->resampledheight);\r
+               if ( !$resampledimage )\r
+               {\r
+                       imagedestroy($original);\r
+                       return FALSE;\r
+               }\r
+               \r
+               @set_time_limit(ini_get('max_execution_time'));\r
+               if ( !ImageCopyResampled($resampledimage, $original, 0, 0, 0, 0, $this->resampledwidth, $this->resampledheight, $this->width, $this->height) )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               \r
+               imagedestroy($original);\r
+               \r
+               ob_start();\r
+               \r
+               switch ( $this->mime )\r
+               {\r
+                       case 'image/gif':\r
+                               imagegif($resampledimage);\r
+                               break;\r
+                       case 'image/jpeg':\r
+                               imagejpeg($resampledimage);\r
+                               break;\r
+                       case 'image/png':\r
+                               imagepng($resampledimage);\r
+                               break;\r
+                       case 'image/bmp':\r
+                       case 'image/x-ms-bmp':\r
+                               imagepng($resampledimage);\r
+                               break;\r
+                       default:\r
+                               return FALSE;\r
+               }\r
+               \r
+               imagedestroy($resampledimage);\r
+               \r
+               return ob_get_clean();\r
+       }\r
+       \r
+       public function getHashedName()\r
+       {\r
+               return (string) hash(Media::$algorism, "{$this->path}/{$this->name}", FALSE);\r
+       }\r
+}\r
+=======
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
@@ -789,3 +1580,4 @@ class MediaObject
                return (string) hash(Media::$algorism, "{$this->path}/{$this->name}", FALSE);
        }
 }
+>>>>>>> skinnable-master
index a0a1146..1047d78 100644 (file)
+<<<<<<< HEAD
+<?php\r
+\r
+/* \r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2009 The Nucleus Group\r
+ * \r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * A class representing site members\r
+ * \r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group\r
+ * @version $Id: MEMBER.php 1616 2012-01-08 09:48:15Z sakamocchi $\r
+ */\r
+class Member\r
+{\r
+       // 1 when authenticated, 0 when not\r
+       public $loggedin = 0;\r
+       public $password;               // not the actual password, but rather a MD5 hash\r
+       private $algorism = 'md5';\r
+       \r
+       public $cookiekey;              // value that should also be in the client cookie to allow authentication\r
+       private $cookie_salt = FALSE;\r
+       \r
+       // member info\r
+       public $id = -1;\r
+       public $realname;\r
+       public $displayname;\r
+       public $email;\r
+       public $url;\r
+       public $admin = 0;                      // (either 0 or 1)\r
+       public $canlogin = 0;           // (either 0 or 1)\r
+       public $notes;\r
+       public $autosave = 1;           // if the member use the autosave draft function\r
+       private $locale = '';\r
+       \r
+       /**\r
+        * Member::__construct()\r
+        * Constructor for a member object\r
+        * \r
+        * @param       Void\r
+        * @return      Void\r
+        * \r
+        */\r
+       public function __construct()\r
+       {\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Member::createFromName()\r
+        * Create a member object for a given displayname\r
+        * \r
+        * @static\r
+        * @param       String  $displayname    login name\r
+        * @return      Object  member object\r
+        * \r
+        */\r
+       public static function &createFromName($displayname)\r
+       {\r
+               $mem = new Member();\r
+               $mem->readFromName($displayname);\r
+               return $mem;\r
+       }\r
+       \r
+       /**\r
+        * Member::createFromID()\r
+        * Create a member object for a given ID\r
+        * \r
+        * @static\r
+        * @param       Integer $id     id for member\r
+        */\r
+       public static function &createFromID($id)\r
+       {\r
+               $mem = new Member();\r
+               $mem->readFromID($id);\r
+               return $mem;\r
+       }\r
+       \r
+       /**\r
+        * Member::readFromName()\r
+        * Read member table in database\r
+        * \r
+        * @param       String  $displayname    login name\r
+        * @return      Object  SQL resource\r
+        * \r
+        */\r
+       public function readFromName($displayname)\r
+       {\r
+               return $this->read('mname='.DB::quoteValue($displayname));\r
+       }\r
+       \r
+       /**\r
+        * Member::readFromID()\r
+        * Read member table in database\r
+        * \r
+        * @param       Integer $id     id for member\r
+        * @return      Object  SQL resource\r
+        * \r
+        */\r
+       public function readFromID($id)\r
+       {\r
+               return $this->read("mnumber=" . intval($id));\r
+       }\r
+       \r
+       /**\r
+        * Member::hash()\r
+        * hash the target string\r
+        * \r
+        * @param       String  $string target string\r
+        * @return      Void    hashed string\r
+        */\r
+       public function hash($string)\r
+       {\r
+               switch ( $this->algorism )\r
+               {\r
+                       case 'md5':\r
+                       default:\r
+                               $string = md5($string);\r
+               }\r
+               return $string;\r
+       }\r
+       \r
+       /**\r
+        * Member::set_cookie_salt()\r
+        * \r
+        * @param       integer $key    secureCookieKey value\r
+        * @return      void\r
+        * \r
+        */\r
+       private function set_cookie_salt($key = 0)\r
+       {\r
+               if ( !$key )\r
+               {\r
+                       $key = 24;\r
+               }\r
+               \r
+               switch( $key )\r
+               {\r
+                       case 8:\r
+                               $this->cookie_salt = preg_replace('/\.[0-9]+\.[0-9]+\.[0-9]+$/', '', serverVar('REMOTE_ADDR'));\r
+                               break;\r
+                       case 16:\r
+                               $this->cookie_salt = preg_replace('/\.[0-9]+\.[0-9]+$/', '', serverVar('REMOTE_ADDR'));\r
+                               break;\r
+                       case 24:\r
+                               $this->cookie_salt = preg_replace('/\.[0-9]+$/', '', serverVar('REMOTE_ADDR'));\r
+                               break;\r
+                       case 32:\r
+                               $this->cookie_salt = serverVar('REMOTE_ADDR');\r
+                               break;\r
+                       default:\r
+                               $this->cookie_salt = 'none';\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Member::login()\r
+        * Tries to login as a given user.\r
+        * Returns true when succeeded, returns false when failed\r
+        * 3.40 adds CustomLogin event\r
+        * \r
+        * @param       String  $login  login name for member\r
+        * @param       String  $password       password for member\r
+        * @param       Integer $shared whether the user agent is shared or not\r
+        * \r
+        */\r
+       public function login($login, $password, $shared=1)\r
+       {\r
+               global $CONF, $errormessage, $manager;\r
+               \r
+               /* TODO: validation for $login, $password, $shared */\r
+               if ( $login == '' || $password == '' )\r
+               {\r
+                       return 0;\r
+               }\r
+               /* limiting the length of password to avoid hash collision */\r
+               $password=i18n::substr($password, 0, 40);\r
+               \r
+               /* \r
+                * generate cookie salt from secure cookie key settings\r
+               * (either 'none', 0, 8, 16, 24, or 32)\r
+               */\r
+               if ( !$this->cookie_salt )\r
+               {\r
+                       $salt = 0;\r
+                       if ( array_key_exists('secureCookieKey', $CONF) )\r
+                       {\r
+                               $salt = $CONF['secureCookieKey'];\r
+                       }\r
+                       $this->set_cookie_salt($salt);\r
+               }\r
+               \r
+               $success = 0;\r
+               $allowlocal = 1;\r
+               $manager->notify('CustomLogin', array('login' => &$login, 'password'=>&$password, 'success'=>&$success, 'allowlocal'=>&$allowlocal));\r
+               \r
+               $this->loggedin = 0;\r
+               if ( $success )\r
+               {\r
+                       $this->loggedin = ( $this->readFromName($login) );\r
+               }\r
+               elseif ( $allowlocal )\r
+               {\r
+                       $this->loggedin = ( $this->readFromName($login) && $this->checkPassword($password) );\r
+               }\r
+               \r
+               /* login failed */\r
+               if ( !$this->loggedin )\r
+               {\r
+                       $trimlogin = trim($login);\r
+                       if ( empty($trimlogin) )\r
+                       {\r
+                               $errormessage = "Please enter a username.";\r
+                       }\r
+                       else\r
+                       {\r
+                               $errormessage = 'Login failed for ' . $login;\r
+                       }\r
+                       $manager->notify('LoginFailed', array('username' => $login) );\r
+                       ActionLog::add(INFO, $errormessage);\r
+               }\r
+               /* login success */\r
+               else\r
+               {\r
+                       /* For lower compatibility */\r
+                       if ( strlen($this->password) === 32 )\r
+                       {\r
+                               $this->password = $this->hash($password);\r
+                       }\r
+                       \r
+                       $this->newCookieKey();\r
+                       $this->setCookies($shared);\r
+                       \r
+                       if ( $this->cookie_salt !== 'none' )\r
+                       {\r
+                               /* secure cookie key */\r
+                               $this->setCookieKey($this->hash($this->getCookieKey() . $this->cookie_salt));\r
+                               $this->write();\r
+                       }\r
+                       \r
+                       $errormessage = '';\r
+                       $manager->notify('LoginSuccess', array('member' => &$member, 'username' => $login) );\r
+                       ActionLog::add(INFO, "Login successful for $login (sharedpc=$shared)");\r
+               }\r
+               \r
+               return $this->loggedin;\r
+       }\r
+       \r
+       /**\r
+        * Member::cookielogin()\r
+        * Login using cookie key\r
+        * \r
+        * @param       String  $login  not used\r
+        * @param       String  $cookiekey      not used\r
+        * @return      Boolean login or not\r
+        */\r
+       public function cookielogin($login='', $cookiekey='')\r
+       {\r
+               global $CONF, $manager;\r
+               \r
+               if ( !headers_sent() && cookieVar("{$CONF['CookiePrefix']}user") )\r
+               {\r
+                       /* Cookie Authentication */\r
+                       $ck = cookieVar("{$CONF['CookiePrefix']}loginkey");\r
+                               \r
+                       /* TODO: validation for each cookie values */\r
+                               \r
+                       /* limiting the length of password to avoid hash collision */\r
+                       $ck = i18n::substr($ck,0,32);\r
+                               \r
+                       /* \r
+                        * generate cookie salt from secure cookie key settings\r
+                       * (either 'none', 0, 8, 16, 24, or 32)\r
+                       */\r
+                       if ( !$this->cookie_salt )\r
+                       {\r
+                               $salt = 0;\r
+                               if ( array_key_exists('secureCookieKey', $CONF) )\r
+                               {\r
+                                       $salt = $CONF['secureCookieKey'];\r
+                               }\r
+                               $this->set_cookie_salt($salt);\r
+                       }\r
+                       \r
+                       if ( $this->cookie_salt !== 'none' )\r
+                       {\r
+                               $ck = $this->hash($ck . $this->cookie_salt);\r
+                       }\r
+                       $this->loggedin = ( $this->readFromName(cookieVar("{$CONF['CookiePrefix']}user")) && $this->checkCookieKey($ck) );\r
+                       unset($ck);\r
+                               \r
+                       /* renew cookies when not on a shared computer */\r
+                       if ( $this->loggedin && (cookieVar($CONF['CookiePrefix'] . 'sharedpc') != 1) )\r
+                       {\r
+                               $this->setCookieKey(cookieVar("{$CONF['CookiePrefix']}loginkey"));\r
+                               $this->setCookies();\r
+                       }\r
+               }\r
+               return $this->loggedin;\r
+       }\r
+       \r
+       /**\r
+        * Member::logout()\r
+        * logout and expire cookie\r
+        * \r
+        * @param       Void\r
+        * @return      Void\r
+        */\r
+       public function logout()\r
+       {\r
+               global $CONF, $manager;\r
+               \r
+               if ( !headers_sent() && cookieVar("{$CONF['CookiePrefix']}user") )\r
+               {\r
+                       /* remove cookies on logout */\r
+                       setcookie("{$CONF['CookiePrefix']}user", '', (time() - 2592000), $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);\r
+                       setcookie("{$CONF['CookiePrefix']}loginkey", '', (time() - 2592000), $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);\r
+                       $manager->notify('Logout', array('username' => cookieVar("{$CONF['CookiePrefix']}user") ) );\r
+               }\r
+               \r
+               $this->loggedin = 0;\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Member::isLoggedIn()\r
+        * return member is loggedin or not\r
+        * \r
+        * @param       Void\r
+        * @return      Void\r
+        */\r
+       public function isLoggedIn()\r
+       {\r
+               return $this->loggedin;\r
+       }\r
+       \r
+       /**\r
+        * MEMBER:read()\r
+        * Read member information from the database\r
+        * \r
+        * @param       String  $where  where statement\r
+        * @return      Resource        SQL resource\r
+        * \r
+        */\r
+       public function read($where)\r
+       {\r
+               // read info\r
+               $query =  'SELECT * FROM '.sql_table('member') . ' WHERE ' . $where;\r
+               \r
+               $row = DB::getRow($query);\r
+               \r
+               $this->setRealName($row['mrealname']);\r
+               $this->setEmail($row['memail']);\r
+               $this->password = $row['mpassword'];\r
+               $this->setCookieKey($row['mcookiekey']);\r
+               $this->setURL($row['murl']);\r
+               $this->setDisplayName($row['mname']);\r
+               $this->setAdmin($row['madmin']);\r
+               $this->id = $row['mnumber'];\r
+               $this->setCanLogin($row['mcanlogin']);\r
+               $this->setNotes($row['mnotes']);\r
+               $this->setLocale($row['mlocale']);\r
+               $this->setAutosave($row['mautosave']);\r
+               \r
+               return $row ? TRUE : FALSE;\r
+       }\r
+       \r
+       /**\r
+        * Member::isBlogAdmin()\r
+        * Returns true if member is an admin for the given blog\r
+        * (returns false if not a team member)\r
+        * \r
+        * @param       Integer $blogid weblog id\r
+        * @return      Integer weblog admin or not\r
+        * \r
+        */\r
+       public function isBlogAdmin($blogid)\r
+       {\r
+               $query = 'SELECT tadmin FROM '.sql_table('team').' WHERE'\r
+               . ' tblog=' . intval($blogid)\r
+               . ' and tmember='. $this->getID();\r
+               $res = DB::getValue($query);\r
+               if ( $res )\r
+                       return ($res == 1);\r
+               else\r
+                       return 0;\r
+       }\r
+       \r
+       /**\r
+        * Member::blogAdminRights()\r
+        * \r
+        * @param       integer $blogid ID of target weblog\r
+        * @return      boolean whether to have admin rights to the weblog or not\r
+        * \r
+        */\r
+       public function blogAdminRights($blogid)\r
+       {\r
+               return ($this->isAdmin() || $this->isBlogAdmin($blogid));\r
+       }\r
+       \r
+       /**\r
+        * Member::teamRights()\r
+        * \r
+        * @param       integer $blogid ID of target weblog\r
+        * @return      boolean whether to have admin right to the weblog or not\r
+        * \r
+        */\r
+       public function teamRights($blogid)\r
+       {\r
+               return ($this->isAdmin() || $this->isTeamMember($blogid));\r
+       }\r
+       \r
+       /**\r
+        * Member::isTeamMember()\r
+        * Returns true if this member is a team member of the given blog\r
+        * \r
+        * @param       integer $blogid ID of target weblog\r
+        * @return      boolean whether to join the weblog or not\r
+        * \r
+        */\r
+       public function isTeamMember($blogid)\r
+       {\r
+               $query = 'SELECT * FROM '.sql_table('team').' WHERE'\r
+                          . ' tblog=' . intval($blogid)\r
+                          . ' and tmember='. $this->getID();\r
+               $res = DB::getResult($query);\r
+               return ($res->rowCount() != 0);\r
+       }\r
+       \r
+       /**\r
+        * Member::canAddItem()\r
+        * \r
+        * @param       integer $catid  ID of target category\r
+        * @return      boolean whether to be able to add items to the category or not\r
+        * \r
+        */\r
+       public function canAddItem($catid)\r
+       {\r
+               global $manager;\r
+               \r
+               // if this is a 'newcat' style newcat\r
+               // no blog admin of destination blog -> NOK\r
+               // blog admin of destination blog -> OK\r
+               if ( i18n::strpos($catid,'newcat') === 0 )\r
+               {\r
+                       // get blogid\r
+                       list($blogid) = sscanf($catid,"newcat-%d");\r
+                       return $this->blogAdminRights($blogid);\r
+               }\r
+               \r
+               // category does not exist -> NOK\r
+               if ( !$manager->existsCategory($catid) )\r
+               {\r
+                       return 0;\r
+               }\r
+               \r
+               $blogid = getBlogIDFromCatID($catid);\r
+               \r
+               // no team rights for blog -> NOK\r
+               if (!$this->teamRights($blogid))\r
+               {\r
+                       return 0;\r
+               }\r
+               \r
+               // all other cases: OK\r
+               return 1;\r
+       }\r
+       \r
+       /**\r
+        * Member::canAlterComment()\r
+        * Returns true if this member can edit/delete a commentitem. This can be in the\r
+        * following cases:\r
+        *        - member is a super-admin\r
+        *   - member is the author of the comment\r
+        *   - member is admin of the blog associated with the comment\r
+        *   - member is author of the item associated with the comment\r
+        * \r
+        * @param       integer $commentid      ID of target comment\r
+        * @return      boolean delete/edit the comment or not\r
+        * \r
+        */\r
+       public function canAlterComment($commentid)\r
+       {\r
+               if ( $this->isAdmin() )\r
+               {\r
+                       return 1;\r
+               }\r
+               \r
+               $query =  'SELECT citem as itemid, iblog as blogid, cmember as cauthor, iauthor'\r
+                          . ' FROM '.sql_table('comment') .', '.sql_table('item').', '.sql_table('blog')\r
+                          . ' WHERE citem=inumber and iblog=bnumber and cnumber=' . intval($commentid);\r
+               $res = DB::getRow($query);\r
+               \r
+               return ($res['cauthor'] == $this->getID()) or $this->isBlogAdmin($res['blogid']) or ($res['iauthor'] == $this->getID());\r
+       }\r
+       \r
+       /**\r
+        * Member::canAlterItem()\r
+        * Returns true if this member can edit/delete an item. This is true in the following\r
+        * cases: - member is a super-admin\r
+        *             - member is the author of the item\r
+        *        - member is admin of the the associated blog\r
+        * \r
+        * @param       integer $itemid ID of target item\r
+        * @return      boolean delete/edit the item or not\r
+        * \r
+        */\r
+       public function canAlterItem($itemid)\r
+       {\r
+               if ($this->isAdmin()) return 1;\r
+               \r
+               $query =  'SELECT iblog, iauthor FROM '.sql_table('item').' WHERE inumber=' . intval($itemid);\r
+               $res = DB::getRow($query);\r
+               return ($res['iauthor'] == $this->getID()) or $this->isBlogAdmin($res['iblog']);\r
+       }\r
+       \r
+       /**\r
+        * Member::canBeDeleted()\r
+        * Return true if member can be deleted. This means that there are no items posted by the member left\r
+        * \r
+        * @param       void\r
+        * @return      boolean whether there is no items or exists\r
+        * \r
+        */\r
+       public function canBeDeleted()\r
+       {\r
+               $res = DB::getResult('SELECT * FROM '.sql_table('item').' WHERE iauthor=' . $this->getID());\r
+               return ( $res->rowCount() == 0 );\r
+       }\r
+       \r
+       /**\r
+        * Member::canUpdateItem()\r
+        * returns true if this member can move/update an item to a given category,\r
+        * false if not (see comments fot the tests that are executed)\r
+        * \r
+        * @param       integer $itemid\r
+        * @param       string  $newcat (can also be of form 'newcat-x' with x=blogid)\r
+        * @return      boolean whether being able to update the item or not\r
+        * \r
+        */\r
+       public function canUpdateItem($itemid, $newcat)\r
+       {\r
+               global $manager;\r
+               \r
+               // item does not exists -> NOK\r
+               if ( !$manager->existsItem($itemid,1,1) )\r
+               {\r
+                       return 0;\r
+               }\r
+               \r
+               // cannot alter item -> NOK\r
+               if (!$this->canAlterItem($itemid))\r
+               {\r
+                       return 0;\r
+               }\r
+               \r
+               // if this is a 'newcat' style newcat\r
+               // no blog admin of destination blog -> NOK\r
+               // blog admin of destination blog -> OK\r
+               if ( i18n::strpos($newcat, 'newcat') === 0 )\r
+               {\r
+                       // get blogid\r
+                       list($blogid) = sscanf($newcat, 'newcat-%d');\r
+                       return $this->blogAdminRights($blogid);\r
+               }\r
+               \r
+               // category does not exist -> NOK\r
+               if (!$manager->existsCategory($newcat))\r
+               {\r
+                       return 0;\r
+               }\r
+               \r
+               // get item\r
+               $item =& $manager->getItem($itemid,1,1);\r
+               \r
+               // old catid = new catid -> OK\r
+               if ($item['catid'] == $newcat)\r
+               {\r
+                       return 1;\r
+               }\r
+               \r
+               // not a valid category -> NOK\r
+               $validCat = DB::getValue('SELECT COUNT(*) AS result FROM '.sql_table('category').' WHERE catid='.intval($newcat));\r
+               if ( !$validCat )\r
+               {\r
+                       return 0;\r
+               }\r
+               \r
+               // get destination blog\r
+               $source_blogid = getBlogIDFromItemID($itemid);\r
+               $dest_blogid = getBlogIDFromCatID($newcat);\r
+               \r
+               // not a team member of destination blog -> NOK\r
+               if ( !$this->teamRights($dest_blogid) )\r
+               {\r
+                       return 0;\r
+               }\r
+               \r
+               // if member is author of item -> OK\r
+               if ( $item['authorid'] == $this->getID() )\r
+               {\r
+                       return 1;\r
+               }\r
+               \r
+               // if member has admin rights on both blogs: OK\r
+               if ( ($this->blogAdminRights($dest_blogid)) && ($this->blogAdminRights($source_blogid)) )\r
+               {\r
+                       return 1;\r
+               }\r
+               \r
+               // all other cases: NOK\r
+               return 0;\r
+       }\r
+       \r
+       /**\r
+        * Member::setCookies()\r
+        * Sets the cookies for the member\r
+        * \r
+        * @param boolean       $shared set this to 1 when using a shared computer. Cookies will expire\r
+        *                              at the end of the session in this case.\r
+        * @return      void\r
+        * \r
+        */\r
+       public function setCookies($shared = 0)\r
+       {\r
+               global $CONF;\r
+               \r
+               if ( $CONF['SessionCookie'] || $shared )\r
+               {\r
+                       $lifetime = 0;\r
+               }\r
+               else\r
+               {\r
+                       $lifetime = time()+2592000;\r
+               }\r
+               \r
+               setcookie($CONF['CookiePrefix'] . 'user', $this->getDisplayName(), $lifetime, $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);\r
+               setcookie($CONF['CookiePrefix'] . 'loginkey', $this->getCookieKey(), $lifetime, $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);\r
+               \r
+               // make sure cookies on shared pcs don't get renewed\r
+               if ( $shared )\r
+               {\r
+                       setcookie($CONF['CookiePrefix'] .'sharedpc', '1',$lifetime,$CONF['CookiePath'],$CONF['CookieDomain'],$CONF['CookieSecure']);\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Member::sendActivationLink()\r
+        * Send activation mail\r
+        * \r
+        * @param       string  $type   activation type\r
+        * @param       string  $extra  extra info\r
+        * @return      void\r
+        */\r
+       public function sendActivationLink($type, $extra='')\r
+       {\r
+               global $CONF;\r
+               \r
+               if ( !isset($CONF['ActivationDays']) )\r
+               {\r
+                       $CONF['ActivationDays'] = 2;\r
+               }\r
+               \r
+               // generate key and URL\r
+               $key = $this->generateActivationEntry($type, $extra);\r
+               $url = $CONF['AdminURL'] . 'index.php?action=activate&key=' . $key;\r
+               \r
+               // choose text to use in mail\r
+               switch ( $type )\r
+               {\r
+                       case 'register':\r
+                               $message = _ACTIVATE_REGISTER_MAIL;\r
+                               $subject = _ACTIVATE_REGISTER_MAILTITLE;\r
+                               break;\r
+                       case 'forgot':\r
+                               $message = _ACTIVATE_FORGOT_MAIL;\r
+                               $subject = _ACTIVATE_FORGOT_MAILTITLE;\r
+                               break;\r
+                       case 'addresschange':\r
+                               $message = _ACTIVATE_CHANGE_MAIL;\r
+                               $subject = _ACTIVATE_CHANGE_MAILTITLE;\r
+                               break;\r
+                       default;\r
+               }\r
+               \r
+               // fill out variables in text\r
+               $aVars = array(\r
+                       'siteName' => $CONF['SiteName'],\r
+                       'siteUrl' => $CONF['IndexURL'],\r
+                       'memberName' => $this->getDisplayName(),\r
+                       'activationUrl' => $url,\r
+                       'activationDays' => $CONF['ActivationDays']\r
+               );\r
+               \r
+               $message = Template::fill($message, $aVars);\r
+               $subject = Template::fill($subject, $aVars);\r
+               \r
+               // send mail\r
+               NOTIFICATION::mail($this->getEmail(), $subject ,$message, $CONF['AdminEmail'], i18n::get_current_charset());\r
+               \r
+               ActionLog::add(INFO, _ACTIONLOG_ACTIVATIONLINK . ' (' . $this->getDisplayName() . ' / type: ' . $type . ')');\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Member::getAdminBlogs()\r
+        * Returns an array of all blogids for which member has admin rights\r
+        * \r
+        * @param       void\r
+        * @return      array   weblog IDs in which this member has admin rights\r
+        * \r
+        */\r
+       public function getAdminBlogs()\r
+       {\r
+               $blogs = array();\r
+               \r
+               if ($this->isAdmin())\r
+               {\r
+                       $query = 'SELECT bnumber as blogid from '.sql_table('blog');\r
+               }\r
+               else\r
+               {\r
+                       $query = 'SELECT tblog as blogid from '.sql_table('team').' where tadmin=1 and tmember=' . $this->getID();\r
+               }\r
+               \r
+               $res = DB::getResult($query);\r
+               if ( $res->rowCount() > 0 )\r
+               {\r
+                       foreach ( $res as $row )\r
+                       {\r
+                               array_push($blogs, $row['blogid']);\r
+                       }\r
+               }\r
+               return $blogs;\r
+       }\r
+       \r
+       /**\r
+        * Member::getTeamBlogs()\r
+        * Returns an array of all blogids for which member has team rights\r
+        * \r
+        * @param       boolean $incAdmin       whether checking weblog admin rights or not\r
+        * @return      array   weblog IDs in which this member join\r
+        * \r
+        */\r
+       public function getTeamBlogs($incAdmin = 1)\r
+       {\r
+               $incAdmin = intval($incAdmin);\r
+               $blogs = array();\r
+               \r
+               if ( $this->isAdmin() && $incAdmin )\r
+               {\r
+                       $query = 'SELECT bnumber as blogid from '.sql_table('blog');\r
+               }\r
+               else\r
+               {\r
+                       $query = 'SELECT tblog as blogid from '.sql_table('team').' where tmember=' . $this->getID();\r
+               }\r
+               \r
+               $res = DB::getResult($query);\r
+               if ( $res->rowCount() > 0 )\r
+               {\r
+                       foreach ( $res as $row )\r
+                       {\r
+                               array_push($blogs, $row['blogid']);\r
+                       }\r
+               }\r
+               return $blogs;\r
+       }\r
+       \r
+       /**\r
+        * Member::getNotifyFromMailAddress()\r
+        * \r
+        * Returns an email address from which notification of commenting/karma voting can\r
+        * be sent. A suggestion can be given for when the member is not logged in\r
+        * \r
+        * @param       String  $suggest\r
+        * @return      String  mail address or suggestion\r
+        */\r
+       public function getNotifyFromMailAddress($suggest = "")\r
+       {\r
+               global $CONF;\r
+               if ( $this->isLoggedIn() )\r
+               {\r
+                       return $this->getDisplayName() . " <" . $this->getEmail() . ">";\r
+               }\r
+               else if ( NOTIFICATION::address_validation($suggest) )\r
+               {\r
+                       return $suggest;\r
+               }\r
+               return $CONF['AdminEmail'];\r
+       }\r
+       \r
+       /**\r
+        * Member::write()\r
+        * Write data to database\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        * \r
+        */\r
+       public function write()\r
+       {\r
+               $query =  'UPDATE '.sql_table('member')\r
+                       . ' SET mname=' . DB::quoteValue($this->displayname) . ', '\r
+                          . 'mrealname='. DB::quoteValue($this->realname) . ', '\r
+                          . 'mpassword='. DB::quoteValue($this->password) . ', '\r
+                          . 'mcookiekey='. DB::quoteValue($this->cookiekey) . ', '\r
+                          . 'murl=' . DB::quoteValue($this->url) . ', '\r
+                          . 'memail=' . DB::quoteValue($this->email) . ', '\r
+                          . 'madmin=' . intval($this->admin) . ', '\r
+                          . 'mnotes=' . DB::quoteValue($this->notes) . ', '\r
+                          . 'mcanlogin=' . intval($this->canlogin) . ', '\r
+                          . 'mlocale=' . DB::quoteValue($this->locale) . ', '\r
+                          . 'mautosave=' . intval($this->autosave) . ' '\r
+                       . 'WHERE mnumber=' . intval($this->id);\r
+               DB::execute($query);\r
+               return;\r
+       }\r
+       \r
+       public function checkCookieKey($key)\r
+       {\r
+               return ( ($key != '') && ( $key == $this->getCookieKey() ) );\r
+       }\r
+       \r
+       public function checkPassword($pw)\r
+       {\r
+               /* for lower compatibility (md5) */\r
+               if ( strlen($this->password) === 32 )\r
+               {\r
+                       return (md5($pw) == $this->password);\r
+               }\r
+               return ($this->hash($pw) == $this->password);\r
+       }\r
+       \r
+       public function getRealName()\r
+       {\r
+               return $this->realname;\r
+       }\r
+       \r
+       public function setRealName($name)\r
+       {\r
+               $this->realname = $name;\r
+       }\r
+       \r
+       public function getEmail()\r
+       {\r
+               return $this->email;\r
+       }\r
+       \r
+       public function setEmail($email)\r
+       {\r
+               $this->email = $email;\r
+       }\r
+       \r
+       public function getPassword()\r
+       {\r
+               return $this->password;\r
+       }\r
+       \r
+       public function setPassword($pwd)\r
+       {\r
+               $this->password = $this->hash($pwd);\r
+       }\r
+       \r
+       public function getCookieKey()\r
+       {\r
+               return $this->cookiekey;\r
+       }\r
+       \r
+       /**\r
+        * Member::newCookieKey()\r
+        * Generate new cookiekey, save it, and return it\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        * \r
+        */\r
+       public function newCookieKey()\r
+       {\r
+               mt_srand( (double) microtime() * 1000000);\r
+               $this->cookiekey = $this->hash(uniqid(mt_rand()));\r
+               $this->write();\r
+               return $this->cookiekey;\r
+       }\r
+       \r
+       public function setCookieKey($val)\r
+       {\r
+               $this->cookiekey = $val;\r
+       }\r
+       \r
+       public function getURL()\r
+       {\r
+               return $this->url;\r
+       }\r
+       \r
+       public function setURL($site)\r
+       {\r
+               $this->url = $site;\r
+       }\r
+       \r
+       public function getLocale()\r
+       {\r
+               return $this->locale;\r
+       }\r
+       \r
+       public function setLocale($locale)\r
+       {\r
+               if ( !preg_match('#^(.+)_(.+)_(.+)$#', $locale)\r
+                && ($locale = i18n::convert_old_language_file_name_to_locale($locale)) === FALSE )\r
+               {\r
+                       $locale = '';\r
+               }\r
+               $this->locale = $locale;\r
+               return;\r
+       }\r
+       \r
+       public function setDisplayName($nick)\r
+       {\r
+               $this->displayname = $nick;\r
+       }\r
+       \r
+       public function getDisplayName()\r
+       {\r
+               return $this->displayname;\r
+       }\r
+       \r
+       public function isAdmin()\r
+       {\r
+               return $this->admin;\r
+       }\r
+       \r
+       public function setAdmin($val)\r
+       {\r
+               $this->admin = $val;\r
+       }\r
+       \r
+       public function canLogin()\r
+       {\r
+               return $this->canlogin;\r
+       }\r
+       \r
+       public function setCanLogin($val)\r
+       {\r
+               $this->canlogin = $val;\r
+       }\r
+       \r
+       public function getNotes()\r
+       {\r
+               return $this->notes;\r
+       }\r
+       \r
+       public function setNotes($val)\r
+       {\r
+               $this->notes = $val;\r
+       }\r
+       \r
+       public function getAutosave()\r
+       {\r
+               return $this->autosave;\r
+       }\r
+       \r
+       public function setAutosave($val)\r
+       {\r
+               $this->autosave = $val;\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Member::getID()\r
+        * \r
+        * @param       void\r
+        * @return      integer id of this member object\r
+        * \r
+        */\r
+       public function getID()\r
+       {\r
+               return $this->id;\r
+       }\r
+       \r
+       /**\r
+        * Member::exists()\r
+        * Returns true if there is a member with the given login name\r
+        * \r
+        * @static\r
+        * @param       string  $name   target name\r
+        * @return      boolean whether target name exists or not\r
+        */\r
+       public static function exists($name)\r
+       {\r
+               $r = DB::getResult('SELECT * FROM ' . sql_table('member') . ' WHERE mname=' . DB::quoteValue($name));\r
+               return ( $r->rowCount() != 0 );\r
+       }\r
+       \r
+       /**\r
+        * Member::existsID()\r
+        * Returns true if there is a member with the given ID\r
+        * \r
+        * @static\r
+        * @param       integer $id     target id\r
+        * @return      boolean whether target id exists or not\r
+        * \r
+        */\r
+       public static function existsID($id)\r
+       {\r
+               $r = DB::getResult('SELECT * FROM ' . sql_table('member') . ' WHERE mnumber=' . intval($id));\r
+               return ( $r->rowCount() != 0 );\r
+       }\r
+       \r
+       /**\r
+        * Member::isNameProtected()\r
+        *  Checks if a username is protected.\r
+        *  If so, it can not be used on anonymous comments\r
+        * \r
+        * @param       string  $name   target name\r
+        * @return      boolean whether the name exists or not\r
+        * \r
+        */\r
+       public function isNameProtected($name)\r
+       {\r
+               // extract name\r
+               $name = strip_tags($name);\r
+               $name = trim($name);\r
+               return self::exists($name);\r
+       }\r
+       \r
+       /**\r
+        * Member::create()\r
+        * Adds a new member\r
+        * \r
+        * @static\r
+        * @param       String  $name\r
+        * @param       String  $realname\r
+        * @param       String  $password\r
+        * @param       String  $email\r
+        * @param       String  $url\r
+        * @param       String  $admin\r
+        * @param       String  $canlogin\r
+        * @param       String  $notes\r
+        * @return      String  1 if success, others if fail\r
+        */\r
+       static public function create($name, $realname, $password, $email, $url, $admin, $canlogin, $notes)\r
+       {\r
+               if ( !NOTIFICATION::address_validation($email) )\r
+               {\r
+                       return _ERROR_BADMAILADDRESS;\r
+               }\r
+               \r
+               /* TODO: this method should be in MEMBER class, not globalfunctions */\r
+               if ( !isValidDisplayName($name) )\r
+               {\r
+                       return _ERROR_BADNAME;\r
+               }\r
+               \r
+               if ( self::exists($name) )\r
+               {\r
+                       return _ERROR_NICKNAMEINUSE;\r
+               }\r
+               \r
+               if ( !$realname )\r
+               {\r
+                       return _ERROR_REALNAMEMISSING;\r
+               }\r
+               \r
+               /* TODO: check the number of characters */\r
+               if ( !$password )\r
+               {\r
+                       return _ERROR_PASSWORDMISSING;\r
+               }\r
+               \r
+               /* \r
+                *  begin if: sometimes user didn't prefix the URL with http:// or https://,\r
+                *  this cause a malformed URL. Let's fix it.\r
+                */\r
+               \r
+               if ( !preg_match('#^https?://#', $url) )\r
+               {\r
+                       $url = 'http://' . $url;\r
+               }\r
+               \r
+               $name           = DB::quoteValue($name);\r
+               $realname       = DB::quoteValue($realname);\r
+               /* NOTE: hashed password is automatically updated if the length is 32 bytes when logging in */\r
+               $password       = DB::quoteValue(md5($password));\r
+               $email          = DB::quoteValue($email);\r
+               $url            = DB::quoteValue($url);\r
+               $admin          = (integer) $admin;\r
+               $canlogin       = (integer) $canlogin;\r
+               $notes          = DB::quoteValue($notes);\r
+               \r
+               $query = "INSERT INTO %s"\r
+                      . " (MNAME,MREALNAME,MPASSWORD,MEMAIL,MURL, MADMIN, MCANLOGIN, MNOTES)"\r
+                      . " VALUES (%s, %s, %s, %s, %s, %d, %d, %s)";\r
+               $query = sprintf($query, sql_table('member'), $name, $realname, $password, $email, $url, $admin, $canlogin, $notes);\r
+               DB::execute($query);\r
+               \r
+               ActionLog::add(INFO, _ACTIONLOG_NEWMEMBER . ' ' . $name);\r
+               \r
+               return 1;\r
+       }\r
+       \r
+       /**\r
+        * Member::getActivationInfo()\r
+        * Returns activation info for a certain key (an object with properties vkey, vmember, ...)\r
+        * \r
+        * @static\r
+        * @param       string  $key    activation key\r
+        * @return      mixed   return 0 if failed, else return activation table object\r
+        * \r
+        */\r
+       public static function getActivationInfo($key)\r
+       {\r
+               $query = 'SELECT * FROM ' . sql_table('activation') . ' WHERE vkey=' . DB::quoteValue($key);\r
+               $res = DB::getResult($query);\r
+               \r
+               if ( !$res || ($res->rowCount() == 0) )\r
+               {\r
+                       return 0;\r
+               }\r
+               return $res->fetch();\r
+       }\r
+       \r
+       /**\r
+        * Member::generateActivationEntry()\r
+        * Creates an account activation key\r
+        * addresschange -> old email address\r
+        * \r
+        * @param       string  $type   one of the following values (determines what to do when activation expires)\r
+        *                              'register'      (new member registration)\r
+        *                              'forgot'        (forgotton password)\r
+        *                              'addresschange' (member address has changed)\r
+        * @param       string  $extra  extra info (needed when validation link expires)\r
+        * @return      string  activation key\r
+        */\r
+       public function generateActivationEntry($type, $extra = '')\r
+       {\r
+               // clean up old entries\r
+               $this->cleanupActivationTable();\r
+               \r
+               // kill any existing entries for the current member (delete is ok)\r
+               // (only one outstanding activation key can be present for a member)\r
+               DB::execute('DELETE FROM ' . sql_table('activation') . ' WHERE vmember=' . intval($this->getID()));\r
+               \r
+               // indicates if the member can log in while the link is active\r
+               $canLoginWhileActive = false;\r
+               switch ( $type )\r
+               {\r
+                       case 'forgot':\r
+                               $canLoginWhileActive = true;\r
+                               break;\r
+                       case 'register':\r
+                               break;\r
+                       case 'addresschange':\r
+                               $extra = $extra . '/' . ( $this->canLogin() ? '1' : '0' );\r
+                               break;\r
+               }\r
+               \r
+               $ok = false;\r
+               while ( !$ok )\r
+               {\r
+                       // generate a random key\r
+                       srand((double)microtime()*1000000);\r
+                       $key = $this->hash(uniqid(rand(), true));\r
+                       \r
+                       // attempt to add entry in database\r
+                       // add in database as non-active\r
+                       $query = 'INSERT INTO %s (vkey, vtime, vmember, vtype, vextra) VALUES (%s, %s, %d, %s, %s)';\r
+                       $query = sprintf($query\r
+                               , sql_table('activation')\r
+                               , DB::quoteValue($key)\r
+                               , DB::formatDateTime()\r
+                               , intval($this->getID())\r
+                               , DB::quoteValue($type)\r
+                               , DB::quoteValue($extra)\r
+                       );\r
+                       if ( DB::execute($query) !== FALSE )\r
+                               $ok = true;\r
+               }\r
+               \r
+               // mark member as not allowed to log in\r
+               if ( !$canLoginWhileActive )\r
+               {\r
+                       $this->setCanLogin(0);\r
+                       $this->write();\r
+               }\r
+               \r
+               // return the key\r
+               return $key;\r
+       }\r
+       \r
+       /**\r
+        * Member::activate()\r
+        * Inidicates that an activation link has been clicked and any forms displayed\r
+        * there have been successfully filled out.\r
+        * \r
+        * @param       string  $key    activation key\r
+        * @return      boolean\r
+        * \r
+        */\r
+       public function activate($key)\r
+       {\r
+               // get activate info\r
+               $info = self::getActivationInfo($key);\r
+               \r
+               // no active key\r
+               if ( !$info )\r
+               {\r
+                       return false;\r
+               }\r
+               \r
+               switch ( $info['vtype'] )\r
+               {\r
+                       case 'forgot':\r
+                               // nothing to do\r
+                               break;\r
+                       case 'register':\r
+                               // set canlogin value\r
+                               global $CONF;\r
+                               DB::execute('UPDATE ' . sql_table('member') . ' SET mcanlogin=' . intval($CONF['NewMemberCanLogon']). ' WHERE mnumber=' . intval($info['vmember']));\r
+                               break;\r
+                       case 'addresschange':\r
+                               // reset old 'canlogin' value\r
+                               list($oldEmail, $oldCanLogin) = preg_split('#/#', $info['vextra']);\r
+                               DB::execute('UPDATE ' . sql_table('member') . ' SET mcanlogin=' . intval($oldCanLogin). ' WHERE mnumber=' . intval($info['vmember']));\r
+                               break;\r
+               }\r
+               \r
+               // delete from activation table\r
+               DB::execute('DELETE FROM ' . sql_table('activation') . ' WHERE vkey=' . DB::quoteValue($key));\r
+               \r
+               // success!\r
+               return true;\r
+       }\r
+       \r
+       /**\r
+        * Member::cleanupActivationTable()\r
+        * Cleans up entries in the activation table. All entries older than 2 days are removed.\r
+        * (static)\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       public function cleanupActivationTable()\r
+       {\r
+               $actdays = 2;\r
+               if ( isset($CONF['ActivationDays']) && intval($CONF['ActivationDays']) > 0 )\r
+               {\r
+                       $actdays = intval($CONF['ActivationDays']);\r
+               }\r
+               else\r
+               {\r
+                       $CONF['ActivationDays'] = 2;\r
+               }\r
+               $boundary = time() - (60 * 60 * 24 * $actdays);\r
+               \r
+               // 1. walk over all entries, and see if special actions need to be performed\r
+               $query = sprintf('SELECT * FROM %s WHERE vtime < %s', sql_table('activation'), DB::formatDateTime($boundary));\r
+               $res = DB::getResult($query);\r
+               \r
+               foreach ( $res as $row )\r
+               {\r
+                       switch ( $row['vtype'] )\r
+                       {\r
+                               case 'register':\r
+                                       // delete all information about this site member. registration is undone because there was\r
+                                       // no timely activation\r
+                                       include_once($DIR_LIBS . 'ADMIN.php');\r
+                                       Admin::deleteOneMember(intval($row['vmember']));\r
+                                       break;\r
+                               case 'addresschange':\r
+                                       // revert the e-mail address of the member back to old address\r
+                                       list($oldEmail, $oldCanLogin) = preg_split('#/#', $row['vextra']);\r
+                                       DB::execute('UPDATE ' . sql_table('member') . ' SET mcanlogin=' . intval($oldCanLogin). ', memail=' . DB::quoteValue($oldEmail). ' WHERE mnumber=' . intval($row['vmember']));\r
+                                       break;\r
+                               case 'forgot':\r
+                                       // delete the activation link and ignore. member can request a new password using the\r
+                                       // forgot password link\r
+                                       break;\r
+                       }\r
+               }\r
+               \r
+               // 2. delete activation entries for real\r
+               $query = sprintf('DELETE FROM %s WHERE vtime < %s', sql_table('activation'), DB::formatDateTime($boundary));\r
+               DB::execute($query);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Member::$language\r
+        * \r
+        * @obsolete\r
+        * @param       void\r
+        * @return      void\r
+        * \r
+        */\r
+       public $language = '';\r
+       /**\r
+        * Member::getLanguage()\r
+        * \r
+        * @obsolete\r
+        * @param       void\r
+        * @return      void\r
+        * \r
+        */\r
+       public function getLanguage()\r
+       {\r
+               if ( ($language = i18n::convert_locale_to_old_language_file_name($this->locale)) === FALSE )\r
+               {\r
+                       $language = '';\r
+               }\r
+               return $language;\r
+       }\r
+}\r
+=======
 <?php
 
 /* 
@@ -1349,3 +2671,4 @@ class Member
                return $language;
        }
 }
+>>>>>>> skinnable-master
index 1d708d1..e7f3d38 100644 (file)
@@ -1,3 +1,404 @@
+<<<<<<< HEAD
+<?php\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * Class used to represent a collection of e-mail addresses, to which a\r
+ * message can be sent (e.g. comment or karma vote notification).\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
+ * @version $Id: NOTIFICATION.php 1534 2011-06-22 06:13:23Z sakamocchi $\r
+ */\r
+class Notification\r
+{\r
+       static private $charset;\r
+       static private $scheme = 'B';\r
+       \r
+       /**\r
+        * NOTIFICATION::address_validation()\r
+        * Validating the string as address\r
+        * \r
+        * FIXME: this is just migrated from globalfunctions.php\r
+        *  we should confirm this regular expression refering to RFC 5322\r
+        * \r
+        * @link        http://www.ietf.org/rfc/rfc5322.txt\r
+        * @see         3.4. Address Specification\r
+        * \r
+        * @static\r
+        * @param       String  $address        Address\r
+        * @return      Boolean valid or not\r
+        */\r
+       static public function address_validation($address)\r
+       {\r
+               return (boolean) preg_match('#^(?!\\.)(?:\\.?[-a-zA-Z0-9!\\#$%&\'*+/=?^_`{|}~]+)+@(?!\\.)(?:\\.?(?!-)[-a-zA-Z0-9]+(?<!-)){2,}$#', $address);\r
+       }\r
+       \r
+       /**\r
+        * NOTIFICATION::get_mail_footer()\r
+        * Return mail footer with Nucleus CMS singnature\r
+        * \r
+        * @static\r
+        * @param       void\r
+        * @return      String  Message body with \r
+        */\r
+       static public function get_mail_footer()\r
+       {\r
+               $message  = "\n";\r
+               $message .= "\n";\r
+               $message .= "-----------------------------\n";\r
+               $message .=  "   Powered by Nucleus CMS\n";\r
+               $message .=  "(http://www.nucleuscms.org/)\n";\r
+               return $message;\r
+       }\r
+       \r
+       /**\r
+        * NOTIFICATION::mail\r
+        * Send mails with headers including 7bit-encoded multibyte string\r
+        * \r
+        * @static\r
+        * @param       string  $to             receivers including singlebyte and multibyte strings, based on RFC 5322\r
+        * @param       string  $subject        subject including singlebyte and multibyte strings\r
+        * @param       string  $message        message including singlebyte and multibyte strings\r
+        * @param       string  $from           senders including singlebyte and multibyte strings, based on RFC 5322\r
+        * @param       string(B/Q)     $scheme 7bit-encoder scheme based on RFC 2047\r
+        * @return      boolean accepted delivery or not\r
+        */\r
+       static public function mail($to, $subject, $message, $from, $charset, $scheme='B')\r
+       {\r
+               self::$charset = $charset;\r
+               self::$scheme = $scheme;\r
+               \r
+               $to = self::mailbox_list_encoder($to);\r
+               $subject = self::seven_bit_characters_encoder($subject);\r
+               $from = 'From: ' . self::mailbox_list_encoder($from);\r
+               \r
+               /*\r
+                * All of 7bit character encoding derives from ISO/IEC 646\r
+                * So we can decide the body's encoding bit count by this regular expression.\r
+                * \r
+                */\r
+               $bitcount = '8bit';\r
+               if ( preg_match('#\A[\x00-\x7f]*\z#', $message) )\r
+               {\r
+                       $bitcount = '7bit';\r
+               }\r
+               \r
+               $header  = 'Content-Type: text/html; charset=' . self::$charset . "; format=flowed; delsp=yes\n";\r
+               $header .= "Content-Transfer-Encoding: {$bitcount}\n";\r
+               $header .= "X-Mailer: Nucleus CMS NOTIFICATION class\n";\r
+               \r
+               return mail($to, $subject, $message, "{$from}\n{$header}");\r
+       }\r
+       \r
+       /**\r
+        * NOTIFICATION::mailbox_list_encoder\r
+        * Encode multi byte strings included in mailbox.\r
+        * The format of mailbox is based on RFC 5322, which obsoletes RFC 2822\r
+        * \r
+        * @link        http://www.ietf.org/rfc/rfc5322.txt\r
+        * @see         3.4. Address Specification\r
+        * \r
+        * @static\r
+        * @param       string  $mailbox_list           mailbox list\r
+        * @return      string  encoded string  \r
+        * \r
+        */\r
+       static private function mailbox_list_encoder ($mailbox_list)\r
+       {\r
+               $encoded_mailboxes = array();\r
+               $mailboxes = preg_split('#,#', $mailbox_list);\r
+               foreach ( $mailboxes as $mailbox )\r
+               {\r
+                       if ( preg_match("#^([^,]+)?<([^,]+)?@([^,]+)?>$#", $mailbox, $match) )\r
+                       {\r
+                               $display_name = self::seven_bit_characters_encoder(trim($match[1]));\r
+                               $local_part = trim($match[2]);\r
+                               $domain = trim($match[3]);\r
+                               $encoded_mailboxes[] = "{$display_name} <{$local_part}@{$domain}>";\r
+                       }\r
+                       else if ( preg_match("#([^,]+)?@([^,]+)?#", $mailbox) )\r
+                       {\r
+                               $encoded_mailboxes[] = $mailbox;\r
+                       }\r
+                       else\r
+                       {\r
+                               continue;\r
+                       }\r
+               }\r
+               if ( $encoded_mailboxes == array() )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               return implode(',', $encoded_mailboxes);\r
+       }\r
+       \r
+       /**\r
+        * NOTIFICATION::seven_bit_characters_encoder\r
+        * Encoder into 7bit ASCII expression for Non-ASCII Text based on RFC 2047.\r
+        * \r
+        * @link http://www.ietf.org/rfc/rfc2047.txt\r
+        * @see 2. Syntax of encoded-words\r
+        * \r
+        * NOTE: RFC 2047 has a ambiguousity for dealing with 'linear-white-space'.\r
+        *  This causes a trouble related to line breaking between single byte and multi-byte strings.\r
+        *  To avoid this, single byte string is encoded as well as multi byte string here.\r
+        * \r
+        * NOTE: RFC 2231 also defines the way to use non-ASCII characters in MIME header.\r
+        * http://www.ietf.org/rfc/rfc2231.txt\r
+        * \r
+        * NOTE: iconv extension give the same functions as this in PHP5\r
+        * iconv_mime_encode():\r
+        * http://www.php.net/manual/en/function.iconv-mime-encode.php\r
+        * \r
+        * @static\r
+        * @param       string  $charset        Character set encoding\r
+        * @param       string  $type   type of 7 bit encoding, should be 'B' or 'Q'\r
+        * @param       string  $string Target string with header field\r
+        * @return      string  encoded string\r
+        * \r
+        */\r
+       static private function seven_bit_characters_encoder($string)\r
+       {\r
+               $header = chr(13) . chr(10) . chr(32) . '=?' . self::$charset . '?' . self::$scheme . '?';\r
+               $footer = "?=";\r
+               $restriction = 78 - strlen($header) - strlen($footer) ;\r
+               \r
+               $encoded_words = array();\r
+               for ( $i = 0; $i < i18n::strlen($string); $i++ )\r
+               {\r
+                       if ( self::$scheme == 'B' )\r
+                       {\r
+                               if ( $i == 0 )\r
+                               {\r
+                                       $letters = '';\r
+                               }\r
+                               \r
+                               $letter = i18n::substr($string, $i, 1);\r
+                               $expected_length = strlen($letters) + strlen($letter) * 4 / 3;\r
+                               \r
+                               if ( $expected_length > $restriction )\r
+                               {\r
+                                       $encoded_text = self::b_encoder($letters);\r
+                                       $encoded_words[] = "{$header}{$encoded_text}{$footer}";\r
+                                       $letters = '';\r
+                               }\r
+                               \r
+                               $letters .= $letter;\r
+                               \r
+                               if ( $i == i18n::strlen($string) - 1 )\r
+                               {\r
+                                       $encoded_text = self::b_encoder($letters);\r
+                                       $encoded_words[] = "{$header}{$encoded_text}{$footer}";\r
+                                       break;\r
+                               }\r
+                               continue;\r
+                       }\r
+                       else\r
+                       {\r
+                               if ( $i == 0 )\r
+                               {\r
+                                       $encoded_text = '';\r
+                               }\r
+                               \r
+                               $encoded_letter = self::q_encoder(i18n::substr($string, $i, 1));\r
+                               $expected_length = strlen($encoded_text) + strlen($encoded_letter);\r
+                               \r
+                               if ( $expected_length > $restriction )\r
+                               {\r
+                                       $encoded_words[] = "{$header}{$encoded_text}{$footer}";\r
+                                       $letters = '';\r
+                               }\r
+                               \r
+                               $encoded_text .= $encoded_letter;\r
+                               \r
+                               if ( $i == i18n::strlen($string) - 1 )\r
+                               {\r
+                                       $encoded_words[] = "{$header}{$encoded_text}{$footer}";\r
+                                       break;\r
+                               }\r
+                               continue;\r
+                       }\r
+               }\r
+               \r
+               return implode('', $encoded_words);\r
+       }\r
+       \r
+       /**\r
+        * NOTIFICATION::b_encoder()\r
+        * \r
+        * B encoder according to RFC 2047.\r
+        * The "B" encoding is identical to the "BASE64" encoding defined by RFC 4648.\r
+        * \r
+        * @link http://www.ietf.org/rfc/rfc4648.txt\r
+        * @see 6.8. Base64 Content-Transfer-Encoding\r
+        * \r
+        * NOTE: According to RFC 4648\r
+        * (1)  The final quantum of encoding input is an integral multiple of 24 bits;\r
+        *              here, the final unit of encoded output will be an integral multiple\r
+        *              of 4 characters with no "=" padding.\r
+        * (2)  The final quantum of encoding input is exactly 8 bits; here,\r
+        *              the final unit of encoded output will be two characters followed\r
+        *              by two "=" padding characters.\r
+        * (3)  The final quantum of encoding input is exactly 16 bits; here,\r
+        *              the final unit of encoded output will be three characters followed\r
+        *              by one "=" padding character.\r
+        * \r
+        * @static\r
+        * @param       string  $target targetted string\r
+        * @return      string  encoded string\r
+        */\r
+       static private function b_encoder($target)\r
+       {\r
+               return base64_encode($target);\r
+       }\r
+       \r
+       /**\r
+        * NOTIFICATION::q_encoder()\r
+        * \r
+        * Q encoder according to RFC 2047.\r
+        * The "Q" encoding is similar to "Quoted-Printable" content-transfer-encoding defined in RFC 2045,\r
+        *  but the "Q" encoding and the "Quoted-Printable" are different a bit.\r
+        * \r
+        * @link http://www.ietf.org/rfc/rfc2047.txt\r
+        * @see 4.2. The "Q" encoding\r
+        * \r
+        * NOTE: According to RFC 2047\r
+        * (1)  Any 8-bit value may be represented by a "=" followed by two hexadecimal digits.\r
+        *              For example, if the character set in use were ISO-8859-1,\r
+        *              the "=" character would thus be encoded as "=3D", and a SPACE by "=20".\r
+        *              (Upper case should be used for hexadecimal digits "A" through "F".)\r
+        * (2)  The 8-bit hexadecimal value 20 (e.g., ISO-8859-1 SPACE) may be\r
+        *              represented as "_" (underscore, ASCII 95.).\r
+        *              (This character may not pass through some internetwork mail gateways,\r
+        *              but its use will greatly enhance readability of "Q" encoded data\r
+        *              with mail readers that do not support this encoding.)\r
+        *              Note that the "_" always represents hexadecimal 20,\r
+        *              even if the SPACE character occupies a different code position\r
+        *              in the character set in use.\r
+        * (3)  8-bit values which correspond to printable ASCII characters\r
+        *              other than "=", "?", and "_" (underscore), MAY be represented as those characters.\r
+        *              (But see section 5 for restrictions.)\r
+        *              In particular, SPACE and TAB MUST NOT be represented as themselves within encoded words.\r
+        * \r
+        * @static\r
+        * @param       string  $target targetted string\r
+        * @return      string  encoded string\r
+        */\r
+       static private function q_encoder($target)\r
+       {\r
+               $string = '';\r
+               \r
+               for ( $i = 0; $i < strlen($target); $i++ )\r
+               {\r
+                       $letter = substr ($target, $i, 1);\r
+                       $order = ord($letter);\r
+                       \r
+                       // Printable ASCII characters without "=", "?", "_"\r
+                       if ((33 <= $order && $order <= 60)\r
+                        || (62 == $order)\r
+                        || (64 <= $order && $order <= 94)\r
+                        || (96 <= $order && $order <= 126))\r
+                       {\r
+                               $string .= strtoupper(dechex($order));\r
+                       }\r
+                       // Space shuold be encoded as the same strings as "_"\r
+                       else if ($order == 32)\r
+                       {\r
+                               $string .= '_';\r
+                       }\r
+                       // Other characters\r
+                       else\r
+                       {\r
+                               $string .= '=' . strtoupper(dechex($order));\r
+                       }\r
+               }\r
+               \r
+               return $string;\r
+       }\r
+       \r
+       /**\r
+        * NOTICE: Deprecated\r
+        * NOTIFICATION::$addresses\r
+        * \r
+        * @deprecated\r
+        */\r
+       private $addresses = array();\r
+       \r
+       /**\r
+        * NOTICE: Deprecated\r
+        * takes one string as argument, containing multiple e-mail addresses\r
+        * separated by semicolons\r
+        * eg: site@demuynck.org;nucleus@demuynck.org;foo@bar.com\r
+        * \r
+        * @deprecated\r
+        */\r
+       function __construct($addresses)\r
+       {\r
+               $this->addresses = preg_split('#;#' , $addresses);\r
+       }\r
+       \r
+       /**\r
+        * NOTICE: Deprecated\r
+        * NOTIFICATION::validAddresses()\r
+        * \r
+        * returns true if all addresses are valid\r
+        * \r
+        * @deprecated\r
+        * @param       Void\r
+        * @return      Boolean\r
+        */\r
+       function validAddresses()\r
+       {\r
+               foreach ( $this->addresses as $address )\r
+               {\r
+                       if ( !self::address_validation(trim($address)) )\r
+                       {\r
+                               return 0;\r
+                       }\r
+               }\r
+               return 1;\r
+       }\r
+       \r
+       /**\r
+        * NOTICE: Deprecated\r
+        * NOTIFICATION::notify()\r
+        * \r
+        * Sends email messages to all the email addresses\r
+        * \r
+        * @deprecated\r
+        * @param       String  $title  \r
+        * @param       String  $message        \r
+        * @param       String  $from   \r
+        * @return      Void\r
+        */\r
+       function notify($title, $message, $from)\r
+       {\r
+               global $member;\r
+               $addresses = array();\r
+               \r
+               foreach ($this->addresses as $address)\r
+               {\r
+                       if ( $member->isLoggedIn() && ($member->getEmail() == $address) )\r
+                       {\r
+                               continue;\r
+                       }\r
+                       $addresses[] = $address;\r
+               }\r
+               \r
+               self::mail(implode(',', $addresses), $title, $message , $from);\r
+               return;\r
+       }\r
+}\r
+=======
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
@@ -397,3 +798,4 @@ class Notification
                return;
        }
 }
+>>>>>>> skinnable-master
diff --git a/nucleus/libs/PAGEFACTORY.php b/nucleus/libs/PAGEFACTORY.php
new file mode 100644 (file)
index 0000000..3c7c72c
--- /dev/null
@@ -0,0 +1,626 @@
+<?php
+/*
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+ * Copyright (C) 2002-2009 The Nucleus Group
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * (see nucleus/documentation/index.html#license for more info)
+ */
+/**
+ * @license http://nucleuscms.org/license.txt GNU General Public License
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group
+ * @version $Id: PAGEFACTORY.php 1805 2012-04-30 13:02:39Z sakamocchi $
+ */
+
+/**
+ * The formfactory class can be used to insert add/edit item forms into
+ * admin area, bookmarklet, skins or any other places where such a form
+ * might be needed
+ */
+class PageFactory extends BaseActions
+{
+       /**
+        * PageFactory::$blog
+        * Reference to the blog object for which an add:edit form is created
+        */
+       private $blog = NULL;
+       
+       /**
+        * PageFactory::$type
+        * One of the types got by self::getAvailableSkinTypes()
+        */
+       private $type = '';
+       
+       /**
+        * PageFactory::$method
+        * 'add' or 'edit'
+        */
+       private $method = '';
+       
+       /**
+        * PageFactory::$variables
+        * Info to fill out in the form (e.g. catid, itemid, ...)
+        */
+       private $variables = array();
+       
+       /**
+        * PageFactory::$actions
+        * Allowed actions (for parser)
+        */
+       // TODO: move the definition of actions to the createXForm methods
+       static private $defined_actions = array(
+               'authorname',
+               'blogid',
+               'bloglink',
+               'blogname',
+               'categories',
+               'checkedonval',
+               'contents',
+               'currenttime',
+               'extrahead',
+               'helplink',
+               'init',
+               'itemoptions',
+               'itemtime',
+               'jsbuttonbar',
+               'jsinput',
+               'pluginextras',
+               'ticket',
+               'title'
+       );
+       
+       static private $default_skin_types = array(
+               'bookmarklet'   => '',
+               'admin'                 => ''
+       );
+       
+       /**
+        * AdminActions::getSkinTypeFriendlyNames()
+        * 
+        * @static
+        * @param       void
+        * @return      array   list of friendly names for page actions
+        */
+       static public function getAvailableSkinTypes()
+       {
+               return self::$default_skin_types;
+       }
+       
+       /**
+        * PageFactory::__construct()
+        * Creates a new PAGEFACTORY object
+        * 
+        * @param       object  $blog
+        * @return      void
+        */
+       public function __construct(&$blog)
+       {
+               global $manager;
+               
+               parent::__construct();
+               
+               $this->blog =& $blog;
+               
+               return;
+       }
+       
+       /**
+        * PageFactory::getAvailableActions()
+        * 
+        * @param       void
+        * @return      array   array for defined action names
+        * 
+        */
+       public function getAvailableActions()
+       {
+               return array_merge(self::$defined_actions, parent::getAvailableActions());
+       }
+       
+       /**
+        * PageFactory::setVariables()
+        * 
+        * @param       array   $variables      associated array for item data
+        * @return      void
+        */
+       public function setVariables($variables)
+       {
+               $this->variables = $variables;
+               return;
+       }
+       
+       /**
+        * PageFactory::getTemplateFor()
+        * Returns an appropriate template
+        * 
+        * @param       string  $type   type of skin
+        * @param       string  $method type of template
+        * @return      string  contents of form template
+        */
+       public function getTemplateFor($type, $method)
+       {
+               global $DIR_LIBS;
+               
+               // the $type is not in the allowed types array
+               if ( !array_key_exists($type, $this->getAvailableSkinTypes()) )
+               {
+                       return '';
+               }
+               
+               $filename = "{$DIR_LIBS}include/{$type}-{$method}.template";
+               
+               // begin if: file doesn't exist
+               if ( !file_exists($filename) )
+               {
+                       return '';
+               } // end if
+               
+               $filesize = filesize($filename);
+               
+               // begin if: filesize is LTE zero
+               if ( $filesize <= 0 )
+               {
+                       return '';
+               }
+               
+               # read file and return it
+               $fd = fopen ($filename, 'r');
+               $contents = fread ($fd, $filesize);
+               fclose ($fd);
+               
+               $this->type = $type;
+               $this->method = $method;
+               
+               return $contents;
+       }
+       
+       /**
+        * PageFactory::parse_categories()
+        * Create category dropdown box
+        * 
+        * @param       integer $start_index
+        * @return      void
+        */
+       public function parse_categories($start_index = 0)
+       {
+               // begin if: catid variable is set; use it to select the category
+               if ( !array_key_exists('catid', $this->variables) )
+               {
+                       $category_id = $this->blog->getDefaultCategory();
+               }
+               // else: get the default category
+               else
+               {
+                       $category_id = $this->variables['catid'];
+               }
+               
+               Admin::selectBlogCategory('catid', $category_id, $start_index, 1, $this->blog->getID());
+               return;
+       }
+       
+       /**
+        * PageFactory::parse_blogid()
+        * Displays the blog ID
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function parse_blogid()
+       {
+               echo $this->blog->getID();
+               return;
+       }
+       
+       /**
+        * PageFactory::parse_blogname()
+        * Displays the blog name
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function parse_blogname()
+       {
+               echo $this->blog->getName();
+               return;
+       }
+       
+       /**
+        * PageFactory::parse_bloglink()
+        * Displays the blog link
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function parse_bloglink()
+       {
+               echo '<a href="', Entity::hsc($this->blog->getURL()), '">', Entity::hsc($this->blog->getName()), '</a>';
+               return;
+       }
+       
+       /**
+        * PageFactory::parse_authorname()
+        * Displays the author's name
+        * 
+        * @param       void
+        * @return      void
+        */
+       function parse_authorname()
+       {
+               // don't use on add item?
+               global $member;
+               echo $member->getDisplayName();
+               return;
+       }
+       
+       /**
+        * PageFactory::parse_title()
+        * Displays the title
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function parse_title()
+       {
+               echo $this->contents['title'];
+               return;
+       }
+       
+       /**
+        * PageFactory::checkCondition()
+        * Checks conditions for if statements
+        *
+        * @param       string  $field  type of <%if%>
+        * @param       string  $name   property of field
+        * @param       string  $value  value of property
+        * @return      boolean
+        */
+       protected function checkCondition($field, $name = '', $value = 1)
+       {
+               global $member;
+               
+               $condition = 0;
+               switch ( $field )
+               {
+                       case 'blogsetting':
+                               $condition = (boolean) ($this->blog->getSetting($name) == $value);
+                               break;
+                       case 'autosave':
+                               $condition = (boolean) ($member->getAutosave() == $value);
+                               break;
+                       case 'itemproperty':
+                               if ( array_key_exists($name, $this->variables) )
+                               {
+                                       $condition = (boolean) ($this->variables[$name] == $value);
+                               }
+                               break;
+                       default:
+                               break;
+               }
+               return $condition;
+       }
+       
+       /**
+        * PageFactory::parse_helplink()
+        * 
+        * @param       string  $topic
+        * @return      void
+        */
+       function parse_helplink($topic)
+       {
+               help($topic);
+               return;
+       }
+       
+       /**
+        * PageFactory::parse_currenttime()
+        * for future items
+        * 
+        * @param       string  $what
+        * @return      void
+        */
+       public function parse_currenttime($what)
+       {
+               $nu = getdate($this->blog->getCorrectTime());
+               echo $nu[$what];
+               return;
+       }
+       
+       /**
+        * PageFactory::parse_itemtime()
+        * date change on edit item
+        * 
+        * @param       string  $what
+        * @return      void
+        */
+       public function parse_itemtime($what)
+       {
+               $itemtime = getdate($this->variables['timestamp']);
+               echo $itemtime[$what];
+               return;
+       }
+       
+       /**
+        * PageFactory::parse_init()
+        * some init stuff for all forms
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function parse_init()
+       {
+               if ( $this->method != 'edit' )
+               {
+                       $authorid = '';
+               }
+               else
+               {
+                       $authorid = $this->variables['authorid'];
+               }
+               $this->blog->insertJavaScriptInfo($authorid);
+               return;
+       }
+       
+       /**
+        * PageFactory::parse_extrahead()
+        * on bookmarklets only: insert extra html header information (by plugins)
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function parse_extrahead()
+       {
+               global $manager;
+               
+               $extrahead = '';
+               $data = array(
+                       'extrahead' => &$extrahead
+               );
+               
+               $manager->notify('BookmarkletExtraHead', $data);
+               echo $extrahead;
+               return;
+       }
+       
+       /**
+        * PageFactory::parse_contents()
+        * 
+        * @param       string  $which
+        * @return      void
+        */
+       public function parse_contents($which)
+       {
+               if ( !array_key_exists($which, $this->variables) || !isset($this->variables[$which]) )
+               {
+                       $this->variables[$which] = '';
+               }
+               echo Entity::hsc($this->variables[$which]);
+               return;
+       }
+       
+       /**
+        * PageFactory::parse_checkedonval()
+        * 
+        * @param       string  $value  value for input element with checkbox type
+        * @return      void
+        */
+       public function parse_checkedonval($value, $name)
+       {
+               if ( !array_key_exists($name, $this->variables) || !isset($this->variables[$name]) )
+               {
+                       $this->variables[$name] = '';
+               }
+               if ( $this->variables[$name] == $value )
+               {
+                       echo "checked='checked'";
+               }
+               return;
+       }
+       
+       /**
+        * Pagefactory::parse_jsinput()
+        * extra javascript for input and textarea fields
+        * 
+        * @param       string  $which  name of JavaScript function
+        * @return      string  attribute for input element
+        */
+       public function parse_jsinput($which)
+       {
+               global $CONF, $member;
+               
+               $attributes  = " name=\"{$which}\"";
+               $attributes .= " id=\"input{$which}\"";
+               
+               if ( !$CONF['DisableJsTools'] )
+               {
+                       $attributes .= ' onkeypress="shortCuts();"';
+                       
+                       if ( $member->getAutosave() )
+                       {
+                               $attributes .= ' onkeyup="doMonitor();"';
+                       }
+               }
+               else
+               {
+                       $attributes .= ' onclick="storeCaret(this);"';
+                       $attributes .= ' onselect="storeCaret(this);"';
+                       
+                       if ( $member->getAutosave() )
+                       {
+                               $attributes .= " onkeyup=\"storeCaret(this); updPreview('{$which}'); doMonitor();\"";
+                       }
+                       else
+                       {
+                               $attributes .= " onkeyup=\"storeCaret(this); updPreview('{$which}');\"";
+                       }
+               }
+               echo $attributes;
+               return;
+       }
+       
+       /**
+        * PageFactory::parse_jsbuttonbar()
+        * shows the javascript button bar
+        * 
+        * @param       string  $extrabuttons   
+        * @return      void
+        */
+       public function parse_jsbuttonbar($extrabuttons = "")
+       {
+               global $CONF;
+               switch ( $CONF['DisableJsTools'] )
+               {
+                       case "0":
+                               echo "<div class=\"jsbuttonbar\">\n";
+                               $this->jsbutton('cut','cutThis()',_ADD_CUT_TT . " (Ctrl + X)");
+                               $this->jsbutton('copy','copyThis()',_ADD_COPY_TT . " (Ctrl + C)");
+                               $this->jsbutton('paste','pasteThis()',_ADD_PASTE_TT . " (Ctrl + V)");
+                               $this->jsbuttonspacer();
+                               $this->jsbutton('bold',"boldThis()", _ADD_BOLD_TT ." (Ctrl + Shift + B)");
+                               $this->jsbutton('italic',"italicThis()", _ADD_ITALIC_TT ." (Ctrl + Shift + I)");
+                               $this->jsbutton('link',"ahrefThis()", _ADD_HREF_TT ." (Ctrl + Shift + A)");
+                               $this->jsbuttonspacer();
+                               $this->jsbutton('alignleft',"alignleftThis()", _ADD_ALIGNLEFT_TT);
+                               $this->jsbutton('alignright',"alignrightThis()", _ADD_ALIGNRIGHT_TT);
+                               $this->jsbutton('aligncenter',"aligncenterThis()", _ADD_ALIGNCENTER_TT);
+                               $this->jsbuttonspacer();
+                               $this->jsbutton('left',"leftThis()", _ADD_LEFT_TT);
+                               $this->jsbutton('right',"rightThis()", _ADD_RIGHT_TT);
+                               
+                               if ( $extrabuttons )
+                               {
+                                       $btns = preg_split('#\+#',$extrabuttons);
+                                       $this->jsbuttonspacer();
+                                       foreach ( $btns as $button )
+                                       {
+                                               switch ( $button )
+                                               {
+                                                       case "media":
+                                                               $this->jsbutton('media', "addMedia()", _ADD_MEDIA_TT .  " (Ctrl + Shift + M)");
+                                                               break;
+                                                       case "preview":
+                                                               $this->jsbutton('preview', "showedit()", _ADD_PREVIEW_TT);
+                                                               break;
+                                               }
+                                       }
+                               }
+                               echo "<div style=\"clear:both;\"></div></div>\n";
+                               break;
+                       case "2":
+                               echo "<div class=\"jsbuttonbar\">";
+                               $this->jsbutton('bold',"boldThis()", _ADD_BOLD_TT);
+                               $this->jsbutton('italic',"italicThis()", _ADD_ITALIC_TT);
+                               $this->jsbutton('link',"ahrefThis()", _ADD_HREF_TT);
+                               $this->jsbuttonspacer();
+                               $this->jsbutton('alignleft',"alignleftThis()", _ADD_ALIGNLEFT_TT);
+                               $this->jsbutton('alignright',"alignrightThis()", _ADD_ALIGNRIGHT_TT);
+                               $this->jsbutton('aligncenter',"aligncenterThis()", _ADD_ALIGNCENTER_TT);
+                               $this->jsbuttonspacer();
+                               $this->jsbutton('left',"leftThis()", _ADD_LEFT_TT);
+                               $this->jsbutton('right',"rightThis()", _ADD_RIGHT_TT);
+
+                               if ( $extrabuttons )
+                               {
+                                       $btns = preg_split('#\+#',$extrabuttons);
+                                       $this->jsbuttonspacer();
+                                       foreach ( $btns as $button )
+                                       {
+                                               switch ( $button )
+                                               {
+                                                       case "media":
+                                                               $this->jsbutton('media', "addMedia()", _ADD_MEDIA_TT);
+                                                               break;
+                                               }
+                                       }
+                               }
+                               echo "<div style=\"clear:both;\"></div></div>\n";
+                               break;
+               }
+               return;
+       }
+       
+       /**
+        * PageFactory::parse_pluginextras()
+        * Allows plugins to add their own custom fields
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function parse_pluginextras()
+       {
+               global $manager;
+               
+               switch ( $this->method )
+               {
+                       case 'add':
+                               $data = array(
+                                       'blog' => &$this->blog
+                               );
+                               
+                               $manager->notify('AddItemFormExtras', $data);
+                               break;
+                       case 'edit':
+                               $data = array(
+                                       'variables'     => $this->variables,
+                                       'blog'          => &$this->blog,
+                                       'itemid'        => $this->variables['itemid']
+                               );
+                               $manager->notify('EditItemFormExtras', $data);
+                               break;
+               }
+               return;
+       }
+       
+       /**
+        * PageFactory::parse_itemoptions()
+        * Adds the itemOptions of a plugin to a page
+        * 
+        * @param       void
+        * @return      void
+        */
+       public function parse_itemoptions()
+       {
+               global $itemid;
+               Admin::_insertPluginOptions('item', $itemid);
+               return;
+       }
+       
+       /**
+        * PageFactory::parse_ticket()
+        */
+       public function parse_ticket()
+       {
+               global $manager;
+               $manager->addTicketHidden();
+               return;
+       }
+       
+       /**
+        * PageFactory::jsbutton()
+        * convenience method
+        * 
+        * @param       string  $type           type of button
+        * @param       string  $code           JavaScript codes for onclick event
+        * @param       string  $tooltip        alternative text attribute for image element
+        */
+       private function jsbutton($type, $code, $tooltip)
+       {
+               echo "<span class=\"jsbutton\" onmouseover=\"BtnHighlight(this);\" onmouseout=\"BtnNormal(this);\" onclick=\"{$code}\" >";
+               echo "<img src=\"images/button-{$type}.gif\" alt=\"{$tooltip}\" title=\"{$tooltip}\" width=\"16\" height=\"16\" />";
+               echo "</span>\n";
+               return;
+       }
+       
+       /**
+        * PageFactory::jsbuttonspacer()
+        * 
+        * @param       void
+        * @return      void
+        */
+       private function jsbuttonspacer()
+       {
+               echo '<span class="jsbuttonspacer">&nbsp;</span>';
+               return;
+       }
+}
index 406fe8c..79f372e 100644 (file)
 /**
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: PARSER.php 1757 2012-04-15 09:02:32Z sakamocchi $
+=======
  * @version $Id: PARSER.php 1879 2012-06-17 07:45:09Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 if ( !function_exists('requestVar') )
@@ -62,6 +66,11 @@ class Parser
                $this->pdelim   =  $pdelim;
                $this->norestrictions = 0;      // set this to 1 to disable checking for allowedActions
                
+<<<<<<< HEAD
+               $this->skin             = NULL;
+               
+=======
+>>>>>>> skinnable-master
                $handler->setParser($this);
                
                return;
@@ -135,7 +144,11 @@ class Parser
                
                if ( in_array($actionlc, $this->actions) || $this->norestrictions )
                {
+<<<<<<< HEAD
+                       call_user_func_array(array(&$this->handler, "parse_{$actionlc}"), $params);
+=======
                        call_user_func_array(array($this->handler, "parse_{$actionlc}"), $params);
+>>>>>>> skinnable-master
                }
                else
                {
index 4cebb26..b52b93c 100644 (file)
@@ -1,3 +1,989 @@
+<<<<<<< HEAD
+<?php\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * This is an (abstract) class of which all Nucleus Plugins must inherit\r
+ *\r
+ * for more information on plugins and how to write your own, see the\r
+ * plugins.html file that is included with the Nucleus documenation\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
+ * @version $Id: PLUGIN.php 1630 2012-01-28 12:16:14Z sakamocchi $\r
+ */\r
+abstract class NucleusPlugin\r
+{\r
+       // these public functions should to be redefined in your plugin\r
+       public function getName()\r
+       {\r
+               return __CLASS__;\r
+       }\r
+       \r
+       public function getAuthor()\r
+       {\r
+               return 'Undefined';\r
+       }\r
+       \r
+       public function getURL()\r
+       {\r
+               return 'Undefined';\r
+       }\r
+       \r
+       public function getVersion()\r
+       {\r
+               return '0.0';\r
+       }\r
+       \r
+       public function getDescription()\r
+       {\r
+               return 'Undefined';\r
+       }\r
+       \r
+       // these final public function _may_ be redefined in your plugin\r
+       \r
+       public function getMinNucleusVersion()\r
+       {\r
+               return 150;\r
+       }\r
+       \r
+       public function getMinNucleusPatchLevel()\r
+       {\r
+               return 0;\r
+       }\r
+       \r
+       public function getEventList()\r
+       {\r
+               return array();\r
+       }\r
+       \r
+       public function getTableList()\r
+       {\r
+               return array();\r
+       }\r
+       \r
+       public function hasAdminArea()\r
+       {\r
+               return 0;\r
+       }\r
+       \r
+       public function install()\r
+       {\r
+               return;\r
+       }\r
+       \r
+       public function unInstall()\r
+       {\r
+               return;\r
+       }\r
+       \r
+       public function init()\r
+       {\r
+               return;\r
+       }\r
+       \r
+       public function doSkinVar($skinType)\r
+       {\r
+               return;\r
+       }\r
+       \r
+       public function doTemplateVar(&$item)\r
+       {\r
+               $args = func_get_args();\r
+               array_shift($args);\r
+               array_unshift($args, 'template');\r
+               call_user_func_array(array(&$this,'doSkinVar'),$args);\r
+               return;\r
+       }\r
+       \r
+       public function doTemplateCommentsVar(&$item, &$comment)\r
+       {\r
+               $args = func_get_args();\r
+               array_shift($args);\r
+               array_shift($args);\r
+               array_unshift($args, 'template');\r
+               call_user_func_array(array(&$this,'doSkinVar'),$args);\r
+               return;\r
+       }\r
+       \r
+       public function doAction($type)\r
+       {\r
+               return _ERROR_PLUGIN_NOSUCHACTION;\r
+       }\r
+       \r
+       public function doIf($key,$value)\r
+       {\r
+               return false;\r
+       }\r
+       \r
+       public function doItemVar (&$item)\r
+       {\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Checks if a plugin supports a certain feature.\r
+        *\r
+        * @returns 1 if the feature is reported, 0 if not\r
+        * @param $feature\r
+        *  Name of the feature. See plugin documentation for more info\r
+        *   'SqlTablePrefix' -> if the plugin uses the sql_table() method to get table names\r
+        *   'HelpPage' -> if the plugin provides a helppage\r
+        *   'SqlApi' -> if the plugin uses the complete sql_* or DB::* api (must also require nucleuscms 3.5)\r
+        */\r
+       public function supportsFeature($feature)\r
+       {\r
+               return 0;\r
+       }\r
+       \r
+       /**\r
+        * Report a list of plugin that is required to final public function\r
+        *\r
+        * @returns an array of names of plugin, an empty array indicates no dependency\r
+        */\r
+       public function getPluginDep()\r
+       {\r
+               return array();\r
+       }\r
+       \r
+       // these helper final public functions should not be redefined in your plugin\r
+       \r
+       /**\r
+        * Creates a new option for this plugin\r
+        *\r
+        * @param name\r
+        *              A string uniquely identifying your option. (max. length is 20 characters)\r
+        * @param description\r
+        *              A description that will show up in the nucleus admin area (max. length: 255 characters)\r
+        * @param type\r
+        *              Either 'text', 'yesno' or 'password'\r
+        *              This info is used when showing 'edit plugin options' screens\r
+        * @param value\r
+        *              Initial value for the option (max. value length is 128 characters)\r
+        */\r
+       final public function createOption($name, $desc, $type, $defValue = '', $typeExtras = '')\r
+       {\r
+               return $this->create_option('global', $name, $desc, $type, $defValue, $typeExtras);\r
+       }\r
+       \r
+       final public function createBlogOption($name, $desc, $type, $defValue = '', $typeExtras = '')\r
+       {\r
+               return $this->create_option('blog', $name, $desc, $type, $defValue, $typeExtras);\r
+       }\r
+       \r
+       final public function createMemberOption($name, $desc, $type, $defValue = '', $typeExtras = '')\r
+       {\r
+               return $this->create_option('member', $name, $desc, $type, $defValue, $typeExtras);\r
+       }\r
+       \r
+       final public function createCategoryOption($name, $desc, $type, $defValue = '', $typeExtras = '')\r
+       {\r
+               return $this->create_option('category', $name, $desc, $type, $defValue, $typeExtras);\r
+       }\r
+       \r
+       final public function createItemOption($name, $desc, $type, $defValue = '', $typeExtras = '')\r
+       {\r
+               return $this->create_option('item', $name, $desc, $type, $defValue, $typeExtras);\r
+       }\r
+       \r
+       /**\r
+        * Removes the option from the database\r
+        *\r
+        * Note: Options get erased automatically on plugin uninstall\r
+        */\r
+       final public function deleteOption($name)\r
+       {\r
+               return $this->delete_option('global', $name);\r
+       }\r
+       \r
+       final public function deleteBlogOption($name)\r
+       {\r
+               return $this->delete_option('blog', $name);\r
+       }\r
+       \r
+       final public function deleteMemberOption($name)\r
+       {\r
+               return $this->delete_option('member', $name);\r
+       }\r
+       \r
+       final public function deleteCategoryOption($name)\r
+       {\r
+               return $this->delete_option('category', $name);\r
+       }\r
+       \r
+       final public function deleteItemOption($name)\r
+       {\r
+               return $this->delete_option('item', $name);\r
+       }\r
+       \r
+       /**\r
+        * Sets the value of an option to something new\r
+        */\r
+       final public function setOption($name, $value)\r
+       {\r
+               return $this->set_option('global', 0, $name, $value);\r
+       }\r
+       \r
+       final public function setBlogOption($blogid, $name, $value)\r
+       {\r
+               return $this->set_option('blog', $blogid, $name, $value);\r
+       }\r
+       \r
+       final public function setMemberOption($memberid, $name, $value)\r
+       {\r
+               return $this->set_option('member', $memberid, $name, $value);\r
+       }\r
+       \r
+       final public function setCategoryOption($catid, $name, $value)\r
+       {\r
+               return $this->set_option('category', $catid, $name, $value);\r
+       }\r
+       \r
+       final public function setItemOption($itemid, $name, $value) {\r
+               return $this->set_option('item', $itemid, $name, $value);\r
+       }\r
+       \r
+       /**\r
+        * Retrieves the current value for an option\r
+        */\r
+       final public function getOption($name)\r
+       {\r
+               // only request the options the very first time. On subsequent requests\r
+               // the static collection is used to save SQL queries.\r
+               if ( $this->plugin_options == 0 )\r
+               {\r
+                       $this->plugin_options = array();\r
+                       \r
+                       $query =  "SELECT d.oname as name, o.ovalue as value FROM %s o, %s d WHERE d.opid=%d AND d.oid=o.oid;";\r
+                       $query = sprintf($query, sql_table('plugin_option'), sql_table('plugin_option_desc'), (integer) $this->plugid);\r
+                       $result = DB::getResult($query);\r
+                       foreach ( $result as $row )\r
+                       {\r
+                               $this->plugin_options[strtolower($row['name'])] = $row['value'];\r
+                       }\r
+               }\r
+               if ( isset($this->plugin_options[strtolower($name)]) )\r
+               {\r
+                       return $this->plugin_options[strtolower($name)];\r
+               }\r
+               else\r
+               {\r
+                       return $this->get_option('global', 0, $name);\r
+               }\r
+       }\r
+       \r
+       final public function getBlogOption($blogid, $name)\r
+       {\r
+               return $this->get_option('blog', $blogid, $name);\r
+       }\r
+       \r
+       final public function getMemberOption($memberid, $name)\r
+       {\r
+               return $this->get_option('member', $memberid, $name);\r
+       }\r
+       \r
+       final public function getCategoryOption($catid, $name)\r
+       {\r
+               return $this->get_option('category', $catid, $name);\r
+       }\r
+       \r
+       final public function getItemOption($itemid, $name)\r
+       {\r
+               return $this->get_option('item', $itemid, $name);\r
+       }\r
+       \r
+       /**\r
+        * Retrieves an associative array with the option value for each\r
+        * context id\r
+        */\r
+       final public function getAllBlogOptions($name)\r
+       {\r
+               return $this->get_all_options('blog', $name);\r
+       }\r
+       \r
+       final public function getAllMemberOptions($name)\r
+       {\r
+               return $this->get_all_options('member', $name);\r
+       }\r
+       \r
+       final public function getAllCategoryOptions($name)\r
+       {\r
+               return $this->get_all_options('category', $name);\r
+       }\r
+       \r
+       final public function getAllItemOptions($name)\r
+       {\r
+               return $this->get_all_options('item', $name);\r
+       }\r
+       \r
+       /**\r
+        * Retrieves an indexed array with the top (or bottom) of an option\r
+        * (delegates to getOptionTop())\r
+        */\r
+       final public function getBlogOptionTop($name, $amount = 10, $sort = 'desc')\r
+       {\r
+               return $this->get_option_top('blog', $name, $amount, $sort);\r
+       }\r
+       \r
+       final public function getMemberOptionTop($name, $amount = 10, $sort = 'desc')\r
+       {\r
+               return $this->get_option_top('member', $name, $amount, $sort);\r
+       }\r
+       \r
+       final public function getCategoryOptionTop($name, $amount = 10, $sort = 'desc')\r
+       {\r
+               return $this->get_option_top('category', $name, $amount, $sort);\r
+       }\r
+       \r
+       final public function getItemOptionTop($name, $amount = 10, $sort = 'desc')\r
+       {\r
+               return $this->get_option_top('item', $name, $amount, $sort);\r
+       }\r
+       \r
+       /**\r
+        * NucleusPlugin::getID()\r
+        * get id for this plugin\r
+        * \r
+        * @access      public\r
+        * @param       void\r
+        * @return      integer this plugid id\r
+        */\r
+       final public function getID()\r
+       {\r
+               return (integer) $this->plugid;\r
+       }\r
+       \r
+       /**\r
+        * NucleusPlugin::setID()\r
+        * set favorite id for this plugin\r
+        * \r
+        * @access      public\r
+        * @param       integer $plugid favorite id for plugin\r
+        * @return      void\r
+        */\r
+       final public function setID($plugid)\r
+       {\r
+               $this->plugid = (integer) $plugid;\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Returns the URL of the admin area for this plugin (in case there's\r
+        * no such area, the returned information is invalid)\r
+        *\r
+        * public\r
+        */\r
+       final public function getAdminURL()\r
+       {\r
+               global $CONF;\r
+               return $CONF['PluginURL'] . $this->getShortName() . '/';\r
+       }\r
+       \r
+       /**\r
+        * Returns the directory where the admin directory is located and\r
+        * where the plugin can maintain his extra files\r
+        *\r
+        * public\r
+        */\r
+       final public function getDirectory()\r
+       {\r
+               global $DIR_PLUGINS;\r
+               return $DIR_PLUGINS . $this->getShortName() . '/';\r
+       }\r
+       \r
+       /**\r
+        * Derives the short name for the plugin from the classname (all\r
+        * lowercase)\r
+        *\r
+        * public\r
+        */\r
+       final public function getShortName()\r
+       {\r
+               return str_replace('np_','',strtolower(get_class($this)));\r
+       }\r
+       \r
+       /**\r
+        *      Clears the option value cache which saves the option values during\r
+        *      the plugin execution. This function is usefull if the options has\r
+        *      changed during the plugin execution (especially in association with\r
+        *      the PrePluginOptionsUpdate and the PostPluginOptionsUpdate events)\r
+        *      \r
+        *  public\r
+        **/\r
+       final public function clearOptionValueCache()\r
+       {\r
+               $this->option_values = array();\r
+               $this->plugin_options = 0;\r
+               return;\r
+       }\r
+       \r
+       // internal functions of the class starts here\r
+       protected $option_values;       // oid_contextid => value\r
+       protected $option_info;         // context_name => array('oid' => ..., 'default' => ...)\r
+       protected $plugin_options;      // see getOption()\r
+       protected $plugid;                      // plugin id\r
+       \r
+       /**\r
+        * Class constructor: Initializes some internal data\r
+        */\r
+       public function __construct()\r
+       {\r
+               $this->option_values = array(); // oid_contextid => value\r
+               $this->option_info = array();   // context_name => array('oid' => ..., 'default' => ...)\r
+               $this->plugin_options = 0;\r
+       }\r
+       \r
+       /**\r
+        * Retrieves an array of the top (or bottom) of an option from a plugin.\r
+        * @author TeRanEX\r
+        * @param  string $context the context for the option: item, blog, member,...\r
+        * @param  string $name    the name of the option\r
+        * @param  int    $amount  how many rows must be returned\r
+        * @param  string $sort    desc or asc\r
+        * @return array           array with both values and contextid's\r
+        * @access private\r
+        */\r
+       final protected function get_option_top($context, $name, $amount = 10, $sort = 'desc')\r
+       {\r
+               if ( ($sort != 'desc') && ($sort != 'asc') )\r
+               {\r
+                       $sort= 'desc';\r
+               }\r
+               \r
+               $oid = $this->get_option_id($context, $name);\r
+               \r
+               // retrieve the data and return\r
+               $query = "SELECT otype, oextra FROM %s WHERE oid = %d;";\r
+               $query = sprintf($query, sql_table('plugin_option_desc'), $oid);\r
+               $row = DB::getRow($query);\r
+               \r
+               if ( ($this->optionCanBeNumeric($row['otype'])) && ($row['oextra'] == 'number' ) )\r
+               {\r
+                       $orderby = 'CAST(ovalue AS SIGNED)';\r
+               }\r
+               else\r
+               {\r
+                       $orderby = 'ovalue';\r
+               }\r
+               $query = "SELECT ovalue value, ocontextid id FROM %s WHERE oid = %d ORDER BY %s %s LIMIT 0,%d;";\r
+               $query = sprintf($query, sql_table('plugin_option'), $oid, $orderby, $sort, (integer) $amount);\r
+               $result = DB::getResult($query);\r
+               \r
+               // create the array\r
+               $i = 0;\r
+               $top = array();\r
+               foreach( $result as $row )\r
+               {\r
+                       $top[$i++] = $row;\r
+               }\r
+               \r
+               // return the array (duh!)\r
+               return $top;\r
+       }\r
+       \r
+       /**\r
+        * Creates an option in the database table plugin_option_desc\r
+        *      \r
+        * private\r
+        */\r
+       final protected function create_option($context, $name, $desc, $type, $defValue, $typeExtras = '')\r
+       {\r
+               // create in plugin_option_desc\r
+               $query = 'INSERT INTO ' . sql_table('plugin_option_desc')\r
+                               .' (opid, oname, ocontext, odesc, otype, odef, oextra)'\r
+                               .' VALUES ('.intval($this->plugid)\r
+                                       .', '.DB::quoteValue($name)\r
+                                       .', '.DB::quoteValue($context)\r
+                                       .', '.DB::quoteValue($desc)\r
+                                       .', '.DB::quoteValue($type)\r
+                                       .', '.DB::quoteValue($defValue)\r
+                                       .', '.DB::quoteValue($typeExtras).')';\r
+               DB::execute($query);\r
+               $oid = DB::getInsertId();\r
+               \r
+               $key = $context . '_' . $name;\r
+               $this->option_info[$key] = array('oid' => $oid, 'default' => $defValue);\r
+               return 1;\r
+       }\r
+       \r
+       /**\r
+        * Deletes an option from the database tables\r
+        * plugin_option and plugin_option_desc\r
+        *\r
+        * private\r
+        */\r
+       final protected function delete_option($context, $name)\r
+       {\r
+               $oid = $this->get_option_id($context, $name);\r
+               if ( !$oid )\r
+               {\r
+                       return 0; // no such option\r
+               }\r
+               \r
+               // delete all things from plugin_option\r
+               $query = "DELETE FROM %s WHERE oid=%d;";\r
+               $query = sprintf($query, sql_table('plugin_option'), (integer) $oid);\r
+               DB::execute($query);\r
+               \r
+               // delete entry from plugin_option_desc\r
+               $query = "DELETE FROM %s WHERE oid=%d;";\r
+               $query = sprintf($query, sql_table('plugin_option_desc'), $oid);\r
+               DB::execute($query);\r
+               \r
+               // clear from cache\r
+               unset($this->option_info["{$context}_{$name}"]);\r
+               $this->option_values = array();\r
+               return 1;\r
+       }\r
+       \r
+       /**\r
+        * Update an option in the database table plugin_option\r
+        *              \r
+        * returns: 1 on success, 0 on failure\r
+        * private\r
+        */\r
+       final protected function set_option($context, $contextid, $name, $value)\r
+       {\r
+               global $manager;\r
+               \r
+               $oid = $this->get_option_id($context, $name);\r
+               if ( !$oid )\r
+               {\r
+                       return 0;\r
+               }\r
+               \r
+               // check if context id exists\r
+               switch ( $context )\r
+               {\r
+                       case 'member':\r
+                               if ( !Member::existsID($contextid) )\r
+                               {\r
+                                       return 0;\r
+                               }\r
+                               break;\r
+                       case 'blog':\r
+                               if ( !$manager->existsBlogID($contextid) )\r
+                               {\r
+                                       return 0;\r
+                               }\r
+                               break;\r
+                       case 'category':\r
+                               if ( !$manager->existsCategory($contextid) )\r
+                               {\r
+                                       return 0;\r
+                               }\r
+                               break;\r
+                       case 'item':\r
+                               if ( !$manager->existsItem($contextid, true, true) )\r
+                               {\r
+                                       return 0;\r
+                               }\r
+                               break;\r
+                       case 'global':\r
+                               if ( $contextid != 0 )\r
+                               {\r
+                                       return 0;\r
+                               }\r
+                               break;\r
+               }\r
+               \r
+               // update plugin_option\r
+               $query = "DELETE FROM %s WHERE oid=%d and ocontextid=%d;";\r
+               $query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid);\r
+               DB::execute($query);\r
+               \r
+               $query = "INSERT INTO %s (ovalue, oid, ocontextid) VALUES (%s, %d, %d);";\r
+               $query = sprintf($query, sql_table('plugin_option'), DB::quoteValue($value), $oid, $contextid);\r
+               DB::execute($query);\r
+               \r
+               // update cache\r
+               $this->option_values["{$oid}_{$contextid}"] = $value;\r
+               if ( $context == 'global' )\r
+               {\r
+                       $this->plugin_options[strtolower($name)] = $value;\r
+               }\r
+               \r
+               return 1;\r
+       }\r
+       \r
+       /**\r
+        * Get an option from Cache or database\r
+        *       - if not in the option Cache read it from the database\r
+        *   - if not in the database write default values into the database\r
+        *              \r
+        * private              \r
+        */                                             \r
+       final protected function get_option($context, $contextid, $name)\r
+       {\r
+               $oid = $this->get_option_id($context, $name);\r
+               if ( !$oid )\r
+               {\r
+                       return '';\r
+               }\r
+               \r
+               $key = "{$oid}_{$contextid}";\r
+               \r
+               if ( isset($this->option_values[$key]) )\r
+               {\r
+                       return $this->option_values[$key];\r
+               }\r
+               \r
+               // get from DB\r
+               $query = "SELECT ovalue FROM %s WHERE oid=%d and ocontextid=%d;";\r
+               $query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid);\r
+               $result = DB::getResult($query);\r
+               \r
+               if ( !$result || ($result->rowCount() == 0) )\r
+               {\r
+                       // fill DB with default value\r
+                       $this->option_values[$key] = $this->get_default_value($context, $name);\r
+                       $query = "INSERT INTO %s (oid, ocontextid, ovalue) VALUES (%d, %d, %s);";\r
+                       $query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid, DB::quoteValue($this->option_values[$key]));\r
+                       DB::execute($query);\r
+               }\r
+               else\r
+               {\r
+                       $row = $result->fetch();\r
+                       $this->option_values[$key] = $row['ovalue'];\r
+               }\r
+               \r
+               return $this->option_values[$key];\r
+       }\r
+       \r
+       /**\r
+        * Returns assoc array with all values for a given option\r
+        * (one option per possible context id)\r
+        *\r
+        * private                              \r
+        */\r
+       final protected function get_all_options($context, $name)\r
+       {\r
+               $oid = $this->get_option_id($context, $name);\r
+               if ( !$oid )\r
+               {\r
+                       return array();\r
+               }\r
+               $default_value = $this->get_default_value($context, $name);\r
+               \r
+               $options = array();\r
+               $query = "SELECT %s as contextid FROM %s;";\r
+               switch ( $context )\r
+               {\r
+                       case 'blog':\r
+                               $query = sprintf($query, 'bnumber', sql_table('blog'));\r
+                               break;\r
+                       case 'category':\r
+                               $query = sprintf($query, 'catid', sql_table('category'));\r
+                               break;\r
+                       case 'member':\r
+                               $query = sprintf($query, 'mnumber', sql_table('member'));\r
+                               break;\r
+                       case 'item':\r
+                               $query = sprintf($query, 'inumber', sql_table('item'));\r
+                               break;\r
+               }\r
+               \r
+               $result = DB::getResult($query);\r
+               if ( $result )\r
+               {\r
+                       foreach ( $result as $row )\r
+                       {\r
+                               $options[$row['contextid']] = $default_value;\r
+                       }\r
+               }\r
+               \r
+               $query = "SELECT ocontextid, ovalue FROM %s WHERE oid=%d;";\r
+               $query = sprintf($query, sql_table('plugin_option'), $oid);\r
+               $result = DB::getResult($query);\r
+               foreach ( $result as $row )\r
+               {\r
+                       $options[$row['ocontextid']] = $row['ovalue'];\r
+               }\r
+\r
+               return $options;\r
+       }\r
+       \r
+       /**\r
+        * NucleusPlugin::get_option_id\r
+        * \r
+        * Gets the 'option identifier' that corresponds to a given option name.\r
+        * When this method is called for the first time, all the OIDs for the plugin\r
+        * are loaded into memory, to avoid re-doing the same query all over.\r
+        * \r
+        * @param       string  $context        option context\r
+        * @param       string  $name           plugin name\r
+        * @return              integer option id\r
+        */\r
+       final protected function get_option_id($context, $name)\r
+       {\r
+               $key = "{$context}_{$name}";\r
+               \r
+               if ( array_key_exists($key, $this->option_info)\r
+                && array_key_exists('oid', $this->option_info[$key]) )\r
+               {\r
+                       return $this->option_info[$key]['oid'];\r
+               }\r
+               \r
+               // load all OIDs for this plugin from the database\r
+               $this->option_info = array();\r
+               $query = "SELECT oid, oname, ocontext, odef FROM %s WHERE opid=%d;";\r
+               $query = sprintf($query, sql_table('plugin_option_desc'), $this->plugid);\r
+               $result = DB::getResult($query);\r
+               foreach ( $result as $row )\r
+               {\r
+                       $k = $row['ocontext'] . '_' . $row['oname'];\r
+                       $this->option_info[$k] = array('oid' => $row['oid'], 'default' => $row['odef']);\r
+               }\r
+               $result->closeCursor();\r
+               \r
+               return $this->option_info[$key]['oid'];\r
+       }\r
+       final protected function get_default_value($context, $name)\r
+       {\r
+               $key = $context . '_' . $name;\r
+               \r
+               if ( array_key_exists($key, $this->option_info)\r
+                && array_key_exists('default', $this->option_info[$key]) )\r
+               {\r
+                       return $this->option_info[$key]['default'];\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * NucleusPlugin::delete_option_values()\r
+        * Deletes all option values for a given context and contextid\r
+        * (used when e.g. a blog, member or category is deleted)\r
+        *\r
+        *@static\r
+        *@param        String  $context        global/blog/category/item/member\r
+        *@param        Integer $contextid              ID\r
+        *@return       Void\r
+        */\r
+       static public function delete_option_values($context, $contextid)\r
+       {\r
+               // delete all associated plugin options\r
+               $aOIDs = array();\r
+               // find ids\r
+               $query = "SELECT oid FROM %s WHERE ocontext=%s;";\r
+               $query = sprintf($query, sql_table('plugin_option_desc'), DB::quoteValue($context));\r
+               \r
+               $result = DB::getResult($query);\r
+               foreach ( $result as $row )\r
+               {\r
+                       array_push($aOIDs, $row['oid']);\r
+               }\r
+               $result->closeCursor();\r
+               // delete those options. go go go\r
+               if ( count($aOIDs) > 0 )\r
+               {\r
+                       $query = "DELETE FROM %s WHERE oid in (%s) and ocontextid=%d;";\r
+                       $query = sprintf($query, sql_table('plugin_option'), implode(',',$aOIDs), (integer) $contextid);\r
+                       DB::execute($query);\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * NucleusPlugin::getOptionMeta()\r
+        * splits the option's typeextra field (at ;'s) to split the meta collection\r
+        * \r
+        * @static\r
+        * @param string $typeExtra the value of the typeExtra field of an option\r
+        * @return array array of the meta-key/value-pairs\r
+        */\r
+       static public function getOptionMeta($typeExtra)\r
+       {\r
+               $meta = array();\r
+               \r
+               /* 1. if $typeExtra includes delimiter ';', split it to tokens */\r
+               $tokens = preg_split('#;#', $typeExtra);\r
+               \r
+               /*\r
+                * 2. if each of tokens includes "=", it consists of key => value\r
+                *    else it's 'select' option\r
+                */\r
+               foreach ( $tokens as $token )\r
+               {\r
+                       $matches = array();\r
+                       if ( preg_match("#^([^=]+)?=([^=]+)?$#", $token, $matches) )\r
+                       {\r
+                               $meta[$matches[1]] = $matches[2];\r
+                       }\r
+                       else\r
+                       {\r
+                               $meta['select'] = $token;\r
+                       }\r
+               }\r
+               return $meta;\r
+       }\r
+       \r
+       /**\r
+        * NucleusPlugin::getOptionSelectValues()\r
+        * filters the selectlists out of the meta collection\r
+        * \r
+        * @static\r
+        * @param string $typeExtra the value of the typeExtra field of an option\r
+        * @return string the selectlist\r
+        */\r
+       static public function getOptionSelectValues($typeExtra)\r
+       {\r
+               $meta = NucleusPlugin::getOptionMeta($typeExtra);\r
+               \r
+               if ( array_key_exists('select', $meta) )\r
+               {\r
+                       return $meta['select'];\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * checks if the eventlist in the database is up-to-date\r
+        * @return bool if it is up-to-date it return true, else false\r
+        * @author TeRanEX\r
+        */\r
+       public function subscribtionListIsUptodate()\r
+       {\r
+               $res = DB::getResult('SELECT event FROM '.sql_table('plugin_event').' WHERE pid = '.$this->plugid);\r
+               $ev = array();\r
+               foreach ( $res as $row )\r
+               {\r
+                       array_push($ev, $row['event']);\r
+               }\r
+               if ( count($ev) != count($this->getEventList()) )\r
+               {\r
+                       return false;\r
+               }\r
+               $d = array_diff($ev, $this->getEventList());\r
+               if ( count($d) > 0 )\r
+               {\r
+                       // there are differences so the db is not up-to-date\r
+                       return false;\r
+               }\r
+               return true;\r
+       }\r
+       \r
+       /**\r
+        * NucleusPlugin::apply_plugin_options()\r
+        * Update its entry in database table\r
+        * \r
+        * @static\r
+        * @param       $options: array ( 'oid' => array( 'contextid' => 'value'))\r
+        *                       (taken from request using requestVar())\r
+        * @param       $new_contextid: integer (accepts a contextid when it is for a new\r
+        *                       contextid there was no id available at the moment of writing the\r
+        *                        formcontrols into the page (by ex: itemOptions for new item)\r
+        * @return void\r
+        */\r
+       static public function apply_plugin_options(&$options, $new_contextid = 0)\r
+       {\r
+               global $manager;\r
+               \r
+               if ( !is_array($options) )\r
+               {\r
+                       return;\r
+               }\r
+               \r
+               foreach ( $options as $oid => $values )\r
+               {\r
+                       // get option type info\r
+                       $query = "SELECT opid, oname, ocontext, otype, oextra, odef FROM %s WHERE oid=%d;";\r
+                       $query = sprintf($query, sql_table('plugin_option_desc'), (integer) $oid);\r
+                       $result = DB::getRow($query);\r
+                       if ( $result )\r
+                       {\r
+                               foreach ( $values as $id => $value )\r
+                               {\r
+                                       // decide wether we are using the contextid of newContextid\r
+                                       if ( $new_contextid != 0 )\r
+                                       {\r
+                                               $contextid = $new_contextid;\r
+                                       }\r
+                                       else\r
+                                       {\r
+                                               $contextid = $id;\r
+                                       }\r
+                                       \r
+                                       // retreive any metadata\r
+                                       $meta = NucleusPlugin::getOptionMeta($result['oextra']);\r
+                                       \r
+                                       // if the option is readonly or hidden it may not be saved\r
+                                       if ( array_key_exists('access', $meta)\r
+                                        && in_array($meta['access'], array('readonly', 'hidden')) )\r
+                                       {\r
+                                               return;\r
+                                       }\r
+                                       \r
+                                       // value comes from request\r
+                                       $value = undoMagic($value);\r
+                                       \r
+                                       /* validation the value according to its type */\r
+                                       switch ( $result['otype'] )\r
+                                       {\r
+                                               case 'yesno':\r
+                                                       if ( ($value != 'yes') && ($value != 'no') )\r
+                                                       {\r
+                                                               $value = 'no';\r
+                                                       }\r
+                                                       break;\r
+                                               case 'text':\r
+                                               case 'select':\r
+                                                       if ( array_key_exists('datatype', $meta)\r
+                                                        && ($meta['datatype'] == 'numerical') && ($value != (integer) $value) )\r
+                                                       {\r
+                                                               $value = (integer) $result['odef'];\r
+                                                       }\r
+                                                       break;\r
+                                               case 'password':\r
+                                               case 'textarea':\r
+                                               default:\r
+                                                       break;\r
+                                       }\r
+                                       \r
+                                       /*\r
+                                        * trigger event PrePluginOptionsUpdate to give the plugin the\r
+                                        * possibility to change/validate the new value for the option\r
+                                        */\r
+                                       $data = array(\r
+                                               'context'               => $result['ocontext'],\r
+                                               'plugid'                => $result['opid'],\r
+                                               'optionname'    => $result['oname'],\r
+                                               'contextid'             => $contextid,\r
+                                               'value'                 => &$value);\r
+                                       $manager->notify('PrePluginOptionsUpdate', $data);\r
+                                       \r
+                                       // delete and insert its fields of table in database\r
+                                       $query = "DELETE FROM %s WHERE oid=%d AND ocontextid=%d;";\r
+                                       $query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid);\r
+                                       DB::execute($query);\r
+                                       $query = "INSERT INTO %s (oid, ocontextid, ovalue) VALUES (%d, %d, %s);";\r
+                                       $query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid, DB::quoteValue($value));\r
+                                       DB::execute($query);\r
+                                       \r
+                                       // clear option value cache if the plugin object is already loaded\r
+                                       $plugin=& $manager->pidLoaded($result['opid']);\r
+                                       if ( $plugin )\r
+                                       {\r
+                                               $plugin->clearOptionValueCache();\r
+                                       }\r
+                                       \r
+                                       continue;\r
+                               }\r
+                       }\r
+                       continue;\r
+               }\r
+               return;\r
+       }\r
+}\r
+=======
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
@@ -982,3 +1968,4 @@ abstract class NucleusPlugin
                return;
        }
 }
+>>>>>>> skinnable-master
index 9d2b208..e1fce52 100644 (file)
@@ -1,3 +1,165 @@
+<<<<<<< HEAD
+<?php\r
+\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * code to make it easier to create plugin admin areas\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
+ * @version $Id: PLUGINADMIN.php 1626 2012-01-09 15:46:54Z sakamocchi $\r
+ */\r
+\r
+class PluginAdmin\r
+{\r
+       public $strFullName;            // NP_SomeThing\r
+       public $plugin;                 // ref. to plugin object\r
+       public $bValid;                 // evaluates to true when object is considered valid\r
+       public $admin;                          // ref to an admin object\r
+       \r
+       public function __construct($pluginName)\r
+       {\r
+               global $manager, $DIR_LIBS;\r
+               \r
+               if ( !class_exists('Admin', FALSE) )\r
+               {\r
+                       include($DIR_LIBS . 'ADMIN.php');\r
+               }\r
+               \r
+               $this->strFullName = "NP_{$pluginName}";\r
+               \r
+               // check if plugin exists and is installed\r
+               if ( !$manager->pluginInstalled($this->strFullName) )\r
+               {\r
+                       doError(_ERROR_INVALID_PLUGIN);\r
+               }\r
+               \r
+               $this->plugin =& $manager->getPlugin($this->strFullName);\r
+               $this->bValid = $this->plugin;\r
+               \r
+               if ( !$this->bValid )\r
+               {\r
+                       doError(_ERROR_INVALID_PLUGIN);\r
+               }\r
+               \r
+               $this->admin = new Admin();\r
+               $this->admin->action = "plugin_{$pluginName}";\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * PluginAdmin::start()\r
+        * \r
+        * @param       string  $extraHead      child elements for header element\r
+        * @return      void\r
+        */\r
+       public function start($extraHead = '')\r
+       {\r
+               global $CONF;\r
+               $strBaseHref  = '<base href="' . Entity::hsc($CONF['AdminURL']) . '" />';\r
+               $extraHead .= $strBaseHref;\r
+               \r
+               $this->admin->pagehead($extraHead);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * PluginAdmin::end()\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       public function end()\r
+       {\r
+               $this->_AddTicketByJS();\r
+               $this->admin->pagefoot();\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * PluginAdmin::_AddTicketByJS()\r
+        * Add ticket when not used in plugin's admin page\r
+        * to avoid CSRF.\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       public function _AddTicketByJS()\r
+       {\r
+               global $CONF,$ticketforplugin;\r
+               if ( !($ticket=$ticketforplugin['ticket']) ) \r
+               {\r
+                       return;\r
+               }\r
+               $ticket=Entity::hsc($ticket);\r
+\r
+?><script type="text/javascript">\r
+/*<![CDATA[*/\r
+/* Add tickets for available links (outside blog excluded) */\r
+for (i=0;document.links[i];i++){\r
+  if (document.links[i].href.indexOf('<?php echo $CONF['PluginURL']; ?>',0)<0\r
+    && !(document.links[i].href.indexOf('//',0)<0)) continue;\r
+  if ((j=document.links[i].href.indexOf('?',0))<0) continue;\r
+  if (document.links[i].href.indexOf('ticket=',j)>=0) continue;\r
+  document.links[i].href=document.links[i].href.substring(0,j+1)+'ticket=<?php echo $ticket; ?>&'+document.links[i].href.substring(j+1);\r
+}\r
+/* Add tickets for forms (outside blog excluded) */\r
+for (i=0;document.forms[i];i++){\r
+  /* check if ticket is already used */\r
+  for (j=0;document.forms[i].elements[j];j++) {\r
+    if (document.forms[i].elements[j].name=='ticket') {\r
+      j=-1;\r
+      break;\r
+    }\r
+  }\r
+  if (j==-1) continue;\r
\r
+  /* check if the modification works */\r
+  try{document.forms[i].innerHTML+='';}catch(e){\r
+    /* Modificaion falied: this sometime happens on IE */\r
+    if (!document.forms[i].action.name && document.forms[i].method.toUpperCase()=="POST") {\r
+      /* <input name="action"/> is not used for POST method*/\r
+      if (document.forms[i].action.indexOf('<?php echo $CONF['PluginURL']; ?>',0)<0\r
+        && !(document.forms[i].action.indexOf('//',0)<0)) continue;\r
+      if (0<(j=document.forms[i].action.indexOf('?',0))) if (0<document.forms[i].action.indexOf('ticket=',j)) continue;\r
+      if (j<0) document.forms[i].action+='?'+'ticket=<?php echo $ticket; ?>';\r
+      else document.forms[i].action+='&'+'ticket=<?php echo $ticket; ?>';\r
+      continue;\r
+    }\r
+    document.write('<?php echo _PLUGINADMIN_TICKETS_JAVASCRIPT ?>');\r
+    j=document.forms[i].outerHTML;\r
+    while (j!=j.replace('<','&lt;')) j=j.replace('<','&lt;');\r
+    document.write('<p>'+j+'</p>');\r
+    continue;\r
+  }\r
+  /* check the action paramer in form tag */\r
+  /* note that <input name="action"/> may be used here */\r
+  j=document.forms[i].innerHTML;\r
+  document.forms[i].innerHTML='';\r
+  if ((document.forms[i].action+'').indexOf('<?php echo $CONF['PluginURL']; ?>',0)<0\r
+      && !((document.forms[i].action+'').indexOf('//',0)<0)) {\r
+    document.forms[i].innerHTML=j;\r
+    continue;\r
+  }\r
+  /* add ticket */\r
+  document.forms[i].innerHTML=j+'<input type="hidden" name="ticket" value="<?php echo $ticket; ?>"/>';\r
+}\r
+/*]]>*/\r
+</script><?php\r
+       return;\r
+       }\r
+}\r
+\r
+=======
 <?php
 
 /*
@@ -165,3 +327,4 @@ for (i=0;document.forms[i];i++){
        }
 }
 
+>>>>>>> skinnable-master
index 534152f..81edfb5 100644 (file)
@@ -1,3 +1,226 @@
+<<<<<<< HEAD
+<?php\r
+\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2003-2009 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * SEARCH(querystring) offers different functionality to create an\r
+ * SQL query to find certain items. (and comments)\r
+ *\r
+ * based on code by David Altherr:\r
+ * http://www.evolt.org/article/Boolean_Fulltext_Searching_with_PHP_and_MySQL/18/15665/\r
+ * http://davidaltherr.net/web/php_functions/boolean/funcs.mysql.boolean.txt\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
+ * @version $Id: SEARCH.php 1556 2011-07-11 14:18:48Z ftruscot $\r
+ */\r
+\r
+\r
+\r
+class Search\r
+{\r
+       var $querystring;\r
+       var $marked;\r
+       var $inclusive;\r
+       var $blogs;\r
+\r
+\r
+       function SEARCH($text) {\r
+               global $blogid;\r
+               $text = preg_replace ("/[<,>,=,?,!,#,^,(,),[,\],:,;,\\\,%]/","",$text);\r
+               $this->querystring      = $text;\r
+               $this->marked           = $this->boolean_mark_atoms($text);\r
+               $this->inclusive        = $this->boolean_inclusive_atoms($text);\r
+               $this->blogs            = array();\r
+\r
+               // get all public searchable blogs, no matter what, include the current blog allways.\r
+               $res = DB::getResult('SELECT bnumber FROM '.sql_table('blog').' WHERE bincludesearch=1 ');\r
+               foreach ( $res as $row )\r
+                       $this->blogs[] = intval($row['bnumber']);\r
+       }\r
+\r
+       function  boolean_sql_select($match){\r
+               if (i18n::strlen($this->inclusive) > 0) {\r
+                  /* build sql for determining score for each record */\r
+                  $result=preg_split("# #",$this->inclusive);\r
+                  for($cth=0;$cth<count($result);$cth++){\r
+                          if(i18n::strlen($result[$cth])>=4){\r
+                                  $stringsum_long .=  " $result[$cth] ";\r
+                          }else{\r
+                                  $stringsum_a[] = ' '.$this->boolean_sql_select_short($result[$cth],$match).' ';\r
+                          }\r
+                  }\r
+\r
+                  if(i18n::strlen($stringsum_long)>0){\r
+                               $stringsum_long = DB::quoteValue($stringsum_long);\r
+                               $stringsum_a[] = " match ({$match}) against ({$stringsum_long}) ";\r
+                  }\r
+\r
+                  $stringsum .= implode("+",$stringsum_a);\r
+                  return $stringsum;\r
+               }\r
+       }\r
+\r
+       function boolean_inclusive_atoms($string){\r
+               $result = trim($string);\r
+               $result = preg_replace("#([[:space:]]{2,})#", ' ', $result);\r
+\r
+               # replaced eregi_replace() below with preg_replace(). ereg* functions are deprecated in PHP 5.3.0\r
+               # just added delimiters to regex and the 'i' for case-insensitive matching\r
+\r
+               /* convert normal boolean operators to shortened syntax */\r
+               $result = preg_replace('# not #i', ' -', $result);\r
+               $result = preg_replace('# and #i', ' ', $result);\r
+               $result = preg_replace('# or #i', ',', $result);\r
+\r
+               /* drop unnecessary spaces */\r
+               $result = str_replace(' ,', ',', $result);\r
+               $result = str_replace(', ', ',', $result);\r
+               $result = str_replace('- ', '-', $result);\r
+               $result = str_replace('+', '', $result);\r
+\r
+               /* strip exlusive atoms */\r
+               $result = preg_replace(\r
+                       "#\-\([A-Za-z0-9]{1,}[A-Za-z0-9\-\.\_\,]{0,}\)#",\r
+                       '',\r
+                       $result);\r
+\r
+               $result = str_replace('(', ' ', $result);\r
+               $result = str_replace(')', ' ', $result);\r
+               $result = str_replace(',', ' ', $result);\r
+\r
+               return $result;\r
+       }\r
+\r
+    function boolean_sql_where($match){\r
+\r
+        $result = $this->marked;\r
+\r
+        $this->boolean_sql_where_cb1($match); // set the static $match\r
+\r
+        $result = preg_replace_callback(\r
+\r
+            "/foo\[\(\'([^\)]{4,})\'\)\]bar/",\r
+\r
+            array($this,'boolean_sql_where_cb1'),\r
+\r
+            $result);\r
+\r
+        $this->boolean_sql_where_cb2($match); // set the static $match\r
+\r
+        $result = preg_replace_callback(\r
+\r
+            "/foo\[\(\'([^\)]{1,3})\'\)\]bar/",\r
+\r
+            array($this,'boolean_sql_where_cb2'),\r
+\r
+            $result);\r
+\r
+        return $result;\r
+\r
+    }\r
+\r
+    function boolean_sql_where_cb1($matches){\r
+\r
+        static $match;\r
+\r
+        if (!is_array($matches)) $match=$matches;\r
+\r
+        else return ' match ('.$match.') against ('.DB::quoteValue($matches[1]).') > 0 ';\r
+\r
+    }\r
+\r
+    function boolean_sql_where_cb2($matches){\r
+\r
+        static $match;\r
+\r
+        if (!is_array($matches)) $match=$matches;\r
+\r
+        else return ' ('.$this->boolean_sql_where_short($matches[1], $match).') ';\r
+\r
+    }  \r
+\r
+       function boolean_mark_atoms($string){\r
+               $result = trim($string);\r
+               $result = preg_replace("/([[:space:]]{2,})/",' ',$result);\r
+\r
+               # replaced eregi_replace() below with preg_replace(). ereg* functions are deprecated in PHP 5.3.0\r
+               # just added delimiters to regex and the 'i' for case-insensitive matching\r
+\r
+               /* convert normal boolean operators to shortened syntax */\r
+               $result = preg_replace('# not #i', ' -', $result);\r
+               $result = preg_replace('# and #i', ' ', $result);\r
+               $result = preg_replace('# or #i', ',', $result);\r
+\r
+               /* strip excessive whitespace */\r
+               $result = str_replace('( ', '(', $result);\r
+               $result = str_replace(' )', ')', $result);\r
+               $result = str_replace(', ', ',', $result);\r
+               $result = str_replace(' ,', ',', $result);\r
+               $result = str_replace('- ', '-', $result);\r
+               $result = str_replace('+', '', $result);\r
+\r
+               // remove double spaces (we might have introduced some new ones above)\r
+               $result = trim($result);\r
+               $result = preg_replace("#([[:space:]]{2,})#", ' ', $result);\r
+\r
+               /* apply arbitrary function to all 'word' atoms */\r
+\r
+               $result_a = preg_split('# #', $result);\r
+\r
+               for($word = 0;$word<count($result_a);$word++)\r
+               {\r
+                       $result_a[$word] = "foo[('" . $result_a[$word] . "')]bar";\r
+               }\r
+\r
+               $result = implode(' ', $result_a);\r
+\r
+               /* dispatch ' ' to ' AND ' */\r
+               $result = str_replace(' ', ' AND ', $result);\r
+\r
+               /* dispatch ',' to ' OR ' */\r
+               $result = str_replace(',', ' OR ', $result);\r
+\r
+               /* dispatch '-' to ' NOT ' */\r
+               $result = str_replace(' -', ' NOT ', $result);\r
+               return $result;\r
+       }\r
+\r
+       function boolean_sql_where_short($string,$match){\r
+               $match_a = preg_split('#,#',$match);\r
+               for($ith=0;$ith<count($match_a);$ith++){\r
+                       $like_a[$ith] = ' $match_a[$ith] LIKE ' . DB::quoteValue("% {$string} %") . ' ';\r
+               }\r
+               $like = implode(" OR ",$like_a);\r
+\r
+               return $like;\r
+       }\r
+       function boolean_sql_select_short($string,$match){\r
+               $match_a = preg_split('#,#',$match);\r
+               $score_unit_weight = .2;\r
+               for($ith=0;$ith<count($match_a);$ith++){\r
+                       $score_a[$ith] =\r
+                                                  " $score_unit_weight*(\r
+                                                  LENGTH(" . DB::quoteValue($match_a[$ith]) . ") -\r
+                                                  LENGTH(REPLACE(LOWER(" . DB::quoteValue($match_a[$ith]) . "),LOWER(" . DB::quoteValue($string) . "),'')))\r
+                                                  /LENGTH(" . DB::quoteValue($string) . ") ";\r
+               }\r
+               $score = implode(" + ",$score_a);\r
+\r
+               return $score;\r
+       }\r
+}\r
+?>\r
+=======
 <?php
 
 /*
@@ -219,3 +442,4 @@ class Search
        }
 }
 ?>
+>>>>>>> skinnable-master
index 1cd58ea..55547be 100644 (file)
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: SKIN.php 1816 2012-05-03 01:40:10Z sakamocchi $
+=======
  * @version $Id: SKIN.php 1886 2012-06-17 08:27:27Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 if ( !function_exists('requestVar') )
@@ -54,7 +58,13 @@ class Skin
                
                $this->id = (integer) $id;
                
+<<<<<<< HEAD
+               /*
+                * NOTE: include needed action class
+                */
+=======
                /* NOTE: include needed action class */
+>>>>>>> skinnable-master
                if ( $action_class != 'Actions' )
                {
                        if ( !class_exists($action_class, FALSE)
@@ -336,6 +346,15 @@ class Skin
                
                // retrieve contents
                $contents = FALSE;
+<<<<<<< HEAD
+               if ( $type != 'fileparse' )
+               {
+                       $contents = $this->getContentFromDB($type);
+               }
+               else if ( $path !== ''  && i18n::strpos(realpath($path), realpath("$DIR_NUCLEUS/../")) == 0 )
+               {
+                       $contents = $this->getContentFromFile($path);
+=======
                if ( $type == 'pluginadmin' )
                {
                        $contents = $path;
@@ -350,6 +369,7 @@ class Skin
                        {
                                $contents = $this->getContentFromFile($path);
                        }
+>>>>>>> skinnable-master
                }
                // use base skin if this skin does not have contents
                if ( $contents === FALSE )
@@ -455,7 +475,11 @@ class Skin
                $res = DB::getValue($query);
                
                $skintypeexists = !empty($res);
+<<<<<<< HEAD
+               $skintypevalue = ($content == true);
+=======
                $skintypevalue = !empty($content);
+>>>>>>> skinnable-master
                
                if( $skintypevalue && $skintypeexists )
                {
@@ -464,6 +488,23 @@ class Skin
                                'type'          =>  $type,
                                'content'       => &$content
                        );
+<<<<<<< HEAD
+                       
+                       // PreUpdateSkinPart event
+                       $manager->notify("PreUpdate{{$this->event_identifier}}Part", $data);
+               }
+               else if( $skintypevalue && !$skintypeexists )
+               {
+                       $data = array(
+                               'skinid'        => $this->id,
+                               'type'          => $type,
+                               'content'       => &$content
+                       );
+                       
+                       $manager->notify("PreAdd{$this->event_identifier}Part", $data);
+               }
+               else if( !$skintypevalue && $skintypeexists )
+=======
                        $manager->notify("PreUpdate{$this->event_identifier}Part", $data);
                }
                else if( $skintypevalue )
@@ -476,23 +517,36 @@ class Skin
                        $manager->notify("PreAdd{$this->event_identifier}Part", $data);
                }
                else if( $skintypeexists )
+>>>>>>> skinnable-master
                {
                        $data = array(
                                'skinid'        => $this->id,
                                'type'          => $type
                        );
+<<<<<<< HEAD
+                       
+=======
+>>>>>>> skinnable-master
                        $manager->notify("PreDelete{$this->event_identifier}Part", $data);
                }
                
                // delete old thingie
+<<<<<<< HEAD
+               $query = "DELETE FROM %s WHERE stype=%s and sdesc=%d";
+=======
                $query = "DELETE FROM %s WHERE stype=%s and sdesc=%d;";
+>>>>>>> skinnable-master
                $query = sprintf($query, sql_table('skin'), DB::quoteValue($type), (integer) $this->id);
                DB::execute($query);
                
                // write new thingie
                if ( $content )
                {
+<<<<<<< HEAD
+                       $query = "INSERT INTO %s (scontent, stype, sdesc) VALUE (%s, %s, %d)";
+=======
                        $query = "INSERT INTO %s (scontent, stype, sdesc) VALUES (%s, %s, %d);";
+>>>>>>> skinnable-master
                        $query = sprintf($query, sql_table('skin'), DB::quoteValue($content), DB::quoteValue($type), (integer) $this->id);
                        DB::execute($query);
                }
@@ -500,6 +554,28 @@ class Skin
                if( $skintypevalue && $skintypeexists )
                {
                        $data = array(
+<<<<<<< HEAD
+                               'skinid'        => $this->id,
+                               'type'          => $type,
+                               'content'       => &$content
+                       );
+                       
+                       // PostUpdateSkinPart event
+                       $manager->notify("PostUpdate{$this->event_identifier}Part", $data);
+               }
+               else if( $skintypevalue && (!$skintypeexists) )
+               {
+                       $data = array(
+                               'skinid'        => $this->id,
+                               'type'          => $type,
+                               'content'       => &$content
+                       );
+                       
+                       // PostAddSkinPart event
+                       $manager->notify("PostAdd{$this->event_identifier}Part", $data);
+               }
+               else if( (!$skintypevalue) && $skintypeexists )
+=======
                                'skinid'        =>  $this->id,
                                'type'          =>  $type,
                                'content'       => &$content
@@ -516,11 +592,16 @@ class Skin
                        $manager->notify("PostAdd{$this->event_identifier}Part", $data);
                }
                else if( $skintypeexists )
+>>>>>>> skinnable-master
                {
                        $data = array(
                                'skinid'        => $this->id,
                                'type'          => $type
                        );
+<<<<<<< HEAD
+                       
+=======
+>>>>>>> skinnable-master
                        $manager->notify("PostDelete{$this->event_identifier}Part", $data);
                }
                return;
@@ -609,14 +690,24 @@ class Skin
        }
        
        /**
+<<<<<<< HEAD
+        * Skin::getDefaultTypes()
+=======
         * Skin::getNormalTypes()
+>>>>>>> skinnable-master
         * 
         * @param       string  void
         * @return      array   default skin types
         */
+<<<<<<< HEAD
+       public function getDefaultTypes()
+       {
+               return call_user_func(array($this->action_class, 'getAvailableSkinTypes'));
+=======
        public function getNormalTypes()
        {
                return call_user_func(array($this->action_class, 'getNormalSkinTypes'));
+>>>>>>> skinnable-master
        }
        
        /**
@@ -627,7 +718,11 @@ class Skin
         */
        public function getAvailableTypes()
        {
+<<<<<<< HEAD
+               $default_skintypes = $this->getDefaultTypes();
+=======
                $default_skintypes = $this->getNormalTypes();
+>>>>>>> skinnable-master
                $query = "SELECT stype FROM %s WHERE sdesc=%d;";
                $query = sprintf($query, sql_table('skin'), (integer) $this->id);
                
@@ -655,7 +750,11 @@ class Skin
         * Skin::getAllowedActionsForType()
         * Get the allowed actions for a skin type
         * returns an array with the allowed actions
+<<<<<<< HEAD
+        * 
+=======
         * @return      array   allowed action types
+>>>>>>> skinnable-master
         * @param       string  $skintype       type of the skin
         * @return      array   allowed action types
         */
index 10af5d1..ea7a6ac 100644 (file)
@@ -1,3 +1,297 @@
+<<<<<<< HEAD
+<?php\r
+\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * A class representing a template\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
+ * @version $Id: TEMPLATE.php 1726 2012-04-07 02:23:46Z sakamocchi $\r
+ */\r
+class Template\r
+{\r
+       /**\r
+        * Template::$id\r
+        */\r
+       private $id;\r
+       \r
+       /**\r
+        * Template::__construct()\r
+        * \r
+        * @param       integer $templateid     id for template\r
+        * @return      void\r
+        */\r
+       public function __construct($templateid)\r
+       {\r
+               $this->id = intval($templateid);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Template::getID()\r
+        * \r
+        * @param       void\r
+        * @return      integer id for this instance of Template class\r
+        */\r
+       public function getID()\r
+       {\r
+               return (integer) $this->id;\r
+       }\r
+       \r
+       /**\r
+        * Template::createFromName()\r
+        * \r
+        * @statc\r
+        * @param       string  $name   template name\r
+        * @return      object  instance of Template class generated by the name\r
+        */\r
+       static public function createFromName($name)\r
+       {\r
+               return new Template(Template::getIdFromName($name));\r
+       }\r
+       \r
+       /**\r
+        * Template::getIdFromName()\r
+        * \r
+        * @static\r
+        * @param       string  $name   template name\r
+        * @return      integer id for the template\r
+        */\r
+       static public function getIdFromName($name)\r
+       {\r
+               $name = DB::quoteValue($name);\r
+               $query = "SELECT tdnumber FROM %s WHERE tdname=%s";\r
+               $query = sprintf($query, sql_table('template_desc'), $name);\r
+               return DB::getValue($query);\r
+       }\r
+       \r
+       /**\r
+        * Template::updateGeneralInfo()\r
+        * Updates the general information about the template\r
+        * \r
+        * @param       string  $name   template name\r
+        * @param       string  $desc   description for this template\r
+        * @return      void\r
+        */\r
+       public function updateGeneralInfo($name, $desc)\r
+       {\r
+               $query =  "UPDATE %s SET tdname=%s, tddesc=%s WHERE tdnumber=%d";\r
+               $query = sprintf($query, sql_table('template_desc'), DB::quoteValue($name), DB::quoteValue($desc), (integer) $this->getID());\r
+               DB::execute($query);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Template::update()\r
+        * Updates the contents of one part of the template\r
+        * \r
+        * @param       String  $type   value for nucleus_template.tpartname\r
+        * @param       String  $content        value for nucleus_template.tcontent\r
+        * @return      Void\r
+        */\r
+       public function update($type, $content)\r
+       {\r
+               // delete old thingie\r
+               $query = "DELETE FROM %s WHERE tpartname=%s and tdesc=%d";\r
+               $query = sprintf($query, sql_table('template'), DB::quoteValue($type), (integer) $this->getID());\r
+               DB::execute($query);\r
+               \r
+               // write new thingie\r
+               if ( $content )\r
+               {\r
+                       $query = "INSERT %s (tcontent, tpartname, tdesc) VALUE (%s, %s, %d)";\r
+                       $query = sprintf($query, sql_table('template'), DB::quoteValue($content), DB::quoteValue($type), (integer) $this->getID());\r
+                       DB::execute($query);\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Template::deleteAllParts()\r
+        * Deletes all template parts from the database\r
+        * \r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       public function deleteAllParts()\r
+       {\r
+               $query = "DELETE FROM %s WHERE tdesc=%d";\r
+               $query = sprintf($query, sql_table('template'), (integer) $this->getID());\r
+               DB::execute($query);\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Template::createNew()\r
+        * Creates a new template\r
+        *\r
+        * @static\r
+        * @param       string  $name   name for new template\r
+        * @param       string  $desc   description for new template\r
+        * @return      integer id for new template\r
+        */\r
+       static public function createNew($name, $desc)\r
+       {\r
+               global $manager;\r
+               \r
+               $manager->notify(\r
+                       'PreAddTemplate',\r
+                       array(\r
+                               'name' => &$name,\r
+                               'description' => &$desc\r
+                       )\r
+               );\r
+               \r
+               DB::execute('INSERT INTO '.sql_table('template_desc').' (tdname, tddesc) VALUES (' . DB::quoteValue($name) . ',' . DB::quoteValue($desc) . ')');\r
+               $newId = DB::getInsertId();\r
+               \r
+               $manager->notify(\r
+                       'PostAddTemplate',\r
+                       array(\r
+                               'templateid' => $newId,\r
+                               'name' => $name,\r
+                               'description' => $desc\r
+                       )\r
+               );\r
+               \r
+               return $newId;\r
+       }\r
+       \r
+       /**\r
+        * Reads a template and returns an array with the parts.\r
+        *\r
+        * @static\r
+        * @param       string  $name name of the template file\r
+        * @return      array   template array\r
+        */\r
+       static public function read($name)\r
+       {\r
+               global $manager;\r
+               $manager->notify(\r
+                       'PreTemplateRead',\r
+                       array(\r
+                               'template' => &$name\r
+                       )\r
+               );\r
+               \r
+               $query = "SELECT tpartname, tcontent FROM %s, %s WHERE tdesc=tdnumber and tdname=%s";\r
+               $query = sprintf($query, sql_table('template_desc'), sql_table('template'), DB::quoteValue($name));\r
+               $res = DB::getResult($query);\r
+               \r
+               foreach ( $res as $row )\r
+               {\r
+                       $template[$row['tpartname']] = $row['tcontent'];\r
+               }\r
+               \r
+               /*\r
+                * TODO: this is appropriate or not?\r
+                */\r
+               if ( array_key_exists('LOCALE', $template) && !empty($template['LOCALE']) )\r
+               {\r
+                       setlocale(LC_TIME, $template['LOCALE']);\r
+               }\r
+               else\r
+               {\r
+                       setlocale(LC_TIME,'');\r
+               }\r
+               \r
+               return $template;\r
+       }\r
+       \r
+       /**\r
+        * fills a template with values\r
+        * \r
+        * @static\r
+        * @param       string  $template       Template to be used\r
+        * @param       array   $values         Array of all the values\r
+        * @return      string  string filled with tag contents\r
+        */\r
+       static public function fill($template, $values)\r
+       {\r
+               \r
+               if ( sizeof($values) != 0 )\r
+               {\r
+                       foreach ( $values as $key => $value )\r
+                       {\r
+                               $template = preg_replace('#<%' . preg_quote($key, '#') . '%>#', $value, $template);\r
+                       }\r
+               }\r
+               \r
+               // remove non matched template-tags\r
+               return preg_replace('#<%([a-zA-Z]+)?%>#', '', $template);\r
+       }\r
+       \r
+       /**\r
+        * TEMPLATE::exists()\r
+        * returns true if there is a template with the given shortname\r
+        * \r
+        * @static\r
+        * @param       string  $name   template name\r
+        * @return      boolean exists or not\r
+        */\r
+       static public function exists($name)\r
+       {\r
+               $query = "SELECT * FROM %s WHERE tdname=%s";\r
+               $query = sprintf($query, sql_table('template_desc'), DB::quoteValue($name));\r
+               $r = DB::getResult($query);\r
+               return ($r->rowCount() != 0);\r
+       }\r
+       \r
+       /**\r
+        * TEMPLATE::existsID()\r
+        * returns true if there is a template with the given ID\r
+        * \r
+        * @static\r
+        * @param       integer $id     id for template\r
+        * @return      bookean exists or not\r
+        */\r
+       static public function existsID($id)\r
+       {\r
+               $query = "SELECT * FROM %s WHERE tdnumber=%d";\r
+               $query = sprintf($query, sql_table('template_desc'), (integer) $id);\r
+               $r = DB::getResult($query);\r
+               return ($r->rowCount() != 0);\r
+       }\r
+       \r
+       /**\r
+        * TEMPLATE::getNameFromId()\r
+        * \r
+        * @static\r
+        * @param       integer $id     id for template\r
+        * @return      object  sql object\r
+        */\r
+       static public function getNameFromId($id)\r
+       {\r
+               $query = "SELECT tdname as result FROM %s WHERE tdnumber=%d";\r
+               $query = sprintf($query, sql_table('template_desc'), (integer) $id);\r
+               return DB::getValue($query);\r
+       }\r
+       \r
+       /**\r
+        * TEMPLATE::getDesc()\r
+        * \r
+        * @static\r
+        * @param       integer $id     id for template\r
+        * @return      string  description for the template\r
+        */\r
+       static public function getDesc($id)\r
+       {\r
+               $query = "SELECT tddesc FROM %s WHERE tdnumber=%d";\r
+               $query = sprintf($query, sql_table('template_desc'), (integer) $id);\r
+               return DB::getValue($query);\r
+       }\r
+}\r
+=======
 <?php
 
 /*
@@ -271,3 +565,4 @@ class Template
                return DB::getValue($query);
        }
 }
+>>>>>>> skinnable-master
index dcc5d71..ecc4762 100644 (file)
@@ -1,3 +1,436 @@
+<<<<<<< HEAD
+<?php\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * Scripts to create/restore a backup of the Nucleus database\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
+ * @version $Id: backup.php 1624 2012-01-09 11:36:20Z sakamocchi $\r
+ */\r
+\r
+class Backup\r
+{\r
+       /**\r
+        * Backup::Backup()\r
+        * Constructor, just for compatibility\r
+        *\r
+        * @deprecated\r
+        * @param       void\r
+        * @return      void\r
+        *\r
+        */\r
+       public function Backup()\r
+       {\r
+               return;\r
+       }\r
+\r
+       /**\r
+        * Backup::do_backup()\r
+        * This function creates an sql dump of the database and sends it to\r
+        * the user as a file (can be gzipped if they want)\r
+        *\r
+        * NOTE: this remains not-static for compatibility\r
+        *\r
+        * @param boolean       $gzip   1 = compress backup file, 0 = no compression (default)\r
+        * @return      void\r
+        *\r
+        */\r
+       public function do_backup($gzip = 0)\r
+       {\r
+               global $manager, $nucleus;\r
+\r
+               // tables of which backup is needed\r
+               $tables = array(\r
+                               sql_table('actionlog'),\r
+                               sql_table('ban'),\r
+                               sql_table('blog'),\r
+                               sql_table('comment'),\r
+                               sql_table('config'),\r
+                               sql_table('item'),\r
+                               sql_table('karma'),\r
+                               sql_table('member'),\r
+                               sql_table('skin'),\r
+                               sql_table('skin_desc'),\r
+                               sql_table('team'),\r
+                               sql_table('template'),\r
+                               sql_table('template_desc'),\r
+                               sql_table('plugin'),\r
+                               sql_table('plugin_event'),\r
+                               sql_table('plugin_option'),\r
+                               sql_table('plugin_option_desc'),\r
+                               sql_table('category'),\r
+                               sql_table('activation'),\r
+                               sql_table('tickets'),\r
+               );\r
+\r
+               // add tables that plugins want to backup to the list\r
+               // catch all output generated by plugins\r
+               ob_start();\r
+               $query = sprintf('SELECT pfile FROM %s', sql_table('plugin'));\r
+               $res = DB::getResult($query);\r
+               foreach ( $res as $row )\r
+               {\r
+                       $plug =& $manager->getPlugin($row['pfile']);\r
+                       if ( $plug )\r
+                       {\r
+                               $tables = array_merge($tables, (array) $plug->getTableList());\r
+                       }\r
+               }\r
+               ob_end_clean();\r
+\r
+               // remove duplicates\r
+               $tables = array_unique($tables);\r
+\r
+               // make sure browsers don't cache the backup\r
+               header("Pragma: no-cache");\r
+\r
+               // don't allow gzip compression when extension is not loaded\r
+               if ( ($gzip != 0) && !extension_loaded("zlib") )\r
+               {\r
+                       $gzip = 0;\r
+               }\r
+\r
+               if ( !$gzip )\r
+               {\r
+                       $filename = 'nucleus_db_backup_' . i18n::formatted_datetime('%Y-%m-%d-%H-%M-%S', time()) . ".sql";\r
+               }\r
+               else\r
+               {\r
+                       // use an output buffer\r
+                       @ob_start();\r
+                       @ob_implicit_flush(0);\r
+\r
+                       // set filename\r
+                       $filename = 'nucleus_db_backup_' . i18n::formatted_datetime('%Y-%m-%d-%H-%M-%S', time()) . ".sql.gz";\r
+               }\r
+\r
+               // send headers that tell the browser a file is coming\r
+               header("Content-Type: text/x-delimtext; name=\"$filename\"");\r
+               header("Content-disposition: attachment; filename=$filename");\r
+\r
+               // dump header\r
+               echo "/*\n";\r
+               echo " * This is a backup file generated by Nucleus \n";\r
+               echo " * http://www.nucleuscms.org/\n";\r
+               echo " * \n";\r
+               echo " * backup-date: " . i18n::formatted_datetime('rfc822GMT', time()) . "\n";\r
+               echo " * Nucleus CMS version: " . $nucleus['version'] . "\n";\r
+               echo " * \n";\r
+               echo " * WARNING: Only try to restore on servers running the exact same version of Nucleus\n";\r
+               echo " */\n";\r
+\r
+               // dump all tables\r
+               reset($tables);\r
+               array_walk($tables, array(__CLASS__, 'dump_table'));\r
+\r
+               if ( $gzip )\r
+               {\r
+                       $Size = ob_get_length();\r
+                       $Crc = crc32(ob_get_contents());\r
+                       $contents = gzcompress(ob_get_contents());\r
+                       ob_end_clean();\r
+                       echo "\x1f\x8b\x08\x00\x00\x00\x00\x00" . substr($contents, 0, strlen($contents) - 4)\r
+                       . self::gzip_print_four_characters($Crc) . self::gzip_print_four_characters($Size);\r
+               }\r
+               exit;\r
+       }\r
+\r
+       /**\r
+        * Backup::dump_table()\r
+        * Creates a dump for a single table\r
+        * ($tablename and $key are filled in by array_walk)\r
+        *\r
+        * @static\r
+        * @param       string  $tablename\r
+        * @param       string  $key\r
+        */\r
+       static private function dump_table($tablename, $key)\r
+       {\r
+               echo "/*\n";\r
+               echo " * TABLE: " . $tablename . "\n";\r
+               echo " */\n";\r
+\r
+               // dump table structure\r
+               self::dump_structure($tablename);\r
+\r
+               // dump table contents\r
+               self::dump_contents($tablename);\r
+               return;\r
+       }\r
+\r
+       /**\r
+        * Backup::dump_structure()\r
+        * Creates a dump of the table structure for one table\r
+        *\r
+        * @static\r
+        * @param       string  $tablename\r
+        * @return      void\r
+        *\r
+        */\r
+       static private function dump_structure($tablename)\r
+       {\r
+               // add command to drop table on restore\r
+               echo "DROP TABLE IF EXISTS {$tablename};\n\n";\r
+               $result = DB::getRow("SHOW CREATE TABLE {$tablename}");\r
+               echo $result['Create Table'];\r
+               echo ";\n\n";\r
+               return;\r
+       }\r
+\r
+       /**\r
+        * Backup::get_field_names()\r
+        * Returns the field named for the given table in the\r
+        * following format:\r
+        * (column1, column2, ..., columnn)\r
+        *\r
+        * @static\r
+        * @param       resource        $result\r
+        * @param       integer $num_fields\r
+        * @return      string\r
+        */\r
+       static private function get_field_names($result, $num_fields)\r
+       {\r
+               $fields = array();\r
+               for ( $j = 0; $j < $num_fields; $j++ )\r
+               {\r
+                       $col = $result->getColumnMeta($j);\r
+                       $fields[] = $col['name'];\r
+               }\r
+\r
+               return '(' . implode(', ', $fields) . ')';\r
+       }\r
+\r
+       /**\r
+        * Backup::dump_contents()\r
+        * Creates a dump of the table content for one table\r
+        *\r
+        * @static\r
+        * @param       string  $tablename\r
+        * @return      void\r
+        *\r
+        */\r
+       static private function dump_contents($tablename)\r
+       {\r
+               /*\r
+                * Grab the data from the table.\r
+               */\r
+               $result = DB::getResult("SELECT * FROM $tablename");\r
+\r
+               if ( $result->rowCount() > 0 )\r
+               {\r
+                       echo "\n";\r
+                       echo "/*\n";\r
+                       echo " * Table Data for {$tablename}\n";\r
+                       echo " */\n";\r
+               }\r
+\r
+               $num_fields = $result->columnCount();\r
+\r
+               /*\r
+                * Compose fieldname list\r
+               */\r
+               $tablename_list = self::get_field_names($result, $num_fields);\r
+\r
+               /*\r
+                * Loop through the resulting rows and build the sql statement.\r
+               */\r
+               foreach ( $result as $row )\r
+               {\r
+                       // Start building the SQL statement.\r
+                       echo 'INSERT INTO ' . $tablename . ' ' . $tablename_list . ' VALUES(';\r
+\r
+                       // Loop through the rows and fill in data for each column\r
+                       for ( $j = 0; $j < $num_fields; $j++ )\r
+                       {\r
+                               if ( !isset($row[$j]) )\r
+                               {\r
+                                       // no data for column\r
+                                       echo ' NULL';\r
+                               }\r
+                               elseif ( $row[$j] != '' )\r
+                               {\r
+                                       // data\r
+                                       echo ' ' . DB::quoteValue($row[$j]);\r
+                               }\r
+                               else\r
+                               {\r
+                                       // empty column (!= no data!)\r
+                                       echo "''";\r
+                               }\r
+\r
+                               // only add comma when not last column\r
+                               if ( $j != ($num_fields - 1) )\r
+                               {\r
+                                       echo ',';\r
+                               }\r
+                       }\r
+                       echo ");\n";\r
+               }\r
+               echo "\n";\r
+               return;\r
+       }\r
+\r
+       /**\r
+        * Backup::gzip_print_four_characters()\r
+        *\r
+        * @static\r
+        * @param       integer $val\r
+        * @return      integer\r
+        */\r
+       static private function gzip_print_four_characters($Val)\r
+       {\r
+               for ( $i = 0; $i < 4; $i ++ )\r
+               {\r
+                       $return .= chr($Val % 256);\r
+                       $Val = floor($Val / 256);\r
+               }\r
+               return $return;\r
+       }\r
+\r
+       /**\r
+        * Backup::do_restore()\r
+        * Restores a database backup\r
+        *\r
+        * NOTE: this remains not-static for compatibility\r
+        *\r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       public function do_restore()\r
+       {\r
+               $uploadInfo = postFileInfo('backup_file');\r
+\r
+               // first of all: get uploaded file:\r
+               if ( array_key_exists('name', $uploadInfo) && empty($uploadInfo['name']) )\r
+               {\r
+                       return 'No file uploaded';\r
+               }\r
+               if ( !is_uploaded_file($uploadInfo['tmp_name']) )\r
+               {\r
+                       return 'No file uploaded';\r
+               }\r
+\r
+               $backup_file_name = $uploadInfo['name'];\r
+               $backup_file_tmpname = $uploadInfo['tmp_name'];\r
+               $backup_file_type = $uploadInfo['type'];\r
+\r
+               if ( !file_exists($backup_file_tmpname) )\r
+               {\r
+                       return 'File Upload Error';\r
+               }\r
+\r
+               if ( !preg_match("#^(text/[a-zA-Z]+)|(application/(x\-)?gzip(\-compressed)?)|(application/octet-stream)$#i", $backup_file_type) )\r
+               {\r
+                       return 'The uploaded file is not of the correct type';\r
+               }\r
+\r
+               $gzip = 0;\r
+               if ( preg_match("#\.gz#i", $backup_file_name) )\r
+               {\r
+                       $gzip = 1;\r
+               }\r
+\r
+               if ( !extension_loaded("zlib") && $gzip )\r
+               {\r
+                       return 'Cannot decompress gzipped backup (zlib package not installed)';\r
+               }\r
+\r
+               // get sql query according to gzip setting (either decompress, or not)\r
+               $contents = self::get_contents($backup_file_tmpname, $gzip);\r
+               if ( $contents == '' )\r
+               {\r
+                       return 'Cannot get contents from this file.';\r
+               }\r
+\r
+               /* detect lines */\r
+               $lines = preg_split('/[\r\n]/', $contents);\r
+               if( $lines === $contents )\r
+               {\r
+                       return 'Cannot parse contents from this file';\r
+               }\r
+\r
+               /* get sql statements from each lines */\r
+               $queries = self::get_queries($lines);\r
+               if ( $queries === array() )\r
+               {\r
+                       return "Cannot get SQL queries from this file.";\r
+               }\r
+\r
+               /* execute sql statements */\r
+               foreach ( $queries as $query )\r
+               {\r
+                       if ( DB::execute($query) === FALSE )\r
+                       {\r
+                               $error = DB::getError();\r
+                               debug('SQL Error: ' . $error[2]);\r
+                               break;\r
+                       }\r
+                       continue;\r
+               }\r
+               return;\r
+       }\r
+\r
+       static private function get_contents($temporary_name, $gzip = 0)\r
+       {\r
+               $contents = '';\r
+               if ( $gzip )\r
+               {\r
+                       // decompress and read\r
+                       $gz_ptr = gzopen($temporary_name, 'rb');\r
+                       while ( !gzeof($gz_ptr) )\r
+                       {\r
+                               $contents .= gzgets($gz_ptr, 100000);\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       // just read\r
+                       $fsize = filesize($temporary_name);\r
+                       if ( $fsize > 0 )\r
+                       {\r
+                               $contents = fread(fopen($temporary_name, 'r'), $fsize);\r
+                       }\r
+               }\r
+               return $contents;\r
+       }\r
+\r
+       static private function get_queries($lines)\r
+       {\r
+               $query = '';\r
+               $queries = array();\r
+               foreach ( $lines as $line )\r
+               {\r
+                       $line = trim($line);\r
+                       if ( !$line || $line[0] == '#' || preg_match('#^[\s|/]?\*#', $line) )\r
+                       {\r
+                               continue;\r
+                       }\r
+\r
+                       if ( preg_match('/^(.*);$/', $line, $matches) === 0 )\r
+                       {\r
+                               $query .= $line;\r
+                       }\r
+                       else\r
+                       {\r
+                               $query .= $matches[1];\r
+                               $queries[] = $query;\r
+                               $query = '';\r
+                       }\r
+                       continue;\r
+               }\r
+               return $queries;\r
+       }\r
+=======
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
@@ -430,4 +863,5 @@ class Backup
                }
                return $queries;
        }
+>>>>>>> skinnable-master
 }
\ No newline at end of file
index 2c443f6..e6448a8 100644 (file)
+<<<<<<< HEAD
+<?php\r
+\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2009 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group\r
+ * @version $Id: globalfunctions.php 1856 2012-05-18 09:30:16Z sakamocchi $
+ */\r
+\r
+/* needed if we include globalfunctions from install.php */\r
+global $nucleus, $CONF, $DIR_LIBS, $DIR_LOCALES, $manager, $member, $MYSQL_HANDLER, $StartTime;
+
+/* just for benchmark tag */
+$StartTime = microtime(TRUE);
+\r
+$nucleus['version'] = 'v4.00 SVN';\r
+$nucleus['codename'] = '';\r
+\r
+/*\r
+ * make sure there's no unnecessary escaping:\r
+ * set_magic_quotes_runtime(0);\r
+ */\r
+if ( version_compare(PHP_VERSION, '5.3.0', '<') )\r
+{\r
+       ini_set('magic_quotes_runtime', '0');\r
+}\r
+\r
+/* check and die if someone is trying to override internal globals (when register_globals turn on) */\r
+checkVars(array('nucleus', 'CONF', 'DIR_LIBS',
+'MYSQL_HOST', 'MYSQL_USER', 'MYSQL_PASSWORD', 'MYSQL_DATABASE',
+'DIR_LOCALES', 'DIR_PLUGINS',
+'HTTP_GET_VARS', 'HTTP_POST_VARS', 'HTTP_COOKIE_VARS', 'HTTP_ENV_VARS',
+'HTTP_SESSION_VARS', 'HTTP_POST_FILES', 'HTTP_SERVER_VARS',
+'GLOBALS', 'argv', 'argc', '_GET', '_POST', '_COOKIE', '_ENV', '_SESSION', '_SERVER', '_FILES'));
+\r
+if ( !isset($CONF) )\r
+{\r
+       $CONF = array();\r
+}\r
+\r
+/* debug mode */\r
+if ( array_key_exists('debug', $CONF) && $CONF['debug'] )\r
+{\r
+       /* report all errors! */\r
+       error_reporting(E_ALL);\r
+}\r
+else\r
+{\r
+       ini_set('display_errors','0');\r
+       error_reporting(E_ERROR | E_WARNING | E_PARSE);\r
+}\r
+\r
+/*\r
+ * alertOnHeadersSent\r
+ *  Displays an error when visiting a public Nucleus page and headers have\r
+ *  been sent out to early. This usually indicates an error in either a\r
+ *  configuration file or a translation file, and could cause Nucleus to\r
+ *  malfunction\r
+ */\r
+if ( !array_key_exists('alertOnHeadersSent', $CONF) )\r
+{\r
+       $CONF['alertOnHeadersSent'] = 1;\r
+}\r
+\r
+/*\r
+ * alertOnSecurityRisk\r
+ * Displays an error only when visiting the admin area, and when one or\r
+ *  more of the installation files (install.php, install.sql, upgrades/\r
+ *  directory) are still on the server.\r
+ */\r
+if ( !array_key_exists('alertOnSecurityRisk', $CONF) )\r
+{\r
+       $CONF['alertOnSecurityRisk'] = 1;\r
+}\r
+\r
+/*\r
+ * Set these to 1 to allow viewing of future items or draft items\r
+ * Should really never do this, but can be useful for some plugins that might need to\r
+ * Could cause some other issues if you use future posts otr drafts\r
+ * So use with care\r
+ */\r
+$CONF['allowDrafts'] = 0;\r
+$CONF['allowFuture'] = 0;\r
+\r
+if ( getNucleusPatchLevel() > 0 )\r
+{\r
+       $nucleus['version'] .= '/' . getNucleusPatchLevel();\r
+}\r
+\r
+/* Avoid notices */\r
+if ( !array_key_exists('installscript', $CONF) || empty($CONF['installscript']) )\r
+{\r
+       $CONF['installscript'] = 0;\r
+}\r
+if ( !array_key_exists('UsingAdminArea', $CONF) )\r
+{\r
+       $CONF['UsingAdminArea'] = 0;\r
+}\r
+\r
+if ( !headers_sent() )\r
+{\r
+       header('Generator: Nucleus CMS ' . $nucleus['version']);\r
+}\r
+\r
+\r
+/* TODO: This is for compatibility since 4.0, should be obsoleted at future release. */\r
+if ( !isset($DIR_LOCALES) )\r
+{\r
+       $DIR_LOCALES = $DIR_NUCLEUS . 'locales/';\r
+}\r
+global $DIR_LANG;\r
+if ( !isset($DIR_LANG) )\r
+{\r
+       $DIR_LANG = $DIR_LOCALES;\r
+}\r
+\r
+/* load and initialize i18n class */\r
+if (!class_exists('i18n', FALSE))\r
+{\r
+       include($DIR_LIBS . 'i18n.php');\r
+}\r
+if ( !i18n::init('UTF-8', $DIR_LOCALES) )\r
+{\r
+       exit('Fail to initialize i18n class.');\r
+}\r
+\r
+/* TODO: This is just for compatibility since 4.0, should be obsoleted at future release. */\r
+define('_CHARSET', i18n::get_current_charset());\r
+\r
+\r
+/*\r
+ * NOTE: Since 4.0 release, Entity class becomes to be important class\r
+ *  with some wrapper functions for htmlspechalchars/htmlentity PHP's built-in function\r
+ */\r
+include($DIR_LIBS . 'ENTITY.php');\r
+\r
+/* we will use postVar, getVar, ... methods instead of $_GET, $_POST ... */\r
+if ( $CONF['installscript'] != 1 )\r
+{\r
+       /* vars were already included in install.php */\r
+       include_once($DIR_LIBS . 'vars4.1.0.php');\r
+       \r
+       /* added for 4.0 DB::* wrapper and compatibility sql_* */\r
+       include_once($DIR_LIBS . 'sql/sql.php');\r
+}\r
+\r
+/* include core classes that are needed for login & plugin handling */\r
+include($DIR_LIBS . 'MEMBER.php');\r
+include($DIR_LIBS . 'ACTIONLOG.php');\r
+include($DIR_LIBS . 'MANAGER.php');\r
+include($DIR_LIBS . 'PLUGIN.php');\r
+\r
+$manager =& MANAGER::instance();\r
+\r
+/* only needed when updating logs */\r
+if ( $CONF['UsingAdminArea'] )\r
+{\r
+       /* XML-RPC client classes */\r
+       include($DIR_LIBS . 'xmlrpc.inc.php');\r
+       include($DIR_LIBS . 'ADMIN.php');\r
+}\r
+\r
+\r
+/* connect to database */\r
+if ( !isset($MYSQL_HANDLER) )\r
+{\r
+       $MYSQL_HANDLER = array('mysql','');\r
+}\r
+if ( $MYSQL_HANDLER[0] == '' )\r
+{\r
+       $MYSQL_HANDLER[0] = 'mysql';\r
+}\r
+DB::setConnectionInfo($MYSQL_HANDLER[1], $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE);\r
+\r
+\r
+/* force locale or charset */\r
+$locale = '';\r
+$charset = i18n::get_current_charset();\r
+\r
+$data = array(\r
+       'locale'        => &$locale,\r
+       'charset'       => &$charset\r
+);\r
+$manager->notify('ForceLocale', $data);\r
+\r
+if ( $data['locale'] !== '' )\r
+{\r
+       i18n::set_forced_locale($data['locale']);\r
+}\r
+if ( $data['charset'] !== '' )\r
+{\r
+       i18n::set_forced_charset($data['charset']);\r
+}\r
+unset($locale);\r
+unset($charset);\r
+\r
+\r
+/* convert forced charset to current charset */\r
+if ( i18n::get_forced_charset() != i18n::get_current_charset() )\r
+{\r
+       $_POST          = i18n::convert_array($_POST, i18n::get_forced_charset());\r
+       $_GET           = i18n::convert_array($_GET, i18n::get_forced_charset());\r
+       $_REQUEST       = i18n::convert_array($_REQUEST, i18n::get_forced_charset());\r
+       $_COOKIE        = i18n::convert_array($_COOKIE, i18n::get_forced_charset());\r
+       $_FILES         = i18n::convert_array($_FILES, i18n::get_forced_charset());\r
+       \r
+       if ( session_id() !== '' )\r
+       {\r
+               $_SESSION = i18n::convert_array($_SESSION, i18n::get_forced_charset());\r
+       }\r
+}\r
+\r
+\r
+/* sanitize option */\r
+$bLoggingSanitizedResult = 0;\r
+$bSanitizeAndContinue = 0;\r
+$orgRequestURI = serverVar('REQUEST_URI');\r
+sanitizeParams();\r
+\r
+/* logs sanitized result if need */\r
+if ( $orgRequestURI !== serverVar('REQUEST_URI') )\r
+{\r
+       $msg = "Sanitized [" . serverVar('REMOTE_ADDR') . "] ";\r
+       $msg .= $orgRequestURI . " -> " . serverVar('REQUEST_URI');\r
+       if ( $bLoggingSanitizedResult )\r
+       {\r
+               addToLog(WARNING, $msg);\r
+       }\r
+       if ( !$bSanitizeAndContinue )\r
+       {\r
+               die("");\r
+       }\r
+}\r
+\r
+/* get all variables that can come from the request and put them in the global scope */\r
+$blogid                = requestVar('blogid');\r
+$itemid                = intRequestVar('itemid');\r
+$catid         = intRequestVar('catid');\r
+$skinid                = requestVar('skinid');\r
+$memberid      = requestVar('memberid');\r
+$archivelist = requestVar('archivelist');\r
+$imagepopup    = requestVar('imagepopup');\r
+$archive       = requestVar('archive');\r
+$query         = requestVar('query');\r
+$highlight     = requestVar('highlight');\r
+$amount                = requestVar('amount');\r
+$action                = requestVar('action');\r
+$nextaction    = requestVar('nextaction');\r
+$maxresults    = requestVar('maxresults');\r
+$startpos      = intRequestVar('startpos');\r
+$errormessage = '';\r
+$error         = '';\r
+$special       = requestVar('special');\r
+\r
+\r
+/* read config */\r
+getConfig();\r
+\r
+\r
+/* Properly set $CONF['Self'] and others if it's not set...\r
+ * usually when we are access from admin menu\r
+ */\r
+if ( !array_key_exists('Self', $CONF) )\r
+{\r
+       $CONF['Self'] = $CONF['IndexURL'];\r
+       /* strip trailing */\r
+       if ( $CONF['Self'][i18n::strlen($CONF['Self']) -1] == "/" )\r
+       {\r
+               $CONF['Self'] = i18n::substr($CONF['Self'], 0, i18n::strlen($CONF['Self']) -1);\r
+       }\r
+}\r
+\r
+$CONF['ItemURL']               = $CONF['Self'];\r
+$CONF['ArchiveURL']            = $CONF['Self'];\r
+$CONF['ArchiveListURL']        = $CONF['Self'];\r
+$CONF['MemberURL']             = $CONF['Self'];\r
+$CONF['SearchURL']             = $CONF['Self'];\r
+$CONF['BlogURL']               = $CONF['Self'];\r
+$CONF['CategoryURL']   = $CONF['Self'];\r
+\r
+/* automatically use simpler toolbar for mozilla */\r
+if ( ($CONF['DisableJsTools'] == 0)\r
+   && i18n::strpos(serverVar('HTTP_USER_AGENT'), 'Mozilla/5.0') !== FALSE\r
+   && i18n::strpos(serverVar('HTTP_USER_AGENT'), 'Gecko') !== FALSE )\r
+{\r
+       $CONF['DisableJsTools'] = 2;\r
+}\r
+\r
+/* login processing */
+$member = new Member();\r
+\r
+if ( $action == 'login' )\r
+{\r
+       $login = postVar('login');\r
+       $password = postVar('password');\r
+       $shared = intPostVar('shared');\r
+       $member->login($login, $password, $shared);\r
+}\r
+elseif ( ($action == 'logout') )\r
+{\r
+       $member->logout();\r
+}\r
+else\r
+{\r
+       $member->cookielogin();\r
+}\r
+\r
+\r
+/* TODO: This is for backward compatibility, should be obsoleted near future. */\r
+if ( !preg_match('#^(.+)_(.+)_(.+)$#', $CONF['Locale'])\r
+  && ($CONF['Locale'] = i18n::convert_old_language_file_name_to_locale($CONF['Locale'])) === FALSE )\r
+{\r
+       $CONF['Locale'] = 'en_Latn_US';\r
+}\r
+if ( !array_key_exists('Language', $CONF) )\r
+{\r
+       $CONF['Language'] = i18n::convert_locale_to_old_language_file_name($CONF['Locale']);\r
+}\r
+$locale = $CONF['Locale'];\r
+\r
+\r
+/* NOTE: include translation file and set locale */\r
+if ( $member->isLoggedIn() )\r
+{\r
+       if ( $member->getLocale() )\r
+       {\r
+               $locale = $member->getLocale();\r
+       }\r
+}\r
+else\r
+{\r
+       if ( i18n::get_forced_locale() !== '' )\r
+       {\r
+               $locale = i18n::get_forced_locale();\r
+       }\r
+}\r
+include_translation($locale);\r
+i18n::set_current_locale($locale);\r
+\r
+\r
+/* login completed */\r
+$manager->notify('PostAuthentication', array('loggedIn' => $member->isLoggedIn() ) );\r
+\r
+/* next action */\r
+if ( $member->isLoggedIn() && $nextaction )\r
+{\r
+       $action = $nextaction;\r
+}\r
+\r
+/* first, let's see if the site is disabled or not. always allow admin area access. */\r
+if ( $CONF['DisableSite'] && !$member->isAdmin() && !$CONF['UsingAdminArea'] )\r
+{\r
+       redirect($CONF['DisableSiteURL']);\r
+       exit;\r
+}\r
+\r
+/* load other classes */\r
+include($DIR_LIBS . 'PARSER.php');\r
+include($DIR_LIBS . 'SKIN.php');\r
+include($DIR_LIBS . 'TEMPLATE.php');\r
+include($DIR_LIBS . 'BLOG.php');\r
+include($DIR_LIBS . 'BODYACTIONS.php');\r
+include($DIR_LIBS . 'COMMENTS.php');\r
+include($DIR_LIBS . 'COMMENT.php');\r
+include($DIR_LIBS . 'NOTIFICATION.php');\r
+include($DIR_LIBS . 'BAN.php');\r
+include($DIR_LIBS . 'PAGEFACTORY.php');\r
+include($DIR_LIBS . 'SEARCH.php');\r
+include($DIR_LIBS . 'LINK.php');\r
+\r
+/* set lastVisit cookie (if allowed) */\r
+if ( !headers_sent() )\r
+{\r
+       if ( $CONF['LastVisit'] )\r
+       {\r
+               setcookie($CONF['CookiePrefix'] . 'lastVisit', time(), time() + 2592000, $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);\r
+       }\r
+       else\r
+       {\r
+               setcookie($CONF['CookiePrefix'] . 'lastVisit', '', (time() - 2592000), $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);\r
+       }\r
+}\r
+\r
+if ( !defined('_ARCHIVETYPE_MONTH') )\r
+{\r
+       define('_ARCHIVETYPE_DAY', 'day');\r
+       define('_ARCHIVETYPE_MONTH', 'month');\r
+       define('_ARCHIVETYPE_YEAR', 'year');\r
+}\r
+\r
+/* for path resolving */
+$virtualpath = getVar('virtualpath');
+if ( getVar('virtualpath') == '' )
+                                       {\r
+       $virtualpath = serverVar('PATH_INFO');
+                                       }\r
+                               \r
+/*
+ * switch URLMode back to normal when $CONF['Self'] ends in .php
+ * this avoids urls like index.php/item/13/index.php/item/15
+ */
+if ( !array_key_exists('URLMode', $CONF) || ($CONF['URLMode'] != 'pathinfo') )
+                                       {\r
+       $CONF['URLMode'] = 'normal';
+                                       }\r
+else
+                                       {\r
+       if ( i18n::substr($CONF['Self'], i18n::strlen($CONF['Self']) - 4) != '.php' )
+                                       {\r
+               decodePathInfo($virtualpath);
+       }\r
+}\r
+\r
+/*\r
+ * PostParseURL is a place to cleanup any of the path-related global variables before the selector function is run.\r
+ * It has 2 values in the data in case the original virtualpath is needed, but most the use will be in tweaking\r
+ * global variables to clean up (scrub out catid or add catid) or to set someother global variable based on\r
+ * the values of something like catid or itemid\r
+ * New in 3.60\r
+ */\r
+$data = array(\r
+       'type' => basename(serverVar('SCRIPT_NAME')),\r
+       'info' => $virtualpath\r
+);\r
+$manager->notify('PostParseURL', $data);\r
+\r
+/*\r
+ * NOTE: Here is the end of initialization\r
+ */\r
+\r
+/**\r
+ * include_libs()\r
+ * This function includes or requires the specified library file\r
+ * \r
+ * @param      string  $file\r
+ * @param      boolean $once use the _once() version\r
+ * @param      boolean $require use require() instead of include()\r
+ * @return     void\r
+ */\r
+function include_libs($file, $once = TRUE, $require = TRUE)\r
+{\r
+       global $DIR_LIBS;\r
+       \r
+       // $DIR_LIBS isn't a directory\r
+       if ( !is_dir($DIR_LIBS) )\r
+       {\r
+               exit;\r
+       }\r
+       \r
+       $lib_path = $DIR_LIBS . $file;\r
+       \r
+       if ( $once && $require )\r
+       {\r
+               require_once($lib_path);\r
+       }\r
+       else if ( $once && !$require )\r
+       {\r
+               include_once($lib_path);\r
+       }\r
+       else if ( $require )\r
+       {\r
+               require($lib_path);\r
+       }\r
+       else\r
+       {\r
+               include($lib_path);\r
+       }\r
+       return;\r
+}\r
+\r
+/**\r
+ * include_plugins()\r
+ * This function includes or requires the specified plugin file\r
+ * \r
+ * @param      string  $file\r
+ * @param      boolean $once use the _once() version\r
+ * @param      boolean $require use require() instead of include()\r
+ * @return     \r
+ */\r
+function include_plugins($file, $once = TRUE, $require = TRUE)\r
+{\r
+       global $DIR_PLUGINS;\r
+       \r
+       // begin if: $DIR_LIBS isn't a directory\r
+       if ( !is_dir($DIR_PLUGINS) )\r
+       {\r
+               exit;\r
+       }\r
+       \r
+       $plugin_path = $DIR_PLUGINS . $file;\r
+       \r
+       // begin if: \r
+       if ( $once && $require )\r
+       {\r
+               require_once($plugin_path);\r
+       }\r
+       else if ( $once && !$require )\r
+       {\r
+               include_once($plugin_path);\r
+       }\r
+       elseif ( $require )\r
+       {\r
+               require($plugin_path);\r
+       }\r
+       else\r
+       {\r
+               include($plugin_path);\r
+       }\r
+       return;\r
+}\r
+\r
+/**\r
+ * include_translation()\r
+ * This function decide which locale is used and include translation\r
+ * \r
+ * @param      string  &$locale        locale name referring to 'language tags' defined in RFC 5646\r
+ * @return     void\r
+ */\r
+function include_translation(&$locale)\r
+{\r
+       global $DIR_LOCALES;\r
+       \r
+       $translation_file = $DIR_LOCALES . $locale . '.' . i18n::get_current_charset() . '.php';\r
+       if ( !file_exists($translation_file) )\r
+       {\r
+               $locale = 'en_Latn_US';\r
+               $translation_file = $DIR_LOCALES . 'en_Latn_US.ISO-8859-1.php';\r
+       }\r
+       include($translation_file);\r
+       return;\r
+}\r
+\r
+/**\r
+ * intPostVar()\r
+ * This function returns the integer value of $_POST for the variable $name\r
+ * \r
+ * @param      string  $name   field to get the integer value of\r
+ * @return     integer\r
+ */\r
+function intPostVar($name)\r
+{\r
+       return (integer) postVar($name);\r
+}\r
+\r
+\r
+/**\r
+ * intGetVar()\r
+ * This function returns the integer value of $_GET for the variable $name\r
+ * \r
+ * @param      string  $name   field to get the integer value of\r
+ * @return     integer\r
+ */\r
+function intGetVar($name)\r
+{\r
+       return (integer) getVar($name);\r
+}\r
+\r
+\r
+/**\r
+ * intRequestVar()\r
+ * This function returns the integer value of $_REQUEST for the variable $name. Also checks $_GET and $_POST if not found in $_REQUEST\r
+ * \r
+ * @param string $name field to get the integer value of\r
+ * @return int\r
+ */\r
+function intRequestVar($name)\r
+{\r
+       return (integer) requestVar($name);\r
+}\r
+\r
+\r
+/**\r
+ * intCookieVar()\r
+ * This function returns the integer value of $_COOKIE for the variable $name\r
+ * \r
+ * @param      string  $name   field to get the integer value of\r
+ * @return     integer\r
+ */\r
+function intCookieVar($name)\r
+{\r
+       return (integer) cookieVar($name);\r
+}\r
+\r
+/**\r
+ * getNucleusVersion()\r
+ * This function returns the current Nucleus version (100 = 1.00, 101 = 1.01, etc...)\r
+ * \r
+ * @param      void\r
+ * @return     integer\r
+ */\r
+function getNucleusVersion()\r
+{\r
+       return 400;\r
+}\r
+\r
+/**\r
+ * getNucleusPatchLevel()\r
+ * TODO: Better description of this function.\r
+ *\r
+ * Power users can install patches in between nucleus releases. These patches\r
+ * usually add new functionality in the plugin API and allow those to\r
+ * be tested without having to install CVS.\r
+ *\r
+ *@param       void\r
+ * @return     integer\r
+ */\r
+function getNucleusPatchLevel()\r
+{\r
+       return 0;\r
+}\r
+\r
+/**\r
+ * getLatestVersion()\r
+ * This function returns the latest Nucleus version available for download from nucleuscms.org or FALSE if unable to attain data\r
+ * Format will be major.minor/patachlevel e.g. 3.41 or 3.41/02\r
+ * \r
+ * @param      void\r
+ * @return     mixed\r
+ */\r
+function getLatestVersion()\r
+{\r
+       // begin if: cURL is not available in this PHP installation\r
+       if ( !function_exists('curl_init') )\r
+       {\r
+               return FALSE;\r
+       }\r
+       \r
+       $curl = curl_init();\r
+       $timeout = 5;\r
+       \r
+       curl_setopt ($curl, CURLOPT_URL, 'http://nucleuscms.org/version_check.php');\r
+       curl_setopt ($curl, CURLOPT_RETURNTRANSFER, 1);\r
+       curl_setopt ($curl, CURLOPT_CONNECTTIMEOUT, $timeout);\r
+       \r
+       $return = curl_exec($curl);\r
+       \r
+       curl_close($curl);\r
+       \r
+       return $return;\r
+}\r
+\r
+/**\r
+ * sql_table()\r
+ * This function returns a Nucleus table name with the appropriate prefix\r
+ * @param string $name\r
+ * @return string\r
+ */\r
+function sql_table($name)\r
+{\r
+       global $MYSQL_PREFIX;\r
+       \r
+       // begin if: no MySQL prefix\r
+       if ( empty($MYSQL_PREFIX) )\r
+       {\r
+               return 'nucleus_' . $name;\r
+       }\r
+       // else: use MySQL prefix\r
+       else\r
+       {\r
+               return $MYSQL_PREFIX . 'nucleus_' . $name;\r
+       }\r
+       return;\r
+}\r
+\r
+/**\r
+ * sendContentType()\r
+ * This function sends the Content-Type header if headers have not already been sent\r
+ * It also determines if the browser can accept application/xhtml+xml and sends it only to those that can.\r
+ * \r
+ * if content type is application/xhtml+xml, only send it to browsers\r
+ * that can handle it (IE6 cannot). Otherwise, send text/html\r
+ *\r
+ * v2.5:\r
+ * For admin area pages, keep sending text/html (unless it's a debug version)\r
+ * application/xhtml+xml still causes too much problems with the javascript implementations\r
+ *\r
+ * v3.3:\r
+ * ($CONF['UsingAdminArea'] && !$CONF['debug']) gets removed,\r
+ * application/xhtml+xml seems to be working, so we're going to use it if we can.\r
+ * \r
+ * @param      string  $content_type   MIME media type registered to IANA, http://www.iana.org/assignments/media-types/index.html\r
+ * @param      string  $page_type              \r
+ * @param      string  $charset                Deprecated. This has no meaning.\r
+ * @return     void\r
+ * \r
+ */\r
+function sendContentType($content_type, $page_type = '', $charset = '')\r
+{\r
+       global $manager, $CONF;\r
+       \r
+       if ( headers_sent() )\r
+       {\r
+               return;\r
+       }\r
+       \r
+       /* NOTE: MIME Media Type */\r
+       if ( ($content_type == 'application/xhtml+xml')\r
+               && (!stristr(serverVar('HTTP_ACCEPT'), 'application/xhtml+xml') ) )\r
+       {\r
+               $content_type = 'text/html';\r
+       }\r
+       \r
+       /* NOTE: generate event */\r
+       $data = array(\r
+               'pageType'              =>  $page_type,\r
+               'contentType'   => &$content_type\r
+       );\r
+       $manager->notify('PreSendContentType', $data);\r
+       \r
+       /* NOTE: confirm MIME Media Type */\r
+       $content_type = preg_replace('#[^a-zA-Z0-9-+./]#', '', $content_type);\r
+       \r
+       /* NOTE: confirm character set */\r
+       $charset = i18n::get_current_charset();\r
+       if ( i18n::get_forced_charset() !== '' )\r
+       {\r
+               $charset = i18n::get_forced_charset();\r
+       }\r
+       \r
+       /* NOTE: send HTTP 1.1 header */\r
+       header("Content-Type: {$content_type}; charset={$charset}");\r
+       \r
+       /* NOTE: set handler for translating character set */\r
+       if ( $charset != i18n::get_current_charset() )\r
+       {\r
+               ob_start(array('i18n', 'convert_handler'));\r
+       }\r
+       \r
+       return;\r
+}\r
+\r
+/**\r
+ * parseHighlight()\r
+ * This function parses a query into an array of expressions that can be passed on to the highlight method\r
+ * @param      string  $query\r
+ * @return     void\r
+ */\r
+function parseHighlight($query)\r
+{\r
+       // TODO: add more intelligent splitting logic\r
+       \r
+       // get rid of quotes\r
+       $query = preg_replace('/\'|"/', '', $query);\r
+       \r
+       if ( !$query )\r
+       {\r
+               return array();\r
+       }\r
+       \r
+       $aHighlight = preg_split('# #', $query);\r
+       \r
+       for ( $i = 0; $i < count($aHighlight); $i++ )\r
+       {\r
+               $aHighlight[$i] = trim($aHighlight[$i]);\r
+               \r
+               if ( i18n::strlen($aHighlight[$i]) < 3 )\r
+               {\r
+                       unset($aHighlight[$i]);\r
+               }\r
+       }\r
+       \r
+       if ( count($aHighlight) == 1 )\r
+       {\r
+               return $aHighlight[0];\r
+       }\r
+       else\r
+       {\r
+               return $aHighlight;\r
+       }\r
+       return;\r
+}\r
+\r
+/**\r
+ * getConfig()\r
+ * \r
+ * @param      void\r
+ * @return     void\r
+ */\r
+function getConfig()\r
+{\r
+       global $CONF;\r
+       \r
+       $query = sprintf('SELECT * FROM %s', sql_table('config'));\r
+       $res = DB::getResult($query);\r
+       \r
+       foreach ( $res as $row )\r
+       {\r
+               $CONF[$row['name']] = $row['value'];\r
+       }\r
+       return;\r
+}\r
+\r
+/**\r
+ * This function gets the blog ID from the blog name\r
+ * @param string $name\r
+ * @return\r
+ */\r
+function getBlogIDFromName($name)\r
+{\r
+       $query = sprintf('SELECT bnumber AS result FROM %s WHERE bshortname=%s', sql_table('blog'), DB::quoteValue($name));\r
+       return DB::getValue($query);\r
+}\r
+\r
+/**\r
+ * This function gets the blog name from the blog ID\r
+ * @param int $id\r
+ * @return object\r
+ */\r
+function getBlogNameFromID($id)\r
+{\r
+       $query = sprintf('SELECT bname AS result FROM %s WHERE bnumber=%d', sql_table('blog'), intval($id));\r
+       return DB::getValue($query);\r
+}\r
+\r
+/**\r
+ * This function gets the blog ID from the item ID\r
+ * @param int $item_id\r
+ * @return object\r
+ */\r
+function getBlogIDFromItemID($item_id)\r
+{\r
+       $query = sprintf('SELECT iblog AS result FROM %s WHERE inumber=%d', sql_table('item'), intval($item_id));\r
+       return DB::getValue($query);\r
+}\r
+\r
+/**\r
+ * This function gets the blog ID from the comment ID\r
+ * @param int $comment_id\r
+ * @return object\r
+ */\r
+function getBlogIDFromCommentID($comment_id)\r
+{\r
+       $query = sprintf('SELECT cblog AS result FROM %s WHERE cnumber=%d', sql_table('comment'), intval($comment_id));\r
+       return DB::getValue($query);\r
+}\r
+\r
+/**\r
+ * This function gets the blog ID from the category ID\r
+ * @param int $category_id\r
+ * @return object\r
+ */\r
+function getBlogIDFromCatID($category_id)\r
+{\r
+       $query = sprintf('SELECT cblog AS result FROM %s WHERE catid=%d', sql_table('category'), intval($category_id));\r
+       return DB::getValue($query);\r
+}\r
+\r
+/**\r
+ * This function gets the category ID from the category name\r
+ * @param int $name\r
+ * @return object\r
+ */\r
+function getCatIDFromName($name)\r
+{\r
+       $query = sprintf('SELECT catid AS result FROM %s WHERE cname=%s', sql_table('category'), DB::quoteValue($name));\r
+       return DB::getValue($query);\r
+}\r
+\r
+\r
+/**\r
+ * functions to be used in index.php to select something\r
+ */\r
+function selectBlog($shortname)\r
+{\r
+       global $blogid, $archivelist;\r
+       $blogid = getBlogIDFromName($shortname);\r
+       \r
+       // also force archivelist variable, if it is set\r
+       if ( $archivelist )\r
+       {\r
+               $archivelist = $blogid;\r
+       }\r
+       return;\r
+}\r
+function selectSkin($skinname)\r
+{\r
+       global $skinid;\r
+       $skinid = SKIN::getIdFromName($skinname);\r
+       return;\r
+}\r
+function selectCategory($cat)\r
+{\r
+       global $catid;\r
+       if ( is_numeric($cat) )\r
+       {\r
+               $catid = (integer) $cat;\r
+       }\r
+       else\r
+       {\r
+               $catid = getCatIDFromName($cat);\r
+       }\r
+       return;\r
+}\r
+function selectItem($id)\r
+{\r
+       global $itemid;\r
+       $itemid = (integer) $id;\r
+       return;\r
+}\r
+function selectSpecialSkinType($id)\r
+{\r
+       global $special;\r
+       $special = strtolower($id);\r
+       return;\r
+}\r
+function selector()\r
+{\r
+       global $archive, $archivelist, $archivenext, $archivenextexists, $archiveprev, $archiveprevexists, $archivetype;\r
+       global $blog, $blogid;\r
+       global $catid;\r
+       global $itemid, $itemidnext, $itemidprev, $itemtitlenext, $itemtitleprev;\r
+       global $CONF, $DIR_LIBS, $amount, $errormessage, $imagepopup;\r
+       global $manager, $maxresults, $query;\r
+       global $member, $memberid, $memberinfo;\r
+       global $skinid, $skinpart, $special;\r
+       \r
+       $actionNames = array('addcomment', 'sendmessage', 'createaccount', 'forgotpassword', 'votepositive', 'votenegative', 'plugin');\r
+       $action = requestVar('action');\r
+       \r
+       if ( in_array($action, $actionNames) )\r
+       {\r
+               include_once($DIR_LIBS . 'ACTION.php');\r
+               $a = new Action();\r
+               $errorInfo = $a->doAction($action);\r
+               \r
+               if ( $errorInfo )\r
+               {\r
+                       $errormessage = $errorInfo['message'];\r
+               }\r
+       }\r
+       \r
+       // show error when headers already sent out\r
+       if ( headers_sent() && $CONF['alertOnHeadersSent'] )\r
+       {\r
+               // try to get line number/filename (extra headers_sent params only exists in PHP 4.3+)\r
+               if ( function_exists('version_compare') && version_compare('4.3.0', phpversion(), '<=') )\r
+               {\r
+                       headers_sent($hsFile, $hsLine);\r
+                       $extraInfo = ' in <code>' . $hsFile . '</code> line <code>' . $hsLine . '</code>';\r
+               }\r
+               else\r
+               {\r
+                       $extraInfo = '';\r
+               }\r
+               \r
+               startUpError(\r
+                  "<p>The page headers have already been sent out{$extraInfo}. This could cause Nucleus not to work in the expected way.</p>"\r
+                . "<p>Usually, this is caused by spaces or newlines at the end of the <code>config.php</code> file, "\r
+                . "at the end of the translation file or at the end of a plugin file.</p>"\r
+                . "<p>Please check this and try again.</p>"\r
+                . "<p>If you don't want to see this error message again, without solving the problem, "\r
+                . "set <code>{$CONF['alertOnHeadersSent']}</code> in <code>globalfunctions.php</code> to <code>0</code></p>"\r
+                . "Page headers already sent"\r
+               );\r
+               exit;\r
+       }\r
+       \r
+       // make is so ?archivelist without blogname or blogid shows the archivelist\r
+       // for the default weblog\r
+       if ( serverVar('QUERY_STRING') == 'archivelist' )\r
+       {\r
+               $archivelist = $CONF['DefaultBlog'];\r
+       }\r
+       \r
+       // now decide which type of skin we need\r
+       if ( $itemid )\r
+       {\r
+               // itemid given -> only show that item\r
+               $type = 'item';\r
+               \r
+               if ( !$manager->existsItem($itemid,intval($CONF['allowFuture']),intval($CONF['allowDrafts'])) )\r
+               {\r
+                       doError(_ERROR_NOSUCHITEM);\r
+               }\r
+               \r
+               // 1. get timestamp, blogid and catid for item\r
+               $query = 'SELECT itime, iblog, icat FROM %s WHERE inumber=%d';\r
+               $query = sprintf($query, sql_table('item'), intval($itemid));\r
+               $row = DB::getRow($query);\r
+               \r
+               // if a different blog id has been set through the request or selectBlog(),\r
+               // deny access\r
+               \r
+               if ( $blogid && (intval($blogid) != $row['iblog']) )\r
+               {\r
+                       doError(_ERROR_NOSUCHITEM);\r
+               }\r
+               \r
+               // if a category has been selected which doesn't match the item, ignore the\r
+               // category. #85\r
+               if ( ($catid != 0) && ($catid != $row['icat']) )\r
+               {\r
+                       $catid = 0;\r
+               }\r
+               \r
+               $blogid = $row['iblog'];\r
+               $timestamp = strtotime($row['itime']);\r
+               \r
+               $b =& $manager->getBlog($blogid);\r
+               \r
+               if ( !$b->isValidCategory($catid) )\r
+               {\r
+                       $query = "SELECT inumber, ititle FROM %s WHERE itime<%s AND idraft=0 AND iblog=%d ORDER BY itime DESC LIMIT 1";\r
+                       $query = sprintf($query, sql_table('item'), DB::formatDateTime($timestamp), intval($blogid));\r
+               }\r
+               else\r
+               {\r
+                       $query = "SELECT inumber, ititle FROM %s WHERE itime<%s AND idraft=0 AND iblog=%d AND icat=%d ORDER BY itime DESC LIMIT 1";\r
+                       $query = sprintf($query, sql_table('item'), DB::formatDateTime($timestamp), intval($blogid), intval($catid));\r
+               }\r
+               $row = DB::getRow($query);\r
+               \r
+               if ( $row )\r
+               {\r
+                       $itemidprev = $row['inumber'];\r
+                       $itemtitleprev = $row['ititle'];\r
+               }\r
+               \r
+               // get next itemid and title\r
+               if ( !$b->isValidCategory($catid) )\r
+               {\r
+                       $query = "SELECT inumber, ititle FROM %s WHERE itime>%s AND itime<=%s AND idraft=0 AND iblog=%d ORDER BY itime ASC LIMIT 1";\r
+                       $query = sprintf($query, sql_table('item'), DB::formatDateTime($timestamp), DB::formatDateTime($b->getCorrectTime()), intval($blogid));\r
+               }\r
+               else\r
+               {\r
+                       $query = "SELECT inumber, ititle FROM %s WHERE itime>%s AND itime<=%s AND idraft=0 AND iblog=%d AND icat=%d ORDER BY itime ASC LIMIT 1";\r
+                       $query = sprintf($query, sql_table('item'), DB::formatDateTime($timestamp), DB::formatDateTime($b->getCorrectTime()), intval($blogid), intval($catid));\r
+               }\r
+               $row = DB::getRow($query);\r
+               \r
+               if ( $row )\r
+               {\r
+                       $itemidnext = $row['inumber'];\r
+                       $itemtitlenext = $row['ititle'];\r
+               }\r
+       }\r
+       elseif ( $archive )\r
+       {\r
+               // show archive\r
+               $type = 'archive';\r
+               \r
+               // sql queries for the timestamp of the first and the last published item\r
+               $query = sprintf('SELECT UNIX_TIMESTAMP(itime) as result FROM %s WHERE idraft=0 ORDER BY itime ASC', sql_table('item'));\r
+               $first_timestamp = DB::getValue($query);\r
+               $query = sprintf('SELECT UNIX_TIMESTAMP(itime) as result FROM %s WHERE idraft=0 ORDER BY itime DESC', sql_table('item'));\r
+               $last_timestamp = DB::getValue($query);\r
+               \r
+               sscanf($archive, '%d-%d-%d', $y, $m, $d);\r
+               \r
+               if ( $d != 0 )\r
+               {\r
+                       $archivetype = _ARCHIVETYPE_DAY;\r
+                       $t = mktime(0, 0, 0, $m, $d, $y);\r
+                       // one day has 24 * 60 * 60 = 86400 seconds\r
+                       $archiveprev = i18n::formatted_datetime('%Y-%m-%d', $t - 86400 );\r
+                       // check for published items\r
+                       if ( $t > $first_timestamp )\r
+                       {\r
+                               $archiveprevexists = true;\r
+                       }\r
+                       else\r
+                       {\r
+                               $archiveprevexists = false;\r
+                       }\r
+                       \r
+                       // one day later\r
+                       $t += 86400;\r
+                       $archivenext = i18n::formatted_datetime('%Y-%m-%d', $t);\r
+                       if ( $t < $last_timestamp )\r
+                       {\r
+                               $archivenextexists = true;\r
+                       }\r
+                       else\r
+                       {\r
+                               $archivenextexists = false;\r
+                       }\r
+               }\r
+               elseif ( $m == 0 )\r
+               {\r
+                       $archivetype = _ARCHIVETYPE_YEAR;\r
+                       $t = mktime(0, 0, 0, 12, 31, $y - 1);\r
+                       // one day before is in the previous year\r
+                       $archiveprev = i18n::formatted_datetime('%Y', $t);\r
+                       if ( $t > $first_timestamp )\r
+                       {\r
+                               $archiveprevexists = true;\r
+                       }\r
+                       else\r
+                       {\r
+                               $archiveprevexists = false;\r
+                       }\r
+\r
+                       // timestamp for the next year\r
+                       $t = mktime(0, 0, 0, 1, 1, $y + 1);\r
+                       $archivenext = i18n::formatted_datetime('%Y', $t);\r
+                       if ( $t < $last_timestamp )\r
+                       {\r
+                               $archivenextexists = true;\r
+                       }\r
+                       else\r
+                       {\r
+                               $archivenextexists = false;\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       $archivetype = _ARCHIVETYPE_MONTH;\r
+                       $t = mktime(0, 0, 0, $m, 1, $y);\r
+                       // one day before is in the previous month\r
+                       $archiveprev = i18n::formatted_datetime('%Y-%m', $t - 86400);\r
+                       if ( $t > $first_timestamp )\r
+                       {\r
+                               $archiveprevexists = true;\r
+                       }\r
+                       else\r
+                       {\r
+                               $archiveprevexists = false;\r
+                       }\r
+                       \r
+                       // timestamp for the next month\r
+                       $t = mktime(0, 0, 0, $m+1, 1, $y);\r
+                       $archivenext = i18n::formatted_datetime('%Y-%m', $t);\r
+                       if ( $t < $last_timestamp )\r
+                       {\r
+                               $archivenextexists = true;\r
+                       }\r
+                       else\r
+                       {\r
+                               $archivenextexists = false;\r
+                       }\r
+               }\r
+       }\r
+       elseif ( $archivelist )\r
+       {\r
+               $type = 'archivelist';\r
+               \r
+               if ( is_numeric($archivelist) )\r
+               {\r
+                       $blogid = intVal($archivelist);\r
+               }\r
+               else\r
+               {\r
+                       $blogid = getBlogIDFromName($archivelist);\r
+               }\r
+       \r
+               if ( !$blogid )\r
+               {\r
+                       doError(_ERROR_NOSUCHBLOG);\r
+               }\r
+       }\r
+       elseif ( $query )\r
+       {\r
+               global $startpos;\r
+               $type = 'search';\r
+               $query = stripslashes($query);\r
+               \r
+               if ( is_numeric($blogid) )\r
+               {\r
+                       $blogid = intVal($blogid);\r
+               }\r
+               else\r
+               {\r
+                       $blogid = getBlogIDFromName($blogid);\r
+               }\r
+               \r
+               if ( !$blogid )\r
+               {\r
+                       doError(_ERROR_NOSUCHBLOG);\r
+               }\r
+       }\r
+       elseif ( $memberid )\r
+       {\r
+               $type = 'member';\r
+               \r
+               if ( !Member::existsID($memberid) )\r
+               {\r
+                       doError(_ERROR_NOSUCHMEMBER);\r
+               }\r
+               $memberinfo = $manager->getMember($memberid);\r
+       }\r
+       elseif ( $imagepopup )\r
+       {\r
+               // media object (images etc.)\r
+               $type = 'imagepopup';\r
+               \r
+               // TODO: check if media-object exists\r
+               // TODO: set some vars?\r
+       }\r
+       else\r
+       {\r
+               // show regular index page\r
+               global $startpos;\r
+               $type = 'index';\r
+       }\r
+       \r
+       // any type of skin with catid\r
+       if ( $catid && !$blogid )\r
+       {\r
+               $blogid = getBlogIDFromCatID($catid);\r
+       }\r
+       \r
+       // decide which blog should be displayed\r
+       if ( !$blogid )\r
+       {\r
+               $blogid = $CONF['DefaultBlog'];\r
+       }\r
+       \r
+       $b =& $manager->getBlog($blogid);\r
+       $blog = $b; // references can't be placed in global variables?\r
+       \r
+       if ( !$blog->isValid )\r
+       {\r
+               doError(_ERROR_NOSUCHBLOG);\r
+       }\r
+       \r
+       // set catid if necessary\r
+       if ( $catid )\r
+       {\r
+               // check if the category is valid\r
+               if ( !$blog->isValidCategory($catid) )\r
+               {\r
+                       doError(_ERROR_NOSUCHCATEGORY);\r
+               }\r
+               else\r
+               {\r
+                       $blog->setSelectedCategory($catid);\r
+               }\r
+       }\r
+       \r
+       if ( !$skinid )\r
+       {\r
+               $skinid = $blog->getDefaultSkin();\r
+       }\r
+       \r
+       if ( !empty($special) && isValidShortName($special) )\r
+       {\r
+               $type = strtolower($special);\r
+       }\r
+       \r
+       $skin = new SKIN($skinid);\r
+       \r
+       if ( !$skin->isValid() )\r
+       {\r
+               doError(_ERROR_NOSUCHSKIN);\r
+       }\r
+       \r
+       // set global skinpart variable so can determine quickly what is being parsed from any plugin or phpinclude\r
+       $skinpart = $type;\r
+       \r
+       // parse the skin\r
+       $skin->parse($type);\r
+       \r
+       // check to see we should throw JustPosted event\r
+       $blog->checkJustPosted();\r
+       return;\r
+}\r
+\r
+/**\r
+ * doError()\r
+ * Show error skin with given message. An optional skin-object to use can be given\r
+ * \r
+ * @param      string  $msg\r
+ * @param      string  $skin\r
+ * @return     void\r
+ */\r
+function doError($msg, $skin = '')\r
+{\r
+       global $errormessage, $CONF, $skinid, $blogid, $manager;\r
+       \r
+       if ( $skin == '' )\r
+       {\r
+               if ( Skin::existsID($skinid) )\r
+               {\r
+                       $id = $skinid;\r
+               }\r
+               elseif ( $manager->existsBlogID($blogid) )\r
+               {\r
+                       $blog =& $manager->getBlog($blogid);\r
+                       $id = $blog->getDefaultSkin();\r
+               }\r
+               elseif ($CONF['DefaultBlog'] )\r
+               {\r
+                       $blog =& $manager->getBlog($CONF['DefaultBlog']);\r
+                       $id = $blog->getDefaultSkin();\r
+               }\r
+               else\r
+               {\r
+                       // this statement should actually never be executed\r
+                       $id = $CONF['BaseSkin'];\r
+               }\r
+               $skin = new Skin($id);\r
+       }\r
+       \r
+       $errormessage = $msg;\r
+       $skin->parse('error');\r
+       return;
+}\r
+\r
+/**\r
+ * Errors before the database connection has been made\r
+ * \r
+ * @param      string  $msg    message to notify\r
+ * @param      string  $title  page title\r
+ * @return     void\r
+ */\r
+function startUpError($msg, $title)\r
+{\r
+       header('Content-Type: text/xml; charset=' . i18n::get_current_charset());\r
+       echo "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n";\r
+       echo "<head>\n";\r
+       echo "<title>{$title}</title></head>\n";\r
+       echo "<body>\n";\r
+       echo "<h1>{$title}</h1>\n";\r
+       echo $msg;\r
+       echo "</body>\n";\r
+       echo "</html>\n";\r
+       exit;\r
+}\r
+\r
+function isValidShortName($name)\r
+{\r
+       return preg_match('#^[a-z0-9]+$#i', $name);\r
+}\r
+function isValidDisplayName($name)\r
+{\r
+       return preg_match('#^[a-z0-9]+[a-z0-9 ]*[a-z0-9]+$#i', $name);\r
+}\r
+function isValidCategoryName($name)\r
+{\r
+       return 1;\r
+}\r
+function isValidTemplateName($name)\r
+{\r
+       return preg_match('#^[a-z0-9/_\-]+$#i', $name);\r
+}\r
+function isValidSkinName($name)\r
+{\r
+       return preg_match('#^[a-z0-9/_\-]+$#i', $name);\r
+}\r
+\r
+// add and remove linebreaks\r
+function addBreaks($var)\r
+{\r
+       return nl2br($var);\r
+}\r
+function removeBreaks($var)\r
+{\r
+       return preg_replace("/<br \/>([\r\n])/", "$1", $var);\r
+}\r
+\r
+/**\r
+ * parseFile()\r
+ * \r
+ * @param      string  $filename\r
+ * @param      string  $includeMode\r
+ * @param      string  $includePrefix\r
+ * @return     void\r
+ */\r
+function parseFile($filename, $includeMode = 'normal', $includePrefix = '')\r
+{\r
+       global $skinid;\r
+       \r
+       if ( !$skinid || !existsID($skinid) )\r
+       {\r
+               $skin = new Skin($CONF['BaseSkin']);\r
+       }\r
+       else\r
+       {\r
+               $skin = new Skin($skinid);\r
+       }\r
+       \r
+       $oldIncludeMode = Parser::getProperty('IncludeMode');\r
+       $oldIncludePrefix = Parser::getProperty('IncludePrefix');\r
+       \r
+       $skin->parse('fileparse', $filename);\r
+       \r
+       Parser::setProperty('IncludeMode', $oldIncludeMode);\r
+       Parser::setProperty('IncludePrefix', $oldIncludePrefix);\r
+       \r
+       return;\r
+}\r
+\r
+/**\r
+ * debug()\r
+ * Outputs a debug message\r
+ * \r
+ * @param      string  $msg\r
+ * @return     void\r
+ */\r
+function debug($msg)\r
+{\r
+       echo '<p><b>' . $msg . "</b></p>\n";\r
+       return;\r
+}\r
+\r
+// shows a link to help file\r
+function help($id)\r
+{\r
+       echo helpHtml($id);\r
+       return;\r
+}\r
+function helpHtml($id)\r
+{\r
+       global $CONF;\r
+       return helplink($id) . '<img src="' . $CONF['AdminURL'] . 'documentation/icon-help.gif" width="15" height="15" alt="' . _HELP_TT . '" title="' . _HELP_TT . '" /></a>';\r
+}\r
+function helplink($id)\r
+{\r
+       global $CONF;\r
+       return '<a href="' . $CONF['AdminURL'] . 'documentation/help.html#'. $id . '" onclick="if (event &amp;&amp; event.preventDefault) event.preventDefault(); return help(this.href);">';\r
+}\r
+\r
+/**\r
+ * includephp()\r
+ * Includes a PHP file. This method can be called while parsing templates and skins\r
+ * \r
+ * @param      string  $filename       name of file to parse\r
+ * @return     void\r
+ */\r
+function includephp($filename)\r
+{\r
+       // make predefined variables global, so most simple scripts can be used here\r
+       \r
+       // apache (names taken from PHP doc)\r
+       global $GATEWAY_INTERFACE, $SERVER_NAME, $SERVER_SOFTWARE, $SERVER_PROTOCOL;\r
+       global $REQUEST_METHOD, $QUERY_STRING, $DOCUMENT_ROOT, $HTTP_ACCEPT;\r
+       global $HTTP_ACCEPT_CHARSET, $HTTP_ACCEPT_ENCODING, $HTTP_ACCEPT_LANGUAGE;\r
+       global $HTTP_CONNECTION, $HTTP_HOST, $HTTP_REFERER, $HTTP_USER_AGENT;\r
+       global $REMOTE_ADDR, $REMOTE_PORT, $SCRIPT_FILENAME, $SERVER_ADMIN;\r
+       global $SERVER_PORT, $SERVER_SIGNATURE, $PATH_TRANSLATED, $SCRIPT_NAME;\r
+       global $REQUEST_URI;\r
+       \r
+       // php (taken from PHP doc)\r
+       global $argv, $argc, $PHP_SELF, $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $HTTP_POST_VARS;\r
+       global $HTTP_POST_FILES, $HTTP_ENV_VARS, $HTTP_SERVER_VARS, $HTTP_SESSION_VARS;\r
+       \r
+       // other\r
+       global $PATH_INFO, $HTTPS, $HTTP_RAW_POST_DATA, $HTTP_X_FORWARDED_FOR;\r
+       \r
+       if ( @file_exists($filename) )\r
+       {\r
+               include($filename);\r
+       }\r
+       return;\r
+}\r
+\r
+/**\r
+ * Checks if a certain plugin exists\r
+ * @param      string  $plug   name of plugin\r
+ * @return     boolean exists or not\r
+ */\r
+function checkPlugin($name)\r
+{\r
+       global $DIR_PLUGINS;\r
+       return file_exists($DIR_PLUGINS . preg_replace('#[\\\\|/]#', '', $name) . '.php');\r
+}\r
+\r
+/**\r
+ * alterQueryStr()\r
+ * \r
+ * @param      string  $querystr       querystring to alter (e.g. foo=1&bar=2&x=y)\r
+ * @param      string  $param  name of parameter to change (e.g. 'foo')\r
+ * @param      string  $value  New value for that parameter (e.g. 3)\r
+ * @return     string  altered query string (for the examples above: foo=3&bar=2&x=y)\r
+ */\r
+function alterQueryStr($querystr, $param, $value)\r
+{\r
+       $vars = preg_split('#&#', $querystr);\r
+       $set = FALSE;\r
+       \r
+       for ( $i = 0; $i < count($vars); $i++ )\r
+       {\r
+               $v = preg_split('#=#', $vars[$i]);\r
+               \r
+               if ( $v[0] == $param )\r
+               {\r
+                       $v[1] = $value;\r
+                       $vars[$i] = implode('=', $v);\r
+                       $set = true;\r
+                       break;\r
+               }\r
+       }\r
+       if ( !$set )\r
+       {\r
+               $vars[] = "{$param}={$value}";\r
+       }\r
+       return ltrim(implode('&', $vars), '&');\r
+}\r
+\r
+/**\r
+ * passVar()\r
+ * passes one variable as hidden input field (multiple fields for arrays)\r
+ * @see passRequestVars in varsx.x.x.php\r
+ * \r
+ * @param      string  $key\r
+ * @param      string  $value\r
+ * @return     void\r
+ */\r
+function passVar($key, $value)\r
+{\r
+       // array ?\r
+       if ( is_array($value) )\r
+       {\r
+               for ( $i = 0; $i < sizeof($value); $i++ )\r
+               {\r
+                       passVar($key . '[' . $i . ']', $value[$i]);\r
+               }\r
+               return;\r
+       }\r
+       \r
+       // other values: do stripslashes if needed\r
+       echo '<input type="hidden" name="' . Entity::hsc($key) . '" value="' . Entity::hsc(undoMagic($value)) . '" />' . "\n";\r
+       return;\r
+}\r
+\r
+/**\r
+ * checkVars()\r
+ * \r
+ * @param      string  $variables\r
+ * @return     void\r
+ */\r
+function checkVars($variables)\r
+{\r
+       foreach ( $variables as $variable )\r
+       {\r
+               if ( array_key_exists($variable, $_GET)\r
+                 || array_key_exists($variable, $_POST)\r
+                 || array_key_exists($variable, $_COOKIE)\r
+                 || array_key_exists($variable, $_ENV)\r
+                 || (session_id() !== '' && array_key_exists($variable, $_SESSION))\r
+                 || array_key_exists($variable, $_FILES) )\r
+               {\r
+                       die('Sorry. An error occurred.');\r
+               }\r
+       }\r
+       return;\r
+}\r
+\r
+/**\r
+ * sanitizeParams()\r
+ * Sanitize parameters such as $_GET and $_SERVER['REQUEST_URI'] etc.\r
+ * to avoid XSS.\r
+ * \r
+ * @param      void\r
+ * @return     void\r
+ */\r
+function sanitizeParams()\r
+{\r
+       $array = array();\r
+       $str = '';\r
+       $frontParam = '';\r
+       \r
+       // REQUEST_URI of $_SERVER\r
+       $str =& $_SERVER["REQUEST_URI"];\r
+       serverStringToArray($str, $array, $frontParam);\r
+       sanitizeArray($array);\r
+       arrayToServerString($array, $frontParam, $str);\r
+       \r
+       // QUERY_STRING of $_SERVER\r
+       $str =& $_SERVER["QUERY_STRING"];\r
+       serverStringToArray($str, $array, $frontParam);\r
+       sanitizeArray($array);\r
+       arrayToServerString($array, $frontParam, $str);\r
+       \r
+       // $_GET\r
+       convArrayForSanitizing($_GET, $array);\r
+       sanitizeArray($array);\r
+       revertArrayForSanitizing($array, $_GET);\r
+       \r
+       // $_REQUEST (only GET param)\r
+       convArrayForSanitizing($_REQUEST, $array);\r
+       sanitizeArray($array);\r
+       revertArrayForSanitizing($array, $_REQUEST);\r
+       \r
+       return;\r
+}\r
+\r
+function _addInputTags(&$keys,$prefix='')\r
+{\r
+       foreach ( $keys as $key=>$value )\r
+       {\r
+               if ( $prefix )\r
+               {\r
+                       $key=$prefix.'['.$key.']';\r
+               }\r
+               if ( is_array($value) )\r
+               {\r
+                       _addInputTags($value,$key);\r
+               }\r
+               else\r
+               {\r
+                       if ( get_magic_quotes_gpc() )\r
+                               {$value=stripslashes($value);\r
+                       }\r
+                       if ( $key == 'ticket' )\r
+                       {\r
+                               continue;\r
+                       }\r
+                       echo '<input type="hidden" name="'.Entity::hsc($key).\r
+                            '" value="'.Entity::hsc($value).'" />'."\n";\r
+               }\r
+       }\r
+       return;\r
+}\r
+\r
+/**\r
+ * serverStringToArray()\r
+ * Convert the server string such as $_SERVER['REQUEST_URI']\r
+ * to arry like arry['blogid']=1 and array['page']=2 etc.\r
+ * \r
+ * @param      string   $uri                           string\r
+ * @param      string  &$query_elements        elements of query according to application/x-www-form-urlencoded\r
+ * @param      string  &$hier_part                     hierarchical part includes path\r
+ * \r
+ * NOTE:\r
+ * RFC 3986: Uniform Resource Identifiers (URI): Generic Syntax\r
+ * 3.  Syntax Components\r
+ * http://www.ietf.org/rfc/rfc3986.txt\r
+ * \r
+ * Hypertext Markup Language - 2.0\r
+ * 8.2.1. The form-urlencoded Media Type\r
+ * http://tools.ietf.org/html/rfc1866#section-8.2.1\r
+ * \r
+ * $_SERVER > Language Reference > Predefined Variables > PHP Manual\r
+ * http://www.php.net/manual/en/reserved.variables.server.php\r
+ */\r
+function serverStringToArray($uri, &$query_elements, &$hier_part)\r
+{\r
+       // init param\r
+       $query_elements = array();\r
+       $hier_part = "";\r
+       \r
+       // split hierarchical part, e.g. /index.php, query and fragment, e.g. blogid=1&page=2#section1\r
+       if ( i18n::strpos($uri, "?") > 0 )\r
+       {\r
+               list($hier_part, $query_and_fragment) = preg_split("#\?#", $uri, 2);\r
+       }\r
+       else\r
+       {\r
+               $query_and_fragment = $uri;\r
+               $hier_part = '';\r
+       }\r
+       \r
+       // If there is no query like blogid=1&page=2, return\r
+       if ( i18n::strpos($uri, "=") == FALSE && !i18n::strlen($hier_part) )\r
+       {\r
+               $hier_part = $uri;\r
+               return;\r
+       }\r
+       \r
+       $query_elements = preg_split("#&#", $query_and_fragment);\r
+       return;\r
+}\r
+\r
+/**\r
+ * arrayToServerString()\r
+ * Convert array like array['blogid'] to server string\r
+ * such as $_SERVER['REQUEST_URI']\r
+ * \r
+ * @param      array    $query_elements        elements of query according to application/x-www-form-urlencoded\r
+ * @param      string   $hier_part                     hier-part defined in RFC3986\r
+ * @param      string  &$uri                           return value\r
+ * @return     void\r
+ * \r
+ * NOTE:\r
+ * RFC 3986: Uniform Resource Identifiers (URI): Generic Syntax\r
+ * 3.  Syntax Components\r
+ * http://www.ietf.org/rfc/rfc3986.txt\r
+ * \r
+ * Hypertext Markup Language - 2.0\r
+ * 8.2.1. The form-urlencoded Media Type\r
+ * http://tools.ietf.org/html/rfc1866#section-8.2.1\r
+ * \r
+ * $_SERVER > Language Reference > Predefined Variables > PHP Manual\r
+ * http://www.php.net/manual/en/reserved.variables.server.php\r
+ */\r
+function arrayToServerString($query_elements, $hier_part, &$uri)\r
+{\r
+       if ( i18n::strpos($uri, "?") !== FALSE )\r
+       {\r
+               $uri = $hier_part . "?";\r
+       }\r
+       else\r
+       {\r
+               $uri = $hier_part;\r
+       }\r
+       if ( count($query_elements) > 0 )\r
+       {\r
+               $uri .= implode("&", $query_elements);\r
+       }\r
+       return;\r
+}\r
+\r
+/**\r
+ * sanitizeArray()\r
+ * Sanitize array parameters.\r
+ * This function checks both key and value.\r
+ * - check key if it inclues " (double quote),  remove from array\r
+ * - check value if it includes \ (escape sequece), remove remaining string\r
+ * \r
+ * @param      array   &$array elements of query according to application/x-www-form-urlencoded\r
+ * @return     void\r
+ */\r
+function sanitizeArray(&$array)\r
+{\r
+       $excludeListForSanitization = array('query');\r
+       \r
+       foreach ( $array as $k => $v )\r
+       {\r
+               // split to key and value\r
+               list($key, $val) = preg_split("#=#", $v, 2);\r
+               if ( !isset($val) )\r
+               {\r
+                       continue;\r
+               }\r
+               \r
+               // when magic quotes is on, need to use stripslashes,\r
+               // and then addslashes\r
+               if ( get_magic_quotes_gpc() )\r
+               {\r
+                       $val = stripslashes($val);\r
+               }\r
+               \r
+               // note that we must use addslashes here because this function is called before the db connection is made\r
+               // and sql_real_escape_string needs a db connection\r
+               $val = addslashes($val);\r
+               \r
+               // if $key is included in exclude list, skip this param\r
+               if ( !in_array($key, $excludeListForSanitization) )\r
+               {\r
+                       // check value\r
+                       if ( i18n::strpos($val, '\\') > 0 )\r
+                       {\r
+                               list($val, $tmp) = preg_split('#\\\\#', $val);\r
+                       }\r
+                       \r
+                       // remove control code etc.\r
+                       $val = strtr($val, "\0\r\n<>'\"", "       ");\r
+                       \r
+                       // check key\r
+                       if ( preg_match('#\"#', $key) > 0 )\r
+                       {\r
+                               unset($array[$k]);\r
+                               continue;\r
+                       }\r
+                       \r
+                       // set sanitized info\r
+                       $array[$k] = sprintf("%s=%s", $key, $val);\r
+               }\r
+       }\r
+       return;\r
+}\r
+\r
+/**\r
+ * convArrayForSanitizing()\r
+ * Convert array for sanitizeArray function\r
+ * \r
+ * @param      string  $src    array to be sanitized\r
+ * @param      array   &$array array to be temporarily stored\r
+ * @return     void\r
+ */\r
+function convArrayForSanitizing($src, &$array)\r
+{\r
+       $array = array();\r
+       foreach ( $src as $key => $val )\r
+       {\r
+               if ( !key_exists($key, $_GET) )\r
+               {\r
+                       continue;\r
+               }\r
+               $array[] = sprintf("%s=%s", $key, $val);\r
+               continue;\r
+       }\r
+       return;\r
+}\r
+\r
+/**\r
+ * revertArrayForSanitizing()\r
+ * Revert array after sanitizeArray function\r
+ * \r
+ * @param      array   $array  element of query according to application/x-www-form-urlencoded\r
+ * @param      array   &$dst   combination of key and value\r
+ * @return     void\r
+ */\r
+function revertArrayForSanitizing($array, &$dst)\r
+{\r
+       foreach ( $array as $v )\r
+       {\r
+               list($key, $val) = preg_split("#=#", $v, 2);\r
+               $dst[$key] = $val;\r
+               continue;\r
+       }\r
+       return;\r
+}\r
+\r
+/**\r
+=======
 <?php
 
 /*
@@ -1834,6 +3642,7 @@ function revertArrayForSanitizing($array, &$dst)
 }
 
 /**
+>>>>>>> skinnable-master
  * decodePathInfo()
  * 
  * @param      string  $virtualpath
@@ -1978,6 +3787,404 @@ function decodePathInfo($virtualpath)
 
 
 /**
+<<<<<<< HEAD
+ * redirect()\r
+ * Stops processing the request and redirects to the given URL.\r
+ * - no actual contents should have been sent to the output yet\r
+ * - the URL will be stripped of illegal or dangerous characters\r
+ * \r
+ * @param      string  $uri\r
+ * @return     void\r
+ */\r
+function redirect($url)\r
+{\r
+       $url = preg_replace('#[^a-z0-9-~+_.?\#=&;,/:@%*]#i', '', $url);\r
+       header('Location: ' . $url);\r
+       exit;\r
+}\r
+\r
+/**\r
+ * getBookmarklet()\r
+ * Returns the Javascript code for a bookmarklet that works on most modern browsers\r
+ * \r
+ * @param      integer $blogid ID for weblog\r
+ * @return     script to call Bookmarklet\r
+ */\r
+function getBookmarklet($blogid, $width=600,  $height=500)\r
+{\r
+       global $CONF;\r
+       \r
+       $script = "Q='';"\r
+               . "x=document;"\r
+               . "y=window;"\r
+               . "if ( x.selection )"\r
+               . "{"\r
+               . " Q=x.selection.createRange().text;"\r
+               . "}"\r
+               . "else if ( y.getSelection )"\r
+               . "{"\r
+               . " Q=y.getSelection();"\r
+               . "}"\r
+               . "else if ( x.getSelection )"\r
+               . "{"\r
+               . " Q=x.getSelection();"\r
+               . "}"\r
+               . "wingm = window.open('{$CONF['AdminURL']}bookmarklet.php?blogid={$blogid}"\r
+               . " &logtext=' + encodeURIComponent(Q) +"\r
+               . " '&loglink=' + encodeURIComponent(x.location.href) +"\r
+               . " '&loglinktitle=' + encodeURIComponent(x.title),"\r
+               . " 'nucleusbm',"\r
+               . " 'scrollbars=yes,width={$width},height={$height},left=10,top=10,status=yes,resizable=yes');"\r
+               . "wingm.focus();";\r
+       \r
+       return $script;\r
+}\r
+\r
+/**\r
+ * cleanFileName()\r
+ * cleans filename of uploaded file for writing to file system\r
+ *\r
+ * @param      string  $str\r
+ * @return     string  $cleaned filename ready for use\r
+ */\r
+function cleanFileName($str)\r
+{\r
+       $str = strtolower($str);\r
+       $ext_point = i18n::strrpos($str,".");\r
+       if ( $ext_point === FALSE )\r
+       {\r
+               return FALSE;\r
+       }\r
+       $ext = i18n::substr($str,$ext_point,i18n::strlen($str));\r
+       $str = i18n::substr($str,0,$ext_point);\r
+       \r
+       return preg_replace("#[^a-z0-9-]#", "_", $str) . $ext;\r
+}\r
+\r
+/**\r
+ * use Notification class instead of this\r
+ * Deprecated since 4.0:\r
+ */\r
+function getMailFooter()\r
+{\r
+       NOTIFICATION::get_mail_footer();\r
+}\r
+function isValidMailAddress($address)\r
+{\r
+       return NOTIFICATION::address_validation($address);\r
+}\r
+/**\r
+ * use Entity class instead of this\r
+ * Deprecated since 4.0:\r
+ */\r
+function highlight($text, $expression, $highlight)\r
+{\r
+       return Entity::highlight($text, $expression, $highlight);\r
+}\r
+function shorten($string, $maxlength, $suffix)\r
+{\r
+       return Entity::shorten($string, $maxlength, $suffix);\r
+}\r
+function stringStripTags ($string)\r
+{\r
+       return Entity::strip_tags($string);\r
+}\r
+function toAscii($string)\r
+{\r
+       return Entity::anchor_footnoting($string);\r
+}\r
+function stringToAttribute ($string)\r
+{\r
+       return Entity::hsc($string);\r
+}\r
+function stringToXML ($string)\r
+{\r
+       return Entity::hen($string);\r
+}\r
+function encode_desc($data)\r
+{\r
+       return Entity::hen($data);\r
+}\r
+/**\r
+ * Centralisation of the functions that deals with locales\r
+ * This functions is based on the old way to deal with languages\r
+ * Deprecated since 4.0:\r
+ */\r
+function getLanguageName()\r
+{\r
+       if( ($language = i18n::convert_locale_to_old_language_file_name(i18n::get_current_locale())) === FALSE )\r
+       {\r
+               $language ='english';\r
+       }\r
+       return $language;\r
+}\r
+function selectLanguage($language)\r
+{\r
+       global $DIR_LANG;\r
+       include($DIR_LANG . preg_replace('#[\\\\|/]#', '', $language) . '.php');\r
+       return;\r
+}\r
+/**\r
+ * use i18n class instead of these\r
+ * Deprecated since 4.0\r
+ */\r
+function checkLanguage($lang)\r
+{\r
+       return ( preg_match('#^(.+)_(.+)_(.+)$#', $lang)\r
+         || i18n::convert_old_language_file_name_to_locale($lang) );\r
+}\r
+function formatDate($format, $timestamp, $default_format, &$blog)\r
+{\r
+       $offset = date('Z', $timestamp);\r
+       if ( $blog )\r
+       {\r
+               $offset += $blog->getTimeOffset() * 3600;\r
+       }\r
+       return i18n::formatted_datetime($format, $timestamp, $offset, $default_format);\r
+}\r
+\r
+/**\r
+ * use DB class instead of these\r
+ * Deprecated since 4.0\r
+ */\r
+function quickQuery($query)\r
+{\r
+       $row = DB::getRow($query);\r
+       return $row['result'];\r
+}\r
+function mysqldate($timestamp)\r
+{\r
+       return DB::formatDateTime($timestamp);\r
+ }\r
+/**\r
+ * Centralisation of the functions that generate links\r
+ * Deprecated since 4.0:\r
+ * Please use Link::FunctionName(...) instead\r
+ */\r
+function createItemLink($itemid, $extra = '')\r
+{\r
+       return Link::create_item_link($itemid, $extra);\r
+}\r
+function createMemberLink($memberid, $extra = '')\r
+{\r
+       return Link::create_member_link($memberid, $extra);\r
+}\r
+function createCategoryLink($catid, $extra = '')\r
+{\r
+       return Link::create_category_link($catid, $extra);\r
+}\r
+function createArchiveListLink($blogid = '', $extra = '')\r
+{\r
+       return Link::create_archivelist_link($blogid, $extra);\r
+}\r
+function createArchiveLink($blogid, $archive, $extra = '')\r
+{\r
+       return Link::create_archive_link($blogid, $archive, $extra);\r
+}\r
+function createBlogidLink($blogid, $params = '')\r
+{\r
+       return Link::create_blogid_link($blogid, $params = '');\r
+}\r
+function createLink($type, $params)\r
+{\r
+       return Link::create_link($type, $params);\r
+}\r
+function createBlogLink($url, $params)\r
+{\r
+       return Link::create_blog_link($url, $params);\r
+}\r
+/**\r
+ * use ActionLog class instead of this\r
+ * Deprecated since 4.0\r
+ */\r
+function addToLog($level, $msg)\r
+{\r
+       ActionLog::add($level, $msg);\r
+}\r
+/**\r
+ * use PHP's implement\r
+ * Deprecated since 4.0\r
+ */\r
+function ifset(&$var)\r
+{\r
+       if ( isset($var) )\r
+       {\r
+               return $var;\r
+       }\r
+       \r
+       return NULL;\r
+}\r
+/**\r
+ * use Manager::getPluginNameFromPid() instead of this\r
+ * Deprecated since 4.0\r
+ */\r
+function getPluginNameFromPid($pid)\r
+{\r
+       global $manager;\r
+       return $manager->getPluginNameFromPid($pid);\r
+}\r
+/**\r
+ * use Manager::numberOfEventSubscribers() instead of this\r
+ * Deprecated since 4.0\r
+ */\r
+function numberOfEventSubscribers($event)\r
+{\r
+       global $manager;\r
+       return $manager->getNumberOfSubscribers($event);\r
+}\r
+\r
+/**\r
+ * PluginAdmin has already the alternative implement\r
+ * Deprecated since 4.0\r
+ */\r
+function ticketForPlugin()\r
+{\r
+       global $CONF, $DIR_LIBS, $DIR_LOCALES, $DIR_PLUGINS, $manager, $member, $ticketforplugin;\r
+       \r
+       /* initialize */\r
+       $ticketforplugin = array();\r
+       $ticketforplugin['ticket'] = FALSE;\r
+       \r
+       /* Check if using plugin's php file. */\r
+       $p_translated = serverVar('SCRIPT_FILENAME');\r
+       \r
+       if (!file_exists($p_translated) )\r
+       {\r
+               header("HTTP/1.0 404 Not Found");\r
+               exit('');\r
+       }\r
+       \r
+       // check whether this is plugin or not\r
+       $p_translated = str_replace('\\', '/', $p_translated);\r
+       $d_plugins = str_replace('\\', '/', $DIR_PLUGINS);\r
+       if ( i18n::strpos($p_translated, $d_plugins) !== 0 )\r
+       {\r
+               return;\r
+       }\r
+       \r
+       // Solve the plugin php file or admin directory\r
+       $phppath = i18n::substr($p_translated, i18n::strlen($d_plugins) );\r
+       // Remove the first "/" if exists.\r
+       $phppath = preg_replace('#^/#', '', $phppath);\r
+       // Remove the first "NP_" and the last ".php" if exists.\r
+       $path = preg_replace('#^NP_(.*)\.php$#', '$1', $phppath);\r
+       // Remove the "/" and beyond.\r
+       $path = preg_replace('#^([^/]*)/(.*)$#', '$1', $path);\r
+       \r
+       // Solve the plugin name.\r
+       $plugins = array();\r
+       $query = sprintf('SELECT pfile FROM %s;', sql_table('plugin'));\r
+       $res = DB::getResult($query);\r
+       \r
+       foreach ( $res as $row )\r
+       {\r
+               $name = i18n::substr($row['pfile'], 3);\r
+               $plugins[strtolower($name)] = $name;\r
+       }\r
+       \r
+       $res->closeCursor();\r
+       \r
+       if ( !array_key_exists($path, $plugins) )\r
+       {\r
+               header("HTTP/1.0 404 Not Found");\r
+               exit('');\r
+       }\r
+       else\r
+       {\r
+               $plugin_name = $plugins[$path];\r
+       }\r
+       \r
+       /* Return if not index.php */\r
+       if ( ($phppath != strtolower($plugin_name) . '/')\r
+         && ($phppath != strtolower($plugin_name) . '/index.php') )\r
+       {\r
+               return;\r
+       }\r
+       \r
+       /* Exit if not logged in. */\r
+       if ( !$member->isLoggedIn() )\r
+       {\r
+               exit('You aren\'t logged in.');\r
+       }\r
+       \r
+       /* Check if this feature is needed (ie, if "$manager->checkTicket()" is not included in the script). */\r
+       if ( $file = @file($p_translated) )\r
+       {\r
+               $prevline = '';\r
+               \r
+               foreach($file as $line)\r
+               {\r
+                       if (preg_match('#[\$]manager([\s]*)[\-]>([\s]*)checkTicket([\s]*)[\(]#i', $prevline . $line) )\r
+                       {\r
+                               return;\r
+                       }\r
+                       \r
+                       $prevline = $line;\r
+               }\r
+       }\r
+       \r
+       /* Show a form if not valid ticket */\r
+       if ( (i18n::strpos(serverVar('REQUEST_URI'), '?') !== FALSE\r
+         || serverVar('QUERY_STRING')\r
+         || strtoupper(serverVar('REQUEST_METHOD') ) == 'POST')\r
+         && !$manager->checkTicket() )\r
+       {\r
+               $oPluginAdmin = new PluginAdmin($plugin_name);\r
+               $oPluginAdmin->start();\r
+               \r
+               echo '<p>' . _ERROR_BADTICKET . "</p>\n";\r
+               \r
+               // Resolve URI and QUERY_STRING\r
+               if ($uri = serverVar('REQUEST_URI') )\r
+               {\r
+                       list($uri, $qstring) = preg_split('#\?#', $uri);\r
+               }\r
+               else\r
+               {\r
+                       if ( !($uri = serverVar('PHP_SELF') ) )\r
+                       {\r
+                               $uri = serverVar('SCRIPT_NAME');\r
+                       }\r
+                       $qstring = serverVar('QUERY_STRING');\r
+               }\r
+               if ($qstring)\r
+               {\r
+                       $qstring = '?' . $qstring;\r
+               }\r
+               \r
+               echo '<p>' . _SETTINGS_UPDATE . ' : ' . _QMENU_PLUGINS . ' <span style="color:red;">' . Entity::hsc($plugin_name) . "</span> ?</p>\n";\r
+               \r
+               switch(strtoupper(serverVar('REQUEST_METHOD') ) )\r
+               {\r
+                       case 'POST':\r
+                               echo '<form method="POST" action="'.Entity::hsc($uri.$qstring).'">';\r
+                               $manager->addTicketHidden();\r
+                               _addInputTags($_POST);\r
+                               break;\r
+                       \r
+                       case 'GET':\r
+                               echo '<form method="GET" action="'.Entity::hsc($uri).'">';\r
+                               $manager->addTicketHidden();\r
+                               _addInputTags($_GET);\r
+                       \r
+                       default:\r
+                               break;\r
+               }\r
+               \r
+               echo '<input type="submit" value="' . _YES . '" />&nbsp;&nbsp;&nbsp;&nbsp;';\r
+               echo '<input type="button" value="' . _NO . '" onclick="history.back(); return false;" />';\r
+               echo "</form>\n";\r
+               \r
+               $oPluginAdmin->end();\r
+               exit;\r
+       }\r
+       \r
+       /* Create new ticket */\r
+       $ticket=$manager->addTicketToUrl('');\r
+       $ticketforplugin['ticket'] = preg_split($ticket, i18n::strpos($ticket, 'ticket=') + 7);\r
+       return;\r
+}\r
+=======
  * redirect()
  * Stops processing the request and redirects to the given URL.
  * - no actual contents should have been sent to the output yet
@@ -2374,3 +4581,4 @@ function ticketForPlugin()
        $ticketforplugin['ticket'] = preg_split($ticket, i18n::strpos($ticket, 'ticket=') + 7);
        return;
 }
+>>>>>>> skinnable-master
index b8628eb..9f846df 100644 (file)
@@ -1,3 +1,688 @@
+<<<<<<< HEAD
+<?php\r
+/**\r
+ * i18n class for Nucleus CMS\r
+ * written by Takashi Sakamoto as of Feb 03, 2012\r
+ * \r
+ * This includes wrapper functions of iconv and mbstring\r
+ * for multibyte processing and includes parameters related to locale.\r
+ * \r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2011 The Nucleus Group\r
+ * @version $Id: i18n.php 1678 2012-02-26 07:31:36Z sakamocchi $\r
+ */\r
+class i18n\r
+{\r
+       static private $mode = FALSE;\r
+       \r
+       static private $current_charset = '';\r
+       static private $current_language = '';\r
+       static private $current_script = '';\r
+       static private $current_region = '';\r
+       \r
+       static private $locale_list = array();\r
+       static private $timezone = 'UTC';\r
+       \r
+       static private $forced_charset = '';\r
+       static private $forced_language = '';\r
+       static private $forced_script = '';\r
+       static private $forced_region = '';\r
+       \r
+       /**\r
+        * i18n::init\r
+        * Initializing i18n class\r
+        * \r
+        * @static\r
+        * @param       string  $charset        character set\r
+        * @return      boolean \r
+        */\r
+       static public function init($charset, $dir)\r
+       {\r
+               /* i18n is already initialized */\r
+               if ( self::$mode )\r
+               {\r
+                       return TRUE;\r
+               }\r
+               \r
+               /* make locale list in this Nucleus CMS */\r
+               if ( ($handle = opendir($dir)) === FALSE )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               while ($filename = readdir($handle))\r
+               {\r
+                       if (preg_match("#^(.+_.+_.+)\.{$charset}\.php$#", $filename, $matches) )\r
+                       {\r
+                               if ( !in_array($matches[1], self::$locale_list) )\r
+                               {\r
+                                       self::$locale_list[] = $matches[1];\r
+                               }\r
+                       }\r
+               }\r
+               closedir($handle);\r
+               \r
+               /* set i18n backend and validate character set */\r
+               if ( extension_loaded('iconv') )\r
+               {\r
+                       /* this is just for checking the charset. */\r
+                       if ( iconv_set_encoding('internal_encoding', $charset)\r
+                        && iconv_set_encoding('output_encoding', $charset)\r
+                        && iconv_set_encoding('internal_encoding', $charset) )\r
+                       {\r
+                               self::$current_charset = $charset;\r
+                               self::$mode = 'iconv';\r
+                       }\r
+               }\r
+               else if ( extension_loaded('mbstring') )\r
+               {\r
+                       /* this is just for checking the charset. */\r
+                       if ( mb_http_output($charset)\r
+                        && mb_internal_encoding($charset)\r
+                        && mb_regex_encoding($charset) )\r
+                       {\r
+                               self::$current_charset = $charset;\r
+                               self::$mode = 'mbstring';\r
+                       }\r
+               }\r
+               \r
+               return TRUE;\r
+       }\r
+       \r
+       /**\r
+        * i18n::get_available_locale_list\r
+        * return available locale list with current charset\r
+        * \r
+        * @static\r
+        * @param       void\r
+        * @return      array   available locale list\r
+        */\r
+       static public function get_available_locale_list()\r
+       {\r
+               return self::$locale_list;\r
+       }\r
+       \r
+       /**\r
+        * i18n::get_current_charset\r
+        * return current charset\r
+        * \r
+        * @static\r
+        * @param       void\r
+        * @return      string  $charset        current character set\r
+        */\r
+       static public function get_current_charset()\r
+       {\r
+               return self::$current_charset;\r
+       }\r
+       \r
+       /**\r
+        * i18n::set_locale\r
+        * Set current locale\r
+        * \r
+        * NOTE:\r
+        * naming rule is "$language_$script_$region.$charset.php", refer to RFC 5646.\r
+        * @link http://www.ietf.org/rfc/rfc5646.txt\r
+        * @see 2.  The Language Tag\r
+        * \r
+        * @static\r
+        * @param       string  $locale\r
+        * @return      bool    TRUE/FALSE\r
+        * \r
+        */\r
+       static public function set_current_locale($locale)\r
+       {\r
+               if ( preg_match('#^(.+)_(.+)_(.+)$#', $locale, $match) )\r
+               {\r
+                       self::$current_language = $match[1];\r
+                       self::$current_script   = $match[2];\r
+                       self::$current_region   = $match[3];\r
+                       return TRUE;\r
+               }\r
+               return FALSE;\r
+       }\r
+       \r
+       /**\r
+        * i18n::get_locale\r
+        * Get current locale\r
+        * \r
+        * @static\r
+        * @param       void\r
+        * @return      $locale\r
+        */\r
+       static public function get_current_locale()\r
+       {\r
+               $elements = array(self::$current_language, self::$current_script, self::$current_region);\r
+               return implode('_', $elements);\r
+       }\r
+       \r
+       /**\r
+        * i18n::set_forced_locale()\r
+        * Set forced locale\r
+        * \r
+        * @static\r
+        * @param       string  $forced_locale\r
+        * @return      bool    TRUE/FALSE\r
+        * \r
+        */\r
+       static public function set_forced_locale($forced_locale)\r
+       {\r
+               if ( preg_match('#^(.+)_(.+)_(.+)$#', $forced_locale, $match) )\r
+               {\r
+                       self::$forced_language  = $match[1];\r
+                       self::$forced_script    = $match[2];\r
+                       self::$forced_region    = $match[3];\r
+                       return TRUE;\r
+               }\r
+               return FALSE;\r
+       }\r
+       \r
+       /**\r
+        * i18n::get_forced_locale\r
+        * Get forced locale\r
+        * \r
+        * @static\r
+        * @param       void\r
+        * @return      $forced_locale\r
+        */\r
+       static public function get_forced_locale()\r
+       {\r
+               if ( !self::$forced_language )\r
+               {\r
+                       return '';\r
+               }\r
+               \r
+               $elements = array(self::$forced_language, self::$forced_script, self::$forced_region);\r
+               return implode('_', $elements);\r
+       }\r
+       \r
+       /**\r
+        * i18n::set_forced_charset\r
+        * return forced charset\r
+        * \r
+        * @static\r
+        * @param       void    $charset        forced character set\r
+        * @return      void\r
+        */\r
+       static public function set_forced_charset($forced_charset)\r
+       {\r
+               self::$forced_charset = $forced_charset;\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * i18n::get_forced_charset\r
+        * return forced charset\r
+        * \r
+        * @static\r
+        * @param       void\r
+        * @return      string  $charset        forced character set\r
+        */\r
+       static public function get_forced_charset()\r
+       {\r
+               return self::$forced_charset;\r
+       }\r
+       \r
+       /**\r
+        * i18n::confirm_default_date_timezone\r
+        * to avoid E_NOTICE or E_WARNING generated when every calling to a date/time function.\r
+        * \r
+        * NOTE:\r
+        * Some private servers are lack of its timezone setting\r
+        * http://www.php.net/manual/en/function.date-default-timezone-set.php\r
+        * \r
+        * @static\r
+        * @param       void\r
+        * @return      void\r
+        */\r
+       static public function confirm_default_date_timezone()\r
+       {\r
+               if ( function_exists('date_default_timezone_get') \r
+                && FALSE !== ($timezone = @date_default_timezone_get()))\r
+               {\r
+                       self::$timezone = $timezone;\r
+               }\r
+               if (function_exists('date_default_timezone_set')) {\r
+                        @date_default_timezone_set(self::$timezone);\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * i18n::get_current_date_timezone()\r
+        * get current timezone\r
+        * \r
+        * @static\r
+        * @param       void\r
+        * @return      $timezone\r
+        */\r
+       static public function get_date_timezone()\r
+       {\r
+               return self::$timezone;\r
+       }\r
+       \r
+       /**\r
+        * i18n::convert\r
+        * character set converter\r
+        * \r
+        * @static\r
+        * @param       string  $string target string binary\r
+        * @param       string  $from   original character set encoding\r
+        * @param       string  $to     target character set encoding\r
+        * @return      string  converted string\r
+        */\r
+       static public function convert($string, $from, $to='')\r
+       {\r
+               if ( $to == '' )\r
+               {\r
+                       $to = self::$current_charset;\r
+               }\r
+               \r
+               if ( $from == $to )\r
+               {\r
+                       /* do nothing */\r
+               }\r
+               else if ( self::$mode == 'iconv' )\r
+               {\r
+                       $string = iconv($from, $to.'//TRANSLIT', $string);\r
+               }\r
+               else if ( self::$mode == 'mbstring' )\r
+               {\r
+                       $string = mb_convert_encoding($string, $to, $from);\r
+               }\r
+               return (string) $string;\r
+       }\r
+       \r
+       /**\r
+        * i18n::convert_handler\r
+        * callable handler for character set converter\r
+        * \r
+        * @static\r
+        * @param       string  $string target string binary\r
+        * @return      void\r
+        */\r
+       static public function convert_handler($string)\r
+       {\r
+               return self::convert($string, self::$current_charset, self::$forced_charset);\r
+       }\r
+       \r
+       /**\r
+        * i18n::convert_array\r
+        * recursively converting array\r
+        * \r
+        * @static\r
+        * @param       array   $array  array to convert\r
+        * @return      void\r
+        */\r
+       static public function convert_array($array, $from, $to='')\r
+       {\r
+               if ( !is_array($array) )\r
+               {\r
+                       $array = self::convert($array, $from, $to);\r
+               }\r
+               else\r
+               {\r
+                       foreach ( $array as $key => $value )\r
+                       {\r
+                               if ( !is_array($value) )\r
+                               {\r
+                                       $array[$key] = self::convert($value, $from, $to);\r
+                               }\r
+                               else\r
+                               {\r
+                                       self::convert_array($array[$key]);\r
+                               }\r
+                       }\r
+               }\r
+               \r
+               return $array;\r
+       }\r
+       \r
+       /**\r
+        * i18n::strlen\r
+        * strlen wrapper\r
+        * \r
+        * @static\r
+        * @param       string  $string target string\r
+        * @return      integer the number of letters\r
+        */\r
+       static public function strlen($string)\r
+       {\r
+               $length = 0;\r
+               if ( self::$mode == 'iconv' )\r
+               {\r
+                       $length = iconv_strlen($string, self::$current_charset);\r
+               }\r
+               else if ( self::$mode == 'mbstring' )\r
+               {\r
+                       $length = mb_strlen($string, self::$current_charset);\r
+               }\r
+               else\r
+               {\r
+                       $length = strlen($string);\r
+               }\r
+               return (integer) $length;\r
+       }\r
+       \r
+       /**\r
+        * i18n::strpos\r
+        * strpos wrapper\r
+        * \r
+        * @static\r
+        * @param       string  $haystack       string to search\r
+        * @param       string  $needle string for search\r
+        * @param       integer $offset the position from which the search should be performed. \r
+        * @return      integer/FALSE   the numeric position of the first occurrence of needle in haystack\r
+        */\r
+       static public function strpos($haystack, $needle, $offset=0)\r
+       {\r
+               $position = 0;\r
+               if ( self::$mode == 'iconv' )\r
+               {\r
+                       $position = iconv_strpos($haystack, $needle, $offset, self::$current_charset);\r
+               }\r
+               else if ( self::$mode == 'mbstring' )\r
+               {\r
+                       $position = mb_strpos($haystack, $needle, $offset, self::$current_charset);\r
+               }\r
+               else\r
+               {\r
+                       $position = strpos($haystack, $needle, $offset);\r
+               }\r
+               \r
+               if ( $position !== FALSE)\r
+               {\r
+                       $position = (integer) $position;\r
+               }\r
+               return $position;\r
+       }\r
+       \r
+       /**\r
+        * i18n::strrpos\r
+        * strrpos wrapper\r
+        * \r
+        * @static\r
+        * @param       string  $haystack       string to search\r
+        * @param       string  $needle string for search\r
+        * @return      integer/FALSE   the numeric position of the last occurrence of needle in haystack\r
+        */\r
+       static public function strrpos ($haystack, $needle)\r
+       {\r
+               $position = 0;\r
+               if ( self::$mode == 'iconv' )\r
+               {\r
+                       $position = iconv_strrpos($haystack, $needle, self::$current_charset);\r
+               }\r
+               else if ( self::$mode == 'mbstring' )\r
+               {\r
+                       $position = mb_strrpos($haystack, $needle, 0, self::$current_charset);\r
+               }\r
+               else\r
+               {\r
+                       $position = strrpos($haystack, $needle, 0);\r
+               }\r
+               \r
+               if ( $position !== FALSE)\r
+               {\r
+                       $position = (integer) $position;\r
+               }\r
+               return $position;\r
+       }\r
+       \r
+       /**\r
+        * i18n::substr\r
+        * substr wrapper\r
+        * \r
+        * @static\r
+        * @param       string  $string string to be cut\r
+        * @param       string  $start  the position of starting\r
+        * @param       integer $length the length to be cut\r
+        * @return      string  the extracted part of string\r
+        */\r
+       static public function substr($string, $start, $length=0)\r
+       {\r
+               $return = '';\r
+               \r
+               if ( $length == 0 )\r
+               {\r
+                       $length = self::strlen($string) - $start;\r
+               }\r
+               \r
+               if ( self::$mode == 'iconv' )\r
+               {\r
+                       $return = iconv_substr($string, $start, $length, self::$current_charset);\r
+               }\r
+               else if ( self::$mode == 'mbstring' )\r
+               {\r
+                       $return = mb_substr($string, $start, $length, self::$current_charset);\r
+               }\r
+               else\r
+               {\r
+                       $return = strrpos($string, $start, $length);\r
+               }\r
+               return (string) $return;\r
+       }\r
+       \r
+       /**\r
+        * i18n::strftime\r
+        * strftime function based on multibyte processing\r
+        * \r
+        * @static\r
+        * @param       string  $format format with singlebyte or multibyte\r
+        * @param       timestamp       $timestamp      UNIX timestamp\r
+        * @return      string  formatted timestamp\r
+        */\r
+       static public function strftime($format, $timestamp='')\r
+       {\r
+               return preg_replace_callback('/(%[a-z%])/i',\r
+                       create_function('$matches', 'return strftime($matches[1], ' . intval($timestamp) . ');'),\r
+                       $format\r
+               );\r
+       }\r
+       \r
+       /**\r
+        * i18n::formatted_datetime()\r
+        * return formatted datetime string\r
+        * \r
+        * Date and Time Formats\r
+        * @link        http://www.w3.org/TR/NOTE-datetime\r
+        * \r
+        * Working with Time Zones\r
+        * @link        http://www.w3.org/TR/timezone/\r
+        * \r
+        * @param       String  $format time expression format\r
+        * @param       String  $timestamp      UNIX timestamp\r
+        * @param       Integer $offset timestamp offset\r
+        * @return      String  formatted datetime\r
+        */\r
+       static public function formatted_datetime($format, $timestamp, $offset=0)\r
+       {\r
+               $suffix = '';\r
+               $string = '';\r
+               \r
+               switch ( $format )\r
+               {\r
+                       case 'mysql':\r
+                               /*\r
+                                * MySQL 5.0 Reference Manual\r
+                                *  10.3.1. The DATE, DATETIME, and TIMESTAMP Types\r
+                                *   http://dev.mysql.com/doc/refman/5.0/en/datetime.html\r
+                                */\r
+                               $timestamp += $offset;\r
+                               $format = '%Y-%m-%d %H:%M:%S';\r
+                               $suffix ='';\r
+                               break;\r
+                       case 'rfc822':\r
+                               /*\r
+                                * RFC 822: STANDARD FOR THE FORMAT OF ARPA INTERNET TEXT MESSAGES\r
+                                *  5.  DATE AND TIME SPECIFICATION\r
+                                *   http://www.ietf.org/rfc/rfc0822.txt\r
+                                */\r
+                               $format = '%a, %d %m %y %H:%M:%S ';\r
+                               if ( $offset < 0 )\r
+                               {\r
+                                       $suffix = '-';\r
+                                       $offset = -$offset;\r
+                               }\r
+                               else\r
+                               {\r
+                                       $suffix = '+';\r
+                               }\r
+                               \r
+                               $suffix .= sprintf("%02d%02d", floor($offset / 3600), round(($offset % 3600) / 60) );\r
+                               break;\r
+                       case 'rfc822GMT':\r
+                               /*\r
+                                * RFC 822: STANDARD FOR THE FORMAT OF ARPA INTERNET TEXT MESSAGES\r
+                                *  5.  DATE AND TIME SPECIFICATION\r
+                                *   http://www.ietf.org/rfc/rfc0822.txt\r
+                                */\r
+                               $format = '%a, %d %m %y %H:%M:%S ';\r
+                               $timestamp -= $offset;\r
+                               $suffix = 'GMT';\r
+                               break;\r
+                       case 'iso8601':\r
+                       case 'rfc3339':\r
+                               /*\r
+                                * RFC3339: Date and Time on the Internet: Timestamps\r
+                                *  5. Date and Time format\r
+                                *   http://www.ietf.org/rfc/rfc3339.txt\r
+                                */\r
+                               $format = '%Y-%m-%dT%H:%M:%S';\r
+                               if ( $offset < 0 )\r
+                               {\r
+                                       $suffix = '-';\r
+                                       $offset = -$offset;\r
+                               }\r
+                               else\r
+                               {\r
+                                       $suffix = '+';\r
+                               }\r
+                               $suffix .= sprintf("%02d:%02d", floor($offset / 3600), round(($offset % 3600) / 60) );\r
+                               break;\r
+                       case 'utc':\r
+                       case 'iso8601UTC':\r
+                       case 'rfc3339UTC':\r
+                               /*\r
+                                * RFC3339: Date and Time on the Internet: Timestamps\r
+                                *  5. Date and Time format\r
+                                *   http://www.ietf.org/rfc/rfc3339.txt\r
+                                */\r
+                               $timestamp -= $offset;\r
+                               $format = '%Y-%m-%dT%H:%M:%SZ';\r
+                               $suffix = '';\r
+                               break;\r
+                       case '':\r
+                               $format = '%X %x';\r
+                               $offset = '';\r
+                               break;\r
+                       default:\r
+                               $suffix = '';\r
+                               break;\r
+               }\r
+               return i18n::strftime($format, $timestamp) . $suffix;\r
+       }\r
+       \r
+       /**\r
+        * i18n::convert_locale_to_old_language_file_name()\r
+        * NOTE: this should be obsoleted near future.\r
+        * \r
+        * @static\r
+        * @param       string  $target_locale  locale name as language_script_region\r
+        * @return      string  old translation file name\r
+        */\r
+       static public function convert_locale_to_old_language_file_name($target_locale)\r
+       {\r
+               $target_language = '';\r
+               foreach ( self::$lang_refs as $language => $locale )\r
+               {\r
+                       if ( preg_match('#-#', $language) )\r
+                       {\r
+                               if ( $target_locale . '.' . self::$current_charset == $locale )\r
+                               {\r
+                                       $target_language = $language;\r
+                                       break;\r
+                               }\r
+                       }\r
+                       else if ( $target_locale == $locale )\r
+                       {\r
+                               $target_language = $language;\r
+                       }\r
+               }\r
+               return $target_language;\r
+       }\r
+       \r
+       /**\r
+        * i18n::convert_old_language_file_name_to_locale()\r
+        * NOTE: this should be obsoleted near future.\r
+        * \r
+        * @static\r
+        * @param       string  $target_language        old translation file name\r
+        * @return      string  locale name as language_script_region\r
+        */\r
+       static public function convert_old_language_file_name_to_locale($target_language)\r
+       {\r
+               $target_locale = '';\r
+               foreach ( self::$lang_refs as $language => $locale )\r
+               {\r
+                       if ( $target_language == $language )\r
+                       {\r
+                               if ( preg_match('#^(.+)\.(.+)$#', $locale, $match) )\r
+                               {\r
+                                       $target_locale = $match[1];\r
+                               }\r
+                               else\r
+                               {\r
+                                       $target_locale = $locale;\r
+                               }\r
+                               break;\r
+                       }\r
+               }\r
+               return $target_locale;\r
+       }\r
+       \r
+       /**\r
+        * i18n::$lang_refs\r
+        * reference table to convert old and new way to name translation files.\r
+        * NOTE: this should be obsoleted as soon as possible.\r
+        * \r
+        * @static\r
+        */\r
+       static private $lang_refs = array(\r
+               "english"               => "en_Latn_US",\r
+               "english-utf8"  => "en_Latn_US.UTF-8",\r
+               "bulgarian"     => "bg_Cyrl_BG",\r
+               "finnish"               => "fi_Latn_FU",\r
+               "catalan"               => "ca_Latn_ES",\r
+               "french"                => "fr_Latn_FR",\r
+               "russian"               => "ru_Cyrl_RU",\r
+               "chinese"               => "zh_Hans_CN",\r
+               "simchinese"    => "zh_Hans_CN",\r
+               "chineseb5"     => "zh_Hant_TW",\r
+               "traditional_chinese"   =>      "zh_Hant_TW",\r
+               "galego"                => "gl_Latn_ES",\r
+               "german"                => "de_Latn_DE",\r
+               "korean-utf"    => "ko_Kore_KR.UTF-8",\r
+               "korean-euc-kr" => "ko_Kore_KR.EUC-KR",\r
+               "slovak"                => "sk_Latn_SK",\r
+               "czech"         => "cs_Latn_CZ",\r
+               "hungarian"     => "hu_Latn_HU",\r
+               "latvian"               => "lv_Latn_LV",\r
+               "nederlands"    => "nl_Latn_NL",\r
+               "italiano"              => "it_Latn_IT",\r
+               "persian"               => "fa_Arab_IR",\r
+               "spanish"               => "es_Latn_ES",\r
+               "spanish-utf8"  => "es_Latn_ES.UTF-8",\r
+               "japanese-euc"  => "ja_Jpan_JP.EUC-JP",\r
+               "japanese-utf8" => "ja_Jpan_JP.UTF-8",\r
+               "portuguese_brazil"     => "pt_Latn_BR"\r
+       );\r
+}\r
+=======
 <?php
 /**
  * i18n class for Nucleus CMS
@@ -682,3 +1367,4 @@ class i18n
                "portuguese_brazil"     => "pt_Latn_BR"
        );
 }
+>>>>>>> skinnable-master
diff --git a/nucleus/libs/include/admin-add.template b/nucleus/libs/include/admin-add.template
new file mode 100644 (file)
index 0000000..f8d6d5c
--- /dev/null
@@ -0,0 +1,140 @@
+<h2><%text(_ADD_ADDTO)%> '<%bloglink%>'</h2>\r
+\r
+<%init%>\r
+<script type="text/javascript" src="javascript/numbercheck.js"></script>\r
+<%if(autosave)%><script type="text/javascript" src="javascript/xmlhttprequest.js"></script><%endif%>\r
+\r
+<form id="addform" method="post" action="index.php" >\r
+\r
+<div>\r
+\r
+<input type="hidden" name="action" value="additem" />\r
+<input name="blogid" value="<%blogid%>" type="hidden" />\r
+<input type="hidden" name="draftid" value="0" />\r
+<%ticket%>\r
+\r
+<table>\r
+       <tr>\r
+               <th colspan="2"><%text(_ADD_CREATENEW)%></th>\r
+       </tr>\r
+       <%if(autosave)%><tr>\r
+               <td><%text(_AUTOSAVEDRAFT)%></td>\r
+               <td><span id="info"><%text(_AUTOSAVEDRAFT_NOTYETSAVED)%></span></td>\r
+       </tr><%endif%>\r
+       <tr>\r
+               <td><%text(_ADD_TITLE)%></td>\r
+               <td><input \r
+                       <%jsinput(title)%>\r
+                       tabindex="10"\r
+                       size="60" \r
+                       maxlength="160" \r
+                       value="<%contents(title)%>"\r
+                       /></td>\r
+       </tr><tr>\r
+               <td>\r
+                       <%text(_ADD_BODY)%> <%helplink(additem)%>\r
+               </td>\r
+               <td>\r
+                       <%jsbuttonbar(media+preview)%>\r
+                       <textarea\r
+                               <%jsinput(body)%>\r
+                               tabindex="20"\r
+                               cols="60"\r
+                               rows="20"><%contents(body)%></textarea>\r
+               </td>\r
+       </tr><tr id="edit" style="display:none;">\r
+               <td><%text(_ADD_PREVIEW)%></td>\r
+               <td><b><span id="prevtitle">&#160;</span></b><br />\r
+                       <span id="prevbody">&#160;</span><br />\r
+                       <span id="prevmore">&#160;</span><br />\r
+               </td>\r
+       </tr><tr>\r
+       \r
+<%if(blogsetting, bcomments)%>\r
+               <td><%text(_ADD_DISABLE_COMMENTS)%></td>\r
+               <td>\r
+                       <input name="closed" type="radio" tabindex="30" value="1" id="closed_yes" /><label for="closed_yes"><%text(_YES)%></label>\r
+                       <input name="closed" type="radio" tabindex="30" value="0" checked="checked" id="closed_no" /><label for="closed_no"><%text(_NO)%></label>\r
+               </td>\r
+       </tr><tr>\r
+<%endif%>\r
+\r
+\r
+               <td><%text(_ADD_CATEGORY)%></td>\r
+               <td><%categories(40)%></td>\r
+       </tr><tr>\r
+               <td><%text(_SUBMIT)%></td>\r
+               <td>\r
+                       <input tabindex="60" type="submit" value="<%text(_ADD_ADDITEM)%>" \r
+                               onclick="return checkSubmit();" />\r
+\r
+                       <br /><br />\r
+\r
+                       <input name="actiontype" value="addnow" type="radio" checked='checked' id="act_now" tabindex="61" /><label for="act_now"><%text(_ADD_ADDNOW)%></label>\r
+                       <br />\r
+                       <input name="actiontype" value="addfuture" type="radio" id="act_future" tabindex="61" /><label for="act_future" ><%text(_ADD_ADDLATER)%></label> <%helplink(future)%>\r
+                       <div class="indent">\r
+                               <%text(_ADD_PLACE_ON)%>\r
+                               <input id="inputday" name="day" tabindex="63" size="2" value="<%currenttime(mday)%>" onchange="document.forms[0].act_future.checked=true;" />/\r
+                               <input id="inputmonth" name="month" tabindex="64" size="2" value="<%currenttime(mon)%>" onchange="document.forms[0].act_future.checked=true;" />/\r
+                               <input id="inputyear" name="year" tabindex="65" size="4" value="<%currenttime(year)%>" onchange="document.forms[0].act_future.checked=true;" />\r
+                               at\r
+                               <input id="inputhour" name="hour" tabindex="66" size="2" value="<%currenttime(hours)%>" onchange="document.forms[0].act_future.checked=true;" />:\r
+                               <input id="inputminutes" name="minutes" tabindex="67" size="2" value="<%currenttime(minutes)%>" onchange="document.forms[0].act_future.checked=true;" />\r
+                               (dd/mm/yyyy hh:mm)\r
+                               \r
+                               <%if(blogsetting, ballowpast,0)%>\r
+                                       <br />\r
+                                       <%text(_ADD_NOPASTDATES)%>\r
+                               <%endif%>\r
+                       </div>\r
+                       <input name="actiontype" tabindex="61" value="adddraft" type="radio" id="act_draft" /><label for="act_draft"><%text(_ADD_ADDDRAFT)%></label> <%helplink(draft)%>\r
+               </td>\r
+       </tr><tr>\r
+               <th colspan="2"><%text(_ADD_PLUGIN_EXTRAS)%><%pluginextras%></th>\r
+       </tr>\r
+                       <%itemoptions%> \r
+    <tr>\r
+       <th colspan="2"><%text(_ADD_MORE)%></th>\r
+       </tr><tr>\r
+               <td><%text(_ADD_MORE)%>\r
+                       <br /><%helplink(extended)%>\r
+               </td>\r
+               <td>\r
+                       <%jsbuttonbar(media+preview)%>          \r
+                       <textarea \r
+                               <%jsinput(more)%>                       \r
+                               tabindex="70"\r
+                               cols="60"\r
+                               rows="20"\r
+                               ><%contents(more)%></textarea>\r
+               </td>\r
+       </tr><tr>\r
+               <td><%text(_SUBMIT)%></td>\r
+               <td>\r
+                       <input tabindex="60" type="submit" value="<%text(_ADD_ADDITEM)%>" \r
+                               onclick="return checkSubmit();" />\r
+                       <%if(autosave)%>\r
+                       <input tabindex="80" type="button" name="autosavenow" value="<%text(_AUTOSAVEDRAFT_NOW)%>"\r
+                               onclick="autoSaveDraft();" />\r
+                       <%endif%>\r
+               </td>\r
+       </tr>\r
+</table>\r
+\r
+</div>\r
+</form>\r
+<%if(autosave)%>\r
+<script type="text/javascript">\r
+       var xmlhttprequest = new Array();\r
+       xmlhttprequest[0] = createHTTPHandler(); // AutoDraft handler\r
+       xmlhttprequest[1] = createHTTPHandler(); // UpdateTicket handler\r
+       var seconds = now(); // Last AutoDraft time\r
+       var checks = 0; // Number of checks since last AutoDraft\r
+       var addform = document.getElementById('addform'); // The form id\r
+       var goal = document.getElementById('info'); // The html div id where 'Last saved: date time' must come\r
+       var goalurl = '../action.php'; // The PHP file where the content must be posted to\r
+       var lastsavedtext = '<%text(_AUTOSAVEDRAFT_LASTSAVED)%>'; // The language variable for 'Last saved'\r
+       var formtype = 'add'; // Add or edit form\r
+</script>\r
+<%endif%>\r
diff --git a/nucleus/libs/include/admin-edit.template b/nucleus/libs/include/admin-edit.template
new file mode 100644 (file)
index 0000000..d1695ce
--- /dev/null
@@ -0,0 +1,164 @@
+<h2><%text(_EDIT_ITEM)%></h2>\r
+\r
+<%init%>\r
+<script type="text/javascript" src="javascript/numbercheck.js"></script>\r
+<%if(autosave)%><script type="text/javascript" src="javascript/xmlhttprequest.js"></script><%endif%>\r
+\r
+<form id="editform" method="post" action="index.php">\r
+<div>\r
+\r
+<input type="hidden" name="action" value="itemupdate" />\r
+<input name="itemid" value="<%contents(itemid)%>" type="hidden" />\r
+<input type="hidden" name="draftid" value="0" />\r
+<%ticket%>\r
+\r
+<table><tr>\r
+       <th colspan="2"><%text(_EDIT_ITEM)%></th>\r
+</tr>\r
+<%if(autosave)%><tr>\r
+       <td><%text(_AUTOSAVEDRAFT)%></td>\r
+       <td><span id="info"><%text(_AUTOSAVEDRAFT_NOTYETSAVED)%></span></td>\r
+</tr><%endif%>\r
+<tr>\r
+       <td><%text(_EDIT_ORIG_AUTHOR)%></td>\r
+       <td><%contents(author)%></td>\r
+</tr><tr>\r
+       <td><%text(_ADD_TITLE)%></td>\r
+       <td><input \r
+                       <%jsinput(title)%>\r
+                       tabindex="10" \r
+                       size="60" \r
+                       maxlength="160" \r
+                       value="<%contents(title)%>" />\r
+       </td>\r
+</tr><tr>\r
+       <td>\r
+               <%text(_ADD_BODY)%>\r
+       </td>\r
+       <td>\r
+               <%jsbuttonbar(media+preview)%>  \r
+               <textarea \r
+                       <%jsinput(body)%>\r
+                       tabindex="20"\r
+                       cols="60"\r
+                       rows="20"><%contents(body)%></textarea>\r
+       </td>\r
+</tr><tr id="edit" style="display:none;">\r
+       <td><%text(_ADD_PREVIEW)%></td>\r
+       <td><b><span id="prevtitle">&#160;</span></b><br />\r
+               <span id="prevbody">&#160;</span><br />\r
+               <span id="prevmore">&#160;</span><br />\r
+       </td>\r
+</tr><tr>\r
+\r
+<%if(blogsetting, bcomments)%>\r
+               <td>\r
+                       <%text(_ADD_DISABLE_COMMENTS)%>\r
+               </td>\r
+               <td> \r
+                       <input type="radio" name="closed" value="1" <%checkedonval(1,closed)%> tabindex="30" id="closed_yes" /><label for="closed_yes"><%text(_YES)%></label>\r
+                       <input type="radio" name="closed" value="0" <%checkedonval(0,closed)%> tabindex="30" id="closed_no" /><label for="closed_no"><%text(_NO)%></label>\r
+                       <br />\r
+                       <small><%text(_EDIT_COMMENTSNOTE)%></small>     \r
+               </td>\r
+       </tr><tr>                               \r
+<%endif%>\r
+\r
+       <td><%text(_ADD_CATEGORY)%></td>\r
+       <td><%categories(40)%></td>\r
+</tr><tr>\r
+       <td><%text(_EDIT_SUBMIT)%></td>\r
+       <td>\r
+\r
+               <input type="submit" tabindex="60" value="<%text(_EDIT_SUBMIT)%>" onclick="return checkSubmit();" />\r
+\r
+<%if(itemproperty, draft)%>\r
+               <br /><br />\r
+               <input name="actiontype" value="addnow" type="radio" id="act_now" /><label for="act_now" tabindex="61"><%text(_ADD_ADDNOW)%></label>\r
+               <br />\r
+               <input name="actiontype" value="addfuture" type="radio" id="act_future" tabindex="61" /><label for="act_future"><%text(_ADD_ADDLATER)%></label> <%helplink(future)%>\r
+               <div class="indent">\r
+                       <%text(_ADD_PLACE_ON)%>\r
+                       <input id="inputday" name="day" tabindex="71" size="2" value="<%currenttime(mday)%>" onchange="document.forms[0].act_future.checked=true;" />/\r
+                       <input id="inputmonth" name="month" tabindex="72" size="2" value="<%currenttime(mon)%>" onchange="document.forms[0].act_future.checked=true;" />/\r
+                       <input id="inputyear" name="year" tabindex="73" size="4" value="<%currenttime(year)%>" onchange="document.forms[0].act_future.checked=true;" />\r
+                       at\r
+                       <input id="inputhour" name="hour" tabindex="74" size="2" value="<%currenttime(hours)%>" onchange="document.forms[0].act_future.checked=true;" />:\r
+                       <input id="inputminutes" name="minutes" tabindex="75" size="2" value="<%currenttime(minutes)%>" onchange="document.forms[0].act_future.checked=true;" />\r
+                       (dd/mm/yyyy hh:mm)\r
+                       <%if(blogsetting, ballowpast,0)%>\r
+                               <br />\r
+                               <%text(_ADD_NOPASTDATES)%>\r
+                       <%endif%>\r
+               </div>\r
+               <input name="actiontype" value="adddraft" type="radio" checked='checked' id="act_draft" tabindex="61" /><label for="act_draft"><%text(_EDIT_BACKTODRAFTS)%></label> <%helplink(draft)%>\r
+               <br />\r
+               <input name="actiontype" value="delete" type="radio" id="act_delete" tabindex="61" /><label for="act_delete"><%text(_BMLET_DELETE)%></label>\r
+<%endif%>\r
+\r
+<%if(itemproperty, draft,0)%>\r
+       <br /><br />\r
+       <input name="actiontype" value="edit" type="radio" checked="checked" id="act_edit" tabindex="61" /><label for="act_edit"><%text(_BMLET_EDIT)%></label>\r
+       <%if(blogsetting, ballowpast)%>\r
+               <br />\r
+               <input name="actiontype" value="changedate" type="radio" id="act_changedate" tabindex="70" /><label for="act_changedate"><%text(_ADD_CHANGEDATE)%></label> <%helplink(changedate)%>\r
+                       <div class="indent">\r
+                               <input id="inputday" name="day" tabindex="71" size="2" value="<%itemtime(mday)%>" onchange="document.forms[0].act_changedate.checked=true;" />/\r
+                               <input id="inputmonth" name="month" tabindex="72" size="2" value="<%itemtime(mon)%>" onchange="document.forms[0].act_changedate.checked=true;" />/\r
+                               <input id="inputyear" name="year" tabindex="73" size="4" value="<%itemtime(year)%>" onchange="document.forms[0].act_changedate.checked=true;" />\r
+                               at\r
+                               <input id="inputhour" name="hour" tabindex="74" size="2" value="<%itemtime(hours)%>" onchange="document.forms[0].act_changedate.checked=true;" />:\r
+                               <input id="inputminutes" name="minutes" tabindex="75" size="2" value="<%itemtime(minutes)%>" onchange="document.forms[0].act_changedate.checked=true;" />\r
+                               (dd/mm/yyyy hh:mm)\r
+                       </div>\r
+       <%endif%>       \r
+       <input name="actiontype" value="backtodrafts" type="radio" id="act_backtodrafts" tabindex="71" /><label for="act_backtodrafts"><%text(_BMLET_BACKTODRAFTS)%></label> <%helplink(draft)%>\r
+       <br />\r
+       <input name="actiontype" value="delete" type="radio" id="act_delete" tabindex="72" /><label for="act_delete"><%text(_BMLET_DELETE)%></label>\r
+<%endif%>\r
+       </td>\r
+</tr><tr>\r
+       <th colspan="2"><%text(_ADD_PLUGIN_EXTRAS)%><%pluginextras%></th>\r
+</tr>\r
+                       <%itemoptions%> \r
+<tr>\r
+       <th colspan="2"><%text(_ADD_MORE)%></th>\r
+</tr>\r
+<tr>\r
+       <td><%text(_ADD_MORE)%>\r
+               <br /><%helplink(extended)%>\r
+       </td>\r
+       <td>\r
+               <%jsbuttonbar(media+preview)%>\r
+               <textarea \r
+                       <%jsinput(more)%>\r
+                       tabindex="90" \r
+                       cols="60" \r
+                       rows="20"><%contents(more)%></textarea>\r
+       </td>\r
+</tr><tr>\r
+               <td><%text(_SUBMIT)%></td>\r
+               <td>\r
+                       <input tabindex="60" type="submit" value="<%text(_EDIT_SUBMIT)%>" \r
+                               onclick="return checkSubmit();" />\r
+                       <%if(autosave)%><input tabindex="80" type="button" name="autosavenow" value="<%text(_AUTOSAVEDRAFT_NOW)%>"\r
+                               onclick="autoSaveDraft();" /><%endif%>\r
+               </td>\r
+       \r
+</tr></table>\r
+\r
+</div>\r
+</form>\r
+\r
+<%if(autosave)%><script type="text/javascript">\r
+       var xmlhttprequest = new Array();\r
+       xmlhttprequest[0] = createHTTPHandler(); // AutoDraft handler\r
+       xmlhttprequest[1] = createHTTPHandler(); // UpdateTicket handler\r
+       var seconds = now(); // Last AutoDraft time\r
+       var checks = 0; // Number of checks since last AutoDraft\r
+       var addform = document.getElementById('editform'); // The form id\r
+       var goal = document.getElementById('info'); // The html div id where 'Last saved: date time' must come\r
+       var goalurl = '../action.php'; // The PHP file where the content must be posted to\r
+       var lastsavedtext = '<%text(_AUTOSAVEDRAFT_LASTSAVED)%>'; // The language variable for 'Last saved'\r
+       var formtype = 'edit'; // Add or edit form\r
+</script><%endif%>\r
diff --git a/nucleus/libs/include/bookmarklet-add.template b/nucleus/libs/include/bookmarklet-add.template
new file mode 100644 (file)
index 0000000..397d366
--- /dev/null
@@ -0,0 +1,172 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
+       <html xmlns="http://www.w3.org/1999/xhtml">\r
+       <head>\r
+               <title><%text(_ADD_ADDTO)%> '<%blogname%>'</title>\r
+               <link rel="stylesheet" type="text/css" href="styles/bookmarklet.css" /> \r
+               <link rel="stylesheet" type="text/css" href="styles/addedit.css" />             \r
+               <script type="text/javascript" src="javascript/bookmarklet.js"></script>\r
+               <script type="text/javascript" src="javascript/edit.js"></script>\r
+               <script type="text/javascript" src="javascript/numbercheck.js"></script>\r
+               <%if(autosave)%><script type="text/javascript" src="javascript/xmlhttprequest.js"></script><%endif%>\r
+               <%init%>\r
+               <%extrahead%>\r
+               <script type="text/javascript">\r
+                       var nucleus_initbm_oldonload = window.onload;\r
+                       function nucleus_initbm()\r
+                       {\r
+                               initStyles(); \r
+                               updAllPreviews();\r
+\r
+                               if (nucleus_initbm_oldonload)\r
+                                       nucleus_initbm_oldonload();\r
+                       }\r
+                       window.onload = nucleus_initbm;\r
+               </script>\r
+       </head>\r
+       <body>\r
+               <h1><%text(_ADD_ADDTO)%> '<%bloglink%>'</h1>\r
+               <form id="addform" method="post" action="bookmarklet.php" ><div>\r
+                       \r
+                       <input name="action" type="hidden" value="additem" />\r
+                       <input name="blogid" type="hidden" value="<%blogid%>" />\r
+                       <input type="hidden" name="draftid" value="0" />\r
+                       <%ticket%>\r
+                       \r
+                       <div id="submit" class="buttonbar">\r
+                               <div id="switchbuttons">\r
+                                       <input type="button" onclick="flipBlock('body');" value="<%text(_BMLET_BODY)%> &gt;&gt;" />\r
+                                       <input type="button" onclick="flipBlock('more');" value="<%text(_BMLET_MORE)%> &gt;&gt;" />\r
+                                       <input type="button" onclick="flipBlock('options');" value="<%text(_BMLET_OPTIONS)%> &gt;&gt;" />\r
+                                       <input type="button" onclick="updAllPreviews(); flipBlock('preview');" value="<%text(_BMLET_PREVIEW)%> &gt;&gt;" />\r
+                               </div>\r
+                               <input type="submit" value="<%text(_BMLET_ADD)%>" onclick="return checkSubmit();" />\r
+                               <input type="button" value="<%text(_BMLET_CANCEL)%>" onclick="window.close();" />\r
+                       </div>\r
+\r
+                       <div id="body" class="contentblock">\r
+\r
+                               <table>\r
+                               <%if(autosave)%><tr>\r
+                               <td><%text(_AUTOSAVEDRAFT)%></td>\r
+                               <td><span id="info"><%text(_AUTOSAVEDRAFT_NOTYETSAVED)%></span></td>\r
+                               </tr><%endif%>\r
+                               <tr>\r
+                               <td><%text(_ADD_TITLE)%></td>\r
+                               <td>\r
+                               <input \r
+                                       <%jsinput(title)%>\r
+                                       type="text" size="60" maxlength="160" \r
+                                       value="<%contents(title)%>"\r
+                               /></td>\r
+                               </tr><tr>\r
+                               <td>\r
+                               <%text(_ADD_BODY)%> <%helplink(additem)%></td>\r
+                               <td>\r
+                               <%jsbuttonbar(media)%>\r
+                               <textarea \r
+                                       <%jsinput(body)%>\r
+                                       cols="58" \r
+                                       rows="12"><%contents(body)%></textarea>\r
+                                       \r
+                               </td></tr>\r
+                               <tr><td>\r
+                               <%text(_ADD_CATEGORY)%></td>\r
+                               <td><%categories%></td>\r
+                               </tr>\r
+                               <tr>\r
+                               <%if(autosave)%><td><%text(_AUTOSAVEDRAFT_NOW)%></td>\r
+                               <td><input tabindex="80" type="button" name="autosavenow" value="<%text(_AUTOSAVEDRAFT_NOW)%>" onclick="autoSaveDraft();" /></td><%endif%>\r
+                               </tr>\r
+                               </table>\r
+\r
+                                       \r
+                       </div>\r
+                       \r
+                       <div id="more" class="contentblock">\r
+                               <table>\r
+                               <tr>\r
+                               <td><%text(_ADD_MORE)%> <%helplink(extended)%></td>\r
+                               <td>\r
+                               <%jsbuttonbar(media)%>\r
+                               <textarea \r
+                                       <%jsinput(more)%>\r
+                                       cols="58" \r
+                                       rows="17"><%contents(more)%></textarea>\r
+                               </td></tr></table>\r
+                       </div>\r
+                       <div id="options" class="contentblock">\r
+                               <table>\r
+                               <%if(blogsetting, bcomments)%>\r
+                                       <tr>\r
+                                       <td><%text(_ADD_DISABLE_COMMENTS)%></td>\r
+                                       <td>\r
+                                       <input type='radio' name='closed' value='1' id="closed_yes" /><label for="closed_yes"><%text(_YES)%></label>\r
+                                       <input type='radio' name='closed' value='0' checked='checked' id="closed_no"/><label for="closed_no"><%text(_NO)%></label>\r
+                                       </td>\r
+                                       </tr>\r
+                               <%endif%>\r
+                               \r
+                               <tr>\r
+                               <td><%text(_ADD_DRAFTNFUTURE)%></td>\r
+                               <td>\r
+                                       <input name="actiontype" value="addnow" type="radio" checked='checked' id="act_now" /><label for="act_now"><%text(_ADD_ADDNOW)%></label>\r
+                                       <br />\r
+                                       <input name="actiontype" value="addfuture" type="radio" id="act_future" /><label for="act_future"><%text(_ADD_ADDLATER)%></label> <%helplink(future)%>\r
+                                       <div class="indent">\r
+                                               <%text(_ADD_PLACE_ON)%>\r
+                                               <input id="inputday" name="day" size="2" value="<%currenttime(mday)%>" onchange="document.forms[0].act_future.checked=true;" />/\r
+                                               <input id="inputmonth" name="month" size="2" value="<%currenttime(mon)%>" onchange="document.forms[0].act_future.checked=true;" />/\r
+                                               <input id="inputyear" name="year" size="4" value="<%currenttime(year)%>" onchange="document.forms[0].act_future.checked=true;" />\r
+                                               at\r
+                                               <input id="inputhour" name="hour" size="2" value="<%currenttime(hours)%>" onchange="document.forms[0].act_future.checked=true;" />:\r
+                                               <input id="inputminutes" name="minutes" size="2" value="<%currenttime(minutes)%>" onchange="document.forms[0].act_future.checked=true;" />\r
+                                               (dd/mm/yyyy hh:mm)\r
+                                               <%if(blogsetting, ballowpast,0)%>\r
+                                                       <br />\r
+                                                       <%text(_ADD_NOPASTDATES)%>\r
+                                               <%endif%>\r
+                                       </div>\r
+                                       <input name="actiontype" value="adddraft" type="radio" id="act_draft" /><label for="act_draft"><%text(_ADD_ADDDRAFT)%></label> <%helplink(draft)%>\r
+                               </td>\r
+                               </tr>\r
+                               <tr>\r
+                               <td><%text(_ADD_PLUGIN_EXTRAS)%></td>\r
+                               <td>\r
+                               <%pluginextras%></td>\r
+                               </tr>\r
+                               \r
+                               \r
+                                 <%itemoptions%>\r
+                               </table>\r
+                               \r
+\r
+                       </div>\r
+                       \r
+                       <div id="preview" class="contentblock">\r
+                               <h2><%text(_ADD_PREVIEW)%></h2>\r
+                               \r
+                               <b><span id="prevtitle">&#160;</span></b>\r
+                               <br />\r
+                               <span id="prevbody">&#160;</span>\r
+                               <br />\r
+                               <span id="prevmore">&#160;</span>\r
+                       </div>\r
+                       \r
+               </div></form>\r
+\r
+       <%if(autosave)%><script type="text/javascript">\r
+               var xmlhttprequest = new Array();\r
+               xmlhttprequest[0] = createHTTPHandler(); // AutoDraft handler\r
+               xmlhttprequest[1] = createHTTPHandler(); // UpdateTicket handler\r
+               var seconds = now(); // Last AutoDraft time\r
+               var checks = 0; // Number of checks since last AutoDraft\r
+               var addform = document.getElementById('addform'); // The form id\r
+               var goal = document.getElementById('info'); // The html div id where 'Last saved: date time' must come\r
+               var goalurl = '../action.php'; // The PHP file where the content must be posted to\r
+               var lastsavedtext = '<%text(_AUTOSAVEDRAFT_LASTSAVED)%>'; // The language variable for 'Last saved'\r
+               var formtype = 'add'; // Add or edit form\r
+       </script><%endif%>\r
+\r
+       </body>\r
+       </html>\r
+\r
diff --git a/nucleus/libs/include/bookmarklet-edit.template b/nucleus/libs/include/bookmarklet-edit.template
new file mode 100644 (file)
index 0000000..980181f
--- /dev/null
@@ -0,0 +1,171 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
+       <html xmlns="http://www.w3.org/1999/xhtml">\r
+       <head>\r
+               <title><%text(_EDIT_ITEM)%></title>\r
+               <link rel="stylesheet" type="text/css" href="styles/bookmarklet.css" />\r
+               <link rel="stylesheet" type="text/css" href="styles/addedit.css" />                             \r
+               <script type="text/javascript" src="javascript/bookmarklet.js"></script>\r
+               <script type="text/javascript" src="javascript/edit.js"></script>\r
+               <script type="text/javascript" src="javascript/numbercheck.js"></script>\r
+               <%if(autosave)%><script type="text/javascript" src="javascript/xmlhttprequest.js"></script><%endif%>\r
+               <%init%>\r
+               <%extrahead%>\r
+               <script type="text/javascript">\r
+                       var nucleus_initbm_oldonload = window.onload;\r
+                       function nucleus_initbm()\r
+                       {\r
+                               initStyles(); \r
+                               updAllPreviews();\r
+\r
+                               if (nucleus_initbm_oldonload)\r
+                                       nucleus_initbm_oldonload();\r
+                       }\r
+                       window.onload = nucleus_initbm;\r
+               </script>\r
+       </head>\r
+       <body>\r
+               <h1><%text(_EDIT_ITEM)%> (<%contents(title)%>)</h1>\r
+               <form id="editform" method="post" action="bookmarklet.php" ><div>\r
+                       \r
+                       <input name="action" type="hidden" value="edititem" />\r
+                       <input name="itemid" type="hidden" value="<%contents(itemid)%>" />\r
+                       <input type="hidden" name="draftid" value="0" />\r
+                       <%ticket%>\r
+                       \r
+                       <div id="submit" class="buttonbar">\r
+                               <div id="switchbuttons">\r
+                                       <input type="button" onclick="flipBlock('body');" value="<%text(_BMLET_BODY)%> &gt;&gt;" />\r
+                                       <input type="button" onclick="flipBlock('more');" value="<%text(_BMLET_MORE)%> &gt;&gt;" />\r
+                                       <input type="button" onclick="flipBlock('options');" value="<%text(_BMLET_OPTIONS)%> &gt;&gt;" />\r
+                                       <input type="button" onclick="updAllPreviews(); flipBlock('preview');" value="<%text(_BMLET_PREVIEW)%> &gt;&gt;" />\r
+                               </div>\r
+                               <input type="submit" value="<%text(_BMLET_EDIT)%>" onclick="return checkSubmit();" />\r
+                               <input type="button" value="<%text(_BMLET_CANCEL)%>" onclick="window.close();" />\r
+                       </div>\r
+\r
+                       <div id="body" class="contentblock">\r
+                               <table>\r
+                               <%if(autosave)%><tr>\r
+                               <td><%text(_AUTOSAVEDRAFT)%></td>\r
+                               <td><span id="info"><%text(_AUTOSAVEDRAFT_NOTYETSAVED)%></span></td>\r
+                               </tr><%endif%>\r
+                               <tr>\r
+                               <td><%text(_ADD_TITLE)%></td>\r
+                               <td><input \r
+                                       <%jsinput(title)%>\r
+                                       type="text" size="60" maxlength="160" \r
+                                       value="<%contents(title)%>"\r
+                               /></td></tr>\r
+                       \r
+                               <tr><td>\r
+                               <%text(_ADD_BODY)%>\r
+                               </td><td>\r
+                               <%jsbuttonbar(media)%>\r
+                               <textarea \r
+                                       <%jsinput(body)%>\r
+                                       cols="58" \r
+                                       rows="12"><%contents(body)%></textarea>\r
+\r
+                               </td></tr>\r
+                               <tr>\r
+                               <td><%text(_ADD_CATEGORY)%></td>\r
+                               <td><%categories%></td>\r
+                               </tr>\r
+                               <tr>\r
+                               <%if(autosave)%><td><%text(_AUTOSAVEDRAFT_NOW)%></td>\r
+                               <td><input tabindex="80" type="button" name="autosavenow" value="<%text(_AUTOSAVEDRAFT_NOW)%>" onclick="autoSaveDraft();" /></td><%endif%>\r
+                               </tr>\r
+                               </table>\r
+                                       \r
+                       </div>\r
+                       \r
+                       <div id="more" class="contentblock">\r
+                               <table>\r
+                               <tr>\r
+                               <td><%text(_ADD_MORE)%> <%helplink(extended)%></td>\r
+                               <td>\r
+                               <%jsbuttonbar(media)%>\r
+                               <textarea \r
+                                       <%jsinput(more)%>\r
+                                       cols="58" \r
+                                       rows="17"><%contents(more)%></textarea>\r
+                               </td></tr></table>\r
+                       </div>\r
+                       <div id="options" class="contentblock">\r
+                               <table>\r
+                               <%if(blogsetting, bcomments)%>\r
+                                       <tr>\r
+                                       <td><%text(_ADD_DISABLE_COMMENTS)%></td>\r
+                                       <td>\r
+                                   <input type="radio" name="closed" value="1" id="closed_yes" <%checkedonval(1,closed)%> /><label for="closed_yes"><%text(_YES)%></label>\r
+                                   <input type="radio" name="closed" value="0" id="closed_no" <%checkedonval(0,closed)%> /><label for="closed_no"><%text(_NO)%></label>\r
+                                       </td>\r
+                                       </tr>\r
+                               <%endif%>\r
+                               \r
+                               <!-- The only actiontypes are 'edit', 'changedate' (no draft items can be edited) and 'delete' -->\r
+                               <tr>\r
+                               <td>Action</td>\r
+                               <td>\r
+                               <ul class="nobullets">\r
+                                       <li><input name="actiontype" value="edit" type="radio" checked="checked" id="act_edit" /><label for="act_edit"><%text(_BMLET_EDIT)%></label></li>\r
+                                       <li><input name="actiontype" value="delete" type="radio" id="act_delete" /><label for="act_delete"><%text(_BMLET_DELETE)%></label></li>\r
+                                       <%if(blogsetting, ballowpast)%>\r
+                                               <li>\r
+                                                       <input name="actiontype" value="changedate" type="radio" id="act_changedate" tabindex="70" /><label for="act_changedate"><%text(_BMLET_CHANGEDATE)%></label> <%helplink(changedate)%>\r
+                                                                       <div class="indent">\r
+                                                                               <input id="inputday" name="day" tabindex="71" size="2" value="<%itemtime(mday)%>" onchange="document.forms[0].act_changedate.checked=true;" />/\r
+                                                                               <input id="inputmonth" name="month" tabindex="72" size="2" value="<%itemtime(mon)%>" onchange="document.forms[0].act_changedate.checked=true;" />/\r
+                                                                               <input id="inputyear" name="year" tabindex="73" size="4" value="<%itemtime(year)%>" onchange="document.forms[0].act_changedate.checked=true;" />\r
+                                                                               at\r
+                                                                               <input id="inputhour" name="hour" tabindex="74" size="2" value="<%itemtime(hours)%>" onchange="document.forms[0].act_changedate.checked=true;" />:\r
+                                                                               <input id="inputminutes" name="minutes" tabindex="75" size="2" value="<%itemtime(minutes)%>" onchange="document.forms[0].act_changedate.checked=true;" />\r
+                                                                               (dd/mm/yyyy hh:mm)\r
+                                                                       </div>\r
+                                                       </li>\r
+                                                       <li>\r
+                                                               <input name="actiontype" value="backtodrafts" type="radio" id="act_backtodrafts" tabindex="71" /><label for="act_backtodrafts"><%text(_BMLET_BACKTODRAFTS)%></label> <%helplink(draft)%>\r
+                                                       </li>\r
+                                       <%endif%>\r
+                               </ul>\r
+                               </td></tr>\r
+                               \r
+                               <tr>\r
+                               <td><%text(_ADD_PLUGIN_EXTRAS)%></td>\r
+                               <td>\r
+                               <%pluginextras%>\r
+                               </td></tr>\r
+                               \r
+                                 <%itemoptions%>\r
+                               </table>\r
+                               \r
+                       </div>\r
+                       \r
+                       <div id="preview" class="contentblock">\r
+                               <h2><%text(_ADD_PREVIEW)%></h2>\r
+                               \r
+                               <b><span id="prevtitle">&#160;</span></b>\r
+                               <br />\r
+                               <span id="prevbody">&#160;</span>\r
+                               <br />\r
+                               <span id="prevmore">&#160;</span>\r
+                       </div>\r
+                       \r
+               </div></form>\r
+\r
+       <%if(autosave)%><script type="text/javascript">\r
+               var xmlhttprequest = new Array();\r
+               xmlhttprequest[0] = createHTTPHandler(); // AutoDraft handler\r
+               xmlhttprequest[1] = createHTTPHandler(); // UpdateTicket handler\r
+               var seconds = now(); // Last AutoDraft time\r
+               var checks = 0; // Number of checks since last AutoDraft\r
+               var addform = document.getElementById('editform'); // The form id\r
+               var goal = document.getElementById('info'); // The html div id where 'Last saved: date time' must come\r
+               var goalurl = '../action.php'; // The PHP file where the content must be posted to\r
+               var lastsavedtext = '<%text(_AUTOSAVEDRAFT_LASTSAVED)%>'; // The language variable for 'Last saved'\r
+               var formtype = 'edit'; // Add or edit form\r
+       </script><%endif%>\r
+\r
+       </body>\r
+       </html>\r
+\r
index bc687f2..a0eaba9 100644 (file)
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: showlist.php 1785 2012-04-22 11:25:14Z sakamocchi $
+=======
  * @version $Id: showlist.php 1886 2012-06-17 08:27:27Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 
 // can take either an array of objects, or an SQL query
+<<<<<<< HEAD
+function showlist($query, $type, $template)
+{
+       if ( is_array($query) )
+       {
+               if ( sizeof($query) == 0 )
+               {
+                       return 0;
+               }
+               
+               call_user_func("listplug_{$type}", $template, 'HEAD');
+               
+               foreach ( $query as $currentObj )
+               {
+                       $template['current'] = $currentObj;
+                       call_user_func("listplug_{$type}", $template, 'BODY');
+               }
+               
+               call_user_func("listplug_{$type}", $template, 'FOOT');
+               
+               return sizeof($query);
+       }
+       else
+       {
+               $res = DB::getResult($query);
+               
+               // don't do anything if there are no results
+               $numrows = $res->rowCount();
+               if ( $numrows == 0 )
+               {
+                       return 0;
+               }
+               call_user_func("listplug_{$type}", $template, 'HEAD');
+               
+               foreach ( $res as $row )
+               {
+                       $template['current'] = $row;
+                       call_user_func("listplug_{$type}", $template, 'BODY');
+               }
+               
+               call_user_func("listplug_{$type}", $template, 'FOOT');
+               
+               $res->closeCursor();
+               
+               // return amount of results
+               return $numrows;
+       }
+}
+
+function listplug_select($template, $type)
+{
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo "<select name=\"{$template['name']}\" tabindex=\"{$template['tabindex']}\"";
+                       if ( array_key_exists('javascript', $template) && !empty($template['javascript']) )
+                       {
+                               echo " {$template['javascript']}";
+                       }
+                       echo ">\n";
+                       
+                       // add extra row if needed
+                       if ( array_key_exists('extra', $template) && !empty($template['extra']) )
+                       {
+                               echo "<option value=\"{$template['extraval']}\">{$template['extra']}</option>\n";
+                       }
+                       
+                       break;
+               case 'BODY':
+                       $current = $template['current'];
+
+                       echo '<option value="' . Entity::hsc($current['value']) . '"';
+                       if ( array_key_exists('selected', $template) && $template['selected'] == $current['value'] )
+                       {
+                               echo ' selected="selected" ';
+                       }
+                       if ( isset($template['shorten']) && $template['shorten'] > 0 )
+                       {
+                               echo ' title="'. Entity::hsc($current['text']).'"';
+                               $current['text'] = Entity::hsc(Entity::shorten($current['text'], $template['shorten'], $template['shortenel']));
+                       }
+                       echo '>' . Entity::hsc($current['text']) . "</option>\n";
+                       break;
+               case 'FOOT':
+                       echo '</select>';
+                       break;
+       }
+       return;
+}
+
+function listplug_table($template, $type)
+{
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo "\n\n";
+                       echo "<table frame=\"box\" rules=\"all\" summary=\"{$template['content']}\">\n";
+                       echo "<thead>\n";
+                       echo "<tr>\n";
+                       // print head
+                       call_user_func("listplug_table_{$template['content']}" , $template, 'HEAD');
+                       echo "</tr>\n";
+                       echo "</thead>\n";
+                       echo "<tbody>\n";
+                       break;
+               case 'BODY':
+                       // print tabletype specific thingies
+                       echo "<tr>\n";
+                       call_user_func("listplug_table_{$template['content']}" , $template,  'BODY');
+                       echo "</tr>\n";
+                       break;
+               case 'FOOT':
+                       call_user_func("listplug_table_{$template['content']}" , $template,  'FOOT');
+                       echo "</tbody>\n";
+                       echo "</table>\n";
+                       echo "\n";
+                       break;
+       }
+       return;
+}
+
+function listplug_table_memberlist($template, $type)
+{
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo '<th>' . _LIST_MEMBER_NAME . "</th>\n";
+                       echo '<th>' . _LIST_MEMBER_RNAME . "</th>\n";
+                       echo '<th>' . _LIST_MEMBER_URL . "</th>\n";
+                       echo '<th>' . _LIST_MEMBER_ADMIN;
+                       help('superadmin');
+                       echo "</th>\n";
+                       echo '<th>' . _LIST_MEMBER_LOGIN;
+                       help('canlogin');
+                       echo "</th>\n";
+                       echo '<th colspan="2">' . _LISTS_ACTIONS. "</th>\n";
+                       break;
+               case 'BODY':
+                       $current = $template['current'];
+                       echo '<td>';
+                       $id = listplug_nextBatchId();
+                       echo "<input type=\"checkbox\" id=\"batch{$id}\" name=\"batch[{$id}]\" value=\"{$current['mnumber']}\" />\n";
+                       echo "<label for=\"batch{$id}\">\n";
+                       echo '<a href="mailto:' . Entity::hsc($current['memail']) . '" tabindex="' . $template['tabindex'] . '">' . Entity::hsc($current['mname']), "</a>\n";
+                       echo "</label>\n";
+                       echo "</td>";
+                       echo "<td>" . Entity::hsc($current['mrealname']) . "</td>\n";
+                       echo '<td><a href="' . Entity::hsc($current['murl']) . '" tabindex="' . $template['tabindex'] . '">' . Entity::hsc($current['murl']) . "</a></td>\n";
+                       echo '<td>' . ($current['madmin'] ? _YES : _NO) . "</td>\n";
+                       echo '<td>' . ($current['mcanlogin'] ? _YES : _NO) . "</td>\n";
+                       echo '<td><a href="index.php?action=memberedit&amp;memberid=' . $current['mnumber'] . '" tabindex="' . $template['tabindex'] . '">' . _LISTS_EDIT . "</a></td>\n";
+                       echo '<td><a href="index.php?action=memberdelete&amp;memberid=' . $current['mnumber'] . '" tabindex="' . $template['tabindex'].'">' . _LISTS_DELETE . "</a></td>\n";
+                       break;
+       }
+       return;
+}
+
+function listplug_table_teamlist($template, $type)
+{
+       global $manager;
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo "<th>" . _LIST_MEMBER_NAME . "</th>\n";
+                       echo "<th>" . _LIST_MEMBER_RNAME . "</th>\n";
+                       echo "<th>" . _LIST_TEAM_ADMIN;
+                       help('teamadmin');
+                       echo "</th>\n";
+                       echo "<th colspan=\"2\">"._LISTS_ACTIONS."</th>\n";
+                       break;
+               case 'BODY':
+                       $current = $template['current'];
+                       
+                       echo '<td>';
+                       $id = listplug_nextBatchId();
+                       echo "<input type=\"checkbox\" id=\"batch{$id}\" name=\"batch[{$id}]\" value=\"{$current['tmember']}\" />\n";
+                       echo '<label for="batch',$id,'">';
+                       echo '<a href="mailto:' . Entity::hsc($current['memail']) . '" tabindex="' . $template['tabindex'] . '">' . Entity::hsc($current['mname']), "</a>\n";
+                       echo "</label>\n";
+                       echo "</td>";
+                       echo '<td>', Entity::hsc($current['mrealname']), "</td>\n";
+                       echo '<td>', ($current['tadmin'] ? _YES : _NO) , "</td>\n";
+                       echo '<td><a href="index.php?action=teamdelete&amp;memberid=' . $current['tmember'] . '&amp;blogid=' . $current['tblog'] . '" tabindex="' . $template['tabindex'] . '">' . _LISTS_DELETE . "</a></td>\n";
+                       
+                       $url = "index.php?action=teamchangeadmin&memberid={$current['tmember']}&blogid={$current['tblog']}";
+                       $url = $manager->addTicketToUrl($url);
+                       echo '<td><a href="' . Entity::hsc($url) . '" tabindex="' . $template['tabindex'] . '">' . _LIST_TEAM_CHADMIN . "</a></td>\n";
+                       break;
+       }
+       return;
+}
+
+function listplug_table_pluginlist($template, $type)
+{
+       global $manager;
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo '<th>' . _LISTS_INFO . "</th>\n";
+                       echo '<th>' . _LISTS_DESC . "</th>\n";
+                       echo '<th>' . _LISTS_ACTIONS . "</th>\n";
+                       break;
+               case 'BODY':
+                       $current = $template['current'];
+=======
 function showlist($query, $type, $vars, $template_name = '')
 {
        $contents = '';
@@ -390,10 +599,59 @@ function listplug_table_pluginlist($vars, $type, $template_name = '')
                        break;
                case 'BODY':
                        $current = $vars['current'];
+>>>>>>> skinnable-master
                        
                        $plug =& $manager->getPlugin($current['pfile']);
                        if ( $plug )
                        {
+<<<<<<< HEAD
+                               echo "<td>\n";
+                               echo '<h3>' . Entity::hsc($plug->getName()) . "</h3>\n";
+                               
+                               echo "<dl>\n";
+                               if ( $plug->getAuthor() )
+                               {
+                                       echo '<dt>' . _LIST_PLUGS_AUTHOR . "</dt>\n";
+                                       echo '<dd>' . Entity::hsc($plug->getAuthor()) , "</dd>\n";
+                               }
+                               
+                               if ( $plug->getVersion() )
+                               {
+                                       echo '<dt>' . _LIST_PLUGS_VER, "</dt>\n";
+                                       echo '<dd>' . Entity::hsc($plug->getVersion()) . "</dd>\n";
+                               }
+                               
+                               if ( $plug->getURL() )
+                               {
+                                       echo '<dt>' . _LIST_PLUGS_SITE . "<dt>\n";
+                                       echo '<dd><a href="' .  Entity::hsc($plug->getURL()) . '" tabindex="' . $template['tabindex'] . '">リンク</a></dd>' . "\n";
+                               }
+                               echo "</dl>\n";
+                               echo "</td>\n";
+                               
+                               echo "<td>\n";
+                               echo "<dl>\n";
+                               echo '<dt>' . _LIST_PLUGS_DESC ."</dt>\n";
+                               echo '<dd>' . Entity::hen($plug->getDescription()) ."</dd>\n";
+                               if ( sizeof($plug->getEventList()) > 0 )
+                               {
+                                       echo '<dt>' . _LIST_PLUGS_SUBS ."</dt>\n";
+                                       echo '<dd>' . Entity::hsc(implode(', ', $plug->getEventList())) ."</dd>\n";
+                               }
+                               
+                               if ( sizeof($plug->getPluginDep()) > 0 )
+                               {
+                                       echo '<dt>' . _LIST_PLUGS_DEP ."</dt>\n";
+                                       echo '<dd>' . Entity::hsc(implode(', ', $plug->getPluginDep())) ."</dd>\n";
+                               }
+                               
+                               /* check dependency */
+                               $req = array();
+                               $res = DB::getResult('SELECT pfile FROM ' . sql_table('plugin'));
+                               foreach ( $res as $row )
+                               {
+                                       $preq =& $manager->getPlugin($row['pfile']);
+=======
                                if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY']) )
                                {
                                        $template = "<td>\n"
@@ -513,6 +771,7 @@ function listplug_table_pluginlist($vars, $type, $template_name = '')
                                foreach ( $plugins as $plugin )
                                {
                                        $preq =& $manager->getPlugin($plugin['pfile']);
+>>>>>>> skinnable-master
                                        if ( $preq )
                                        {
                                                $depList = $preq->getPluginDep();
@@ -520,7 +779,11 @@ function listplug_table_pluginlist($vars, $type, $template_name = '')
                                                {
                                                        if ( $current['pfile'] == $depName )
                                                        {
+<<<<<<< HEAD
+                                                               $req[] = $row['pfile'];
+=======
                                                                $req[] = $plugin['pfile'];
+>>>>>>> skinnable-master
                                                        }
                                                }
                                        }
@@ -528,6 +791,88 @@ function listplug_table_pluginlist($vars, $type, $template_name = '')
                                
                                if ( count($req) > 0 )
                                {
+<<<<<<< HEAD
+                                       echo '<dt>' . _LIST_PLUGS_DEPREQ . "</dt>\n";
+                                       echo '<dd>' . Entity::hsc(implode(', ', $req)) . "</dd>\n";
+                               }
+                               
+                               /* check the database to see if it is up-to-date and notice the user if not */
+                               if ( !$plug->subscribtionListIsUptodate() )
+                               {
+                                       echo '<dt>' . 'NOTICE:' . "</dt>\n";
+                                       echo '<dd>' . _LIST_PLUG_SUBS_NEEDUPDATE . "</dd>\n";
+                               }
+                               
+                               echo "</dl>\n";
+                               echo "</td>\n";
+                       }
+                       else
+                       {
+                               echo '<td colspan="2">' . sprintf(_PLUGINFILE_COULDNT_BELOADED, Entity::hsc($current['pfile'])) . "</td>\n";
+                       }
+                       
+                       echo "<td>\n";
+                       echo "<ul>\n";
+                       $current['pid'] = (integer) $current['pid'];
+                       
+                       $url = Entity::hsc($manager->addTicketToUrl("index.php?plugid={$current['pid']}&action=pluginup"));
+                       echo "<li><a href=\"{$url}\" tabindex=\"{$template['tabindex']}\">" , _LIST_PLUGS_UP , "</a></li>\n";
+                       
+                       $url = Entity::hsc($manager->addTicketToUrl("index.php?plugid={$current['pid']}&action=plugindown"));
+                       echo "<li><a href=\"{$url}\" tabindex=\"{$template['tabindex']}\">" . _LIST_PLUGS_DOWN , "</a></li>\n";
+                       echo "<li><a href=\"index.php?action=plugindelete&amp;plugid={$current['pid']}\" tabindex=\"{$template['tabindex']}\">" . _LIST_PLUGS_UNINSTALL , "</a></li>\n";
+                       
+                       if ( $plug && ($plug->hasAdminArea() > 0) )
+                       {
+                               echo '<li><a href="' , Entity::hsc($plug->getAdminURL()) , '" tabindex="' , $template['tabindex'] , '">' , _LIST_PLUGS_ADMIN , "</a></li>\n";
+                       }
+                       
+                       if ( $plug && ($plug->supportsFeature('HelpPage') > 0) )
+                       {
+                               echo "<li><a href=\"index.php?action=pluginhelp&amp;plugid={$current['pid']}\" tabindex=\"{$template['tabindex']}\">" . _LIST_PLUGS_HELP , "</a></li>\n";
+                       }
+                       
+                       $query = "SELECT COUNT(*) AS result FROM %s WHERE ocontext='global' and opid=%s;";
+                       $query = sprintf($query, sql_table('plugin_option_desc'), (integer) $current['pid']);
+                       if ( DB::getValue($query) > 0 )
+                       {
+                               echo "<li><a href=\"index.php?action=pluginoptions&amp;plugid={$current['pid']}\" tabindex=\"{$template['tabindex']}\">" . _LIST_PLUGS_OPTIONS . "</a></li>\n";
+                       }
+                       echo "</ul>\n";
+                       echo "</td>\n";
+                       break;
+       }
+       return;
+}
+
+function listplug_table_plugoptionlist($template, $type)
+{
+       global $manager;
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo '<th>' . _LISTS_INFO . "</th>\n";
+                       echo '<th>' . _LISTS_VALUE . "</th>\n";
+                       break;
+               case 'BODY':
+                       listplug_plugOptionRow($template['current']);
+                       break;
+               case 'FOOT':
+                       echo "<tr>\n";
+                       echo '<th colspan="2">' . _PLUGS_SAVE . "</th>\n";
+                       echo "</tr>\n";
+                       echo "<tr>\n";
+                       echo "<td>" . _PLUGS_SAVE . "</td>\n";
+                       echo "<td><input type=\"submit\" value=\"".  _PLUGS_SAVE . "\" /></td>\n";
+                       echo "</tr>\n";
+                       break;
+       }
+       return;
+}
+
+function listplug_plugOptionRow($current)
+{
+=======
                                        if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ']) )
                                        {
                                                $subTpl = "<br /><br /><%deprlstlbl%><br /><%depreqlist%>";
@@ -741,6 +1086,7 @@ function listplug_plugOptionRow($current, $template_name = '')
                $templates =& $manager->getTemplate($template_name);
        }
        
+>>>>>>> skinnable-master
        $varname = "plugoption[{$current['oid']}][{$current['contextid']}]";
        
        // retreive the optionmeta
@@ -749,6 +1095,102 @@ function listplug_plugOptionRow($current, $template_name = '')
        // only if it is not a hidden option write the controls to the page
        if ( in_array('access', $meta) && $meta['access'] == 'hidden' )
        {
+<<<<<<< HEAD
+               return;
+       }
+       
+       if ( !$current['description'] )
+       {
+               echo '<td>' , Entity::hsc($current['name']) . "</td>\n";
+       }
+       else
+       {
+               if ( !defined($current['description']) )
+               {
+                       echo '<td>' , Entity::hsc($current['description']) . "</td>\n";
+               }
+               else
+               {
+                       echo '<td>' , Entity::hsc(constant($current['description'])) . "</td>\n";
+               }
+       }
+       echo "<td>\n";
+       switch($current['type'])
+       {
+               case 'yesno':
+                       Admin::input_yesno($varname, $current['value'], 0, 'yes', 'no');
+                       break;
+               case 'password':
+                       echo '<input type="password" size="40" maxlength="128" name="',Entity::hsc($varname),'" value="',Entity::hsc($current['value']),"\" />\n";
+                       break;
+               case 'select':
+                       echo '<select name="'.Entity::hsc($varname)."\">\n";
+                       $options = NucleusPlugin::getOptionSelectValues($current['typeinfo']);
+                       $options = preg_split('/\|/', $options);
+                       
+                       for ( $i=0; $i<(count($options)-1); $i+=2 )
+                       {
+                               if ($options[$i+1] == $current['value'])
+                               {
+                                       echo '<option value="' . Entity::hsc($options[$i+1]) . '" selected="selected">';
+                               }
+                               else
+                               {
+                                       echo '<option value="' . Entity::hsc($options[$i+1]) . '">';
+                               }
+                               if ( defined($options[$i]) )
+                               {
+                                       echo Entity::hsc(constant($options[$i]));
+                               }
+                               else
+                               {
+                                       echo Entity::hsc($options[$i]);
+                               }
+                               echo "</option>\n";
+                       }
+                       echo "</select>\n";
+                       
+                       break;
+               case 'textarea':
+                       //$meta = NucleusPlugin::getOptionMeta($current['typeinfo']);
+                       if ( array_key_exists('access', $meta) && $meta['access'] == 'readonly' )
+                       {
+                               echo '<textarea class="pluginoption" cols="30" rows="5" name="' . Entity::hsc($varname) . "\" readonly=\"readonly\">\n";
+                       }
+                       else
+                       {
+                               echo '<textarea class="pluginoption" cols="30" rows="5" name="' . Entity::hsc($varname) . "\">\n";
+                       }
+                       echo Entity::hsc($current['value']) . "\n";
+                       echo "</textarea>\n";
+                       break;
+               case 'text':
+               default:
+                       //$meta = NucleusPlugin::getOptionMeta($current['typeinfo']);
+                       echo '<input type="text" size="40" maxlength="128" name="',Entity::hsc($varname),'" value="',Entity::hsc($current['value']),'"';
+                       if ( array_key_exists('datatype', $meta) && $meta['datatype'] == 'numerical' )
+                       {
+                               echo ' onkeyup="checkNumeric(this)" onblur="checkNumeric(this)"';
+                       }
+                       if ( array_key_exists('access', $current) && $meta['access'] == 'readonly')
+                       {
+                               echo ' readonly="readonly"';
+                       }
+                       echo " />\n";
+       }
+       if ( array_key_exists('extra', $current) )
+       {
+               echo $current['extra'];
+       }
+       echo "</td>\n";
+       
+       return;
+}
+
+function listplug_table_itemlist($template, $type)
+{
+       $cssclass = '';
+=======
                return false;
        }
        else
@@ -1007,10 +1449,85 @@ function listplug_table_itemlist($vars, $type, $template_name = '')
        {
                $templates =& $manager->getTemplate($template_name);
        }
+>>>>>>> skinnable-master
        
        switch( $type )
        {
                case 'HEAD':
+<<<<<<< HEAD
+                       echo "<th>"._LIST_ITEM_INFO."</th>\n";
+                       echo "<th>"._LIST_ITEM_CONTENT."</th>\n";
+                       echo "<th colspan='1'>"._LISTS_ACTIONS."</th>";
+                       break;
+               case 'BODY':
+                       $current = $template['current'];
+                       // string -> unix timestamp
+                       $current['itime'] = strtotime($current['itime']);
+                       
+                       if ( $current['idraft'] == 1 )
+                       {
+                               $cssclass = " class='draft'";
+                       }
+                       
+                       // (can't use offset time since offsets might vary between blogs)
+                       if ( $current['itime'] > $template['now'] )
+                       {
+                               $cssclass = " class='future'";
+                       }
+                       
+                       echo "<td{$cssclass}>\n";
+                       echo "<dl>\n";
+                       echo '<dt>' . _LIST_ITEM_BLOG . "</dt>\n";
+                       echo '<dd>' . Entity::hsc($current['bshortname']) . "</dd>\n";
+                       echo '<dt>' . _LIST_ITEM_CAT . "</dt>\n";
+                       echo '<dd>' . Entity::hsc($current['cname']) . "</dd>\n";
+                       echo '<dt>' . _LIST_ITEM_AUTHOR . "</dt>\n";
+                       echo '<dd>' . Entity::hsc($current['mname']) . "</dd>\n";
+                       echo '<dt>' . _LIST_ITEM_DATE . "</dt>\n";
+                       echo '<dd>' . date("Y-m-d",$current['itime']) . "</dd>\n";
+                       echo '<dt>' . _LIST_ITEM_TIME . "</dt>\n";
+                       echo '<dd>' . date("H:i",$current['itime']) . "</dd>\n";
+                       echo "</dl>\n";
+                       echo "</td>\n";
+                       
+                       $id = listplug_nextBatchId();
+                       
+                       echo "<td{$cssclass}>\n";
+                       echo "<h3>\n";
+                       echo "<input type=\"checkbox\" id=\"batch{$id}\" name=\"batch[{$id}]\" value=\"{$current['inumber']}\" />\n";
+                       echo "<label for=\"batch{$id}\">" . Entity::hsc(strip_tags($current['ititle'])) . "</label>\n";
+                       echo "</h3>\n";
+                       
+                       $current['ibody'] = strip_tags($current['ibody']);
+                       $current['ibody'] = Entity::hsc(Entity::shorten($current['ibody'], 300, '...'));
+                       echo "<p>{$current['ibody']}</p>\n";
+                       echo "</td>\n";
+                       
+                       echo "<td{$cssclass}>\n";
+                       echo "<ul>\n";
+                       echo "<li><a href=\"index.php?action=itemedit&amp;itemid={$current['inumber']}\">" . _LISTS_EDIT . "</a></li>\n";
+                       
+                       // evaluate amount of comments for the item
+                       $COMMENTS = new Comments($current['inumber']);
+                       $camount = $COMMENTS->amountComments();
+                       if ( $camount > 0 )
+                       {
+                               echo "<li><a href=\"index.php?action=itemcommentlist&amp;itemid={$current['inumber']}\">( ";
+                               echo sprintf(_LIST_ITEM_COMMENTS, $COMMENTS->amountComments()) . " )</a></li>\n";
+                       }
+                       else
+                       {
+                               echo '<li>' . _LIST_ITEM_NOCONTENT . "</li>\n";
+                       }
+                       
+                       echo "<li><a href=\"index.php?action=itemmove&amp;itemid={$current['inumber']}\">" . _LISTS_MOVE . "</a></li>\n";
+                       echo "<li><a href=\"index.php?action=itemdelete&amp;itemid={$current['inumber']}\">" . _LISTS_DELETE . "</a></li>\n";
+                       echo "</ul>\n";
+                       echo "</td>\n";
+                       break;
+       }
+       return;
+=======
                        if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD']) )
                        {
                                $template = "<th><%colinfo%></th>\n"
@@ -1114,6 +1631,7 @@ function listplug_table_itemlist($vars, $type, $template_name = '')
                        break;
        }
        return Template::fill($template, $data);
+>>>>>>> skinnable-master
 }
 
 // for batch operations: generates the index numbers for checkboxes
@@ -1123,6 +1641,251 @@ function listplug_nextBatchId()
        return $id++;
 }
 
+<<<<<<< HEAD
+function listplug_table_commentlist($template, $type)
+{
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo '<th>' . _LISTS_INFO . "</th>\n";
+                       echo '<th>' . _LIST_COMMENT . "</th>\n";
+                       echo '<th colspan="3">' . _LISTS_ACTIONS . "</th>";
+                       break;
+               case 'BODY':
+                       $current = $template['current'];
+                       $current['ctime'] = strtotime($current['ctime']);       // string -> unix timestamp
+                       
+                       echo "<td>\n";
+                       echo "<ul>\n";
+                       echo '<li>' . date("Y-m-d@H:i",$current['ctime']) . "</li>\n";
+                       if ( isset($current['mname']) )
+                       {
+                               echo '<li>' . Entity::hsc($current['mname']) ,' ', _LIST_COMMENTS_MEMBER . "</li>\n";
+                       }
+                       else
+                       {
+                               echo '<li>' . Entity::hsc($current['cuser']) . "</li>\n";
+                       }
+                       if ( isset($current['cmail']) && $current['cmail'] )
+                       {
+                               echo '<li>' . Entity::hsc($current['cmail']) . "</li>\n";
+                       }
+                       if ( isset($current['cemail']) && $current['cemail'] )
+                       {
+                               echo '<li>' . Entity::hsc($current['cemail']) . "</li>\n";
+                       }
+                       echo "</ul>\n";
+                       echo "</td>\n";
+
+                       $id = listplug_nextBatchId();
+                       
+                       echo '<td>';
+                       echo "<input type=\"checkbox\" id=\"batch{$id}\" name=\"batch[{$id}\" value=\"{$current['cnumber']}\" />\n";
+                       echo "<label for=\"batch{$id}\">\n";
+                       $current['cbody'] = strip_tags($current['cbody']);
+                       $current['cbody'] = Entity::hsc(Entity::shorten($current['cbody'], 300, '...'));
+                       echo $current['cbody'];
+                       echo '</label>';
+                       echo '</td>';
+                       
+                       echo '<td><a href="index.php?action=commentedit&amp;commentid=' . $current['cnumber'] . '">' . _LISTS_EDIT . "</a></td>\n";
+                       echo '<td><a href="index.php?action=commentdelete&amp;commentid=' . $current['cnumber'] . '">' . _LISTS_DELETE . "</a></td>\n";
+                       if ( $template['canAddBan'] )
+                       {
+                               echo '<td><a href="index.php?action=banlistnewfromitem&amp;itemid=' . $current['citem'] . '&amp;ip=' . Entity::hsc($current['cip']), '" title="' . Entity::hsc($current['chost']) . '">' . _LIST_COMMENT_BANIP . "</a></td>\n";
+                       }
+                       break;
+       }
+       return;
+}
+
+function listplug_table_bloglist($template, $type)
+{
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo '<th>' . _NAME . "</th>\n";
+                       echo '<th colspan="7">' . _LISTS_ACTIONS . "</th>\n";
+                       break;
+               case 'BODY':
+                       $current = $template['current'];
+                       $current['bname'] = Entity::hsc($current['bname']);
+                       
+                       echo "<td title=\"blogid:{$current['bnumber']} shortname:{$current['bshortname']}\"><a href=\"{$current['burl']}\"><img src=\"images/globe.gif\" width=\"13\" height=\"13\" alt=\"". _BLOGLIST_TT_VISIT."\" /></a>{$current['bname']}</td>\n";
+                       echo "<td><a href=\"index.php?action=createitem&amp;blogid={$current['bnumber']}\" title=\"" . _BLOGLIST_TT_ADD ."\">" . _BLOGLIST_ADD . "</a></td>\n";
+                       echo "<td><a href=\"index.php?action=itemlist&amp;blogid={$current['bnumber']}\" title=\"". _BLOGLIST_TT_EDIT."\">". _BLOGLIST_EDIT."</a></td>\n";
+                       echo "<td><a href=\"index.php?action=blogcommentlist&amp;blogid={$current['bnumber']}\" title=\"". _BLOGLIST_TT_COMMENTS."\">". _BLOGLIST_COMMENTS."</a></td>\n";
+                       echo "<td><a href=\"index.php?action=bookmarklet&amp;blogid={$current['bnumber']}\" title=\"". _BLOGLIST_TT_BMLET."\">". _BLOGLIST_BMLET . "</a></td>\n";
+                       
+                       if ( $current['tadmin'] == 1 )
+                       {
+                               echo "<td><a href=\"index.php?action=blogsettings&amp;blogid={$current['bnumber']}\" title=\"" . _BLOGLIST_TT_SETTINGS . "\">" . _BLOGLIST_SETTINGS . "</a></td>\n";
+                               echo "<td><a href=\"index.php?action=banlist&amp;blogid={$current['bnumber']}\" title=\"" . _BLOGLIST_TT_BANS . "\">" . _BLOGLIST_BANS . "</a></td>\n";
+                       }
+                       
+                       if ( $template['superadmin'] )
+                       {
+                               echo "<td><a href=\"index.php?action=deleteblog&amp;blogid={$current['bnumber']}\" title=\"". _BLOGLIST_TT_DELETE."\">" ._BLOGLIST_DELETE. "</a></td>\n";
+                       }
+                       break;
+       }
+       return;
+}
+
+function listplug_table_shortblognames($template, $type)
+{
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo '<th>' . _EBLOG_SHORTNAME . "</th>\n";
+                       echo '<th>' . _EBLOG_NAME. "</th>";
+                       break;
+               case 'BODY':
+                       $current = $template['current'];
+                       $current['bshortname'] = Entity::hsc($current['bshortname']);
+                       $current['bname'] = Entity::hsc($current['bname']);
+                       
+                       echo "<td>{$current['bshortname']}</td>\n";
+                       echo "<td>{$current['bname']}</td>\n";
+                       break;
+       }
+       return;
+}
+
+function listplug_table_shortnames($template, $type)
+{
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo '<th>' . _NAME . "</th>\n";
+                       echo '<th>' . _LISTS_DESC. "</th>\n";
+                       break;
+               case 'BODY':
+                       $current = $template['current'];
+                       $current['name'] = Entity::hsc($current['name']);
+                       $current['description'] = Entity::hsc($current['description']);
+                       
+                       echo "<td>{$current['name']}</td>\n";
+                       echo "<td>{$current['description']}</td>\n";
+                       break;
+       }
+       return;
+}
+
+
+function listplug_table_categorylist($template, $type)
+{
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo '<th>' . _LISTS_NAME . "</th>";
+                       echo '<th>' . _LISTS_DESC."</th>\n";
+                       echo '<th colspan="2">' . _LISTS_ACTIONS . "</th>\n";
+                       break;
+               case 'BODY':
+                       $id = listplug_nextBatchId();
+                       
+                       $current = $template['current'];
+                       $current['cname'] = Entity::hsc($current['cname']);
+                       $current['cdesc'] = Entity::hsc($current['cdesc']);
+                       
+                       echo "<td>\n";
+                       echo "<input type=\"checkbox\" id=\"batch{$id}\" name=\"batch[{$id}]\" value=\"{$current['catid']}\" />\n";
+                       echo "<label for=\"batch{$id}\">{$current['cname']}</label>\n";
+                       echo "</td>\n";
+                       echo "<td>{$current['cdesc']}</td>\n";
+                       echo "<td><a href=\"index.php?action=categoryedit&amp;blogid={$current['cblog']}&amp;catid={$current['catid']}\" tabindex=\"{$template['tabindex']}\">" . _LISTS_EDIT . "</a></td>\n";
+                       echo "<td><a href=\"index.php?action=categorydelete&amp;blogid={$current['cblog']}&amp;catid={$current['catid']}\" tabindex=\"{$template['tabindex']}\">" . _LISTS_DELETE . "</a></td>\n";
+                       break;
+       }
+       return;
+}
+
+function listplug_table_templatelist($template, $type)
+{
+       global $manager;
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo '<th>' . _LISTS_NAME . "</th>\n";
+                       echo '<th>' . _LISTS_DESC . "</th>\n";
+                       echo '<th colspan="3">' . _LISTS_ACTIONS . "</th>\n";
+                       break;
+               case 'BODY':
+                       $current = $template['current'];
+                       $current['tdnumber'] = (integer) $current['tdnumber'];
+                       $current['tdname'] = Entity::hsc($current['tdname']);
+                       $current['tddesc'] = Entity::hsc($current['tddesc']);
+                       
+                       $url = "index.php?action=templateclone&templateid={$current['tdnumber']}";
+                       $url = Entity::hsc($manager->addTicketToUrl($url));
+                       
+                       echo "<td>{$current['tdname']}</td>\n";
+                       echo "<td>{$current['tddesc']}</td>\n";
+                       echo "<td>\n";
+                       echo "<a href=\"index.php?action=templateedit&amp;templateid={$current['tdnumber']}\" tabindex=\"{$template['tabindex']}\">" . _LISTS_EDIT . "</a>\n";
+                       echo "</td>\n";
+                       echo "<td>\n";
+                       echo "<a href=\"{$url}\" tabindex=\"{$template['tabindex']}\">" . _LISTS_CLONE . "</a>\n";
+                       echo "</td>\n";
+                       echo "<td>\n";
+                       echo "<a href=\"index.php?action=templatedelete&amp;templateid={$current['tdnumber']}\" tabindex=\"{$template['tabindex']}\">" . _LISTS_DELETE . "</a>\n";
+                       echo "</td>\n";
+                       break;
+       }
+       return;
+}
+
+function listplug_table_skinlist($template, $type)
+{
+       global $CONF, $DIR_SKINS, $manager;
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo '<th>' . _LISTS_NAME . "</th>\n";
+                       echo '<th>' . _LISTS_DESC . "</th>\n";
+                       echo '<th colspan="3">' . _LISTS_ACTIONS . "</th>\n";
+                       break;
+               case 'BODY':
+                       $current = $template['current'];
+                       $current['sdnumber'] = (integer) $current['sdnumber'];
+                       $current['sdname'] = Entity::hsc($current['sdname']);
+                       $current['sdtype'] = Entity::hsc($current['sdtype']);
+                       
+                       echo "<td>\n";
+                       
+                       // use a special style for the default skin
+                       if ( $current['sdnumber'] == $CONF['BaseSkin'] )
+                       {
+                               echo '<h3 id="base_skin">' . $current['sdname'] . "</h3>\n";
+                       }
+                       else
+                       {
+                               echo '<h3>' . $current['sdname'] . "</h3>\n";
+                       }
+                       
+                       echo "<dl>\n";
+                       echo '<dt>' . _LISTS_TYPE . "</dt>\n";
+                       echo '<dd>' . $current['sdtype'] . "</dd>\n";
+                       
+                       echo '<dt>' . _LIST_SKINS_INCMODE . "</dt>\n";
+                       
+                       if ( $current['sdincmode'] == 'skindir' )
+                       {
+                               echo '<dd>' . _PARSER_INCMODE_SKINDIR . "</dd>\n";
+                       }
+                       else
+                       {
+                               echo '<dd>' . _PARSER_INCMODE_NORMAL . "</dd>\n";
+                       }
+                       
+                       if ( $current['sdincpref'] )
+                       {
+                               echo '<dt>' . _LIST_SKINS_INCPREFIX . "</dt>\n";
+                               echo '<dd>' . Entity::hsc($current['sdincpref']) . "</dd>\n";
+                       }
+                       echo "</dl>\n";
+=======
 function listplug_table_commentlist($vars, $type, $template_name = '')
 {
        global $manager;
@@ -1708,28 +2471,67 @@ function listplug_table_skinlist($vars, $type, $template_name = '')
                        {
                                $data['skinname'] = '<strong>' . Entity::hsc($current['sdname']) . '</strong>';
                        }
+>>>>>>> skinnable-master
                        
                        // add preview image when present
                        if ( $current['sdincpref'] && @file_exists("{$DIR_SKINS}{$current['sdincpref']}preview.png") )
                        {
+<<<<<<< HEAD
+                               echo "<p>\n";
+=======
                                $data['skinthumb'] = "<p>\n";
+>>>>>>> skinnable-master
                                
                                $alternatve_text = sprintf(_LIST_SKIN_PREVIEW, $current['sdname']);
                                $has_enlargement = @file_exists($DIR_SKINS . $current['sdincpref'] . 'preview-large.png');
                                if ( $has_enlargement )
                                {
+<<<<<<< HEAD
+                                       echo '<a href="',$CONF['SkinsURL'], Entity::hsc($current['sdincpref']),'preview-large.png" title="' . _LIST_SKIN_PREVIEW_VIEWLARGER . "\">\n";
+                                       echo '<img class="skinpreview" src="',$CONF['SkinsURL'], Entity::hsc($current['sdincpref']),'preview.png" width="100" height="75" alt="' . $alternatve_text . "\" />\n";
+                                       echo "</a><br />\n";
+                               }
+                               else
+                               {
+                                       echo '<img class="skinpreview" src="',$CONF['SkinsURL'], Entity::hsc($current['sdincpref']),'preview.png" width="100" height="75" alt="' . $alternatve_text . "\" /><br />\n";
+=======
                                        $data['skinthumb'] .= '<a href="' . $CONF['SkinsURL'] . Entity::hsc($current['sdincpref']) . 'preview-large.png" title="' . _LIST_SKIN_PREVIEW_VIEWLARGER . "\">\n";
                                }
                                $data['skinthumb'] .= '<img class="skinpreview" src="' . $CONF['SkinsURL'] . Entity::hsc($current['sdincpref']) . 'preview.png" width="100" height="75" alt="' . $alternatve_text . "\" />\n";
                                if ( $has_enlargement )
                                {
                                        $data['skinthumb'] .= "</a><br />\n";
+>>>>>>> skinnable-master
                                }
                                
                                if ( @file_exists("{$DIR_SKINS}{$current['sdincpref']}readme.html") )
                                {
                                        $url = $CONF['SkinsURL'] . Entity::hsc($current['sdincpref']) . 'readme.html';
                                        $title = sprintf(_LIST_SKIN_README, $current['sdname']);
+<<<<<<< HEAD
+                                       echo "<a href=\"{$url}\" title=\"{$title}\">" . _LIST_SKIN_README_TXT . "</a>\n";
+                               }
+                               
+                               echo "</p>\n";
+                       }
+                       
+                       echo "</td>\n";
+                       
+                       echo "<td>\n";
+                       echo '<p>' . Entity::hsc($current['sddesc']) . "</p>\n";
+                       
+                       /* make list of defined skins */
+                       $skin = new Skin($current['sdnumber']);
+                       $available_skin_types = $skin->getAvailableTypes();
+                       
+                       echo _LIST_SKINS_DEFINED;
+                       echo "<ul>\n";
+                       foreach ( $available_skin_types as $type => $friendlyName )
+                       {
+                               if ( $friendlyName === FALSE )
+                               {
+                                       $friendlyName = ucfirst($type);
+=======
                                        $data['readme'] = "<a href=\"{$url}\" title=\"{$title}\">" . _LIST_SKIN_README_TXT . "</a>\n";
                                }
                                else
@@ -1750,12 +2552,131 @@ function listplug_table_skinlist($vars, $type, $template_name = '')
                                if ( $label === FALSE )
                                {
                                        $label = ucfirst($type);
+>>>>>>> skinnable-master
                                        $article = 'skinpartspecial';
                                }
                                else
                                {
                                        $article = "skinpart{$type}";
                                }
+<<<<<<< HEAD
+                               echo "<li>\n";
+                               echo helpHtml($article) . "\n";
+                               echo "<a href=\"index.php?action=skinedittype&amp;skinid={$current['sdnumber']}&amp;type={$type}\" tabindex=\"{$template['tabindex']}\">";
+                               echo Entity::hsc($friendlyName);
+                               echo "</a>\n";
+                               echo "</li>\n";
+                       }
+                       echo "</ul>\n";
+                       
+                       echo "</td>";
+                       echo "<td>\n";
+                       echo "<a href=\nindex.php?action=skinedit&amp;skinid={$current['sdnumber']}\n tabindex=\n{$template['tabindex']}>" . _LISTS_EDIT . "</a>\n";
+                       echo "</td>\n";
+                       
+                       $url = "index.php?action=skinclone&skinid={$current['sdnumber']}";
+                       $url = Entity::hsc($manager->addTicketToUrl($url));
+                       echo "<td>\n";
+                       echo "<a href=\"{$url}\" tabindex=\"{$template['tabindex']}\">" . _LISTS_CLONE . "</a>\n";
+                       echo "</td>\n";
+                       echo "<td>\n";
+                       echo "<a href=\"index.php?action=skindelete&amp;skinid={$current['sdnumber']}\" tabindex=\"{$template['tabindex']}\">" . _LISTS_DELETE . "</a></td>\n";
+                       break;
+       }
+       return;
+}
+
+function listplug_table_draftlist($template, $type)
+{
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo '<th>' . _LISTS_BLOG . "</th>\n";
+                       echo '<th>' . _LISTS_TITLE . "</th>\n";
+                       echo '<th colspan="2">' . _LISTS_ACTIONS . "</th>\n";
+                       break;
+               case 'BODY':
+                       $current = $template['current'];
+                       $current['bshortname'] = Entity::hsc($current['bshortname']);
+                       $current['ititle'] = Entity::hsc(strip_tags($current['ititle']));
+                       
+                       echo "<td>{$current['bshortname']}</td>\n";
+                       echo "<td>{$current['ititle']}</td>\n";
+                       echo "<td><a href=\"index.php?action=itemedit&amp;itemid={$current['inumber']}\">" . _LISTS_EDIT . "</a></td>\n";
+                       echo "<td><a href=\"index.php?action=itemdelete&amp;itemid={$current['inumber']}\">" . _LISTS_DELETE . "</a></td>\n";
+                       break;
+       }
+       return;
+}
+
+function listplug_table_otherdraftlist($template, $type)
+{
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo '<th>' . _LISTS_BLOG . "</th>\n";
+                       echo '<th>' . _LISTS_TITLE . "</th>\n";
+                       echo '<th>' . _LISTS_AUTHOR . "</th>\n";
+                       echo '<th colspan="2">' . _LISTS_ACTIONS . "</th>\n";
+                       break;
+               case 'BODY':
+                       $current = $template['current'];
+                       $current['bshortname'] = Entity::hsc($current['bshortname']);
+                       $current['ititle'] = Entity::hsc(strip_tags($current['ititle']));
+                       $current['mname'] = Entity::hsc($current['mname']);
+                       
+                       echo "<td>{$current['bshortname']}</td>\n";
+                       echo "<td>{$current['ititle']}</td>\n";
+                       echo "<td>{$current['mname']}</td>\n";
+                       echo "<td><a href=\"index.php?action=itemedit&amp;itemid={$current['inumber']}\">" . _LISTS_EDIT . "</a></td>\n";
+                       echo "<td><a href=\"index.php?action=itemdelete&amp;itemid={$current['inumber']}\">" . _LISTS_DELETE . "</a></td>\n";
+                       break;
+       }
+       return;
+}
+
+function listplug_table_actionlist($template, $type)
+{
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo '<th>' . _LISTS_TIME . "</th>\n";
+                       echo '<th>' . _LIST_ACTION_MSG . "</th>\n";
+                       break;
+               case 'BODY':
+                       $current = $template['current'];
+                       $current['timestamp'] = Entity::hsc($current['timestamp']);
+                       $current['message'] = Entity::hsc($current['message']);
+                       
+                       echo "<td>{$current['timestamp']}</td>\n";
+                       echo "<td>{$current['message']}</td>\n";
+                       break;
+       }
+       return;
+}
+
+function listplug_table_banlist($template, $type)
+{
+       switch( $type )
+       {
+               case 'HEAD':
+                       echo '<th>' . _LIST_BAN_IPRANGE . "</th>\n";
+                       echo '<th>' . _LIST_BAN_REASON."</th>\n";
+                       echo '<th>' . _LISTS_ACTIONS . "</th>\n";
+                       break;
+               case 'BODY':
+                       $current = $template['current'];
+                       $current['blogid'] = (integer) $current['blogid'];
+                       $current['iprange'] = Entity::hsc($current['iprange']);
+                       $current['reason'] = Entity::hsc($current['reason']);
+                       
+                       echo "<td>{$current['iprange']}</td>\n";
+                       echo "<td>{$current['reason']}</td>\n";
+                       echo '<td><a href="index.php?action=banlistdelete&amp;blogid=' . $current['blogid'] . '&amp;iprange=' . Entity::hsc($current['iprange']) . '">' . _LISTS_DELETE . "</a></td>\n";
+                       break;
+       }
+       return;
+=======
                                $data['skinparts'] .= "<li>\n"
                                                   . helpHtml($article) . "\n"
                                                   . "<a href=\"{$CONF['AdminURL']}index.php?action={$vars['edittypeaction']}&amp;skinid={$current['sdnumber']}&amp;type={$type}\" tabindex=\"{$vars['tabindex']}\">"
@@ -2461,4 +3382,5 @@ function listplug_navlist($attribute, $query, $type, $vars, $template_name)
        $template .= Template::fill($navi, $dat);
        
        return $template;
+>>>>>>> skinnable-master
 }
index 8e7e8a1..03be6c1 100644 (file)
@@ -1,3 +1,749 @@
+<<<<<<< HEAD
+<?php\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ *     This class contains two classes that can be used for importing and\r
+ *     exporting Nucleus skins: SKINIMPORT and SKINEXPORT\r
+ *\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
+ * @version $Id: skinie.php 1624 2012-01-09 11:36:20Z sakamocchi $\r
+ */\r
+\r
+class SkinImport\r
+{\r
+       // hardcoded value (see constructor). When 1, interesting info about the\r
+       // parsing process is sent to the output\r
+       private $debug;\r
+       \r
+       // parser/file pointer\r
+       private $parser;\r
+       private $fp;\r
+       \r
+       // parset internal charset, US-ASCII/ISO-8859-1/UTF-8\r
+       private $parse_charset = 'UTF-8';\r
+       \r
+       // which data has been read?\r
+       private $metaDataRead;\r
+       private $allRead;\r
+       \r
+       // extracted data\r
+       private $skins;\r
+       private $templates;\r
+       private $info;\r
+       \r
+       // to maintain track of where we are inside the XML file\r
+       private $inXml;\r
+       private $inData;\r
+       private $inMeta;\r
+       private $inSkin;\r
+       private $inTemplate;\r
+       private $currentName;\r
+       private $currentPartName;\r
+       private $cdata;\r
+       \r
+       /**\r
+        * constructor initializes data structures\r
+        */\r
+       public function __construct()\r
+       {\r
+               // disable magic_quotes_runtime if it's turned on\r
+               //set_magic_quotes_runtime(0);\r
+               if ( version_compare(PHP_VERSION, '5.3.0', '<') )\r
+               {\r
+                       ini_set('magic_quotes_runtime', '0');\r
+               }\r
+               \r
+               // debugging mode?\r
+               $this->debug = 0;\r
+               \r
+               $this->reset();\r
+               return;\r
+       }\r
+       \r
+       public function __destruct()\r
+       {\r
+               return;\r
+       }\r
+       \r
+       public function reset()\r
+       {\r
+               if ( $this->parser )\r
+               {\r
+                       xml_parser_free($this->parser);\r
+               }\r
+               \r
+               // XML file pointer\r
+               $this->fp = 0;\r
+               \r
+               // which data has been read?\r
+               $this->metaDataRead = 0;\r
+               $this->allRead = 0;\r
+               \r
+               // to maintain track of where we are inside the XML file\r
+               $this->inXml = 0;\r
+               $this->inData = 0;\r
+               $this->inMeta = 0;\r
+               $this->inSkin = 0;\r
+               $this->inTemplate = 0;\r
+               $this->currentName = '';\r
+               $this->currentPartName = '';\r
+               \r
+               // character data pile\r
+               $this->cdata = '';\r
+               \r
+               // list of skinnames and templatenames (will be array of array)\r
+               $this->skins = array();\r
+               $this->templates = array();\r
+               \r
+               // extra info included in the XML files (e.g. installation notes)\r
+               $this->info = '';\r
+               \r
+               // init XML parser, this parser deal with characters as encoded by UTF-8\r
+               $this->parser = xml_parser_create($this->parse_charset);\r
+               xml_set_object($this->parser, $this);\r
+               xml_set_element_handler($this->parser, 'start_element', 'end_element');\r
+               xml_set_character_data_handler($this->parser, 'character_data');\r
+               xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);\r
+               \r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Reads an XML file into memory\r
+        *\r
+        * @param $filename\r
+        *              Which file to read\r
+        * @param $metaOnly\r
+        *              Set to 1 when only the metadata needs to be read (optional, default 0)\r
+        */\r
+       public function readFile($filename, $metaOnly = 0)\r
+       {\r
+               // open file\r
+               $this->fp = @fopen($filename, 'r');\r
+               if ( !$this->fp )\r
+               {\r
+                       return _SKINIE_ERROR_FAILEDOPEN_FILEURL;\r
+               }\r
+               \r
+               // here we go!\r
+               $this->inXml = 1;\r
+               \r
+               $tempbuffer = null;\r
+               \r
+               while ( !feof($this->fp) )\r
+               {\r
+                       $tempbuffer .= fread($this->fp, 4096);\r
+               }\r
+               fclose($this->fp);\r
+               \r
+               /*\r
+                * NOTE: conver character set.\r
+                * We hope all characters in the file also includes UTF-8 coded character set,\r
+                *  because this PHP extension implements support for James Clark's expat in PHP\r
+                *   and it supports juust US-ASCII, ISO-8859-1, UTF-8 character coding scheme.\r
+                */\r
+               if ( i18n::get_current_charset() != $this->parse_charset )\r
+               {\r
+                       $tempbuffer = i18n::convert($tempbuffer, i18n::get_current_charset(), $this->parse_charset);\r
+               }\r
+               \r
+               $temp = tmpfile();\r
+               fwrite($temp, $tempbuffer);\r
+               rewind($temp);\r
+               \r
+               while ( ($buffer = fread($temp, 4096) )\r
+                && (!$metaOnly || ($metaOnly && !$this->metaDataRead)) )\r
+                {\r
+                       $err = xml_parse( $this->parser, $buffer, feof($temp) );\r
+                       if ( !$err && $this->debug )\r
+                       {\r
+                               echo 'ERROR: ', xml_error_string(xml_get_error_code($this->parser)), '<br />';\r
+                       }\r
+               }\r
+               \r
+               // all done\r
+               $this->inXml = 0;\r
+               fclose($temp);\r
+               \r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Returns the list of skin names\r
+        */\r
+       public function getSkinNames()\r
+       {\r
+               return array_keys($this->skins);\r
+       }\r
+       \r
+       /**\r
+        * Returns the list of template names\r
+        */\r
+       public function getTemplateNames()\r
+       {\r
+               return array_keys($this->templates);\r
+       }\r
+       \r
+       /**\r
+        * Returns the extra information included in the XML file\r
+        */\r
+       public function getInfo()\r
+       {\r
+               return $this->info;\r
+       }\r
+       \r
+       /**\r
+        * Writes the skins and templates to the database\r
+        *\r
+        * @param $allowOverwrite\r
+        *              set to 1 when allowed to overwrite existing skins with the same name\r
+        *              (default = 0)\r
+        */\r
+       public function writeToDatabase($allowOverwrite = 0)\r
+       {\r
+               $existingSkins = $this->checkSkinNameClashes();\r
+               $existingTemplates = $this->checkTemplateNameClashes();\r
+               $invalidSkinNames = $this->checkSkinNamesValid();\r
+               $invalidTemplateNames = $this->checkTemplateNamesValid();\r
+               \r
+               // if there are invalid skin or template names, stop executioin and return and error\r
+               if ( (sizeof($invalidSkinNames) > 0) || (sizeof($invalidTemplateNames) > 0) )\r
+               {\r
+                       $inames_error = "<p>"._SKINIE_INVALID_NAMES_DETECTED."</p>\n";\r
+                       $inames_error .= "<ul>";\r
+                       foreach( $invalidSkinNames as $sName )\r
+                       {\r
+                               $inames_error .= "<li>".Entity::hsc($sName)."</li>";\r
+                       }\r
+                       foreach( $invalidTemplateNames as $sName )\r
+                       {\r
+                               $inames_error .= "<li>".Entity::hsc($sName)."</li>";\r
+                       }\r
+                       $inames_error .= "</ul>";\r
+                       return $inames_error;\r
+               }\r
+               \r
+               // if not allowed to overwrite, check if any nameclashes exists\r
+               if ( !$allowOverwrite )\r
+               {\r
+                       if ( (sizeof($existingSkins) > 0) || (sizeof($existingTemplates) > 0) )\r
+                       {\r
+                               return _SKINIE_NAME_CLASHES_DETECTED;\r
+                       }\r
+               }\r
+               \r
+               foreach ( $this->skins as $skinName => $data )\r
+               {\r
+                       // 1. if exists: delete all part data, update desc data\r
+                       //    if not exists: create desc\r
+                       if ( in_array($skinName, $existingSkins) )\r
+                       {\r
+                               $skinObj = SKIN::createFromName($skinName);\r
+                               \r
+                               // delete all parts of the skin\r
+                               $skinObj->deleteAllParts();\r
+                               \r
+                               // update general info\r
+                               $skinObj->updateGeneralInfo(\r
+                                       $skinName,\r
+                                       $data['description'],\r
+                                       $data['type'],\r
+                                       $data['includeMode'],\r
+                                       $data['includePrefix']\r
+                               );\r
+                       }\r
+                       else\r
+                       {\r
+                               $skinid = SKIN::createNew(\r
+                                       $skinName,\r
+                                       $data['description'],\r
+                                       $data['type'],\r
+                                       $data['includeMode'],\r
+                                       $data['includePrefix']\r
+                               );\r
+                               $skinObj = new SKIN($skinid);\r
+                       }\r
+                       \r
+                       // 2. add parts\r
+                       foreach ( $data['parts'] as $partName => $partContent )\r
+                       {\r
+                               $skinObj->update($partName, $partContent);\r
+                       }\r
+               }\r
+               \r
+               foreach ( $this->templates as $templateName => $data )\r
+               {\r
+                       // 1. if exists: delete all part data, update desc data\r
+                       //    if not exists: create desc\r
+                       if ( in_array($templateName, $existingTemplates) )\r
+                       {\r
+                               $templateObj = Template::createFromName($templateName);\r
+                               \r
+                               // delete all parts of the template\r
+                               $templateObj->deleteAllParts();\r
+                               \r
+                               // update general info\r
+                               $templateObj->updateGeneralInfo($templateName, $data['description']);\r
+                       }\r
+                       else\r
+                       {\r
+                               $templateid = Template::createNew($templateName, $data['description']);\r
+                               $templateObj = new Template($templateid);\r
+                       }\r
+                       \r
+                       // 2. add parts\r
+                       foreach ( $data['parts'] as $partName => $partContent )\r
+                       {\r
+                               $templateObj->update($partName, $partContent);\r
+                       }\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+         * returns an array of all the skin nameclashes (empty array when no name clashes)\r
+         */\r
+       public function checkSkinNameClashes()\r
+       {\r
+               $clashes = array();\r
+               \r
+               foreach ( $this->skins as $skinName => $data )\r
+               {\r
+                       if ( SKIN::exists($skinName) )\r
+                       {\r
+                               array_push($clashes, $skinName);\r
+                       }\r
+               }\r
+               return $clashes;\r
+       }\r
+       \r
+       /**\r
+         * returns an array of all the template nameclashes\r
+         * (empty array when no name clashes)\r
+         */\r
+       public function checkTemplateNameClashes()\r
+       {\r
+               $clashes = array();\r
+               \r
+               foreach ( $this->templates as $templateName => $data )\r
+               {\r
+                       if ( Template::exists($templateName) )\r
+                       {\r
+                               array_push($clashes, $templateName);\r
+                       }\r
+               }\r
+               return $clashes;\r
+       }\r
+       \r
+       /**\r
+         * returns an array of all the invalid skin names (empty array when no invalid names )\r
+         */\r
+       private function checkSkinNamesValid()\r
+       {\r
+               $notValid = array();\r
+               \r
+               foreach ( $this->skins as $skinName => $data )\r
+               {\r
+                       if ( !isValidSkinName($skinName) )\r
+                       {\r
+                               array_push($notValid, $skinName);\r
+                       }\r
+               }\r
+               return $notValid;\r
+       }\r
+       \r
+       /**\r
+         * returns an array of all the invalid template names (empty array when no invalid names )\r
+         */\r
+       private function checkTemplateNamesValid()\r
+       {\r
+               $notValid = array();\r
+               \r
+               foreach ( $this->templates as $templateName => $data )\r
+               {\r
+                       if ( !isValidTemplateName($templateName) )\r
+                       {\r
+                               array_push($notValid, $templateName);\r
+                       }\r
+               }\r
+               return $notValid;\r
+       }\r
+       \r
+       /**\r
+        * Called by XML parser for each new start element encountered\r
+        */\r
+       private function start_element($parser, $name, $attrs)\r
+       {\r
+               foreach( $attrs as $key=>$value )\r
+               {\r
+                       if ( $this->parse_charset != i18n::get_current_charset() )\r
+                       {\r
+                               $name = i18n::convert($name, $this->parse_charset, i18n::get_current_charset());\r
+                               $value = i18n::convert($value, $this->parse_charset, i18n::get_current_charset());\r
+                       }\r
+                       \r
+                       $attrs[$key] = $value;\r
+               }\r
+               \r
+               if ( $this->debug )\r
+               {\r
+                       echo 'START: ', Entity::hsc($name), '<br />';\r
+               }\r
+               \r
+               switch ( $name )\r
+               {\r
+                       case 'nucleusskin':\r
+                               $this->inData = 1;\r
+                               break;\r
+                       case 'meta':\r
+                               $this->inMeta = 1;\r
+                               break;\r
+                       case 'info':\r
+                               // no action needed\r
+                               break;\r
+                       case 'skin':\r
+                               if ( !$this->inMeta )\r
+                               {\r
+                                       $this->inSkin = 1;\r
+                                       $this->currentName = $attrs['name'];\r
+                                       $this->skins[$this->currentName]['type'] = $attrs['type'];\r
+                                       $this->skins[$this->currentName]['includeMode'] = $attrs['includeMode'];\r
+                                       $this->skins[$this->currentName]['includePrefix'] = $attrs['includePrefix'];\r
+                                       $this->skins[$this->currentName]['parts'] = array();\r
+                               }\r
+                               else\r
+                               {\r
+                                       $this->skins[$attrs['name']] = array();\r
+                                       $this->skins[$attrs['name']]['parts'] = array();\r
+                               }\r
+                               break;\r
+                       case 'template':\r
+                               if ( !$this->inMeta )\r
+                               {\r
+                                       $this->inTemplate = 1;\r
+                                       $this->currentName = $attrs['name'];\r
+                                       $this->templates[$this->currentName]['parts'] = array();\r
+                               }\r
+                               else\r
+                               {\r
+                                       $this->templates[$attrs['name']] = array();\r
+                                       $this->templates[$attrs['name']]['parts'] = array();\r
+                               }\r
+                               break;\r
+                       case 'description':\r
+                               // no action needed\r
+                               break;\r
+                       case 'part':\r
+                               $this->currentPartName = $attrs['name'];\r
+                               break;\r
+                       default:\r
+                               echo _SKINIE_SEELEMENT_UNEXPECTEDTAG . Entity::hsc($name) . '<br />';\r
+                               break;\r
+               }\r
+               // character data never contains other tags\r
+               $this->clear_character_data();\r
+               return;\r
+       }\r
+       \r
+       /**\r
+         * Called by the XML parser for each closing tag encountered\r
+         */\r
+       private function end_element($parser, $name)\r
+       {\r
+               if ( $this->debug )\r
+               {\r
+                       echo 'END: ' . Entity::hsc($name) . '<br />';\r
+               }\r
+               \r
+               if ( $this->parse_charset != i18n::get_current_charset() )\r
+               {\r
+                       $name = i18n::convert($name, $this->parse_charset, i18n::get_current_charset());\r
+                       $charset_data = i18n::convert($this->get_character_data(), $this->parse_charset, i18n::get_current_charset());\r
+               }\r
+               else\r
+               {\r
+                       $charset_data = $this->get_character_data();\r
+               }\r
+               \r
+               switch ( $name )\r
+               {\r
+                       case 'nucleusskin':\r
+                               $this->inData = 0;\r
+                               $this->allRead = 1;\r
+                               break;\r
+                       case 'meta':\r
+                               $this->inMeta = 0;\r
+                               $this->metaDataRead = 1;\r
+                               break;\r
+                       case 'info':\r
+                               $this->info = $charset_data;\r
+                       case 'skin':\r
+                               if ( !$this->inMeta )\r
+                               {\r
+                                       $this->inSkin = 0;\r
+                               }\r
+                               break;\r
+                       case 'template':\r
+                               if ( !$this->inMeta )\r
+                               {\r
+                                       $this->inTemplate = 0;\r
+                               }\r
+                               break;\r
+                       case 'description':\r
+                               if ( $this->inSkin )\r
+                               {\r
+                                       $this->skins[$this->currentName]['description'] = $charset_data;\r
+                               }\r
+                               else\r
+                               {\r
+                                       $this->templates[$this->currentName]['description'] = $charset_data;\r
+                               }\r
+                               break;\r
+                       case 'part':\r
+                               if ( $this->inSkin )\r
+                               {\r
+                                       $this->skins[$this->currentName]['parts'][$this->currentPartName] = $charset_data;\r
+                               }\r
+                               else\r
+                               {\r
+                                       $this->templates[$this->currentName]['parts'][$this->currentPartName] = $charset_data;\r
+                               }\r
+                               break;\r
+                       default:\r
+                               echo _SKINIE_SEELEMENT_UNEXPECTEDTAG . Entity::hsc($name) . '<br />';\r
+                               break;\r
+               }\r
+               $this->clear_character_data();\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Called by XML parser for data inside elements\r
+        */\r
+       private function character_data ($parser, $data)\r
+       {\r
+               if ( $this->debug )\r
+               {\r
+                       echo 'NEW DATA: ' . Entity::hsc($data) . '<br />';\r
+               }\r
+               $this->cdata .= $data;\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Returns the data collected so far\r
+        */\r
+       private function get_character_data()\r
+       {\r
+               return $this->cdata;\r
+       }\r
+       \r
+       /**\r
+        * Clears the data buffer\r
+        */\r
+       private function clear_character_data()\r
+       {\r
+               $this->cdata = '';\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * Static method that looks for importable XML files in subdirs of the given dir\r
+        */\r
+       static public function searchForCandidates($dir)\r
+       {\r
+               $candidates = array();\r
+               \r
+               $dirhandle = opendir($dir);\r
+               while ( $filename = readdir($dirhandle) )\r
+               {\r
+                       if ( @is_dir($dir . $filename) && ($filename != '.') && ($filename != '..') )\r
+                       {\r
+                               $xml_file = $dir . $filename . '/skinbackup.xml';\r
+                               if ( file_exists($xml_file) && is_readable($xml_file) )\r
+                               {\r
+                                       //$xml_file;\r
+                                       $candidates[$filename] = $filename;\r
+                               }\r
+                               \r
+                               // backwards compatibility\r
+                               $xml_file = $dir . $filename . '/skindata.xml';\r
+                               if ( file_exists($xml_file) && is_readable($xml_file) )\r
+                               {\r
+                                       //$xml_file;\r
+                                       $candidates[$filename] = $filename;\r
+                               }\r
+                       }\r
+               }\r
+               closedir($dirhandle);\r
+               return $candidates;\r
+       }\r
+}\r
+\r
+class SkinExport\r
+{\r
+       private $templates;\r
+       private $skins;\r
+       private $info;\r
+       \r
+       /**\r
+        * Constructor initializes data structures\r
+        */\r
+       public function __construct()\r
+       {\r
+               // list of templateIDs to export\r
+               $this->templates = array();\r
+               \r
+               // list of skinIDs to export\r
+               $this->skins = array();\r
+               \r
+               // extra info to be in XML file\r
+               $this->info = '';\r
+       }\r
+       \r
+       /**\r
+        * Adds a template to be exported\r
+        *\r
+        * @param id\r
+        *              template ID\r
+        * @result false when no such ID exists\r
+        */\r
+       public function addTemplate($id)\r
+       {\r
+               if ( !Template::existsID($id) )\r
+               {\r
+                       return 0;\r
+               }\r
+               \r
+               $this->templates[$id] = Template::getNameFromId($id);\r
+               return 1;\r
+       }\r
+       \r
+       /**\r
+        * Adds a skin to be exported\r
+        *\r
+        * @param id\r
+        *              skin ID\r
+        * @result false when no such ID exists\r
+        */\r
+       public function addSkin($id)\r
+       {\r
+               if ( !SKIN::existsID($id) )\r
+               {\r
+                       return 0;\r
+               }\r
+               \r
+               $this->skins[$id] = SKIN::getNameFromId($id);\r
+               return 1;\r
+       }\r
+       \r
+       /**\r
+        * Sets the extra info to be included in the exported file\r
+        */\r
+       public function setInfo($info)\r
+       {\r
+               $this->info = $info;\r
+       }\r
+       \r
+       /**\r
+        * Outputs the XML contents of the export file\r
+        *\r
+        * @param $setHeaders\r
+        *              set to 0 if you don't want to send out headers\r
+        *              (optional, default 1)\r
+        */\r
+       public function export($setHeaders = 1)\r
+       {\r
+               if ( $setHeaders )\r
+               {\r
+                       // make sure the mimetype is correct, and that the data does not show up\r
+                       // in the browser, but gets saved into and XML file (popup download window)\r
+                       header('Content-Type: text/xml; charset=' . i18n::get_current_charset());\r
+                       header('Content-Disposition: attachment; filename="skinbackup.xml"');\r
+                       header('Expires: 0');\r
+                       header('Pragma: no-cache');\r
+               }\r
+               \r
+               echo "<nucleusskin>\n";\r
+               \r
+               // meta\r
+               echo "\t<meta>\n";\r
+               // skins\r
+               foreach ( $this->skins as $skinId => $skinName )\r
+               {\r
+                       echo "\t\t" . '<skin name="' . Entity::hsc($skinName) . '" />' . "\n";\r
+               }\r
+               // templates\r
+               foreach ( $this->templates as $templateId => $templateName )\r
+               {\r
+                       echo "\t\t" . '<template name="' . Entity::hsc($templateName) . '" />' . "\n";\r
+               }\r
+               // extra info\r
+               if ( $this->info )\r
+               {\r
+                       echo "\t\t<info><![CDATA[" . $this->info . "]]></info>\n";\r
+               }\r
+               echo "\t</meta>\n\n\n";\r
+               \r
+               // contents skins\r
+               foreach ($this->skins as $skinId => $skinName)\r
+               {\r
+                       $skinId = intval($skinId);\r
+                       $skinObj = new SKIN($skinId);\r
+                       \r
+                       echo "\t" . '<skin name="' . Entity::hsc($skinName) . '" type="' . Entity::hsc($skinObj->getContentType()) . '" includeMode="' . Entity::hsc($skinObj->getIncludeMode()) . '" includePrefix="' . Entity::hsc($skinObj->getIncludePrefix()) . '">' . "\n";\r
+                       echo "\t\t<description>" . Entity::hsc($skinObj->getDescription()) . "</description>\n";\r
+                       \r
+                       $res = DB::getResult('SELECT stype, scontent FROM '. sql_table('skin') .' WHERE sdesc=' . $skinId);\r
+                       foreach ( $res as $row )\r
+                       {\r
+                               echo "\t\t" . '<part name="',Entity::hsc($row['stype']) . '">';\r
+                               echo '<![CDATA[' . $this->escapeCDATA($row['scontent']) . ']]>';\r
+                               echo "</part>\n\n";\r
+                       }\r
+                       echo "\t</skin>\n\n\n";\r
+               }\r
+               \r
+               // contents templates\r
+               foreach ( $this->templates as $templateId => $templateName )\r
+               {\r
+                       $templateId = intval($templateId);\r
+                       \r
+                       echo "\t" . '<template name="' . Entity::hsc($templateName) . '">' . "\n";\r
+                       echo "\t\t<description>" . Entity::hsc(Template::getDesc($templateId)) . "</description>\n";\r
+                       \r
+                       $res = DB::getResult('SELECT tpartname, tcontent FROM '. sql_table('template') .' WHERE tdesc=' . $templateId);\r
+                       foreach ( $res as $row )\r
+                       {\r
+                               echo "\t\t" . '<part name="' . Entity::hsc($row['tpartname']) . '">';\r
+                               echo '<![CDATA[' . $this->escapeCDATA($row['tcontent']) . ']]>';\r
+                               echo "</part>\n\n";\r
+                       }\r
+                       \r
+                       echo "\t</template>\n\n\n";\r
+               }\r
+               echo '</nucleusskin>';\r
+       }\r
+       \r
+       /**\r
+        * Escapes CDATA content so it can be included in another CDATA section\r
+        */\r
+       private function escapeCDATA($cdata)\r
+       {\r
+               return preg_replace('/]]>/', ']]]]><![CDATA[>', $cdata);\r
+       }\r
+}\r
+=======
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
@@ -745,4 +1491,5 @@ class SkinExport
        {
                return preg_replace('/]]>/', ']]]]><![CDATA[>', $cdata);
        }
-}
\ No newline at end of file
+}
+>>>>>>> skinnable-master
index 18b9898..d8f1d5a 100644 (file)
@@ -1,3 +1,324 @@
+<<<<<<< HEAD
+<?php\r
+\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+\r
+/**\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2012 The Nucleus Group\r
+ * @version $Id$\r
+ */\r
+\r
+class DB\r
+{\r
+       private static $dbh;\r
+       private static $execCount = 0;\r
+       private static $dateFormat = '\'%Y-%m-%d %H:%M:%S\'';\r
+       \r
+       /**\r
+        * DB::setConnectionInfo()\r
+        * Set the information to connect to the database, it will attempt to connect.\r
+        * @param string $engine Engine\r
+        * @param string $host Host\r
+        * @param string $user User\r
+        * @param string $password Password\r
+        * @param string $database Database\r
+        * @return bool Returns TRUE if able to connect, otherwise it returns FALSE.\r
+        */\r
+       public static function setConnectionInfo($engine, $host, $user, $password, $database)\r
+       {\r
+               self::disConnect();\r
+\r
+               try\r
+               {\r
+                       if ( i18n::strpos($host, ':') === false )\r
+                       {\r
+                               $portnum = '';\r
+                       }\r
+                       else\r
+                       {\r
+                               list($host, $portnum) = i18n::explode(":", $host);\r
+                               if ( isset($portnum) )\r
+                               {\r
+                                       $portnum = trim($portnum);\r
+                               }\r
+                               else\r
+                               {\r
+                                       $portnum = '';\r
+                               }\r
+                       }\r
+\r
+                       switch ( $engine )\r
+                       {\r
+                               case 'sybase':\r
+                               case 'dblib':\r
+                                       $port = is_numeric($portnum) ? ':' . intval($portnum) : '';\r
+                                       $db = $database ? ';dbname=' . $database : '';\r
+                                       self::$dbh = new PDO($engine . ':host=' . $host . $port . $db, $user, $password);\r
+                                       break;\r
+                               case 'mssql':\r
+                                       $port = is_numeric($portnum) ? ',' . intval($portnum) : '';\r
+                                       $db = $database ? ';dbname=' . $database : '';\r
+                                       self::$dbh = new PDO($engine . ':host=' . $host . $port . $db, $user, $password);\r
+                                       break;\r
+                               case 'oci':\r
+                                       $port = is_numeric($portnum) ? ':' . intval($portnum) : '';\r
+                                       self::$dbh = new PDO($engine . ':dbname=//' . $host . $port . '/' . $database, $user, $password);\r
+                                       break;\r
+                               case 'odbc':\r
+                                       $port = is_numeric($portnum) ? ';PORT=' . intval($portnum) : '';\r
+                                       self::$dbh = new PDO(\r
+                                               $engine . ':DRIVER={IBM DB2 ODBC DRIVER};HOSTNAME=' . $host . $port . ';DATABASE=' . $database . ';PROTOCOL=TCPIP;UID='\r
+                                                       . $user . ';PWD=' . $password);\r
+                                       break;\r
+                               case 'pgsql':\r
+                                       $port = is_numeric($portnum) ? ';port=' . intval($portnum) : '';\r
+                                       $db = $database ? ';dbname=' . $database : '';\r
+                                       self::$dbh = new PDO($engine . ':host=' . $host . $port . $db, $user, $password);\r
+                                       break;\r
+                               case 'sqlite':\r
+                               case 'sqlite2':\r
+                                       $port = is_numeric($portnum) ? ':' . intval($portnum) : '';\r
+                                       self::$dbh = new PDO($engine . ':' . $database, $user, $password);\r
+                                       if ( self::$dbh )\r
+                                       {\r
+                                               self::$dbh->sqliteCreateFunction('SUBSTRING', 'substr', 3);\r
+                                               self::$dbh->sqliteCreateFunction('UNIX_TIMESTAMP', 'strtotime', 1);\r
+                                       }\r
+                                       break;\r
+                               case 'mysql':\r
+                                       $port = is_numeric($portnum) ? ';port=' . intval($portnum) : '';\r
+                                       $db = $database ? ';dbname=' . $database : '';\r
+                                       self::$dbh = new PDO(\r
+                                               'mysql' . ':host=' . $host . $port . $db,\r
+                                               $user,\r
+                                               $password,\r
+                                               array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES \'utf8\''));\r
+                                       break;\r
+                               default: // mysql\r
+                                       if ( !class_exists('MysqlPDO') )\r
+                                       {\r
+                                               include_once realpath(dirname(__FILE__)) . '/MYSQLPDO.php';\r
+                                       }\r
+                                       $port = is_numeric($portnum) ? ';port=' . intval($portnum) : '';\r
+                                       $db = $database ? ';dbname=' . $database : '';\r
+                                       self::$dbh = new MysqlPDO(\r
+                                               'mysql' . ':host=' . $host . $port . $db,\r
+                                               $user,\r
+                                               $password,\r
+                                               array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES \'utf8\''));\r
+                                       break;\r
+                       }\r
+               }\r
+               catch (PDOException $e)\r
+               {\r
+                       self::disConnect();\r
+                       return FALSE;\r
+               }\r
+               return TRUE;\r
+       }\r
+\r
+       /**\r
+        * DB::disConnect()\r
+        * Disconnect the connection to the database.\r
+        */\r
+       public static function disConnect()\r
+       {\r
+               self::$dbh = null;\r
+       }\r
+\r
+       /**\r
+        * DB::getExecCount()\r
+        * To get the number of times you run the statement.\r
+        * @return int Number of executions\r
+        */\r
+       public static function getExecCount()\r
+       {\r
+               return self::$execCount;\r
+       }\r
+\r
+       /**\r
+        * DB::formatDateTime()\r
+        * The value converted to a format that can be passed to the database datetime.\r
+        * @param int $timestamp UNIX timestamp\r
+        * @param int $offset timestamp offset\r
+        * @return string formatted datetime (quart treated)\r
+        */\r
+       public static function formatDateTime($timestamp = null, $offset=0)\r
+       {\r
+               if ( $timestamp == null )\r
+               {\r
+                       $timestamp = time();\r
+               }\r
+               $timestamp += $offset;\r
+               return preg_replace_callback('/(%[a-z%])/i',\r
+                       create_function('$matches', 'return strftime($matches[1], ' . intval($timestamp) . ');'),\r
+                       self::$dateFormat\r
+               );\r
+       }\r
+       \r
+       /**\r
+        * DB::getValue()\r
+        * Gets the value of the first column of the first row of the results obtained in the statement.\r
+        * @param string $statement SQL Statement\r
+        * @return mixed Result value. If the call fails, it will return FALSE.\r
+        */\r
+       public static function getValue($statement)\r
+       {\r
+               if ( self::$dbh == null ) return FALSE;\r
+               self::$execCount++;\r
+               $result = self::callQuery($statement);\r
+               if ( $row = $result->fetch(PDO::FETCH_NUM) )\r
+               {\r
+                       return $row[0];\r
+               }\r
+               return FALSE;\r
+       }\r
+\r
+       /**\r
+        * DB::getRow()\r
+        * Gets the first row of the results obtained in the statement.\r
+        * @param string $statement SQL Statement\r
+        * @return array Result row. If the call fails, it will return FALSE.\r
+        */\r
+       public static function getRow($statement)\r
+       {\r
+               if ( self::$dbh == null ) return FALSE;\r
+               self::$execCount++;\r
+               $result = self::callQuery($statement);\r
+               return $result->fetch(PDO::FETCH_BOTH);\r
+       }\r
+\r
+       /**\r
+        * DB::getResult()\r
+        * Gets the set of results obtained in the statement.\r
+        * @param string $statement SQL Statement\r
+        * @return PDOStatement Result set object. If the call fails, it will return FALSE.\r
+        */\r
+       public static function getResult($statement)\r
+       {\r
+               if ( self::$dbh == null ) return FALSE;\r
+               self::$execCount++;\r
+               return self::callQuery($statement);\r
+       }\r
+\r
+       /**\r
+        * DB::execute()\r
+        * Execute an SQL statement and return the number of affected rows.\r
+        * @param string $statement SQL Statement\r
+        * @return int number of rows that were modified or deleted by the SQL statement you issued. If the call fails, it will return FALSE.\r
+        */\r
+       public static function execute($statement)\r
+       {\r
+               if ( self::$dbh == null ) return FALSE;\r
+               self::$execCount++;\r
+               return self::callExec($statement);\r
+       }\r
+\r
+       /**\r
+        * DB::callQuery()\r
+        * Run the query to retrieve the result set.\r
+        * @param string $statement query to be executed\r
+        * @return PDOStatement Result set object. If the call fails, it will return FALSE.\r
+        */\r
+       private static function callQuery($statement)\r
+       {\r
+               $result = self::$dbh->query($statement);\r
+               if ( $result === FALSE )\r
+               {\r
+                       self::showErrorDisplay($statement);\r
+               }\r
+               return $result;\r
+       }\r
+       \r
+       /**\r
+        * DB::callExec()\r
+        * Run the query and returns the number of rows affected.\r
+        * @param string $statement query to be executed\r
+        * @return int number of rows that were modified or deleted by the SQL statement you issued. If the call fails, it will return FALSE.\r
+        */\r
+       private static function callExec($statement)\r
+       {\r
+               $result = self::$dbh->exec($statement);\r
+               if ( $result === FALSE )\r
+               {\r
+                       self::showErrorDisplay($statement);\r
+               }\r
+               return $result;\r
+       }\r
+       \r
+       /**\r
+        * DB::showErrorDisplay()\r
+        * The error message is output to the screen of the query.\r
+        * @param string $statement query output to the screen\r
+        */\r
+       private static function showErrorDisplay($statement)\r
+       {\r
+               global $CONF;\r
+               if ( array_key_exists('debug', $CONF) && $CONF['debug'] )\r
+               {\r
+                       $err = self::getError();\r
+                       print("mySQL error with query '{$statement}' : " . $err[2]);\r
+               }\r
+               return;\r
+       }\r
+       \r
+       /**\r
+        * DB::getError()\r
+        * Gets the error information associated with the last operation.\r
+        * @return array Error info\r
+        */\r
+       public static function getError()\r
+       {\r
+               if ( self::$dbh == null ) return FALSE;\r
+               return self::$dbh->errorInfo();\r
+       }\r
+\r
+       /**\r
+        * DB::quoteValue()\r
+        * Quotes a string for use in a query.\r
+        * @param string $value Value to quote\r
+        * @return string Quoted value\r
+        */\r
+       public static function quoteValue($value)\r
+       {\r
+               if ( self::$dbh == null ) return FALSE;\r
+               return self::$dbh->quote($value);\r
+       }\r
+\r
+       /**\r
+        * DB::getInsertId()\r
+        * Get the value of the ID of the rows that are inserted at the end.\r
+        * @return string ID of the row\r
+        */\r
+       public static function getInsertId()\r
+       {\r
+               if ( self::$dbh == null ) return FALSE;\r
+               return self::$dbh->lastInsertId();\r
+       }\r
+\r
+       /**\r
+        * DB::getAttribute()\r
+        * Gets the attribute of the database.\r
+        * @return string Attribute\r
+        */\r
+       public static function getAttribute($attribute)\r
+       {\r
+               if ( self::$dbh == null ) return FALSE;\r
+               return self::$dbh->getAttribute($attribute);\r
+       }\r
+       \r
+}\r
+=======
 <?php
 
 /*
@@ -316,3 +637,4 @@ class DB
        }
        
 }
+>>>>>>> skinnable-master
index da9e3ed..65bcb48 100644 (file)
@@ -1,3 +1,667 @@
+<<<<<<< HEAD
+<?php\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2012 The Nucleus Group\r
+ * @version $Id$\r
+ */\r
+\r
+if ( !class_exists('PDO') )\r
+{\r
+\r
+       /**\r
+        * Dummy constant of the PDO class\r
+        */\r
+       class PDO\r
+       {\r
+               /* constant values */\r
+               const PARAM_NULL = 0;\r
+               const PARAM_INT = 1;\r
+               const PARAM_STR = 2;\r
+               const PARAM_LOB = 3;\r
+               const PARAM_STMT = 4;\r
+               const PARAM_BOOL = 5;\r
+               const PARAM_INPUT_OUTPUT = 128; // orignal is undefined.\r
+               const FETCH_LAZY = 1;\r
+               const FETCH_ASSOC = 2;\r
+               const FETCH_NUM = 3;\r
+               const FETCH_BOTH = 4;\r
+               const FETCH_OBJ = 5;\r
+               const FETCH_BOUND = 6;\r
+               const FETCH_COLUMN = 7;\r
+               const FETCH_CLASS = 8;\r
+               const FETCH_INTO = 9;\r
+               const FETCH_FUNC = 10;\r
+               const FETCH_NAMED = 11;\r
+               const FETCH_KEY_PAIR = 12;\r
+               const FETCH_GROUP = 65536;\r
+               const FETCH_UNIQUE = 196608;\r
+               const FETCH_CLASSTYPE = 262144;\r
+               const FETCH_SERIALIZE = 524288;\r
+               const FETCH_PROPS_LATE = 1048576;\r
+               const ATTR_AUTOCOMMIT = 0;\r
+               const ATTR_PREFETCH = 1;\r
+               const ATTR_TIMEOUT = 2;\r
+               const ATTR_ERRMODE = 3;\r
+               const ATTR_SERVER_VERSION = 4;\r
+               const ATTR_CLIENT_VERSION = 5;\r
+               const ATTR_SERVER_INFO = 6;\r
+               const ATTR_CONNECTION_STATUS = 7;\r
+               const ATTR_CASE = 8;\r
+               const ATTR_CURSOR_NAME = 9;\r
+               const ATTR_CURSOR = 10;\r
+               const ATTR_ORACLE_NULLS = 11;\r
+               const ATTR_PERSISTENT = 12;\r
+               const ATTR_STATEMENT_CLASS = 13;\r
+               const ATTR_FETCH_TABLE_NAMES = 14;\r
+               const ATTR_FETCH_CATALOG_NAMES = 15;\r
+               const ATTR_DRIVER_NAME = 16;\r
+               const ATTR_STRINGIFY_FETCHES = 17;\r
+               const ATTR_MAX_COLUMN_LEN = 18;\r
+               const ATTR_DEFAULT_FETCH_MODE = 19;\r
+               const ATTR_EMULATE_PREPARES = 20;\r
+               const ERRMODE_SILENT = 0;\r
+               const ERRMODE_WARNING = 1;\r
+               const ERRMODE_EXCEPTION = 2;\r
+               const CASE_NATURAL = 0;\r
+               const CASE_UPPER = 1;\r
+               const CASE_LOWER = 2;\r
+               const NULL_NATURAL = 0;\r
+               const NULL_EMPTY_STRING = 1;\r
+               const NULL_TO_STRING = 2;\r
+               const FETCH_ORI_NEXT = 0;\r
+               const FETCH_ORI_PRIOR = 1;\r
+               const FETCH_ORI_FIRST = 2;\r
+               const FETCH_ORI_LAST = 3;\r
+               const FETCH_ORI_ABS = 4;\r
+               const FETCH_ORI_REL = 5;\r
+               const CURSOR_FWDONLY = 0;\r
+               const CURSOR_SCROLL = 1;\r
+               // from here orignal is undefined.\r
+               const ERR_CANT_MAP = 0;\r
+               const ERR_SYNTAX = 0;\r
+               const ERR_CONSTRAINT = 0;\r
+               const ERR_NOT_FOUND = 0;\r
+               const ERR_ALREADY_EXISTS = 0;\r
+               const ERR_NOT_IMPLEMENTED = 0;\r
+               const ERR_MISMATCH = 0;\r
+               const ERR_TRUNCATED = 0;\r
+               const ERR_DISCONNECTED = 0;\r
+               const ERR_NO_PERM = 0;\r
+               // so far\r
+               const ERR_NONE = '00000';\r
+               const PARAM_EVT_ALLOC = 0;\r
+               const PARAM_EVT_FREE = 1;\r
+               const PARAM_EVT_EXEC_PRE = 2;\r
+               const PARAM_EVT_EXEC_POST = 3;\r
+               const PARAM_EVT_FETCH_PRE = 4;\r
+               const PARAM_EVT_FETCH_POST = 5;\r
+               const PARAM_EVT_NORMALIZE = 6;\r
+\r
+               const MYSQL_ATTR_INIT_COMMAND = 1002;\r
+       }\r
+\r
+       /**\r
+        * PDOException class of dummy\r
+        */\r
+       class PDOException extends Exception\r
+       {}\r
+}\r
+\r
+/**\r
+ * MysqlPDO class that wraps the mysql_ or mysqli_ function like PDO class\r
+ */\r
+class MysqlPDO\r
+{\r
+       // Prefix function name\r
+       public static $handler;\r
+\r
+       private $dbcon;\r
+\r
+       /**\r
+        * Creates a PDO instance representing a connection to a MySQL database.\r
+        * @param string $dsn DSN\r
+        * @param string $username UserName\r
+        * @param string $password Password\r
+        * @param mixed $driver_options Options[optional]\r
+        * @throws PDOException Thrown when failed to connect to the database.\r
+        */\r
+       public function __construct($dsn, $username, $password, $driver_options = '')\r
+       {\r
+               // select use function\r
+               if ( function_exists('mysql_query') )\r
+               {\r
+                       MysqlPDO::$handler = 'mysql_';\r
+               }\r
+               else if ( function_exists('mysqli_query') )\r
+               {\r
+                       MysqlPDO::$handler = 'mysqli_';\r
+               }\r
+               else\r
+               {\r
+                       throw new PDOException('Can not be found mysql_ or mysqli_ functions.', 'IM000');\r
+               }\r
+\r
+               if ( preg_match('/host=([^;]+)/', $dsn, $matches) )\r
+               {\r
+                       $host = $matches[1];\r
+               }\r
+               else\r
+               {\r
+                       throw new PDOException('Host has not been set.', '01000');\r
+               }\r
+               if ( preg_match('/port=([^;]+)/', $dsn, $matches) )\r
+               {\r
+                       $host .= ':' . $matches[1];\r
+               }\r
+\r
+               // mysql connect\r
+               $this->dbcon = @call_user_func(MysqlPDO::$handler . 'connect', $host, $username, $password);\r
+\r
+               if ( $this->dbcon == FALSE )\r
+               {\r
+                       throw new PDOException('Failed to connect to the server.', '01000');\r
+               }\r
+\r
+               // select database\r
+               if ( preg_match('/dbname=([^;]+)/', $dsn, $matches) )\r
+               {\r
+                       $dbname = $matches[1];\r
+                       if ( $dbname )\r
+                       {\r
+                               if ( MysqlPDO::$handler == 'mysql_' )\r
+                               {\r
+                                       call_user_func(MysqlPDO::$handler . 'select_db', $dbname, $this->dbcon);\r
+                               }\r
+                               else\r
+                               {\r
+                                       call_user_func(MysqlPDO::$handler . 'select_db', $this->dbcon, $dbname);\r
+                               }\r
+\r
+                               // set use character\r
+                               $charset = 'utf8';\r
+                               if ( is_array($driver_options) && array_key_exists(PDO::MYSQL_ATTR_INIT_COMMAND, $driver_options) )\r
+                               {\r
+                                       if ( preg_match('/SET\s+CHARACTER\s+SET\s+\'?([a-z0-9_-]+)\'?/', $driver_options[PDO::MYSQL_ATTR_INIT_COMMAND], $matches) )\r
+                                       {\r
+                                               $charset = $matches[1];\r
+                                       }\r
+                               }\r
+                               $server_info = call_user_func(MysqlPDO::$handler . 'get_server_info', $this->dbcon);\r
+                               $mysql_version = preg_replace('/^([0-9]{1,2})\.([0-9]{1,2})\.([0-9]{1,2})(.*)$/', '$1.$2.$3', $server_info);\r
+\r
+                               if ( version_compare($mysql_version, '5.0.7', '>=') && function_exists(MysqlPDO::$handler . 'set_charset') )\r
+                               {\r
+                                       call_user_func(MysqlPDO::$handler . 'set_charset', $charset);\r
+                               }\r
+                               else if ( version_compare($mysql_version, '5.0.7', '<') )\r
+                               {\r
+                                       $this->exec("SET CHARACTER SET '{$charset}';");\r
+                               }\r
+                               else\r
+                               {\r
+                                       $this->exec("SET NAMES '{$charset}';");\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+\r
+       /**\r
+        * Close the connection to the MySQL server.\r
+        */\r
+       public function __destruct()\r
+       {\r
+               if ( $this->dbcon )\r
+               {\r
+                       @call_user_func(MysqlPDO::$handler . 'close', $this->dbcon);\r
+               }\r
+       }\r
+\r
+       /**\r
+        * Not supported\r
+        */\r
+       public function beginTransaction()\r
+       {\r
+               return FALSE;\r
+       }\r
+\r
+       /**\r
+        * Not supported\r
+        */\r
+       public function commit()\r
+       {\r
+               return FALSE;\r
+       }\r
+\r
+       /**\r
+        * Fetch the SQLSTATE associated with the last operation.\r
+        * However, if successful '00000' Otherwise, the return to '01000'.\r
+        * @return string Error code\r
+        */\r
+       public function errorCode()\r
+       {\r
+               $errno = call_user_func(MysqlPDO::$handler . 'errno', $this->dbcon);\r
+               return $errno === 0 ? '00000' : '01000';\r
+       }\r
+\r
+       /**\r
+        * To get extended error information associated with the last operation.\r
+        * Element 0: if successful '00000' Otherwise, the return to '01000'\r
+        * Element 1: The return value of mysql_errno()\r
+        * Element 2: The return value of mysql_error()\r
+        * @return array Array of error information\r
+        */\r
+       public function errorInfo()\r
+       {\r
+               $errno = call_user_func(MysqlPDO::$handler . 'errno', $this->dbcon);\r
+               $error = call_user_func(MysqlPDO::$handler . 'error', $this->dbcon);\r
+               return array($errno === 0 ? '00000' : '01000', $errno, $error);\r
+       }\r
+\r
+       public function exec($statement)\r
+       {\r
+               $result = @call_user_func(MysqlPDO::$handler . 'query', $statement, $this->dbcon);\r
+               if ( $result === TRUE )\r
+               {\r
+                       return @call_user_func(MysqlPDO::$handler . 'affected_rows', $this->dbcon);\r
+               }\r
+               else if ( is_resource($result) )\r
+               {\r
+                       return;\r
+               }\r
+               return FALSE;\r
+       }\r
+\r
+       public function getAttribute($attribute)\r
+       {\r
+               switch ( $attribute )\r
+               {\r
+                       case PDO::ATTR_SERVER_VERSION:\r
+                               return call_user_func(MysqlPDO::$handler . 'get_server_info', $this->dbcon);\r
+                               break;\r
+                       case PDO::ATTR_CLIENT_VERSION:\r
+                               return call_user_func(MysqlPDO::$handler . 'get_client_info');\r
+                               break;\r
+                       default:\r
+                               return FALSE;\r
+               }\r
+       }\r
+\r
+       public static function getAvailableDrivers()\r
+       {\r
+               return array('mysql');\r
+       }\r
+\r
+       /**\r
+        * Not supported\r
+        */\r
+       public function inTransaction()\r
+       {\r
+               return FALSE;\r
+       }\r
+\r
+       public function lastInsertId($name = null)\r
+       {\r
+               return call_user_func(MysqlPDO::$handler . 'insert_id', $this->dbcon);\r
+       }\r
+\r
+       /**\r
+        * Not supported\r
+        */\r
+       public function prepare($statement, $driver_options = array())\r
+       {\r
+               return FALSE;\r
+       }\r
+\r
+       public function query($statement)\r
+       {\r
+               $result = @call_user_func(MysqlPDO::$handler . 'query', $statement, $this->dbcon);\r
+               return ($result == FALSE) ? FALSE : new MysqlPDOStatement($statement, $result, $this->dbcon);\r
+       }\r
+\r
+       public function quote($string, $parameter_type = PDO::PARAM_STR)\r
+       {\r
+               switch ( $parameter_type )\r
+               {\r
+                       case PDO::PARAM_NULL:\r
+                               return 'null';\r
+                       case PDO::PARAM_BOOL:\r
+                               return $string ? '1' : '0';\r
+                       default:\r
+                               if ( $parameter_type == PDO::PARAM_INT && is_numeric($string) )\r
+                               {\r
+                                       return $string;\r
+                               }\r
+                               else\r
+                               {\r
+                                       return '\'' . call_user_func(MysqlPDO::$handler . 'real_escape_string', $string) . '\'';\r
+                               }\r
+               }\r
+       }\r
+\r
+       /**\r
+        * Not supported\r
+        */\r
+       public function rollBack()\r
+       {\r
+               return FALSE;\r
+       }\r
+\r
+       /**\r
+        * Not supported\r
+        */\r
+       public function setAttribute($attribute, $value)\r
+       {\r
+               return FALSE;\r
+       }\r
+}\r
+\r
+/**\r
+ * MysqlPDOStatement class PDOStatement class like.\r
+ */\r
+class MysqlPDOStatement implements Iterator\r
+{\r
+       private $result;\r
+       private $dbcon;\r
+       private $_queryString = '';\r
+\r
+       private $def_fetch_mode = PDO::FETCH_BOTH;\r
+       private $def_col_num = 0;\r
+       private $def_class_name = 'stdClass';\r
+       private $def_ctorargs = null;\r
+       private $bind_object = null;\r
+\r
+       public function __get($name)\r
+       {\r
+               if ( $name == 'queryString' )\r
+               {\r
+                       return $this->_queryString;\r
+               }\r
+       }\r
+\r
+       public function __construct($query, $result, $dbconnect = null)\r
+       {\r
+               $this->dbcon = $dbconnect;\r
+               $this->_queryString = $query;\r
+               $this->result = $result;\r
+       }\r
+\r
+       public function __destruct()\r
+       {\r
+               $this->result = null;\r
+       }\r
+\r
+       /**\r
+        * Not supported\r
+        */\r
+       public function bindColumn($column, &$param, $type, $maxlen, $driverdata)\r
+       {\r
+               return FALSE;\r
+       }\r
+\r
+       /**\r
+        * Not supported\r
+        */\r
+       public function bindParam($parameter, &$variable, $data_type = PDO::PARAM_STR, $length, $driver_options)\r
+       {\r
+               return FALSE;\r
+       }\r
+\r
+       /**\r
+        * Not supported\r
+        */\r
+       public function bindValue($parameter, $value, $data_type = PDO::PARAM_STR)\r
+       {\r
+               return FALSE;\r
+       }\r
+\r
+       public function closeCursor()\r
+       {\r
+               return call_user_func(MysqlPDO::$handler . 'free_result', $this->result);\r
+       }\r
+\r
+       public function columnCount()\r
+       {\r
+               return call_user_func(MysqlPDO::$handler . 'num_fields', $this->result);\r
+       }\r
+\r
+       /**\r
+        * Not supported\r
+        */\r
+       public function debugDumpParams()\r
+       {\r
+               return;\r
+       }\r
+\r
+       public function errorCode()\r
+       {\r
+               $errno = call_user_func(MysqlPDO::$handler . 'errno', $this->dbcon);\r
+               return $errno === 0 ? '00000' : '01000';\r
+       }\r
+\r
+       public function errorInfo()\r
+       {\r
+               $errno = call_user_func(MysqlPDO::$handler . 'errno', $this->dbcon);\r
+               $error = call_user_func(MysqlPDO::$handler . 'error', $this->dbcon);\r
+               return array($errno === 0 ? '00000' : '01000', $errno, $error);\r
+       }\r
+\r
+       /**\r
+        * Not supported\r
+        */\r
+       public function execute($input_parameters)\r
+       {\r
+               return FALSE;\r
+       }\r
+\r
+       public function fetch($fetch_style = PDO::ATTR_DEFAULT_FETCH_MODE, $cursor_orientation = PDO::FETCH_ORI_NEXT, $cursor_offset = 0)\r
+       {\r
+               if ( !is_resource($this->result) || $cursor_orientation != PDO::FETCH_ORI_NEXT )\r
+               {\r
+                       return FALSE;\r
+               }\r
+               \r
+               if ( $fetch_style == PDO::ATTR_DEFAULT_FETCH_MODE )\r
+               {\r
+                       $fetch_style = $this->def_fetch_mode;\r
+               }\r
+\r
+               switch ( $fetch_style )\r
+               {\r
+                       case PDO::FETCH_ASSOC:\r
+                               return @call_user_func(MysqlPDO::$handler . 'fetch_array', $this->result, MYSQL_ASSOC);\r
+                       case PDO::FETCH_BOTH:\r
+                               return @call_user_func(MysqlPDO::$handler . 'fetch_array', $this->result, MYSQL_BOTH);\r
+                       case PDO::FETCH_NUM:\r
+                               return @call_user_func(MysqlPDO::$handler . 'fetch_array', $this->result, MYSQL_NUM);\r
+                       case PDO::FETCH_OBJ:\r
+                               return $this->fetchObject();\r
+                       case PDO::FETCH_CLASS:\r
+                               return $this->fetchObject($this->def_class_name, $this->def_ctorargs);\r
+                       case PDO::FETCH_COLUMN:\r
+                               return $this->fetchColumn($this->def_col_num);\r
+                       case PDO::FETCH_BOUND:\r
+                               return FALSE; // Not supported\r
+                       case PDO::FETCH_INTO:\r
+                               return FALSE; // Not supported\r
+                       case PDO::FETCH_LAZY:\r
+                               return FALSE; // Not supported\r
+                       default:\r
+                               return FALSE;\r
+               }\r
+       }\r
+\r
+       public function fetchAll($fetch_style = PDO::ATTR_DEFAULT_FETCH_MODE, $fetch_argument = null, $ctor_args = array())\r
+       {\r
+               if ( $fetch_style == PDO::ATTR_DEFAULT_FETCH_MODE )\r
+               {\r
+                       $fetch_style = PDO::FETCH_BOTH;\r
+               }\r
+               \r
+               $ret = array();\r
+               if ( ($fetch_style & PDO::FETCH_COLUMN) != 0 )\r
+               {\r
+                       if ( $fetch_style == PDO::FETCH_COLUMN )\r
+                       {\r
+                               $column = $fetch_argument == null ? 0 : intval($fetch_argument);\r
+                               while ( $row = $this->fetchColumn($column) )\r
+                               {\r
+                                       $ret[] = $row;\r
+                               }\r
+                       }\r
+                       elseif ( ($fetch_style & PDO::FETCH_UNIQUE) != 0 )\r
+                       {\r
+                               return FALSE;\r
+                       }\r
+                       elseif ( ($fetch_style & PDO::FETCH_GROUP) != 0 )\r
+                       {\r
+                               return FALSE;\r
+                       }\r
+               }\r
+               elseif ( $fetch_style == PDO::FETCH_CLASS )\r
+               {\r
+                       while ( $row = $this->fetchObject($fetch_argument, $ctor_args) )\r
+                       {\r
+                               $ret[] = $row;\r
+                       }\r
+               }\r
+               elseif ( $fetch_style == PDO::FETCH_FUNC )\r
+               {\r
+                       while ( $row = $this->fetch(PDO::FETCH_ASSOC) )\r
+                       {\r
+                               $ret[] = call_user_func_array($fetch_argument, array_values($row));\r
+                       }\r
+               }\r
+               else\r
+               {\r
+                       while ( $row = $this->fetch($fetch_style) )\r
+                       {\r
+                               $ret[] = $row;\r
+                       }\r
+               }\r
+               return $ret;\r
+       }\r
+\r
+       public function fetchColumn($column_number = 0)\r
+       {\r
+               if ( $ret = $this->fetch(PDO::FETCH_NUM) )\r
+               {\r
+                       return $ret[$column_number];\r
+               }\r
+               return FALSE;\r
+       }\r
+\r
+       public function fetchObject($class_name = 'stdClass', $ctor_args = null)\r
+       {\r
+               if ( is_array($ctor_args) && !empty($ctor_args) )\r
+               {\r
+                       return @call_user_func(MysqlPDO::$handler . 'fetch_object', $this->result, $class_name, $ctor_args);\r
+               }\r
+               else\r
+               {\r
+                       return @call_user_func(MysqlPDO::$handler . 'fetch_object', $this->result, $class_name);\r
+               }\r
+       }\r
+\r
+       public function getAttribute($attribute)\r
+       {\r
+               switch ( $attribute )\r
+               {\r
+                       default:\r
+                               return FALSE;\r
+               }\r
+       }\r
+\r
+       /**\r
+        * Not supported\r
+        */\r
+       public function getColumnMeta($column)\r
+       {\r
+               $result = array();\r
+               if ( MysqlPDO::$handler == 'mysql_' )\r
+               {\r
+                       $result['name'] = @call_user_func(MysqlPDO::$handler . 'field_name', $this->result, $column);\r
+               }\r
+               return $result;\r
+       }\r
+\r
+       /**\r
+        * Not supported\r
+        */\r
+       public function nextRowset()\r
+       {\r
+               return FALSE;\r
+       }\r
+\r
+       public function rowCount()\r
+       {\r
+               return @call_user_func(MysqlPDO::$handler . 'affected_rows', $this->dbcon);\r
+       }\r
+\r
+       /**\r
+        * Not supported\r
+        */\r
+       public function setAttribute($attribute, $value)\r
+       {\r
+               return FALSE;\r
+       }\r
+\r
+       public function setFetchMode($mode, &$mode_argument, $ctorargs)\r
+       {\r
+               switch ( $mode )\r
+               {\r
+                       case PDO::FETCH_COLUMN:\r
+                               $this->def_col_num = $mode_argument;\r
+                               break;\r
+                       case PDO::FETCH_CLASS:\r
+                               $this->def_class_name = $mode_argument;\r
+                               $this->def_ctorargs = $ctorargs;\r
+                               break;\r
+                       case PDO::FETCH_INTO:\r
+                               $this->bind_object = &$mode_argument;\r
+                               return FALSE; // Not supported\r
+                       default:\r
+                               $this->def_fetch_mode = $mode;\r
+                               break;\r
+               }\r
+               return 1;\r
+       }\r
+\r
+       // Iterator\r
+       private $iterator_value;\r
+\r
+       function rewind()\r
+       {}\r
+\r
+       function next()\r
+       {}\r
+\r
+       function valid()\r
+       {\r
+               return ($this->iterator_value = $this->fetch());\r
+       }\r
+\r
+       function current()\r
+       {\r
+               return $this->iterator_value;\r
+       }\r
+\r
+       function key()\r
+       {\r
+               return null;\r
+       }\r
+}\r
+=======
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
@@ -659,3 +1323,4 @@ class MysqlPDOStatement implements Iterator
                return null;
        }
 }
+>>>>>>> skinnable-master
index 77d9ff6..e1b5e42 100644 (file)
@@ -1,3 +1,321 @@
+<<<<<<< HEAD
+<?php\r
+\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2012 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2012 The Nucleus Group\r
+ * @version $Id$\r
+ */\r
+\r
+/*\r
+ * sql_* wrappers for DB class access\r
+ */\r
+if ( !class_exists('DB') )\r
+{\r
+       include_once realpath(dirname(__FILE__)) . '/DB.php';\r
+}\r
+\r
+/**\r
+ * Connects to database server with arguments\r
+ * @deprecated\r
+ */\r
+function sql_connect_args($host = 'localhost', $user = '', $password = '', $database = '', $new_link = FALSE)\r
+{\r
+       global $MYSQL_HANDLER;\r
+       return DB::setConnectionInfo($MYSQL_HANDLER[1], $host, $user, $password, $database);\r
+}\r
+\r
+/**\r
+ * Connects to database server\r
+ * @deprecated\r
+ */\r
+function sql_connect()\r
+{\r
+       global $MYSQL_HANDLER, $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE;\r
+\r
+       return DB::setConnectionInfo($MYSQL_HANDLER[1], $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE);\r
+}\r
+\r
+/**\r
+ * disconnects from SQL server\r
+ * @deprecated\r
+ */\r
+function sql_disconnect($conn = false)\r
+{\r
+       DB::disConnect();\r
+}\r
+\r
+/**\r
+ * disconnects from SQL server\r
+ * @deprecated\r
+ * @param unknown_type $conn\r
+ */\r
+function sql_close($conn = false)\r
+{\r
+       DB::disConnect();\r
+}\r
+\r
+/**\r
+ * executes an SQL query\r
+ * @deprecated\r
+ */\r
+function sql_query($query, $conn = false)\r
+{\r
+       global $mysql_affected_row;\r
+       $mysql_affected_row = -1;\r
+       if ( preg_match('/^\W*(INSERT|UPDATE|DELETE|DROP)/i', $query) )\r
+       {\r
+               $mysql_affected_row = DB::execute($query);\r
+               return $mysql_affected_row !== FALSE ? TRUE : FALSE;\r
+       }\r
+       return DB::getResult($query);\r
+}\r
+\r
+/**\r
+ * executes an SQL error\r
+ * @deprecated\r
+ */\r
+function sql_error($conn = false)\r
+{\r
+       $err = DB::getError();\r
+       return $err[2];\r
+}\r
+\r
+/**\r
+ * executes an SQL db select\r
+ * @deprecated\r
+ */\r
+function sql_select_db($db, $conn = false)\r
+{\r
+       sql_disconnect();\r
+       return sql_connect();\r
+}\r
+\r
+/**\r
+ * executes an SQL real escape\r
+ * @deprecated\r
+ */\r
+function sql_real_escape_string($val, $conn = false)\r
+{\r
+       if ( is_numeric($val) )\r
+       {\r
+               return $val;\r
+       }\r
+       $escapeval = DB::quoteValue($val);\r
+       if ( preg_match("/^'(.*)'$/", $escapeval, $matches) )\r
+       {\r
+               $escapeval = $matches[1];\r
+       }\r
+       return $escapeval;\r
+}\r
+\r
+/**\r
+ * executes an PDO::quote() like escape, ie adds quotes arround the string and escapes chars as needed\r
+ * @deprecated\r
+ */\r
+function sql_quote_string($val, $conn = false)\r
+{\r
+       if ( is_numeric($val) )\r
+       {\r
+               return $val;\r
+       }\r
+       return DB::quoteValue($val);\r
+}\r
+\r
+/**\r
+ * executes an SQL insert id\r
+ * @deprecated\r
+ */\r
+function sql_insert_id($conn = false)\r
+{\r
+       return DB::getInsertId();\r
+}\r
+\r
+/**\r
+ * executes an SQL result request\r
+ * @deprecated\r
+ */\r
+function sql_result($res, $row, $col)\r
+{\r
+       if ( !method_exists($res, 'fetch') ) return FALSE;\r
+       for ( $i = 0; $i < $row; $i++ )\r
+               $res->fetch();\r
+       return $res->fetchColumn($col);\r
+}\r
+\r
+/**\r
+ * frees sql result resources\r
+ * @deprecated\r
+ */\r
+function sql_free_result($res)\r
+{\r
+       if ( !method_exists($res, 'closeCursor') ) return FALSE;\r
+       return $res->closeCursor();\r
+}\r
+\r
+/**\r
+ * returns number of rows in SQL result\r
+ * @deprecated\r
+ */\r
+function sql_num_rows($res)\r
+{\r
+       if ( !method_exists($res, 'rowCount') ) return FALSE;\r
+       return $res->rowCount();\r
+}\r
+\r
+/**\r
+ * returns number of rows affected by SQL query\r
+ * @deprecated\r
+ */\r
+function sql_affected_rows($conn = false)\r
+{\r
+       global $mysql_affected_row;\r
+       return $mysql_affected_row;\r
+}\r
+\r
+/**\r
+ * Get number of fields in result\r
+ * @deprecated\r
+ */\r
+function sql_num_fields($res)\r
+{\r
+       if ( !method_exists($res, 'columnCount') ) return FALSE;\r
+       return $res->columnCount();\r
+}\r
+\r
+/**\r
+ * fetches next row of SQL result as an associative array\r
+ * @deprecated\r
+ */\r
+function sql_fetch_assoc($res)\r
+{\r
+       if ( !method_exists($res, 'fetch') ) return FALSE;\r
+       return $res->fetch(PDO::FETCH_ASSOC);\r
+}\r
+\r
+/**\r
+ * Fetch a result row as an associative array, a numeric array, or both\r
+ * @deprecated\r
+ */\r
+function sql_fetch_array($res)\r
+{\r
+       if ( !method_exists($res, 'fetch') ) return FALSE;\r
+       return $res->fetch(PDO::FETCH_BOTH);\r
+}\r
+\r
+/**\r
+ * fetches next row of SQL result as an object\r
+ * @deprecated\r
+ */\r
+function sql_fetch_object($res)\r
+{\r
+       if ( !method_exists($res, 'fetch') ) return FALSE;\r
+       return $res->fetch(PDO::FETCH_OBJ);\r
+}\r
+\r
+/**\r
+ * Get a result row as an enumerated array\r
+ * @deprecated\r
+ */\r
+function sql_fetch_row($res)\r
+{\r
+       if ( !method_exists($res, 'fetch') ) return FALSE;\r
+       return $res->fetch(PDO::FETCH_NUM);\r
+}\r
+\r
+/**\r
+ * Get column information from a result and return as an object\r
+ * @deprecated\r
+ */\r
+function sql_fetch_field($res, $offset = 0)\r
+{\r
+       return FALSE;\r
+}\r
+\r
+/**\r
+ * Get current system status (returns string)\r
+ * @deprecated\r
+ */\r
+function sql_stat($conn = false)\r
+{\r
+       return FALSE;\r
+}\r
+\r
+/**\r
+ * Returns the name of the character set\r
+ * @deprecated\r
+ */\r
+function sql_client_encoding($conn = false)\r
+{\r
+       return FALSE;\r
+}\r
+\r
+/**\r
+ * Get SQL client version\r
+ * @deprecated\r
+ */\r
+function sql_get_client_info()\r
+{\r
+       return DB::getAttribute(PDO::ATTR_CLIENT_VERSION);\r
+}\r
+\r
+/**\r
+ * Get SQL server version\r
+ * @deprecated\r
+ */\r
+function sql_get_server_info($conn = false)\r
+{\r
+       return DB::getAttribute(PDO::ATTR_SERVER_VERSION);\r
+}\r
+\r
+/**\r
+ * Returns a string describing the type of SQL connection in use for the connection or FALSE on failure\r
+ * @deprecated\r
+ */\r
+function sql_get_host_info($conn = false)\r
+{\r
+       return FALSE;\r
+}\r
+\r
+/**\r
+ * Returns the SQL protocol on success, or FALSE on failure.\r
+ * @deprecated\r
+ */\r
+function sql_get_proto_info($conn = false)\r
+{\r
+       return FALSE;\r
+}\r
+\r
+/**\r
+ * Get the name of the specified field in a result\r
+ * @deprecated\r
+ */\r
+function sql_field_name($res, $offset = 0)\r
+{\r
+       if ( !method_exists($res, 'getColumnMeta') ) return FALSE;\r
+       $column = $res->getColumnMeta($offset);\r
+       return $column['name'];\r
+}\r
+\r
+/**\r
+ * Set character encodings in each fields related to MySQL connection.\r
+ * @deprecated\r
+ */\r
+function sql_set_charset($charset)\r
+{\r
+       return TRUE;\r
+}\r
+=======
 <?php
 
 /*
@@ -313,3 +631,4 @@ function sql_set_charset($charset)
 {
        return TRUE;
 }
+>>>>>>> skinnable-master
index e770271..d76fb27 100644 (file)
@@ -8,10 +8,17 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: bg_Cyrl_BG.ISO-8859-5.php 1868 2012-05-22 05:10:53Z sakamocchi $
+ */
+
+ /********************************************
+=======
  * @version $Id: bg_Cyrl_BG.ISO-8859-5.php 1887 2012-06-17 08:30:08Z sakamocchi $
  */
 
 /********************************************
+>>>>>>> skinnable-master
  *        Start New for 4.0                 *
  ********************************************/
 /* argument value for setlocale() in Microsoft's windows operating system */
index f3faa34..4562794 100644 (file)
@@ -8,7 +8,11 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: bg_Cyrl_BG.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: bg_Cyrl_BG.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index 4360d76..0a4e1ac 100644 (file)
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: ca_Latn_ES.ISO-8859-1.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: ca_Latn_ES.ISO-8859-1.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index 247ba4e..57acb07 100644 (file)
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: ca_Latn_ES.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: ca_Latn_ES.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index aa2f1a1..cc39ecf 100644 (file)
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: cs_Latn_CZ.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: cs_Latn_CZ.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index b948b17..71f0587 100644 (file)
@@ -1,5 +1,16 @@
 <?php
 /**
+<<<<<<< HEAD
+ * Nucleus Translation File
+ * Czech in Czech Republic
+ *
+ * Author: Mnemonic (mnemonic@dead-code.org)
+ * Nucleus version: v1.0-v2.0
+ *
+ * @license http://nucleuscms.org/license.txt GNU General Public License
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group
+ * @version $Id: cs_Latn_CZ.WINDOWS-1250.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * Nucleus CMS Translation File
  * Czech in Czech Republic (Latin script)
  * 
@@ -9,6 +20,7 @@
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
  * @version $Id: cs_Latn_CZ.WINDOWS-1250.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -546,6 +558,12 @@ define('_MEDIA_COLLECTION_LABEL',  'Aktu
 define('_ADD_ALIGNLEFT_TT',                    'Zarovnat doleva');
 define('_ADD_ALIGNRIGHT_TT',           'Zarovnat doprava');
 define('_ADD_ALIGNCENTER_TT',          'Zarovnat na støed');
+<<<<<<< HEAD
+
+// searchable blog setting (yes/no)
+define('_EBLOG_SEARCH',                                'Zahrnout do hledání');
+=======
+>>>>>>> skinnable-master
 
 // generic upload failure
 define('_ERROR_UPLOADFAILED',          'Nahrávání selhalo');
@@ -833,6 +851,10 @@ define('_COMMENTFORM_YOUARE',              'Jste');
 define('_COMMENTFORM_SUBMIT',          'Pøidat komentáø');
 define('_COMMENTFORM_COMMENT',         'Vá\9a komentáø');
 define('_COMMENTFORM_NAME',                    'Jméno');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                    'E-mail/HTTP');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Pamatuj si mne');
 
 // loginform
@@ -859,6 +881,10 @@ define('_ADD_DISABLE_COMMENTS',            'Zak
 define('_ADD_DRAFTNFUTURE',                    'Koncepty a èlánky pro pozdìj\9aí publikování');
 define('_ADD_ADDITEM',                         'Pøidat èlánek');
 define('_ADD_ADDNOW',                          'Pøidat nyní');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                'Pøidat pozdìji');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                'Umístit na');
 define('_ADD_ADDDRAFT',                                'Pøidat mezi koncepty');
 define('_ADD_NOPASTDATES',                     '(data a èasy v minulosti NEJSOU platné, v tom pøípadì bude pou\9eit aktuální èas)');
@@ -1202,6 +1228,11 @@ define('_BAN_ADD_BTN',                           'P
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                       'Zpráva');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                          'Jméno');
+define('_LOGIN_PASSWORD',                      'Heslo');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                'Zapomnìl jste heslo?');
 
@@ -1333,6 +1364,8 @@ define('_EDITC_NONMEMBER',                        'nen
 // move item
 define('_MOVE_TITLE',                          'Pøesunout do jakého blogu?');
 define('_MOVE_BTN',                                    'Pøesunout èlánek');
+<<<<<<< HEAD
+=======
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
@@ -1349,3 +1382,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index 0bb11fb..05a8472 100644 (file)
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: de_Latn_DE.ISO-8859-1.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: de_Latn_DE.ISO-8859-1.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -169,7 +173,11 @@ define('_ERROR_INSREQPLUGIN',                                              'Plugin-Installation misslungen, erfordert ')
 define('_ERROR_DELREQPLUGIN',                                          'Lö;schen des Plugins misslungen, benö;tigt von ');
 
 //define('_ADD_ADDLATER',                                                      'Add Later');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                                                'Add the dates specified');
+=======
 define('_ADD_ADDLATER',                                'Später hinzufügen');
+>>>>>>> skinnable-master
 
 define('_LOGIN_NAME',                                                          'Name:');
 define('_LOGIN_PASSWORD',                                                      'Password:');
@@ -269,7 +277,17 @@ define('_PLUGIN_OPTIONS_TITLE',                                                    'Options for %s');
 // Plugin file loda error
 define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
 
+<<<<<<< HEAD
+//ITEM add/edit template (for japanese only)
 define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
+=======
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+>>>>>>> skinnable-master
 
 // Errors
 define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
@@ -379,6 +397,7 @@ define('_CREATED_NEW_CATEGORY_DESC',                                'New category');
 
 // ADMIN.php blog settings
 define('_EBLOG_CURRENT_TEAM_MEMBER',                           'Mitglieder im Team:');
+<<<<<<< HEAD
 
 /********************************************
  *        End New for 3.40                  *
@@ -405,6 +424,34 @@ define('_EBLOG_REQUIREDEMAIL',             'E-Mail Addresse f
 define('_ERROR_COMMENTS_SPAM',      'Your comment was rejected because it did not pass the spam test');
 // END changed/added after 3.22 END
 
+=======
+
+/********************************************
+ *        End New for 3.40                  *
+ ********************************************/
+
+// START changed/added after 3.3 START
+define('_AUTOSAVEDRAFT',               'Auto save draft');
+define('_AUTOSAVEDRAFT_LASTSAVED',     'Last saved: ');
+define('_AUTOSAVEDRAFT_NOTYETSAVED',   'No saves have been made yet');
+define('_AUTOSAVEDRAFT_NOW',           'Auto save now');
+define('_SKIN_PARTS_SPECIAL',          'Special skin parts');
+define('_ERROR_SKIN_PARTS_SPECIAL_FORMAT',             'You must enter a name that exists only out of lowercase letters and digits');
+define('_ERROR_SKIN_PARTS_SPECIAL_DELETE',             'Can\'t delete this skin part');
+define('_CONFIRMTXT_SKIN_PARTS_SPECIAL',               'Do you really want to delete this special skin part?');
+define('_ERROR_PLUGIN_LOAD',           'Plugin could not be loaded, or does not support certain features that are required for it to run on your Nucleus installation (you might want to check the <a href="?action=actionlog">actionlog</a> for more info)');
+// END changed/added after 3.3 END
+
+// START changed/added after 3.22 START
+define('_SEARCHFORM_QUERY',                    'Keywords to search');
+define('_ERROR_EMAIL_REQUIRED',                'Email address is required');
+define('_COMMENTFORM_MAIL',                    'eMail/HTTP');
+define('_COMMENTFORM_EMAIL',           'E-mail:');
+define('_EBLOG_REQUIREDEMAIL',         'E-Mail Addresse für Kommentare voraussetzen?');
+define('_ERROR_COMMENTS_SPAM',      'Your comment was rejected because it did not pass the spam test');
+// END changed/added after 3.22 END
+
+>>>>>>> skinnable-master
 // START changed/added after 3.15 START
 
 define('_LIST_PLUG_SUBS_NEEDUPDATE','Bitte benutzen Sie den \'Update Subscribtion list\'-Taste zum Update der Plugin-Abonnementliste.');
@@ -795,8 +842,21 @@ define('_MANAGE_GENERAL',                  'Verschiedene Einstellungen');
 define('_MANAGE_SKINS',                                'Skins und Vorlagen');
 define('_MANAGE_EXTRA',                                'Spezielle Einstellungen');
 define('_BACKTOMANAGE',                                'Zurück zur Nucleus Verwaltung');
+<<<<<<< HEAD
+
+define('_BACKTOMANAGE',                                'Back to Nucleus management');
+
+
 // END introduced after v1.1 END
 
+
+
+
+
+=======
+// END introduced after v1.1 END
+
+>>>>>>> skinnable-master
 // global stuff
 define('_LOGOUT',                                      'Abmelden');
 define('_LOGIN',                                       'Anmelden');
@@ -851,6 +911,10 @@ define('_ADD_PREVIEW',                             'Vorschau');
 define('_ADD_DISABLE_COMMENTS',                'Kommentare verbieten?');
 define('_ADD_ADDITEM',                         'Artikel hinzufügen');
 define('_ADD_ADDNOW',                          'Jetzt hinzufügen');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                'Später hinzufügen');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                'am');
 define('_ADD_ADDDRAFT',                                'Zu Entwürfen hinzufügen');
 define('_ADD_DRAFTNFUTURE',                    'Entwürfe &amp; zukünftige Inhalte');
index 30b2164..7a56157 100644 (file)
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: de_Latn_DE.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: de_Latn_DE.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -169,7 +173,11 @@ define('_ERROR_INSREQPLUGIN',                                              'Plugin-Installation misslungen, erfordert ')
 define('_ERROR_DELREQPLUGIN',                                          'Lö;schen des Plugins misslungen, benö;tigt von ');
 
 //define('_ADD_ADDLATER',                                                      'Add Later');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                                                'Add the dates specified');
+=======
 define('_ADD_ADDLATER',                                'Später hinzufügen');
+>>>>>>> skinnable-master
 
 define('_LOGIN_NAME',                                                          'Name:');
 define('_LOGIN_PASSWORD',                                                      'Password:');
@@ -269,7 +277,17 @@ define('_PLUGIN_OPTIONS_TITLE',                                                    'Options for %s');
 // Plugin file loda error
 define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
 
+<<<<<<< HEAD
+//ITEM add/edit template (for japanese only)
 define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
+=======
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+>>>>>>> skinnable-master
 
 // Errors
 define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
@@ -795,8 +813,21 @@ define('_MANAGE_GENERAL',                  'Verschiedene Einstellungen');
 define('_MANAGE_SKINS',                                'Skins und Vorlagen');
 define('_MANAGE_EXTRA',                                'Spezielle Einstellungen');
 define('_BACKTOMANAGE',                                'Zurück zur Nucleus Verwaltung');
+<<<<<<< HEAD
+
+define('_BACKTOMANAGE',                                'Back to Nucleus management');
+
+
 // END introduced after v1.1 END
 
+
+
+
+
+=======
+// END introduced after v1.1 END
+
+>>>>>>> skinnable-master
 // global stuff
 define('_LOGOUT',                                      'Abmelden');
 define('_LOGIN',                                       'Anmelden');
@@ -851,6 +882,10 @@ define('_ADD_PREVIEW',                             'Vorschau');
 define('_ADD_DISABLE_COMMENTS',                'Kommentare verbieten?');
 define('_ADD_ADDITEM',                         'Artikel hinzufügen');
 define('_ADD_ADDNOW',                          'Jetzt hinzufügen');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                'Später hinzufügen');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                'am');
 define('_ADD_ADDDRAFT',                                'Zu Entwürfen hinzufügen');
 define('_ADD_DRAFTNFUTURE',                    'Entwürfe &amp; zukünftige Inhalte');
diff --git a/nucleus/locales/el_Latn_GR.UTF-8.php b/nucleus/locales/el_Latn_GR.UTF-8.php
new file mode 100644 (file)
index 0000000..00415f5
--- /dev/null
@@ -0,0 +1,1267 @@
+<?php
+/**
+ * Nucleus CMS Translation File
+ * Greek in Greece (Latin script)
+ * 
+ * Nucleus version: v1.0-v2.5
+ * Authors: Antonis Scandalis (scandalis@datapages.gr) and Vangelis Pantelias (gelitheworm@limoutsis.gr)
+ * Full Revision and update for version 3.1 by Spiros Doikas (www.translatum.gr) on the 30th July 2005.
+ *
+ * @license http://nucleuscms.org/license.txt GNU General Public License
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group
+ * @version $Id: el_Latn_GR.UTF-8.php 1837 2012-05-13 04:12:13Z sakamocchi $
+ */
+
+/********************************************
+ *        Start New for 4.0                 *
+ ********************************************/
+define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
+define('_LISTS_AUTHOR', 'Author');
+define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts');
+/********************************************
+ *        Start New for 3.6x                *
+ ********************************************/
+define('_ERROR_USER_TOO_LONG', 'Please enter a name shorter than 40 characters.');
+define('_ERROR_EMAIL_TOO_LONG', 'Please enter an email shorter than 100 characters.');
+define('_ERROR_URL_TOO_LONG', 'Please enter a website shorter than 100 characters.');
+
+/********************************************
+ *        Start New for 3.62                *
+ ********************************************/
+define('_SETTINGS_ADMINCSS',           'Admin Area Style');
+
+/********************************************
+ *        Start New for 3.50                *
+ ********************************************/
+define('_PLUGS_TITLE_GETPLUGINS',              'get more plugins...');
+define('_ARCHIVETYPE_YEAR', 'year');
+define('_ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TITLE',            'Newer Version Available');
+define('_ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TEXT',             'Upgrade available: v');
+define('_MANAGER_PLUGINSQLAPI_NOTSUPPORT', "Plugin %s was not loaded (does not support SqlApi and you are trying to use a non-mysql db)");
+
+
+/********************************************
+ *        Start New for 3.40                *
+ ********************************************/
+
+// START changed/added after 3.33 START
+define('_MEMBERS_USEAUTOSAVE',                                         'Use the Autosave function?');
+
+define('_TEMPLATE_PLUGIN_FIELDS',                                      'Custom Plugin Fields');
+define('_TEMPLATE_BLOGLIST',                                           'Template Blog List');
+define('_TEMPLATE_BLOGHEADER',                                         'Blog List Header');
+define('_TEMPLATE_BLOGITEM',                                           'Blog List Item');
+define('_TEMPLATE_BLOGFOOTER',                                         'Blog List Footer');
+
+define('_SETTINGS_DEFAULTLISTSIZE',                                    'Default Size of Lists in Admin Area');
+define('_SETTINGS_DEBUGVARS',          'Debug Vars');
+
+define('_CREATE_ACCOUNT_TITLE',                                                'Create Member Account');
+define('_CREATE_ACCOUNT0',                                                     'Create Account');
+define('_CREATE_ACCOUNT1',                                                     'Visitors are not allowed to create a Member Account.<br /><br />');
+define('_CREATE_ACCOUNT2',                                                     'Please contact the website administrator for more information.');
+define('_CREATE_ACCOUNT_USER_DATA',                                    'Account Info.');
+define('_CREATE_ACCOUNT_LOGIN_NAME',                           'Login Name (required):');
+define('_CREATE_ACCOUNT_LOGIN_NAME_VALID',                     'only a-z and 0-9 allowed, no spaces at start/end');
+define('_CREATE_ACCOUNT_REAL_NAME',                                    'Real Name (required):');
+define('_CREATE_ACCOUNT_EMAIL',                                                'Email (required):');
+define('_CREATE_ACCOUNT_EMAIL2',                                       '(must be valid, because an activation link will be sent over there)');
+define('_CREATE_ACCOUNT_URL',                                          'URL:');
+define('_CREATE_ACCOUNT_SUBMIT',                                       'Create Account');
+
+define('_BMLET_BACKTODRAFTS',          'Move back to drafts');
+define('_BMLET_CANCEL',                                'Cancel');
+
+define('_LIST_ITEM_NOCONTENT',                                         'No Comment');
+define('_LIST_ITEM_COMMENTS',                                          '%d Comments');
+
+define('_EDITC_URL',                           'Web site');
+define('_EDITC_EMAIL',                         'E-mail');
+
+define('_MANAGER_PLUGINFILE_NOTFOUND',                         "Plugin %s was not loaded (File not found)");
+/* changed */
+// plugin dependency 
+define('_ERROR_INSREQPLUGIN',          'Plugin installation failed, requires %s');
+define('_ERROR_DELREQPLUGIN',          'Plugin deletion failed, required by %s');
+
+//define('_ADD_ADDLATER',                                                              'Add Later');
+define('_ADD_ADDLATER',                                                                'Add the dates specified');
+
+define('_LOGIN_NAME',                          'Name:');
+define('_LOGIN_PASSWORD',                      'Password:');
+
+// changed from _BOOKMARLET_BMARKLFOLLOW
+define('_BOOKMARKLET_BMARKFOLLOW',                                     ' (Works with nearly all browsers)');
+// END changed/added after 3.33 END
+
+// START merge UTF-8 and EUC-JP
+
+// Create New blog
+define('_ADMIN_NOTABILIA',                                                     'Some information');
+define('_ADMIN_PLEASE_READ',                                           "Before you start, here's some <strong>important information</strong>");
+define('_ADMIN_HOW_TO_ACCESS',                                         "After you've created a new weblog, you'll need to perform some actions to make your blog accessible. There are two possibilities:");
+define('_ADMIN_SIMPLE_WAY',                                                    "<strong>Simple:</strong> Create a copy of <code>index.php</code> and modify it to display your new weblog. Further instructions on how to do this will be provided after you've submitted this first form.");
+define('_ADMIN_ADVANCED_WAY',                                          "<strong>Advanced:</strong> Insert the blog content into your current skins using skinvars like <code>&lt;%otherblog()&gt;</code>. This way, you can place multiple blogs on the same page.");
+define('_ADMIN_HOW_TO_CREATE',                                         'Create Weblog');
+
+
+define('_BOOKMARKLET_NEW_CATEGORY',                                    'Item was added, and a new category was created. ');
+define('_BOOKMARKLET_NEW_CATEGORY_EDIT',                       'Click here to edit the name and description of the category.');
+define('_BOOKMARKLET_NEW_WINDOW',                                      'Opens in new window');
+define('_BOOKMARKLET_SEND_PING',                                       'Item was added successfully. Now pinging weblogs.com. Please hold on... (can take a while)'); // NOTE: This string is no longer in used
+
+// END merge UTF-8 and EUC-JP
+
+// <add by shizuki>
+// OVERVIEW screen
+define('_OVERVIEW_SHOWALL',                                                    'Show all blogs');      // <add by shizuki />
+
+// Edit skins
+define('_SKINEDIT_ALLOWEDBLOGS',                                               'Short blog names:');                   // <add by shizuki>
+define('_SKINEDIT_ALLOWEDTEMPLATESS',                                  'Template names:');             // <add by shizuki>
+
+// delete member
+define('_WARNINGTXT_NOTDELMEDIAFILES',                         'Please note that media files will <b>NOT</b> be deleted. (At least not in this Nucleus version)');     // <add by shizuki />
+
+// send Weblogupdate.ping
+define('_UPDATEDPING_MESSAGE',                                         '<h2>Site Updated, Now pinging various weblog listing services...</h2><p>This can take a while...</p><p>If you aren\'t automatically passed through, '); // NOTE: This string is no longer in used
+define('_UPDATEDPING_GOPINGPAGE',                                      'try again'); // NOTE: This string is no longer in used
+define('_UPDATEDPING_PINGING',                                         'Pinging services, please wait...'); // NOTE: This string is no longer in used
+define('_UPDATEDPING_VIEWITEM',                                                'View list of recent items for '); // NOTE: This string is no longer in used
+define('_UPDATEDPING_VISITOWNSITE',                                    'Visit your own site'); // NOTE: This string is no longer in used
+
+// General category
+define('_EBLOGDEFAULTCATEGORY_NAME',                           'General');
+define('_EBLOGDEFAULTCATEGORY_DESC',                           'Items that do not fit in other categories');
+
+// First ITEM
+define('_EBLOG_FIRSTITEM_TITLE',                                       'First Item');
+define('_EBLOG_FIRSTITEM_BODY',                                                'This is the first item in your weblog. Feel free to delete it.');
+
+// New weblog was created
+define('_BLOGCREATED_TITLE',                                           'New weblog created');
+define('_BLOGCREATED_ADDEDTXT',                                                "Your new weblog (%s) has been created. To continue, choose the way you'll want to make it viewable:");
+define('_BLOGCREATED_SIMPLEWAY',                                       "Easiest: A copy of <code>%s.php</code>");
+define('_BLOGCREATED_ADVANCEDWAY',                                     "Advanced: Call the weblog from existing skins");
+define('_BLOGCREATED_SIMPLEDESC1',                                     "Method 1: Create an extra <code>%s.php</code> file");
+define('_BLOGCREATED_SIMPLEDESC2',                                     "Create a file called <code>%s.php</code>, and copy-paste the following code into it:");
+define('_BLOGCREATED_SIMPLEDESC3',                                     "Upload the file next to your existing <code>index.php</code> file, and you should be all set.");
+define('_BLOGCREATED_SIMPLEDESC4',                                     "To finish the weblog creation process, please fill out the final URL for your weblog (the proposed value is a <em>guess</em>, don't take it for granted):");
+define('_BLOGCREATED_ADVANCEDWAY2',                                    "Method 2: Call the weblog from existing skins");
+define('_BLOGCREATED_ADVANCEDWAY3',                                    "To finish the weblog creation process, simply please fill out the final URL for your weblog: (might be the same as another already existing weblog)");
+
+// Donate!
+define('_ADMINPAGEFOOT_OFFICIALURL',                           'http://nucleuscms.org/');
+define('_ADMINPAGEFOOT_DONATEURL',                                     'http://nucleuscms.org/donate.php');
+define('_ADMINPAGEFOOT_DONATE',                                                'Donate!');
+define('_ADMINPAGEFOOT_COPYRIGHT',                                     'The Nucleus Group');
+
+// Quick menu
+define('_QMENU_MANAGE_SYSTEM',                                         'System info');
+
+// Bookmarklet
+define('_BOOKMARKLET_TITLE',                                           'Bookmarklet<!-- and Right Click Menu -->');
+define('_BOOKMARKLET_DESC1',                                           'Bookmarklets allow adding items to your weblog with just one single click. ');
+define('_BOOKMARKLET_DESC2',                                           'After installing these bookmarklets, you\'ll be able to click the \'add to weblog\' button on your browser toolbar, ');
+define('_BOOKMARKLET_DESC3',                                           'and a Nucleus add-item window will popup, ');
+define('_BOOKMARKLET_DESC4',                                           'containing the link and title of the page you were visiting, ');
+define('_BOOKMARKLET_DESC5',                                           'plus any text you might have selected.');
+define('_BOOKMARKLET_BOOKARKLET',                                      'bookmarklet');
+define('_BOOKMARKLET_ANCHOR',                                          'Add to %s');
+define('_BOOKMARKLET_BMARKTEXT',                                       'You can drag the following link to your favorites, or your browsers toolbar: ');
+define('_BOOKMARKLET_BMARKTEST',                                       '(if you want to test the bookmarklet first, click the link)');
+
+define('_BOOKMARKLET_ERROR_SOMETHINGWRONG',                    'Something went wrong');
+define('_BOOKMARKLET_ERROR_COULDNTNEWCAT',                     'Could not create new category');
+
+// BAN
+define('_BAN_EXAMPLE_TITLE',                                           'An example');
+define('_BAN_EXAMPLE_TEXT',                                                    ': "134.58.253.193" will only block one computer, while "134.58.253" will block 256 IP addresses, including the one from the first example.');
+define('_BAN_IP_CUSTOM',                                                       'Custom: ');
+define('_BAN_BANBLOGNAME',                                                     'Only blog %s');
+
+// Plugin Options
+define('_PLUGIN_OPTIONS_TITLE',                                                        'Options for %s');
+
+// Plugin file loda error
+define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
+
+//ITEM add/edit template (for japanese only)
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
+
+// Errors
+define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
+define('_ERRORS_INSTALLDIR',                                           'install directory should be deleted');  // <add by shizuki />
+define('_ERRORS_INSTALLPHP',                                           'install.php should be deleted');
+define('_ERRORS_UPGRADESDIR',                                          'nucleus/upgrades directory should be deleted');
+define('_ERRORS_CONVERTDIR',                                           'nucleus/convert directory should be deleted');
+define('_ERRORS_CONFIGPHP',                                                    'config.php should be non-writable (chmod to 444)');
+define('_ERRORS_STARTUPERROR1',                                                '<p>One or more of the Nucleus installation files are still present on the webserver, or are writable.</p><p>You should remove these files or change their permissions to ensure security. Here are the files that were found by Nucleus</p> <ul><li>');
+define('_ERRORS_STARTUPERROR2',                                                '</li></ul><p>If you don\'t want to see this error message again, without solving the problem, set <code>$CONF[\'alertOnSecurityRisk\']</code> in <code>globalfunctions.php</code> to <code>0</code>, or do this at the end of <code>config.php</code>.</p>');
+define('_ERRORS_STARTUPERROR3',                                                'Security Risk');
+
+// PluginAdmin tickets by javascript
+define('_PLUGINADMIN_TICKETS_JAVASCRIPT',                      '<p><b>Error occured during automatic addition of tickets.</b></p>');
+
+// Global settings disablesite URL
+define('_SETTINGS_DISABLESITEURL',                                     'Redirect URL:');
+
+// Skin import/export
+define('_SKINIE_SEELEMENT_UNEXPECTEDTAG',                      'UNEXPECTED TAG');
+define('_SKINIE_ERROR_FAILEDOPEN_FILEURL',                     'Failed to open file/URL');
+define('_SKINIE_NAME_CLASHES_DETECTED',                                'Name clashes detected, re-run with allowOverwrite = 1 to force overwrite');
+
+// ACTIONS.php parse_commentform
+define('_ACTIONURL_NOTLONGER_PARAMATER',                       'actionurl is not longer a parameter on commentform skinvars. Moved to be a global setting instead.');
+
+// ADMIN.php addToTemplate 'Query error: '
+define('_ADMIN_SQLDIE_QUERYERROR',                                     'Query error: ');
+
+// backyp.php Backup WARNING
+define('_BACKUP_BACKUPFILE_TITLE',                                     'This is a backup file generated by Nucleus');
+define('_BACKUP_BACKUPFILE_BACKUPDATE',                                'backup-date:');
+define('_BACKUP_BACKUPFILE_NUCLEUSVERSION',                    'Nucleus CMS version:');
+define('_BACKUP_BACKUPFILE_DATABASE_NAME',                     'Nucleus CMS Database name:');
+define('_BACKUP_BACKUPFILE_TABLE_NAME',                                'TABLE:');
+define('_BACKUP_BACKUPFILE_TABLEDATAFOR',                      'Table Data for %s');
+define('_BACKUP_WARNING_NUCLEUSVERSION',                       'WARNING: Only try to restore on servers running the exact same version of Nucleus');
+define('_BACKUP_RESTOR_NOFILEUPLOADED',                                'No file uploaded');
+define('_BACKUP_RESTOR_UPLOAD_ERROR',                          'File Upload Error');
+define('_BACKUP_RESTOR_UPLOAD_NOCORRECTTYPE',          'The uploaded file is not of the correct type');
+define('_BACKUP_RESTOR_UPLOAD_NOZLIB',                         'Cannot decompress gzipped backup (zlib package not installed)');
+define('_BACKUP_RESTOR_SQL_ERROR',                                     'SQL Error: ');
+
+// BLOG.php addTeamMember
+define('_TEAM_ADD_NEWTEAMMEMBER',                                      'Added %s (ID=%d) to the team of blog "%s"');
+
+// ADMIN.php systemoverview()
+define('_ADMIN_SYSTEMOVERVIEW_HEADING',                                'System Overview');
+define('_ADMIN_SYSTEMOVERVIEW_PHPANDMYSQL',                    'PHP and MySQL');
+define('_ADMIN_SYSTEMOVERVIEW_VERSIONS',                       'Versions');
+define('_ADMIN_SYSTEMOVERVIEW_PHPVERSION',                     'PHP version');
+define('_ADMIN_SYSTEMOVERVIEW_MYSQLVERSION',           'MySQL version');
+define('_ADMIN_SYSTEMOVERVIEW_SETTINGS',                       'Settings');
+define('_ADMIN_SYSTEMOVERVIEW_GDLIBRALY',                      'GD Libraly');
+define('_ADMIN_SYSTEMOVERVIEW_MODULES',                                'Modules');
+define('_ADMIN_SYSTEMOVERVIEW_ENABLE',                         'enabled');
+define('_ADMIN_SYSTEMOVERVIEW_DISABLE',                                'disabled');
+define('_ADMIN_SYSTEMOVERVIEW_NUCLEUSSYSTEM',          'Your Nucleus CMS System');
+define('_ADMIN_SYSTEMOVERVIEW_NUCLEUSVERSION',         'Nucleus CMS version');
+define('_ADMIN_SYSTEMOVERVIEW_NUCLEUSPATCHLEVEL',      'Nucleus CMS patch level');
+define('_ADMIN_SYSTEMOVERVIEW_NUCLEUSSETTINGS',                'Important settings');
+define('_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK',           'Check for a new version');
+define('_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TXT',       'Check on nucleuscms.org if a new version is available: ');
+define('_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_URL',       'http://nucleuscms.org/version.php?v=%d&amp;pl=%d');
+define('_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE',     'Check for upgrade');
+define('_ADMIN_SYSTEMOVERVIEW_NOT_ADMIN',                      "You haven't enough rights to see the system informations.");
+
+// ENCAPSULATE.php
+define('_ENCAPSULATE_ENCAPSULATE_NOENTRY',                     'No entries');
+
+// globalfunctions.php
+define('_GFUNCTIONS_LOGINPCSHARED_YES',                                'on shared PC');
+define('_GFUNCTIONS_LOGINPCSHARED_NO',                         'on not shared PC');
+define('_GFUNCTIONS_LOGINSUCCESSFUL_TXT',                      'Login successful for %s (%s)');
+define('_GFUNCTIONS_LOGINFAILED_TXT',                          'Login failed for %s');
+define('_GFUNCTIONS_LOGOUT_TXT',                                       '%s is logouted');
+define('_GFUNCTIONS_HEADERSALREADYSENT_FILE',          ' in <code>%s</code> line <code>%s</code>');
+define('_GFUNCTIONS_HEADERSALREADYSENT_TITLE',         ' Page headers already sent');
+define('_GFUNCTIONS_HEADERSALREADYSENT_TXT',           '<p>The page headers have already been sent out%s. This could cause Nucleus not to work in the expected way.</p><p>Usually, this is caused by spaces or newlines at the end of the <code>config.php</code> file, at the end of the translation file or at the end of a plugin file. Please check this and try again.</p><p>If you don\'t want to see this error message again, without solving the problem, set <code>$CONF[\'alertOnHeadersSent\']</code> in <code>globalfunctions.php</code> to <code>0</code></p>');
+define('_GFUNCTIONS_PARSEFILE_FILEMISSING',                    'A file is missing');
+define('_GFUNCTIONS_AN_ERROR_OCCURRED',                                'Sorry. An error occurred.');
+define('_GFUNCTIONS_YOU_AERNT_LOGGEDIN',                       "You aren't logged in.");
+
+// MANAGER.php
+define('_MANAGER_PLUGINFILE_NOCLASS',                          "Plugin %s was not loaded (Class not found in file, possible parse error)");
+define('_MANAGER_PLUGINTABLEPREFIX_NOTSUPPORT',                "Plugin %s was not loaded (does not support SqlTablePrefix)");
+
+// mysql.php
+define('_NO_SUITABLE_MYSQL_LIBRARY',                           "<p>No suitable mySQL library was found to run Nucleus</p>");
+
+// PLUGIN.php
+define('_ERROR_PLUGIN_NOSUCHACTION',                           'No Such Action');
+
+// PLUGINADMIN.php
+define('_ERROR_INVALID_PLUGIN',                                                'Invalid plugin');
+
+// showlist.php
+define('_LIST_PLUGS_DEPREQ',                                           'Plugin(s) requires:');
+define('_LIST_SKIN_PREVIEW',                                           "Preview for '%s' skin");
+define('_LIST_SKIN_PREVIEW_VIEWLARGER',                                "View larger");
+define('_LIST_SKIN_README',                                                    "More info on the '%s' skin");
+define('_LIST_SKIN_README_TXT',                                                'Read me');
+
+// BLOG.php createNewCategory()
+define('_CREATED_NEW_CATEGORY_NAME',                           'newcat');
+define('_CREATED_NEW_CATEGORY_DESC',                           'New category');
+
+// ADMIN.php blog settings
+define('_EBLOG_CURRENT_TEAM_MEMBER',                           'Members currently on your team:');
+
+/********************************************
+ *        End New for 3.40                  *
+ ********************************************/
+
+// START changed/added after 3.3 START
+define('_AUTOSAVEDRAFT',               'Auto save draft');
+define('_AUTOSAVEDRAFT_LASTSAVED',     'Last saved: ');
+define('_AUTOSAVEDRAFT_NOTYETSAVED',   'No saves have been made yet');
+define('_AUTOSAVEDRAFT_NOW',           'Auto save now');
+define('_SKIN_PARTS_SPECIAL',          'Special skin parts');
+define('_ERROR_SKIN_PARTS_SPECIAL_FORMAT',             'You must enter a name that exists only out of lowercase letters and digits');
+define('_ERROR_SKIN_PARTS_SPECIAL_DELETE',             'Can\'t delete this skin part');
+define('_CONFIRMTXT_SKIN_PARTS_SPECIAL',               'Do you really want to delete this special skin part?');
+define('_ERROR_PLUGIN_LOAD',           'Plugin could not be loaded, or does not support certain features that are required for it to run on your Nucleus installation (you might want to check the <a href="?action=actionlog">actionlog</a> for more info)');
+// END changed/added after 3.3 END
+
+// START changed/added after 3.22 START
+define('_SEARCHFORM_QUERY',                    'Keywords to search');
+define('_ERROR_EMAIL_REQUIRED',                'Email address is required');
+define('_COMMENTFORM_MAIL',                    'Website:');
+define('_COMMENTFORM_EMAIL',           'E-mail:');
+define('_EBLOG_REQUIREDEMAIL',         'Require E-mail address with comments?');
+define('_ERROR_COMMENTS_SPAM',      'Your comment was rejected because it did not pass the spam test');
+// END changed/added after 3.22 END
+
+// START changed/added after 315 START
+
+define('_LIST_PLUG_SUBS_NEEDUPDATE','Per favore usa il pulsante \'Aggiorna lista di sottoscrizione\' per aggiornare la lista di sottoscrizione dei plugin.');
+define('_LIST_PLUGS_DEP',                      'I Plugin richiedono:');
+
+// END changed/added after 3.15
+
+// START changed/added after 3.1 START
+
+// comments list per weblog
+define('_COMMENTS_BLOG',                       'Όλα τα σχόλια για το ιστολόγιο');
+define('_NOCOMMENTS_BLOG',                     'Δεν έχουν γινει σχόλια σε άρθρα αυτού του ιστολογίου');
+define('_BLOGLIST_COMMENTS',           'Σχόλια');
+define('_BLOGLIST_TT_COMMENTS',                'Μια λίστα με όλα τα σχόλια που έχουν γίνει σε άρθρα αυτού του ιστολογίου');
+
+
+// for use in archivetype-skinvar
+define('_ARCHIVETYPE_DAY',                     'ημέρα');
+define('_ARCHIVETYPE_MONTH',           'μήνας');
+
+// tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
+define('_ERROR_BADTICKET',                     'Μη έγκυρο ή ληγμένο εισιτήριο.');
+
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Η εγκατάσταση προσθέτου απέτυχε, απαιτεί ');
+define('_ERROR_DELREQPLUGIN',          'Η διαγραφή προσθέτου απέτυχε, απαιτείται από');
+
+// cookie prefix
+define('_SETTINGS_COOKIEPREFIX',       'Πρόθεμα cookie');
+
+// account activation
+define('_ERROR_NOLOGON_NOACTIVATE',    'Δεν είναι δυνατή η αποστολή συνδέσμου ενεργοποίησης. Δεν σας επιτρέπεται να συνδεθείτε.');
+define('_ERROR_ACTIVATE',                      'Το κλειδί ενεργοποίησης δεν υπάρχει, δεν είναι έγκυρο ή έχει λήξει.');
+define('_ACTIONLOG_ACTIVATIONLINK', 'Ο σύνδεσμος ενεργοποίησης έχει σταλεί');
+define('_MSG_ACTIVATION_SENT',         'Ένας σύνδεσμος ενεργοποίησης έχει σταλεί με e-mail.');
+
+// activation link emails
+define('_ACTIVATE_REGISTER_MAIL',      "Γεια σας <%memberName%>,\n\nΠρέπει να ενεργοποιήσετε τον λογαριασμό σας στο <%siteName%> (<%siteUrl%>).\nΜπορείτε να το κάνετε πηγαίνοντας στον παρακάτω σύνδεσμο: \n\n\t<%activationUrl%>\n\nΈχετε 2 περιθώριο για να το κάνετε. Ύστερα, ο σύνδεσμος ενεργοποίησης δεν θα είναι πλέον έγκυρος.");
+define('_ACTIVATE_REGISTER_MAILTITLE', "Ενεργοποιήστε τον λογαριασμό σας '<%memberName%>'");
+define('_ACTIVATE_REGISTER_TITLE',     'Καλώς όρισες <%memberName%>');
+define('_ACTIVATE_REGISTER_TEXT',      'Έχετε σχεδόν τελειώσει. Παρακαλώ επιλέξτε έναν κωδικό πρόσβασης για τον παρακάτω λογαριασμό σας.');
+define('_ACTIVATE_FORGOT_MAIL',                "Hi <%memberName%>,\n\nΧρησιμοποιώντας τον παρακάτω σύνδεσμο, μπορείτε να επιλέξτε έναν νέο κωδικό πρόσβασης για τον λογαριασμό σας στο <%siteName%> (<%siteUrl%>) επιλέγοντας έναν νέο κωδικό πρόσβασης .\n\n\t<%activationUrl%>\n\nΈχετε 2 περιθώριο για να το κάνετε. Ύστερα, ο σύνδεσμος ενεργοποίησης δεν θα είναι πλέον έγκυρος.");
+define('_ACTIVATE_FORGOT_MAILTITLE',"Ενεργοποιήστε ξανά στον λογαριασμό σας '<%memberName%>'");
+define('_ACTIVATE_FORGOT_TITLE',       'Καλώς όρισες <%memberName%>');
+define('_ACTIVATE_FORGOT_TEXT',                'Μπορείτε να επιλέξτε έναν νέο κωδικό πρόσβασης για τον λογαριασμό σας παρακάτω:');
+define('_ACTIVATE_CHANGE_MAIL',                "Hi <%memberName%>,\n\nΚαθώς η διεύθυνσή σας e-mail έχει αλλάξει, θα χρειαστε να ενεργοποιήσετε ξανά το λογαριασμό σας στο <%siteName%> (<%siteUrl%>).\nΜπορείτε να το κάνετε πηγαίνοντας στον παρακάτω σύνδεσμο: \n\n\t<%activationUrl%>\n\nΈχετε 2 περιθώριο για να το κάνετε. Ύστερα, ο σύνδεσμος ενεργοποίησης δεν θα είναι πλέον έγκυρος.");
+define('_ACTIVATE_CHANGE_MAILTITLE',"Ενεργοποιήστε ξανά στον λογαριασμό σας '<%memberName%>'");
+define('_ACTIVATE_CHANGE_TITLE',       'Καλώς όρισες <%memberName%>');
+define('_ACTIVATE_CHANGE_TEXT',                'Η διεύθυνσή σας επαληθεύτηκε. Ευχαριστούμε!');
+define('_ACTIVATE_SUCCESS_TITLE',      'Η ενεργοποίηση πέτυχε');
+define('_ACTIVATE_SUCCESS_TEXT',       'Ο λογαριασμός σας ενεργοποιήθηκε με επιτυχία.');
+define('_MEMBERS_SETPWD',                      'Ορισμός κωδικού πρόσβασης');
+define('_MEMBERS_SETPWD_BTN',          'Ορισμός κωδικού πρόσβασης');
+define('_QMENU_ACTIVATE',                      'Ενεργοποίηση λογαριασμού');
+define('_QMENU_ACTIVATE_TEXT',         '<p>Αφού ενεργοποιήσετε τον λογαριασμό σας, μπορείτε να αρχίσετε να τον χρησιμοποιείτε αφού <a href="index.php?action=showlogin">συνδεθείτε</a>.</p>');
+
+define('_PLUGS_BTN_UPDATE',                    'Ενημέρωση λίστας συνδρομής');
+
+// global settings
+define('_SETTINGS_JSTOOLBAR',          'Γραμμή εργαλείων σε στυλ Javascript');
+define('_SETTINGS_JSTOOLBAR_FULL',     'Πλήρης γραμμή εργαλείων (IE)');
+define('_SETTINGS_JSTOOLBAR_SIMPLE','Απλή γραμμή εργαλείων (Όχι IE)');
+define('_SETTINGS_JSTOOLBAR_NONE',     'Απενεργοποίηση γραμμής εργαλείων');
+define('_SETTINGS_URLMODE_HELP',       '(Info: <a href="documentation/tips.html#searchengines-fancyurls">Πώς να ενεργοποιήσετε τα προχωρημένα URL</a>)');
+
+// extra plugin settings part when editing categories/members/blogs/...
+define('_PLUGINS_EXTRA',                       'Επιπρόσθετες ρυθμίσεις προσθέτων');
+
+// itemlist info column keys
+define('_LIST_ITEM_BLOG',                      'ιστολόγιο:');
+define('_LIST_ITEM_CAT',                       'κατ:');
+define('_LIST_ITEM_AUTHOR',                    'συντάκτης:');
+define('_LIST_ITEM_DATE',                      'ημερομηνία:');
+define('_LIST_ITEM_TIME',                      'ώρα:');
+
+// indication of registered members in comments list
+define('_LIST_COMMENTS_MEMBER',        '(μέλος)');
+
+// batch operations
+define('_BATCH_WITH_SEL',                      'Με τα επιλεγμένα:');
+define('_BATCH_EXEC',                          'Εκτέλεση');
+
+// quickmenu
+define('_QMENU_HOME',                          'Αρχική');
+define('_QMENU_ADD',                           'Προσθήκη άρθρου');
+define('_QMENU_ADD_SELECT',                    '-- επιλέξτε --');
+define('_QMENU_USER_SETTINGS',         'Ρυθμίσεις');
+define('_QMENU_USER_ITEMS',                    'Άρθρα');
+define('_QMENU_USER_COMMENTS',         'Σχόλια');
+define('_QMENU_MANAGE',                                'Διαχείριση');
+define('_QMENU_MANAGE_LOG',                    'Ημερολόγιο καταγραφής ενεργειών');
+define('_QMENU_MANAGE_SETTINGS',       'Γενικές ρυθμίσεις');
+define('_QMENU_MANAGE_MEMBERS',                'Μέλη');
+define('_QMENU_MANAGE_NEWBLOG',                'Νέο ιστολόγιο');
+define('_QMENU_MANAGE_BACKUPS',                'Αντίγραφα ασφαλείας');
+define('_QMENU_MANAGE_PLUGINS',                'Πρόσθετα');
+define('_QMENU_LAYOUT',                                'Διάταξη');
+define('_QMENU_LAYOUT_SKINS',          'Εμφανίσεις');
+define('_QMENU_LAYOUT_TEMPL',          'Πρότυπα');
+define('_QMENU_LAYOUT_IEXPORT',                'Εισαγωγή/Εξαγωγή');
+define('_QMENU_PLUGINS',                       'Πρόσθετα');
+
+// quickmenu on logon screen
+define('_QMENU_INTRO',                         'Εισαγωγή');
+define('_QMENU_INTRO_TEXT',                    '<p>Αυτή είναι η σελίδα σύνδεσης στο Nucleus CMS, το σύστημα διαχείρισης περιεχομένου που χρησιμοποιείτε για τη λειτουργία αυτού του δικτυακού τόπου.</p><p>Εάν έχετε λογαριασμό, μπορείτε να συνδεθείτε και να αρχίσετε να δημοσιεύεται νέα άρθρα.</p>');
+
+// helppages for plugins
+define('_ERROR_PLUGNOHELPFILE',                'Δεν είναι δυνατή η εύρεση του αρχείου βοηθείας για αυτό το πρόσθετο');
+define('_PLUGS_HELP_TITLE',                    'Σελίδα βοήθειας για το πρόσθετο');
+define('_LIST_PLUGS_HELP',                     'βοήθεια');
+
+
+// END changed/started after 3.1
+
+
+
+// general settings (security)
+define('_SETTINGS_EXTAUTH',                    'Ενεργοποίηση εξωτερικής πιστοποίησης ταυτότητας');
+define('_WARNING_EXTAUTH',                     'Προειδοποίηση: Ενεργοποιήστε το μόνο αν το χρειάζεστε.');
+
+// member profile
+define('_MEMBERS_BYPASS',                      'Χρήση εξωτερικής πιστοποίησης ταυτότητας');
+
+// 'always include in search' blog setting (yes/no) [in v2.5beta, the 'always' part wasn't clear]
+define('_EBLOG_SEARCH',                                '<em>Πάντα</em> να συμπεριλαμβάνεται στην αναζήτηση');
+
+// END changed/added after v2.5beta
+
+// START introduced after v2.0 START
+
+// media library
+define('_MEDIA_VIEW',                          'Προβολή');
+define('_MEDIA_VIEW_TT',                       'Προβολή αρχείου (άνοιγμα σε νέο παράθυρο)');
+define('_MEDIA_FILTER_APPLY',          'Εφαρμογή φίλτρου');
+define('_MEDIA_FILTER_LABEL',          'Φίλτρο: ');
+define('_MEDIA_UPLOAD_TO',                     'Αποστολή στο...');
+define('_MEDIA_UPLOAD_NEW',            'Αποστολή νέου αρχείου...');
+define('_MEDIA_COLLECTION_SELECT',     'Επιλογή');
+define('_MEDIA_COLLECTION_TT',         'Εναλλαγή σε αυτή την κατηγορία');
+define('_MEDIA_COLLECTION_LABEL',      'Τρέχουσα κατηγορία: ');
+
+// tooltips on toolbar
+define('_ADD_ALIGNLEFT_TT',                    'Αριστερή στοίχιση');
+define('_ADD_ALIGNRIGHT_TT',           'Δεξιά στοίχιση');
+define('_ADD_ALIGNCENTER_TT',          'Κεντρική στοίχιση');
+
+
+// generic upload failure
+define('_ERROR_UPLOADFAILED',          'Η αποστολή απέτυχε');
+
+// END introduced after v2.0 END
+
+// START introduced after v1.5 START
+
+// posting to the past/edit timestamps
+define('_EBLOG_ALLOWPASTPOSTING',      'Επιτρέπεται η δημοσίευση σε παρελθούσα ημερομηνία');
+define('_ADD_CHANGEDATE',                      'Ενημέρωση ώρας');
+define('_BMLET_CHANGEDATE',            'Ενημέρωση ώρας');
+
+// skin import/export
+define('_OVERVIEW_SKINIMPORT',         'Εισάγωγη/Εξαγωγή εμφάνισης...');
+
+// skin settings
+define('_PARSER_INCMODE_NORMAL',       'Κανονική');
+define('_PARSER_INCMODE_SKINDIR',      'Χρήση φακέλου εμφανίσεων');
+define('_SKIN_INCLUDE_MODE',           'Λειτουργία συμπερίληψης');
+define('_SKIN_INCLUDE_PREFIX',         'Συμπερίληψη προθέματος');
+
+// global settings
+define('_SETTINGS_BASESKIN',           'Βασική εμφάνιση');
+define('_SETTINGS_SKINSURL',           'URL εμφανίσεων');
+define('_SETTINGS_ACTIONSURL',         'Πλήρες URL για το action.php');
+
+// category moves (batch)
+define('_ERROR_MOVEDEFCATEGORY',       'Δεν είναι δυνατή η μεταφορά της προεπιλεγμένης κατηγορίας');
+define('_ERROR_MOVETOSELF',            'Δεν είναι δυνατή η μεταφορά της κατηγορίας (το ιστολόγιο προορισμού ειναι το ίδιο με το ιστολόγιο προέλευσης)');
+define('_MOVECAT_TITLE',                       'Επιλέξτε ιστολόγιο στο οποίο να μετακινηθεί η κατηγορία');
+define('_MOVECAT_BTN',                         'Μετακίνηση κατηγορίας');
+
+// URLMode setting
+define('_SETTINGS_URLMODE',            'Λειτουργία URL');
+define('_SETTINGS_URLMODE_NORMAL',     'Κανονική');
+define('_SETTINGS_URLMODE_PATHINFO','Προχωρημένη');
+
+// Batch operations
+define('_BATCH_NOSELECTION',           'Δεν εχει επιλεγεί τίποτα για να πραγματοποιηθούν ενέργειας σε αυτό');
+define('_BATCH_ITEMS',                         'Μαζική λειτουργία στα άρθρα');
+define('_BATCH_CATEGORIES',            'Μαζική λειτουργία σε κατηγορίες');
+define('_BATCH_MEMBERS',                       'Μαζική λειτουργία σε μέλη');
+define('_BATCH_TEAM',                          'Μαζική λειτουργία σε ομάδες μελών');
+define('_BATCH_COMMENTS',                      'Μαζική λειτουργία σε σχόλια');
+define('_BATCH_UNKNOWN',                       'Άγνωστη μαζική λειτουργία: ');
+define('_BATCH_EXECUTING',                     'Εκτέλεση');
+define('_BATCH_ONCATEGORY',            'στην κατηγορία');
+define('_BATCH_ONITEM',                        'στο άρθρο');
+define('_BATCH_ONCOMMENT',             'στο σχόλιο');
+define('_BATCH_ONMEMBER',                      'στο μέλος');
+define('_BATCH_ONTEAM',                        'στην ομάδα μελών');
+define('_BATCH_SUCCESS',                       'Επιτυχία!');
+define('_BATCH_DONE',                          'Ολοκληρώθηκε!');
+define('_BATCH_DELETE_CONFIRM',        'Επιβεβαίωση μαζικής διαγραφής');
+define('_BATCH_DELETE_CONFIRM_BTN','Επιβεβαίωση μαζικής διαγραφής');
+define('_BATCH_SELECTALL',                     'επιλογή όλων');
+define('_BATCH_DESELECTALL',           'αποεπιλογή όλων');
+
+// batch operations: options in dropdowns
+define('_BATCH_ITEM_DELETE',           'Διαγραφή');
+define('_BATCH_ITEM_MOVE',                     'Μετακίνηση');
+define('_BATCH_MEMBER_DELETE',         'Διαγραφή');
+define('_BATCH_MEMBER_SET_ADM',        'Απόδοση δικαιωμάτων διαχειριστή');
+define('_BATCH_MEMBER_UNSET_ADM',      'Στέρηση δικαιωμάτων διαχειριστή');
+define('_BATCH_TEAM_DELETE',           'Διαγραφή από την ομάδα');
+define('_BATCH_TEAM_SET_ADM',          'Απόδοση δικαιωμάτων διαχειριστή');
+define('_BATCH_TEAM_UNSET_ADM',        'Στέρηση δικαιωμάτων διαχειριστή');
+define('_BATCH_CAT_DELETE',            'Διαγραφή');
+define('_BATCH_CAT_MOVE',                      'Μετακίνηση σε άλλο ιστολόγιο');
+define('_BATCH_COMMENT_DELETE',        'Διαγραφή');
+
+// itemlist: Add new item...
+define('_ITEMLIST_ADDNEW',                     'Προσθήκη νέου άρθρου...');
+define('_ADD_PLUGIN_EXTRAS',           'Επιπλέον ρυθμίσεις Προσθέτων');
+
+// errors
+define('_ERROR_CATCREATEFAIL',         'Δεν ήταν δυνατή η δημιουργία νέας κατηγορίας');
+define('_ERROR_NUCLEUSVERSIONREQ',     'Αυτό το πρόσθετο απαιτεί μία νεότερη έκδοση του Nucleus: ');
+
+// backlinks
+define('_BACK_TO_BLOGSETTINGS',        'Επιστροφή στις ρυθμίσεις του ιστολογίου');
+
+// skin import export
+define('_SKINIE_TITLE_IMPORT',         'Εισαγωγή');
+define('_SKINIE_TITLE_EXPORT',         'Εξαγωγή');
+define('_SKINIE_BTN_IMPORT',           'Εισαγωγή');
+define('_SKINIE_BTN_EXPORT',           'Εξαγωγή επιλεγμένων εμφανίσεων/προτύπων');
+define('_SKINIE_LOCAL',                                'Εισαγωγή από τοπικό αρχείο:');
+define('_SKINIE_NOCANDIDATES',         'Δεν βρέθηκαν υποψήφιοι για εισαγωγή στο φάκελο των εμφανίσεων');
+define('_SKINIE_FROMURL',                      'Εισαγωγή από το URL:');
+define('_SKINIE_EXPORT_INTRO',         'Επιλέξτε παρακάτω τις εμφανίσεις και τα πρότυπα που θέλετε να εξάγετε');
+define('_SKINIE_EXPORT_SKINS',         'Εμφανίσεις');
+define('_SKINIE_EXPORT_TEMPLATES',     'Πρότυπα');
+define('_SKINIE_EXPORT_EXTRA',         'Επιπλέον πληροφορίες');
+define('_SKINIE_CONFIRM_OVERWRITE','Επανεγγραφή των ήδη υπαρχόντων εμφανίσεων (βλ. nameclashes)');
+define('_SKINIE_CONFIRM_IMPORT',       'Ναι, επιθυμώ να το εισάγω');
+define('_SKINIE_CONFIRM_TITLE',                'Πρόκειται να εισαχθούν πρότυπα εμφανίσεων');
+define('_SKINIE_INFO_SKINS',           'Εμφανίσεις στο αρχείο:');
+define('_SKINIE_INFO_TEMPLATES',       'Πρότυπα στο αρχείο:');
+define('_SKINIE_INFO_GENERAL',         'Πληροφορίες:');
+define('_SKINIE_INFO_SKINCLASH',       'Το όνομα της εμφάνισης είναι ίδιο με:');
+define('_SKINIE_INFO_TEMPLCLASH',      'Το όνομα του προτύπου είναι ίδιο με:');
+define('_SKINIE_INFO_IMPORTEDSKINS','Εισαγώμενες εμφανίσεις:');
+define('_SKINIE_INFO_IMPORTEDTEMPLS','Εισαγωμενα πρότυπα:');
+define('_SKINIE_DONE',                         'Η εισαγωγή ολοκληρώθηκε');
+
+define('_AND',                                         'και');
+define('_OR',                                          'ή');
+
+// empty fields on template edit
+define('_EDITTEMPLATE_EMPTY',          'κενό πεδίο (κάντε κλικ για επεξεργασία)');
+
+// skin overview list
+define('_LIST_SKINS_INCMODE',          'Λειτουργία συμπερίληψης:');
+define('_LIST_SKINS_INCPREFIX',                'Πρόθεμα συμπερίληψης:');
+define('_LIST_SKINS_DEFINED',          'Καθορισμένα μέρη:');
+
+// backup
+define('_BACKUPS_TITLE',                       'Αντίγραφο ασφάλειας/Επαναφορά');
+define('_BACKUP_TITLE',                                'Αντίγραφο ασφάλειας');
+define('_BACKUP_INTRO',                        'Πατήστε το παρακάτω κουμπί για να δημιουργήσετε ένα αντίγραφο ασφαλείας της βάσης δεδομένων σας. Θα σας προταθεί να αποθηκεύσετε ένα αρχείο αντιγράφου ασφαλείας. Αποθηκεύστε το σε ένα ασφαλές μέρος.');
+define('_BACKUP_ZIP_YES',                      'Προσπάθεια για συμπίεση');
+define('_BACKUP_ZIP_NO',                       'Χωρίς συμπίεση');
+define('_BACKUP_BTN',                          'Δημιουργία αντιγράφου ασφαλείας');
+define('_BACKUP_NOTE',                         '<b>Σημείωση:</b> Μόνο τα περιεχόμενα της βάσης δεδομένων αποθηκεύονται στο αντίγραφο ασφαλείας. Τα αρχεία και οι ρυθμίσεις πολυμέσων στο config.php συνεπώς <b>ΔΕΝ</b> συμπεριλαμβάνονται στο αντίγραφο ασφαλείας.');
+define('_RESTORE_TITLE',                       'Επαναφορά');
+define('_RESTORE_NOTE',                        '<b>ΠΡΟΕΙΔΟΠΟΙΗΣΗ:</b> Κάνοντας επαναφορά από ένα αντίγραφο ασφαλείας θα <b>ΔΙΑΓΡΑΨΕΤΕ</b> όλα τα τρέχοντα δεδομένα του Nucleus στη βάση δεδομένων! Κάντετο μόνο αν είστε πραγματικά σίγουροι!    <br />  <b>Σημείωση:</b> Βεβαιωθείτε ότι η έκδοση του Nucleus στην οποία δημιουργήσατε το αντίγραφο ασφαλείας είναι η ίδια με την έκδοση που εκτελείτε τώρα! Δεν θα λειτουργήσει σε αντίθετη περίπτωση');
+define('_RESTORE_INTRO',                       'Επιλέξτε το αρχείο αντιγράφου ασφαλείας (θα γίνει αποστολή στον διακομιστή) και κάντε κλικ στο Επαναφορά για έναρξη.');
+define('_RESTORE_IMSURE',                      'Ναι, είμαι σίγουρος ότι επιθυμώ να το κάνω!');
+define('_RESTORE_BTN',                         'Επαναφορά από αρχείο');
+define('_RESTORE_WARNING',                     '(βεβαιωθείτε ότι επαναφέρετε το σωστό αντίγραφο ασφάλειας, ίσως να κάνετε και ένα νέο αντίγραφο ασφάλειας πριν να ξεκινήσετε)');
+define('_ERROR_BACKUP_NOTSURE',        'Θα χρειαστεί να τσεκάρετε το \'Έίμαι σίγουρος\' testbox');
+define('_RESTORE_COMPLETE',            'Η επαναφορά ολοκληρώθηκε');
+
+// new item notification
+define('_NOTIFY_NI_MSG',                       'Ένα νέο άρθρο έχει δημοσιευθεί:');
+define('_NOTIFY_NI_TITLE',                     'Νέο άρθρο!');
+define('_NOTIFY_KV_MSG',                       'Ψήφος karma στο άρθρο:');
+define('_NOTIFY_KV_TITLE',                     'Nucleus karma:');
+define('_NOTIFY_NC_MSG',                       'Σχόλιο στο άρθρο:');
+define('_NOTIFY_NC_TITLE',                     'Σχόλιο Nucleus:');
+define('_NOTIFY_USERID',                       'ID χρήστη:');
+define('_NOTIFY_USER',                         'Χρήστης:');
+define('_NOTIFY_COMMENT',                      'Σχόλιο:');
+define('_NOTIFY_VOTE',                         'Ψήφος:');
+define('_NOTIFY_HOST',                         'Διακομιστής:');
+define('_NOTIFY_IP',                           'IP:');
+define('_NOTIFY_MEMBER',                       'Μέλος:');
+define('_NOTIFY_TITLE',                                'Τίτλος:');
+define('_NOTIFY_CONTENTS',                     'Περιεχόμενα:');
+
+// member mail message
+define('_MMAIL_MSG',                           'Σας έχει σταλεί ένα μήνυμα από');
+define('_MMAIL_FROMANON',                      'έναν ανώνυμο επισκέπτη');
+define('_MMAIL_FROMNUC',                       'Δημοσιεύθηκε από ένα ιστολόγιο Nucleus στο');
+define('_MMAIL_TITLE',                         'Ένα μήνυμα από');
+define('_MMAIL_MAIL',                          'Μήνυμα:');
+
+// END introduced after v1.5 END
+
+
+// START introduced after v1.1 START
+
+// bookmarklet buttons
+define('_BMLET_EDIT',                          'Επεξεργασία');
+define('_BMLET_ADD',                           'Προσθήκη');
+define('_BMLET_DELETE',                                'Διαγραφή');
+define('_BMLET_BODY',                          'Σώμα');
+define('_BMLET_MORE',                          'Περισσότερα');
+define('_BMLET_OPTIONS',                       'Επιλογές');
+define('_BMLET_PREVIEW',                       'Προεπισκόπηση');
+
+// used in bookmarklet
+define('_ITEM_UPDATED',                        'Το άρθρο ενημερώθηκε');
+define('_ITEM_DELETED',                                'Το άρθρο διαγράφηκε');
+
+// plugins
+define('_CONFIRMTXT_PLUGIN',           'Είστε σίγουροι ότι θέλετε να διαγράψετε το πρόσθετο με το όνομα');
+define('_ERROR_NOSUCHPLUGIN',          'Δεν υπάρχει τέτοιο πρόσθετο');
+define('_ERROR_DUPPLUGIN',                     'Λυπούμαστε, το πρόσθετο αυτό έχει ήδη εγκατασταθεί');
+define('_ERROR_PLUGFILEERROR',         'Δεν υπάρχει τέτοιο πρόσθετο, ή οι άδειες έχουν ορισθεί λανθασμένα');
+define('_PLUGS_NOCANDIDATES',          'Δεν βρέθηκαν πρόσθετα');
+
+define('_PLUGS_TITLE_MANAGE',          'Διαχείριση προσθέτων');
+define('_PLUGS_TITLE_INSTALLED',       'Ήδη εγκατεστημένα');
+define('_PLUGS_TITLE_UPDATE',          'Ενημέρωση λίστας εγγραφών');
+define('_PLUGS_TEXT_UPDATE',           'Το Nucleus διατηρεί μια προσωρινή μνήμη (cache) των γεγονότων εγγραφής των προσθέτων. Όταν αναβαθμίζετε ένα πρόσθετο αντικαθιστώντας το αρχείο του, πρέπει να εκτελείτε αυτό το αρχείο ενημέρωσης για να βεβαιωθείτε ότι γίνεται προσωρινή αποθήκευση των σωστών εγγραφών.');
+define('_PLUGS_TITLE_NEW',                     'Εγκατάσταση νέου προσθέτου');
+define('_PLUGS_ADD_TEXT',                      'Παρακάτω υπάρχει μια λίστα όλων των αρχείων στον φάκελο των προσθέτων, τα οποία πιθανώς να είναι μη εγκατεστημένα πρόσθετα. Βεβαιωθείτε ότι είστε <strong>πραγματικά σίγουροι</strong> ότι είοναι ένα πρόσθετο πριν το προσθέσετε.');
+define('_PLUGS_BTN_INSTALL',           'Εγκατάσταση Προσθέτου');
+define('_BACKTOOVERVIEW',                      'Επιστροφή στην προεπισκόπηση');
+
+// editlink
+define('_TEMPLATE_EDITLINK',           'Επεξεργασία συνδέσμου άρθρου');
+
+// add left / add right tooltips
+define('_ADD_LEFT_TT',                         'Προσθήκη αριστερού πλαισίου');
+define('_ADD_RIGHT_TT',                                'Προσθήκη δεξιου πλαισίου');
+
+// add/edit item: new category (in dropdown box)
+define('_ADD_NEWCAT',                          'Νέα κατηγορία...');
+
+// new settings
+define('_SETTINGS_PLUGINURL',          'URL προσθέτου');
+define('_SETTINGS_MAXUPLOADSIZE',      'Μέγιστο μέγεθος αρχείου για αποστολή (bytes)');
+define('_SETTINGS_NONMEMBERMSGS',      'Να επιτρέπεται η απόστολή μηνυμάτων από μη μέλη');
+define('_SETTINGS_PROTECTMEMNAMES','Προστασία ονομάτων μελών');
+
+// overview screen
+define('_OVERVIEW_PLUGINS',            'Διαχείριση προσθέτων...');
+
+// actionlog
+define('_ACTIONLOG_NEWMEMBER', 'Εγγραφή νέου μέλους:');
+
+// membermail (when not logged in)
+define('_MEMBERMAIL_MAIL',                     'Η διεύθυνση email σας:');
+
+// file upload
+define('_ERROR_DISALLOWEDUPLOAD2','Δεν έχετε δικαιώματα διαχειριστή πάνω σε κανένα από τα ιστολόγια τα οποία έχουν το μέλος προορισμού στο teamlist. Συνεπώς, δεν σας επιτρέπετε να ανεβάσετε αρχεία στο φάκελο πολυμέσων αυτού του μέλους');
+
+// plugin list
+define('_LISTS_INFO',                          'Πληροφορίες');
+define('_LIST_PLUGS_AUTHOR',           'Από:');
+define('_LIST_PLUGS_VER',                      'Έκδοση:');
+define('_LIST_PLUGS_SITE',                     'Επίσκεψη δικτυακού τόπου');
+define('_LIST_PLUGS_DESC',                     'Περιγραφή:');
+define('_LIST_PLUGS_SUBS',                     'Εγγραφές στα ακόλουθα γεγονότα:');
+define('_LIST_PLUGS_UP',                       'μετακίνηση επάνω');
+define('_LIST_PLUGS_DOWN',                     'μετακίνηση κάτω');
+define('_LIST_PLUGS_UNINSTALL',                'απεγκατάσταση');
+define('_LIST_PLUGS_ADMIN',                    'διαχείριση');
+define('_LIST_PLUGS_OPTIONS',          'Επεξεργασία&nbsp;επιλογών');
+
+// plugin option list
+define('_LISTS_VALUE',                         'τιμή');
+
+
+
+// plugin options
+define('_ERROR_NOPLUGOPTIONS',         'Δεν έχουν ρυθμιστεί οι επιλογές για αυτό το πρόσθετο');
+define('_PLUGS_BACK',                          'Επιστροφή στο προεπισκόπηση προσθέτου');
+define('_PLUGS_SAVE',                          'Αποθήκευση επιλογών');
+define('_PLUGS_OPTIONS_UPDATED',       'Οι επιλογές του προσθέτου ενημερώθηκαν');
+
+define('_OVERVIEW_MANAGEMENT', 'Διαχείριση');
+define('_OVERVIEW_MANAGE',             'Διαχείριση Nucleus...');
+define('_MANAGE_GENERAL',                      'Γενική διαχείριση');
+define('_MANAGE_SKINS',                        'Εμφανίσεις και πρότυπα');
+define('_MANAGE_EXTRA',                        'Επιπλέον χαρακτηριστικά');
+
+define('_BACKTOMANAGE',                        'Επιστροφή στη διαχείριση Nucleus');
+
+
+// END introduced after v1.1 END
+
+// global stuff
+define('_LOGOUT',                                      'Αποσύνδεση');
+define('_LOGIN',                                       'Σύνδεση');
+define('_YES',                                         'Ναι');
+define('_NO',                                          'Όχι');
+define('_SUBMIT',                                      'Υποβολή');
+define('_ERROR',                                       'Σφάλμα');
+define('_ERRORMSG',                            'Προέκυψε ένα σφάλμα!');
+define('_BACK',                                        'Επιστροφή');
+define('_NOTLOGGEDIN',                         'Δεν είστε συνδεμένοι');
+define('_LOGGEDINAS',                          'Συνδεθήκατε ως');
+define('_ADMINHOME',                           'Αρχική σελίδα διαχείρισης');
+define('_NAME',                                        'Όνομα');
+define('_BACKHOME',                            'Επιστρογή στην αρχική σελίδα διαχείρισης');
+define('_BADACTION',                           'Ζητήθηκε μη υπάρχουσα δράση');
+define('_MESSAGE',                                     'Μήνυμα');
+define('_HELP_TT',                                     'Βοήθεια!');
+define('_YOURSITE',                                    'Ο δικτυακός σας τόπος');
+
+
+define('_POPUP_CLOSE',                         'Κλείσιμο παραθύρου');
+
+define('_LOGIN_PLEASE',                                'Παρακαλώ συνδεθείτε πρώτα');
+
+// commentform
+define('_COMMENTFORM_YOUARE',          'Είστε ο/η');
+define('_COMMENTFORM_SUBMIT',          'Προσθήκη σχολίου');
+define('_COMMENTFORM_COMMENT', 'Το σχόλιό σας');
+define('_COMMENTFORM_NAME',            'Όνομα');
+define('_COMMENTFORM_MAIL',            'E-mail/HTTP');
+define('_COMMENTFORM_REMEMBER',        'Θυμήσου με');
+
+// loginform
+define('_LOGINFORM_NAME',                      'Όνομα χρήστη');
+define('_LOGINFORM_PWD',                       'Κωδικός πρόσβασης');
+define('_LOGINFORM_YOUARE',            'Συνδεθήκατε ως');
+define('_LOGINFORM_SHARED',            'Κοινόχρηστός υπολογιστής');
+
+// member mailform
+define('_MEMBERMAIL_SUBMIT',           'Αποστολή μηνύματος');
+
+// search form
+define('_SEARCHFORM_SUBMIT',           'Εύρεση');
+
+// add item form
+define('_ADD_ADDTO',                           'Προσθήκη νέου άρθρου στο');
+define('_ADD_CREATENEW',                       'Δημιουργία νέα άρθρου');
+define('_ADD_BODY',                            'Σώμα');
+define('_ADD_TITLE',                           'Τίτλος');
+define('_ADD_MORE',                            'Εκτεταμένος (προαιρετικό)');
+define('_ADD_CATEGORY',                        'Κατηγορία');
+define('_ADD_PREVIEW',                         'Προεπισκόπηση');
+define('_ADD_DISABLE_COMMENTS',        'Απενεργοποίηση σχολίων;');
+define('_ADD_DRAFTNFUTURE',            'Πρόχειρα &amp; μελλοντικά άρθρα');
+define('_ADD_ADDITEM',                         'Προσθήκη άρθρου');
+define('_ADD_ADDNOW',                          'Προσθηκη τώρα');
+define('_ADD_ADDLATER',                        'Προσθήκη αργότερα');
+define('_ADD_PLACE_ON',                        'Τοποθετηση πάνω στο');
+define('_ADD_ADDDRAFT',                        'Προσθήκη στα πρόχειρα');
+define('_ADD_NOPASTDATES',                     '(Ημερομηνίες και ώρες στο παρελθόν ΔΕΝ είναι έγκυρες, η τρέχουσα όρα θα χρησιμοποιηθεί σε τέτοια περίπτωση)');
+define('_ADD_BOLD_TT',                         'Έντονα');
+define('_ADD_ITALIC_TT',                       'Πλάγια');
+define('_ADD_HREF_TT',                         'Δημιουργία συνδέσμου');
+define('_ADD_MEDIA_TT',                        'Προσθήκη πολυμέσου');
+define('_ADD_PREVIEW_TT',                      'Εμφάνιση/Απόκρυψη προεπισκόπησης');
+define('_ADD_CUT_TT',                          'Αποκοπή');
+define('_ADD_COPY_TT',                         'Αντιγραφή');
+define('_ADD_PASTE_TT',                                'Επικόλληση');
+
+
+// edit item form
+define('_EDIT_ITEM',                           'Προσθήκη άρθρου');
+define('_EDIT_SUBMIT',                         'Προσθήκη άρθρου');
+define('_EDIT_ORIG_AUTHOR',            'Αρχικός συντάκτης');
+define('_EDIT_BACKTODRAFTS',           'Προσθήκη πίσω στα πρόχειρα');
+define('_EDIT_COMMENTSNOTE',           '(Σημείωση: Η απενεργοποίηση σχολίων δεν θα αποκρύψει σχόλια που έχουν καταχωρηθεί παλαιότερα)');
+
+// used on delete screens
+define('_DELETE_CONFIRM',                      'Παρακαλώ επιβεβαιώστε τη διαγραφή');
+define('_DELETE_CONFIRM_BTN',          'Επιβεβαιώστε τη διαγραφή');
+define('_CONFIRMTXT_ITEM',                     'Πρόκειται να διαγράψετε το ακόλουθο άρθρο:');
+define('_CONFIRMTXT_COMMENT',          'Πρόκειται να διαγράψετε το ακόλουθο σχόλιο:');
+define('_CONFIRMTXT_TEAM1',            'Πρόκειται να διαγράψετε ');
+define('_CONFIRMTXT_TEAM2',            ' από τη λίστα ομάδας του ιστολογίου');
+define('_CONFIRMTXT_BLOG',                     'Το ιστολόγιο που προκειται να διαγράψετε είναι το: ');
+define('_WARNINGTXT_BLOGDEL',          'Προειδοποίηση! Διαγράφοντας ένα ιστολόγιο θα διαγράψετε ΟΛΑ τα άρθρα του και όλα τα σχόλια. Παρακαλώ επιβεβαιώστε για να κάνετε σαφές ότι είστε ΣΙΓΟΥΡΟΙ για αυτό που κάνετε!<br />Επίσης, μη διακόψετε το Nucleus καθώς διαγράφει το ιστολόγιο.');
+define('_CONFIRMTXT_MEMBER',           'Πρόκειται να διαγράψετε το ακόλουθο προφίλ μέλους: ');
+define('_CONFIRMTXT_TEMPLATE',         'Πρόκειται να διαγράψετε το πρότυπο με το όνομα');
+define('_CONFIRMTXT_SKIN',                     'Πρόκειται να διαγράψετε την εμφάνιση με το όνομα');
+define('_CONFIRMTXT_BAN',                      'Πρόκειται να διαγράψετε τον αποκλεισμό για το πεδίο ip');
+define('_CONFIRMTXT_CATEGORY',         'Πρόκειται να διαγράψετε την κατηγορία ');
+
+// some status messages
+define('_DELETED_ITEM',                                'Το άρθρο διαγράφηκε');
+define('_DELETED_MEMBER',                      'Το μέλος διαγράφηκε');
+define('_DELETED_COMMENT',                     'Το σχόλιο διαγράφηκε');
+define('_DELETED_BLOG',                        'Το ιστολόγιο διαγράφηκε');
+define('_DELETED_CATEGORY',            'Η κατηγορία διαγράφηκε');
+define('_ITEM_MOVED',                          'Το άρθρο μετακινήθηκε');
+define('_ITEM_ADDED',                          'Το άρθρο προστέθηκε');
+define('_COMMENT_UPDATED',             'Το σχόλιο ενημερώθηκε');
+define('_SKIN_UPDATED',                        'Τα δεδομένα της εμφάνισης έχουν αποθηκευτεί');
+define('_TEMPLATE_UPDATED',            'Τα δεδομένα του προτύπου έχουν αποθηκευτεί');
+
+// errors
+define('_ERROR_COMMENT_LONGWORD',      'Παρακαλώ μη χρησιμοποιείτε λέξεις μεγαλύτερες των 90 χαρακτήρων στα σχόλιά σας');
+define('_ERROR_COMMENT_NOCOMMENT',     'Παρακαλώ εισαγάγετε ένα σχόλιο');
+define('_ERROR_COMMENT_NOUSERNAME',    'Μη έγκυρο όνομα χρήστη');
+define('_ERROR_COMMENT_TOOLONG',               'Τα σχόλιά σας είναι υπερβολικά μεγάλα (μεγ. 5000 χαρακτήρες)');
+define('_ERROR_COMMENTS_DISABLED',             'Τα σχόλια για αυτό το ιστολόγιο είναι προς το παρόν απενεργοποιημένα.');
+define('_ERROR_COMMENTS_NONPUBLIC',    'Πρέπει να είστε συνδεμένος ως μέλος για να προσθέσετε σχόλιο σε αυτό το ιστολόγιο');
+define('_ERROR_COMMENTS_MEMBERNICK',   'Το όνομα που θέλετε να χρησιμοποιήσετε για να δημοσιεύσετε σχόλια χρησιμοποιείτε από ένα μέλος του δικτυακού τόπου. Επιλέξτε κάτι άλλο.');
+define('_ERROR_SKIN',                                  'Σφάλμα στην εμφάνιση');
+define('_ERROR_ITEMCLOSED',                    'Το άρθρο έχει κλείσει, δεν είναι δυνατό να προσθέσετε σχόλια σε αυτό ή να ψηφίσετε για αυτό');
+define('_ERROR_NOSUCHITEM',                    'Δεν υπάρχει τέτοιο άρθρο');
+define('_ERROR_NOSUCHBLOG',                    'Δεν υπάρχει τέτοιο ιστολόγιο');
+define('_ERROR_NOSUCHSKIN',                    'Δεν υπάρχει τέτοια εμφάνιση');
+define('_ERROR_NOSUCHMEMBER',                  'Δεν υπάρχει τέτοιο μέλος');
+define('_ERROR_NOTONTEAM',                     'Δεν είστε στην λίστα ομάδας αυτού του ιστολογίου.');
+define('_ERROR_BADDESTBLOG',                   'Δεν υπάρχει το ιστολόγιο προορισμού');
+define('_ERROR_NOTONDESTTEAM',         'Δεν είναι δυνατή η μετακίνηση του άρθρου, καθώς δεν είστε στη λίστα ομάδας του ιστολόγιο προορισμού');
+define('_ERROR_NOEMPTYITEMS',                  'Δεν είναι δυνατή η προσθήκη κενών άρθρων!');
+define('_ERROR_BADMAILADDRESS',                'Μη έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου');
+define('_ERROR_BADNOTIFY',                             'Μία η περισσότερες από τις δοθείσες διευθύνσεις για ειδοποίηση δεν είναι έγκυρες διευθύνσεις ηλ. ταχυδρομείου');
+define('_ERROR_BADNAME',                               'Μη έγκυρο όνομα (επιτρέπονται μόνο a-z και 0-9, χωρίς κενά σε αρχή/τέλος)');
+define('_ERROR_NICKNAMEINUSE',                 'Ένα άλλο μέλος χρησιμοποιεί ήδη αυτό το ψευδώνυμο');
+define('_ERROR_PASSWORDMISMATCH',              'Οι κωδικοί πρέπει να ταιριάζουν');
+define('_ERROR_PASSWORDTOOSHORT',              'Οι κωδικοί πρέπει να είναι τουλάχιστον 6 χαρακτήρων');
+define('_ERROR_PASSWORDMISSING',               'Ο κωδικός πρόσβασης δεν μπορεί να είναι κενός');
+define('_ERROR_REALNAMEMISSING',               'Πρέπει να εισαγάγετε ένα πραγματικό όνομα');
+define('_ERROR_ATLEASTONEADMIN',               'Πρέπει να υπάρχει πάντοτε τουλάχιστον ένας super-admin που να μπορεί να συνδεθεί με την admin area.');
+define('_ERROR_ATLEASTONEBLOGADMIN',   'Πραγματοποιόντας αυτή την ενέργεια θα καταστήσετε το ιστολόγιο μη διατηρήσιμο. Παρακαλώ βεβαιωθείτε ότι υπάρχει πάντοτε τουλάχιστον ένας admin.');
+define('_ERROR_ALREADYONTEAM',                 'Δεν είναι δυνατή η προσθήκη ενός μέλους που υπάρχει ήδη στην ομάδα');
+define('_ERROR_BADSHORTBLOGNAME',              'Το σύντομο όνομα ιστολόγιο πρέπει να περιέχει μόνο a-z και 0-9, χωρίς κενά');
+define('_ERROR_DUPSHORTBLOGNAME',              'Κάποιο άλλο ιστολόγιο έχει ήδη το επιλεγμένο σύντομο όνομα. Αυτά τα ονόματα πρέπει να είναι μοναδικά');
+define('_ERROR_UPDATEFILE',                            'Δεν δίνεται άδεια εγγραφής για το συγκεκριμένο αρχείο ενημέρωσης. Βεβαιωθείτε ότι οι άδειες των αρχείων έχουν ορισθεί σωστά (try chmodding it to 666). Επίσης σημειώστε ότι η τοποθεσία εναι σχετική με το φάκελο admin-area, οπότε ίσωσ θα θέλατε να χρησιμοποιήσετε ένα απόλυτο μονοπάτι (κάτι σαν το /your/path/to/nucleus/)');
+define('_ERROR_DELDEFBLOG',                    'Δεν είναι δυνατή η διαγραφή του προεπιλεγμένου ιστολογίου');
+define('_ERROR_DELETEMEMBER',                  'Δεν είναι δυνατή η διαγραφή αυτού του μέλους, πιθανώς επειδή είναι ο συντάκτης άρθρων ή σχολιών');
+define('_ERROR_BADTEMPLATENAME',               'Μη έγκυρο όνομα για πρότυπο, χρησιμοποιήστε μόνο a-z και 0-9, χωρίς κενά');
+define('_ERROR_DUPTEMPLATENAME',               'Υπάρχει ήδη κάποιο άλλο πρότυπο με αυτό το όνομα');
+define('_ERROR_BADSKINNAME',                   'Μη έγκυρο όνομα για εμφάνιση (επιτρέπονται μόνο a-z, 0-9, χωρίς κενά)');
+define('_ERROR_DUPSKINNAME',                   'Υπάρχει ήδη κάποιο άλλη εμφάνιση με αυτό το όνομα');
+define('_ERROR_DEFAULTSKIN',                   'Πρέπει πάντοτε να υπάρχει μια εμφάνιση με το όνομα "προεπιλεγμένο"');
+define('_ERROR_SKINDEFDELETE',                 'Δεν είναι δυνατή η διαγραφή της εμφάνισης καθώς είναι η προεπιλεγμένη εμφάνιση για το ακόλουθο ιστολόγιο: ');
+define('_ERROR_DISALLOWED',                    'Λυπούμαστε, δεν σας επιτρέπεται να πραγματοποιήσετε αυτή την ενέργεια');
+define('_ERROR_DELETEBAN',                             'Σφάλμα κατα την προσπάθεια διαγραφής του ban (Ο αποκλεισμός δεν υπάρχει)');
+define('_ERROR_ADDBAN',                                'Σφάλμα κατα την προσπάθεια προσθήκης του αποκλεισμού. Πιθανώς ο αποκλεισμός να μην ενεργοποιηθεί σωστά σε όλα τα ιστολόγια.');
+define('_ERROR_BADACTION',                             'Η Απαιτούμενη ενέργεια δεν υπάρχει');
+define('_ERROR_MEMBERMAILDISABLED',    'Τα μηνύματα από μέλος σε μέλος είναι απενεργοποιημένα');
+define('_ERROR_MEMBERCREATEDISABLED',  'Η δημιουργιά λογαριασμών μέλών είναι απενεργοποιημένη');
+define('_ERROR_INCORRECTEMAIL',                'Λανθασμένη διεύθυνση ηλεκτρονικού ταχυδρομείου');
+define('_ERROR_VOTEDBEFORE',                   'Έχετε ήδη ψηφίσει για αυτό το άρθρο');
+define('_ERROR_BANNED1',                               'Δεν είναι δυνατή η πραγματοποίηση της ενέργειας (ip range ');
+define('_ERROR_BANNED2',                               'καθώς σας έχει απαγορευτεί. Το μήνυμα ήταν:');
+define('_ERROR_BANNED3',                               '\'');
+define('_ERROR_LOGINNEEDED',                   'Πρέπει να είστε συνδεδεμένοι για να πραγματοποιήσετε αυτή την ενέργεια');
+define('_ERROR_CONNECT',                               'Σφάλμα στη σύνδεση');
+define('_ERROR_FILE_TOO_BIG',                  'Το αρχείο είναι υπερβολικά μεγάλο!');
+define('_ERROR_BADFILETYPE',                   'Λυπούμαστε, αυτός ο τύπος αρχείου δεν επιτρέπεται');
+define('_ERROR_BADREQUEST',                    'Εσφαλμένη αίτηση αποστολής');
+define('_ERROR_DISALLOWEDUPLOAD',              'Δεν είσαστε σε καμία λίστα ομάδας ιστολογίων. Συνεπώς, δεν σας επιτρέπεται να ανεβάσετε αρχεία');
+define('_ERROR_BADPERMISSIONS',                'Τα δικαιώματα αρχείων/καταλόγων δεν έχουν οριστεί σωστά');
+define('_ERROR_UPLOADMOVEP',                   'Σφάλμα κατα τη μετακίνηση αρχείου που έχει αποσταλεί');
+define('_ERROR_UPLOADCOPY',                    'Σφάλμα κατά την αντιγραφή αρχείου');
+define('_ERROR_UPLOADDUPLICATE',               'Υπάρχει ήδη κάποιο άλλο αρχείο με αυτό το όνομα. Προσπαθείστε να το μετονομάσετε πριν το ανεβάσετε.');
+define('_ERROR_LOGINDISALLOWED',               'Λυπούμαστε, δεν σας επιτρέπετε να συνδεθείτε στην περιοχή διαχείρισης. Μπορείτε όμως να συνδεθείτε ως κάποιος άλλος χρήστης');
+define('_ERROR_DBCONNECT',                     'Δεν ήταν δυνατή η σύνδεση στον διακομιστή mySQL');
+define('_ERROR_DBSELECT',                              'Δεν ήταν δυνατή η επιλογή της βάσης δεδομένων nucleus.');
+define('_ERROR_NOSUCHLANGUAGE',                'Δεν υπάρχει τέτοιο αρχείο γλώσσας');
+define('_ERROR_NOSUCHCATEGORY',                'Δεν υπάρχει τέτοια κατηγορία');
+define('_ERROR_DELETELASTCATEGORY',    'Πρέπει να υπάρχει τουλάχιστον μια κατηγορία');
+define('_ERROR_DELETEDEFCATEGORY',             'Δεν είναι δυνατή η διαγραφή της προεπιλεγμένηςκατηγορίας');
+define('_ERROR_BADCATEGORYNAME',               'Μη έγκυρο όνομα κατηγορίας');
+define('_ERROR_DUPCATEGORYNAME',               'Υπάρχει ήδη κάποια άλλη κατηγορία με αυτό το όνομα');
+
+// some warnings (used for mediadir setting)
+define('_WARNING_NOTADIR',                     'Προειδοποίηση: Η τρέχουσα τιμή δεν είναι κάποιος φάκελος!');
+define('_WARNING_NOTREADABLE',         'Προειδοποίηση: Η τρέχουσα τιμή δεν είναι ένας μη αναγνώσιμος φάκελος!');
+define('_WARNING_NOTWRITABLE',         'Προειδοποίηση: Η τρέχουσα τιμή δεν είναι κάποιος εγγράψιμος φάκελος!');
+
+// media and upload
+define('_MEDIA_UPLOADLINK',                    'Αποστολή νέου αρχείου');
+define('_MEDIA_MODIFIED',                              'τροποποιημένο');
+define('_MEDIA_FILENAME',                              'όνομα αρχείου');
+define('_MEDIA_DIMENSIONS',                    'διαστάσεις');
+define('_MEDIA_INLINE',                                        'Ενσωματωμένο');
+define('_MEDIA_POPUP',                                 'Αναδυόμενο');
+define('_UPLOAD_TITLE',                                        'Επιλογή αρχείου');
+define('_UPLOAD_MSG',                                  'Επιλέξτε παρακάτω το αρχείο που θέλετε να ανεβάσετε, και πατήστε το κουμπί \'Αποστολή\'.');
+define('_UPLOAD_BUTTON',                               'Αποστολή');
+
+// some status messages
+define('_MSG_ACCOUNTCREATED',                  'Ο λογαριασμός δημιουργήθηκε, ο κωδικός πρόσβασης θα σας σταλεί μέσω ηλεκτρονικού ταχυδρομείου');
+define('_MSG_PASSWORDSENT',                    'Ο κωδικός πρόσβασης έχει σταλεί μέσω ηλεκτρονικού ταχυδρομείου.');
+define('_MSG_LOGINAGAIN',                              'Θα χρειαστεί να ξανασυνδεθείτε, επείδη τα άρθρα σας έχουν αλλάξει');
+define('_MSG_SETTINGSCHANGED',                 'Οι ρυθμίσεις έχουν αλλάξει');
+define('_MSG_ADMINCHANGED',                    'Ο διαχειριστής έχει αλλάξει');
+define('_MSG_NEWBLOG',                         'Ένα νέο ιστολόγιο δημιουργήθηκε');
+define('_MSG_ACTIONLOGCLEARED',                'Το ημερολόγιο ενεργειών έχει καθαρισθεί');
+
+// actionlog in admin area
+define('_ACTIONLOG_DISALLOWED',                'Μη επιτρεπόμενη ενέργεια: ');
+define('_ACTIONLOG_PWDREMINDERSENT',   'Νέος κωδικός πρόσβασης έχει σταλεί για ');
+define('_ACTIONLOG_TITLE',                             'Ημερολόγιο ενεργειών');
+define('_ACTIONLOG_CLEAR_TITLE',               'Καθαρισμός ημερολογίου ενεργειών');
+define('_ACTIONLOG_CLEAR_TEXT',                'Καθαρισμός ημερολογίου ενεργειών τώρα');
+
+// team management
+define('_TEAM_TITLE',                          'Διαχείριση ομάδας για ιστολόγιο');
+define('_TEAM_CURRENT',                        'Τρέχουσα ομάδα');
+define('_TEAM_ADDNEW',                 'Προσθήκη νέου μέλους στην ομάδα');
+define('_TEAM_CHOOSEMEMBER',           'Επιλογή μέλους');
+define('_TEAM_ADMIN',                          'Δικαιώματα διαχειριστή ;');
+define('_TEAM_ADD',                            'Προσθήκη στην ομάδα');
+define('_TEAM_ADD_BTN',                        'προσθήκη στην ομάδα');
+
+// blogsettings
+define('_EBLOG_TITLE',                         'Επεγεργασία ρυθμίσεων ιστολογίου');
+define('_EBLOG_TEAM_TITLE',                    'Επεξεργασία ομάδας');
+define('_EBLOG_TEAM_TEXT',                     'Πατήστε εδώ για να επεξεργαστείτε την ομάδα σας...');
+define('_EBLOG_SETTINGS_TITLE',                'Ρυθμίσεις ιστολογίου');
+define('_EBLOG_NAME',                          'Όνομα ιστολογίου');
+define('_EBLOG_SHORTNAME',                     'Σύντομο όνομα ιστολογίου');
+define('_EBLOG_SHORTNAME_EXTRA',       '<br />(πρέπει να περιέχει μόνο a-z και χωρίς κενά)');
+define('_EBLOG_DESC',                          'Περιγραφή ιστολογίου');
+define('_EBLOG_URL',                           'URL');
+define('_EBLOG_DEFSKIN',                       'Προεπιλεγμένη εμφάνιση');
+define('_EBLOG_DEFCAT',                        'Προεπιλεγμένη Κατηγορία');
+define('_EBLOG_LINEBREAKS',                    'Μετατροπή αλλαγών γραμμής');
+define('_EBLOG_DISABLECOMMENTS',       'Επιτρέπονται τα σχόλια;<br /><small>(Η απενεργοποίηση σχολίων σημαίνει ότι η προσθήκη σχολίων δεν είναι δυνατή.)</small>');
+define('_EBLOG_ANONYMOUS',             'Επιτρέπονται τα σχόλια από μη μέλη;');
+define('_EBLOG_NOTIFY',                                'Διευθύνσεις για ειδοποίηση (χρησιμοποιείστε το ; ως διαχωριστικό)');
+define('_EBLOG_NOTIFY_ON',                     'Ειδοποίηση όταν');
+define('_EBLOG_NOTIFY_COMMENT',        'Νέα σχόλια');
+define('_EBLOG_NOTIFY_KARMA',          'Νέοι ψήφοι κάρμα');
+define('_EBLOG_NOTIFY_ITEM',           'Νέα άρθρα ιστολογίου');
+define('_EBLOG_PING',                          'Ping Weblogs.com κατά την ενημέρωση;');
+define('_EBLOG_MAXCOMMENTS',           'Μέγιστος αριθμός σχολίων');
+define('_EBLOG_UPDATE',                        'Ενημέρωση αρχείου');
+define('_EBLOG_OFFSET',                        'Χρονική μετάθεση');
+define('_EBLOG_STIME',                         'Η τρέχουσα ώρα του διακομιστή είναι');
+define('_EBLOG_BTIME',                         'Η τρέχουσα ώρα του ιστολογίου είναι :');
+define('_EBLOG_CHANGE',                        'Αλλαγή ρυθμίσεων');
+define('_EBLOG_CHANGE_BTN',            'Αλλαγή ρυθμίσεων');
+define('_EBLOG_ADMIN',                         'Διαχειριστής ιστολογίου');
+define('_EBLOG_ADMIN_MSG',                     'Θα σας αποδωθούν δικαιώματα διαχειριστή');
+define('_EBLOG_CREATE_TITLE',          'Δημιουργία νέου ιστολογίου');
+define('_EBLOG_CREATE_TEXT',           'Συμπληρώστε την παρακάτω φόρμα για να δημιουργήσετε ένα νεό ιστολόγιο. <br /><br /> <b>Σημείωση:</b> Παρατίθενται μόνο οι απαραίτητες επιλογές. Αν θέλετε να ρυθμίσετε επιπλέον επιλογές, μπείτε στην σελίδα ρυθμίσεων ιστολογίου αφού δημιουργήσετε το ιστολόγιο.');
+define('_EBLOG_CREATE',                        'Δημιουργία!');
+define('_EBLOG_CREATE_BTN',            'Δημιουργία ιστολογίου');
+define('_EBLOG_CAT_TITLE',                     'Κατηγορίες');
+define('_EBLOG_CAT_NAME',                      'Όνομα κατηγορίας');
+define('_EBLOG_CAT_DESC',                      'Περιγραφή κατηγορίας');
+define('_EBLOG_CAT_CREATE',            'Δημιουργία νέας κατηγορίας');
+define('_EBLOG_CAT_UPDATE',            'Ενημέρωση κατηγορίας');
+define('_EBLOG_CAT_UPDATE_BTN',        'Ενημέρωση κατηγορίας');
+
+// templates
+define('_TEMPLATE_TITLE',                      'Επεξεργασία προτύπων');
+define('_TEMPLATE_AVAILABLE_TITLE',    'Διαθέσιμα πρότυπα');
+define('_TEMPLATE_NEW_TITLE',          'Νέο πρότυπο');
+define('_TEMPLATE_NAME',                       'Όνομα προτύπου');
+define('_TEMPLATE_DESC',                       'Περιγραφή προτύπου');
+define('_TEMPLATE_CREATE',                     'Δημιουργία προτύπου');
+define('_TEMPLATE_CREATE_BTN',         'Δημιουργία προτύπου');
+define('_TEMPLATE_EDIT_TITLE',         'Επεξεργασία προτύπου');
+define('_TEMPLATE_BACK',                       'Επιστροφή στην προεπισκόπηση προτύπου');
+define('_TEMPLATE_EDIT_MSG',           'Δεν είναι απαραραίτητα όλα τα μέρη του προτύπου, αφήστε κενά αυτά που δεν είναι απαραίτητα.');
+define('_TEMPLATE_SETTINGS',           'Ρυθμίσεις προτύπου');
+define('_TEMPLATE_ITEMS',                      'άρθρα');
+define('_TEMPLATE_ITEMHEADER',         'Κεφαλίδα άρθρου');
+define('_TEMPLATE_ITEMBODY',           'Σώμα άρθρου');
+define('_TEMPLATE_ITEMFOOTER',         'Υποσέλιδο άρθρου');
+define('_TEMPLATE_MORELINK',           'Σύνδεση σε εκτεταμένη καταχώρηση');
+define('_TEMPLATE_NEW',                        'Ένδειξη νέου άρθρου');
+define('_TEMPLATE_COMMENTS_ANY',       'Σχόλια (αν υπάρχουν)');
+define('_TEMPLATE_CHEADER',            'Κεφαλίδα σχολίων');
+define('_TEMPLATE_CBODY',                      'Σώμα σχολίου');
+define('_TEMPLATE_CFOOTER',            'Υποσέλιδο σχολίων');
+define('_TEMPLATE_CONE',                       'Ένα σχόλιο');
+define('_TEMPLATE_CMANY',                      'Δύο (ή περισσότερα) σχόλια');
+define('_TEMPLATE_CMORE',                      'Περισσότερα αναγνωσμένα σχόλια');
+define('_TEMPLATE_CMEXTRA',            'Επιπλέον μέλος');
+define('_TEMPLATE_COMMENTS_NONE',      'Σχόλια (αν υπάρχουν)');
+define('_TEMPLATE_CNONE',                      'Καθόλου σχόλια');
+define('_TEMPLATE_COMMENTS_TOOMUCH','Σχόλια (αν υπάρχουν, αλλά πάρα πολλά για να εμφανιστούν σε μια γραμμή)');
+define('_TEMPLATE_CTOOMUCH',           'Υπερβολικά πολλά σχόλια');
+define('_TEMPLATE_ARCHIVELIST',                'Λίστες αρχείου');
+define('_TEMPLATE_AHEADER',            'Κεφαλίδα λίστας αρχείου');
+define('_TEMPLATE_AITEM',                      'Άρθρο λίστας αρχείου');
+define('_TEMPLATE_AFOOTER',            'Υποσέλιδο λίστας αρχείου');
+define('_TEMPLATE_DATETIME',           'Ημερομηνία και ώρα');
+define('_TEMPLATE_DHEADER',            'Κεφαλίδα ημερομηνίας');
+define('_TEMPLATE_DFOOTER',            'Υποσέλιδο ημερομηνίας');
+define('_TEMPLATE_DFORMAT',            'Μορφή ημερομηνίας');
+define('_TEMPLATE_TFORMAT',            'Μορφή ώρας');
+define('_TEMPLATE_LOCALE',                     'Τοπικές ρυθμίσεις');
+define('_TEMPLATE_IMAGE',                      'Αναδυόμενες εικόνες');
+define('_TEMPLATE_PCODE',                      'Κωδικός αναδυόμενου συνδέσμου');
+define('_TEMPLATE_ICODE',                      'Ενσωματωμένος κώδικας εικόνας');
+define('_TEMPLATE_MCODE',                      'Κώδικας συνδέσμου άρθρου μέσων');
+define('_TEMPLATE_SEARCH',                     'Εύρεση');
+define('_TEMPLATE_SHIGHLIGHT',         'Επισήμανση');
+define('_TEMPLATE_SNOTFOUND',          'Δεν βρέθηκε τίποτα');
+define('_TEMPLATE_UPDATE',                     'Ενημέρωση');
+define('_TEMPLATE_UPDATE_BTN',         'Ενημέρωση προτύπου');
+define('_TEMPLATE_RESET_BTN',          'Επαναφορά δεδομένων');
+define('_TEMPLATE_CATEGORYLIST',       'Λίστες κατηγοριών');
+define('_TEMPLATE_CATHEADER',          'Κεφαλίδα λίστας κατηγοριών');
+define('_TEMPLATE_CATITEM',                    'Στοιχείο λίστας κατηγοριών');
+define('_TEMPLATE_CATFOOTER',          'Υποσέλιδο λίστας κατηγοριών');
+
+// skins - KOSTANTINOS
+define('_SKIN_EDIT_TITLE',                     'Επεξεργασία εμφανίσεων');
+define('_SKIN_AVAILABLE_TITLE',                'Διαθέσιμες εμφανίσεις');
+define('_SKIN_NEW_TITLE',                      'Νέα εμφάνιση');
+define('_SKIN_NAME',                           'Όνομα');
+define('_SKIN_DESC',                           'Περιγραφή');
+define('_SKIN_TYPE',                           'Τύπος Περιεχομένου');
+define('_SKIN_CREATE',                         'Δημιουργία');
+define('_SKIN_CREATE_BTN',                     'Δημιουργία εμφάνισης');
+define('_SKIN_EDITONE_TITLE',          'Επεξεργασία εμφάνισης');
+define('_SKIN_BACK',                           'Πίσω στη γενική προεπισκόπηση εμφάνισης ');
+define('_SKIN_PARTS_TITLE',                    'Μέρη εμφάνισης');
+define('_SKIN_PARTS_MSG',                      'Δεν χρειάζονται όλοι οι τύποι για κάθε εμφάνιση. Άφησε κενά αυτά που δεν χρειάζονται. Διαλέξτε τον τύπο εμφάνισης που θα επεξεργαστείτε:');
+define('_SKIN_PART_MAIN',                      'Αρχική σελίδα');
+define('_SKIN_PART_ITEM',                      'Σελίδες άρθρων');
+define('_SKIN_PART_ALIST',                     'Λίστα αρχείων');
+define('_SKIN_PART_ARCHIVE',           'Αρχείο');
+define('_SKIN_PART_SEARCH',                    'Αναζήτηση');
+define('_SKIN_PART_ERROR',                     'Λάθη');
+define('_SKIN_PART_MEMBER',            'Στοιχεία μελών');
+define('_SKIN_PART_POPUP',                     'Αναδυόμενες εικόνες');
+define('_SKIN_GENSETTINGS_TITLE',      'Γενικές ρυθμίσεις');
+define('_SKIN_CHANGE',                         'Αλλαγή');
+define('_SKIN_CHANGE_BTN',                     'Αλλαγή των ρυθμίσεων');
+define('_SKIN_UPDATE_BTN',                     'Ανανέωση εμφάνισης');
+define('_SKIN_RESET_BTN',                      'Επαναφορά δεδομένων');
+define('_SKIN_EDITPART_TITLE',         'Επεξεργασία εμφάνισης');
+define('_SKIN_GOBACK',                         'Πήγαινε Πίσω');
+define('_SKIN_ALLOWEDVARS',            'Επιτρεπόμενες μεταβλητές (πατήστε για πληροφορίες):');
+
+// global settings
+define('_SETTINGS_TITLE',                      'Γενικές ρυθμίσεις');
+define('_SETTINGS_SUB_GENERAL',                'Γενικές ρυθμίσεις');
+define('_SETTINGS_DEFBLOG',                    'Προεπιλεγμένο ιστολόγιο');
+define('_SETTINGS_ADMINMAIL',          'Email διαχειριστή' );
+define('_SETTINGS_SITENAME',           'Όνομα δικτυακού τόπου');
+define('_SETTINGS_SITEURL',                    'URL δικτυακού τόπου (πρέπει να τελειώνει με κάθετο)');
+define('_SETTINGS_ADMINURL',           'URL περιοχής διαχείρισης (πρέπει να τελειώνει με κάθετο)');
+define('_SETTINGS_DIRS',                       ' Κατάλογοι Nucleus ');
+define('_SETTINGS_MEDIADIR',           ' Κατάλογοι Media ');
+define('_SETTINGS_SEECONFIGPHP',       '(βλέπε config.php)');
+define('_SETTINGS_MEDIAURL',           'Media URL (πρέπει να τελειώνει με κάθετο)');
+define('_SETTINGS_ALLOWUPLOAD',        'Να επιτρέπεται η αποστολή αρχείων;');
+define('_SETTINGS_ALLOWUPLOADTYPES','Τύποι αρχείων που επιτρέπεται η αποστολή τους');
+define('_SETTINGS_CHANGELOGIN',        'Να επιτρέπεται στους χρήστες να αλλάξουν όνομα χρήστη/κωδικό πρόσβασης');
+define('_SETTINGS_COOKIES_TITLE',      ' Ρυθμίσεις cookie');
+define('_SETTINGS_COOKIELIFE',         'Διάρκεια cookie σύνδεσης');
+define('_SETTINGS_COOKIESESSION',      'Cookies περιόδου λειτουργίας');
+define('_SETTINGS_COOKIEMONTH',        'Διάρκεια για ένα μήνα');
+define('_SETTINGS_COOKIEPATH',         ' Διαδρομή cookie (προχωρημένο)');
+define('_SETTINGS_COOKIEDOMAIN',       'Cookie τομέα (προχωρημένο)');
+define('_SETTINGS_COOKIESECURE',       'Ασφαλές cookie (προχωρημένο)');
+define('_SETTINGS_LASTVISIT',          'Αποθήκευση cookies τελευταίας επίσκεψης');
+define('_SETTINGS_ALLOWCREATE',        'Να επιτρέπεται στους επισκέπτες να δημιουργήσουν λογαριασμό μέλους');
+define('_SETTINGS_NEWLOGIN',           'Να επιτρέπεται η σύνδεση σε λογαριασμούς που δημιούργησαν χρήστες');
+define('_SETTINGS_NEWLOGIN2',          '(ισχύει μόνο για νέους λογαριασμούς)');
+define('_SETTINGS_MEMBERMSGS',         'Να επιτρέπεται η υπηρεσία μέλος-σε-μέλος');
+define('_SETTINGS_LANGUAGE',           'Προεπιλεγμένη γλώσσα');
+define('_SETTINGS_DISABLESITE',                'Απενεργοποίηση δικτυακού τόπου');
+define('_SETTINGS_DBLOGIN',                    'mySQL Login &amp; Database');
+define('_SETTINGS_UPDATE',                     'Ανανέωση ρυθμίσεων');
+define('_SETTINGS_UPDATE_BTN',         'Ανανέωση ρυθμίσεων');
+define('_SETTINGS_DISABLEJS',          'Απενεργοποίηση γραμμών εργαλείων JavaScript ');
+define('_SETTINGS_MEDIA',                      'Μέσα/Αποστολή αρχείων');
+define('_SETTINGS_MEDIAPREFIX',                'Προκαθορισμένα αρχεία για αποστολή με ημερομηνία');
+define('_SETTINGS_MEMBERS',            'Ρυθμίσεις μέλους');
+
+// bans
+define('_BAN_TITLE',                           'Λίστα αποκλεισμού για');
+define('_BAN_NONE',                            'Όχι απαγορέυσεις για αυτό το ιστολόγιο');
+define('_BAN_NEW_TITLE',                       'Προσθήκη νέας αποκλεισμού');
+define('_BAN_NEW_TEXT',                        'Προσθήκη νέου αποκλεισμού τώρα');
+define('_BAN_REMOVE_TITLE',                    'Κατάργηση αποκλεισμού');
+define('_BAN_IPRANGE',                         'Εύρος IP');
+define('_BAN_BLOGS',                           'Ποια ιστολόγια;');
+define('_BAN_DELETE_TITLE',                    'Διαγραφή αποκλεισμού');
+define('_BAN_ALLBLOGS',                        'Όλα τα ιστολόγια στα οποία έχετε δικαιώματα διαχειριστή ');
+define('_BAN_REMOVED_TITLE',           'Ο αποκλεισμός διαγράφηκε');
+define('_BAN_REMOVED_TEXT',            'Ο αποκλεισμός καταργήθηκε από τα παρακάτω ιστολόγια:');
+define('_BAN_ADD_TITLE',                       'Προσθήκη αποκλεισμού');
+define('_BAN_IPRANGE_TEXT',                    'Επιλογή εμβέλεια IP που θέλετε να μπλοκάρετε. Όσο πιο λίγους αριθμούς περιέχει, τόσο περισσότερες διευθύνσεις θα αποκλειστούν');
+define('_BAN_BLOGS_TEXT',                      'Μπορείτε είτε να διαλέξετε να αποκλείσετε την IP σε ένα μόνο ιστολόγιο είτε να την αποκλείσετε σε όλα τα ιστολόγια στα οποία έχετε δικαιώματα διαχειριστή. Κάντε την επιλογή σας παρακάτω');
+define('_BAN_REASON_TITLE',                    'Λόγος');
+define('_BAN_REASON_TEXT',                     'Μπορείτε να δώσετε ένα λόγο για τον αποκλεισμό, ο οποίος θα εμφανίζεται όταν ο κάτοχος IP προσπαθήσει να προσθέσει άλλο σχόλιο ή να δώσει ψήφο karma. Το μέγιστο μήκος είναι 256 χαρακτήρες.');
+define('_BAN_ADD_BTN',                         'Προσθήκη αποκλεισμού');
+
+// LOGIN screen
+define('_LOGIN_MESSAGE',                       'Μήνυμα');
+define('_LOGIN_NAME',                          'Όνομα');
+define('_LOGIN_PASSWORD',                      'Κωδικός πρόσβασης');
+define('_LOGIN_SHARED',                        'Κοινόχρηστη φόρμα σύνδεσης');
+define('_LOGIN_FORGOT',                        'Ξεχάσατε τον κωδικό σας;');
+
+// membermanagement
+define('_MEMBERS_TITLE',                       'Διαχείριση μέλους');
+define('_MEMBERS_CURRENT',                     'Υπάρχοντα μέλη');
+define('_MEMBERS_NEW',                 'Νέο μέλος');
+define('_MEMBERS_DISPLAY',                     'Εμφάνιση ονόματος');
+define('_MEMBERS_DISPLAY_INFO',                '(Αυτό είναι το όνομα που χρησιμοποιείς για login)');
+define('_MEMBERS_REALNAME',            'Πραγματικό όνομα');
+define('_MEMBERS_PWD',                 'Κωδικός πρόσβασης');
+define('_MEMBERS_REPPWD',                      'Επανάληψη κωδικού πρόσβασης');
+define('_MEMBERS_EMAIL',                       'Διεύθυνση ηλεκτρονικού ταχυδρομείου');
+define('_MEMBERS_EMAIL_EDIT',          '(Όταν αλλάξετε τη διεύθυνση ηλεκτρονικού ταχυδρομείου, ένας νέος κωδικός πρόσβασης θα σταλεί αυτόματα σε αυτή τη διεύθυνση )');
+define('_MEMBERS_URL',                         'Διεύθυνση τοποθεσίας (URL)');
+define('_MEMBERS_SUPERADMIN',          'Δικαιώματα διαχειριστή');
+define('_MEMBERS_CANLOGIN',            'Μπορείτε να συνδεθείτε στην περιοχή του Διαχειριστή');
+define('_MEMBERS_NOTES',                       'Σημειώσεις');
+define('_MEMBERS_NEW_BTN',             'Προσθήκη μέλους');
+define('_MEMBERS_EDIT',                        'Επεξεργασία μέλους');
+define('_MEMBERS_EDIT_BTN',            'Αλλαγή Ρυθμίσεων');
+define('_MEMBERS_BACKTOOVERVIEW',      'Πίσω στην προεπισκόπηση μέλους');
+define('_MEMBERS_DEFLANG',                     'Γλώσσα');
+define('_MEMBERS_USESITELANG',         '- Χρήση ρυθμίσεων δικτυακού τόπου -');
+
+// List of blogs (TT = tooltip)
+define('_BLOGLIST_TT_VISIT',           'Επίσκεψη δικτυακού τόπου');
+define('_BLOGLIST_ADD',                        'Προσθήκη άρθρου');
+define('_BLOGLIST_TT_ADD',             'Προσθήκη νέου άρθρου σε αυτό το ιστολόγιο');
+define('_BLOGLIST_EDIT',               'Επεξεργασία /Διαγραφή άρθρων');
+define('_BLOGLIST_TT_EDIT',                    '');
+define('_BLOGLIST_BMLET',                      'Σελιδοδεικτίδιο');
+define('_BLOGLIST_TT_BMLET',           '');
+define('_BLOGLIST_SETTINGS',           'Ρυθμίσεις');
+define('_BLOGLIST_TT_SETTINGS',                'Επεξεργασία ρυθμίσεων ή διαχείριση ομάδας');
+define('_BLOGLIST_BANS',                       'Απαγορεύσεις');
+define('_BLOGLIST_TT_BANS',                    'Προβολή, προσθήκη ή κατάργηση απαγορευμένων IP');
+define('_BLOGLIST_DELETE',                     'Διαγραφή όλων');
+define('_BLOGLIST_TT_DELETE',          'Διαγραφή αυτής της καταγραφής');
+
+// OVERVIEW screen
+define('_OVERVIEW_YRBLOGS',            'Οι καταγραφές σας');
+define('_OVERVIEW_YRDRAFTS',           'Το προσχέδιό σας');
+define('_OVERVIEW_YRSETTINGS',         'Οι ρυθμίσεις σας');
+define('_OVERVIEW_GSETTINGS',          'Γενικές ρυθμίσεις');
+define('_OVERVIEW_NOBLOGS',            'Δεν είστε σε καμία ομαδική λίστα καταγραφών');
+define('_OVERVIEW_NODRAFTS',           'Κανένα προσχέδιο');
+define('_OVERVIEW_EDITSETTINGS',       'Επεξεργασία ρυθμίσεων...');
+define('_OVERVIEW_BROWSEITEMS',        'Περιήγηση στα άρθρα...');
+define('_OVERVIEW_BROWSECOMM', 'Περιήγηση στα σχόλια...');
+define('_OVERVIEW_VIEWLOG',            'Προβολή ημερολογίου ενεργειών...');
+define('_OVERVIEW_MEMBERS',            'Διαχείριση μελών...');
+define('_OVERVIEW_NEWLOG',             'Δημιουργία νέου ημερολογίου ενεργειών...');
+define('_OVERVIEW_SETTINGS',           'Επεξεργασία ρυθμίσεων...');
+define('_OVERVIEW_TEMPLATES',          'Επεξεργασία προτύπου...');
+define('_OVERVIEW_SKINS',                      'Επεξεργασία εμφανίσεων...');
+define('_OVERVIEW_BACKUP',                     'Αντίγραφο ασφαλείας/Επαναφορά...');
+
+// ITEMLIST
+define('_ITEMLIST_BLOG',                       'Άρθρα για το ιστολόγιο'); 
+define('_ITEMLIST_YOUR',                       'Τα άρθρα σας');
+
+// Comments
+define('_COMMENTS',                            'Σχόλια');
+define('_NOCOMMENTS',                          'Κανένα σχόλιο για αυτό το άρθρο');
+define('_COMMENTS_YOUR',                       'Τα σχόλιά σας');
+define('_NOCOMMENTS_YOUR',             'Δεν γράψατε κανένα σχόλιο');
+
+// LISTS (general)
+define('_LISTS_NOMORE',                        'Δεν υπάρχουν άλλα αποτελέσματα ή δεν βρέθηκαν καθόλου αποτελέσματα');
+define('_LISTS_PREV',                          'Προηγούμενο');
+define('_LISTS_NEXT',                          'Επόμενο');
+define('_LISTS_SEARCH',                                'Εύρεση');
+define('_LISTS_CHANGE',                                'Αλλαγή');
+define('_LISTS_PERPAGE',                       'άρθρα/σελίδα');
+define('_LISTS_ACTIONS',                       'Ενέργειες');
+define('_LISTS_DELETE',                                'Διαγραφή');
+define('_LISTS_EDIT',                          'Επεξεργασία');
+define('_LISTS_MOVE',                          'Μετακίνηση');
+define('_LISTS_CLONE',                         'Κλωνοποίηση');
+define('_LISTS_TITLE',                         'Τίτλος');
+define('_LISTS_BLOG',                          'Ιστολόγιο');
+define('_LISTS_NAME',                          'Όνομα');
+define('_LISTS_DESC',                          'Περιγραφή');
+define('_LISTS_TIME',                          'Ώρα');
+define('_LISTS_COMMENTS',                      'Σχόλια');
+define('_LISTS_TYPE',                          'Τύπος ');
+
+
+// member list 
+define('_LIST_MEMBER_NAME',            'Εμφάνιση ονόματος');
+define('_LIST_MEMBER_RNAME',           'Πραγματικό όνομα');
+define('_LIST_MEMBER_ADMIN',           'Υπέρδιαχειριστής; ');
+define('_LIST_MEMBER_LOGIN',           'Μπορώ να συνδεθώ; ');
+define('_LIST_MEMBER_URL',                     'Δικτυακός τόπος');
+
+// banlist
+define('_LIST_BAN_IPRANGE',                    'Εμβέλεια IP');
+define('_LIST_BAN_REASON',                     'Λόγος');
+
+// actionlist
+define('_LIST_ACTION_MSG',                     'Μήνυμα');
+
+// commentlist
+define('_LIST_COMMENT_BANIP',          'Αποκλεισμός IP');
+define('_LIST_COMMENT_WHO',            'Συντάκτης');
+define('_LIST_COMMENT',                        'Σχόλιο');
+define('_LIST_COMMENT_HOST',           'Host');
+
+// itemlist
+define('_LIST_ITEM_INFO',                      'Πληροφορία');
+define('_LIST_ITEM_CONTENT',           'Τίτλος και Κείμενο');
+
+
+// teamlist
+define('_LIST_TEAM_ADMIN',                     'Διαχειριστής ');
+define('_LIST_TEAM_CHADMIN',           'Αλλαγή διαχειριστή');
+
+// edit comments
+define('_EDITC_TITLE',                         'Επεξεργασία σχολίων');
+define('_EDITC_WHO',                           'Συντάκτης');
+define('_EDITC_HOST',                          'Από πού;');
+define('_EDITC_WHEN',                          'Πότε;');
+define('_EDITC_TEXT',                          'Κείμενο');
+define('_EDITC_EDIT',                          'Επεξεργασία σχολίου');
+define('_EDITC_MEMBER',                        'μέλος');
+define('_EDITC_NONMEMBER',                     'όχι μέλος');
+
+// move item
+define('_MOVE_TITLE',                          'Μεταφορά σε ποιο ιστολόγιο;');
+define('_MOVE_BTN',                            'Μεταφορά άρθρου');
diff --git a/nucleus/locales/el_Latn_GR.WINDOWS-1253.php b/nucleus/locales/el_Latn_GR.WINDOWS-1253.php
new file mode 100644 (file)
index 0000000..8c474ab
--- /dev/null
@@ -0,0 +1,1267 @@
+<?php
+/**
+ * Nucleus CMS Locale File
+ * Greek in Greece (Latin script)
+ * 
+ * Nucleus version: v1.0-v2.5
+ * Authors: Antonis Scandalis (scandalis@datapages.gr) and Vangelis Pantelias (gelitheworm@limoutsis.gr)
+ * Full Revision and update for version 3.1 by Spiros Doikas (www.translatum.gr) on the 30th July 2005.
+ *
+ * @license http://nucleuscms.org/license.txt GNU General Public License
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group
+ * @version $Id: el_Latn_GR.WINDOWS-1253.php 1837 2012-05-13 04:12:13Z sakamocchi $
+ */
+
+/********************************************
+ *        Start New for 4.0                 *
+ ********************************************/
+define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
+define('_LISTS_AUTHOR', 'Author');
+define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts');
+/********************************************
+ *        Start New for 3.6x                *
+ ********************************************/
+define('_ERROR_USER_TOO_LONG', 'Please enter a name shorter than 40 characters.');
+define('_ERROR_EMAIL_TOO_LONG', 'Please enter an email shorter than 100 characters.');
+define('_ERROR_URL_TOO_LONG', 'Please enter a website shorter than 100 characters.');
+
+/********************************************
+ *        Start New for 3.62                *
+ ********************************************/
+define('_SETTINGS_ADMINCSS',           'Admin Area Style');
+
+/********************************************
+ *        Start New for 3.50                *
+ ********************************************/
+define('_PLUGS_TITLE_GETPLUGINS',              'get more plugins...');
+define('_ARCHIVETYPE_YEAR', 'year');
+define('_ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TITLE',            'Newer Version Available');
+define('_ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TEXT',             'Upgrade available: v');
+define('_MANAGER_PLUGINSQLAPI_NOTSUPPORT', "Plugin %s was not loaded (does not support SqlApi and you are trying to use a non-mysql db)");
+
+
+/********************************************
+ *        Start New for 3.40                *
+ ********************************************/
+
+// START changed/added after 3.33 START
+define('_MEMBERS_USEAUTOSAVE',                                         'Use the Autosave function?');
+
+define('_TEMPLATE_PLUGIN_FIELDS',                                      'Custom Plugin Fields');
+define('_TEMPLATE_BLOGLIST',                                           'Template Blog List');
+define('_TEMPLATE_BLOGHEADER',                                         'Blog List Header');
+define('_TEMPLATE_BLOGITEM',                                           'Blog List Item');
+define('_TEMPLATE_BLOGFOOTER',                                         'Blog List Footer');
+
+define('_SETTINGS_DEFAULTLISTSIZE',                                    'Default Size of Lists in Admin Area');
+define('_SETTINGS_DEBUGVARS',          'Debug Vars');
+
+define('_CREATE_ACCOUNT_TITLE',                                                'Create Member Account');
+define('_CREATE_ACCOUNT0',                                                     'Create Account');
+define('_CREATE_ACCOUNT1',                                                     'Visitors are not allowed to create a Member Account.<br /><br />');
+define('_CREATE_ACCOUNT2',                                                     'Please contact the website administrator for more information.');
+define('_CREATE_ACCOUNT_USER_DATA',                                    'Account Info.');
+define('_CREATE_ACCOUNT_LOGIN_NAME',                           'Login Name (required):');
+define('_CREATE_ACCOUNT_LOGIN_NAME_VALID',                     'only a-z and 0-9 allowed, no spaces at start/end');
+define('_CREATE_ACCOUNT_REAL_NAME',                                    'Real Name (required):');
+define('_CREATE_ACCOUNT_EMAIL',                                                'Email (required):');
+define('_CREATE_ACCOUNT_EMAIL2',                                       '(must be valid, because an activation link will be sent over there)');
+define('_CREATE_ACCOUNT_URL',                                          'URL:');
+define('_CREATE_ACCOUNT_SUBMIT',                                       'Create Account');
+
+define('_BMLET_BACKTODRAFTS',          'Move back to drafts');
+define('_BMLET_CANCEL',                                'Cancel');
+
+define('_LIST_ITEM_NOCONTENT',                                         'No Comment');
+define('_LIST_ITEM_COMMENTS',                                          '%d Comments');
+
+define('_EDITC_URL',                           'Web site');
+define('_EDITC_EMAIL',                         'E-mail');
+
+define('_MANAGER_PLUGINFILE_NOTFOUND',                         "Plugin %s was not loaded (File not found)");
+/* changed */
+// plugin dependency 
+define('_ERROR_INSREQPLUGIN',          'Plugin installation failed, requires %s');
+define('_ERROR_DELREQPLUGIN',          'Plugin deletion failed, required by %s');
+
+//define('_ADD_ADDLATER',                                                              'Add Later');
+define('_ADD_ADDLATER',                                                                'Add the dates specified');
+
+define('_LOGIN_NAME',                          'Name:');
+define('_LOGIN_PASSWORD',                      'Password:');
+
+// changed from _BOOKMARLET_BMARKLFOLLOW
+define('_BOOKMARKLET_BMARKFOLLOW',                                     ' (Works with nearly all browsers)');
+// END changed/added after 3.33 END
+
+// START merge UTF-8 and EUC-JP
+
+// Create New blog
+define('_ADMIN_NOTABILIA',                                                     'Some information');
+define('_ADMIN_PLEASE_READ',                                           "Before you start, here's some <strong>important information</strong>");
+define('_ADMIN_HOW_TO_ACCESS',                                         "After you've created a new weblog, you'll need to perform some actions to make your blog accessible. There are two possibilities:");
+define('_ADMIN_SIMPLE_WAY',                                                    "<strong>Simple:</strong> Create a copy of <code>index.php</code> and modify it to display your new weblog. Further instructions on how to do this will be provided after you've submitted this first form.");
+define('_ADMIN_ADVANCED_WAY',                                          "<strong>Advanced:</strong> Insert the blog content into your current skins using skinvars like <code>&lt;%otherblog()&gt;</code>. This way, you can place multiple blogs on the same page.");
+define('_ADMIN_HOW_TO_CREATE',                                         'Create Weblog');
+
+
+define('_BOOKMARKLET_NEW_CATEGORY',                                    'Item was added, and a new category was created. ');
+define('_BOOKMARKLET_NEW_CATEGORY_EDIT',                       'Click here to edit the name and description of the category.');
+define('_BOOKMARKLET_NEW_WINDOW',                                      'Opens in new window');
+define('_BOOKMARKLET_SEND_PING',                                       'Item was added successfully. Now pinging weblogs.com. Please hold on... (can take a while)'); // NOTE: This string is no longer in used
+
+// END merge UTF-8 and EUC-JP
+
+// <add by shizuki>
+// OVERVIEW screen
+define('_OVERVIEW_SHOWALL',                                                    'Show all blogs');      // <add by shizuki />
+
+// Edit skins
+define('_SKINEDIT_ALLOWEDBLOGS',                                               'Short blog names:');                   // <add by shizuki>
+define('_SKINEDIT_ALLOWEDTEMPLATESS',                                  'Template names:');             // <add by shizuki>
+
+// delete member
+define('_WARNINGTXT_NOTDELMEDIAFILES',                         'Please note that media files will <b>NOT</b> be deleted. (At least not in this Nucleus version)');     // <add by shizuki />
+
+// send Weblogupdate.ping
+define('_UPDATEDPING_MESSAGE',                                         '<h2>Site Updated, Now pinging various weblog listing services...</h2><p>This can take a while...</p><p>If you aren\'t automatically passed through, '); // NOTE: This string is no longer in used
+define('_UPDATEDPING_GOPINGPAGE',                                      'try again'); // NOTE: This string is no longer in used
+define('_UPDATEDPING_PINGING',                                         'Pinging services, please wait...'); // NOTE: This string is no longer in used
+define('_UPDATEDPING_VIEWITEM',                                                'View list of recent items for '); // NOTE: This string is no longer in used
+define('_UPDATEDPING_VISITOWNSITE',                                    'Visit your own site'); // NOTE: This string is no longer in used
+
+// General category
+define('_EBLOGDEFAULTCATEGORY_NAME',                           'General');
+define('_EBLOGDEFAULTCATEGORY_DESC',                           'Items that do not fit in other categories');
+
+// First ITEM
+define('_EBLOG_FIRSTITEM_TITLE',                                       'First Item');
+define('_EBLOG_FIRSTITEM_BODY',                                                'This is the first item in your weblog. Feel free to delete it.');
+
+// New weblog was created
+define('_BLOGCREATED_TITLE',                                           'New weblog created');
+define('_BLOGCREATED_ADDEDTXT',                                                "Your new weblog (%s) has been created. To continue, choose the way you'll want to make it viewable:");
+define('_BLOGCREATED_SIMPLEWAY',                                       "Easiest: A copy of <code>%s.php</code>");
+define('_BLOGCREATED_ADVANCEDWAY',                                     "Advanced: Call the weblog from existing skins");
+define('_BLOGCREATED_SIMPLEDESC1',                                     "Method 1: Create an extra <code>%s.php</code> file");
+define('_BLOGCREATED_SIMPLEDESC2',                                     "Create a file called <code>%s.php</code>, and copy-paste the following code into it:");
+define('_BLOGCREATED_SIMPLEDESC3',                                     "Upload the file next to your existing <code>index.php</code> file, and you should be all set.");
+define('_BLOGCREATED_SIMPLEDESC4',                                     "To finish the weblog creation process, please fill out the final URL for your weblog (the proposed value is a <em>guess</em>, don't take it for granted):");
+define('_BLOGCREATED_ADVANCEDWAY2',                                    "Method 2: Call the weblog from existing skins");
+define('_BLOGCREATED_ADVANCEDWAY3',                                    "To finish the weblog creation process, simply please fill out the final URL for your weblog: (might be the same as another already existing weblog)");
+
+// Donate!
+define('_ADMINPAGEFOOT_OFFICIALURL',                           'http://nucleuscms.org/');
+define('_ADMINPAGEFOOT_DONATEURL',                                     'http://nucleuscms.org/donate.php');
+define('_ADMINPAGEFOOT_DONATE',                                                'Donate!');
+define('_ADMINPAGEFOOT_COPYRIGHT',                                     'The Nucleus Group');
+
+// Quick menu
+define('_QMENU_MANAGE_SYSTEM',                                         'System info');
+
+// Bookmarklet
+define('_BOOKMARKLET_TITLE',                                           'Bookmarklet<!-- and Right Click Menu -->');
+define('_BOOKMARKLET_DESC1',                                           'Bookmarklets allow adding items to your weblog with just one single click. ');
+define('_BOOKMARKLET_DESC2',                                           'After installing these bookmarklets, you\'ll be able to click the \'add to weblog\' button on your browser toolbar, ');
+define('_BOOKMARKLET_DESC3',                                           'and a Nucleus add-item window will popup, ');
+define('_BOOKMARKLET_DESC4',                                           'containing the link and title of the page you were visiting, ');
+define('_BOOKMARKLET_DESC5',                                           'plus any text you might have selected.');
+define('_BOOKMARKLET_BOOKARKLET',                                      'bookmarklet');
+define('_BOOKMARKLET_ANCHOR',                                          'Add to %s');
+define('_BOOKMARKLET_BMARKTEXT',                                       'You can drag the following link to your favorites, or your browsers toolbar: ');
+define('_BOOKMARKLET_BMARKTEST',                                       '(if you want to test the bookmarklet first, click the link)');
+
+define('_BOOKMARKLET_ERROR_SOMETHINGWRONG',                    'Something went wrong');
+define('_BOOKMARKLET_ERROR_COULDNTNEWCAT',                     'Could not create new category');
+
+// BAN
+define('_BAN_EXAMPLE_TITLE',                                           'An example');
+define('_BAN_EXAMPLE_TEXT',                                                    ': "134.58.253.193" will only block one computer, while "134.58.253" will block 256 IP addresses, including the one from the first example.');
+define('_BAN_IP_CUSTOM',                                                       'Custom: ');
+define('_BAN_BANBLOGNAME',                                                     'Only blog %s');
+
+// Plugin Options
+define('_PLUGIN_OPTIONS_TITLE',                                                        'Options for %s');
+
+// Plugin file loda error
+define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
+
+//ITEM add/edit template (for japanese only)
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
+
+// Errors
+define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
+define('_ERRORS_INSTALLDIR',                                           'install directory should be deleted');  // <add by shizuki />
+define('_ERRORS_INSTALLPHP',                                           'install.php should be deleted');
+define('_ERRORS_UPGRADESDIR',                                          'nucleus/upgrades directory should be deleted');
+define('_ERRORS_CONVERTDIR',                                           'nucleus/convert directory should be deleted');
+define('_ERRORS_CONFIGPHP',                                                    'config.php should be non-writable (chmod to 444)');
+define('_ERRORS_STARTUPERROR1',                                                '<p>One or more of the Nucleus installation files are still present on the webserver, or are writable.</p><p>You should remove these files or change their permissions to ensure security. Here are the files that were found by Nucleus</p> <ul><li>');
+define('_ERRORS_STARTUPERROR2',                                                '</li></ul><p>If you don\'t want to see this error message again, without solving the problem, set <code>$CONF[\'alertOnSecurityRisk\']</code> in <code>globalfunctions.php</code> to <code>0</code>, or do this at the end of <code>config.php</code>.</p>');
+define('_ERRORS_STARTUPERROR3',                                                'Security Risk');
+
+// PluginAdmin tickets by javascript
+define('_PLUGINADMIN_TICKETS_JAVASCRIPT',                      '<p><b>Error occured during automatic addition of tickets.</b></p>');
+
+// Global settings disablesite URL
+define('_SETTINGS_DISABLESITEURL',                                     'Redirect URL:');
+
+// Skin import/export
+define('_SKINIE_SEELEMENT_UNEXPECTEDTAG',                      'UNEXPECTED TAG');
+define('_SKINIE_ERROR_FAILEDOPEN_FILEURL',                     'Failed to open file/URL');
+define('_SKINIE_NAME_CLASHES_DETECTED',                                'Name clashes detected, re-run with allowOverwrite = 1 to force overwrite');
+
+// ACTIONS.php parse_commentform
+define('_ACTIONURL_NOTLONGER_PARAMATER',                       'actionurl is not longer a parameter on commentform skinvars. Moved to be a global setting instead.');
+
+// ADMIN.php addToTemplate 'Query error: '
+define('_ADMIN_SQLDIE_QUERYERROR',                                     'Query error: ');
+
+// backyp.php Backup WARNING
+define('_BACKUP_BACKUPFILE_TITLE',                                     'This is a backup file generated by Nucleus');
+define('_BACKUP_BACKUPFILE_BACKUPDATE',                                'backup-date:');
+define('_BACKUP_BACKUPFILE_NUCLEUSVERSION',                    'Nucleus CMS version:');
+define('_BACKUP_BACKUPFILE_DATABASE_NAME',                     'Nucleus CMS Database name:');
+define('_BACKUP_BACKUPFILE_TABLE_NAME',                                'TABLE:');
+define('_BACKUP_BACKUPFILE_TABLEDATAFOR',                      'Table Data for %s');
+define('_BACKUP_WARNING_NUCLEUSVERSION',                       'WARNING: Only try to restore on servers running the exact same version of Nucleus');
+define('_BACKUP_RESTOR_NOFILEUPLOADED',                                'No file uploaded');
+define('_BACKUP_RESTOR_UPLOAD_ERROR',                          'File Upload Error');
+define('_BACKUP_RESTOR_UPLOAD_NOCORRECTTYPE',          'The uploaded file is not of the correct type');
+define('_BACKUP_RESTOR_UPLOAD_NOZLIB',                         'Cannot decompress gzipped backup (zlib package not installed)');
+define('_BACKUP_RESTOR_SQL_ERROR',                                     'SQL Error: ');
+
+// BLOG.php addTeamMember
+define('_TEAM_ADD_NEWTEAMMEMBER',                                      'Added %s (ID=%d) to the team of blog "%s"');
+
+// ADMIN.php systemoverview()
+define('_ADMIN_SYSTEMOVERVIEW_HEADING',                                'System Overview');
+define('_ADMIN_SYSTEMOVERVIEW_PHPANDMYSQL',                    'PHP and MySQL');
+define('_ADMIN_SYSTEMOVERVIEW_VERSIONS',                       'Versions');
+define('_ADMIN_SYSTEMOVERVIEW_PHPVERSION',                     'PHP version');
+define('_ADMIN_SYSTEMOVERVIEW_MYSQLVERSION',           'MySQL version');
+define('_ADMIN_SYSTEMOVERVIEW_SETTINGS',                       'Settings');
+define('_ADMIN_SYSTEMOVERVIEW_GDLIBRALY',                      'GD Libraly');
+define('_ADMIN_SYSTEMOVERVIEW_MODULES',                                'Modules');
+define('_ADMIN_SYSTEMOVERVIEW_ENABLE',                         'enabled');
+define('_ADMIN_SYSTEMOVERVIEW_DISABLE',                                'disabled');
+define('_ADMIN_SYSTEMOVERVIEW_NUCLEUSSYSTEM',          'Your Nucleus CMS System');
+define('_ADMIN_SYSTEMOVERVIEW_NUCLEUSVERSION',         'Nucleus CMS version');
+define('_ADMIN_SYSTEMOVERVIEW_NUCLEUSPATCHLEVEL',      'Nucleus CMS patch level');
+define('_ADMIN_SYSTEMOVERVIEW_NUCLEUSSETTINGS',                'Important settings');
+define('_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK',           'Check for a new version');
+define('_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TXT',       'Check on nucleuscms.org if a new version is available: ');
+define('_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_URL',       'http://nucleuscms.org/version.php?v=%d&amp;pl=%d');
+define('_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE',     'Check for upgrade');
+define('_ADMIN_SYSTEMOVERVIEW_NOT_ADMIN',                      "You haven't enough rights to see the system informations.");
+
+// ENCAPSULATE.php
+define('_ENCAPSULATE_ENCAPSULATE_NOENTRY',                     'No entries');
+
+// globalfunctions.php
+define('_GFUNCTIONS_LOGINPCSHARED_YES',                                'on shared PC');
+define('_GFUNCTIONS_LOGINPCSHARED_NO',                         'on not shared PC');
+define('_GFUNCTIONS_LOGINSUCCESSFUL_TXT',                      'Login successful for %s (%s)');
+define('_GFUNCTIONS_LOGINFAILED_TXT',                          'Login failed for %s');
+define('_GFUNCTIONS_LOGOUT_TXT',                                       '%s is logouted');
+define('_GFUNCTIONS_HEADERSALREADYSENT_FILE',          ' in <code>%s</code> line <code>%s</code>');
+define('_GFUNCTIONS_HEADERSALREADYSENT_TITLE',         ' Page headers already sent');
+define('_GFUNCTIONS_HEADERSALREADYSENT_TXT',           '<p>The page headers have already been sent out%s. This could cause Nucleus not to work in the expected way.</p><p>Usually, this is caused by spaces or newlines at the end of the <code>config.php</code> file, at the end of the translation file or at the end of a plugin file. Please check this and try again.</p><p>If you don\'t want to see this error message again, without solving the problem, set <code>$CONF[\'alertOnHeadersSent\']</code> in <code>globalfunctions.php</code> to <code>0</code></p>');
+define('_GFUNCTIONS_PARSEFILE_FILEMISSING',                    'A file is missing');
+define('_GFUNCTIONS_AN_ERROR_OCCURRED',                                'Sorry. An error occurred.');
+define('_GFUNCTIONS_YOU_AERNT_LOGGEDIN',                       "You aren't logged in.");
+
+// MANAGER.php
+define('_MANAGER_PLUGINFILE_NOCLASS',                          "Plugin %s was not loaded (Class not found in file, possible parse error)");
+define('_MANAGER_PLUGINTABLEPREFIX_NOTSUPPORT',                "Plugin %s was not loaded (does not support SqlTablePrefix)");
+
+// mysql.php
+define('_NO_SUITABLE_MYSQL_LIBRARY',                           "<p>No suitable mySQL library was found to run Nucleus</p>");
+
+// PLUGIN.php
+define('_ERROR_PLUGIN_NOSUCHACTION',                           'No Such Action');
+
+// PLUGINADMIN.php
+define('_ERROR_INVALID_PLUGIN',                                                'Invalid plugin');
+
+// showlist.php
+define('_LIST_PLUGS_DEPREQ',                                           'Plugin(s) requires:');
+define('_LIST_SKIN_PREVIEW',                                           "Preview for '%s' skin");
+define('_LIST_SKIN_PREVIEW_VIEWLARGER',                                "View larger");
+define('_LIST_SKIN_README',                                                    "More info on the '%s' skin");
+define('_LIST_SKIN_README_TXT',                                                'Read me');
+
+// BLOG.php createNewCategory()
+define('_CREATED_NEW_CATEGORY_NAME',                           'newcat');
+define('_CREATED_NEW_CATEGORY_DESC',                           'New category');
+
+// ADMIN.php blog settings
+define('_EBLOG_CURRENT_TEAM_MEMBER',                           'Members currently on your team:');
+
+/********************************************
+ *        End New for 3.40                  *
+ ********************************************/
+
+// START changed/added after 3.3 START
+define('_AUTOSAVEDRAFT',               'Auto save draft');
+define('_AUTOSAVEDRAFT_LASTSAVED',     'Last saved: ');
+define('_AUTOSAVEDRAFT_NOTYETSAVED',   'No saves have been made yet');
+define('_AUTOSAVEDRAFT_NOW',           'Auto save now');
+define('_SKIN_PARTS_SPECIAL',          'Special skin parts');
+define('_ERROR_SKIN_PARTS_SPECIAL_FORMAT',             'You must enter a name that exists only out of lowercase letters and digits');
+define('_ERROR_SKIN_PARTS_SPECIAL_DELETE',             'Can\'t delete this skin part');
+define('_CONFIRMTXT_SKIN_PARTS_SPECIAL',               'Do you really want to delete this special skin part?');
+define('_ERROR_PLUGIN_LOAD',           'Plugin could not be loaded, or does not support certain features that are required for it to run on your Nucleus installation (you might want to check the <a href="?action=actionlog">actionlog</a> for more info)');
+// END changed/added after 3.3 END
+
+// START changed/added after 3.22 START
+define('_SEARCHFORM_QUERY',                    'Keywords to search');
+define('_ERROR_EMAIL_REQUIRED',                'Email address is required');
+define('_COMMENTFORM_MAIL',                    'Website:');
+define('_COMMENTFORM_EMAIL',           'E-mail:');
+define('_EBLOG_REQUIREDEMAIL',         'Require E-mail address with comments?');
+define('_ERROR_COMMENTS_SPAM',      'Your comment was rejected because it did not pass the spam test');
+// END changed/added after 3.22 END
+
+// START changed/added after 315 START
+
+define('_LIST_PLUG_SUBS_NEEDUPDATE','Per favore usa il pulsante \'Aggiorna lista di sottoscrizione\' per aggiornare la lista di sottoscrizione dei plugin.');
+define('_LIST_PLUGS_DEP',                      'I Plugin richiedono:');
+
+// END changed/added after 3.15
+
+// START changed/added after 3.1 START
+
+// comments list per weblog
+define('_COMMENTS_BLOG',                       '¼ëá ôá ó÷üëéá ãéá ôï éóôïëüãéï');
+define('_NOCOMMENTS_BLOG',                     'Äåí Ý÷ïõí ãéíåé ó÷üëéá óå Üñèñá áõôïý ôïõ éóôïëïãßïõ');
+define('_BLOGLIST_COMMENTS',           'Ó÷üëéá');
+define('_BLOGLIST_TT_COMMENTS',                'Ìéá ëßóôá ìå üëá ôá ó÷üëéá ðïõ Ý÷ïõí ãßíåé óå Üñèñá áõôïý ôïõ éóôïëïãßïõ');
+
+
+// for use in archivetype-skinvar
+define('_ARCHIVETYPE_DAY',                     'çìÝñá');
+define('_ARCHIVETYPE_MONTH',           'ìÞíáò');
+
+// tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
+define('_ERROR_BADTICKET',                     'Ìç Ýãêõñï Þ ëçãìÝíï åéóéôÞñéï.');
+
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Ç åãêáôÜóôáóç ðñïóèÝôïõ áðÝôõ÷å, áðáéôåß ');
+define('_ERROR_DELREQPLUGIN',          'Ç äéáãñáöÞ ðñïóèÝôïõ áðÝôõ÷å, áðáéôåßôáé áðü');
+
+// cookie prefix
+define('_SETTINGS_COOKIEPREFIX',       'Ðñüèåìá cookie');
+
+// account activation
+define('_ERROR_NOLOGON_NOACTIVATE',    'Äåí åßíáé äõíáôÞ ç áðïóôïëÞ óõíäÝóìïõ åíåñãïðïßçóçò. Äåí óáò åðéôñÝðåôáé íá óõíäåèåßôå.');
+define('_ERROR_ACTIVATE',                      'Ôï êëåéäß åíåñãïðïßçóçò äåí õðÜñ÷åé, äåí åßíáé Ýãêõñï Þ Ý÷åé ëÞîåé.');
+define('_ACTIONLOG_ACTIVATIONLINK', 'Ï óýíäåóìïò åíåñãïðïßçóçò Ý÷åé óôáëåß');
+define('_MSG_ACTIVATION_SENT',         '¸íáò óýíäåóìïò åíåñãïðïßçóçò Ý÷åé óôáëåß ìå e-mail.');
+
+// activation link emails
+define('_ACTIVATE_REGISTER_MAIL',      "Ãåéá óáò <%memberName%>,\n\nÐñÝðåé íá åíåñãïðïéÞóåôå ôïí ëïãáñéáóìü óáò óôï <%siteName%> (<%siteUrl%>).\nÌðïñåßôå íá ôï êÜíåôå ðçãáßíïíôáò óôïí ðáñáêÜôù óýíäåóìï: \n\n\t<%activationUrl%>\n\n¸÷åôå 2 ðåñéèþñéï ãéá íá ôï êÜíåôå. ¾óôåñá, ï óýíäåóìïò åíåñãïðïßçóçò äåí èá åßíáé ðëÝïí Ýãêõñïò.");
+define('_ACTIVATE_REGISTER_MAILTITLE', "ÅíåñãïðïéÞóôå ôïí ëïãáñéáóìü óáò '<%memberName%>'");
+define('_ACTIVATE_REGISTER_TITLE',     'Êáëþò üñéóåò <%memberName%>');
+define('_ACTIVATE_REGISTER_TEXT',      '¸÷åôå ó÷åäüí ôåëåéþóåé. Ðáñáêáëþ åðéëÝîôå Ýíáí êùäéêü ðñüóâáóçò ãéá ôïí ðáñáêÜôù ëïãáñéáóìü óáò.');
+define('_ACTIVATE_FORGOT_MAIL',                "Hi <%memberName%>,\n\n×ñçóéìïðïéþíôáò ôïí ðáñáêÜôù óýíäåóìï, ìðïñåßôå íá åðéëÝîôå Ýíáí íÝï êùäéêü ðñüóâáóçò ãéá ôïí ëïãáñéáóìü óáò óôï <%siteName%> (<%siteUrl%>) åðéëÝãïíôáò Ýíáí íÝï êùäéêü ðñüóâáóçò .\n\n\t<%activationUrl%>\n\n¸÷åôå 2 ðåñéèþñéï ãéá íá ôï êÜíåôå. ¾óôåñá, ï óýíäåóìïò åíåñãïðïßçóçò äåí èá åßíáé ðëÝïí Ýãêõñïò.");
+define('_ACTIVATE_FORGOT_MAILTITLE',"ÅíåñãïðïéÞóôå îáíÜ óôïí ëïãáñéáóìü óáò '<%memberName%>'");
+define('_ACTIVATE_FORGOT_TITLE',       'Êáëþò üñéóåò <%memberName%>');
+define('_ACTIVATE_FORGOT_TEXT',                'Ìðïñåßôå íá åðéëÝîôå Ýíáí íÝï êùäéêü ðñüóâáóçò ãéá ôïí ëïãáñéáóìü óáò ðáñáêÜôù:');
+define('_ACTIVATE_CHANGE_MAIL',                "Hi <%memberName%>,\n\nÊáèþò ç äéåýèõíóÞ óáò e-mail Ý÷åé áëëÜîåé, èá ÷ñåéáóôå íá åíåñãïðïéÞóåôå îáíÜ ôï ëïãáñéáóìü óáò óôï <%siteName%> (<%siteUrl%>).\nÌðïñåßôå íá ôï êÜíåôå ðçãáßíïíôáò óôïí ðáñáêÜôù óýíäåóìï: \n\n\t<%activationUrl%>\n\n¸÷åôå 2 ðåñéèþñéï ãéá íá ôï êÜíåôå. ¾óôåñá, ï óýíäåóìïò åíåñãïðïßçóçò äåí èá åßíáé ðëÝïí Ýãêõñïò.");
+define('_ACTIVATE_CHANGE_MAILTITLE',"ÅíåñãïðïéÞóôå îáíÜ óôïí ëïãáñéáóìü óáò '<%memberName%>'");
+define('_ACTIVATE_CHANGE_TITLE',       'Êáëþò üñéóåò <%memberName%>');
+define('_ACTIVATE_CHANGE_TEXT',                'Ç äéåýèõíóÞ óáò åðáëçèåýôçêå. Åõ÷áñéóôïýìå!');
+define('_ACTIVATE_SUCCESS_TITLE',      'Ç åíåñãïðïßçóç ðÝôõ÷å');
+define('_ACTIVATE_SUCCESS_TEXT',       'Ï ëïãáñéáóìüò óáò åíåñãïðïéÞèçêå ìå åðéôõ÷ßá.');
+define('_MEMBERS_SETPWD',                      'Ïñéóìüò êùäéêïý ðñüóâáóçò');
+define('_MEMBERS_SETPWD_BTN',          'Ïñéóìüò êùäéêïý ðñüóâáóçò');
+define('_QMENU_ACTIVATE',                      'Åíåñãïðïßçóç ëïãáñéáóìïý');
+define('_QMENU_ACTIVATE_TEXT',         '<p>Áöïý åíåñãïðïéÞóåôå ôïí ëïãáñéáóìü óáò, ìðïñåßôå íá áñ÷ßóåôå íá ôïí ÷ñçóéìïðïéåßôå áöïý <a href="index.php?action=showlogin">óõíäåèåßôå</a>.</p>');
+
+define('_PLUGS_BTN_UPDATE',                    'ÅíçìÝñùóç ëßóôáò óõíäñïìÞò');
+
+// global settings
+define('_SETTINGS_JSTOOLBAR',          'ÃñáììÞ åñãáëåßùí óå óôõë Javascript');
+define('_SETTINGS_JSTOOLBAR_FULL',     'ÐëÞñçò ãñáììÞ åñãáëåßùí (IE)');
+define('_SETTINGS_JSTOOLBAR_SIMPLE','ÁðëÞ ãñáììÞ åñãáëåßùí (¼÷é IE)');
+define('_SETTINGS_JSTOOLBAR_NONE',     'Áðåíåñãïðïßçóç ãñáììÞò åñãáëåßùí');
+define('_SETTINGS_URLMODE_HELP',       '(Info: <a href="documentation/tips.html#searchengines-fancyurls">Ðþò íá åíåñãïðïéÞóåôå ôá ðñï÷ùñçìÝíá URL</a>)');
+
+// extra plugin settings part when editing categories/members/blogs/...
+define('_PLUGINS_EXTRA',                       'Åðéðñüóèåôåò ñõèìßóåéò ðñïóèÝôùí');
+
+// itemlist info column keys
+define('_LIST_ITEM_BLOG',                      'éóôïëüãéï:');
+define('_LIST_ITEM_CAT',                       'êáô:');
+define('_LIST_ITEM_AUTHOR',                    'óõíôÜêôçò:');
+define('_LIST_ITEM_DATE',                      'çìåñïìçíßá:');
+define('_LIST_ITEM_TIME',                      'þñá:');
+
+// indication of registered members in comments list
+define('_LIST_COMMENTS_MEMBER',        '(ìÝëïò)');
+
+// batch operations
+define('_BATCH_WITH_SEL',                      'Ìå ôá åðéëåãìÝíá:');
+define('_BATCH_EXEC',                          'ÅêôÝëåóç');
+
+// quickmenu
+define('_QMENU_HOME',                          'Áñ÷éêÞ');
+define('_QMENU_ADD',                           'ÐñïóèÞêç Üñèñïõ');
+define('_QMENU_ADD_SELECT',                    '-- åðéëÝîôå --');
+define('_QMENU_USER_SETTINGS',         'Ñõèìßóåéò');
+define('_QMENU_USER_ITEMS',                    '¢ñèñá');
+define('_QMENU_USER_COMMENTS',         'Ó÷üëéá');
+define('_QMENU_MANAGE',                                'Äéá÷åßñéóç');
+define('_QMENU_MANAGE_LOG',                    'Çìåñïëüãéï êáôáãñáöÞò åíåñãåéþí');
+define('_QMENU_MANAGE_SETTINGS',       'ÃåíéêÝò ñõèìßóåéò');
+define('_QMENU_MANAGE_MEMBERS',                'ÌÝëç');
+define('_QMENU_MANAGE_NEWBLOG',                'ÍÝï éóôïëüãéï');
+define('_QMENU_MANAGE_BACKUPS',                'Áíôßãñáöá áóöáëåßáò');
+define('_QMENU_MANAGE_PLUGINS',                'Ðñüóèåôá');
+define('_QMENU_LAYOUT',                                'ÄéÜôáîç');
+define('_QMENU_LAYOUT_SKINS',          'Åìöáíßóåéò');
+define('_QMENU_LAYOUT_TEMPL',          'Ðñüôõðá');
+define('_QMENU_LAYOUT_IEXPORT',                'ÅéóáãùãÞ/ÅîáãùãÞ');
+define('_QMENU_PLUGINS',                       'Ðñüóèåôá');
+
+// quickmenu on logon screen
+define('_QMENU_INTRO',                         'ÅéóáãùãÞ');
+define('_QMENU_INTRO_TEXT',                    '<p>ÁõôÞ åßíáé ç óåëßäá óýíäåóçò óôï Nucleus CMS, ôï óýóôçìá äéá÷åßñéóçò ðåñéå÷ïìÝíïõ ðïõ ÷ñçóéìïðïéåßôå ãéá ôç ëåéôïõñãßá áõôïý ôïõ äéêôõáêïý ôüðïõ.</p><p>ÅÜí Ý÷åôå ëïãáñéáóìü, ìðïñåßôå íá óõíäåèåßôå êáé íá áñ÷ßóåôå íá äçìïóéåýåôáé íÝá Üñèñá.</p>');
+
+// helppages for plugins
+define('_ERROR_PLUGNOHELPFILE',                'Äåí åßíáé äõíáôÞ ç åýñåóç ôïõ áñ÷åßïõ âïçèåßáò ãéá áõôü ôï ðñüóèåôï');
+define('_PLUGS_HELP_TITLE',                    'Óåëßäá âïÞèåéáò ãéá ôï ðñüóèåôï');
+define('_LIST_PLUGS_HELP',                     'âïÞèåéá');
+
+
+// END changed/started after 3.1
+
+
+
+// general settings (security)
+define('_SETTINGS_EXTAUTH',                    'Åíåñãïðïßçóç åîùôåñéêÞò ðéóôïðïßçóçò ôáõôüôçôáò');
+define('_WARNING_EXTAUTH',                     'Ðñïåéäïðïßçóç: ÅíåñãïðïéÞóôå ôï ìüíï áí ôï ÷ñåéÜæåóôå.');
+
+// member profile
+define('_MEMBERS_BYPASS',                      '×ñÞóç åîùôåñéêÞò ðéóôïðïßçóçò ôáõôüôçôáò');
+
+// 'always include in search' blog setting (yes/no) [in v2.5beta, the 'always' part wasn't clear]
+define('_EBLOG_SEARCH',                                '<em>ÐÜíôá</em> íá óõìðåñéëáìâÜíåôáé óôçí áíáæÞôçóç');
+
+// END changed/added after v2.5beta
+
+// START introduced after v2.0 START
+
+// media library
+define('_MEDIA_VIEW',                          'ÐñïâïëÞ');
+define('_MEDIA_VIEW_TT',                       'ÐñïâïëÞ áñ÷åßïõ (Üíïéãìá óå íÝï ðáñÜèõñï)');
+define('_MEDIA_FILTER_APPLY',          'ÅöáñìïãÞ ößëôñïõ');
+define('_MEDIA_FILTER_LABEL',          'Ößëôñï: ');
+define('_MEDIA_UPLOAD_TO',                     'ÁðïóôïëÞ óôï...');
+define('_MEDIA_UPLOAD_NEW',            'ÁðïóôïëÞ íÝïõ áñ÷åßïõ...');
+define('_MEDIA_COLLECTION_SELECT',     'ÅðéëïãÞ');
+define('_MEDIA_COLLECTION_TT',         'ÅíáëëáãÞ óå áõôÞ ôçí êáôçãïñßá');
+define('_MEDIA_COLLECTION_LABEL',      'ÔñÝ÷ïõóá êáôçãïñßá: ');
+
+// tooltips on toolbar
+define('_ADD_ALIGNLEFT_TT',                    'ÁñéóôåñÞ óôïß÷éóç');
+define('_ADD_ALIGNRIGHT_TT',           'ÄåîéÜ óôïß÷éóç');
+define('_ADD_ALIGNCENTER_TT',          'ÊåíôñéêÞ óôïß÷éóç');
+
+
+// generic upload failure
+define('_ERROR_UPLOADFAILED',          'Ç áðïóôïëÞ áðÝôõ÷å');
+
+// END introduced after v2.0 END
+
+// START introduced after v1.5 START
+
+// posting to the past/edit timestamps
+define('_EBLOG_ALLOWPASTPOSTING',      'ÅðéôñÝðåôáé ç äçìïóßåõóç óå ðáñåëèïýóá çìåñïìçíßá');
+define('_ADD_CHANGEDATE',                      'ÅíçìÝñùóç þñáò');
+define('_BMLET_CHANGEDATE',            'ÅíçìÝñùóç þñáò');
+
+// skin import/export
+define('_OVERVIEW_SKINIMPORT',         'ÅéóÜãùãç/ÅîáãùãÞ åìöÜíéóçò...');
+
+// skin settings
+define('_PARSER_INCMODE_NORMAL',       'ÊáíïíéêÞ');
+define('_PARSER_INCMODE_SKINDIR',      '×ñÞóç öáêÝëïõ åìöáíßóåùí');
+define('_SKIN_INCLUDE_MODE',           'Ëåéôïõñãßá óõìðåñßëçøçò');
+define('_SKIN_INCLUDE_PREFIX',         'Óõìðåñßëçøç ðñïèÝìáôïò');
+
+// global settings
+define('_SETTINGS_BASESKIN',           'ÂáóéêÞ åìöÜíéóç');
+define('_SETTINGS_SKINSURL',           'URL åìöáíßóåùí');
+define('_SETTINGS_ACTIONSURL',         'ÐëÞñåò URL ãéá ôï action.php');
+
+// category moves (batch)
+define('_ERROR_MOVEDEFCATEGORY',       'Äåí åßíáé äõíáôÞ ç ìåôáöïñÜ ôçò ðñïåðéëåãìÝíçò êáôçãïñßáò');
+define('_ERROR_MOVETOSELF',            'Äåí åßíáé äõíáôÞ ç ìåôáöïñÜ ôçò êáôçãïñßáò (ôï éóôïëüãéï ðñïïñéóìïý åéíáé ôï ßäéï ìå ôï éóôïëüãéï ðñïÝëåõóçò)');
+define('_MOVECAT_TITLE',                       'ÅðéëÝîôå éóôïëüãéï óôï ïðïßï íá ìåôáêéíçèåß ç êáôçãïñßá');
+define('_MOVECAT_BTN',                         'Ìåôáêßíçóç êáôçãïñßáò');
+
+// URLMode setting
+define('_SETTINGS_URLMODE',            'Ëåéôïõñãßá URL');
+define('_SETTINGS_URLMODE_NORMAL',     'ÊáíïíéêÞ');
+define('_SETTINGS_URLMODE_PATHINFO','Ðñï÷ùñçìÝíç');
+
+// Batch operations
+define('_BATCH_NOSELECTION',           'Äåí å÷åé åðéëåãåß ôßðïôá ãéá íá ðñáãìáôïðïéçèïýí åíÝñãåéáò óå áõôü');
+define('_BATCH_ITEMS',                         'ÌáæéêÞ ëåéôïõñãßá óôá Üñèñá');
+define('_BATCH_CATEGORIES',            'ÌáæéêÞ ëåéôïõñãßá óå êáôçãïñßåò');
+define('_BATCH_MEMBERS',                       'ÌáæéêÞ ëåéôïõñãßá óå ìÝëç');
+define('_BATCH_TEAM',                          'ÌáæéêÞ ëåéôïõñãßá óå ïìÜäåò ìåëþí');
+define('_BATCH_COMMENTS',                      'ÌáæéêÞ ëåéôïõñãßá óå ó÷üëéá');
+define('_BATCH_UNKNOWN',                       '¢ãíùóôç ìáæéêÞ ëåéôïõñãßá: ');
+define('_BATCH_EXECUTING',                     'ÅêôÝëåóç');
+define('_BATCH_ONCATEGORY',            'óôçí êáôçãïñßá');
+define('_BATCH_ONITEM',                        'óôï Üñèñï');
+define('_BATCH_ONCOMMENT',             'óôï ó÷üëéï');
+define('_BATCH_ONMEMBER',                      'óôï ìÝëïò');
+define('_BATCH_ONTEAM',                        'óôçí ïìÜäá ìåëþí');
+define('_BATCH_SUCCESS',                       'Åðéôõ÷ßá!');
+define('_BATCH_DONE',                          'Ïëïêëçñþèçêå!');
+define('_BATCH_DELETE_CONFIRM',        'Åðéâåâáßùóç ìáæéêÞò äéáãñáöÞò');
+define('_BATCH_DELETE_CONFIRM_BTN','Åðéâåâáßùóç ìáæéêÞò äéáãñáöÞò');
+define('_BATCH_SELECTALL',                     'åðéëïãÞ üëùí');
+define('_BATCH_DESELECTALL',           'áðïåðéëïãÞ üëùí');
+
+// batch operations: options in dropdowns
+define('_BATCH_ITEM_DELETE',           'ÄéáãñáöÞ');
+define('_BATCH_ITEM_MOVE',                     'Ìåôáêßíçóç');
+define('_BATCH_MEMBER_DELETE',         'ÄéáãñáöÞ');
+define('_BATCH_MEMBER_SET_ADM',        'Áðüäïóç äéêáéùìÜôùí äéá÷åéñéóôÞ');
+define('_BATCH_MEMBER_UNSET_ADM',      'ÓôÝñçóç äéêáéùìÜôùí äéá÷åéñéóôÞ');
+define('_BATCH_TEAM_DELETE',           'ÄéáãñáöÞ áðü ôçí ïìÜäá');
+define('_BATCH_TEAM_SET_ADM',          'Áðüäïóç äéêáéùìÜôùí äéá÷åéñéóôÞ');
+define('_BATCH_TEAM_UNSET_ADM',        'ÓôÝñçóç äéêáéùìÜôùí äéá÷åéñéóôÞ');
+define('_BATCH_CAT_DELETE',            'ÄéáãñáöÞ');
+define('_BATCH_CAT_MOVE',                      'Ìåôáêßíçóç óå Üëëï éóôïëüãéï');
+define('_BATCH_COMMENT_DELETE',        'ÄéáãñáöÞ');
+
+// itemlist: Add new item...
+define('_ITEMLIST_ADDNEW',                     'ÐñïóèÞêç íÝïõ Üñèñïõ...');
+define('_ADD_PLUGIN_EXTRAS',           'ÅðéðëÝïí ñõèìßóåéò ÐñïóèÝôùí');
+
+// errors
+define('_ERROR_CATCREATEFAIL',         'Äåí Þôáí äõíáôÞ ç äçìéïõñãßá íÝáò êáôçãïñßáò');
+define('_ERROR_NUCLEUSVERSIONREQ',     'Áõôü ôï ðñüóèåôï áðáéôåß ìßá íåüôåñç Ýêäïóç ôïõ Nucleus: ');
+
+// backlinks
+define('_BACK_TO_BLOGSETTINGS',        'ÅðéóôñïöÞ óôéò ñõèìßóåéò ôïõ éóôïëïãßïõ');
+
+// skin import export
+define('_SKINIE_TITLE_IMPORT',         'ÅéóáãùãÞ');
+define('_SKINIE_TITLE_EXPORT',         'ÅîáãùãÞ');
+define('_SKINIE_BTN_IMPORT',           'ÅéóáãùãÞ');
+define('_SKINIE_BTN_EXPORT',           'ÅîáãùãÞ åðéëåãìÝíùí åìöáíßóåùí/ðñïôýðùí');
+define('_SKINIE_LOCAL',                                'ÅéóáãùãÞ áðü ôïðéêü áñ÷åßï:');
+define('_SKINIE_NOCANDIDATES',         'Äåí âñÝèçêáí õðïøÞöéïé ãéá åéóáãùãÞ óôï öÜêåëï ôùí åìöáíßóåùí');
+define('_SKINIE_FROMURL',                      'ÅéóáãùãÞ áðü ôï URL:');
+define('_SKINIE_EXPORT_INTRO',         'ÅðéëÝîôå ðáñáêÜôù ôéò åìöáíßóåéò êáé ôá ðñüôõðá ðïõ èÝëåôå íá åîÜãåôå');
+define('_SKINIE_EXPORT_SKINS',         'Åìöáíßóåéò');
+define('_SKINIE_EXPORT_TEMPLATES',     'Ðñüôõðá');
+define('_SKINIE_EXPORT_EXTRA',         'ÅðéðëÝïí ðëçñïöïñßåò');
+define('_SKINIE_CONFIRM_OVERWRITE','ÅðáíåããñáöÞ ôùí Þäç õðáñ÷üíôùí åìöáíßóåùí (âë. nameclashes)');
+define('_SKINIE_CONFIRM_IMPORT',       'Íáé, åðéèõìþ íá ôï åéóÜãù');
+define('_SKINIE_CONFIRM_TITLE',                'Ðñüêåéôáé íá åéóá÷èïýí ðñüôõðá åìöáíßóåùí');
+define('_SKINIE_INFO_SKINS',           'Åìöáíßóåéò óôï áñ÷åßï:');
+define('_SKINIE_INFO_TEMPLATES',       'Ðñüôõðá óôï áñ÷åßï:');
+define('_SKINIE_INFO_GENERAL',         'Ðëçñïöïñßåò:');
+define('_SKINIE_INFO_SKINCLASH',       'Ôï üíïìá ôçò åìöÜíéóçò åßíáé ßäéï ìå:');
+define('_SKINIE_INFO_TEMPLCLASH',      'Ôï üíïìá ôïõ ðñïôýðïõ åßíáé ßäéï ìå:');
+define('_SKINIE_INFO_IMPORTEDSKINS','Åéóáãþìåíåò åìöáíßóåéò:');
+define('_SKINIE_INFO_IMPORTEDTEMPLS','Åéóáãùìåíá ðñüôõðá:');
+define('_SKINIE_DONE',                         'Ç åéóáãùãÞ ïëïêëçñþèçêå');
+
+define('_AND',                                         'êáé');
+define('_OR',                                          'Þ');
+
+// empty fields on template edit
+define('_EDITTEMPLATE_EMPTY',          'êåíü ðåäßï (êÜíôå êëéê ãéá åðåîåñãáóßá)');
+
+// skin overview list
+define('_LIST_SKINS_INCMODE',          'Ëåéôïõñãßá óõìðåñßëçøçò:');
+define('_LIST_SKINS_INCPREFIX',                'Ðñüèåìá óõìðåñßëçøçò:');
+define('_LIST_SKINS_DEFINED',          'ÊáèïñéóìÝíá ìÝñç:');
+
+// backup
+define('_BACKUPS_TITLE',                       'Áíôßãñáöï áóöÜëåéáò/ÅðáíáöïñÜ');
+define('_BACKUP_TITLE',                                'Áíôßãñáöï áóöÜëåéáò');
+define('_BACKUP_INTRO',                        'ÐáôÞóôå ôï ðáñáêÜôù êïõìðß ãéá íá äçìéïõñãÞóåôå Ýíá áíôßãñáöï áóöáëåßáò ôçò âÜóçò äåäïìÝíùí óáò. Èá óáò ðñïôáèåß íá áðïèçêåýóåôå Ýíá áñ÷åßï áíôéãñÜöïõ áóöáëåßáò. Áðïèçêåýóôå ôï óå Ýíá áóöáëÝò ìÝñïò.');
+define('_BACKUP_ZIP_YES',                      'ÐñïóðÜèåéá ãéá óõìðßåóç');
+define('_BACKUP_ZIP_NO',                       '×ùñßò óõìðßåóç');
+define('_BACKUP_BTN',                          'Äçìéïõñãßá áíôéãñÜöïõ áóöáëåßáò');
+define('_BACKUP_NOTE',                         '<b>Óçìåßùóç:</b> Ìüíï ôá ðåñéå÷üìåíá ôçò âÜóçò äåäïìÝíùí áðïèçêåýïíôáé óôï áíôßãñáöï áóöáëåßáò. Ôá áñ÷åßá êáé ïé ñõèìßóåéò ðïëõìÝóùí óôï config.php óõíåðþò <b>ÄÅÍ</b> óõìðåñéëáìâÜíïíôáé óôï áíôßãñáöï áóöáëåßáò.');
+define('_RESTORE_TITLE',                       'ÅðáíáöïñÜ');
+define('_RESTORE_NOTE',                        '<b>ÐÑÏÅÉÄÏÐÏÉÇÓÇ:</b> ÊÜíïíôáò åðáíáöïñÜ áðü Ýíá áíôßãñáöï áóöáëåßáò èá <b>ÄÉÁÃÑÁØÅÔÅ</b> üëá ôá ôñÝ÷ïíôá äåäïìÝíá ôïõ Nucleus óôç âÜóç äåäïìÝíùí! ÊÜíôåôï ìüíï áí åßóôå ðñáãìáôéêÜ óßãïõñïé!  <br />  <b>Óçìåßùóç:</b> Âåâáéùèåßôå üôé ç Ýêäïóç ôïõ Nucleus óôçí ïðïßá äçìéïõñãÞóáôå ôï áíôßãñáöï áóöáëåßáò åßíáé ç ßäéá ìå ôçí Ýêäïóç ðïõ åêôåëåßôå ôþñá! Äåí èá ëåéôïõñãÞóåé óå áíôßèåôç ðåñßðôùóç');
+define('_RESTORE_INTRO',                       'ÅðéëÝîôå ôï áñ÷åßï áíôéãñÜöïõ áóöáëåßáò (èá ãßíåé áðïóôïëÞ óôïí äéáêïìéóôÞ) êáé êÜíôå êëéê óôï ÅðáíáöïñÜ ãéá Ýíáñîç.');
+define('_RESTORE_IMSURE',                      'Íáé, åßìáé óßãïõñïò üôé åðéèõìþ íá ôï êÜíù!');
+define('_RESTORE_BTN',                         'ÅðáíáöïñÜ áðü áñ÷åßï');
+define('_RESTORE_WARNING',                     '(âåâáéùèåßôå üôé åðáíáöÝñåôå ôï óùóôü áíôßãñáöï áóöÜëåéáò, ßóùò íá êÜíåôå êáé Ýíá íÝï áíôßãñáöï áóöÜëåéáò ðñéí íá îåêéíÞóåôå)');
+define('_ERROR_BACKUP_NOTSURE',        'Èá ÷ñåéáóôåß íá ôóåêÜñåôå ôï \'¸ßìáé óßãïõñïò\' testbox');
+define('_RESTORE_COMPLETE',            'Ç åðáíáöïñÜ ïëïêëçñþèçêå');
+
+// new item notification
+define('_NOTIFY_NI_MSG',                       '¸íá íÝï Üñèñï Ý÷åé äçìïóéåõèåß:');
+define('_NOTIFY_NI_TITLE',                     'ÍÝï Üñèñï!');
+define('_NOTIFY_KV_MSG',                       'ØÞöïò karma óôï Üñèñï:');
+define('_NOTIFY_KV_TITLE',                     'Nucleus karma:');
+define('_NOTIFY_NC_MSG',                       'Ó÷üëéï óôï Üñèñï:');
+define('_NOTIFY_NC_TITLE',                     'Ó÷üëéï Nucleus:');
+define('_NOTIFY_USERID',                       'ID ÷ñÞóôç:');
+define('_NOTIFY_USER',                         '×ñÞóôçò:');
+define('_NOTIFY_COMMENT',                      'Ó÷üëéï:');
+define('_NOTIFY_VOTE',                         'ØÞöïò:');
+define('_NOTIFY_HOST',                         'ÄéáêïìéóôÞò:');
+define('_NOTIFY_IP',                           'IP:');
+define('_NOTIFY_MEMBER',                       'ÌÝëïò:');
+define('_NOTIFY_TITLE',                                'Ôßôëïò:');
+define('_NOTIFY_CONTENTS',                     'Ðåñéå÷üìåíá:');
+
+// member mail message
+define('_MMAIL_MSG',                           'Óáò Ý÷åé óôáëåß Ýíá ìÞíõìá áðü');
+define('_MMAIL_FROMANON',                      'Ýíáí áíþíõìï åðéóêÝðôç');
+define('_MMAIL_FROMNUC',                       'Äçìïóéåýèçêå áðü Ýíá éóôïëüãéï Nucleus óôï');
+define('_MMAIL_TITLE',                         '¸íá ìÞíõìá áðü');
+define('_MMAIL_MAIL',                          'ÌÞíõìá:');
+
+// END introduced after v1.5 END
+
+
+// START introduced after v1.1 START
+
+// bookmarklet buttons
+define('_BMLET_EDIT',                          'Åðåîåñãáóßá');
+define('_BMLET_ADD',                           'ÐñïóèÞêç');
+define('_BMLET_DELETE',                                'ÄéáãñáöÞ');
+define('_BMLET_BODY',                          'Óþìá');
+define('_BMLET_MORE',                          'Ðåñéóóüôåñá');
+define('_BMLET_OPTIONS',                       'ÅðéëïãÝò');
+define('_BMLET_PREVIEW',                       'Ðñïåðéóêüðçóç');
+
+// used in bookmarklet
+define('_ITEM_UPDATED',                        'Ôï Üñèñï åíçìåñþèçêå');
+define('_ITEM_DELETED',                                'Ôï Üñèñï äéáãñÜöçêå');
+
+// plugins
+define('_CONFIRMTXT_PLUGIN',           'Åßóôå óßãïõñïé üôé èÝëåôå íá äéáãñÜøåôå ôï ðñüóèåôï ìå ôï üíïìá');
+define('_ERROR_NOSUCHPLUGIN',          'Äåí õðÜñ÷åé ôÝôïéï ðñüóèåôï');
+define('_ERROR_DUPPLUGIN',                     'Ëõðïýìáóôå, ôï ðñüóèåôï áõôü Ý÷åé Þäç åãêáôáóôáèåß');
+define('_ERROR_PLUGFILEERROR',         'Äåí õðÜñ÷åé ôÝôïéï ðñüóèåôï, Þ ïé Üäåéåò Ý÷ïõí ïñéóèåß ëáíèáóìÝíá');
+define('_PLUGS_NOCANDIDATES',          'Äåí âñÝèçêáí ðñüóèåôá');
+
+define('_PLUGS_TITLE_MANAGE',          'Äéá÷åßñéóç ðñïóèÝôùí');
+define('_PLUGS_TITLE_INSTALLED',       '¹äç åãêáôåóôçìÝíá');
+define('_PLUGS_TITLE_UPDATE',          'ÅíçìÝñùóç ëßóôáò åããñáöþí');
+define('_PLUGS_TEXT_UPDATE',           'Ôï Nucleus äéáôçñåß ìéá ðñïóùñéíÞ ìíÞìç (cache) ôùí ãåãïíüôùí åããñáöÞò ôùí ðñïóèÝôùí. ¼ôáí áíáâáèìßæåôå Ýíá ðñüóèåôï áíôéêáèéóôþíôáò ôï áñ÷åßï ôïõ, ðñÝðåé íá åêôåëåßôå áõôü ôï áñ÷åßï åíçìÝñùóçò ãéá íá âåâáéùèåßôå üôé ãßíåôáé ðñïóùñéíÞ áðïèÞêåõóç ôùí óùóôþí åããñáöþí.');
+define('_PLUGS_TITLE_NEW',                     'ÅãêáôÜóôáóç íÝïõ ðñïóèÝôïõ');
+define('_PLUGS_ADD_TEXT',                      'ÐáñáêÜôù õðÜñ÷åé ìéá ëßóôá üëùí ôùí áñ÷åßùí óôïí öÜêåëï ôùí ðñïóèÝôùí, ôá ïðïßá ðéèáíþò íá åßíáé ìç åãêáôåóôçìÝíá ðñüóèåôá. Âåâáéùèåßôå üôé åßóôå <strong>ðñáãìáôéêÜ óßãïõñïé</strong> üôé åßïíáé Ýíá ðñüóèåôï ðñéí ôï ðñïóèÝóåôå.');
+define('_PLUGS_BTN_INSTALL',           'ÅãêáôÜóôáóç ÐñïóèÝôïõ');
+define('_BACKTOOVERVIEW',                      'ÅðéóôñïöÞ óôçí ðñïåðéóêüðçóç');
+
+// editlink
+define('_TEMPLATE_EDITLINK',           'Åðåîåñãáóßá óõíäÝóìïõ Üñèñïõ');
+
+// add left / add right tooltips
+define('_ADD_LEFT_TT',                         'ÐñïóèÞêç áñéóôåñïý ðëáéóßïõ');
+define('_ADD_RIGHT_TT',                                'ÐñïóèÞêç äåîéïõ ðëáéóßïõ');
+
+// add/edit item: new category (in dropdown box)
+define('_ADD_NEWCAT',                          'ÍÝá êáôçãïñßá...');
+
+// new settings
+define('_SETTINGS_PLUGINURL',          'URL ðñïóèÝôïõ');
+define('_SETTINGS_MAXUPLOADSIZE',      'ÌÝãéóôï ìÝãåèïò áñ÷åßïõ ãéá áðïóôïëÞ (bytes)');
+define('_SETTINGS_NONMEMBERMSGS',      'Íá åðéôñÝðåôáé ç áðüóôïëÞ ìçíõìÜôùí áðü ìç ìÝëç');
+define('_SETTINGS_PROTECTMEMNAMES','Ðñïóôáóßá ïíïìÜôùí ìåëþí');
+
+// overview screen
+define('_OVERVIEW_PLUGINS',            'Äéá÷åßñéóç ðñïóèÝôùí...');
+
+// actionlog
+define('_ACTIONLOG_NEWMEMBER', 'ÅããñáöÞ íÝïõ ìÝëïõò:');
+
+// membermail (when not logged in)
+define('_MEMBERMAIL_MAIL',                     'Ç äéåýèõíóç email óáò:');
+
+// file upload
+define('_ERROR_DISALLOWEDUPLOAD2','Äåí Ý÷åôå äéêáéþìáôá äéá÷åéñéóôÞ ðÜíù óå êáíÝíá áðü ôá éóôïëüãéá ôá ïðïßá Ý÷ïõí ôï ìÝëïò ðñïïñéóìïý óôï teamlist. Óõíåðþò, äåí óáò åðéôñÝðåôå íá áíåâÜóåôå áñ÷åßá óôï öÜêåëï ðïëõìÝóùí áõôïý ôïõ ìÝëïõò');
+
+// plugin list
+define('_LISTS_INFO',                          'Ðëçñïöïñßåò');
+define('_LIST_PLUGS_AUTHOR',           'Áðü:');
+define('_LIST_PLUGS_VER',                      '¸êäïóç:');
+define('_LIST_PLUGS_SITE',                     'Åðßóêåøç äéêôõáêïý ôüðïõ');
+define('_LIST_PLUGS_DESC',                     'ÐåñéãñáöÞ:');
+define('_LIST_PLUGS_SUBS',                     'ÅããñáöÝò óôá áêüëïõèá ãåãïíüôá:');
+define('_LIST_PLUGS_UP',                       'ìåôáêßíçóç åðÜíù');
+define('_LIST_PLUGS_DOWN',                     'ìåôáêßíçóç êÜôù');
+define('_LIST_PLUGS_UNINSTALL',                'áðåãêáôÜóôáóç');
+define('_LIST_PLUGS_ADMIN',                    'äéá÷åßñéóç');
+define('_LIST_PLUGS_OPTIONS',          'Åðåîåñãáóßá&nbsp;åðéëïãþí');
+
+// plugin option list
+define('_LISTS_VALUE',                         'ôéìÞ');
+
+
+
+// plugin options
+define('_ERROR_NOPLUGOPTIONS',         'Äåí Ý÷ïõí ñõèìéóôåß ïé åðéëïãÝò ãéá áõôü ôï ðñüóèåôï');
+define('_PLUGS_BACK',                          'ÅðéóôñïöÞ óôï ðñïåðéóêüðçóç ðñïóèÝôïõ');
+define('_PLUGS_SAVE',                          'ÁðïèÞêåõóç åðéëïãþí');
+define('_PLUGS_OPTIONS_UPDATED',       'Ïé åðéëïãÝò ôïõ ðñïóèÝôïõ åíçìåñþèçêáí');
+
+define('_OVERVIEW_MANAGEMENT', 'Äéá÷åßñéóç');
+define('_OVERVIEW_MANAGE',             'Äéá÷åßñéóç Nucleus...');
+define('_MANAGE_GENERAL',                      'ÃåíéêÞ äéá÷åßñéóç');
+define('_MANAGE_SKINS',                        'Åìöáíßóåéò êáé ðñüôõðá');
+define('_MANAGE_EXTRA',                        'ÅðéðëÝïí ÷áñáêôçñéóôéêÜ');
+
+define('_BACKTOMANAGE',                        'ÅðéóôñïöÞ óôç äéá÷åßñéóç Nucleus');
+
+
+// END introduced after v1.1 END
+
+// global stuff
+define('_LOGOUT',                                      'Áðïóýíäåóç');
+define('_LOGIN',                                       'Óýíäåóç');
+define('_YES',                                         'Íáé');
+define('_NO',                                          '¼÷é');
+define('_SUBMIT',                                      'ÕðïâïëÞ');
+define('_ERROR',                                       'ÓöÜëìá');
+define('_ERRORMSG',                            'ÐñïÝêõøå Ýíá óöÜëìá!');
+define('_BACK',                                        'ÅðéóôñïöÞ');
+define('_NOTLOGGEDIN',                         'Äåí åßóôå óõíäåìÝíïé');
+define('_LOGGEDINAS',                          'ÓõíäåèÞêáôå ùò');
+define('_ADMINHOME',                           'Áñ÷éêÞ óåëßäá äéá÷åßñéóçò');
+define('_NAME',                                        '¼íïìá');
+define('_BACKHOME',                            'ÅðéóôñïãÞ óôçí áñ÷éêÞ óåëßäá äéá÷åßñéóçò');
+define('_BADACTION',                           'ÆçôÞèçêå ìç õðÜñ÷ïõóá äñÜóç');
+define('_MESSAGE',                                     'ÌÞíõìá');
+define('_HELP_TT',                                     'ÂïÞèåéá!');
+define('_YOURSITE',                                    'Ï äéêôõáêüò óáò ôüðïò');
+
+
+define('_POPUP_CLOSE',                         'Êëåßóéìï ðáñáèýñïõ');
+
+define('_LOGIN_PLEASE',                                'Ðáñáêáëþ óõíäåèåßôå ðñþôá');
+
+// commentform
+define('_COMMENTFORM_YOUARE',          'Åßóôå ï/ç');
+define('_COMMENTFORM_SUBMIT',          'ÐñïóèÞêç ó÷ïëßïõ');
+define('_COMMENTFORM_COMMENT', 'Ôï ó÷üëéü óáò');
+define('_COMMENTFORM_NAME',            '¼íïìá');
+define('_COMMENTFORM_MAIL',            'E-mail/HTTP');
+define('_COMMENTFORM_REMEMBER',        'ÈõìÞóïõ ìå');
+
+// loginform
+define('_LOGINFORM_NAME',                      '¼íïìá ÷ñÞóôç');
+define('_LOGINFORM_PWD',                       'Êùäéêüò ðñüóâáóçò');
+define('_LOGINFORM_YOUARE',            'ÓõíäåèÞêáôå ùò');
+define('_LOGINFORM_SHARED',            'Êïéíü÷ñçóôüò õðïëïãéóôÞò');
+
+// member mailform
+define('_MEMBERMAIL_SUBMIT',           'ÁðïóôïëÞ ìçíýìáôïò');
+
+// search form
+define('_SEARCHFORM_SUBMIT',           'Åýñåóç');
+
+// add item form
+define('_ADD_ADDTO',                           'ÐñïóèÞêç íÝïõ Üñèñïõ óôï');
+define('_ADD_CREATENEW',                       'Äçìéïõñãßá íÝá Üñèñïõ');
+define('_ADD_BODY',                            'Óþìá');
+define('_ADD_TITLE',                           'Ôßôëïò');
+define('_ADD_MORE',                            'ÅêôåôáìÝíïò (ðñïáéñåôéêü)');
+define('_ADD_CATEGORY',                        'Êáôçãïñßá');
+define('_ADD_PREVIEW',                         'Ðñïåðéóêüðçóç');
+define('_ADD_DISABLE_COMMENTS',        'Áðåíåñãïðïßçóç ó÷ïëßùí;');
+define('_ADD_DRAFTNFUTURE',            'Ðñü÷åéñá &amp; ìåëëïíôéêÜ Üñèñá');
+define('_ADD_ADDITEM',                         'ÐñïóèÞêç Üñèñïõ');
+define('_ADD_ADDNOW',                          'Ðñïóèçêç ôþñá');
+define('_ADD_ADDLATER',                        'ÐñïóèÞêç áñãüôåñá');
+define('_ADD_PLACE_ON',                        'Ôïðïèåôçóç ðÜíù óôï');
+define('_ADD_ADDDRAFT',                        'ÐñïóèÞêç óôá ðñü÷åéñá');
+define('_ADD_NOPASTDATES',                     '(Çìåñïìçíßåò êáé þñåò óôï ðáñåëèüí ÄÅÍ åßíáé Ýãêõñåò, ç ôñÝ÷ïõóá üñá èá ÷ñçóéìïðïéçèåß óå ôÝôïéá ðåñßðôùóç)');
+define('_ADD_BOLD_TT',                         '¸íôïíá');
+define('_ADD_ITALIC_TT',                       'ÐëÜãéá');
+define('_ADD_HREF_TT',                         'Äçìéïõñãßá óõíäÝóìïõ');
+define('_ADD_MEDIA_TT',                        'ÐñïóèÞêç ðïëõìÝóïõ');
+define('_ADD_PREVIEW_TT',                      'ÅìöÜíéóç/Áðüêñõøç ðñïåðéóêüðçóçò');
+define('_ADD_CUT_TT',                          'ÁðïêïðÞ');
+define('_ADD_COPY_TT',                         'ÁíôéãñáöÞ');
+define('_ADD_PASTE_TT',                                'Åðéêüëëçóç');
+
+
+// edit item form
+define('_EDIT_ITEM',                           'ÐñïóèÞêç Üñèñïõ');
+define('_EDIT_SUBMIT',                         'ÐñïóèÞêç Üñèñïõ');
+define('_EDIT_ORIG_AUTHOR',            'Áñ÷éêüò óõíôÜêôçò');
+define('_EDIT_BACKTODRAFTS',           'ÐñïóèÞêç ðßóù óôá ðñü÷åéñá');
+define('_EDIT_COMMENTSNOTE',           '(Óçìåßùóç: Ç áðåíåñãïðïßçóç ó÷ïëßùí äåí èá áðïêñýøåé ó÷üëéá ðïõ Ý÷ïõí êáôá÷ùñçèåß ðáëáéüôåñá)');
+
+// used on delete screens
+define('_DELETE_CONFIRM',                      'Ðáñáêáëþ åðéâåâáéþóôå ôç äéáãñáöÞ');
+define('_DELETE_CONFIRM_BTN',          'Åðéâåâáéþóôå ôç äéáãñáöÞ');
+define('_CONFIRMTXT_ITEM',                     'Ðñüêåéôáé íá äéáãñÜøåôå ôï áêüëïõèï Üñèñï:');
+define('_CONFIRMTXT_COMMENT',          'Ðñüêåéôáé íá äéáãñÜøåôå ôï áêüëïõèï ó÷üëéï:');
+define('_CONFIRMTXT_TEAM1',            'Ðñüêåéôáé íá äéáãñÜøåôå ');
+define('_CONFIRMTXT_TEAM2',            ' áðü ôç ëßóôá ïìÜäáò ôïõ éóôïëïãßïõ');
+define('_CONFIRMTXT_BLOG',                     'Ôï éóôïëüãéï ðïõ ðñïêåéôáé íá äéáãñÜøåôå åßíáé ôï: ');
+define('_WARNINGTXT_BLOGDEL',          'Ðñïåéäïðïßçóç! ÄéáãñÜöïíôáò Ýíá éóôïëüãéï èá äéáãñÜøåôå ÏËÁ ôá Üñèñá ôïõ êáé üëá ôá ó÷üëéá. Ðáñáêáëþ åðéâåâáéþóôå ãéá íá êÜíåôå óáöÝò üôé åßóôå ÓÉÃÏÕÑÏÉ ãéá áõôü ðïõ êÜíåôå!<br />Åðßóçò, ìç äéáêüøåôå ôï Nucleus êáèþò äéáãñÜöåé ôï éóôïëüãéï.');
+define('_CONFIRMTXT_MEMBER',           'Ðñüêåéôáé íá äéáãñÜøåôå ôï áêüëïõèï ðñïößë ìÝëïõò: ');
+define('_CONFIRMTXT_TEMPLATE',         'Ðñüêåéôáé íá äéáãñÜøåôå ôï ðñüôõðï ìå ôï üíïìá');
+define('_CONFIRMTXT_SKIN',                     'Ðñüêåéôáé íá äéáãñÜøåôå ôçí åìöÜíéóç ìå ôï üíïìá');
+define('_CONFIRMTXT_BAN',                      'Ðñüêåéôáé íá äéáãñÜøåôå ôïí áðïêëåéóìü ãéá ôï ðåäßï ip');
+define('_CONFIRMTXT_CATEGORY',         'Ðñüêåéôáé íá äéáãñÜøåôå ôçí êáôçãïñßá ');
+
+// some status messages
+define('_DELETED_ITEM',                                'Ôï Üñèñï äéáãñÜöçêå');
+define('_DELETED_MEMBER',                      'Ôï ìÝëïò äéáãñÜöçêå');
+define('_DELETED_COMMENT',                     'Ôï ó÷üëéï äéáãñÜöçêå');
+define('_DELETED_BLOG',                        'Ôï éóôïëüãéï äéáãñÜöçêå');
+define('_DELETED_CATEGORY',            'Ç êáôçãïñßá äéáãñÜöçêå');
+define('_ITEM_MOVED',                          'Ôï Üñèñï ìåôáêéíÞèçêå');
+define('_ITEM_ADDED',                          'Ôï Üñèñï ðñïóôÝèçêå');
+define('_COMMENT_UPDATED',             'Ôï ó÷üëéï åíçìåñþèçêå');
+define('_SKIN_UPDATED',                        'Ôá äåäïìÝíá ôçò åìöÜíéóçò Ý÷ïõí áðïèçêåõôåß');
+define('_TEMPLATE_UPDATED',            'Ôá äåäïìÝíá ôïõ ðñïôýðïõ Ý÷ïõí áðïèçêåõôåß');
+
+// errors
+define('_ERROR_COMMENT_LONGWORD',      'Ðáñáêáëþ ìç ÷ñçóéìïðïéåßôå ëÝîåéò ìåãáëýôåñåò ôùí 90 ÷áñáêôÞñùí óôá ó÷üëéÜ óáò');
+define('_ERROR_COMMENT_NOCOMMENT',     'Ðáñáêáëþ åéóáãÜãåôå Ýíá ó÷üëéï');
+define('_ERROR_COMMENT_NOUSERNAME',    'Ìç Ýãêõñï üíïìá ÷ñÞóôç');
+define('_ERROR_COMMENT_TOOLONG',               'Ôá ó÷üëéÜ óáò åßíáé õðåñâïëéêÜ ìåãÜëá (ìåã. 5000 ÷áñáêôÞñåò)');
+define('_ERROR_COMMENTS_DISABLED',             'Ôá ó÷üëéá ãéá áõôü ôï éóôïëüãéï åßíáé ðñïò ôï ðáñüí áðåíåñãïðïéçìÝíá.');
+define('_ERROR_COMMENTS_NONPUBLIC',    'ÐñÝðåé íá åßóôå óõíäåìÝíïò ùò ìÝëïò ãéá íá ðñïóèÝóåôå ó÷üëéï óå áõôü ôï éóôïëüãéï');
+define('_ERROR_COMMENTS_MEMBERNICK',   'Ôï üíïìá ðïõ èÝëåôå íá ÷ñçóéìïðïéÞóåôå ãéá íá äçìïóéåýóåôå ó÷üëéá ÷ñçóéìïðïéåßôå áðü Ýíá ìÝëïò ôïõ äéêôõáêïý ôüðïõ. ÅðéëÝîôå êÜôé Üëëï.');
+define('_ERROR_SKIN',                                  'ÓöÜëìá óôçí åìöÜíéóç');
+define('_ERROR_ITEMCLOSED',                    'Ôï Üñèñï Ý÷åé êëåßóåé, äåí åßíáé äõíáôü íá ðñïóèÝóåôå ó÷üëéá óå áõôü Þ íá øçößóåôå ãéá áõôü');
+define('_ERROR_NOSUCHITEM',                    'Äåí õðÜñ÷åé ôÝôïéï Üñèñï');
+define('_ERROR_NOSUCHBLOG',                    'Äåí õðÜñ÷åé ôÝôïéï éóôïëüãéï');
+define('_ERROR_NOSUCHSKIN',                    'Äåí õðÜñ÷åé ôÝôïéá åìöÜíéóç');
+define('_ERROR_NOSUCHMEMBER',                  'Äåí õðÜñ÷åé ôÝôïéï ìÝëïò');
+define('_ERROR_NOTONTEAM',                     'Äåí åßóôå óôçí ëßóôá ïìÜäáò áõôïý ôïõ éóôïëïãßïõ.');
+define('_ERROR_BADDESTBLOG',                   'Äåí õðÜñ÷åé ôï éóôïëüãéï ðñïïñéóìïý');
+define('_ERROR_NOTONDESTTEAM',         'Äåí åßíáé äõíáôÞ ç ìåôáêßíçóç ôïõ Üñèñïõ, êáèþò äåí åßóôå óôç ëßóôá ïìÜäáò ôïõ éóôïëüãéï ðñïïñéóìïý');
+define('_ERROR_NOEMPTYITEMS',                  'Äåí åßíáé äõíáôÞ ç ðñïóèÞêç êåíþí Üñèñùí!');
+define('_ERROR_BADMAILADDRESS',                'Ìç Ýãêõñç äéåýèõíóç çëåêôñïíéêïý ôá÷õäñïìåßïõ');
+define('_ERROR_BADNOTIFY',                             'Ìßá ç ðåñéóóüôåñåò áðü ôéò äïèåßóåò äéåõèýíóåéò ãéá åéäïðïßçóç äåí åßíáé Ýãêõñåò äéåõèýíóåéò çë. ôá÷õäñïìåßïõ');
+define('_ERROR_BADNAME',                               'Ìç Ýãêõñï üíïìá (åðéôñÝðïíôáé ìüíï a-z êáé 0-9, ÷ùñßò êåíÜ óå áñ÷Þ/ôÝëïò)');
+define('_ERROR_NICKNAMEINUSE',                 '¸íá Üëëï ìÝëïò ÷ñçóéìïðïéåß Þäç áõôü ôï øåõäþíõìï');
+define('_ERROR_PASSWORDMISMATCH',              'Ïé êùäéêïß ðñÝðåé íá ôáéñéÜæïõí');
+define('_ERROR_PASSWORDTOOSHORT',              'Ïé êùäéêïß ðñÝðåé íá åßíáé ôïõëÜ÷éóôïí 6 ÷áñáêôÞñùí');
+define('_ERROR_PASSWORDMISSING',               'Ï êùäéêüò ðñüóâáóçò äåí ìðïñåß íá åßíáé êåíüò');
+define('_ERROR_REALNAMEMISSING',               'ÐñÝðåé íá åéóáãÜãåôå Ýíá ðñáãìáôéêü üíïìá');
+define('_ERROR_ATLEASTONEADMIN',               'ÐñÝðåé íá õðÜñ÷åé ðÜíôïôå ôïõëÜ÷éóôïí Ýíáò super-admin ðïõ íá ìðïñåß íá óõíäåèåß ìå ôçí admin area.');
+define('_ERROR_ATLEASTONEBLOGADMIN',   'Ðñáãìáôïðïéüíôáò áõôÞ ôçí åíÝñãåéá èá êáôáóôÞóåôå ôï éóôïëüãéï ìç äéáôçñÞóéìï. Ðáñáêáëþ âåâáéùèåßôå üôé õðÜñ÷åé ðÜíôïôå ôïõëÜ÷éóôïí Ýíáò admin.');
+define('_ERROR_ALREADYONTEAM',                 'Äåí åßíáé äõíáôÞ ç ðñïóèÞêç åíüò ìÝëïõò ðïõ õðÜñ÷åé Þäç óôçí ïìÜäá');
+define('_ERROR_BADSHORTBLOGNAME',              'Ôï óýíôïìï üíïìá éóôïëüãéï ðñÝðåé íá ðåñéÝ÷åé ìüíï a-z êáé 0-9, ÷ùñßò êåíÜ');
+define('_ERROR_DUPSHORTBLOGNAME',              'ÊÜðïéï Üëëï éóôïëüãéï Ý÷åé Þäç ôï åðéëåãìÝíï óýíôïìï üíïìá. ÁõôÜ ôá ïíüìáôá ðñÝðåé íá åßíáé ìïíáäéêÜ');
+define('_ERROR_UPDATEFILE',                            'Äåí äßíåôáé Üäåéá åããñáöÞò ãéá ôï óõãêåêñéìÝíï áñ÷åßï åíçìÝñùóçò. Âåâáéùèåßôå üôé ïé Üäåéåò ôùí áñ÷åßùí Ý÷ïõí ïñéóèåß óùóôÜ (try chmodding it to 666). Åðßóçò óçìåéþóôå üôé ç ôïðïèåóßá åíáé ó÷åôéêÞ ìå ôï öÜêåëï admin-area, ïðüôå ßóùó èá èÝëáôå íá ÷ñçóéìïðïéÞóåôå Ýíá áðüëõôï ìïíïðÜôé (êÜôé óáí ôï /your/path/to/nucleus/)');
+define('_ERROR_DELDEFBLOG',                    'Äåí åßíáé äõíáôÞ ç äéáãñáöÞ ôïõ ðñïåðéëåãìÝíïõ éóôïëïãßïõ');
+define('_ERROR_DELETEMEMBER',                  'Äåí åßíáé äõíáôÞ ç äéáãñáöÞ áõôïý ôïõ ìÝëïõò, ðéèáíþò åðåéäÞ åßíáé ï óõíôÜêôçò Üñèñùí Þ ó÷ïëéþí');
+define('_ERROR_BADTEMPLATENAME',               'Ìç Ýãêõñï üíïìá ãéá ðñüôõðï, ÷ñçóéìïðïéÞóôå ìüíï a-z êáé 0-9, ÷ùñßò êåíÜ');
+define('_ERROR_DUPTEMPLATENAME',               'ÕðÜñ÷åé Þäç êÜðïéï Üëëï ðñüôõðï ìå áõôü ôï üíïìá');
+define('_ERROR_BADSKINNAME',                   'Ìç Ýãêõñï üíïìá ãéá åìöÜíéóç (åðéôñÝðïíôáé ìüíï a-z, 0-9, ÷ùñßò êåíÜ)');
+define('_ERROR_DUPSKINNAME',                   'ÕðÜñ÷åé Þäç êÜðïéï Üëëç åìöÜíéóç ìå áõôü ôï üíïìá');
+define('_ERROR_DEFAULTSKIN',                   'ÐñÝðåé ðÜíôïôå íá õðÜñ÷åé ìéá åìöÜíéóç ìå ôï üíïìá "ðñïåðéëåãìÝíï"');
+define('_ERROR_SKINDEFDELETE',                 'Äåí åßíáé äõíáôÞ ç äéáãñáöÞ ôçò åìöÜíéóçò êáèþò åßíáé ç ðñïåðéëåãìÝíç åìöÜíéóç ãéá ôï áêüëïõèï éóôïëüãéï: ');
+define('_ERROR_DISALLOWED',                    'Ëõðïýìáóôå, äåí óáò åðéôñÝðåôáé íá ðñáãìáôïðïéÞóåôå áõôÞ ôçí åíÝñãåéá');
+define('_ERROR_DELETEBAN',                             'ÓöÜëìá êáôá ôçí ðñïóðÜèåéá äéáãñáöÞò ôïõ ban (Ï áðïêëåéóìüò äåí õðÜñ÷åé)');
+define('_ERROR_ADDBAN',                                'ÓöÜëìá êáôá ôçí ðñïóðÜèåéá ðñïóèÞêçò ôïõ áðïêëåéóìïý. Ðéèáíþò ï áðïêëåéóìüò íá ìçí åíåñãïðïéçèåß óùóôÜ óå üëá ôá éóôïëüãéá.');
+define('_ERROR_BADACTION',                             'Ç Áðáéôïýìåíç åíÝñãåéá äåí õðÜñ÷åé');
+define('_ERROR_MEMBERMAILDISABLED',    'Ôá ìçíýìáôá áðü ìÝëïò óå ìÝëïò åßíáé áðåíåñãïðïéçìÝíá');
+define('_ERROR_MEMBERCREATEDISABLED',  'Ç äçìéïõñãéÜ ëïãáñéáóìþí ìÝëþí åßíáé áðåíåñãïðïéçìÝíç');
+define('_ERROR_INCORRECTEMAIL',                'ËáíèáóìÝíç äéåýèõíóç çëåêôñïíéêïý ôá÷õäñïìåßïõ');
+define('_ERROR_VOTEDBEFORE',                   '¸÷åôå Þäç øçößóåé ãéá áõôü ôï Üñèñï');
+define('_ERROR_BANNED1',                               'Äåí åßíáé äõíáôÞ ç ðñáãìáôïðïßçóç ôçò åíÝñãåéáò (ip range ');
+define('_ERROR_BANNED2',                               'êáèþò óáò Ý÷åé áðáãïñåõôåß. Ôï ìÞíõìá Þôáí:');
+define('_ERROR_BANNED3',                               '\'');
+define('_ERROR_LOGINNEEDED',                   'ÐñÝðåé íá åßóôå óõíäåäåìÝíïé ãéá íá ðñáãìáôïðïéÞóåôå áõôÞ ôçí åíÝñãåéá');
+define('_ERROR_CONNECT',                               'ÓöÜëìá óôç óýíäåóç');
+define('_ERROR_FILE_TOO_BIG',                  'Ôï áñ÷åßï åßíáé õðåñâïëéêÜ ìåãÜëï!');
+define('_ERROR_BADFILETYPE',                   'Ëõðïýìáóôå, áõôüò ï ôýðïò áñ÷åßïõ äåí åðéôñÝðåôáé');
+define('_ERROR_BADREQUEST',                    'ÅóöáëìÝíç áßôçóç áðïóôïëÞò');
+define('_ERROR_DISALLOWEDUPLOAD',              'Äåí åßóáóôå óå êáìßá ëßóôá ïìÜäáò éóôïëïãßùí. Óõíåðþò, äåí óáò åðéôñÝðåôáé íá áíåâÜóåôå áñ÷åßá');
+define('_ERROR_BADPERMISSIONS',                'Ôá äéêáéþìáôá áñ÷åßùí/êáôáëüãùí äåí Ý÷ïõí ïñéóôåß óùóôÜ');
+define('_ERROR_UPLOADMOVEP',                   'ÓöÜëìá êáôá ôç ìåôáêßíçóç áñ÷åßïõ ðïõ Ý÷åé áðïóôáëåß');
+define('_ERROR_UPLOADCOPY',                    'ÓöÜëìá êáôÜ ôçí áíôéãñáöÞ áñ÷åßïõ');
+define('_ERROR_UPLOADDUPLICATE',               'ÕðÜñ÷åé Þäç êÜðïéï Üëëï áñ÷åßï ìå áõôü ôï üíïìá. Ðñïóðáèåßóôå íá ôï ìåôïíïìÜóåôå ðñéí ôï áíåâÜóåôå.');
+define('_ERROR_LOGINDISALLOWED',               'Ëõðïýìáóôå, äåí óáò åðéôñÝðåôå íá óõíäåèåßôå óôçí ðåñéï÷Þ äéá÷åßñéóçò. Ìðïñåßôå üìùò íá óõíäåèåßôå ùò êÜðïéïò Üëëïò ÷ñÞóôçò');
+define('_ERROR_DBCONNECT',                     'Äåí Þôáí äõíáôÞ ç óýíäåóç óôïí äéáêïìéóôÞ mySQL');
+define('_ERROR_DBSELECT',                              'Äåí Þôáí äõíáôÞ ç åðéëïãÞ ôçò âÜóçò äåäïìÝíùí nucleus.');
+define('_ERROR_NOSUCHLANGUAGE',                'Äåí õðÜñ÷åé ôÝôïéï áñ÷åßï ãëþóóáò');
+define('_ERROR_NOSUCHCATEGORY',                'Äåí õðÜñ÷åé ôÝôïéá êáôçãïñßá');
+define('_ERROR_DELETELASTCATEGORY',    'ÐñÝðåé íá õðÜñ÷åé ôïõëÜ÷éóôïí ìéá êáôçãïñßá');
+define('_ERROR_DELETEDEFCATEGORY',             'Äåí åßíáé äõíáôÞ ç äéáãñáöÞ ôçò ðñïåðéëåãìÝíçòêáôçãïñßáò');
+define('_ERROR_BADCATEGORYNAME',               'Ìç Ýãêõñï üíïìá êáôçãïñßáò');
+define('_ERROR_DUPCATEGORYNAME',               'ÕðÜñ÷åé Þäç êÜðïéá Üëëç êáôçãïñßá ìå áõôü ôï üíïìá');
+
+// some warnings (used for mediadir setting)
+define('_WARNING_NOTADIR',                     'Ðñïåéäïðïßçóç: Ç ôñÝ÷ïõóá ôéìÞ äåí åßíáé êÜðïéïò öÜêåëïò!');
+define('_WARNING_NOTREADABLE',         'Ðñïåéäïðïßçóç: Ç ôñÝ÷ïõóá ôéìÞ äåí åßíáé Ýíáò ìç áíáãíþóéìïò öÜêåëïò!');
+define('_WARNING_NOTWRITABLE',         'Ðñïåéäïðïßçóç: Ç ôñÝ÷ïõóá ôéìÞ äåí åßíáé êÜðïéïò åããñÜøéìïò öÜêåëïò!');
+
+// media and upload
+define('_MEDIA_UPLOADLINK',                    'ÁðïóôïëÞ íÝïõ áñ÷åßïõ');
+define('_MEDIA_MODIFIED',                              'ôñïðïðïéçìÝíï');
+define('_MEDIA_FILENAME',                              'üíïìá áñ÷åßïõ');
+define('_MEDIA_DIMENSIONS',                    'äéáóôÜóåéò');
+define('_MEDIA_INLINE',                                        'ÅíóùìáôùìÝíï');
+define('_MEDIA_POPUP',                                 'Áíáäõüìåíï');
+define('_UPLOAD_TITLE',                                        'ÅðéëïãÞ áñ÷åßïõ');
+define('_UPLOAD_MSG',                                  'ÅðéëÝîôå ðáñáêÜôù ôï áñ÷åßï ðïõ èÝëåôå íá áíåâÜóåôå, êáé ðáôÞóôå ôï êïõìðß \'ÁðïóôïëÞ\'.');
+define('_UPLOAD_BUTTON',                               'ÁðïóôïëÞ');
+
+// some status messages
+define('_MSG_ACCOUNTCREATED',                  'Ï ëïãáñéáóìüò äçìéïõñãÞèçêå, ï êùäéêüò ðñüóâáóçò èá óáò óôáëåß ìÝóù çëåêôñïíéêïý ôá÷õäñïìåßïõ');
+define('_MSG_PASSWORDSENT',                    'Ï êùäéêüò ðñüóâáóçò Ý÷åé óôáëåß ìÝóù çëåêôñïíéêïý ôá÷õäñïìåßïõ.');
+define('_MSG_LOGINAGAIN',                              'Èá ÷ñåéáóôåß íá îáíáóõíäåèåßôå, åðåßäç ôá Üñèñá óáò Ý÷ïõí áëëÜîåé');
+define('_MSG_SETTINGSCHANGED',                 'Ïé ñõèìßóåéò Ý÷ïõí áëëÜîåé');
+define('_MSG_ADMINCHANGED',                    'Ï äéá÷åéñéóôÞò Ý÷åé áëëÜîåé');
+define('_MSG_NEWBLOG',                         '¸íá íÝï éóôïëüãéï äçìéïõñãÞèçêå');
+define('_MSG_ACTIONLOGCLEARED',                'Ôï çìåñïëüãéï åíåñãåéþí Ý÷åé êáèáñéóèåß');
+
+// actionlog in admin area
+define('_ACTIONLOG_DISALLOWED',                'Ìç åðéôñåðüìåíç åíÝñãåéá: ');
+define('_ACTIONLOG_PWDREMINDERSENT',   'ÍÝïò êùäéêüò ðñüóâáóçò Ý÷åé óôáëåß ãéá ');
+define('_ACTIONLOG_TITLE',                             'Çìåñïëüãéï åíåñãåéþí');
+define('_ACTIONLOG_CLEAR_TITLE',               'Êáèáñéóìüò çìåñïëïãßïõ åíåñãåéþí');
+define('_ACTIONLOG_CLEAR_TEXT',                'Êáèáñéóìüò çìåñïëïãßïõ åíåñãåéþí ôþñá');
+
+// team management
+define('_TEAM_TITLE',                          'Äéá÷åßñéóç ïìÜäáò ãéá éóôïëüãéï');
+define('_TEAM_CURRENT',                        'ÔñÝ÷ïõóá ïìÜäá');
+define('_TEAM_ADDNEW',                 'ÐñïóèÞêç íÝïõ ìÝëïõò óôçí ïìÜäá');
+define('_TEAM_CHOOSEMEMBER',           'ÅðéëïãÞ ìÝëïõò');
+define('_TEAM_ADMIN',                          'Äéêáéþìáôá äéá÷åéñéóôÞ ;');
+define('_TEAM_ADD',                            'ÐñïóèÞêç óôçí ïìÜäá');
+define('_TEAM_ADD_BTN',                        'ðñïóèÞêç óôçí ïìÜäá');
+
+// blogsettings
+define('_EBLOG_TITLE',                         'Åðåãåñãáóßá ñõèìßóåùí éóôïëïãßïõ');
+define('_EBLOG_TEAM_TITLE',                    'Åðåîåñãáóßá ïìÜäáò');
+define('_EBLOG_TEAM_TEXT',                     'ÐáôÞóôå åäþ ãéá íá åðåîåñãáóôåßôå ôçí ïìÜäá óáò...');
+define('_EBLOG_SETTINGS_TITLE',                'Ñõèìßóåéò éóôïëïãßïõ');
+define('_EBLOG_NAME',                          '¼íïìá éóôïëïãßïõ');
+define('_EBLOG_SHORTNAME',                     'Óýíôïìï üíïìá éóôïëïãßïõ');
+define('_EBLOG_SHORTNAME_EXTRA',       '<br />(ðñÝðåé íá ðåñéÝ÷åé ìüíï a-z êáé ÷ùñßò êåíÜ)');
+define('_EBLOG_DESC',                          'ÐåñéãñáöÞ éóôïëïãßïõ');
+define('_EBLOG_URL',                           'URL');
+define('_EBLOG_DEFSKIN',                       'ÐñïåðéëåãìÝíç åìöÜíéóç');
+define('_EBLOG_DEFCAT',                        'ÐñïåðéëåãìÝíç Êáôçãïñßá');
+define('_EBLOG_LINEBREAKS',                    'ÌåôáôñïðÞ áëëáãþí ãñáììÞò');
+define('_EBLOG_DISABLECOMMENTS',       'ÅðéôñÝðïíôáé ôá ó÷üëéá;<br /><small>(Ç áðåíåñãïðïßçóç ó÷ïëßùí óçìáßíåé üôé ç ðñïóèÞêç ó÷ïëßùí äåí åßíáé äõíáôÞ.)</small>');
+define('_EBLOG_ANONYMOUS',             'ÅðéôñÝðïíôáé ôá ó÷üëéá áðü ìç ìÝëç;');
+define('_EBLOG_NOTIFY',                                'Äéåõèýíóåéò ãéá åéäïðïßçóç (÷ñçóéìïðïéåßóôå ôï ; ùò äéá÷ùñéóôéêü)');
+define('_EBLOG_NOTIFY_ON',                     'Åéäïðïßçóç üôáí');
+define('_EBLOG_NOTIFY_COMMENT',        'ÍÝá ó÷üëéá');
+define('_EBLOG_NOTIFY_KARMA',          'ÍÝïé øÞöïé êÜñìá');
+define('_EBLOG_NOTIFY_ITEM',           'ÍÝá Üñèñá éóôïëïãßïõ');
+define('_EBLOG_PING',                          'Ping Weblogs.com êáôÜ ôçí åíçìÝñùóç;');
+define('_EBLOG_MAXCOMMENTS',           'ÌÝãéóôïò áñéèìüò ó÷ïëßùí');
+define('_EBLOG_UPDATE',                        'ÅíçìÝñùóç áñ÷åßïõ');
+define('_EBLOG_OFFSET',                        '×ñïíéêÞ ìåôÜèåóç');
+define('_EBLOG_STIME',                         'Ç ôñÝ÷ïõóá þñá ôïõ äéáêïìéóôÞ åßíáé');
+define('_EBLOG_BTIME',                         'Ç ôñÝ÷ïõóá þñá ôïõ éóôïëïãßïõ åßíáé :');
+define('_EBLOG_CHANGE',                        'ÁëëáãÞ ñõèìßóåùí');
+define('_EBLOG_CHANGE_BTN',            'ÁëëáãÞ ñõèìßóåùí');
+define('_EBLOG_ADMIN',                         'Äéá÷åéñéóôÞò éóôïëïãßïõ');
+define('_EBLOG_ADMIN_MSG',                     'Èá óáò áðïäùèïýí äéêáéþìáôá äéá÷åéñéóôÞ');
+define('_EBLOG_CREATE_TITLE',          'Äçìéïõñãßá íÝïõ éóôïëïãßïõ');
+define('_EBLOG_CREATE_TEXT',           'Óõìðëçñþóôå ôçí ðáñáêÜôù öüñìá ãéá íá äçìéïõñãÞóåôå Ýíá íåü éóôïëüãéï. <br /><br /> <b>Óçìåßùóç:</b> Ðáñáôßèåíôáé ìüíï ïé áðáñáßôçôåò åðéëïãÝò. Áí èÝëåôå íá ñõèìßóåôå åðéðëÝïí åðéëïãÝò, ìðåßôå óôçí óåëßäá ñõèìßóåùí éóôïëïãßïõ áöïý äçìéïõñãÞóåôå ôï éóôïëüãéï.');
+define('_EBLOG_CREATE',                        'Äçìéïõñãßá!');
+define('_EBLOG_CREATE_BTN',            'Äçìéïõñãßá éóôïëïãßïõ');
+define('_EBLOG_CAT_TITLE',                     'Êáôçãïñßåò');
+define('_EBLOG_CAT_NAME',                      '¼íïìá êáôçãïñßáò');
+define('_EBLOG_CAT_DESC',                      'ÐåñéãñáöÞ êáôçãïñßáò');
+define('_EBLOG_CAT_CREATE',            'Äçìéïõñãßá íÝáò êáôçãïñßáò');
+define('_EBLOG_CAT_UPDATE',            'ÅíçìÝñùóç êáôçãïñßáò');
+define('_EBLOG_CAT_UPDATE_BTN',        'ÅíçìÝñùóç êáôçãïñßáò');
+
+// templates
+define('_TEMPLATE_TITLE',                      'Åðåîåñãáóßá ðñïôýðùí');
+define('_TEMPLATE_AVAILABLE_TITLE',    'ÄéáèÝóéìá ðñüôõðá');
+define('_TEMPLATE_NEW_TITLE',          'ÍÝï ðñüôõðï');
+define('_TEMPLATE_NAME',                       '¼íïìá ðñïôýðïõ');
+define('_TEMPLATE_DESC',                       'ÐåñéãñáöÞ ðñïôýðïõ');
+define('_TEMPLATE_CREATE',                     'Äçìéïõñãßá ðñïôýðïõ');
+define('_TEMPLATE_CREATE_BTN',         'Äçìéïõñãßá ðñïôýðïõ');
+define('_TEMPLATE_EDIT_TITLE',         'Åðåîåñãáóßá ðñïôýðïõ');
+define('_TEMPLATE_BACK',                       'ÅðéóôñïöÞ óôçí ðñïåðéóêüðçóç ðñïôýðïõ');
+define('_TEMPLATE_EDIT_MSG',           'Äåí åßíáé áðáñáñáßôçôá üëá ôá ìÝñç ôïõ ðñïôýðïõ, áöÞóôå êåíÜ áõôÜ ðïõ äåí åßíáé áðáñáßôçôá.');
+define('_TEMPLATE_SETTINGS',           'Ñõèìßóåéò ðñïôýðïõ');
+define('_TEMPLATE_ITEMS',                      'Üñèñá');
+define('_TEMPLATE_ITEMHEADER',         'Êåöáëßäá Üñèñïõ');
+define('_TEMPLATE_ITEMBODY',           'Óþìá Üñèñïõ');
+define('_TEMPLATE_ITEMFOOTER',         'ÕðïóÝëéäï Üñèñïõ');
+define('_TEMPLATE_MORELINK',           'Óýíäåóç óå åêôåôáìÝíç êáôá÷þñçóç');
+define('_TEMPLATE_NEW',                        '¸íäåéîç íÝïõ Üñèñïõ');
+define('_TEMPLATE_COMMENTS_ANY',       'Ó÷üëéá (áí õðÜñ÷ïõí)');
+define('_TEMPLATE_CHEADER',            'Êåöáëßäá ó÷ïëßùí');
+define('_TEMPLATE_CBODY',                      'Óþìá ó÷ïëßïõ');
+define('_TEMPLATE_CFOOTER',            'ÕðïóÝëéäï ó÷ïëßùí');
+define('_TEMPLATE_CONE',                       '¸íá ó÷üëéï');
+define('_TEMPLATE_CMANY',                      'Äýï (Þ ðåñéóóüôåñá) ó÷üëéá');
+define('_TEMPLATE_CMORE',                      'Ðåñéóóüôåñá áíáãíùóìÝíá ó÷üëéá');
+define('_TEMPLATE_CMEXTRA',            'ÅðéðëÝïí ìÝëïò');
+define('_TEMPLATE_COMMENTS_NONE',      'Ó÷üëéá (áí õðÜñ÷ïõí)');
+define('_TEMPLATE_CNONE',                      'Êáèüëïõ ó÷üëéá');
+define('_TEMPLATE_COMMENTS_TOOMUCH','Ó÷üëéá (áí õðÜñ÷ïõí, áëëÜ ðÜñá ðïëëÜ ãéá íá åìöáíéóôïýí óå ìéá ãñáììÞ)');
+define('_TEMPLATE_CTOOMUCH',           'ÕðåñâïëéêÜ ðïëëÜ ó÷üëéá');
+define('_TEMPLATE_ARCHIVELIST',                'Ëßóôåò áñ÷åßïõ');
+define('_TEMPLATE_AHEADER',            'Êåöáëßäá ëßóôáò áñ÷åßïõ');
+define('_TEMPLATE_AITEM',                      '¢ñèñï ëßóôáò áñ÷åßïõ');
+define('_TEMPLATE_AFOOTER',            'ÕðïóÝëéäï ëßóôáò áñ÷åßïõ');
+define('_TEMPLATE_DATETIME',           'Çìåñïìçíßá êáé þñá');
+define('_TEMPLATE_DHEADER',            'Êåöáëßäá çìåñïìçíßáò');
+define('_TEMPLATE_DFOOTER',            'ÕðïóÝëéäï çìåñïìçíßáò');
+define('_TEMPLATE_DFORMAT',            'ÌïñöÞ çìåñïìçíßáò');
+define('_TEMPLATE_TFORMAT',            'ÌïñöÞ þñáò');
+define('_TEMPLATE_LOCALE',                     'ÔïðéêÝò ñõèìßóåéò');
+define('_TEMPLATE_IMAGE',                      'Áíáäõüìåíåò åéêüíåò');
+define('_TEMPLATE_PCODE',                      'Êùäéêüò áíáäõüìåíïõ óõíäÝóìïõ');
+define('_TEMPLATE_ICODE',                      'ÅíóùìáôùìÝíïò êþäéêáò åéêüíáò');
+define('_TEMPLATE_MCODE',                      'Êþäéêáò óõíäÝóìïõ Üñèñïõ ìÝóùí');
+define('_TEMPLATE_SEARCH',                     'Åýñåóç');
+define('_TEMPLATE_SHIGHLIGHT',         'ÅðéóÞìáíóç');
+define('_TEMPLATE_SNOTFOUND',          'Äåí âñÝèçêå ôßðïôá');
+define('_TEMPLATE_UPDATE',                     'ÅíçìÝñùóç');
+define('_TEMPLATE_UPDATE_BTN',         'ÅíçìÝñùóç ðñïôýðïõ');
+define('_TEMPLATE_RESET_BTN',          'ÅðáíáöïñÜ äåäïìÝíùí');
+define('_TEMPLATE_CATEGORYLIST',       'Ëßóôåò êáôçãïñéþí');
+define('_TEMPLATE_CATHEADER',          'Êåöáëßäá ëßóôáò êáôçãïñéþí');
+define('_TEMPLATE_CATITEM',                    'Óôïé÷åßï ëßóôáò êáôçãïñéþí');
+define('_TEMPLATE_CATFOOTER',          'ÕðïóÝëéäï ëßóôáò êáôçãïñéþí');
+
+// skins - KOSTANTINOS
+define('_SKIN_EDIT_TITLE',                     'Åðåîåñãáóßá åìöáíßóåùí');
+define('_SKIN_AVAILABLE_TITLE',                'ÄéáèÝóéìåò åìöáíßóåéò');
+define('_SKIN_NEW_TITLE',                      'ÍÝá åìöÜíéóç');
+define('_SKIN_NAME',                           '¼íïìá');
+define('_SKIN_DESC',                           'ÐåñéãñáöÞ');
+define('_SKIN_TYPE',                           'Ôýðïò Ðåñéå÷ïìÝíïõ');
+define('_SKIN_CREATE',                         'Äçìéïõñãßá');
+define('_SKIN_CREATE_BTN',                     'Äçìéïõñãßá åìöÜíéóçò');
+define('_SKIN_EDITONE_TITLE',          'Åðåîåñãáóßá åìöÜíéóçò');
+define('_SKIN_BACK',                           'Ðßóù óôç ãåíéêÞ ðñïåðéóêüðçóç åìöÜíéóçò ');
+define('_SKIN_PARTS_TITLE',                    'ÌÝñç åìöÜíéóçò');
+define('_SKIN_PARTS_MSG',                      'Äåí ÷ñåéÜæïíôáé üëïé ïé ôýðïé ãéá êÜèå åìöÜíéóç. ¢öçóå êåíÜ áõôÜ ðïõ äåí ÷ñåéÜæïíôáé. ÄéáëÝîôå ôïí ôýðï åìöÜíéóçò ðïõ èá åðåîåñãáóôåßôå:');
+define('_SKIN_PART_MAIN',                      'Áñ÷éêÞ óåëßäá');
+define('_SKIN_PART_ITEM',                      'Óåëßäåò Üñèñùí');
+define('_SKIN_PART_ALIST',                     'Ëßóôá áñ÷åßùí');
+define('_SKIN_PART_ARCHIVE',           'Áñ÷åßï');
+define('_SKIN_PART_SEARCH',                    'ÁíáæÞôçóç');
+define('_SKIN_PART_ERROR',                     'ËÜèç');
+define('_SKIN_PART_MEMBER',            'Óôïé÷åßá ìåëþí');
+define('_SKIN_PART_POPUP',                     'Áíáäõüìåíåò åéêüíåò');
+define('_SKIN_GENSETTINGS_TITLE',      'ÃåíéêÝò ñõèìßóåéò');
+define('_SKIN_CHANGE',                         'ÁëëáãÞ');
+define('_SKIN_CHANGE_BTN',                     'ÁëëáãÞ ôùí ñõèìßóåùí');
+define('_SKIN_UPDATE_BTN',                     'ÁíáíÝùóç åìöÜíéóçò');
+define('_SKIN_RESET_BTN',                      'ÅðáíáöïñÜ äåäïìÝíùí');
+define('_SKIN_EDITPART_TITLE',         'Åðåîåñãáóßá åìöÜíéóçò');
+define('_SKIN_GOBACK',                         'ÐÞãáéíå Ðßóù');
+define('_SKIN_ALLOWEDVARS',            'Åðéôñåðüìåíåò ìåôáâëçôÝò (ðáôÞóôå ãéá ðëçñïöïñßåò):');
+
+// global settings
+define('_SETTINGS_TITLE',                      'ÃåíéêÝò ñõèìßóåéò');
+define('_SETTINGS_SUB_GENERAL',                'ÃåíéêÝò ñõèìßóåéò');
+define('_SETTINGS_DEFBLOG',                    'ÐñïåðéëåãìÝíï éóôïëüãéï');
+define('_SETTINGS_ADMINMAIL',          'Email äéá÷åéñéóôÞ' );
+define('_SETTINGS_SITENAME',           '¼íïìá äéêôõáêïý ôüðïõ');
+define('_SETTINGS_SITEURL',                    'URL äéêôõáêïý ôüðïõ (ðñÝðåé íá ôåëåéþíåé ìå êÜèåôï)');
+define('_SETTINGS_ADMINURL',           'URL ðåñéï÷Þò äéá÷åßñéóçò (ðñÝðåé íá ôåëåéþíåé ìå êÜèåôï)');
+define('_SETTINGS_DIRS',                       ' ÊáôÜëïãïé Nucleus ');
+define('_SETTINGS_MEDIADIR',           ' ÊáôÜëïãïé Media ');
+define('_SETTINGS_SEECONFIGPHP',       '(âëÝðå config.php)');
+define('_SETTINGS_MEDIAURL',           'Media URL (ðñÝðåé íá ôåëåéþíåé ìå êÜèåôï)');
+define('_SETTINGS_ALLOWUPLOAD',        'Íá åðéôñÝðåôáé ç áðïóôïëÞ áñ÷åßùí;');
+define('_SETTINGS_ALLOWUPLOADTYPES','Ôýðïé áñ÷åßùí ðïõ åðéôñÝðåôáé ç áðïóôïëÞ ôïõò');
+define('_SETTINGS_CHANGELOGIN',        'Íá åðéôñÝðåôáé óôïõò ÷ñÞóôåò íá áëëÜîïõí üíïìá ÷ñÞóôç/êùäéêü ðñüóâáóçò');
+define('_SETTINGS_COOKIES_TITLE',      ' Ñõèìßóåéò cookie');
+define('_SETTINGS_COOKIELIFE',         'ÄéÜñêåéá cookie óýíäåóçò');
+define('_SETTINGS_COOKIESESSION',      'Cookies ðåñéüäïõ ëåéôïõñãßáò');
+define('_SETTINGS_COOKIEMONTH',        'ÄéÜñêåéá ãéá Ýíá ìÞíá');
+define('_SETTINGS_COOKIEPATH',         ' ÄéáäñïìÞ cookie (ðñï÷ùñçìÝíï)');
+define('_SETTINGS_COOKIEDOMAIN',       'Cookie ôïìÝá (ðñï÷ùñçìÝíï)');
+define('_SETTINGS_COOKIESECURE',       'ÁóöáëÝò cookie (ðñï÷ùñçìÝíï)');
+define('_SETTINGS_LASTVISIT',          'ÁðïèÞêåõóç cookies ôåëåõôáßáò åðßóêåøçò');
+define('_SETTINGS_ALLOWCREATE',        'Íá åðéôñÝðåôáé óôïõò åðéóêÝðôåò íá äçìéïõñãÞóïõí ëïãáñéáóìü ìÝëïõò');
+define('_SETTINGS_NEWLOGIN',           'Íá åðéôñÝðåôáé ç óýíäåóç óå ëïãáñéáóìïýò ðïõ äçìéïýñãçóáí ÷ñÞóôåò');
+define('_SETTINGS_NEWLOGIN2',          '(éó÷ýåé ìüíï ãéá íÝïõò ëïãáñéáóìïýò)');
+define('_SETTINGS_MEMBERMSGS',         'Íá åðéôñÝðåôáé ç õðçñåóßá ìÝëïò-óå-ìÝëïò');
+define('_SETTINGS_LANGUAGE',           'ÐñïåðéëåãìÝíç ãëþóóá');
+define('_SETTINGS_DISABLESITE',                'Áðåíåñãïðïßçóç äéêôõáêïý ôüðïõ');
+define('_SETTINGS_DBLOGIN',                    'mySQL Login &amp; Database');
+define('_SETTINGS_UPDATE',                     'ÁíáíÝùóç ñõèìßóåùí');
+define('_SETTINGS_UPDATE_BTN',         'ÁíáíÝùóç ñõèìßóåùí');
+define('_SETTINGS_DISABLEJS',          'Áðåíåñãïðïßçóç ãñáììþí åñãáëåßùí JavaScript ');
+define('_SETTINGS_MEDIA',                      'ÌÝóá/ÁðïóôïëÞ áñ÷åßùí');
+define('_SETTINGS_MEDIAPREFIX',                'ÐñïêáèïñéóìÝíá áñ÷åßá ãéá áðïóôïëÞ ìå çìåñïìçíßá');
+define('_SETTINGS_MEMBERS',            'Ñõèìßóåéò ìÝëïõò');
+
+// bans
+define('_BAN_TITLE',                           'Ëßóôá áðïêëåéóìïý ãéá');
+define('_BAN_NONE',                            '¼÷é áðáãïñÝõóåéò ãéá áõôü ôï éóôïëüãéï');
+define('_BAN_NEW_TITLE',                       'ÐñïóèÞêç íÝáò áðïêëåéóìïý');
+define('_BAN_NEW_TEXT',                        'ÐñïóèÞêç íÝïõ áðïêëåéóìïý ôþñá');
+define('_BAN_REMOVE_TITLE',                    'ÊáôÜñãçóç áðïêëåéóìïý');
+define('_BAN_IPRANGE',                         'Åýñïò IP');
+define('_BAN_BLOGS',                           'Ðïéá éóôïëüãéá;');
+define('_BAN_DELETE_TITLE',                    'ÄéáãñáöÞ áðïêëåéóìïý');
+define('_BAN_ALLBLOGS',                        '¼ëá ôá éóôïëüãéá óôá ïðïßá Ý÷åôå äéêáéþìáôá äéá÷åéñéóôÞ ');
+define('_BAN_REMOVED_TITLE',           'Ï áðïêëåéóìüò äéáãñÜöçêå');
+define('_BAN_REMOVED_TEXT',            'Ï áðïêëåéóìüò êáôáñãÞèçêå áðü ôá ðáñáêÜôù éóôïëüãéá:');
+define('_BAN_ADD_TITLE',                       'ÐñïóèÞêç áðïêëåéóìïý');
+define('_BAN_IPRANGE_TEXT',                    'ÅðéëïãÞ åìâÝëåéá IP ðïõ èÝëåôå íá ìðëïêÜñåôå. ¼óï ðéï ëßãïõò áñéèìïýò ðåñéÝ÷åé, ôüóï ðåñéóóüôåñåò äéåõèýíóåéò èá áðïêëåéóôïýí');
+define('_BAN_BLOGS_TEXT',                      'Ìðïñåßôå åßôå íá äéáëÝîåôå íá áðïêëåßóåôå ôçí IP óå Ýíá ìüíï éóôïëüãéï åßôå íá ôçí áðïêëåßóåôå óå üëá ôá éóôïëüãéá óôá ïðïßá Ý÷åôå äéêáéþìáôá äéá÷åéñéóôÞ. ÊÜíôå ôçí åðéëïãÞ óáò ðáñáêÜôù');
+define('_BAN_REASON_TITLE',                    'Ëüãïò');
+define('_BAN_REASON_TEXT',                     'Ìðïñåßôå íá äþóåôå Ýíá ëüãï ãéá ôïí áðïêëåéóìü, ï ïðïßïò èá åìöáíßæåôáé üôáí ï êÜôï÷ïò IP ðñïóðáèÞóåé íá ðñïóèÝóåé Üëëï ó÷üëéï Þ íá äþóåé øÞöï karma. Ôï ìÝãéóôï ìÞêïò åßíáé 256 ÷áñáêôÞñåò.');
+define('_BAN_ADD_BTN',                         'ÐñïóèÞêç áðïêëåéóìïý');
+
+// LOGIN screen
+define('_LOGIN_MESSAGE',                       'ÌÞíõìá');
+define('_LOGIN_NAME',                          '¼íïìá');
+define('_LOGIN_PASSWORD',                      'Êùäéêüò ðñüóâáóçò');
+define('_LOGIN_SHARED',                        'Êïéíü÷ñçóôç öüñìá óýíäåóçò');
+define('_LOGIN_FORGOT',                        'Îå÷Üóáôå ôïí êùäéêü óáò;');
+
+// membermanagement
+define('_MEMBERS_TITLE',                       'Äéá÷åßñéóç ìÝëïõò');
+define('_MEMBERS_CURRENT',                     'ÕðÜñ÷ïíôá ìÝëç');
+define('_MEMBERS_NEW',                 'ÍÝï ìÝëïò');
+define('_MEMBERS_DISPLAY',                     'ÅìöÜíéóç ïíüìáôïò');
+define('_MEMBERS_DISPLAY_INFO',                '(Áõôü åßíáé ôï üíïìá ðïõ ÷ñçóéìïðïéåßò ãéá login)');
+define('_MEMBERS_REALNAME',            'Ðñáãìáôéêü üíïìá');
+define('_MEMBERS_PWD',                 'Êùäéêüò ðñüóâáóçò');
+define('_MEMBERS_REPPWD',                      'ÅðáíÜëçøç êùäéêïý ðñüóâáóçò');
+define('_MEMBERS_EMAIL',                       'Äéåýèõíóç çëåêôñïíéêïý ôá÷õäñïìåßïõ');
+define('_MEMBERS_EMAIL_EDIT',          '(¼ôáí áëëÜîåôå ôç äéåýèõíóç çëåêôñïíéêïý ôá÷õäñïìåßïõ, Ýíáò íÝïò êùäéêüò ðñüóâáóçò èá óôáëåß áõôüìáôá óå áõôÞ ôç äéåýèõíóç )');
+define('_MEMBERS_URL',                         'Äéåýèõíóç ôïðïèåóßáò (URL)');
+define('_MEMBERS_SUPERADMIN',          'Äéêáéþìáôá äéá÷åéñéóôÞ');
+define('_MEMBERS_CANLOGIN',            'Ìðïñåßôå íá óõíäåèåßôå óôçí ðåñéï÷Þ ôïõ Äéá÷åéñéóôÞ');
+define('_MEMBERS_NOTES',                       'Óçìåéþóåéò');
+define('_MEMBERS_NEW_BTN',             'ÐñïóèÞêç ìÝëïõò');
+define('_MEMBERS_EDIT',                        'Åðåîåñãáóßá ìÝëïõò');
+define('_MEMBERS_EDIT_BTN',            'ÁëëáãÞ Ñõèìßóåùí');
+define('_MEMBERS_BACKTOOVERVIEW',      'Ðßóù óôçí ðñïåðéóêüðçóç ìÝëïõò');
+define('_MEMBERS_DEFLANG',                     'Ãëþóóá');
+define('_MEMBERS_USESITELANG',         '- ×ñÞóç ñõèìßóåùí äéêôõáêïý ôüðïõ -');
+
+// List of blogs (TT = tooltip)
+define('_BLOGLIST_TT_VISIT',           'Åðßóêåøç äéêôõáêïý ôüðïõ');
+define('_BLOGLIST_ADD',                        'ÐñïóèÞêç Üñèñïõ');
+define('_BLOGLIST_TT_ADD',             'ÐñïóèÞêç íÝïõ Üñèñïõ óå áõôü ôï éóôïëüãéï');
+define('_BLOGLIST_EDIT',               'Åðåîåñãáóßá /ÄéáãñáöÞ Üñèñùí');
+define('_BLOGLIST_TT_EDIT',                    '');
+define('_BLOGLIST_BMLET',                      'Óåëéäïäåéêôßäéï');
+define('_BLOGLIST_TT_BMLET',           '');
+define('_BLOGLIST_SETTINGS',           'Ñõèìßóåéò');
+define('_BLOGLIST_TT_SETTINGS',                'Åðåîåñãáóßá ñõèìßóåùí Þ äéá÷åßñéóç ïìÜäáò');
+define('_BLOGLIST_BANS',                       'Áðáãïñåýóåéò');
+define('_BLOGLIST_TT_BANS',                    'ÐñïâïëÞ, ðñïóèÞêç Þ êáôÜñãçóç áðáãïñåõìÝíùí IP');
+define('_BLOGLIST_DELETE',                     'ÄéáãñáöÞ üëùí');
+define('_BLOGLIST_TT_DELETE',          'ÄéáãñáöÞ áõôÞò ôçò êáôáãñáöÞò');
+
+// OVERVIEW screen
+define('_OVERVIEW_YRBLOGS',            'Ïé êáôáãñáöÝò óáò');
+define('_OVERVIEW_YRDRAFTS',           'Ôï ðñïó÷Ýäéü óáò');
+define('_OVERVIEW_YRSETTINGS',         'Ïé ñõèìßóåéò óáò');
+define('_OVERVIEW_GSETTINGS',          'ÃåíéêÝò ñõèìßóåéò');
+define('_OVERVIEW_NOBLOGS',            'Äåí åßóôå óå êáìßá ïìáäéêÞ ëßóôá êáôáãñáöþí');
+define('_OVERVIEW_NODRAFTS',           'ÊáíÝíá ðñïó÷Ýäéï');
+define('_OVERVIEW_EDITSETTINGS',       'Åðåîåñãáóßá ñõèìßóåùí...');
+define('_OVERVIEW_BROWSEITEMS',        'ÐåñéÞãçóç óôá Üñèñá...');
+define('_OVERVIEW_BROWSECOMM', 'ÐåñéÞãçóç óôá ó÷üëéá...');
+define('_OVERVIEW_VIEWLOG',            'ÐñïâïëÞ çìåñïëïãßïõ åíåñãåéþí...');
+define('_OVERVIEW_MEMBERS',            'Äéá÷åßñéóç ìåëþí...');
+define('_OVERVIEW_NEWLOG',             'Äçìéïõñãßá íÝïõ çìåñïëïãßïõ åíåñãåéþí...');
+define('_OVERVIEW_SETTINGS',           'Åðåîåñãáóßá ñõèìßóåùí...');
+define('_OVERVIEW_TEMPLATES',          'Åðåîåñãáóßá ðñïôýðïõ...');
+define('_OVERVIEW_SKINS',                      'Åðåîåñãáóßá åìöáíßóåùí...');
+define('_OVERVIEW_BACKUP',                     'Áíôßãñáöï áóöáëåßáò/ÅðáíáöïñÜ...');
+
+// ITEMLIST
+define('_ITEMLIST_BLOG',                       '¢ñèñá ãéá ôï éóôïëüãéï'); 
+define('_ITEMLIST_YOUR',                       'Ôá Üñèñá óáò');
+
+// Comments
+define('_COMMENTS',                            'Ó÷üëéá');
+define('_NOCOMMENTS',                          'ÊáíÝíá ó÷üëéï ãéá áõôü ôï Üñèñï');
+define('_COMMENTS_YOUR',                       'Ôá ó÷üëéÜ óáò');
+define('_NOCOMMENTS_YOUR',             'Äåí ãñÜøáôå êáíÝíá ó÷üëéï');
+
+// LISTS (general)
+define('_LISTS_NOMORE',                        'Äåí õðÜñ÷ïõí Üëëá áðïôåëÝóìáôá Þ äåí âñÝèçêáí êáèüëïõ áðïôåëÝóìáôá');
+define('_LISTS_PREV',                          'Ðñïçãïýìåíï');
+define('_LISTS_NEXT',                          'Åðüìåíï');
+define('_LISTS_SEARCH',                                'Åýñåóç');
+define('_LISTS_CHANGE',                                'ÁëëáãÞ');
+define('_LISTS_PERPAGE',                       'Üñèñá/óåëßäá');
+define('_LISTS_ACTIONS',                       'ÅíÝñãåéåò');
+define('_LISTS_DELETE',                                'ÄéáãñáöÞ');
+define('_LISTS_EDIT',                          'Åðåîåñãáóßá');
+define('_LISTS_MOVE',                          'Ìåôáêßíçóç');
+define('_LISTS_CLONE',                         'Êëùíïðïßçóç');
+define('_LISTS_TITLE',                         'Ôßôëïò');
+define('_LISTS_BLOG',                          'Éóôïëüãéï');
+define('_LISTS_NAME',                          '¼íïìá');
+define('_LISTS_DESC',                          'ÐåñéãñáöÞ');
+define('_LISTS_TIME',                          '¿ñá');
+define('_LISTS_COMMENTS',                      'Ó÷üëéá');
+define('_LISTS_TYPE',                          'Ôýðïò ');
+
+
+// member list 
+define('_LIST_MEMBER_NAME',            'ÅìöÜíéóç ïíüìáôïò');
+define('_LIST_MEMBER_RNAME',           'Ðñáãìáôéêü üíïìá');
+define('_LIST_MEMBER_ADMIN',           'ÕðÝñäéá÷åéñéóôÞò; ');
+define('_LIST_MEMBER_LOGIN',           'Ìðïñþ íá óõíäåèþ; ');
+define('_LIST_MEMBER_URL',                     'Äéêôõáêüò ôüðïò');
+
+// banlist
+define('_LIST_BAN_IPRANGE',                    'ÅìâÝëåéá IP');
+define('_LIST_BAN_REASON',                     'Ëüãïò');
+
+// actionlist
+define('_LIST_ACTION_MSG',                     'ÌÞíõìá');
+
+// commentlist
+define('_LIST_COMMENT_BANIP',          'Áðïêëåéóìüò IP');
+define('_LIST_COMMENT_WHO',            'ÓõíôÜêôçò');
+define('_LIST_COMMENT',                        'Ó÷üëéï');
+define('_LIST_COMMENT_HOST',           'Host');
+
+// itemlist
+define('_LIST_ITEM_INFO',                      'Ðëçñïöïñßá');
+define('_LIST_ITEM_CONTENT',           'Ôßôëïò êáé Êåßìåíï');
+
+
+// teamlist
+define('_LIST_TEAM_ADMIN',                     'Äéá÷åéñéóôÞò ');
+define('_LIST_TEAM_CHADMIN',           'ÁëëáãÞ äéá÷åéñéóôÞ');
+
+// edit comments
+define('_EDITC_TITLE',                         'Åðåîåñãáóßá ó÷ïëßùí');
+define('_EDITC_WHO',                           'ÓõíôÜêôçò');
+define('_EDITC_HOST',                          'Áðü ðïý;');
+define('_EDITC_WHEN',                          'Ðüôå;');
+define('_EDITC_TEXT',                          'Êåßìåíï');
+define('_EDITC_EDIT',                          'Åðåîåñãáóßá ó÷ïëßïõ');
+define('_EDITC_MEMBER',                        'ìÝëïò');
+define('_EDITC_NONMEMBER',                     'ü÷é ìÝëïò');
+
+// move item
+define('_MOVE_TITLE',                          'ÌåôáöïñÜ óå ðïéï éóôïëüãéï;');
+define('_MOVE_BTN',                            'ÌåôáöïñÜ Üñèñïõ');
index 8a7afc0..e117a62 100644 (file)
@@ -5,7 +5,11 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: en_Latn_US.ISO-8859-1.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: en_Latn_US.ISO-8859-1.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index a03c0bb..1a8d328 100644 (file)
@@ -1,11 +1,19 @@
 <?php
 /**
+<<<<<<< HEAD
+ * Nucleus CMS Locale File
+=======
  * Nucleus CMS Translation File
+>>>>>>> skinnable-master
  * English in United States (Latin script)
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: en_Latn_US.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: en_Latn_US.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index 8db84f7..ce5a376 100644 (file)
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: es_Latn_ES.ISO-8859-1.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: es_Latn_ES.ISO-8859-1.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -408,31 +412,92 @@ define('_ERROR_COMMENTS_SPAM',      'Your comment was rejected because it did no
 
 // START changed/added after 315 START
 
+<<<<<<< HEAD
+define('_LIST_PLUG_SUBS_NEEDUPDATE','Per favore usa il pulsante \'Aggiorna lista di sottoscrizione\' per aggiornare la lista di sottoscrizione dei plugin.');
+define('_LIST_PLUGS_DEP',                      'I Plugin richiedono:');
+=======
 define('_LIST_PLUG_SUBS_NEEDUPDATE','Por favor, usa el botón de la \'lista de suscripción de actualizaciones\' para actualizar la lista de suscripciones de los plugin\'s.');
 define('_LIST_PLUGS_DEP',                      'Plugin(s) requires:');
+>>>>>>> skinnable-master
 
 // END changed/added after 3.15
 
 // START changed/added after 3.1 START
 
 // comments list per weblog
+<<<<<<< HEAD
+define('_COMMENTS_BLOG',                       'Tutti i commenti di un blog');
+define('_NOCOMMENTS_BLOG',                     'Nessun commento è stato fatto agli elementi di questo blog');
+define('_BLOGLIST_COMMENTS',           'Commenti');
+define('_BLOGLIST_TT_COMMENTS',                'Un elenco di tutti i commenti fatti agli elementi di questo blog');
+=======
 define('_COMMENTS_BLOG',                       'Todos los comentarios para la bitácora');
 define('_NOCOMMENTS_BLOG',                     'No se hicieron comentarios en los elementos de esta bitácora');
 define('_BLOGLIST_COMMENTS',           'Comentarios');
 define('_BLOGLIST_TT_COMMENTS',                'Una lista de los comentarios hechos en los elementos de esta bitácora');
+>>>>>>> skinnable-master
 
 
 // for use in archivetype-skinvar
-define('_ARCHIVETYPE_DAY',                     'dia');
-define('_ARCHIVETYPE_MONTH',           'mes');
+define('_ARCHIVETYPE_DAY',                     'giorno');
+define('_ARCHIVETYPE_MONTH',           'mese');
 
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
+<<<<<<< HEAD
+define('_ERROR_BADTICKET',                     'Biglietto non valido o scaduto.');
+
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Installazione del plugin fallita, richiede ');
+define('_ERROR_DELREQPLUGIN',          'Cancellazione del plugin fallita, è richiesto da ');
+=======
 define('_ERROR_BADTICKET',                     'Ticket inválido o caducado.');
+>>>>>>> skinnable-master
 
 // cookie prefix
-define('_SETTINGS_COOKIEPREFIX',       'Prefijo de la Cookie');
+define('_SETTINGS_COOKIEPREFIX',       'Prefisso dei Cookie');
 
 // account activation
+<<<<<<< HEAD
+define('_ERROR_NOLOGON_NOACTIVATE',    'Impossibile inviare il link di attivazione. Non sei autorizzato ad eseguire il login.');
+define('_ERROR_ACTIVATE',                      'La chiave di attivazione non esiste, non &egrave; valida o &egrave; scaduta.');
+define('_ACTIONLOG_ACTIVATIONLINK', 'Link di attivazione inviato');
+define('_MSG_ACTIVATION_SENT',         'Un link di attivazione &egrave; stato inviato per e-mail.');
+
+// activation link emails
+define('_ACTIVATE_REGISTER_MAIL',      "Ciao <%memberName%>,\n\nHai bisogno di attivare il tuo account su <%siteName%> (<%siteUrl%>).\nPuoi farlo visitando il link seguente: \n\n\t<%activationUrl%>\n\nHai 2 giorni di tempo per farlo. Dopo questo periodo, il link di attivazione non sar&agrave; pi&ugrave; valido.");
+define('_ACTIVATE_REGISTER_MAILTITLE', "Attiva il tuo account '<%memberName%>'");
+define('_ACTIVATE_REGISTER_TITLE',     'Benvenuto <%memberName%>');
+define('_ACTIVATE_REGISTER_TEXT',      'Ci sei quasi. Per favore scegli una password per il tuo account di seguito.');
+define('_ACTIVATE_FORGOT_MAIL',                "Ciao <%memberName%>,\n\nUsando il link seguente, potrai scegliere una nuova password per il tuo account su <%siteName%> (<%siteUrl%>).\n\n\t<%activationUrl%>\n\nHai 2 giorni di tempo per farlo. Dopo questo periodo, il link di attivazione non sar&agrave; pi&ugrave; valido.");
+define('_ACTIVATE_FORGOT_MAILTITLE',"Riattiva il tuo account '<%memberName%>'");
+define('_ACTIVATE_FORGOT_TITLE',       'Benvenuto <%memberName%>');
+define('_ACTIVATE_FORGOT_TEXT',                'Puoi scegliere una nuova password per il tuo account di seguito:');
+define('_ACTIVATE_CHANGE_MAIL',                "Ciao <%memberName%>,\n\nDato che il tuo indirizzo e-mail &egrave; cambiato, devi riattivare il tuo account su <%siteName%> (<%siteUrl%>).\nPuoi farlo visitando il link seguente: \n\n\t<%activationUrl%>\n\nHai 2 giorni di tempo per farlo. Dopo questo periodo, il link di attivazione non sar&agrave; pi&ugrave; valido.");
+define('_ACTIVATE_CHANGE_MAILTITLE',"Riattiva il tuo account '<%memberName%>'");
+define('_ACTIVATE_CHANGE_TITLE',       'Benvenuto <%memberName%>');
+define('_ACTIVATE_CHANGE_TEXT',                'Il tuo cambio di indirizzo &egrave; stato verificato. Grazie!');
+define('_ACTIVATE_SUCCESS_TITLE',      'Attivazione avvenuta con successo');
+define('_ACTIVATE_SUCCESS_TEXT',       'Il tuo account &egrave; stato attivato con successo.');
+define('_MEMBERS_SETPWD',                      'Imposta Password');
+define('_MEMBERS_SETPWD_BTN',          'Imposta Password');
+define('_QMENU_ACTIVATE',                      'Attivazione account');
+define('_QMENU_ACTIVATE_TEXT',         '<p>Dopo che avrai attivato il tuo account, potrai iniziare ad usarlo <a href="index.php?action=showlogin">eseguendo il login</a>.</p>');
+
+define('_PLUGS_BTN_UPDATE',                    'Aggiorna la lista di sottoscrizione');
+
+// global settings
+define('_SETTINGS_JSTOOLBAR',          'Stile della Barra degli Strumenti Javascript');
+define('_SETTINGS_JSTOOLBAR_FULL',     'Barra degli Strumenti Completa (IE)');
+define('_SETTINGS_JSTOOLBAR_SIMPLE','Barra degli Strumenti Semplice (Non-IE)');
+define('_SETTINGS_JSTOOLBAR_NONE',     'Disabilita la Barra degli Strumenti');
+define('_SETTINGS_URLMODE_HELP',       '(Info: <a href="documentation/tips.html#searchengines-fancyurls">Come puoi attivare le URL brevi</a>)');
+
+// extra plugin settings part when editing categories/members/blogs/...
+define('_PLUGINS_EXTRA',                       'Impostazioni extra per i Plugin');
+
+// itemlist info column keys
+define('_LIST_ITEM_BLOG',                      'blog:');
+=======
 define('_ERROR_NOLOGON_NOACTIVATE',    'No se puede enviar el enlace de activación. No tienes permitido el acceso.');
 define('_ERROR_ACTIVATE',                      'La clave de activación no existe, es inválida, o ha caducado.');
 define('_ACTIONLOG_ACTIVATIONLINK', 'Enlace de activación enviado');
@@ -472,19 +537,49 @@ define('_PLUGINS_EXTRA',                  'Configuraci
 
 // itemlist info column keys
 define('_LIST_ITEM_BLOG',                      'bitácora:');
+>>>>>>> skinnable-master
 define('_LIST_ITEM_CAT',                       'cat:');
-define('_LIST_ITEM_AUTHOR',                    'autor:');
-define('_LIST_ITEM_DATE',                      'fecha:');
-define('_LIST_ITEM_TIME',                      'hora:');
+define('_LIST_ITEM_AUTHOR',                    'autore:');
+define('_LIST_ITEM_DATE',                      'data:');
+define('_LIST_ITEM_TIME',                      'ora:');
 
 // indication of registered members in comments list
-define('_LIST_COMMENTS_MEMBER',        '(miembro)');
+define('_LIST_COMMENTS_MEMBER',        '(membro)');
 
 // batch operations
-define('_BATCH_WITH_SEL',                      'con los seleccionados:');
-define('_BATCH_EXEC',                          'Ejecutar');
+define('_BATCH_WITH_SEL',                      'Con la selezione:');
+define('_BATCH_EXEC',                          'Esegui');
 
 // quickmenu
+<<<<<<< HEAD
+define('_QMENU_HOME',                          'Home');
+define('_QMENU_ADD',                           'Aggiungi articoli');
+define('_QMENU_ADD_SELECT',                    '-- seleziona --');
+define('_QMENU_USER_SETTINGS',         'Impostazioni');
+define('_QMENU_USER_ITEMS',                    'Articoli');
+define('_QMENU_USER_COMMENTS',         'Commenti');
+define('_QMENU_MANAGE',                                'Gestione');
+define('_QMENU_MANAGE_LOG',                    'Log Azioni');
+define('_QMENU_MANAGE_SETTINGS',       'Impostazioni Globali');
+define('_QMENU_MANAGE_MEMBERS',                'Membri');
+define('_QMENU_MANAGE_NEWBLOG',                'Nuovo Weblog');
+define('_QMENU_MANAGE_BACKUPS',                'Backups');
+define('_QMENU_MANAGE_PLUGINS',                'Plugins');
+define('_QMENU_LAYOUT',                                'Layout');
+define('_QMENU_LAYOUT_SKINS',          'Temi');
+define('_QMENU_LAYOUT_TEMPL',          'Modelli');
+define('_QMENU_LAYOUT_IEXPORT',                'Importa/Esporta');
+define('_QMENU_PLUGINS',                       'Plugins');
+
+// quickmenu on logon screen
+define('_QMENU_INTRO',                         'Introduzione');
+define('_QMENU_INTRO_TEXT',                    '<p>Questa &egrave; la schermata di Login per BLOG:CMS, il sistema di gestione contenuti che &egrave; usato per gestire questo sito web.</p><p>Se hai un account, puoi fare il login e iniziare a inviare nuovi articoli.</p>');
+
+// helppages for plugins
+define('_ERROR_PLUGNOHELPFILE',                'Il file di aiuto per questo plugin non pu&ograve; essere trovato');
+define('_PLUGS_HELP_TITLE',                    'Pagina di aiuto per il plugin');
+define('_LIST_PLUGS_HELP',                     'aiuto');
+=======
 define('_QMENU_HOME',                          'Inicio');
 define('_QMENU_ADD',                           'Agregar elemento');
 define('_QMENU_ADD_SELECT',                    '-- seleccionar --');
@@ -512,6 +607,7 @@ define('_QMENU_INTRO_TEXT',                 '<p>Esta es la pantalla de entrada de Nucleus CMS,
 define('_ERROR_PLUGNOHELPFILE',                'El archivo de ayuda de este plugin no se encuentra');
 define('_PLUGS_HELP_TITLE',                    'Página de ayuda del plugin');
 define('_LIST_PLUGS_HELP',                     'ayuda');
+>>>>>>> skinnable-master
 
 
 // END changed/started after 3.1
@@ -519,6 +615,16 @@ define('_LIST_PLUGS_HELP',                         'ayuda');
 // START changed/added after v2.5beta START
 
 // general settings (security)
+<<<<<<< HEAD
+define('_SETTINGS_EXTAUTH',                    'Abilita l\'Autenticazione Esterna');
+define('_WARNING_EXTAUTH',                     'Attenzione: Abilitare solo se necessario.');
+
+// member profile
+define('_MEMBERS_BYPASS',                      'Usa l\'Autenticazione Esterna');
+
+// 'always include in search' blog setting (yes/no) [in v2.5beta, the 'always' part wasn't clear]
+define('_EBLOG_SEARCH',                                'Includi <em>SEMPRE</em> nella ricerca');
+=======
 define('_SETTINGS_EXTAUTH',                    'Habilita la autenticación externa');
 define('_WARNING_EXTAUTH',                     'Aviso: Habilita sólo si es necesario.');
 
@@ -527,65 +633,119 @@ define('_MEMBERS_BYPASS',                        'Usar Autenticaci
 
 // 'always include in search' blog setting (yes/no) [in v2.5beta, the 'always' part wasn't clear]
 define('_EBLOG_SEARCH',                                'Incluir en búsquedas');
+>>>>>>> skinnable-master
 
 // END changed/added after v2.5beta
 
 // START introduced after v2.0 START
 
 // media library
-define('_MEDIA_VIEW',                          'ver');
-define('_MEDIA_VIEW_TT',                       'Ver archivo (se abre en nueva ventana)');
-define('_MEDIA_FILTER_APPLY',          'Aplicar filtro');
+define('_MEDIA_VIEW',                          'visualizza');
+define('_MEDIA_VIEW_TT',                       'Visualizza il file (apre una nuova finestra)');
+define('_MEDIA_FILTER_APPLY',          'Applica filtro');
 define('_MEDIA_FILTER_LABEL',          'Filtro: ');
+<<<<<<< HEAD
+define('_MEDIA_UPLOAD_TO',                     'Carica in...');
+define('_MEDIA_UPLOAD_NEW',                    'Carica un nuovo file...');
+define('_MEDIA_COLLECTION_SELECT',     'Seleziona');
+define('_MEDIA_COLLECTION_TT',         'Passa a questa categoria');
+define('_MEDIA_COLLECTION_LABEL',      'Collezione corrente: ');
+=======
 define('_MEDIA_UPLOAD_TO',                     'Subir a...');
 define('_MEDIA_UPLOAD_NEW',                    'Subir nuevo archivo...');
 define('_MEDIA_COLLECTION_SELECT',     'Seleccionar');
 define('_MEDIA_COLLECTION_TT',         'Cambiar a esta categoría');
 define('_MEDIA_COLLECTION_LABEL',      'Colección actual: ');
+>>>>>>> skinnable-master
 
 // tooltips on toolbar
-define('_ADD_ALIGNLEFT_TT',                    'Alinear a la izquierda');
-define('_ADD_ALIGNRIGHT_TT',           'Alinear a la derecha');
-define('_ADD_ALIGNCENTER_TT',          'Alinear al centro');
+define('_ADD_ALIGNLEFT_TT',                    'Allinea a sinistra');
+define('_ADD_ALIGNRIGHT_TT',           'Allinea a destra');
+define('_ADD_ALIGNCENTER_TT',          'Centra');
 
+<<<<<<< HEAD
+
+=======
+>>>>>>> skinnable-master
 // generic upload failure
-define('_ERROR_UPLOADFAILED',          'Error al subir');
+define('_ERROR_UPLOADFAILED',          'Caricamento fallito');
 
 // END introduced after v2.0 END
 
 // START introduced after v1.5 START
 
 // posting to the past/edit timestamps
-define('_EBLOG_ALLOWPASTPOSTING',      'Permite introducir entradas en el pasado');
-define('_ADD_CHANGEDATE',                      'Actualizar fecha y hora');
-define('_BMLET_CHANGEDATE',                    'Actualizar fecha y hora');
+define('_EBLOG_ALLOWPASTPOSTING',      'Permetti l\'invio di articoli nel passato');
+define('_ADD_CHANGEDATE',                      'Aggiorna il timestamp');
+define('_BMLET_CHANGEDATE',                    'Aggiorna il timestamp');
 
 // skin import/export
-define('_OVERVIEW_SKINIMPORT',         'Importar/exportar piel...');
+define('_OVERVIEW_SKINIMPORT',         'Importa/esporta temi...');
 
 // skin settings
-define('_PARSER_INCMODE_NORMAL',       'Normal');
-define('_PARSER_INCMODE_SKINDIR',      'Usar el directorio de pieles');
-define('_SKIN_INCLUDE_MODE',           'Incluir modo');
-define('_SKIN_INCLUDE_PREFIX',         'Incluir prefijo');
+define('_PARSER_INCMODE_NORMAL',       'Normale');
+define('_PARSER_INCMODE_SKINDIR',      'Usa la directory dei temi');
+define('_SKIN_INCLUDE_MODE',           'Modo inclusione');
+define('_SKIN_INCLUDE_PREFIX',         'Prefisso inclusione');
 
 // global settings
-define('_SETTINGS_BASESKIN',           'Piel base');
-define('_SETTINGS_SKINSURL',           'URL de pieles');
-define('_SETTINGS_ACTIONSURL',         'URL completa para action.php');
+define('_SETTINGS_BASESKIN',           'Tema di base');
+define('_SETTINGS_SKINSURL',           'URL dei temi');
+define('_SETTINGS_ACTIONSURL',         'URL completa al file action.php');
 
 // category moves (batch)
+<<<<<<< HEAD
+define('_ERROR_MOVEDEFCATEGORY',       'Non posso spostare la categoria di default');
+define('_ERROR_MOVETOSELF',                    'Non posso spostare la categoria (il blog di destinazione coincide con quello di partenza)');
+define('_MOVECAT_TITLE',                       'Seleziona il blog dove spostare la categoria selezionata');
+define('_MOVECAT_BTN',                         'Sposta la Categoria');
+=======
 define('_ERROR_MOVEDEFCATEGORY',       'No se puede mover la categoría por defecto');
 define('_ERROR_MOVETOSELF',                    'No se puede mover la categoría (la bitácora de destino es la misma que la de origen)');
 define('_MOVECAT_TITLE',                       'Seleccionar la bitácora a la que mover la categoría');
 define('_MOVECAT_BTN',                         'Mover categoría');
+>>>>>>> skinnable-master
 
 // URLMode setting
 define('_SETTINGS_URLMODE',                    'Modo URL');
-define('_SETTINGS_URLMODE_NORMAL',     'Normal');
-define('_SETTINGS_URLMODE_PATHINFO','Atractivo');
+define('_SETTINGS_URLMODE_NORMAL',     'Normale');
+define('_SETTINGS_URLMODE_PATHINFO','Fancy');
 
 // Batch operations
+<<<<<<< HEAD
+define('_BATCH_NOSELECTION',           'Non &egrave; stato selezionato nulla su cui eseguire le azioni richieste');
+define('_BATCH_ITEMS',                         'Operazione automatiche sugli articoli');
+define('_BATCH_CATEGORIES',                    'Operazioni automatiche sulle categorie');
+define('_BATCH_MEMBERS',                       'Operazioni automatiche sui membri');
+define('_BATCH_TEAM',                          'Operazioni automatiche sui membri del gruppo');
+define('_BATCH_COMMENTS',                      'Operazioni automatiche sui commenti');
+define('_BATCH_UNKNOWN',                       'Operazione automatica sconosciuta: ');
+define('_BATCH_EXECUTING',                     'Esecuzione dell\'operazione di');
+define('_BATCH_ONCATEGORY',                    'sulla categoria');
+define('_BATCH_ONITEM',                                'sull\'articolo');
+define('_BATCH_ONCOMMENT',                     'sul commento');
+define('_BATCH_ONMEMBER',                      'sull\'utente');
+define('_BATCH_ONTEAM',                                'sul ');
+define('_BATCH_SUCCESS',                       ' Operazione effettuata con successo!');
+define('_BATCH_DONE',                          'Fatto!');
+define('_BATCH_DELETE_CONFIRM',                'Conferma l\'operazione di eliminazione');
+define('_BATCH_DELETE_CONFIRM_BTN',    'Conferma operazione eliminazione');
+define('_BATCH_SELECTALL',                     'seleziona tutti');
+define('_BATCH_DESELECTALL',           'deseleziona tutti');
+
+// batch operations: options in dropdowns
+define('_BATCH_ITEM_DELETE',           'Cancella');
+define('_BATCH_ITEM_MOVE',                     'Sposta');
+define('_BATCH_MEMBER_DELETE',         'Cancella');
+define('_BATCH_MEMBER_SET_ADM',                'Dai i permessi di amministrazione');
+define('_BATCH_MEMBER_UNSET_ADM',      'Togli i permessi di amministrazione');
+define('_BATCH_TEAM_DELETE',           'Cancellalo dal gruppo');
+define('_BATCH_TEAM_SET_ADM',          'Dai i permessi di amministrazione');
+define('_BATCH_TEAM_UNSET_ADM',                'Togli i privilegi di amministrazione');
+define('_BATCH_CAT_DELETE',                    'Cancella');
+define('_BATCH_CAT_MOVE',                      'Spostalo in un altro blog');
+define('_BATCH_COMMENT_DELETE',                'Cancella');
+=======
 define('_BATCH_NOSELECTION',           'Nada seleccionado sobre lo que se pueda realizar una acción');
 define('_BATCH_ITEMS',                         'Operación de lotes sobre elementos');
 define('_BATCH_CATEGORIES',                    'Operación de lotes sobre categorías');
@@ -618,12 +778,50 @@ define('_BATCH_TEAM_UNSET_ADM',           'Quitar derechos de administraci
 define('_BATCH_CAT_DELETE',                    'Eliminar');
 define('_BATCH_CAT_MOVE',                      'Mover a otra bitácora');
 define('_BATCH_COMMENT_DELETE',                'Eliminar');
+>>>>>>> skinnable-master
 
 // itemlist: Add new item...
-define('_ITEMLIST_ADDNEW',                     'Introducir nuevo elemento...');
-define('_ADD_PLUGIN_EXTRAS',           'Opciones extra de plugin');
+define('_ITEMLIST_ADDNEW',                     'Aggiungi un nuovo articolo...');
+define('_ADD_PLUGIN_EXTRAS',           'Moduli aggiuntivi - Opzioni extra ');
 
 // errors
+<<<<<<< HEAD
+define('_ERROR_CATCREATEFAIL',         'Non posso creare una nuova categoria');
+define('_ERROR_NUCLEUSVERSIONREQ',     'Questo modulo aggiuntivo richiede una versione di Nucleus pi&ugrave; recente: ');
+
+// backlinks
+define('_BACK_TO_BLOGSETTINGS',                'Torna alle impostazioni del blog');
+
+// skin import export
+define('_SKINIE_TITLE_IMPORT',         'Importa');
+define('_SKINIE_TITLE_EXPORT',         'Esporta');
+define('_SKINIE_BTN_IMPORT',           'Importa');
+define('_SKINIE_BTN_EXPORT',           'Esporta i temi o i modelli selezionati');
+define('_SKINIE_LOCAL',                                'Importa da un file locale:');
+define('_SKINIE_NOCANDIDATES',         'Nessuna tema da importare &egrave; stato individuato nella directory dei temi');
+define('_SKINIE_FROMURL',                      'Importa dall\'URL:');
+define('_SKINIE_EXPORT_INTRO',         'Seleziona i temi ed i modelli che vuoi esportare dalla lista che segue');
+define('_SKINIE_EXPORT_SKINS',         'Temi');
+define('_SKINIE_EXPORT_TEMPLATES',     'Modelli');
+define('_SKINIE_EXPORT_EXTRA',         'Informazioni aggiuntive');
+define('_SKINIE_CONFIRM_OVERWRITE',    'Sovrascrivi i temi esistenti (see nameclashes)');
+define('_SKINIE_CONFIRM_IMPORT',       'Si, voglio importarlo');
+define('_SKINIE_CONFIRM_TITLE',                'Sull\'importazioni di temi e modelli');
+define('_SKINIE_INFO_SKINS',           'File del tema:');
+define('_SKINIE_INFO_TEMPLATES',       'File del modello:');
+define('_SKINIE_INFO_GENERAL',         'Informazioni:');
+define('_SKINIE_INFO_SKINCLASH',       'Collisioni nomi dei temi:');
+define('_SKINIE_INFO_TEMPLCLASH',      'Collisioni nomi dei modelli:');
+define('_SKINIE_INFO_IMPORTEDSKINS','Temi importati:');
+define('_SKINIE_INFO_IMPORTEDTEMPLS','Modelli importati:');
+define('_SKINIE_DONE',                         'Importazione effettuata');
+
+define('_AND',                                         'e');
+define('_OR',                                          'o');
+
+// empty fields on template edit
+define('_EDITTEMPLATE_EMPTY',          'campo vuoto (clicca per modificare)');
+=======
 define('_ERROR_CATCREATEFAIL',         'No se puede crear una nueva categoría');
 define('_ERROR_NUCLEUSVERSIONREQ',     'Este plugin necesita una versión más reciente de Nucleus: ');
 
@@ -659,13 +857,31 @@ define('_OR',                                             'o');
 
 // empty fields on template edit
 define('_EDITTEMPLATE_EMPTY',          'campo vacío (hacer clic para editar)');
+>>>>>>> skinnable-master
 
 // skin overview list
-define('_LIST_SKINS_INCMODE',          'Incluye modo:');
-define('_LIST_SKINS_INCPREFIX',                'Incluye prefijo:');
-define('_LIST_SKINS_DEFINED',          'Partes definidas:');
+define('_LIST_SKINS_INCMODE',          'Modo inclusione:');
+define('_LIST_SKINS_INCPREFIX',                'Prefisso inclusione:');
+define('_LIST_SKINS_DEFINED',          'Parti definite:');
 
 // backup
+<<<<<<< HEAD
+define('_BACKUPS_TITLE',                       'Salva / Ripristina');
+define('_BACKUP_TITLE',                                'Salvataggio');
+define('_BACKUP_INTRO',                                'Clicca sul pulsante qui sotto per eseguire un salvataggio (backup) del database di Nucleus. Ti verr&agrave; richiesto di salvare un file contenente il backup: scegli di conservare tale file in un posto sicuro.');
+define('_BACKUP_ZIP_YES',                      'Prova ad utilizzare la compressione dei dati');
+define('_BACKUP_ZIP_NO',                       'Non utilizzare la compressione dei dati');
+define('_BACKUP_BTN',                          'Crea il backup');
+define('_BACKUP_NOTE',                         '<b>Nota:</b> solo il contenuto del database verr&agrave; salvato nel backup. Tutti gli altri file, comprese le impostazioni presenti nel file config.php, <b>NON</b> verranno incluse nel salvataggio.');
+define('_RESTORE_TITLE',                       'Ripristina');
+define('_RESTORE_NOTE',                                '<b>ATTENZIONE:</b> il ripristino del database da una copia di backup  <b>CANCELLERA\'</b> tutto il contenuto corrente del database di Nucleus! Esegui questa operazione solo se sei veramente sicuro di ci&ograve; che stai facendo!   <br />  <b>Nota:</b> la versione di Nucleus da cui hai creato il file di backup deve essere identica alla versione che stai utilizzando in questo momento! Il ripristino dei dati tra versioni differenti di Nucleus non &egrave; assicurato.');
+define('_RESTORE_INTRO',                       'Seleziona il file contenente il backup: il file selezionato verr&agrave; caricato sul server. Clicca sul pulsante &quot;Ripristina&quot; per eseguire il recupero dei dati.');
+define('_RESTORE_IMSURE',                      'Si, sono sicuro! Voglio procedere con il ripristino dei dati.');
+define('_RESTORE_BTN',                         'Ripristina');
+define('_RESTORE_WARNING',                     '(assicurati di selezionare il backup corretto; &egrave; consigliato effettuare un nuovo backup prima di procedere con il ripristino di un precedente salvataggio)');
+define('_ERROR_BACKUP_NOTSURE',                'Devi spuntare la casellina \'Si, sono sicuro\' per poter procedere con il ripristino dei dati');
+define('_RESTORE_COMPLETE',                    'Ripristino dati completato');
+=======
 define('_BACKUPS_TITLE',                       'Almacenar / Restaurar');
 define('_BACKUP_TITLE',                                'Almacenar');
 define('_BACKUP_INTRO',                                'Hacer clic sobre el siguiente botón para crear una copia de seguridad de la base de datos de Nucleus. Se pedirá que guarde un archivo de seguridad. Guárdelo en lugar seguro.');
@@ -681,20 +897,33 @@ define('_RESTORE_BTN',                            'Restaurar desde archivo');
 define('_RESTORE_WARNING',                     '(asegurarse de estar restaurando la copia de seguridad correcta, quizá sea mejor hacer una copia de seguridad antes de empezar)');
 define('_ERROR_BACKUP_NOTSURE',                'Necesitará marcar la casilla \'Estoy seguro\'');
 define('_RESTORE_COMPLETE',                    'Restauración completada');
+>>>>>>> skinnable-master
 
 // new item notification
-define('_NOTIFY_NI_MSG',                       'Un nuevo elemento ha sido insertado:');
-define('_NOTIFY_NI_TITLE',                     'Nuevo elemento!');
-define('_NOTIFY_KV_MSG',                       'Voto Karma del elemento:');
+define('_NOTIFY_NI_MSG',                       'E\' stato inserito un nuovo articolo:');
+define('_NOTIFY_NI_TITLE',                     'nuovo Articolo!');
+define('_NOTIFY_KV_MSG',                       'Voto karma sull\'articolo:');
 define('_NOTIFY_KV_TITLE',                     'Nucleus karma:');
-define('_NOTIFY_NC_MSG',                       'Comentario sobre el elemento:');
-define('_NOTIFY_NC_TITLE',                     'Comentario de Nucleus:');
-define('_NOTIFY_USERID',                       'ID de usuario:');
-define('_NOTIFY_USER',                         'Usuario:');
-define('_NOTIFY_COMMENT',                      'Comentario:');
-define('_NOTIFY_VOTE',                         'Voto:');
+define('_NOTIFY_NC_MSG',                       'Comment per sull\'articolo:');
+define('_NOTIFY_NC_TITLE',                     'Commento Nucleus:');
+define('_NOTIFY_USERID',                       'ID Utente:');
+define('_NOTIFY_USER',                         'Utente:');
+define('_NOTIFY_COMMENT',                      'Commento:');
+define('_NOTIFY_VOTE',                         'Vota:');
 define('_NOTIFY_HOST',                         'Host:');
 define('_NOTIFY_IP',                           'IP:');
+<<<<<<< HEAD
+define('_NOTIFY_MEMBER',                       'Membro:');
+define('_NOTIFY_TITLE',                                'Titolo:');
+define('_NOTIFY_CONTENTS',                     'Contenuti:');
+
+// member mail message
+define('_MMAIL_MSG',                           'Ti &egrave; stato inviato un messaggio da');
+define('_MMAIL_FROMANON',                      'un visitatore anonimo');
+define('_MMAIL_FROMNUC',                       'il messaggio ti &egrave; stato inviato utilizzando i servizi di nucleus utilizzato dal sito ');
+define('_MMAIL_TITLE',                         'Un messaggio da');
+define('_MMAIL_MAIL',                          'Messaggio:');
+=======
 define('_NOTIFY_MEMBER',                       'Miembro:');
 define('_NOTIFY_TITLE',                                'Título:');
 define('_NOTIFY_CONTENTS',                     'Contenido:');
@@ -705,6 +934,7 @@ define('_MMAIL_FROMANON',                   'un visitante an
 define('_MMAIL_FROMNUC',                       'Insertado desde una bitácora de Nucleus en');
 define('_MMAIL_TITLE',                         'Un mensaje de');
 define('_MMAIL_MAIL',                          'Mensaje:');
+>>>>>>> skinnable-master
 
 // END introduced after v1.5 END
 
@@ -712,6 +942,15 @@ define('_MMAIL_MAIL',                              'Mensaje:');
 // START introduced after v1.1 START
 
 // bookmarklet buttons
+<<<<<<< HEAD
+define('_BMLET_ADD',                           'Aggiungi un articolo');
+define('_BMLET_EDIT',                          'Modifica un articolo');
+define('_BMLET_DELETE',                                'Cancella un articolo');
+define('_BMLET_BODY',                          'Corpo');
+define('_BMLET_MORE',                          'Corpo (esteso)');
+define('_BMLET_OPTIONS',                       'Opzioni');
+define('_BMLET_PREVIEW',                       'Anteprima');
+=======
 define('_BMLET_ADD',                           'Introducir entrada');
 define('_BMLET_EDIT',                          'Editar entrada');
 define('_BMLET_DELETE',                                'Eliminar entrada');
@@ -719,12 +958,29 @@ define('_BMLET_BODY',                             'Cuerpo');
 define('_BMLET_MORE',                          'Más');
 define('_BMLET_OPTIONS',                       'Opciones');
 define('_BMLET_PREVIEW',                       'Previsualizar');
+>>>>>>> skinnable-master
 
 // used in bookmarklet
-define('_ITEM_UPDATED',                                'La entrada ha sido actualizada');
-define('_ITEM_DELETED',                                'La entrada ha sido eliminada');
+define('_ITEM_UPDATED',                                'L\'articolo &egrave; stato aggiornato');
+define('_ITEM_DELETED',                                'L\'articolo &egrave; stato cancellato');
 
 // plugins
+<<<<<<< HEAD
+define('_CONFIRMTXT_PLUGIN',           'Sei sicuro di volere eliminare il modulo aggiuntivo chiamato');
+define('_ERROR_NOSUCHPLUGIN',          'Modulo aggiuntivo inesistente');
+define('_ERROR_DUPPLUGIN',                     'Questo modulo aggiuntivo &egrave; gi&agrave; stato installato');
+define('_ERROR_PLUGFILEERROR',         'Modulo aggiuntivo inesistente, o permessi impostati non correttamente');
+define('_PLUGS_NOCANDIDATES',          'Non &egrave; stato trovato alcun modulo aggiuntivo');
+
+define('_PLUGS_TITLE_MANAGE',          'Gestisci i moduli aggiuntivi');
+define('_PLUGS_TITLE_INSTALLED',       'Moduli attualmente installati');
+define('_PLUGS_TITLE_UPDATE',          'Aggiorna elenco sottoscrittori');
+define('_PLUGS_TEXT_UPDATE',           'Nucleus mantiene una cache degli eventi sottoscritti dai moduli aggiuntivi. Quando aggiorni un modulo aggiuntivo sovrascrivendone il file, devi eseguire questa opzione per essere sicuro che vengano aggiornate le sottoscrizioni corrette');
+define('_PLUGS_TITLE_NEW',                     'Installa un nuovo modulo aggiuntivo');
+define('_PLUGS_ADD_TEXT',                      'Qui sotto sono elencati tutti i file contenuti nella directory dei moduli aggiuntivi. Dovrebbero essere elencati solo i moduli non ancora installati. Prima di procedere con l\'installazione di uno qualsiasi dei file elencati accertati che lo stesso sia <strong>sicuramente</strong> un modulo aggiuntivo valido.');
+define('_PLUGS_BTN_INSTALL',           'Installa');
+define('_BACKTOOVERVIEW',                      'Torna alla pagina principale dei moduli aggiuntivi');
+=======
 define('_CONFIRMTXT_PLUGIN',           'Seguro que se desea eliminar el plugin llamado');
 define('_ERROR_NOSUCHPLUGIN',          'No existe ese plugin');
 define('_ERROR_DUPPLUGIN',                     'Ese plugin ya ha sido instalado');
@@ -739,15 +995,25 @@ define('_PLUGS_TITLE_NEW',                        'Instalar un nuevo plugin');
 define('_PLUGS_ADD_TEXT',                      'A continuación hay una lista de todos los archivos de tu directorio de plugins, algunos podrían ser plugins sin instalación. Asegúrate de estar <strong>totalmente seguro</strong> de que se trata de un plugin antes de introducirlo.');
 define('_PLUGS_BTN_INSTALL',           'Instalar plugin');
 define('_BACKTOOVERVIEW',                      'Volver a principal');
+>>>>>>> skinnable-master
 
 // editlink
-define('_TEMPLATE_EDITLINK',           'Editar el enlace de la entrada');
+define('_TEMPLATE_EDITLINK',           'Link per la modifica dell\'articolo');
 
 // add left / add right tooltips
-define('_ADD_LEFT_TT',                         'Insertar cuadro a la izquierda');
-define('_ADD_RIGHT_TT',                                'Insertar cuadro a la derecha');
+define('_ADD_LEFT_TT',                         'Aggiungi un riquadro laterale a sinistra');
+define('_ADD_RIGHT_TT',                                'Aggiungi un riquadro laterale a destra');
 
 // add/edit item: new category (in dropdown box)
+<<<<<<< HEAD
+define('_ADD_NEWCAT',                          'Nuova categoria...');
+
+// new settings
+define('_SETTINGS_PLUGINURL',          'URL moduli aggiuntivi');
+define('_SETTINGS_MAXUPLOADSIZE',      'Max. grandezza file caricabili (in byte)');
+define('_SETTINGS_NONMEMBERMSGS',      'Abilita gli utenti non registrati ad inviare messaggi');
+define('_SETTINGS_PROTECTMEMNAMES',    'Proteggi i nomi degli utenti registrati');
+=======
 define('_ADD_NEWCAT',                          'Nueva categoría');
 
 // new settings
@@ -755,17 +1021,34 @@ define('_SETTINGS_PLUGINURL',            'URL del plugin');
 define('_SETTINGS_MAXUPLOADSIZE',      'Max. tamaño de archivo para subida (bytes)');
 define('_SETTINGS_NONMEMBERMSGS',      'Permitir a los no miembros que envien mensajes');
 define('_SETTINGS_PROTECTMEMNAMES',    'Proteger los nombres de los miembros');
+>>>>>>> skinnable-master
 
 // overview screen
-define('_OVERVIEW_PLUGINS',                    'Gestionar plugins...');
+define('_OVERVIEW_PLUGINS',                    'Gestisci i moduli aggiuntivi...');
 
 // actionlog
-define('_ACTIONLOG_NEWMEMBER',         'Registro de un nuevo miembro:');
+define('_ACTIONLOG_NEWMEMBER',         'Registrazione nuovo membro:');
 
 // membermail (when not logged in)
-define('_MEMBERMAIL_MAIL',                     'Tu email:');
+define('_MEMBERMAIL_MAIL',                     'Il tuo indirizzo email:');
 
 // file upload
+<<<<<<< HEAD
+define('_ERROR_DISALLOWEDUPLOAD2',     'Non hai diritti di amministrazione su nessuno dei blog che hanno il membro di destinazione nel loro gruppo. Per questo motivo non sei abilitato a caricare file nella directory media di questi mebri.');
+
+// plugin list
+define('_LISTS_INFO',                          'Informazioni');
+define('_LIST_PLUGS_AUTHOR',           'Da:');
+define('_LIST_PLUGS_VER',                      'Versione:');
+define('_LIST_PLUGS_SITE',                     'Visita il sito');
+define('_LIST_PLUGS_DESC',                     'Descrizione:');
+define('_LIST_PLUGS_SUBS',                     'Sottoscrive i seguenti eventi:');
+define('_LIST_PLUGS_UP',                       'sposta sopra');
+define('_LIST_PLUGS_DOWN',                     'sposta sotto');
+define('_LIST_PLUGS_UNINSTALL',                'disinstalla');
+define('_LIST_PLUGS_ADMIN',                    'amministra');
+define('_LIST_PLUGS_OPTIONS',          'modifica&nbsp;opzioni');
+=======
 define('_ERROR_DISALLOWEDUPLOAD2',     'Sin permiso de administración sobre ninguna de las bitácoras que tiene el miembro de destino del equipo. Por tanto, no es posible subir archivos al directorio de medios de este miembro');
 
 // plugin list
@@ -780,11 +1063,26 @@ define('_LIST_PLUGS_DOWN',                       'desplazar abajo');
 define('_LIST_PLUGS_UNINSTALL',                'desinstalar');
 define('_LIST_PLUGS_ADMIN',                    'admin');
 define('_LIST_PLUGS_OPTIONS',          'editar&nbsp;opciones');
+>>>>>>> skinnable-master
 
 // plugin option list
-define('_LISTS_VALUE',                         'Valor');
+define('_LISTS_VALUE',                         'Valore');
 
 // plugin options
+<<<<<<< HEAD
+define('_ERROR_NOPLUGOPTIONS',         'questo modulo non ha alcuna opzione impostata');
+define('_PLUGS_BACK',                          'Torna alla pagina principale dei moduli aggiuntivi');
+define('_PLUGS_SAVE',                          'Salva le opzioni');
+define('_PLUGS_OPTIONS_UPDATED',       'Opzioni del modulo aggiuntivo modificate');
+
+define('_OVERVIEW_MANAGEMENT',         'Amministrazione');
+define('_OVERVIEW_MANAGE',                     'Amministrazione Nucleus...');
+define('_MANAGE_GENERAL',                      'Gestione Generale');
+define('_MANAGE_SKINS',                                'Temi e Modelli');
+define('_MANAGE_EXTRA',                                'Caratteristiche aggiuntive');
+
+define('_BACKTOMANAGE',                                'Torna all\'amministrazione di Nucleus');
+=======
 define('_ERROR_NOPLUGOPTIONS',         'este plugin no tiene establecida ninguna opción');
 define('_PLUGS_BACK',                          'Volver a la lista de plugins');
 define('_PLUGS_SAVE',                          'Guardar opciones');
@@ -797,6 +1095,7 @@ define('_MANAGE_SKINS',                            '"Skins" y plantillas');
 define('_MANAGE_EXTRA',                                'Características extra');
 
 define('_BACKTOMANAGE',                                'Volver a la gestión de Nucleus');
+>>>>>>> skinnable-master
 
 
 // END introduced after v1.1 END
@@ -806,6 +1105,25 @@ define('_BACKTOMANAGE',                           'Volver a la gesti
 
 
 // global stuff
+<<<<<<< HEAD
+define('_LOGOUT',                                      'Disconnettiti');
+define('_LOGIN',                                       'Connettiti');
+define('_YES',                                         'Si');
+define('_NO',                                          'No');
+define('_SUBMIT',                                      'Invia');
+define('_ERROR',                                       'Errore');
+define('_ERRORMSG',                                    'Si &egrave; verificato un errore!');
+define('_BACK',                                                'Go Back');
+define('_NOTLOGGEDIN',                         'Non sei collegato');
+define('_LOGGEDINAS',                          'Sei collegato come');
+define('_ADMINHOME',                           'Home Page Amministrativa');
+define('_NAME',                                                'Nome');
+define('_BACKHOME',                                    'Torna alla pagina di amministrazione');
+define('_BADACTION',                           'E\' stato richiesto di eseguire un\'azione non esistente');
+define('_MESSAGE',                                     'Messaggio');
+define('_HELP_TT',                                     'Aiuto!');
+define('_YOURSITE',                                    'Il tuo sito');
+=======
 define('_LOGOUT',                                      'Salir');
 define('_LOGIN',                                       'Entrar');
 define('_YES',                                         'Sí');
@@ -823,10 +1141,22 @@ define('_BADACTION',                             'No existe la acci
 define('_MESSAGE',                                     'Mensaje');
 define('_HELP_TT',                                     'Ayuda!');
 define('_YOURSITE',                                    'Ver web');
+>>>>>>> skinnable-master
+
 
+define('_POPUP_CLOSE',                         'Chiudi la finestra');
 
-define('_POPUP_CLOSE',                         'Cerrar ventana');
+<<<<<<< HEAD
+define('_LOGIN_PLEASE',                                'Connettiti per poter utilizzare quest\'opzione');
 
+// commentform
+define('_COMMENTFORM_YOUARE',          'Sei collegato come');
+define('_COMMENTFORM_SUBMIT',          'Aggiungi un commento');
+define('_COMMENTFORM_COMMENT',         'Il tuo commento');
+define('_COMMENTFORM_NAME',                    'Nome');
+define('_COMMENTFORM_MAIL',                    'E-mail/HTTP');
+define('_COMMENTFORM_REMEMBER',                'Ricordami');
+=======
 define('_LOGIN_PLEASE',                                'Es necesario regístrarse primero');
 
 // commentform
@@ -835,20 +1165,152 @@ define('_COMMENTFORM_SUBMIT',           'Introducir comentario');
 define('_COMMENTFORM_COMMENT',         'Comentario');
 define('_COMMENTFORM_NAME',                    'Nombre');
 define('_COMMENTFORM_REMEMBER',                'Recordar usuario');
+>>>>>>> skinnable-master
 
 // loginform
-define('_LOGINFORM_NAME',                      'Usuario');
-define('_LOGINFORM_PWD',                       'Clave');
-define('_LOGINFORM_YOUARE',                    'Registrado como');
-define('_LOGINFORM_SHARED',                    'Ordenador compartido');
+define('_LOGINFORM_NAME',                      'Nome utente');
+define('_LOGINFORM_PWD',                       'Password');
+define('_LOGINFORM_YOUARE',                    'Collegato come');
+define('_LOGINFORM_SHARED',                    'Computer condiviso');
 
 // member mailform
-define('_MEMBERMAIL_SUBMIT',           'Enviar mensaje');
+define('_MEMBERMAIL_SUBMIT',           'Invia messaggio');
 
 // search form
-define('_SEARCHFORM_SUBMIT',           'Buscar');
+define('_SEARCHFORM_SUBMIT',           'Cerca');
 
 // add item form
+<<<<<<< HEAD
+define('_ADD_ADDTO',                           'Aggiungi un nuovo articolo in');
+define('_ADD_CREATENEW',                       'Crea un nuovo articolo');
+define('_ADD_BODY',                                    'Corpo');
+define('_ADD_TITLE',                           'Titolo');
+define('_ADD_MORE',                                    'Corpo esteso (opzionale)');
+define('_ADD_CATEGORY',                                'Categoria');
+define('_ADD_PREVIEW',                         'Anteprima');
+define('_ADD_DISABLE_COMMENTS',                'Disabilitare i commenti?');
+define('_ADD_DRAFTNFUTURE',                    'Bozza &amp; articoli futuri');
+define('_ADD_ADDITEM',                         'Aggiungi un articolo');
+define('_ADD_ADDNOW',                          'Aggiungi ora');
+define('_ADD_ADDLATER',                                'Aggiungi dopo');
+define('_ADD_PLACE_ON',                                'Place on');
+define('_ADD_ADDDRAFT',                                'Aggiungi alle bozze');
+define('_ADD_NOPASTDATES',                     '(date ed orari passati NON sono validi, in tal caso verr&agrave; automaticamente aggiunta la data attuale)');
+define('_ADD_BOLD_TT',                         'Grassetto');
+define('_ADD_ITALIC_TT',                       'Inclinato');
+define('_ADD_HREF_TT',                         'Crea un link');
+define('_ADD_MEDIA_TT',                                'Aggiungi elemento media');
+define('_ADD_PREVIEW_TT',                      'Mostra/nascondi anteprima');
+define('_ADD_CUT_TT',                          'Taglia');
+define('_ADD_COPY_TT',                         'Copia');
+define('_ADD_PASTE_TT',                                'Incolla');
+
+
+// edit item form
+define('_EDIT_ITEM',                           'Modifica un articolo');
+define('_EDIT_SUBMIT',                         'Modifica articolo');
+define('_EDIT_ORIG_AUTHOR',                    'Autore originale');
+define('_EDIT_BACKTODRAFTS',           'Rimetti nelle bozze');
+define('_EDIT_COMMENTSNOTE',           '(nota: disabilitare i commenti non canceller&agrave;/nasconder&agrave; i commenti precedentemente inseriti)');
+
+// used on delete screens
+define('_DELETE_CONFIRM',                      'Conferma la cancellazione');
+define('_DELETE_CONFIRM_BTN',          'Conferma cancellazione');
+define('_CONFIRMTXT_ITEM',                     'Stai per eliminare il seguente articolo:');
+define('_CONFIRMTXT_COMMENT',          'Stai per eliminare il seguente commento:');
+define('_CONFIRMTXT_TEAM1',                    'Stai per cancellare ');
+define('_CONFIRMTXT_TEAM2',                    ' dal gruppo membri del blog ');
+define('_CONFIRMTXT_BLOG',                     'Il blog che stai per eliminare &egrave;: ');
+define('_WARNINGTXT_BLOGDEL',          'Attenzione! L\'eliminazione di un blog porter&agrave; alla cancellazione di TUTTI gli articoli ed i commenti del blog. Per maggiore sicurezza sei pregato di confermare l\'azione di cancellazione.!<br />Non interrompere Nucleus mentre effettuer&agrave; l\'eliminazione del blog.');
+define('_CONFIRMTXT_MEMBER',           'Stai per cancellare il seguente utente: ');
+define('_CONFIRMTXT_TEMPLATE',         'Stai per cancellare il modello chiamato ');
+define('_CONFIRMTXT_SKIN',                     'Stai per cancellare il tema chiamato ');
+define('_CONFIRMTXT_BAN',                      'Stai per cancellare il ban per il seguente range di IP');
+define('_CONFIRMTXT_CATEGORY',         'Stai per cancellare la categoria ');
+
+// some status messages
+define('_DELETED_ITEM',                                'Articolo cancellato');
+define('_DELETED_MEMBER',                      'Utente cancellato');
+define('_DELETED_COMMENT',                     'Commento cancellato');
+define('_DELETED_BLOG',                                'Blog eliminato');
+define('_DELETED_CATEGORY',                    'Categoria cancellata');
+define('_ITEM_MOVED',                          'Articolo spostato');
+define('_ITEM_ADDED',                          'Articolo aggiunto');
+define('_COMMENT_UPDATED',                     'Commento aggiornato');
+define('_SKIN_UPDATED',                                'le modifiche effettuate al tema sono state salvate');
+define('_TEMPLATE_UPDATED',                    'le modifiche effettuate al modello sono state salvate');
+
+// errors
+define('_ERROR_COMMENT_LONGWORD',      'Non utilizzare parole pi&ugrave; lunghe di 90 caratteri nei commenti');
+define('_ERROR_COMMENT_NOCOMMENT',     'Inserisci un commento');
+define('_ERROR_COMMENT_NOUSERNAME',    'Nome utente non valido');
+define('_ERROR_COMMENT_TOOLONG',       'Il commento inserito &egrave; troppo lungo (max. 5000 caratteri)');
+define('_ERROR_COMMENTS_DISABLED',     'I commenti per questo blog sono attualmente disabilitati.');
+define('_ERROR_COMMENTS_NONPUBLIC',    'Devi essere collegato come memro per poter aggiungere commenti in questo blog');
+define('_ERROR_COMMENTS_MEMBERNICK','Il nome che hai scelto di utilizzare per pubblicare i tuoi commenti &egrave; gi&agrave; usato da un membro del blog. Scegli un nome diverso.');
+define('_ERROR_SKIN',                          'Errore Skin');
+define('_ERROR_ITEMCLOSED',                    'Questo articolo &egrave; stato chiuso, non &egrave; possibile aggiungervi commenti/voti');
+define('_ERROR_NOSUCHITEM',                    'Articolo inesistente');
+define('_ERROR_NOSUCHBLOG',                    'Blog inesistente');
+define('_ERROR_NOSUCHSKIN',                    'Tema inesistente');
+define('_ERROR_NOSUCHMEMBER',          'membro inesistente');
+define('_ERROR_NOTONTEAM',                     'Non sei nel gruppo membri di questo blog.');
+define('_ERROR_BADDESTBLOG',           'Il blog di destinazione non esiste');
+define('_ERROR_NOTONDESTTEAM',         'Articolo impossibile da spostare in quanto non sei nel gruppo membri del blog di destinazione');
+define('_ERROR_NOEMPTYITEMS',          'Impossibile aggiungere articoli vuoti!');
+define('_ERROR_BADMAILADDRESS',                'Indirizzo email non valido');
+define('_ERROR_BADNOTIFY',                     'Uno o pi&ugrave; degli indirizzi di notifica forniti non &egrave; un indirizzo email valido');
+define('_ERROR_BADNAME',                       'Nome non valido (sono permessi solo caratteri a-z e 0-9 e niente spazi iniziali/finali)');
+define('_ERROR_NICKNAMEINUSE',         'Un altro membro sta gi &agrave; utilizzando il nickname che hai scelto');
+define('_ERROR_PASSWORDMISMATCH',      'Le due password devono coincidere');
+define('_ERROR_PASSWORDTOOSHORT',      'La password deve essere lunga ameno 6 caratteri');
+define('_ERROR_PASSWORDMISSING',       'Il campo della password non pu&ograve; essere lasciato vuoto');
+define('_ERROR_REALNAMEMISSING',       'Devi inserire un nome reale');
+define('_ERROR_ATLEASTONEADMIN',       'Deve sempre esistere almeno un utente super-amministratore che possa connettersi all\'area di amministrazione.');
+define('_ERROR_ATLEASTONEBLOGADMIN','Eseguendo questa azione potresti rendere il tuo weblog inutilizzabile. Assicurati che ci sia sempre almeno un utente amministratore del blog.');
+define('_ERROR_ALREADYONTEAM',         'Non &egrave; possibile aggiungere un membro che &egrave; gi&agrave; parte del gruppo');
+define('_ERROR_BADSHORTBLOGNAME',      'Il nome breve del blog pu&ograve; contenere solo caratteri a-z e 0-9, senza spazi');
+define('_ERROR_DUPSHORTBLOGNAME',      'Il nome-breve scelto &egrave; gi&agrave; utilizzato da un altro blog. Questi nomi devono essere univoci');
+define('_ERROR_UPDATEFILE',                    'Cannot get write access to the update-file. Make sure the file permissions are set ok (try chmodding it to 666). Also note that the location is relative to the admin-area directory, so you might want to use an absolute path (something like /your/path/to/nucleus/)');
+define('_ERROR_DELDEFBLOG',                    'E\' Impossibile cancellare il blog di default');
+define('_ERROR_DELETEMEMBER',          'questo membro on pu&ograve; essere cancellato, probabilmente perch&eacute; &egrave; autore articoli o commenti');
+define('_ERROR_BADTEMPLATENAME',       'Il nome scelto per il modello non &egrave; valido, utilizza solo caratteri a-z e 0-9 e niente spazi iniziali/finali');
+define('_ERROR_DUPTEMPLATENAME',       'Gi&agrave; esiste un altro modello con questo nome');
+define('_ERROR_BADSKINNAME',           'Il nome scelto per il tema non &egrave; valido (sono permessi solo caratteri a-z e 0-9 e niente spazi iniziali/finali)');
+define('_ERROR_DUPSKINNAME',           'Gi&agrave; esiste un altro tema con questo nome');
+define('_ERROR_DEFAULTSKIN',           'Deve sempre esistere un tema chiamato &quot;default&quot;');
+define('_ERROR_SKINDEFDELETE',         'Impossibile eliminare il tema selezionao poich&eacute; &egrave; il tema di default del seguente weblog: ');
+define('_ERROR_DISALLOWED',                    'Non hai le abilitazioni necessarie per effettuare questa azione');
+define('_ERROR_DELETEBAN',                     'Si &egrave; verificato un errore durante l\'eliminazione del ban (ban inesistente)');
+define('_ERROR_ADDBAN',                                'Si &egrave; verificato un errore durante l\'aggiunta di un nuovo ban. Il ban potrebbe NON essere stato correttamente aggiunto in tutti i tuoi blog.');
+define('_ERROR_BADACTION',                     'L\'azione richiesta non esiste');
+define('_ERROR_MEMBERMAILDISABLED',    'L\'invio di email tra membri &egrave; disabilitato');
+define('_ERROR_MEMBERCREATEDISABLED','La creazione di nuovi account utente &egrave; disabilitata');
+define('_ERROR_INCORRECTEMAIL',                'indirizzo email non corretto');
+define('_ERROR_VOTEDBEFORE',           'Hai gi&agrave; espresso il tuo voto per questo articolo');
+define('_ERROR_BANNED1',                       'Non posso eseguire l\'azione richiesta in quanto il tuo indirizzo IP (intervallo ip ');
+define('_ERROR_BANNED2',                       ') risulta bannato. Il messaggio &egrave;: \'');
+define('_ERROR_BANNED3',                       '\'');
+define('_ERROR_LOGINNEEDED',           'Devi essere collegato al blog per effettuare questa azione');
+define('_ERROR_CONNECT',                       'Errore di connessione');
+define('_ERROR_FILE_TOO_BIG',          'Il file &egrave; troppo grande!');
+define('_ERROR_BADFILETYPE',           'Il caricamento di questo tipo di file non &egrave; permesso');
+define('_ERROR_BADREQUEST',                    'Richiesta di caricamento errata');
+define('_ERROR_DISALLOWEDUPLOAD',      'Non sei presente in nessuno dei gruppi del blog, per questo motivo non puoi caricare file');
+define('_ERROR_BADPERMISSIONS',                'I permessi per il file/la directry non sono stati impostati correttamente');
+define('_ERROR_UPLOADMOVEP',           'Si &egrave; verificato un errore durante lo spostamento del file');
+define('_ERROR_UPLOADCOPY',                    'Si &egrave; verificato un errore durante la copia del file');
+define('_ERROR_UPLOADDUPLICATE',       'E\' gi&agrave; present eun altro file con questo nome. Prova a rinominare il file prima di caricarlo.');
+define('_ERROR_LOGINDISALLOWED',       'Non sei ablitato all\'accesso all\'area amministrativa del blog. Puoi connetterti come altro utente');
+define('_ERROR_DBCONNECT',                     'Non &egrave; possibile connettersi al server mySQL');
+define('_ERROR_DBSELECT',                      'Non &egrave; possibile selezionare il database di Nucleus.');
+define('_ERROR_NOSUCHLOCALE',          'Il file della lingua non esiste');
+define('_ERROR_NOSUCHCATEGORY',                'La categoria non esiste');
+define('_ERROR_DELETELASTCATEGORY',    'Ci deve essere almeno una categoria');
+define('_ERROR_DELETEDEFCATEGORY',     'Non puoi cancellare la categoria di default');
+define('_ERROR_BADCATEGORYNAME',       'Nome della categoria non valido');
+define('_ERROR_DUPCATEGORYNAME',       'Una categoria con questo nome &egrave; gi&agrave; presente');
+=======
 define('_ADD_ADDTO',                           'Introducir nueva entrada a');
 define('_ADD_CREATENEW',                       'Crear nueva entrada');
 define('_ADD_BODY',                                    'Cuerpo');
@@ -977,13 +1439,237 @@ define('_ERROR_DELETELASTCATEGORY',     'Debe haber al menos una categor
 define('_ERROR_DELETEDEFCATEGORY',     'No es posible eliminar la categoría principal');
 define('_ERROR_BADCATEGORYNAME',       'Nombre de categoría incorrecto');
 define('_ERROR_DUPCATEGORYNAME',       'Ya existe otra categoría con ese nombre');
+>>>>>>> skinnable-master
 
 // some warnings (used for mediadir setting)
-define('_WARNING_NOTADIR',                     'Cuidado: El valor actual no es un directorio!');
-define('_WARNING_NOTREADABLE',         'Cuidado: El valor actual es un directorio sin permiso de lectura!');
-define('_WARNING_NOTWRITABLE',         'Cuidado: El valor actual NO es un directorio con permiso de escritura!');
+define('_WARNING_NOTADIR',                     'Attenzione: il valore inserito non &egrave; una directory!');
+define('_WARNING_NOTREADABLE',         'Attenzione: il valore inserito &egrave; una directory non leggibile dal webserver!');
+define('_WARNING_NOTWRITABLE',         'Attenzione: il valore inserito NON &egrave; una directory scrivibile dal webserver!');
 
 // media and upload
+<<<<<<< HEAD
+define('_MEDIA_UPLOADLINK',                    'Carica un nuovo file');
+define('_MEDIA_MODIFIED',                      'modificato');
+define('_MEDIA_FILENAME',                      'nome file');
+define('_MEDIA_DIMENSIONS',                    'dimensioni');
+define('_MEDIA_INLINE',                                'Inline');
+define('_MEDIA_POPUP',                         'Popup');
+define('_UPLOAD_TITLE',                                'Seleziona il file');
+define('_UPLOAD_MSG',                          'Seleziona il file che vuoi caricare e fai clic sul pulsante \'Carica\'.');
+define('_UPLOAD_BUTTON',                       'Carica');
+
+// some status messages
+//define('_MSG_ACCOUNTCREATED',                '\'account &egrave; stato creato, la password ti verr&agrave; spedita via email');
+//define('_MSG_PASSWORDSENT',                  'La password &egrave; stata spedita per email.');
+define('_MSG_LOGINAGAIN',                      'Devi effettuare nuovamente la connessione poch&eacute; le tue impostazioni sono state modificate');
+define('_MSG_SETTINGSCHANGED',         'Impostazioni Modificate');
+define('_MSG_ADMINCHANGED',                    'Amministratore Modificato');
+define('_MSG_NEWBLOG',                         'Il nuovo blog &egrave; stato creato');
+define('_MSG_ACTIONLOGCLEARED',                'Il log delle azioni &egrave; stato azzerato');
+
+// actionlog in admin area
+define('_ACTIONLOG_DISALLOWED',                'Azione disabilitata: ');
+define('_ACTIONLOG_PWDREMINDERSENT','Una nuova password &egrave; stata inviata per ');
+define('_ACTIONLOG_TITLE',                     'Log delle azioni');
+define('_ACTIONLOG_CLEAR_TITLE',       'Azzera il log delle azioni');
+define('_ACTIONLOG_CLEAR_TEXT',                'Azzera il log delle azioni ora!');
+
+// team management
+define('_TEAM_TITLE',                          'Gestisci i gruppi dei blog ');
+define('_TEAM_CURRENT',                                'Gruppo attuale');
+define('_TEAM_ADDNEW',                         'Aggiungi un nuovo membro al gruppo');
+define('_TEAM_CHOOSEMEMBER',           'Scegli un membro');
+define('_TEAM_ADMIN',                          'Privilegi di amministrazione? ');
+define('_TEAM_ADD',                                    'Aggiungi al gruppo');
+define('_TEAM_ADD_BTN',                                'Aggiungi al gruppo');
+
+// blogsettings
+define('_EBLOG_TITLE',                         'Modifica le Impostazioni del Blog');
+define('_EBLOG_TEAM_TITLE',                    'modifica gruppo');
+define('_EBLOG_TEAM_TEXT',                     'Clicca qui per modificare il tuo gruppo...');
+define('_EBLOG_SETTINGS_TITLE',                'Impostazioni blog');
+define('_EBLOG_NAME',                          'Nome blog');
+define('_EBLOG_SHORTNAME',                     'Nome blog (breve)');
+define('_EBLOG_SHORTNAME_EXTRA',       '<br />(deve contenere solo caratteri a-z senza spazi)');
+define('_EBLOG_DESC',                          'Descrizione blog');
+define('_EBLOG_URL',                           'URL');
+define('_EBLOG_DEFSKIN',                       'Tema di default');
+define('_EBLOG_DEFCAT',                                'Categoria di default');
+define('_EBLOG_LINEBREAKS',                    'Converti gli &quot;a capo&quot;');
+define('_EBLOG_DISABLECOMMENTS',       'Commenti abilitati?<br /><small>(Non sar&agrave; possibile inserire commenti agli articoli con questa opzione disabilitata.)</small>');
+define('_EBLOG_ANONYMOUS',                     'Abilitare i non-iscritti a scrivere commenti?');
+define('_EBLOG_NOTIFY',                                'Indirizzo\i per la notifica (usa ; come separatore)');
+define('_EBLOG_NOTIFY_ON',                     'Notifica i seguenti eventi');
+define('_EBLOG_NOTIFY_COMMENT',                'Nuovi commenti');
+define('_EBLOG_NOTIFY_KARMA',          'Nuovi voti karma');
+define('_EBLOG_NOTIFY_ITEM',           'Nuovi articoli');
+define('_EBLOG_PING',                          'Inviare un ping a Weblogs.com dopo un aggiornamento?');
+define('_EBLOG_MAXCOMMENTS',           'Max numero di commenti');
+define('_EBLOG_UPDATE',                                'Update file');
+define('_EBLOG_OFFSET',                                'Compensazione orario');
+define('_EBLOG_STIME',                         'L\'ora attuale del server &egrave;');
+define('_EBLOG_BTIME',                         'L\'ora attuale del blog &egrave;');
+define('_EBLOG_CHANGE',                                'Modifica le impostazioni');
+define('_EBLOG_CHANGE_BTN',                    'Modifica impostazioni');
+define('_EBLOG_ADMIN',                         'Amministratore blog');
+define('_EBLOG_ADMIN_MSG',                     'Ti verranno assegnati privilegi di amministrazione');
+define('_EBLOG_CREATE_TITLE',          'Crea un nuovo weblog');
+define('_EBLOG_CREATE_TEXT',           'Per creare un nuovo weblog compila il modulo riportato qui sotto. <br /><br /> <b>Nota:</b> sono presenti solo le opzioni necessarie alla creazione di un nuovo weblog. Se vuoi impostare opzioni aggiuntive, utilizza la pagina delle impostazioni del blog dopo la sua creazioni.');
+define('_EBLOG_CREATE',                                'Crea il nuovo weblog!');
+define('_EBLOG_CREATE_BTN',                    'Crea weblog');
+define('_EBLOG_CAT_TITLE',                     'Categorie');
+define('_EBLOG_CAT_NAME',                      'Nome categoria');
+define('_EBLOG_CAT_DESC',                      'Descrizione categoria');
+define('_EBLOG_CAT_CREATE',                    'Crea una nuova categoria');
+define('_EBLOG_CAT_UPDATE',                    'Aggiorna la categoria');
+define('_EBLOG_CAT_UPDATE_BTN',                'Aggiorna categoria');
+
+// templates
+define('_TEMPLATE_TITLE',                      'Modifica i modelli');
+define('_TEMPLATE_AVAILABLE_TITLE',    'Modelli disponibili');
+define('_TEMPLATE_NEW_TITLE',          'Nuovo modello');
+define('_TEMPLATE_NAME',                       'Nome del modello');
+define('_TEMPLATE_DESC',                       'Descrizione del modello');
+define('_TEMPLATE_CREATE',                     'Crea un modello');
+define('_TEMPLATE_CREATE_BTN',         'Crea modello');
+define('_TEMPLATE_EDIT_TITLE',         'Modifica il modello');
+define('_TEMPLATE_BACK',                       'Torna alla pagina principale della gestione dei modelli');
+define('_TEMPLATE_EDIT_MSG',           'Non tutte le parti del modello sono necessarie al suo corretto funzionamento; lascia vuote quelle che non intendi utilizzare.');
+define('_TEMPLATE_SETTINGS',           'Impostazioni del modello');
+define('_TEMPLATE_ITEMS',                      'Articoli');
+define('_TEMPLATE_ITEMHEADER',         'Intestazione articolo');
+define('_TEMPLATE_ITEMBODY',           'Corpo articolo');
+define('_TEMPLATE_ITEMFOOTER',         'Fine articolo');
+define('_TEMPLATE_MORELINK',           'Link alla parte estesa dell\'articolo');
+define('_TEMPLATE_NEW',                                'Indicazione di un nuovo articolo');
+define('_TEMPLATE_COMMENTS_ANY',       'Commenti (se presenti)');
+define('_TEMPLATE_CHEADER',                    'Intestazione commenti');
+define('_TEMPLATE_CBODY',                      'Corpo commenti');
+define('_TEMPLATE_CFOOTER',                    'Fine commenti');
+define('_TEMPLATE_CONE',                       'Un commento');
+define('_TEMPLATE_CMANY',                      'Due (o pi&ugrave;) commenti');
+define('_TEMPLATE_CMORE',                      '&quot;Leggi tutti&quot; i commenti');
+define('_TEMPLATE_CMEXTRA',                    'Voce extra per utenti iscritti');
+define('_TEMPLATE_COMMENTS_NONE',      'Commenti (se non presenti)');
+define('_TEMPLATE_CNONE',                      'Nessun commento');
+define('_TEMPLATE_COMMENTS_TOOMUCH','Commenti (se presenti, ma troppi da mostrarli tutti insieme)');
+define('_TEMPLATE_CTOOMUCH',           'Molti commenti');
+define('_TEMPLATE_ARCHIVELIST',                'Liste archivio');
+define('_TEMPLATE_AHEADER',                    'Intestazione lista archivio');
+define('_TEMPLATE_AITEM',                      'Elemento lista archivio');
+define('_TEMPLATE_AFOOTER',                    'Fine lista archivio');
+define('_TEMPLATE_DATETIME',           'Data ed ora');
+define('_TEMPLATE_DHEADER',                    'Intestazione data');
+define('_TEMPLATE_DFOOTER',                    'Fine data');
+define('_TEMPLATE_DFORMAT',                    'Formato data');
+define('_TEMPLATE_TFORMAT',                    'Formato ora');
+define('_TEMPLATE_LOCALE',                     'Locale');
+define('_TEMPLATE_IMAGE',                      'Imagini popup');
+define('_TEMPLATE_PCODE',                      'Codice per link popup');
+define('_TEMPLATE_ICODE',                      'Codice per Immagine in linea');
+define('_TEMPLATE_MCODE',                      'Codice per Link elemento media');
+define('_TEMPLATE_SEARCH',                     'Ricerca');
+define('_TEMPLATE_SHIGHLIGHT',         'Evidenziazione');
+define('_TEMPLATE_SNOTFOUND',          'Nessun risultato per la ricerca');
+define('_TEMPLATE_UPDATE',                     'Aggiorna');
+define('_TEMPLATE_UPDATE_BTN',         'Aggiorna il modello');
+define('_TEMPLATE_RESET_BTN',          'Azzera dati');
+define('_TEMPLATE_CATEGORYLIST',       'Liste categorie');
+define('_TEMPLATE_CATHEADER',          'Testata lista categoria');
+define('_TEMPLATE_CATITEM',                    'Elemento lista categoria');
+define('_TEMPLATE_CATFOOTER',          'Fine lista categoria');
+
+// skins
+define('_SKIN_EDIT_TITLE',                     'Modifica il tema');
+define('_SKIN_AVAILABLE_TITLE',                'Temi disponibili');
+define('_SKIN_NEW_TITLE',                      'Nuovo tema');
+define('_SKIN_NAME',                           'Nome');
+define('_SKIN_DESC',                           'Descrizione');
+define('_SKIN_TYPE',                           'Content Type');
+define('_SKIN_CREATE',                         'Cre');
+define('_SKIN_CREATE_BTN',                     'Crea tema');
+define('_SKIN_EDITONE_TITLE',          'Modifica il tema');
+define('_SKIN_BACK',                           'Torna alla pagina principale della gestione dei temi');
+define('_SKIN_PARTS_TITLE',                    'Parti del tema');
+define('_SKIN_PARTS_MSG',                      'Non tutte le parti del tema sono necessarie. Lascia vuote quelle che non ti servono. Seleziona la parte da modificare dall\'elenco qui sotto:');
+define('_SKIN_PART_MAIN',                      'Indice principale');
+define('_SKIN_PART_ITEM',                      'Pagine articolo');
+define('_SKIN_PART_ALIST',                     'Lista archivio');
+define('_SKIN_PART_ARCHIVE',           'Archivio');
+define('_SKIN_PART_SEARCH',                    'Cerca');
+define('_SKIN_PART_ERROR',                     'Errori');
+define('_SKIN_PART_MEMBER',                    'Dettagli utente');
+define('_SKIN_PART_POPUP',                     'Popup immagine');
+define('_SKIN_GENSETTINGS_TITLE',      'Impostazioni generali');
+define('_SKIN_CHANGE',                         'Cambia');
+define('_SKIN_CHANGE_BTN',                     'Cambia queste impostazioni');
+define('_SKIN_UPDATE_BTN',                     'Aggiorna il tema');
+define('_SKIN_RESET_BTN',                      'Reimposta Dati');
+define('_SKIN_EDITPART_TITLE',         'Modifica tema');
+define('_SKIN_GOBACK',                         'Torna indietro');
+define('_SKIN_ALLOWEDVARS',                    'Variabili Disponibili (clicca sul nome della variabile per maggiori informazioni):');
+
+// global settings
+define('_SETTINGS_TITLE',                      'Impostazioni generali');
+define('_SETTINGS_SUB_GENERAL',                'Impostazioni generali');
+define('_SETTINGS_DEFBLOG',                    'Blog di default');
+define('_SETTINGS_ADMINMAIL',          'Email amministratore');
+define('_SETTINGS_SITENAME',           'Nome sito');
+define('_SETTINGS_SITEURL',                    'URL del sito (deve terminare con uno slash)');
+define('_SETTINGS_ADMINURL',           'URL dell\'area di amministrazione (deve terminare con uno slash)');
+define('_SETTINGS_DIRS',                       'Directory di Nucleus');
+define('_SETTINGS_MEDIADIR',           'Directory media (upload)');
+define('_SETTINGS_SEECONFIGPHP',       '(vedi config.php)');
+define('_SETTINGS_MEDIAURL',           'Url della directory media (deve terminare con uno slash)');
+define('_SETTINGS_ALLOWUPLOAD',                'Consenti il caricamento dei file?');
+define('_SETTINGS_ALLOWUPLOADTYPES','Consenti il caricamento dei seguenti tipi di file');
+define('_SETTINGS_CHANGELOGIN',                'Abilita gli utenti alla modifica della login/password');
+define('_SETTINGS_COOKIES_TITLE',      'Impostazioni cookie');
+define('_SETTINGS_COOKIELIFE',         'Durata del cookie');
+define('_SETTINGS_COOKIESESSION',      'Sessione');
+define('_SETTINGS_COOKIEMONTH',                'Un mese');
+define('_SETTINGS_COOKIEPATH',         'Percorso cookie (avanzato)');
+define('_SETTINGS_COOKIEDOMAIN',       'Dominio cookie (avanzato)');
+define('_SETTINGS_COOKIESECURE',       'Cookie sicuro (avanzato)');
+define('_SETTINGS_LASTVISIT',          'Salva il cookie dell\'ultima visita');
+define('_SETTINGS_ALLOWCREATE',                'Consenti ai visitatori di creare un account utente');
+define('_SETTINGS_NEWLOGIN',           'Abilita il login all\'area amministrativa per gli account creati dagli utenti');
+define('_SETTINGS_NEWLOGIN2',          '(questa impostazione verr&agrave; applicata solo ai nuovi account)');
+define('_SETTINGS_MEMBERMSGS',         'Abilita i servizi tra i membri del blog');
+define('_SETTINGS_LOCALE',             'Linguaggio di default');
+define('_SETTINGS_DISABLESITE',                'Disabilita il weblog');
+define('_SETTINGS_DBLOGIN',                    'Connessione mySQL &amp; database');
+define('_SETTINGS_UPDATE',                     'Aggiorna le impostazioni');
+define('_SETTINGS_UPDATE_BTN',         'Aggiorna impostazioni');
+define('_SETTINGS_DISABLEJS',          'Disabilita la barra degli strumenti in JavaScript');
+define('_SETTINGS_MEDIA',                      'Impostazioni media/caricamento');
+define('_SETTINGS_MEDIAPREFIX',                'Aggiungi un prefisso con la data ai file caricati');
+define('_SETTINGS_MEMBERS',                    'Impostazioni utente');
+
+// bans
+define('_BAN_TITLE',                           'Lista ban per');
+define('_BAN_NONE',                                    'Nessun ban per questo weblog');
+define('_BAN_NEW_TITLE',                       'Aggiungi un nuovo ban');
+define('_BAN_NEW_TEXT',                                'Aggiungi un nuovo ban ora');
+define('_BAN_REMOVE_TITLE',                    'Rimuovi ban');
+define('_BAN_IPRANGE',                         'Range IP');
+define('_BAN_BLOGS',                           'In quali blog?');
+define('_BAN_DELETE_TITLE',                    'Cancella ban');
+define('_BAN_ALLBLOGS',                                'Tutti i blog nei quali hai privilegi di amministrazione.');
+define('_BAN_REMOVED_TITLE',           'Ban rimosso');
+define('_BAN_REMOVED_TEXT',                    'Il ban &egrave; stato rimosso dai seguenti blog:');
+define('_BAN_ADD_TITLE',                       'Aggiungi ban');
+define('_BAN_IPRANGE_TEXT',                    'Scegli il range di IP che vuoi bloccare. Minori sono i numeri inseriti, maggiori saranno gli indirizzi bloccati.');
+define('_BAN_BLOGS_TEXT',                      'Puoi selezionare di aggiungere un ban in un blog solamente, oppure puoi selezionare di bloccare gli IP sopra indicati in tutti i blog nei quali hai i diritti di amministrazione. Effettua la tua scelta qui sotto.');
+define('_BAN_REASON_TITLE',                    'Motivo del ban');
+define('_BAN_REASON_TEXT',                     'Puoi fornire una spiegazione al ban. Questa verr&agrave; visualizzata ai proprietari degli IP che tenteranno di aggiungere un commento o un voto karma negli articoli dei blog sopra selezionati. La lunghezza massima della spiegazione &egrave; di 256 caratteri.');
+define('_BAN_ADD_BTN',                         'Aggiungi ban');
+
+// LOGIN screen
+define('_LOGIN_MESSAGE',                       'Messaggio');
+define('_LOGIN_NAME',                          'Nome');
+define('_LOGIN_PASSWORD',                      'Password');
+=======
 define('_MEDIA_UPLOADLINK',                    'Enviar un nuevo archivo');
 define('_MEDIA_MODIFIED',                      'modificado');
 define('_MEDIA_FILENAME',                      'nombre de archivo');
@@ -1203,10 +1889,95 @@ define('_BAN_ADD_BTN',                          'Introducir restricci
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                       'Mensaje');
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                _LOGINFORM_SHARED);
-define('_LOGIN_FORGOT',                                'Has olvidado la clave?');
+define('_LOGIN_FORGOT',                                'Hai dimenticato la password?');
 
 // membermanagement
+<<<<<<< HEAD
+define('_MEMBERS_TITLE',                       'Gestione utenti');
+define('_MEMBERS_CURRENT',                     'Utenti registrati');
+define('_MEMBERS_NEW',                         'Nuovo utente');
+define('_MEMBERS_DISPLAY',                     'Nome utente');
+define('_MEMBERS_DISPLAY_INFO',                '(questo &egrave; il nome che dovrai utilizzare per la connessione)');
+define('_MEMBERS_REALNAME',                    'Nome reale');
+define('_MEMBERS_PWD',                         'Password');
+define('_MEMBERS_REPPWD',                      'Reinserisci la password');
+define('_MEMBERS_EMAIL',                       'Indirizzo email');
+define('_MEMBERS_EMAIL_EDIT',          '(modificando l\'indirizzo email verr&agrave; automaticamente spedita una nuova password all\'indirizzo inserito)');
+define('_MEMBERS_URL',                         'Indirizzo sito web (URL)');
+define('_MEMBERS_SUPERADMIN',          'Privilegi di amministrazione');
+define('_MEMBERS_CANLOGIN',                    'Pu&ograve; connettersi all\'area amministrativa del sito');
+define('_MEMBERS_NOTES',                       'Note');
+define('_MEMBERS_NEW_BTN',                     'Aggiungi utente');
+define('_MEMBERS_EDIT',                                'Modifica dati utente');
+define('_MEMBERS_EDIT_BTN',                    'Invia le modifiche');
+define('_MEMBERS_BACKTOOVERVIEW',      'Torna alla pagina principale della gestione degli utenti');
+define('_MEMBERS_LOCALE',                      'Linguaggio');
+define('_MEMBERS_USESITELANG',         '- usa le impostazioni standard del weblog -');
+
+// List of blogs (TT = tooltip)
+define('_BLOGLIST_TT_VISIT',           'Visita il sito');
+define('_BLOGLIST_ADD',                                'Aggiungi un articolo');
+define('_BLOGLIST_TT_ADD',                     'Aggiungi un nuovo articolo in questo weblog');
+define('_BLOGLIST_EDIT',                       'Modifica/elimina gli articoli');
+define('_BLOGLIST_TT_EDIT',                    '');
+define('_BLOGLIST_BMLET',                      'Bookmarklet');
+define('_BLOGLIST_TT_BMLET',           'Gestisci il tuo blog con un solo click');
+define('_BLOGLIST_SETTINGS',           'Impostazioni');
+define('_BLOGLIST_TT_SETTINGS',                'Modifica le impostazioni e gestisci gli utenti');
+define('_BLOGLIST_BANS',                       'Ban');
+define('_BLOGLIST_TT_BANS',                    'Visualizza, aggiungi o rimuovi IP da BANnare');
+define('_BLOGLIST_DELETE',                     'Cancella tutto');
+define('_BLOGLIST_TT_DELETE',          'Elimina questo weblog');
+
+// OVERVIEW screen
+define('_OVERVIEW_YRBLOGS',                    'I tuoi weblog');
+define('_OVERVIEW_YRDRAFTS',           'Le tue bozze');
+define('_OVERVIEW_YRSETTINGS',         'Le tue impostazioni');
+define('_OVERVIEW_GSETTINGS',          'Impostazioni generali');
+define('_OVERVIEW_NOBLOGS',                    'Non sei presente nelle liste degli utenti di alcun weblog');
+define('_OVERVIEW_NODRAFTS',           'Nessuna bozza presente');
+define('_OVERVIEW_EDITSETTINGS',       'Modifica le tue impostazioni...');
+define('_OVERVIEW_BROWSEITEMS',                'Gestisci i tuoi articoli...');
+define('_OVERVIEW_BROWSECOMM',         'Gestisci i tuoi commenti...');
+define('_OVERVIEW_VIEWLOG',                    'Visualizza i log delle azioni...');
+define('_OVERVIEW_MEMBERS',                    'Gestisci i membri...');
+define('_OVERVIEW_NEWLOG',                     'Crea un nuovo weblog...');
+define('_OVERVIEW_SETTINGS',           'Modifica le impostazioni...');
+define('_OVERVIEW_TEMPLATES',          'Modifica i modelli...');
+define('_OVERVIEW_SKINS',                      'Modifica i temi...');
+define('_OVERVIEW_BACKUP',                     'Salva/ripristina...');
+
+// ITEMLIST
+define('_ITEMLIST_BLOG',                       'Articoli del blog');
+define('_ITEMLIST_YOUR',                       'I tuoi articolo');
+
+// Comments
+define('_COMMENTS',                                    'Commenti');
+define('_NOCOMMENTS',                          'Non sono presenti commenti per questo articolo');
+define('_COMMENTS_YOUR',                       'I tuoi commenti');
+define('_NOCOMMENTS_YOUR',                     'Non hai scritto alcun commento');
+
+// LISTS (general)
+define('_LISTS_NOMORE',                                'Nessun risultato/Non ci sono altri risultati');
+define('_LISTS_PREV',                          'Precedente');
+define('_LISTS_NEXT',                          'Prossimo');
+define('_LISTS_SEARCH',                                'Cerca');
+define('_LISTS_CHANGE',                                'Cambia');
+define('_LISTS_PERPAGE',                       'articoli/pagina');
+define('_LISTS_ACTIONS',                       'Azioni');
+define('_LISTS_DELETE',                                'Cancella');
+define('_LISTS_EDIT',                          'Modifica');
+define('_LISTS_MOVE',                          'Sposta');
+define('_LISTS_CLONE',                         'Clona');
+define('_LISTS_TITLE',                         'Titolo');
+define('_LISTS_BLOG',                          'Blog');
+define('_LISTS_NAME',                          'Nome');
+define('_LISTS_DESC',                          'Descrizione');
+define('_LISTS_TIME',                          'Ora');
+define('_LISTS_COMMENTS',                      'Commenti');
+=======
 define('_MEMBERS_TITLE',                       'Gestión de los miembros');
 define('_MEMBERS_CURRENT',                     'Miembros actuales');
 define('_MEMBERS_NEW',                         'Nuevo miembro');
@@ -1289,24 +2060,40 @@ define('_LISTS_NAME',                           'Nombre');
 define('_LISTS_DESC',                          'Descripción');
 define('_LISTS_TIME',                          'Tiempo');
 define('_LISTS_COMMENTS',                      'Comentarios');
+>>>>>>> skinnable-master
 define('_LISTS_TYPE',                          'Tipo');
 
 
-// member list 
-define('_LIST_MEMBER_NAME',                    'Nombre mostrado');
-define('_LIST_MEMBER_RNAME',           'Nombre real');
-define('_LIST_MEMBER_ADMIN',           'Superadministrador? ');
-define('_LIST_MEMBER_LOGIN',           'Puede registrarse? ');
-define('_LIST_MEMBER_URL',                     'Web');
+// member list
+define('_LIST_MEMBER_NAME',                    'Nome Utente');
+define('_LIST_MEMBER_RNAME',           'Nome Reale');
+define('_LIST_MEMBER_ADMIN',           'Super-admin? ');
+define('_LIST_MEMBER_LOGIN',           'Pu&ograve; connettersi? ');
+define('_LIST_MEMBER_URL',                     'Sito Web');
 
 // banlist
+<<<<<<< HEAD
+define('_LIST_BAN_IPRANGE',                    'Range IP');
+define('_LIST_BAN_REASON',                     'Motivo');
+=======
 define('_LIST_BAN_IPRANGE',                    'Rango IP');
 define('_LIST_BAN_REASON',                     'Razón');
+>>>>>>> skinnable-master
 
 // actionlist
-define('_LIST_ACTION_MSG',                     'Mensaje');
+define('_LIST_ACTION_MSG',                     'Messaggio');
 
 // commentlist
+<<<<<<< HEAD
+define('_LIST_COMMENT_BANIP',          'Ban IP');
+define('_LIST_COMMENT_WHO',                    'Autore');
+define('_LIST_COMMENT',                                'Commento');
+define('_LIST_COMMENT_HOST',           'Host');
+
+// itemlist
+define('_LIST_ITEM_INFO',                      'Informazioni');
+define('_LIST_ITEM_CONTENT',           'Titolo e testo');
+=======
 define('_LIST_COMMENT_BANIP',          'Restricción de IP');
 define('_LIST_COMMENT_WHO',                    'Autor');
 define('_LIST_COMMENT',                                'Comentario');
@@ -1315,13 +2102,28 @@ define('_LIST_COMMENT_HOST',            'Host');
 // itemlist
 define('_LIST_ITEM_INFO',                      'Info');
 define('_LIST_ITEM_CONTENT',           'Título y texto');
+>>>>>>> skinnable-master
 
 
 // teamlist
-define('_LIST_TEAM_ADMIN',                     'Administrador ');
-define('_LIST_TEAM_CHADMIN',           'Modificar administrador');
+define('_LIST_TEAM_ADMIN',                     'Amministratore ');
+define('_LIST_TEAM_CHADMIN',           'Modifica amministratore');
 
 // edit comments
+<<<<<<< HEAD
+define('_EDITC_TITLE',                         'Modifica commenti');
+define('_EDITC_WHO',                           'Autore');
+define('_EDITC_HOST',                          'Da dove?');
+define('_EDITC_WHEN',                          'Quando?');
+define('_EDITC_TEXT',                          'Testo');
+define('_EDITC_EDIT',                          'Modifica commento');
+define('_EDITC_MEMBER',                                'utente');
+define('_EDITC_NONMEMBER',                     'utente non registrato');
+
+// move item
+define('_MOVE_TITLE',                          'Sposta in quale blog?');
+define('_MOVE_BTN',                                    'Sposta articolo');
+=======
 define('_EDITC_TITLE',                         'Modificar comentarios');
 define('_EDITC_WHO',                           'Autor');
 define('_EDITC_HOST',                          'Desde dónde?');
@@ -1350,3 +2152,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index 3e6e6e2..14d7d30 100644 (file)
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: es_Latn_ES.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: es_Latn_ES.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index a074c3d..3ac45ec 100644 (file)
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: fa_Arab_IR.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: fa_Arab_IR.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
  /********************************************
index f8443b2..fe5d807 100644 (file)
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: fi_Latn_FI.ISO-8859-1.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: fi_Latn_FI.ISO-8859-1.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -430,6 +434,13 @@ define('_ARCHIVETYPE_MONTH',               'kuukausi');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'Vanhentunut tai virheellinen tunniste.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Laajennuksen asennus ei onnistunut, syynä ');
+define('_ERROR_DELREQPLUGIN',          'Laajennuksen poistaminen ei onnistunut, syynä ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'Evästeen tunniste');
 
@@ -526,7 +537,11 @@ define('_WARNING_EXTAUTH',                 'Varoitus: salli vain jos tarvitset t
 define('_MEMBERS_BYPASS',                      'Käytä ulkoista varmennusta');
 
 // 'always include in search' blog setting (yes/no) [in v2.5beta, the 'always' part wasn't clear]
+<<<<<<< HEAD
+define('_EBLOG_SEARCH',                                'Sisällytä <em>aina</em> hakuun');
+=======
 define('_EBLOG_SEARCH',                                'Sisällytä hakuun');
+>>>>>>> skinnable-master
 
 // END changed/added after v2.5beta
 
@@ -548,6 +563,12 @@ define('_MEDIA_COLLECTION_LABEL',  'Valittu kokoelma: ');
 define('_ADD_ALIGNLEFT_TT',                    'Tasaa vasemmalle');
 define('_ADD_ALIGNRIGHT_TT',           'Tasaa oikealle');
 define('_ADD_ALIGNCENTER_TT',          'Keskitä');
+<<<<<<< HEAD
+
+// searchable blog setting (yes/no)
+define('_EBLOG_SEARCH',                                'Sisällytä hakuun');
+=======
+>>>>>>> skinnable-master
 
 // generic upload failure
 define('_ERROR_UPLOADFAILED',          'Lähetys epäonnistui');
@@ -837,6 +858,10 @@ define('_COMMENTFORM_YOUARE',              'Olet');
 define('_COMMENTFORM_SUBMIT',          'Lisää kommentti');
 define('_COMMENTFORM_COMMENT',         'Kommenttisi');
 define('_COMMENTFORM_NAME',                    'Nimi');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                    'Sähköpostiosoite tai WWW-osoite');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Muista minut');
 
 // loginform
@@ -863,6 +888,10 @@ define('_ADD_DISABLE_COMMENTS',            'Kommentit pois k
 define('_ADD_DRAFTNFUTURE',                    'Vedos &amp; tulevat artikkelit');
 define('_ADD_ADDITEM',                         'Lisää artikkeli');
 define('_ADD_ADDNOW',                          'Lisää nyt');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                'Lisää myöhemmin');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                'Place on');
 define('_ADD_ADDDRAFT',                                'Lisää vedoksiin');
 define('_ADD_NOPASTDATES',                     '(Menneet päiväykset ja kellonajat EIVÄT kelpaa, käytä meneillään olevaa aikaa.)');
@@ -1337,6 +1366,8 @@ define('_EDITC_NONMEMBER',                        'ei-k
 // move item
 define('_MOVE_TITLE',                          'Siirrä mihin blogiin?');
 define('_MOVE_BTN',                                    'Siirrä artikkeli');
+<<<<<<< HEAD
+=======
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
@@ -1353,3 +1384,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index b69ade8..082ac66 100644 (file)
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: fi_Latn_FI.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: fi_Latn_FI.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index 90e6031..8b51872 100644 (file)
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: fr_Latn_FR.ISO-8859-15.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: fr_Latn_FR.ISO-8859-15.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -408,25 +412,92 @@ define('_ERROR_COMMENTS_SPAM',      'Your comment was rejected because it did no
 
 // START changed/added after 3.15 START
 
+<<<<<<< HEAD
+define('_LIST_PLUG_SUBS_NEEDUPDATE','Paina \'Päivitä laajennuslista\'-nappulaa päivittääksesi listan kaikista laajennuksista.');
+define('_LIST_PLUGS_DEP',                      'Laajennus vaatii:');
+=======
 define('_LIST_PLUG_SUBS_NEEDUPDATE',   'Veuillez utiliser le bouton \'Mettre à jour la liste des installations\' pour mettre à jour la liste des modules installés.');
 define('_LIST_PLUGS_DEP',              'Ce module nécessite:');
+>>>>>>> skinnable-master
 
 // END changed/added after 3.15
 
 // START changed/added after 3.1 START
 
 // comments list per weblog
+<<<<<<< HEAD
+define('_COMMENTS_BLOG',                       'Kaikki kommentit kohteessa ');
+define('_NOCOMMENTS_BLOG',                     'Ei kommentteja');
+define('_BLOGLIST_COMMENTS',           'Kommentit');
+define('_BLOGLIST_TT_COMMENTS',                'Lista kommenteista');
+=======
 define('_COMMENTS_BLOG',               'Tous les commentaires du blog');
 define('_NOCOMMENTS_BLOG',             'Aucun commentaire n\'a été fait sur les billets de ce blog');
 define('_BLOGLIST_COMMENTS',           'Commentaires');
 define('_BLOGLIST_TT_COMMENTS',                'Liste de tous les commentaires apportés aux billets de blog');
+>>>>>>> skinnable-master
 
 
 // for use in archivetype-skinvar
-define('_ARCHIVETYPE_DAY',             'jour');
-define('_ARCHIVETYPE_MONTH',           'mois');
+define('_ARCHIVETYPE_DAY',                     'päivä');
+define('_ARCHIVETYPE_MONTH',           'kuukausi');
 
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
+<<<<<<< HEAD
+define('_ERROR_BADTICKET',                     'Vanhentunut tai virheellinen tunniste.');
+
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Laajennuksen asennus ei onnistunut, syynä ');
+define('_ERROR_DELREQPLUGIN',          'Laajennuksen poistaminen ei onnistunut, syynä ');
+
+// cookie prefix
+define('_SETTINGS_COOKIEPREFIX',       'Evästeen tunniste');
+
+// account activation
+define('_ERROR_NOLOGON_NOACTIVATE',    'Aktivointiin tarvittavaa linkkiä ei voida lähettää. Sisäänkirjautumista ei ole sallittu.');
+define('_ERROR_ACTIVATE',                      'Aktivointiin tarvittavaa avainta ei ole olemassa, se ei ole voimassa tai se on mennyt vanhaksi.');
+define('_ACTIONLOG_ACTIVATIONLINK', 'Aktivointilinkki on lähetetty');
+define('_MSG_ACTIVATION_SENT',         'Aktivointilinkki on lähetetty sähköpostitse.');
+
+// activation link emails
+define('_ACTIVATE_REGISTER_MAIL',      "Terve <%memberName%>,\n\nSinun tulee aktivoida käyttäjätilisi sivustolla <%siteName%> (<%siteUrl%>).\nVoit tehdä tämän valitsemalla oheisen linkin: \n\n\t<%activationUrl%>\n\nSinulla on kaksi päivää aikaa tehdä näin. Tämän jälkeen aktivointilinkki menee vanhaksi.");
+define('_ACTIVATE_REGISTER_MAILTITLE', "Aktivoi tilisi nimelle '<%memberName%>'");
+define('_ACTIVATE_REGISTER_TITLE',     'Tervetuloa <%memberName%>');
+define('_ACTIVATE_REGISTER_TEXT',      'Olet melkein valmis. Valitse salasana tilille.');
+define('_ACTIVATE_FORGOT_MAIL',                "Terve <%memberName%>,\n\nOheisella linkillä voit vaihtaa uuden salasanan tilillesi sivustolle <%siteName%> (<%siteUrl%>), valitsemalla uusi salasana.\n\n\t<%activationUrl%>\n\nSinulla on kaksi päivää aikaa käyttää linkkiä, tämän jälkeen linkki vanhenee.");
+define('_ACTIVATE_FORGOT_MAILTITLE',"Aktivoi '<%memberName%>' tilisi uudestaan");
+define('_ACTIVATE_FORGOT_TITLE',       'Tervetuloa <%memberName%>');
+define('_ACTIVATE_FORGOT_TEXT',                'Valitse uusi salasana tilillesi:');
+define('_ACTIVATE_CHANGE_MAIL',                "Terve <%memberName%>,\n\nKoska sähköpostiosoitteesi on vaihtunut, sinun tulee aktivoida tilisi uudelleen sivustolle <%siteName%> (<%siteUrl%>).\nVoit tehdä tämän oheisella linkillä: \n\n\t<%activationUrl%>\n\nSinulla on kaksi päivää aikaa tehdä näin, tämän jälkeen linkki menee vanhaksi.");
+define('_ACTIVATE_CHANGE_MAILTITLE',"Aktivoi tilisi '<%memberName%>' uudestaan");
+define('_ACTIVATE_CHANGE_TITLE',       'Tervetuloa <%memberName%>');
+define('_ACTIVATE_CHANGE_TEXT',                'Osoitteesi on tarkistettu. Kiitokset!');
+define('_ACTIVATE_SUCCESS_TITLE',      'Onnistunut aktivointi');
+define('_ACTIVATE_SUCCESS_TEXT',       'Tilisi on aktivoitu onnistuneesti.');
+define('_MEMBERS_SETPWD',                      'Aseta salasana');
+define('_MEMBERS_SETPWD_BTN',          'Aseta salasana');
+define('_QMENU_ACTIVATE',                      'Tilin aktivointi');
+define('_QMENU_ACTIVATE_TEXT',         '<p>Kun olet aktivoinut tilisi, voit alkaa käyttää sitä <a href="index.php?action=showlogin">kirjautumalla sisään</a>.</p>');
+
+define('_PLUGS_BTN_UPDATE',                    'Päivitä laajennuslista');
+
+// global settings 
+define('_SETTINGS_JSTOOLBAR',          'Javascript valikon tyyli');
+define('_SETTINGS_JSTOOLBAR_FULL',     'Täydellinen valikko (IE)');
+define('_SETTINGS_JSTOOLBAR_SIMPLE','Yksinkertainen valikko (Non-IE)');
+define('_SETTINGS_JSTOOLBAR_NONE',     'Poista valikko käytöstä');
+define('_SETTINGS_URLMODE_HELP',       '(Lisätietoja: <a href="documentation/tips.html#searchengines-fancyurls">How to activate fancy URLs</a>)');
+
+// extra plugin settings part when editing categories/members/blogs/...
+define('_PLUGINS_EXTRA',                       'Laajennuksen lisäasetukset');
+
+// itemlist info column keys
+define('_LIST_ITEM_BLOG',                      'blog:');
+define('_LIST_ITEM_CAT',                       'cat:');
+define('_LIST_ITEM_AUTHOR',                    'author:');
+define('_LIST_ITEM_DATE',                      'date:');
+define('_LIST_ITEM_TIME',                      'time:');
+=======
 define('_ERROR_BADTICKET',             'Ticket invalide ou expiré.');
 
 // cookie prefix
@@ -476,11 +547,45 @@ define('_LIST_ITEM_CAT',          'th
 define('_LIST_ITEM_AUTHOR',            'auteur:');
 define('_LIST_ITEM_DATE',              'date:');
 define('_LIST_ITEM_TIME',              'heure:');
+>>>>>>> skinnable-master
 
 // indication of registered members in comments list
-define('_LIST_COMMENTS_MEMBER',        '(participant)');
+define('_LIST_COMMENTS_MEMBER',        '(jäsen)');
 
 // batch operations
+<<<<<<< HEAD
+define('_BATCH_WITH_SEL',                      'Valituille:');
+define('_BATCH_EXEC',                          'Suorita');
+
+// quickmenu
+define('_QMENU_HOME',                          'Pääsivu');
+define('_QMENU_ADD',                           'Lisää artikkeli');
+define('_QMENU_ADD_SELECT',                    '-- valitse --');
+define('_QMENU_USER_SETTINGS',         'Tiedot');
+define('_QMENU_USER_ITEMS',                    'Artikkelit');
+define('_QMENU_USER_COMMENTS',         'Kommentit');
+define('_QMENU_MANAGE',                                'Hallinta');
+define('_QMENU_MANAGE_LOG',                    'Toimintaloki');
+define('_QMENU_MANAGE_SETTINGS',               'Asetukset');
+define('_QMENU_MANAGE_MEMBERS',                'Käyttäjät');
+define('_QMENU_MANAGE_NEWBLOG',                'Uusi blogi');
+define('_QMENU_MANAGE_BACKUPS',                'Varmuuskopiot');
+define('_QMENU_MANAGE_PLUGINS',                'Laajennukset');
+define('_QMENU_LAYOUT',                                'Ulkoasu');
+define('_QMENU_LAYOUT_SKINS',          'Sivurungot');
+define('_QMENU_LAYOUT_TEMPL',          'Asettelut');
+define('_QMENU_LAYOUT_IEXPORT',                'Tuo/Vie');
+define('_QMENU_PLUGINS',                       'Laajennukset');
+
+// quickmenu on logon screen
+define('_QMENU_INTRO',                         'Esittely');
+define('_QMENU_INTRO_TEXT',                    '<p>Tämä on kirjautumisruutu Nucleus-sisällönhallintajärjestelmän ylläpitoalueelle.</p><p>Jos sinulla on tili sivustolle, voit kirjautua sisään ja lisätä uusia artikkeleita tai muuttaa asetuksia.</p>');
+
+// helppages for plugins
+define('_ERROR_PLUGNOHELPFILE',                'Avustustiedostoa laajennukselle ei löytynyt');
+define('_PLUGS_HELP_TITLE',                    'Laajennuksen avustussivu');
+define('_LIST_PLUGS_HELP',                     'apua');
+=======
 define('_BATCH_WITH_SEL',              'Ayant pour sélection:');
 define('_BATCH_EXEC',                  'Executer');
 
@@ -513,26 +618,52 @@ define('_ERROR_PLUGNOHELPFILE',           'Impossible de trouver le fichier d\'aide corre
 define('_PLUGS_HELP_TITLE',            'Page d\'aide pour le module');
 define('_LIST_PLUGS_HELP',             'aide');
 
+>>>>>>> skinnable-master
 
 // END changed/started after 3.1
 
 // START changed/added after v2.5beta START
 
 // general settings (security)
+<<<<<<< HEAD
+define('_SETTINGS_EXTAUTH',                    'Salli ulkoinen varmennus');
+define('_WARNING_EXTAUTH',                     'Varoitus: salli vain jos tarvitset tätä.');
+
+// member profile
+define('_MEMBERS_BYPASS',                      'Käytä ulkoista varmennusta');
+=======
 define('_SETTINGS_EXTAUTH',            'Activer le système d\'authentification externe');
 define('_WARNING_EXTAUTH',             'Attention: à n\'activer que si nécessaire.');
 
 // member profile
 define('_MEMBERS_BYPASS',              'Utiliser le système d\'authentification externe');
+>>>>>>> skinnable-master
 
 // 'always include in search' blog setting (yes/no) [in v2.5beta, the 'always' part wasn't clear]
-define('_EBLOG_SEARCH',                        '<em>Toujours</em> inclure dans la recherche');
+define('_EBLOG_SEARCH',                                'Sisällytä <em>aina</em> hakuun');
 
 // END changed/added after v2.5beta
 
+
 // START introduced after v2.0 START
 
 // media library
+<<<<<<< HEAD
+define('_MEDIA_VIEW',                          'Tarkastele');
+define('_MEDIA_VIEW_TT',                       'Tarkastele tiedostoa (avautuu uuteen ikkunaan)');
+define('_MEDIA_FILTER_APPLY',          'Ota suodatin käyttöön');
+define('_MEDIA_FILTER_LABEL',          'Suodatin: ');
+define('_MEDIA_UPLOAD_TO',                     'Lähetä...');
+define('_MEDIA_UPLOAD_NEW',                    'Lähetä uusi tiedosto...');
+define('_MEDIA_COLLECTION_SELECT',     'Valitse');
+define('_MEDIA_COLLECTION_TT',         'Vaihda tähän kategoriaan');
+define('_MEDIA_COLLECTION_LABEL',      'Valittu kokoelma: ');
+
+// tooltips on toolbar
+define('_ADD_ALIGNLEFT_TT',                    'Tasaa vasemmalle');
+define('_ADD_ALIGNRIGHT_TT',           'Tasaa oikealle');
+define('_ADD_ALIGNCENTER_TT',          'Keskitä');
+=======
 define('_MEDIA_VIEW',                  'afficher');
 define('_MEDIA_VIEW_TT',               'Afficher la page (ouvrir une nouvelle fenêtre)');
 define('_MEDIA_FILTER_APPLY',          'Appliquer le filtre');
@@ -547,46 +678,116 @@ define('_MEDIA_COLLECTION_LABEL',        'Biblioth
 define('_ADD_ALIGNLEFT_TT',            'Aligner à gauche');
 define('_ADD_ALIGNRIGHT_TT',           'Aligner à droite');
 define('_ADD_ALIGNCENTER_TT',          'Centrer');
+>>>>>>> skinnable-master
 
+// searchable blog setting (yes/no)
+define('_EBLOG_SEARCH',                                'Sisällytä hakuun');
 
 // generic upload failure
+<<<<<<< HEAD
+define('_ERROR_UPLOADFAILED',          'Lähetys epäonnistui');
+=======
 define('_ERROR_UPLOADFAILED',          'Echec du téléchargement');
+>>>>>>> skinnable-master
 
 // END introduced after v2.0 END
 
+
 // START introduced after v1.5 START
 
 // posting to the past/edit timestamps
+<<<<<<< HEAD
+define('_EBLOG_ALLOWPASTPOSTING',      'Salli menneille päiville postitus');
+define('_ADD_CHANGEDATE',                      'Päivitä aikaleima');
+define('_BMLET_CHANGEDATE',                    'Päivitä aikaleima');
+=======
 define('_EBLOG_ALLOWPASTPOSTING',      'Permettre d\'antidater');
 define('_ADD_CHANGEDATE',              'Mise à  jour  de la date');
 define('_BMLET_CHANGEDATE',            'Mise à  jour de la date');
+>>>>>>> skinnable-master
 
 // skin import/export
-define('_OVERVIEW_SKINIMPORT',         'Habillage import/export...');
+define('_OVERVIEW_SKINIMPORT',         'Tuominen / vieminen...');
 
 // skin settings
+<<<<<<< HEAD
+define('_PARSER_INCMODE_NORMAL',       'Normaali');
+define('_PARSER_INCMODE_SKINDIR',      'Käytä sivurunkohakemistoa');
+define('_SKIN_INCLUDE_MODE',           'Moodi');
+define('_SKIN_INCLUDE_PREFIX',         'Etuliite');
+=======
 define('_PARSER_INCMODE_NORMAL',       'Normal');
 define('_PARSER_INCMODE_SKINDIR',      'Utiliser un dossier d\'habillage');
 define('_SKIN_INCLUDE_MODE',           'Type d\'inclusion');
 define('_SKIN_INCLUDE_PREFIX',         'Préfixe d\'inclusion');
+>>>>>>> skinnable-master
 
 // global settings
-define('_SETTINGS_BASESKIN',           'Habillage de base');
-define('_SETTINGS_SKINSURL',           'URL pour l\'habillage');
-define('_SETTINGS_ACTIONSURL',         'URL complet pour action.php');
+define('_SETTINGS_BASESKIN',           'Perussivurunko');
+define('_SETTINGS_SKINSURL',           'Perussivurunkojen URL');
+define('_SETTINGS_ACTIONSURL',         'Koko URL action.php:lle');
 
 // category moves (batch)
+<<<<<<< HEAD
+define('_ERROR_MOVEDEFCATEGORY',       'Vakiokategoriaa ei voi siirtää');
+define('_ERROR_MOVETOSELF',                    'Kategoriaa ei voi voida siirtää (kohdeblogi on sama kuin lähdeblogi)');
+define('_MOVECAT_TITLE',                       'Valitse blogi johon kategoria siirretään');
+define('_MOVECAT_BTN',                         'Siirrä kategoria');
+=======
 define('_ERROR_MOVEDEFCATEGORY',       'Impossible de déplacer le thème par défaut');
 define('_ERROR_MOVETOSELF',            'Impossible de déplacer le thème (le blog de destination est identique au blog source)');
 define('_MOVECAT_TITLE',               'Sélectionner le blog dans lequel vous souhaitez déplacer ce thème');
 define('_MOVECAT_BTN',                 'Déplacer le thème');
+>>>>>>> skinnable-master
 
 // URLMode setting
-define('_SETTINGS_URLMODE',            'Type de lien');
-define('_SETTINGS_URLMODE_NORMAL',     'Normal');
-define('_SETTINGS_URLMODE_PATHINFO',   'Fancy');
+define('_SETTINGS_URLMODE',                    'URL moodi');
+define('_SETTINGS_URLMODE_NORMAL',     'Normaali');
+define('_SETTINGS_URLMODE_PATHINFO','Tarkka');
 
 // Batch operations
+<<<<<<< HEAD
+define('_BATCH_NOSELECTION',           'Ei valintoja, joihin kohdistuu toimintoja');
+define('_BATCH_ITEMS',                         'Joukkotoiminne blogiartikkeleille');
+define('_BATCH_CATEGORIES',                    'Joukkotoiminne kategorioille');
+define('_BATCH_MEMBERS',                       'Joukkotoiminne jäsenille');
+define('_BATCH_TEAM',                          'Joukkotoiminne hallintaryhmille');
+define('_BATCH_COMMENTS',                      'Joukkotoiminne kommenteille');
+define('_BATCH_UNKNOWN',                       'Tuntematon joukkotoiminne: ');
+define('_BATCH_EXECUTING',                     'Suorittaa..');
+define('_BATCH_ONCATEGORY',                    'kategorialle');
+define('_BATCH_ONITEM',                                'blogiartikkelille');
+define('_BATCH_ONCOMMENT',                     'kommentille');
+define('_BATCH_ONMEMBER',                      'jäsenelle');
+define('_BATCH_ONTEAM',                                'hallintaryhmän jäsenelle');
+define('_BATCH_SUCCESS',                       'Onnistui!');
+define('_BATCH_DONE',                          'Valmis!');
+define('_BATCH_DELETE_CONFIRM',                'Vahvista joukkopoistaminen');
+define('_BATCH_DELETE_CONFIRM_BTN',    'Vahvista joukkopoistaminen');
+define('_BATCH_SELECTALL',                     'valitse kaikki');
+define('_BATCH_DESELECTALL',           'poista valinnat');
+
+// batch operations: options in dropdowns
+define('_BATCH_ITEM_DELETE',           'Poista');
+define('_BATCH_ITEM_MOVE',                     'Siirrä');
+define('_BATCH_MEMBER_DELETE',         'Poista');
+define('_BATCH_MEMBER_SET_ADM',                'Anna järjestelmänvalvojan oikeudet');
+define('_BATCH_MEMBER_UNSET_ADM',      'Ota pois järjestelmänvalvojan oikeudet');
+define('_BATCH_TEAM_DELETE',           'Poista hallintaryhmästä');
+define('_BATCH_TEAM_SET_ADM',          'Anna järjestelmänvalvojan oikeudet');
+define('_BATCH_TEAM_UNSET_ADM',                'Ota pois järjestelmänvalvojan oikeudet');
+define('_BATCH_CAT_DELETE',                    'Poista');
+define('_BATCH_CAT_MOVE',                      'Siirrää toiseen blogiin');
+define('_BATCH_COMMENT_DELETE',                'Poista');
+
+// itemlist: Add new item...
+define('_ITEMLIST_ADDNEW',                     'Lisää uusi blogiartikkeli...');
+define('_ADD_PLUGIN_EXTRAS',           'Laajennuksen lisävalinnat');
+
+// errors
+define('_ERROR_CATCREATEFAIL',         'Ei pystytty luomaan uutta kategoriaa');
+define('_ERROR_NUCLEUSVERSIONREQ',     'Tämä laajennus vaatii uudemman Nucleuksen version: ');
+=======
 define('_BATCH_NOSELECTION',           'Aucune action sélectionnée');
 define('_BATCH_ITEMS',                 'Action sur les billets');
 define('_BATCH_CATEGORIES',            'Action sur les thèmes');
@@ -627,11 +828,39 @@ define('_ADD_PLUGIN_EXTRAS',              'Options suppl
 // errors
 define('_ERROR_CATCREATEFAIL',         'Impossible de créer le nouveau thème');
 define('_ERROR_NUCLEUSVERSIONREQ',     'Ce module requiert une version ultérieure de Nucleus: ');
+>>>>>>> skinnable-master
 
 // backlinks
-define('_BACK_TO_BLOGSETTINGS',                'Retour au menu de configuration des blogs');
+define('_BACK_TO_BLOGSETTINGS',                'Takaisin blogiasetuksiin');
 
 // skin import export
+<<<<<<< HEAD
+define('_SKINIE_TITLE_IMPORT',         'Tuo');
+define('_SKINIE_TITLE_EXPORT',         'Vie');
+define('_SKINIE_BTN_IMPORT',           'Tuo valitut sivurungot / asettelut');
+define('_SKINIE_BTN_EXPORT',           'Vie valitut sivurungot / asettelut');
+define('_SKINIE_LOCAL',                                'Tuo paikallisesta tiedostosta:');
+define('_SKINIE_NOCANDIDATES',         'Ei ehdokkaita tuotavaksi sivurunko -hakemistossa');
+define('_SKINIE_FROMURL',                      'Tuo URL:sta:');
+define('_SKINIE_EXPORT_INTRO',         'Valitse sivurungot ja asettelut, jotka haluavat viedä');
+define('_SKINIE_EXPORT_SKINS',         'Sivurungot');
+define('_SKINIE_EXPORT_TEMPLATES',     'Asettelut');
+define('_SKINIE_EXPORT_EXTRA',         'Lisätietoa');
+define('_SKINIE_CONFIRM_OVERWRITE',    'Ylikirjoita sivurungot, jotka ovat jo olemassa (katso nimien päällekkäisyydet)');
+define('_SKINIE_CONFIRM_IMPORT',       'Kyllä, haluan tuoda tämän ');
+define('_SKINIE_CONFIRM_TITLE',                'Valmis tuomaan sivurungon ja asettelut');
+define('_SKINIE_INFO_SKINS',           'Sivurungot tiedostossa:');
+define('_SKINIE_INFO_TEMPLATES',       'Asettelut tiedostossa:');
+define('_SKINIE_INFO_GENERAL',         'Tietoa:');
+define('_SKINIE_INFO_SKINCLASH',       'Sivirunkonimien päällekkäisyydet:');
+define('_SKINIE_INFO_TEMPLCLASH',      'Asettelunimien päällekkäisyydet:');
+define('_SKINIE_INFO_IMPORTEDSKINS','Tuodut sivurungot:');
+define('_SKINIE_INFO_IMPORTEDTEMPLS','Tuodut asettelut:');
+define('_SKINIE_DONE',                         'Tuominen valmis');
+
+define('_AND',                                         'ja');
+define('_OR',                                          'tai');
+=======
 define('_SKINIE_TITLE_IMPORT',         'Importation');
 define('_SKINIE_TITLE_EXPORT',         'Exportation');
 define('_SKINIE_BTN_IMPORT',           'Importer');
@@ -657,11 +886,58 @@ define('_SKINIE_DONE',                    'Importation r
 
 define('_AND',                         'et');
 define('_OR',                          'ou');
+>>>>>>> skinnable-master
 
 // empty fields on template edit
-define('_EDITTEMPLATE_EMPTY',          'Champ vide (cliquer pour modifier)');
+define('_EDITTEMPLATE_EMPTY',          'tyhjä kenttä (klikkaa editoidaksesi)');
 
 // skin overview list
+<<<<<<< HEAD
+define('_LIST_SKINS_INCMODE',          'IncludeMode:');
+define('_LIST_SKINS_INCPREFIX',                'IncludePrefix:');
+define('_LIST_SKINS_DEFINED',          'Määritellyt osat:');
+
+// backup
+define('_BACKUPS_TITLE',                       'Varmuuskopioi / Palauta');
+define('_BACKUP_TITLE',                                'Varmuuskopioi');
+define('_BACKUP_INTRO',                                'Klikkaa alla olevaa painiketta luodaksesi varmuuskopion Nucleus-tietokannastasi. Tallennusikkuna tulee esiin ja voit valita minne haluat tallettaa varmuuskopiotiedoston. Säilö se varmaan paikkaan.');
+define('_BACKUP_ZIP_YES',                      'Yritä käyttää tiedonpakkausta');
+define('_BACKUP_ZIP_NO',                       'Älä käytä tiedonpakkausta');
+define('_BACKUP_BTN',                          'Luo varmuuskopio');
+define('_BACKUP_NOTE',                         '<b>Huomaa:</b> Vain tietokannan sisältö on talletettuna varmuuskopioon. Mediatiedostot ja asetukset tiedostossa config.php <b>eivät</b> täten sisälly varmuuskopioon.');
+define('_RESTORE_TITLE',                       'Palauta');
+define('_RESTORE_NOTE',                                '<b>VAROITUS:</b> Varmuuskopiosta palauttaminen tulee <b>TYHJENTÄMÄÄN</b> kaiken nykyisen Nucleus-tietokannan kokonaan! Älä jatka ellet ole ehdottoman varma siitä mitä olet tekemässä! <br />  <b>Huom!</b> Varmista, että Nucleuksen versio, jossa varmuuskopion loit, pitäisi olla sama kuin versio, jota käytät juuri nyt! Muuten se ei toimi.');
+define('_RESTORE_INTRO',                       'Valitse varmuuskopiotiedosto alta (se tullaan lataamaan serverille) ja klikkaa "Palauta tiedostosta" -painiketta aloittaaksesi.');
+define('_RESTORE_IMSURE',                      'Kyllä, olen varma, että haluan tehdä tämän!');
+define('_RESTORE_BTN',                         'Palauta tiedostosta');
+define('_RESTORE_WARNING',                     '(varmista, että olet palauttamassa oikeaa varmuuskopiota. Kenties kannattaisi tehdä uusi varmuuskopio ennen kuin aloitat...)');
+define('_ERROR_BACKUP_NOTSURE',                'Sinun täytyy ruksittaa \'Olen varma, että haluan tehdä tämän\' -kohta');
+define('_RESTORE_COMPLETE',                    'Palautus valmis');
+
+// new item notification
+define('_NOTIFY_NI_MSG',                       'Uusi blogiartikkeli on postitettu:');
+define('_NOTIFY_NI_TITLE',                     'Uusi blogiartikkeli!');
+define('_NOTIFY_KV_MSG',                       'Karma-äänestä blogiartikkelia:');
+define('_NOTIFY_KV_TITLE',                     'Nucleus karma:');
+define('_NOTIFY_NC_MSG',                       'Kommentoi blogiartikkelia:');
+define('_NOTIFY_NC_TITLE',                     'Nucleus kommentti:');
+define('_NOTIFY_USERID',                       'Käyttäjän ID:');
+define('_NOTIFY_USER',                         'Käyttäjä:');
+define('_NOTIFY_COMMENT',                      'Kommentti:');
+define('_NOTIFY_VOTE',                         'Äänestys:');
+define('_NOTIFY_HOST',                         'Host:');
+define('_NOTIFY_IP',                           'IP:');
+define('_NOTIFY_MEMBER',                       'Jäsen:');
+define('_NOTIFY_TITLE',                                'Otsikko:');
+define('_NOTIFY_CONTENTS',                     'Sisältö:');
+
+// member mail message
+define('_MMAIL_MSG',                           'Viesti sinulle, jonka on lähettänyt');
+define('_MMAIL_FROMANON',                      'nimetön vierailija');
+define('_MMAIL_FROMNUC',                       'Postitettu Nucleus weblogista osoitteessa');
+define('_MMAIL_TITLE',                         'Viesti jäseneltä');
+define('_MMAIL_MAIL',                          'Viesti:');
+=======
 define('_LIST_SKINS_INCMODE',          'Type d\'inclusion:');
 define('_LIST_SKINS_INCPREFIX',                'Préfixe d\'inclusion:');
 define('_LIST_SKINS_DEFINED',          'Habillages définis:');
@@ -706,6 +982,7 @@ define('_MMAIL_FROMANON',           'un visiteur anonyme');
 define('_MMAIL_FROMNUC',               'Posté depuis un weblog Nucleus à');
 define('_MMAIL_TITLE',                 'Un message de');
 define('_MMAIL_MAIL',                  'Message:');
+>>>>>>> skinnable-master
 
 // END introduced after v1.5 END
 
@@ -713,6 +990,35 @@ define('_MMAIL_MAIL',                      'Message:');
 // START introduced after v1.1 START
 
 // bookmarklet buttons
+<<<<<<< HEAD
+define('_BMLET_ADD',                           'Lisää artikkeli');
+define('_BMLET_EDIT',                          'Muokkaa artikkelia');
+define('_BMLET_DELETE',                                'Poista artikkeli');
+define('_BMLET_BODY',                          'Sisältö');
+define('_BMLET_MORE',                          'Laajennettu');
+define('_BMLET_OPTIONS',                       'Optiot');
+define('_BMLET_PREVIEW',                       'Esikatselu');
+
+// used in bookmarklet
+define('_ITEM_UPDATED',                                'Artikkeli päivitetty');
+define('_ITEM_DELETED',                                'Artikkeli poistettu');
+
+// plugins
+define('_CONFIRMTXT_PLUGIN',           'Oletko varma, että haluat poistaa laajennuksen nimeltä');
+define('_ERROR_NOSUCHPLUGIN',          'Kyseistä laajennusta ei ole');
+define('_ERROR_DUPPLUGIN',                     'Tämä laajennus on jo asennettu');
+define('_ERROR_PLUGFILEERROR',         'Kyseistä laajennusta ei ole, tai oikeudet ovat väärin asetetut');
+define('_PLUGS_NOCANDIDATES',          'Haluttuja laajennuksia ei löytynyt');
+
+define('_PLUGS_TITLE_MANAGE',          'Laajennustenhallinta');
+define('_PLUGS_TITLE_INSTALLED',       'Asennetut laajennukset');
+define('_PLUGS_TITLE_UPDATE',          'Päivitä tapahtumalistaa');
+define('_PLUGS_TEXT_UPDATE',           'Nucleus pitää yllä listaa laajennusten tapahtumatilauksista. Kun päivität laajennuksen ylikirjoittamalla sen tiedoston, sinun täytyisi ajaa tämä päivitys varmistaaksesi, että listassa olisi oikeat tilaukset');
+define('_PLUGS_TITLE_NEW',                     'Asenna uusi laajennus');
+define('_PLUGS_ADD_TEXT',                      'Alla on lista kaikista tiedostoista Plugins -hakemistossasi, jotka voivat olla laajennuksia, joita ei vielä ole asennettu. Varmista että olet <strong>aivan varma</strong>, että kyseessä on laajennus, ennen kuin lisäät sen.');
+define('_PLUGS_BTN_INSTALL',           'Asenna laajennus');
+define('_BACKTOOVERVIEW',                      'Takaisin');
+=======
 define('_BMLET_ADD',                   'Ajouter un  billet');
 define('_BMLET_EDIT',                  'Modifier un billet');
 define('_BMLET_DELETE',                        'Effacer un billet');
@@ -740,11 +1046,28 @@ define('_PLUGS_TITLE_NEW',               'Installer un nouveau module');
 define('_PLUGS_ADD_TEXT',              'Vous trouverez ci-dessous la liste de tous les fichiers contenus dans votre répertoire de plugins. Il peut s\'agir de modules non-installés. Soyez <strong>vraiment</strong> sûr qu\'il s\'agit d\'un module avant de l\'ajouter.');
 define('_PLUGS_BTN_INSTALL',           'Installer le module');
 define('_BACKTOOVERVIEW',              'Retour au sommaire');
+>>>>>>> skinnable-master
 
 // editlink
-define('_TEMPLATE_EDITLINK',           'Modifier le lien du billet');
+define('_TEMPLATE_EDITLINK',           'Muokkaa artikkelia -linkki');
 
 // add left / add right tooltips
+<<<<<<< HEAD
+define('_ADD_LEFT_TT',                         'Lisää vasen palsta');
+define('_ADD_RIGHT_TT',                                'Lisää oikea palsta');
+
+// add/edit item: new category (in dropdown box)
+define('_ADD_NEWCAT',                          'Uusi kategoria');
+
+// new settings
+define('_SETTINGS_PLUGINURL',          'Laajennuksen osoite (URL)');
+define('_SETTINGS_MAXUPLOADSIZE',      'Lähetetyn tiedoston maksimikoko (bitteinä)');
+define('_SETTINGS_NONMEMBERMSGS',      'Salli ei-jäsenten lähettää viestejä');
+define('_SETTINGS_PROTECTMEMNAMES',    'Suojaa jäsenten nimet');
+
+// overview screen
+define('_OVERVIEW_PLUGINS',                    'Laajennuksien hallinta');
+=======
 define('_ADD_LEFT_TT',                 'Ajouter un cadre à gauche');
 define('_ADD_RIGHT_TT',                        'Ajouter un cadre à droite');
 
@@ -759,14 +1082,31 @@ define('_SETTINGS_PROTECTMEMNAMES',      'Prot
 
 // overview screen
 define('_OVERVIEW_PLUGINS',            'Gérer les modules...');
+>>>>>>> skinnable-master
 
 // actionlog
-define('_ACTIONLOG_NEWMEMBER',         'Inscription d\'un nouveau participant:');
+define('_ACTIONLOG_NEWMEMBER',         'Uuden jäsenen rekisteröinti:');
 
 // membermail (when not logged in)
-define('_MEMBERMAIL_MAIL',             'Votre adresse email:');
+define('_MEMBERMAIL_MAIL',                     'Sähköpostiosoitteesi:');
 
 // file upload
+<<<<<<< HEAD
+define('_ERROR_DISALLOWEDUPLOAD2',     'Sinulla ei ole ylläpitäjän oikeuksia mihinkään blogiin, joilla on kohdejäsen listallaan. Täten, et ole oikeutettu lähettämään tiedostoja tämän jäsenen media -hakemistoon');
+
+// plugin list
+define('_LISTS_INFO',                          'Tiedot');
+define('_LIST_PLUGS_AUTHOR',           'Tekijä:');
+define('_LIST_PLUGS_VER',                      'Versio:');
+define('_LIST_PLUGS_SITE',                     'WWW-sivut');
+define('_LIST_PLUGS_DESC',                     'Kuvaus');
+define('_LIST_PLUGS_SUBS',                     'Liittyy seuraaviin tapahtumiin:');
+define('_LIST_PLUGS_UP',                       'Siirrä ylös');
+define('_LIST_PLUGS_DOWN',                     'Siirrä alas');
+define('_LIST_PLUGS_UNINSTALL',                'Poista&nbsp;installointi');
+define('_LIST_PLUGS_ADMIN',                    'Ylläpito');
+define('_LIST_PLUGS_OPTIONS',          'Säädä&nbsp;asetuksia');
+=======
 define('_ERROR_DISALLOWEDUPLOAD2',     'Vous n\'avez pas les droits d\'admin sur les blogs de ce participant. Vous n\'êtes donc pas autorisé à télécharger de fichier sur le répertoire media de ce participant.');
 
 // plugin list
@@ -781,11 +1121,25 @@ define('_LIST_PLUGS_DOWN',               'descendre');
 define('_LIST_PLUGS_UNINSTALL',                'désinstaller');
 define('_LIST_PLUGS_ADMIN',            'admin');
 define('_LIST_PLUGS_OPTIONS',          'modifier les options');
+>>>>>>> skinnable-master
 
 // plugin option list
-define('_LISTS_VALUE',                 'Valeur');
+define('_LISTS_VALUE',                         'Arvo');
 
 // plugin options
+<<<<<<< HEAD
+define('_ERROR_NOPLUGOPTIONS',         'Tällä laajennuksella ei ole asetuksia säädettävänä
+');
+define('_PLUGS_BACK',                          'Takaisin Laajennukset -sivulle');
+define('_PLUGS_SAVE',                          'Tallenna asetukset');
+define('_PLUGS_OPTIONS_UPDATED',       'Laajennuksen asetukset päivitetty');
+
+define('_OVERVIEW_MANAGEMENT',         'Hallinta');
+define('_OVERVIEW_MANAGE',                     'Nucleuksen hallinta...');
+define('_MANAGE_GENERAL',                      'Yleinen hallinta');
+define('_MANAGE_SKINS',                                'Sivurungot ja asettelut');
+define('_MANAGE_EXTRA',                                'Lisäominaisuudet');
+=======
 define('_ERROR_NOPLUGOPTIONS',         'ce plugin n\'a pas d\'option');
 define('_PLUGS_BACK',                  'Retour au menu des modules');
 define('_PLUGS_SAVE',                  'Sauvegarder les options');
@@ -796,8 +1150,9 @@ define('_OVERVIEW_MANAGE',         'Gestion de Nucleus...');
 define('_MANAGE_GENERAL',              'Gestion globale');
 define('_MANAGE_SKINS',                        'Habillages et modèles');
 define('_MANAGE_EXTRA',                        'Options supplémentaires');
+>>>>>>> skinnable-master
 
-define('_BACKTOMANAGE',                        'Retour au menu de gestion de Nucleus');
+define('_BACKTOMANAGE',                                'Takaisin Nucleuksen hallintaan');
 
 
 // END introduced after v1.1 END
@@ -807,6 +1162,44 @@ define('_BACKTOMANAGE',                   'Retour au menu de gestion de Nucleus');
 
 
 // global stuff
+<<<<<<< HEAD
+define('_LOGOUT',                                      'Kirjaudu ulos');
+define('_LOGIN',                                       'Kirjaudu sisään');
+define('_YES',                                         'Kyllä');
+define('_NO',                                          'Ei');
+define('_SUBMIT',                                      'Lähetä');
+define('_ERROR',                                       'Virhe');
+define('_ERRORMSG',                                    'Virhe esiintyi!');
+define('_BACK',                                                'Takaisin');
+define('_NOTLOGGEDIN',                         'Et ole kirjautunut sisään');
+define('_LOGGEDINAS',                          'Olet kirjautunut sisään tunnuksella');
+define('_ADMINHOME',                           'Järjestelmänvalvoja-asetukset');
+define('_NAME',                                                'Nimi');
+define('_BACKHOME',                                    'Takaisin järjestelmänvalvoja-asetuksiin');
+define('_BADACTION',                           'Pyydettyä toimintoa ei ole');
+define('_MESSAGE',                                     'Viesti');
+define('_HELP_TT',                                     'Apua!');
+define('_YOURSITE',                                    'Sivustosi');
+
+
+define('_POPUP_CLOSE',                         'Sulje ikkuna');
+
+define('_LOGIN_PLEASE',                                'Kirjaudu ensin sisään');
+
+// commentform
+define('_COMMENTFORM_YOUARE',          'Olet');
+define('_COMMENTFORM_SUBMIT',          'Lisää kommentti');
+define('_COMMENTFORM_COMMENT',         'Kommenttisi');
+define('_COMMENTFORM_NAME',                    'Nimi');
+define('_COMMENTFORM_MAIL',                    'Sähköpostiosoite tai WWW-osoite');
+define('_COMMENTFORM_REMEMBER',                'Muista minut');
+
+// loginform
+define('_LOGINFORM_NAME',                      'Tunnus');
+define('_LOGINFORM_PWD',                       'Salasana');
+define('_LOGINFORM_YOUARE',                    'Olet kirjautuneena<br />sisään tunnuksella<br />');
+define('_LOGINFORM_SHARED',                    'Usean käyttäjän tietokone');
+=======
 define('_LOGOUT',                      'Déconnexion');
 define('_LOGIN',                       'Connexion');
 define('_YES',                         'Oui');
@@ -842,14 +1235,431 @@ define('_LOGINFORM_NAME',               'Nom d\'utilisateur');
 define('_LOGINFORM_PWD',               'Mot de passe');
 define('_LOGINFORM_YOUARE',            'Connecté en tant que');
 define('_LOGINFORM_SHARED',            'Ordinateur partagé');
+>>>>>>> skinnable-master
 
 // member mailform
-define('_MEMBERMAIL_SUBMIT',           'Envoyer un message');
+define('_MEMBERMAIL_SUBMIT',           'Lähetä viesti');
 
 // search form
-define('_SEARCHFORM_SUBMIT',           'Rechercher');
+define('_SEARCHFORM_SUBMIT',           'Etsi');
 
 // add item form
+<<<<<<< HEAD
+define('_ADD_ADDTO',                           'Uusi artikkeli blogiin ');
+define('_ADD_CREATENEW',                       'Luo uusi artikkeli');
+define('_ADD_BODY',                                    'Sisältö');
+define('_ADD_TITLE',                           'Otsikko');
+define('_ADD_MORE',                                    'Laajennettu (optionaalinen)');
+define('_ADD_CATEGORY',                                'Kategoria');
+define('_ADD_PREVIEW',                         'Esikatselu');
+define('_ADD_DISABLE_COMMENTS',                'Kommentit pois käytöstä?');
+define('_ADD_DRAFTNFUTURE',                    'Vedos &amp; tulevat artikkelit');
+define('_ADD_ADDITEM',                         'Lisää artikkeli');
+define('_ADD_ADDNOW',                          'Lisää nyt');
+define('_ADD_ADDLATER',                                'Lisää myöhemmin');
+define('_ADD_PLACE_ON',                                'Place on');
+define('_ADD_ADDDRAFT',                                'Lisää vedoksiin');
+define('_ADD_NOPASTDATES',                     '(Menneet päiväykset ja kellonajat EIVÄT kelpaa, käytä meneillään olevaa aikaa.)');
+define('_ADD_BOLD_TT',                         'Lihavoitu');
+define('_ADD_ITALIC_TT',                       'Kursivoitu');
+define('_ADD_HREF_TT',                         'Luo linkki');
+define('_ADD_MEDIA_TT',                                'Lisää media');
+define('_ADD_PREVIEW_TT',                      'Näytä/Piilota esikatselu');
+define('_ADD_CUT_TT',                          'Leikkaa');
+define('_ADD_COPY_TT',                         'Kopioi');
+define('_ADD_PASTE_TT',                                'Liitä');
+
+
+// edit item form
+define('_EDIT_ITEM',                           'Muokkaa artikkelia');
+define('_EDIT_SUBMIT',                         'Muokkaa');
+define('_EDIT_ORIG_AUTHOR',                    'Alkuperäinen kirjoittaja');
+define('_EDIT_BACKTODRAFTS',           'Tallenna takaisin vedokseen');
+define('_EDIT_COMMENTSNOTE',           '(huomaa: kommenttien pois päältä kytkeminen _ei_ piilota aiemmin lisättyjä kommentteja)');
+
+// used on delete screens
+define('_DELETE_CONFIRM',                      'Varmista poistaminen');
+define('_DELETE_CONFIRM_BTN',          'Varmista poistaminen');
+define('_CONFIRMTXT_ITEM',                     'Olet poistamassa seuraavan artikkelin:');
+define('_CONFIRMTXT_COMMENT',          'Olet poistamassa seuraavan kommentin:');
+define('_CONFIRMTXT_TEAM1',                    'Olet poistamassa ');
+define('_CONFIRMTXT_TEAM2',                    ' blogin hallintaryhmässä ');
+define('_CONFIRMTXT_BLOG',                     'Olet poistamassa blogia: ');
+define('_WARNINGTXT_BLOGDEL',          'Varoitus! Blogin poisto tulee tuhoamaan kaikki artikkelit ja kommentit kyseisessä blogissa. Vahvista että olet AIVAN VARMA siitä mitä olet tekemässä!<br />Älä myöskään keskeytä Nucleusta sen poistaessa blogiasi.');
+define('_CONFIRMTXT_MEMBER',           'Olet poistamassa seuraavan käyttäjän profiilin: ');
+define('_CONFIRMTXT_TEMPLATE',         'Olet poistamassa sivuasetuksen nimeltä ');
+define('_CONFIRMTXT_SKIN',                     'Olet poistamassa sivurungon nimeltä ');
+define('_CONFIRMTXT_BAN',                      'Olet poistamassa eston ip-osoitteelle ');
+define('_CONFIRMTXT_CATEGORY',         'Olet poistamassa kategorian ');
+
+// some status messages
+define('_DELETED_ITEM',                                'Artikkeli poistettu');
+define('_DELETED_MEMBER',                      'Käyttäjä poistettu');
+define('_DELETED_COMMENT',                     'Kommentti poistettu');
+define('_DELETED_BLOG',                                'Blogi poistettu');
+define('_DELETED_CATEGORY',                    'Kategoria poistettu');
+define('_ITEM_MOVED',                          'Artikkeli siirretty');
+define('_ITEM_ADDED',                          'Artikkeli lisätty');
+define('_COMMENT_UPDATED',                     'Kommentti päivitetty');
+define('_SKIN_UPDATED',                                'Sivurunkodata on tallennettu');
+define('_TEMPLATE_UPDATED',                    'Asettelu on tallennettu');
+
+// errors
+define('_ERROR_COMMENT_LONGWORD',      'Älä käytä yli 60 merkkiä pitkiä sanoja kommenteissasi');
+define('_ERROR_COMMENT_NOCOMMENT',     'Kommentti puuttuu');
+define('_ERROR_COMMENT_NOUSERNAME',    'Nimi puuttuu');
+define('_ERROR_COMMENT_TOOLONG',       'Kommenttisi on liian pitkä (max. 5000 merkkiä)');
+define('_ERROR_COMMENTS_DISABLED',     'Kommentointimahdollisuus tälle blogille on pois käytöstä.');
+define('_ERROR_COMMENTS_NONPUBLIC',    'Sinun täytyy olla kirjautunut käyttäjä lisätäksesi kommentin tähän blogiin');
+define('_ERROR_COMMENTS_MEMBERNICK','Tunnus, jota haluat käyttää lähettääksesi kommentin on registeröityneen käyttäjän käytössä. Valitse jokin toinen tunnus.');
+define('_ERROR_SKIN',                          'Sivurunkovirhe');
+define('_ERROR_ITEMCLOSED',                    'Tämä artikkeli on suljettu, et voi lisätä uusia kommentteja siihen tai äänestää siinä');
+define('_ERROR_NOSUCHITEM',                    'Kyseistä artikkelia ei ole');
+define('_ERROR_NOSUCHBLOG',                    'Kyseistä blogia ei ole');
+define('_ERROR_NOSUCHSKIN',                    'Kyseistä sivurunkoa ei ole');
+define('_ERROR_NOSUCHMEMBER',          'Kyseistä käyttäjää ei ole');
+define('_ERROR_NOTONTEAM',                     'Et ole tämän webblogin hallintaryhmässä.');
+define('_ERROR_BADDESTBLOG',           'Kohdeblogia ei ole');
+define('_ERROR_NOTONDESTTEAM',         'Artikkelia ei voi siirtää, sillä et ole kohdeblogin hallintaryhmässä');
+define('_ERROR_NOEMPTYITEMS',          'Tyhjiä artikkeleita ei voi lisätä!');
+define('_ERROR_BADMAILADDRESS',                'Sähköpostiosoite ei ole kelvollinen');
+define('_ERROR_BADNOTIFY',                     'Yksi (tai useampi) annettu sähköposti-ilmoitusosoite on epäkelpo sähköpostiosoite');
+define('_ERROR_BADNAME',                       'Nimi ei ole hyväksyttävä (vain a-z ja 0-9 ovat hyväksyttäviä merkkejä, ei välilyöntejä alussa eikä lopussa)');
+define('_ERROR_NICKNAMEINUSE',         'Jo registeröitynyt käyttää käyttää jo kyseistä nimeä');
+define('_ERROR_PASSWORDMISMATCH',      'Salasanojen täytyy olla samoja');
+define('_ERROR_PASSWORDTOOSHORT',      'Salasanan pitäisi olla ainakin 6 merkkiä pitkä');
+define('_ERROR_PASSWORDMISSING',       'Salasana on valittava');
+define('_ERROR_REALNAMEMISSING',       'Sinun täytyy antaa oikea nimesi');
+define('_ERROR_ATLEASTONEADMIN',       'Aina pitäisi olla ainakin yksi ylijärjestelmänvalvoja, joka voi kirjautua järjestelmänvalvoja alueelle.');
+define('_ERROR_ATLEASTONEBLOGADMIN','Tämä toiminnon suorittaminen jättäisi blogisi mahdottomaksi ylläpitää. Varmista että järjestelmänvalvojia on ainakin yksi.');
+define('_ERROR_ALREADYONTEAM',         'Et voi lisätä käyttäjää joka on jo hallintaryhmässä');
+define('_ERROR_BADSHORTBLOGNAME',      'Blogin id-nimi saisi sisältää vain merkkejä a-z ja 0-9, ilman välilyöntejä');
+define('_ERROR_DUPSHORTBLOGNAME',      'Toisella blogilla on jo valittu id-nimi. Näiden nimien tulisi erota toisistaan');
+define('_ERROR_UPDATEFILE',                    'Päivitystiedostoon ei voi saada kirjoitusoikeutta. Tarkista että tiedosto-oikeudet ovat ok (kokeile chmod 666). Huomaa myös, että sijainti on suhteellinen järjestelmänvalvoja hakemistoon nähden, joten saattanet haluta käyttää absoluuttista polkua (kuten /sinun/polkusi/nucleukseen/)');
+define('_ERROR_DELDEFBLOG',                    'Oletusblogia ei voi poistaa');
+define('_ERROR_DELETEMEMBER',          'Käyttäjää ei voi poistaa, koska hän on kirjoittanut artikkeleita ja/tai kommentteja tietokantaan');
+define('_ERROR_BADTEMPLATENAME',       'Sivuasetukselle antamasi nimi ei kelpaa. Käytä vain merkkejä a-z ja 0-9, ilman välilyöntejä');
+define('_ERROR_DUPTEMPLATENAME',       'Toinen asettelu käyttää jo tätä nimeä');
+define('_ERROR_BADSKINNAME',           'Epäkelpo nimi sivurungolle (käytä vain merkkejä a-z ja 0-9, ilman välilyöntejä)');
+define('_ERROR_DUPSKINNAME',           'Toinen sivurunko tällä nimellä on jo olemassa');
+define('_ERROR_DEFAULTSKIN',           'Sivurunko nimeltä "default" täytyy olla olemassa');
+define('_ERROR_SKINDEFDELETE',         'Sivurunkoa ei voi poistaa, koska se on vakiosivurunko seuraavalle weblogille: ');
+define('_ERROR_DISALLOWED',                    'Valitettavasti et ole oikeutettu suorittamaan tätä toimintoa');
+define('_ERROR_DELETEBAN',                     'Virhe poistettaessa estoa (estoa ei ole olemassa)');
+define('_ERROR_ADDBAN',                                'Virhe lisättäessä estoa. Estoa ei ehkei ole lisätty oikein kaikissa blogeissasi.');
+define('_ERROR_BADACTION',                     'Pyydettyä toimintoa ei ole');
+define('_ERROR_MEMBERMAILDISABLED',    'Käyttäjältä käyttäjälle -viestit ovat poissa käytöstä');
+define('_ERROR_MEMBERCREATEDISABLED','Käyttäjien luomismahdollisuus on poissa käytöstä');
+define('_ERROR_INCORRECTEMAIL',                'Epäkelpo osoite');
+define('_ERROR_VOTEDBEFORE',           'Olet jo antanut äänesi tälle artikkelille');
+define('_ERROR_BANNED1',                       'Toimintoa ei voi suorittaa johtuen siitä, että (esto ip:lle ');
+define('_ERROR_BANNED2',                       ') olet estetty tekemästä niin. Viesti oli: \'');
+define('_ERROR_BANNED3',                       '\'');
+define('_ERROR_LOGINNEEDED',           'Sinun täytyy olla kirjautunut sisään suorittaaksesi tämän toiminnon');
+define('_ERROR_CONNECT',                       'Yhdistämisvirhe');
+define('_ERROR_FILE_TOO_BIG',          'Tiedosto on liian iso!');
+define('_ERROR_BADFILETYPE',           'Valitettavasti tämä tiedostotyyppi ei ole sallittujen joukossa');
+define('_ERROR_BADREQUEST',                    'Epäkelpo tiedostonsiirto-pyyntö');
+define('_ERROR_DISALLOWEDUPLOAD',      'Et ole minkään weblogin hallintaryhmässä. Täten, et ole oikeutettu lähettämään tiedostoja blogiin');
+define('_ERROR_BADPERMISSIONS',                'Tiedosto/hakemisto -oikeudet eivät ole oikein asetetut');
+define('_ERROR_UPLOADMOVEP',           'Virhe tiedostoa siirrettäessä');
+define('_ERROR_UPLOADCOPY',                    'Virhe tiedostoa kopioidessa');
+define('_ERROR_UPLOADDUPLICATE',       'Toinen samanniminen tiedosto on jo olemassa. Kokeile sen uudelleennimeästä ennen tiedostonsiirtoa.');
+define('_ERROR_LOGINDISALLOWED',       'Valitettavasti et ole oikeutettu kirjautumaan järjestelmänvalvoja alueelle. Toisaalta, voit kirjautua sisään toisena käyttäjänä');
+define('_ERROR_DBCONNECT',                     'MySQL-palvelimeen ei saatu yhteyttä');
+define('_ERROR_DBSELECT',                      'Nucleus tietokantaa ei voitu valita.');
+define('_ERROR_NOSUCHLOCALE',          'Kyseistä kielitiedostoa ei ole olemassa');
+define('_ERROR_NOSUCHCATEGORY',                'Kyseistä kategoriaa ei ole olemassa');
+define('_ERROR_DELETELASTCATEGORY',    'Ainakin yksi kategoria täytyy olla olemassa');
+define('_ERROR_DELETEDEFCATEGORY',     'Vakiokategoriaa ei voi tuhota');
+define('_ERROR_BADCATEGORYNAME',       'Epäkelpo kategorian nimi');
+define('_ERROR_DUPCATEGORYNAME',       'Toinen samanniminen kategoria samaisella nimellä on jo olemassa');
+
+// some warnings (used for mediadir setting)
+define('_WARNING_NOTADIR',                     'Varoitus: Nykyinen arvo ei ole hakemisto!');
+define('_WARNING_NOTREADABLE',         'Varoitus: Nykyinen arvo on ei-lukuoikeudellinen hakemisto!');
+define('_WARNING_NOTWRITABLE',         'Varoitus: Nykyinen arvo EI ole kirjoitusoikeudellinen hakemisto!');
+
+// media and upload
+define('_MEDIA_UPLOADLINK',                    'Lähetä uusi tiedosto');
+define('_MEDIA_MODIFIED',                      'muokattu');
+define('_MEDIA_FILENAME',                      'tiedoston nimi');
+define('_MEDIA_DIMENSIONS',                    'mittasuhteet');
+define('_MEDIA_INLINE',                                'Inline');
+define('_MEDIA_POPUP',                         'Popup');
+define('_UPLOAD_TITLE',                                'Valitse tiedosto');
+define('_UPLOAD_MSG',                          'Valitse alta tiedosto, jonka haluat lähettää ja paina \'Lataa\' nappia.');
+define('_UPLOAD_BUTTON',                       'Lähetä');
+
+// some status messages
+define('_MSG_ACCOUNTCREATED',          'Käyttäjätili luotu, salasana lähetetään sähköpostitse');
+define('_MSG_PASSWORDSENT',                    'Salasana on lähetettyä sähköpostitse.');
+define('_MSG_LOGINAGAIN',                      'Sinun täytyy kirjautua sisään uudelleen, johtuen vaihtuneista tiedoista');
+define('_MSG_SETTINGSCHANGED',         'Asetuksia muutettu');
+define('_MSG_ADMINCHANGED',                    'Järjestelmänvalvoja muutettu');
+define('_MSG_NEWBLOG',                         'Uusi blogi luotu');
+define('_MSG_ACTIONLOGCLEARED',                'Toimintologi tyhjennetty');
+
+// actionlog in admin area
+define('_ACTIONLOG_DISALLOWED',                'Ei hyväksyttävä toiminto: ');
+define('_ACTIONLOG_PWDREMINDERSENT','Uusi salasana on lähetetty käyttäjälle ');
+define('_ACTIONLOG_TITLE',                     'Toimintologi');
+define('_ACTIONLOG_CLEAR_TITLE',       'Tyhjennä toimintologi');
+define('_ACTIONLOG_CLEAR_TEXT',                'Tyhjennä toimintologi nyt');
+
+// team management
+define('_TEAM_TITLE',                          'Käsittele blogin hallintaryhmää ');
+define('_TEAM_CURRENT',                                'Nykyinen hallintaryhmä');
+define('_TEAM_ADDNEW',                         'Lisää uusi käyttäjä hallintaryhmään');
+define('_TEAM_CHOOSEMEMBER',           'Valitse käyttäjä');
+define('_TEAM_ADMIN',                          'Ylläpitäjän oikeudet? ');
+define('_TEAM_ADD',                                    'Lisää hallintaryhmään');
+define('_TEAM_ADD_BTN',                                'Lisää hallintaryhmään');
+
+// blogsettings
+define('_EBLOG_TITLE',                         'Säädä asetuksia blogiin');
+define('_EBLOG_TEAM_TITLE',                    'Käsittele hallintaryhmää');
+define('_EBLOG_TEAM_TEXT',                     'Klikkaa tästä käsitelläksesi hallintaryhmääsi.');
+define('_EBLOG_SETTINGS_TITLE',                'Blogin asetukset');
+define('_EBLOG_NAME',                          'Blogin nimi');
+define('_EBLOG_SHORTNAME',                     'Blogin id-nimi');
+define('_EBLOG_SHORTNAME_EXTRA',       '<br />(saisi sisältää vain merkkejä a-z ja 0-9, ilman välilyöntejä)');
+define('_EBLOG_DESC',                          'Blogin kuvaus');
+define('_EBLOG_URL',                           'URL');
+define('_EBLOG_DEFSKIN',                       'Vakiosivurunko');
+define('_EBLOG_DEFCAT',                                'Vakiokategoria');
+define('_EBLOG_LINEBREAKS',                    'Konvertoi rivinvaihdot');
+define('_EBLOG_DISABLECOMMENTS',       'Kommentit sallittuja?<br /><small>(Estämällä kommenttien kirjoittaminen, kommenttien lisääminen ei ole mahdollista.)</small>');
+define('_EBLOG_ANONYMOUS',                     'Salli kommentit ei-käyttäjiltä?');
+define('_EBLOG_NOTIFY',                                'Ilmoitussähköpostiosoite/-osoitteet (käytä puolipistemerkkiä ; erottajana)');
+define('_EBLOG_NOTIFY_ON',                     'Ilmoitukset päällä');
+define('_EBLOG_NOTIFY_COMMENT',                'Uusista kommenteista');
+define('_EBLOG_NOTIFY_KARMA',          'Uusista karma äänestyksistä');
+define('_EBLOG_NOTIFY_ITEM',           'Uusista weblogin artikkeleista');
+define('_EBLOG_PING',                          'Pingaa Weblogs.com päivityksistä?');
+define('_EBLOG_MAXCOMMENTS',           'Kommenttien maksimimäärä');
+define('_EBLOG_UPDATE',                                'Päivitystiedosto');
+define('_EBLOG_OFFSET',                                'Ajan muutos');
+define('_EBLOG_STIME',                         'Nykyinen serverin aika on');
+define('_EBLOG_BTIME',                         'Nykyinen blogin aika on');
+define('_EBLOG_CHANGE',                                'Muuta asetuksia');
+define('_EBLOG_CHANGE_BTN',                    'Muuta asetuksia');
+define('_EBLOG_ADMIN',                         'Blogin ylläpito');
+define('_EBLOG_ADMIN_MSG',                     'Sinulle asetetaan järjestelmänvalvoja oikeudet');
+define('_EBLOG_CREATE_TITLE',          'Uusi weblogi');
+define('_EBLOG_CREATE_TEXT',           'Täytä alla oleva kaavake luodaksesi uuden weblogin. <br /><br /> <b>Huomaa:</b> Vain tarvittavat kentät on listattu. Jos haluat säätää muita optioita, siirry blogin asetussivulle weblogin luomisen jälkeen.');
+define('_EBLOG_CREATE',                                'Luo!');
+define('_EBLOG_CREATE_BTN',                    'Luo weblogi');
+define('_EBLOG_CAT_TITLE',                     'Kategoriat');
+define('_EBLOG_CAT_NAME',                      'Kategorian nimi');
+define('_EBLOG_CAT_DESC',                      'Kategorian kuvaus');
+define('_EBLOG_CAT_CREATE',                    'Luo uusi kategoria');
+define('_EBLOG_CAT_UPDATE',                    'Päivitä kategoria');
+define('_EBLOG_CAT_UPDATE_BTN',                'Päivitä kategoria');
+
+// templates
+define('_TEMPLATE_TITLE',                      'Asettelut');
+define('_TEMPLATE_AVAILABLE_TITLE',    'Tarjolla olevat asettelut');
+define('_TEMPLATE_NEW_TITLE',          'Uusi asettelu');
+define('_TEMPLATE_NAME',                       'Asettelun nimi');
+define('_TEMPLATE_DESC',                       'Asettelun kuvaus');
+define('_TEMPLATE_CREATE',                     'Luo asettelu');
+define('_TEMPLATE_CREATE_BTN',         'Luo asettelu');
+define('_TEMPLATE_EDIT_TITLE',         'Asettelut');
+define('_TEMPLATE_BACK',                       'Takaisin asettelut -sivulle');
+define('_TEMPLATE_EDIT_MSG',           'Kaikkia asetteluja ei tarvita. Voit jättää osan tyhjäksi.');
+define('_TEMPLATE_SETTINGS',           'Asettelun asetukset');
+define('_TEMPLATE_ITEMS',                      'Artikkelit');
+define('_TEMPLATE_ITEMHEADER',         'Artikkelin ylätunniste');
+define('_TEMPLATE_ITEMBODY',           'Artikkelin sisältö');
+define('_TEMPLATE_ITEMFOOTER',         'Artikkelin alatunniste');
+define('_TEMPLATE_MORELINK',           'Linkki laajennettuun artikkeliin');
+define('_TEMPLATE_NEW',                                'Uuden artikkelin merkki');
+define('_TEMPLATE_COMMENTS_ANY',       'Kommentit (jos niitä on)');
+define('_TEMPLATE_CHEADER',                    'Kommentin ylätunniste');
+define('_TEMPLATE_CBODY',                      'Kommentin sisältö');
+define('_TEMPLATE_CFOOTER',                    'Kommentin alatunniste');
+define('_TEMPLATE_CONE',                       'Yksi kommentti');
+define('_TEMPLATE_CMANY',                      'Kaksi (tai useampi) kommenttia');
+define('_TEMPLATE_CMORE',                      'Kommentin lue_lisää');
+define('_TEMPLATE_CMEXTRA',                    'Käyttäjäextrat');
+define('_TEMPLATE_COMMENTS_NONE',      'Kommentit (jos niitä ei ole)');
+define('_TEMPLATE_CNONE',                      'Ei kommentteja');
+define('_TEMPLATE_COMMENTS_TOOMUCH','Kommentit (jos niitä on, mutta liikaa jotta ne voitaisiin näyttää)');
+define('_TEMPLATE_CTOOMUCH',           'Liikaa kommentteja');
+define('_TEMPLATE_ARCHIVELIST',                'Arkistolistaukset');
+define('_TEMPLATE_AHEADER',                    'Arkistolistauksen ylätunniste');
+define('_TEMPLATE_AITEM',                      'Arkistolistauksen artikkeli');
+define('_TEMPLATE_AFOOTER',                    'Arkistolistauksen alatunniste');
+define('_TEMPLATE_DATETIME',           'Päiväys ja kellonaika');
+define('_TEMPLATE_DHEADER',                    'Päiväyksen ylätunniste');
+define('_TEMPLATE_DFOOTER',                    'Päiväyksen alatunniste');
+define('_TEMPLATE_DFORMAT',                    'Päiväyksen formaatti');
+define('_TEMPLATE_TFORMAT',                    'Kellonajan formaatti');
+define('_TEMPLATE_LOCALE',                     'Paikallinen päiväys');
+define('_TEMPLATE_IMAGE',                      'Kuva popupit');
+define('_TEMPLATE_PCODE',                      'Popupin linkkikoodi');
+define('_TEMPLATE_ICODE',                      'Inline kuvan koodi');
+define('_TEMPLATE_MCODE',                      'Media objektin linkkikoodi');
+define('_TEMPLATE_SEARCH',                     'Etsi');
+define('_TEMPLATE_SHIGHLIGHT',         'Korosta');
+define('_TEMPLATE_SNOTFOUND',          'Haku ei palauttanut mitään');
+define('_TEMPLATE_UPDATE',                     'Päivitä');
+define('_TEMPLATE_UPDATE_BTN',         'Päivitä asettelu');
+define('_TEMPLATE_RESET_BTN',          'Resetoi data');
+define('_TEMPLATE_CATEGORYLIST',       'Kategorialistaus');
+define('_TEMPLATE_CATHEADER',          'Kategorialistan ylätunniste');
+define('_TEMPLATE_CATITEM',                    'Kategorialistan kategoria');
+define('_TEMPLATE_CATFOOTER',          'Kategorialistan alatunniste');
+
+// skins
+define('_SKIN_EDIT_TITLE',                     'Sivurungot');
+define('_SKIN_AVAILABLE_TITLE',                'Tarjolla olevat sivurungot');
+define('_SKIN_NEW_TITLE',                      'Uusi sivurunko');
+define('_SKIN_NAME',                           'Nimi');
+define('_SKIN_DESC',                           'Kuvaus');
+define('_SKIN_TYPE',                           'Sisällön tyyppi');
+define('_SKIN_CREATE',                         'Luo');
+define('_SKIN_CREATE_BTN',                     'Luo sivurunko');
+define('_SKIN_EDITONE_TITLE',          'Muokkaa sivurunkoa');
+define('_SKIN_BACK',                           'Takaisin sivurunko -sivulle');
+define('_SKIN_PARTS_TITLE',                    'Sivurungon osat');
+define('_SKIN_PARTS_MSG',                      'Kaikkia osia ei tarvita jokaiselle sivurungolle. Jätä tyhjäksi ne joita et tarvitse. Valitse muokattava sivurunko alta:');
+define('_SKIN_PART_MAIN',                      'Artikkelit (indeksi)');
+define('_SKIN_PART_ITEM',                      'Yksittäiset artikkelisivut');
+define('_SKIN_PART_ALIST',                     'Arkisto (indeksi)');
+define('_SKIN_PART_ARCHIVE',           'Arkistolistaukset');
+define('_SKIN_PART_SEARCH',                    'Etsi');
+define('_SKIN_PART_ERROR',                     'Virheet');
+define('_SKIN_PART_MEMBER',                    'Käyttäjän tiedot');
+define('_SKIN_PART_POPUP',                     'Kuva popupit');
+define('_SKIN_GENSETTINGS_TITLE',      'Yleiset asetukset');
+define('_SKIN_CHANGE',                         'Muuta');
+define('_SKIN_CHANGE_BTN',                     'Muuta näitä asetuksia');
+define('_SKIN_UPDATE_BTN',                     'Päivitä sivurunko');
+define('_SKIN_RESET_BTN',                      'Resetoi data');
+define('_SKIN_EDITPART_TITLE',         'Muokkaa sivurunkoa');
+define('_SKIN_GOBACK',                         'Palaa takaisin');
+define('_SKIN_ALLOWEDVARS',                    'Sallitut muuttujat (klikkaa saadaksesi infoa):');
+
+// global settings
+define('_SETTINGS_TITLE',                      'Yleiset asetukset');
+define('_SETTINGS_SUB_GENERAL',                'Yleiset asetukset');
+define('_SETTINGS_DEFBLOG',                    'Vakioblogi');
+define('_SETTINGS_ADMINMAIL',          'Ylläpitäjän sähköpostiosoite');
+define('_SETTINGS_SITENAME',           'Sivuston nimi');
+define('_SETTINGS_SITEURL',                    'Sivuston URL (pitäisi loppua kauttaviivaan)');
+define('_SETTINGS_ADMINURL',           'Järjestelmänvalvoja-alueen osoite (pitäisi loppua kauttaviivaan)');
+define('_SETTINGS_DIRS',                       'Nucleus -hakemisto');
+define('_SETTINGS_MEDIADIR',           'Media -hakemisto');
+define('_SETTINGS_SEECONFIGPHP',       '(katso config.php)');
+define('_SETTINGS_MEDIAURL',           'Media URL (pitäisi loppua kauttaviivaan)');
+define('_SETTINGS_ALLOWUPLOAD',                'Salli tiedostojen lähetys blogiin?');
+define('_SETTINGS_ALLOWUPLOADTYPES','Sallitut tiedostomuodot lähettäessä');
+define('_SETTINGS_CHANGELOGIN',                'Salli käyttäjien vaihtaa tunnusta/salasanaa');
+define('_SETTINGS_COOKIES_TITLE',      'Evästeasetukset');
+define('_SETTINGS_COOKIELIFE',         'Kirjautumisevästeen elinaika');
+define('_SETTINGS_COOKIESESSION',      'Istuntoeväste');
+define('_SETTINGS_COOKIEMONTH',                'Kuukauden elinaika');
+define('_SETTINGS_COOKIEPATH',         'Evästepolku (edistykselliset)');
+define('_SETTINGS_COOKIEDOMAIN',       'Cookie Domain (edistykselliset)');
+define('_SETTINGS_COOKIESECURE',       'Secure Cookie (edistykselliset)');
+define('_SETTINGS_LASTVISIT',          'Tallenna edellisen käynnin evästeet');
+define('_SETTINGS_ALLOWCREATE',                'Salli käyttäjien luoda käyttäjätili');
+define('_SETTINGS_NEWLOGIN',           'Sisäänkirjautuminen sallittu käyttäjän luomilla tileillä');
+define('_SETTINGS_NEWLOGIN2',          '(koskee vain vasta luotuja tilejä)');
+define('_SETTINGS_MEMBERMSGS',         'Salli käyttäjältä-käyttäjälle palvelu');
+define('_SETTINGS_LOCALE',             'Vakiokieli');
+define('_SETTINGS_DISABLESITE',                'Sivusto pois käytöstä');
+define('_SETTINGS_DBLOGIN',                    'MySQL -kirjautuminen &amp; -tietokanta');
+define('_SETTINGS_UPDATE',                     'Päivitä asetukset');
+define('_SETTINGS_UPDATE_BTN',         'Päivitä asetukset');
+define('_SETTINGS_DISABLEJS',          'JavaScript -työkalurivi pois käytöstä');
+define('_SETTINGS_MEDIA',                      'Media/lataus -asetukset');
+define('_SETTINGS_MEDIAPREFIX',                'Päiväysetuliite ladatuille tiedostoille');
+define('_SETTINGS_MEMBERS',                    'Käyttäjäasetukset');
+
+// bans
+define('_BAN_TITLE',                           'Estolistasi blogissa');
+define('_BAN_NONE',                                    'Ei estoja tälle weblogille');
+define('_BAN_NEW_TITLE',                       'Lisää uusi esto');
+define('_BAN_NEW_TEXT',                                'Lisää uusi esto nyt');
+define('_BAN_REMOVE_TITLE',                    'Poista esto');
+define('_BAN_IPRANGE',                         'IP-osoite');
+define('_BAN_BLOGS',                           'Mitkä blogit?');
+define('_BAN_DELETE_TITLE',                    'Poista esto');
+define('_BAN_ALLBLOGS',                                'Kaikki blogit joihin sinulla on järjestelmänvalvojan oikeudet.');
+define('_BAN_REMOVED_TITLE',           'Esto poistettu');
+define('_BAN_REMOVED_TEXT',                    'Esto poistettu seuraavista blogeista:');
+define('_BAN_ADD_TITLE',                       'Lisää esto');
+define('_BAN_IPRANGE_TEXT',                    'Valitse ip-osoite, jonka haluat blokata. Mitä vähemmän numeroita siinä on, sitä enemmän osoitteita tullaan blokkaamaan.');
+define('_BAN_BLOGS_TEXT',                      'Voit estää ip:n vain yhdellä blogilla tai voit estää ip:n kaikilla niillä blogeilla, joihin sinulla järjestelmänvalvojan oikeudet. Tee valintasi alla.');
+define('_BAN_REASON_TITLE',                    'Syy');
+define('_BAN_REASON_TEXT',                     'Voit osoittaa syyn estolle, joka näytetään kun ip:n haltija yrittää lisätä uuden kommentin tai antaa karma äänen. Maksimipituus on 256 merkkiä.');
+define('_BAN_ADD_BTN',                         'Lisää esto');
+
+// LOGIN screen
+define('_LOGIN_MESSAGE',                       'Viesti');
+define('_LOGIN_NAME',                          'Tunnus');
+define('_LOGIN_PASSWORD',                      'Salasana');
+define('_LOGIN_SHARED',                                _LOGINFORM_SHARED);
+define('_LOGIN_FORGOT',                                'Unohditko salasanasi?');
+
+// membermanagement
+define('_MEMBERS_TITLE',                       'Käyttäjät');
+define('_MEMBERS_CURRENT',                     'Nykyiset käyttäjät');
+define('_MEMBERS_NEW',                         'Uusi käyttäjä');
+define('_MEMBERS_DISPLAY',                     'Tunnus');
+define('_MEMBERS_DISPLAY_INFO',                '(Tämä on tunnus jota käytät kirjautumiseen)');
+define('_MEMBERS_REALNAME',                    'Oikea nimi');
+define('_MEMBERS_PWD',                         'Salasana');
+define('_MEMBERS_REPPWD',                      'Toista salasana');
+define('_MEMBERS_EMAIL',                       'Sähköpostiosoite');
+define('_MEMBERS_EMAIL_EDIT',          '(Kun vaihdat sähköpostiosoitetta, uusi salasana tullaan automaattisesti postittamaan siihen osoitteeseen)');
+define('_MEMBERS_URL',                         'Sivuston osoite (URL)');
+define('_MEMBERS_SUPERADMIN',          'Järjestelmänvalvojan oikeudet');
+define('_MEMBERS_CANLOGIN',                    'Voi kirjautua järjestelmänvalvoja alueelle');
+define('_MEMBERS_NOTES',                       'Tietoja');
+define('_MEMBERS_NEW_BTN',                     'Lisää käyttäjä');
+define('_MEMBERS_EDIT',                                'Käyttäjätietojen muokkaus');
+define('_MEMBERS_EDIT_BTN',                    'Muuta asetuksia');
+define('_MEMBERS_BACKTOOVERVIEW',      'Takaisin käyttäjät -sivulle');
+define('_MEMBERS_LOCALE',                      'Kieli');
+define('_MEMBERS_USESITELANG',         '- käytä sivuston vakioasetusta -');
+
+// List of blogs (TT = tooltip)
+define('_BLOGLIST_TT_VISIT',           'Käy sivustolla');
+define('_BLOGLIST_ADD',                                'Lisää artikkeli');
+define('_BLOGLIST_TT_ADD',                     'Lisää artikkeli tähän weblogiin');
+define('_BLOGLIST_EDIT',                       'Muokkaa/poista artikkeleita');
+define('_BLOGLIST_TT_EDIT',                    '');
+define('_BLOGLIST_BMLET',                      'Bookmarklet');
+define('_BLOGLIST_TT_BMLET',           '');
+define('_BLOGLIST_SETTINGS',           'Asetukset');
+define('_BLOGLIST_TT_SETTINGS',                'Säädä asetuksia tai käsittele hallintaryhmää');
+define('_BLOGLIST_BANS',                       'Estot');
+define('_BLOGLIST_TT_BANS',                    'Tarkastele, lisää tai poista estettyjä ip:itä');
+define('_BLOGLIST_DELETE',                     'Poista kaikki');
+define('_BLOGLIST_TT_DELETE',          'Poista tämä weblogi');
+
+// OVERVIEW screen
+define('_OVERVIEW_YRBLOGS',                    'Weblogisi');
+define('_OVERVIEW_YRDRAFTS',           'Vedoksesi');
+define('_OVERVIEW_YRSETTINGS',         'Asetuksesi');
+define('_OVERVIEW_GSETTINGS',          'Yleiset asetukset');
+define('_OVERVIEW_NOBLOGS',                    'Et ole minkään weblogin hallintaryhmässä');
+define('_OVERVIEW_NODRAFTS',           'Ei vedoksia');
+define('_OVERVIEW_EDITSETTINGS',       'Muokkaa omia tietojasi...');
+define('_OVERVIEW_BROWSEITEMS',                'Selaa artikkeleitasi...');
+define('_OVERVIEW_BROWSECOMM',         'Selaa kommenttejasi...');
+define('_OVERVIEW_VIEWLOG',                    'Tarkastele toimintologia...');
+define('_OVERVIEW_MEMBERS',                    'Hallitse käyttäjiä...');
+define('_OVERVIEW_NEWLOG',                     'Luo uusi weblogi...');
+define('_OVERVIEW_SETTINGS',           'Säädä yleisiä asetuksia...');
+define('_OVERVIEW_TEMPLATES',          'Muokkaa asetteluja...');
+define('_OVERVIEW_SKINS',                      'Muokkaa sivurunkoja...');
+define('_OVERVIEW_BACKUP',                     'Tee varmuuskopio / palauta varmuuskopio...');
+=======
 define('_ADD_ADDTO',                   'Ajouter un billet à');
 define('_ADD_CREATENEW',               'Créer un nouveau billet');
 define('_ADD_BODY',                    'Corps');
@@ -1261,12 +2071,47 @@ define('_OVERVIEW_SETTINGS',            'Modifier les r
 define('_OVERVIEW_TEMPLATES',          'Modifier les modèles...');
 define('_OVERVIEW_SKINS',              'Modifier les habillages...');
 define('_OVERVIEW_BACKUP',             'Sauvegarde/Récupération...');
+>>>>>>> skinnable-master
 
 // ITEMLIST
-define('_ITEMLIST_BLOG',               'Billets du blog'); 
-define('_ITEMLIST_YOUR',               'Vos billets');
+define('_ITEMLIST_BLOG',                       'Artikkelit blogiin'); 
+define('_ITEMLIST_YOUR',                       'Artikkelisi');
 
 // Comments
+<<<<<<< HEAD
+define('_COMMENTS',                                    'Kommentteja');
+define('_NOCOMMENTS',                          'Ei kommentteja tähän artikkeliin');
+define('_COMMENTS_YOUR',                       'Kommenttisi');
+define('_NOCOMMENTS_YOUR',                     'Et ole kirjoittanut kommentteja');
+
+// LISTS (general)
+define('_LISTS_NOMORE',                                'Ei enää hakuvastauksia tai ei hakuvastauksia ollenkaan');
+define('_LISTS_PREV',                          'Edellinen');
+define('_LISTS_NEXT',                          'Seuraava');
+define('_LISTS_SEARCH',                                'Etsi');
+define('_LISTS_CHANGE',                                'Muuta');
+define('_LISTS_PERPAGE',                       'artikkelia/sivu');
+define('_LISTS_ACTIONS',                       'Toiminnot');
+define('_LISTS_DELETE',                                'Poista');
+define('_LISTS_EDIT',                          'Muokkaa');
+define('_LISTS_MOVE',                          'Siirrä');
+define('_LISTS_CLONE',                         'Monista');
+define('_LISTS_TITLE',                         'Otsikko');
+define('_LISTS_BLOG',                          'Blogi');
+define('_LISTS_NAME',                          'Nimi');
+define('_LISTS_DESC',                          'Kuvaus');
+define('_LISTS_TIME',                          'Päiväys');
+define('_LISTS_COMMENTS',                      'Kommentit');
+define('_LISTS_TYPE',                          'Tyyppi');
+
+
+// member list 
+define('_LIST_MEMBER_NAME',                    'Tunnus');
+define('_LIST_MEMBER_RNAME',           'Oikea nimi');
+define('_LIST_MEMBER_ADMIN',           'Ylijärjestelmänvalvoja? ');
+define('_LIST_MEMBER_LOGIN',           'Voi kirjautua sisään? ');
+define('_LIST_MEMBER_URL',                     'Verkkosivut');
+=======
 define('_COMMENTS',                    'Commentaires');
 define('_NOCOMMENTS',                  'Pas de commentaire pour ce billet');
 define('_COMMENTS_YOUR',               'Vos commentaires');
@@ -1299,30 +2144,52 @@ define('_LIST_MEMBER_RNAME',            'Nom');
 define('_LIST_MEMBER_ADMIN',           'Super admin? ');
 define('_LIST_MEMBER_LOGIN',           'Peut se connecter? ');
 define('_LIST_MEMBER_URL',             'Site');
+>>>>>>> skinnable-master
 
 // banlist
-define('_LIST_BAN_IPRANGE',            'Plage IP');
-define('_LIST_BAN_REASON',             'Motif');
+define('_LIST_BAN_IPRANGE',                    'IP-osoite');
+define('_LIST_BAN_REASON',                     'Syy');
 
 // actionlist
-define('_LIST_ACTION_MSG',             'Message');
+define('_LIST_ACTION_MSG',                     'Viesti');
 
 // commentlist
+<<<<<<< HEAD
+define('_LIST_COMMENT_BANIP',          'Estä IP');
+define('_LIST_COMMENT_WHO',                    'Kirjoittaja');
+define('_LIST_COMMENT',                                'Kommentti');
+define('_LIST_COMMENT_HOST',           'Isäntäkone');
+=======
 define('_LIST_COMMENT_BANIP',          'Exclure l\'IP');
 define('_LIST_COMMENT_WHO',            'Auteur');
 define('_LIST_COMMENT',                        'Commentaire');
 define('_LIST_COMMENT_HOST',           'Hôte');
+>>>>>>> skinnable-master
 
 // itemlist
-define('_LIST_ITEM_INFO',              'Info');
-define('_LIST_ITEM_CONTENT',           'Titre et contenu');
+define('_LIST_ITEM_INFO',                      'Info');
+define('_LIST_ITEM_CONTENT',           'Otsikko ja teksti');
 
 
 // teamlist
-define('_LIST_TEAM_ADMIN',             'Admin ');
-define('_LIST_TEAM_CHADMIN',           'Changer l\'admin');
+define('_LIST_TEAM_ADMIN',                     'Järjestelmänvalvoja ');
+define('_LIST_TEAM_CHADMIN',           'Vaihda järjestelmänvalvoja');
 
 // edit comments
+<<<<<<< HEAD
+define('_EDITC_TITLE',                         'Muokkaa kommentteja');
+define('_EDITC_WHO',                           'Kirjoittaja');
+define('_EDITC_HOST',                          'Mistä?');
+define('_EDITC_WHEN',                          'Milloin?');
+define('_EDITC_TEXT',                          'Teksti');
+define('_EDITC_EDIT',                          'Muokkaa kommenttia');
+define('_EDITC_MEMBER',                                'käyttäjä');
+define('_EDITC_NONMEMBER',                     'ei-käyttäjä');
+
+// move item
+define('_MOVE_TITLE',                          'Siirrä mihin blogiin?');
+define('_MOVE_BTN',                                    'Siirrä artikkeli');
+=======
 define('_EDITC_TITLE',                 'Modifier les commentaires');
 define('_EDITC_WHO',                   'Auteur');
 define('_EDITC_HOST',                  'D\'où?');
@@ -1351,3 +2218,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index 1219d6f..0ad5844 100644 (file)
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: fr_Latn_FR.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: fr_Latn_FR.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index f60f99f..bf5512b 100644 (file)
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: gl_Latn_ES.ISO-8859-1.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: gl_Latn_ES.ISO-8859-1.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -545,6 +549,12 @@ define('_MEDIA_COLLECTION_LABEL',  'Colecci
 define('_ADD_ALIGNLEFT_TT',                    'Alinear á esquerda');
 define('_ADD_ALIGNRIGHT_TT',           'Alinear á derieta');
 define('_ADD_ALIGNCENTER_TT',          'Alinear ó centro');
+<<<<<<< HEAD
+
+// searchable blog setting (yes/no)
+define('_EBLOG_SEARCH',                                'Incluir en búsquedas');
+=======
+>>>>>>> skinnable-master
 
 // generic upload failure
 define('_ERROR_UPLOADFAILED',          'Erro ó subir');
index a478e8f..df67a07 100644 (file)
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
+<?
+=======
 <?php
+>>>>>>> skinnable-master
 /**
  * Nucleus Translation File
  * Galician in Spain (Latin script)
@@ -8,7 +12,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: gl_Latn_ES.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: gl_Latn_ES.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index 45c1e87..4752532 100644 (file)
 /********************************************
  *        Start New for 4.0                 *
  ********************************************/
+<<<<<<< HEAD
+define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
+define('_LISTS_AUTHOR', 'Author');
+define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts');
+=======
 /* argument value for setlocale() in Microsoft's windows operating system */
 define('_LOCALE_IN_WINDOWS',   'C');
 
@@ -99,6 +105,7 @@ define('_SETTINGS_BKMKLTSKIN',                               'default skin for bookmarklet');
 define('_MEMBERS_BKMKLTSKIN',                          "bookmarklet skin");
 define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         'The version which is being used is latest.');
 
+>>>>>>> skinnable-master
 /********************************************
  *        Start New for 3.6x                *
  ********************************************/
@@ -162,6 +169,17 @@ define('_EDITC_EMAIL',                             'E-mail');
 
 define('_MANAGER_PLUGINFILE_NOTFOUND',                         "Plugin %s was not loaded (File not found)");
 /* changed */
+<<<<<<< HEAD
+// plugin dependency 
+define('_ERROR_INSREQPLUGIN',          'Plugin installation failed, requires %s');
+define('_ERROR_DELREQPLUGIN',          'Plugin deletion failed, required by %s');
+
+//define('_ADD_ADDLATER',                                                              'Add Later');
+define('_ADD_ADDLATER',                                                                'Add the dates specified');
+
+define('_LOGIN_NAME',                          'Name:');
+define('_LOGIN_PASSWORD',                      'Password:');
+=======
 // plugin dependency
 define('_ERROR_INSREQPLUGIN',                  'Instalacija plugina nije uspjela, potrebno je ');
 define('_ERROR_DELREQPLUGIN',                  'Nije moguće ukloniti plugin, potrebno je ');
@@ -171,6 +189,7 @@ define('_ADD_ADDLATER',                                     'Dodaj kasnije');
 
 define('_LOGIN_NAME',                                  'Korisničko ime');
 define('_LOGIN_PASSWORD',                              'Zaporka');
+>>>>>>> skinnable-master
 
 // changed from _BOOKMARLET_BMARKLFOLLOW
 define('_BOOKMARKLET_BMARKFOLLOW',                                     ' (Works with nearly all browsers)');
@@ -267,7 +286,17 @@ define('_PLUGIN_OPTIONS_TITLE',                                                    'Options for %s');
 // Plugin file loda error
 define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
 
+<<<<<<< HEAD
+//ITEM add/edit template (for japanese only)
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
+=======
 define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+>>>>>>> skinnable-master
 
 // Errors
 define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
@@ -425,6 +454,13 @@ define('_ARCHIVETYPE_MONTH',                       'mjesec');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                             'Neodgovarajući ili već iskorišteni kupon.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',                  'Instalacija plugina nije uspjela, potrebno je ');
+define('_ERROR_DELREQPLUGIN',                  'Nije moguće ukloniti plugin, potrebno je ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',               'Cookie prefiks');
 
@@ -827,6 +863,10 @@ define('_COMMENTFORM_YOUARE',                      'Vi ste');
 define('_COMMENTFORM_SUBMIT',                  'Dodajte komentar');
 define('_COMMENTFORM_COMMENT',         'Vaš komentar');
 define('_COMMENTFORM_NAME',                            'Ime');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                            'E-mail/http');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Zapamti');
 
 // loginform
@@ -853,6 +893,10 @@ define('_ADD_DISABLE_COMMENTS',            'Isključiti komentare?');
 define('_ADD_DRAFTNFUTURE',                            'Draft &amp; za kasnije postove');
 define('_ADD_ADDITEM',                                 'Dodaj post');
 define('_ADD_ADDNOW',                                  'Dodaj sada');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                        'Dodaj kasnije');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                        'Kada dodati');
 define('_ADD_ADDDRAFT',                                        'Dodaj u draftove');
 define('_ADD_NOPASTDATES',                             '(raniji datumi i vrijeme ne mogu biti prihvaćeni, u slučaju njihovog odabira bit će uneseni trenutni datum i vrijeme.)');
@@ -1197,6 +1241,11 @@ define('_BAN_ADD_BTN',                                   'Postavi blokadu');
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                               'Obavijest');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                                  'Korisničko ime');
+define('_LOGIN_PASSWORD',                              'Zaporka');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                        _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                        'Zaboravili ste zaporku?');
 
@@ -1327,6 +1376,8 @@ define('_EDITC_NONMEMBER',                                'posjetitelj');
 // move item
 define('_MOVE_TITLE',                                  'U koji blog prenijeti ovaj post?');
 define('_MOVE_BTN',                                            'Prenesi post');
+<<<<<<< HEAD
+=======
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
@@ -1343,3 +1394,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index a10d3ef..2025736 100644 (file)
 /********************************************
  *        Start New for 4.0                 *
  ********************************************/
+<<<<<<< HEAD
+define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
+define('_LISTS_AUTHOR', 'Author');
+define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts');
+=======
 /* argument value for setlocale() in Microsoft's windows operating system */
 define('_LOCALE_IN_WINDOWS',   'C');
 
@@ -99,6 +105,7 @@ define('_SETTINGS_BKMKLTSKIN',                               'default skin for bookmarklet');
 define('_MEMBERS_BKMKLTSKIN',                          "bookmarklet skin");
 define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         'The version which is being used is latest.');
 
+>>>>>>> skinnable-master
 /********************************************
  *        Start New for 3.6x                *
  ********************************************/
@@ -162,6 +169,17 @@ define('_EDITC_EMAIL',                             'E-mail');
 
 define('_MANAGER_PLUGINFILE_NOTFOUND',                         "Plugin %s was not loaded (File not found)");
 /* changed */
+<<<<<<< HEAD
+// plugin dependency 
+define('_ERROR_INSREQPLUGIN',          'Plugin installation failed, requires %s');
+define('_ERROR_DELREQPLUGIN',          'Plugin deletion failed, required by %s');
+
+//define('_ADD_ADDLATER',                                                              'Add Later');
+define('_ADD_ADDLATER',                                                                'Add the dates specified');
+
+define('_LOGIN_NAME',                          'Name:');
+define('_LOGIN_PASSWORD',                      'Password:');
+=======
 // plugin dependency
 define('_ERROR_INSREQPLUGIN',                  'Instalacija plugina nije uspjela, potrebno je ');
 define('_ERROR_DELREQPLUGIN',                  'Nije moguæe ukloniti plugin, potrebno je ');
@@ -171,6 +189,7 @@ define('_ADD_ADDLATER',                                     'Dodaj kasnije');
 
 define('_LOGIN_NAME',                                  'Korisnièko ime');
 define('_LOGIN_PASSWORD',                              'Zaporka');
+>>>>>>> skinnable-master
 
 // changed from _BOOKMARLET_BMARKLFOLLOW
 define('_BOOKMARKLET_BMARKFOLLOW',                                     ' (Works with nearly all browsers)');
@@ -267,7 +286,17 @@ define('_PLUGIN_OPTIONS_TITLE',                                                    'Options for %s');
 // Plugin file loda error
 define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
 
+<<<<<<< HEAD
+//ITEM add/edit template (for japanese only)
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
+=======
 define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+>>>>>>> skinnable-master
 
 // Errors
 define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
@@ -425,6 +454,13 @@ define('_ARCHIVETYPE_MONTH',                       'mjesec');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                             'Neodgovarajuæi ili veæ iskori\9ateni kupon.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',                  'Instalacija plugina nije uspjela, potrebno je ');
+define('_ERROR_DELREQPLUGIN',                  'Nije moguæe ukloniti plugin, potrebno je ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',               'Cookie prefiks');
 
@@ -827,6 +863,10 @@ define('_COMMENTFORM_YOUARE',                      'Vi ste');
 define('_COMMENTFORM_SUBMIT',                  'Dodajte komentar');
 define('_COMMENTFORM_COMMENT',         'Va\9a komentar');
 define('_COMMENTFORM_NAME',                            'Ime');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                            'E-mail/http');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Zapamti');
 
 // loginform
@@ -853,6 +893,10 @@ define('_ADD_DISABLE_COMMENTS',            'Isklju
 define('_ADD_DRAFTNFUTURE',                            'Draft &amp; za kasnije postove');
 define('_ADD_ADDITEM',                                 'Dodaj post');
 define('_ADD_ADDNOW',                                  'Dodaj sada');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                        'Dodaj kasnije');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                        'Kada dodati');
 define('_ADD_ADDDRAFT',                                        'Dodaj u draftove');
 define('_ADD_NOPASTDATES',                             '(raniji datumi i vrijeme ne mogu biti prihvaæeni, u sluèaju njihovog odabira bit æe uneseni trenutni datum i vrijeme.)');
@@ -1197,6 +1241,11 @@ define('_BAN_ADD_BTN',                                   'Postavi blokadu');
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                               'Obavijest');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                                  'Korisnièko ime');
+define('_LOGIN_PASSWORD',                              'Zaporka');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                        _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                        'Zaboravili ste zaporku?');
 
@@ -1327,6 +1376,8 @@ define('_EDITC_NONMEMBER',                                'posjetitelj');
 // move item
 define('_MOVE_TITLE',                                  'U koji blog prenijeti ovaj post?');
 define('_MOVE_BTN',                                            'Prenesi post');
+<<<<<<< HEAD
+=======
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
@@ -1343,3 +1394,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index 46ff41c..10d7242 100644 (file)
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: hu_Latn_HU.ISO-8859-2.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: hu_Latn_HU.ISO-8859-2.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -426,6 +430,13 @@ define('_ARCHIVETYPE_MONTH',               'h
 
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'Hamis vagy lejárt címke.');
+<<<<<<< HEAD
+
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Plugin installáció sikertelen, szükséges: ');
+define('_ERROR_DELREQPLUGIN',          'Plugin törlése sikertelen, szükséges: ');
+=======
+>>>>>>> skinnable-master
 
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'Süti elõtag');
@@ -859,6 +870,10 @@ define('_ADD_DISABLE_COMMENTS',            'Megjegyz
 define('_ADD_DRAFTNFUTURE',                    'Piszkozat &amp; Jövõbeni elemek');
 define('_ADD_ADDITEM',                         'Elem hozzáadása');
 define('_ADD_ADDNOW',                          'Hozzáadás azonnal');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                'Hozzáadás késõbb');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                'Place on');
 define('_ADD_ADDDRAFT',                                'Hozzáadás a piszkozathoz');
 define('_ADD_NOPASTDATES',                     '(A régebbi dátum és idõ NEM érvényes, így ebben az esetben a mostani idõ lesz)');
@@ -1202,6 +1217,11 @@ define('_BAN_ADD_BTN',                           'Ban hozz
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                       'Üzenet');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                          'Név');
+define('_LOGIN_PASSWORD',                      'Jelszó');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                'Elfelejetted a jelszavad?');
 
@@ -1333,6 +1353,8 @@ define('_EDITC_NONMEMBER',                        'Nem tag');
 // move item
 define('_MOVE_TITLE',                          'Melyik blogba mozgassam?');
 define('_MOVE_BTN',                                    'Elem áthelyezése');
+<<<<<<< HEAD
+=======
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
@@ -1349,3 +1371,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index b784f3d..eda94cf 100644 (file)
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: hu_Latn_HU.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: hu_Latn_HU.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index 5882e1e..4e751bc 100644 (file)
 /********************************************
  *        Start New for 4.0                 *
  ********************************************/
+<<<<<<< HEAD
+define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
+define('_LISTS_AUTHOR', 'Author');
+define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts');
+=======
 /* argument value for setlocale() in Microsoft's windows operating system */
 define('_LOCALE_IN_WINDOWS',   'C');
 
@@ -99,6 +105,7 @@ define('_SETTINGS_BKMKLTSKIN',                               'default skin for bookmarklet');
 define('_MEMBERS_BKMKLTSKIN',                          "bookmarklet skin");
 define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         'The version which is being used is latest.');
 
+>>>>>>> skinnable-master
 /********************************************
  *        Start New for 3.6x                *
  ********************************************/
@@ -267,7 +274,17 @@ define('_PLUGIN_OPTIONS_TITLE',                                                    'Options for %s');
 // Plugin file loda error
 define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
 
+<<<<<<< HEAD
+//ITEM add/edit template (for japanese only)
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
+=======
 define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+>>>>>>> skinnable-master
 
 // Errors
 define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
@@ -427,6 +444,13 @@ define('_ARCHIVETYPE_MONTH',               'bulan');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'Tiket tidak sah atau kadaluarsa.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Instalasi Plugingagal, harus ada ');
+define('_ERROR_DELREQPLUGIN',          'Menghapus Plugin gagal, dibutuhkan oleh ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'Awalan Cookie');
 
@@ -829,6 +853,10 @@ define('_COMMENTFORM_YOUARE',              'Anda adalah');
 define('_COMMENTFORM_SUBMIT',          'Tambahkan komentar');
 define('_COMMENTFORM_COMMENT',         'Komentar Anda');
 define('_COMMENTFORM_NAME',                    'Nama');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                    'E-mail/HTTP');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Ingat Saya');
 
 // loginform
@@ -855,6 +883,10 @@ define('_ADD_DISABLE_COMMENTS',            'Tidak mengizinkan komentar?');
 define('_ADD_DRAFTNFUTURE',                    'Draft &amp; Isi untuk nanti');
 define('_ADD_ADDITEM',                         'Tambahkan Isi');
 define('_ADD_ADDNOW',                          'Tambahkan Sekarang');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                'Tambahkan Nanti');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                'Taruh di');
 define('_ADD_ADDDRAFT',                                'Tambahkan ke draft');
 define('_ADD_NOPASTDATES',                     '(tanggal dan waktu di masa lampau tidak sah, waktu yang sekarang yang akan dipakai)');
@@ -1198,6 +1230,11 @@ define('_BAN_ADD_BTN',                           'Tambah daftar cekal');
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                       'Pesan');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                          'Nama');
+define('_LOGIN_PASSWORD',                      'Password');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                'Lupa password Anda?');
 
@@ -1329,6 +1366,8 @@ define('_EDITC_NONMEMBER',                        'bukan anggota');
 // move item
 define('_MOVE_TITLE',                          'Pindahkan ke blog mana?');
 define('_MOVE_BTN',                                    'Pindahkan Isi');
+<<<<<<< HEAD
+=======
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
@@ -1345,3 +1384,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index be71884..e85be38 100644 (file)
 /********************************************
  *        Start New for 4.0                 *
  ********************************************/
+<<<<<<< HEAD
+define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
+define('_LISTS_AUTHOR', 'Author');
+define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts');
+=======
 /* argument value for setlocale() in Microsoft's windows operating system */
 define('_LOCALE_IN_WINDOWS',   'C');
 
@@ -99,6 +105,7 @@ define('_SETTINGS_BKMKLTSKIN',                               'default skin for bookmarklet');
 define('_MEMBERS_BKMKLTSKIN',                          "bookmarklet skin");
 define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         'The version which is being used is latest.');
 
+>>>>>>> skinnable-master
 /********************************************
  *        Start New for 3.6x                *
  ********************************************/
@@ -267,7 +274,17 @@ define('_PLUGIN_OPTIONS_TITLE',                                                    'Options for %s');
 // Plugin file loda error
 define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
 
+<<<<<<< HEAD
+//ITEM add/edit template (for japanese only)
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
+=======
 define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+>>>>>>> skinnable-master
 
 // Errors
 define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
@@ -427,6 +444,13 @@ define('_ARCHIVETYPE_MONTH',               'bulan');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'Tiket tidak sah atau kadaluarsa.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Instalasi Plugingagal, harus ada ');
+define('_ERROR_DELREQPLUGIN',          'Menghapus Plugin gagal, dibutuhkan oleh ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'Awalan Cookie');
 
@@ -829,6 +853,10 @@ define('_COMMENTFORM_YOUARE',              'Anda adalah');
 define('_COMMENTFORM_SUBMIT',          'Tambahkan komentar');
 define('_COMMENTFORM_COMMENT',         'Komentar Anda');
 define('_COMMENTFORM_NAME',                    'Nama');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                    'E-mail/HTTP');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Ingat Saya');
 
 // loginform
@@ -855,6 +883,10 @@ define('_ADD_DISABLE_COMMENTS',            'Tidak mengizinkan komentar?');
 define('_ADD_DRAFTNFUTURE',                    'Draft &amp; Isi untuk nanti');
 define('_ADD_ADDITEM',                         'Tambahkan Isi');
 define('_ADD_ADDNOW',                          'Tambahkan Sekarang');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                'Tambahkan Nanti');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                'Taruh di');
 define('_ADD_ADDDRAFT',                                'Tambahkan ke draft');
 define('_ADD_NOPASTDATES',                     '(tanggal dan waktu di masa lampau tidak sah, waktu yang sekarang yang akan dipakai)');
@@ -1198,6 +1230,11 @@ define('_BAN_ADD_BTN',                           'Tambah daftar cekal');
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                       'Pesan');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                          'Nama');
+define('_LOGIN_PASSWORD',                      'Password');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                'Lupa password Anda?');
 
@@ -1329,6 +1366,8 @@ define('_EDITC_NONMEMBER',                        'bukan anggota');
 // move item
 define('_MOVE_TITLE',                          'Pindahkan ke blog mana?');
 define('_MOVE_BTN',                                    'Pindahkan Isi');
+<<<<<<< HEAD
+=======
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
@@ -1345,3 +1384,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index ea5f92e..19a370e 100644 (file)
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: it_Latn_IT.ISO-8859-1.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: it_Latn_IT.ISO-8859-1.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -429,6 +433,13 @@ define('_ARCHIVETYPE_MONTH',               'mese');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'Biglietto non valido o scaduto.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Installazione del plugin fallita, richiede ');
+define('_ERROR_DELREQPLUGIN',          'Cancellazione del plugin fallita, è richiesto da ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'Prefisso dei Cookie');
 
index 4401962..7b10313 100644 (file)
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: it_Latn_IT.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: it_Latn_IT.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index 1134954..2b0b807 100644 (file)
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The NucleusCMS Japan¥Á¡¼¥à
+<<<<<<< HEAD
+ * @version $Id: ja_Jpan_JP.EUC-JP.php 1868 2012-05-22 05:10:53Z sakamocchi $
+ */
+
+/********************************************
+ *        Start New for 4.0                *
+=======
  * @version $Id: ja_Jpan_JP.EUC-JP.php 1887 2012-06-17 08:30:08Z sakamocchi $
  */
 
 /********************************************
  *        Start New for 4.0                 *
+>>>>>>> skinnable-master
  ********************************************/
 /* argument value for setlocale() in Microsoft's windows operating system */
 define('_LOCALE_IN_WINDOWS',   'jpn_jpn');
index 64f72fa..a6af85b 100644 (file)
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2009 The NucleusCMS Japanチーム
+<<<<<<< HEAD
+ * @version $Id: ja_Jpan_JP.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+ */
+
+/********************************************
+ *        Start New for 4.0                *
+=======
  * @version $Id: ja_Jpan_JP.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
  */
 
 /********************************************
  *        Start New for 4.0                 *
+>>>>>>> skinnable-master
  ********************************************/
 /* argument value for setlocale() in Microsoft's windows operating system */
 define('_LOCALE_IN_WINDOWS',   'jpn_jpn');
index cd16e8a..b75dae9 100644 (file)
@@ -9,7 +9,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: ko_Kore_KR.EUC-KR.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: ko_Kore_KR.EUC-KR.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index 7a93863..8b6cbb8 100644 (file)
@@ -9,7 +9,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: ko_Kore_KR.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: ko_Kore_KR.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index d10d1cc..e1dd678 100644 (file)
 /********************************************
  *        Start New for 4.0                 *
  ********************************************/
+<<<<<<< HEAD
+define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
+define('_LISTS_AUTHOR', 'Author');
+define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts');
+=======
 /* argument value for setlocale() in Microsoft's windows operating system */
 define('_LOCALE_IN_WINDOWS',   'C');
 
@@ -100,6 +106,7 @@ define('_SETTINGS_BKMKLTSKIN',                              'default skin for bookmarklet');
 define('_MEMBERS_BKMKLTSKIN',                          "bookmarklet skin");
 define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         'The version which is being used is latest.');
 
+>>>>>>> skinnable-master
 /********************************************
  *        Start New for 3.6x                *
  ********************************************/
@@ -268,7 +275,17 @@ define('_PLUGIN_OPTIONS_TITLE',                                                    'Options for %s');
 // Plugin file loda error
 define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
 
+<<<<<<< HEAD
+//ITEM add/edit template (for japanese only)
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
+=======
 define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+>>>>>>> skinnable-master
 
 // Errors
 define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
@@ -427,6 +444,13 @@ define('_ARCHIVETYPE_MONTH',               'مانگ');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'كارتێكی ناچالاك یان به‌سه‌رچوو');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'دامه‌زراندنی پێوه‌كراوه‌ی پێویسته‌ ');
+define('_ERROR_DELREQPLUGIN',          'پێوه‌كراوی سڕاوه‌ جێ‌به‌جی نه‌بووه‌');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'پرێفیكسی كووكیزه‌كان');
 
@@ -829,6 +853,10 @@ define('_COMMENTFORM_YOUARE',              'تۆ هه‌ته‌');
 define('_COMMENTFORM_SUBMIT',          'زیادكردنی بۆچوون');
 define('_COMMENTFORM_COMMENT',         'بۆچوونه‌كه‌ت');
 define('_COMMENTFORM_NAME',                    'ناو');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                    'پۆستی ئه‌لیكترۆنی یا وێبگه‌');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'به‌بیرم بهێنه‌وه‌');
 
 // loginform
@@ -855,6 +883,10 @@ define('_ADD_DISABLE_COMMENTS',            'ناچالاك كردنی بۆچوون؟');
 define('_ADD_DRAFTNFUTURE',                    'هه‌ڵگیراو &amp; بابه‌تی داهاتوو');
 define('_ADD_ADDITEM',                         'زیادكردنی بابه‌ت');
 define('_ADD_ADDNOW',                          'زیادكردن ئێستا');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                'پاشان زیادكردن');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                'ڕووبه‌ر بۆ');
 define('_ADD_ADDDRAFT',                                'زیادكردن بۆ هه‌ڵگیراوه‌كان');
 define('_ADD_NOPASTDATES',                     '(dates and times in the past are NOT valid, the current time will be used in that case)');
@@ -1198,6 +1230,11 @@ define('_BAN_ADD_BTN',                           'زیادكردنی قه‌ده‌غه‌كراو');
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                       'په‌یام');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                          'ناو');
+define('_LOGIN_PASSWORD',                      'وشه‌ی تێپه‌ڕبوون');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                'وشه‌ی تێپه‌ڕبوونت له‌بیركردوه‌؟');
 
@@ -1330,6 +1367,9 @@ define('_EDITC_NONMEMBER',                        'ئه‌ندام نی‌یه‌');
 define('_MOVE_TITLE',                          'بۆ كوێ ئه‌یگوازنه‌وه‌؟');
 define('_MOVE_BTN',                                    'گواستنه‌وه‌ی بابه‌ت');
 
+<<<<<<< HEAD
+?>
+=======
 // ADMIN-template template types
 include_once('adminskinTypes.php');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',          'navibar for item/comment list');
@@ -1345,3 +1385,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index a3d3974..6e54fff 100644 (file)
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: lv_Latn_LV.ISO-8859-13.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: lv_Latn_LV.ISO-8859-13.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -545,6 +549,12 @@ define('_MEDIA_COLLECTION_LABEL',  'Pa
 define('_ADD_ALIGNLEFT_TT',                    'Kreisajâ pusç');
 define('_ADD_ALIGNRIGHT_TT',           'Labajâ pusç');
 define('_ADD_ALIGNCENTER_TT',          'Iecentrçts');
+<<<<<<< HEAD
+
+// searchable blog setting (yes/no)
+define('_EBLOG_SEARCH',                                'Pievienot meklçðanas indeksam');
+=======
+>>>>>>> skinnable-master
 
 // generic upload failure
 define('_ERROR_UPLOADFAILED',          'Kïûdas rezultâtâ fails netika pievienots.');
@@ -844,6 +854,10 @@ define('_COMMENTFORM_YOUARE',        'Tu esi');
 define('_COMMENTFORM_SUBMIT',        'Komentçt');
 define('_COMMENTFORM_COMMENT',        'Tavs komentârs');
 define('_COMMENTFORM_NAME',            'Vârds');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',            'Epasts/HTTP');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',        'Atcerçties mani turpmâk');
 
 // loginform
@@ -870,6 +884,10 @@ define('_ADD_DISABLE_COMMENTS',        'Atsl
 define('_ADD_DRAFTNFUTURE',            'Sagataves nâkotnei');
 define('_ADD_ADDITEM',                'Pievienot');
 define('_ADD_ADDNOW',                'Pievienot tagad');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                'Pievienot vçlâk');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                'Vieta');
 define('_ADD_ADDDRAFT',                'Pievienot sagatavçm');
 define('_ADD_NOPASTDATES',            '(pagâtnes datumi un laiki nav iespçjami, ðajâ gadîjumâ tiks lietots ðâbrîþa laiks)');
@@ -1217,6 +1235,11 @@ define('_BAN_ADD_BTN',                'Pievienot aizliegumu');
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',            'Ziòojums');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                'Vârds/nosaukums');
+define('_LOGIN_PASSWORD',            'Parole');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                'Aizmirsâs parole?');
 
@@ -1348,6 +1371,8 @@ define('_EDITC_NONMEMBER',            'ciemi
 // move item
 define('_MOVE_TITLE',                'Uz kuru blogu?');
 define('_MOVE_BTN',                    'Pârvietot...');
+<<<<<<< HEAD
+=======
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
@@ -1364,3 +1389,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index 9edb53d..6ec7fb7 100644 (file)
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: lv_Latn_LV.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: lv_Latn_LV.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index 1a056ad..4ef6abf 100644 (file)
@@ -3,6 +3,12 @@
  * Nucleus CMS Translation File
  * Dutch in Netherlands (Latin script)
  *
+<<<<<<< HEAD
+ * Nucleus CMS Translation File
+ * Dutch in Netherlands (Latin script)
+ *
+=======
+>>>>>>> skinnable-master
  * Updates:
  * Oct 7, 2005 - Translation fine-tuned and spellingcorrection by Errie (http://getverd.errie.com
  * - Nucleus v2.5-3.1 Norbert (beckerswna@yahoo.com)
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: nl_Latn_NL.ISO-8859-15.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: nl_Latn_NL.ISO-8859-15.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -426,6 +436,13 @@ define('_ARCHIVETYPE_MONTH',               'maand');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'Ongeldig ticket.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Plugin kon niet geïnstalleerd worden: vereist ');
+define('_ERROR_DELREQPLUGIN',          'Plugin kon niet verwijderd worden: vereist door ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'Cookie Prefix');
 
index c5c4a20..167200a 100644 (file)
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: nl_Latn_NL.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: nl_Latn_NL.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index 65ff9c3..29bc0a8 100644 (file)
 /********************************************
  *        Start New for 4.0                 *
  ********************************************/
+<<<<<<< HEAD
+define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
+define('_LISTS_AUTHOR', 'Author');
+define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts');
+=======
 /* argument value for setlocale() in Microsoft's windows operating system */
 define('_LOCALE_IN_WINDOWS',   'plk_pol');
 
@@ -104,6 +110,7 @@ define('_SETTINGS_BKMKLTSKIN',                              'default skin for bookmarklet');
 define('_MEMBERS_BKMKLTSKIN',                          "bookmarklet skin");
 define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         'The version which is being used is latest.');
 
+>>>>>>> skinnable-master
 /********************************************
  *        Start New for 3.6x                *
  ********************************************/
@@ -289,7 +296,17 @@ define('_PLUGIN_OPTIONS_TITLE',                                                    'Opcje dla %s');
 // Plugin file loda error
 define('_PLUGINFILE_COULDNT_BELOADED',                         'Błąd: plik wtyczki <strong>%s.php</strong> nie został załadowany, lub jest on nieaktywny ponieważ nie obsługuje niektórych funkcji (sprawdź <a href="?action=actionlog">logi</a>, żeby uzyskać więcej informacji.)');
 
+<<<<<<< HEAD
+//ITEM add/edit template (for japanese only)
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Rok');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Miesiąc');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Dzień');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Godzina');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minuta');
+=======
 define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+>>>>>>> skinnable-master
 
 // Errors
 define('_ERRORS_INSTALLSQL',                                           'Plik install.sql powinien zostać usunięty');
@@ -488,6 +505,13 @@ define('_ARCHIVETYPE_MONTH',               'miesiąc');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'Niewłaściwa lub przeterminowana sesja.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Instalacja pluginu nie powiodła się, wymaga ');
+define('_ERROR_DELREQPLUGIN',          'Nie można usunąć pluginu, wymagany przez ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'prefix Cookie');
 
@@ -893,6 +917,10 @@ define('_COMMENTFORM_YOUARE',              'Jesteś');
 define('_COMMENTFORM_SUBMIT',          'Dodaj komentarz');
 define('_COMMENTFORM_COMMENT',         'Twój komentarz');
 define('_COMMENTFORM_NAME',                    'Nazwa');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                    'E-mail/HTTP');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Zapamiętaj mnie');
 
 // loginform
@@ -919,6 +947,10 @@ define('_ADD_DISABLE_COMMENTS',            'Wyłączyć możliwość komentowania?');
 define('_ADD_DRAFTNFUTURE',                    'Wykorzystuj do późniejszej publikacji');
 define('_ADD_ADDITEM',                         'Dodaj element');
 define('_ADD_ADDNOW',                          'Dodaj teraz');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                'Dodaj później');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                'Rozpocznij wyświetlanie');
 define('_ADD_ADDDRAFT',                                'Dodaj do brudnopisu');
 define('_ADD_NOPASTDATES',                     '(minione daty lub godziny nie będą akceptowane zamiast nich wyświetlony będzie czas rzeczywisty.)');
@@ -1262,6 +1294,11 @@ define('_BAN_ADD_BTN',                           'Dodaj blkokadę');
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                       'Wiadomość');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                          'Login');
+define('_LOGIN_PASSWORD',                      'Hasło');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                'Zapomniałeś hasła?');
 
@@ -1394,6 +1431,9 @@ define('_EDITC_NONMEMBER',                        'odwiedzający');
 define('_MOVE_TITLE',                          'Do którego bloga przenieść ten wpis?');
 define('_MOVE_BTN',                                    'Przenieś wpis');
 
+<<<<<<< HEAD
+?>
+=======
 // ADMIN-template template types
 include_once('adminskinTypes.php');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',          'navibar for item/comment list');
@@ -1409,3 +1449,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index 7b4ce89..1980557 100644 (file)
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: pt_Latn_BR.ISO-8859-1.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: pt_Latn_BR.ISO-8859-1.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -828,6 +832,10 @@ define('_COMMENTFORM_YOUARE',              'Voc
 define('_COMMENTFORM_SUBMIT',          'Envia');
 define('_COMMENTFORM_COMMENT',         'Seu comentário');
 define('_COMMENTFORM_NAME',                    'Nome');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                    'E-mail ou site');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'auto-completar na próxima visita');
 
 // loginform
index 784f466..fedefb1 100644 (file)
@@ -8,7 +8,11 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: pt_Latn_BR.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: pt_Latn_BR.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index d0f057e..1f57a34 100644 (file)
 /********************************************
  *        Start New for 4.0                 *
  ********************************************/
+<<<<<<< HEAD
+define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
+define('_LISTS_AUTHOR', 'Author');
+define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts');
+=======
 /* argument value for setlocale() in Microsoft's windows operating system */
 define('_LOCALE_IN_WINDOWS',   'C');
 
@@ -105,6 +111,7 @@ define('_SETTINGS_BKMKLTSKIN',                              'default skin for bookmarklet');
 define('_MEMBERS_BKMKLTSKIN',                          "bookmarklet skin");
 define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         'The version which is being used is latest.');
 
+>>>>>>> skinnable-master
 /********************************************
  *        Start New for 3.6x                *
  ********************************************/
@@ -175,6 +182,12 @@ define('_ERROR_DELREQPLUGIN',              'Plugin deletion failed, required by %s');
 //define('_ADD_ADDLATER',                                                              'Add Later');
 define('_ADD_ADDLATER',                                                                'Add the dates specified');
 
+<<<<<<< HEAD
+define('_LOGIN_NAME',                          'Name:');
+define('_LOGIN_PASSWORD',                      'Password:');
+
+=======
+>>>>>>> skinnable-master
 // changed from _BOOKMARLET_BMARKLFOLLOW
 define('_BOOKMARKLET_BMARKFOLLOW',                                     ' (Works with nearly all browsers)');
 // END changed/added after 3.33 END
@@ -270,7 +283,17 @@ define('_PLUGIN_OPTIONS_TITLE',                                                    'Options for %s');
 // Plugin file loda error
 define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
 
+<<<<<<< HEAD
+//ITEM add/edit template (for japanese only)
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
+=======
 define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+>>>>>>> skinnable-master
 
 // Errors
 define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
@@ -429,6 +452,13 @@ define('_ARCHIVETYPE_MONTH',               'luna');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'Tichetul nu este valid sau este expirat.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Instalarea pluginului a esuat, necesita ');
+define('_ERROR_DELREQPLUGIN',          'Stergerea pluginului a esuat, folosit de ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'Prefixul Cookieului');
 
@@ -550,6 +580,12 @@ define('_ADD_ALIGNLEFT_TT',                'Aliniaza la stanga');
 define('_ADD_ALIGNRIGHT_TT',           'Aliniaza la dreapta');
 define('_ADD_ALIGNCENTER_TT',          'Centreaza');
 
+<<<<<<< HEAD
+// searchable blog setting (yes/no)
+define('_EBLOG_SEARCH',                        'Include in cautare');
+
+=======
+>>>>>>> skinnable-master
 // generic upload failure
 define('_ERROR_UPLOADFAILED',          'Descarcare esuata');
 
@@ -832,6 +868,10 @@ define('_COMMENTFORM_YOUARE',              'Sunteti');
 define('_COMMENTFORM_SUBMIT',          'Adaugati un comentariu');
 define('_COMMENTFORM_COMMENT',         'Comentariul Dvs');
 define('_COMMENTFORM_NAME',            'Nume');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',            'Email/HTTP');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Tine minte numele');
 
 // loginform
@@ -858,6 +898,10 @@ define('_ADD_DISABLE_COMMENTS',            'Interziceti comentariile?');
 define('_ADD_DRAFTNFUTURE',            'Ciorne &amp; articole viitoare');
 define('_ADD_ADDITEM',                 'Adauga un articol');
 define('_ADD_ADDNOW',                  'Adauga acum');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                        'Adauga mai tarziu');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                        'Datat: ');
 define('_ADD_ADDDRAFT',                        'Adaugati la ciorne');
 define('_ADD_NOPASTDATES',             '(Datele si orele nu sunt valide, deci va fi utilizata data de azi)');
@@ -1335,6 +1379,9 @@ define('_EDITC_NONMEMBER',                'vizitator');
 define('_MOVE_TITLE',                  'Deplasare in care blog?');
 define('_MOVE_BTN',                    'Deplasare articol');
 
+<<<<<<< HEAD
+?>
+=======
 // ADMIN-template template types
 include_once('adminskinTypes.php');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',          'navibar for item/comment list');
@@ -1350,3 +1397,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index 64efdf1..0e88985 100644 (file)
 /********************************************
  *        Start New for 4.0                 *
  ********************************************/
+<<<<<<< HEAD
+define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
+define('_LISTS_AUTHOR', 'Author');
+define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts');
+=======
 /* argument value for setlocale() in Microsoft's windows operating system */
 define('_LOCALE_IN_WINDOWS',   'C');
 
@@ -105,6 +111,7 @@ define('_SETTINGS_BKMKLTSKIN',                              'default skin for bookmarklet');
 define('_MEMBERS_BKMKLTSKIN',                          "bookmarklet skin");
 define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         'The version which is being used is latest.');
 
+>>>>>>> skinnable-master
 /********************************************
  *        Start New for 3.6x                *
  ********************************************/
@@ -175,6 +182,12 @@ define('_ERROR_DELREQPLUGIN',              'Plugin deletion failed, required by %s');
 //define('_ADD_ADDLATER',                                                              'Add Later');
 define('_ADD_ADDLATER',                                                                'Add the dates specified');
 
+<<<<<<< HEAD
+define('_LOGIN_NAME',                          'Name:');
+define('_LOGIN_PASSWORD',                      'Password:');
+
+=======
+>>>>>>> skinnable-master
 // changed from _BOOKMARLET_BMARKLFOLLOW
 define('_BOOKMARKLET_BMARKFOLLOW',                                     ' (Works with nearly all browsers)');
 // END changed/added after 3.33 END
@@ -270,7 +283,17 @@ define('_PLUGIN_OPTIONS_TITLE',                                                    'Options for %s');
 // Plugin file loda error
 define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
 
+<<<<<<< HEAD
+//ITEM add/edit template (for japanese only)
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
+=======
 define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+>>>>>>> skinnable-master
 
 // Errors
 define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
@@ -429,6 +452,13 @@ define('_ARCHIVETYPE_MONTH',               'luna');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'Tichetul nu este valid sau este expirat.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Instalarea pluginului a esuat, necesita ');
+define('_ERROR_DELREQPLUGIN',          'Stergerea pluginului a esuat, folosit de ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'Prefixul Cookieului');
 
@@ -550,6 +580,12 @@ define('_ADD_ALIGNLEFT_TT',                'Aliniaza la stanga');
 define('_ADD_ALIGNRIGHT_TT',           'Aliniaza la dreapta');
 define('_ADD_ALIGNCENTER_TT',          'Centreaza');
 
+<<<<<<< HEAD
+// searchable blog setting (yes/no)
+define('_EBLOG_SEARCH',                        'Include in cautare');
+
+=======
+>>>>>>> skinnable-master
 // generic upload failure
 define('_ERROR_UPLOADFAILED',          'Descarcare esuata');
 
@@ -832,6 +868,10 @@ define('_COMMENTFORM_YOUARE',              'Sunteti');
 define('_COMMENTFORM_SUBMIT',          'Adaugati un comentariu');
 define('_COMMENTFORM_COMMENT',         'Comentariul Dvs');
 define('_COMMENTFORM_NAME',            'Nume');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',            'Email/HTTP');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Tine minte numele');
 
 // loginform
@@ -858,6 +898,10 @@ define('_ADD_DISABLE_COMMENTS',            'Interziceti comentariile?');
 define('_ADD_DRAFTNFUTURE',            'Ciorne &amp; articole viitoare');
 define('_ADD_ADDITEM',                 'Adauga un articol');
 define('_ADD_ADDNOW',                  'Adauga acum');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                        'Adauga mai tarziu');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                        'Datat: ');
 define('_ADD_ADDDRAFT',                        'Adaugati la ciorne');
 define('_ADD_NOPASTDATES',             '(Datele si orele nu sunt valide, deci va fi utilizata data de azi)');
@@ -1335,6 +1379,9 @@ define('_EDITC_NONMEMBER',                'vizitator');
 define('_MOVE_TITLE',                  'Deplasare in care blog?');
 define('_MOVE_BTN',                    'Deplasare articol');
 
+<<<<<<< HEAD
+?>
+=======
 // ADMIN-template template types
 include_once('adminskinTypes.php');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',          'navibar for item/comment list');
@@ -1350,3 +1397,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index 3a59854..b4bcf9a 100644 (file)
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: ru_Cyrl_RU.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: ru_Cyrl_RU.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index fac5681..cbd5b1f 100644 (file)
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: ru_Cyrl_RU.WINDOWS-1251.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: ru_Cyrl_RU.WINDOWS-1251.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -430,6 +434,13 @@ define('_ARCHIVETYPE_MONTH',               '
 
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'Íåïðàâèëüíàÿ èëè èñïîëüçóåìàÿ ïîâòîðíî ññûëêà.');
+<<<<<<< HEAD
+
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'Îøèáêà ïðè óñòàíîâêå ïëàãèíà, òðåáóåòñÿ ');
+define('_ERROR_DELREQPLUGIN',          'Íå óäàëîñü âûïîëíèòü óäàëåíèå ïëàãèíà, òðåáóåòñÿ ');
+=======
+>>>>>>> skinnable-master
 
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'Ïðåôèêñ Cookie');
@@ -837,6 +848,10 @@ define('_COMMENTFORM_YOUARE',              '
 define('_COMMENTFORM_SUBMIT',          'Êîììåíòèðîâàòü!');
 define('_COMMENTFORM_COMMENT',         'Âàø êîììåíòàðèé');
 define('_COMMENTFORM_NAME',                    'Èìÿ');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                    'E-mail/HTTP');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Çàïîìíèòü ìåíÿ');
 
 // loginform
@@ -863,6 +878,10 @@ define('_ADD_DISABLE_COMMENTS',            '
 define('_ADD_DRAFTNFUTURE',                    '×åðíîâèêè &amp; Áóäóùèå ñîîáøåíèÿ');
 define('_ADD_ADDITEM',                         'Äîáàâèòü ñîîáùåíèå');
 define('_ADD_ADDNOW',                          'Äîáàâèòü ñåé÷àñ');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                'Äîáàâèòü ïîçæå');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                'Âûáåðèòå äàòó');
 define('_ADD_ADDDRAFT',                                'Äîáàâèòü â ÷åðíîâèêè');
 define('_ADD_NOPASTDATES',                     '(äàòà è âðåìÿ â ïðîøëîì íåäåéñòâèòåëüíû, áóäóò èñïîëüçîâàíî òåêóùåå âðåìÿ)');
@@ -1206,6 +1225,11 @@ define('_BAN_ADD_BTN',                           '
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                       'Ñîîáùåíèå');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                          'Èìÿ');
+define('_LOGIN_PASSWORD',                      'Ïàðîëü');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                'Âñïîìíèòü ïàðîëü');
 
@@ -1337,6 +1361,8 @@ define('_EDITC_NONMEMBER',                        '
 // move item
 define('_MOVE_TITLE',                          'Âûáåðèòå ðàçäåë äëÿ ïåðåìåùåíèÿ');
 define('_MOVE_BTN',                                    'Ïåðåìåñòèòü ñîîáùåíèå');
+<<<<<<< HEAD
+=======
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
@@ -1353,3 +1379,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index 8f4a93c..1b151a3 100644 (file)
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: sk_Latn_SK.ISO-8859-2.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: sk_Latn_SK.ISO-8859-2.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
@@ -545,6 +549,12 @@ define('_MEDIA_COLLECTION_LABEL',  'Aktu
 define('_ADD_ALIGNLEFT_TT',                    'Zarovna» doµava');
 define('_ADD_ALIGNRIGHT_TT',           'Zarovna» doprava');
 define('_ADD_ALIGNCENTER_TT',          'Zarovna» na stred');
+<<<<<<< HEAD
+
+// searchable blog setting (yes/no)
+define('_EBLOG_SEARCH',                                'Zahrnú» do hµadania');
+=======
+>>>>>>> skinnable-master
 
 // generic upload failure
 define('_ERROR_UPLOADFAILED',          'Nahrávanie zlyhalo');
@@ -832,6 +842,10 @@ define('_COMMENTFORM_YOUARE',              'Ste');
 define('_COMMENTFORM_SUBMIT',          'Prida» komentár');
 define('_COMMENTFORM_COMMENT',         'Vá¹ komentár');
 define('_COMMENTFORM_NAME',                    'Meno');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                    'E-mail/HTTP');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Pamätaj si mna');
 
 // loginform
@@ -858,6 +872,10 @@ define('_ADD_DISABLE_COMMENTS',            'Zak
 define('_ADD_DRAFTNFUTURE',                    'Koncepty a èlánky pre neskor¹ie publikovanie');
 define('_ADD_ADDITEM',                         'Prida» èlánok');
 define('_ADD_ADDNOW',                          'Prida» teraz');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                'Prida» neskôr');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                'Umiestni» na');
 define('_ADD_ADDDRAFT',                                'Prida» medzi koncepty');
 define('_ADD_NOPASTDATES',                     '(dátumy a èasy v minulosti NIE SÚ platné, v tom prípade bude pou¾itý aktuálny èas)');
@@ -1201,6 +1219,11 @@ define('_BAN_ADD_BTN',                           'Prida
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                       'Správa');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                          'Meno');
+define('_LOGIN_PASSWORD',                      'Heslo');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                'Zabudli ste heslo?');
 
@@ -1332,6 +1355,8 @@ define('_EDITC_NONMEMBER',                        'nie je 
 // move item
 define('_MOVE_TITLE',                          'Presunú» do akého blogu?');
 define('_MOVE_BTN',                                    'Presunú» èlánok');
+<<<<<<< HEAD
+=======
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
@@ -1348,3 +1373,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index 521c326..6572790 100644 (file)
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: sk_Latn_SK.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: sk_Latn_SK.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index 229ccb8..7ad8355 100644 (file)
 /********************************************
  *        Start New for 4.0                 *
  ********************************************/
+<<<<<<< HEAD
+define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
+define('_LISTS_AUTHOR', 'Author');
+define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts');
+=======
 /* argument value for setlocale() in Microsoft's windows operating system */
 define('_LOCALE_IN_WINDOWS',   'C');
 
@@ -99,6 +105,7 @@ define('_SETTINGS_BKMKLTSKIN',                               'default skin for bookmarklet');
 define('_MEMBERS_BKMKLTSKIN',                          "bookmarklet skin");
 define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         'The version which is being used is latest.');
 
+>>>>>>> skinnable-master
 /********************************************
  *        Start New for 3.6x                *
  ********************************************/
@@ -267,7 +274,17 @@ define('_PLUGIN_OPTIONS_TITLE',                                                    'Options for %s');
 // Plugin file loda error
 define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
 
+<<<<<<< HEAD
+//ITEM add/edit template (for japanese only)
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
+=======
 define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+>>>>>>> skinnable-master
 
 // Errors
 define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
@@ -425,6 +442,13 @@ define('_ARCHIVETYPE_MONTH',                       'mesec');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                             'Neodgovarajući ili već iskorišćeni kupon.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',                  'Instalacija plugina nije uspela, potrebno je ');
+define('_ERROR_DELREQPLUGIN',                  'Nije uspelo brisanje plugina, potrebno je ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',               'Cookie prefiks');
 
@@ -827,6 +851,10 @@ define('_COMMENTFORM_YOUARE',                      'Vi ste');
 define('_COMMENTFORM_SUBMIT',                  'Dodajte komentar');
 define('_COMMENTFORM_COMMENT',         'Vaš komentar');
 define('_COMMENTFORM_NAME',                            'Ime');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                            'E-mail/http');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Zapamti me');
 
 // loginform
@@ -853,6 +881,10 @@ define('_ADD_DISABLE_COMMENTS',            'Isključiti komentare?');
 define('_ADD_DRAFTNFUTURE',                    'Skica &amp; za kasnije postove');
 define('_ADD_ADDITEM',                                 'Dodaj post');
 define('_ADD_ADDNOW',                                  'Dodaj sada');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                        'Dodaj kasnije');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                        'Postavi na');
 define('_ADD_ADDDRAFT',                                        'Dodaj u skice');
 define('_ADD_NOPASTDATES',                             '(raniji datumi i vreme NISU važeći, u slučaju njihovog odabira bit će unešeni trenutni datum i vreme.)');
@@ -1197,6 +1229,11 @@ define('_BAN_ADD_BTN',                                   'Postavi blokadu');
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                               'Poruka');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                                  'Korisničko ime');
+define('_LOGIN_PASSWORD',                              'Lozinka');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                        _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                        'Zaboravili ste lozinku?');
 
@@ -1328,6 +1365,9 @@ define('_EDITC_NONMEMBER',                                'posetilac');
 define('_MOVE_TITLE',                                  'U koji blog preneti ovaj post?');
 define('_MOVE_BTN',                                            'Prenesi post');
 
+<<<<<<< HEAD
+?>
+=======
 // ADMIN-template template types
 include_once('adminskinTypes.php');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',          'navibar for item/comment list');
@@ -1343,3 +1383,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index b67a33c..ea8bcb8 100644 (file)
 /********************************************
  *        Start New for 4.0                 *
  ********************************************/
+<<<<<<< HEAD
+define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
+define('_LISTS_AUTHOR', 'Author');
+define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts');
+=======
 /* argument value for setlocale() in Microsoft's windows operating system */
 define('_LOCALE_IN_WINDOWS',   'C');
 
@@ -99,6 +105,7 @@ define('_SETTINGS_BKMKLTSKIN',                               'default skin for bookmarklet');
 define('_MEMBERS_BKMKLTSKIN',                          "bookmarklet skin");
 define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         'The version which is being used is latest.');
 
+>>>>>>> skinnable-master
 /********************************************
  *        Start New for 3.6x                *
  ********************************************/
@@ -267,7 +274,17 @@ define('_PLUGIN_OPTIONS_TITLE',                                                    'Options for %s');
 // Plugin file loda error
 define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
 
+<<<<<<< HEAD
+//ITEM add/edit template (for japanese only)
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
+=======
 define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+>>>>>>> skinnable-master
 
 // Errors
 define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
@@ -426,6 +443,13 @@ define('_ARCHIVETYPE_MONTH',               'مہینہ');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                     'نا موزوں یا ختم شدہ ٹکٹ.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',          'پلگ ان کی تنصیب ناکام ہوگئی، درکار ہے ');
+define('_ERROR_DELREQPLUGIN',          'پلگ ان حذف کرنا ناکام ہوگیا، درکار از ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',       'کوکی پریفکس');
 
@@ -854,6 +878,10 @@ define('_ADD_DISABLE_COMMENTS',            'تبصرہ جات معطل کریں؟');
 define('_ADD_DRAFTNFUTURE',                    'مسودے &amp; مستقبل کے عناصر');
 define('_ADD_ADDITEM',                         'عنصر شامل کریں');
 define('_ADD_ADDNOW',                          'ابھی شامل کریں');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                'بعد میں شامل کریں');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                'لگائیں');
 define('_ADD_ADDDRAFT',                                'مسودوں میں شامل کریں');
 define('_ADD_NOPASTDATES',                     '(ماضی کی تاریخیں اور وقت موزوں نہیں، اس صورت میں حالیہ وقت استعمال کی جائے گا)');
@@ -1197,6 +1225,11 @@ define('_BAN_ADD_BTN',                           'بین شامل کریں');
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                       'پیغام');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                          'نام');
+define('_LOGIN_PASSWORD',                      'پاس ورڈ');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                'پاس ورڈ بھول گئے؟');
 
@@ -1329,6 +1362,9 @@ define('_EDITC_NONMEMBER',                        'غیر رکن');
 define('_MOVE_TITLE',                          'کس بلاگ میں منتقل کیا جائے؟');
 define('_MOVE_BTN',                                    'عنصر منتقل کریں');
 
+<<<<<<< HEAD
+?>
+=======
 // ADMIN-template template types
 include_once('adminskinTypes.php');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',          'navibar for item/comment list');
@@ -1344,3 +1380,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index 101b50b..fc6736c 100644 (file)
 /********************************************
  *        Start New for 4.0                 *
  ********************************************/
+<<<<<<< HEAD
+define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
+define('_LISTS_AUTHOR', 'Author');
+define('_OVERVIEW_OTHER_DRAFTS', 'Other Drafts');
+=======
 /* argument value for setlocale() in Microsoft's windows operating system */
 define('_LOCALE_IN_WINDOWS',   'C');
 
@@ -99,6 +105,7 @@ define('_SETTINGS_BKMKLTSKIN',                               'default skin for bookmarklet');
 define('_MEMBERS_BKMKLTSKIN',                          "bookmarklet skin");
 define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         'The version which is being used is latest.');
 
+>>>>>>> skinnable-master
 /********************************************
  *        Start New for 3.6x                *
  ********************************************/
@@ -267,7 +274,17 @@ define('_PLUGIN_OPTIONS_TITLE',                                                    'Options for %s');
 // Plugin file loda error
 define('_PLUGINFILE_COULDNT_BELOADED',                         'Error: plugin file <strong>%s.php</strong> could not be loaded, or it has been set inactive because it does not support some features (check the <a href="?action=actionlog">actionlog</a> for more info)');
 
+<<<<<<< HEAD
+//ITEM add/edit template (for japanese only)
+define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+define('_ITEM_ADDEDITTEMPLATE_YEAR',                           'Year');
+define('_ITEM_ADDEDITTEMPLATE_MONTH',                          'Month');
+define('_ITEM_ADDEDITTEMPLATE_DAY',                                    'Day');
+define('_ITEM_ADDEDITTEMPLATE_HOUR',                           'Hour');
+define('_ITEM_ADDEDITTEMPLATE_MINUTE',                         'Minute');
+=======
 define('_ITEM_ADDEDITTEMPLATE_FORMAT',                         'Format :');
+>>>>>>> skinnable-master
 
 // Errors
 define('_ERRORS_INSTALLSQL',                                           'install.sql should be deleted');
@@ -426,6 +443,13 @@ define('_ARCHIVETYPE_MONTH',                'tháng');
 // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
 define('_ERROR_BADTICKET',                        'Invalid or expired ticket.');
 
+<<<<<<< HEAD
+// plugin dependency
+define('_ERROR_INSREQPLUGIN',                'Lỗi cài đặt plugin, cần có:');
+define('_ERROR_DELREQPLUGIN',                'Không thể xóa plugin, đang dùng bởi ');
+
+=======
+>>>>>>> skinnable-master
 // cookie prefix
 define('_SETTINGS_COOKIEPREFIX',        'Tiếp đầu ngữ cookie');
 
@@ -828,6 +852,10 @@ define('_COMMENTFORM_YOUARE',                'Tài khoản của bạn là');
 define('_COMMENTFORM_SUBMIT',                'Gởi ý kiến');
 define('_COMMENTFORM_COMMENT',                'Ý kiến của bạn');
 define('_COMMENTFORM_NAME',                        'Tên');
+<<<<<<< HEAD
+define('_COMMENTFORM_MAIL',                        'E-mail/HTTP');
+=======
+>>>>>>> skinnable-master
 define('_COMMENTFORM_REMEMBER',                'Ghi nhớ');
 
 // loginform
@@ -854,6 +882,10 @@ define('_ADD_DISABLE_COMMENTS',                'Khóa việc gởi ý kiến?');
 define('_ADD_DRAFTNFUTURE',                        'Nháp &amp; Các bài viết ở tương lai');
 define('_ADD_ADDITEM',                                'Thêm bài viết');
 define('_ADD_ADDNOW',                                'Thêm lúc này');
+<<<<<<< HEAD
+define('_ADD_ADDLATER',                                'Thêm vào sau');
+=======
+>>>>>>> skinnable-master
 define('_ADD_PLACE_ON',                                'Thời điểm');
 define('_ADD_ADDDRAFT',                                'Lưu nháp');
 define('_ADD_NOPASTDATES',                        '(ngày và giờ trong quá khứ là không được chấp nhận, giờ hiện tại sẽ được thay thế vào các chỗ đó)');
@@ -1197,6 +1229,11 @@ define('_BAN_ADD_BTN',                                'Thêm điều cấm');
 
 // LOGIN screen
 define('_LOGIN_MESSAGE',                        'Tin nhắn');
+<<<<<<< HEAD
+define('_LOGIN_NAME',                                'Tên');
+define('_LOGIN_PASSWORD',                        'Mật khẩu');
+=======
+>>>>>>> skinnable-master
 define('_LOGIN_SHARED',                                _LOGINFORM_SHARED);
 define('_LOGIN_FORGOT',                                'Quên mật khẩu?');
 
@@ -1329,6 +1366,9 @@ define('_EDITC_NONMEMBER',                        'không phải thành viên');
 define('_MOVE_TITLE',                                'Di chuyển đến blog nào?');
 define('_MOVE_BTN',                                        'Di chuyển');
 define('_ADMINTITLE',                                        'Trang Quản Lý');
+<<<<<<< HEAD
+?>
+=======
 
 // ADMIN-template template types
 include_once('adminskinTypes.php');
@@ -1345,3 +1385,4 @@ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin admin link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin help link');
 define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin option setting link');
+>>>>>>> skinnable-master
index a8cbbac..34d92ca 100644 (file)
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: zh_Hans_CN.GB2312.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: zh_Hans_CN.GB2312.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index 2e66ef3..3443848 100644 (file)
@@ -8,7 +8,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: zh_Hans_CN.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: zh_Hans_CN.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
index b14fecf..a068c26 100644 (file)
@@ -7,7 +7,11 @@
  * 
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+<<<<<<< HEAD
+ * @version $Id: zh_Hant_TW.UTF-8.php 1868 2012-05-22 05:10:53Z sakamocchi $
+=======
  * @version $Id: zh_Hant_TW.UTF-8.php 1887 2012-06-17 08:30:08Z sakamocchi $
+>>>>>>> skinnable-master
  */
 
 /********************************************
diff --git a/nucleus/media.php b/nucleus/media.php
new file mode 100644 (file)
index 0000000..0635de3
--- /dev/null
@@ -0,0 +1,444 @@
+<?php
+/*
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+ * Copyright (C) 2002-2009 The Nucleus Group
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * (see nucleus/documentation/index.html#license for more info)
+ */
+/**
+ * Media popup window for Nucleus
+ *
+ * Purpose:
+ *   - can be openen from an add-item form or bookmarklet popup
+ *   - shows a list of recent files, allowing browsing, search and
+ *     upload of new files
+ *   - close the popup by selecting a file in the list. The file gets
+ *     passed through to the add-item form (linkto, popupimg or inline img)
+ *
+ * @license http://nucleuscms.org/license.txt GNU General Public License
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group
+ * @version $Id: media.php 1870 2012-05-22 14:57:15Z sakamocchi $
+ *
+ */
+
+$CONF = array();
+
+// defines how much media items will be shown per page. You can override this
+// in config.php if you like. (changing it in config.php instead of here will
+// allow your settings to be kept even after a Nucleus upgrade)
+$CONF['MediaPerPage'] = 10;
+
+// include all classes and config data
+$DIR_LIBS = '';
+require_once('../config.php');
+//include($DIR_LIBS . 'MEDIA.php');    // media classes
+include_libs('MEDIA.php',false,false);
+
+sendContentType('application/xhtml+xml', 'media');
+
+// user needs to be logged in to use this
+if (!$member->isLoggedIn()) {
+       media_loginAndPassThrough();
+       exit;
+}
+
+// check if member is on at least one teamlist
+$query = 'SELECT * FROM ' . sql_table('team'). ' WHERE tmember=' . $member->getID();
+$teams = DB::getResult($query);
+if ($teams->rowCount() == 0 && !$member->isAdmin())
+       media_doError(_ERROR_DISALLOWEDUPLOAD);
+
+// get action
+$action = requestVar('action');
+if ($action == '')
+       $action = 'selectmedia';
+
+// check ticket
+$aActionsNotToCheck = array('selectmedia', _MEDIA_FILTER_APPLY, _MEDIA_COLLECTION_SELECT);
+if (!in_array($action, $aActionsNotToCheck))
+{
+       if (!$manager->checkTicket())
+               media_doError(_ERROR_BADTICKET);
+}
+
+
+switch($action) {
+       case 'chooseupload':
+       case _MEDIA_UPLOAD_TO:
+       case _MEDIA_UPLOAD_NEW:
+               if (!$member->isAdmin() and $CONF['AllowUpload'] != true) {
+                       media_doError(_ERROR_DISALLOWED);
+               } else {
+                       media_choose();
+               }
+               break;
+       case 'uploadfile':
+               if (!$member->isAdmin() and $CONF['AllowUpload'] != true) {
+                       media_doError(_ERROR_DISALLOWED);
+               } else {
+                       media_upload();
+               }
+               break;
+       case _MEDIA_FILTER_APPLY:
+       case 'selectmedia':
+       case _MEDIA_COLLECTION_SELECT:
+       default:
+               media_select();
+               break;
+}
+
+// select a file
+function media_select() {
+       global $member, $CONF, $DIR_MEDIA, $manager;
+
+       // show 10 files + navigation buttons
+       // show msg when no files
+       // show upload form
+       // files sorted according to last modification date
+
+       // currently selected collection
+       $currentCollection = requestVar('collection');
+       if (!$currentCollection || !@is_dir($DIR_MEDIA . $currentCollection))
+               $currentCollection = $member->getID();
+
+       // avoid directory travarsal and accessing invalid directory
+       if (!Media::isValidCollection($currentCollection)) media_doError(_ERROR_DISALLOWED);
+
+       media_head();
+
+       // get collection list
+       $collections = Media::getCollectionList();
+
+       if (sizeof($collections) > 1) {
+       ?>
+               <form method="post" action="media.php"><div>
+                       <label for="media_collection"><?php echo Entity::hsc(_MEDIA_COLLECTION_LABEL)?></label>
+                       <select name="collection" id="media_collection">
+                               <?php                                   foreach ($collections as $dirname => $description) {
+                                               echo '<option value="',Entity::hsc($dirname),'"';
+                                               if ($dirname == $currentCollection) {
+                                                       echo ' selected="selected"';
+                                               }
+                                               echo '>',Entity::hsc($description),'</option>';
+                                       }
+                               ?>
+                       </select>
+                       <input type="submit" name="action" value="<?php echo Entity::hsc(_MEDIA_COLLECTION_SELECT) ?>" title="<?php echo Entity::hsc(_MEDIA_COLLECTION_TT)?>" />
+                       <input type="submit" name="action" value="<?php echo Entity::hsc(_MEDIA_UPLOAD_TO) ?>" title="<?php echo Entity::hsc(_MEDIA_UPLOADLINK) ?>" />
+                       <?php $manager->addTicketHidden() ?>
+               </div></form>
+       <?php   } else {
+       ?>
+               <form method="post" action="media.php" style="float:right"><div>
+                       <input type="hidden" name="collection" value="<?php echo Entity::hsc($currentCollection)?>" />
+                       <input type="submit" name="action" value="<?php echo Entity::hsc(_MEDIA_UPLOAD_NEW) ?>" title="<?php echo Entity::hsc(_MEDIA_UPLOADLINK) ?>" />
+                       <?php $manager->addTicketHidden() ?>
+               </div></form>
+       <?php   } // if sizeof
+
+       $filter = requestVar('filter');
+       $offset = intRequestVar('offset');
+       $arr = Media::getMediaListByCollection($currentCollection, $filter);
+
+       ?>
+               <form method="post" action="media.php"><div>
+                       <label for="media_filter"><?php echo Entity::hsc(_MEDIA_FILTER_LABEL)?></label>
+                       <input id="media_filter" type="text" name="filter" value="<?php echo Entity::hsc($filter)?>" />
+                       <input type="submit" name="action" value="<?php echo Entity::hsc(_MEDIA_FILTER_APPLY) ?>" />
+                       <input type="hidden" name="collection" value="<?php echo Entity::hsc($currentCollection)?>" />
+                       <input type="hidden" name="offset" value="<?php echo intval($offset)?>" />
+               </div></form>
+
+       <?php
+
+       ?>
+               <table width="100%">
+               <caption><?php echo _MEDIA_COLLECTION_LABEL . Entity::hsc($collections[$currentCollection])?></caption>
+               <tr>
+                <th><?php echo _MEDIA_MODIFIED?></th><th><?php echo _MEDIA_FILENAME?></th><th><?php echo _MEDIA_DIMENSIONS?></th>
+               </tr>
+
+       <?php
+       if ( sizeof($arr) > 0 )
+       {
+               if ( ($offset + $CONF['MediaPerPage']) >= sizeof($arr) )
+               {
+                       $offset = sizeof($arr) - $CONF['MediaPerPage'];
+               }
+               
+               if ( $offset < 0 )
+               {
+                       $offset = 0;
+               }
+               
+               $idxStart = $offset;
+               $idxEnd = $offset + $CONF['MediaPerPage'];
+               $idxNext = $idxEnd;
+               $idxPrev = $idxStart - $CONF['MediaPerPage'];
+               
+               if ( $idxPrev < 0 )
+               {
+                       $idxPrev = 0;
+               }
+               
+               if ( $idxEnd > sizeof($arr) )
+               {
+                       $idxEnd = sizeof($arr);
+               }
+               
+               for ( $i = $idxStart; $i < $idxEnd; $i++ )
+               {
+                       $medium = $arr[$i];
+                       $medium->refine();
+                       
+                       echo "<tr>\n";
+                       echo "<td>" . date("Y-m-d", $medium->timestamp) . "</td>\n";
+                       
+                       // strings for javascript
+                       $jsCurrentCollection = str_replace("'", "\\'", $currentCollection);
+                       $jsFileName = str_replace("'", "\\'", $medium->filename);
+                       
+                       if ( array_key_exists($medium->mime, Media::$image_mime) )
+                       {
+                               echo "<td><a href=\"media.php\" onclick=\"chooseImage('" . Entity::hsc($jsCurrentCollection) . "','" . Entity::hsc($jsFileName) . "',"
+                                                          . "'" . Entity::hsc($medium->width) . "','" . Entity::hsc($medium->height) . "'"
+                                                          . ")\" title=\"" . Entity::hsc($medium->filename) . "\">"
+                                                          . Entity::hsc(Entity::shorten($medium->filename, 25, '...'))
+                                                          ."</a>";
+                               echo ' (<a href="', Entity::hsc("{$CONF['MediaURL']}/$currentCollection/$medium->filename"), '" onclick="window.open(this.href); return false;" title="'. Entity::hsc(_MEDIA_VIEW_TT) . '">' . _MEDIA_VIEW . '</a>)';
+                               echo "</td>\n";
+                               echo '<td>' . Entity::hsc($medium->width) . 'x' . Entity::hsc($medium->height) . "</td>\n";
+                       }
+                       else
+                       {
+                               // no image (e.g. mpg)
+                               echo "<td><a href='media.php' onclick=\"chooseOther('" , Entity::hsc($jsCurrentCollection), "','", Entity::hsc($jsFileName), "'"
+                                              . ")\" title=\"" . Entity::hsc($medium->filename). "\">"
+                                              . Entity::hsc(Entity::shorten($medium->filename, 30, '...'))
+                                              ."</a></td>\n";
+                               echo '<td>' . Entity::hsc($medium->size) . "KB</td>\n";
+                       }
+                       echo "</tr>\n";
+                       continue;
+               }
+       }
+       ?>
+
+               </table>
+       <?php
+       if ($idxStart > 0)
+               echo "<a href='media.php?offset=$idxPrev&amp;collection=".urlencode($currentCollection)."'>". _LISTS_PREV."</a> ";
+       if ($idxEnd < sizeof($arr))
+               echo "<a href='media.php?offset=$idxNext&amp;collection=".urlencode($currentCollection)."'>". _LISTS_NEXT."</a> ";
+
+       ?>
+               <input id="typeradio0" type="radio" name="typeradio" onclick="setType(0);" checked="checked" /><label for="typeradio0"><?php echo _MEDIA_INLINE?></label>
+               <input id="typeradio1" type="radio" name="typeradio" onclick="setType(1);" /><label for="typeradio1"><?php echo _MEDIA_POPUP?></label>
+       <?php
+       media_foot();
+
+
+}
+
+/**
+  * Shows a screen where you can select the file to upload
+  */
+function media_choose() {
+       global $CONF, $member, $manager;
+
+       $currentCollection = requestVar('collection');
+
+       $collections = Media::getCollectionList();
+
+       media_head();
+       ?>
+       <h1><?php echo _UPLOAD_TITLE?></h1>
+
+       <p><?php echo _UPLOAD_MSG?></p>
+
+       <form method="post" enctype="multipart/form-data" action="media.php">
+       <div>
+         <input type="hidden" name="action" value="uploadfile" />
+         <?php $manager->addTicketHidden() ?>
+         <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $CONF['MaxUploadSize']?>" />
+         File:
+         <br />
+         <input name="uploadfile" type="file" size="40" />
+       <?php           if (sizeof($collections) > 1) {
+       ?>
+               <br /><br /><label for="upload_collection">Collection:</label>
+               <br /><select name="collection" id="upload_collection">
+                       <?php                           foreach ($collections as $dirname => $description) {
+                                       echo '<option value="',Entity::hsc($dirname),'"';
+                                       if ($dirname == $currentCollection) {
+                                               echo ' selected="selected"';
+                                       }
+                                       echo '>',Entity::hsc($description),'</option>';
+                               }
+                       ?>
+               </select>
+       <?php           } else {
+       ?>
+               <input name="collection" type="hidden" value="<?php echo Entity::hsc(requestVar('collection'))?>" />
+       <?php           } // if sizeof
+       ?>
+       <br /><br />
+       <?php
+       $manager->notify(
+                'MediaUploadFormExtras',
+                array()
+            );
+       ?>
+         <br /><br />
+         <input type="submit" value="<?php echo _UPLOAD_BUTTON?>" />
+       </div>
+       </form>
+
+       <?php
+       media_foot();
+}
+
+
+/**
+  * accepts a file for upload
+  */
+function media_upload() {
+       global $DIR_MEDIA, $member, $CONF;
+
+       $uploadInfo = postFileInfo('uploadfile');
+
+       $filename = $uploadInfo['name'];
+       $filetype = $uploadInfo['type'];
+       $filesize = $uploadInfo['size'];
+       $filetempname = $uploadInfo['tmp_name'];
+       $fileerror = intval($uploadInfo['error']);
+       
+       // clean filename of characters that may cause trouble in a filename using cleanFileName() function from globalfunctions.php
+       $filename = cleanFileName($filename);
+       if ($filename === false) 
+               media_doError(_ERROR_BADFILETYPE);
+       
+       switch ($fileerror)
+       {
+               case 0: // = UPLOAD_ERR_OK
+                       break;
+               case 1: // = UPLOAD_ERR_INI_SIZE
+               case 2: // = UPLOAD_ERR_FORM_SIZE
+                       media_doError(_ERROR_FILE_TOO_BIG);
+               case 3: // = UPLOAD_ERR_PARTIAL
+               case 4: // = UPLOAD_ERR_NO_FILE
+               case 6: // = UPLOAD_ERR_NO_TMP_DIR
+               case 7: // = UPLOAD_ERR_CANT_WRITE
+               default:
+                       // include error code for debugging
+                       // (see http://www.php.net/manual/en/features.file-upload.errors.php)
+                       media_doError(_ERROR_BADREQUEST . ' (' . $fileerror . ')');
+       }
+
+       if ($filesize > $CONF['MaxUploadSize'])
+               media_doError(_ERROR_FILE_TOO_BIG);
+
+       // check file type against allowed types
+       $ok = 0;
+       $allowedtypes = preg_split('#,#', $CONF['AllowedTypes']);
+       foreach ( $allowedtypes as $type )
+       {
+               //if (eregi("\." .$type. "$",$filename)) $ok = 1;
+               if (preg_match("#\." .$type. "$#i",$filename)) $ok = 1;
+       }
+       if (!$ok) media_doError(_ERROR_BADFILETYPE);
+
+       if (!is_uploaded_file($filetempname))
+               media_doError(_ERROR_BADREQUEST);
+
+       // prefix filename with current date (YYYY-MM-DD-)
+       // this to avoid nameclashes
+       if ( $CONF['MediaPrefix'] )
+       {
+               $filename = i18n::formatted_datetime("%Y%m%d-", time()) . $filename;
+       }
+       
+       $collection = requestVar('collection');
+       $res = Media::addMediaObject($collection, $filetempname, $filename);
+
+       if ($res != '')
+               media_doError($res);
+
+       // shows updated list afterwards
+       media_select();
+}
+
+function media_loginAndPassThrough() {
+       media_head();
+       ?>
+               <h1><?php echo _LOGIN_PLEASE?></h1>
+
+               <form method="post" action="media.php">
+               <div>
+                       <input name="action" value="login" type="hidden" />
+                       <input name="collection" value="<?php echo Entity::hsc(requestVar('collection'))?>" type="hidden" />
+                       <?php echo _LOGINFORM_NAME?>: <input name="login" />
+                       <br /><?php echo _LOGINFORM_PWD?>: <input name="password" type="password" />
+                       <br /><input type="submit" value="<?php echo _LOGIN?>" />
+               </div>
+               </form>
+               <p><a href="media.php" onclick="window.close();"><?php echo _POPUP_CLOSE?></a></p>
+       <?php   media_foot();
+       exit;
+}
+
+function media_doError($msg) {
+       media_head();
+       ?>
+       <h1><?php echo _ERROR?></h1>
+       <p><?php echo $msg?></p>
+       <p><a href="media.php" onclick="history.back()"><?php echo _BACK?></a></p>
+       <?php   media_foot();
+       exit;
+}
+
+
+function media_head() {
+?>
+       <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+       <html xmlns="http://www.w3.org/1999/xhtml">
+       <head>
+               <title>Nucleus Media</title>
+               <link rel="stylesheet" type="text/css" href="styles/popups.css" />
+               <script type="text/javascript">
+                       var type = 0;
+                       function setType(val) { type = val; }
+
+                       function chooseImage(collection, filename, width, height) {
+                               window.opener.focus();
+                               window.opener.includeImage(collection,
+                                                                                  filename,
+                                                                                  type == 0 ? 'inline' : 'popup',
+                                                                                  width,
+                                                                                  height
+                                                                                  );
+                               window.close();
+                       }
+
+                       function chooseOther(collection, filename) {
+                               window.opener.focus();
+                               window.opener.includeOtherMedia(collection, filename);
+                               window.close();
+
+                       }
+               </script>
+       </head>
+       <body>
+<?php }
+
+function media_foot() {
+?>
+       </body>
+       </html>
+<?php }
+
+?>
index a66c1a8..ca5017c 100644 (file)
@@ -14,7 +14,11 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
+<<<<<<< HEAD
+* @version $Id: NP_SecurityEnforcer.php 1721 2012-03-31 10:18:25Z sakamocchi $
+=======
 * @version $Id: NP_SecurityEnforcer.php 1874 2012-06-17 07:27:38Z sakamocchi $
+>>>>>>> skinnable-master
 */
 class NP_SecurityEnforcer extends NucleusPlugin
 {
@@ -85,7 +89,11 @@ class NP_SecurityEnforcer extends NucleusPlugin
                $this->createOption('login_lockout',            '_SECURITYENFORCER_OPT_LOGIN_LOCKOUT',          'text', '15');
                
                // create needed tables
+<<<<<<< HEAD
+               DB::execute("CREATE TABLE IF NOT EXISTS ". sql_table('plug_securityenforcer').
+=======
                DB::execute('CREATE TABLE IF NOT EXISTS '. sql_table('plug_securityenforcer').
+>>>>>>> skinnable-master
                                        " (login varchar(255),
                                           fails int(11) NOT NULL default '0',
                                           lastfail bigint NOT NULL default '0',
@@ -203,6 +211,14 @@ class NP_SecurityEnforcer extends NucleusPlugin
                global $_SERVER;
                $login = $data['login'];
                $ip = $_SERVER['REMOTE_ADDR'];
+<<<<<<< HEAD
+               DB::execute("DELETE FROM " . sql_table('plug_securityenforcer') . " WHERE lastfail < " . (time() - ($this->login_lockout * 60)));
+               $query = "SELECT fails as result FROM " . sql_table('plug_securityenforcer') . " ";
+               $query .= 'WHERE login=' . DB::quoteValue($login);
+               $flogin = DB::getValue($query); 
+               $query = "SELECT fails as result FROM " . sql_table('plug_securityenforcer') . " ";
+               $query .= 'WHERE login=' . DB::quoteValue($ip);
+=======
                
                $query = "DELETE FROM %s WHERE lastfail < %d;";
                $query = sprintf($query, sql_table('plug_securityenforcer'), (integer) (time() - ($this->login_lockout * 60)));
@@ -214,6 +230,7 @@ class NP_SecurityEnforcer extends NucleusPlugin
                
                $query = "SELECT fails as result FROM %s WHERE login=%s;";
                $query = sprintf($query, sql_table('plug_securityenforcer'), DB::quoteValue($ip));
+>>>>>>> skinnable-master
                $fip = DB::getValue($query); 
                
                if ( $flogin >= $this->max_failed_login || $fip >= $this->max_failed_login )
@@ -236,8 +253,13 @@ class NP_SecurityEnforcer extends NucleusPlugin
                global $_SERVER;
                $login = $data['username'];
                $ip = $_SERVER['REMOTE_ADDR'];
+<<<<<<< HEAD
+               DB::execute("DELETE FROM " . sql_table('plug_securityenforcer') . " WHERE login=" . DB::quoteValue($login));
+               DB::execute("DELETE FROM " . sql_table('plug_securityenforcer') . " WHERE login=" . DB::quoteValue($ip));
+=======
                DB::execute('DELETE FROM ' . sql_table('plug_securityenforcer') . ' WHERE login=' . DB::quoteValue($login));
                DB::execute('DELETE FROM ' . sql_table('plug_securityenforcer') . ' WHERE login=' . DB::quoteValue($ip));
+>>>>>>> skinnable-master
                return;
        }
        
@@ -251,6 +273,25 @@ class NP_SecurityEnforcer extends NucleusPlugin
                global $_SERVER;
                $login = $data['username'];
                $ip = $_SERVER['REMOTE_ADDR'];
+<<<<<<< HEAD
+               $lres = DB::getValue("SELECT * FROM " . sql_table('plug_securityenforcer') . ' WHERE login=' . DB::quoteValue($login));
+               if ( $lres )
+               {
+                       DB::execute("UPDATE " . sql_table('plug_securityenforcer') . " SET fails=fails+1, lastfail=" . time() . ' WHERE login=' . DB::quoteValue($login));
+               }
+               else
+               {
+                       DB::execute("INSERT INTO " . sql_table('plug_securityenforcer') . ' (login,fails,lastfail) VALUES (' . DB::quoteValue($login) . ',1,' . time() . ')');
+               }
+               $lres = DB::getValue("SELECT * FROM " . sql_table('plug_securityenforcer') . " WHERE login='" . DB::quoteValue($ip) . "'");
+               if ( $lres )
+               {
+                       DB::execute("UPDATE " . sql_table('plug_securityenforcer') . ' SET fails=fails+1, lastfail=' . time() . ' WHERE login=' . DB::quoteValue($ip));
+               }
+               else
+               {
+                       DB::execute("INSERT INTO " . sql_table('plug_securityenforcer') . ' (login,fails,lastfail) VALUES (' . DB::quoteValue($ip) . ',1,' . time() . ')');
+=======
                $lres = DB::getResult('SELECT * FROM ' . sql_table('plug_securityenforcer') . ' WHERE login=' . DB::quoteValue($login));
                if ( $lres->rowCount() > 0 )
                {
@@ -268,6 +309,7 @@ class NP_SecurityEnforcer extends NucleusPlugin
                else
                {
                        DB::execute('INSERT INTO ' . sql_table('plug_securityenforcer') . ' (login,fails,lastfail) VALUES (' . DB::quoteValue($ip) . ',1,' . time() . ')');
+>>>>>>> skinnable-master
                }
                return;
        }
@@ -292,10 +334,17 @@ class NP_SecurityEnforcer extends NucleusPlugin
                        $complexity = 4;
                }
                
+<<<<<<< HEAD
+               $ucchars        = "[A-Z]";
+               $lcchars        = "[a-z]";
+               $numchars       = "[0-9]";
+               $ochars         = "[-~!@#$%^&*()_+=,.<>?:;|]";
+=======
                $ucchars        = '[A-Z]';
                $lcchars        = '[a-z]';
                $numchars       = '[0-9]';
                $ochars         = '[#-~!@\\$%^&*()_+=,.<>?:;|]';
+>>>>>>> skinnable-master
                $chartypes      = array($ucchars, $lcchars, $numchars, $ochars);
                $tot            = array(0,0,0,0);
                $i                      = 0;
index 8f8005a..ad88a68 100644 (file)
@@ -7,7 +7,11 @@ class NP_SkinFiles extends NucleusPlugin {
        *
        * Copyright 2005-2007 by Jeff MacMichael and Niels Leenheer
        *
+<<<<<<< HEAD
+       * @version $Id: NP_SkinFiles.php 1678 2012-02-26 07:31:36Z sakamocchi $
+=======
        * @version $Id: NP_SkinFiles.php 1749 2012-04-13 14:06:34Z sakamocchi $
+>>>>>>> skinnable-master
        * @version $NucleusJP: NP_SkinFiles.php,v 1.3 2006/07/17 20:03:45 kimitake Exp $
        *
        * ==========================================================================================
index 41d8d4f..45b7e14 100644 (file)
                        break;
                }
 
+<<<<<<< HEAD
+               $result = DB::getResult($query);
+               $installed = ( $result !== FALSE ) && ($result->rowCount() >= $minrows);
+
+=======
                $result = mysql_query($query);
                $installed = ( $result != 0 ) && (mysql_num_rows($result) >= $minrows);
                
+>>>>>>> skinnable-master
                return $installed;
        }
 
                echo "<li> $friendly &mdash; ";
 
                # execute the query
-               $result = @mysql_query($query);
+               $result = @DB::execute($query);
 
                // begin if: error executing query
                if ( $result === FALSE )
                {
                        echo '<span class="warning"> FAILED </span> <br />';
-                       echo 'Error: <code>', mysql_error(), '</code>';
+                       $err = DB::getError();
+                       echo 'Error: <code>', $err[2], '</code>';
                        $upgrade_failures++;
                }
                // else: query was successful
                $indices = array();
 
                $query = 'SHOW INDEX FROM ' . sql_table($table);
-               $result = @mysql_query($query);
+               $result = @DB::getResult($query);
 
                // begin loop: each result object
-               while ( $object = mysql_fetch_object($result) )
+               foreach ( $result as $row )
                {
 
                        // begin if: key has not been added to the indeces array yet
-                       if ( !isset($indices[$object->Key_name]) )
+                       if ( !isset($indices[$row['Key_name']]) )
                        {
-                               $indices[$object->Key_name] = array();
+                               $indices[$row['Key_name']] = array();
                        } // end if
 
-                       array_push($indices[$object->Key_name], $object->Column_name);
+                       array_push($indices[$row['Key_name']], $row['Column_name']);
                }
 
                // compare each index with parameter
        function upgrade_checkIfTableExists($table)
        {
                $query = 'SHOW TABLES LIKE ' . sql_table($table);
-               $result = @mysql_query($query);
+               $result = DB::getResult($query);
 
                // begin if: query executed successfully and one row was returned
-               if ( ($result !== FALSE) && (@mysql_num_rows($result) == 1) )
+               if ( ($result !== FALSE) && ($result->rowCount() == 1) )
                {
                        return TRUE;
                }
        function upgrade_checkIfCVExists($value)
        {
                $query = 'SELECT name FROM ' . sql_table('config') . ' WHERE name = "' . $value . '"';
-               $result = @mysql_query($query);
+               $result = DB::getResult($query);
 
                // begin if: query executed successfully and one row was returned
-               if ( ($result !== FALSE) && (@mysql_num_rows($result) == 1) )
+               if ( ($result !== FALSE) && ($result->rowCount() == 1) )
                {
                        return TRUE;
                }
        function upgrade_checkIfColumnExists($table, $column)
        {
                $query = 'DESC ' . sql_table($table) . ' ' . $column;
-               $result = @mysql_query($query);
+               $result = DB::getResult($query);
 
                // begin if: query executed successfully and one row was returned
-               if ( ($result !== FALSE) && (@mysql_num_rows($result) == 1) )
+               if ( ($result !== FALSE) && ($result->rowCount() == 1) )
                {
                        return TRUE;
                }
index 8099dfe..4d0f269 100644 (file)
@@ -74,17 +74,15 @@ function upgrade_do96() {
        // 6. add 'imagepopup' skincontents in skin 'default'
        
        $query = 'SELECT sdnumber FROM '.sql_table('skin_desc')." WHERE sdname='default'";
-       $res = sql_query($query);
-       $obj = mysql_fetch_object($res);
-       $skinid = $obj->sdnumber;
-       $query = 'INSERT INTO '.sql_table('skin')." VALUES (" . $skinid . ", 'imagepopup', '<html xmlns=\"http://www.w3.org/1999/xhtml\">\r\n<head>\r\n  <title><%imagetext%></title>\r\n  <style type=\"text/css\">\r\n   img { border: none; }\r\n  </style>\r\n</head>\r\n<body>\r\n  <a href=\"javascript:window.close();\"><%image%></a>\r\n</body>\r\n</html>');";
+       $res = DB::getValue($query);
+       $query = 'INSERT INTO '.sql_table('skin')." VALUES (" . $res . ", 'imagepopup', '<html xmlns=\"http://www.w3.org/1999/xhtml\">\r\n<head>\r\n  <title><%imagetext%></title>\r\n  <style type=\"text/css\">\r\n   img { border: none; }\r\n  </style>\r\n</head>\r\n<body>\r\n  <a href=\"javascript:window.close();\"><%image%></a>\r\n</body>\r\n</html>');";
        upgrade_query("Adding 'imagepopup' skinparts",$query);
        
        // 7. add POPUP_CODE, MEDIA_CODE, IMAGE_CODE to ALL templates
        $query = 'SELECT tdnumber FROM '.sql_table('template_desc');
-       $res = sql_query($query);       // get all template ids
-       while ($obj = mysql_fetch_object($res)) {
-               $tid = $obj->tdnumber;  // template id
+       $res = DB::getResult($query);   // get all template ids
+       foreach ( $res as $row ) {
+               $tid = $row['tdnumber'];        // template id
        
                $query = 'INSERT INTO '.sql_table('template')." VALUES ($tid, 'POPUP_CODE', '<%popuplink%>');";
                $query2 = 'INSERT INTO '.sql_table('template')." VALUES ($tid, 'MEDIA_CODE', '<%media%>');";
index 5cb0b81..50e21e6 100644 (file)
@@ -51,11 +51,11 @@ function upgrade_do100() {
                if ($res) {
                        // 5. for all members: hash their password and also copy it to mcookiekey
                        $query = 'SELECT * FROM '.sql_table('member');
-                       $res = mysql_query($query);
-                       while ($current = mysql_fetch_object($res)) {
-                               $hashedpw = md5($current->mpassword);
-                               $updquery = 'UPDATE '.sql_table('member')." SET mpassword='$hashedpw' WHERE mnumber=" . $current->mnumber;
-                               upgrade_query("Encrypting password for member " . $current->mnumber,$updquery);
+                       $res = DB::getResult($query);
+                       foreach ( $res as $current ) {
+                               $hashedpw = md5($current['mpassword']);
+                               $updquery = 'UPDATE '.sql_table('member')." SET mpassword='$hashedpw' WHERE mnumber=" . $current['mnumber'];
+                               upgrade_query("Encrypting password for member " . $current['mnumber'], $updquery);
                        }
                }
        }else{
index f324ea2..7c6cf8a 100644 (file)
@@ -71,9 +71,9 @@ function upgrade_do110() {
                // 4. add 'general' categories for all blogs, and update nucleus_item
                $catid = 1;     // generate catids ourself
                $query = 'SELECT bnumber FROM '.sql_table('blog');
-               $res = mysql_query($query);
-               while ($current = mysql_fetch_object($res)) {
-                       $blogid = $current->bnumber;
+               $res = DB::getResult($query);
+               foreach ( $res as $current ) {
+                       $blogid = $current['bnumber'];
                        
                        $query = 'INSERT INTO '.sql_table('category')." (catid, cblog, cname, cdesc) VALUES ($catid, $blogid, 'General', 'Items that do not fit in other categories')";
                        $r = upgrade_query("Adding category 'general' for blog " . $blogid, $query);
@@ -92,9 +92,9 @@ function upgrade_do110() {
                
                // 5. add template parts for category lists to all templates
                $query = 'SELECT tdnumber FROM '.sql_table('template_desc');
-               $res = sql_query($query);       // get all template ids
-               while ($obj = mysql_fetch_object($res)) {
-                       $tid = $obj->tdnumber;  // template id
+               $res = DB::getResult($query);   // get all template ids
+               foreach ( $res as $row ) {
+                       $tid = $row['tdnumber'];        // template id
                
                        $query = 'INSERT INTO '.sql_table('template')." VALUES ($tid, 'CATLIST_HEADER', '<ul><li><a href=\"<%blogurl%>\">All</a></li>');";
                        $query2 = 'INSERT INTO '.sql_table('template')." VALUES ($tid, 'CATLIST_LISTITEM', '<li><a href=\"<%catlink%>\"><%catname%></a></li>');";
index 0c58171..fc4f885 100644 (file)
@@ -54,11 +54,11 @@ function upgrade_do150() {
                upgrade_query('Adding cblog column in table nucleus_comment',$query);
 
                $query = 'SELECT inumber, iblog FROM '.sql_table('item').', '.sql_table('comment').' WHERE inumber=citem AND cblog=0';
-               $res = sql_query($query);
+               $res = DB::getResult($query);
 
-               while($o = mysql_fetch_object($res)) {
-                       $query = 'UPDATE '.sql_table('comment')." SET cblog='".$o->iblog."' WHERE citem='".$o->inumber."'";
-                       upgrade_query('Filling cblog column for item ' . $o->inumber, $query);
+               foreach ( $res as $row ) {
+                       $query = 'UPDATE '.sql_table('comment')." SET cblog='".$row['iblog']."' WHERE citem='".$row['inumber']."'";
+                       upgrade_query('Filling cblog column for item ' . $row['inumber'], $query);
                }
        }       
        
@@ -72,9 +72,9 @@ function upgrade_do150() {
        
        // add 'EDITLINK' to all templates
        $query = 'SELECT tdnumber FROM '.sql_table('template_desc');
-       $res = sql_query($query);       // get all template ids
-       while ($obj = mysql_fetch_object($res)) {
-               $tid = $obj->tdnumber;  // template id
+       $res = DB::getResult($query);   // get all template ids
+       foreach ( $res as $row ) {
+               $tid = $row['tdnumber'];        // template id
        
                $query = 'INSERT INTO '.sql_table('template')." VALUES ($tid, 'EDITLINK', '<a href=\"<%editlink%>\" onclick=\"<%editpopupcode%>\">edit</a>');";
                upgrade_query("Adding editlink code to template $tid",$query);
@@ -82,20 +82,22 @@ function upgrade_do150() {
        }
        
        // in templates: update DATE_HEADER templates
-       $res = sql_query('SELECT * FROM '.sql_table('template').' WHERE tpartname=\'DATE_HEADER\'');
-       while ($o = mysql_fetch_object($res)) {
-               $newval = str_replace('<%daylink%>','<%%daylink%%>',$o->tcontent);
-               $query = 'UPDATE '.sql_table('template').' SET tcontent=\''. addslashes($newval).'\' WHERE tdesc=' . $o->tdesc . ' AND tpartname=\'DATE_HEADER\'';
-               upgrade_query('Updating DATE_HEADER part in template ' . $o->tdesc, $query);
+       $res = DB::getResult('SELECT * FROM '.sql_table('template').' WHERE tpartname=\'DATE_HEADER\'');
+       foreach ( $res as $row ) {
+               $newval = str_replace('<%daylink%>','<%%daylink%%>',$row['tcontent']);
+               $query = 'UPDATE '.sql_table('template').' SET tcontent=\''. addslashes($newval).'\' WHERE tdesc=' . $row['tdesc'] . ' AND tpartname=\'DATE_HEADER\'';
+               upgrade_query('Updating DATE_HEADER part in template ' . $row['tdesc'], $query);
        }
        
        // in templates: add 'comments'-templatevar to all non-empty ITEM templates     
-       $res = sql_query('SELECT * FROM '.sql_table('template').' WHERE tpartname=\'ITEM\'');
-       while ($o = mysql_fetch_object($res)) {
-               if (!strstr($o->tcontent,'<%comments%>')) {
-                       $newval = $o->tcontent . '<%comments%>';
-                       $query = 'UPDATE '.sql_table('template').' SET tcontent=\''. addslashes($newval).'\' WHERE tdesc=' . $o->tdesc . ' AND tpartname=\'ITEM\'';
-                       upgrade_query('Updating ITEM part in template ' . $o->tdesc, $query);
+       $res = DB::getResult('SELECT * FROM '.sql_table('template').' WHERE tpartname=\'ITEM\'');
+       foreach ( $res as $row )
+       {
+               if ( i18n::strpos($o->tcontent,'<%comments%>') === FALSE )
+               {
+                       $newval = $row['tcontent'] . '<%comments%>';
+                       $query = 'UPDATE '.sql_table('template').' SET tcontent=\''. addslashes($newval).'\' WHERE tdesc=' . $row['tdesc'] . ' AND tpartname=\'ITEM\'';
+                       upgrade_query('Updating ITEM part in template ' . $row['tdesc'], $query);
                }
        }
 
index 9cade8a..0041e40 100644 (file)
@@ -47,23 +47,23 @@ function upgrade_do250() {
                        $query = 'DELETE FROM ' . sql_table('plugin_option_desc');
                        upgrade_query('Flushing plugin option descriptions', $query);
                        $query = 'SELECT * FROM ' . sql_table('plugin_option') .' ORDER BY oid ASC';
-                       $res = sql_query($query);
+                       $res = DB::getResult($query);
                        $aValues = array();
-                       while ($o = mysql_fetch_object($res)) {
+                       foreach ( $res as $row) {
                                $query = 'INSERT INTO ' . sql_table('plugin_option_desc')
                                           .' (opid, oname, ocontext, odesc, otype)'
                                           ." VALUES ("
-                                                       ."'".addslashes($o->opid)."',"
-                                                       ."'".addslashes($o->oname) ."',"
+                                                       ."'".addslashes($row['opid'])."',"
+                                                       ."'".addslashes($row['oname']) ."',"
                                                        ."'global',"
-                                                       ."'".addslashes($o->odesc) ."',"
-                                                       ."'".addslashes($o->otype) ."')";
-                               upgrade_query('Moving option description for '.i18n::hsc($o->oname).' to ' . sql_table('plugin_option_desc'), $query);
+                                                       ."'".addslashes($row['odesc']) ."',"
+                                                       ."'".addslashes($row['otype']) ."')";
+                               upgrade_query('Moving option description for '.i18n::hsc($row['oname']).' to ' . sql_table('plugin_option_desc'), $query);
        
                                // store new id
                                $aValues[] = array ( 
-                                                               'id' => mysql_insert_id(),
-                                                               'value' => $o->ovalue
+                                                               'id' => DB::getInsertId(),
+                                                               'value' => $row['ovalue']
                                                        );
                        }
                }
index 2666fb4..5cd17b6 100644 (file)
@@ -35,7 +35,7 @@ function upgrade_do330() {
        }
 
        // check cmail column to separate to URL and cemail
-       mysql_query(
+       DB::execute(
                'UPDATE ' . sql_table('comment') . ' ' . 
                "SET cemail = cmail, cmail = '' " .
                "WHERE cmail LIKE '%@%'"
@@ -61,8 +61,8 @@ function upgrade_do330() {
 
        // check to see if user turn on Weblogs.com ping, if so, suggest to install the plugin
        $query = "SELECT bsendping FROM " . sql_table('blog') . " WHERE bsendping='1'"; 
-       $res = mysql_query($query);
-       if (mysql_num_rows($res) > 0) {
+       $res = DB::getResult($query);
+       if ($res->rowCount() > 0) {
                echo "<li>Note: The weblogs.com ping function is improved and moved into a plugin. To activate this function in v3.3, please go to plugin menu and install NP_Ping plugin. Also, NP_Ping is replacing NP_PingPong. If you have NP_PingPing installed, please also remove it.</li>";
        }
 }
index 07a122b..ed756b5 100644 (file)
@@ -25,6 +25,12 @@ function upgrade_do400()
        // Give user warning if they are running old version of PHP
        if ( phpversion() < '5' )
        {
+<<<<<<< HEAD
+               $res = DB::getResult("SELECT * FROM " . sql_table('config') . " WHERE name='Language'");
+               foreach ( $res as $row )
+               {
+                       $locale = $row['Language'];
+=======
                echo 'WARNING: You are running NucleusCMS on a older version of PHP that is no longer supported by NucleusCMS. Please upgrade to PHP5!';
        }
        
@@ -45,6 +51,7 @@ function upgrade_do400()
                                $query = 'DELETE FROM ' . sql_table('config') . " WHERE name='Language'";
                                upgrade_query("Removing Language config value", $query);
                        }
+>>>>>>> skinnable-master
                }
        }
        
index 5ac0922..2a03069 100644 (file)
@@ -282,7 +282,11 @@ function _getSkinPart($blogid, $username, $password, $type) {
 
        // 3. return skin part
        $blog =& $manager->getBlog($blogid);
+<<<<<<< HEAD
+       $skin = new SKIN($blog->getDefaultSkin());
+=======
        $skin =& $manager->getSkin($blog->getDefaultSkin());
+>>>>>>> skinnable-master
        return new xmlrpcresp(new xmlrpcval($skin->getContentFromDB($type),"string"));
 
 }
@@ -303,7 +307,11 @@ function _setSkinPart($blogid, $username, $password, $content, $type) {
 
        // 3. update skin part
        $blog =& $manager->getBlog($blogid);
+<<<<<<< HEAD
+       $skin = new SKIN($blog->getDefaultSkin());
+=======
        $skin =& $manager->getSkin($blog->getDefaultSkin());
+>>>>>>> skinnable-master
        $skin->update($type, $content);
 
        return new xmlrpcresp(new xmlrpcval(1,'boolean'));
index 2f00ebc..266790f 100644 (file)
@@ -336,7 +336,6 @@ function BtnHighlight(el) {
 
 function BtnNormal(el) {
        with(el.style){
-               padding="3px";
                border="1px solid #dddddd";
        }
 }
index f8749f1..29a7d99 100644 (file)
 
 /* markup buttons */
 .jsbuttonbar {
+<<<<<<< HEAD:nucleus/styles/addedit.css
+       height: 30px;
+=======
        padding: 3px;
+>>>>>>> skinnable-master:skins/admin/bookmarklet/styles/addedit.css
        cursor: default;
 }
 
 .jsbuttonspacer {
        float: left;
        width: 10px;
+<<<<<<< HEAD:nucleus/styles/addedit.css
+=======
 }
 
 .jsbuttonend {
        clear: both;
+>>>>>>> skinnable-master:skins/admin/bookmarklet/styles/addedit.css
 }
index d25f9a7..113fc9e 100644 (file)
@@ -269,7 +269,9 @@ div#content table tbody tr:hover {
        background-color:       #F5F5F5;
 }
 
-div#content table thead tr th {
+div#content table thead tr th,
+div#content table tfoot tr th,
+div#content table tbody tr th {
        border: none;
        background-color: #BBBBCC;
        color: #000000;
@@ -277,17 +279,23 @@ div#content table thead tr th {
 }
 
 div#content table thead th,
+div#content table thead td,
+div#content table tfoot th,
+div#content table tfoot td,
 div#content table tbody td {
        padding: 4px;
        empty-cells: show;
 }
 
 /* systemconfig column */
-div#content table.systemoverview thead th,
+div#content table.systemoverview thead td,
+div#content table.systemoverview tfoot td,
 div#content table.systemoverview tbody td {
        width:  50%;
 }
 
+div#content table thead tr td,
+div#content table tfoot tr td,
 div#content table tbody tr td {
        border: 1px solid #ddd;
        font-size: small;
index 43372af..30c2286 100644 (file)
@@ -433,9 +433,15 @@ function moveNiceTitle(e)
                X = e.pageX;
                }
        w_title = Number(CURRENT_NICE_TITLE.style.width.replace(/^(\d+).*$/, '$1'));
+<<<<<<< HEAD
+       if (w_title + X > (window.innerWidth - 20))
+               {
+               X = window.innerWidth - w_title - 20;
+=======
        if (w_title + X > (window.innerWidth + (document.documentElement.scrollLeft || window.pageXOffset) - 20))
                {
                X = (window.innerWidth + (document.documentElement.scrollLeft || window.pageXOffset) - 20) - w_title;
+>>>>>>> skinnable-master
                }
 
        if (document.all)
@@ -446,7 +452,11 @@ function moveNiceTitle(e)
                {
                Y = e.pageY;
                }
+<<<<<<< HEAD
+       if (Y > (window.innerHeight - 60))
+=======
        if (Y > (window.innerHeight + (document.documentElement.scrollTop || window.pageYOffset) - 60))
+>>>>>>> skinnable-master
                {
                Y = Y - 25 - 60;
                }