From: sakamocchi <o-takashi@sakamocchi.jp>
Date: Mon, 17 Sep 2012 11:10:23 +0000 (+0900)
Subject: Merge branch 'skinnable-master'
X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-next.git;a=commitdiff_plain;h=c90b0980cfa3e79cd4bc7eed551a64a5e2b02a5c;hp=-c

Merge branch 'skinnable-master'

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
---

c90b0980cfa3e79cd4bc7eed551a64a5e2b02a5c
diff --combined .buildpath
index 0000000,0000000..8bcb4b5
new file mode 100644
--- /dev/null
+++ b/.buildpath
@@@ -1,0 -1,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 --combined .project
index 0000000,0000000..7e1a46c
new file mode 100644
--- /dev/null
+++ b/.project
@@@ -1,0 -1,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 --combined .settings/org.eclipse.core.resources.prefs
index 0000000,0000000..730e5d2
new file mode 100644
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@@ -1,0 -1,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 --combined .settings/org.eclipse.php.core.prefs
index 0000000,0000000..5f7d896
new file mode 100644
--- /dev/null
+++ b/.settings/org.eclipse.php.core.prefs
@@@ -1,0 -1,0 +1,2 @@@
++eclipse.preferences.version=1
++include_path=
diff --combined action.php
index 6cf854a,56d18a8..33529ec
--- a/action.php
+++ b/action.php
@@@ -1,35 -1,35 +1,72 @@@
++<<<<<<< HEAD
 +<?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)
 + */
 +
 +/**
 + * File containing actions that can be performed by visitors of the site,
 + * like adding comments, etc...
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2009 The Nucleus Group
 + * @version $Id: action.php 1721 2012-03-31 10:18:25Z sakamocchi $
 + */
 +
 +$CONF = array();
 +require('./config.php');
 +include_libs('ACTION.php');
 +
 +$action = requestVar('action');
 +$a = new Action();
 +$errorInfo = $a->doAction($action);
 +
 +if ( $errorInfo )
 +{
 +	$skin = new SKIN($errorInfo['skinid']);
 +	doError($errorInfo['message'], $skin);
 +}
 +
++=======
+ <?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)
+  */
+ 
+ /**
+  * File containing actions that can be performed by visitors of the site,
+  * like adding comments, etc...
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: action.php 1888 2012-06-17 08:38:54Z sakamocchi $
+  */
+ 
+ $CONF = array();
+ require('./config.php');
+ include_libs('ACTION.php');
+ 
+ $action = requestVar('action');
+ $a = new Action();
+ $errorInfo = $a->doAction($action);
+ 
+ if ( $errorInfo )
+ {
+ 	$skin =& $manager->getSkin($errorInfo['skinid']);
+ 	doError($errorInfo['message'], $skin);
+ }
+ 
++>>>>>>> skinnable-master
  exit;
diff --combined index.php
index 3440faf,e824f67..17c1577
--- a/index.php
+++ b/index.php
@@@ -1,8 -1,9 +1,20 @@@
++<<<<<<< HEAD
 +<?php
 +// This file will generate and return the main page of the site
 +$CONF = array();
 +$CONF['Self'] = 'index.php';
 +
 +include('./config.php');
 +
 +selector();
++=======
+ <?php
+ // This file will generate and return the main page of the site
+ $CONF = array();
+ $CONF['Self'] = 'index.php';
+ 
+ include('./config.php');
+ 
+ selector();
+ 
++>>>>>>> skinnable-master
diff --combined install/index.php
index 17fb9a3,04288ee..13fd7be
--- a/install/index.php
+++ b/install/index.php
@@@ -1,1726 -1,1817 +1,3546 @@@
++<<<<<<< HEAD
 +<?php
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2002-2012 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)
 + *
 + * This script will install the Nucleus tables in your SQL-database,
 + * and initialize the data in those tables.
 + */
 +
 +/**
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2012 The Nucleus Group
 + * @version $Id: index.php 1745 2012-04-12 23:45:47Z sakamocchi $
 + */
 +
 +/* global values initialize */
 +$CONF = array();
 +
 +/* reporting all errors for support */
 +error_reporting(E_ALL);
 +
 +$minimum_php_version = '5.0.6';
 +$minimum_mysql_version = '3.23';
 +
 +$page_footer_copyright = '&copy; 2001-2012 The Nucleus Groupe . Running Nucleus CMS v4.00';
 +
 +// begin if: server's PHP version is below the minimum; halt installation
 +if ( version_compare(PHP_VERSION, $minimum_php_version, '<') )
 +{
 +	exit('<div style="font-size: xx-large;"> Nucleus requires at least PHP version ' . $minimum_php_version . '</div>');
 +}
 +
 +// make sure there's no unnecessary escaping: # set_magic_quotes_runtime(0);
 +if ( version_compare(PHP_VERSION, '5.3.0', '<') )
 +{
 +	ini_set('magic_quotes_runtime', '0');
 +}
 +
 +/* default installed plugins and skins */
 +$aConfPlugsToInstall = array('NP_SecurityEnforcer', 'NP_SkinFiles');
 +$aConfSkinsToImport = array('atom', 'rss2.0', 'rsd', 'default');
 +
 +// Check if some important files
 +do_check_files();
 +
 +/* i18n class is needed for internationalization */
 +include_once('../nucleus/libs/i18n.php');
 +if ( !i18n::init('UTF-8', '../nucleus/locales') )
 +{
 +	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>');
 +}
 +
 +// include core classes that are needed for login & plugin handling
 +
 +// added for 3.5 sql_* wrapper
 +global $MYSQL_HANDLER;
 +
 +if ( !isset($MYSQL_HANDLER) )
 +{
 +	$MYSQL_HANDLER = array('mysql', '');
 +	
 +	// check if mysql support is installed; this check may not make sense, as is, in a version past 3.5x
 +	if ( !function_exists('mysql_query') && !function_exists('mysqli_query') )
 +	{
 +		exit('<div style="font-size: xx-large;"> Your PHP version does not have support for MySQL :( </div>');
 +	}
 +}
 +include_once('../nucleus/libs/sql/sql.php');
 +
 +session_start();
 +if ( count($_GET) == 0 && count($_POST) == 0 )
 +{
 +	unset($_SESSION['param_manager']);
 +}
 +
 +// restore the $param from the session
 +if ( array_key_exists('param_manager', $_SESSION) )
 +{
 +	$param = $_SESSION['param_manager'];
 +}
 +else
 +{
 +	$param = new ParamManager();
 +}
 +
 +// include translation file
 +if ( array_key_exists('locale', $_POST) ) $param->set_locale();
 +i18n::set_current_locale($param->locale);
 +$translation_file = './locales/' . i18n::get_current_locale() . '.' . i18n::get_current_charset() . '.php';
 +if ( !file_exists($translation_file) )
 +{
 +	$translation_file = './locales/en_Latn_US.UTF-8.php';
 +}
 +include($translation_file);
 +
 +do_action();
 +
 +// $param is saved to the session
 +if ( isset($param) )
 +{
 +	$_SESSION['param_manager'] = $param;
 +}
 +else
 +{
 +	unset($_SESSION['param_manager']);
 +}
 +exit;
 +
 +/**
 + * installer action
 + */
 +function do_action()
 +{
 +	global $param;
 +
 +	if ( array_key_exists('action', $_POST) )
 +	{
 +		$isPostback = true;
 +	}
 +	else
 +	{
 +		$isPostback = false;
 +	}
 +
 +	// mode change
 +	if ( array_key_exists('mode', $_REQUEST) )
 +	{
 +		if ( $_REQUEST['mode'] == 'detail' )
 +		{
 +			$param->set_state('detail');
 +		}
 +		elseif ( $_REQUEST['mode'] == 'simple' )
 +		{
 +			$param->set_state('mysql');
 +		}
 +	}
 +
 +	// input parameter check
 +	if ( $isPostback )
 +	{
 +		switch ( $param->state )
 +		{
 +			case 'locale':
 +				$param->set_locale();
 +				$param->set_state('mysql');
 +				$isPostback = false;
 +				break;
 +			case 'mysql':
 +				if ( count($param->check_mysql_parameters()) == 0 )
 +				{
 +					$param->set_state('weblog');
 +					$isPostback = false;
 +				}
 +				break;
 +			case 'weblog':
 +				if ( count($param->check_user_parameters()) == 0
 +					&& count($param->check_weblog_parameters()) == 0 )
 +				{
 +					$param->set_state('install');
 +					$isPostback = false;
 +				}
 +				break;
 +			case 'detail':
 +				if ( $param->check_all_parameters() )
 +				{
 +					$param->set_state('install');
 +					$isPostback = false;
 +				}
 +				break;
 +		}
 +	}
 +
 +	// page render
 +	show_header();
 +	switch ( $param->state )
 +	{
 +		case 'locale':
 +			show_select_locale_form();
 +			break;
 +		case 'mysql':
 +			show_database_setting_form($isPostback);
 +			break;
 +		case 'weblog':
 +			show_blog_setting_form($isPostback);
 +			break;
 +		case 'detail':
 +			show_detail_setting_form($isPostback);
 +			break;
 +		case 'install':
 +			show_install_complete_form();
 +			break;
 +	}
 +	show_footer();
 +}
 +
 +/**
 + * header tag of the installation screens
 + **/
 +function show_header()
 +{
 +	global $param;
 +
 +	/* HTTP 1.1 application for no caching */
 +	header("Cache-Control: no-cache, must-revalidate");
 +	header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
 +	header('Content-Type: text/html; charset=' . i18n::get_current_charset());
 +?>
 +<!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><?php echo _TITLE; ?></title>
 +		<link rel="stylesheet" type="text/css" href="./styles/inst.css" />
 +		<style type="text/css">
 +		<!--
 +		<?php echo _BODYFONTSTYLE; ?>
 +		-->
 +		</style>
 +		<script type="text/javascript">
 +			function SelectText( element ) {
 +				window.setTimeout( function() { element.select() }, 0 );
 +			}
 +			var isSubmit = false;
 +			function OnceSubmit() {
 +				if (!isSubmit) {
 +					isSubmit = true;
 +					window.setTimeout( function() { isSubmit = false; }, 10000 );
 +					return true;
 +				}
 +				return false;
 +			}
 +		</script>
 +	</head>
 +	<body>
 +		<div id="header">
 +			<div id="navigation">
 +				<h1><img src="./styles/nucleus_rogo.png" alt="NucleusCMS" /></h1>
 +				<ul>
 +<?php
 +	if ( in_array($param->state, array('mysql', 'weblog', 'install')) )
 +	{
 +		echo '<li>', _STEP1, '</li><li';
 +		if ( $param->state == 'mysql' )
 +		{
 +			echo ' class="gry"';
 +		}
 +		echo '>&nbsp; &gt; &nbsp;', _STEP2, '</li><li';
 +		if ( in_array($param->state, array('mysql', 'weblog')) )
 +		{
 +			echo ' class="gry"';
 +		}
 +		echo '>&nbsp; &gt; &nbsp;', _STEP3, "</li>\n";
 +	}
 +	if ( in_array($param->state, array('mysql', 'weblog', 'detail')) )
 +	{
 +		echo '<li class="rightbox">';
 +		if ( in_array($param->state, array('mysql', 'weblog')) )
 +		{
 +			echo '<a href="./?mode=detail">', _MODE2, '</a>';
 +		}
 +		else
 +		{
 +			echo '<a href="./?mode=simple">', _MODE1, '</a>';
 +		}
 +		echo '</li>';
 +	}
 +?>
 +				</ul>
 +			</div>
 +		</div>
 +<?php
 +}
 +
 +/**
 + * footer tag of the installation screens
 + **/
 +function show_footer()
 +{
 +	global $page_footer_copyright;
 +?>
 +		<div id="footer">
 +			<?php echo $page_footer_copyright; ?>
 +		</div>
 +	</body>
 +</html>
 +<?php
 +}
 +
 +/**
 + * Display the form for language select
 + */
 +function show_select_locale_form()
 +{
 +	// get locale list
 +	$localelist = i18n::get_available_locale_list();
 +	$locales = array();
 +	foreach ( $localelist as $locale ) {
 +		$checkfile = './locales/' . $locale . '.' . i18n::get_current_charset() . '.php';
 +		$locales[] = array( $locale, (!file_exists($checkfile) ? '*&nbsp;' : '') . $locale );
 +	}
 +?>
 +		<div id="container">
 +			<p style="font-size:152%;font-weight:bold;">
 +				Select your locale:
 +			</p>
 +			<form method="post" action="./index.php">
 +
 +				<div class="prt">
 +					<select name="locale">
 +<?php
 +	// Get the browser language that can be displayed
 +	// TODO: default locale select simple implementation
 +	$languages = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
 +	$language = (is_array($languages) && count($languages) > 0) ? preg_replace('#^([\w]+).*$#', '$1', $languages[0]) : '';
 +
 +	foreach ( $locales as $locale )
 +	{
 +		echo "<option value=\"$locale[0]\"";
 +		if ( i18n::strpos($locale[0], $language) === 0 )
 +		{
 +			echo ' selected';
 +		}
 +		echo ">$locale[1]</option>\n";
 +	}
 +?>
 +					</select>
 +					<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>
 +					<p>We will wait for the translator by volunteers!</p>
 +					</p>
 +					<p class="sbt">
 +						<button type="submit" name="action" value="locale" class="sbt_arw">START</button>
 +					</p>
 +				</div>
 +			</form>
 +		</div>
 +<?php
 +}
 +
 +/**
 + * Display the form to set up a database
 + * @param bool $isPostback
 + */
 +function show_database_setting_form($isPostback)
 +{
 +	global $param, $minimum_mysql_version;
 +
 +	$config_writable = canConfigFileWritable();
 +	$mysql_version = getMySqlVersion();
 +?>
 +		<div id="container">
 +			<p class="msg">
 +<?php
 +	echo _SIMPLE_NAVI1;
 +	if ( $config_writable != '' )
 +	{
 +		echo '<span class="err">', $config_writable, '</span>';
 +	}
 +	if ( $mysql_version == '0.0.0' )
 +	{
 +		echo '<span class="err">', _DBVERSION_UNKOWN, '</span>';
 +	}
 +	elseif ( version_compare($mysql_version, $minimum_mysql_version, '<') )
 +	{
 +		echo '<span class="err">', sprintf(_DBVERSION_TOOLOW, $minimum_mysql_version), '</span>';
 +	}
 +?>
 +			</p>
 +			<form method="post" action="./index.php">
 +				<div class="prt">
 +					<h2><?php echo _DB_HEADER; ?></h2>
 +					<p class="msg">
 +<?php
 +	if ( $isPostback )
 +	{
 +		$errors = $param->check_mysql_parameters();
 +		if ( is_array($errors) )
 +		{
 +			foreach ( $errors as $error )
 +			{
 +				echo '<span class="err">', $error, "</span>\n";
 +			}
 +		}
 +	}
 +?>
 +					</p>
 +					<table>
 +						<tr>
 +							<th><span class="nam"><?php echo _DB_FIELD1; ?></span><span class="sub"><?php echo _DB_FIELD1_DESC; ?></span></th>
 +								<td><input type="text" name="mysql_host" value="<?php echo $param->mysql_host; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _DB_FIELD2; ?></span><span class="sub"><?php echo _DB_FIELD2_DESC; ?></span></th>
 +								<td><input type="text" name="mysql_user" value="<?php echo $param->mysql_user; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _DB_FIELD3; ?></span></th>
 +								<td><input type="text" name="mysql_password" value="<?php echo $param->mysql_password; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _DB_FIELD4; ?></span><span class="sub"><?php echo _DB_FIELD4_DESC; ?></span></th>
 +								<td><input type="text" name="mysql_database" value="<?php echo $param->mysql_database; ?>" /></td>
 +						</tr>
 +					</table>
 +					<p class="sbt">
 +						<button type="submit" name="mode" value="detail" class="sbt_sqr"><?php echo _MODE2; ?></button>
 +						<button type="submit" name="action" value="mysql" class="sbt_arw"><?php echo _NEXT; ?></button>
 +					</p>
 +					<p class="msg">
 +						<?php echo _DB_TEXT1; ?>
 +					</p>
 +				</div>
 +			</form>
 +		</div>
 +<?php
 +}
 +
 +/**
 + * Displays a form to the blog settings
 + * @param bool $isPostback
 + */
 +function show_blog_setting_form($isPostback)
 +{
 +	global $param;
 +?>
 +		<div id="container">
 +			<p class="msg">
 +				<?php echo _SIMPLE_NAVI2; ?>
 +			</p>
 +			<form method="post" action="./index.php">
 +				<div class="prt">
 +					<h2><?php echo _BLOG_HEADER; ?></h2>
 +					<p class="msg">
 +<?php
 +	if ( $isPostback )
 +	{
 +		$errors = $param->check_weblog_parameters();
 +		if ( is_array($errors) )
 +		{
 +			foreach ( $errors as $error )
 +			{
 +				echo '<span class="err">', $error, "</span>\n";
 +			}
 +		}
 +	}
 +?>
 +					</p>
 +					<table>
 +						<tr>
 +							<th><span class="nam"><?php echo _BLOG_FIELD1; ?></span></th>
 +								<td><input type="text" name="blog_name" value="<?php echo $param->blog_name; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _BLOG_FIELD2; ?></span><span class="sub"><?php echo _BLOG_FIELD2_DESC; ?></span></th>
 +								<td><input type="text" name="blog_shortname" value="<?php echo $param->blog_shortname; ?>" /></td>
 +						</tr>
 +					</table>
 +				</div>
 +
 +				<div class="prt">
 +					<h2><?php echo _ADMIN_HEADER; ?></h2>
 +					<p class="msg">
 +<?php
 +	if ( $isPostback )
 +	{
 +		$errors = $param->check_user_parameters();
 +		if ( is_array($errors) )
 +		{
 +			foreach ( $errors as $error )
 +			{
 +				echo '<span class="err">', $error, "</span>\n";
 +			}
 +		}
 +	}
 +?>
 +					</p>
 +					<table>
 +						<tr>
 +							<th><span class="nam"><?php echo _ADMIN_FIELD1; ?></span></th>
 +								<td><input type="text" name="user_realname" value="<?php echo $param->user_realname; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _ADMIN_FIELD2; ?></span><span class="sub"><?php echo _ADMIN_FIELD2_DESC; ?></span></th>
 +								<td><input type="text" name="user_name" value="<?php echo $param->user_name; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _ADMIN_FIELD3; ?></span></th>
 +								<td><input type="password" name="user_password" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _ADMIN_FIELD4; ?></span></th>
 +								<td><input type="password" name="user_password2" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _ADMIN_FIELD5; ?></span></th>
 +								<td><input type="text" name="user_email" value="<?php echo $param->user_email; ?>" /></td>
 +						</tr>
 +					</table>
 +					<p class="sbt">
 +						<button type="submit" name="action" value="weblog" class="sbt_arw" onclick="OnceSubmit()"><?php echo _INSTALL; ?></button>
 +					</p>
 +				</div>
 +			</form>
 +		</div>
 +<?php
 +}
 +
 +/**
 + * Displays a form to the detail settings
 + * @param bool $isPostback
 + */
 +function show_detail_setting_form($isPostback)
 +{
 +	global $param, $minimum_mysql_version;
 +
 +	$mysql_version = getMySqlVersion();
 +?>
 +		<div id="container_detailed">
 +			<p class="msg">
 +				<?php echo _DETAIL_NAVI1; ?>
 +<?php
 +	if ( $isPostback && !$param->check_all_parameters() )
 +	{
 +		echo '<span class="err">', _VALID_ERROR, "</span>\n";
 +	}
 +?>
 +			</p>
 +			<ul class="msg">
 +				<li>PHP: <?php echo phpversion(); ?></li>
 +				<li>MySQL:
 +<?php
 +	echo ($mysql_version == '0.0.0') ? _DBVERSION_UNKOWN : $mysql_version;
 +	if ( version_compare($mysql_version, $minimum_mysql_version, '<') )
 +	{
 +		echo '<span class="err">', sprintf(_DBVERSION_TOOLOW, $minimum_mysql_version), '</span>';
 +	}
 +?></li>
 +			</ul>
 +			<form method="post" action="">
 +
 +				<div class="prt">
 +					<h2><?php echo _DETAIL_HEADER1; ?></h2>
 +					<p class="msg">
 +<?php
 +	if ( $isPostback )
 +	{
 +		$errors = $param->check_mysql_parameters();
 +		if ( is_array($errors) )
 +		{
 +			foreach ( $errors as $error )
 +			{
 +				echo '<span class="err">', $error, "</span>\n";
 +			}
 +		}
 +	}
 +?>
 +					</p>
 +					<table>
 +						<tr>
 +							<th><span class="nam"><?php echo _DB_FIELD1; ?></span><span class="sub"><?php echo _DB_FIELD1_DESC; ?></span></th>
 +								<td><input type="text" name="mysql_host" value="<?php echo $param->mysql_host; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _DB_FIELD2; ?></span><span class="sub"><?php echo _DB_FIELD2_DESC; ?></span></th>
 +								<td><input type="text" name="mysql_user" value="<?php echo $param->mysql_user; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _DB_FIELD3; ?></span></th>
 +								<td><input type="text" name="mysql_password" value="<?php echo $param->mysql_password; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _DB_FIELD4; ?></span><span class="sub"><?php echo _DB_FIELD4_DESC; ?></span></th>
 +								<td><input type="text" name="mysql_database" value="<?php echo $param->mysql_database; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _DB_FIELD5; ?></span><span class="sub"><?php echo _DB_FIELD5_DESC; ?></span></th>
 +								<td><input type="text" name="mysql_tablePrefix" value="<?php echo $param->mysql_tablePrefix; ?>" /></td>
 +						</tr>
 +					</table>
 +
 +					<h2><?php echo _DETAIL_HEADER2; ?></h2>
 +					<p class="msg">
 +<?php
 +	if ( $isPostback )
 +	{
 +		$errors = $param->check_uri_parameters();
 +		if ( is_array($errors) )
 +		{
 +			foreach ( $errors as $error )
 +			{
 +				echo '<span class="err">', $error, "</span>\n";
 +			}
 +		}
 +		$errors = $param->check_path_parameters();
 +		if ( is_array($errors) )
 +		{
 +			foreach ( $errors as $error )
 +			{
 +				echo '<span class="err">', $error, "</span>\n";
 +			}
 +		}
 +	}
 +?>
 +					</p>
 +					<table>
 +						<tr>
 +							<th><span class="nam"><?php echo _PATH_FIELD1; ?></span></th>
 +								<td><input type="text" name="IndexURL" value="<?php echo $param->IndexURL; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _PATH_FIELD2; ?></span></th>
 +								<td><input type="text" name="AdminURL" value="<?php echo $param->AdminURL; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _PATH_FIELD3; ?></span></th>
 +								<td><input type="text" name="AdminPath" value="<?php echo $param->AdminPath; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _PATH_FIELD4; ?></span></th>
 +								<td><input type="text" name="MediaURL" value="<?php echo $param->MediaURL; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _PATH_FIELD5; ?></span></th>
 +								<td><input type="text" name="MediaPath" value="<?php echo $param->MediaPath; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _PATH_FIELD6; ?></span></th>
 +								<td><input type="text" name="SkinsURL" value="<?php echo $param->SkinsURL; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _PATH_FIELD7; ?></span></th>
 +								<td><input type="text" name="SkinsPath" value="<?php echo $param->SkinsPath; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _PATH_FIELD8; ?></span></th>
 +								<td><input type="text" name="PluginURL" value="<?php echo $param->PluginURL; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _PATH_FIELD9; ?></span></th>
 +								<td><input type="text" name="ActionURL" value="<?php echo $param->ActionURL; ?>" /></td>
 +						</tr>
 +					</table>
 +					<p class="msg">
 +						<?php echo _DETAIL_TEXT3; ?>
 +					</p>
 +
 +					<h2><?php echo _DETAIL_HEADER3; ?></h2>
 +					<p class="msg">
 +<?php
 +	echo _DETAIL_TEXT4;
 +	if ( $isPostback )
 +	{
 +		$errors = $param->check_user_parameters();
 +		if ( is_array($errors) )
 +		{
 +			foreach ( $errors as $error )
 +			{
 +				echo '<span class="err">', $error, "</span>\n";
 +			}
 +		}
 +	}
 +?>
 +					</p>
 +					<table>
 +						<tr>
 +							<th><span class="nam"><?php echo _ADMIN_FIELD1; ?></span></th>
 +								<td><input type="text" name="user_realname" value="<?php echo $param->user_realname; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _ADMIN_FIELD2; ?></span><span class="sub"><?php echo _ADMIN_FIELD2_DESC; ?></span></th>
 +								<td><input type="text" name="user_name" value="<?php echo $param->user_name; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _ADMIN_FIELD3; ?></span></th>
 +								<td><input type="password" name="user_password" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _ADMIN_FIELD4; ?></span></th>
 +								<td><input type="password" name="user_password2" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _ADMIN_FIELD5; ?></span></th>
 +								<td><input type="text" name="user_email" value="<?php echo $param->user_email; ?>" /></td>
 +						</tr>
 +					</table>
 +
 +					<h2><?php echo _DETAIL_HEADER4; ?></h2>
 +					<p class="msg">
 +<?php
 +	echo _DETAIL_TEXT5;
 +	if ( $isPostback )
 +	{
 +		$errors = $param->check_weblog_parameters();
 +		if ( is_array($errors) )
 +		{
 +			foreach ( $errors as $error )
 +			{
 +				echo '<span class="err">', $error, "</span>\n";
 +			}
 +		}
 +	}
 +?>
 +					</p>
 +					<table>
 +						<tr>
 +							<th><span class="nam"><?php echo _BLOG_FIELD1; ?></span></th>
 +								<td><input type="text" name="blog_name" value="<?php echo $param->blog_name; ?>" /></td>
 +						</tr>
 +						<tr>
 +							<th><span class="nam"><?php echo _BLOG_FIELD2; ?></span><span class="sub"><?php echo _BLOG_FIELD2_DESC; ?></span></th>
 +								<td><input type="text" name="blog_shortname" value="<?php echo $param->blog_shortname; ?>" /></td>
 +						</tr>
 +					</table>
 +
 +					<p class="msg">
 +						<?php echo _DETAIL_TEXT6; ?>
 +					</p>
 +
 +					<p class="sbt">
 +						<button type="submit" name="action" value="detail" class="sbt_arw" onclick="OnceSubmit()"><?php echo _INSTALL; ?></button>
 +					</p>
 +				</div>
 +			</form>
 +		</div>
 +<?php
 +}
 +
 +/**
 + * Displays a screen to signal the completion of the installation
 + */
 +function show_install_complete_form()
 +{
 +	global $MYSQL_HANDLER, $param;
 +	$errors = do_install();
 +?>
 +		<div id="container">
 +			<p class="msg">
 +<?php
 +	if ( is_array($errors) && count($errors) > 0 )
 +	{
 +		echo _INST_ERROR;
 +		foreach ( $errors as $error )
 +		{
 +			echo '<span class="err">', $error, "</span>\n";
 +		}
 +	}
 +	else
 +	{
 +		echo _INST_TEXT;
 +		if ( array_key_exists('config_data', $_SESSION) )
 +		{
 +			echo '<span class="err">', _INST_TEXT4, '</span>';
 +?>
 +<textarea id="config_text" readonly="readonly" onfocus="SelectText(this);"><?php echo htmlentities($_SESSION['config_data'], null, i18n::get_current_charset()) ?></textarea>
 +<?php
 +		}
 +		else
 +		{
 +			echo '<span class="err">', _INST_TEXT5, '</span>';
 +		}
 +?>
 +			</p>
 +			<form method="post" action="./index.php">
 +				<div class="prt">
 +					<h2><?php echo _INST_HEADER1; ?></h2>
 +					<p class="msg">
 +						<?php echo sprintf(_INST_TEXT1, $param->blog_name); ?>
 +					</p>
 +					<p class="sbt">
 +						<button type="button" name="toBlog" onclick="location.href='<?php echo $param->IndexURL; ?>';" class="sbt_arw"><?php echo _INST_BUTTON1; ?></button>
 +					</p>
 +				</div>
 +
 +				<div class="prt">
 +					<h2><?php echo _INST_HEADER2; ?></h2>
 +					<p class="msg">
 +						<?php echo _INST_TEXT2; ?>
 +					</p>
 +					<p class="sbt">
 +						<button type="button" name="toMng" onclick="location.href='<?php echo $param->AdminURL; ?>';" class="sbt_arw"><?php echo _INST_BUTTON2; ?></button>
 +					</p>
 +				</div>
 +
 +				<div class="prt">
 +					<h2><?php echo _INST_HEADER3; ?></h2>
 +					<p class="msg">
 +						<?php echo _INST_TEXT3; ?>
 +					</p>
 +					<p class="sbt">
 +						<button type="button" name="toAddBlog" onclick="location.href='<?php echo $param->AdminURL; ?>index.php?action=createnewlog';" class="sbt_arw"><?php echo _INST_BUTTON3; ?></button>
 +					</p>
 +				</div>
 +			</form>
 +<?php
 +	}
 +?>
 +		</div>
 +<?php
 +	unset($param);
 +}
 +
 +/**
 + * The installation process itself
 + * @return array error messages
 + */
 +function do_install()
 +{
 +	global $param;
 +	global $MYSQL_HANDLER, $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE, $MYSQL_PREFIX, $MYSQL_CONN;
 +	global $DIR_NUCLEUS, $DIR_MEDIA, $DIR_SKINS, $DIR_PLUGINS, $DIR_LANG, $DIR_LIBS;
 +	$errors = array();
 +
 +	/*
 +	 * 1. put all param-vars into vars
 +	 */
 +	$MYSQL_HOST		= $param->mysql_host;
 +	$MYSQL_USER		= $param->mysql_user;
 +	$MYSQL_PASSWORD	= $param->mysql_password;
 +	$MYSQL_DATABASE	= $param->mysql_database;
 +	$MYSQL_PREFIX	= $param->mysql_tablePrefix;
 +
 +	$DIR_NUCLEUS	= $param->AdminPath;
 +	$DIR_MEDIA		= $param->MediaPath;
 +	$DIR_SKINS		= $param->SkinsPath;
 +	$DIR_PLUGINS	= $DIR_NUCLEUS . 'plugins/';
 +	$DIR_LOCALES	= $DIR_NUCLEUS . 'locales/';
 +	$DIR_LIBS		= $DIR_NUCLEUS . 'libs/';
 +
 +	/*
 +	 * 2.open mySQL connection
 +	 */
 +	$MYSQL_CONN = @DB::setConnectionInfo($MYSQL_HANDLER[1], $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD);
 +	if ( $MYSQL_CONN == FALSE )
 +	{
 +		$errors[] = _DBCONNECT_ERROR;
 +		return $errors;
 +	}
 +
 +	/*
 +	 * 3. try to create database if needed
 +	 */
 +	if ( DB::execute("CREATE DATABASE IF NOT EXISTS {$MYSQL_DATABASE}") === FALSE )
 +	{
 +		$errinfo = DB::getError();
 +		$errors[] = _INST_ERROR1 . ': ' . $errinfo[2];
 +	}
 +
 +	/*
 +	 * 4. try to select database
 +	 */
 +	$MYSQL_CONN = @DB::setConnectionInfo($MYSQL_HANDLER[1], $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE);
 +	if ( !$MYSQL_CONN )
 +	{
 +		$errors[] = _INST_ERROR2;
 +	}
 +
 +	if ( count($errors) > 0 )
 +	{
 +		return $errors;
 +	}
 +
 +	/*
 +	 * 5. execute queries
 +	 */
 +	$table_names = array(
 +		'nucleus_actionlog',
 +		'nucleus_ban',
 +		'nucleus_blog',
 +		'nucleus_category',
 +		'nucleus_comment',
 +		'nucleus_config',
 +		'nucleus_item',
 +		'nucleus_karma',
 +		'nucleus_member',
 +		'nucleus_plugin',
 +		'nucleus_skin',
 +		'nucleus_template',
 +		'nucleus_team',
 +		'nucleus_activation',
 +		'nucleus_tickets'
 +	);
 +
 +	$prefixed_table_names = array();
 +	foreach ( $table_names as $table_name )
 +	{
 +		$prefixed_table_names[] = $MYSQL_PREFIX . $table_name;
 +	}
 +
 +	// table exists check
 +	$result = DB::getResult('SHOW TABLES');
 +	foreach ( $result as $row )
 +	{
 +		if ( in_array($row[0], $prefixed_table_names) )
 +		{
 +			$errors[] = _INST_ERROR3;
 +			break;
 +		}
 +	}
 +	if ( count($errors) > 0 )
 +	{
 +		return $errors;
 +	}
 +
 +	$filename = 'install.sql';
 +	$fd = fopen($filename, 'r');
 +	$queries = fread($fd, filesize($filename));
 +	fclose($fd);
 +
 +	$queries = preg_split('#(;\n|;\r)#', $queries);
 +
 +	foreach ( $queries as $query )
 +	{
 +		if ( preg_match('/\w+/', $query) )
 +		{
 +			if ( $MYSQL_PREFIX )
 +			{
 +				$query = str_replace($table_names, $prefixed_table_names, $query);
 +			}
 +
 +			if ( DB::execute($query) === FALSE )
 +			{
 +				$errinfo = DB::getError();
 +				$errors[] = _INST_ERROR4 . ' (<small>' . $query . '</small>): ' . $errinfo[2];
 +			}
 +		}
 +	}
 +
 +	/*
 +	 * 6. put needed records
 +	 */
 +	/* push first post */
 +	$query = "INSERT INTO %s VALUES (1, %s, %s, %s, 1, 1, %s, 0, 0, 0, 1, 0, 1)";
 +	$query = sprintf($query,
 +		tableName('nucleus_item'),
 +		DB::quoteValue(_1ST_POST_TITLE),
 +		DB::quoteValue(_1ST_POST),
 +		DB::quoteValue(_1ST_POST2),
 +		DB::formatDateTime()
 +	);
 +	if ( DB::execute($query) === FALSE )
 +	{
 +		$errinfo = DB::getError();
 +		$errors[] = _INST_ERROR4 . ' (<small>' . $query . '</small>): ' . $errinfo[2];
 +	}
 +
 +	/* push configurations */
 +	array_merge($errors, updateConfig('IndexURL', $param->IndexURL));
 +	array_merge($errors, updateConfig('AdminURL', $param->AdminURL));
 +	array_merge($errors, updateConfig('MediaURL', $param->MediaURL));
 +	array_merge($errors, updateConfig('SkinsURL', $param->SkinsURL));
 +	array_merge($errors, updateConfig('PluginURL', $param->PluginURL));
 +	array_merge($errors, updateConfig('ActionURL', $param->ActionURL));
 +	array_merge($errors, updateConfig('AdminEmail', $param->user_email));
 +	array_merge($errors, updateConfig('SiteName', $param->blog_name));
 +	array_merge($errors, updateConfig('Locale', i18n::get_current_locale()));
 +
 +	/* push super admin */
 +	$query = "UPDATE %s SET mname = %s, mrealname = %s, mpassword = %s, memail = %s, murl = %s, madmin = 1, mcanlogin = 1 WHERE mnumber = 1";
 +	$query = sprintf($query,
 +		tableName('nucleus_member'),
 +		DB::quoteValue($param->user_name),
 +		DB::quoteValue($param->user_realname),
 +		DB::quoteValue(md5($param->user_password)),
 +		DB::quoteValue($param->user_email),
 +		DB::quoteValue($param->IndexURL)
 +	);
 +	if ( DB::execute($query) === FALSE )
 +	{
 +		$errinfo = DB::getError();
 +		$errors[] = _INST_ERROR5 . ': ' . $errinfo[2];
 +	}
 +
 +	/* push new weblog */
 +	$query = "UPDATE %s SET bname = %s, bshortname = %s, burl = %s WHERE bnumber = 1";
 +	$query = sprintf($query,
 +		tableName('nucleus_blog'),
 +		DB::quoteValue($param->blog_name),
 +		DB::quoteValue($param->blog_shortname),
 +		DB::quoteValue($param->IndexURL)
 +	);
 +	if ( DB::execute($query) === FALSE )
 +	{
 +		$errinfo = DB::getError();
 +		$errors[] = _INST_ERROR6 . ': ' . $errinfo[2];
 +	}
 +
 +	/* push default category */
 +	$query = "UPDATE %s SET cname = %s, cdesc = %s WHERE catid = 1";
 +	$query = sprintf($query,
 +		tableName('nucleus_category'),
 +		DB::quoteValue(_GENERALCAT_NAME),
 +		DB::quoteValue(_GENERALCAT_DESC)
 +	);
 +	if ( DB::execute($query) === FALSE )
 +	{
 +		$errinfo = DB::getError();
 +		$errors[] = _INST_ERROR6 . ': ' . $errinfo[2];
 +	}
 +
 +	/*
 +	 * 7. install default plugins and skins
 +	 */
 +	global $aConfPlugsToInstall, $aConfSkinsToImport;
 +	$aSkinErrors = array();
 +	$aPlugErrors = array();
 +
 +	if ( (count($aConfPlugsToInstall) > 0) || (count($aConfSkinsToImport) > 0) )
 +	{
 +		include_once($DIR_LIBS . 'globalfunctions.php');
 +		global $manager;
 +		if ( !isset($manager) )
 +		{
 +			$manager = new Manager();
 +		}
 +
 +		include_once($DIR_LIBS . 'skinie.php');
 +		
 +		$aSkinErrors = installCustomSkins();
 +		if ( count($aSkinErrors) > 0 )
 +		{
 +			array_merge($errors, $aSkinErrors);
 +		}
 +
 +		$query		= "SELECT sdnumber FROM %s WHERE sdname='default'";
 +		$query		= sprintf($query, tableName('nucleus_skin_desc'));
 +		$defSkinID	= intval(DB::getValue($query));
 +
 +		$query = "UPDATE %s SET bdefskin=%d WHERE bnumber=1";
 +		$query = sprintf($query, tableName('nucleus_blog'), $defSkinID);
 +		DB::execute($query);
 +		
 +		$query = "UPDATE %s SET value=%d WHERE name='BaseSkin'";
 +		$query = sprintf($query, tableName('nucleus_config'), $defSkinID);
 +		DB::execute($query);
 +
 +		$aPlugErrors = installCustomPlugs();
 +		if ( count($aPlugErrors) > 0 )
 +		{
 +			array_merge($errors, $aPlugErrors);
 +		}
 +	}
 +
 +	/*
 +	 * 8. Write config file ourselves (if possible)
 +	 */
 +	$config_data = '<' . '?php' . "\n";
 +	$config_data .= "// mySQL connection information\n";
 +	$config_data .= "\$MYSQL_HOST = '" . $MYSQL_HOST . "';\n";
 +	$config_data .= "\$MYSQL_USER = '" . $MYSQL_USER . "';\n";
 +	$config_data .= "\$MYSQL_PASSWORD = '" . $MYSQL_PASSWORD . "';\n";
 +	$config_data .= "\$MYSQL_DATABASE = '" . $MYSQL_DATABASE . "';\n";
 +	$config_data .= "\$MYSQL_PREFIX = '" . $MYSQL_PREFIX . "';\n";
 +	$config_data .= "// new in 3.50. first element is db handler, the second is the db driver used by the handler\n";
 +	$config_data .= "// default is \$MYSQL_HANDLER = array('mysql','mysql');\n";
 +	$config_data .= "//\$MYSQL_HANDLER = array('mysql','mysql');\n";
 +	$config_data .= "//\$MYSQL_HANDLER = array('pdo','mysql');\n";
 +	$config_data .= "\$MYSQL_HANDLER = array('" . $MYSQL_HANDLER[0] . "','" . $MYSQL_HANDLER[1] . "');\n";
 +	$config_data .= "\n";
 +	$config_data .= "// main nucleus directory\n";
 +	$config_data .= "\$DIR_NUCLEUS = '" . $DIR_NUCLEUS . "';\n";
 +	$config_data .= "\n";
 +	$config_data .= "// path to media dir\n";
 +	$config_data .= "\$DIR_MEDIA = '" . $DIR_MEDIA . "';\n";
 +	$config_data .= "\n";
 +	$config_data .= "// extra skin files for imported skins\n";
 +	$config_data .= "\$DIR_SKINS = '" . $DIR_SKINS . "';\n";
 +	$config_data .= "\n";
 +	$config_data .= "// these dirs are normally sub dirs of the nucleus dir, but \n";
 +	$config_data .= "// you can redefine them if you wish\n";
 +	$config_data .= "\$DIR_PLUGINS = \$DIR_NUCLEUS . 'plugins/';\n";
 +	$config_data .= "\$DIR_LOCALES = \$DIR_NUCLEUS . 'locales/';\n";
 +	$config_data .= "\$DIR_LIBS = \$DIR_NUCLEUS . 'libs/';\n";
 +	$config_data .= "\n";
 +	$config_data .= "// include libs\n";
 +	$config_data .= "include(\$DIR_LIBS.'globalfunctions.php');\n";
 +	$config_data .= "?" . ">";
 +
 +	$result = false;
 +	if ( @!file_exists('../config.php') || is_writable('../config.php') )
 +	{
 +		if ( $fp = @fopen('../config.php', 'w') )
 +		{
 +			$result = @fwrite($fp, $config_data, i18n::strlen($config_data));
 +			fclose($fp);
 +		}
 +	}
 +
 +	if ( $result )
 +	{
 +		// try to change the read-only permission.
 +		if ( strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN' )
 +		{
 +			@chmod('../config.php', 0444);
 +		}
 +	}
 +	else
 +	{
 +		$_SESSION['config_data'] = $config_data;
 +	}
 +
 +	return $errors;
 +}
 +
 +/**
 + * Confirm that you can write to the configuration file
 + * @return string error message
 + */
 +function canConfigFileWritable()
 +{
 +	if ( @file_exists('../config.php') && @!is_writable('../config.php') )
 +	{
 +		// try to change the read-write permission.
 +		if ( strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN' )
 +		{
 +			@chmod('../config.php', 0666);
 +		}
 +
 +		if ( @!is_writable('../config.php') )
 +		{
 +			return _INST_ERROR8;
 +		}
 +	}
 +	return '';
 +}
 +
 +/**
 + * To obtain the version of MySQL
 + * @return string
 + */
 +function getMySqlVersion()
 +{
 +	global $MYSQL_HANDLER, $minimum_mysql_version, $errors;
 +	// Turn on output buffer
 +	// Needed to repress the output of the sql function that are
 +	// not part of php (in this case the @ operator doesn't work)
 +	ob_start();
 +
 +	// note: this piece of code is taken from phpMyAdmin
 +	$conn = @DB::setConnectionInfo($MYSQL_HANDLER[1], 'localhost', '', '');
 +
 +	if ( $conn )
 +	{
 +		$row = DB::getAttribute(PDO::ATTR_SERVER_VERSION);
 +		$match = preg_split('#\.#', $row);
 +	}
 +	else
 +	{
 +		$row = @DB::getRow('SHOW VARIABLES LIKE \'version\'');
 +
 +		if ( $row )
 +		{
 +			$match = preg_split('#\.#', $row[1]);
 +		}
 +		else
 +		{
 +			$output = (function_exists('shell_exec')) ? @shell_exec('mysql -V') : '0.0.0';
 +			preg_match('@[0-9]+\.[0-9]+\.[0-9]+@', $output, $version);
 +			$match = preg_split('#\.#', $version[0]);
 +
 +			if ( $match[0] == '' )
 +			{
 +				$match = array('0', '0', '0');
 +			}
 +		}
 +	}
 +
 +	@DB::disConnect();
 +
 +	//End and clean output buffer
 +	ob_end_clean();
 +
 +	return implode($match, '.');
 +}
 +
 +/**
 + * Add a table prefix if it is used
 + *
 + * @param string $input table name with prefix
 + * @return string
 + */
 +function tableName($input)
 +{
 +	global $MYSQL_PREFIX;
 +	if ( $MYSQL_PREFIX )
 +	{
 +		return $MYSQL_PREFIX . $input;
 +	}
 +	else
 +	{
 +		return $input;
 +	}
 +}
 +
 +/**
 + * Install custom plugins
 + */
 +function installCustomPlugs()
 +{
 +	global $aConfPlugsToInstall, $DIR_LIBS, $manager;
 +
 +	$aErrors = array();
 +	if ( count($aConfPlugsToInstall) == 0 )
 +	{
 +		return $aErrors;
 +	}
 +
 +	$query = sprintf('SELECT * FROM %s', tableName('nucleus_plugin'));
 +	$res = DB::getResult($query);
 +	$numCurrent = $res->rowCount();
 +
 +	foreach ( $aConfPlugsToInstall as $plugName )
 +	{
 +		$query = sprintf('INSERT INTO %s (porder, pfile) VALUES (%d, %s)',
 +			tableName('nucleus_plugin'),
 +			(++$numCurrent),
 +			DB::quoteValue($plugName));
 +		DB::execute($query);
 +
 +		$manager->clearCachedInfo('installedPlugins');
 +		$plugin =& $manager->getPlugin($plugName);
 +		$plugin->setID($numCurrent);
 +
 +		if ( !$plugin )
 +		{
 +			$query = sprintf('DELETE FROM %s WHERE pfile = %s',
 +				tableName('nucleus_plugin'),
 +				DB::quoteValue($plugName));
 +			DB::execute($query);
 +			$numCurrent--;
 +			array_push($aErrors, sprintf(_INST_ERROR9, $plugName));
 +			continue;
 +		}
 +		$plugin->install();
 +	}
 +
 +	$query = sprintf('DELETE FROM %s', tableName('nucleus_plugin_event'));
 +	DB::execute($query);
 +	$query = sprintf('SELECT pid, pfile FROM %s', tableName('nucleus_plugin'));
 +	$res = DB::getResult($query);
 +
 +	foreach ( $res as $row )
 +	{
 +		$plug =& $manager->getPlugin($row['pfile']);
 +
 +		if ( $plug )
 +		{
 +			$eventList = $plug->getEventList();
 +			foreach ( $eventList as $eventName )
 +			{
 +				$query = sprintf('INSERT INTO %s (pid, event) VALUES (%d, %s)',
 +					tableName('nucleus_plugin_event'),
 +					intval($row['pid']),
 +					DB::quoteValue($eventName));
 +				DB::execute($query);
 +			}
 +		}
 +	}
 +	return $aErrors;
 +}
 +
 +/**
 + * Install custom skins
 + * Prepares the installation of custom skins
 + */
 +function installCustomSkins()
 +{
 +	global $aConfSkinsToImport, $DIR_LIBS, $DIR_SKINS;
 +
 +	$aErrors = array();
 +	if ( count($aConfSkinsToImport) == 0 )
 +	{
 +		return $aErrors;
 +	}
 +
 +	$importer = new SkinImport();
 +
 +	foreach ( $aConfSkinsToImport as $skinName )
 +	{
 +		$importer->reset();
 +		$skinFile = $DIR_SKINS . $skinName . '/skinbackup.xml';
 +
 +		if ( !@file_exists($skinFile) )
 +		{
 +			array_push($aErrors, sprintf(_INST_ERROR10, $skinFile));
 +			continue;
 +		}
 +
 +		$error = $importer->readFile($skinFile);
 +
 +		if ( $error )
 +		{
 +			array_push($aErrors, sprintf(_INST_ERROR11, $skinName) . ' : ' . $error);
 +			continue;
 +		}
 +
 +		$error = $importer->writeToDatabase(1);
 +
 +		if ( $error )
 +		{
 +			array_push($aErrors, sprintf(_INST_ERROR12, $skinName) . ' : ' . $error);
 +			continue;
 +		}
 +	}
 +	return $aErrors;
 +}
 +
 +/**
 + * Check if some important files of the Nucleus CMS installation are available
 + * Give an error if one or more files are not accessible
 + */
 +function do_check_files()
 +{
 +	$missingfiles = array();
 +	$files = array(
 +		'./install.sql',
 +		'../index.php',
 +		'../action.php',
 +		'../nucleus/index.php',
 +		'../nucleus/media.php',
 +		'../nucleus/libs/ACTION.php',
 +		'../nucleus/libs/ACTIONLOG.php',
 +		'../nucleus/libs/ACTIONS.php',
 +		'../nucleus/libs/ADMIN.php',
 +		'../nucleus/libs/BaseActions.php',
 +		'../nucleus/libs/BLOG.php',
 +		'../nucleus/libs/BODYACTIONS.php',
 +		'../nucleus/libs/COMMENT.php',
 +		'../nucleus/libs/COMMENTACTIONS.php',
 +		'../nucleus/libs/COMMENTS.php',
 +		'../nucleus/libs/ENCAPSULATE.php',
 +		'../nucleus/libs/ENTITY.php',
 +		'../nucleus/libs/globalfunctions.php',
 +		'../nucleus/libs/i18n.php',
 +		'../nucleus/libs/ITEM.php',
 +		'../nucleus/libs/ITEMACTIONS.php',
 +		'../nucleus/libs/LINK.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/showlist.php',
 +		'../nucleus/libs/SKIN.php',
 +		'../nucleus/libs/TEMPLATE.php',
 +		'../nucleus/libs/vars4.1.0.php',
 +		'../nucleus/libs/xmlrpc.inc.php',
 +		'../nucleus/libs/xmlrpcs.inc.php',
 +		'../nucleus/libs/sql/DB.php',
 +		'../nucleus/libs/sql/MYSQLPDO.php'
 +	);
 +
 +	$count = count($files);
 +	for ( $i = 0; $i < $count; $i++ )
 +	{
 +		if ( !is_readable($files[$i]) )
 +		{
 +			array_push($missingfiles, 'File <b>' . $files[$i] . '</b> is missing or not readable.<br />');
 +		}
 +	}
 +
 +	if ( count($missingfiles) > 0 )
 +	{
 +		exit(implode("\n", $missingfiles));
 +	}
 +}
 +
 +/**
 + * Updates the configuration in the database
 + *
 + * @param string $name name of the config var
 + * @param string $value new value of the config var
 + * @return array
 + */
 +function updateConfig($name, $value)
 +{
 +	$errors = array();
 +
 +	$query = "UPDATE %s SET value = %s WHERE name = %s";
 +	$query = sprintf($query, tableName('nucleus_config'), DB::quoteValue(trim($value)), DB::quoteValue($name));
 +
 +	if ( DB::execute($query) === FALSE )
 +	{
 +		$errinfo = DB::getError();
 +		$errors[] = _INST_ERROR4 . ': ' . $errinfo[2];
 +	}
 +	return $errors;
 +}
 +
 +class ParamManager
 +{
 +	/* process parameter */
 +	public $state;
 +	public $locale;
 +
 +	/* mysql connection parameters */
 +	public $mysql_host;
 +	public $mysql_user;
 +	public $mysql_password;
 +	public $mysql_database;
 +	public $mysql_tablePrefix;
 +
 +	/* weblog configuration parameters */
 +	public $blog_name;
 +	public $blog_shortname;
 +
 +	/* member configuration parameters */
 +	public $user_name;
 +	public $user_realname;
 +	public $user_password;
 +	private $user_password2;
 +	public $user_email;
 +
 +	/* URI parameters  */
 +	private $root_url;
 +	public $IndexURL;
 +	public $AdminURL;
 +	public $MediaURL;
 +	public $SkinsURL;
 +	public $PluginURL;
 +	public $ActionURL;
 +
 +	/* path parameters */
 +	private $root_path;
 +	public $AdminPath;
 +	public $MediaPath;
 +	public $SkinsPath;
 +
 +	/**
 +	 * constructor
 +	 */
 +	public function __construct()
 +	{
 +		$this->init();
 +	}
 +
 +	public function init()
 +	{
 +		// set default values
 +		$this->state = 'locale';
 +		$this->install_mode = 'simple';
 +		$this->locale = 'en_Latn_US';
 +		$this->mysql_host = @ini_get('mysql.default_host');
 +		$this->blog_name = 'My Nucleus CMS';
 +		$this->blog_shortname = 'mynucleuscms';
 +
 +		/* root path */
 +		$directory_separator = preg_quote(DIRECTORY_SEPARATOR, '|');
 +		$this->root_path = implode('/', preg_split("|$directory_separator|", realpath(dirname(__FILE__) . '/..')));
 +		if ( substr($this->root_path, -1, 1) !== '/' )
 +		{
 +			$this->root_path .= '/';
 +		}
 +		$base_path_pcre = preg_quote($this->root_path, '|');
 +
 +		/* current directry name */
 +		$directory_name = preg_replace("#{$base_path_pcre}#", '', implode('/', preg_split("#{$directory_separator}#", realpath(dirname(__FILE__)))));
 +		$directory_name_pcre = preg_quote($directory_name, '|');
 +
 +		/* root uri */
 +		$root_url = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
 +		$this->root_url = preg_replace("|$directory_name_pcre(.*)$|", '', $root_url);
 +
 +		$this->AdminPath = $this->root_path . 'nucleus/';
 +		$this->MediaPath = $this->root_path . 'media/';
 +		$this->SkinsPath = $this->root_path . 'skins/';
 +
 +		$this->IndexURL  = $this->root_url;
 +		$this->AdminURL  = $this->root_url . 'nucleus/';
 +		$this->MediaURL  = $this->root_url . 'media/';
 +		$this->SkinsURL  = $this->root_url . 'skins/';
 +		$this->PluginURL = $this->root_url . 'nucleus/plugins/';
 +		$this->ActionURL = $this->root_url . 'action.php';
 +	}
 +
 +	private function read_parameter($parameter)
 +	{
 +		foreach ( $parameter as $element )
 +		{
 +			if ( array_key_exists($element, $_POST) )
 +			{
 +				$this->$element = $_POST[$element];
 +			}
 +		}
 +	}
 +
 +	public function set_state($state)
 +	{
 +		$states = array('locale', 'mysql', 'weblog', 'detail', 'install');
 +		if ( in_array($state, $states) )
 +		{
 +			$this->state = $state;
 +		}
 +	}
 +
 +	public function set_locale()
 +	{
 +		$this->read_parameter(array('locale'));
 +
 +		if ( !in_array($this->locale, i18n::get_available_locale_list()) )
 +		{
 +			$this->locale = 'en_Latn_US';
 +		}
 +	}
 +
 +	public function check_mysql_parameters()
 +	{
 +		global $MYSQL_HANDLER;
 +		
 +		$parameters = array('mysql_host', 'mysql_user', 'mysql_password', 'mysql_database', 'mysql_tablePrefix');
 +		$this->read_parameter($parameters);
 +
 +		$errors = array();
 +		if ( $this->mysql_host == '' )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR1, _DB_FIELD1);
 +		}
 +
 +		if ( $this->mysql_user == '' )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR1, _DB_FIELD2);
 +		}
 +		
 +		if ( $this->mysql_user != ''
 +			&& !preg_match('/^[a-z0-9_\-]+$/i', $this->mysql_user) )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR2, _DB_FIELD2);
 +		}
 +		
 +		if ( $this->mysql_database == '' )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR1, _DB_FIELD4);
 +		}
 +
 +		if ( $this->mysql_database != ''
 +			&& !preg_match('/^[a-z0-9_\-]+$/i', $this->mysql_database) )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR2, _DB_FIELD4);
 +		}
 +
 +		if ( $this->mysql_tablePrefix != ''
 +			&& !preg_match('/^[a-z0-9_]+$/i', $this->mysql_tablePrefix) )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR3, _DB_FIELD5);
 +		}
 +		
 +		if ( count($errors) == 0 )
 +		{
 +			$mysql_conn = @DB::setConnectionInfo($MYSQL_HANDLER[1], $this->mysql_host, $this->mysql_user, $this->mysql_password);
 +			if ( $mysql_conn == false )
 +			{
 +				$errors[] = _DBCONNECT_ERROR;
 +			}
 +			else
 +			{
 +				@DB::disConnect();
 +			}
 +		}
 +
 +		return $errors;
 +	}
 +
 +	public function check_user_parameters()
 +	{
 +		$parameters = array('user_name', 'user_realname', 'user_password', 'user_password2', 'user_email');
 +		$this->read_parameter($parameters);
 +
 +		$errors = array();
 +		if ( $this->user_realname == '' )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR1, _ADMIN_FIELD1);
 +		}
 +
 +		if ( $this->user_name == '' )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR1, _ADMIN_FIELD2);
 +		}
 +		elseif ( !preg_match("/^[a-z0-9]+([ a-z0-9]*[a-z0-9]+)?$/i", $this->user_name) )
 +		{
 +			$errors[] = _VALID_ERROR5;
 +		}
 +
 +		if ( $this->user_password == '' || $this->user_password2 == '' )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR1, _ADMIN_FIELD3);
 +			$this->user_password = '';
 +		}
 +		elseif ( $this->user_password != $this->user_password2 )
 +		{
 +			$errors[] = _VALID_ERROR6;
 +			$this->user_password = '';
 +		}
 +
 +		if ( !preg_match("/^[a-z0-9\._+\-]+@[a-z0-9\._\-]+\.[a-z]{2,6}$/i", $this->user_email) )
 +		{
 +			$errors[] = _VALID_ERROR7;
 +		}
 +
 +		return $errors;
 +	}
 +
 +	public function check_weblog_parameters()
 +	{
 +		$parameters = array('blog_name', 'blog_shortname');
 +		$this->read_parameter($parameters);
 +
 +		$errors = array();
 +		if ( $this->blog_name == '' )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR1, _BLOG_FIELD1);
 +		}
 +
 +		if ( $this->blog_shortname == '' )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR1, _BLOG_FIELD2);
 +		}
 +
 +		if ( !preg_match("/^[a-z0-9]+$/i", $this->blog_shortname) )
 +		{
 +			$errors[] = _VALID_ERROR4;
 +		}
 +
 +		return $errors;
 +	}
 +
 +	public function check_uri_parameters()
 +	{
 +		$parameters = array('IndexURL', 'AdminURL', 'MediaURL', 'SkinsURL', 'PluginURL', 'ActionURL');
 +		$this->read_parameter($parameters);
 +
 +		$errors = array();
 +		if ( substr($this->IndexURL, -1, 1) !== '/' )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR8, _PATH_FIELD1);
 +		}
 +
 +		if ( substr($this->AdminURL, -1, 1) !== '/' )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR8, _PATH_FIELD2);
 +		}
 +
 +		if ( substr($this->MediaURL, -1, 1) !== '/' )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR8, _PATH_FIELD4);
 +		}
 +
 +		if ( substr($this->SkinsURL, -1, 1) !== '/' )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR8, _PATH_FIELD6);
 +		}
 +
 +		if ( substr($this->PluginURL, -1, 1) !== '/' )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR8, _PATH_FIELD8);
 +		}
 +
 +		if ( strrchr($this->ActionURL, '/') != '/action.php' )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR9, _PATH_FIELD9);
 +		}
 +
 +		return $errors;
 +	}
 +
 +	public function check_path_parameters()
 +	{
 +		$parameters = array('AdminPath', 'MediaPath', 'SkinsPath');
 +		$this->read_parameter($parameters);
 +
 +		$separators = array('/', DIRECTORY_SEPARATOR);
 +		$errors = array();
 +		if ( !in_array(substr($this->AdminPath, -1, 1), $separators) )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR10, _PATH_FIELD3);
 +		}
 +		elseif ( !file_exists($this->AdminPath) )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR11, _PATH_FIELD3);
 +		}
 +
 +		if ( !in_array(substr($this->MediaPath, -1, 1), $separators) )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR10, _PATH_FIELD5);
 +		}
 +		elseif ( !file_exists($this->MediaPath) )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR11, _PATH_FIELD5);
 +		}
 +
 +		if ( !in_array(substr($this->SkinsPath, -1, 1), $separators) )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR10, _PATH_FIELD7);
 +		}
 +		elseif ( !file_exists($this->SkinsPath) )
 +		{
 +			$errors[] = sprintf(_VALID_ERROR11, _PATH_FIELD7);
 +		}
 +
 +		return $errors;
 +	}
 +
 +	/**
 +	 * check all parameters
 +	 * @return bool
 +	 */
 +	public function check_all_parameters()
 +	{
 +		$this->set_locale();
 +
 +		$isValid = true;
 +		$isValid &= (count($this->check_mysql_parameters()) == 0);
 +		$isValid &= (count($this->check_user_parameters()) == 0);
 +		$isValid &= (count($this->check_weblog_parameters()) == 0);
 +		$isValid &= (count($this->check_uri_parameters()) == 0);
 +		$isValid &= (count($this->check_path_parameters()) == 0);
 +
 +		return $isValid;
 +	}
 +}
++=======
+ <?php
+ /*
+  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+  * Copyright (C) 2002-2012 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)
+  *
+  * This script will install the Nucleus tables in your SQL-database,
+  * and initialize the data in those tables.
+  */
+ 
+ /**
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+  * @version $Id: index.php 1889 2012-06-17 08:46:45Z sakamocchi $
+  */
+ 
+ /* global values initialize */
+ $CONF = array();
+ 
+ /* reporting all errors for support */
+ error_reporting(E_ALL);
+ 
+ $minimum_php_version = '5.0.6';
+ $minimum_mysql_version = '3.23';
+ 
+ $page_footer_copyright = '&copy; 2001-2012 The Nucleus Groupe . Running Nucleus CMS v4.00';
+ 
+ // begin if: server's PHP version is below the minimum; halt installation
+ if ( version_compare(PHP_VERSION, $minimum_php_version, '<') )
+ {
+ 	exit('<div style="font-size: xx-large;"> Nucleus requires at least PHP version ' . $minimum_php_version . '</div>');
+ }
+ 
+ // make sure there's no unnecessary escaping: # set_magic_quotes_runtime(0);
+ if ( version_compare(PHP_VERSION, '5.3.0', '<') )
+ {
+ 	ini_set('magic_quotes_runtime', '0');
+ }
+ 
+ /* default installed plugins and skins */
+ $aConfPlugsToInstall = array('NP_SecurityEnforcer', 'NP_SkinFiles', 'NP_Medium');
+ $aConfSkinsToImport = array('atom', 'rss2.0', 'rsd', 'default', 'admin/default', 'admin/bookmarklet');
+ 
+ // Check if some important files
+ do_check_files();
+ 
+ /* i18n class is needed for internationalization */
+ include_once('../nucleus/libs/i18n.php');
+ if ( !i18n::init('UTF-8', '../nucleus/locales') )
+ {
+ 	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>');
+ }
+ 
+ // include core classes that are needed for login & plugin handling
+ 
+ // added for 3.5 sql_* wrapper
+ global $MYSQL_HANDLER;
+ 
+ if ( !isset($MYSQL_HANDLER) )
+ {
+ 	$MYSQL_HANDLER = array('mysql', '');
+ 	
+ 	// check if mysql support is installed; this check may not make sense, as is, in a version past 3.5x
+ 	if ( !function_exists('mysql_query') && !function_exists('mysqli_query') )
+ 	{
+ 		exit('<div style="font-size: xx-large;"> Your PHP version does not have support for MySQL :( </div>');
+ }
+ }
+ include_once('../nucleus/libs/sql/sql.php');
+ 
+ session_start();
+ if ( count($_GET) == 0 && count($_POST) == 0 )
+ {
+ 	unset($_SESSION['param_manager']);
+ }
+ 
+ // restore the $param from the session
+ if ( array_key_exists('param_manager', $_SESSION) )
+ {
+ 	$param = $_SESSION['param_manager'];
+ }
+ else
+ {
+ 	$param = new ParamManager();
+ }
+ 
+ // include translation file
+ $param->set_locale();
+ 
+ do_action();
+ 
+ // $param is saved to the session
+ if ( isset($param) )
+ {
+ 	$_SESSION['param_manager'] = $param;
+ }
+ else
+ {
+ 	unset($_SESSION['param_manager']);
+ }
+ exit;
+ 
+ /**
+  * installer action
+  */
+ function do_action()
+ {
+ 	global $param;
+ 
+ 	if ( array_key_exists('action', $_POST) )
+ 	{
+ 		$isPostback = true;
+ 	}
+ 	else
+ 	{
+ 		$isPostback = false;
+ 	}
+ 
+ 	// mode change
+ 	if ( array_key_exists('mode', $_REQUEST) )
+ 	{
+ 		if ( $_REQUEST['mode'] == 'detail' )
+ 		{
+ 			$param->set_state('detail');
+ 		}
+ 		elseif ( $_REQUEST['mode'] == 'simple' )
+ 		{
+ 			$param->set_state('mysql');
+ 		}
+ 	}
+ 
+ 	// input parameter check
+ 	if ( $isPostback )
+ 	{
+ 		switch ( $param->state )
+ 		{
+ 			case 'locale':
+ 				$param->set_state('mysql');
+ 				$isPostback = false;
+ 				break;
+ 			case 'mysql':
+ 				if ( count($param->check_mysql_parameters()) == 0 )
+ 				{
+ 					$param->set_state('weblog');
+ 					$isPostback = false;
+ 				}
+ 				break;
+ 			case 'weblog':
+ 				if ( count($param->check_user_parameters()) == 0
+ 					&& count($param->check_weblog_parameters()) == 0 )
+ 				{
+ 					$param->set_state('install');
+ 					$isPostback = false;
+ 				}
+ 				break;
+ 			case 'detail':
+ 				if ( $param->check_all_parameters() )
+ 				{
+ 					$param->set_state('install');
+ 					$isPostback = false;
+ 				}
+ 				break;
+ 		}
+ 	}
+ 
+ 	// page render
+ 	show_header();
+ 	switch ( $param->state )
+ 	{
+ 		case 'locale':
+ 			show_select_locale_form();
+ 			break;
+ 		case 'mysql':
+ 			show_database_setting_form($isPostback);
+ 			break;
+ 		case 'weblog':
+ 			show_blog_setting_form($isPostback);
+ 			break;
+ 		case 'detail':
+ 			show_detail_setting_form($isPostback);
+ 			break;
+ 		case 'install':
+ 			show_install_complete_form();
+ 			break;
+ 	}
+ 	show_footer();
+ }
+ 
+ /**
+  * header tag of the installation screens
+  **/
+ function show_header()
+ {
+ 	global $param;
+ 
+ 	/* HTTP 1.1 application for no caching */
+ 	header("Cache-Control: no-cache, must-revalidate");
+ 	header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
+ 	header('Content-Type: text/html; charset=' . i18n::get_current_charset());
+ ?>
+ <!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><?php echo _TITLE; ?></title>
+ 		<link rel="stylesheet" type="text/css" href="./styles/inst.css" />
+ 		<style type="text/css">
+ 		<!--
+ 		<?php echo _BODYFONTSTYLE; ?>
+ 		-->
+ 		</style>
+ 		<script type="text/javascript">
+ 			function SelectText( element ) {
+ 				window.setTimeout( function() { element.select() }, 0 );
+ 			}
+ 			var isSubmit = false;
+ 			function OnceSubmit() {
+ 				if (!isSubmit) {
+ 					isSubmit = true;
+ 					window.setTimeout( function() { isSubmit = false; }, 10000 );
+ 					return true;
+ 				}
+ 				return false;
+ 			}
+ 		</script>
+ 	</head>
+ 	<body>
+ 		<div id="header">
+ 			<div id="navigation">
+ 				<h1><img src="./styles/nucleus_rogo.png" alt="NucleusCMS" /></h1>
+ 				<ul>
+ <?php
+ 	echo '<li>';
+ 	$label = '_LOCALE_' . strtoupper($param->locale);
+ 	if ( !defined($label) )
+ 	{
+ 		echo $param->locale;
+ 	}
+ 	else
+ 	{
+ 		echo constant($label);
+ 	}
+ 	echo "</li>\n";
+ 	
+ 	if ( in_array($param->state, array('mysql', 'weblog', 'install')) )
+ 	{
+ 		echo '<li>&nbsp; &gt; &nbsp;' . _STEP1, '</li><li';
+ 		if ( $param->state == 'mysql' )
+ 		{
+ 			echo ' class="gry"';
+ 		}
+ 		echo '>&nbsp; &gt; &nbsp;', _STEP2, '</li><li';
+ 		if ( in_array($param->state, array('mysql', 'weblog')) )
+ 		{
+ 			echo ' class="gry"';
+ 		}
+ 		echo '>&nbsp; &gt; &nbsp;', _STEP3, "</li>\n";
+ 	}
+ 	if ( in_array($param->state, array('mysql', 'weblog', 'detail')) )
+ 	{
+ 		echo '<li class="rightbox">';
+ 		if ( in_array($param->state, array('mysql', 'weblog')) )
+ 		{
+ 			echo '<a href="./?mode=detail">', _MODE2, '</a>';
+ 		}
+ 		else
+ 		{
+ 			echo '<a href="./?mode=simple">', _MODE1, '</a>';
+ 		}
+ 		echo '</li>';
+ 	}
+ ?>
+ 				</ul>
+ 			</div>
+ 		</div>
+ <?php
+ }
+ 
+ /**
+  * footer tag of the installation screens
+  **/
+ function show_footer()
+ {
+ 	global $page_footer_copyright;
+ ?>
+ 		<div id="footer">
+ 			<?php echo $page_footer_copyright; ?>
+ 		</div>
+ 	</body>
+ </html>
+ <?php
+ }
+ 
+ /**
+  * Display the form for language select
+  */
+ function show_select_locale_form()
+ {
+ 	global $param;
+ 	
+ ?>
+ 		<div id="container">
+ 			<p style="font-size:152%;font-weight:bold;">
+ 				<?php echo _LOCALE_HEADER; ?>
+ 			</p>
+ 			<form method="post" action="./index.php">
+ 
+ 				<div class="prt">
+ 					<select name="locale">
+ <?php
+ 	$locales = i18n::get_available_locale_list();
+ 	foreach ( $locales as $locale )
+ 	{
+ 		if ( $param->locale != $locale )
+ 		{
+ 			echo "<option value=\"{$locale}\">";
+ 		}
+ 		else
+ 		{
+ 			echo "<option value=\"{$locale}\" selected=\"selected\">";
+ 		}
+ 		
+ 		$checkfile = "./locales/{$locale}." . i18n::get_current_charset() . '.php';
+ 		if ( !file_exists($checkfile) )
+ 		{
+ 			echo '*&nbsp;';
+ 		}
+ 
+ 		$label = '_LOCALE_' . strtoupper($locale);
+ 		if ( !defined($label) )
+ 	{
+ 			echo $locale;
+ 		}
+ 		else
+ 		{
+ 			echo constant($label);
+ 		}
+ 		echo "</option>\n";
+ 	}
+ ?>
+ 					</select>
+ 					<p><?php echo _LOCALE_DESC1; ?></p>
+ 					<p><?php echo _LOCALE_DESC2; ?></p>
+ 					<p><?php echo _LOCALE_NEED_HELP;?></p>
+ 					<p class="sbt">
+ 						<button type="submit" name="action" value="locale" class="sbt_arw">START</button>
+ 					</p>
+ 				</div>
+ 			</form>
+ 		</div>
+ <?php
+ }
+ 
+ /**
+  * Display the form to set up a database
+  * @param bool $isPostback
+  */
+ function show_database_setting_form($isPostback)
+ {
+ 	global $param, $minimum_mysql_version;
+ 
+ 	$config_writable = canConfigFileWritable();
+ 	$mysql_version = getMySqlVersion();
+ ?>
+ 		<div id="container">
+ 			<p class="msg">
+ <?php
+ 	echo _SIMPLE_NAVI1;
+ 	if ( $config_writable != '' )
+ 	{
+ 		echo '<span class="err">', $config_writable, '</span>';
+ 	}
+ 	if ( $mysql_version == '0.0.0' )
+ 	{
+ 		echo '<span class="err">', _DBVERSION_UNKOWN, '</span>';
+ 	}
+ 	elseif ( version_compare($mysql_version, $minimum_mysql_version, '<') )
+ 	{
+ 		echo '<span class="err">', sprintf(_DBVERSION_TOOLOW, $minimum_mysql_version), '</span>';
+ 	}
+ ?>
+ 			</p>
+ 			<form method="post" action="./index.php">
+ 				<div class="prt">
+ 					<h2><?php echo _DB_HEADER; ?></h2>
+ 					<p class="msg">
+ <?php
+ 	if ( $isPostback )
+ 	{
+ 		$errors = $param->check_mysql_parameters();
+ 		if ( is_array($errors) )
+ 		{
+ 			foreach ( $errors as $error )
+ 			{
+ 				echo '<span class="err">', $error, "</span>\n";
+ 			}
+ 		}
+ 	}
+ ?>
+ 					</p>
+ 					<table>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _DB_FIELD1; ?></span><span class="sub"><?php echo _DB_FIELD1_DESC; ?></span></th>
+ 								<td><input type="text" name="mysql_host" value="<?php echo $param->mysql_host; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _DB_FIELD2; ?></span><span class="sub"><?php echo _DB_FIELD2_DESC; ?></span></th>
+ 								<td><input type="text" name="mysql_user" value="<?php echo $param->mysql_user; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _DB_FIELD3; ?></span></th>
+ 								<td><input type="text" name="mysql_password" value="<?php echo $param->mysql_password; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _DB_FIELD4; ?></span><span class="sub"><?php echo _DB_FIELD4_DESC; ?></span></th>
+ 								<td><input type="text" name="mysql_database" value="<?php echo $param->mysql_database; ?>" /></td>
+ 						</tr>
+ 					</table>
+ 					<p class="sbt">
+ 						<button type="submit" name="mode" value="detail" class="sbt_sqr"><?php echo _MODE2; ?></button>
+ 						<button type="submit" name="action" value="mysql" class="sbt_arw"><?php echo _NEXT; ?></button>
+ 					</p>
+ 					<p class="msg">
+ 						<?php echo _DB_TEXT1; ?>
+ 					</p>
+ 				</div>
+ 			</form>
+ 		</div>
+ <?php
+ }
+ 
+ /**
+  * Displays a form to the blog settings
+  * @param bool $isPostback
+  */
+ function show_blog_setting_form($isPostback)
+ {
+ 	global $param;
+ ?>
+ 		<div id="container">
+ 			<p class="msg">
+ 				<?php echo _SIMPLE_NAVI2; ?>
+ 			</p>
+ 			<form method="post" action="./index.php">
+ 				<div class="prt">
+ 					<h2><?php echo _BLOG_HEADER; ?></h2>
+ 					<p class="msg">
+ <?php
+ 	if ( $isPostback )
+ 	{
+ 		$errors = $param->check_weblog_parameters();
+ 		if ( is_array($errors) )
+ 		{
+ 			foreach ( $errors as $error )
+ 			{
+ 				echo '<span class="err">', $error, "</span>\n";
+ 			}
+ 		}
+ 	}
+ ?>
+ 					</p>
+ 					<table>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _BLOG_FIELD1; ?></span></th>
+ 								<td><input type="text" name="blog_name" value="<?php echo $param->blog_name; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _BLOG_FIELD2; ?></span><span class="sub"><?php echo _BLOG_FIELD2_DESC; ?></span></th>
+ 								<td><input type="text" name="blog_shortname" value="<?php echo $param->blog_shortname; ?>" /></td>
+ 						</tr>
+ 					</table>
+ 				</div>
+ 
+ 				<div class="prt">
+ 					<h2><?php echo _ADMIN_HEADER; ?></h2>
+ 					<p class="msg">
+ <?php
+ 	if ( $isPostback )
+ 	{
+ 		$errors = $param->check_user_parameters();
+ 		if ( is_array($errors) )
+ 		{
+ 			foreach ( $errors as $error )
+ 			{
+ 				echo '<span class="err">', $error, "</span>\n";
+ 			}
+ 		}
+ 	}
+ ?>
+ 					</p>
+ 					<table>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _ADMIN_FIELD1; ?></span></th>
+ 								<td><input type="text" name="user_realname" value="<?php echo $param->user_realname; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _ADMIN_FIELD2; ?></span><span class="sub"><?php echo _ADMIN_FIELD2_DESC; ?></span></th>
+ 								<td><input type="text" name="user_name" value="<?php echo $param->user_name; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _ADMIN_FIELD3; ?></span></th>
+ 								<td><input type="password" name="user_password" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _ADMIN_FIELD4; ?></span></th>
+ 								<td><input type="password" name="user_password2" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _ADMIN_FIELD5; ?></span></th>
+ 								<td><input type="text" name="user_email" value="<?php echo $param->user_email; ?>" /></td>
+ 						</tr>
+ 					</table>
+ 					<p class="sbt">
+ 						<button type="submit" name="action" value="weblog" class="sbt_arw" onclick="OnceSubmit()"><?php echo _INSTALL; ?></button>
+ 					</p>
+ 				</div>
+ 			</form>
+ 		</div>
+ <?php
+ }
+ 
+ /**
+  * Displays a form to the detail settings
+  * @param bool $isPostback
+  */
+ function show_detail_setting_form($isPostback)
+ {
+ 	global $param, $minimum_mysql_version;
+ 
+ 	$mysql_version = getMySqlVersion();
+ ?>
+ 		<div id="container_detailed">
+ 			<p class="msg">
+ 				<?php echo _DETAIL_NAVI1; ?>
+ <?php
+ 	if ( $isPostback && !$param->check_all_parameters() )
+ 	{
+ 		echo '<span class="err">', _VALID_ERROR, "</span>\n";
+ 	}
+ ?>
+ 			</p>
+ 			<ul class="msg">
+ 				<li>PHP: <?php echo phpversion(); ?></li>
+ 				<li>MySQL:
+ <?php
+ 	echo ($mysql_version == '0.0.0') ? _DBVERSION_UNKOWN : $mysql_version;
+ 	if ( version_compare($mysql_version, $minimum_mysql_version, '<') )
+ 	{
+ 		echo '<span class="err">', sprintf(_DBVERSION_TOOLOW, $minimum_mysql_version), '</span>';
+ 	}
+ ?></li>
+ 			</ul>
+ 			<form method="post" action="">
+ 
+ 				<div class="prt">
+ 					<h2><?php echo _DETAIL_HEADER1; ?></h2>
+ 					<p class="msg">
+ <?php
+ 	if ( $isPostback )
+ 	{
+ 		$errors = $param->check_mysql_parameters();
+ 		if ( is_array($errors) )
+ 		{
+ 			foreach ( $errors as $error )
+ 			{
+ 				echo '<span class="err">', $error, "</span>\n";
+ 			}
+ 		}
+ 	}
+ ?>
+ 					</p>
+ 					<table>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _DB_FIELD1; ?></span><span class="sub"><?php echo _DB_FIELD1_DESC; ?></span></th>
+ 								<td><input type="text" name="mysql_host" value="<?php echo $param->mysql_host; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _DB_FIELD2; ?></span><span class="sub"><?php echo _DB_FIELD2_DESC; ?></span></th>
+ 								<td><input type="text" name="mysql_user" value="<?php echo $param->mysql_user; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _DB_FIELD3; ?></span></th>
+ 								<td><input type="text" name="mysql_password" value="<?php echo $param->mysql_password; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _DB_FIELD4; ?></span><span class="sub"><?php echo _DB_FIELD4_DESC; ?></span></th>
+ 								<td><input type="text" name="mysql_database" value="<?php echo $param->mysql_database; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _DB_FIELD5; ?></span><span class="sub"><?php echo _DB_FIELD5_DESC; ?></span></th>
+ 								<td><input type="text" name="mysql_tablePrefix" value="<?php echo $param->mysql_tablePrefix; ?>" /></td>
+ 						</tr>
+ 					</table>
+ 
+ 					<h2><?php echo _DETAIL_HEADER2; ?></h2>
+ 					<p class="msg">
+ <?php
+ 	if ( $isPostback )
+ 	{
+ 		$errors = $param->check_uri_parameters();
+ 		if ( is_array($errors) )
+ 		{
+ 			foreach ( $errors as $error )
+ 			{
+ 				echo '<span class="err">', $error, "</span>\n";
+ 			}
+ 		}
+ 		$errors = $param->check_path_parameters();
+ 		if ( is_array($errors) )
+ 		{
+ 			foreach ( $errors as $error )
+ 			{
+ 				echo '<span class="err">', $error, "</span>\n";
+ 			}
+ 		}
+ 	}
+ ?>
+ 					</p>
+ 					<table>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _PATH_FIELD1; ?></span></th>
+ 								<td><input type="text" name="IndexURL" value="<?php echo $param->IndexURL; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _PATH_FIELD2; ?></span></th>
+ 								<td><input type="text" name="AdminURL" value="<?php echo $param->AdminURL; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _PATH_FIELD3; ?></span></th>
+ 								<td><input type="text" name="AdminPath" value="<?php echo $param->AdminPath; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _PATH_FIELD4; ?></span></th>
+ 								<td><input type="text" name="MediaURL" value="<?php echo $param->MediaURL; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _PATH_FIELD5; ?></span></th>
+ 								<td><input type="text" name="MediaPath" value="<?php echo $param->MediaPath; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _PATH_FIELD6; ?></span></th>
+ 								<td><input type="text" name="SkinsURL" value="<?php echo $param->SkinsURL; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _PATH_FIELD7; ?></span></th>
+ 								<td><input type="text" name="SkinsPath" value="<?php echo $param->SkinsPath; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _PATH_FIELD8; ?></span></th>
+ 								<td><input type="text" name="PluginURL" value="<?php echo $param->PluginURL; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _PATH_FIELD9; ?></span></th>
+ 								<td><input type="text" name="ActionURL" value="<?php echo $param->ActionURL; ?>" /></td>
+ 						</tr>
+ 					</table>
+ 					<p class="msg">
+ 						<?php echo _DETAIL_TEXT3; ?>
+ 					</p>
+ 
+ 					<h2><?php echo _DETAIL_HEADER3; ?></h2>
+ 					<p class="msg">
+ <?php
+ 	echo _DETAIL_TEXT4;
+ 	if ( $isPostback )
+ 	{
+ 		$errors = $param->check_user_parameters();
+ 		if ( is_array($errors) )
+ 		{
+ 			foreach ( $errors as $error )
+ 			{
+ 				echo '<span class="err">', $error, "</span>\n";
+ 			}
+ 		}
+ 	}
+ ?>
+ 					</p>
+ 					<table>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _ADMIN_FIELD1; ?></span></th>
+ 								<td><input type="text" name="user_realname" value="<?php echo $param->user_realname; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _ADMIN_FIELD2; ?></span><span class="sub"><?php echo _ADMIN_FIELD2_DESC; ?></span></th>
+ 								<td><input type="text" name="user_name" value="<?php echo $param->user_name; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _ADMIN_FIELD3; ?></span></th>
+ 								<td><input type="password" name="user_password" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _ADMIN_FIELD4; ?></span></th>
+ 								<td><input type="password" name="user_password2" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _ADMIN_FIELD5; ?></span></th>
+ 								<td><input type="text" name="user_email" value="<?php echo $param->user_email; ?>" /></td>
+ 						</tr>
+ 					</table>
+ 
+ 					<h2><?php echo _DETAIL_HEADER4; ?></h2>
+ 					<p class="msg">
+ <?php
+ 	echo _DETAIL_TEXT5;
+ 	if ( $isPostback )
+ 	{
+ 		$errors = $param->check_weblog_parameters();
+ 		if ( is_array($errors) )
+ 		{
+ 			foreach ( $errors as $error )
+ 			{
+ 				echo '<span class="err">', $error, "</span>\n";
+ 			}
+ 		}
+ 	}
+ ?>
+ 					</p>
+ 					<table>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _BLOG_FIELD1; ?></span></th>
+ 								<td><input type="text" name="blog_name" value="<?php echo $param->blog_name; ?>" /></td>
+ 						</tr>
+ 						<tr>
+ 							<th><span class="nam"><?php echo _BLOG_FIELD2; ?></span><span class="sub"><?php echo _BLOG_FIELD2_DESC; ?></span></th>
+ 								<td><input type="text" name="blog_shortname" value="<?php echo $param->blog_shortname; ?>" /></td>
+ 						</tr>
+ 					</table>
+ 
+ 					<p class="msg">
+ 						<?php echo _DETAIL_TEXT6; ?>
+ 					</p>
+ 
+ 					<p class="sbt">
+ 						<button type="submit" name="action" value="detail" class="sbt_arw" onclick="OnceSubmit()"><?php echo _INSTALL; ?></button>
+ 					</p>
+ 				</div>
+ 			</form>
+ 		</div>
+ <?php
+ }
+ 
+ /**
+  * Displays a screen to signal the completion of the installation
+  */
+ function show_install_complete_form()
+ {
+ 	global $MYSQL_HANDLER, $param;
+ 	$errors = do_install();
+ ?>
+ 		<div id="container">
+ 			<p class="msg">
+ <?php
+ 	if ( is_array($errors) && count($errors) > 0 )
+ 	{
+ 		echo _INST_ERROR;
+ 		foreach ( $errors as $error )
+ 		{
+ 			echo '<span class="err">', $error, "</span>\n";
+ 		}
+ 	}
+ 	else
+ 	{
+ 		echo _INST_TEXT;
+ 		if ( array_key_exists('config_data', $_SESSION) )
+ 		{
+ 			echo '<span class="err">', _INST_TEXT4, '</span>';
+ ?>
+ <textarea id="config_text" readonly="readonly" onfocus="SelectText(this);"><?php echo htmlentities($_SESSION['config_data'], null, i18n::get_current_charset()) ?></textarea>
+ <?php
+ 		}
+ 		else
+ 		{
+ 			echo '<span class="err">', _INST_TEXT5, '</span>';
+ 		}
+ ?>
+ 			</p>
+ 			<form method="post" action="./index.php">
+ 				<div class="prt">
+ 					<h2><?php echo _INST_HEADER1; ?></h2>
+ 					<p class="msg">
+ 						<?php echo sprintf(_INST_TEXT1, $param->blog_name); ?>
+ 					</p>
+ 					<p class="sbt">
+ 						<button type="button" name="toBlog" onclick="location.href='<?php echo $param->IndexURL; ?>';" class="sbt_arw"><?php echo _INST_BUTTON1; ?></button>
+ 					</p>
+ 				</div>
+ 
+ 				<div class="prt">
+ 					<h2><?php echo _INST_HEADER2; ?></h2>
+ 					<p class="msg">
+ 						<?php echo _INST_TEXT2; ?>
+ 					</p>
+ 					<p class="sbt">
+ 						<button type="button" name="toMng" onclick="location.href='<?php echo $param->AdminURL; ?>';" class="sbt_arw"><?php echo _INST_BUTTON2; ?></button>
+ 					</p>
+ 				</div>
+ 
+ 				<div class="prt">
+ 					<h2><?php echo _INST_HEADER3; ?></h2>
+ 					<p class="msg">
+ 						<?php echo _INST_TEXT3; ?>
+ 					</p>
+ 					<p class="sbt">
+ 						<button type="button" name="toAddBlog" onclick="location.href='<?php echo $param->AdminURL; ?>index.php?action=createnewlog';" class="sbt_arw"><?php echo _INST_BUTTON3; ?></button>
+ 					</p>
+ 				</div>
+ 			</form>
+ <?php
+ 	}
+ ?>
+ 		</div>
+ <?php
+ 	unset($param);
+ }
+ 
+ /**
+  * The installation process itself
+  * @return array error messages
+  */
+ function do_install()
+ {
+ 	global $param;
+ 	global $MYSQL_HANDLER, $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE, $MYSQL_PREFIX, $MYSQL_CONN;
+ 	global $DIR_NUCLEUS, $DIR_MEDIA, $DIR_SKINS, $DIR_PLUGINS, $DIR_LANG, $DIR_LIBS;
+ 	$errors = array();
+ 
+ 	/*
+ 	 * 1. put all param-vars into vars
+ 	 */
+ 	$MYSQL_HOST		= $param->mysql_host;
+ 	$MYSQL_USER		= $param->mysql_user;
+ 	$MYSQL_PASSWORD	= $param->mysql_password;
+ 	$MYSQL_DATABASE	= $param->mysql_database;
+ 	$MYSQL_PREFIX	= $param->mysql_tablePrefix;
+ 
+ 	$DIR_NUCLEUS	= $param->AdminPath;
+ 	$DIR_MEDIA		= $param->MediaPath;
+ 	$DIR_SKINS		= $param->SkinsPath;
+ 	$DIR_PLUGINS	= $DIR_NUCLEUS . 'plugins/';
+ 	$DIR_LOCALES	= $DIR_NUCLEUS . 'locales/';
+ 	$DIR_LIBS		= $DIR_NUCLEUS . 'libs/';
+ 
+ 	/*
+ 	 * 2.open mySQL connection
+ 	 */
+ 	$MYSQL_CONN = @DB::setConnectionInfo($MYSQL_HANDLER[1], $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD);
+ 	if ( $MYSQL_CONN == FALSE )
+ 	{
+ 		$errors[] = _DBCONNECT_ERROR;
+ 		return $errors;
+ 	}
+ 
+ 	/*
+ 	 * 3. try to create database if needed
+ 	 */
+ 	if ( DB::execute("CREATE DATABASE IF NOT EXISTS {$MYSQL_DATABASE}") === FALSE )
+ 	{
+ 		$errinfo = DB::getError();
+ 		$errors[] = _INST_ERROR1 . ': ' . $errinfo[2];
+ 	}
+ 
+ 	/*
+ 	 * 4. try to select database
+ 	 */
+ 	$MYSQL_CONN = @DB::setConnectionInfo($MYSQL_HANDLER[1], $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE);
+ 	if ( !$MYSQL_CONN )
+ 	{
+ 		$errors[] = _INST_ERROR2;
+ 	}
+ 
+ 	if ( count($errors) > 0 )
+ 	{
+ 		return $errors;
+ 	}
+ 
+ 	/*
+ 	 * 5. execute queries
+ 	 */
+ 	$table_names = array(
+ 		'nucleus_actionlog',
+ 		'nucleus_ban',
+ 		'nucleus_blog',
+ 		'nucleus_category',
+ 		'nucleus_comment',
+ 		'nucleus_config',
+ 		'nucleus_item',
+ 		'nucleus_karma',
+ 		'nucleus_member',
+ 		'nucleus_plugin',
+ 		'nucleus_skin',
+ 		'nucleus_template',
+ 		'nucleus_team',
+ 		'nucleus_activation',
+ 		'nucleus_tickets'
+ 	);
+ 
+ 	$prefixed_table_names = array();
+ 	foreach ( $table_names as $table_name )
+ 	{
+ 		$prefixed_table_names[] = $MYSQL_PREFIX . $table_name;
+ 	}
+ 
+ 	// table exists check
+ 	$result = DB::getResult('SHOW TABLES');
+ 	foreach ( $result as $row )
+ 	{
+ 		if ( in_array($row[0], $prefixed_table_names) )
+ 		{
+ 			$errors[] = _INST_ERROR3;
+ 			break;
+ 		}
+ 	}
+ 	if ( count($errors) > 0 )
+ 	{
+ 		return $errors;
+ 	}
+ 
+ 	$filename = 'install.sql';
+ 	$fd = fopen($filename, 'r');
+ 	$queries = fread($fd, filesize($filename));
+ 	fclose($fd);
+ 
+ 	$queries = preg_split('#(;\n|;\r)#', $queries);
+ 
+ 	foreach ( $queries as $query )
+ 	{
+ 		if ( preg_match('/\w+/', $query) )
+ 		{
+ 			if ( $MYSQL_PREFIX )
+ 			{
+ 				$query = str_replace($table_names, $prefixed_table_names, $query);
+ 			}
+ 
+ 			if ( DB::execute($query) === FALSE )
+ 			{
+ 				$errinfo = DB::getError();
+ 				$errors[] = _INST_ERROR4 . ' (<small>' . $query . '</small>): ' . $errinfo[2];
+ 			}
+ 		}
+ 	}
+ 
+ 	/*
+ 	 * 6. put needed records
+ 	 */
+ 	/* push first post */
+ 	$query = "INSERT INTO %s VALUES (1, %s, %s, %s, 1, 1, %s, 0, 0, 0, 1, 0, 1)";
+ 	$query = sprintf($query,
+ 		tableName('nucleus_item'),
+ 		DB::quoteValue(_1ST_POST_TITLE),
+ 		DB::quoteValue(_1ST_POST),
+ 		DB::quoteValue(_1ST_POST2),
+ 		DB::formatDateTime()
+ 	);
+ 	if ( DB::execute($query) === FALSE )
+ 	{
+ 		$errinfo = DB::getError();
+ 		$errors[] = _INST_ERROR4 . ' (<small>' . $query . '</small>): ' . $errinfo[2];
+ 	}
+ 
+ 	/* push configurations */
+ 	array_merge($errors, updateConfig('IndexURL', $param->IndexURL));
+ 	array_merge($errors, updateConfig('AdminURL', $param->AdminURL));
+ 	array_merge($errors, updateConfig('MediaURL', $param->MediaURL));
+ 	array_merge($errors, updateConfig('SkinsURL', $param->SkinsURL));
+ 	array_merge($errors, updateConfig('PluginURL', $param->PluginURL));
+ 	array_merge($errors, updateConfig('ActionURL', $param->ActionURL));
+ 	array_merge($errors, updateConfig('AdminEmail', $param->user_email));
+ 	array_merge($errors, updateConfig('SiteName', $param->blog_name));
+ 	array_merge($errors, updateConfig('Locale', i18n::get_current_locale()));
+ 
+ 	/* push super admin */
+ 	$query = "UPDATE %s SET mname = %s, mrealname = %s, mpassword = %s, memail = %s, murl = %s, madmin = 1, mcanlogin = 1 WHERE mnumber = 1";
+ 	$query = sprintf($query,
+ 		tableName('nucleus_member'),
+ 		DB::quoteValue($param->user_name),
+ 		DB::quoteValue($param->user_realname),
+ 		DB::quoteValue(md5($param->user_password)),
+ 		DB::quoteValue($param->user_email),
+ 		DB::quoteValue($param->IndexURL)
+ 	);
+ 	if ( DB::execute($query) === FALSE )
+ 	{
+ 		$errinfo = DB::getError();
+ 		$errors[] = _INST_ERROR5 . ': ' . $errinfo[2];
+ 	}
+ 
+ 	/* push new weblog */
+ 	$query = "UPDATE %s SET bname = %s, bshortname = %s, burl = %s WHERE bnumber = 1";
+ 	$query = sprintf($query,
+ 		tableName('nucleus_blog'),
+ 		DB::quoteValue($param->blog_name),
+ 		DB::quoteValue($param->blog_shortname),
+ 		DB::quoteValue($param->IndexURL)
+ 	);
+ 	if ( DB::execute($query) === FALSE )
+ 	{
+ 		$errinfo = DB::getError();
+ 		$errors[] = _INST_ERROR6 . ': ' . $errinfo[2];
+ 	}
+ 
+ 	/* push default category */
+ 	$query = "UPDATE %s SET cname = %s, cdesc = %s WHERE catid = 1";
+ 	$query = sprintf($query,
+ 		tableName('nucleus_category'),
+ 		DB::quoteValue(_GENERALCAT_NAME),
+ 		DB::quoteValue(_GENERALCAT_DESC)
+ 	);
+ 	if ( DB::execute($query) === FALSE )
+ 	{
+ 		$errinfo = DB::getError();
+ 		$errors[] = _INST_ERROR6 . ': ' . $errinfo[2];
+ 	}
+ 
+ 	/*
+ 	 * 7. install default plugins and skins
+ 	 */
+ 	global $aConfPlugsToInstall, $aConfSkinsToImport;
+ 	$aSkinErrors = array();
+ 	$aPlugErrors = array();
+ 
+ 	if ( (count($aConfPlugsToInstall) > 0) || (count($aConfSkinsToImport) > 0) )
+ 	{
+ 		include_once($DIR_LIBS . 'globalfunctions.php');
+ 		global $manager;
+ 		if ( !isset($manager) )
+ 		{
+ 			$manager = new Manager();
+ 		}
+ 
+ 		include_once($DIR_LIBS . 'skinie.php');
+ 		
+ 		$aSkinErrors = installCustomSkins();
+ 		if ( count($aSkinErrors) > 0 )
+ 		{
+ 			array_merge($errors, $aSkinErrors);
+ 		}
+ 
+ 		$query	= "SELECT sdnumber FROM %s WHERE sdname='admin/default'";
+ 		$query	= sprintf($query, tableName('nucleus_skin_desc'));
+ 		$res	= intval(DB::getValue($query));
+ 		array_merge($errors, updateConfig('AdminSkin', $res));
+ 		
+ 		$query	= "SELECT sdnumber FROM %s WHERE sdname='admin/bookmarklet'";
+ 		$query	= sprintf($query, tableName('nucleus_skin_desc'));
+ 		$res	= intval(DB::getValue($query));
+ 		array_merge($errors, updateConfig('BookmarkletSkin', $res));
+ 		
+ 		$query		= "SELECT sdnumber FROM %s WHERE sdname='default'";
+ 		$query		= sprintf($query, tableName('nucleus_skin_desc'));
+ 		$defSkinID	= intval(DB::getValue($query));
+ 
+ 		$query = "UPDATE %s SET bdefskin=%d WHERE bnumber=1";
+ 		$query = sprintf($query, tableName('nucleus_blog'), $defSkinID);
+ 		DB::execute($query);
+ 		$query = "UPDATE %s SET value=%d WHERE name='BaseSkin'";
+ 		$query = sprintf($query, tableName('nucleus_config'), $defSkinID);
+ 		DB::execute($query);
+ 
+ 		$aPlugErrors = installCustomPlugs();
+ 		if ( count($aPlugErrors) > 0 )
+ 		{
+ 			array_merge($errors, $aPlugErrors);
+ 		}
+ 	}
+ 
+ 	/*
+ 	 * 8. Write config file ourselves (if possible)
+ 	 */
+ 	$config_data = '<' . '?php' . "\n";
+ 	$config_data .= "// mySQL connection information\n";
+ 	$config_data .= "\$MYSQL_HOST = '" . $MYSQL_HOST . "';\n";
+ 	$config_data .= "\$MYSQL_USER = '" . $MYSQL_USER . "';\n";
+ 	$config_data .= "\$MYSQL_PASSWORD = '" . $MYSQL_PASSWORD . "';\n";
+ 	$config_data .= "\$MYSQL_DATABASE = '" . $MYSQL_DATABASE . "';\n";
+ 	$config_data .= "\$MYSQL_PREFIX = '" . $MYSQL_PREFIX . "';\n";
+ 	$config_data .= "// new in 3.50. first element is db handler, the second is the db driver used by the handler\n";
+ 	$config_data .= "// default is \$MYSQL_HANDLER = array('mysql','mysql');\n";
+ 	$config_data .= "//\$MYSQL_HANDLER = array('mysql','mysql');\n";
+ 	$config_data .= "//\$MYSQL_HANDLER = array('pdo','mysql');\n";
+ 	$config_data .= "\$MYSQL_HANDLER = array('" . $MYSQL_HANDLER[0] . "','" . $MYSQL_HANDLER[1] . "');\n";
+ 	$config_data .= "\n";
+ 	$config_data .= "// main nucleus directory\n";
+ 	$config_data .= "\$DIR_NUCLEUS = '" . $DIR_NUCLEUS . "';\n";
+ 	$config_data .= "\n";
+ 	$config_data .= "// path to media dir\n";
+ 	$config_data .= "\$DIR_MEDIA = '" . $DIR_MEDIA . "';\n";
+ 	$config_data .= "\n";
+ 	$config_data .= "// extra skin files for imported skins\n";
+ 	$config_data .= "\$DIR_SKINS = '" . $DIR_SKINS . "';\n";
+ 	$config_data .= "\n";
+ 	$config_data .= "// these dirs are normally sub dirs of the nucleus dir, but \n";
+ 	$config_data .= "// you can redefine them if you wish\n";
+ 	$config_data .= "\$DIR_PLUGINS = \$DIR_NUCLEUS . 'plugins/';\n";
+ 	$config_data .= "\$DIR_LOCALES = \$DIR_NUCLEUS . 'locales/';\n";
+ 	$config_data .= "\$DIR_LIBS = \$DIR_NUCLEUS . 'libs/';\n";
+ 	$config_data .= "\n";
+ 	$config_data .= "// include libs\n";
+ 	$config_data .= "include(\$DIR_LIBS.'globalfunctions.php');\n";
+ 	$config_data .= "?" . ">";
+ 
+ 	$result = false;
+ 	if ( @!file_exists('../config.php') || is_writable('../config.php') )
+ 	{
+ 		if ( $fp = @fopen('../config.php', 'w') )
+ 		{
+ 			$result = @fwrite($fp, $config_data, i18n::strlen($config_data));
+ 			fclose($fp);
+ 		}
+ 	}
+ 
+ 	if ( $result )
+ 	{
+ 		// try to change the read-only permission.
+ 		if ( strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN' )
+ 		{
+ 			@chmod('../config.php', 0444);
+ 		}
+ 	}
+ 	else
+ 	{
+ 		$_SESSION['config_data'] = $config_data;
+ 	}
+ 
+ 	return $errors;
+ }
+ 
+ /**
+  * Confirm that you can write to the configuration file
+  * @return string error message
+  */
+ function canConfigFileWritable()
+ {
+ 	if ( @file_exists('../config.php') && @!is_writable('../config.php') )
+ 	{
+ 		// try to change the read-write permission.
+ 		if ( strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN' )
+ 		{
+ 			@chmod('../config.php', 0666);
+ 		}
+ 
+ 		if ( @!is_writable('../config.php') )
+ 		{
+ 			return _INST_ERROR8;
+ 		}
+ 	}
+ 	return '';
+ }
+ 
+ /**
+  * To obtain the version of MySQL
+  * @return string
+  */
+ function getMySqlVersion()
+ {
+ 	global $MYSQL_HANDLER, $minimum_mysql_version, $errors;
+ 	// Turn on output buffer
+ 	// Needed to repress the output of the sql function that are
+ 	// not part of php (in this case the @ operator doesn't work)
+ 	ob_start();
+ 
+ 	// note: this piece of code is taken from phpMyAdmin
+ 	$conn = @DB::setConnectionInfo($MYSQL_HANDLER[1], 'localhost', '', '');
+ 
+ 	if ( $conn )
+ 	{
+ 		$row = DB::getAttribute(PDO::ATTR_SERVER_VERSION);
+ 		$match = preg_split('#\.#', $row);
+ 	}
+ 	else
+ 	{
+ 		$row = @DB::getRow('SHOW VARIABLES LIKE \'version\'');
+ 
+ 		if ( $row )
+ 		{
+ 			$match = preg_split('#\.#', $row[1]);
+ 		}
+ 		else
+ 		{
+ 			$output = (function_exists('shell_exec')) ? @shell_exec('mysql -V') : '0.0.0';
+ 			preg_match('@[0-9]+\.[0-9]+\.[0-9]+@', $output, $version);
+ 			$match = preg_split('#\.#', $version[0]);
+ 
+ 			if ( $match[0] == '' )
+ 			{
+ 				$match = array('0', '0', '0');
+ 			}
+ 		}
+ 	}
+ 
+ 	@DB::disConnect();
+ 
+ 	//End and clean output buffer
+ 	ob_end_clean();
+ 
+ 	return implode($match, '.');
+ }
+ 
+ /**
+  * Add a table prefix if it is used
+  *
+  * @param string $input table name with prefix
+  * @return string
+  */
+ function tableName($input)
+ {
+ 	global $MYSQL_PREFIX;
+ 	if ( $MYSQL_PREFIX )
+ 	{
+ 		return $MYSQL_PREFIX . $input;
+ 	}
+ 	else
+ 	{
+ 		return $input;
+ 	}
+ }
+ 
+ /**
+  * Install custom plugins
+  */
+ function installCustomPlugs()
+ {
+ 	global $aConfPlugsToInstall, $DIR_LIBS, $manager;
+ 
+ 	$aErrors = array();
+ 	if ( count($aConfPlugsToInstall) == 0 )
+ 	{
+ 		return $aErrors;
+ 	}
+ 
+ 	$query = sprintf('SELECT * FROM %s', tableName('nucleus_plugin'));
+ 	$res = DB::getResult($query);
+ 	$numCurrent = $res->rowCount();
+ 
+ 	foreach ( $aConfPlugsToInstall as $plugName )
+ 	{
+ 		$query = sprintf('INSERT INTO %s (porder, pfile) VALUES (%d, %s)',
+ 			tableName('nucleus_plugin'),
+ 			(++$numCurrent),
+ 			DB::quoteValue($plugName));
+ 		DB::execute($query);
+ 
+ 		$manager->clearCachedInfo('installedPlugins');
+ 		$plugin =& $manager->getPlugin($plugName);
+ 		$plugin->setID($numCurrent);
+ 
+ 		if ( !$plugin )
+ 		{
+ 			$query = sprintf('DELETE FROM %s WHERE pfile = %s',
+ 				tableName('nucleus_plugin'),
+ 				DB::quoteValue($plugName));
+ 			DB::execute($query);
+ 			$numCurrent--;
+ 			array_push($aErrors, sprintf(_INST_ERROR9, $plugName));
+ 			continue;
+ 		}
+ 		$plugin->install();
+ 	}
+ 
+ 	$query = sprintf('DELETE FROM %s', tableName('nucleus_plugin_event'));
+ 	DB::execute($query);
+ 	$query = sprintf('SELECT pid, pfile FROM %s', tableName('nucleus_plugin'));
+ 	$res = DB::getResult($query);
+ 
+ 	foreach ( $res as $row )
+ 	{
+ 		$plug =& $manager->getPlugin($row['pfile']);
+ 
+ 		if ( $plug )
+ 		{
+ 			$eventList = $plug->getEventList();
+ 			foreach ( $eventList as $eventName )
+ 			{
+ 				$query = sprintf('INSERT INTO %s (pid, event) VALUES (%d, %s)',
+ 					tableName('nucleus_plugin_event'),
+ 					intval($row['pid']),
+ 					DB::quoteValue($eventName));
+ 				DB::execute($query);
+ 			}
+ 		}
+ 	}
+ 	return $aErrors;
+ }
+ 
+ /**
+  * Install custom skins
+  * Prepares the installation of custom skins
+  */
+ function installCustomSkins()
+ {
+ 	global $aConfSkinsToImport, $DIR_LIBS, $DIR_SKINS;
+ 
+ 	$aErrors = array();
+ 	if ( count($aConfSkinsToImport) == 0 )
+ 	{
+ 		return $aErrors;
+ 	}
+ 
+ 	$importer = new SkinImport();
+ 
+ 	foreach ( $aConfSkinsToImport as $skinName )
+ 	{
+ 		$importer->reset();
+ 		$skinFile = $DIR_SKINS . $skinName . '/skinbackup.xml';
+ 
+ 		if ( !@file_exists($skinFile) )
+ 		{
+ 			array_push($aErrors, sprintf(_INST_ERROR10, $skinFile));
+ 			continue;
+ 		}
+ 
+ 		$error = $importer->readFile($skinFile);
+ 
+ 		if ( $error )
+ 		{
+ 			array_push($aErrors, sprintf(_INST_ERROR11, $skinName) . ' : ' . $error);
+ 			continue;
+ 		}
+ 
+ 		$error = $importer->writeToDatabase(1);
+ 
+ 		if ( $error )
+ 		{
+ 			array_push($aErrors, sprintf(_INST_ERROR12, $skinName) . ' : ' . $error);
+ 			continue;
+ 		}
+ 	}
+ 	return $aErrors;
+ }
+ 
+ /**
+  * Check if some important files of the Nucleus CMS installation are available
+  * Give an error if one or more files are not accessible
+  */
+ function do_check_files()
+ {
+ 	$missingfiles = array();
+ 	$files = array(
+ 		'./install.sql',
+ 		'../index.php',
+ 		'../action.php',
+ 		'../nucleus/index.php',
+ 		'../nucleus/libs/ACTION.php',
+ 		'../nucleus/libs/ACTIONLOG.php',
+ 		'../nucleus/libs/ACTIONS.php',
+ 		'../nucleus/libs/ADMIN.php',
+ 		'../nucleus/libs/BaseActions.php',
+ 		'../nucleus/libs/BLOG.php',
+ 		'../nucleus/libs/BODYACTIONS.php',
+ 		'../nucleus/libs/COMMENT.php',
+ 		'../nucleus/libs/COMMENTACTIONS.php',
+ 		'../nucleus/libs/COMMENTS.php',
+ 		'../nucleus/libs/ENTITY.php',
+ 		'../nucleus/libs/globalfunctions.php',
+ 		'../nucleus/libs/i18n.php',
+ 		'../nucleus/libs/ITEM.php',
+ 		'../nucleus/libs/ITEMACTIONS.php',
+ 		'../nucleus/libs/LINK.php',
+ 		'../nucleus/libs/MANAGER.php',
+ 		'../nucleus/libs/MEDIA.php',
+ 		'../nucleus/libs/MEMBER.php',
+ 		'../nucleus/libs/NOTIFICATION.php',
+ 		'../nucleus/libs/PARSER.php',
+ 		'../nucleus/libs/PLUGIN.php',
+ 		'../nucleus/libs/PLUGINADMIN.php',
+ 		'../nucleus/libs/SEARCH.php',
+ 		'../nucleus/libs/showlist.php',
+ 		'../nucleus/libs/SKIN.php',
+ 		'../nucleus/libs/TEMPLATE.php',
+ 		'../nucleus/libs/vars4.1.0.php',
+ 		'../nucleus/libs/xmlrpc.inc.php',
+ 		'../nucleus/libs/xmlrpcs.inc.php',
+ 		'../nucleus/libs/sql/DB.php',
+ 		'../nucleus/libs/sql/MYSQLPDO.php'
+ 	);
+ 
+ 	$count = count($files);
+ 	for ( $i = 0; $i < $count; $i++ )
+ 	{
+ 		if ( !is_readable($files[$i]) )
+ 		{
+ 			array_push($missingfiles, 'File <b>' . $files[$i] . '</b> is missing or not readable.<br />');
+ 		}
+ 	}
+ 
+ 	if ( count($missingfiles) > 0 )
+ 	{
+ 		exit(implode("\n", $missingfiles));
+ 	}
+ }
+ 
+ /**
+  * Updates the configuration in the database
+  *
+  * @param string $name name of the config var
+  * @param string $value new value of the config var
+  * @return array
+  */
+ function updateConfig($name, $value)
+ {
+ 	$errors = array();
+ 
+ 	$query = "UPDATE %s SET value = %s WHERE name = %s";
+ 	$query = sprintf($query, tableName('nucleus_config'), DB::quoteValue(trim($value)), DB::quoteValue($name));
+ 
+ 	if ( DB::execute($query) === FALSE )
+ 	{
+ 		$errinfo = DB::getError();
+ 		$errors[] = _INST_ERROR4 . ': ' . $errinfo[2];
+ 	}
+ 	return $errors;
+ }
+ 
+ class ParamManager
+ {
+ 	/* process parameter */
+ 	public $state;
+ 	public $locale;
+ 
+ 	/* mysql connection parameters */
+ 	public $mysql_host;
+ 	public $mysql_user;
+ 	public $mysql_password;
+ 	public $mysql_database;
+ 	public $mysql_tablePrefix;
+ 
+ 	/* weblog configuration parameters */
+ 	public $blog_name;
+ 	public $blog_shortname;
+ 
+ 	/* member configuration parameters */
+ 	public $user_name;
+ 	public $user_realname;
+ 	public $user_password;
+ 	private $user_password2;
+ 	public $user_email;
+ 
+ 	/* URI parameters  */
+ 	private $root_url;
+ 	public $IndexURL;
+ 	public $AdminURL;
+ 	public $MediaURL;
+ 	public $SkinsURL;
+ 	public $PluginURL;
+ 	public $ActionURL;
+ 
+ 	/* path parameters */
+ 	private $root_path;
+ 	public $AdminPath;
+ 	public $MediaPath;
+ 	public $SkinsPath;
+ 
+ 	/**
+ 	 * constructor
+ 	 */
+ 	public function __construct()
+ 	{
+ 		$this->init();
+ 	}
+ 
+ 	public function init()
+ 	{
+ 		// set default values
+ 		$this->state = 'locale';
+ 		$this->install_mode = 'simple';
+ 		$this->locale = '';
+ 		$this->mysql_host = @ini_get('mysql.default_host');
+ 		$this->blog_name = 'My Nucleus CMS';
+ 		$this->blog_shortname = 'mynucleuscms';
+ 
+ 		/* root path */
+ 		$directory_separator = preg_quote(DIRECTORY_SEPARATOR, '|');
+ 		$this->root_path = implode('/', preg_split("|$directory_separator|", realpath(dirname(__FILE__) . '/..')));
+ 		if ( substr($this->root_path, -1, 1) !== '/' )
+ 		{
+ 			$this->root_path .= '/';
+ 		}
+ 		$base_path_pcre = preg_quote($this->root_path, '|');
+ 
+ 		/* current directry name */
+ 		$directory_name = preg_replace("#{$base_path_pcre}#", '', implode('/', preg_split("#{$directory_separator}#", realpath(dirname(__FILE__)))));
+ 		$directory_name_pcre = preg_quote($directory_name, '|');
+ 
+ 		/* root uri */
+ 		$root_url = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
+ 		$this->root_url = preg_replace("|$directory_name_pcre(.*)$|", '', $root_url);
+ 
+ 		$this->AdminPath = $this->root_path . 'nucleus/';
+ 		$this->MediaPath = $this->root_path . 'media/';
+ 		$this->SkinsPath = $this->root_path . 'skins/';
+ 
+ 		$this->IndexURL  = $this->root_url;
+ 		$this->AdminURL  = $this->root_url . 'nucleus/';
+ 		$this->MediaURL  = $this->root_url . 'media/';
+ 		$this->SkinsURL  = $this->root_url . 'skins/';
+ 		$this->PluginURL = $this->root_url . 'nucleus/plugins/';
+ 		$this->ActionURL = $this->root_url . 'action.php';
+ 	}
+ 
+ 	private function read_parameter($parameter)
+ 	{
+ 		foreach ( $parameter as $element )
+ 		{
+ 			if ( array_key_exists($element, $_POST) )
+ 			{
+ 				$this->$element = $_POST[$element];
+ 			}
+ 		}
+ 	}
+ 
+ 	public function set_state($state)
+ 	{
+ 		$states = array('locale', 'mysql', 'weblog', 'detail', 'install');
+ 		if ( in_array($state, $states) )
+ 		{
+ 			$this->state = $state;
+ 		}
+ 	}
+ 
+ 	public function set_locale()
+ 	{
+ 		$this->read_parameter(array('locale'));
+ 
+ 		if ( !$this->locale )
+ 		{
+ 			/**
+ 			 * default locale select simple implementation
+ 			 * 
+ 			 * NOTE:
+ 			 * RFC2616: Hypertext Transfer Protocol -- HTTP/1.1
+ 			 * http://www.ietf.org/rfc/rfc2616.txt
+ 			 * 
+ 			 * 14.4 Accept-Language
+ 			 * 
+ 			 *    The Accept-Language request-header field is similar to Accept, but
+ 			 *    restricts the set of natural languages that are preferred as a
+ 			 *    response to the request. Language tags are defined in section 3.10.
+ 			 * 
+ 			 *        Accept-Language = "Accept-Language" ":"
+ 			 *                          1#( language-range [ ";" "q" "=" qvalue ] )
+ 			 *        language-range  = ( ( 1*8ALPHA *( "-" 1*8ALPHA ) ) | "*" )
+ 			 *        
+ 			 *    Each language-range MAY be given an associated quality value which
+ 			 *    represents an estimate of the user's preference for the languages
+ 			 *    specified by that range. The quality value defaults to "q=1". For
+ 			 *    example,
+ 			 * 
+ 			 *        Accept-Language: da, en-gb;q=0.8, en;q=0.7
+ 			 * 
+ 			 *    would mean: "I prefer Danish, but will accept British English and
+ 			 *    other types of English." A language-range matches a language-tag if
+ 			 *    it exactly equals the tag, or if it exactly equals a prefix of the
+ 			 *    tag such that the first tag character following the prefix is "-".
+ 			 *    The special range "*", if present in the Accept-Language field,
+ 			 *    matches every tag not matched by any other range present in the
+ 			 *    Accept-Language field.
+ 			 * 
+ 			 * TODO: this is appropriate implement or not
+ 			 */
+ 			$languages = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+ 			
+ 			/* retrieve language token of language tag from first token */
+ 			$language = '';
+ 			if ( is_array($languages) && count($languages) > 0 )
+ 			{
+ 				$language = preg_replace('#^([\w]+).*$#', '$1', $languages[0]);
+ 			}
+ 			
+ 			$locales = i18n::get_available_locale_list();
+ 			foreach ( $locales as $locale )
+ 			{
+ 				if ( i18n::strpos($locale, $language) === 0 )
+ 				{
+ 					$this->locale = $locale;
+ 					break;
+ 				}
+ 			}
+ 		}
+ 		
+ 		/* include installer translation messages */
+ 		$translation_file = "./locales/{$this->locale}." . i18n::get_current_charset() . '.php';
+ 		if ( !file_exists($translation_file) )
+ 		{
+ 			$translation_file = './locales/en_Latn_US.UTF-8.php';
+ 		}
+ 		include($translation_file);
+ 		
+ 		/* include global translation messages */
+ 		$translation_file = "../nucleus/locales/{$this->locale}." . i18n::get_current_charset() . '.php';
+ 		if ( !file_exists($translation_file) )
+ 		{
+ 			$translation_file = './locales/en_Latn_US.UTF-8.php';
+ 		}
+ 		include($translation_file);
+ 		
+ 		i18n::set_current_locale($this->locale);
+ 		
+ 		return;
+ 	}
+ 
+ 	public function check_mysql_parameters()
+ 	{
+ 		global $MYSQL_HANDLER;
+ 		
+ 		$parameters = array('mysql_host', 'mysql_user', 'mysql_password', 'mysql_database', 'mysql_tablePrefix');
+ 		$this->read_parameter($parameters);
+ 
+ 		$errors = array();
+ 		if ( $this->mysql_host == '' )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR1, _DB_FIELD1);
+ 		}
+ 
+ 		if ( $this->mysql_user == '' )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR1, _DB_FIELD2);
+ 		}
+ 		
+ 		if ( $this->mysql_user != ''
+ 			&& !preg_match('/^[a-z0-9_\-]+$/i', $this->mysql_user) )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR2, _DB_FIELD2);
+ 		}
+ 		
+ 		if ( $this->mysql_database == '' )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR1, _DB_FIELD4);
+ 		}
+ 
+ 		if ( $this->mysql_database != ''
+ 			&& !preg_match('/^[a-z0-9_\-]+$/i', $this->mysql_database) )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR2, _DB_FIELD4);
+ 		}
+ 
+ 		if ( $this->mysql_tablePrefix != ''
+ 			&& !preg_match('/^[a-z0-9_]+$/i', $this->mysql_tablePrefix) )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR3, _DB_FIELD5);
+ 		}
+ 		
+ 		if ( count($errors) == 0 )
+ 		{
+ 			$mysql_conn = @DB::setConnectionInfo($MYSQL_HANDLER[1], $this->mysql_host, $this->mysql_user, $this->mysql_password);
+ 			if ( $mysql_conn == false )
+ 			{
+ 				$errors[] = _DBCONNECT_ERROR;
+ 			}
+ 			else
+ 			{
+ 				@DB::disConnect();
+ 			}
+ 		}
+ 
+ 		return $errors;
+ 	}
+ 
+ 	public function check_user_parameters()
+ 	{
+ 		$parameters = array('user_name', 'user_realname', 'user_password', 'user_password2', 'user_email');
+ 		$this->read_parameter($parameters);
+ 
+ 		$errors = array();
+ 		if ( $this->user_realname == '' )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR1, _ADMIN_FIELD1);
+ 		}
+ 
+ 		if ( $this->user_name == '' )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR1, _ADMIN_FIELD2);
+ 		}
+ 		elseif ( !preg_match("/^[a-z0-9]+([ a-z0-9]*[a-z0-9]+)?$/i", $this->user_name) )
+ 		{
+ 			$errors[] = _VALID_ERROR5;
+ 		}
+ 
+ 		if ( $this->user_password == '' || $this->user_password2 == '' )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR1, _ADMIN_FIELD3);
+ 			$this->user_password = '';
+ 		}
+ 		elseif ( $this->user_password != $this->user_password2 )
+ 		{
+ 			$errors[] = _VALID_ERROR6;
+ 			$this->user_password = '';
+ 		}
+ 
+ 		if ( !preg_match("/^[a-z0-9\._+\-]+@[a-z0-9\._\-]+\.[a-z]{2,6}$/i", $this->user_email) )
+ 		{
+ 			$errors[] = _VALID_ERROR7;
+ 		}
+ 
+ 		return $errors;
+ 	}
+ 
+ 	public function check_weblog_parameters()
+ 	{
+ 		$parameters = array('blog_name', 'blog_shortname');
+ 		$this->read_parameter($parameters);
+ 
+ 		$errors = array();
+ 		if ( $this->blog_name == '' )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR1, _BLOG_FIELD1);
+ 		}
+ 
+ 		if ( $this->blog_shortname == '' )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR1, _BLOG_FIELD2);
+ 		}
+ 
+ 		if ( !preg_match("/^[a-z0-9]+$/i", $this->blog_shortname) )
+ 		{
+ 			$errors[] = _VALID_ERROR4;
+ 		}
+ 
+ 		return $errors;
+ 	}
+ 
+ 	public function check_uri_parameters()
+ 	{
+ 		$parameters = array('IndexURL', 'AdminURL', 'MediaURL', 'SkinsURL', 'PluginURL', 'ActionURL');
+ 		$this->read_parameter($parameters);
+ 
+ 		$errors = array();
+ 		if ( substr($this->IndexURL, -1, 1) !== '/' )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR8, _PATH_FIELD1);
+ 		}
+ 
+ 		if ( substr($this->AdminURL, -1, 1) !== '/' )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR8, _PATH_FIELD2);
+ 		}
+ 
+ 		if ( substr($this->MediaURL, -1, 1) !== '/' )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR8, _PATH_FIELD4);
+ 		}
+ 
+ 		if ( substr($this->SkinsURL, -1, 1) !== '/' )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR8, _PATH_FIELD6);
+ 		}
+ 
+ 		if ( substr($this->PluginURL, -1, 1) !== '/' )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR8, _PATH_FIELD8);
+ 		}
+ 
+ 		if ( strrchr($this->ActionURL, '/') != '/action.php' )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR9, _PATH_FIELD9);
+ 		}
+ 
+ 		return $errors;
+ 	}
+ 
+ 	public function check_path_parameters()
+ 	{
+ 		$parameters = array('AdminPath', 'MediaPath', 'SkinsPath');
+ 		$this->read_parameter($parameters);
+ 
+ 		$separators = array('/', DIRECTORY_SEPARATOR);
+ 		$errors = array();
+ 		if ( !in_array(substr($this->AdminPath, -1, 1), $separators) )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR10, _PATH_FIELD3);
+ 		}
+ 		elseif ( !file_exists($this->AdminPath) )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR11, _PATH_FIELD3);
+ 		}
+ 
+ 		if ( !in_array(substr($this->MediaPath, -1, 1), $separators) )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR10, _PATH_FIELD5);
+ 		}
+ 		elseif ( !file_exists($this->MediaPath) )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR11, _PATH_FIELD5);
+ 		}
+ 
+ 		if ( !in_array(substr($this->SkinsPath, -1, 1), $separators) )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR10, _PATH_FIELD7);
+ 		}
+ 		elseif ( !file_exists($this->SkinsPath) )
+ 		{
+ 			$errors[] = sprintf(_VALID_ERROR11, _PATH_FIELD7);
+ 		}
+ 
+ 		return $errors;
+ 	}
+ 
+ 	/**
+ 	 * check all parameters
+ 	 * @return bool
+ 	 */
+ 	public function check_all_parameters()
+ 	{
+ 		$this->set_locale();
+ 
+ 		$isValid = true;
+ 		$isValid &= (count($this->check_mysql_parameters()) == 0);
+ 		$isValid &= (count($this->check_user_parameters()) == 0);
+ 		$isValid &= (count($this->check_weblog_parameters()) == 0);
+ 		$isValid &= (count($this->check_uri_parameters()) == 0);
+ 		$isValid &= (count($this->check_path_parameters()) == 0);
+ 
+ 		return $isValid;
+ 	}
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/bookmarklet.php
index 6278c97,61af96c..836b920
--- a/nucleus/bookmarklet.php
+++ b/nucleus/bookmarklet.php
@@@ -25,11 -25,25 +25,32 @@@ $CONF['UsingAdminArea'] = 1
  // include all classes and config data
  include('../config.php');
  
++<<<<<<< HEAD
++=======
+ // get skin object
+ $skinid = $member->bookmarklet;
+ if ( !Skin::existsID($skinid) )
+ {
+ 	$skinid = $CONF['BookmarkletSkin'];
+ 	if ( !Skin::existsID($skinid) )
+ 	{
+ 		sendContentType('text/html');
+ 		echo _ERROR_SKIN;
+ 		exit;
+ 	}
+ }
+ $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')
@@@ -49,16 -63,13 +70,19 @@@ 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) )
  {
  	if ( !$manager->checkTicket() )
  	{
- 		bm_doError(_ERROR_BADTICKET);
+ 		bm_doError($skin, _ERROR_BADTICKET);
  	}
  }
  
@@@ -67,32 -78,32 +91,32 @@@ switch ( $action 
  {
  	// adds the item for real
  	case 'additem':
- 		bm_doAddItem();
+ 		bm_doAddItem($skin);
  		break;
  	
  	// shows the edit item form
  	case 'edit':
- 		bm_doEditForm();
+ 		bm_doEditForm($skin);
  		break;
  	
  	// edits the item for real
  	case 'edititem':
- 		bm_doEditItem();
+ 		bm_doEditItem($skin);
  		break;
  	
  	// on login, 'action' gets changed to 'nextaction'
  	case 'login':
- 		bm_doError('Something went wrong');
+ 		bm_doError($skin, 'Something went wrong');
  		break;
  	
  	// shows the fill in form
  	case 'add':
  	default:
- 		bm_doShowForm();
+ 		bm_doShowForm($skin);
  		break;
  }
  
- function bm_doAddItem()
+ function bm_doAddItem($skin)
  {
  	global $member, $manager, $CONF;
  	
@@@ -101,7 -112,7 +125,7 @@@
  	
  	if ( $result['status'] == 'error' )
  	{
- 		bm_doError($result['message']);
+ 		bm_doError($skin, $result['message']);
  	}
  	
  	$blogid = getBlogIDFromItemID($result['itemid']);
@@@ -118,12 -129,12 +142,16 @@@
  		$extrahead = '';
  	}
  	
++<<<<<<< HEAD
 +	bm_message(_ITEM_ADDED, _ITEM_ADDED, $message,$extrahead);
++=======
+ 	bm_message($skin, _ITEM_ADDED, $message,$extrahead);
++>>>>>>> skinnable-master
  	
  	return;
  }
  
- function bm_doEditItem()
+ function bm_doEditItem($skin)
  {
  	global $member, $manager, $CONF;
  	
@@@ -133,7 -144,7 +161,7 @@@
  	// only allow if user is allowed to alter item
  	if ( !$member->canUpdateItem($itemid, $catid) )
  	{
- 		bm_doError(_ERROR_DISALLOWED);
+ 		bm_doError($skin, _ERROR_DISALLOWED);
  	}
  	
  	$body = postVar('body');
@@@ -163,7 -174,7 +191,7 @@@
  		// show error when sth goes wrong
  		if ( !$catid )
  		{
- 			bm_doError('Could not create new category');
+ 			bm_doError($skin, 'Could not create new category');
  		}
  	}
  	
@@@ -186,7 -197,7 +214,7 @@@
  			$timestamp = 0;
  			break;
  		default:
- 			bm_doError('Something went wrong');
+ 			bm_doError($skin, 'Something went wrong');
  	}
  	
  	// update item for real
@@@ -197,58 -208,48 +225,81 @@@
  		Item::delete($draftid);
  	}
  	
- 	// show success message
- 	if ( $catid != intPostVar('catid') )
+ 	if ( $result['status'] == 'newcategory' )
  	{
- 		bm_message(_ITEM_UPDATED, _ITEM_UPDATED, 'Item was added, and a new category was created. <a href="index.php?action=categoryedit&amp;blogid=' . $blog->getID() . '&amp;catid=' . $catid . '" onclick="if (event &amp;&amp; event.preventDefault) event.preventDefault(); window.open(this.href); return false;" title="Opens in new window">Click here to edit the name and description of the category.</a>', '');
+ 		$href		= "index.php?action=categoryedit&amp;blogid={$blogid}&amp;catid={$result['catid']}";
+ 		$onclick	= 'if (event &amp;&amp; event.preventDefault) event.preventDefault(); window.open(this.href); return false;';
+ 		$title		= _BOOKMARKLET_NEW_WINDOW;
+ 		$aTag		= " <a href=\"{$href}\" onclick=\"{$onclick}\" title=\"{$title}\">";
+ 		$message	= _BOOKMARKLET_NEW_CATEGORY . $aTag . _BOOKMARKLET_NEW_CATEGORY_EDIT . '</a>';
  	}
  	else
  	{
- 		bm_message(_ITEM_UPDATED, _ITEM_UPDATED, _ITEM_UPDATED, '');
+ 		$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: これを出力させる
  	$blogid = intRequestVar('blogid');
  	$itemid = intRequestVar('itemid');
  	$log_text = requestVar('logtext');
  	$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;
  }
  
- function bm_doShowForm()
+ function bm_doShowForm($skin)
  {
  	global $manager, $member;
  	
@@@ -259,18 -260,15 +310,24 @@@
  	
  	if ( !Blog::existsID($blogid) )
  	{
- 		bm_doError(_ERROR_NOSUCHBLOG);
+ 		bm_doError($skin, _ERROR_NOSUCHBLOG);
  	}
++<<<<<<< HEAD
 +	else
 +	{
 +		$blog =& $manager->getBlog($blogid);
 +	}
 +	
 +	if ( !$member->isTeamMember($blogid) )
++=======
+ 	else if ( !$member->isTeamMember($blogid) )
++>>>>>>> skinnable-master
  	{
- 		bm_doError(_ERROR_NOTONTEAM);
+ 		bm_doError($skin, _ERROR_NOTONTEAM);
  	}
  	
+ 	$blog =& $manager->getBlog($blogid);
+ 	
  	$logje = '';
  	
  	if ( $log_text )
@@@ -288,23 -286,32 +345,48 @@@
  		$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);
+ 	
+ 	$data = array(
+ 		'blog'		=> &$blog,
+ 		'item'		=> &$item,
+ 		'contents'	=> &$item
+ 	);
+ 	$manager->notify('PreAddItemForm', $data);
+ 	
+ 	if ( $blog->convertBreaks() )
+ 	{
+ 		$item['body'] = removeBreaks($item['body']);
+ 	}
+ 	
+ 	Admin::$blog = &$blog;
+ 	Admin::$contents = &$item;
+ 	
+ 	Admin::$action = 'createitem';
+ 	$skin->parse('createitem');
+ 	
++>>>>>>> skinnable-master
  	return;
  }
  
- function bm_doEditForm()
+ function bm_doEditForm($skin)
  {
  	global $member, $manager;
  	
@@@ -312,74 -319,54 +394,105 @@@
  	
  	if ( !$manager->existsItem($itemid, 0, 0) )
  	{
- 		bm_doError(_ERROR_NOSUCHITEM);
+ 		bm_doError($skin, _ERROR_NOSUCHITEM);
  	}
- 	
- 	if ( !$member->canAlterItem($itemid) )
+ 	else if ( !$member->canAlterItem($itemid) )
  	{
- 		bm_doError(_ERROR_DISALLOWED);
+ 		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;
+ 	
+ 	Admin::$action = 'itemedit';
+ 	$skin->parse('itemedit');
+ 	
+ 	return;}
++>>>>>>> skinnable-master
  
- function bm_doError($msg)
+ function bm_doError($skin, $msg)
  {
- 	bm_message(_ERROR, _ERRORMSG, $msg);
+ 	bm_message($skin, _ERRORMSG, $msg);
  	die;
  }
  
- function bm_message($title, $head, $msg, $extrahead = '')
+ 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_style()
+ 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";
diff --combined nucleus/convert/functions.inc.php
index cf28fb5,be81999..6f27dfd
--- a/nucleus/convert/functions.inc.php
+++ b/nucleus/convert/functions.inc.php
@@@ -12,7 -12,7 +12,7 @@@
  /**
   * @license http://nucleuscms.org/license.txt GNU General Public License
   * @copyright Copyright (C) 2002-2006 The Nucleus Group
-  * @version $Id: functions.inc.php 1624 2012-01-09 11:36:20Z sakamocchi $
+  * @version $Id: functions.inc.php 1889 2012-06-17 08:46:45Z sakamocchi $
   */
  
  // try to set a long timeout time
@@@ -228,8 -228,10 +228,10 @@@ class BlogImport 
  		}
  
  		// - call callback
- 		if ($this->strCallback && function_exists($this->strCallback)) {
- 			call_user_func_array($this->strCallback, array(&$aData));
+ 		if ( $this->strCallback && function_exists($this->strCallback) )
+ 		{
+ 			$params = array(&$aData);
+ 			call_user_func_array($this->strCallback, $params);
  		}
  
  		if ($this->bDebug) {
@@@ -294,7 -296,7 +296,7 @@@
  				$query =  'SELECT bname as text, bnumber as value FROM '.sql_table('blog');
  				$template['name'] = 'blogid';
  				$template['selected'] = $CONF['DefaultBlog'];
- 				showlist($query,'select',$template);
+ 				echo showlist($query,'select',$template);
  				break;
  // ----------------------------------------------------------------------------------------
  			case 'ConvertSelectMembers':
@@@ -796,34 -798,34 +798,45 @@@
  	}
  
  	function sql_addToItem($title, $body, $more, $blogid, $authorid, $timestamp, $closed, $category, $karmapos, $karmaneg) {
- 		$title 		= trim(addslashes($title));
- 		$body 		= trim(addslashes($body));
- 		$more 		= trim(addslashes($more));
- 		$timestamp 	= date("Y-m-d H:i:s", $timestamp);
+ 		$title 		= DB::quoteValue(trim($title));
+ 		$body 		= DB::quoteValue(trim($body));
+ 		$more 		= DB::quoteValue(trim($more));
+ 		$timestamp 	= DB::formatDateTime($timestamp);
  
  		$query = 'INSERT INTO '.sql_table('item').' (ITITLE, IBODY, IMORE, IBLOG, IAUTHOR, ITIME, ICLOSED, IKARMAPOS, IKARMANEG, ICAT) '
- 			   . "VALUES ('$title', '$body', '$more', $blogid, $authorid, '$timestamp', $closed, $karmapos, $karmaneg,  $category)";
+ 			   . "VALUES ($title, $body, $more, $blogid, $authorid, $timestamp, $closed, $karmapos, $karmaneg,  $category)";
  
  		if ( DB::execute($query) === FALSE )
  		{
++<<<<<<< HEAD
 +			die("Error while executing query: " . $query);
++=======
+ 			die('Error while executing query: ' . $query);
++>>>>>>> skinnable-master
  		}
  
  		return DB::getInsertId();
  	}
  
  	function sql_addToBlog($name, $shortname, $ownerid) {
- 		$name 		= addslashes($name);
- 		$shortname 	= addslashes($shortname);
+ 		$name 		= DB::quoteValue($name);
+ 		$shortname 	= DB::quoteValue($shortname);
  
  		// create new category first
  		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();
  
@@@ -837,20 -839,20 +850,24 @@@
  	}
  
  	function sql_addToComments($name, $url, $body, $blogid, $itemid, $memberid, $timestamp, $host, $ip='') {
- 		$name 		= addslashes($name);
- 		$url 		= addslashes($url);
- 		$body 		= trim(addslashes($body));
- 		$host 		= addslashes($host);
- 		$ip 		= addslashes($ip);
- 		$timestamp 	= date("Y-m-d H:i:s", $timestamp);
+ 		$name 		= DB::quoteValue($name);
+ 		$url 		= DB::quoteValue($url);
+ 		$body 		= DB::quoteValue(trim($body));
+ 		$host 		= DB::quoteValue($host);
+ 		$ip 		= DB::quoteValue($ip);
+ 		$timestamp 	= DB::formatDateTime($timestamp);
  
  		$query = 'INSERT INTO '.sql_table('comment')
  			   . ' (CUSER, CMAIL, CMEMBER, CBODY, CITEM, CTIME, CHOST, CBLOG, CIP) '
- 			   . "VALUES ('$name', '$url', $memberid, '$body', $itemid, '$timestamp', '$host', $blogid, '$ip')";
+ 			   . "VALUES ($name, $url, $memberid, $body, $itemid, $timestamp, $host, $blogid, $ip)";
  
  		if ( DB::execute($query) === FALSE )
  		{
++<<<<<<< HEAD
 +			die("Error while executing query: " . $query);
++=======
+ 			die('Error while executing query: ' . $query);
++>>>>>>> skinnable-master
  		}
  
  		return DB::getInsertId();
@@@ -863,7 -865,7 +880,11 @@@
  
  		if ( DB::execute($query) === FALSE )
  		{
++<<<<<<< HEAD
 +			die("Error while executing query: " . $query);
++=======
+ 			die('Error while executing query: ' . $query);
++>>>>>>> skinnable-master
  		}
  
  		return DB::getInsertId();
@@@ -893,16 -895,16 +914,20 @@@ if ($ver > 250
  
  	// TODO: remove this function (replaced by BlogImport::sql_addToItem)
  	function convert_addToItem($title, $body, $more, $blogid, $authorid, $timestamp, $closed, $category, $karmapos, $karmaneg) {
- 		$title = trim(addslashes($title));
- 		$body = trim(addslashes($body));
- 		$more = trim(addslashes($more));
+ 		$title = DB::quoteValue(trim($title));
+ 		$body = DB::quoteValue(trim($body));
+ 		$more = DB::quoteValue(trim($more));
  
  		$query = 'INSERT INTO '.sql_table('item').' (ITITLE, IBODY, IMORE, IBLOG, IAUTHOR, ITIME, ICLOSED, IKARMAPOS, IKARMANEG, ICAT) '
- 			   . "VALUES ('$title', '$body', '$more', $blogid, $authorid, '$timestamp', $closed, $karmapos, $karmaneg,  $category)";
+ 			   . "VALUES ($title, $body, $more, $blogid, $authorid, '$timestamp', $closed, $karmapos, $karmaneg,  $category)";
  
  		if ( DB::execute($query) === FALSE )
  		{
++<<<<<<< HEAD
 +			die("Error while executing query: " . $query);
++=======
+ 			die('Error while executing query: ' . $query);
++>>>>>>> skinnable-master
  		}
  
  		return DB::getInsertId();
@@@ -911,17 -913,17 +936,24 @@@
  
  	// TODO: remove this function (replaced by BlogImport::sql_addToBlog)
  	function convert_addToBlog($name, $shortname, $ownerid) {
- 		$name = addslashes($name);
- 		$shortname = addslashes($shortname);
+ 		$name = DB::quoteValue($name);
+ 		$shortname = DB::quoteValue($shortname);
  
  		// create new category first
  		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();
  
@@@ -932,15 -934,15 +964,15 @@@
  
  	// TODO: remove this function (replaced by BlogImport::sql_addToComments)
  	function convert_addToComments($name, $url, $body, $blogid, $itemid, $memberid, $timestamp, $host, $ip='') {
- 		$name = addslashes($name);
- 		$url = addslashes($url);
- 		$body = trim(addslashes($body));
- 		$host = addslashes($host);
- 		$ip = addslashes($ip);
+ 		$name = DB::quoteValue($name);
+ 		$url = DB::quoteValue($url);
+ 		$body = DB::quoteValue(trim($body));
+ 		$host = DB::quoteValue($host);
+ 		$ip = DB::quoteValue($ip);
  
  		$query = 'INSERT INTO '.sql_table('comment')
  			   . ' (CUSER, CMAIL, CMEMBER, CBODY, CITEM, CTIME, CHOST, CBLOG, CIP) '
- 			   . "VALUES ('$name', '$url', $memberid, '$body', $itemid, '$timestamp', '$host', $blogid, '$ip')";
+ 			   . "VALUES ($name, $url, $memberid, $body, $itemid, '$timestamp', $host, $blogid, $ip)";
  
  		if ( DB::execute($query) === FALSE )
  		{
@@@ -994,7 -996,7 +1026,7 @@@
  		<head>
  			<title>Nucleus Convert</title>
  			<style><!--
- 				@import url('../styles/manual.css');
+ 				@import url('../styles/documentation/manual.css');
  			--></style>
  		</head>
  		<body>
diff --combined nucleus/convert/wordpress.php
index cb00639,9e5a78c..3d933c4
--- a/nucleus/convert/wordpress.php
+++ b/nucleus/convert/wordpress.php
@@@ -25,66 -25,60 +25,114 @@@
  
  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]); 
+     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; 
+   }
++>>>>>>> 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'>
@@@ -130,65 -124,65 +178,127 @@@ els
  	{
  		@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
+ 	/*
+ 	$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>";
+ 
++>>>>>>> skinnable-master
  		/* *********************************************** */
  		echo "<h2>Transfering posts and comments...</h2>";
  		DB::execute("DELETE FROM " . sql_table('comment') . " WHERE chost='@wordpress'");
diff --combined nucleus/index.php
index f3d70ec,89d14ec..fed8f8d
--- a/nucleus/index.php
+++ b/nucleus/index.php
@@@ -1,7 -1,7 +1,7 @@@
  <?php
  /*
   * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
-  * Copyright (C) 2002-2012 The Nucleus Group
+  * 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
@@@ -11,8 -11,8 +11,13 @@@
   */
  /**
   * @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:
@@@ -78,7 -78,27 +83,27 @@@ if ( $bNeedsLogin 
  	$action = 'showlogin';
  }
  
- sendContentType('text/html', 'admin-' . $action);
+ if ( !Admin::initialize() )
+ {
+ 	/* TODO: this is a bad way... */
+ 	sendContentType('text/html', 'admin-' . $action);
+ 	
+ 	$skin =& $manager->getSkin(0, 'AdminActions', 'AdminSkin');
+ 	if ( $bNeedsLogin )
+ 	{
+ 		$skin->parse('fileparse', $DIR_SKINS . 'admin/showlogin.skn');
+ 	}
+ 	else if ($action == 'adminskinieimport' )
+ 	{
+ 		Admin::action($action);
+ 	}
+ 	else
+ 	{
+ 		$skin->parse('importAdmin', $DIR_SKINS . 'admin/defaultimporter.skn');
+ 	}
+ 	/* TODO: something to handling errors */
+ 	exit;
+ }
  
- $admin = new Admin();
- $admin->action($action);
+ Admin::action($action);
+ exit;
diff --combined nucleus/libs/ACTION.php
index 5ac9e75,e7dbc0a..a7b3363
--- a/nucleus/libs/ACTION.php
+++ b/nucleus/libs/ACTION.php
@@@ -1,571 -1,580 +1,1154 @@@
++<<<<<<< HEAD
 +<?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)
 + */
 +/**
 + * Actions that can be called via action.php
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2009 The Nucleus Group
 + * @version $Id: ACTION.php 1646 2012-01-29 10:47:32Z sakamocchi $
 + */
 +class Action
 +{
 +	/**
 +	 * Action::__construct()
 +	 *  Constructor for an new ACTION object
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	public function __construct()
 +	{
 +		return;
 +	}
 +	
 +	/**
 +	 * Action::doAction()
 +	 *  Calls functions that handle an action called from action.php
 +	 * 
 +	 * @param	string	$action	action type
 +	 * @return	mixed
 +	 */
 +	public function doAction($action)
 +	{
 +		switch ( $action )
 +		{
 +			case 'autodraft':
 +				return $this->autoDraft();
 +				break;
 +			case 'updateticket':
 +				return $this->updateTicket();
 +				break;
 +			case 'addcomment':
 +				return $this->addComment();
 +				break;
 +			case 'sendmessage':
 +				return $this->sendMessage();
 +				break;
 +			case 'createaccount':
 +				return $this->createAccount();
 +				break;
 +			case 'forgotpassword':
 +				return $this->forgotPassword();
 +				break;
 +			case 'votepositive':
 +				return $this->doKarma('pos');
 +				break;
 +			case 'votenegative':
 +				return $this->doKarma('neg');
 +				break;
 +			case 'plugin':
 +				return $this->callPlugin();
 +				break;
 +			default:
 +				doError(_ERROR_BADACTION);
 +				break;
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * Action::addComment()
 +	 * Adds a new comment to an item (if IP isn't banned)
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	private function addComment()
 +	{
 +		global $CONF, $errormessage, $manager;
 +		
 +		$post['itemid']	= intPostVar('itemid');
 +		$post['user']	= postVar('user');
 +		$post['userid']	= postVar('userid');
 +		$post['email']	= postVar('email');
 +		$post['body']	= postVar('body');
 +		$post['remember'] = intPostVar('remember');
 +		
 +		// begin if: "Remember Me" box checked
 +		if ( $post['remember'] == 1 )
 +		{
 +			$lifetime = time() + 2592000;
 +			setcookie($CONF['CookiePrefix'] . 'comment_user', $post['user'], $lifetime, '/', '', 0);
 +			setcookie($CONF['CookiePrefix'] . 'comment_userid', $post['userid'], $lifetime, '/', '', 0);
 +			setcookie($CONF['CookiePrefix'] . 'comment_email', $post['email'], $lifetime, '/', '', 0);
 +		}
 +		
 +		$comments = new Comments($post['itemid']);
 +		
 +		$blog_id = getBlogIDFromItemID($post['itemid']);
 +		$this->checkban($blog_id);
 +		$blog =& $manager->getBlog($blog_id);
 +		
 +		// note: PreAddComment and PostAddComment gets called somewhere inside addComment
 +		$errormessage = $comments->addComment($blog->getCorrectTime(), $post);
 +		
 +		if ( $errormessage != '1' )
 +		{
 +			// show error message using default skin for blo
 +			return array(
 +				'message'	=> $errormessage,
 +				'skinid'	=> $blog->getDefaultSkin()
 +			);
 +		}
 +		else
 +		{
 +			// redirect when adding comments succeeded
 +			if ( postVar('url') )
 +			{
 +				redirect(postVar('url') );
 +			}
 +			else
 +			{
 +				$url = Link::create_item_link($post['itemid']);
 +				redirect($url);
 +			}
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * Action::sendMessage()
 +	 * Sends a message from the current member to the member given as argument
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	private function sendMessage()
 +	{
 +		global $CONF, $member;
 +		
 +		$error = $this->validateMessage();
 +		
 +		if ( $error != '' )
 +		{
 +			return array('message' => $error);
 +		}
 +		
 +		if ( !$member->isLoggedIn() )
 +		{
 +			$fromMail = postVar('frommail');
 +			$fromName = _MMAIL_FROMANON;
 +		}
 +		else
 +		{
 +			$fromMail = $member->getEmail();
 +			$fromName = $member->getDisplayName();
 +		}
 +		
 +		/* TODO: validation */
 +		$memberid = postVar('memberid');
 +		$tomem = new Member();
 +		$tomem->readFromId($memberid);
 +		
 +		/* TODO: validation */
 +		$message = postVar('message');
 +		$message  = _MMAIL_MSG . ' ' . $fromName . "\n"
 +			. '(' . _MMAIL_FROMNUC. ' ' . $CONF['IndexURL'] .") \n\n"
 +			. _MMAIL_MAIL . " \n\n"
 +			. $message;
 +		$message .= Notification::get_mail_footer();
 +		
 +		$title = _MMAIL_TITLE . ' ' . $fromName;
 +		Notification::mail($tomem->getEmail(), $title, $message, $fromMail, i18n::get_current_charset());
 +		
 +		/* TODO: validation */
 +		$url = postVar('url');
 +		if ( empty($url) )
 +		{
 +			$CONF['MemberURL'] = $CONF['IndexURL'];
 +			
 +			if ( $CONF['URLMode'] == 'pathinfo' )
 +			{
 +				$data = array(
 +					'memberid'	=> $tomem->getID(),
 +					'name'		=> $tomem->getDisplayName()
 +				);
 +				$url = Link::create_link('member', $data);
 +			}
 +			else
 +			{
 +				$url = $CONF['IndexURL'] . Link::create_member_link($tomem->getID());
 +			}
 +		}
 +		redirect($url );
 +		
 +		return;
 +	}
 +	
 +	/**
 +	 * Action::validateMessage()
 +	 *  Checks if a mail to a member is allowed
 +	 *  Returns a string with the error message if the mail is disallowed
 +	 * 
 +	 * @param		void
 +	 * @return	String	Null character string
 +	 */
 +	private function validateMessage()
 +	{
 +		global $CONF, $member, $manager;
 +		
 +		if ( !$CONF['AllowMemberMail'] )
 +		{
 +			return _ERROR_MEMBERMAILDISABLED;
 +		}
 +		
 +		if ( !$member->isLoggedIn() && !$CONF['NonmemberMail'] )
 +		{
 +			return _ERROR_DISALLOWED;
 +		}
 +		
 +		if ( !$member->isLoggedIn() && !Notification::address_validation(postVar('frommail')) )
 +		{
 +			return _ERROR_BADMAILADDRESS;
 +		}
 +		
 +		/*
 +		 * let plugins do verification (any plugin which thinks the comment is
 +		 * invalid can change 'error' to something other than '')
 +		 */
 +		$result = '';
 +		$data = array(
 +			'type'	=> 'membermail',
 +			'error'	=> &$result
 +		);
 +		$manager->notify('ValidateForm', $data);
 +		
 +		return $result;
 +	}
 +	
 +	/**
 +	 * Action::createAccount()
 +	 * Creates a new user account
 +	 *  
 +	 * @param	void
 +	 * @return	mixed
 +	 */
 +	private function createAccount()
 +	{
 +		global $CONF, $manager;
 +		
 +		if ( array_key_exists('AllowMemberCreate', $CONF) && !$CONF['AllowMemberCreate'] )
 +		{
 +			doError(_ERROR_MEMBERCREATEDISABLED);
 +		}
 +		
 +		// evaluate content from FormExtra
 +		$result = 1;
 +		$data = array(
 +			'type'	=> 'membermail',
 +			'error'	=> &$result
 +		);
 +		$manager->notify('ValidateForm', $data);
 +		
 +		if ( $result != 1 )
 +		{
 +			return $result;
 +		}
 +		
 +		// even though the member can not log in, set some random initial password. One never knows.
 +		srand((double) microtime() * 1000000);
 +		$initialPwd = md5(uniqid(rand(), TRUE) );
 +		
 +		// create member (non admin/can not login/no notes/random string as password)
 +		$name		= Entity::shorten(postVar('name'), 32, '');
 +		$relname	= postVar('realname');
 +		$email		= postVar('email');
 +		$url		= postVar('url');
 +		
 +		$r = Member::create($name, $realname, $initialPwd, $email, $url, 0, 0, '');
 +		
 +		if ( $r != 1 )
 +		{
 +			return $r;
 +		}
 +		
 +		// send message containing password.
 +		$newmem = new Member();
 +		$newmem->readFromName($name);
 +		$newmem->sendActivationLink('register');
 +		
 +		$manager->notify('PostRegister', array('member' => &$newmem) );
 +		
 +		if ( postVar('desturl') )
 +		{
 +			redirect(postVar('desturl') );
 +		}
 +		
 +		return 1;
 +	}
 +	
 +	/**
 +	 * Action::forgotPassword()
 +	 * Sends a new password
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	private function forgotPassword()
 +	{
 +		$membername = trim(postVar('name') );
 +		
 +		if ( !Member::exists($membername) )
 +		{
 +			doError(_ERROR_NOSUCHMEMBER);
 +		}
 +		
 +		$mem = Member::createFromName($membername);
 +		
 +		// check if e-mail address is correct
 +		$email = postVar('email');
 +		if ( $mem->getEmail() != $email )
 +		{
 +			doError(_ERROR_INCORRECTEMAIL);
 +		}
 +		
 +		// send activation link
 +		$mem->sendActivationLink('forgot');
 +		
 +		// redirection
 +		$url = postVar('url');
 +		if ( !empty($url) )
 +		{
 +			redirect(postVar('url') );
 +		}
 +		else
 +		{
 +			echo _MSG_ACTIVATION_SENT;
 +			echo "<br />"
 +			    . "<br />"
 +			    . "Return to <a href=\"{$CONF['IndexURL']}\" title=\"{$CONF['SiteName']}\">{$CONF['SiteName']}</a>\n";
 +		}
 +		
 +		return;
 +	}
 +	
 +	/**
 +	 * Action::doKarma()
 +	 * Handle karma votes
 +	 * 
 +	 * @param	string	$type	pos or neg
 +	 * @return	Void
 +	 */
 +	private function doKarma($type)
 +	{
 +		global $itemid, $member, $CONF, $manager;
 +		
 +		// check if itemid exists
 +		if ( !$manager->existsItem($itemid, 0, 0) )
 +		{
 +			doError(_ERROR_NOSUCHITEM);
 +		}
 +		
 +		$blogid = getBlogIDFromItemID($itemid);
 +		$this->checkban($blogid);
 +		
 +		$karma =& $manager->getKarma($itemid);
 +		
 +		// check if not already voted
 +		if ( !$karma->isVoteAllowed(serverVar('REMOTE_ADDR') ) )
 +		{
 +			doError(_ERROR_VOTEDBEFORE);
 +		}
 +		
 +		// check if item does allow voting
 +		$item =& $manager->getItem($itemid, 0, 0);
 +		
 +		if ( $item['closed'] )
 +		{
 +			doError(_ERROR_ITEMCLOSED);
 +		}
 +		
 +		switch ( $type )
 +		{
 +			case 'pos':
 +				$karma->votePositive();
 +			break;
 +			
 +			case 'neg':
 +				$karma->voteNegative();
 +			break;
 +		}
 +		
 +		$blog =& $manager->getBlog($blogid);
 +		
 +		// send email to notification address, if any
 +		if ( $blog->getNotifyAddress() && $blog->notifyOnVote() )
 +		{
 +			$message = _NOTIFY_KV_MSG . ' ' . $itemid . "\n";
 +			$itemLink = Link::create_item_link((integer)$itemid);
 +			$temp = parse_url($itemLink);
 +			
 +			if ( !$temp['scheme'] )
 +			{
 +				$itemLink = $CONF['IndexURL'] . $itemLink;
 +			}
 +			
 +			$message .= $itemLink . "\n\n";
 +			
 +			if ( $member->isLoggedIn() )
 +			{
 +				$message .= _NOTIFY_MEMBER . ' ' . $member->getDisplayName() . ' (ID=' . $member->getID() . ")\n";
 +			}
 +			
 +			$message .= _NOTIFY_IP . ' ' . serverVar('REMOTE_ADDR') . "\n";
 +			$message .= _NOTIFY_HOST . ' ' .  gethostbyaddr(serverVar('REMOTE_ADDR'))  . "\n";
 +			$message .= _NOTIFY_VOTE . "\n " . $type . "\n";
 +			$message .= Notification::get_mail_footer();
 +			
 +			$subject = _NOTIFY_KV_TITLE . ' ' . strip_tags($item['title']) . ' (' . $itemid . ')';
 +			
 +			$from = $member->getNotifyFromMailAddress();
 +			
 +			Notification::mail($blog->getNotifyAddress(), $subject, $message, $from, i18n::get_current_charset());
 +		}
 +		
 +		$refererUrl = serverVar('HTTP_REFERER');
 +		
 +		if ( !$refererUrl )
 +		{
 +			$url = $itemLink;
 +		}
 +		else
 +		{
 +			$url = $refererUrl;
 +		}
 +		
 +		redirect($url);
 +		return;
 +	}
 +	
 +	/**
 +	 * Action::callPlugin()
 +	 * Calls a plugin action
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	private function callPlugin()
 +	{
 +		global $manager;
 +		
 +		$name = requestVar('name');
 +		$pluginName = "NP_{$name}";
 +		$actionType = requestVar('type');
 +		
 +		// 1: check if plugin is installed
 +		if ( !$manager->pluginInstalled($pluginName) )
 +		{
 +			doError(_ERROR_NOSUCHPLUGIN);
 +		}
 +		
 +		// 2: call plugin
 +		$pluginObject =& $manager->getPlugin($pluginName);
 +		if ( !$pluginObject )
 +		{
 +			$error = 'Could not load plugin (see actionlog)';
 +		}
 +		else
 +		{
 +			$error = $pluginObject->doAction($actionType);
 +		}
 +		
 +		/*
 +		 * doAction returns error when:
 +		 *  - an error occurred (duh)
 +		 *  - no actions are allowed (doAction is not implemented)
 +		 */
 +		if ( $error )
 +		{
 +			doError($error);
 +		}
 +		
 +		return;
 +	}
 +	
 +	/**
 +	 * Action::checkban()
 +	 *  Checks if an IP or IP range is banned
 +	 * 
 +	 * @param	integer	$blogid
 +	 * @return	void
 +	 */
 +	private function checkban($blogid)
 +	{
 +		// check if banned
 +		$ban = Ban::isBanned($blogid, serverVar('REMOTE_ADDR') );
 +		
 +		if ( $ban != 0 )
 +		{
 +			doError(_ERROR_BANNED1 . $ban->iprange . _ERROR_BANNED2 . $ban->message . _ERROR_BANNED3);
 +		}
 +		
 +		return;
 +	}
 +	
 +	/**
 +	 * Action::updateTicket()
 +	 * Gets a new ticket
 +	 * 
 +	 * @param	void
 +	 * @return	boolean	FALSE
 +	 */
 +	private function updateTicket()
 +	{
 +		global $manager;
 +		
 +		if ( !$manager->checkTicket() )
 +		{
 +			echo _ERROR . ':' . _ERROR_BADTICKET;
 +		}
 +		else
 +		{
 +			echo $manager->getNewTicket();
 +		}
 +		
 +		return FALSE;
 +	}
 +	
 +	/**
 +	 * Action::autoDraft()
 +	 * Handles AutoSaveDraft
 +	 * 
 +	 * @param	void
 +	 * @return	boolean	FALSE
 +	 */
 +	private function autoDraft()
 +	{
 +		global $manager;
 +		
 +		if ( !$manager->checkTicket() )
 +		{
 +			echo _ERROR . ':' . _ERROR_BADTICKET;
 +		}
 +		else
 +		{
 +			$manager->loadClass('ITEM');
 +			$info = Item::createDraftFromRequest();
 +			
 +			if ( $info['status'] != 'error' )
 +			{
 +				echo $info['draftid'];
 +			}
 +			else
 +			{
 +				echo $info['message'];
 +			}
 +		}
 +		
 +		return FALSE;
 +	}
 +}
 +
++=======
+ <?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)
+  */
+ /**
+  * Actions that can be called via action.php
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: ACTION.php 1646 2012-01-29 10:47:32Z sakamocchi $
+  */
+ class Action
+ {
+ 	/**
+ 	 * Action::__construct()
+ 	 *  Constructor for an new ACTION object
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	public function __construct()
+ 	{
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Action::doAction()
+ 	 *  Calls functions that handle an action called from action.php
+ 	 * 
+ 	 * @param	string	$action	action type
+ 	 * @return	mixed
+ 	 */
+ 	public function doAction($action)
+ 	{
+ 		switch ( $action )
+ 		{
+ 			case 'autodraft':
+ 				return $this->autoDraft();
+ 				break;
+ 			case 'updateticket':
+ 				return $this->updateTicket();
+ 				break;
+ 			case 'addcomment':
+ 				return $this->addComment();
+ 				break;
+ 			case 'sendmessage':
+ 				return $this->sendMessage();
+ 				break;
+ 			case 'createaccount':
+ 				return $this->createAccount();
+ 				break;
+ 			case 'forgotpassword':
+ 				return $this->forgotPassword();
+ 				break;
+ 			case 'votepositive':
+ 				return $this->doKarma('pos');
+ 				break;
+ 			case 'votenegative':
+ 				return $this->doKarma('neg');
+ 				break;
+ 			case 'plugin':
+ 				return $this->callPlugin();
+ 				break;
+ 			default:
+ 				doError(_ERROR_BADACTION);
+ 				break;
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Action::addComment()
+ 	 * Adds a new comment to an item (if IP isn't banned)
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	private function addComment()
+ 	{
+ 		global $CONF, $errormessage, $manager;
+ 		
+ 		$post['itemid']	= intPostVar('itemid');
+ 		$post['user']	= postVar('user');
+ 		$post['userid']	= postVar('userid');
+ 		$post['email']	= postVar('email');
+ 		$post['body']	= postVar('body');
+ 		$post['remember'] = intPostVar('remember');
+ 		
+ 		// begin if: "Remember Me" box checked
+ 		if ( $post['remember'] == 1 )
+ 		{
+ 			$lifetime = time() + 2592000;
+ 			setcookie($CONF['CookiePrefix'] . 'comment_user', $post['user'], $lifetime, '/', '', 0);
+ 			setcookie($CONF['CookiePrefix'] . 'comment_userid', $post['userid'], $lifetime, '/', '', 0);
+ 			setcookie($CONF['CookiePrefix'] . 'comment_email', $post['email'], $lifetime, '/', '', 0);
+ 		}
+ 		
+ 		$item =& $manager->getItem($post['itemid'], 0, 0);
+ 		$this->checkban($item['blogid']);
+ 		$blog =& $manager->getBlog($item['blogid']);
+ 		
+ 		// note: PreAddComment and PostAddComment gets called somewhere inside addComment
+ 		$comments = new Comments($post['itemid']);
+ 		$errormessage = $comments->addComment($blog->getCorrectTime(), $post);
+ 		
+ 		if ( $errormessage != '1' )
+ 		{
+ 			// show error message using default skin for blo
+ 			return array(
+ 				'message'	=> $errormessage,
+ 				'skinid'	=> $blog->getDefaultSkin()
+ 			);
+ 		}
+ 		else
+ 		{
+ 			// redirect when adding comments succeeded
+ 			if ( postVar('url') )
+ 			{
+ 				redirect(postVar('url') );
+ 			}
+ 			else
+ 			{
+ 				$url = Link::create_item_link($post['itemid']);
+ 				redirect($url);
+ 			}
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Action::sendMessage()
+ 	 * Sends a message from the current member to the member given as argument
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	private function sendMessage()
+ 	{
+ 		global $CONF, $member;
+ 		
+ 		$error = $this->validateMessage();
+ 		
+ 		if ( $error != '' )
+ 		{
+ 			return array('message' => $error);
+ 		}
+ 		
+ 		if ( !$member->isLoggedIn() )
+ 		{
+ 			$fromMail = postVar('frommail');
+ 			$fromName = _MMAIL_FROMANON;
+ 		}
+ 		else
+ 		{
+ 			$fromMail = $member->getEmail();
+ 			$fromName = $member->getDisplayName();
+ 		}
+ 		
+ 		/* TODO: validation */
+ 		$memberid = postVar('memberid');
+ 		$tomem = new Member();
+ 		$tomem->readFromId($memberid);
+ 		
+ 		/* TODO: validation */
+ 		$message = postVar('message');
+ 		$message  = _MMAIL_MSG . ' ' . $fromName . "\n"
+ 			. '(' . _MMAIL_FROMNUC. ' ' . $CONF['IndexURL'] .") \n\n"
+ 			. _MMAIL_MAIL . " \n\n"
+ 			. $message;
+ 		$message .= Notification::get_mail_footer();
+ 		
+ 		$title = _MMAIL_TITLE . ' ' . $fromName;
+ 		Notification::mail($tomem->getEmail(), $title, $message, $fromMail, i18n::get_current_charset());
+ 		
+ 		/* TODO: validation */
+ 		$url = postVar('url');
+ 		if ( empty($url) )
+ 		{
+ 			$CONF['MemberURL'] = $CONF['IndexURL'];
+ 			
+ 			if ( $CONF['URLMode'] == 'pathinfo' )
+ 			{
+ 				$data = array(
+ 					'memberid'	=> $tomem->getID(),
+ 					'name'		=> $tomem->getDisplayName()
+ 				);
+ 				$url = Link::create_link('member', $data);
+ 			}
+ 			else
+ 			{
+ 				$url = $CONF['IndexURL'] . Link::create_member_link($tomem->getID());
+ 			}
+ 		}
+ 		redirect($url );
+ 		
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Action::validateMessage()
+ 	 *  Checks if a mail to a member is allowed
+ 	 *  Returns a string with the error message if the mail is disallowed
+ 	 * 
+ 	 * @param		void
+ 	 * @return	String	Null character string
+ 	 */
+ 	private function validateMessage()
+ 	{
+ 		global $CONF, $member, $manager;
+ 		
+ 		if ( !$CONF['AllowMemberMail'] )
+ 		{
+ 			return _ERROR_MEMBERMAILDISABLED;
+ 		}
+ 		
+ 		if ( !$member->isLoggedIn() && !$CONF['NonmemberMail'] )
+ 		{
+ 			return _ERROR_DISALLOWED;
+ 		}
+ 		
+ 		if ( !$member->isLoggedIn() && !Notification::address_validation(postVar('frommail')) )
+ 		{
+ 			return _ERROR_BADMAILADDRESS;
+ 		}
+ 		
+ 		/*
+ 		 * let plugins do verification (any plugin which thinks the comment is
+ 		 * invalid can change 'error' to something other than '')
+ 		 */
+ 		$result = '';
+ 		$data = array(
+ 			'type'	=> 'membermail',
+ 			'error'	=> &$result
+ 		);
+ 		$manager->notify('ValidateForm', $data);
+ 		
+ 		return $result;
+ 	}
+ 	
+ 	/**
+ 	 * Action::createAccount()
+ 	 * Creates a new user account
+ 	 *  
+ 	 * @param	void
+ 	 * @return	mixed
+ 	 */
+ 	private function createAccount()
+ 	{
+ 		global $CONF, $manager;
+ 		
+ 		if ( array_key_exists('AllowMemberCreate', $CONF) && !$CONF['AllowMemberCreate'] )
+ 		{
+ 			doError(_ERROR_MEMBERCREATEDISABLED);
+ 			return;
+ 		}
+ 		
+ 		// evaluate content from FormExtra
+ 		$result = 1;
+ 		$data = array(
+ 			'type'	=> 'membermail',
+ 			'error'	=> &$result
+ 		);
+ 		$manager->notify('ValidateForm', $data);
+ 		
+ 		if ( $result != 1 )
+ 		{
+ 			return $result;
+ 		}
+ 		
+ 		// even though the member can not log in, set some random initial password. One never knows.
+ 		srand((double) microtime() * 1000000);
+ 		$initialPwd = md5(uniqid(rand(), TRUE) );
+ 		
+ 		// create member (non admin/can not login/no notes/random string as password)
+ 		$name		= Entity::shorten(postVar('name'), 32, '');
+ 		$relname	= postVar('realname');
+ 		$email		= postVar('email');
+ 		$url		= postVar('url');
+ 		
+ 		$r = Member::create($name, $realname, $initialPwd, $email, $url, 0, 0, '');
+ 		
+ 		if ( $r != 1 )
+ 		{
+ 			return $r;
+ 		}
+ 		
+ 		// send message containing password.
+ 		$newmem = new Member();
+ 		$newmem->readFromName($name);
+ 		$newmem->sendActivationLink('register');
+ 
+ 		$data = array('member' => $newmem);
+ 		$manager->notify('PostRegister', $data);
+ 		
+ 		if ( postVar('desturl') )
+ 		{
+ 			redirect(postVar('desturl') );
+ 		}
+ 		
+ 		return 1;
+ 	}
+ 	
+ 	/**
+ 	 * Action::forgotPassword()
+ 	 * Sends a new password
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	private function forgotPassword()
+ 	{
+ 		$membername = trim(postVar('name') );
+ 		
+ 		if ( !Member::exists($membername) )
+ 		{
+ 			doError(_ERROR_NOSUCHMEMBER);
+ 			return;
+ 		}
+ 		
+ 		$mem = Member::createFromName($membername);
+ 		
+ 		// check if e-mail address is correct
+ 		$email = postVar('email');
+ 		if ( $mem->getEmail() != $email )
+ 		{
+ 			doError(_ERROR_INCORRECTEMAIL);
+ 			return;
+ 		}
+ 		
+ 		// send activation link
+ 		$mem->sendActivationLink('forgot');
+ 		
+ 		// redirection
+ 		$url = postVar('url');
+ 		if ( !empty($url) )
+ 		{
+ 			redirect(postVar('url') );
+ 		}
+ 		else
+ 		{
+ 			echo _MSG_ACTIVATION_SENT;
+ 			echo "<br />"
+ 			    . "<br />"
+ 			    . "Return to <a href=\"{$CONF['IndexURL']}\" title=\"{$CONF['SiteName']}\">{$CONF['SiteName']}</a>\n";
+ 		}
+ 		
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Action::doKarma()
+ 	 * Handle karma votes
+ 	 * 
+ 	 * @param	string	$type	pos or neg
+ 	 * @return	Void
+ 	 */
+ 	private function doKarma($type)
+ 	{
+ 		global $itemid, $member, $CONF, $manager;
+ 		
+ 		// check if itemid exists
+ 		if ( !$manager->existsItem($itemid, 0, 0) )
+ 		{
+ 			doError(_ERROR_NOSUCHITEM);
+ 			return;
+ 		}
+ 		
+ 		$item =& $manager->getItem($itemid, 0, 0);
+ 		$this->checkban($item['blogid']);
+ 		
+ 		$karma =& $manager->getKarma($itemid);
+ 		
+ 		// check if not already voted
+ 		if ( !$karma->isVoteAllowed(serverVar('REMOTE_ADDR') ) )
+ 		{
+ 			doError(_ERROR_VOTEDBEFORE);
+ 			return;
+ 		}
+ 		
+ 		// check if item does allow voting
+ 		$item =& $manager->getItem($itemid, 0, 0);
+ 		
+ 		if ( $item['closed'] )
+ 		{
+ 			doError(_ERROR_ITEMCLOSED);
+ 			return;
+ 		}
+ 		
+ 		switch ( $type )
+ 		{
+ 			case 'pos':
+ 				$karma->votePositive();
+ 			break;
+ 			
+ 			case 'neg':
+ 				$karma->voteNegative();
+ 			break;
+ 		}
+ 		
+ 		$blog =& $manager->getBlog($blogid);
+ 		
+ 		// send email to notification address, if any
+ 		if ( $blog->getNotifyAddress() && $blog->notifyOnVote() )
+ 		{
+ 			$message = _NOTIFY_KV_MSG . ' ' . $itemid . "\n";
+ 			$itemLink = Link::create_item_link((integer)$itemid);
+ 			$temp = parse_url($itemLink);
+ 			
+ 			if ( !$temp['scheme'] )
+ 			{
+ 				$itemLink = $CONF['IndexURL'] . $itemLink;
+ 			}
+ 			
+ 			$message .= $itemLink . "\n\n";
+ 			
+ 			if ( $member->isLoggedIn() )
+ 			{
+ 				$message .= _NOTIFY_MEMBER . ' ' . $member->getDisplayName() . ' (ID=' . $member->getID() . ")\n";
+ 			}
+ 			
+ 			$message .= _NOTIFY_IP . ' ' . serverVar('REMOTE_ADDR') . "\n";
+ 			$message .= _NOTIFY_HOST . ' ' .  gethostbyaddr(serverVar('REMOTE_ADDR'))  . "\n";
+ 			$message .= _NOTIFY_VOTE . "\n " . $type . "\n";
+ 			$message .= Notification::get_mail_footer();
+ 			
+ 			$subject = _NOTIFY_KV_TITLE . ' ' . strip_tags($item['title']) . ' (' . $itemid . ')';
+ 			
+ 			$from = $member->getNotifyFromMailAddress();
+ 			
+ 			Notification::mail($blog->getNotifyAddress(), $subject, $message, $from, i18n::get_current_charset());
+ 		}
+ 		
+ 		$refererUrl = serverVar('HTTP_REFERER');
+ 		
+ 		if ( !$refererUrl )
+ 		{
+ 			$url = $itemLink;
+ 		}
+ 		else
+ 		{
+ 			$url = $refererUrl;
+ 		}
+ 		
+ 		redirect($url);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Action::callPlugin()
+ 	 * Calls a plugin action
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	private function callPlugin()
+ 	{
+ 		global $manager;
+ 		
+ 		$name = requestVar('name');
+ 		$pluginName = "NP_{$name}";
+ 		$actionType = requestVar('type');
+ 		
+ 		// 1: check if plugin is installed
+ 		if ( !$manager->pluginInstalled($pluginName) )
+ 		{
+ 			doError(_ERROR_NOSUCHPLUGIN);
+ 			return;
+ 		}
+ 		
+ 		// 2: call plugin
+ 		$pluginObject =& $manager->getPlugin($pluginName);
+ 		if ( !$pluginObject )
+ 		{
+ 			$error = 'Could not load plugin (see actionlog)';
+ 		}
+ 		else
+ 		{
+ 			$error = $pluginObject->doAction($actionType);
+ 		}
+ 		
+ 		/*
+ 		 * doAction returns error when:
+ 		 *  - an error occurred (duh)
+ 		 *  - no actions are allowed (doAction is not implemented)
+ 		 */
+ 		if ( $error )
+ 		{
+ 			doError($error);
+ 			return;
+ 		}
+ 		
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Action::checkban()
+ 	 *  Checks if an IP or IP range is banned
+ 	 * 
+ 	 * @param	integer	$blogid
+ 	 * @return	void
+ 	 */
+ 	private function checkban($blogid)
+ 	{
+ 		// check if banned
+ 		$ban = Ban::isBanned($blogid, serverVar('REMOTE_ADDR') );
+ 		
+ 		if ( $ban != 0 )
+ 		{
+ 			doError(_ERROR_BANNED1 . $ban->iprange . _ERROR_BANNED2 . $ban->message . _ERROR_BANNED3);
+ 			return;
+ 		}
+ 		
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Action::updateTicket()
+ 	 * Gets a new ticket
+ 	 * 
+ 	 * @param	void
+ 	 * @return	boolean	FALSE
+ 	 */
+ 	private function updateTicket()
+ 	{
+ 		global $manager;
+ 		
+ 		if ( !$manager->checkTicket() )
+ 		{
+ 			echo _ERROR . ':' . _ERROR_BADTICKET;
+ 		}
+ 		else
+ 		{
+ 			echo $manager->getNewTicket();
+ 		}
+ 		
+ 		return FALSE;
+ 	}
+ 	
+ 	/**
+ 	 * Action::autoDraft()
+ 	 * Handles AutoSaveDraft
+ 	 * 
+ 	 * @param	void
+ 	 * @return	boolean	FALSE
+ 	 */
+ 	private function autoDraft()
+ 	{
+ 		global $manager;
+ 		
+ 		if ( !$manager->checkTicket() )
+ 		{
+ 			echo _ERROR . ':' . _ERROR_BADTICKET;
+ 		}
+ 		else
+ 		{
+ 			$manager->loadClass('ITEM');
+ 			$info = Item::createDraftFromRequest();
+ 			
+ 			if ( $info['status'] != 'error' )
+ 			{
+ 				echo $info['draftid'];
+ 			}
+ 			else
+ 			{
+ 				echo $info['message'];
+ 			}
+ 		}
+ 		
+ 		return FALSE;
+ 	}
+ }
+ 
++>>>>>>> skinnable-master
diff --combined nucleus/libs/ACTIONLOG.php
index a7c7055,fe738d0..8c4f1e0
--- a/nucleus/libs/ACTIONLOG.php
+++ b/nucleus/libs/ACTIONLOG.php
@@@ -1,102 -1,103 +1,208 @@@
++<<<<<<< HEAD
 +<?php
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2002-2012 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)
 + */
 +/**
 + * Actionlog class for Nucleus
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2012 The Nucleus Group
 + * @version $Id: ACTIONLOG.php 1470 2010-11-29 22:10:16Z ftruscot $
 + */
 +define('ERROR',1);		// only errors
 +define('WARNING',2);	// errors and warnings
 +define('INFO',3);		// info, errors and warnings
 +define('DEBUG',4);		// everything
 +$CONF['LogLevel'] = INFO;
 +
 +class ActionLog
 +{
 +	/**
 +	 * ActionLog::add()
 +	 * Method to add a message to the action log
 +	 * 
 +	 * @static
 +	 * @param	Integer	$level	log level
 +	 * @param	String	$message	log message
 +	 * @return	
 +	 * 
 +	 */
 +	function add($level, $message)
 +	{
 +		global $member, $CONF;
 +		
 +		if ( $CONF['LogLevel'] < $level )
 +		{
 +			return;
 +		}
 +		
 +		if ( $member && $member->isLoggedIn() )
 +		{
 +			$message = "[" . $member->getDisplayName() . "] " . $message;
 +		}
 +		
 +		$query = "INSERT INTO %s (timestamp, message) VALUES (%s, %s)";
 +		$query = sprintf($query, sql_table('actionlog'), DB::formatDateTime(), DB::quoteValue($message));
 +		DB::execute($query);
 +		
 +		self::trimLog();
 +		return;
 +	}
 +	
 +	/**
 +	  * (Static) Method to clear the whole action log
 +	  */
 +	function clear() {
 +		global $manager;
 +
 +		$query = sprintf('DELETE FROM %s', sql_table('actionlog'));
 +
 +		$manager->notify('ActionLogCleared',array());
 +
 +		return DB::execute($query) !== FALSE;
 +	}
 +
 +	/**
 +	  * (Static) Method to trim the action log (from over 500 back to 250 entries)
 +	  */
 +	function trimLog() {
 +		static $checked = 0;
 +
 +		// only check once per run
 +		if ($checked) return;
 +
 +		// trim
 +		$checked = 1;
 +
 +		$query = sprintf('SELECT COUNT(*) AS result FROM %s', sql_table('actionlog'));
 +		$iTotal = DB::getValue($query);
 +
 +		// if size > 500, drop back to about 250
 +		$iMaxSize = 500;
 +		$iDropSize = 250;
 +		if ($iTotal > $iMaxSize) {
 +			$query = sprintf('SELECT timestamp as result FROM %s ORDER BY timestamp DESC LIMIT %d,1',
 +				sql_table('actionlog'), intval($iDropSize));
 +			$tsChop = DB::getValue($query);
 +			$query = sprintf("DELETE FROM %s WHERE timestamp < '%s'", sql_table('actionlog'), $tsChop);
 +			DB::execute($query);
 +		}
 +
 +	}
 +
 +}
 +
 +?>
++=======
+ <?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)
+  */
+ /**
+  * Actionlog class for Nucleus
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: ACTIONLOG.php 1822 2012-05-04 13:47:22Z sakamocchi $
+  */
+ define('ERROR',1);		// only errors
+ define('WARNING',2);	// errors and warnings
+ define('INFO',3);		// info, errors and warnings
+ define('DEBUG',4);		// everything
+ $CONF['LogLevel'] = INFO;
+ 
+ class ActionLog
+ {
+ 	/**
+ 	 * ActionLog::add()
+ 	 * Method to add a message to the action log
+ 	 * 
+ 	 * @static
+ 	 * @param	Integer	$level	log level
+ 	 * @param	String	$message	log message
+ 	 * @return	
+ 	 * 
+ 	 */
+ 	function add($level, $message)
+ 	{
+ 		global $member, $CONF;
+ 		
+ 		if ( $CONF['LogLevel'] < $level )
+ 		{
+ 			return;
+ 		}
+ 		
+ 		if ( $member && $member->isLoggedIn() )
+ 		{
+ 			$message = "[" . $member->getDisplayName() . "] " . $message;
+ 		}
+ 		
+ 		$query = "INSERT INTO %s (timestamp, message) VALUES (%s, %s)";
+ 		$query = sprintf($query, sql_table('actionlog'), DB::formatDateTime(), DB::quoteValue($message));
+ 		DB::execute($query);
+ 		
+ 		self::trimLog();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	  * (Static) Method to clear the whole action log
+ 	  */
+ 	function clear() {
+ 		global $manager;
+ 
+ 		$query = sprintf('DELETE FROM %s', sql_table('actionlog'));
+ 
+ 		$data = array();
+ 		$manager->notify('ActionLogCleared', $data);
+ 
+ 		return DB::execute($query) !== FALSE;
+ 	}
+ 
+ 	/**
+ 	  * (Static) Method to trim the action log (from over 500 back to 250 entries)
+ 	  */
+ 	function trimLog() {
+ 		static $checked = 0;
+ 
+ 		// only check once per run
+ 		if ($checked) return;
+ 
+ 		// trim
+ 		$checked = 1;
+ 
+ 		$query = sprintf('SELECT COUNT(*) AS result FROM %s', sql_table('actionlog'));
+ 		$iTotal = DB::getValue($query);
+ 
+ 		// if size > 500, drop back to about 250
+ 		$iMaxSize = 500;
+ 		$iDropSize = 250;
+ 		if ($iTotal > $iMaxSize) {
+ 			$query = sprintf('SELECT timestamp as result FROM %s ORDER BY timestamp DESC LIMIT %d,1',
+ 				sql_table('actionlog'), intval($iDropSize));
+ 			$tsChop = DB::getValue($query);
+ 			$query = sprintf("DELETE FROM %s WHERE timestamp < '%s'", sql_table('actionlog'), $tsChop);
+ 			DB::execute($query);
+ 		}
+ 
+ 	}
+ 
+ }
+ 
 -?>
++?>
++>>>>>>> skinnable-master
diff --combined nucleus/libs/ACTIONS.php
index 37cc913,5e865a5..db41cfc
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@@ -15,7 -15,7 +15,11 @@@
   *
   * @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 -69,10 +73,17 @@@
  	);
  	
  	/**
++<<<<<<< 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 -84,15 +95,25 @@@
  	);
  	
  	/**
++<<<<<<< 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 -405,7 +426,11 @@@
  		$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 -552,8 +577,13 @@@
  		// 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,7 -709,8 +739,12 @@@
  	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;
  	}
  
@@@ -724,7 -725,8 +759,12 @@@
  	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;
  	}
  	
@@@ -813,25 -815,13 +853,35 @@@
  	 * 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
+ 	 */
+ 	public function parse_archivedate($locale='')
+ 	{
+ 		global $archive;
+ 		
++>>>>>>> skinnable-master
  		// get archive date
  		sscanf($archive,'%d-%d-%d',$y,$m,$d);
  		
@@@ -1042,7 -1032,8 +1092,12 @@@
  	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;
  	}
  	
@@@ -1221,7 -1212,7 +1276,11 @@@
  		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);
@@@ -1422,7 -1413,7 +1481,11 @@@
  	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 )
  		{
@@@ -1874,7 -1865,7 +1937,11 @@@
  		// 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;
  	}
  	
@@@ -2204,17 -2195,19 +2271,33 @@@
  	 * @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;
+ 		
+ 		$itemid = (integer) $itemid;
+ 		$itemarray = array($itemid);
+ 		
+ 		$item =& $manager->getItem($post['itemid'], 1, 1);
+ 		$blog =& $manager->getBlog($item['blogid']);
+ 		
+ 		$this->preBlogContent('sticky', $blog);
+ 		$this->amountfound = $blog->readLogFromList($itemarray, $template);
+ 		$this->postBlogContent('sticky', $blog);
++>>>>>>> skinnable-master
  		return;
  	}
  }
diff --combined nucleus/libs/ADMIN.php
index 747c599,8ecdb28..2bbcc40
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@@ -1,5 -1,5 +1,5 @@@
  <?php
- /*
+ /**
   * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
   * Copyright (C) 2002-2009 The Nucleus Group
   *
@@@ -15,332 -15,360 +15,678 @@@
   * @license http://nucleuscms.org/license.txt GNU General Public License
   * @copyright Copyright (C) 2002-2009 The Nucleus Group
   * @version $Id: ADMIN.php 1661 2012-02-12 11:55:39Z sakamocchi $
- 
   */
  
  if ( !function_exists('requestVar') ) exit;
  require_once dirname(__FILE__) . '/showlist.php';
  
- /**
-  * Builds the admin area and executes admin actions
-  */
  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;
+ 	static public $aOptions;
+ 	static public $blog;
+ 	static public $contents;
+ 	static public $extrahead;
+ 	static public $headMess;
+ 	static public $passvar;
+ 	
+ 	static private $skinless_actions = array(
+ 		'plugindeleteconfirm',
+ 		'pluginoptionsupdate',
+ 		'blogsettingsupdate',
+ 		'settingsupdate',
+ 		'addnewlog2',
+ 		'additem',
+ 		'banlistnewfromitem',
+ 		'itemdeleteconfirm',
+ 		'itemupdate',
+ 		'changemembersettings',
+ 		'clearactionlog',
+ 		'memberedit',
+ 		'login',
+ 		
+ 		'skinremovetypeconfirm',
+ 		'skinclone',
+ 		'skindeleteconfirm',
+ 		'skinnew',
+ 		'skineditgeneral',
+ 		'skinupdate',
+ 		
+ 		'skinieexport',
+ 		
+ 		'templateupdate',
+ 		'templatedeleteconfirm',
+ 		'templatenew',
+ 		'templateclone',
+ 		
+ 		'adminskinremovetypeconfirm',
+ 		'adminskinclone',
+ 		'adminskindeleteconfirm',
+ 		'adminskinnew',
+ 		'adminskineditgeneral',
+ 		'adminskinupdate',
+ 		
+ 		'adminskinieexport',
+ 		
+ 		'admintemplateupdate',
+ 		'admintemplatedeleteconfirm',
+ 		'admintemplatenew',
+ 		'admintemplateclone'
+ 	);
+ 	
+ 	static private $ticketless_actions = array(
+ 		'showlogin',
+ 		'login',
+ 		'overview',
+ 		'itemlist',
+ 		'blogcommentlist',
+ 		'bookmarklet',
+ 		'blogsettings',
+ 		'banlist',
+ 		'createaccount',
+ 		'deleteblog',
+ 		'editmembersettings',
+ 		'createaccount',
+ 		'forgotpassword',
+ 		'browseowncomments',
+ 		'createitem',
+ 		'browseownitems',
+ 		'itemedit',
+ 		'itemmove',
+ 		'categoryedit',
+ 		'categorydelete',
+ 		'manage',
+ 		'actionlog',
+ 		'settingsedit',
+ 		'backupoverview',
+ 		'pluginlist',
+ 		'createnewlog',
+ 		'usermanagement',
+ 		'itemcommentlist',
+ 		'commentedit',
+ 		'commentdelete',
+ 		'banlistnewfromitem',
+ 		'banlistdelete',
+ 		'itemdelete',
+ 		'manageteam',
+ 		'teamdelete',
+ 		'banlistnew',
+ 		'memberedit',
+ 		'memberdelete',
+ 		'pluginhelp',
+ 		'pluginoptions',
+ 		'plugindelete',
+ 		
+ 		'activate',
+ 		'systemoverview',
+ 		'activatesetpwd',
+ 		
+ 		'skinoverview',
+ 		'skinclone',
+ 		'skindelete',
+ 		'skinedit',
+ 		'skinedittype',
+ 		'skinnew',
+ 		'skinremovetype',
+ 		
+ 		'skinieoverview',
+ 		
+ 		'templateoverview',
+ 		'templateclone',
+ 		'templateedit',
+ 		'templatedelete',
+ 		
+ 		'adminskinoverview',
+ 		'adminskinclone',
+ 		'adminskindelete',
+ 		'adminskinedit',
+ 		'adminskinedittype',
+ 		'adminskinnew',
+ 		'adminskinremovetype',
+ 		
+ 		'adminskinieoverview',
+ 		
+ 		'admintemplateoverview',
+ 		'admintemplateclone',
+ 		'admintemplateedit',
+ 		'admintemplatedelete'
+ 	);
+ 	
+ 	/**
+ 	 * NOTE: This is for condition of admin/normal skin actions
+ 	 */
+ 	static public $adminskin_actions = array(
+ 		/* ticketless */
+ 		'adminskinoverview',
+ 		'adminskinclone',
+ 		'adminskindelete',
+ 		'adminskinedit',
+ 		'adminskinedittype',
+ 		'adminskinnew',
+ 		'adminskinremovetype',
+ 		
+ 		'adminskinieoverview',
+ 		
+ 		'admintemplateoverview',
+ 		'admintemplateclone',
+ 		'admintemplateedit',
+ 		'admintemplatedelete',
+ 		
+ 		/* ticket needed */
+ 		'adminskineditgeneral',
+ 		'adminskinupdate',
+ 		'adminskindeleteconfirm',
+ 		'adminskinremovetypeconfirm',
+ 		
+ 		'adminskinieoverview',
+ 		'adminskiniedoimport',
+ 		'adminskinieexport',
+ 		'adminskinieimport',
+ 		
+ 		'admintemplatenew',
+ 		'admintemplatedeleteconfirm',
+ 		'admintemplateupdate'
+ 	);
+ 	
+ 	static public function initialize()
+ 	{
+ 		global $CONF, $manager, $member;
+ 		
+ 		/* NOTE: 1. decide which skinid to use */
+ 		$skinid = $CONF['AdminSkin'];
+ 		if ( $member->isLoggedIn() )
+ 		{
+ 			$memskin = $member->getAdminSkin();
+ 			if ( $memskin && Skin::existsID($memskin))
+ 			{
+ 				$skinid = $memskin;
+ 			}
+ 		}
+ 		
+ 		/* NOTE: 2. make an instance of skin object */
+ 		if ( !Skin::existsID($skinid) )
+ 		{
+ 			return FALSE;
+ 		}
+ 		
+ 		/* NOTE: 3. initializing each members */
+ 		self::$skin			=& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');
+ 		self::$action		= '';
+ 		self::$extrahead	= '';
+ 		self::$passvar		= '';
+ 		self::$headMess		= '';
+ 		self::$aOptions		= '';
+ 		return TRUE;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action()
+ 	 * Executes an action
+ 	 *
+ 	 * @param	string	$action	action to be performed
+ 	 * @return	void
+ 	 */
+ 	static public function action($action)
+ 	{
+ 		global $CONF, $manager, $member;
+ 		
+ 		/* 1. decide action name */
+ 		$customAction = postvar('customaction');
+ 		if ( empty($customAction) )
+ 		{
+ 			$alias = array(
+ 				'login'	=> 'overview',
+ 				''		=> 'overview',
+ 			);
+ 		}
+ 		else
+ 		{
+ 			$alias = array(
+ 				'login'	=> $customAction,
+ 				''		=> $customAction
+ 			);
+ 		}
+ 		if ( array_key_exists($action, $alias) && isset($alias[$action]) )
+ 		{
+ 			$action = $alias[$action];
+ 		}
+ 		$method_name = "action_{$action}";
+ 		self::$action = strtolower($action);
+ 		
+ 		/* 2. check ticket-needed action */
+ 		if ( !in_array(self::$action, self::$ticketless_actions) && !$manager->checkTicket() )
+ 		{
+ 			self::error(_ERROR_BADTICKET);
+ 			return;
+ 		}
+ 		
+ 		/* 3. parse according to the action */
+ 		else if ( method_exists('Admin', $method_name) )
+ 		{
+ 			call_user_func(array(__CLASS__, $method_name));
+ 			return;
+ 		}
+ 		/* 4. parse special admin skin */
+ 		elseif ( in_array(self::$action, self::$skinless_actions) )
+ 		{
+ 			/* TODO: need to be implemented or not?
+ 			self::action_parseSpecialskin();
+ 			*/
+ 		}
+ 		else
+ 		{
+ 			self::error(_BADACTION . ENTITY::hsc($action));
+ 			return;
+ 		}
+ 		
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Action::action_showlogin()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_showlogin()
+ 	{
+ 		global $error;
+ 		self::action_login($error);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Action::action_login()
+ 	 * 
+ 	 * @param	string	$msg		message for pageheader
+ 	 * @param	integer	$passvars	???
+ 	 */
+ 	static private function action_login($msg = '', $passvars = 1)
+ 	{
+ 		global $member;
+ 		
+ 		// skip to overview when allowed
+ 		if ( $member->isLoggedIn() && $member->canLogin() )
+ 		{
+ 			self::action_overview();
+ 			return;
+ 		}
+ 		
+ 		/* TODO: needless variable??? */
+ 		self::$passvar = $passvars;
+ 		if ( $msg )
+ 		{
+ 			self::$headMess = $msg;
+ 		}
+ 		
+ 		self::$skin->parse('showlogin');
+ 	}
+ 	
+ 	/**
+ 	 * Action::action_overview()
+ 	 * provides a screen with the overview of the actions available
+ 	 * 
+ 	 * @param	string	$msg	message for pageheader
+ 	 * @return	void
+ 	 */
+ 	static private function action_overview($msg = '')
+ 	{
+ 		if ( $msg )
+ 		{
+ 			self::$headMess = $msg;
+ 		}
+ 		
+ 		self::$skin->parse('overview');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_manage()
+ 	 * 
+ 	 * @param	string	$msg	message for pageheader
+ 	 * @retrn	void
+ 	 */
+ 	static private function action_manage($msg = '')
+ 	{
+ 		global $member;
+ 		
+ 		if ( $msg )
+ 		{
+ 			self::$headMess = $msg;
+ 		}
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		self::$skin->parse('manage');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Action::action_itemlist()
+ 	 * 
+ 	 * @param	integer	id for weblod
+ 	 * @return	void
+ 	 */
+ 	static private function action_itemlist($blogid = '')
++>>>>>>> skinnable-master
  	{
  		global $member, $manager, $CONF;
  		
@@@ -349,838 -377,295 +695,918 @@@
  			$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');
  		return;
  	}
  	
  	/**
- 	 * Admin::action_browseownitems()
+ 	 * Action::action_batchitem()
  	 * 
  	 * @param	void
  	 * @return	void
  	 */
- 	public function action_browseownitems()
+ 	static private function action_batchitem()
  	{
- 		global $member, $manager, $CONF;
+ 		global $member, $manager;
  		
- 		$this->pagehead();
+ 		$member->isLoggedIn() or self::disallow();
  		
- 		echo '<p><a href="index.php?action=overview">(' . _BACKHOME . ")</a></p>\n";
- 		echo '<h2>' . _ITEMLIST_YOUR . "</h2>\n";
+ 		$selected	= requestIntArray('batch');
+ 		$action		= requestVar('batchaction');
  		
- 		// start index
- 		if ( postVar('start') )
- 		{
- 			$start = intPostVar('start');
- 		}
- 		else
+ 		if ( !is_array($selected) || sizeof($selected) == 0 )
  		{
- 			$start = 0;
+ 			self::error(_BATCH_NOSELECTION);
+ 			return;
  		}
  		
- 		// amount of items to show
- 		if ( postVar('amount') )
+ 		// On move: when no destination blog/category chosen, show choice now
+ 		$destCatid = intRequestVar('destcatid');
+ 		if ( ($action == 'move') && (!$manager->existsCategory($destCatid)) )
  		{
- 			$amount = intPostVar('amount');
+ 			self::batchMoveSelectDestination('item', $selected);
  		}
- 		else
+ 		
+ 		// On delete: check if confirmation has been given
+ 		if ( ($action == 'delete') && (requestVar('confirmation') != 'yes') )
  		{
- 			$amount = (integer) $CONF['DefaultListSize'];
- 			if ( $amount < 1 )
- 			{
- 				$amount = 10;
- 			}
+ 			self::batchAskDeleteConfirmation('item', $selected);
  		}
  		
- 		$search = postVar('search');	// search through items
+ 		self::$skin->parse('batchitem');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Action::action_batchcomment()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_batchcomment()
+ 	{
+ 		global $member;
  		
- 		$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';
+ 		$member->isLoggedIn() or self::disallow();
  		
- 		if ( $search )
+ 		$selected	= requestIntArray('batch');
+ 		$action		= requestVar('batchaction');
+ 		
+ 		// Show error when no items were selected
+ 		if ( !is_array($selected) || sizeof($selected) == 0 )
  		{
- 			$query .= " and ((ititle LIKE " . DB::quoteValue('%'.$search.'%') . ") or (ibody LIKE " . DB::quoteValue('%'.$search.'%') . ") or (imore LIKE " . DB::quoteValue('%'.$search.'%') . "))";
+ 			self::error(_BATCH_NOSELECTION);
+ 			return;
  		}
  		
- 		$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);
+ 		// On delete: check if confirmation has been given
+ 		if ( ($action == 'delete') && (requestVar('confirmation') != 'yes') )
+ 		{
+ 			self::batchAskDeleteConfirmation('comment', $selected);
+ 		}
  		
- 		$this->pagefoot();
+ 		self::$skin->parse('batchcomment');
  		return;
  	}
  	
  	/**
- 	 * Admin::action_itemcommentlist()
+ 	 * Admin::action_batchmember()
  	 * 
- 	 * Show all the comments for a given item
- 	 * @param	integer	$itemid	ID for item
+ 	 * @param	void
  	 * @return	void
  	 */
- 	public function action_itemcommentlist($itemid = '')
+ 	static private function action_batchmember()
  	{
- 		global $member, $manager, $CONF;
- 		
- 		if ( $itemid == '' )
- 		{
- 			$itemid = intRequestVar('itemid');
- 		}
- 		
- 		// only allow if user is allowed to alter item
- 		$member->canAlterItem($itemid) or $this->disallow();
+ 		global $member;
  		
- 		$blogid = getBlogIdFromItemId($itemid);
+ 		($member->isLoggedIn() && $member->isAdmin()) or self::disallow();
  		
- 		$this->pagehead();
+ 		$selected	= requestIntArray('batch');
+ 		$action		= requestVar('batchaction');
  		
- 		// start index
- 		if ( postVar('start') )
- 		{
- 			$start = intPostVar('start');
- 		}
- 		else
+ 		// Show error when no members selected
+ 		if ( !is_array($selected) || sizeof($selected) == 0 )
  		{
- 			$start = 0;
+ 			self::error(_BATCH_NOSELECTION);
+ 			return;
  		}
  		
- 		// amount of items to show
- 		if ( postVar('amount') )
- 		{
- 			$amount = intPostVar('amount');
- 		}
- 		else
+ 		// On delete: check if confirmation has been given
+ 		if ( ($action == 'delete') && (requestVar('confirmation') != 'yes') )
  		{
- 			$amount = (integer) $CONF['DefaultListSize'];
- 			if ( $amount < 1 )
- 			{
- 				$amount = 10;
- 			}
+ 			self::batchAskDeleteConfirmation('member',$selected);
  		}
  		
- 		$search = postVar('search');
+ 		self::$skin->parse('batchmember');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_batchteam()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_batchteam()
+ 	{
+ 		global $member;
  		
- 		echo '<p>(<a href="index.php?action=itemlist&amp;blogid=' . $blogid . '">' . _BACKTOOVERVIEW . "</a>)</p>\n";
- 		echo '<h2>',_COMMENTS,'</h2>';
+ 		$blogid = intRequestVar('blogid');
  		
- 		$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;
+ 		($member->isLoggedIn() && $member->blogAdminRights($blogid)) or self::disallow();
  		
- 		if ( $search )
+ 		$selected	= requestIntArray('batch');
+ 		$action		= requestVar('batchaction');
+ 		
+ 		if ( !is_array($selected) || sizeof($selected) == 0 )
  		{
- 			$query .= " and cbody LIKE " . DB::quoteValue('%'.$search.'%');
+ 			self::error(_BATCH_NOSELECTION);
+ 			return;
  		}
  		
- 		$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);
+ 		// On delete: check if confirmation has been given
+ 		if ( ($action == 'delete') && (requestVar('confirmation') != 'yes') )
+ 		{
+ 			self::batchAskDeleteConfirmation('team',$selected);
+ 		}
  		
- 		$this->pagefoot();
+ 		self::$skin->parse('batchteam');
  		return;
  	}
  	
  	/**
- 	 * Admin::action_browseowncomments()
- 	 * Browse own comments
+ 	 * Admin::action_batchcategory()
  	 * 
  	 * @param	void
  	 * @return	void
  	 */
- 	public function action_browseowncomments()
+ 	static private function action_batchcategory()
  	{
- 		global $member, $manager, $CONF;
+ 		global $member, $manager;
  		
- 		// start index
- 		if ( postVar('start') )
- 		{
- 			$start = intPostVar('start');
- 		}
- 		else
+ 		$member->isLoggedIn() or self::disallow();
+ 		
+ 		$selected	= requestIntArray('batch');
+ 		$action		= requestVar('batchaction');
+ 		
+ 		if ( !is_array($selected) || sizeof($selected) == 0 )
  		{
- 			$start = 0;
+ 			self::error(_BATCH_NOSELECTION);
+ 			return;
  		}
  		
- 		// amount of items to show
- 		if ( postVar('amount') )
+ 		// On move: when no destination blog chosen, show choice now
+ 		$destBlogId = intRequestVar('destblogid');
+ 		if ( ($action == 'move') && (!$manager->existsBlogID($destBlogId)) )
  		{
- 			$amount = intPostVar('amount');
+ 			self::batchMoveCategorySelectDestination('category', $selected);
  		}
- 		else
+ 		
+ 		// On delete: check if confirmation has been given
+ 		if ( ($action == 'delete') && (requestVar('confirmation') != 'yes') )
  		{
- 			$amount = intval($CONF['DefaultListSize']);
- 			if ( $amount < 1 )
- 			{
- 				$amount = 10;
- 			}
+ 			self::batchAskDeleteConfirmation('category', $selected);
  		}
  		
- 		$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();
+ 		self::$skin->parse('batchcategory');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::batchMoveSelectDestination()
+ 	 * 
+ 	 * @param	string	$type	type of batch action
+ 	 * @param	integer	$ids	needless???
+ 	 * @return	void
+ 	 * 
+ 	 * TODO: remove needless argument
+ 	 */
+ 	static private function batchMoveSelectDestination($type, $ids)
+ 	{
+ 		$_POST['batchmove'] = $type;
+ 		self::$skin->parse('batchmove');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::batchMoveCategorySelectDestination()
+ 	 * 
+ 	 * @param	string	$type	type of batch action
+ 	 * @param	integer	$ids	needless???
+ 	 * @return	void
+ 	 * 
+ 	 * TODO: remove needless argument
+ 	 */
+ 	static private function batchMoveCategorySelectDestination($type, $ids)
+ 	{
+ 		$_POST['batchmove'] = $type;
+ 		global $manager;
+ 		self::$skin->parse('batchmovecat');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::batchAskDeleteConfirmation()
+ 	 * 
+ 	 * @param	string	$type	type of batch action
+ 	 * @param	integer	$ids	needless???
+ 	 * @return	void
+ 	 * 
+ 	 * TODO: remove needless argument
+ 	 */
+ 	static private function batchAskDeleteConfirmation($type, $ids)
+ 	{
+ 		self::$skin->parse('batchdelete');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_browseownitems()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_browseownitems()
+ 	{
+ 		global $member, $manager, $CONF;
  		
- 		if ( $search )
+ 		self::$skin->parse('browseownitems');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_itemcommentlist()
+ 	 * Show all the comments for a given item
+ 	 * 
+ 	 * @param	integer	$itemid	ID for item
+ 	 * @return	void
+ 	 */
+ 	static private function action_itemcommentlist($itemid = '')
+ 	{
+ 		global $member, $manager, $CONF;
+ 		
+ 		if ( $itemid == '' )
  		{
- 			$query .= " and cbody LIKE " . DB::quoteValue('%'.$search.'%');
+ 			$itemid = intRequestVar('itemid');
  		}
  		
- 		$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
+ 		// only allow if user is allowed to alter item
+ 		$member->canAlterItem($itemid) or self::disallow();
  		
- 		$manager->loadClass("ENCAPSULATE");
- 		$navList = new NavList('browseowncomments', $start, $amount, 0, 1000, 0, $search, 0);
- 		$navList->showBatchList('comment',$query,'table',$template,_NOCOMMENTS_YOUR);
+ 		$item =& $manager->getItem($itemid, 1, 1);
+ 		$_REQUEST['itemid'] = $item['itemid'];
+ 		$_REQUEST['blogid'] = $item['blogid'];
  		
- 		$this->pagefoot();
+ 		self::$skin->parse('itemcommentlist');
  		return;
  	}
  	
  	/**
- 	 * Admin::action_blogcommentlist()
+ 	 * Admin::action_browseowncomments()
+ 	 * Browse own comments
  	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_browseowncomments()
+ 	{
+ 		self::$skin->parse('browseowncomments');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_blogcommentlist()
  	 * Browse all comments for a weblog
+ 	 * 
  	 * @param	integer	$blogid	ID for weblog
  	 * @return	void
  	 */
- 	function action_blogcommentlist($blogid = '')
+ 	static private function action_blogcommentlist($blogid = '')
  	{
  		global $member, $manager, $CONF;
  		
@@@ -1193,59 -678,77 +1619,77 @@@
  			$blogid = intval($blogid);
  		}
  		
- 		$member->teamRights($blogid) or $member->isAdmin() or $this->disallow();
+ 		$member->teamRights($blogid) or $member->isAdmin() or self::disallow();
  		
- 		// start index
- 		if ( postVar('start') )
- 		{
- 			$start = intPostVar('start');
- 		}
- 		else
- 		{
- 			$start = 0;
- 		}
+ 		/* TODO: we consider to use the other way insterad of this */
+ 		$_REQUEST['blogid'] = $blogid;
  		
- 		// amount of items to show
- 		if ( postVar('amount') )
- 		{
- 			$amount = intPostVar('amount');
- 		}
- 		else
+ 		self::$skin->parse('blogcommentlist');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_createaccount()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_createaccount()
+ 	{
+ 		global $CONF;
+ 		
+ 		if ( $CONF['AllowMemberCreate'] != 1 )
  		{
- 			$amount = intval($CONF['DefaultListSize']);
- 			if ( $amount < 1 )
- 			{
- 				$amount = 10;
- 			}
+ 			self::$skin->parse('createaccountdisable');
+ 			return;
  		}
  		
- 		$search = postVar('search');		// search through comments
+ 		$name = '';
+ 		$realname ='';
+ 		$email = '';
+ 		$url = '';
  		
- 		$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);
+ 		$contents = array(
+ 			'name'		=> '',
+ 			'realname'	=> '',
+ 			'email'		=> '',
+ 			'url'		=> ''
+ 		);
  		
- 		if ( $search != '' )
+ 		if ( array_key_exists('showform', $_POST) && $_POST['showform'] == 1 )
  		{
- 			$query .= " and cbody LIKE " . DB::quoteValue('%'.$search.'%');
+ 			$action = new Action();
+ 			$message = $action->createAccount();
+ 			if ( $message === 1 )
+ 			{
+ 				self::$headMess = $message;
+ 				self::$skin->parse('createaccountsuccess');
+ 				return;
+ 			}
+ 			
+ 			/* TODO: validation */
+ 			if ( array_key_exists('name', $_POST) )
+ 			{
+ 				$contents['name'] = $_POST['name'];
+ 			}
+ 			if ( array_key_exists('realname', $_POST) )
+ 			{
+ 				$contents['realname'] = $_POST['realname'];
+ 			}
+ 			if ( array_key_exists('email', $_POST) )
+ 			{
+ 				$contents['email'] = $_POST['email'];
+ 			}
+ 			if ( array_key_exists('url', $_POST) )
+ 			{
+ 				$contents['url'] = $_POST['url'];
+ 			}
+ 			
+ 			self::$contents = $contents;
+ 			
  		}
  		
- 		$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();
+ 		self::$skin->parse('createaccountinput');
  		return;
  	}
  	
@@@ -1256,31 -759,40 +1700,40 @@@
  	 * @param	void
  	 * @return	void
  	 */
- 	public function action_createitem()
+ 	static private function action_createitem()
  	{
  		global $member, $manager;
  		
  		$blogid = intRequestVar('blogid');
  		
  		// check if allowed
- 		$member->teamRights($blogid) or $this->disallow();
- 		
- 		$memberid = $member->getID();
+ 		$member->teamRights($blogid) or self::disallow();
  		
  		$blog =& $manager->getBlog($blogid);
+ 		$contents = array();
  		
- 		// generate the add-item form
- 		$handler = new PageFactory($blog);
- 		
- 		$contents = $handler->getTemplateFor('admin', 'add');
- 		$manager->notify('PreAddItemForm', array('contents' => &$contents, 'blog' => &$blog));
+ 		$data = array(
+ 			'blog'		=> &$blog,
+ 			'contents'	=> &$contents
+ 		);
+ 		$manager->notify('PreAddItemForm', $data);
  		
- 		$parser = new Parser($handler);
+ 		if ( $blog->convertBreaks() )
+ 		{
+ 			if ( array_key_exists('body', $contents) && !empty($contents['body']) )
+ 			{
+ 				$contents['body'] = removeBreaks($contents['body']);
+ 			}
+ 			if ( array_key_exists('more', $contents) && !empty($contents['more']) )
+ 			{
+ 				$contents['more'] = removeBreaks($contents['more']);
+ 			}
+ 		}
  		
- 		$this->pagehead();
- 		$parser->parse($contents);
- 		$this->pagefoot();
+ 		self::$blog = &$blog;
+ 		self::$contents = &$contents;
  		
+ 		self::$skin->parse('createitem');
  		return;
  	}
  	
@@@ -1290,3804 -802,3448 +1743,7118 @@@
  	 * @param	void
  	 * @return	void
  	 */
- 	public function action_itemedit()
+ 	static private 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));
+ 		$member->canAlterItem($itemid) or self::disallow();
  		
- 		$manager->notify('PrepareItemForEdit', array('item' => &$variables));
+ 		$item =& $manager->getItem($itemid, 1, 1);
+ 		$blog =& $manager->getBlog($item['blogid']);
+ 		$data = array('blog'=> &$blog, 'item' => &$item);
+ 		$manager->notify('PrepareItemForEdit', $data);
  		
  		if ( $blog->convertBreaks() )
  		{
- 			$variables['body'] = removeBreaks($variables['body']);
- 			$variables['more'] = removeBreaks($variables['more']);
+ 			if ( array_key_exists('body', $item) && !empty($item['body']) )
+ 			{
+ 				$item['body'] = removeBreaks($item['body']);
+ 			}
+ 			if ( array_key_exists('more', $item) && !empty($item['more']) )
+ 			{
+ 				$item['more'] = removeBreaks($item['more']);
+ 			}
  		}
  		
- 		// form to edit blog items
- 		$handler = new PageFactory($blog);
- 		$handler->setVariables($variables);
+ 		self::$blog = &$blog;
+ 		self::$contents = &$item;
  		
- 		$content = $handler->getTemplateFor('admin', 'edit');
+ 		self::$skin->parse('itemedit');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_itemupdate()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_itemupdate()
+ 	{
+ 		global $member, $manager, $CONF;
  		
- 		$parser = new Parser($handler);
+ 		$itemid = intRequestVar('itemid');
+ 		$catid  = postVar('catid');
  		
- 		$this->pagehead();
- 		$parser->parse($content);
- 		$this->pagefoot();
+ 		// only allow if user is allowed to alter item
+ 		$member->canUpdateItem($itemid, $catid) or self::disallow();
+ 		
+ 		$actiontype = postVar('actiontype');
+ 		
+ 		// delete actions are handled by itemdelete (which has confirmation)
+ 		if ( $actiontype == 'delete' )
+ 		{
+ 			self::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 )
+ 			{
+ 				self::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);
+ 		
+ 		self::updateFuturePosted($blogid);
+ 		
+ 		if ( $draftid > 0 )
+ 		{
+ 			// delete permission is checked inside Item::delete()
+ 			Item::delete($draftid);
+ 		}
+ 		
+ 		if ( $catid != intPostVar('catid') )
+ 		{
+ 			self::action_categoryedit(
+ 				$catid,
+ 				$blog->getID(),
+ 				$CONF['AdminURL'] . 'index.php?action=itemlist&blogid=' . getBlogIDFromItemID($itemid)
+ 			);
+ 		}
+ 		else
+ 		{
+ 			// TODO: set start item correctly for itemlist
+ 			$item =& $manager->getitem($itemid, 1, 1);
+ 			$query = "SELECT COUNT(*) FROM %s WHERE unix_timestamp(itime) <= '%s';";
+ 			$query = sprintf($query, sql_table('item'), $item['timestamp']);
+ 			$cnt  = DB::getValue($query);
+ 			$_REQUEST['start'] = $cnt + 1;
+ 			self::action_itemlist(getBlogIDFromItemID($itemid));
+ 		}
  		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();
- 
+ 	/**
+ 	 * Admin::action_itemdelete()
+ 	 * Delete item
+ 	 * 
+ 	 * @param	Void
+ 	 * @return	Void
+ 	 */
+ 	static private function action_itemdelete()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$itemid = intRequestVar('itemid');
+ 		
+ 		// only allow if user is allowed to alter item
+ 		$member->canAlterItem($itemid) or self::disallow();
+ 		
+ 		if ( !$manager->existsItem($itemid,1,1) )
+ 		{
+ 			self::error(_ERROR_NOSUCHITEM);
+ 			return;
+ 		}
+ 		
+ 		self::$skin->parse('itemdelete');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_itemdeleteconfirm()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_itemdeleteconfirm()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$itemid = intRequestVar('itemid');
+ 		
+ 		// only allow if user is allowed to alter item
+ 		$member->canAlterItem($itemid) or self::disallow();
+ 		
+ 		// get item first
+ 		$item =& $manager->getItem($itemid, 1, 1);
+ 		
+ 		// delete item (note: some checks will be performed twice)
+ 		self::deleteOneItem($item['itemid']);
+ 		
+ 		self::action_itemlist($item['blogid']);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::deleteOneItem()
+ 	 * Deletes one item and returns error if something goes wrong
+ 	 * 
+ 	 * @param	integer	$itemid	ID for item
+ 	 * @return	void
+ 	 */
+ 	static public function deleteOneItem($itemid)
+ 	{
+ 		global $member, $manager;
+ 		
+ 		// only allow if user is allowed to alter item (also checks if itemid exists)
+ 		if ( !$member->canAlterItem($itemid) )
+ 		{
+ 			return _ERROR_DISALLOWED;
+ 		}
+ 		
+ 		// need to get blogid before the item is deleted
+ 		$item =& $manager->getItem($itemid, 1, 1);
+ 		
+ 		$manager->loadClass('ITEM');
+ 		Item::delete($item['itemid']);
+ 		
+ 		// update blog's futureposted
+ 		self::updateFuturePosted($item['itemid']);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::updateFuturePosted()
+ 	 * Update a blog's future posted flag
+ 	 * 
+ 	 * @param integer $blogid
+ 	 * @return	void
+ 	 */
+ 	static private function updateFuturePosted($blogid)
+ 	{
+ 		global $manager;
+ 		
+ 		$blogid			=  intval($blogid);
+ 		$blog			=& $manager->getBlog($blogid);
+ 		$currenttime	=  $blog->getCorrectTime(time());
+ 		
+ 		$query = "SELECT * FROM %s WHERE iblog=%d AND iposted=0 AND itime>'%s'";
+ 		$query = sprintf($query, sql_table('item'), (integer) $blogid, i18n::formatted_datetime('mysql', $currenttime));
+ 		$result = DB::getResult($query);
+ 		
+ 		if ( $result->rowCount() > 0 )
+ 		{
+ 				$blog->setFuturePost();
+ 		}
+ 		else
+ 		{
+ 				$blog->clearFuturePost();
+ 		}
+ 		return;
+ 	}
+ 
+ 	/**
+ 	 * Admin::action_itemmove()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_itemmove()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$itemid = intRequestVar('itemid');
+ 		
+ 		$member->canAlterItem($itemid) or self::disallow();
+ 		
+ 		self::$skin->parse('itemmove');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_itemmoveto()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private 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 )
+ 			{
+ 				self::doError(_ERROR_CATCREATEFAIL);
+ 			}
+ 		}
+ 		
+ 		// only allow if user is allowed to alter item
+ 		$member->canUpdateItem($itemid, $catid) or self::disallow();
+ 		
+ 		$old_blogid = getBlogIDFromItemId($itemid);
+ 		
+ 		Item::move($itemid, $catid);
+ 		
+ 		// set the futurePosted flag on the blog
+ 		self::updateFuturePosted(getBlogIDFromItemId($itemid));
+ 		
+ 		// reset the futurePosted in case the item is moved from one blog to another
+ 		self::updateFuturePosted($old_blogid);
+ 		
+ 		if ( $catid != intRequestVar('catid') )
+ 		{
+ 			self::action_categoryedit($catid, $blog->getID());
+ 		}
+ 		else
+ 		{
+ 			self::action_itemlist(getBlogIDFromCatID($catid));
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::moveOneItem()
+ 	 * Moves one item to a given category (category existance should be checked by caller)
+ 	 * errors are returned
+ 	 * 
+ 	 * @param	integer	$itemid		ID for item
+ 	 * @param	integer	$destCatid	ID for category to which the item will be moved
+ 	 * @return	void
+ 	 */
+ 	static public 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);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_additem()
+ 	 * Adds a item to the chosen blog
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_additem()
+ 	{
+ 		global $manager, $CONF;
+ 		
+ 		$manager->loadClass('ITEM');
+ 		
+ 		$result = Item::createFromRequest();
+ 		
+ 		if ( $result['status'] == 'error' )
+ 		{
+ 			self::error($result['message']);
+ 			return;
+ 		}
+ 		
+ 		$item =& $manager->getItem($result['itemid'], 0, 0);
+ 		
+ 		if ( $result['status'] == 'newcategory' )
+ 		{
+ 			$distURI = $manager->addTicketToUrl($CONF['AdminURL'] . 'index.php?action=itemList&blogid=' . $item['blogid']);
+ 			self::action_categoryedit($result['catid'], $item['blogid'], $distURI);
+ 		}
+ 		else
+ 		{
+ 			$methodName = 'action_itemlist';
+ 			self::action_itemlist($item['blogid']);
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_commentedit()
+ 	 * Allows to edit previously made comments
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_commentedit()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$commentid = intRequestVar('commentid');
+ 		
+ 		$member->canAlterComment($commentid) or self::disallow();
+ 		
+ 		$comment = Comment::getComment($commentid);
+ 		$data = array('comment' => &$comment);
+ 		$manager->notify('PrepareCommentForEdit', $data);
+ 		
+ 		self::$contents = $comment;
+ 		self::$skin->parse('commentedit');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_commentupdate()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_commentupdate()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$commentid = intRequestVar('commentid');
+ 		
+ 		$member->canAlterComment($commentid) or self::disallow();
+ 		
+ 		$url	= postVar('url');
+ 		$email	= postVar('email');
+ 		$body	= postVar('body');
+ 		
+ 		// intercept words that are too long
+ 		if (preg_match('#[a-zA-Z0-9|\.,;:!\?=\/\\\\]{90,90}#', $body) != FALSE)
+ 		{
+ 			self::error(_ERROR_COMMENT_LONGWORD);
+ 			return;
+ 		}
+ 		
+ 		// check length
+ 		if ( i18n::strlen($body) < 3 )
+ 		{
+ 			self::error(_ERROR_COMMENT_NOCOMMENT);
+ 			return;
+ 		}
+ 		
+ 		if ( i18n::strlen($body) > 5000 )
+ 		{
+ 			self::error(_ERROR_COMMENT_TOOLONG);
+ 			return;
+ 		}
+ 		
+ 		// prepare body
+ 		$body = Comment::prepareBody($body);
+ 		
+ 		// call plugins
+ 		$data = array(
+ 			'body' => &$body
+ 		);
+ 		$manager->notify('PreUpdateComment', $data);
+ 		
+ 		$query = "UPDATE %s SET cmail=%s, cemail=%s, cbody=%s WHERE cnumber=%d;";
+ 		$query = sprintf($query, sql_table('comment'), DB::quoteValue($url), DB::quoteValue($email), DB::quoteValue($body), (integer) $commentid);
+ 		DB::execute($query);
+ 		
+ 		// get itemid
+ 		$query = "SELECT citem FROM %s WHERE cnumber=%d;";
+ 		$query = sprintf($query, sql_table('comment'), (integer) $commentid);
+ 		
+ 		$itemid	= DB::getValue($query);
+ 		
+ 		if ( $member->canAlterItem($itemid) )
+ 		{
+ 			self::action_itemcommentlist($itemid);
+ 		}
+ 		else
+ 		{
+ 			self::action_browseowncomments();
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_commentdelete()
+ 	 * Update comment
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_commentdelete()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$commentid = intRequestVar('commentid');
+ 		$member->canAlterComment($commentid) or self::disallow();
+ 		
+ 		self::$skin->parse('commentdelete');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_commentdeleteconfirm()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_commentdeleteconfirm()
+ 	{
+ 		global $member;
+ 		
+ 		$commentid = intRequestVar('commentid');
+ 		
+ 		// get item id first
+ 		$query = "SELECT citem FROM %s WHERE cnumber=%d;";
+ 		$query = sprintf($query, sql_table('comment'), (integer) $commentid);
+ 		
+ 		$itemid = DB::getValue($query);
+ 		
+ 		$error = self::deleteOneComment($commentid);
+ 		if ( $error )
+ 		{
+ 			self::doError($error);
+ 		}
+ 		
+ 		if ( $member->canAlterItem($itemid) )
+ 		{
+ 			self::action_itemcommentlist($itemid);
+ 		}
+ 		else
+ 		{
+ 			self::action_browseowncomments();
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::deleteOneComment()
+ 	 * 
+ 	 * @param	integer	$commentid	ID for comment
+ 	 * @return	void
+ 	 */
+ 	static public function deleteOneComment($commentid)
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$commentid = (integer) $commentid;
+ 		
+ 		if ( !$member->canAlterComment($commentid) )
+ 		{
+ 			return _ERROR_DISALLOWED;
+ 		}
+ 		
+ 		$data = array(
+ 			'commentid' => $commentid
+ 		);
+ 		
+ 		$manager->notify('PreDeleteComment', $data);
+ 		
+ 		// delete the comments associated with the item
+ 		$query = "DELETE FROM %s WHERE cnumber=%d;";
+ 		$query = sprintf($query, sql_table('comment'), (integer) $commentid);
+ 		DB::execute($query);
+ 		
+ 		$data = array(
+ 			'commentid' => $commentid
+ 		);
+ 		
+ 		$manager->notify('PostDeleteComment', $data);
+ 		
+ 		return '';
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_usermanagement()
+ 	 * Usermanagement main
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_usermanagement()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		// check if allowed
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		self::$skin->parse('usermanagement');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_memberedit()
+ 	 * Edit member settings
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_memberedit()
+ 	{
+ 		self::action_editmembersettings(intRequestVar('memberid'));
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_editmembersettings()
+ 	 * 
+ 	 * @param	integer	$memberid	ID for member
+ 	 * @return	void
+ 	 * 
+ 	 */
+ 	static private function action_editmembersettings($memberid = '')
+ 	{
+ 		global $member, $manager, $CONF;
+ 		
+ 		if ( $memberid == '' )
+ 		{
+ 			$memberid = $member->getID();
+ 		}
+ 		
+ 		/* TODO: we should consider to use the other way insterad of this */
+ 		$_REQUEST['memberid'] = $memberid;
+ 		
+ 		// check if allowed
+ 		($member->getID() == $memberid) or $member->isAdmin() or self::disallow();
+ 		
+ 		self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";
+ 		
+ 		self::$skin->parse('editmembersettings');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_changemembersettings()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_changemembersettings()
+ 	{
+ 		global $member, $CONF, $manager;
+ 		
+ 		$memberid = intRequestVar('memberid');
+ 		
+ 		// check if allowed
+ 		($member->getID() == $memberid) or $member->isAdmin() or self::disallow();
+ 		
+ 		$name			= trim(strip_tags(postVar('name')));
+ 		$realname		= trim(strip_tags(postVar('realname')));
+ 		$password		= postVar('password');
+ 		$repeatpassword	= postVar('repeatpassword');
+ 		$email			= strip_tags(postVar('email'));
+ 		$url			= strip_tags(postVar('url'));
+ 		$adminskin		= intPostVar('adminskin');
+ 		$bookmarklet	= intPostVar('bookmarklet');
+ 		
+ 		// begin if: sometimes user didn't prefix the URL with http:// or https://, this cause a malformed URL. Let's fix it.
+ 		if ( !preg_match('#^https?://#', $url) )
+ 		{
+ 			$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) )
+ 			{
+ 				self::error(_ERROR_BADNAME);
+ 				return;
+ 			}
+ 			
+ 			if ( ($name != $mem->getDisplayName()) && Member::exists($name) )
+ 			{
+ 				self::error(_ERROR_NICKNAMEINUSE);
+ 				return;
+ 			}
+ 			
+ 			if ( $password != $repeatpassword )
+ 			{
+ 				self::error(_ERROR_PASSWORDMISMATCH);
+ 				return;
+ 			}
+ 			
+ 			if ( $password && (i18n::strlen($password) < 6) )
+ 			{
+ 				self::error(_ERROR_PASSWORDTOOSHORT);
+ 				return;
+ 			}
+ 				
+ 			if ( $password )
+ 			{
+ 				$pwdvalid = true;
+ 				$pwderror = '';
+ 				
+ 				$data = array(
+ 					'password'     => $password,
+ 					'errormessage' => &$pwderror,
+ 					'valid'        => &$pwdvalid
+ 				);
+ 				$manager->notify('PrePasswordSet', $data);
+ 				
+ 				if ( !$pwdvalid )
+ 				{
+ 					self::error($pwderror);
+ 					return;
+ 				}
+ 			}
+ 		}
+ 		
+ 		if ( !NOTIFICATION::address_validation($email) )
+ 		{
+ 			self::error(_ERROR_BADMAILADDRESS);
+ 			return;
+ 		}
+ 		if ( !$realname )
+ 		{
+ 			self::error(_ERROR_REALNAMEMISSING);
+ 			return;
+ 		}
+ 		if ( ($locale != '') && (!in_array($locale, i18n::get_available_locale_list())) )
+ 		{
+ 			self::error(_ERROR_NOSUCHTRANSLATION);
+ 			return;
+ 		}
+ 		
+ 		// 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 )
+ 			{
+ 				self::error(_ERROR_ATLEASTONEADMIN);
+ 				return;
+ 			}
+ 		}
+ 		
+ 		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);
+ 		$mem->setAdminSkin($adminskin);
+ 		$mem->setBookmarklet($bookmarklet);
+ 
+ 		// 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);
+ 		$data = array(
+ 			'context'  => 'member',
+ 			'memberid' => $memberid,
+ 			'member'   => &$mem
+ 		);
+ 		$manager->notify('PostPluginOptionsUpdate', $data);
+ 		
+ 		// 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();
+ 			}
+ 			self::action_login(_MSG_ACTIVATION_SENT, 0);
+ 			return;
+ 		}
+ 		
+ 		if ( ($mem->getID() == $member->getID())
+ 			&& ($mem->getDisplayName() != $member->getDisplayName()) )
+ 		{
+ 			$mem->newCookieKey();
+ 			$member->logout();
+ 			self::action_login(_MSG_LOGINAGAIN, 0);
+ 		}
+ 		else
+ 		{
+ 			self::action_overview(_MSG_SETTINGSCHANGED);
+ 		}
+ 		return;
+ 	}
+ 
+ 	/**
+ 	 * Admin::action_memberadd()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 * 
+ 	 */
+ 	static private function action_memberadd()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		// check if allowed
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		if ( postVar('password') != postVar('repeatpassword') )
+ 		{
+ 			self::error(_ERROR_PASSWORDMISMATCH);
+ 			return;
+ 		}
+ 		
+ 		if ( i18n::strlen(postVar('password')) < 6 )
+ 		{
+ 			self::error(_ERROR_PASSWORDTOOSHORT);
+ 			return;
+ 		}
+ 		
+ 		$res = Member::create(
+ 			postVar('name'),
+ 			postVar('realname'),
+ 			postVar('password'),
+ 			postVar('email'),
+ 			postVar('url'),
+ 			postVar('admin'),
+ 			postVar('canlogin'),
+ 			postVar('notes')
+ 		);
+ 		
+ 		if ( $res != 1 )
+ 		{
+ 			self::error($res);
+ 			return;
+ 		}
+ 		
+ 		// fire PostRegister event
+ 		$newmem = new Member();
+ 		$newmem->readFromName(postVar('name'));
+ 		$data = array(
+ 			'member' => &$newmem
+ 		);
+ 		$manager->notify('PostRegister', $data);
+ 		
+ 		self::action_usermanagement();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_forgotpassword()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_forgotpassword()
+ 	{
+ 		self::$skin->parse('forgotpassword');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_activate()
+ 	 * Account activation
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_activate()
+ 	{
+ 		$key = getVar('key');
+ 		self::showActivationPage($key);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::showActivationPage()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function showActivationPage($key, $message = '')
+ 	{
+ 		global $manager;
+ 		
+ 		// clean up old activation keys
+ 		Member::cleanupActivationTable();
+ 		
+ 		// get activation info
+ 		$info = Member::getActivationInfo($key);
+ 		
+ 		if ( !$info )
+ 		{
+ 			self::error(_ERROR_ACTIVATE);
+ 			return;
+ 		}
+ 		
+ 		$mem =& $manager->getMember($info->vmember);
+ 		
+ 		if ( !$mem )
+ 		{
+ 			self::error(_ERROR_ACTIVATE);
+ 			return;
+ 		}
+ 		
+ 		/* TODO: we should consider to use the other way insterad of this */
+ 		$_POST['ackey']					= $key;
+ 		$_POST['bNeedsPasswordChange']	= TRUE;
+ 		
+ 		self::$headMess = $message;
+ 		self::$skin->parse('activate');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_activatesetpwd()
+ 	 * Account activation - set password part
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private 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 self::showActivationPage($key, _ERROR_ACTIVATE);
+ 		}
+ 		
+ 		$mem =& $manager->getMember($info->vmember);
+ 		
+ 		if ( !$mem )
+ 		{
+ 			return self::showActivationPage($key, _ERROR_ACTIVATE);
+ 		}
+ 		
+ 		$password		= postVar('password');
+ 		$repeatpassword	= postVar('repeatpassword');
+ 		
+ 		if ( $password != $repeatpassword )
+ 		{
+ 			return self::showActivationPage($key, _ERROR_PASSWORDMISMATCH);
+ 		}
+ 		
+ 		if ( $password && (i18n::strlen($password) < 6) )
+ 		{
+ 			return self::showActivationPage($key, _ERROR_PASSWORDTOOSHORT);
+ 		}
+ 			
+ 		if ( $password )
+ 		{
+ 			$pwdvalid = true;
+ 			$pwderror = '';
+ 			
+ 			$data = array(
+ 				'password'		=> $password,
+ 				'errormessage'	=> &$pwderror,
+ 				'valid'			=> &$pwdvalid
+ 			);
+ 			$manager->notify('PrePasswordSet', $data);
+ 			if ( !$pwdvalid )
+ 			{
+ 				return self::showActivationPage($key,$pwderror);
+ 			}
+ 		}
+ 		
+ 		$error = '';
+ 		
+ 		$data = array(
+ 			'type'   => 'activation',
+ 			'member' => $mem,
+ 			'error'  => &$error
+ 		);
+ 		$manager->notify('ValidateForm', $data);
+ 		if ( $error != '' )
+ 		{
+ 			return self::showActivationPage($key, $error);
+ 		}
+ 		
+ 		// set password
+ 		$mem->setPassword($password);
+ 		$mem->write();
+ 		
+ 		// do the activation
+ 		Member::activate($key);
+ 		
+ 		self::$skin->parse('activatesetpwd');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_manageteam()
+ 	 * Manage team
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_manageteam()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$blogid = intRequestVar('blogid');
+ 		
+ 		// check if allowed
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		self::$skin->parse('manageteam');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_teamaddmember()
+ 	 * Add member to team
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_teamaddmember()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$memberid	= intPostVar('memberid');
+ 		$blogid		= intPostVar('blogid');
+ 		$admin		= intPostVar('admin');
+ 		
+ 		// check if allowed
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		$blog =& $manager->getBlog($blogid);
+ 		if ( !$blog->addTeamMember($memberid, $admin) )
+ 		{
+ 			self::error(_ERROR_ALREADYONTEAM);
+ 			return;
+ 		}
+ 		
+ 		self::action_manageteam();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_teamdelete()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_teamdelete()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$memberid	= intRequestVar('memberid');
+ 		$blogid		= intRequestVar('blogid');
+ 		
+ 		// check if allowed
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		$teammem =& $manager->getMember($memberid);
+ 		$blog =& $manager->getBlog($blogid);
+ 		
+ 		self::$skin->parse('teamdelete');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_teamdeleteconfirm()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_teamdeleteconfirm()
+ 	{
+ 		global $member;
+ 		
+ 		$memberid = intRequestVar('memberid');
+ 		$blogid = intRequestVar('blogid');
+ 		
+ 		$error = self::deleteOneTeamMember($blogid, $memberid);
+ 		if ( $error )
+ 		{
+ 			self::error($error);
+ 			return;
+ 		}
+ 		self::action_manageteam();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::deleteOneTeamMember()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static public 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);
+ 		
+ 		
+ 		$data = array(
+ 			'member' => &$tmem,
+ 			'blogid' => $blogid
+ 		);
+ 		$manager->notify('PreDeleteTeamMember', $data);
+ 		
+ 		if ( $tmem->isBlogAdmin($blogid) )
+ 		{
+ 			/* TODO: why we did double check? */
+ 			// check if there are more blog members left and at least one admin
+ 			// (check for at least two admins before deletion)
+ 			$query = "SELECT * FROM %s WHERE tblog=%d and tadmin=1;";
+ 			$query = sprintf($query, sql_table('team'), (integer) $blogid);
+ 			$r     = DB::getResult($query);
+ 			if ( $r->rowCount() < 2 )
+ 			{
+ 				return _ERROR_ATLEASTONEBLOGADMIN;
+ 			}
+ 		}
+ 		
+ 		$query = "DELETE FROM %s WHERE tblog=%d AND tmember=%d;";
+ 		$query = sprintf($query, sql_table('team'), (integer) $blogid, (integer) $memberid);
+ 		DB::execute($query);
+ 		
+ 		$data = array(
+ 			'member' => &$tmem,
+ 			'blogid' => $blogid
+ 		);
+ 		$manager->notify('PostDeleteTeamMember', $data);
+ 		
+ 		return '';
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_teamchangeadmin()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_teamchangeadmin()
+ 	{
+ 		global $manager, $member;
+ 		
+ 		$blogid		= intRequestVar('blogid');
+ 		$memberid	= intRequestVar('memberid');
+ 		
+ 		// check if allowed
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		$mem =& $manager->getMember($memberid);
+ 		
+ 		// don't allow when there is only one admin at this moment
+ 		if ( $mem->isBlogAdmin($blogid) )
+ 		{
+ 			$query = "SELECT * FROM %s WHERE tblog=%d AND tadmin=1;";
+ 			$query = sprintf($query, sql_table('team'), (integer) $blogid);
+ 			$r = DB::getResult($query);
+ 			if ( $r->rowCount() == 1 )
+ 			{
+ 				self::error(_ERROR_ATLEASTONEBLOGADMIN);
+ 				return;
+ 			}
+ 		}
+ 		
+ 		if ( $mem->isBlogAdmin($blogid) )
+ 		{
+ 			$newval = 0;
+ 		}
+ 		else
+ 		{
+ 			$newval = 1;
+ 		}
+ 		
+ 		$query = "UPDATE %s SET tadmin=%d WHERE tblog=%d and tmember=%d;";
+ 		$query = sprintf($query, (integer) $blogid, (integer) $newval, (integer) $blogid, (integer) $memberid);
+ 		DB::execute($query);
+ 		
+ 		// only show manageteam if member did not change its own admin privileges
+ 		if ( $member->isBlogAdmin($blogid) )
+ 		{
+ 			self::action_manageteam();
+ 		}
+ 		else
+ 		{
+ 			self::action_overview(_MSG_ADMINCHANGED);
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_blogsettings()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_blogsettings()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$blogid = intRequestVar('blogid');
+ 		
+ 		// check if allowed
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		$blog =& $manager->getBlog($blogid);
+ 		
+ 		self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";
+ 		
+ 		self::$skin->parse('blogsettings');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_categorynew()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_categorynew()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$blogid = intRequestVar('blogid');
+ 		
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		$cname = postVar('cname');
+ 		$cdesc = postVar('cdesc');
+ 		
+ 		if ( !isValidCategoryName($cname) )
+ 		{
+ 			self::error(_ERROR_BADCATEGORYNAME);
+ 			return;
+ 		}
+ 		
+ 		$query = "SELECT * FROM %s WHERE cname=%s AND cblog=%d;";
+ 		$query = sprintf($query, sql_table('category'), DB::quoteValue($cname), (integer) $blogid);
+ 		$res = DB::getResult($query);
+ 		if ( $res->rowCount() > 0 )
+ 		{
+ 			self::error(_ERROR_DUPCATEGORYNAME);
+ 			return;
+ 		}
+ 		
+ 		$blog		=& $manager->getBlog($blogid);
+ 		$newCatID	=  $blog->createNewCategory($cname, $cdesc);
+ 		
+ 		self::action_blogsettings();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_categoryedit()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private 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);
+ 		}
+ 		
+ 		/* TODO: we should consider to use the other way insterad of this */
+ 		$_REQUEST['blogid']		= $blogid;
+ 		$_REQUEST['catid']		= $catid;
+ 		$_REQUEST['desturl']	= $desturl;
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";
+ 		
+ 		self::$skin->parse('categoryedit');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_categoryupdate()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private 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 self::disallow();
+ 		
+ 		if ( !isValidCategoryName($cname) )
+ 		{
+ 			self::error(_ERROR_BADCATEGORYNAME);
+ 			return;
+ 		}
+ 		
+ 		$query	= "SELECT * FROM %s WHERE cname=%s AND cblog=%d AND not(catid=%d);";
+ 		$query	= sprintf($query, sql_table('category'), DB::quoteValue($cname), (integer) $blogid, (integer) $catid);
+ 		$res	= DB::getResult($query);
+ 		if ( $res->rowCount() > 0 )
+ 		{
+ 			self::error(_ERROR_DUPCATEGORYNAME);
+ 			return;
+ 		}
+ 		
+ 		$query =  "UPDATE %s SET cname=%s, cdesc=%s WHERE catid=%d;";
+ 		$query = sprintf($query, sql_table('category'), DB::quoteValue($cname), DB::quoteValue($cdesc), (integer) $catid);
+ 		DB::execute($query);
+ 		
+ 		// store plugin options
+ 		$aOptions = requestArray('plugoption');
+ 		NucleusPlugin::apply_plugin_options($aOptions);
+ 		$data = array(
+ 			'context'	=> 'category',
+ 			'catid'		=> $catid
+ 		);
+ 		$manager->notify('PostPluginOptionsUpdate', $data);
+ 		
+ 		if ( $desturl )
+ 		{
+ 			redirect($desturl);
+ 			return;
+ 		}
+ 		
+ 		self::action_blogsettings();
+ 		
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_categorydelete()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_categorydelete()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$blogid	= intRequestVar('blogid');
+ 		$catid	= intRequestVar('catid');
+ 		
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		$blog =& $manager->getBlog($blogid);
+ 		
+ 		// check if the category is valid
+ 		if ( !$blog->isValidCategory($catid) )
+ 		{
+ 			self::error(_ERROR_NOSUCHCATEGORY);
+ 			return;
+ 		}
+ 		
+ 		// don't allow deletion of default category
+ 		if ( $blog->getDefaultCategory() == $catid )
+ 		{
+ 			self::error(_ERROR_DELETEDEFCATEGORY);
+ 			return;
+ 		}
+ 		
+ 		// check if catid is the only category left for blogid
+ 		$query = "SELECT catid FROM %s WHERE cblog=%d;";
+ 		$query = sprintf($query, sql_table('category'), $blogid);
+ 		$res = DB::getResult($query);
+ 		if ( $res->rowCount() == 1 )
+ 		{
+ 			self::error(_ERROR_DELETELASTCATEGORY);
+ 			return;
+ 		}
+ 		
+ 		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');
+ 		
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		$error = self::deleteOneCategory($catid);
+ 		if ( $error )
+ 		{
+ 			self::error($error);
+ 			return;
+ 		}
+ 		
+ 		self::action_blogsettings();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::deleteOneCategory()
+ 	 * Delete a category by its id
+ 	 * 
+ 	 * @param	String	$catid	category id for deleting
+ 	 * @return	Void
+ 	 */
+ 	static public function deleteOneCategory($catid)
+ 	{
+ 		global $manager, $member;
+ 		
+ 		$catid  = intval($catid);
+ 		$blogid = getBlogIDFromCatID($catid);
+ 		
+ 		if ( !$member->blogAdminRights($blogid) )
+ 		{
+ 			return ERROR_DISALLOWED;
+ 		}
+ 		
+ 		// get blog
+ 		$blog =& $manager->getBlog($blogid);
+ 		
+ 		// check if the category is valid
+ 		if ( !$blog || !$blog->isValidCategory($catid) )
+ 		{
+ 			return _ERROR_NOSUCHCATEGORY;
+ 		}
+ 		
+ 		$destcatid = $blog->getDefaultCategory();
+ 		
+ 		// don't allow deletion of default category
+ 		if ( $blog->getDefaultCategory() == $catid )
+ 		{
+ 			return _ERROR_DELETEDEFCATEGORY;
+ 		}
+ 		
+ 		// check if catid is the only category left for blogid
+ 		$query = "SELECT catid FROM %s WHERE cblog=%d;";
+ 		$query = sprintf($query, sql_table('category'), (integer) $blogid);
+ 		
+ 		$res = DB::getResult($query);
+ 		if ( $res->rowCount() == 1 )
+ 		{
+ 			return _ERROR_DELETELASTCATEGORY;
+ 		}
+ 		
+ 		$data = array('catid' => $catid);
+ 		$manager->notify('PreDeleteCategory', $data);
+ 		
+ 		// change category for all items to the default category
+ 		$query = "UPDATE %s SET icat=%d WHERE icat=%d;";
+ 		$query =sprintf($query, sql_table('item'), (integer) $destcatid, (integer) $catid);
+ 		DB::execute($query);
+ 		
+ 		// delete all associated plugin options
+ 		NucleusPlugin::delete_option_values('category', (integer) $catid);
+ 		
+ 		// delete category
+ 		$query = "DELETE FROM %s WHERE catid=%d;";
+ 		$query = sprintf($query, sql_table('category'), (integer) $catid);
+ 		DB::execute($query);
+ 		
+ 		$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
+ 	 * 
+ 	 * @param	int	$catid		category id for move
+ 	 * @param	int	$destblogid	blog id for destination
+ 	 * @return	void
+ 	 */
+ 	static public function moveOneCategory($catid, $destblogid)
+ 	{
+ 		global $manager, $member;
+ 		$catid      = intval($catid);
+ 		$destblogid = intval($destblogid);
+ 		$blogid     = getBlogIDFromCatID($catid);
+ 		// mover should have admin rights on both blogs
+ 		if (!$member->blogAdminRights($blogid)) {
+ 			return _ERROR_DISALLOWED;
+ 		}
+ 		if (!$member->blogAdminRights($destblogid)) {
+ 			return _ERROR_DISALLOWED;
+ 		}
+ 		// cannot move to self
+ 		if ($blogid == $destblogid) {
+ 			return _ERROR_MOVETOSELF;
+ 		}
+ 		// get blogs
+ 		$blog     =& $manager->getBlog($blogid);
+ 		$destblog =& $manager->getBlog($destblogid);
+ 		// check if the category is valid
+ 		if (!$blog || !$blog->isValidCategory($catid)) {
+ 			return _ERROR_NOSUCHCATEGORY;
+ 		}
+ 		// don't allow default category to be moved
+ 		if ($blog->getDefaultCategory() == $catid) {
+ 			return _ERROR_MOVEDEFCATEGORY;
+ 		}
+ 		$data = array(
+ 			'catid'			=> &$catid,
+ 			'sourceblog'	=> &$blog,
+ 			'destblog'		=> &$destblog
+ 		);
+ 		$manager->notify('PreMoveCategory', $data);
+ 		// update comments table (cblog)
+ 		$query = 'SELECT '
+ 		. '    inumber '
+ 		. 'FROM '
+ 		.      sql_table('item') . ' '
+ 		. 'WHERE '
+ 		. '    icat = %d';
+ 		$items = sql_query(sprintf($query, $catid));
+ 		while ($oItem = sql_fetch_object($items)) {
+ 			$query = 'UPDATE '
+ 			.      sql_table('comment') . ' '
+ 			. 'SET '
+ 			. '    cblog = %d' . ' '
+ 			. 'WHERE '
+ 			. '    citem = %d';
+ 			sql_query(sprintf($query, $destblogid, $oItem->inumber));
+ 		}
+ 	
+ 		// update items (iblog)
+ 		$query = 'UPDATE '
+ 		.      sql_table('item') . ' '
+ 		. 'SET '
+ 		. '    iblog = %d '
+ 		. 'WHERE '
+ 		. '    icat = %d';
+ 		sql_query(sprintf($query, $destblogid, $catid));
+ 	
+ 		// move category
+ 		$query = 'UPDATE '
+ 		.      sql_table('category') . ' '
+ 		. 'SET '
+ 		. '    cblog = %d' . ' '
+ 		. 'WHERE '
+ 		. '    catid = %d';
+ 		sql_query(sprintf($query, $destblogid, $catid));
+ 		
+ 		$data = array(
+ 			'catid'			=> &$catid,
+ 			'sourceblog'	=> &$blog,
+ 			'destblog'		=>  $destblog
+ 		);
+ 		$manager->notify('PostMoveCategory', $data);
+ 		return;
+ 	}
+ 
+ 	/**
+ 	 * Admin::action_blogsettingsupdate
+ 	 * Updating blog settings
+ 	 * 
+ 	 * @param	Void
+ 	 * @return	Void
+ 	 */
+ 	static private function action_blogsettingsupdate()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$blogid = intRequestVar('blogid');
+ 		
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		$blog =& $manager->getBlog($blogid);
+ 		
+ 		$notify_address	= trim(postVar('notify'));
+ 		$shortname		= trim(postVar('shortname'));
+ 		$updatefile		= trim(postVar('update'));
+ 		
+ 		$notifyComment	= intPostVar('notifyComment');
+ 		$notifyVote		= intPostVar('notifyVote');
+ 		$notifyNewItem	= intPostVar('notifyNewItem');
+ 		
+ 		if ( $notifyComment == 0 )
+ 		{
+ 			$notifyComment = 1;
+ 		}
+ 		if ( $notifyVote == 0 )
+ 		{
+ 			$notifyVote = 1;
+ 		}
+ 		if ( $notifyNewItem == 0 )
+ 		{
+ 			$notifyNewItem = 1;
+ 		}
+ 		$notifyType = $notifyComment * $notifyVote * $notifyNewItem;
+ 		
+ 		if ( $notify_address && !NOTIFICATION::address_validation($notify_address) )
+ 		{
+ 			self::error(_ERROR_BADNOTIFY);
+ 			return;
+ 		}
+ 		
+ 		if ( !isValidShortName($shortname) )
+ 		{
+ 			self::error(_ERROR_BADSHORTBLOGNAME);
+ 			return;
+ 		}
+ 		
+ 		if ( ($blog->getShortName() != $shortname) && $manager->existsBlog($shortname) )
+ 		{
+ 			self::error(_ERROR_DUPSHORTBLOGNAME);
+ 			return;
+ 		}
+ 		// check if update file is writable
+ 		if ( $updatefile && !is_writeable($updatefile) )
+ 		{
+ 			self::error(_ERROR_UPDATEFILE);
+ 			return;
+ 		}
+ 		
+ 		$blog->setName(trim(postVar('name')));
+ 		$blog->setShortName($shortname);
+ 		$blog->setNotifyAddress($notify_address);
+ 		$blog->setNotifyType($notifyType);
+ 		$blog->setMaxComments(postVar('maxcomments'));
+ 		$blog->setCommentsEnabled(postVar('comments'));
+ 		$blog->setTimeOffset(postVar('timeoffset'));
+ 		$blog->setUpdateFile($updatefile);
+ 		$blog->setURL(trim(postVar('url')));
+ 		$blog->setDefaultSkin(intPostVar('defskin'));
+ 		$blog->setDescription(trim(postVar('desc')));
+ 		$blog->setPublic(postVar('public'));
+ 		$blog->setConvertBreaks(intPostVar('convertbreaks'));
+ 		$blog->setAllowPastPosting(intPostVar('allowpastposting'));
+ 		$blog->setDefaultCategory(intPostVar('defcat'));
+ 		$blog->setSearchable(intPostVar('searchable'));
+ 		$blog->setEmailRequired(intPostVar('reqemail'));
+ 		$blog->writeSettings();
+ 		
+ 		// store plugin options
+ 		$aOptions = requestArray('plugoption');
+ 		NucleusPlugin::apply_plugin_options($aOptions);
+ 		
+ 		$data = array(
+ 			'context' => 'blog',
+ 			'blogid'  => $blogid,
+ 			'blog'    => &$blog
+ 		);
+ 		$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;
+ 		
+ 		$blogid = intRequestVar('blogid');
+ 		
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		// check if blog is default blog
+ 		if ( $CONF['DefaultBlog'] == $blogid )
+ 		{
+ 			self::error(_ERROR_DELDEFBLOG);
+ 			return;
+ 		}
+ 		
+ 		$blog =& $manager->getBlog($blogid);
+ 		
+ 		self::$skin->parse('deleteblog');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_deleteblogconfirm()
+ 	 * Delete Blog
+ 	 * 
+ 	 * @param	Void
+ 	 * @return	Void
+ 	 */
+ 	static private function action_deleteblogconfirm()
+ 	{
+ 		global $member, $CONF, $manager;
+ 		
+ 		$blogid = intRequestVar('blogid');
+ 		
+ 		$data = array('blogid' => $blogid);
+ 		$manager->notify('PreDeleteBlog', $data);
+ 		
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		// check if blog is default blog
+ 		if ( $CONF['DefaultBlog'] == $blogid )
+ 		{
+ 			self::error(_ERROR_DELDEFBLOG);
+ 			return;
+ 		}
+ 		
+ 		// 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);
+ 		
+ 		// delete all associated plugin options
+ 		NucleusPlugin::delete_option_values('blog', $blogid);
+ 		
+ 		// delete the blog itself
+ 		$query = 'DELETE FROM ' . sql_table('blog') . ' WHERE bnumber=' . $blogid;
+ 		DB::execute($query);
+ 		
+ 		$data = array('blogid' => $blogid);
+ 		$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
+ 	 * @return	void
+ 	 */
+ 	static private function action_memberdelete()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$memberid = intRequestVar('memberid');
+ 		
+ 		($member->getID() == $memberid) or $member->isAdmin() or self::disallow();
+ 		
+ 		$mem =& $manager->getMember($memberid);
+ 		
+ 		self::$skin->parse('memberdelete');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_memberdeleteconfirm()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_memberdeleteconfirm()
+ 	{
+ 		global $member;
+ 		
+ 		$memberid = intRequestVar('memberid');
+ 		
+ 		($member->getID() == $memberid) or $member->isAdmin() or self::disallow();
+ 		
+ 		$error = self::deleteOneMember($memberid);
+ 		if ( $error )
+ 		{
+ 			self::error($error);
+ 			return;
+ 		}
+ 		
+ 		if ( $member->isAdmin() )
+ 		{
+ 			self::action_usermanagement();
+ 			return;
+ 		}
+ 		else
+ 		{
+ 			self::action_overview(_DELETED_MEMBER);
+ 			return;
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::deleteOneMember()
+ 	 * Delete a member by id
+ 	 * 
+ 	 * @static
+ 	 * @params	Integer	$memberid	member id
+ 	 * @return	String	null string or error messages
+ 	 */
+ 	static public function deleteOneMember($memberid)
+ 	{
+ 		global $manager;
+ 		
+ 		$memberid = intval($memberid);
+ 		$mem =& $manager->getMember($memberid);
+ 		
+ 		if ( !$mem->canBeDeleted() )
+ 		{
+ 			return _ERROR_DELETEMEMBER;
+ 		}
+ 		
+ 		$data = array('member' => &$mem);
+ 		$manager->notify('PreDeleteMember', $data);
+ 		
+ 		/* unlink comments from memberid */
+ 		if ( $memberid )
+ 		{
+ 			$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);
+ 		}
+ 		
+ 		$query = 'DELETE FROM ' . sql_table('member') . ' WHERE mnumber=' . $memberid;
+ 		DB::execute($query);
+ 		
+ 		$query = 'DELETE FROM ' . sql_table('team') . ' WHERE tmember=' . $memberid;
+ 		DB::execute($query);
+ 		
+ 		$query = 'DELETE FROM ' . sql_table('activation') . ' WHERE vmember=' . $memberid;
+ 		DB::execute($query);
+ 		
+ 		// delete all associated plugin options
+ 		NucleusPlugin::delete_option_values('member', $memberid);
+ 		
+ 		$data = array('member' => &$mem);
+ 		$manager->notify('PostDeleteMember', $data);
+ 		
+ 		return '';
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_createnewlog()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_createnewlog()
+ 	{
+ 		global $member, $CONF, $manager;
+ 		
+ 		// Only Super-Admins can do this
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		self::$skin->parse('createnewlog');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_addnewlog()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_addnewlog()
+ 	{
+ 		global $member, $manager, $CONF;
+ 		
+ 		// Only Super-Admins can do this
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$bname			= trim(postVar('name'));
+ 		$bshortname		= trim(postVar('shortname'));
+ 		$btimeoffset	= postVar('timeoffset');
+ 		$bdesc			= trim(postVar('desc'));
+ 		$bdefskin		= postVar('defskin');
+ 		
+ 		if ( !isValidShortName($bshortname) )
+ 		{
+ 			self::error(_ERROR_BADSHORTBLOGNAME);
+ 			return;
+ 		}
+ 		
+ 		if ( $manager->existsBlog($bshortname) )
+ 		{
+ 			self::error(_ERROR_DUPSHORTBLOGNAME);
+ 			return;
+ 		}
+ 		
+ 		$data = array(
+ 			'name'        => &$bname,
+ 			'shortname'   => &$bshortname,
+ 			'timeoffset'  => &$btimeoffset,
+ 			'description' => &$bdesc,
+ 			'defaultskin' => &$bdefskin
+ 		);
+ 		$manager->notify('PreAddBlog', $data);
+ 		
+ 		// add slashes for sql queries
+ 		$bname			= DB::quoteValue($bname);
+ 		$bshortname		= DB::quoteValue($bshortname);
+ 		$btimeoffset	= DB::quoteValue($btimeoffset);
+ 		$bdesc			= DB::quoteValue($bdesc);
+ 		$bdefskin		= DB::quoteValue($bdefskin);
+ 		
+ 		// create blog
+ 		$query = "INSERT INTO %s (bname, bshortname, bdesc, btimeoffset, bdefskin) VALUES (%s, %s, %s, %s, %s);";
+ 		$query = sprintf($query, sql_table('blog'), $bname, $bshortname, $bdesc, $btimeoffset, $bdefskin);
+ 		DB::execute($query);
+ 		
+ 		$blogid = DB::getInsertId();
+ 		$blog   =& $manager->getBlog($blogid);
+ 		
+ 		// create new category
+ 		$catdefname = (!defined('_EBLOGDEFAULTCATEGORY_NAME') ? 'General' : _EBLOGDEFAULTCATEGORY_NAME);
+ 		$catdefdesc = (!defined('_EBLOGDEFAULTCATEGORY_DESC') ? 'Items that do not fit in other categories' : _EBLOGDEFAULTCATEGORY_DESC);
+ 		
+ 		$query = 'INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, %s, %s)';
+ 		DB::execute(sprintf($query, sql_table('category'), (integer) $blogid, DB::quoteValue($catdefname), DB::quoteValue($catdefdesc)));
+ 		$catid = DB::getInsertId();
+ 		
+ 		// set as default category
+ 		$blog->setDefaultCategory($catid);
+ 		$blog->writeSettings();
+ 		
+ 		// create team member
+ 		$query = "INSERT INTO %s (tmember, tblog, tadmin) VALUES (%d, %d, 1);";
+ 		$query = sprintf($query, sql_table('team'), (integer) $member->getID(), (integer) $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,
+ 			$member->getID(),
+ 			$blog->getCorrectTime(),
+ 			0,
+ 			0,
+ 			0
+ 		);
+ 		
+ 		$data = array('blog' => &$blog);
+ 		$manager->notify('PostAddBlog', $data);
+ 		
+ 		$data = array(
+ 			'blog'			=> &$blog,
+ 			'name'			=> _EBLOGDEFAULTCATEGORY_NAME,
+ 			'description'	=> _EBLOGDEFAULTCATEGORY_DESC,
+ 			'catid'			=> $catid
+ 		);
+ 		$manager->notify('PostAddCategory', $data);
+ 		
+ 		/* TODO: we should consider to use the other way insterad of this */
+ 		$_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;
+ 		$blogid = intRequestVar('blogid');
+ 		
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		$burl = requestVar('url');
+ 		
+ 		$blog =& $manager->getBlog($blogid);
+ 		$blog->setURL(trim($burl));
+ 		$blog->writeSettings();
+ 		
+ 		self::action_overview(_MSG_NEWBLOG);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_skinieoverview()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_skinieoverview()
+ 	{
+ 		global $member, $DIR_LIBS, $manager;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		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;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$skinFileRaw = postVar('skinfile');
+ 		$mode = postVar('mode');
+ 		
+ 		$error = self::skinieimport($mode, $skinFileRaw);
+ 		if ( $error )
+ 		{
+ 			self::error($error);
+ 			return;
+ 		}
+ 		
+ 		self::$skin->parse('skinieimport');
+ 		return;
+ 	}
  	
  	/**
- 	 * Admin::action_itemdelete()
- 	 * Delete item
+ 	 * Admin::action_skiniedoimport()
  	 * 
- 	 * @param	Void
- 	 * @return	Void
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_skiniedoimport()
+ 	{
+ 		global $member, $DIR_LIBS, $DIR_SKINS;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		// load skinie class
+ 		include_once($DIR_LIBS . 'skinie.php');
+ 		
+ 		$mode = postVar('mode');
+ 		$skinFileRaw = postVar('skinfile');
+ 		$allowOverwrite = intPostVar('overwrite');
+ 		
+ 		$error = self::skiniedoimport($mode, $skinFileRaw, $allowOverwrite);
+ 		if ( $error )
+ 		{
+ 			self::error($msg);
+ 			return;
+ 		}
+ 		
+ 		self::$skin->parse('skiniedoimport');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_skinieexport()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
  	 */
- 	function action_itemdelete()
+ 	static private function action_skinieexport()
+ 	{
+ 		global $member;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$aSkins = requestIntArray('skin');
+ 		$aTemplates = requestIntArray('template');
+ 		$info = postVar('info');
+ 		
+ 		self::skinieexport($aSkins, $aTemplates, $info);
+ 		
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_templateoverview()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_templateoverview()
  	{
  		global $member, $manager;
  		
- 		$itemid = intRequestVar('itemid');
+ 		$member->isAdmin() or self::disallow();
  		
- 		// only allow if user is allowed to alter item
- 		$member->canAlterItem($itemid) or $this->disallow();
+ 		self::$skin->parse('templateoverview');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_templateedit()
+ 	 * 
+ 	 * @param	string	$msg	message for pageheader
+ 	 * @return	void
+ 	 */
+ 	static private function action_templateedit($msg = '')
+ 	{
+ 		global $member, $manager;
+ 		if ( $msg )
+ 		{
+ 			self::$headMess = $msg;
+ 		}
  		
- 		if ( !$manager->existsItem($itemid,1,1) )
+ 		$templateid = intRequestVar('templateid');
+ 		
+ 		$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('templateedit');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_templateupdate()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_templateupdate()
+ 	{
+ 		global $member,$manager;
+ 		
+ 		$templateid = intRequestVar('templateid');
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$name = postVar('tname');
+ 		$desc = postVar('tdesc');
+ 		
+ 		if ( !isValidTemplateName($name) )
+ 		{
+ 			self::error(_ERROR_BADTEMPLATENAME);
+ 			return;
+ 		}
+ 		
+ 		if ( (Template::getNameFromId($templateid) != $name) && Template::exists($name) )
  		{
- 			$this->error(_ERROR_NOSUCHITEM);
+ 			self::error(_ERROR_DUPTEMPLATENAME);
+ 			return;
  		}
  		
- 		$item =& $manager->getItem($itemid,1,1);
- 		$title = Entity::hsc(strip_tags($item['title']));
- 		$body = strip_tags($item['body']);
- 		$body = Entity::hsc(Entity::shorten($body,300,'...'));
+ 		// 1. Remove all template parts
+ 		$query = "DELETE FROM %s WHERE tdesc=%d;";
+ 		$query = sprintf($query, sql_table('template'), (integer) $templateid);
+ 		DB::execute($query);
  		
- 		$this->pagehead();
- 		echo '<h2>' . _DELETE_CONFIRM . "</h2>\n";
- 		echo '<p>' . _CONFIRMTXT_ITEM . "</p>\n";
- 		echo "<div class=\"note\">\n";
- 		echo "<b>{$title}</b>\n";
- 		echo "<br />\n";
- 		echo "{$body}\n";
- 		echo "</div>\n";
- 		echo "<form method=\"post\" action=\"index.php\">\n";
- 		echo "<div>\n";
- 		echo "<input type=\"hidden\" name=\"action\" value=\"itemdeleteconfirm\" />\n";
- 		echo $manager->addTicketHidden() . "\n";
- 		echo "<input type=\"hidden\" name=\"itemid\" value=\"{$itemid}\" />\n";
- 		echo '<input type="submit" value="' . _DELETE_CONFIRM_BTN . "\"  tabindex=\"10\" />\n";
- 		echo "</div>\n";
- 		echo "</form>\n";
- 		$this->pagefoot();
+ 		// 2. Update description
+ 		$query = "UPDATE %s SET tdname=%s, tddesc=%s WHERE tdnumber=%d;";
+ 		$query = sprintf($query, sql_table('template_desc'), DB::quoteValue($name), DB::quoteValue($desc), (integer) $templateid);
+ 		DB::execute($query);
+ 		
+ 		// 3. Add non-empty template parts
+ 		self::addToTemplate($templateid, 'ITEM_HEADER',			postVar('ITEM_HEADER'));
+ 		self::addToTemplate($templateid, 'ITEM',				postVar('ITEM'));
+ 		self::addToTemplate($templateid, 'ITEM_FOOTER',			postVar('ITEM_FOOTER'));
+ 		self::addToTemplate($templateid, 'MORELINK',			postVar('MORELINK'));
+ 		self::addToTemplate($templateid, 'EDITLINK',			postVar('EDITLINK'));
+ 		self::addToTemplate($templateid, 'NEW',					postVar('NEW'));
+ 		self::addToTemplate($templateid, 'COMMENTS_HEADER',		postVar('COMMENTS_HEADER'));
+ 		self::addToTemplate($templateid, 'COMMENTS_BODY', 		postVar('COMMENTS_BODY'));
+ 		self::addToTemplate($templateid, 'COMMENTS_FOOTER',		postVar('COMMENTS_FOOTER'));
+ 		self::addToTemplate($templateid, 'COMMENTS_CONTINUED',	postVar('COMMENTS_CONTINUED'));
+ 		self::addToTemplate($templateid, 'COMMENTS_TOOMUCH',	postVar('COMMENTS_TOOMUCH'));
+ 		self::addToTemplate($templateid, 'COMMENTS_AUTH',		postVar('COMMENTS_AUTH'));
+ 		self::addToTemplate($templateid, 'COMMENTS_ONE',		postVar('COMMENTS_ONE'));
+ 		self::addToTemplate($templateid, 'COMMENTS_MANY',		postVar('COMMENTS_MANY'));
+ 		self::addToTemplate($templateid, 'COMMENTS_NONE',		postVar('COMMENTS_NONE'));
+ 		self::addToTemplate($templateid, 'ARCHIVELIST_HEADER',	postVar('ARCHIVELIST_HEADER'));
+ 		self::addToTemplate($templateid, 'ARCHIVELIST_LISTITEM', postVar('ARCHIVELIST_LISTITEM'));
+ 		self::addToTemplate($templateid, 'ARCHIVELIST_FOOTER',	postVar('ARCHIVELIST_FOOTER'));
+ 		self::addToTemplate($templateid, 'BLOGLIST_HEADER',		postVar('BLOGLIST_HEADER'));
+ 		self::addToTemplate($templateid, 'BLOGLIST_LISTITEM',	postVar('BLOGLIST_LISTITEM'));
+ 		self::addToTemplate($templateid, 'BLOGLIST_FOOTER',		postVar('BLOGLIST_FOOTER'));
+ 		self::addToTemplate($templateid, 'CATLIST_HEADER',		postVar('CATLIST_HEADER'));
+ 		self::addToTemplate($templateid, 'CATLIST_LISTITEM',	postVar('CATLIST_LISTITEM'));
+ 		self::addToTemplate($templateid, 'CATLIST_FOOTER',		postVar('CATLIST_FOOTER'));
+ 		self::addToTemplate($templateid, 'DATE_HEADER',			postVar('DATE_HEADER'));
+ 		self::addToTemplate($templateid, 'DATE_FOOTER',			postVar('DATE_FOOTER'));
+ 		self::addToTemplate($templateid, 'FORMAT_DATE',			postVar('FORMAT_DATE'));
+ 		self::addToTemplate($templateid, 'FORMAT_TIME',			postVar('FORMAT_TIME'));
+ 		self::addToTemplate($templateid, 'SEARCH_HIGHLIGHT',	postVar('SEARCH_HIGHLIGHT'));
+ 		self::addToTemplate($templateid, 'SEARCH_NOTHINGFOUND', postVar('SEARCH_NOTHINGFOUND'));
+ 		self::addToTemplate($templateid, 'POPUP_CODE',			postVar('POPUP_CODE'));
+ 		self::addToTemplate($templateid, 'MEDIA_CODE',			postVar('MEDIA_CODE'));
+ 		self::addToTemplate($templateid, 'IMAGE_CODE',			postVar('IMAGE_CODE'));
+ 		
+ 		$data = array('fields' => array());
+ 		$manager->notify('TemplateExtraFields', $data);
+ 		foreach ( $data['fields'] as $pfkey=>$pfvalue )
+ 		{
+ 			foreach ( $pfvalue as $pffield => $pfdesc )
+ 			{
+ 				self::addToTemplate($templateid, $pffield, postVar($pffield));
+ 			}
+ 		}
+ 		
+ 		// jump back to template edit
+ 		self::action_templateedit(_TEMPLATE_UPDATED);
  		return;
  	}
  	
-     /**
-      * @todo document this
-      */
-     function action_itemdeleteconfirm() {
-         global $member;
- 
-         $itemid = intRequestVar('itemid');
- 
-         // only allow if user is allowed to alter item
-         $member->canAlterItem($itemid) or $this->disallow();
- 
-         // get blogid first
-         $blogid = getBlogIdFromItemId($itemid);
- 
-         // delete item (note: some checks will be performed twice)
-         $this->deleteOneItem($itemid);
- 
-         $this->action_itemlist($blogid);
-     }
- 
-     /**
-      * Deletes one item and returns error if something goes wrong
-      * @param int $itemid
-      */
-     function deleteOneItem($itemid) {
-         global $member, $manager;
- 
-         // only allow if user is allowed to alter item (also checks if itemid exists)
-         if (!$member->canAlterItem($itemid))
-             return _ERROR_DISALLOWED;
- 
-         // need to get blogid before the item is deleted
-         $blogid = getBlogIDFromItemId($itemid);
- 
-         $manager->loadClass('ITEM');
-         Item::delete($itemid);
- 
-         // update blog's futureposted
-         $this->updateFuturePosted($blogid);
-     }
- 
  	/**
- 	 * Admin::updateFuturePosted()
- 	 * Update a blog's future posted flag
+ 	 * Admin::addToTemplate()
  	 * 
- 	 * @param integer $blogid
+ 	 * @param	Integer	$id	ID for template
+ 	 * @param	String	$partname	parts name
+ 	 * @param	String	$content	template contents
+ 	 * @return	Integer	record index
+ 	 * 
+ 	 */
+ 	static private function addToTemplate($id, $partname, $content)
+ 	{
+ 		// don't add empty parts:
+ 		if ( !trim($content) )
+ 		{
+ 			return -1;
+ 		}
+ 		
+ 		$query = "INSERT INTO %s (tdesc, tpartname, tcontent) VALUES (%d, %s, %s);";
+ 		$query = sprintf($query, sql_table('template'), (integer) $id, DB::quoteValue($partname), DB::quoteValue($content));
+ 		if ( DB::execute($query) === FALSE )
+ 		{
+ 			$err = DB::getError();
+ 			exit(_ADMIN_SQLDIE_QUERYERROR . $err[2]);
+ 		}
+ 		return DB::getInsertId();
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_templatedelete()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_templatedelete()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$templateid = intRequestVar('templateid');
+ 		// TODO: check if template can be deleted
+ 		
+ 		self::$skin->parse('templatedelete');
+ 		return;
+ 	}
++>>>>>>> skinnable-master
+ 	
+ 	/**
+ 	 * Admin::action_templatedeleteconfirm()
+ 	 * 
+ 	 * @param	void
  	 * @return	void
+ 	 */
+ 	static private function action_templatedeleteconfirm()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$templateid = intRequestVar('templateid');
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$data = array('templateid' => $templateid);
+ 		$manager->notify('PreDeleteTemplate', $data);
+ 		
+ 		// 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);
+ 		
+ 		
+ 		$data = array('templateid' => $templateid);
+ 		$manager->notify('PostDeleteTemplate', $data);
+ 		
+ 		self::action_templateoverview();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_templatenew()
  	 * 
+ 	 * @param	void
+ 	 * @return	void
  	 */
- 	function updateFuturePosted($blogid)
+ 	static private function action_templatenew()
  	{
- 		global $manager;
+ 		global $member;
  		
- 		$blog =& $manager->getBlog($blogid);
- 		$currenttime = $blog->getCorrectTime(time());
+ 		$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
  		{
- 				$blog->setFuturePost();
+ 			self::error(_ERROR_BADTEMPLATENAME);
+ 			return;
  		}
- 		else
+ 		
+ 		if ( Template::exists($name) )
  		{
- 				$blog->clearFuturePost();
+ 			self::error(_ERROR_DUPTEMPLATENAME);
+ 			return;
  		}
+ 		
+ 		$newTemplateId = Template::createNew($name, $desc);
+ 		
+ 		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()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_templateclone()
+ 	{
+ 		global $member;
+ 		
+ 		$templateid = intRequestVar('templateid');
+ 		
+ 		$member->isAdmin() or self::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) )
++>>>>>>> skinnable-master
  		{
- 			$this->error(_ERROR_COMMENT_LONGWORD);
+ 			$i = 1;
+ 			while (Template::exists($name . $i))
+ 			{
+ 				$i++;
+ 			}
+ 			$name .= $i;
  		}
- 
- 		// check length
- 		if (i18n::strlen($body) < 3)
+ 		
+ 		$newid = Template::createNew($name, $desc);
+ 		
+ 		// 3. create clone
+ 		// go through parts of old template and add them to the new one
+ 		$query = "SELECT tpartname, tcontent FROM %s WHERE tdesc=%d;";
+ 		$query = sprintf($query, sql_table('template'), (integer) $templateid);
+ 		
+ 		$res = DB::getResult($query);
+ 		foreach ( $res as $row)
  		{
- 			$this->error(_ERROR_COMMENT_NOCOMMENT);
+ 			self::addToTemplate($newid, $row['tpartname'], $row['tcontent']);
  		}
- 
- 		if (i18n::strlen($body) > 5000)
+ 		
+ 		self::action_templateoverview();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_admintemplateoverview()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_admintemplateoverview()
+ 	{
+ 		global $member;
+ 		$member->isAdmin() or self::disallow();
+ 		self::$skin->parse('admntemplateoverview');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_admintemplateedit()
+ 	 * 
+ 	 * @param	string	$msg	message for pageheader
+ 	 * @return	void
+ 	 */
+ 	static private function action_admintemplateedit($msg = '')
+ 	{
+ 		global $member, $manager;
+ 		if ( $msg )
  		{
- 			$this->error(_ERROR_COMMENT_TOOLONG);
+ 			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_commentdelete()
- 	 * Update comment
+ 	 * Admin::action_admintemplateupdate()
  	 * 
- 	 * @param	Void
- 	 * @return	Void
+ 	 * @param	void
+ 	 * @return	void
  	 */
- 	function action_commentdelete()
+ 	static private function action_admintemplateupdate()
  	{
  		global $member, $manager;
+ 		$templateid = intRequestVar('templateid');
+ 		$member->isAdmin() or self::disallow();
+ 		$name = postVar('tname');
+ 		$desc = postVar('tdesc');
  		
- 		$commentid = intRequestVar('commentid');
- 		$member->canAlterComment($commentid) or $this->disallow();
- 		$comment = Comment::getComment($commentid);
- 		
- 		$body = strip_tags($comment['body']);
- 		$body = Entity::hsc(Entity::shorten($body, 300, '...'));
- 		
- 		if ( $comment['member'] )
+ 		if ( !isValidTemplateName($name) )
  		{
- 			$author = $comment['member'];
+ 			self::error(_ERROR_BADTEMPLATENAME);
+ 			return;
  		}
- 		else
+ 		
+ 		if ( (Template::getNameFromId($templateid) != $name) && Template::exists($name) )
  		{
- 			$author = $comment['user'];
+ 			self::error(_ERROR_DUPTEMPLATENAME);
+ 			return;
  		}
  		
- 		$this->pagehead();
+ 		// 1. Remove all template parts
+ 		$query = "DELETE FROM %s WHERE tdesc=%d;";
+ 		$query = sprintf($query, sql_table('template'), (integer) $templateid);
+ 		DB::execute($query);
  		
- 		echo '<h2>' . _DELETE_CONFIRM . "</h2>\n";
- 		echo '<p>' . _CONFIRMTXT_COMMENT . "</p>\n";
- 		echo "<div class=\"note\">\n";
- 		echo '<b>' . _EDITC_WHO . ":</b>{$author}<br />\n";
- 		echo '<b>' . _EDITC_TEXT . ":</b>{$body}\n";
- 		echo "</div>\n";
- 		echo "<form method=\"post\" action=\"index.php\">\n";
- 		echo "<div>\n";
- 		echo "<input type=\"hidden\" name=\"action\" value=\"commentdeleteconfirm\" />\n";
- 		echo $manager->addTicketHidden() . "\n";
- 		echo "<input type=\"hidden\" name=\"commentid\" value=\"{$commentid}\" />\n";
- 		echo '<input type="submit" tabindex="10" value="'. _DELETE_CONFIRM_BTN . "\" />\n";
- 		echo "</div>\n";
- 		echo "</form>\n";
- 		$this->pagefoot();
+ 		// 2. Update description
+ 		$query = "UPDATE %s SET tdname=%s, tddesc=%s WHERE tdnumber=%d;";
+ 		$query = sprintf($query, sql_table('template_desc'), DB::quoteValue($name), DB::quoteValue($desc), (integer) $templateid);
+ 		DB::execute($query);
+ 		
+ 		// 3. Add non-empty template parts
+ 		self::addToTemplate($templateid, 'NORMALSKINLIST_HEAD',						postVar('NORMALSKINLIST_HEAD'));
+ 		self::addToTemplate($templateid, 'NORMALSKINLIST_BODY',						postVar('NORMALSKINLIST_BODY'));
+ 		self::addToTemplate($templateid, 'NORMALSKINLIST_FOOT',						postVar('NORMALSKINLIST_FOOT'));
+ 		self::addToTemplate($templateid, 'ADMIN_CUSTOMHELPLINK_ICON',				postVar('ADMIN_CUSTOMHELPLINK_ICON'));
+ 		self::addToTemplate($templateid, 'ADMIN_CUSTOMHELPLINK_ANCHOR',				postVar('ADMIN_CUSTOMHELPLINK_ANCHOR'));
+ 		self::addToTemplate($templateid, 'ADMIN_BLOGLINK',							postVar('ADMIN_BLOGLINK'));
+ 		self::addToTemplate($templateid, 'ADMIN_BATCHLIST',							postVar('ADMIN_BATCHLIST'));
+ 		self::addToTemplate($templateid, 'ACTIVATE_FORGOT_TITLE',					postVar('ACTIVATE_FORGOT_TITLE'));
+ 		self::addToTemplate($templateid, 'ACTIVATE_FORGOT_TEXT',					postVar('ACTIVATE_FORGOT_TEXT'));
+ 		self::addToTemplate($templateid, 'ACTIVATE_REGISTER_TITLE',					postVar('ACTIVATE_REGISTER_TITLE'));
+ 		self::addToTemplate($templateid, 'ACTIVATE_REGISTER_TEXT',					postVar('ACTIVATE_REGISTER_TEXT'));
+ 		self::addToTemplate($templateid, 'ACTIVATE_CHANGE_TITLE',					postVar('ACTIVATE_CHANGE_TITLE'));
+ 		self::addToTemplate($templateid, 'ACTIVATE_CHANGE_TEXT',					postVar('ACTIVATE_CHANGE_TEXT'));
+ 		self::addToTemplate($templateid, 'TEMPLATE_EDIT_EXPLUGNAME',				postVar('TEMPLATE_EDIT_EXPLUGNAME'));
+ 		self::addToTemplate($templateid, 'TEMPLATE_EDIT_ROW_HEAD',					postVar('TEMPLATE_EDIT_ROW_HEAD'));
+ 		self::addToTemplate($templateid, 'TEMPLATE_EDIT_ROW_TAIL',					postVar('TEMPLATE_EDIT_ROW_TAIL'));
+ 		self::addToTemplate($templateid, 'SPECIALSKINLIST_HEAD',					postVar('SPECIALSKINLIST_HEAD'));
+ 		self::addToTemplate($templateid, 'SPECIALSKINLIST_BODY',					postVar('SPECIALSKINLIST_BODY'));
+ 		self::addToTemplate($templateid, 'SPECIALSKINLIST_FOOT',					postVar('SPECIALSKINLIST_FOOT'));
+ 		self::addToTemplate($templateid, 'SYSTEMINFO_GDSETTINGS',					postVar('SYSTEMINFO_GDSETTINGS'));
+ 		self::addToTemplate($templateid, 'BANLIST_DELETED_LIST',					postVar('BANLIST_DELETED_LIST'));
+ 		self::addToTemplate($templateid, 'INSERT_PLUGOPTION_TITLE',					postVar('INSERT_PLUGOPTION_TITLE'));
+ 		self::addToTemplate($templateid, 'INSERT_PLUGOPTION_BODY',					postVar('INSERT_PLUGOPTION_BODY'));
+ 		self::addToTemplate($templateid, 'INPUTYESNO_TEMPLATE_ADMIN',				postVar('INPUTYESNO_TEMPLATE_ADMIN'));
+ 		self::addToTemplate($templateid, 'INPUTYESNO_TEMPLATE_NORMAL',				postVar('INPUTYESNO_TEMPLATE_NORMAL'));
+ 		self::addToTemplate($templateid, 'ADMIN_SPECIALSKINLIST_HEAD',				postVar('ADMIN_SPECIALSKINLIST_HEAD'));
+ 		self::addToTemplate($templateid, 'ADMIN_SPECIALSKINLIST_BODY',				postVar('ADMIN_SPECIALSKINLIST_BODY'));
+ 		self::addToTemplate($templateid, 'ADMIN_SPECIALSKINLIST_FOOT',				postVar('ADMIN_SPECIALSKINLIST_FOOT'));
+ 		self::addToTemplate($templateid, 'SKINIE_EXPORT_LIST',						postVar('SKINIE_EXPORT_LIST'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_SELECT_HEAD',			postVar('SHOWLIST_LISTPLUG_SELECT_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_SELECT_BODY',			postVar('SHOWLIST_LISTPLUG_SELECT_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_SELECT_FOOT',			postVar('SHOWLIST_LISTPLUG_SELECT_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_HEAD',			postVar('SHOWLIST_LISTPLUG_TABLE_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BODY',			postVar('SHOWLIST_LISTPLUG_TABLE_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_FOOT',			postVar('SHOWLIST_LISTPLUG_TABLE_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD',	postVar('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY',	postVar('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD',	postVar('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY',	postVar('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD',	postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY',	postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',	postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',	postVar('SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',	postVar('SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',	postVar('SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',	postVar('SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',	postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',	postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',	postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',	postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',	postVar('SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD',	postVar('SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY',	postVar('SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO',	postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD',	postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP',	postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO',	postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC',	postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA',	postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT',	postVar('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD',	postVar('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY',	postVar('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD',	postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY',	postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN',	postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD',	postVar('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY',	postVar('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',	postVar('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',	postVar('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD',	postVar('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY',	postVar('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD',	postVar('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY',	postVar('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD',	postVar('SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY',	postVar('SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD',	postVar('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY',	postVar('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD',	postVar('SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY',	postVar('SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD',	postVar('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY',	postVar('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD',	postVar('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY',	postVar('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD',	postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY',	postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT',	postVar('SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT'));
+ 		self::addToTemplate($templateid, 'SHOWLIST_LISTPLUG_TABLE_NAVILIST',		postVar('SHOWLIST_LISTPLUG_TABLE_NAVILIST'));
+ 		self::addToTemplate($templateid, 'PLUGIN_QUICKMENU_TITLE',					postVar('PLUGIN_QUICKMENU_TITLE'));
+ 		self::addToTemplate($templateid, 'PLUGIN_QUICKMENU_HEAD',					postVar('PLUGIN_QUICKMENU_HEAD'));
+ 		self::addToTemplate($templateid, 'PLUGIN_QUICKMENU_BODY',					postVar('PLUGIN_QUICKMENU_BODY'));
+ 		self::addToTemplate($templateid, 'PLUGIN_QUICKMENU_FOOT',					postVar('PLUGIN_QUICKMENU_FOOT'));
+ 		
+ 		$data = array('fields' => array());
+ 		$manager->notify('AdminTemplateExtraFields', $data);
+ 		foreach ( $data['fields'] as $pfkey => $pfvalue )
+ 		{
+ 			foreach ( $pfvalue as $pffield => $pfdesc )
+ 			{
+ 				self::addToTemplate($templateid, $pffield, postVar($pffield));
+ 			}
+ 		}
+ 		
+ 		// jump back to template edit
+ 		self::action_admintemplateedit(_TEMPLATE_UPDATED);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_admintemplatedelete()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_admintemplatedelete()
+ 	{
+ 		global $member, $manager;
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		// TODO: check if template can be deleted
+ 		self::$skin->parse('admintemplatedelete');
  		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
  	/**
- 	 * @todo document this
+ 	 * Admin::action_admintemplatedeleteconfirm()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
  	 */
- 	function action_editmembersettings($memberid = '') {
- 		global $member, $manager, $CONF;
+ 	static private function action_admintemplatedeleteconfirm()
+ 	{
+ 		global $member, $manager;
  		
- 		if ($memberid == '')
- 		{
- 			$memberid = $member->getID();
- 		}
+ 		$templateid = intRequestVar('templateid');
+ 		$member->isAdmin() or self::disallow();
  		
- 		// check if allowed
- 		($member->getID() == $memberid) or $member->isAdmin() or $this->disallow();
+ 		$data = array('templateid' => $templateid);
+ 		$manager->notify('PreDeleteAdminTemplate', $data);
  		
- 		$extrahead = '<script type="text/javascript" src="javascript/numbercheck.js"></script>';
- 		$this->pagehead($extrahead);
+ 		// 1. delete description
+ 		$query = "DELETE FROM %s WHERE tdnumber=%s;";
+ 		$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);
+ 		DB::execute($query);
+ 		
+ 		$data = array('templateid' => $templateid);
+ 		$manager->notify('PostDeleteAdminTemplate', $data);
+ 		
+ 		self::action_admintemplateoverview();
+ 		return;
++>>>>>>> skinnable-master
  	}
  	
-     /**
-      * @todo document this
-      */
-     function action_changemembersettings() {
-         global $member, $CONF, $manager;
- 
-         $memberid = intRequestVar('memberid');
- 
-         // check if allowed
-         ($member->getID() == $memberid) or $member->isAdmin() or $this->disallow();
- 
-         $name           = trim(strip_tags(postVar('name')));
-         $realname       = trim(strip_tags(postVar('realname')));
-         $password       = postVar('password');
-         $repeatpassword = postVar('repeatpassword');
-         $email          = strip_tags(postVar('email'));
-         $url            = strip_tags(postVar('url'));
- 
- 		# replaced eregi() below with preg_match(). ereg* functions are deprecated in PHP 5.3.0
- 		# original eregi: !eregi("^https?://", $url)
- 
- 		// begin if: sometimes user didn't prefix the URL with http:// or https://, this cause a malformed URL. Let's fix it.
- 		if (!preg_match('#^https?://#', $url) )
+ 	/**
+ 	 * Admin::action_admintemplatenew()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_admintemplatenew()
+ 	{
+ 		global $member;
+ 		$member->isAdmin() or self::disallow();
+ 		$name = postVar('name');
+ 		$desc = postVar('desc');
+ 		
+ 		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
  		}
- 		
- 		if ( !NOTIFICATION::address_validation($email) )
+ 		else if ( !preg_match('#^admin/#', $name) )
  		{
- 			$this->error(_ERROR_BADMAILADDRESS);
+ 			self::error(_ERROR_BADADMINTEMPLATENAME);
+ 			return;
  		}
- 		if ( !$realname )
+ 		else if ( Template::exists($name) )
  		{
- 			$this->error(_ERROR_REALNAMEMISSING);
+ 			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_memberadd()
+ 	 * Admin::action_admintemplateclone()
  	 * 
  	 * @param	void
  	 * @return	void
- 	 * 
- 	*/
- 	function action_memberadd()
+ 	 */
+ 	static private function action_admintemplateclone()
  	{
- 		global $member, $manager;
+ 		global $member;
+ 		$templateid = intRequestVar('templateid');
+ 		$member->isAdmin() or self::disallow();
  		
- 		// check if allowed
- 		$member->isAdmin() or $this->disallow();
+ 		// 1. read old template
+ 		$name = Template::getNameFromId($templateid);
+ 		$desc = Template::getDesc($templateid);
  		
- 		if ( postVar('password') != postVar('repeatpassword') )
+ 		// 2. create desc thing
+ 		$name = $name . "cloned";
+ 		
+ 		// if a template with that name already exists:
+ 		if ( Template::exists($name) )
  		{
- 			$this->error(_ERROR_PASSWORDMISMATCH);
+ 			$i = 1;
+ 			while ( Template::exists($name . $i) )
+ 			{
+ 				$i++;
+ 			}
+ 			$name .= $i;
  		}
  		
- 		if ( i18n::strlen(postVar('password')) < 6 )
+ 		$newid = Template::createNew($name, $desc);
+ 		
+ 		// 3. create clone
+ 		// go through parts of old template and add them to the new one
+ 		$query = "SELECT tpartname, tcontent FROM %s WHERE tdesc=%d;";
+ 		$query = sprintf($query, sql_table('template'), (integer) $templateid);
+ 		
+ 		$res = DB::getResult($query);
+ 		foreach ( $res as $row )
  		{
- 			$this->error(_ERROR_PASSWORDTOOSHORT);
+ 			self::addToTemplate($newid, $row['tpartname'], $row['tcontent']);
  		}
  		
- 		$res = Member::create(postVar('name'), postVar('realname'), postVar('password'), postVar('email'), postVar('url'), postVar('admin'), postVar('canlogin'), postVar('notes'));
- 		if ( $res != 1 )
+ 		self::action_admintemplateoverview();
+ 		return;
+ 	}
+ 
+ 	/**
+ 	 * Admin::action_skinoverview()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_skinoverview()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		self::$skin->parse('skinoverview');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_skinnew()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_skinnew()
+ 	{
+ 		global $member;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$name = trim(postVar('name'));
+ 		$desc = trim(postVar('desc'));
+ 		
+ 		if ( !isValidSkinName($name) )
+ 		{
+ 			self::error(_ERROR_BADSKINNAME);
+ 			return;
+ 		}
+ 		else if ( SKIN::exists($name) )
  		{
- 			$this->error($res);
+ 			self::error(_ERROR_DUPSKINNAME);
+ 			return;
  		}
  		
- 		// fire PostRegister event
- 		$newmem = new Member();
- 		$newmem->readFromName(postVar('name'));
- 		$manager->notify('PostRegister',array('member' => &$newmem));
+ 		SKIN::createNew($name, $desc);
  		
- 		$this->action_usermanagement();
+ 		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::deleteOneCategory()
- 	 * Delete a category by its id
++	 * Admin::action_skinedit()
 +	 * 
- 	 * @param	String	$catid	category id for deleting
- 	 * @return	Void
++	 * @param	void
++	 * @return	void
 +	 */
- 	function deleteOneCategory($catid)
++	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;
 +		
- 		$catid = intval($catid);
- 		$blogid = getBlogIDFromCatID($catid);
++		$skinid = intRequestVar('skinid');
++		$content = trim(postVar('content'));
++		$type = postVar('type');
 +		
- 		if ( !$member->blogAdminRights($blogid) )
++		$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'] )
 +		{
- 			return ERROR_DISALLOWED;
++			self::error(_ERROR_DEFAULTSKIN);
+ 			return;
  		}
  		
- 		// get blog
- 		$blog =& $manager->getBlog($blogid);
+ 		// 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);
  		
- 		// check if the category is valid
- 		if ( !$blog || !$blog->isValidCategory($catid) )
+ 		$name = DB::getValue($query);
+ 		if ( $name )
  		{
- 			return _ERROR_NOSUCHCATEGORY;
+ 			self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));
+ 			return;
  		}
  		
- 		$destcatid = $blog->getDefaultCategory();
+ 		self::$skin->parse('skindelete');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_skindeleteconfirm()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_skindeleteconfirm()
+ 	{
+ 		global $member, $CONF;
  		
- 		// don't allow deletion of default category
- 		if ( $blog->getDefaultCategory() == $catid )
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$skinid = intRequestVar('skinid');
+ 		
+ 		// don't allow default skin to be deleted
+ 		if ( $skinid == $CONF['BaseSkin'] )
  		{
- 			return _ERROR_DELETEDEFCATEGORY;
+ 			self::error(_ERROR_DEFAULTSKIN);
+ 			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);
+ 		
+ 		$name = DB::getValue($query);
+ 		if ( $name )
+ 				{
+ 			self::error(_ERROR_SKINDEFDELETE . Entity::hsc($name));
+ 			return;
+ 		}
+ 		
+ 		self::skindeleteconfirm($skinid);
+ 		
+ 		self::action_skinoverview();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_skinremovetype()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_skinremovetype()
+ 	{
+ 		global $member, $CONF;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$skinid = intRequestVar('skinid');
+ 		$skintype = requestVar('type');
+ 		
+ 		if ( !isValidShortName($skintype) )
++>>>>>>> skinnable-master
  		{
- 			return _ERROR_DELETELASTCATEGORY;
+ 			self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
+ 			return;
  		}
  		
- 		$manager->notify('PreDeleteCategory', array('catid' => $catid));
+ 		self::$skin->parse('skinremovetype');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_skinremovetypeconfirm()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_skinremovetypeconfirm()
+ 	{
+ 		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
  		
- 		// delete all associated plugin options
- 		NucleusPlugin::delete_option_values('category', $catid);
+ 		$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
  		
- 		$manager->notify('PostDeleteCategory', array('catid' => $catid));
+ 		self::action_skinedit();
  		return;
  	}
  	
  	/**
- 	 * Admin::action_blogsettingsupdate
- 	 * Updating blog settings
+ 	 * Admin::action_skinclone()
  	 * 
- 	 * @param	Void
- 	 * @return	Void
+ 	 * @param	void
+ 	 * @return	void
  	 */
- 	function action_blogsettingsupdate()
+ 	static private function action_skinclone()
  	{
- 		global $member, $manager;
+ 		global $member;
  		
- 		$blogid = intRequestVar('blogid');
+ 		$member->isAdmin() or self::disallow();
  		
- 		$member->blogAdminRights($blogid) or $this->disallow();
+ 		$skinid = intRequestVar('skinid');
  		
- 		$blog =& $manager->getBlog($blogid);
+ 		self::skinclone($skinid);
  		
- 		$notify_address	= trim(postVar('notify'));
- 		$shortname	 	= trim(postVar('shortname'));
- 		$updatefile	= trim(postVar('update'));
+ 		self::action_skinoverview();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_adminskinoverview()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_adminskinoverview()
+ 	{
+ 		global $member;
  		
- 		$notifyComment	= intPostVar('notifyComment');
- 		$notifyVote		= intPostVar('notifyVote');
- 		$notifyNewItem	= intPostVar('notifyNewItem');
+ 		$member->isAdmin() or self::disallow();
  		
- 		if ( $notifyComment == 0 )
+ 		self::$skin->parse('adminskinoverview');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_adminskinnew()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_adminskinnew()
+ 	{
+ 		global $member;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$name = trim(postVar('name'));
+ 		$desc = trim(postVar('desc'));
+ 		
+ 		if ( !isValidSkinName($name) )
  		{
- 			$notifyComment = 1;
+ 			self::error(_ERROR_BADSKINNAME);
+ 			return;
  		}
- 		if ( $notifyVote == 0 )
+ 		else if ( !preg_match('#^admin/#', $name) )
  		{
- 			$notifyVote = 1;
+ 			self::error(_ERROR_BADADMINSKINNAME);
+ 			return;
  		}
- 		if ( $notifyNewItem == 0 )
+ 		else if ( Skin::exists($name) )
  		{
- 			$notifyNewItem = 1;
+ 			self::error(_ERROR_DUPSKINNAME);
+ 			return;
  		}
- 		$notifyType = $notifyComment * $notifyVote * $notifyNewItem;
  		
- 		if ( $notify_address && !NOTIFICATION::address_validation($notify_address) )
+ 		Skin::createNew($name, $desc);
+ 		
+ 		self::action_adminskinoverview();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_adminskinedit()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_adminskinedit()
+ 	{
+ 		global $member;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		self::$skin->parse('adminskinedit');
+ 		
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_adminskineditgeneral()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_adminskineditgeneral()
+ 	{
+ 		global $member;
+ 		
+ 		$skinid = intRequestVar('skinid');
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$error = self::skineditgeneral($skinid, 'AdminActions');
+ 		if ( $error )
  		{
- 			$this->error(_ERROR_BADNOTIFY);
+ 			self::error($error);
+ 			return;
  		}
  		
- 		if ( !isValidShortName($shortname) )
+ 		self::action_adminskinedit();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_adminskinedittype()
+ 	 * 
+ 	 * @param	string	$msg	message for pageheader
+ 	 * @return	void
+ 	 */
+ 	static private function action_adminskinedittype($msg = '')
+ 	{
+ 		global $member;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		if ( $msg )
  		{
- 			$this->error(_ERROR_BADSHORTBLOGNAME);
+ 			self::$headMess = $msg;
  		}
+ 		$type = requestVar('type');
+ 		$type = trim($type);
+ 		$type = strtolower($type);
  		
- 		if ( ($blog->getShortName() != $shortname) && $manager->existsBlog($shortname) )
+ 		if ( !isValidShortName($type) )
  		{
- 			$this->error(_ERROR_DUPSHORTBLOGNAME);
+ 			self::error(_ERROR_SKIN_PARTS_SPECIAL_FORMAT);
+ 			return;
  		}
- 		// check if update file is writable
- 		if ( $updatefile && !is_writeable($updatefile) )
+ 		
+ 		self::$skin->parse('adminskinedittype');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_adminskinupdate()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_adminskinupdate()
+ 	{
+ 		global $manager, $member;
+ 		
+ 		$skinid = intRequestVar('skinid');
+ 		$content = trim(postVar('content'));
+ 		$type = postVar('type');
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$skin =& $manager->getSkin($skinid, 'AdminActions', 'AdminSkin');
+ 		$skin->update($type, $content);
+ 		
+ 		self::action_adminskinedittype(_SKIN_UPDATED);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_adminskindelete()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_adminskindelete()
+ 	{
+ 		global $CONF, $member;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$skinid = intRequestVar('skinid');
+ 		
+ 		// don't allow default skin to be deleted
+ 		if ( $skinid == $CONF['AdminSkin'] || $skinid == $CONF['BookmarkletSkin'] )
  		{
- 			$this->error(_ERROR_UPDATEFILE);
+ 			self::error(_ERROR_DEFAULTSKIN);
+ 			return;
  		}
  		
- 		$blog->setName(trim(postVar('name')));
- 		$blog->setShortName($shortname);
- 		$blog->setNotifyAddress($notify_address);
- 		$blog->setNotifyType($notifyType);
- 		$blog->setMaxComments(postVar('maxcomments'));
- 		$blog->setCommentsEnabled(postVar('comments'));
- 		$blog->setTimeOffset(postVar('timeoffset'));
- 		$blog->setUpdateFile($updatefile);
- 		$blog->setURL(trim(postVar('url')));
- 		$blog->setDefaultSkin(intPostVar('defskin'));
- 		$blog->setDescription(trim(postVar('desc')));
- 		$blog->setPublic(postVar('public'));
- 		$blog->setConvertBreaks(intPostVar('convertbreaks'));
- 		$blog->setAllowPastPosting(intPostVar('allowpastposting'));
- 		$blog->setDefaultCategory(intPostVar('defcat'));
- 		$blog->setSearchable(intPostVar('searchable'));
- 		$blog->setEmailRequired(intPostVar('reqemail'));
- 		$blog->writeSettings();
+ 		/* don't allow if someone use it as a default*/
+ 		$query = 'SELECT * FROM %s WHERE madminskin = %d or mbkmklt = %d;';
+ 		$res = DB::getResult(sprintf($query, sql_table('member'), $skinid, $skinid));
  		
- 		// store plugin options
- 		$aOptions = requestArray('plugoption');
- 		NucleusPlugin::apply_plugin_options($aOptions);
- 		$manager->notify('PostPluginOptionsUpdate',array('context' => 'blog', 'blogid' => $blogid, 'blog' => &$blog));
+ 		$members = array();
+ 		while ( $row = $res->fetch() ) {
+ 			$members[] = $row['mrealname'];
+ 		}
+ 		if ( count($members) )
+ 		{
+ 			self::error(_ERROR_SKINDEFDELETE . implode(' ' . _AND . ' ', $members));
+ 			return;
+ 		}
+ 		
+ 		self::$skin->parse('adminskindelete');
+ 		return;
+ 	}
+ 
+ 	/**
+ 	 * Admin::action_adminskindeleteconfirm()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_adminskindeleteconfirm()
+ 	{
+ 		global $member, $CONF;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$skinid = intRequestVar('skinid');
+ 		
+ 		// don't allow default skin to be deleted
+ 		if ( $skinid == $CONF['AdminSkin'] || $skinid == $CONF['BookmarkletSkin'] )
+ 		{
+ 			self::error(_ERROR_DEFAULTSKIN);
+ 			return;
+ 		}
+ 		
+ 		/* don't allow if someone use it as a default*/
+ 		$query = 'SELECT * FROM %s WHERE madminskin = %d or mbkmklt = %d;';
+ 		$res = DB::getResult(sprintf($query, sql_table('member'), $skinid, $skinid));
+ 		
+ 		$members = array();
+ 		while ( $row = $res->fetch() ) {
+ 			$members[] = $row['mrealname'];
+ 		}
+ 		if ( count($members) )
+ 		{
+ 			self::error(_ERROR_SKINDEFDELETE . implode(' ' . _AND . ' ', $members));
+ 			return;
+ 		}
+ 		
+ 		self::skindeleteconfirm($skinid);
+ 		
+ 		self::action_adminskinoverview();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_adminskinremovetype()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_adminskinremovetype()
+ 	{
+ 		global $member, $CONF;
+ 
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$skinid = intRequestVar('skinid');
+ 		$skintype = requestVar('type');
  		
- 		$this->action_overview(_MSG_SETTINGSCHANGED);
+ 		if ( !isValidShortName($skintype) )
+ 		{
+ 			self::error(_ERROR_SKIN_PARTS_SPECIAL_DELETE);
+ 			return;
+ 		}
+ 		
+ 		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_deleteblogconfirm()
- 	 * Delete Blog
+ 	 * Admin::action_adminskinremovetypeconfirm()
  	 * 
- 	 * @param	Void
- 	 * @return	Void
+ 	 * @param	void
+ 	 * @return	void
  	 */
- 	function action_deleteblogconfirm()
+ 	static private function action_adminskinremovetypeconfirm()
  	{
- 		global $member, $CONF, $manager;
+ 		global $member;
  		
- 		$blogid = intRequestVar('blogid');
- 		$manager->notify('PreDeleteBlog', array('blogid' => $blogid));
- 		$member->blogAdminRights($blogid) or $this->disallow();
+ 		$member->isAdmin() or self::disallow();
  		
- 		// check if blog is default blog
- 		if ( $CONF['DefaultBlog'] == $blogid )
+ 		$skinid = intRequestVar('skinid');
+ 		$skintype = requestVar('type');
+ 		
+ 		$error = self::skinremovetypeconfirm($skinid, $skintype);
+ 		if ( $error )
  		{
- 			$this->error(_ERROR_DELDEFBLOG);
+ 			self::error($error);
+ 			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;
+ 	}
+ 
+ 	/**
+ 	 * Admin::action_adminskinclone()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_adminskinclone()
+ 	{
+ 		global $member;
  		
- 		// delete all associated plugin options
- 		NucleusPlugin::delete_option_values('blog', $blogid);
+ 		$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;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_adminskinieoverview()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_adminskinieoverview()
+ 	{
+ 		global $member;
++>>>>>>> skinnable-master
  		
- 		$manager->notify('PostDeleteBlog', array('blogid' => $blogid));
+ 		$member->isAdmin() or self::disallow();
  		
- 		$this->action_overview(_DELETED_BLOG);
+ 		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
  
-         $memberid = intRequestVar('memberid');
- 
-         ($member->getID() == $memberid) or $member->isAdmin() or $this->disallow();
- 
-         $error = $this->deleteOneMember($memberid);
-         if ($error)
-             $this->error($error);
- 
-         if ($member->isAdmin())
-             $this->action_usermanagement();
-         else
-             $this->action_overview(_DELETED_MEMBER);
-     }
- 	
  	/**
- 	 * Admin::deleteOneMember()
- 	 * Delete a member by id
+ 	 * Admin::action_adminskinieimport()
  	 * 
- 	 * @static
- 	 * @params	Integer	$memberid	member id
- 	 * @return	String	null string or error messages
+ 	 * @param	void
+ 	 * @return	void
  	 */
- 	function deleteOneMember($memberid)
+ 	static private function action_adminskinieimport()
  	{
- 		global $manager;
+ 		global $member;
  		
++<<<<<<< HEAD
 +		$memberid = intval($memberid);
 +		$mem =& $manager->getMember($memberid);
 +		
 +		if ( !$mem->canBeDeleted() )
 +		{
 +			return _ERROR_DELETEMEMBER;
 +		}
++=======
+ 		$member->isAdmin() or self::disallow();
++>>>>>>> skinnable-master
  		
- 		$manager->notify('PreDeleteMember', array('member' => &$mem));
+ 		$skinFileRaw = postVar('skinfile');
+ 		$mode = postVar('mode');
  		
- 		/* unlink comments from memberid */
- 		if ( $memberid )
+ 		$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::addToTemplate()
- 	 * 
- 	 * @param	Integer	$id	ID for template
- 	 * @param	String	$partname	parts name
- 	 * @param	String	$content	template contents
- 	 * @return	Integer	record index
++	 * Admin::action_adminskiniedoimport()
 +	 * 
++	 * @param	void
++	 * @return	void
 +	 */
- 	function addToTemplate($id, $partname, $content)
++	static private function action_adminskiniedoimport()
 +	{
- 		// don't add empty parts:
- 		if ( !trim($content) )
++		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 )
  		{
- 			return -1;
 -			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;
+ 			$query	= "SELECT min(sdnumber) FROM %s WHERE sdname != 'admin/bookmarklet' AND sdname LIKE 'admin/%%'";
+ 			$query	= sprintf($query, sql_table('skin_desc'));
+ 			$res	= intval(DB::getValue($query));
+ 			$query	= "UPDATE %s SET value = %d WHERE name = 'AdminSkin'";
+ 			$query	= sprintf($query, sql_table('config'), $res);
+ 			DB::execute($query);
+ 			if ( $res )
+ 			{
+ 				redirect($CONF['AdminURL']);
+ 				exit;
+ 			}
+ 			$skin	= new Skin(0, 'AdminActions', 'AdminSkin');
+ 			$skin->parse('importAdmin', $DIR_SKINS . 'admin/defaultimporter.skn');
+ 		}
+ 		else
+ 		{
+ 			self::$skin->parse('adminskiniedoimport');
+ 		}
+ 		return;
+ 	}
++>>>>>>> skinnable-master
  
  	/**
- 	 * Admin::skinclonetype()
+ 	 * Admin::action_adminskinieexport()
  	 * 
- 	 * @param	String	$skin	Skin object
- 	 * @param	Integer	$newid	ID for this clone
- 	 * @param	String	$type	type of skin
- 	 * @return	Void
+ 	 * @param	void
+ 	 * @return	void
  	 */
- 	function skinclonetype($skin, $newid, $type)
+ 	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();
+ 		
+ 		// load skinie class
+ 		$aSkins = requestIntArray('skin');
+ 		$aTemplates = requestIntArray('template');
+ 		$info = postVar('info');
+ 		
+ 		self::skinieexport($aSkins, $aTemplates, $info);
+ 		
++>>>>>>> skinnable-master
  		return;
  	}
  	
@@@ -5097,337 -4253,14 +8864,346 @@@
  	 * @param	Void
  	 * @return	Void
  	 */
- 	function action_settingsedit() {
+ 	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
  	}
  	
  	/**
@@@ -5437,61 -4270,65 +9213,65 @@@
  	 * @param	void
  	 * @return	void
  	 */
- 	function action_settingsupdate() {
+ 	static private function action_settingsupdate()
+ 	{
  		global $member, $CONF;
  		
- 		$member->isAdmin() or $this->disallow();
+ 		$member->isAdmin() or self::disallow();
  		
  		// check if email address for admin is valid
  		if ( !NOTIFICATION::address_validation(postVar('AdminEmail')) )
  		{
- 			$this->error(_ERROR_BADMAILADDRESS);
+ 			self::error(_ERROR_BADMAILADDRESS);
+ 			return;
  		}
  		
  		// save settings
- 		$this->updateConfig('DefaultBlog',	  postVar('DefaultBlog'));
- 		$this->updateConfig('BaseSkin',		 postVar('BaseSkin'));
- 		$this->updateConfig('IndexURL',		 postVar('IndexURL'));
- 		$this->updateConfig('AdminURL',		 postVar('AdminURL'));
- 		$this->updateConfig('PluginURL',		postVar('PluginURL'));
- 		$this->updateConfig('SkinsURL',		 postVar('SkinsURL'));
- 		$this->updateConfig('ActionURL',		postVar('ActionURL'));
- 		$this->updateConfig('Locale',		   postVar('Locale'));
- 		$this->updateConfig('AdminEmail',	   postVar('AdminEmail'));
- 		$this->updateConfig('SessionCookie',	postVar('SessionCookie'));
- 		$this->updateConfig('AllowMemberCreate',postVar('AllowMemberCreate'));
- 		$this->updateConfig('AllowMemberMail',  postVar('AllowMemberMail'));
- 		$this->updateConfig('NonmemberMail',	postVar('NonmemberMail'));
- 		$this->updateConfig('ProtectMemNames',  postVar('ProtectMemNames'));
- 		$this->updateConfig('SiteName',		 postVar('SiteName'));
- 		$this->updateConfig('NewMemberCanLogon',postVar('NewMemberCanLogon'));
- 		$this->updateConfig('DisableSite',	  postVar('DisableSite'));
- 		$this->updateConfig('DisableSiteURL',   postVar('DisableSiteURL'));
- 		$this->updateConfig('LastVisit',		postVar('LastVisit'));
- 		$this->updateConfig('MediaURL',		 postVar('MediaURL'));
- 		$this->updateConfig('AllowedTypes',	 postVar('AllowedTypes'));
- 		$this->updateConfig('AllowUpload',	  postVar('AllowUpload'));
- 		$this->updateConfig('MaxUploadSize',	postVar('MaxUploadSize'));
- 		$this->updateConfig('MediaPrefix',	  postVar('MediaPrefix'));
- 		$this->updateConfig('AllowLoginEdit',   postVar('AllowLoginEdit'));
- 		$this->updateConfig('DisableJsTools',   postVar('DisableJsTools'));
- 		$this->updateConfig('CookieDomain',	 postVar('CookieDomain'));
- 		$this->updateConfig('CookiePath',	   postVar('CookiePath'));
- 		$this->updateConfig('CookieSecure',	 postVar('CookieSecure'));
- 		$this->updateConfig('URLMode',		  postVar('URLMode'));
- 		$this->updateConfig('CookiePrefix',	 postVar('CookiePrefix'));
- 		$this->updateConfig('DebugVars',			postVar('DebugVars'));
- 		$this->updateConfig('DefaultListSize',		  postVar('DefaultListSize'));
- 		$this->updateConfig('AdminCSS',		  postVar('AdminCSS'));
- 		
+ 		self::updateConfig('DefaultBlog',		postVar('DefaultBlog'));
+ 		self::updateConfig('BaseSkin',			postVar('BaseSkin'));
+ 		self::updateConfig('IndexURL',			postVar('IndexURL'));
+ 		self::updateConfig('AdminURL',			postVar('AdminURL'));
+ 		self::updateConfig('PluginURL',			postVar('PluginURL'));
+ 		self::updateConfig('SkinsURL',			postVar('SkinsURL'));
+ 		self::updateConfig('ActionURL',			postVar('ActionURL'));
+ 		self::updateConfig('Locale',			postVar('Locale'));
+ 		self::updateConfig('AdminEmail',		postVar('AdminEmail'));
+ 		self::updateConfig('SessionCookie',		postVar('SessionCookie'));
+ 		self::updateConfig('AllowMemberCreate',	postVar('AllowMemberCreate'));
+ 		self::updateConfig('AllowMemberMail',	postVar('AllowMemberMail'));
+ 		self::updateConfig('NonmemberMail',		postVar('NonmemberMail'));
+ 		self::updateConfig('ProtectMemNames',	postVar('ProtectMemNames'));
+ 		self::updateConfig('SiteName',			postVar('SiteName'));
+ 		self::updateConfig('NewMemberCanLogon',	postVar('NewMemberCanLogon'));
+ 		self::updateConfig('DisableSite',		postVar('DisableSite'));
+ 		self::updateConfig('DisableSiteURL',	postVar('DisableSiteURL'));
+ 		self::updateConfig('LastVisit',			postVar('LastVisit'));
+ 		self::updateConfig('MediaURL',			postVar('MediaURL'));
+ 		self::updateConfig('AllowedTypes',		postVar('AllowedTypes'));
+ 		self::updateConfig('AllowUpload',		postVar('AllowUpload'));
+ 		self::updateConfig('MaxUploadSize',		postVar('MaxUploadSize'));
+ 		self::updateConfig('MediaPrefix',		postVar('MediaPrefix'));
+ 		self::updateConfig('AllowLoginEdit',	postVar('AllowLoginEdit'));
+ 		self::updateConfig('DisableJsTools',	postVar('DisableJsTools'));
+ 		self::updateConfig('CookieDomain',		postVar('CookieDomain'));
+ 		self::updateConfig('CookiePath',		postVar('CookiePath'));
+ 		self::updateConfig('CookieSecure',		postVar('CookieSecure'));
+ 		self::updateConfig('URLMode',			postVar('URLMode'));
+ 		self::updateConfig('CookiePrefix',		postVar('CookiePrefix'));
+ 		self::updateConfig('DebugVars',			postVar('DebugVars'));
+ 		self::updateConfig('DefaultListSize',	postVar('DefaultListSize'));
+ 		self::updateConfig('AdminCSS',			postVar('AdminCSS'));
+ 		self::updateConfig('AdminSkin',			postVar('adminskin'));
+ 		self::updateConfig('BookmarkletSkin',	postVar('bookmarklet'));
+ 
  		// load new config and redirect (this way, the new locale will be used is necessary)
  		// note that when changing cookie settings, this redirect might cause the user
  		// to have to log in again.
  		getConfig();
  		redirect($CONF['AdminURL'] . '?action=manage');
- 		exit;
+ 		return;
  	}
- 
+ 	
  	/**
  	 * Admin::action_systemoverview()
  	 * Output system overview
@@@ -5499,188 -4336,12 +9279,193 @@@
  	 * @param	void
  	 * @return	void
  	 */
- 	function action_systemoverview()
+ 	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
  	}
- 
+ 	
  	/**
  	 * Admin::updateConfig()
  	 * 
@@@ -5688,35 -4349,30 +9473,42 @@@
  	 * @param	string	$val	
  	 * @return	integer	return the ID in which the latest query posted
  	 */
- 	function updateConfig($name, $val)
+ 	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();
  	}
  	
  	/**
+ 	 * Admin::error()
  	 * Error message
- 	 * @param string $msg message that will be shown
+ 	 * 
+ 	 * @param	string	$msg	message that will be shown
+ 	 * @return	void
  	 */
- 	function error($msg)
+ 	static public function error($msg)
  	{
- 		$this->pagehead();
- 		
- 		echo "<h2>Error!</h2>\n";
- 		echo $msg;
- 		echo "<br />\n";
- 		echo '<a href="index.php" onclick="history.back()">' . _BACK . "</a>\n";
- 		$this->pagefoot();
- 		exit;
+ 		self::$headMess = $msg;
+ 		self::$skin->parse('adminerrorpage');
+ 		return;
  	}
  	
  	/**
@@@ -5726,637 -4382,276 +9518,713 @@@
  	 * @param	void
  	 * @return	void
  	 */
- 	function disallow()
+ 	static public function disallow()
  	{
  		ActionLog::add(WARNING, _ACTIONLOG_DISALLOWED . serverVar('REQUEST_URI'));
- 		$this->error(_ERROR_DISALLOWED);
+ 		self::error(_ERROR_DISALLOWED);
+ 		return;
+ 	}
+ 
+ 	/**
+ 	 * Admin::action_PluginAdmin()
+ 	 * Output pluginadmin
+ 	 *
+ 	 * @param	string	$skinContents
+ 	 * @param	string	$extrahead
+ 	 * @return	void
+ 	 */
+ 	static public function action_PluginAdmin($skinContents, $extrahead = '')
+ 	{
+ 		self::$extrahead .= $extrahead;
+ 		self::$skin->parse('pluginadmin', $skinContents);
+ 		return;
  	}
  	
  	/**
- 	 * Admin::pagehead()
- 	 * Output admin page head
+ 	 * Admin::action_bookmarklet()
  	 * 
  	 * @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
  		
- 		if (array_key_exists('codename', $nucleus) && $nucleus['codename'] != '' )
- 		{
- 			$codenamestring = ' &quot;' . $nucleus['codename'].'&quot;';
- 		}
- 		else
- 		{
- 			$codenamestring = '';
- 		}
+ 		$blogid = intRequestVar('blogid');
+ 		$member->teamRights($blogid) or self::disallow();
  		
- 		if ( $member->isLoggedIn() && $member->isAdmin() )
- 		{
- 			$checkURL = sprintf(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_URL, getNucleusVersion(), getNucleusPatchLevel());
- 			echo '<a href="' . $checkURL . '" title="' . _ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE . '">Nucleus CMS ' . $nucleus['version'] . $codenamestring . '</a>';
- 			
- 			$newestVersion = getLatestVersion();
- 			$newestCompare = str_replace('/','.',$newestVersion);
- 			$currentVersion = str_replace(array('/','v'),array('.',''),$nucleus['version']);
- 			if ( $newestVersion && version_compare($newestCompare, $currentVersion) > 0 )
- 			{
- 				echo "<br />\n";
- 				echo '<a style="color:red" href="http://nucleuscms.org/upgrade.php" title="' . _ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TITLE . '">';
- 				echo _ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TEXT . $newestVersion;
- 				echo "</a>";
- 			}
- 		}
- 		else
- 		{
- 			echo 'Nucleus CMS ' . $nucleus['version'] . $codenamestring;
- 		}
- 		echo ')';
- 		echo '</div>';
+ 		self::$skin->parse('bookmarklet');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_actionlog()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_actionlog()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		self::$skin->parse('actionlog');
  		return;
  	}
  	
  	/**
- 	 * Admin::pagefoot()
- 	 * Output admin page foot include quickmenu
+ 	 * Admin::action_banlist()
  	 * 
  	 * @param	void
  	 * @return	void
  	 */
- 	function pagefoot()
+ 	static private function action_banlist()
  	{
- 		global $action, $member, $manager;
+ 		global $member, $manager;
  		
- 		$manager->notify(
- 			'AdminPrePageFoot',
- 			array('action' => $this->action)
- 		);
+ 		$blogid = intRequestVar('blogid');
+ 		$member->blogAdminRights($blogid) or self::disallow();
  		
- 		if ( $member->isLoggedIn() && ($action != 'showlogin') )
- 		{
- 			echo '<h2>' . _LOGOUT . "</h2>\n";
- 			echo "<ul>\n";
- 			echo '<li><a href="index.php?action=overview">' . _BACKHOME . "</a></li>\n";
- 			echo '<li><a href="index.php?action=logout">' .  _LOGOUT . "</a></li>\n";
- 			echo "</ul>\n";
- 		}
+ 		self::$skin->parse('banlist');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_banlistdelete()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_banlistdelete()
+ 	{
+ 		global $member, $manager;
  		
- 		echo "<div class=\"foot\">\n";
- 		echo '<a href="' . _ADMINPAGEFOOT_OFFICIALURL . '">Nucleus CMS</a> &copy; 2002-' . date('Y') . ' ' . _ADMINPAGEFOOT_COPYRIGHT;
- 		echo '-';
- 		echo '<a href="' . _ADMINPAGEFOOT_DONATEURL . '">' . _ADMINPAGEFOOT_DONATE . "</a>\n";
- 		echo "</div>\n";
+ 		$blogid = intRequestVar('blogid');
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		self::$skin->parse('banlistdelete');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_banlistdeleteconfirm()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_banlistdeleteconfirm()
+ 	{
+ 		global $member, $manager;
  		
- 		echo "<!-- content -->\n";
- 		echo "<div id=\"quickmenu\">\n";
+ 		$blogid		= intPostVar('blogid');
+ 		$allblogs	= postVar('allblogs');
+ 		$iprange	= postVar('iprange');
  		
- 		if ( ($action != 'showlogin') && ($member->isLoggedIn()) )
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		$deleted = array();
+ 		
+ 		if ( !$allblogs )
  		{
- 			echo "<ul>\n";
- 			echo '<li><a href="index.php?action=overview">' . _QMENU_HOME . "</a></li>\n";
- 			echo "</ul>\n";
- 			
- 			echo '<h2>' . _QMENU_ADD . "</h2>\n";
- 			echo "<form method=\"get\" action=\"index.php\">\n";
- 			echo "<p>\n";
- 			echo "<input type=\"hidden\" name=\"action\" value=\"createitem\" />\n";
- 			
- 			$showAll = requestVar('showall');
- 			
- 			if ( ($member->isAdmin()) && ($showAll == 'yes') )
- 			{
- 				// Super-Admins have access to all blogs! (no add item support though)
- 				$query =  'SELECT bnumber as value, bname as text'
- 						. ' FROM ' . sql_table('blog')
- 						. ' ORDER BY bname';
- 			}
- 			else
+ 			if ( Ban::removeBan($blogid, $iprange) )
  			{
- 				$query =  'SELECT bnumber as value, bname as text'
- 						. ' FROM ' . sql_table('blog') . ', ' . sql_table('team')
- 						. ' WHERE tblog=bnumber and tmember=' . $member->getID()
- 						. ' ORDER BY bname';
+ 				$deleted[] = $blogid;
  			}
- 			$template['name'] = 'blogid';
- 			$template['tabindex'] = 15000;
- 			$template['extra'] = _QMENU_ADD_SELECT;
- 			$template['selected'] = -1;
- 			$template['shorten'] = 10;
- 			$template['shortenel'] = '';
- 			$template['javascript'] = 'onchange="return form.submit()"';
- 			showlist($query,'select',$template);
- 			
- 			echo "</p>\n";
- 			echo "</form>\n";
- 			
- 			echo "<h2>{$member->getDisplayName()}</h2>\n";
- 			echo "<ul>\n";
- 			echo '<li><a href="index.php?action=editmembersettings">' . _QMENU_USER_SETTINGS . "</a></li>\n";
- 			echo '<li><a href="index.php?action=browseownitems">' . _QMENU_USER_ITEMS . "</a></li>\n";
- 			echo '<li><a href="index.php?action=browseowncomments">' . _QMENU_USER_COMMENTS . "</a></li>\n";
- 			echo "</ul>\n";
- 			
- 			// ---- general settings ----
- 			if ( $member->isAdmin() )
- 			{
- 				echo '<h2>' . _QMENU_MANAGE . "</h2>\n";
- 				echo "<ul>\n";
- 				echo '<li><a href="index.php?action=actionlog">' . _QMENU_MANAGE_LOG . "</a></li>\n";
- 				echo '<li><a href="index.php?action=settingsedit">' . _QMENU_MANAGE_SETTINGS . "</a></li>\n";
- 				echo '<li><a href="index.php?action=systemoverview">' . _QMENU_MANAGE_SYSTEM . "</a></li>\n";
- 				echo '<li><a href="index.php?action=usermanagement">' . _QMENU_MANAGE_MEMBERS . "</a></li>\n";
- 				echo '<li><a href="index.php?action=createnewlog">' . _QMENU_MANAGE_NEWBLOG . "</a></li>\n";
- 				echo '<li><a href="index.php?action=backupoverview">' . _QMENU_MANAGE_BACKUPS . "</a></li>\n";
- 				echo '<li><a href="index.php?action=pluginlist">' . _QMENU_MANAGE_PLUGINS . "</a></li>\n";
- 				echo "</ul>\n";
- 				
- 				echo "<h2>" . _QMENU_LAYOUT . "</h2>\n";
- 				echo "<ul>\n";
- 				echo '<li><a href="index.php?action=skinoverview">' . _QMENU_LAYOUT_SKINS . "</a></li>\n";
- 				echo '<li><a href="index.php?action=templateoverview">' . _QMENU_LAYOUT_TEMPL . "</a></li>\n";
- 				echo '<li><a href="index.php?action=skinieoverview">' . _QMENU_LAYOUT_IEXPORT . "</a></li>\n";
- 				echo "</ul>\n";
- 			}
- 			
- 			$aPluginExtras = array();
- 			$manager->notify(
- 				'QuickMenu',
- 				array(
- 					'options' => &$aPluginExtras));
- 			
- 			if ( count($aPluginExtras) > 0 )
+ 		}
+ 		else
+ 		{
+ 			// get blogs fot which member has admin rights
+ 			$adminblogs = $member->getAdminBlogs();
+ 			foreach ($adminblogs as $blogje)
  			{
- 				echo "<h2>" . _QMENU_PLUGINS . "</h2>\n";
- 				echo "<ul>\n";
- 				foreach ( $aPluginExtras as $aInfo )
+ 				if ( Ban::removeBan($blogje, $iprange) )
  				{
- 					echo '<li><a href="' . Entity::hsc($aInfo['url']) . '" title="' . Entity::hsc($aInfo['tooltip']) . '">' . Entity::hsc($aInfo['title']) . "</a></li>\n";
+ 					$deleted[] = $blogje;
  				}
- 				echo "</ul>\n";
  			}
  		}
- 		else if ( ($action == 'activate') || ($action == 'activatesetpwd') )
- 		{
  		
- 			echo '<h2>' . _QMENU_ACTIVATE . '</h2>' . _QMENU_ACTIVATE_TEXT;
- 		}
- 		else
+ 		if ( sizeof($deleted) == 0 )
  		{
- 			// introduction text on login screen
- 			echo '<h2>' . _QMENU_INTRO . '</h2>' . _QMENU_INTRO_TEXT;
+ 			self::error(_ERROR_DELETEBAN);
+ 			return;
  		}
  		
- 		echo "<!-- quickmenu -->\n";
- 		echo "</div>\n";
- 		
- 		echo "<!-- content -->\n";
- 		echo "</div>\n";
- 		
- 		echo "<!-- container -->\n";
- 		echo "</div>\n";
- 		
- 		echo "<!-- adminwrapper -->\n";
- 		echo "</div>\n";
+ 		/* TODO: we should use other ways */
+ 		$_REQUEST['delblogs'] = $deleted;
  		
- 		echo "</body>\n";
- 		echo "</html>\n";
+ 		self::$skin->parse('banlistdeleteconfirm');
  		return;
  	}
  	
  	/**
++<<<<<<< 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;
+ 		
+ 		$itemid = intRequestVar('itemid');
+ 		$item =& $manager->getItem($itemid, 1, 1);
+ 		self::action_banlistnew($item['blogid']);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_banlistnew()
+ 	 * 
+ 	 * @param	integer	$blogid	ID for weblog
+ 	 * @return	void
+ 	 */
+ 	static private function action_banlistnew($blogid = '')
+ 	{
+ 		global $member, $manager;
+ 		
+ 		if ( $blogid == '' )
+ 		{
+ 			$blogid = intRequestVar('blogid');
+ 		}
+ 		
+ 		$ip = requestVar('ip');
+ 		
+ 		$member->blogAdminRights($blogid) or self::disallow();
+ 		
+ 		/* TODO: we should consider to use the other way instead of this */
+ 		$_REQUEST['blogid'] = $blogid;		
+ 		
+ 		self::$skin->parse('banlistnew');
+ 		
+ 		return;
+ 	}
++>>>>>>> skinnable-master
  
-         <?php       $this->pagefoot();
-     }
+ 	/**
+ 	 * Admin::action_banlistadd()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private 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 self::disallow();
+ 		
+ 		// TODO: check IP range validity
+ 		
+ 		if ( !$allblogs )
+ 		{
+ 			if ( !Ban::addBan($blogid, $iprange, $reason) )
+ 			{
+ 				self::error(_ERROR_ADDBAN);
+ 				return;
+ 			}
+ 		}
+ 		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 )
+ 			{
+ 				self::error(_ERROR_ADDBAN);
+ 				return;
+ 			}
+ 		}
+ 		self::action_banlist();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_clearactionlog()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_clearactionlog()
+ 	{
+ 		global $member;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		ActionLog::clear();
+ 		
+ 		self::action_manage(_MSG_ACTIONLOGCLEARED);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_backupoverview()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_backupoverview()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		self::$skin->parse('backupoverview');
+ 		return;
+ 	}
  
  	/**
  	 * Admin::action_backupcreate()
@@@ -6366,11 -4661,11 +10234,11 @@@
  	 * @return	void
  	 * 
  	 */
- 	function action_backupcreate()
+ 	static private function action_backupcreate()
  	{
  		global $member, $DIR_LIBS;
  		
- 		$member->isAdmin() or $this->disallow();
+ 		$member->isAdmin() or self::disallow();
  		
  		// use compression ?
  		$useGzip = (integer) postVar('gzip');
@@@ -6382,7 -4677,7 +10250,7 @@@
  		@set_time_limit(1200);
  		
  		Backup::do_backup($useGzip);
- 		exit;
+ 		return;
  	}
  	
  	/**
@@@ -6392,15 -4687,16 +10260,16 @@@
  	 * @param		void
  	 * @return	void
  	 */
- 	function action_backuprestore()
+ 	static private function action_backuprestore()
  	{
  		global $member, $DIR_LIBS;
  		
- 		$member->isAdmin() or $this->disallow();
+ 		$member->isAdmin() or self::disallow();
  		
  		if ( intPostVar('letsgo') != 1 )
  		{
- 			$this->error(_ERROR_BACKUP_NOTSURE);
+ 			self::error(_ERROR_BACKUP_NOTSURE);
+ 			return;
  		}
  		
  		include($DIR_LIBS . 'backup.php');
@@@ -6412,11 -4708,10 +10281,10 @@@
  		$message = Backup::do_restore();
  		if ( $message != '' )
  		{
- 			$this->error($message);
+ 			self::error($message);
+ 			return;
  		}
- 		$this->pagehead();
- 		echo '<h2>' . _RESTORE_COMPLETE . "</h2>\n";
- 		$this->pagefoot();
+ 		self::$skin->parse('backuprestore');
  		return;
  	}
  	
@@@ -6428,128 -4723,42 +10296,101 @@@
  	 * @return	void
  	 * 
  	 */
- 	function action_pluginlist()
+ 	static private function action_pluginlist()
  	{
  		global $DIR_PLUGINS, $member, $manager;
  		
  		// check if allowed
- 		$member->isAdmin() or $this->disallow();
+ 		$member->isAdmin() or self::disallow();
  		
- 		$this->pagehead();
- 		
- 		echo '<p><a href="index.php?action=manage">(',_BACKTOMANAGE,')</a></p>';
- 		
- 		echo '<h2>' , _PLUGS_TITLE_MANAGE , ' ', help('plugins'), '</h2>';
- 		
- 		echo '<h3>' , _PLUGS_TITLE_INSTALLED , ' &nbsp;&nbsp;<span style="font-size:smaller">', helplink('getplugins'), _PLUGS_TITLE_GETPLUGINS, '</a></span></h3>';
- 		
- 		$query =  'SELECT * FROM '.sql_table('plugin').' ORDER BY porder ASC';
- 		
- 		$template['content'] = 'pluginlist';
- 		$template['tabindex'] = 10;
- 		showlist($query, 'table', $template);
- 		
- 		echo '<h3>' . _PLUGS_TITLE_UPDATE . "</h3>\n";
- 		echo '<p>' . _PLUGS_TEXT_UPDATE . "</p>\n";
- 		echo '<form method="post" action="index.php">' . "\n";
- 		echo "<div>\n";
- 		echo '<input type="hidden" name="action" value="pluginupdate" />' . "\n";
- 		$manager->addTicketHidden();
- 		echo '<input type="submit" value="' . _PLUGS_BTN_UPDATE . '" tabindex="20" />' . "\n";
- 		echo "</div>\n";
- 		echo "</form>\n";
- 		
- 		echo '<h3>' . _PLUGS_TITLE_NEW . "</h3>\n";
- 		
- 		// find a list of possibly non-installed plugins
- 		$candidates = array();
- 		$dirhandle = opendir($DIR_PLUGINS);
+ 		self::$skin->parse('pluginlist');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_pluginhelp()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_pluginhelp()
+ 	{
+ 		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
  		
- 		closedir($dirhandle);
+ 		$plugid = intGetVar('plugid');
  		
- 		if ( sizeof($candidates) > 0 )
- 		{
- 			echo '<p>' . _PLUGS_ADD_TEXT . "</p>\n";
- 			
- 			echo '<form method="post" action="index.php">' . "\n";
- 			echo "<div>\n";
- 			echo '<input type="hidden" name="action" value="pluginadd" />' . "\n";
- 			$manager->addTicketHidden();
- 			echo '<select name="filename" tabindex="30">' . "\n";
- 			
- 			foreach ( $candidates as $name )
- 			{
- 				echo '<option value="NP_',$name,'">',Entity::hsc($name),'</option>';
- 			}
- 			
- 			echo "</select>\n";
- 			echo '<input type="submit" tabindex="40" value="' . _PLUGS_BTN_INSTALL ."\" />\n";
- 			echo "</div>\n";
- 			echo "</form>\n";
- 		}
- 		else
+ 		if ( !$manager->pidInstalled($plugid) )
  		{
- 			echo '<p>', _PLUGS_NOCANDIDATES, '</p>';
+ 			self::error(_ERROR_NOSUCHPLUGIN);
+ 			return;
  		}
  		
- 		$this->pagefoot();
+ 		self::$skin->parse('pluginhelp');
  		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()
  	 * 
@@@ -6557,325 -4766,358 +10398,590 @@@
  	 * @return	Void
  	 * 
  	 */
- 	function action_pluginadd()
+ 	static private function action_pluginadd()
  	{
  		global $member, $manager, $DIR_PLUGINS;
  		
  		// check if allowed
- 		$member->isAdmin() or $this->disallow();
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$name = postVar('filename');
+ 		
+ 		if ( $manager->pluginInstalled($name) )
+ 		{
+ 			self::error(_ERROR_DUPPLUGIN);
+ 			return;
+ 		}
+ 		
+ 		if ( !checkPlugin($name) )
+ 		{
+ 			self::error(_ERROR_PLUGFILEERROR . ' (' . Entity::hsc($name) . ')');
+ 			return;
+ 		}
+ 		
+ 		// 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
+ 		$newOrder = $numCurrent + 1;
+ 		
+ 		$data = array('file' => &$name);
+ 		$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();
+ 		
+ 		$manager->clearCachedInfo('installedPlugins');
+ 		
+ 		// Load the plugin for condition checking and instalation
+ 		$plugin =& $manager->getPlugin($name);
+ 		
+ 		// 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;
+ 		}
+ 		
+ 		// check if plugin needs a newer Nucleus version
+ 		if ( getNucleusVersion() < $plugin->getMinNucleusVersion() )
+ 		{
+ 			// uninstall plugin again...
+ 			self::deleteOnePlugin($plugin->getID());
+ 			
+ 			// ...and show error
+ 			self::error(_ERROR_NUCLEUSVERSIONREQ . Entity::hsc($plugin->getMinNucleusVersion()));
+ 			return;
+ 		}
+ 		
+ 		// check if plugin needs a newer Nucleus version
+ 		if ( (getNucleusVersion() == $plugin->getMinNucleusVersion()) && (getNucleusPatchLevel() < $plugin->getMinNucleusPatchLevel()) )
+ 		{
+ 			// uninstall plugin again...
+ 			self::deleteOnePlugin($plugin->getID());
+ 			
+ 			// ...and show error
+ 			self::error(_ERROR_NUCLEUSVERSIONREQ . Entity::hsc( $plugin->getMinNucleusVersion() . ' patch ' . $plugin->getMinNucleusPatchLevel() ) );
+ 			return;
+ 		}
+ 		
+ 		$pluginList = $plugin->getPluginDep();
+ 		foreach ( $pluginList as $pluginName )
+ 		{
+ 			$res = DB::getResult('SELECT * FROM '.sql_table('plugin') . ' WHERE pfile=' . DB::quoteValue($pluginName));
+ 			if ($res->rowCount() == 0)
+ 			{
+ 				// uninstall plugin again...
+ 				self::deleteOnePlugin($plugin->getID());
+ 				self::error(sprintf(_ERROR_INSREQPLUGIN, Entity::hsc($pluginName)));
+ 				return;
+ 			}
+ 		}
+ 		
+ 		// call the install method of the plugin
+ 		$plugin->install();
+ 		
+ 		$data = array('plugin' => &$plugin);
+ 		$manager->notify('PostAddPlugin', $data);
+ 		
+ 		// update all events
+ 		self::action_pluginupdate();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * ADMIN:action_pluginupdate():
+ 	 * 
+ 	 * @param	Void
+ 	 * @return	Void
+ 	 * 
+ 	 */
+ 	static private function action_pluginupdate()
+ 	{
+ 		global $member, $manager, $CONF;
+ 		
+ 		// check if allowed
+ 		$member->isAdmin() or self::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);
+ 				}
+ 			}
+ 		}
+ 		redirect($CONF['AdminURL'] . '?action=pluginlist');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_plugindelete()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_plugindelete()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		// check if allowed
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$pid = intGetVar('plugid');
+ 		
+ 		if ( !$manager->pidInstalled($pid) )
+ 		{
+ 			self::error(_ERROR_NOSUCHPLUGIN);
+ 			return;
+ 		}
+ 		
+ 		self::$skin->parse('plugindelete');
+ 		return;
+ 	}
+ 
+ 	/**
+ 	 * Admin::action_plugindeleteconfirm()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_plugindeleteconfirm()
+ 	{
+ 		global $member, $manager, $CONF;
+ 		
+ 		// check if allowed
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$pid = intPostVar('plugid');
+ 		
+ 		$error = self::deleteOnePlugin($pid, 1);
+ 		if ( $error )
+ 		{
+ 			self::error($error);
+ 			return;
+ 		}
+ 		
+ 		redirect($CONF['AdminURL'] . '?action=pluginlist');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::deleteOnePlugin()
+ 	 * 
+ 	 * @param	integer	$pid
+ 	 * @param	boolean	$callUninstall
+ 	 * @return	string	empty or message if failed
+ 	 */
+ 	static public function deleteOnePlugin($pid, $callUninstall = 0)
+ 	{
+ 		global $manager;
  		
- 		$name = postVar('filename');
+ 		$pid = intval($pid);
  		
- 		if ( $manager->pluginInstalled($name) )
+ 		if ( !$manager->pidInstalled($pid) )
  		{
- 			$this->error(_ERROR_DUPPLUGIN);
+ 			return _ERROR_NOSUCHPLUGIN;
  		}
  		
- 		if ( !checkPlugin($name) )
+ 		$query = "SELECT pfile as result FROM %s WHERE pid=%d;";
+ 		$query = sprintf($query, sql_table('plugin'), (integer) $pid);
+ 		$name = DB::getValue($query);
+ 		
+ 		// check dependency before delete
+ 		$res = DB::getResult('SELECT pfile FROM ' . sql_table('plugin'));
+ 		foreach ( $res as $row )
  		{
- 			$this->error(_ERROR_PLUGFILEERROR . ' (' . Entity::hsc($name) . ')');
+ 			$plug =& $manager->getPlugin($row['pfile']);
+ 			if ( $plug )
+ 			{
+ 				$depList = $plug->getPluginDep();
+ 				foreach ( $depList as $depName )
+ 				{
+ 					if ( $name == $depName )
+ 					{
+ 						return sprintf(_ERROR_DELREQPLUGIN, $row['pfile']);
+ 					}
+ 				}
+ 			}
  		}
  		
- 		// get number of currently installed plugins
- 		$res = DB::getResult('SELECT * FROM '.sql_table('plugin'));
- 		$numCurrent = $res->rowCount();
- 		
- 		// plugin will be added as last one in the list
- 		$newOrder = $numCurrent + 1;
- 		
- 		$manager->notify(
- 			'PreAddPlugin',
- 			array(
- 				'file' => &$name
- 			)
- 		);
- 		
- 		// do this before calling getPlugin (in case the plugin id is used there)
- 		$query = 'INSERT INTO '.sql_table('plugin').' (porder, pfile) VALUES ('.$newOrder.','.DB::quoteValue($name).')';
- 		DB::execute($query);
- 		$iPid = DB::getInsertId();
- 		
- 		$manager->clearCachedInfo('installedPlugins');
- 		
- 		// Load the plugin for condition checking and instalation
- 		$plugin =& $manager->getPlugin($name);
+ 		$data = array('plugid' => $pid);
+ 		$manager->notify('PreDeletePlugin', $data);
  		
- 		// check if it got loaded (could have failed)
- 		if ( !$plugin )
+ 		// call the unInstall method of the plugin
+ 		if ( $callUninstall )
  		{
- 			DB::execute('DELETE FROM ' . sql_table('plugin') . ' WHERE pid='. intval($iPid));
- 			$manager->clearCachedInfo('installedPlugins');
- 			$this->error(_ERROR_PLUGIN_LOAD);
+ 			$plugin =& $manager->getPlugin($name);
+ 			if ( $plugin )
+ 			{
+ 				$plugin->unInstall();
+ 			}
  		}
  		
- 		// check if plugin needs a newer Nucleus version
- 		if ( getNucleusVersion() < $plugin->getMinNucleusVersion() )
+ 		// 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 )
  		{
- 			// uninstall plugin again...
- 			$this->deleteOnePlugin($plugin->getID());
- 			
- 			// ...and show error
- 			$this->error(_ERROR_NUCLEUSVERSIONREQ . Entity::hsc($plugin->getMinNucleusVersion()));
+ 			array_push($aOIDs, $row['oid']);
  		}
  		
- 		// check if plugin needs a newer Nucleus version
- 		if ( (getNucleusVersion() == $plugin->getMinNucleusVersion()) && (getNucleusPatchLevel() < $plugin->getMinNucleusPatchLevel()) )
+ 		// delete from plugin_option and plugin_option_desc
+ 		DB::execute('DELETE FROM ' . sql_table('plugin_option_desc') . ' WHERE opid=' . $pid);
+ 		if (count($aOIDs) > 0)
  		{
- 			// uninstall plugin again...
- 			$this->deleteOnePlugin($plugin->getID());
- 			
- 			// ...and show error
- 			$this->error(_ERROR_NUCLEUSVERSIONREQ . Entity::hsc( $plugin->getMinNucleusVersion() . ' patch ' . $plugin->getMinNucleusPatchLevel() ) );
+ 			DB::execute('DELETE FROM ' . sql_table('plugin_option') . ' WHERE oid in (' . implode(',', $aOIDs) . ')');
  		}
  		
- 		$pluginList = $plugin->getPluginDep();
- 		foreach ( $pluginList as $pluginName )
+ 		// 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');
+ 		$data = array('plugid' => $pid);
+ 		$manager->notify('PostDeletePlugin', $data);
+ 		
+ 		return '';
+ 	}
+ 	
+ 	/**
+ 	 * Admin::action_pluginup()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_pluginup()
+ 	{
+ 		global $member, $manager, $CONF;
+ 		
+ 		// check if allowed
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$plugid = intGetVar('plugid');
+ 		
+ 		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
  		}
  		
- 		// call the install method of the plugin
- 		$plugin->install();
+ 		// 1. get old order number
+ 		$oldOrder = DB::getValue('SELECT porder FROM ' . sql_table('plugin') . ' WHERE pid=' . $plugid);
  		
- 		$manager->notify(
- 			'PostAddPlugin',
- 			array(
- 				'plugin' => &$plugin
- 			)
- 		);
+ 		// 2. calculate new order number
+ 		$newOrder = ($oldOrder > 1) ? ($oldOrder - 1) : 1;
  		
- 		// update all events
- 		$this->action_pluginupdate();
+ 		// 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);
+ 		
+ 		//self::action_pluginlist();
+ 		// To avoid showing ticket in the URL, redirect to pluginlist, instead.
+ 		redirect($CONF['AdminURL'] . '?action=pluginlist');
  		return;
  	}
  	
  	/**
- 	 * ADMIN:action_pluginupdate():
- 	 * 
- 	 * @param	Void
- 	 * @return	Void
+ 	 * Admin::action_plugindown()
  	 * 
+ 	 * @param	void
+ 	 * @return	void
  	 */
- 	function action_pluginupdate()
+ 	static private function action_plugindown()
  	{
  		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');
+ 		if ( !$manager->pidInstalled($plugid) )
+ 		{
+ 			self::error(_ERROR_NOSUCHPLUGIN);
+ 			return;
++>>>>>>> skinnable-master
  		}
+ 		
+ 		// 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);
+ 		
+ 		//self::action_pluginlist();
+ 		// To avoid showing ticket in the URL, redirect to pluginlist, instead.
  		redirect($CONF['AdminURL'] . '?action=pluginlist');
  		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()
  	 * 
@@@ -6886,82 -5128,29 +10992,90 @@@
  	 * @return	void
  	 * 
  	 */
- 	public function action_pluginoptions($message = '')
+ 	static private function action_pluginoptions($message = '')
  	{
  		global $member, $manager;
  		
  		// check if allowed
- 		$member->isAdmin() or $this->disallow();
+ 		$member->isAdmin() or self::disallow();
  		
- 		$pid = (integer) requestVar('plugid');
+ 		$pid = intRequestVar('plugid');
  		if ( !$manager->pidInstalled($pid) )
  		{
- 			$this->error(_ERROR_NOSUCHPLUGIN);
+ 			self::error(_ERROR_NOSUCHPLUGIN);
+ 			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
  		}
- 		echo "</div>\n";
- 		echo "</form>\n";
- 		$this->pagefoot();
+ 		$plugname	= $manager->getPluginNameFromPid($pid);
+ 		$plugin		= $manager->getPlugin($plugname);
+ 		self::$extrahead .= "<script type=\"text/javascript\" src=\"<%skinfile(/javascripts/numbercheck.js)%>\"></script>\n";
  		
+ 		self::$skin->parse('pluginoptions');
  		return;
  	}
  	
@@@ -6974,150 -5163,370 +11088,426 @@@
  	 * @param	void
  	 * @return	void
  	 */
- 	public function action_pluginoptionsupdate()
+ 	static private function action_pluginoptionsupdate()
  	{
  		global $member, $manager;
  		
  		// check if allowed
- 		$member->isAdmin() or $this->disallow();
+ 		$member->isAdmin() or self::disallow();
+ 		
+ 		$pid = intRequestVar('plugid');
  		
- 		$pid = (integer) requestVar('plugid');
  		if ( !$manager->pidInstalled($pid) )
  		{
- 			$this->error(_ERROR_NOSUCHPLUGIN);
+ 			self::error(_ERROR_NOSUCHPLUGIN);
+ 			return;
  		}
  		
  		$aOptions = requestArray('plugoption');
  		NucleusPlugin::apply_plugin_options($aOptions);
  		
- 		$manager->notify('PostPluginOptionsUpdate',array('context' => 'global', 'plugid' => $pid));
+ 		$data = array(
+ 			'context'	=> 'global',
+ 			'plugid'	=> $pid
+ 		);
+ 		$manager->notify('PostPluginOptionsUpdate', $data);
  		
- 		$this->action_pluginoptions(_PLUGS_OPTIONS_UPDATED);
+ 		self::action_pluginoptions(_PLUGS_OPTIONS_UPDATED);
  		return;
  	}
  	
  	/**
- 	 * Admin::_insertPluginOptions()
+ 	 * Admin::skineditgeneral()
  	 * 
- 	 * Output plugin option field
+ 	 * @param	integer	$skinid
+ 	 * @param	string	$handler
+ 	 * @return	string	empty or message if failed
+ 	 */
+ 	static private function skineditgeneral($skinid, $handler='')
+ 	{
+ 		global $manager;
+ 		
+ 		$name = postVar('name');
+ 		$desc = postVar('desc');
+ 		$type = postVar('type');
+ 		$inc_mode = postVar('inc_mode');
+ 		$inc_prefix = postVar('inc_prefix');
+ 		
+ 		$skin =& $manager->getSkin($skinid, $handler);
+ 		
+ 		// 1. Some checks
+ 		if ( !isValidSkinName($name) )
+ 		{
+ 			return _ERROR_BADSKINNAME;
+ 		}
+ 		
+ 		if ( ($skin->getName() != $name) && SKIN::exists($name) )
+ 		{
+ 			return _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);
+ 		
+ 		return '';
+ 	}
+ 	/**
+ 	 * Admin::skindeleteconfirm()
  	 * 
- 	 * @access	public
- 	 * @param string	$context	plugin option context
- 	 * @param integer	$contextid	plugin option context id
+ 	 * @param	integer	$skinid
  	 * @return	void
  	 */
- 	public function _insertPluginOptions($context, $contextid = 0)
+ 	static private function skindeleteconfirm($skinid)
+ 	{
+ 		global $manager;
+ 		
+ 		if ( !in_array(self::$action, self::$adminskin_actions) )
+ 		{
+ 			$event_identifier = 'Skin';
+ 		}
+ 		else
+ 		{
+ 			$event_identifier = 'AdminSkin';
+ 		}
+ 
+ 		$data = array('skinid' => $skinid);
+ 		$manager->notify("PreDelete{$event_identifier}", $data);
+ 		
+ 		// 1. delete description
+ 		$query = "DELETE FROM %s WHERE sdnumber=%d;";
+ 		$query = sprintf($query, sql_table('skin_desc'), (integer) $skinid);
+ 		DB::execute($query);
+ 		
+ 		// 2. delete parts
+ 		$query = "DELETE FROM %s WHERE sdesc=%d;";
+ 		$query = sprintf($query, sql_table('skin'), (integer) $skinid);
+ 		DB::execute($query);
+ 		
+ 		$manager->notify("PostDelete{$event_identifier}", $data);
+ 		
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Admin::skinremovetypeconfirm()
+ 	 * 
+ 	 * @param	integer	$skinid
+ 	 * @param	string	$skintype
+ 	 * @return	string	empty or message if failed
+ 	 */
+ 	static private function skinremovetypeconfirm($skinid, $skintype)
  	{
  		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';
+ 		}
+ 		else
+ 		{
+ 			$event_identifier = 'AdminSkin';
+ 		}
+ 		
+ 		if ( !isValidShortName($skintype) )
+ 		{
+ 			return _ERROR_SKIN_PARTS_SPECIAL_DELETE;
+ 		}
+ 		
+ 		$data = array(
+ 			'skinid'	=> $skinid,
+ 			'skintype'	=> $skintype
+ 		);
+ 		$manager->notify("PreDelete{$event_identifier}Part", $data);
+ 		
+ 		// delete part
+ 		$query = 'DELETE FROM %s WHERE sdesc = %d AND stype = %s;';
+ 		$query = sprintf($query, sql_table('skin'), (integer) $skinid, DB::quoteValue($skintype) );
+ 		DB::execute($query);
+ 		
+ 		$data = array(
+ 			'skinid'	=> $skinid,
+ 			'skintype'	=> $skintype
+ 		);
+ 		$manager->notify("PostDelete{$event_identifier}Part", $data);
+ 		
+ 		return '';
+ 	}
+ 	
+ 	/**
+ 	 * Admin::skinclone()
+ 	 * 
+ 	 * @param	integer	$skinid
+ 	 * @param	string	$handler
+ 	 * @return	void
+ 	 */
+ 	static private function skinclone($skinid, $handler='')
+ 	{
+ 		global $manager;
+ 		
+ 		// 1. read skin to clone
+ 		$skin =& $manager->getSkin($skinid, $handler);
+ 		$name = "{$skin->getName()}_clone";
+ 		
+ 		// 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()
+ 		);
+ 		
+ 		// 3. clone
+ 		$query = "SELECT stype FROM %s WHERE sdesc=%d;";
+ 		$query = sprintf($query, sql_table('skin'), (integer) $skinid);
+ 		
+ 		$res = DB::getResult($query);
+ 		foreach ( $res as $row )
+ 		{
+ 			$content = $skin->getContentFromDB($row['stype']);
+ 			if ( $content )
+ 			{
+ 				$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;
  	}
  	
  	/**
- 	 * Admin::input_yesno()
- 	 * Output input elements with radio attribute for yes/no options
+ 	 * Admin::skinieimport()
  	 * 
- 	 * @param	string	$name	name attribute
- 	 * @param	string	$value_current	current value attribute
- 	 * @param	integer	$tabindex	tab index
- 	 * @param	string	$value_yes	value attribute for yes option
- 	 * @param	string	$value_no	value attribute for no option
- 	 * @param	string	$text_yes	child text element for yes option
- 	 * @param	string	$text_no	child text element for no option
- 	 * @param	boolean	$isAdmin	have admin right or not
- 	 * @return	void
+ 	 * @param	string	$mode
+ 	 * @param	string	$skinFileRaw
+ 	 * @return	string	empty or message if failed
+ 	 */
+ 	static private function skinieimport($mode, $skinFileRaw)
+ 	{
+ 		global $DIR_LIBS, $DIR_SKINS;
+ 		
+ 		// load skinie class
+ 		include_once($DIR_LIBS . 'skinie.php');
+ 		
+ 		$importer = new SkinImport();
+ 		
+ 		// get full filename
+ 		if ( $mode == 'file' )
+ 		{
+ 			$skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';
+ 		}
+ 		else
+ 		{
+ 			$skinFile = $skinFileRaw;
+ 		}
+ 		
+ 		// read only metadata
+ 		$error = $importer->readFile($skinFile, 1);
+ 		if ( $error )
+ 		{
+ 			unset($importer);
+ 			return $error;
+ 		}
+ 		
+ 		self::$contents['mode']		= $mode;
+ 		self::$contents['skinfile']	= $skinFileRaw;
+ 		self::$contents['skininfo']	= $importer->getInfo();
+ 		self::$contents['skinnames']	= $importer->getSkinNames();
+ 		self::$contents['tpltnames']	= $importer->getTemplateNames();
+ 		
+ 		// clashes
+ 		$skinNameClashes		= $importer->checkSkinNameClashes();
+ 		$templateNameClashes	= $importer->checkTemplateNameClashes();
+ 		$hasNameClashes			= (count($skinNameClashes) > 0) || (count($templateNameClashes) > 0);
+ 		
+ 		self::$contents['skinclashes'] = $skinNameClashes;
+ 		self::$contents['tpltclashes'] = $templateNameClashes;
+ 		self::$contents['nameclashes'] = $hasNameClashes ? 1 : 0;
+ 		
+ 		unset($importer);
+ 		return '';
+ 	}
+ 	
+ 	/**
+ 	 * Admin::skinieedoimport()
+ 	 * 
+ 	 * @param	string	$mode
+ 	 * @param	string	$skinFileRaw
+ 	 * @param	boolean	$allowOverwrite
+ 	 * @return	string	empty	or message if failed
  	 */
- 	function input_yesno($name, $value_current, $tabindex = 0, $value_yes = 1, $value_no = 0, $text_yes = _YES, $text_no = _NO, $isAdmin = 0)
+ 	static private function skiniedoimport($mode, $skinFileRaw, $allowOverwrite)
  	{
- 		$id = preg_replace('#\[|\]#', '-', $name);
- 		$id_yes = $id . $value_yes;
- 		$id_no  = $id . $value_no;
+ 		global $DIR_LIBS, $DIR_SKINS;
+ 		
+ 		// load skinie class
+ 		include_once($DIR_LIBS . 'skinie.php');
+ 		
+ 		$importer = new SkinImport();
  		
- 		/* yes option */
- 		echo '<input type="radio" id="' . Entity::hsc($id_yes) . '" name="' . Entity::hsc($name) . '" value="' . Entity::hsc($value_yes) . '"';
- 		if ( $name=="admin" )
+ 		// get full filename
+ 		if ( $mode == 'file' )
  		{
- 			echo ' onclick="selectCanLogin(true);"';
+ 			$skinFile = $DIR_SKINS . $skinFileRaw . '/skinbackup.xml';
  		}
- 		if ( $value_current == $value_yes )
+ 		else
+ 		{
+ 			$skinFile = $skinFileRaw;
+ 		}
+ 		
+ 		$error = $importer->readFile($skinFile);
+ 		if ( $error )
+ 		{
+ 			unset($importer);
+ 			return $error;
+ 		}
+ 		
+ 		$error = $importer->writeToDatabase($allowOverwrite);
+ 		if ( $error )
+ 		{
+ 			unset($importer);
+ 			return $error;
+ 		}
+ 		
+ 		self::$contents['mode']		= $mode;
+ 		self::$contents['skinfile']	= $skinFileRaw;
+ 		self::$contents['skininfo']	= $importer->getInfo();
+ 		self::$contents['skinnames']	= $importer->getSkinNames();
+ 		self::$contents['tpltnames']	= $importer->getTemplateNames();
+ 		
+ 		unset($importer);
+ 		return '';
+ 	}
+ 	
+ 	/**
+ 	 * Admin::skinieexport()
+ 	 * 
+ 	 * @param	array	$aSkins
+ 	 * @param	array	$aTemplates
+ 	 * @param	string	$info
+ 	 * @return	void
+ 	 */
+ 	static private function skinieexport($aSkins, $aTemplates, $info)
+ 	{
+ 		global $DIR_LIBS;
+ 		
+ 		// load skinie class
+ 		include_once($DIR_LIBS . 'skinie.php');
+ 		
+ 		if ( !is_array($aSkins) )
  		{
- 			echo " tabindex='$tabindex' checked='checked'";
+ 			$aSkins = array();
  		}
- 		echo " />\n";
- 		echo '<label for="' . Entity::hsc($id_yes) . '">' . Entity::hsc($text_yes) . "</label>\n";
  		
- 		/* no option */
- 		echo '<input type="radio" id="' . Entity::hsc($id_no) . '" name="' . Entity::hsc($name) . '" value="' . Entity::hsc($value_no) . '"';
- 		if ( $name=="admin" )
+ 		if (!is_array($aTemplates))
  		{
- 			echo ' onclick="selectCanLogin(false);"';
+ 			$aTemplates = array();
  		}
- 		if ( $value_current != $value_yes )
+ 		
+ 		$skinList = array_keys($aSkins);
+ 		$templateList = array_keys($aTemplates);
+ 		
+ 		$exporter = new SkinExport();
+ 		foreach ( $skinList as $skinId )
  		{
- 			echo " tabindex='$tabindex' checked='checked'";
+ 			$exporter->addSkin($skinId);
  		}
- 		if ($isAdmin && $name=="canlogin")
+ 		foreach ( $templateList as $templateId )
  		{
- 			echo ' disabled="disabled"';
+ 			$exporter->addTemplate($templateId);
  		}
- 		echo " />\n";
- 		echo '<label for="' . Entity::hsc($id_no) . '">' . Entity::hsc($text_no) . "</label>\n";
+ 		$exporter->setInfo($info);
+ 		$exporter->export();
  		
  		return;
  	}
+ 	
+ 	/**
+ 	 * Admin::action_parseSpecialskin()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static private function action_parseSpecialskin()
+ 	{
+ 		self::$skin->parse(self::$action);
+ 		return;
+ 	}
  }
diff --combined nucleus/libs/BAN.php
index cd8f8cf,18e034a..27f7af6
--- a/nucleus/libs/BAN.php
+++ b/nucleus/libs/BAN.php
@@@ -1,127 -1,110 +1,240 @@@
++<<<<<<< HEAD
 +<?php
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2002-2012 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)
 + */
 +/**
 + * PHP class responsible for ban-management.
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2012 The Nucleus Group
 + * @version $Id: BAN.php 1525 2011-06-21 10:20:19Z sakamocchi $
 + */
 +
 +class Ban
 +{
 +	/**
 +	 * Checks if a given IP is banned from commenting/voting
 +	 *
 +	 * Returns 0 when not banned, or a BanInfo object containing the
 +	 * message and other information of the ban
 +	 */
 +	public function isBanned($blogid, $ip)
 +	{
 +		$blogid = intval($blogid);
 +		$query = sprintf('SELECT * FROM %s WHERE blogid=%d', sql_table('ban'), intval($blogid));
 +		$res = DB::getResult($query);
 +		foreach ( $res as $row )
 +		{
 +			$found = i18n::strpos ($ip, $row['iprange']);
 +			if ( $found !== false )
 +			{
 +				// found a match!
 +				return new BanInfo($row['iprange'], $row['reason']);
 +			}
 +		}
 +		return 0;
 +	}
 +
 +	/**
 +	 * Ban::addBan()
 +	 * Adds a new ban to the banlist. Returns 1 on success, 0 on error
 +	 * 
 +	 * @param	Integer	$blogid	ID for weblog
 +	 * @param	String 	$iprange	IP range
 +	 * @param	String 	$reason	reason for banning
 +	 * @return	Boolean
 +	 * 
 +	 */
 +	public function addBan($blogid, $iprange, $reason)
 +	{
 +		global $manager;
 +		
 +		$manager->notify(
 +			'PreAddBan',
 +			array(
 +				'blogid' => $blogid,
 +				'iprange' => &$iprange,
 +				'reason' => &$reason
 +			)
 +		);
 +		
 +		$query = 'INSERT INTO %s (blogid, iprange, reason) VALUES (%d, %s, %s)';
 +		$query = sprintf($query, sql_table('ban'), intval($blogid), DB::quoteValue($iprange), DB::quoteValue($reason));
 +		$res = DB::execute($query);
 +		
 +		$manager->notify(
 +			'PostAddBan',
 +			array(
 +				'blogid' => $blogid,
 +				'iprange' => $iprange,
 +				'reason' => $reason
 +			)
 +		);
 +		
 +		return $res !== FALSE ? 1 : 0;
 +	}
 +	
 +	/**
 +	 * Removes a ban from the banlist (correct iprange is needed as argument)
 +	 * Returns 1 on success, 0 on error
 +	 */
 +	public function removeBan($blogid, $iprange)
 +	{
 +		global $manager;
 +		
 +		$manager->notify(
 +			'PreDeleteBan',
 +			array(
 +				'blogid' => $blogid,
 +				'range' => $iprange
 +			)
 +		);
 +		
 +		$query = 'DELETE FROM %s WHERE blogid=%d and iprange=%s';
 +		$query = sprintf($query, sql_table('ban'), intval($blogid), DB::quoteValue($iprange));
 +		$res = DB::execute($query);
 +		
 +		$manager->notify(
 +			'PostDeleteBan',
 +			array(
 +				'blogid' => $blogid,
 +				'range' => $iprange
 +			)
 +		);
 +		
 +		return $res !== FALSE ? 1 : 0;
 +	}
 +}
 +
 +class BanInfo
 +{
 +	public $iprange;
 +	public $message;
 +	
 +	public function __construct($iprange, $message)
 +	{
 +		$this->iprange = $iprange;
 +		$this->message = $message;
 +		return;
 +	}
 +}
++=======
+ <?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)
+  */
+ /**
+  * PHP class responsible for ban-management.
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: BAN.php 1812 2012-05-01 14:59:07Z sakamocchi $
+  */
+ 
+ class Ban
+ {
+ 	/**
+ 	 * Checks if a given IP is banned from commenting/voting
+ 	 *
+ 	 * Returns 0 when not banned, or a BanInfo object containing the
+ 	 * message and other information of the ban
+ 	 */
+ 	public function isBanned($blogid, $ip)
+ 	{
+ 		$blogid = intval($blogid);
+ 		$query = sprintf('SELECT * FROM %s WHERE blogid=%d', sql_table('ban'), intval($blogid));
+ 		$res = DB::getResult($query);
+ 		foreach ( $res as $row )
+ 		{
+ 			$found = i18n::strpos ($ip, $row['iprange']);
+ 			if ( $found !== false )
+ 			{
+ 				// found a match!
+ 				return new BanInfo($row['iprange'], $row['reason']);
+ 			}
+ 		}
+ 		return 0;
+ 	}
+ 
+ 	/**
+ 	 * Ban::addBan()
+ 	 * Adds a new ban to the banlist. Returns 1 on success, 0 on error
+ 	 * 
+ 	 * @param	Integer	$blogid	ID for weblog
+ 	 * @param	String 	$iprange	IP range
+ 	 * @param	String 	$reason	reason for banning
+ 	 * @return	Boolean
+ 	 * 
+ 	 */
+ 	public function addBan($blogid, $iprange, $reason)
+ 	{
+ 		global $manager;
+ 
+ 		$data = array(
+ 				'blogid'	=> $blogid,
+ 				'iprange'	=> &$iprange,
+ 				'reason'	=> &$reason
+ 			);
+ 		$manager->notify('PreAddBan', $data);
+ 		
+ 		$query = 'INSERT INTO %s (blogid, iprange, reason) VALUES (%d, %s, %s)';
+ 		$query = sprintf($query, sql_table('ban'), intval($blogid), DB::quoteValue($iprange), DB::quoteValue($reason));
+ 		$res = DB::execute($query);
+ 		
+ 		$manager->notify('PostAddBan', $data);
+ 		
+ 		return $res !== FALSE ? 1 : 0;
+ 	}
+ 	
+ 	/**
+ 	 * Removes a ban from the banlist (correct iprange is needed as argument)
+ 	 * Returns 1 on success, 0 on error
+ 	 */
+ 	public function removeBan($blogid, $iprange)
+ 	{
+ 		global $manager;
+ 		
+ 		$data = array(
+ 			'blogid'	=> $blogid,
+ 			'range'		=> $iprange
+ 		);
+ 		$manager->notify('PreDeleteBan', $data);
+ 		
+ 		$query = 'DELETE FROM %s WHERE blogid=%d and iprange=%s';
+ 		$query = sprintf($query, sql_table('ban'), intval($blogid), DB::quoteValue($iprange));
+ 		$res = DB::execute($query);
+ 		
+ 		$manager->notify('PostDeleteBan', $data);
+ 		
+ 		return $res !== FALSE ? 1 : 0;
+ 	}
+ }
+ 
+ class BanInfo
+ {
+ 	public $iprange;
+ 	public $message;
+ 	
+ 	public function __construct($iprange, $message)
+ 	{
+ 		$this->iprange = $iprange;
+ 		$this->message = $message;
+ 		return;
+ 	}
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/libs/BLOG.php
index f0f91a5,64ea623..bede7bd
--- a/nucleus/libs/BLOG.php
+++ b/nucleus/libs/BLOG.php
@@@ -1,1918 -1,1928 +1,3849 @@@
++<<<<<<< HEAD
 +<?php
 +
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2002-2012 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)
 + */
 +/**
 + * A class representing a blog and containing functions to get that blog shown
 + * on the screen
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2009 The Nucleus Group
 + * @version $Id: BLOG.php 1624 2012-01-09 11:36:20Z sakamocchi $
 + */
 +
 +if ( !function_exists('requestVar') ) exit;
 +require_once dirname(__FILE__) . '/ITEMACTIONS.php';
 +
 +class Blog
 +{
 +	// blog id
 +	public $blogid;
 +	
 +	// After creating an object of the blog class, contains true if the BLOG object is
 +	// valid (the blog exists)
 +	public $isValid;
 +	
 +	// associative array, containing all blogsettings (use the get/set functions instead)
 +	private $settings;
 +	
 +	// ID of currently selected category
 +	private $selectedcatid;
 +	
 +	/**
 +	 * Blog::_\construct()
 +	 * Creates a new BLOG object for the given blog
 +	 *
 +	 * @param	integer	$id	blogid
 +	 * @return	void
 +	 */
 +	public function __construct($id)
 +	{
 +		global $catid;
 +		
 +		$this->blogid = (integer) $id;
 +		$this->readSettings();
 +		$this->setSelectedCategory($catid);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::readLog()
 +	 * Shows the given amount of items for this blog
 +	 *
 +	 * @param	string	$template	String representing the template _NAME_ (!)
 +	 * @param	integer	$amountEntries	amount of entries to show
 +	 * @param	integer	$startpos	offset from where items should be shown (e.g. 5 = start at fifth item)
 +	 * @return	integer	amount of items shown
 +	 */
 +	public function readLog($template, $amountEntries, $offset = 0, $startpos = 0)
 +	{
 +		return $this->readLogAmount($template,$amountEntries,'','',1,1,$offset, $startpos);
 +	}
 +	
 +	/**
 +	 * Blog::showArchive()
 +	 * Shows an archive for a given month
 +	 *
 +	 * @param	integer	$year		year
 +	 * @param	integer	$month		month
 +	 * @param	string	$template	String representing the template name to be used
 +	 * @return	void
 +	 */
 +	public function showArchive($templatename, $year, $month=0, $day=0)
 +	{
 +		// create extra where clause for select query
 +		if ( $day == 0 && $month != 0 )
 +		{
 +			$timestamp_start = mktime(0,0,0,$month,1,$year);
 +			// also works when $month==12
 +			$timestamp_end = mktime(0,0,0,$month+1,1,$year);
 +		}
 +		elseif ( $month == 0 )
 +		{
 +			$timestamp_start = mktime(0,0,0,1,1,$year);
 +			// also works when $month==12
 +			$timestamp_end = mktime(0,0,0,12,31,$year);
 +		}
 +		else
 +		{
 +			$timestamp_start = mktime(0,0,0,$month,$day,$year);
 +			$timestamp_end = mktime(0,0,0,$month,$day+1,$year);
 +		}
 +		$extra_query = " and i.itime>=%s and i.itime<%s";
 +		$extra_query = sprintf($extra_query, DB::formatDateTime($timestamp_start), DB::formatDateTime($timestamp_end));
 +		
 +		$this->readLogAmount($templatename,0,$extra_query,'',1,1);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setSelectedCategory()
 +	 * Sets the selected category by id (only when category exists)
 +	 * 
 +	 * @param	integer	$catid	ID for category
 +	 * @return	void
 +	 */
 +	public function setSelectedCategory($catid)
 +	{
 +		if ( $this->isValidCategory($catid) || (intval($catid) == 0) )
 +		{
 +			$this->selectedcatid = intval($catid);
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setSelectedCategoryByName()
 +	 * Sets the selected category by name
 +	 * 
 +	 * @param	string	$catname	name of category
 +	 * @return	void
 +	 */
 +	public function setSelectedCategoryByName($catname)
 +	{
 +		$this->setSelectedCategory($this->getCategoryIdFromName($catname));
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::getSelectedCategory()
 +	 * Returns the selected category
 +	 * 
 +	 * @param	void
 +	 * @return	integer
 +	 */
 +	public function getSelectedCategory()
 +	{
 +		return $this->selectedcatid;
 +	}
 +	
 +	/**
 +	 * Shows the given amount of items for this blog
 +	 *
 +	 * @param	string	$template		string representing the template _NAME_ (!)
 +	 * @param	integer	$amountEntries	amount of entries to show (0 = no limit)
 +	 * @param	string	$extraQuery		extra conditions to be added to the query
 +	 * @param	string	$highlight		contains a query that should be highlighted
 +	 * @param	integer	$comments		1=show comments 0=don't show comments
 +	 * @param	integer	$dateheads		1=show dateheads 0=don't show dateheads
 +	 * @param	integer	$offset			offset
 +	 * @return	integer	amount of items shown
 +	 */
 +	private function readLogAmount($template, $amountEntries, $extraQuery, $highlight, $comments, $dateheads, $offset = 0, $startpos = 0)
 +	{
 +		$query = $this->getSqlBlog($extraQuery);
 +		
 +		if ( $amountEntries > 0 )
 +		{
 +			// $offset zou moeten worden:
 +			// (($startpos / $amountentries) + 1) * $offset ... later testen ...
 +			$query .= ' LIMIT ' . intval($startpos + $offset).',' . intval($amountEntries);
 +		}
 +		return $this->showUsingQuery($template, $query, $highlight, $comments, $dateheads);
 +	}
 +	
 +	/**
 +	 * Blog::showUsingQuery()
 +	 * Do the job for readLogAmmount
 +	 * 
 +	 * @param	string	$templateName	template name
 +	 * @param	string	$query			string for query
 +	 * @param	string	$highlight		string to be highlighted
 +	 * @param	integer	$comments		the number of comments
 +	 * @param	boolean	$dateheads		date header is needed or not
 +	 * @return	integer	the number of rows as a result of mysql query
 +	 */
 +	private function showUsingQuery($templateName, $query, $highlight = '', $comments = 0, $dateheads = 1)
 +	{
 +		global $CONF, $manager, $currentTemplateName;
 +		
 +		$lastVisit = cookieVar($CONF['CookiePrefix'] .'lastVisit');
 +		if ( $lastVisit != 0 )
 +		{
 +			$lastVisit = $this->getCorrectTime($lastVisit);
 +		}
 +		
 +		// set templatename as global variable (so plugins can access it)
 +		$currentTemplateName = $templateName;
 +		$template =& $manager->getTemplate($templateName);
 +		
 +		// create parser object & action handler
 +		$handler = new ItemActions($this);
 +		$handler->setTemplate($template);
 +		$handler->setHighlight($highlight);
 +		$handler->setLastVisit($lastVisit);
 +		$handler->setShowComments($comments);
 +		
 +		$parser = new Parser($handler);
 +		
 +		// execute query
 +		$items = DB::getResult($query);
 +		
 +		// loop over all items
 +		$old_date = 0;
 +		foreach ( $items as $item )
 +		{
 +			// string timestamp -> unix timestamp
 +			$item['timestamp'] = strtotime($item['itime']);
 +			
 +			// action handler needs to know the item we're handling
 +			$handler->setCurrentItem($item);
 +			
 +			// add date header if needed
 +			if ( $dateheads )
 +			{
 +				$new_date = date('dFY', $item['timestamp']);
 +				if ( $new_date != $old_date )
 +				{
 +					// unless this is the first time, write date footer
 +					$timestamp = $item['timestamp'];
 +					if ( $old_date != 0 )
 +					{
 +						$oldTS = strtotime($old_date);
 +						$manager->notify('PreDateFoot',array('blog' => &$this, 'timestamp' => $oldTS));
 +						
 +						if ( !in_array('DATE_FOOTER', $template) || empty($template['DATE_FOOTER']) )
 +						{
 +							$tmp_footer = '';
 +						}
 +						else
 +						{
 +							$tmp_footer = i18n::formatted_datetime($template['DATE_FOOTER'], $oldTS);
 +						}
 +						$parser->parse($tmp_footer);
 +						$manager->notify('PostDateFoot',array('blog' => &$this, 'timestamp' => $oldTS));
 +					}
 +					
 +					$manager->notify('PreDateHead',array('blog' => &$this, 'timestamp' => $timestamp));
 +					
 +					// note, to use templatvars in the dateheader, the %-characters need to be doubled in
 +					// order to be preserved by strftime
 +					if ( !in_array('DATE_HEADER', $template) || empty($template['DATE_HEADER']) )
 +					{
 +						$tmp_header = '';
 +					}
 +					else
 +					{
 +						$tmp_header = i18n::formatted_datetime($template['DATE_HEADER'], $timestamp);
 +					}
 +					$parser->parse($tmp_header);
 +					$manager->notify('PostDateHead',array('blog' => &$this, 'timestamp' => $timestamp));
 +				}
 +				$old_date = $new_date;
 +			}
 +			
 +			// parse item
 +			$parser->parse($template['ITEM_HEADER']);
 +			$manager->notify('PreItem', array('blog' => &$this, 'item' => &$item));
 +			$parser->parse($template['ITEM']);
 +			$manager->notify('PostItem', array('blog' => &$this, 'item' => &$item));
 +			$parser->parse($template['ITEM_FOOTER']);
 +		}
 +		
 +		$numrows = $items->rowCount();
 +		
 +		// add another date footer if there was at least one item
 +		if ( ($numrows > 0) && $dateheads )
 +		{
 +			$manager->notify('PreDateFoot',array('blog' => &$this, 'timestamp' => strtotime($old_date)));
 +			$parser->parse($template['DATE_FOOTER']);
 +			$manager->notify('PostDateFoot',array('blog' => &$this, 'timestamp' => strtotime($old_date)));
 +		}
 +		
 +		$items->closeCursor();
 +		return $numrows;
 +	}
 +	
 +	/**
 +	 * Blog::showOneitem()
 +	 * Simplified function for showing only one item
 +	 * 
 +	 * @param	integer	$itemid		ID for item
 +	 * @param	array	$template	template for item
 +	 * @param	string	$highlight	string for highlight
 +	 * @return	integer	1
 +	 */
 +	public function showOneitem($itemid, $template, $highlight)
 +	{
 +		$extraQuery = ' and inumber=' . intval($itemid);
 +		
 +		return $this->readLogAmount($template, 1, $extraQuery, $highlight, 0, 0);
 +	}
 +	
 +	/**
 +	 * Blog::addItem()
 +	 * Adds an item to this blog
 +	 * 
 +	 * @param	integer		$catid	ID for category
 +	 * @param	string		$title	ID for 
 +	 * @param	string		$body	text for body
 +	 * @param	string		$more	text for more
 +	 * @param	integer		$blogid	ID for blog
 +	 * @param	integer		$authorid	ID for author
 +	 * @param	timestamp	$timestamp	UNIX timestamp for post
 +	 * @param	boolean		$closed	opened or closed
 +	 * @param	boolean		$draft	draft or not
 +	 * @param	boolean		$posted	posted or not
 +	 * @return	integer	ID for added item
 +	 */
 +	function additem($catid, $title, $body, $more, $blogid, $authorid, $timestamp, $closed, $draft, $posted='1')
 +	{
 +		global $manager;
 +		
 +		$blogid		= (integer) $blogid;
 +		$authorid	= (integer) $authorid;
 +		$title		= $title;
 +		$body		= $body;
 +		$more		= $more;
 +		$catid		= intval($catid);
 +		
 +		// convert newlines to <br />
 +		if ( $this->convertBreaks() )
 +		{
 +			$body = addBreaks($body);
 +			$more = addBreaks($more);
 +		}
 +
 +		if ( $closed != '1' )
 +		{
 +			$closed = '0';
 +		}
 +		if ( $draft != '0' )
 +		{
 +			$draft = '1';
 +		}
 +		
 +		if ( !$this->isValidCategory($catid) )
 +		{
 +			$catid = $this->getDefaultCategory();
 +		}
 +		
 +		$isFuture = 0;
 +		if ( $timestamp > $this->getCorrectTime() )
 +		{
 +			$isFuture = 1;
 +		}
 +		
 +		$timestamp = date('Y-m-d H:i:s',$timestamp);
 +		
 +		$manager->notify('PreAddItem',array('title' => &$title, 'body' => &$body, 'more' => &$more, 'blog' => &$this, 'authorid' => &$authorid, 'timestamp' => &$timestamp, 'closed' => &$closed, 'draft' => &$draft, 'catid' => &$catid));
 +		
 +		$ititle = DB::quoteValue($title);
 +		$ibody = DB::quoteValue($body);
 +		$imore = DB::quoteValue($more);
 +		$timestamp = DB::formatDateTime(strtotime($timestamp));
 +		
 +		$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)";
 +		$query = sprintf($query, sql_table('item'), $ititle, $ibody, $imore, $blogid, $authorid, $timestamp, $closed, $draft, $catid, $posted);
 +		DB::execute($query);
 +		$itemid = DB::getInsertId();
 +		
 +		$manager->notify('PostAddItem',array('itemid' => $itemid));
 +		
 +		if ( !$draft )
 +		{
 +			$this->updateUpdateFile();
 +		}
 +		// send notification mail
 +		if ( !$draft && !$isFuture && $this->getNotifyAddress() && $this->notifyOnNewItem() )
 +		{
 +			$this->sendNewItemNotification($itemid, $title, $body);
 +		}
 +		return $itemid;
 +	}
 +	
 +	/**
 +	 * Blog::sendNewItemNotification()
 +	 * Send a new item notification to the notification list
 +	 * 
 +	 * @param	string	$itemid	ID of the item
 +	 * @param	string	$title	title of the item
 +	 * @param	string	$body	body of the item
 +	 * @return	void
 +	 */
 +	public function sendNewItemNotification($itemid, $title, $body)
 +	{
 +		global $CONF, $member;
 +		
 +		$ascii = Entity::anchor_footnoting($body);
 +		
 +		$message = _NOTIFY_NI_MSG . " \n";
 +		$temp = parse_url($CONF['Self']);
 +		if ( $temp['scheme'] )
 +		{
 +			$message .= Link::create_item_link($itemid) . "\n\n";
 +		}
 +		else
 +		{
 +			$tempurl = $this->getURL();
 +			if ( i18n::substr($tempurl, -1) == '/' || i18n::substr($tempurl, -4) == '.php' )
 +			{
 +				$message .= $tempurl . '?itemid=' . $itemid . "\n\n";
 +			}
 +			else
 +			{
 +				$message .= $tempurl . '/?itemid=' . $itemid . "\n\n";
 +			}
 +		}
 +		$message .= _NOTIFY_TITLE . ' ' . strip_tags($title) . "\n";
 +		$message .= _NOTIFY_CONTENTS . "\n " . $ascii . "\n";
 +		$message .= NOTIFICATION::get_mail_footer();
 +		
 +		$subject = $this->getName() . ': ' . _NOTIFY_NI_TITLE;
 +		
 +		$from = $member->getNotifyFromMailAddress();
 +		
 +		NOTIFICATION::mail($this->getNotifyAddress(), $subject, $message, $from, i18n::get_current_charset());
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::createNewCategory()
 +	 * Creates a new category for this blog
 +	 *
 +	 * @param	string	$catName		name of the new category. When empty, a name is generated automatically (starting with newcat)
 +	 * @param	string	$catDescription	description of the new category. Defaults to 'New Category'
 +	 * @return	integer	ID for new category on success. 0 on failure
 +	 */
 +	public function createNewCategory($catName = '', $catDescription = _CREATED_NEW_CATEGORY_DESC)
 +	{
 +		global $member, $manager;
 +		
 +		if ( !$member->blogAdminRights($this->blogid) )
 +		{
 +			return 0;
 +		}
 +		
 +		// generate
 +		if ( $catName == '' )
 +		{
 +			$catName = _CREATED_NEW_CATEGORY_NAME;
 +			$i = 1;
 +			
 +			$res = DB::getResult('SELECT * FROM '.sql_table('category')." WHERE cname='".$catName.$i."' and cblog=".$this->blogid);
 +			while ( $res->rowCount() > 0 )
 +			{
 +				$i++;
 +				$res = DB::getResult('SELECT * FROM '.sql_table('category')." WHERE cname='".$catName.$i."' and cblog=".$this->blogid);
 +			}
 +			
 +			$catName = $catName . $i;
 +		}
 +		
 +		$data = array(
 +			'blog'			=> &$this,
 +			'name'			=> &$catName,
 +			'description'	=> $catDescription
 +		);
 +		$manager->notify('PreAddCategory', $data);
 +		
 +		$query = "INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, %s, %s)";
 +		$query = sprintf($query, sql_table('category'), (integer) $this->blogid, DB::quoteValue($catName), DB::quoteValue($catDescription));
 +		DB::execute($query);
 +		$catid = DB::getInsertId();
 +		
 +		$data = array(
 +			'blog'			=> &$this,
 +			'name'			=> $catName,
 +			'description'	=> $catDescription,
 +			'catid'			=> $catid
 +		);
 +		$manager->notify('PostAddCategory', $data);
 +		
 +		return $catid;
 +	}
 +	
 +	/**
 +	 * Blog::search()
 +	 * Searches all months of this blog for the given query
 +	 *
 +	 * @param	string	$query			search query
 +	 * @param	array	$template		template to be used (__NAME__ of the template)
 +	 * @param	integer	$amountMonths	max amount of months to be search (0 = all)
 +	 * @param	integer	$maxresults		max number of results to show
 +	 * @param	integer	$startpos		offset
 +	 * @return	amount of hits found
 +	 */
 +	public function search($query, $template, $amountMonths, $maxresults, $startpos) {
 +		global $CONF, $manager;
 +		
 +		$highlight 	= '';
 +		$sqlquery	= $this->getSqlSearch($query, $amountMonths, $highlight);
 +		
 +		if ( $sqlquery == '' )
 +		{
 +			// no query -> show everything
 +			$extraquery = '';
 +			$amountfound = $this->readLogAmount($template, $maxresults, $extraQuery, $query, 1, 1);
 +		}
 +		else
 +		{
 +			// add LIMIT to query (to split search results into pages)
 +			if ( intval($maxresults > 0) )
 +			{
 +				$sqlquery .= ' LIMIT ' . intval($startpos) . ',' . intval($maxresults);
 +			}
 +			
 +			// show results
 +			$amountfound = $this->showUsingQuery($template, $sqlquery, $highlight, 1, 1);
 +			
 +			// when no results were found, show a message
 +			if ( $amountfound == 0 )
 +			{
 +				$template =& $manager->getTemplate($template);
 +				$vars = array(
 +					'query'		=> Entity::hsc($query),
 +					'blogid'	=> $this->blogid
 +				);
 +				echo Template::fill($template['SEARCH_NOTHINGFOUND'], $vars);
 +			}
 +		}
 +		return $amountfound;
 +	}
 +	
 +	/**
 +	 * Blog::getSqlSearch()
 +	 * Returns an SQL query to use for a search query
 +	 * No LIMIT clause is added. (caller should add this if multiple pages are requested)
 +	 *
 +	 * @param	string	$query			search query
 +	 * @param	integer	$amountMonths	amount of months to search back. Default = 0 = unlimited
 +	 * @param	string	$mode			either empty, or 'count'. In this case, the query will be a SELECT COUNT(*) query
 +	 * @return	string	$highlight		words to highlight (out parameter)
 +	 * @return	string	either a full SQL query, or an empty string (if querystring empty)
 +	 */
 +	public function getSqlSearch($query, $amountMonths = 0, &$highlight, $mode = '')
 +	{
 +		$searchclass = new Search($query);
 +		
 +		$highlight	 = $searchclass->inclusive;
 +		
 +		// if querystring is empty, return empty string
 +		if ( $searchclass->inclusive == '' )
 +		{
 +			return '';
 +		}
 +		
 +		$where  = $searchclass->boolean_sql_where('ititle,ibody,imore');
 +		$select = $searchclass->boolean_sql_select('ititle,ibody,imore');
 +		
 +		// get list of blogs to search
 +		$blogs		= $searchclass->blogs;	// array containing blogs that always need to be included
 +		$blogs[]	= $this->blogid;		// also search current blog (duh)
 +		$blogs		= array_unique($blogs);	// remove duplicates
 +		$selectblogs = '';
 +		if ( count($blogs) > 0 )
 +		{
 +			$selectblogs = ' and i.iblog in (' . implode(',', $blogs) . ')';
 +		}
 +		
 +		if ( $mode == '' )
 +		{
 +			$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,
 +				m.mname as author, m.mrealname as authorname, m.mnumber as authorid, m.memail as authormail, m.murl as authorurl,
 +				c.cname as category';
 +			
 +			if ( $select )
 +			{
 +				$query .= ', '.$select. ' as score ';
 +			}
 +		}
 +		else
 +		{
 +			$query = 'SELECT COUNT(*) as result ';
 +		}
 +		
 +		$query .= ' FROM '.sql_table('item').' as i, '.sql_table('member').' as m, '.sql_table('category').' as c'
 +				. ' WHERE i.iauthor=m.mnumber'
 +				. ' and i.icat=c.catid'
 +				// exclude drafts
 +				. ' and i.idraft=0'
 +				. $selectblogs
 +					// don't show future items
 +				. ' and i.itime<=' . DB::formatDateTime($this->getCorrectTime())
 +				. ' and '.$where;
 +		
 +		// take into account amount of months to search
 +		if ( $amountMonths > 0 )
 +		{
 +			$localtime = getdate($this->getCorrectTime());
 +			$timestamp_start = mktime(0,0,0,$localtime['mon'] - $amountMonths,1,$localtime['year']);
 +			$query .= ' and i.itime>' . DB::formatDateTime($timestamp_start);
 +		}
 +		
 +		if ( $mode == '' )
 +		{
 +			if ( $select )
 +			{
 +				$query .= ' ORDER BY score DESC';
 +			}
 +			else
 +			{
 +				$query .= ' ORDER BY i.itime DESC ';
 +			}
 +		}
 +		
 +		return $query;
 +	}
 +	
 +	/**
 +	 * Blog::getSqlBlog()
 +	 * Returns the SQL query that's normally used to display the blog items on the index type skins
 +	 * No LIMIT clause is added. (caller should add this if multiple pages are requested)
 +	 *
 +	 * @param	string	$extraQuery	extra query string
 +	 * @param	string	$mode		either empty, or 'count'. In this case, the query will be a SELECT COUNT(*) query
 +	 * @return	string	either a full SQL query, or an empty string
 +	 */
 +	public function getSqlBlog($extraQuery, $mode = '')
 +	{
 +		if ( $mode == '' )
 +		{
 +			$query = 'SELECT i.inumber as itemid, i.ititle as title, i.ibody as body, m.mname as author,
 +				m.mrealname as authorname, i.itime, i.imore as more, m.mnumber as authorid, m.memail as authormail,
 +				m.murl as authorurl, c.cname as category, i.icat as catid, i.iclosed as closed';
 +		}
 +		else
 +		{
 +			$query = 'SELECT COUNT(*) as result ';
 +		}
 +		
 +		$query	.= ' FROM '.sql_table('item').' as i, '.sql_table('member').' as m, '.sql_table('category').' as c'
 +				. ' WHERE i.iblog='.$this->blogid
 +				. ' and i.iauthor=m.mnumber'
 +				. ' and i.icat=c.catid'
 +				. ' and i.idraft=0' // exclude drafts
 +				. ' and i.itime<=' . DB::formatDateTime($this->getCorrectTime()); // don't show future items
 +		
 +		if ( $this->selectedcatid )
 +		{
 +			$query .= ' and i.icat=' . $this->selectedcatid . ' ';
 +		}
 +		
 +		$query .= $extraQuery;
 +		
 +		if ( $mode == '' )
 +		{
 +			$query .= ' ORDER BY i.itime DESC';
 +		}
 +		return $query;
 +	}
 +	
 +	/**
 +	 * Blog::showArchiveList()
 +	 * Shows the archivelist using the given template
 +	 * 
 +	 * @param	string	$template	template name
 +	 * @param	string	$mode	year/month/day
 +	 * @param	integer	$limit	limit of record count
 +	 * @return	void
 +	 */
 +	public function showArchiveList($template, $mode = 'month', $limit = 0)
 +	{
 +		global $CONF, $catid, $manager;
 +		
 +		if ( !isset ($linkparams) )
 +		{
 +			$linkparams = array();
 +		}
 +		
 +		if ( $catid )
 +		{
 +			$linkparams = array('catid' => $catid);
 +		}
 +		
 +		$template =& $manager->getTemplate($template);
 +		$data['blogid'] = $this->blogid;
 +		
 +		if ( !array_key_exists('ARCHIVELIST_HEADER', $template) || !$template['ARCHIVELIST_HEADER'] )
 +		{
 +			$tplt = '';
 +		}
 +		else
 +		{
 +			$tplt = $template['ARCHIVELIST_HEADER'];
 +		}
 +		
 +		echo Template::fill($tplt, $data);
 +		
 +		$query = 'SELECT itime, SUBSTRING(itime,1,4) AS Year, SUBSTRING(itime,6,2) AS Month, SUBSTRING(itime,9,2) AS Day'
 +				. ' FROM '.sql_table('item')
 +				. ' WHERE iblog=' . $this->blogid
 +				. ' AND itime <=' . DB::formatDateTime($this->getCorrectTime()) // don't show future items!
 +				. ' AND idraft=0'; // don't show draft items
 +		
 +		if ( $catid )
 +		{
 +			$query .= ' and icat=' . intval($catid);
 +		}
 +		
 +		$query .= ' GROUP BY Year';
 +		if ( $mode == 'month' || $mode == 'day' )
 +		{
 +			$query .= ', Month';
 +		}
 +		if ( $mode == 'day' )
 +		{
 +			$query .= ', Day';
 +		}
 +		
 +		$query .= ' ORDER BY itime DESC';
 +		
 +		if ( $limit > 0 )
 +		{
 +			$query .= ' LIMIT ' . intval($limit);
 +		}
 +		
 +		$res = DB::getResult($query);
 +		foreach ( $res as $current )
 +		{
 +			/* string time -> unix timestamp */
 +			$current['itime'] = strtotime($current['itime']);
 +			
 +			if ( $mode == 'day' )
 +			{
 +				$archivedate = date('Y-m-d',$current['itime']);
 +				$archive['day'] = date('d',$current['itime']);
 +				$data['day'] = date('d',$current['itime']);
 +				$data['month'] = date('m',$current['itime']);
 +				$archive['month'] = $data['month'];
 +			}
 +			elseif ( $mode == 'year' )
 +			{
 +				$archivedate = date('Y',$current['itime']);
 +				$data['day'] = '';
 +				$data['month'] = '';
 +				$archive['day'] = '';
 +				$archive['month'] = '';
 +			}
 +			else
 +			{
 +				$archivedate = date('Y-m',$current['itime']);
 +				$data['month'] = date('m',$current['itime']);
 +				$archive['month'] = $data['month'];
 +				$data['day'] = '';
 +				$archive['day'] = '';
 +			}
 +			
 +			$data['year'] = date('Y',$current['itime']);
 +			$archive['year'] = $data['year'];
 +			$data['archivelink'] = Link::create_archive_link($this->blogid,$archivedate,$linkparams);
 +			
 +			$manager->notify('PreArchiveListItem', array('listitem' => &$data));
 +			
 +			$temp = Template::fill($template['ARCHIVELIST_LISTITEM'],$data);
 +			echo i18n::formatted_datetime($temp, $current['itime']);
 +			return;
 +		}
 +		
 +		$res->closeCursor();
 +		
 +		if ( !array_key_exists('ARCHIVELIST_FOOTER', $template) || !$template['ARCHIVELIST_FOOTER'] )
 +		{
 +			$tplt = '';
 +		}
 +		else
 +		{
 +			$tplt = $template['ARCHIVELIST_FOOTER'];
 +		}
 +		
 +		echo Template::fill($tplt, $data);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::showCategoryList()
 +	 * Shows the list of categories using a given template
 +	 * 
 +	 * @param	string	$template	Template Name
 +	 * @return	void
 +	 */
 +	public function showCategoryList($template)
 +	{
 +		global $CONF, $archive, $archivelist, $manager;
 +		
 +		/*
 +		 * determine arguments next to catids
 +		 * I guess this can be done in a better way, but it works
 +		 */
 +		$linkparams = array();
 +		if ( $archive )
 +		{
 +			$blogurl = Link::create_archive_link($this->blogid, $archive, '');
 +			$linkparams['blogid'] = $this->blogid;
 +			$linkparams['archive'] = $archive;
 +		}
 +		else if ( $archivelist )
 +		{
 +			$blogurl = Link::create_archivelist_link($this->blogid, '');
 +			$linkparams['archivelist'] = $archivelist;
 +		}
 +		else
 +		{
 +			$blogurl = Link::create_blogid_link($this->blogid, '');
 +			$linkparams['blogid'] = $this->blogid;
 +		}
 +		
 +		$template =& $manager->getTemplate($template);
 +		
 +		//: Change: Set nocatselected variable
 +		if ( $this->selectedcatid )
 +		{
 +			$nocatselected = 'no';
 +		}
 +		else
 +		{
 +			$nocatselected = 'yes';
 +		} 
 +		
 +		$args = array(
 +			'blogid'	=> $this->blogid,
 +			'blogurl'	=> $blogurl,
 +			'self'		=> $CONF['Self'],
 +			'catiscurrent'	=> $nocatselected, // Change: Set catiscurrent template variable for header
 +			'currentcat'	=> $nocatselected 
 +		);
 +		
 +		/* output header of category list item */
 +		if ( !array_key_exists('CATLIST_HEADER', $template) || empty($template['CATLIST_HEADER']) )
 +		{
 +			echo Template::fill(NULL, $args);
 +		}
 +		else
 +		{
 +			echo Template::fill($template['CATLIST_HEADER'], $args);
 +		}
 +		
 +		$query = "SELECT catid, cdesc as catdesc, cname as catname FROM %s WHERE cblog=%d ORDER BY cname ASC;";
 +		$query = sprintf($query, sql_table('category'), (integer) $this->blogid);
 +		$res = DB::getResult($query);
 +		
 +		foreach ( $res as $data )
 +		{
 +			$args = array(
 +				'catid'	=> $data['catid'],
 +				'name'	=> $data['catname'],
 +				'extra'	=> $linkparams
 +			);
 +			
 +			$data['blogid']		= $this->blogid;
 +			$data['blogurl']	= $blogurl;
 +			$data['catlink']	= Link::create_link('category', $args);
 +			$data['self']		= $CONF['Self'];
 +			
 +			// this gives catiscurrent = no when no category is selected.
 +			$data['catiscurrent'] = 'no';
 +			$data['currentcat'] = 'no';
 +			
 +			if ( $this->selectedcatid )
 +			{
 +				if ( $this->selectedcatid == $data['catid'] )
 +				{
 +					$data['catiscurrent']	= 'yes';
 +					$data['currentcat']		= 'yes';
 +				}
 +			}
 +			else
 +			{
 +				global $itemid;
 +				if ( intval($itemid) && $manager->existsItem(intval($itemid), 0, 0) )
 +				{
 +					$iobj	=& $manager->getItem(intval($itemid), 0, 0);
 +					$cid	= $iobj['catid'];
 +					
 +					if ( $cid == $data['catid'] )
 +					{
 +						$data['catiscurrent']	= 'yes';
 +						$data['currentcat']		= 'yes';
 +					}
 +				}
 +			}
 +			
 +			$manager->notify('PreCategoryListItem', array('listitem' => &$data));
 +			
 +			if ( !array_key_exists('CATLIST_LISTITEM', $template) || empty($template['CATLIST_LISTITEM']))
 +			{
 +				echo Template::fill(NULL, $data);
 +			}
 +			else
 +			{
 +				echo Template::fill($template['CATLIST_LISTITEM'], $data);
 +			}
 +		}
 +		
 +		$res->closeCursor();
 +		
 +		$args = array(
 +			'blogid'		=> $this->blogid,
 +			'blogurl'		=> $blogurl,
 +			'self'			=> $CONF['Self'],
 +			'catiscurrent'	=> $nocatselected, //: Change: Set catiscurrent template variable for footer
 +			'currentcat'	=> $nocatselected
 +		);
 +		
 +		if ( !array_key_exists('CATLIST_FOOTER', $template) || empty($template['CATLIST_FOOTER']))
 +		{
 +			echo Template::fill(NULL, $args);
 +		}
 +		else
 +		{
 +			echo Template::fill($template['CATLIST_FOOTER'], $args);
 +		}
 +		
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::showBlogList()
 +	 * Shows a list of all blogs in the system using a given template
 +	 * ordered by number, name, shortname or description
 +	 * in ascending or descending order
 +	 * 
 +	 * @param	string	$template	tempalte name
 +	 * @param	string	$bnametype	bname/bshortname
 +	 * @param	string	$orderby	string for 'ORDER BY' SQL
 +	 * @param	string	$direction	ASC/DESC
 +	 * @return	void
 +	 */
 +	public function showBlogList($template, $bnametype, $orderby, $direction)
 +	{
 +		global $CONF, $manager;
 +		
 +		switch ( $orderby )
 +		{
 +			case 'number':
 +				$orderby='bnumber';
 +				break;
 +			case 'name':
 +				$orderby='bname';
 +				break;
 +			case 'shortname':
 +				$orderby='bshortname';
 +				break;
 +			case 'description':
 +				$orderby='bdesc';
 +				break;
 +			default:
 +				$orderby='bnumber';
 +				break;
 +		}
 +		
 +		$direction=strtolower($direction);
 +		switch ( $direction )
 +		{
 +			case 'asc':
 +				$direction='ASC';
 +				break;
 +			case 'desc':
 +				$direction='DESC';
 +				break;
 +			default:
 +				$direction='ASC';
 +				break;
 +		}
 +		
 +		$template =& $manager->getTemplate($template);
 +		
 +		if ( array_key_exists('BLOGLIST_HEADER', $template) && !empty($template['BLOGLIST_HEADER']) )
 +		{
 +			$vars = array(
 +				'sitename'	=> $CONF['SiteName'],
 +				'siteurl'	=> $CONF['IndexURL']
 +			);
 +			
 +			echo Template::fill($template['BLOGLIST_HEADER'], $vars);
 +		}
 +		
 +		if ( array_key_exists('BLOGLIST_LISTITEM', $template) && !empty($template['BLOGLIST_LISTITEM']) )
 +		{
 +			$query = 'SELECT bnumber, bname, bshortname, bdesc, burl FROM '.sql_table('blog').' ORDER BY '.$orderby.' '.$direction;
 +			$res = DB::getResult($query);
 +			
 +			foreach ( $res as $data )
 +			{
 +				$list = array();
 +				$list['bloglink'] = Link::create_blogid_link($data['bnumber']);
 +				$list['blogdesc'] = $data['bdesc'];
 +				$list['blogurl'] = $data['burl'];
 +				
 +				if ( $bnametype == 'shortname' )
 +				{
 +					$list['blogname'] = $data['bshortname'];
 +				}
 +				else
 +				{
 +					/* all other cases */
 +					$list['blogname'] = $data['bname'];
 +				}
 +				
 +				$manager->notify('PreBlogListItem',array('listitem' => &$list));
 +				
 +				echo Template::fill($template['BLOGLIST_LISTITEM'], $list);
 +			}
 +			
 +			$res->closeCursor();
 +		}
 +		
 +		
 +		if ( array_key_exists('BLOGLIST_FOOTER', $template) && !empty($template['BLOGLIST_FOOTER']) )
 +		{
 +			$vars = array(
 +				'sitename' => $CONF['SiteName'],
 +				'siteurl' => $CONF['IndexURL']
 +			);
 +			echo Template::fill($template['BLOGLIST_FOOTER']);
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::readSettings()
 +	 * Read the blog settings
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	public function readSettings()
 +	{
 +		$query =  'SELECT * FROM %s WHERE bnumber=%d;';
 +		$query = sprintf($query, sql_table('blog'), (integer) $this->blogid);
 +		$res = DB::getResult($query);
 +		
 +		$this->isValid = ($res->rowCount() > 0);
 +		if ( $this->isValid )
 +		{
 +			$this->settings = $res->fetch(PDO::FETCH_ASSOC);
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::writeSettings()
 +	 * Write the blog settings
 +	 */
 +	public function writeSettings()
 +	{
 +		// (can't use floatval since not available prior to PHP 4.2)
 +		$offset = $this->getTimeOffset();
 +		if ( !is_float($offset) )
 +		{
 +			$offset = (integer) $offset;
 +		}
 +		
 +		$query =  'UPDATE '.sql_table('blog')
 +			   . ' SET bname=' . DB::quoteValue($this->getName()) . ','
 +			   . '     bshortname='. DB::quoteValue($this->getShortName()) . ','
 +			   . '     bcomments='. intval($this->commentsEnabled()) . ','
 +			   . '     bmaxcomments=' . intval($this->getMaxComments()) . ','
 +			   . '     btimeoffset=' . $offset . ','
 +			   . '     bpublic=' . intval($this->isPublic()) . ','
 +			   . '     breqemail=' . intval($this->emailRequired()) . ','
 +			   . '     bconvertbreaks=' . intval($this->convertBreaks()) . ','
 +			   . '     ballowpast=' . intval($this->allowPastPosting()) . ','
 +			   . '     bnotify=' . DB::quoteValue($this->getNotifyAddress()) . ','
 +			   . '     bnotifytype=' . intval($this->getNotifyType()) . ','
 +			   . '     burl=' . DB::quoteValue($this->getURL()) . ','
 +			   . '     bupdate=' . DB::quoteValue($this->getUpdateFile()) . ','
 +			   . '     bdesc=' . DB::quoteValue($this->getDescription()) . ','
 +			   . '     bdefcat=' . intval($this->getDefaultCategory()) . ','
 +			   . '     bdefskin=' . intval($this->getDefaultSkin()) . ','
 +			   . '     bincludesearch=' . intval($this->getSearchable())
 +			   . ' WHERE bnumber=' . intval($this->blogid);
 +		DB::execute($query);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::updateUpdatefile()
 +	 * Update the update file if requested
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	public function updateUpdatefile()
 +	{
 +		if ( $this->getUpdateFile() )
 +		{
 +			$f_update = fopen($this->getUpdateFile(), 'w');
 +			fputs($f_update,$this->getCorrectTime());
 +			fclose($f_update);
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::isValidCategory()
 +	 * Check if a category with a given catid is valid
 +	 * 
 +	 * @param	integer	$catid	ID for category
 +	 * @return	boolean	exists or not
 +	 */
 +	public function isValidCategory($catid)
 +	{
 +		$query = 'SELECT * FROM %s WHERE cblog=%d and catid=%d;';
 +		$query = sprintf($query, sql_table('category'), (integer) $this->blogid, (integer) $catid);
 +		$res = DB::getResult($query);
 +		return ($res->rowCount() != 0);
 +	}
 +	
 +	/**
 +	 * Blog::getCategoryName()
 +	 * Get the category name for a given catid
 +	 * 
 +	 * @param	integer	$catid	ID for category
 +	 * @return	string	name of category
 +	 */
 +	public function getCategoryName($catid)
 +	{
 +		$query = 'SELECT cname FROM %s WHERE cblog=%d and catid=%d;';
 +		$query = sprintf($query, sql_table('category'), (integer) $this->blogid, (integer) $catid);
 +		$res = DB::getValue($query);
 +		return $res;
 +	}
 +	
 +	/**
 +	 * Blog::getCategoryDesc()
 +	 * Get the category description for a given catid
 +	 * 
 +	 * @param $catid
 +	 * 	category id
 +	 */
 +	public function getCategoryDesc($catid)
 +	{
 +		$query = 'SELECT cdesc FROM %s WHERE cblog=%d and catid=%d;';
 +		$query = sprintf($querym, sql_table('category'), (integer) $this->blogid, (integer) $catid);
 +		$res = DB::getValue();
 +		return $res;
 +	}
 +	
 +	/**
 +	 * Blog::getCategoryIdFromName
 +	 * Get the category id for a given category name
 +	 * 
 +	 * @param	string	$name	category name
 +	 * @return	ID for category
 +	 */
 +	public function getCategoryIdFromName($name)
 +	{
 +		$query = 'SELECT catid FROM %s WHERE cblog=%d and cname=%s;';
 +		$query = sprintf($query, sql_table('category'), (integer) $this->blogid, DB::quoteValue($name));
 +		
 +		$res = DB::getValue();
 +		if ( !$res )
 +		{
 +			return $this->getDefaultCategory();
 +		}
 +		return $res;
 +	}
 +	
 +	/**
 +	 * Blog::insertJavaScriptInfo()
 +	 * Insert a javascript that includes information about the settings
 +	 * of an author:  ConvertBreaks, MediaUrl and AuthorId
 +	 * 
 +	 * @param	$authorid	id of the author
 +	 */
 +	public function insertJavaScriptInfo($authorid = '')
 +	{
 +		global $member, $CONF;
 +		
 +		if ( $authorid == '' )
 +		{
 +			$authorid = $member->getID();
 +		}
 +		
 +		echo "<script type=\"text/javascript\">\n";
 +		
 +		if ( !$this->convertBreaks() )
 +		{
 +			echo "setConvertBreaks(false);\n";
 +		}
 +		else
 +		{
 +			echo "setConvertBreaks(true);\n";
 +		}
 +		echo "setMediaUrl('{$CONF['MediaURL']}');\n";
 +		echo "setAuthorId('{$authorid}');\n";
 +		echo "</script>\n";
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setAllowPastPosting()
 +	 * Set the the setting for allowing to publish postings in the past
 +	 * 
 +	 * @param	boolean	$val	new value for ballowpast
 +	 * @return	void
 +	 */
 +	public function setAllowPastPosting($val)
 +	{
 +		$this->setSetting('ballowpast', $val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::allowPastPosting()
 +	 * Get the the setting if it is allowed to publish postings in the past
 +	 * [should be named as getAllowPastPosting()]
 +	 * 
 +	 * @param	void
 +	 * @return	boolean
 +	 */
 +	public function allowPastPosting()
 +	{
 +		return $this->getSetting('ballowpast');
 +	}
 +	
 +	/**
 +	 * Blog::getCorrectTime()
 +	 * 
 +	 * @param	integer	$t
 +	 * @return	integer
 +	 */
 +	public function getCorrectTime($t=0)
 +	{
 +		if ( $t == 0 )
 +		{
 +			$t = time();
 +		}
 +		return ($t + 3600 * $this->getTimeOffset());
 +	}
 +	
 +	/**
 +	 * Blog::getName()
 +	 * 
 +	 * @param	void
 +	 * @return	string name of this weblog
 +	 */
 +	public function getName()
 +	{
 +		return $this->getSetting('bname');
 +	}
 +	
 +	/**
 +	 * Blog::getShortName()
 +	 * 
 +	 * @param	void
 +	 * @return	string	short name of this weblog
 +	 */
 +	public function getShortName()
 +	{
 +		return $this->getSetting('bshortname');
 +	}
 +	
 +	/**
 +	 * Blog::getMaxComments()
 +	 * 
 +	 * @param	void
 +	 * @return	integer	maximum number of comments
 +	 */
 +	public function getMaxComments()
 +	{
 +		return $this->getSetting('bmaxcomments');
 +	}
 +	
 +	/**
 +	 * Blog::getNotifyAddress()
 +	 * 
 +	 * @param	void
 +	 * @return	string	mail address for notifying
 +	 */
 +	public function getNotifyAddress()
 +	{
 +		return $this->getSetting('bnotify');
 +	}
 +	
 +	/**
 +	 * Blog::getNotifyType()
 +	 * 
 +	 * @param	void
 +	 * @return	integer	notifycation type
 +	 */
 +	public function getNotifyType()
 +	{
 +		return $this->getSetting('bnotifytype');
 +	}
 +	
 +	/**
 +	 * Blog::notifyOnComment()
 +	 * 
 +	 * @param	void
 +	 * @return	boolean
 +	 */
 +	public function notifyOnComment()
 +	{
 +		$n = $this->getNotifyType();
 +		return (($n != 0) && (($n % 3) == 0));
 +	}
 +	
 +	/**
 +	 * Blog::notifyOnVote()
 +	 * 
 +	 * @param	void
 +	 * @return	boolean
 +	 */
 +	public function notifyOnVote()
 +	{
 +		$n = $this->getNotifyType();
 +		return (($n != 0) && (($n % 5) == 0));
 +	}
 +	
 +	/**
 +	 * Blog::notifyOnNewItem()
 +	 * 
 +	 * @param	void
 +	 * @return	boolean
 +	 */
 +	public function notifyOnNewItem()
 +	{
 +		$n = $this->getNotifyType();
 +		return (($n != 0) && (($n % 7) == 0));
 +	}
 +	
 +	/**
 +	 * Blog::setNotifyType()
 +	 * 
 +	 * @param	integer	$val
 +	 * @return	void
 +	 */
 +	public function setNotifyType($val)
 +	{
 +		$this->setSetting('bnotifytype',$val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::getTimeOffset()
 +	 * @param	void
 +	 * @return	
 +	 */
 +	public function getTimeOffset()
 +	{
 +		return $this->getSetting('btimeoffset');
 +	}
 +	
 +	/**
 +	 * Blog::commentsEnabled()
 +	 * @param	void
 +	 * @return	integer	enabled or not
 +	 */
 +	public function commentsEnabled()
 +	{
 +		return $this->getSetting('bcomments');
 +	}
 +	
 +	/**
 +	 * Blog::getURL()
 +	 * @param	void
 +	 * @return	string	URI for this weblog
 +	 */
 +	public function getURL()
 +	{
 +		return $this->getSetting('burl');
 +	}
 +	
 +	/**
 +	 * Blog::getDefaultSkin()
 +	 * @param	void
 +	 * @return	name of skin as default for this weblog
 +	 */
 +	public function getDefaultSkin()
 +	{
 +		return $this->getSetting('bdefskin');
 +	}
 +	
 +	/**
 +	 * Blog::getUpdateFile()
 +	 * @param	void
 +	 * @return	string	name of file to be updated when weblog is updated
 +	 */
 +	public function getUpdateFile()
 +	{
 +		return $this->getSetting('bupdate');
 +	}
 +	
 +	/**
 +	 * Blog::getDescription()
 +	 * @param	void
 +	 * @return	string	description for this weblog
 +	 */
 +	public function getDescription()
 +	{
 +		return $this->getSetting('bdesc');
 +	}
 +	
 +	/**
 +	 * Blog::isPublic()
 +	 * @param	void
 +	 * @return	integer	publlic or not
 +	 */
 +	public function isPublic()
 +	{
 +		return $this->getSetting('bpublic');
 +	}
 +	
 +	/**
 +	 * Blog::emailRequired()
 +	 * @param	void
 +	 * @return	integer	email is required when posting comment or not
 +	 */
 +	public function emailRequired()
 +	{
 +		return $this->getSetting('breqemail');
 +	}
 +	
 +	/**
 +	 * Blog::getSearchable()
 +	 * @param	void
 +	 * @return	integer	searchable or not
 +	 */
 +	public function getSearchable()
 +	{
 +		return $this->getSetting('bincludesearch');
 +	}
 +	
 +	/**
 +	 * Blog::getDefaultCategory()
 +	 * @param	void
 +	 * @return	ID for category as a default
 +	 */
 +	public function getDefaultCategory()
 +	{
 +		return $this->getSetting('bdefcat');
 +	}
 +	
 +	/**
 +	 * Blog::setPublic()
 +	 * @param	integer	$val	allow comments by non-registered members or not
 +	 * @return	void
 +	 */
 +	public function setPublic($val)
 +	{
 +		$this->setSetting('bpublic', $val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setSearchable()
 +	 * @param	integer	$val	searchable from the other blogs or not
 +	 * @return	void
 +	 */
 +	public function setSearchable($val)
 +	{
 +		$this->setSetting('bincludesearch', $val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setDescription
 +	 * @param	string	$val	description for this weblog
 +	 * @return	void
 +	 */
 +	public function setDescription($val)
 +	{
 +		$this->setSetting('bdesc',$val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setUpdateFile()
 +	 * @param	string	$val	name of file to beupdated when weblog is updated
 +	 * @return	
 +	 */
 +	public function setUpdateFile($val)
 +	{
 +		$this->setSetting('bupdate',$val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setDefaultSkin()
 +	 * @param	integer	$val	ID for default skin to use when displaying this weblog
 +	 * @return	void
 +	 */
 +	public function setDefaultSkin($val)
 +	{
 +		$this->setSetting('bdefskin', $val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setURL()
 +	 * @param	string	$val	URI for this weblog
 +	 * @return	
 +	 */
 +	public function setURL($val)
 +	{
 +		$this->setSetting('burl', $val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setName()
 +	 * @param	string	$val	name of this weblog
 +	 * @return	void
 +	 */
 +	public function setName($val)
 +	{
 +		$this->setSetting('bname', $val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setShortName()
 +	 * @param	string	$val	short name for this weblog
 +	 * @return	void
 +	 */
 +	public function setShortName($val)
 +	{
 +		$this->setSetting('bshortname', $val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setCommentsEnabled()
 +	 * @param	integer	$val	enabling posting comment or not
 +	 * @return	void
 +	 */
 +	public function setCommentsEnabled($val)
 +	{
 +		$this->setSetting('bcomments',$val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setMaxComments()
 +	 * @param	integer	$val	maximum number of comments for this weblog
 +	 * @return	void
 +	 */
 +	public function setMaxComments($val)
 +	{
 +		$this->setSetting('bmaxcomments', $val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setNotifyAddress()
 +	 * @param	string	$val	email to be notified if weblog updated
 +	 * @return	void
 +	 */
 +	public function setNotifyAddress($val)
 +	{
 +		$this->setSetting('bnotify', $val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setEmailRequired()
 +	 * @param	string	requiring comments with email or not from non member
 +	 * @return	void
 +	 */
 +	public function setEmailRequired($val)
 +	{
 +		$this->setSetting('breqemail', $val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setTimeOffset()
 +	 * @param	integer	$val	time offset
 +	 * @return	void
 +	 */
 +	public function setTimeOffset($val)
 +	{
 +		// check validity of value
 +		// 1. replace , by . (common mistake)
 +		$val = str_replace(',','.',$val);
 +		
 +		// 2. cast to float or int
 +		if ( is_numeric($val) && (i18n::strpos($val, '.5') === (i18n::strlen($val) - 2)) )
 +		{
 +			$val = (float) $val;
 +		}
 +		else
 +		{
 +			$val = (integer) $val;
 +		}
 +		
 +		$this->setSetting('btimeoffset',$val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::setDefaultCategory()
 +	 * @param	integer	$val	ID for default category for this weblog
 +	 * @return	
 +	 */
 +	public function setDefaultCategory($val)
 +	{
 +		$this->setSetting('bdefcat',$val);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::getSetting()
 +	 * @param	string	$key	key for setting of this weblog
 +	 * @return	mixed	value for the setting
 +	 */
 +	public function getSetting($key)
 +	{
 +		return $this->settings[$key];
 +	}
 +	
 +	/**
 +	 * Blog::setSetting()
 +	 * @param	string	$key	key for setting of this weblog
 +	 * @param	mixed	$value	value for the key
 +	 * @return	
 +	 */
 +	public function setSetting($key, $value)
 +	{
 +		$this->settings[$key] = $value;
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::addTeamMember()
 +	 * Tries to add a member to the team. 
 +	 * Returns false if the member was already on the team
 +	 * 
 +	 * @param	integer	$memberid	id for member
 +	 * @param	boolean	$admin	super-admin or not
 +	 * @return	boolean	Success/Fail
 +	 */
 +	public function addTeamMember($memberid, $admin)
 +	{
 +		global $manager;
 +		
 +		$memberid = intval($memberid);
 +		$admin = intval($admin);
 +		
 +		// check if member is already a member
 +		$tmem =& $manager->getMember($memberid);
 +		
 +		if ( $tmem->isTeamMember($this->blogid) )
 +		{
 +			return 0;
 +		}
 +		
 +		$data = array(
 +			'blog'		=> &$this,
 +			'member'	=> &$tmem,
 +			'admin'		=> &$admin
 +		);
 +		$manager->notify('PreAddTeamMember', $data);
 +		
 +		// add to team
 +		$query = "INSERT INTO %s (TMEMBER, TBLOG, TADMIN) VALUES (%d, %d, %d);";
 +		$query = sprintf($query, sql_table('team'), (integer) $memberid, (integer) $this->blogid, (integer) $admin);
 +		DB::execute($query);
 +		
 +		$data = array(
 +			'blog'		=> &$this,
 +			'member'	=> &$tmem,
 +			'admin'		=>  $admin
 +		);
 +		$manager->notify('PostAddTeamMember', $data);
 +		
 +		$logMsg = sprintf(_TEAM_ADD_NEWTEAMMEMBER, $tmem->getDisplayName(), $memberid, $this->getName());
 +		ActionLog::add(INFO, $logMsg);
 +		
 +		return 1;
 +	}
 +	
 +	/**
 +	 * Blog::getID()
 +	 * @param	void
 +	 * @return	integer	ID for this weblog
 +	 */
 +	public function getID()
 +	{
 +		return (integer) $this->blogid;
 +	}
 +	
 +	/**
 +	 * Checks if a blog with a given shortname exists 
 +	 * Returns true if there is a blog with the given shortname (static)
 +	 * 
 +	 * @param	string	$name		blog shortname
 +	 * @return	boolean	exists or not
 +	 */
 +	public function exists($name)
 +	{
 +		$r = DB::getResult('SELECT * FROM '.sql_table('blog').' WHERE bshortname='. DB::quoteValue($name));
 +		return ($r->rowCount() != 0);
 +	}
 +	
 +	/**
 +	 * Checks if a blog with a given id exists 
 +	 * Returns true if there is a blog with the given ID (static)
 +	 * 
 +	 * @param	integer	$id	ID for searched weblog
 +	 * @return	boolean	exists or not
 +	 */
 +	public function existsID($id)
 +	{
 +		$r = DB::getResult('SELECT * FROM '.sql_table('blog').' WHERE bnumber='.intval($id));
 +		return ($r->rowCount() != 0);
 +	}
 +	
 +	/**
 +	 * Blog::setFuturePost()
 +	 * flag there is a future post pending
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	public function setFuturePost()
 +	{
 +		$query =  "UPDATE %s SET bfuturepost='1' WHERE bnumber=%d;";
 +		$query = sprintf($query, sql_table('blog'), (integer) $this->blogid);
 +		DB::execute($query);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::clearFuturePost()
 +	 * clear there is a future post pending
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	public function clearFuturePost()
 +	{
 +		$query =  "UPDATE %s SET bfuturepost='0' WHERE bnumber=%d;";
 +		$query = sprintf($query, sql_table('blog'), (integer) $this->blogid);
 +		DB::execute($query);
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::checkJustPosted()
 +	 * check if we should throw justPosted event 
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	public function checkJustPosted()
 +	{
 +		global $manager;
 +		
 +		if ( $this->settings['bfuturepost'] == 1 )
 +		{
 +			$query = "SELECT * FROM %s WHERE iposted=0 AND iblog=%d AND itime < NOW();";
 +			$query = sprintf($query, sql_table('item'), (integer) $this->blogid);
 +			
 +			$result = DB::getResult($query);
 +			if ( $result->rowCount() > 0 )
 +			{
 +				// This $pinged is allow a plugin to tell other hook to the event that a ping is sent already
 +				// Note that the plugins's calling order is subject to thri order in the plugin list
 +				$pinged = FALSE;
 +				$manager->notify('JustPosted', array('blogid' => $this->blogid, 'pinged' => &$pinged));
 +				
 +				// clear all expired future posts
 +				$query = "UPDATE %s SET iposted='1' WHERE iblog=%d AND itime < NOW();";
 +				$query = spriintf($query, sql_table('item'), (integer) $this->blogid);
 +				DB::execute($query);
 +				
 +				// check to see any pending future post, clear the flag is none
 +				$query = "SELECT * FROM %s WHERE iposted=0 AND iblog=%d;";
 +				$query = sprintf($query, sql_table('item'), (integer) $this->blogid);
 +				
 +				$result = DB::getResult($query);
 +				if ( $result->rowCount() == 0 )
 +				{
 +					$this->clearFuturePost();
 +				}
 +			}
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * Blog::readLogFromList()
 +	 * Shows the given list of items for this blog
 +	 *
 +	 * @param	array	$itemarray	array of item numbers to be displayed
 +	 * @param	string	$template	string representing the template _NAME_ (!)
 +	 * @param	string	$highlight	contains a query that should be highlighted
 +	 * @param	boolean	$comments	1=show comments 0=don't show comments
 +	 * @param	boolean	$dateheads	1=show dateheads 0=don't show dateheads
 +	 * @param	boolean	$showDrafts	0=do not show drafts 1=show drafts
 +	 * @param	boolean	$showFuture	0=do not show future posts 1=show future posts
 +	 * @return	integer	amount of items shown
 +	 */
 +	public function readLogFromList($itemarray, $template, $highlight = '', $comments = 1, $dateheads = 1,$showDrafts = 0, $showFuture = 0)
 +	{
 +		$query = $this->getSqlItemList($itemarray,$showDrafts,$showFuture);
 +		return $this->showUsingQuery($template, $query, $highlight, $comments, $dateheads);
 +	}
 +	
 +	/**
 +	 * Blog::getSqlItemList()
 +	 * Returns the SQL query used to fill out templates for a list of items
 +	 * No LIMIT clause is added. (caller should add this if multiple pages are requested)
 +	 *
 +	 * @param	array	$itemarray	an array holding the item numbers of the items to be displayed
 +	 * @param	integer	$showDrafts	0=do not show drafts 1=show drafts
 +	 * @param	integer	$showFuture	0=do not show future posts 1=show future posts
 +	 * @return	string	either a full SQL query, or an empty string
 +	 */
 +	public function getSqlItemList($itemarray,$showDrafts = 0,$showFuture = 0)
 +	{
 +		if ( !is_array($itemarray) )
 +		{
 +			return '';
 +		}
 +		
 +		$showDrafts = intval($showDrafts);
 +		$showFuture = intval($showFuture);
 +		$items = array();
 +		
 +		foreach ( $itemarray as $value )
 +		{
 +			if ( intval($value) )
 +			{
 +				$items[] = intval($value);
 +			}
 +		}
 +		if ( !count($items) )
 +		{
 +			return '';
 +		}
 +		
 +		$i = count($items);
 +		$query = '';
 +		foreach ( $items as $value )
 +		{
 +			$query .= '('
 +					.	'SELECT'
 +					.	' i.inumber as itemid,'
 +					.	' i.ititle as title,'
 +					.	' i.ibody as body,'
 +					.	' m.mname as author,'
 +					.	' m.mrealname as authorname,'
 +					.	' i.itime,'
 +					.	' i.imore as more,'
 +					.	' m.mnumber as authorid,'
 +					.	' m.memail as authormail,'
 +					.	' m.murl as authorurl,'
 +					.	' c.cname as category,'
 +					.	' i.icat as catid,'
 +					.	' i.iclosed as closed';
 +			
 +			$query .= ' FROM '
 +					. sql_table('item') . ' as i, '
 +					. sql_table('member') . ' as m, '
 +					. sql_table('category') . ' as c'
 +					. ' WHERE'
 +				    .    ' i.iblog='.$this->blogid
 +				   . ' and i.iauthor=m.mnumber'
 +				   . ' and i.icat=c.catid';
 +			
 +			// exclude drafts	
 +			if ( !$showDrafts )
 +			{
 +				$query .= ' and i.idraft=0';
 +			}
 +			if ( !$showFuture )
 +			{
 +				// don't show future items
 +				$query .= ' and i.itime<=' . DB::formatDateTime($this->getCorrectTime());
 +			}
 +			
 +			$query .= ' and i.inumber='.intval($value);
 +			$query .= ')';
 +			$i--;
 +			if ($i) $query .= ' UNION ';
 +		}
 +		
 +		return $query;
 +	}
 +	
 +	/**
 +	 * Blog::convertBreaks()
 +	 * Get the the setting for the line break handling
 +	 * [should be named as getConvertBreaks()]
 +	 * 
 +	 * @deprecated
 +	 * @param	void
 +	 * @return	
 +	 */
 +	public function convertBreaks()
 +	{
 +		return $this->getSetting('bconvertbreaks');
 +	}
 +	
 +	/**
 +	 * Set the the setting for the line break handling
 +	 * 
 +	 * @deprecated
 +	 * @param	boolean	$val	new value for bconvertbreaks
 +	 * @return	void
 +	 */
 +	public function setConvertBreaks($val)
 +	{
 +		$this->setSetting('bconvertbreaks', $val);
 +		return;
 +	}
 +}
++=======
+ <?php
+ 
+ /*
+  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+  * Copyright (C) 2002-2012 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)
+  */
+ /**
+  * A class representing a blog and containing functions to get that blog shown
+  * on the screen
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: BLOG.php 1624 2012-01-09 11:36:20Z sakamocchi $
+  */
+ 
+ if ( !function_exists('requestVar') ) exit;
+ require_once dirname(__FILE__) . '/ITEMACTIONS.php';
+ 
+ class Blog
+ {
+ 	// blog id
+ 	public $blogid;
+ 
+ 	// After creating an object of the blog class, contains true if the BLOG object is
+ 	// valid (the blog exists)
+ 	public $isValid;
+ 
+ 	// associative array, containing all blogsettings (use the get/set functions instead)
+ 	private $settings;
+ 	
+ 	// ID of currently selected category
+ 	private $selectedcatid;
+ 
+ 	/**
+ 	 * Blog::_\construct()
+ 	 * Creates a new BLOG object for the given blog
+ 	 *
+ 	 * @param	integer	$id	blogid
+ 	 * @return	void
+ 	 */
+ 	public function __construct($id)
+ 	{
+ 		global $catid;
+ 		
+ 		$this->blogid = (integer) $id;
+ 		$this->readSettings();
+ 		$this->setSelectedCategory($catid);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::readLog()
+ 	 * Shows the given amount of items for this blog
+ 	 *
+ 	 * @param	string	$template	String representing the template _NAME_ (!)
+ 	 * @param	integer	$amountEntries	amount of entries to show
+ 	 * @param	integer	$startpos	offset from where items should be shown (e.g. 5 = start at fifth item)
+ 	 * @return	integer	amount of items shown
+ 	 */
+ 	public function readLog($template, $amountEntries, $offset = 0, $startpos = 0)
+ 	{
+ 		return $this->readLogAmount($template,$amountEntries,'','',1,1,$offset, $startpos);
+ 	}
+ 	
+ 	/**
+ 	 * Blog::showArchive()
+ 	 * Shows an archive for a given month
+ 	 *
+ 	 * @param	integer	$year		year
+ 	 * @param	integer	$month		month
+ 	 * @param	string	$template	String representing the template name to be used
+ 	 * @return	void
+ 	 */
+ 	public function showArchive($templatename, $year, $month=0, $day=0)
+ 	{
+ 		// create extra where clause for select query
+ 		if ( $day == 0 && $month != 0 )
+ 		{
+ 			$timestamp_start = mktime(0,0,0,$month,1,$year);
+ 			// also works when $month==12
+ 			$timestamp_end = mktime(0,0,0,$month+1,1,$year);
+ 		}
+ 		elseif ( $month == 0 )
+ 		{
+ 			$timestamp_start = mktime(0,0,0,1,1,$year);
+ 			// also works when $month==12
+ 			$timestamp_end = mktime(0,0,0,12,31,$year);
+ 		}
+ 		else
+ 		{
+ 			$timestamp_start = mktime(0,0,0,$month,$day,$year);
+ 			$timestamp_end = mktime(0,0,0,$month,$day+1,$year);
+ 		}
+ 		$extra_query = " and i.itime>=%s and i.itime<%s";
+ 		$extra_query = sprintf($extra_query, DB::formatDateTime($timestamp_start), DB::formatDateTime($timestamp_end));
+ 		
+ 		$this->readLogAmount($templatename,0,$extra_query,'',1,1);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setSelectedCategory()
+ 	 * Sets the selected category by id (only when category exists)
+ 	 * 
+ 	 * @param	integer	$catid	ID for category
+ 	 * @return	void
+ 	 */
+ 	public function setSelectedCategory($catid)
+ 	{
+ 		if ( $this->isValidCategory($catid) || (intval($catid) == 0) )
+ 		{
+ 			$this->selectedcatid = intval($catid);
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setSelectedCategoryByName()
+ 	 * Sets the selected category by name
+ 	 * 
+ 	 * @param	string	$catname	name of category
+ 	 * @return	void
+ 	 */
+ 	public function setSelectedCategoryByName($catname)
+ 	{
+ 		$this->setSelectedCategory($this->getCategoryIdFromName($catname));
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getSelectedCategory()
+ 	 * Returns the selected category
+ 	 * 
+ 	 * @param	void
+ 	 * @return	integer
+ 	 */
+ 	public function getSelectedCategory()
+ 	{
+ 		return $this->selectedcatid;
+ 	}
+ 	
+ 	/**
+ 	 * Shows the given amount of items for this blog
+ 	 *
+ 	 * @param	string	$template		string representing the template _NAME_ (!)
+ 	 * @param	integer	$amountEntries	amount of entries to show (0 = no limit)
+ 	 * @param	string	$extraQuery		extra conditions to be added to the query
+ 	 * @param	string	$highlight		contains a query that should be highlighted
+ 	 * @param	integer	$comments		1=show comments 0=don't show comments
+ 	 * @param	integer	$dateheads		1=show dateheads 0=don't show dateheads
+ 	 * @param	integer	$offset			offset
+ 	 * @return	integer	amount of items shown
+ 	 */
+ 	private function readLogAmount($template, $amountEntries, $extraQuery, $highlight, $comments, $dateheads, $offset = 0, $startpos = 0)
+ 	{
+ 		$query = $this->getSqlBlog($extraQuery);
+ 		
+ 		if ( $amountEntries > 0 )
+ 		{
+ 			// $offset zou moeten worden:
+ 			// (($startpos / $amountentries) + 1) * $offset ... later testen ...
+ 			$query .= ' LIMIT ' . intval($startpos + $offset).',' . intval($amountEntries);
+ 		}
+ 		return $this->showUsingQuery($template, $query, $highlight, $comments, $dateheads);
+ 	}
+ 	
+ 	/**
+ 	 * Blog::showUsingQuery()
+ 	 * Do the job for readLogAmmount
+ 	 * 
+ 	 * @param	string	$templateName	template name
+ 	 * @param	string	$query			string for query
+ 	 * @param	string	$highlight		string to be highlighted
+ 	 * @param	integer	$comments		the number of comments
+ 	 * @param	boolean	$dateheads		date header is needed or not
+ 	 * @return	integer	the number of rows as a result of mysql query
+ 	 */
+ 	private function showUsingQuery($templateName, $query, $highlight = '', $comments = 0, $dateheads = 1)
+ 	{
+ 		global $CONF, $manager, $currentTemplateName;
+ 		
+ 		$lastVisit = cookieVar($CONF['CookiePrefix'] .'lastVisit');
+ 		if ( $lastVisit != 0 )
+ 		{
+ 			$lastVisit = $this->getCorrectTime($lastVisit);
+ 		}
+ 		
+ 		// set templatename as global variable (so plugins can access it)
+ 		$currentTemplateName = $templateName;
+ 		$template =& $manager->getTemplate($templateName);
+ 		
+ 		// create parser object & action handler
+ 		$handler = new ItemActions($this);
+ 		$handler->setTemplate($template);
+ 		$handler->setHighlight($highlight);
+ 		$handler->setLastVisit($lastVisit);
+ 		$handler->setShowComments($comments);
+ 		
+ 		$parser = new Parser($handler);
+ 		
+ 		// execute query
+ 		$items = DB::getResult($query);
+ 		
+ 		// loop over all items
+ 		$old_date = 0;
+ 		foreach ( $items as $item )
+ 		{
+ 			// string timestamp -> unix timestamp
+ 			$item['timestamp'] = strtotime($item['itime']);
+ 			
+ 			// action handler needs to know the item we're handling
+ 			$handler->setCurrentItem($item);
+ 			
+ 			// add date header if needed
+ 			if ( $dateheads )
+ 			{
+ 				$new_date = date('dFY', $item['timestamp']);
+ 				if ( $new_date != $old_date )
+ 				{
+ 					// unless this is the first time, write date footer
+ 					$timestamp = $item['timestamp'];
+ 					if ( $old_date != 0 )
+ 					{
+ 						$oldTS = strtotime($old_date);
+ 						$data = array('blog' => &$this, 'timestamp' => $oldTS);
+ 						$manager->notify('PreDateFoot', $data);
+ 						
+ 						if ( !in_array('DATE_FOOTER', $template) || empty($template['DATE_FOOTER']) )
+ 						{
+ 							$tmp_footer = '';
+ 						}
+ 						else
+ 						{
+ 							$tmp_footer = i18n::formatted_datetime($template['DATE_FOOTER'], $oldTS);
+ 						}
+ 						$parser->parse($tmp_footer);
+ 						$manager->notify('PostDateFoot', $data);
+ 					}
+ 					
+ 					$data = array('blog' => &$this, 'timestamp' => $timestamp);
+ 					$manager->notify('PreDateHead', $data);
+ 					
+ 					// note, to use templatvars in the dateheader, the %-characters need to be doubled in
+ 					// order to be preserved by strftime
+ 					if ( !in_array('DATE_HEADER', $template) || empty($template['DATE_HEADER']) )
+ 					{
+ 						$tmp_header = '';
+ 					}
+ 					else
+ 					{
+ 						$tmp_header = i18n::formatted_datetime($template['DATE_HEADER'], $timestamp);
+ 					}
+ 					$parser->parse($tmp_header);
+ 					$manager->notify('PostDateHead', $data);
+ 				}
+ 				$old_date = $new_date;
+ 			}
+ 			
+ 			// parse item
+ 			$parser->parse($template['ITEM_HEADER']);
+ 			$data = array('blog' => &$this, 'item' => &$item);
+ 			$manager->notify('PreItem', $data);
+ 			$parser->parse($template['ITEM']);
+ 			$manager->notify('PostItem', $data);
+ 			$parser->parse($template['ITEM_FOOTER']);
+ 		}
+ 		
+ 		$numrows = $items->rowCount();
+ 		
+ 		// add another date footer if there was at least one item
+ 		if ( ($numrows > 0) && $dateheads )
+ 		{
+ 			$data = array('blog' => &$this, 'timestamp' => strtotime($old_date));
+ 			$manager->notify('PreDateFoot', $data);
+ 			$parser->parse($template['DATE_FOOTER']);
+ 			$manager->notify('PostDateFoot', $data);
+ 		}
+ 		
+ 		$items->closeCursor();
+ 		return $numrows;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::showOneitem()
+ 	 * Simplified function for showing only one item
+ 	 * 
+ 	 * @param	integer	$itemid		ID for item
+ 	 * @param	array	$template	template for item
+ 	 * @param	string	$highlight	string for highlight
+ 	 * @return	integer	1
+ 	 */
+ 	public function showOneitem($itemid, $template, $highlight)
+ 	{
+ 		$extraQuery = ' and inumber=' . intval($itemid);
+ 		
+ 		return $this->readLogAmount($template, 1, $extraQuery, $highlight, 0, 0);
+ 	}
+ 	
+ 	/**
+ 	 * Blog::addItem()
+ 	 * Adds an item to this blog
+ 	 * 
+ 	 * @param	integer		$catid	ID for category
+ 	 * @param	string		$title	ID for 
+ 	 * @param	string		$body	text for body
+ 	 * @param	string		$more	text for more
+ 	 * @param	integer		$blogid	ID for blog
+ 	 * @param	integer		$authorid	ID for author
+ 	 * @param	timestamp	$timestamp	UNIX timestamp for post
+ 	 * @param	boolean		$closed	opened or closed
+ 	 * @param	boolean		$draft	draft or not
+ 	 * @param	boolean		$posted	posted or not
+ 	 * @return	integer	ID for added item
+ 	 */
+ 	function additem($catid, $title, $body, $more, $blogid, $authorid, $timestamp, $closed, $draft, $posted='1')
+ 	{
+ 		global $manager;
+ 		
+ 		$blogid		= (integer) $blogid;
+ 		$authorid	= (integer) $authorid;
+ 		$title		= $title;
+ 		$body		= $body;
+ 		$more		= $more;
+ 		$catid		= intval($catid);
+ 		
+ 		// convert newlines to <br />
+ 		if ( $this->convertBreaks() )
+ 		{
+ 			$body = addBreaks($body);
+ 			$more = addBreaks($more);
+ 		}
+ 
+ 		if ( $closed != '1' )
+ 		{
+ 			$closed = '0';
+ 		}
+ 		if ( $draft != '0' )
+ 		{
+ 			$draft = '1';
+ 		}
+ 		
+ 		if ( !$this->isValidCategory($catid) )
+ 		{
+ 			$catid = $this->getDefaultCategory();
+ 		}
+ 		
+ 		$isFuture = 0;
+ 		if ( $timestamp > $this->getCorrectTime() )
+ 		{
+ 			$isFuture = 1;
+ 		}
+ 		
+ 		$timestamp = date('Y-m-d H:i:s',$timestamp);
+ 
+ 		$data = array('title' => &$title, 'body' => &$body, 'more' => &$more, 'blog' => $this, 'authorid' => &$authorid, 'timestamp' => &$timestamp, 'closed' => &$closed, 'draft' => &$draft, 'catid' => &$catid);
+ 		$manager->notify('PreAddItem', $data);
+ 		
+ 		$ititle = DB::quoteValue($title);
+ 		$ibody = DB::quoteValue($body);
+ 		$imore = DB::quoteValue($more);
+ 		$timestamp = DB::formatDateTime(strtotime($timestamp));
+ 		
+ 		$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)";
+ 		$query = sprintf($query, sql_table('item'), $ititle, $ibody, $imore, $blogid, $authorid, $timestamp, $closed, $draft, $catid, $posted);
+ 		DB::execute($query);
+ 		$itemid = DB::getInsertId();
+ 
+ 		$data = array('itemid' => $itemid);
+ 		$manager->notify('PostAddItem', $data);
+ 		
+ 		if ( !$draft )
+ 		{
+ 			$this->updateUpdateFile();
+ 		}
+ 		// send notification mail
+ 		if ( !$draft && !$isFuture && $this->getNotifyAddress() && $this->notifyOnNewItem() )
+ 		{
+ 			$this->sendNewItemNotification($itemid, $title, $body);
+ 		}
+ 		return $itemid;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::sendNewItemNotification()
+ 	 * Send a new item notification to the notification list
+ 	 * 
+ 	 * @param	string	$itemid	ID of the item
+ 	 * @param	string	$title	title of the item
+ 	 * @param	string	$body	body of the item
+ 	 * @return	void
+ 	 */
+ 	public function sendNewItemNotification($itemid, $title, $body)
+ 	{
+ 		global $CONF, $member;
+ 		
+ 		$ascii = Entity::anchor_footnoting($body);
+ 		
+ 		$message = _NOTIFY_NI_MSG . " \n";
+ 		$temp = parse_url($CONF['Self']);
+ 		if ( $temp['scheme'] )
+ 		{
+ 			$message .= Link::create_item_link($itemid) . "\n\n";
+ 		}
+ 		else
+ 		{
+ 			$tempurl = $this->getURL();
+ 			if ( i18n::substr($tempurl, -1) == '/' || i18n::substr($tempurl, -4) == '.php' )
+ 			{
+ 				$message .= $tempurl . '?itemid=' . $itemid . "\n\n";
+ 			}
+ 			else
+ 			{
+ 				$message .= $tempurl . '/?itemid=' . $itemid . "\n\n";
+ 			}
+ 		}
+ 		$message .= _NOTIFY_TITLE . ' ' . strip_tags($title) . "\n";
+ 		$message .= _NOTIFY_CONTENTS . "\n " . $ascii . "\n";
+ 		$message .= NOTIFICATION::get_mail_footer();
+ 		
+ 		$subject = $this->getName() . ': ' . _NOTIFY_NI_TITLE;
+ 		
+ 		$from = $member->getNotifyFromMailAddress();
+ 		
+ 		NOTIFICATION::mail($this->getNotifyAddress(), $subject, $message, $from, i18n::get_current_charset());
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::createNewCategory()
+ 	 * Creates a new category for this blog
+ 	 *
+ 	 * @param	string	$catName		name of the new category. When empty, a name is generated automatically (starting with newcat)
+ 	 * @param	string	$catDescription	description of the new category. Defaults to 'New Category'
+ 	 * @return	integer	ID for new category on success. 0 on failure
+ 	 */
+ 	public function createNewCategory($catName = '', $catDescription = _CREATED_NEW_CATEGORY_DESC)
+ 	{
+ 		global $member, $manager;
+ 		
+ 		if ( !$member->blogAdminRights($this->blogid) )
+ 		{
+ 			return 0;
+ 		}
+ 		
+ 		// generate
+ 		if ( $catName == '' )
+ 		{
+ 			$catName = _CREATED_NEW_CATEGORY_NAME;
+ 			$i = 1;
+ 			
+ 			$res = DB::getResult('SELECT * FROM '.sql_table('category')." WHERE cname='".$catName.$i."' and cblog=".$this->blogid);
+ 			while ( $res->rowCount() > 0 )
+ 			{
+ 				$i++;
+ 				$res = DB::getResult('SELECT * FROM '.sql_table('category')." WHERE cname='".$catName.$i."' and cblog=".$this->blogid);
+ 			}
+ 			
+ 			$catName = $catName . $i;
+ 		}
+ 		
+ 		$data = array(
+ 			'blog'			=> &$this,
+ 			'name'			=> &$catName,
+ 			'description'	=> $catDescription
+ 		);
+ 		$manager->notify('PreAddCategory', $data);
+ 		
+ 		$query = "INSERT INTO %s (cblog, cname, cdesc) VALUES (%d, %s, %s)";
+ 		$query = sprintf($query, sql_table('category'), (integer) $this->blogid, DB::quoteValue($catName), DB::quoteValue($catDescription));
+ 		DB::execute($query);
+ 		$catid = DB::getInsertId();
+ 		
+ 		$data = array(
+ 			'blog'			=> &$this,
+ 			'name'			=> $catName,
+ 			'description'	=> $catDescription,
+ 			'catid'			=> $catid
+ 		);
+ 		$manager->notify('PostAddCategory', $data);
+ 		
+ 		return $catid;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::search()
+ 	 * Searches all months of this blog for the given query
+ 	 *
+ 	 * @param	string	$query			search query
+ 	 * @param	array	$template		template to be used (__NAME__ of the template)
+ 	 * @param	integer	$amountMonths	max amount of months to be search (0 = all)
+ 	 * @param	integer	$maxresults		max number of results to show
+ 	 * @param	integer	$startpos		offset
+ 	 * @return	amount of hits found
+ 	 */
+ 	public function search($query, $template, $amountMonths, $maxresults, $startpos) {
+ 		global $CONF, $manager;
+ 		
+ 		$highlight 	= '';
+ 		$sqlquery	= $this->getSqlSearch($query, $amountMonths, $highlight);
+ 		
+ 		if ( $sqlquery == '' )
+ 		{
+ 			// no query -> show everything
+ 			$extraquery = '';
+ 			$amountfound = $this->readLogAmount($template, $maxresults, $extraQuery, $query, 1, 1);
+ 		}
+ 		else
+ 		{
+ 			// add LIMIT to query (to split search results into pages)
+ 			if ( intval($maxresults > 0) )
+ 			{
+ 				$sqlquery .= ' LIMIT ' . intval($startpos) . ',' . intval($maxresults);
+ 			}
+ 			
+ 			// show results
+ 			$amountfound = $this->showUsingQuery($template, $sqlquery, $highlight, 1, 1);
+ 			
+ 			// when no results were found, show a message
+ 			if ( $amountfound == 0 )
+ 			{
+ 				$template =& $manager->getTemplate($template);
+ 				$vars = array(
+ 					'query'		=> Entity::hsc($query),
+ 					'blogid'	=> $this->blogid
+ 				);
+ 				echo Template::fill($template['SEARCH_NOTHINGFOUND'], $vars);
+ 			}
+ 		}
+ 		return $amountfound;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getSqlSearch()
+ 	 * Returns an SQL query to use for a search query
+ 	 * No LIMIT clause is added. (caller should add this if multiple pages are requested)
+ 	 *
+ 	 * @param	string	$query			search query
+ 	 * @param	integer	$amountMonths	amount of months to search back. Default = 0 = unlimited
+ 	 * @param	string	$mode			either empty, or 'count'. In this case, the query will be a SELECT COUNT(*) query
+ 	 * @return	string	$highlight		words to highlight (out parameter)
+ 	 * @return	string	either a full SQL query, or an empty string (if querystring empty)
+ 	 */
+ 	public function getSqlSearch($query, $amountMonths = 0, &$highlight, $mode = '')
+ 	{
+ 		$searchclass = new Search($query);
+ 		
+ 		$highlight	 = $searchclass->inclusive;
+ 		
+ 		// if querystring is empty, return empty string
+ 		if ( $searchclass->inclusive == '' )
+ 		{
+ 			return '';
+ 		}
+ 		
+ 		$where  = $searchclass->boolean_sql_where('ititle,ibody,imore');
+ 		$select = $searchclass->boolean_sql_select('ititle,ibody,imore');
+ 		
+ 		// get list of blogs to search
+ 		$blogs		= $searchclass->blogs;	// array containing blogs that always need to be included
+ 		$blogs[]	= $this->blogid;		// also search current blog (duh)
+ 		$blogs		= array_unique($blogs);	// remove duplicates
+ 		$selectblogs = '';
+ 		if ( count($blogs) > 0 )
+ 		{
+ 			$selectblogs = ' and i.iblog in (' . implode(',', $blogs) . ')';
+ 		}
+ 		
+ 		if ( $mode == '' )
+ 		{
+ 			$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,
+ 				m.mname as author, m.mrealname as authorname, m.mnumber as authorid, m.memail as authormail, m.murl as authorurl,
+ 				c.cname as category';
+ 			
+ 			if ( $select )
+ 			{
+ 				$query .= ', '.$select. ' as score ';
+ 			}
+ 		}
+ 		else
+ 		{
+ 			$query = 'SELECT COUNT(*) as result ';
+ 		}
+ 		
+ 		$query .= ' FROM '.sql_table('item').' as i, '.sql_table('member').' as m, '.sql_table('category').' as c'
+ 				. ' WHERE i.iauthor=m.mnumber'
+ 				. ' and i.icat=c.catid'
+ 				// exclude drafts
+ 				. ' and i.idraft=0'
+ 				. $selectblogs
+ 					// don't show future items
+ 				. ' and i.itime<=' . DB::formatDateTime($this->getCorrectTime())
+ 				. ' and '.$where;
+ 		
+ 		// take into account amount of months to search
+ 		if ( $amountMonths > 0 )
+ 		{
+ 			$localtime = getdate($this->getCorrectTime());
+ 			$timestamp_start = mktime(0,0,0,$localtime['mon'] - $amountMonths,1,$localtime['year']);
+ 			$query .= ' and i.itime>' . DB::formatDateTime($timestamp_start);
+ 		}
+ 		
+ 		if ( $mode == '' )
+ 		{
+ 			if ( $select )
+ 			{
+ 				$query .= ' ORDER BY score DESC';
+ 			}
+ 			else
+ 			{
+ 				$query .= ' ORDER BY i.itime DESC ';
+ 			}
+ 		}
+ 		
+ 		return $query;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getSqlBlog()
+ 	 * Returns the SQL query that's normally used to display the blog items on the index type skins
+ 	 * No LIMIT clause is added. (caller should add this if multiple pages are requested)
+ 	 *
+ 	 * @param	string	$extraQuery	extra query string
+ 	 * @param	string	$mode		either empty, or 'count'. In this case, the query will be a SELECT COUNT(*) query
+ 	 * @return	string	either a full SQL query, or an empty string
+ 	 */
+ 	public function getSqlBlog($extraQuery, $mode = '')
+ 	{
+ 		if ( $mode == '' )
+ 		{
+ 			$query = 'SELECT i.inumber as itemid, i.ititle as title, i.ibody as body, m.mname as author,
+ 				m.mrealname as authorname, i.itime, i.imore as more, m.mnumber as authorid, m.memail as authormail,
+ 				m.murl as authorurl, c.cname as category, i.icat as catid, i.iclosed as closed';
+ 		}
+ 		else
+ 		{
+ 			$query = 'SELECT COUNT(*) as result ';
+ 		}
+ 		
+ 		$query	.= ' FROM '.sql_table('item').' as i, '.sql_table('member').' as m, '.sql_table('category').' as c'
+ 				. ' WHERE i.iblog='.$this->blogid
+ 				. ' and i.iauthor=m.mnumber'
+ 				. ' and i.icat=c.catid'
+ 				. ' and i.idraft=0' // exclude drafts
+ 				. ' and i.itime<=' . DB::formatDateTime($this->getCorrectTime()); // don't show future items
+ 		
+ 		if ( $this->selectedcatid )
+ 		{
+ 			$query .= ' and i.icat=' . $this->selectedcatid . ' ';
+ 		}
+ 		
+ 		$query .= $extraQuery;
+ 		
+ 		if ( $mode == '' )
+ 		{
+ 			$query .= ' ORDER BY i.itime DESC';
+ 		}
+ 		return $query;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::showArchiveList()
+ 	 * Shows the archivelist using the given template
+ 	 * 
+ 	 * @param	string	$template	template name
+ 	 * @param	string	$mode	year/month/day
+ 	 * @param	integer	$limit	limit of record count
+ 	 * @return	void
+ 	 */
+ 	public function showArchiveList($template, $mode = 'month', $limit = 0)
+ 	{
+ 		global $CONF, $catid, $manager;
+ 		
+ 		if ( !isset ($linkparams) )
+ 		{
+ 			$linkparams = array();
+ 		}
+ 		
+ 		if ( $catid )
+ 		{
+ 			$linkparams = array('catid' => $catid);
+ 		}
+ 		
+ 		$template =& $manager->getTemplate($template);
+ 		$listitem['blogid'] = $this->blogid;
+ 		
+ 		if ( !array_key_exists('ARCHIVELIST_HEADER', $template) || !$template['ARCHIVELIST_HEADER'] )
+ 		{
+ 			$tplt = '';
+ 		}
+ 		else
+ 		{
+ 			$tplt = $template['ARCHIVELIST_HEADER'];
+ 		}
+ 		
+ 		echo Template::fill($tplt, $listitem);
+ 		
+ 		$query = 'SELECT itime, SUBSTRING(itime,1,4) AS Year, SUBSTRING(itime,6,2) AS Month, SUBSTRING(itime,9,2) AS Day'
+ 				. ' FROM '.sql_table('item')
+ 				. ' WHERE iblog=' . $this->blogid
+ 				. ' AND itime <=' . DB::formatDateTime($this->getCorrectTime()) // don't show future items!
+ 				. ' AND idraft=0'; // don't show draft items
+ 		
+ 		if ( $catid )
+ 		{
+ 			$query .= ' and icat=' . intval($catid);
+ 		}
+ 		
+ 		$query .= ' GROUP BY Year';
+ 		if ( $mode == 'month' || $mode == 'day' )
+ 		{
+ 			$query .= ', Month';
+ 		}
+ 		if ( $mode == 'day' )
+ 		{
+ 			$query .= ', Day';
+ 		}
+ 		
+ 		$query .= ' ORDER BY itime DESC';
+ 		
+ 		if ( $limit > 0 )
+ 		{
+ 			$query .= ' LIMIT ' . intval($limit);
+ 		}
+ 		
+ 		$res = DB::getResult($query);
+ 		foreach ( $res as $current )
+ 		{
+ 			/* string time -> unix timestamp */
+ 			$current['itime'] = strtotime($current['itime']);
+ 			
+ 			if ( $mode == 'day' )
+ 			{
+ 				$archivedate = date('Y-m-d',$current['itime']);
+ 				$archive['day'] = date('d',$current['itime']);
+ 				$listitem['day'] = date('d',$current['itime']);
+ 				$listitem['month'] = date('m',$current['itime']);
+ 				$archive['month'] = $listitem['month'];
+ 			}
+ 			elseif ( $mode == 'year' )
+ 			{
+ 				$archivedate = date('Y',$current['itime']);
+ 				$listitem['day'] = '';
+ 				$listitem['month'] = '';
+ 				$archive['day'] = '';
+ 				$archive['month'] = '';
+ 			}
+ 			else
+ 			{
+ 				$archivedate = date('Y-m',$current['itime']);
+ 				$listitem['month'] = date('m',$current['itime']);
+ 				$archive['month'] = $listitem['month'];
+ 				$listitem['day'] = '';
+ 				$archive['day'] = '';
+ 			}
+ 			
+ 			$listitem['year'] = date('Y',$current['itime']);
+ 			$archive['year'] = $listitem['year'];
+ 			$listitem['archivelink'] = Link::create_archive_link($this->blogid,$archivedate,$linkparams);
+ 
+ 			$data = array('listitem' => &$listitem);
+ 			$manager->notify('PreArchiveListItem', $data);
+ 			
+ 			$temp = Template::fill($template['ARCHIVELIST_LISTITEM'],$listitem);
+ 			echo i18n::formatted_datetime($temp, $current['itime']);
+ 			return;
+ 		}
+ 		
+ 		$res->closeCursor();
+ 		
+ 		if ( !array_key_exists('ARCHIVELIST_FOOTER', $template) || !$template['ARCHIVELIST_FOOTER'] )
+ 		{
+ 			$tplt = '';
+ 		}
+ 		else
+ 		{
+ 			$tplt = $template['ARCHIVELIST_FOOTER'];
+ 		}
+ 		
+ 		echo Template::fill($tplt, $listitem);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::showCategoryList()
+ 	 * Shows the list of categories using a given template
+ 	 * 
+ 	 * @param	string	$template	Template Name
+ 	 * @return	void
+ 	 */
+ 	public function showCategoryList($template)
+ 	{
+ 		global $CONF, $archive, $archivelist, $manager;
+ 		
+ 		/*
+ 		 * determine arguments next to catids
+ 		 * I guess this can be done in a better way, but it works
+ 		 */
+ 		$linkparams = array();
+ 		if ( $archive )
+ 		{
+ 			$blogurl = Link::create_archive_link($this->blogid, $archive, '');
+ 			$linkparams['blogid'] = $this->blogid;
+ 			$linkparams['archive'] = $archive;
+ 		}
+ 		else if ( $archivelist )
+ 		{
+ 			$blogurl = Link::create_archivelist_link($this->blogid, '');
+ 			$linkparams['archivelist'] = $archivelist;
+ 		}
+ 		else
+ 		{
+ 			$blogurl = Link::create_blogid_link($this->blogid, '');
+ 			$linkparams['blogid'] = $this->blogid;
+ 		}
+ 		
+ 		$template =& $manager->getTemplate($template);
+ 		
+ 		//: Change: Set nocatselected variable
+ 		if ( $this->selectedcatid )
+ 		{
+ 			$nocatselected = 'no';
+ 		}
+ 		else
+ 		{
+ 			$nocatselected = 'yes';
+ 		} 
+ 		
+ 		$args = array(
+ 			'blogid'	=> $this->blogid,
+ 			'blogurl'	=> $blogurl,
+ 			'self'		=> $CONF['Self'],
+ 			'catiscurrent'	=> $nocatselected, // Change: Set catiscurrent template variable for header
+ 			'currentcat'	=> $nocatselected 
+ 		);
+ 		
+ 		/* output header of category list item */
+ 		if ( !array_key_exists('CATLIST_HEADER', $template) || empty($template['CATLIST_HEADER']) )
+ 		{
+ 			echo Template::fill(NULL, $args);
+ 		}
+ 		else
+ 		{
+ 			echo Template::fill($template['CATLIST_HEADER'], $args);
+ 		}
+ 		
+ 		$query = "SELECT catid, cdesc as catdesc, cname as catname FROM %s WHERE cblog=%d ORDER BY cname ASC;";
+ 		$query = sprintf($query, sql_table('category'), (integer) $this->blogid);
+ 		$res = DB::getResult($query);
+ 		
+ 		foreach ( $res as $row )
+ 		{
+ 			$args = array(
+ 				'catid'	=> $row['catid'],
+ 				'name'	=> $row['catname'],
+ 				'extra'	=> $linkparams
+ 			);
+ 			
+ 			$row['blogid']		= $this->blogid;
+ 			$row['blogurl']		= $blogurl;
+ 			$row['catlink']		= Link::create_link('category', $args);
+ 			$row['self']		= $CONF['Self'];
+ 			
+ 			// this gives catiscurrent = no when no category is selected.
+ 			$row['catiscurrent'] = 'no';
+ 			$row['currentcat'] = 'no';
+ 			
+ 			if ( $this->selectedcatid )
+ 			{
+ 				if ( $this->selectedcatid == $row['catid'] )
+ 				{
+ 					$row['catiscurrent']	= 'yes';
+ 					$row['currentcat']		= 'yes';
+ 				}
+ 			}
+ 			else
+ 			{
+ 				global $itemid;
+ 				if ( (integer) $itemid && $manager->existsItem((integer) $itemid, 0, 0) )
+ 				{
+ 					$iobj	=& $manager->getItem($itemid, 0, 0);
+ 					$cid	= $iobj['catid'];
+ 					
+ 					if ( $cid == $row['catid'] )
+ 					{
+ 						$row['catiscurrent']	= 'yes';
+ 						$row['currentcat']		= 'yes';
+ 					}
+ 				}
+ 			}
+ 
+ 			$data = array('listitem' => &$row);
+ 			$manager->notify('PreCategoryListItem', $data);
+ 			
+ 			if ( !array_key_exists('CATLIST_LISTITEM', $template) || empty($template['CATLIST_LISTITEM']))
+ 			{
+ 				echo Template::fill(NULL, $row);
+ 			}
+ 			else
+ 			{
+ 				echo Template::fill($template['CATLIST_LISTITEM'], $row);
+ 			}
+ 		}
+ 		
+ 		$res->closeCursor();
+ 		
+ 		$args = array(
+ 			'blogid'		=> $this->blogid,
+ 			'blogurl'		=> $blogurl,
+ 			'self'			=> $CONF['Self'],
+ 			'catiscurrent'	=> $nocatselected, //: Change: Set catiscurrent template variable for footer
+ 			'currentcat'	=> $nocatselected
+ 		);
+ 		
+ 		if ( !array_key_exists('CATLIST_FOOTER', $template) || empty($template['CATLIST_FOOTER']))
+ 		{
+ 			echo Template::fill(NULL, $args);
+ 		}
+ 		else
+ 		{
+ 			echo Template::fill($template['CATLIST_FOOTER'], $args);
+ 		}
+ 		
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::showBlogList()
+ 	 * Shows a list of all blogs in the system using a given template
+ 	 * ordered by number, name, shortname or description
+ 	 * in ascending or descending order
+ 	 * 
+ 	 * @param	string	$template	tempalte name
+ 	 * @param	string	$bnametype	bname/bshortname
+ 	 * @param	string	$orderby	string for 'ORDER BY' SQL
+ 	 * @param	string	$direction	ASC/DESC
+ 	 * @return	void
+ 	 */
+ 	static public function showBlogList($template, $bnametype, $orderby, $direction)
+ 	{
+ 		global $CONF, $manager;
+ 		
+ 		switch ( $orderby )
+ 		{
+ 			case 'number':
+ 				$orderby='bnumber';
+ 				break;
+ 			case 'name':
+ 				$orderby='bname';
+ 				break;
+ 			case 'shortname':
+ 				$orderby='bshortname';
+ 				break;
+ 			case 'description':
+ 				$orderby='bdesc';
+ 				break;
+ 			default:
+ 				$orderby='bnumber';
+ 				break;
+ 		}
+ 		
+ 		$direction=strtolower($direction);
+ 		switch ( $direction )
+ 		{
+ 			case 'asc':
+ 				$direction='ASC';
+ 				break;
+ 			case 'desc':
+ 				$direction='DESC';
+ 				break;
+ 			default:
+ 				$direction='ASC';
+ 				break;
+ 		}
+ 		
+ 		$template =& $manager->getTemplate($template);
+ 		
+ 		if ( array_key_exists('BLOGLIST_HEADER', $template) && !empty($template['BLOGLIST_HEADER']) )
+ 		{
+ 			$vars = array(
+ 				'sitename'	=> $CONF['SiteName'],
+ 				'siteurl'	=> $CONF['IndexURL']
+ 			);
+ 			
+ 			echo Template::fill($template['BLOGLIST_HEADER'], $vars);
+ 		}
+ 		
+ 		if ( array_key_exists('BLOGLIST_LISTITEM', $template) && !empty($template['BLOGLIST_LISTITEM']) )
+ 		{
+ 			$query = 'SELECT bnumber, bname, bshortname, bdesc, burl FROM '.sql_table('blog').' ORDER BY '.$orderby.' '.$direction;
+ 			$res = DB::getResult($query);
+ 			
+ 			foreach ( $res as $row )
+ 			{
+ 				$list = array();
+ 				$list['bloglink'] = Link::create_blogid_link($row['bnumber']);
+ 				$list['blogdesc'] = $row['bdesc'];
+ 				$list['blogurl'] = $row['burl'];
+ 				
+ 				if ( $bnametype == 'shortname' )
+ 				{
+ 					$list['blogname'] = $row['bshortname'];
+ 				}
+ 				else
+ 				{
+ 					/* all other cases */
+ 					$list['blogname'] = $row['bname'];
+ 				}
+ 
+ 				$data = array('listitem' => &$list);
+ 				$manager->notify('PreBlogListItem', $data);
+ 				
+ 				echo Template::fill($template['BLOGLIST_LISTITEM'], $list);
+ 			}
+ 			
+ 			$res->closeCursor();
+ 		}
+ 		
+ 		
+ 		if ( array_key_exists('BLOGLIST_FOOTER', $template) && !empty($template['BLOGLIST_FOOTER']) )
+ 		{
+ 			$vars = array(
+ 				'sitename' => $CONF['SiteName'],
+ 				'siteurl' => $CONF['IndexURL']
+ 			);
+ 			echo Template::fill($template['BLOGLIST_FOOTER']);
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::readSettings()
+ 	 * Read the blog settings
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	public function readSettings()
+ 	{
+ 		$query =  'SELECT * FROM %s WHERE bnumber=%d;';
+ 		$query = sprintf($query, sql_table('blog'), (integer) $this->blogid);
+ 		$res = DB::getResult($query);
+ 		
+ 		$this->isValid = ($res->rowCount() > 0);
+ 		if ( $this->isValid )
+ 		{
+ 			$this->settings = $res->fetch(PDO::FETCH_ASSOC);
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::writeSettings()
+ 	 * Write the blog settings
+ 	 */
+ 	public function writeSettings()
+ 	{
+ 		// (can't use floatval since not available prior to PHP 4.2)
+ 		$offset = $this->getTimeOffset();
+ 		if ( !is_float($offset) )
+ 		{
+ 			$offset = (integer) $offset;
+ 		}
+ 		
+ 		$query =  'UPDATE '.sql_table('blog')
+ 			   . ' SET bname=' . DB::quoteValue($this->getName()) . ','
+ 			   . '     bshortname='. DB::quoteValue($this->getShortName()) . ','
+ 			   . '     bcomments='. intval($this->commentsEnabled()) . ','
+ 			   . '     bmaxcomments=' . intval($this->getMaxComments()) . ','
+ 			   . '     btimeoffset=' . $offset . ','
+ 			   . '     bpublic=' . intval($this->isPublic()) . ','
+ 			   . '     breqemail=' . intval($this->emailRequired()) . ','
+ 			   . '     bconvertbreaks=' . intval($this->convertBreaks()) . ','
+ 			   . '     ballowpast=' . intval($this->allowPastPosting()) . ','
+ 			   . '     bnotify=' . DB::quoteValue($this->getNotifyAddress()) . ','
+ 			   . '     bnotifytype=' . intval($this->getNotifyType()) . ','
+ 			   . '     burl=' . DB::quoteValue($this->getURL()) . ','
+ 			   . '     bupdate=' . DB::quoteValue($this->getUpdateFile()) . ','
+ 			   . '     bdesc=' . DB::quoteValue($this->getDescription()) . ','
+ 			   . '     bdefcat=' . intval($this->getDefaultCategory()) . ','
+ 			   . '     bdefskin=' . intval($this->getDefaultSkin()) . ','
+ 			   . '     bincludesearch=' . intval($this->getSearchable())
+ 			   . ' WHERE bnumber=' . intval($this->blogid);
+ 		DB::execute($query);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::updateUpdatefile()
+ 	 * Update the update file if requested
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	public function updateUpdatefile()
+ 	{
+ 		if ( $this->getUpdateFile() )
+ 		{
+ 			$f_update = fopen($this->getUpdateFile(), 'w');
+ 			fputs($f_update,$this->getCorrectTime());
+ 			fclose($f_update);
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::isValidCategory()
+ 	 * Check if a category with a given catid is valid
+ 	 * 
+ 	 * @param	integer	$catid	ID for category
+ 	 * @return	boolean	exists or not
+ 	 */
+ 	public function isValidCategory($catid)
+ 	{
+ 		$query = 'SELECT * FROM %s WHERE cblog=%d and catid=%d;';
+ 		$query = sprintf($query, sql_table('category'), (integer) $this->blogid, (integer) $catid);
+ 		$res = DB::getResult($query);
+ 		return ($res->rowCount() != 0);
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getCategoryName()
+ 	 * Get the category name for a given catid
+ 	 * 
+ 	 * @param	integer	$catid	ID for category
+ 	 * @return	string	name of category
+ 	 */
+ 	public function getCategoryName($catid)
+ 	{
+ 		$query = 'SELECT cname FROM %s WHERE cblog=%d and catid=%d;';
+ 		$query = sprintf($query, sql_table('category'), (integer) $this->blogid, (integer) $catid);
+ 		$res = DB::getValue($query);
+ 		return $res;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getCategoryDesc()
+ 	 * Get the category description for a given catid
+ 	 * 
+ 	 * @param $catid
+ 	 * 	category id
+ 	 */
+ 	public function getCategoryDesc($catid)
+ 	{
+ 		$query = 'SELECT cdesc FROM %s WHERE cblog=%d and catid=%d;';
+ 		$query = sprintf($query, sql_table('category'), (integer) $this->blogid, (integer) $catid);
+ 		$res = DB::getValue($query);
+ 		return $res;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getCategoryIdFromName
+ 	 * Get the category id for a given category name
+ 	 * 
+ 	 * @param	string	$name	category name
+ 	 * @return	ID for category
+ 	 */
+ 	public function getCategoryIdFromName($name)
+ 	{
+ 		$query = 'SELECT catid FROM %s WHERE cblog=%d and cname=%s;';
+ 		$query = sprintf($query, sql_table('category'), (integer) $this->blogid, DB::quoteValue($name));
+ 		
+ 		$res = DB::getValue();
+ 		if ( !$res )
+ 		{
+ 			return $this->getDefaultCategory();
+ 		}
+ 		return $res;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::insertJavaScriptInfo()
+ 	 * Insert a javascript that includes information about the settings
+ 	 * of an author:  ConvertBreaks, MediaUrl and AuthorId
+ 	 * 
+ 	 * @param	$authorid	id of the author
+ 	 */
+ 	public function insertJavaScriptInfo($authorid = '')
+ 	{
+ 		global $member, $CONF;
+ 		
+ 		if ( $authorid == '' )
+ 		{
+ 			$authorid = $member->getID();
+ 		}
+ 		
+ 		echo "<script type=\"text/javascript\">\n";
+ 		
+ 		if ( !$this->convertBreaks() )
+ 		{
+ 			echo "setConvertBreaks(false);\n";
+ 		}
+ 		else
+ 		{
+ 			echo "setConvertBreaks(true);\n";
+ 		}
+ 		echo "setMediaUrl('{$CONF['MediaURL']}');\n";
+ 		echo "setAuthorId('{$authorid}');\n";
+ 		echo "</script>\n";
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setAllowPastPosting()
+ 	 * Set the the setting for allowing to publish postings in the past
+ 	 * 
+ 	 * @param	boolean	$val	new value for ballowpast
+ 	 * @return	void
+ 	 */
+ 	public function setAllowPastPosting($val)
+ 	{
+ 		$this->setSetting('ballowpast', $val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::allowPastPosting()
+ 	 * Get the the setting if it is allowed to publish postings in the past
+ 	 * [should be named as getAllowPastPosting()]
+ 	 * 
+ 	 * @param	void
+ 	 * @return	boolean
+ 	 */
+ 	public function allowPastPosting()
+ 	{
+ 		return $this->getSetting('ballowpast');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getCorrectTime()
+ 	 * 
+ 	 * @param	integer	$t
+ 	 * @return	integer
+ 	 */
+ 	public function getCorrectTime($t=0)
+ 	{
+ 		if ( $t == 0 )
+ 		{
+ 			$t = time();
+ 		}
+ 		return ($t + 3600 * $this->getTimeOffset());
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getName()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	string name of this weblog
+ 	 */
+ 	public function getName()
+ 	{
+ 		return $this->getSetting('bname');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getShortName()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	string	short name of this weblog
+ 	 */
+ 	public function getShortName()
+ 	{
+ 		return $this->getSetting('bshortname');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getMaxComments()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	integer	maximum number of comments
+ 	 */
+ 	public function getMaxComments()
+ 	{
+ 		return $this->getSetting('bmaxcomments');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getNotifyAddress()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	string	mail address for notifying
+ 	 */
+ 	public function getNotifyAddress()
+ 	{
+ 		return $this->getSetting('bnotify');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getNotifyType()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	integer	notifycation type
+ 	 */
+ 	public function getNotifyType()
+ 	{
+ 		return $this->getSetting('bnotifytype');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::notifyOnComment()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	boolean
+ 	 */
+ 	public function notifyOnComment()
+ 	{
+ 		$n = $this->getNotifyType();
+ 		return (($n != 0) && (($n % 3) == 0));
+ 	}
+ 	
+ 	/**
+ 	 * Blog::notifyOnVote()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	boolean
+ 	 */
+ 	public function notifyOnVote()
+ 	{
+ 		$n = $this->getNotifyType();
+ 		return (($n != 0) && (($n % 5) == 0));
+ 	}
+ 	
+ 	/**
+ 	 * Blog::notifyOnNewItem()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	boolean
+ 	 */
+ 	public function notifyOnNewItem()
+ 	{
+ 		$n = $this->getNotifyType();
+ 		return (($n != 0) && (($n % 7) == 0));
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setNotifyType()
+ 	 * 
+ 	 * @param	integer	$val
+ 	 * @return	void
+ 	 */
+ 	public function setNotifyType($val)
+ 	{
+ 		$this->setSetting('bnotifytype',$val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getTimeOffset()
+ 	 * @param	void
+ 	 * @return	
+ 	 */
+ 	public function getTimeOffset()
+ 	{
+ 		return $this->getSetting('btimeoffset');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::commentsEnabled()
+ 	 * @param	void
+ 	 * @return	integer	enabled or not
+ 	 */
+ 	public function commentsEnabled()
+ 	{
+ 		return $this->getSetting('bcomments');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getURL()
+ 	 * @param	void
+ 	 * @return	string	URI for this weblog
+ 	 */
+ 	public function getURL()
+ 	{
+ 		return $this->getSetting('burl');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getDefaultSkin()
+ 	 * @param	void
+ 	 * @return	name of skin as default for this weblog
+ 	 */
+ 	public function getDefaultSkin()
+ 	{
+ 		return $this->getSetting('bdefskin');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getUpdateFile()
+ 	 * @param	void
+ 	 * @return	string	name of file to be updated when weblog is updated
+ 	 */
+ 	public function getUpdateFile()
+ 	{
+ 		return $this->getSetting('bupdate');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getDescription()
+ 	 * @param	void
+ 	 * @return	string	description for this weblog
+ 	 */
+ 	public function getDescription()
+ 	{
+ 		return $this->getSetting('bdesc');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::isPublic()
+ 	 * @param	void
+ 	 * @return	integer	publlic or not
+ 	 */
+ 	public function isPublic()
+ 	{
+ 		return $this->getSetting('bpublic');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::emailRequired()
+ 	 * @param	void
+ 	 * @return	integer	email is required when posting comment or not
+ 	 */
+ 	public function emailRequired()
+ 	{
+ 		return $this->getSetting('breqemail');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getSearchable()
+ 	 * @param	void
+ 	 * @return	integer	searchable or not
+ 	 */
+ 	public function getSearchable()
+ 	{
+ 		return $this->getSetting('bincludesearch');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getDefaultCategory()
+ 	 * @param	void
+ 	 * @return	ID for category as a default
+ 	 */
+ 	public function getDefaultCategory()
+ 	{
+ 		return $this->getSetting('bdefcat');
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setPublic()
+ 	 * @param	integer	$val	allow comments by non-registered members or not
+ 	 * @return	void
+ 	 */
+ 	public function setPublic($val)
+ 	{
+ 		$this->setSetting('bpublic', $val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setSearchable()
+ 	 * @param	integer	$val	searchable from the other blogs or not
+ 	 * @return	void
+ 	 */
+ 	public function setSearchable($val)
+ 	{
+ 		$this->setSetting('bincludesearch', $val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setDescription
+ 	 * @param	string	$val	description for this weblog
+ 	 * @return	void
+ 	 */
+ 	public function setDescription($val)
+ 	{
+ 		$this->setSetting('bdesc',$val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setUpdateFile()
+ 	 * @param	string	$val	name of file to beupdated when weblog is updated
+ 	 * @return	
+ 	 */
+ 	public function setUpdateFile($val)
+ 	{
+ 		$this->setSetting('bupdate',$val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setDefaultSkin()
+ 	 * @param	integer	$val	ID for default skin to use when displaying this weblog
+ 	 * @return	void
+ 	 */
+ 	public function setDefaultSkin($val)
+ 	{
+ 		$this->setSetting('bdefskin', $val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setURL()
+ 	 * @param	string	$val	URI for this weblog
+ 	 * @return	
+ 	 */
+ 	public function setURL($val)
+ 	{
+ 		$this->setSetting('burl', $val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setName()
+ 	 * @param	string	$val	name of this weblog
+ 	 * @return	void
+ 	 */
+ 	public function setName($val)
+ 	{
+ 		$this->setSetting('bname', $val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setShortName()
+ 	 * @param	string	$val	short name for this weblog
+ 	 * @return	void
+ 	 */
+ 	public function setShortName($val)
+ 	{
+ 		$this->setSetting('bshortname', $val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setCommentsEnabled()
+ 	 * @param	integer	$val	enabling posting comment or not
+ 	 * @return	void
+ 	 */
+ 	public function setCommentsEnabled($val)
+ 	{
+ 		$this->setSetting('bcomments',$val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setMaxComments()
+ 	 * @param	integer	$val	maximum number of comments for this weblog
+ 	 * @return	void
+ 	 */
+ 	public function setMaxComments($val)
+ 	{
+ 		$this->setSetting('bmaxcomments', $val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setNotifyAddress()
+ 	 * @param	string	$val	email to be notified if weblog updated
+ 	 * @return	void
+ 	 */
+ 	public function setNotifyAddress($val)
+ 	{
+ 		$this->setSetting('bnotify', $val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setEmailRequired()
+ 	 * @param	string	requiring comments with email or not from non member
+ 	 * @return	void
+ 	 */
+ 	public function setEmailRequired($val)
+ 	{
+ 		$this->setSetting('breqemail', $val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setTimeOffset()
+ 	 * @param	integer	$val	time offset
+ 	 * @return	void
+ 	 */
+ 	public function setTimeOffset($val)
+ 	{
+ 		// check validity of value
+ 		// 1. replace , by . (common mistake)
+ 		$val = str_replace(',','.',$val);
+ 		
+ 		// 2. cast to float or int
+ 		if ( is_numeric($val) && (i18n::strpos($val, '.5') === (i18n::strlen($val) - 2)) )
+ 		{
+ 			$val = (float) $val;
+ 		}
+ 		else
+ 		{
+ 			$val = (integer) $val;
+ 		}
+ 		
+ 		$this->setSetting('btimeoffset',$val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setDefaultCategory()
+ 	 * @param	integer	$val	ID for default category for this weblog
+ 	 * @return	
+ 	 */
+ 	public function setDefaultCategory($val)
+ 	{
+ 		$this->setSetting('bdefcat',$val);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getSetting()
+ 	 * @param	string	$key	key for setting of this weblog
+ 	 * @return	mixed	value for the setting
+ 	 */
+ 	public function getSetting($key)
+ 	{
+ 		return $this->settings[$key];
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setSetting()
+ 	 * @param	string	$key	key for setting of this weblog
+ 	 * @param	mixed	$value	value for the key
+ 	 * @return	
+ 	 */
+ 	public function setSetting($key, $value)
+ 	{
+ 		$this->settings[$key] = $value;
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::addTeamMember()
+ 	 * Tries to add a member to the team. 
+ 	 * Returns false if the member was already on the team
+ 	 * 
+ 	 * @param	integer	$memberid	id for member
+ 	 * @param	boolean	$admin	super-admin or not
+ 	 * @return	boolean	Success/Fail
+ 	 */
+ 	public function addTeamMember($memberid, $admin)
+ 	{
+ 		global $manager;
+ 		
+ 		$memberid = intval($memberid);
+ 		$admin = intval($admin);
+ 		
+ 		// check if member is already a member
+ 		$tmem =& $manager->getMember($memberid);
+ 		
+ 		if ( $tmem->isTeamMember($this->blogid) )
+ 		{
+ 			return 0;
+ 		}
+ 		
+ 		$data = array(
+ 			'blog'		=> &$this,
+ 			'member'	=> &$tmem,
+ 			'admin'		=> &$admin
+ 		);
+ 		$manager->notify('PreAddTeamMember', $data);
+ 		
+ 		// add to team
+ 		$query = "INSERT INTO %s (TMEMBER, TBLOG, TADMIN) VALUES (%d, %d, %d);";
+ 		$query = sprintf($query, sql_table('team'), (integer) $memberid, (integer) $this->blogid, (integer) $admin);
+ 		DB::execute($query);
+ 		
+ 		$data = array(
+ 			'blog'		=> &$this,
+ 			'member'	=> &$tmem,
+ 			'admin'		=>  $admin
+ 		);
+ 		$manager->notify('PostAddTeamMember', $data);
+ 		
+ 		$logMsg = sprintf(_TEAM_ADD_NEWTEAMMEMBER, $tmem->getDisplayName(), $memberid, $this->getName());
+ 		ActionLog::add(INFO, $logMsg);
+ 		
+ 		return 1;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getID()
+ 	 * @param	void
+ 	 * @return	integer	ID for this weblog
+ 	 */
+ 	public function getID()
+ 	{
+ 		return (integer) $this->blogid;
+ 	}
+ 	
+ 	/**
+ 	 * Checks if a blog with a given shortname exists 
+ 	 * Returns true if there is a blog with the given shortname (static)
+ 	 * 
+ 	 * @param	string	$name		blog shortname
+ 	 * @return	boolean	exists or not
+ 	 */
+ 	public function exists($name)
+ 	{
+ 		$r = DB::getResult('SELECT * FROM '.sql_table('blog').' WHERE bshortname='. DB::quoteValue($name));
+ 		return ($r->rowCount() != 0);
+ 	}
+ 	
+ 	/**
+ 	 * Checks if a blog with a given id exists 
+ 	 * Returns true if there is a blog with the given ID (static)
+ 	 * 
+ 	 * @param	integer	$id	ID for searched weblog
+ 	 * @return	boolean	exists or not
+ 	 */
+ 	public function existsID($id)
+ 	{
+ 		$r = DB::getResult('SELECT * FROM '.sql_table('blog').' WHERE bnumber='.intval($id));
+ 		return ($r->rowCount() != 0);
+ 	}
+ 	
+ 	/**
+ 	 * Blog::setFuturePost()
+ 	 * flag there is a future post pending
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	public function setFuturePost()
+ 	{
+ 		$query =  "UPDATE %s SET bfuturepost='1' WHERE bnumber=%d;";
+ 		$query = sprintf($query, sql_table('blog'), (integer) $this->blogid);
+ 		DB::execute($query);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::clearFuturePost()
+ 	 * clear there is a future post pending
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	public function clearFuturePost()
+ 	{
+ 		$query =  "UPDATE %s SET bfuturepost='0' WHERE bnumber=%d;";
+ 		$query = sprintf($query, sql_table('blog'), (integer) $this->blogid);
+ 		DB::execute($query);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::checkJustPosted()
+ 	 * check if we should throw justPosted event 
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	public function checkJustPosted()
+ 	{
+ 		global $manager;
+ 		
+ 		if ( $this->settings['bfuturepost'] == 1 )
+ 		{
+ 			$query = "SELECT * FROM %s WHERE iposted=0 AND iblog=%d AND itime < NOW();";
+ 			$query = sprintf($query, sql_table('item'), (integer) $this->blogid);
+ 			
+ 			$result = DB::getResult($query);
+ 			if ( $result->rowCount() > 0 )
+ 			{
+ 				// This $pinged is allow a plugin to tell other hook to the event that a ping is sent already
+ 				// Note that the plugins's calling order is subject to thri order in the plugin list
+ 				$pinged = FALSE;
+ 				$data = array('blogid' => $this->blogid, 'pinged' => &$pinged);
+ 				$manager->notify('JustPosted', $data);
+ 				
+ 				// clear all expired future posts
+ 				$query = "UPDATE %s SET iposted='1' WHERE iblog=%d AND itime < NOW();";
+ 				$query = spriintf($query, sql_table('item'), (integer) $this->blogid);
+ 				DB::execute($query);
+ 				
+ 				// check to see any pending future post, clear the flag is none
+ 				$query = "SELECT * FROM %s WHERE iposted=0 AND iblog=%d;";
+ 				$query = sprintf($query, sql_table('item'), (integer) $this->blogid);
+ 				
+ 				$result = DB::getResult($query);
+ 				if ( $result->rowCount() == 0 )
+ 				{
+ 					$this->clearFuturePost();
+ 				}
+ 			}
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::readLogFromList()
+ 	 * Shows the given list of items for this blog
+ 	 *
+ 	 * @param	array	$itemarray	array of item numbers to be displayed
+ 	 * @param	string	$template	string representing the template _NAME_ (!)
+ 	 * @param	string	$highlight	contains a query that should be highlighted
+ 	 * @param	boolean	$comments	1=show comments 0=don't show comments
+ 	 * @param	boolean	$dateheads	1=show dateheads 0=don't show dateheads
+ 	 * @param	boolean	$showDrafts	0=do not show drafts 1=show drafts
+ 	 * @param	boolean	$showFuture	0=do not show future posts 1=show future posts
+ 	 * @return	integer	amount of items shown
+ 	 */
+ 	public function readLogFromList($itemarray, $template, $highlight = '', $comments = 1, $dateheads = 1,$showDrafts = 0, $showFuture = 0)
+ 	{
+ 		$query = $this->getSqlItemList($itemarray,$showDrafts,$showFuture);
+ 		return $this->showUsingQuery($template, $query, $highlight, $comments, $dateheads);
+ 	}
+ 	
+ 	/**
+ 	 * Blog::getSqlItemList()
+ 	 * Returns the SQL query used to fill out templates for a list of items
+ 	 * No LIMIT clause is added. (caller should add this if multiple pages are requested)
+ 	 *
+ 	 * @param	array	$itemarray	an array holding the item numbers of the items to be displayed
+ 	 * @param	integer	$showDrafts	0=do not show drafts 1=show drafts
+ 	 * @param	integer	$showFuture	0=do not show future posts 1=show future posts
+ 	 * @return	string	either a full SQL query, or an empty string
+ 	 */
+ 	public function getSqlItemList($itemarray,$showDrafts = 0,$showFuture = 0)
+ 	{
+ 		if ( !is_array($itemarray) )
+ 		{
+ 			return '';
+ 		}
+ 		
+ 		$showDrafts = intval($showDrafts);
+ 		$showFuture = intval($showFuture);
+ 		$items = array();
+ 		
+ 		foreach ( $itemarray as $value )
+ 		{
+ 			if ( intval($value) )
+ 			{
+ 				$items[] = intval($value);
+ 			}
+ 		}
+ 		if ( !count($items) )
+ 		{
+ 			return '';
+ 		}
+ 		
+ 		$i = count($items);
+ 		$query = '';
+ 		foreach ( $items as $value )
+ 		{
+ 			$query .= '('
+ 					.	'SELECT'
+ 					.	' i.inumber as itemid,'
+ 					.	' i.ititle as title,'
+ 					.	' i.ibody as body,'
+ 					.	' m.mname as author,'
+ 					.	' m.mrealname as authorname,'
+ 					.	' i.itime,'
+ 					.	' i.imore as more,'
+ 					.	' m.mnumber as authorid,'
+ 					.	' m.memail as authormail,'
+ 					.	' m.murl as authorurl,'
+ 					.	' c.cname as category,'
+ 					.	' i.icat as catid,'
+ 					.	' i.iclosed as closed';
+ 			
+ 			$query .= ' FROM '
+ 					. sql_table('item') . ' as i, '
+ 					. sql_table('member') . ' as m, '
+ 					. sql_table('category') . ' as c'
+ 					. ' WHERE'
+ 				    .    ' i.iblog='.$this->blogid
+ 				   . ' and i.iauthor=m.mnumber'
+ 				   . ' and i.icat=c.catid';
+ 			
+ 			// exclude drafts	
+ 			if ( !$showDrafts )
+ 			{
+ 				$query .= ' and i.idraft=0';
+ 			}
+ 			if ( !$showFuture )
+ 			{
+ 				// don't show future items
+ 				$query .= ' and i.itime<=' . DB::formatDateTime($this->getCorrectTime());
+ 			}
+ 			
+ 			$query .= ' and i.inumber='.intval($value);
+ 			$query .= ')';
+ 			$i--;
+ 			if ($i) $query .= ' UNION ';
+ 		}
+ 		
+ 		return $query;
+ 	}
+ 	
+ 	/**
+ 	 * Blog::convertBreaks()
+ 	 * Get the the setting for the line break handling
+ 	 * [should be named as getConvertBreaks()]
+ 	 * 
+ 	 * @deprecated
+ 	 * @param	void
+ 	 * @return	
+ 	 */
+ 	public function convertBreaks()
+ 	{
+ 		return $this->getSetting('bconvertbreaks');
+ 	}
+ 	
+ 	/**
+ 	 * Set the the setting for the line break handling
+ 	 * 
+ 	 * @deprecated
+ 	 * @param	boolean	$val	new value for bconvertbreaks
+ 	 * @return	void
+ 	 */
+ 	public function setConvertBreaks($val)
+ 	{
+ 		$this->setSetting('bconvertbreaks', $val);
+ 		return;
+ 	}
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/libs/BODYACTIONS.php
index 137af90,06b4f9d..8464021
--- a/nucleus/libs/BODYACTIONS.php
+++ b/nucleus/libs/BODYACTIONS.php
@@@ -15,7 -15,7 +15,11 @@@
   *
   * @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 -39,7 +43,11 @@@
  	 */
  	public function __construct()
  	{
++<<<<<<< HEAD
 +		parent::__construct();	
++=======
+ 		parent::__construct();
++>>>>>>> skinnable-master
  		return;
  	}
  	
@@@ -107,9 -107,10 +115,16 @@@
  		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;
  	}
  	
@@@ -126,7 -127,7 +141,11 @@@
  		// 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
  	}
  	
  	/**
@@@ -174,7 -175,7 +193,11 @@@
  		// 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
  	}
  	
  	/**
@@@ -215,7 -216,7 +238,11 @@@
  		// 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
  	}
  	
  	/**
@@@ -280,7 -281,7 +307,11 @@@
  				$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':
@@@ -354,7 -355,7 +385,11 @@@
  	{
  		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 == '') )
@@@ -400,7 -401,7 +435,11 @@@
  	{
  		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 == '') )
@@@ -558,6 -559,6 +597,10 @@@
  		$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
  	}
  }
diff --combined nucleus/libs/BaseActions.php
index 9473d52,410804e..6ae996b
--- a/nucleus/libs/BaseActions.php
+++ b/nucleus/libs/BaseActions.php
@@@ -17,7 -17,7 +17,11 @@@
   *
   * @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 -139,14 +143,22 @@@
  	
  	/**
  	 * 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 -434,7 +446,11 @@@
  	{
  		$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 -505,7 +521,11 @@@
  		{
  			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 -523,7 +543,11 @@@
  		$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 -559,7 +583,11 @@@
  		{
  			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;
diff --combined nucleus/libs/COMMENT.php
index bb38e11,22f8926..3cb7daa
--- a/nucleus/libs/COMMENT.php
+++ b/nucleus/libs/COMMENT.php
@@@ -1,229 -1,229 +1,461 @@@
++<<<<<<< HEAD
 +<?php
 +
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2002-2007 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)
 + */
 +/**
 + * A class representing a single comment
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2007 The Nucleus Group
 + * @version $Id: COMMENT.php 1844 2012-05-13 11:14:38Z sakamocchi $
 + */
 +class Comment
 +{
 +	/**
 +	 * Comment::getComment()
 +	 * Returns the requested comment
 +	 *
 +	 * @static
 +	 * @param	integer	$commentid	id for comment
 +	 * @return	array	comment information
 +	 * 
 +	 */
 +	static function getComment($commentid)
 +	{
 +		$query = 'SELECT cnumber AS commentid,'
 +		              . ' cbody AS body,'
 +		              . ' cuser AS user,'
 +		              . ' cmail AS userid,'
 +		              . ' cemail AS email,'
 +		              . ' cmember AS memberid,'
 +		              . ' ctime,'
 +		              . ' chost AS host,'
 +		              . ' mname AS member,'
 +		              . ' cip AS ip,'
 +		              . ' cblog AS blogid'
 +		       . ' FROM %s LEFT OUTER JOIN %s ON cmember = mnumber'
 +		       . ' WHERE cnumber = %d;';
 +		
 +		$query = sprintf($query, sql_table('comment'), sql_table('member'), (integer) $commentid);
 +		$aCommentInfo = DB::getRow($query);
 +		
 +		if ( $aCommentInfo )
 +		{
 +			$aCommentInfo['timestamp'] = strtotime($aCommentInfo['ctime']);
 +		}
 +		
 +		return $aCommentInfo;
 +	}
 +	
 +	/**
 +	 * Comment::prepare()
 +	 * Prepares a comment to be saved
 +	 *
 +	 * @static
 +	 * @param	array	$comment	comment data
 +	 * @return	array	comment date
 +	 * 
 +	 */
 +	static function prepare($comment)
 +	{
 +		$comment['user']	= strip_tags($comment['user']);
 +		$comment['userid']	= strip_tags($comment['userid']);
 +		$comment['email']	= strip_tags($comment['email']);
 +		
 +		// remove newlines from user; remove quotes and newlines from userid and email; trim whitespace from beginning and end
 +		$comment['user']	= trim(strtr($comment['user'], "\n", ' ') );
 +		$comment['userid']	= trim(strtr($comment['userid'], "\'\"\n", '-- ') );
 +		$comment['email']	= trim(strtr($comment['email'], "\'\"\n", '-- ') );
 +		
 +		// begin if: a comment userid is supplied, but does not have an "http://" or "https://" at the beginning - prepend an "http://"
 +		if ( array_key_exists('userid', $comment)
 +		  && !empty($comment['userid'])
 +		  && (i18n::strpos($comment['userid'], 'http://') !== 0)
 +		  && (i18n::strpos($comment['userid'], 'https://') !== 0) )
 +		{
 +			$comment['userid'] = 'http://' . $comment['userid'];
 +		}
 +		
 +		$comment['body'] = Comment::prepareBody($comment['body']);
 +		
 +		return $comment;
 +	}
 +	
 +	/**
 +	 * Comment::prepareBody()
 +	 * Prepares the body of a comment
 +	 *
 +	 * @static
 +	 * @param	string	$body	string for comment body
 +	 * @return	string	validate string for comment body
 +	 */
 +	static public function prepareBody($body)
 +	{
 +		// convert Windows and Mac style 'returns' to *nix newlines
 +		$body = preg_replace("/\r\n/", "\n", $body);
 +		$body = preg_replace("/\r/", "\n", $body);
 +		
 +		// then remove newlines when too many in a row (3 or more newlines get converted to 1 newline)
 +		$body = preg_replace("/\n{3,}/", "\n\n", $body);
 +		
 +		// encode special characters as entities
 +		$body = Entity::hsc($body);
 +		
 +		// trim away whitespace and newlines at beginning and end
 +		$body = trim($body);
 +		
 +		// add <br /> tags
 +		$body = addBreaks($body);
 +		
 +		// create hyperlinks for http:// addresses
 +		// there's a testcase for this in /build/testcases/urllinking.txt
 +		$replace_from = array(
 +			'/([^:\/\/\w]|^)((https:\/\/)([\w\.-]+)([\/\w+\.~%&?@=_:;#,-]+))/i',
 +			'/([^:\/\/\w]|^)((http:\/\/|www\.)([\w\.-]+)([\/\w+\.~%&?@=_:;#,-]+))/i',
 +			'/([^:\/\/\w]|^)((ftp:\/\/|ftp\.)([\w\.-]+)([\/\w+\.~%&?@=_:;#,-]+))/i',
 +			'/([^:\/\/\w]|^)(mailto:(([a-zA-Z\@\%\.\-\+_])+))/i'
 +		);
 +		
 +		return preg_replace_callback($replace_from, array(__CLASS__, 'prepareBody_cb'), $body);
 +	}
 +	
 +	/**
 +	 * Comment::createLinkCode()
 +	 * Creates a link code for unlinked URLs with different protocols
 +	 *
 +	 * @static
 +	 * @param	string	$pre	Prefix of comment
 +	 * @param	string	$url	URL
 +	 * @param	string	$protocol	http, mailto and so on
 +	 * @return	string	string	including anchor element and child text
 +	 */
 +	static private function createLinkCode($pre, $url, $protocol = 'http')
 +	{
 +		$post = '';
 +		
 +		// it's possible that $url ends contains entities we don't want,
 +		// since htmlspecialchars is applied _before_ URL linking
 +		// move the part of URL, starting from the disallowed entity to the 'post' link part
 +		$aBadEntities = array('&quot;', '&gt;', '&lt;');
 +		foreach ( $aBadEntities as $entity )
 +		{
 +			$pos = i18n::strpos($url, $entity);
 +			
 +			if ( $pos )
 +			{
 +				$post = i18n::substr($url, $pos) . $post;
 +				$url = i18n::substr($url, 0, $pos);
 +			}
 +		}
 +		
 +		// remove entities at end (&&&&)
 +		if ( preg_match('/(&\w+;)+$/i', $url, $matches) )
 +		{
 +			$post = $matches[0] . $post;	// found entities (1 or more)
 +			$url = i18n::substr($url, 0, i18n::strlen($url) - i18n::strlen($post) );
 +		}
 +		
 +		// move ending comma from url to 'post' part
 +		if ( i18n::substr($url, i18n::strlen($url) - 1) == ',' )
 +		{
 +			$url = i18n::substr($url, 0, i18n::strlen($url) - 1);
 +			$post = ',' . $post;
 +		}
 +		
 +		if ( !preg_match('#^' . $protocol . '://#', $url) )
 +		{
 +			$linkedUrl = $protocol . ( ($protocol == 'mailto') ? ':' : '://') . $url;
 +		}
 +		else
 +		{
 +			$linkedUrl = $url;
 +		}
 +		
 +		if ( $protocol != 'mailto' )
 +		{
 +			$displayedUrl = $linkedUrl;
 +		}
 +		else
 +		{
 +			$displayedUrl = $url;
 +		}
 +		
 +		return $pre . '<a href="' . $linkedUrl . '" rel="nofollow">' . Entity::hsc(Entity::shorten($displayedUrl,30,'...')) . '</a>' . $post;
 +	}
 +	
 +	/**
 +	 * Comment::prepareBody_cb()
 +	 * This method is a callback for creating link codes
 +	 * 
 +	 * @param	array	$match	elements for achor
 +	 * @return	string	including anchor element and child text
 +	 * 
 +	 */
 +	static public function prepareBody_cb($match)
 +	{
 +		if ( !preg_match('/^[a-z]+/i', $match[2], $protocol) )
 +		{
 +			return $match[0];
 +		}
 +		
 +		switch( strtolower($protocol[0]) )
 +		{
 +			case 'https':
 +				return self::createLinkCode($match[1], $match[2], 'https');
 +			break;
 +			
 +			case 'ftp':
 +				return self::createLinkCode($match[1], $match[2], 'ftp');
 +			break;
 +			
 +			case 'mailto':
 +				return self::createLinkCode($match[1], $match[3], 'mailto');
 +			break;
 +			
 +			default:
 +				return self::createLinkCode($match[1], $match[2], 'http');
 +			break;
 +		}
 +		return;
 +	}
 +}
++=======
+ <?php
+ 
+ /*
+  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+  * Copyright (C) 2002-2007 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)
+  */
+ /**
+  * A class representing a single comment
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2007 The Nucleus Group
+  * @version $Id: COMMENT.php 1844 2012-05-13 11:14:38Z sakamocchi $
+  */
+ class Comment 
+ {
+ 	/**
+ 	 * Comment::getComment()
+ 	 * Returns the requested comment
+ 	 *
+ 	 * @static
+ 	 * @param	integer	$commentid	id for comment
+ 	 * @return	array	comment information
+ 	 * 
+ 	 */
+ 	static function getComment($commentid)
+ 	{
+ 		$query = 'SELECT cnumber AS commentid,'
+ 		              . ' cbody AS body,'
+ 		              . ' cuser AS user,'
+ 		              . ' cmail AS userid,'
+ 		              . ' cemail AS email,'
+ 		              . ' cmember AS memberid,'
+ 		              . ' ctime,'
+ 		              . ' chost AS host,'
+ 		              . ' mname AS member,'
+ 		              . ' cip AS ip,'
+ 		              . ' cblog AS blogid'
+ 		       . ' FROM %s LEFT OUTER JOIN %s ON cmember = mnumber'
+ 		       . ' WHERE cnumber = %d;';
+ 		
+ 		$query = sprintf($query, sql_table('comment'), sql_table('member'), (integer) $commentid);
+ 		$aCommentInfo = DB::getRow($query);
+ 		
+ 		if ( $aCommentInfo )
+ 		{
+ 			$aCommentInfo['timestamp'] = strtotime($aCommentInfo['ctime']);
+ 		}
+ 		
+ 		return $aCommentInfo;
+ 	}
+ 	
+ 	/**
+ 	 * Comment::prepare()
+ 	 * Prepares a comment to be saved
+ 	 *
+ 	 * @static
+ 	 * @param	array	$comment	comment data
+ 	 * @return	array	comment date
+ 	 * 
+ 	 */
+ 	static function prepare($comment)
+ 	{
+ 		$comment['user']	= strip_tags($comment['user']);
+ 		$comment['userid']	= strip_tags($comment['userid']);
+ 		$comment['email']	= strip_tags($comment['email']);
+ 		
+ 		// remove newlines from user; remove quotes and newlines from userid and email; trim whitespace from beginning and end
+ 		$comment['user']	= trim(strtr($comment['user'], "\n", ' ') );
+ 		$comment['userid']	= trim(strtr($comment['userid'], "\'\"\n", '-- ') );
+ 		$comment['email']	= trim(strtr($comment['email'], "\'\"\n", '-- ') );
+ 		
+ 		// begin if: a comment userid is supplied, but does not have an "http://" or "https://" at the beginning - prepend an "http://"
+ 		if ( array_key_exists('userid', $comment)
+ 		  && !empty($comment['userid'])
+ 		  && (i18n::strpos($comment['userid'], 'http://') !== 0)
+ 		  && (i18n::strpos($comment['userid'], 'https://') !== 0) )
+ 		{
+ 			$comment['userid'] = 'http://' . $comment['userid'];
+ 		}
+ 		
+ 		$comment['body'] = Comment::prepareBody($comment['body']);
+ 		
+ 		return $comment;
+ 	}
+ 	
+ 	/**
+ 	 * Comment::prepareBody()
+ 	 * Prepares the body of a comment
+ 	 *
+ 	 * @static
+ 	 * @param	string	$body	string for comment body
+ 	 * @return	string	validate string for comment body
+ 	 */
+ 	static public function prepareBody($body)
+ 	{
+ 		// convert Windows and Mac style 'returns' to *nix newlines
+ 		$body = preg_replace("/\r\n/", "\n", $body);
+ 		$body = preg_replace("/\r/", "\n", $body);
+ 		
+ 		// then remove newlines when too many in a row (3 or more newlines get converted to 1 newline)
+ 		$body = preg_replace("/\n{3,}/", "\n\n", $body);
+ 		
+ 		// encode special characters as entities
+ 		$body = Entity::hsc($body);
+ 		
+ 		// trim away whitespace and newlines at beginning and end
+ 		$body = trim($body);
+ 		
+ 		// add <br /> tags
+ 		$body = addBreaks($body);
+ 		
+ 		// create hyperlinks for http:// addresses
+ 		// there's a testcase for this in /build/testcases/urllinking.txt
+ 		$replace_from = array(
+ 			'/([^:\/\/\w]|^)((https:\/\/)([\w\.-]+)([\/\w+\.~%&?@=_:;#,-]+))/i',
+ 			'/([^:\/\/\w]|^)((http:\/\/|www\.)([\w\.-]+)([\/\w+\.~%&?@=_:;#,-]+))/i',
+ 			'/([^:\/\/\w]|^)((ftp:\/\/|ftp\.)([\w\.-]+)([\/\w+\.~%&?@=_:;#,-]+))/i',
+ 			'/([^:\/\/\w]|^)(mailto:(([a-zA-Z\@\%\.\-\+_])+))/i'
+ 		);
+ 		
+ 		return preg_replace_callback($replace_from, array(__CLASS__, 'prepareBody_cb'), $body);
+ 	}
+ 	
+ 	/**
+ 	 * Comment::createLinkCode()
+ 	 * Creates a link code for unlinked URLs with different protocols
+ 	 *
+ 	 * @static
+ 	 * @param	string	$pre	Prefix of comment
+ 	 * @param	string	$url	URL
+ 	 * @param	string	$protocol	http, mailto and so on
+ 	 * @return	string	string	including anchor element and child text
+ 	 */
+ 	static private function createLinkCode($pre, $url, $protocol = 'http')
+ 	{
+ 		$post = '';
+ 		
+ 		// it's possible that $url ends contains entities we don't want,
+ 		// since htmlspecialchars is applied _before_ URL linking
+ 		// move the part of URL, starting from the disallowed entity to the 'post' link part
+ 		$aBadEntities = array('&quot;', '&gt;', '&lt;');
+ 		foreach ( $aBadEntities as $entity )
+ 		{
+ 			$pos = i18n::strpos($url, $entity);
+ 			
+ 			if ( $pos )
+ 			{
+ 				$post = i18n::substr($url, $pos) . $post;
+ 				$url = i18n::substr($url, 0, $pos);
+ 			}
+ 		}
+ 		
+ 		// remove entities at end (&&&&)
+ 		if ( preg_match('/(&\w+;)+$/i', $url, $matches) )
+ 		{
+ 			$post = $matches[0] . $post;	// found entities (1 or more)
+ 			$url = i18n::substr($url, 0, i18n::strlen($url) - i18n::strlen($post) );
+ 		}
+ 		
+ 		// move ending comma from url to 'post' part
+ 		if ( i18n::substr($url, i18n::strlen($url) - 1) == ',' )
+ 		{
+ 			$url = i18n::substr($url, 0, i18n::strlen($url) - 1);
+ 			$post = ',' . $post;
+ 		}
+ 		
+ 		if ( !preg_match('#^' . $protocol . '://#', $url) )
+ 		{
+ 			$linkedUrl = $protocol . ( ($protocol == 'mailto') ? ':' : '://') . $url;
+ 		}
+ 		else
+ 		{
+ 			$linkedUrl = $url;
+ 		}
+ 		
+ 		if ( $protocol != 'mailto' )
+ 		{
+ 			$displayedUrl = $linkedUrl;
+ 		}
+ 		else
+ 		{
+ 			$displayedUrl = $url;
+ 		}
+ 		
+ 		return $pre . '<a href="' . $linkedUrl . '" rel="nofollow">' . Entity::hsc(Entity::shorten($displayedUrl,30,'...')) . '</a>' . $post;
+ 	}
+ 	
+ 	/**
+ 	 * Comment::prepareBody_cb()
+ 	 * This method is a callback for creating link codes
+ 	 * 
+ 	 * @param	array	$match	elements for achor
+ 	 * @return	string	including anchor element and child text
+ 	 * 
+ 	 */
+ 	static public function prepareBody_cb($match)
+ 	{
+ 		if ( !preg_match('/^[a-z]+/i', $match[2], $protocol) )
+ 		{
+ 			return $match[0];
+ 		}
+ 		
+ 		switch( strtolower($protocol[0]) )
+ 		{
+ 			case 'https':
+ 				return self::createLinkCode($match[1], $match[2], 'https');
+ 			break;
+ 			
+ 			case 'ftp':
+ 				return self::createLinkCode($match[1], $match[2], 'ftp');
+ 			break;
+ 			
+ 			case 'mailto':
+ 				return self::createLinkCode($match[1], $match[3], 'mailto');
+ 			break;
+ 			
+ 			default:
+ 				return self::createLinkCode($match[1], $match[2], 'http');
+ 			break;
+ 		}
+ 		return;
+ 	}
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/libs/COMMENTACTIONS.php
index b320145,96bdb10..8ef2afb
--- a/nucleus/libs/COMMENTACTIONS.php
+++ b/nucleus/libs/COMMENTACTIONS.php
@@@ -232,8 -232,8 +232,13 @@@ class CommentActions extends BaseAction
  	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,10 -537,12 +542,19 @@@
  		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;
  	}
  	
@@@ -641,7 -643,7 +655,11 @@@
  	 */
  	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;
  	}
  	
@@@ -705,8 -707,9 +723,14 @@@
  				$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();
@@@ -781,13 -784,13 +805,23 @@@
  			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);
+ 		
+ 		// when no parameter is defined, just check if item author is current visitor
+ 		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
@@@ -798,7 -801,7 +832,11 @@@
  			{
  				return FALSE;
  			}
++<<<<<<< HEAD
 +			if ( $value == strtolower($mem->getDisplayName()) )
++=======
+ 			if ( $value == strtolower($member->getDisplayName()) )
++>>>>>>> skinnable-master
  			{
  				return TRUE;
  			}
@@@ -807,24 -810,23 +845,40 @@@
  		// 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;
  	}
@@@ -840,31 -842,30 +894,58 @@@
  	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']);
+ 		
+ 		// when no parameter is defined, just check if a category is selected
+ 		if ( ($key != 'catname' && $key != 'catid') || ($value == '') )
+ 		{
+ 			return $blog->isValidCategory($item['catid']);
+ 		}
+ 		
+ 		// check category name
+ 		if ( $key == 'catname' )
+ 		{
+ 			$value = $blog->getCategoryIdFromName($value);
+ 			if ( $value == $item['catid'] )
+ 			{
+ 				return $blog->isValidCategory($item['catid']);
+ 			}
+ 		}
+ 		
+ 		// check category id
+ 		if ( ($key == 'catid') && ($value == $item['catid']) )
+ 		{
+ 			return $blog->isValidCategory($item['catid']);
++>>>>>>> skinnable-master
  		}
  		return FALSE;
  	}
@@@ -878,12 -879,13 +959,22 @@@
  	 */
  	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);
+ 		$blog =& $manager->getBlog($item['blogid']);
+ 		
+ 		// when no blog found
+ 		if ( ($blogName == '') && !is_object($blog) )
++>>>>>>> skinnable-master
  		{
  			return 0;
  		}
@@@ -897,7 -899,7 +988,11 @@@
  		// use current blog
  		if ( ($blogName == '') || !$manager->existsBlogID($blogid) )
  		{
++<<<<<<< HEAD
 +			$blogid = $b->getID();
++=======
+ 			$blogid = $blog->getID();
++>>>>>>> skinnable-master
  		}
  		
  		return $member->teamRights($blogid);
@@@ -912,12 -914,13 +1007,22 @@@
  	 */
  	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);
+ 		$blog =& $manager->getBlog($item['blogid']);
+ 		
+ 		// when no blog found
+ 		if ( ($blogName == '') && !is_object($blog) )
++>>>>>>> skinnable-master
  		{
  			return 0;
  		}
@@@ -931,7 -934,7 +1036,11 @@@
  		// use current blog
  		if ( ($blogName == '') || !$manager->existsBlogID($blogid) )
  		{
++<<<<<<< HEAD
 +			$blogid = $b->getID();
++=======
+ 			$blogid = $blog->getID();
++>>>>>>> skinnable-master
  		}
  		
  		return $member->isBlogAdmin($blogid);
@@@ -1004,6 -1007,6 +1113,10 @@@
  		$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
  	}
  }
diff --combined nucleus/libs/COMMENTS.php
index 6783c06,4376f16..5eaf79d
--- a/nucleus/libs/COMMENTS.php
+++ b/nucleus/libs/COMMENTS.php
@@@ -1,442 -1,447 +1,892 @@@
++<<<<<<< HEAD
 +<?php
 +
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2002-2012 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)
 + */
 +/**
 + * A class representing the comments (all of them) for a certain post on a ceratin blog
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2012 The Nucleus Group
 + * @version $Id: COMMENTS.php 1527 2011-06-21 10:43:44Z sakamocchi $
 + */
 +
 +if ( !function_exists('requestVar') ) exit;
 +require_once dirname(__FILE__) . '/COMMENTACTIONS.php';
 +
 +class Comments
 +{
 +	// reference to the itemActions object that is calling the showComments function
 +	public $itemActions;
 +	
 +	// item for which comment are being displayed
 +	public $itemid;
 +	
 +	// total amount of comments displayed
 +	public $commentcount;
 +	
 +	/**
 +	 * Comments::__construct()
 +	 * Creates a new Comments object for the given blog and item
 +	 *
 +	 * @param	integer	$itemid	id of the item
 +	 * @return	void
 +	 */
 +	public function __construct($itemid)
 +	{
 +		$this->itemid = (integer) $itemid;
 +		return;
 +	}
 +	
 +	/**
 +	 * Comments::setItemActions()
 +	 * Used when parsing comments
 +	 *
 +	 * @param	object	$itemActions	itemActions object, that will take care of the parsing
 +	 * @return	void
 +	 */
 +	public function setItemActions(&$itemActions)
 +	{
 +		$this->itemActions =& $itemActions;
 +		return;
 +	}
 +	
 +	/**
 +	 * Comments::showComments()
 +	 * Shows maximum $max comments to the given item using the given template
 +	 * returns the amount of shown comments (if maxToShow = -1, then there is no limit)
 +	 *
 +	 * @param	array	template	template to use
 +	 * @param	integer	maxToShow	max. comments to show
 +	 * @param	integer	showNone	indicates if the 'no comments' thingie should be outputted
 +	 * 								when there are no comments (useful for closed items)
 +	 * @param	string	highlight	Highlight to use (if any)
 +	 * @return	integer	number of comments
 +	 */
 +	public function showComments($template, $maxToShow = -1, $showNone = 1, $highlight = '')
 +	{
 +		global $CONF, $manager;
 +		
 +		if ( $maxToShow == 0 )
 +		{
 +			$this->commentcount = $this->amountComments();
 +		}
 +		else
 +		{
 +			$query = 'SELECT citem as itemid, cnumber as commentid, cbody as body, cuser as user, cmail as userid, '
 +			       . 'cemail as email, cmember as memberid, ctime, chost as host, cip as ip, cblog as blogid '
 +			       . 'FROM %s as c WHERE citem=%d ORDER BY ctime';
 +			
 +			$query = sprintf($query, sql_table('comment'), (integer) $this->itemid);
 +			$comments = DB::getResult($query);
 +			$this->commentcount = $comments->rowCount();
 +		}
 +		
 +		// create parser object & action handler
 +		$handler = new CommentActions($this);
 +		$handler->setTemplate($template);
 +		
 +		$parser = new Parser($handler);
 +		
 +		// if no result was found
 +		if ( $this->commentcount == 0 )
 +		{
 +			// note: when no reactions, COMMENTS_HEADER and COMMENTS_FOOTER are _NOT_ used
 +			if ( $showNone )
 +			{
 +				$parser->parse($template['COMMENTS_NONE']);
 +			}
 +			return 0;
 +		}
 +		
 +		// if too many comments to show
 +		if ( ($maxToShow != -1) && ($this->commentcount > $maxToShow) )
 +		{
 +			$parser->parse($template['COMMENTS_TOOMUCH']);
 +			return 0;
 +		}
 +		
 +		$parser->parse($template['COMMENTS_HEADER']);
 +		
 +		foreach ( $comments as $comment )
 +		{
 +			$comment['timestamp'] = strtotime($comment['ctime']);
 +			$handler->setCurrentComment($comment);
 +			$handler->setHighlight($highlight);
 +			
 +			$manager->notify('PreComment', array('comment' => &$comment));
 +			$parser->parse($template['COMMENTS_BODY']);
 +			$manager->notify('PostComment', array('comment' => &$comment));
 +		}
 +		
 +		$parser->parse($template['COMMENTS_FOOTER']);
 +		
 +		$comments->closeCursor();
 +		
 +		return $this->commentcount;
 +	}
 +	
 +	/**
 +	 * Comments::amountComments()
 +	 * Returns the amount of comments for this itemid
 +	 * 
 +	 * @param	void
 +	 * @return	integer	number of comments
 +	 */
 +	public function amountComments()
 +	{
 +		$query = 'SELECT COUNT(*) FROM %s WHERE citem=%d;';
 +		$query = sprintf($query, sql_table('comment'), (integer) $this->itemid);
 +		$res = DB::getValue($query);
 +		
 +		return $res;
 +	}
 +	
 +	/**
 +	 * Comments::addComment()
 +	 * Adds a new comment to the database
 +	 * 
 +	 * @param string $timestamp
 +	 * @param array $comment
 +	 * @return mixed
 +	 */
 +	public function addComment($timestamp, $comment)
 +	{
 +		global $CONF, $member, $manager;
 +		
 +		$blogid = getBlogIDFromItemID($this->itemid);
 +		
 +		$settings =& $manager->getBlog($blogid);
 +		$settings->readSettings();
 +		
 +		// begin if: comments disabled
 +		if ( !$settings->commentsEnabled() )
 +		{
 +			return _ERROR_COMMENTS_DISABLED;
 +		}
 +		
 +		// begin if: public cannot comment
 +		if ( !$settings->isPublic() && !$member->isLoggedIn() )
 +		{
 +			return _ERROR_COMMENTS_NONPUBLIC;
 +		}
 +		
 +		// begin if: comment uses a protected member name
 +		if ( $CONF['ProtectMemNames'] && !$member->isLoggedIn() && Member::isNameProtected($comment['user']) )
 +		{
 +			return _ERROR_COMMENTS_MEMBERNICK;
 +		}
 +		
 +		// begin if: email required, but missing (doesn't apply to members)
 +		if ( $settings->emailRequired() && i18n::strlen($comment['email']) == 0 && !$member->isLoggedIn() )
 +		{
 +			return _ERROR_EMAIL_REQUIRED;
 +		}
 +		
 +		// begin if: commenter's name is too long
 +		if ( i18n::strlen($comment['user']) > 40 )
 +		{
 +			return _ERROR_USER_TOO_LONG;
 +		}
 +		
 +		// begin if: commenter's email is too long
 +		if ( i18n::strlen($comment['email']) > 100 )
 +		{
 +			return _ERROR_EMAIL_TOO_LONG;
 +		}
 +		
 +		// begin if: commenter's url is too long
 +		if ( i18n::strlen($comment['userid']) > 100 )
 +		{
 +			return _ERROR_URL_TOO_LONG;
 +		}
 +		
 +		$comment['timestamp'] = $timestamp;
 +		$comment['host'] = gethostbyaddr(serverVar('REMOTE_ADDR') );
 +		$comment['ip'] = serverVar('REMOTE_ADDR');
 +		
 +		// begin if: member is logged in, use that data
 +		if ( $member->isLoggedIn() )
 +		{
 +			$comment['memberid'] = $member->getID();
 +			$comment['user'] = '';
 +			$comment['userid'] = '';
 +			$comment['email'] = '';
 +		}
 +		else
 +		{
 +			$comment['memberid'] = 0;
 +		}
 +		
 +		// spam check
 +		$continue = FALSE;
 +		$plugins = array();
 +		
 +		if ( isset($manager->subscriptions['ValidateForm']) )
 +		{
 +			$plugins = array_merge($plugins, $manager->subscriptions['ValidateForm']);
 +		}
 +		
 +		if ( isset($manager->subscriptions['PreAddComment']) )
 +		{
 +			$plugins = array_merge($plugins, $manager->subscriptions['PreAddComment']);
 +		}
 +		
 +		if ( isset($manager->subscriptions['PostAddComment']) )
 +		{
 +			$plugins = array_merge($plugins, $manager->subscriptions['PostAddComment']);
 +		}
 +		
 +		$plugins = array_unique($plugins);
 +		
 +		while ( list(, $plugin) = each($plugins) )
 +		{
 +			$p = $manager->getPlugin($plugin);
 +			$continue = $continue || $p->supportsFeature('handleSpam');
 +		}
 +		
 +		$spamcheck = array(
 +			'type'		=> 'comment',
 +			'body'		=> $comment['body'],
 +			'id'		=> $comment['itemid'],
 +			'live'		=> TRUE,
 +			'return'	=> $continue
 +		);
 +		
 +		// begin if: member logged in
 +		if ( $member->isLoggedIn() )
 +		{
 +			$spamcheck['author'] = $member->displayname;
 +			$spamcheck['email'] = $member->email;
 +		}
 +		// else: public
 +		else
 +		{
 +			$spamcheck['author'] = $comment['user'];
 +			$spamcheck['email'] = $comment['email'];
 +			$spamcheck['url'] = $comment['userid'];
 +		}
 +		
 +		$manager->notify('SpamCheck', array('spamcheck' => &$spamcheck) );
 +		
 +		if ( !$continue && isset($spamcheck['result']) && $spamcheck['result'] == TRUE )
 +		{
 +			return _ERROR_COMMENTS_SPAM;
 +		}
 +		
 +		// isValidComment returns either "1" or an error message
 +		$isvalid = $this->isValidComment($comment, $spamcheck);
 +		if ( $isvalid != 1 )
 +		{
 +			return $isvalid;
 +		}
 +		
 +		// begin if: send email to notification address
 +		if ( $settings->getNotifyAddress() && $settings->notifyOnComment() )
 +		{
 +		
 +			$message = _NOTIFY_NC_MSG . ' ' . $this->itemid . "\n";
 +			$temp = parse_url($CONF['Self']);
 +			
 +			if ( $temp['scheme'] )
 +			{
 +				$message .= Link::create_item_link($this->itemid) . "\n\n";
 +			}
 +			else
 +			{
 +				$tempurl = $settings->getURL();
 +				
 +				if ( i18n::substr($tempurl, -1) == '/' || i18n::substr($tempurl, -4) == '.php' )
 +				{
 +					$message .= $tempurl . '?itemid=' . $this->itemid . "\n\n";
 +				}
 +				else
 +				{
 +					$message .= $tempurl . '/?itemid=' . $this->itemid . "\n\n";
 +				}
 +			}
 +			
 +			if ( $comment['memberid'] == 0 )
 +			{
 +				$message .= _NOTIFY_USER . ' ' . $comment['user'] . "\n";
 +				$message .= _NOTIFY_USERID . ' ' . $comment['userid'] . "\n";
 +			}
 +			else
 +			{
 +				$message .= _NOTIFY_MEMBER .' ' . $member->getDisplayName() . ' (ID=' . $member->getID() . ")\n";
 +			}
 +			
 +			$message .= _NOTIFY_HOST . ' ' . $comment['host'] . "\n";
 +			$message .= _NOTIFY_COMMENT . "\n " . $comment['body'] . "\n";
 +			$message .= NOTIFICATION::get_mail_footer();
 +			
 +			$item =& $manager->getItem($this->itemid, 0, 0);
 +			$subject = _NOTIFY_NC_TITLE . ' ' . strip_tags($item['title']) . ' (' . $this->itemid . ')';
 +			
 +			$from = $member->getNotifyFromMailAddress($comment['email']);
 +			
 +			NOTIFICATION::mail($settings->getNotifyAddress(), $subject, $message, $from, i18n::get_current_charset());
 +		}
 +		
 +		$comment = Comment::prepare($comment);
 +		
 +		$manager->notify('PreAddComment', array('comment' => &$comment, 'spamcheck' => &$spamcheck) );
 +		
 +		$name		= DB::quoteValue($comment['user']);
 +		$url		= DB::quoteValue($comment['userid']);
 +		$email      = DB::quoteValue($comment['email']);
 +		$body		= DB::quoteValue($comment['body']);
 +		$host		= DB::quoteValue($comment['host']);
 +		$ip			= DB::quoteValue($comment['ip']);
 +		$memberid	= intval($comment['memberid']);
 +		$timestamp	= DB::formatDateTime($comment['timestamp']);
 +		$itemid		= $this->itemid;
 +		
 +		$qSql = 'SELECT COUNT(*) AS result '
 +		      . 'FROM ' . sql_table('comment')
 +		      . ' WHERE '
 +		      .      'cmail   = ' . $url
 +		      . ' AND cmember = ' . $memberid
 +		      . ' AND cbody   = ' . $body
 +		      . ' AND citem   = ' . $itemid
 +		      . ' AND cblog   = ' . $blogid;
 +		$result = (integer) DB::getValue($qSql);
 +		
 +		if ( $result > 0 )
 +		{
 +			return _ERROR_BADACTION;
 +		}
 +		
 +		$query = sprintf('INSERT INTO %s (cuser, cmail, cemail, cmember, cbody, citem, ctime, chost, cip, cblog) '
 +			. 'VALUES (%s, %s, %s, %d, %s, %d, %s, %s, %s, %d)'
 +			, sql_table('comment'), $name, $url, $email, $memberid, $body, $itemid, $timestamp, $host, $ip, $blogid);
 +		
 +		DB::execute($query);
 +		
 +		// post add comment
 +		$commentid = DB::getInsertId();
 +		$manager->notify('PostAddComment', array('comment' => &$comment, 'commentid' => &$commentid, 'spamcheck' => &$spamcheck) );
 +		
 +		// succeeded !
 +		return TRUE;
 +	}
 +	
 +	/**
 +	 * Comments::isValidComment()
 +	 * Checks if a comment is valid and call plugins
 +	 * that can check if the comment is a spam comment	  
 +	 * 
 +	 * @param	array	$comment	array with comment elements
 +	 * @param	array	$spamcheck	array with spamcheck elements
 +	 * @return	boolean	valid or not
 +	 */
 +	private function isValidComment(&$comment, &$spamcheck)
 +	{
 +		global $member, $manager;
 +		
 +		// check if there exists a item for this date
 +		$item =& $manager->getItem($this->itemid, 0, 0);
 +		
 +		if ( !$item )
 +		{
 +			return _ERROR_NOSUCHITEM;
 +		}
 +		
 +		if ( $item['closed'] )
 +		{
 +			return _ERROR_ITEMCLOSED;
 +		}
 +		
 +		// don't allow words that are too long
 +		if ( preg_match('/[a-zA-Z0-9|\.,;:!\?=\/\\\\]{90,90}/', $comment['body']) != 0 )
 +		{
 +			return _ERROR_COMMENT_LONGWORD;
 +		}
 +		
 +		// check lengths of comment
 +		if ( i18n::strlen($comment['body']) < 3 )
 +		{
 +			return _ERROR_COMMENT_NOCOMMENT;
 +		}
 +		
 +		if ( i18n::strlen($comment['body']) > 5000 )
 +		{
 +			return _ERROR_COMMENT_TOOLONG;
 +		}
 +		
 +		// only check username if no member logged in
 +		if ( !$member->isLoggedIn() && (i18n::strlen($comment['user']) < 2) )
 +		{
 +			return _ERROR_COMMENT_NOUSERNAME;
 +		}
 +		
 +		if ( (i18n::strlen($comment['email']) != 0) && !NOTIFICATION::address_validation(trim($comment['email'])) )
 +		{
 +			return _ERROR_BADMAILADDRESS;
 +		}
 +		
 +		// let plugins do verification (any plugin which thinks the comment is invalid
 +		// can change 'error' to something other than '1')
 +		$result = 1;
 +		$manager->notify('ValidateForm', array('type' => 'comment', 'comment' => &$comment, 'error' => &$result, 'spamcheck' => &$spamcheck) );
 +		
 +		return $result;
 +	}
 +}
++=======
+ <?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)
+  */
+ /**
+  * A class representing the comments (all of them) for a certain post on a ceratin blog
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: COMMENTS.php 1527 2011-06-21 10:43:44Z sakamocchi $
+  */
+ 
+ if ( !function_exists('requestVar') ) exit;
+ require_once dirname(__FILE__) . '/COMMENTACTIONS.php';
+ 
+ class Comments
+ {
+ 	// reference to the itemActions object that is calling the showComments function
+ 	public $itemActions;
+ 	
+ 	// item for which comment are being displayed
+ 	public $itemid;
+ 	
+ 	// total amount of comments displayed
+ 	public $commentcount;
+ 	
+ 	/**
+ 	 * Comments::__construct()
+ 	 * Creates a new Comments object for the given blog and item
+ 	 *
+ 	 * @param	integer	$itemid	id of the item
+ 	 * @return	void
+ 	 */
+ 	public function __construct($itemid)
+ 	{
+ 		$this->itemid = (integer) $itemid;
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Comments::setItemActions()
+ 	 * Used when parsing comments
+ 	 *
+ 	 * @param	object	$itemActions	itemActions object, that will take care of the parsing
+ 	 * @return	void
+ 	 */
+ 	public function setItemActions(&$itemActions)
+ 	{
+ 		$this->itemActions =& $itemActions;
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Comments::showComments()
+ 	 * Shows maximum $max comments to the given item using the given template
+ 	 * returns the amount of shown comments (if maxToShow = -1, then there is no limit)
+ 	 *
+ 	 * @param	array	template	template to use
+ 	 * @param	integer	maxToShow	max. comments to show
+ 	 * @param	integer	showNone	indicates if the 'no comments' thingie should be outputted
+ 	 * 								when there are no comments (useful for closed items)
+ 	 * @param	string	highlight	Highlight to use (if any)
+ 	 * @return	integer	number of comments
+ 	 */
+ 	public function showComments($template, $maxToShow = -1, $showNone = 1, $highlight = '')
+ 	{
+ 		global $CONF, $manager;
+ 		
+ 		if ( $maxToShow == 0 )
+ 		{
+ 			$this->commentcount = $this->amountComments();
+ 		}
+ 		else
+ 		{
+ 			$query = 'SELECT citem as itemid, cnumber as commentid, cbody as body, cuser as user, cmail as userid, '
+ 			       . 'cemail as email, cmember as memberid, ctime, chost as host, cip as ip, cblog as blogid '
+ 			       . 'FROM %s as c WHERE citem=%d ORDER BY ctime';
+ 			
+ 			$query = sprintf($query, sql_table('comment'), (integer) $this->itemid);
+ 			$comments = DB::getResult($query);
+ 			$this->commentcount = $comments->rowCount();
+ 		}
+ 		
+ 		// create parser object & action handler
+ 		$handler = new CommentActions($this);
+ 		$handler->setTemplate($template);
+ 		
+ 		$parser = new Parser($handler);
+ 		
+ 		// if no result was found
+ 		if ( $this->commentcount == 0 )
+ 		{
+ 			// note: when no reactions, COMMENTS_HEADER and COMMENTS_FOOTER are _NOT_ used
+ 			if ( $showNone )
+ 			{
+ 				$parser->parse($template['COMMENTS_NONE']);
+ 			}
+ 			return 0;
+ 		}
+ 		
+ 		// if too many comments to show
+ 		if ( ($maxToShow != -1) && ($this->commentcount > $maxToShow) )
+ 		{
+ 			$parser->parse($template['COMMENTS_TOOMUCH']);
+ 			return 0;
+ 		}
+ 		
+ 		$parser->parse($template['COMMENTS_HEADER']);
+ 		
+ 		foreach ( $comments as $comment )
+ 		{
+ 			$comment['timestamp'] = strtotime($comment['ctime']);
+ 			$handler->setCurrentComment($comment);
+ 			$handler->setHighlight($highlight);
+ 
+ 			$data = array('comment' => &$comment);
+ 			$manager->notify('PreComment', $data);
+ 			$parser->parse($template['COMMENTS_BODY']);
+ 			$manager->notify('PostComment', $data);
+ 		}
+ 		
+ 		$parser->parse($template['COMMENTS_FOOTER']);
+ 		
+ 		$comments->closeCursor();
+ 		
+ 		return $this->commentcount;
+ 	}
+ 	
+ 	/**
+ 	 * Comments::amountComments()
+ 	 * Returns the amount of comments for this itemid
+ 	 * 
+ 	 * @param	void
+ 	 * @return	integer	number of comments
+ 	 */
+ 	public function amountComments()
+ 	{
+ 		$query = 'SELECT COUNT(*) FROM %s WHERE citem=%d;';
+ 		$query = sprintf($query, sql_table('comment'), (integer) $this->itemid);
+ 		$res = DB::getValue($query);
+ 		
+ 		return $res;
+ 	}
+ 	
+ 	/**
+ 	 * Comments::addComment()
+ 	 * Adds a new comment to the database
+ 	 * 
+ 	 * @param string $timestamp
+ 	 * @param array $comment
+ 	 * @return mixed
+ 	 */
+ 	public function addComment($timestamp, $comment)
+ 	{
+ 		global $CONF, $member, $manager;
+ 		
+ 		$blogid = getBlogIDFromItemID($this->itemid);
+ 		
+ 		$settings =& $manager->getBlog($blogid);
+ 		$settings->readSettings();
+ 		
+ 		// begin if: comments disabled
+ 		if ( !$settings->commentsEnabled() )
+ 		{
+ 			return _ERROR_COMMENTS_DISABLED;
+ 		}
+ 		
+ 		// begin if: public cannot comment
+ 		if ( !$settings->isPublic() && !$member->isLoggedIn() )
+ 		{
+ 			return _ERROR_COMMENTS_NONPUBLIC;
+ 		}
+ 		
+ 		// begin if: comment uses a protected member name
+ 		if ( $CONF['ProtectMemNames'] && !$member->isLoggedIn() && Member::isNameProtected($comment['user']) )
+ 		{
+ 			return _ERROR_COMMENTS_MEMBERNICK;
+ 		}
+ 		
+ 		// begin if: email required, but missing (doesn't apply to members)
+ 		if ( $settings->emailRequired() && i18n::strlen($comment['email']) == 0 && !$member->isLoggedIn() )
+ 		{
+ 			return _ERROR_EMAIL_REQUIRED;
+ 		}
+ 		
+ 		// begin if: commenter's name is too long
+ 		if ( i18n::strlen($comment['user']) > 40 )
+ 		{
+ 			return _ERROR_USER_TOO_LONG;
+ 		}
+ 		
+ 		// begin if: commenter's email is too long
+ 		if ( i18n::strlen($comment['email']) > 100 )
+ 		{
+ 			return _ERROR_EMAIL_TOO_LONG;
+ 		}
+ 		
+ 		// begin if: commenter's url is too long
+ 		if ( i18n::strlen($comment['userid']) > 100 )
+ 		{
+ 			return _ERROR_URL_TOO_LONG;
+ 		}
+ 		
+ 		$comment['timestamp'] = $timestamp;
+ 		$comment['host'] = gethostbyaddr(serverVar('REMOTE_ADDR') );
+ 		$comment['ip'] = serverVar('REMOTE_ADDR');
+ 		
+ 		// begin if: member is logged in, use that data
+ 		if ( $member->isLoggedIn() )
+ 		{
+ 			$comment['memberid'] = $member->getID();
+ 			$comment['user'] = '';
+ 			$comment['userid'] = '';
+ 			$comment['email'] = '';
+ 		}
+ 		else
+ 		{
+ 			$comment['memberid'] = 0;
+ 		}
+ 		
+ 		// spam check
+ 		$continue = FALSE;
+ 		$plugins = array();
+ 		
+ 		if ( isset($manager->subscriptions['ValidateForm']) )
+ 		{
+ 			$plugins = array_merge($plugins, $manager->subscriptions['ValidateForm']);
+ 		}
+ 		
+ 		if ( isset($manager->subscriptions['PreAddComment']) )
+ 		{
+ 			$plugins = array_merge($plugins, $manager->subscriptions['PreAddComment']);
+ 		}
+ 		
+ 		if ( isset($manager->subscriptions['PostAddComment']) )
+ 		{
+ 			$plugins = array_merge($plugins, $manager->subscriptions['PostAddComment']);
+ 		}
+ 		
+ 		$plugins = array_unique($plugins);
+ 		
+ 		while ( list(, $plugin) = each($plugins) )
+ 		{
+ 			$p = $manager->getPlugin($plugin);
+ 			$continue = $continue || $p->supportsFeature('handleSpam');
+ 		}
+ 		
+ 		$spamcheck = array(
+ 			'type'		=> 'comment',
+ 			'body'		=> $comment['body'],
+ 			'id'		=> $comment['itemid'],
+ 			'live'		=> TRUE,
+ 			'return'	=> $continue
+ 		);
+ 		
+ 		// begin if: member logged in
+ 		if ( $member->isLoggedIn() )
+ 		{
+ 			$spamcheck['author'] = $member->displayname;
+ 			$spamcheck['email'] = $member->email;
+ 		}
+ 		// else: public
+ 		else
+ 		{
+ 			$spamcheck['author'] = $comment['user'];
+ 			$spamcheck['email'] = $comment['email'];
+ 			$spamcheck['url'] = $comment['userid'];
+ 		}
+ 
+ 		$data = array('spamcheck' => &$spamcheck);
+ 		$manager->notify('SpamCheck', $data);
+ 		
+ 		if ( !$continue && isset($spamcheck['result']) && $spamcheck['result'] == TRUE )
+ 		{
+ 			return _ERROR_COMMENTS_SPAM;
+ 		}
+ 		
+ 		// isValidComment returns either "1" or an error message
+ 		$isvalid = $this->isValidComment($comment, $spamcheck);
+ 		if ( $isvalid != 1 )
+ 		{
+ 			return $isvalid;
+ 		}
+ 		
+ 		// begin if: send email to notification address
+ 		if ( $settings->getNotifyAddress() && $settings->notifyOnComment() )
+ 		{
+ 		
+ 			$message = _NOTIFY_NC_MSG . ' ' . $this->itemid . "\n";
+ 			$temp = parse_url($CONF['Self']);
+ 			
+ 			if ( $temp['scheme'] )
+ 			{
+ 				$message .= Link::create_item_link($this->itemid) . "\n\n";
+ 			}
+ 			else
+ 			{
+ 				$tempurl = $settings->getURL();
+ 				
+ 				if ( i18n::substr($tempurl, -1) == '/' || i18n::substr($tempurl, -4) == '.php' )
+ 				{
+ 					$message .= $tempurl . '?itemid=' . $this->itemid . "\n\n";
+ 				}
+ 				else
+ 				{
+ 					$message .= $tempurl . '/?itemid=' . $this->itemid . "\n\n";
+ 				}
+ 			}
+ 			
+ 			if ( $comment['memberid'] == 0 )
+ 			{
+ 				$message .= _NOTIFY_USER . ' ' . $comment['user'] . "\n";
+ 				$message .= _NOTIFY_USERID . ' ' . $comment['userid'] . "\n";
+ 			}
+ 			else
+ 			{
+ 				$message .= _NOTIFY_MEMBER .' ' . $member->getDisplayName() . ' (ID=' . $member->getID() . ")\n";
+ 			}
+ 			
+ 			$message .= _NOTIFY_HOST . ' ' . $comment['host'] . "\n";
+ 			$message .= _NOTIFY_COMMENT . "\n " . $comment['body'] . "\n";
+ 			$message .= NOTIFICATION::get_mail_footer();
+ 			
+ 			$item =& $manager->getItem($this->itemid, 0, 0);
+ 			$subject = _NOTIFY_NC_TITLE . ' ' . strip_tags($item['title']) . ' (' . $this->itemid . ')';
+ 			
+ 			$from = $member->getNotifyFromMailAddress($comment['email']);
+ 			
+ 			NOTIFICATION::mail($settings->getNotifyAddress(), $subject, $message, $from, i18n::get_current_charset());
+ 		}
+ 		
+ 		$comment = Comment::prepare($comment);
+ 
+ 		$data = array('comment' => &$comment, 'spamcheck' => &$spamcheck);
+ 		$manager->notify('PreAddComment', $data);
+ 		
+ 		$name		= DB::quoteValue($comment['user']);
+ 		$url		= DB::quoteValue($comment['userid']);
+ 		$email		= DB::quoteValue($comment['email']);
+ 		$body		= DB::quoteValue($comment['body']);
+ 		$host		= DB::quoteValue($comment['host']);
+ 		$ip			= DB::quoteValue($comment['ip']);
+ 		$memberid	= intval($comment['memberid']);
+ 		$timestamp	= DB::formatDateTime($comment['timestamp']);
+ 		$itemid		= $this->itemid;
+ 		
+ 		$qSql = 'SELECT COUNT(*) AS result '
+ 		      . 'FROM ' . sql_table('comment')
+ 		      . ' WHERE '
+ 		      .      'cmail   = ' . $url
+ 		      . ' AND cmember = ' . $memberid
+ 		      . ' AND cbody   = ' . $body
+ 		      . ' AND citem   = ' . $itemid
+ 		      . ' AND cblog   = ' . $blogid;
+ 		$result = (integer) DB::getValue($qSql);
+ 		
+ 		if ( $result > 0 )
+ 		{
+ 			return _ERROR_BADACTION;
+ 		}
+ 		
+ 		$query = sprintf('INSERT INTO %s (cuser, cmail, cemail, cmember, cbody, citem, ctime, chost, cip, cblog) '
+ 			. 'VALUES (%s, %s, %s, %d, %s, %d, %s, %s, %s, %d)'
+ 			, sql_table('comment'), $name, $url, $email, $memberid, $body, $itemid, $timestamp, $host, $ip, $blogid);
+ 		
+ 		DB::execute($query);
+ 		
+ 		// post add comment
+ 		$commentid = DB::getInsertId();
+ 		$data = array('comment' => &$comment, 'commentid' => &$commentid, 'spamcheck' => &$spamcheck);
+ 		$manager->notify('PostAddComment', $data);
+ 		
+ 		// succeeded !
+ 		return TRUE;
+ 	}
+ 	
+ 	/**
+ 	 * Comments::isValidComment()
+ 	 * Checks if a comment is valid and call plugins
+ 	 * that can check if the comment is a spam comment	  
+ 	 * 
+ 	 * @param	array	$comment	array with comment elements
+ 	 * @param	array	$spamcheck	array with spamcheck elements
+ 	 * @return	boolean	valid or not
+ 	 */
+ 	private function isValidComment(&$comment, &$spamcheck)
+ 	{
+ 		global $member, $manager;
+ 		
+ 		// check if there exists a item for this date
+ 		$item =& $manager->getItem($this->itemid, 0, 0);
+ 		
+ 		if ( !$item )
+ 		{
+ 			return _ERROR_NOSUCHITEM;
+ 		}
+ 		
+ 		if ( $item['closed'] )
+ 		{
+ 			return _ERROR_ITEMCLOSED;
+ 		}
+ 		
+ 		// don't allow words that are too long
+ 		if ( preg_match('/[a-zA-Z0-9|\.,;:!\?=\/\\\\]{90,90}/', $comment['body']) != 0 )
+ 		{
+ 			return _ERROR_COMMENT_LONGWORD;
+ 		}
+ 		
+ 		// check lengths of comment
+ 		if ( i18n::strlen($comment['body']) < 3 )
+ 		{
+ 			return _ERROR_COMMENT_NOCOMMENT;
+ 		}
+ 		
+ 		if ( i18n::strlen($comment['body']) > 5000 )
+ 		{
+ 			return _ERROR_COMMENT_TOOLONG;
+ 		}
+ 		
+ 		// only check username if no member logged in
+ 		if ( !$member->isLoggedIn() && (i18n::strlen($comment['user']) < 2) )
+ 		{
+ 			return _ERROR_COMMENT_NOUSERNAME;
+ 		}
+ 		
+ 		if ( (i18n::strlen($comment['email']) != 0) && !NOTIFICATION::address_validation(trim($comment['email'])) )
+ 		{
+ 			return _ERROR_BADMAILADDRESS;
+ 		}
+ 		
+ 		// let plugins do verification (any plugin which thinks the comment is invalid
+ 		// can change 'error' to something other than '1')
+ 		$result = 1;
+ 		$data = array('type' => 'comment', 'comment' => &$comment, 'error' => &$result, 'spamcheck' => &$spamcheck);
+ 		$manager->notify('ValidateForm', $data);
+ 		
+ 		return $result;
+ 	}
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/libs/ITEM.php
index 475f6a3,a989ca9..0fce570
--- a/nucleus/libs/ITEM.php
+++ b/nucleus/libs/ITEM.php
@@@ -1,601 -1,604 +1,1208 @@@
++<<<<<<< HEAD
 +<?php
 +
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2002-2012 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-2012 The Nucleus Group
 + * @version $Id: ITEM.php 1668 2012-02-19 14:36:44Z sakamocchi $
 + */
 +
 +/**
 + * A class representing an item
 + *
 + */
 +class Item
 +{
 +	/**
 +	 * Item::$actiontypes
 +	 * actiontype list for handling items
 +	 * 
 +	 * @static
 +	 */
 +	static private $actiontypes = array(
 +		'addnow', 'adddraft', 'addfuture', 'edit',
 +		'changedate', 'backtodrafts', 'delete'
 +	);
 +	
 +	/**
 +	 * Item::$itemid
 +	 * item id
 +	 * @deprecated
 +	 */
 +	public $itemid;
 +	
 +	/**
 +	 * Item::__construct()
 +	 * Creates a new ITEM object
 +	 * 
 +	 * @deprecated
 +	 * @param integer	$item_id	id for item
 +	 * @return void
 +	 */
 +	public function __construct($item_id)
 +	{
 +		$this->itemid = $item_id;
 +		return;
 +	}
 +	
 +	/**
 +	 * Item::getitem()
 +	 * Returns one item with the specific itemid
 +	 * 
 +	 * @static
 +	 * @param int $item_id
 +	 * @param bool $allow_draft
 +	 * @param bool $allow_future
 +	 * @return mixed
 +	 */
 +	static public function getitem($item_id, $allow_draft, $allow_future)
 +	{
 +		global $manager;
 +		
 +		$item_id = (integer) $item_id;
 +		
 +		$query = 'SELECT ' .
 +			'i.idraft AS draft, ' .
 +			'i.inumber AS itemid, ' .
 +			'i.iclosed AS closed, ' .
 +			'i.ititle AS title, ' .
 +			'i.ibody AS body, ' .
 +			'm.mname AS author, ' .
 +			'i.iauthor AS authorid, ' .
 +			'i.itime, ' .
 +			'i.imore AS more, ' .
 +			'i.ikarmapos AS karmapos, ' .
 +			'i.ikarmaneg AS karmaneg, ' .
 +			'i.icat AS catid, ' .
 +			'i.iblog AS blogid ' .
 +			'FROM %s AS i, %s AS m, %s AS b ' .
 +			'WHERE i.inumber = %d ' .
 +			'AND i.iauthor = m.mnumber ' .
 +			'AND i.iblog = b.bnumber ';
 +		
 +		$query = sprintf($query, sql_table('item'), sql_table('member'), sql_table('blog'), $item_id);
 +		
 +		if ( !$allow_draft )
 +		{
 +			$query .= "AND i.idraft = 0 ";
 +		}
 +		
 +		if ( !$allow_future )
 +		{
 +			$blog =& $manager->getBlog(getBlogIDFromItemID($item_id));
 +			$query .= 'AND i.itime <= ' . DB::formatDateTime($blog->getCorrectTime());
 +		}
 +		
 +		$query .= ' LIMIT 1';
 +		$result = DB::getResult($query);
 +		
 +		if ( $result->rowCount() == 1 )
 +		{
 +			$aItemInfo = $result->fetch(PDO::FETCH_ASSOC);
 +			$aItemInfo['timestamp'] = strtotime($aItemInfo['itime']);
 +			return $aItemInfo;
 +		}
 +		return 0;
 +	}
 +	
 +	/**
 +	 * Item::createFromRequest()
 +	 * Tries to create an item from the data in the current request (comes from
 +	 * bookmarklet or admin area
 +	 *
 +	 * @static
 +	 * @param	void
 +	 * @return	array	(status = added/error/newcategory, message)
 +	 * 
 +	 */
 +	static public function createFromRequest()
 +	{
 +		global $member, $manager;
 +		
 +		/*
 +		 * TODO: these values from user agent should be validated but not implemented yet
 +		 */
 +		$i_author		= $member->getID();
 +		$i_body			= postVar('body');
 +		$i_title		= postVar('title');
 +		$i_more			= postVar('more');
 +		$i_actiontype	= postVar('actiontype');
 +		$i_closed		= intPostVar('closed');
 +		$i_hour			= intPostVar('hour');
 +		$i_minutes		= intPostVar('minutes');
 +		$i_month		= intPostVar('month');
 +		$i_day			= intPostVar('day');
 +		$i_year			= intPostVar('year');
 +		$i_catid		= postVar('catid');
 +		$i_draftid		= intPostVar('draftid');
 +		
 +		if ( !$member->canAddItem($i_catid) )
 +		{
 +			return array('status' => 'error', 'message' => _ERROR_DISALLOWED);
 +		}
 +		
 +		if ( !in_array($i_actiontype, self::$actiontypes) )
 +		{
 +			$i_actiontype = 'addnow';
 +		}
 +		
 +		$i_draft = (integer) ( $i_actiontype == 'adddraft' );
 +		
 +		if ( !trim($i_body) )
 +		{
 +			return array('status' => 'error', 'message' => _ERROR_NOEMPTYITEMS);
 +		}
 +		
 +		// create new category if needed
 +		if ( i18n::strpos($i_catid, 'newcat') === 0 )
 +		{
 +			// get blogid
 +			list($i_blogid) = sscanf($i_catid, "newcat-%d");
 +			
 +			// create
 +			$blog =& $manager->getBlog($i_blogid);
 +			$i_catid = $blog->createNewCategory();
 +			
 +			// show error when sth goes wrong
 +			if ( !$i_catid )
 +			{
 +				return array('status' => 'error','message' => 'Could not create new category');
 +			}
 +		}
 +		else
 +		{
 +			// force blogid (must be same as category id)
 +			$i_blogid = getBlogIDFromCatID($i_catid);
 +			$blog =& $manager->getBlog($i_blogid);
 +		}
 +		
 +		if ( $i_actiontype == 'addfuture' )
 +		{
 +			$posttime = mktime($i_hour, $i_minutes, 0, $i_month, $i_day, $i_year);
 +			
 +			// make sure the date is in the future, unless we allow past dates
 +			if ( (!$blog->allowPastPosting()) && ($posttime < $blog->getCorrectTime()) )
 +			{
 +				$posttime = $blog->getCorrectTime();
 +			}
 +		}
 +		else
 +		{
 +			if ( !$i_draft )
 +			{
 +				$posttime = $blog->getCorrectTime();
 +			}
 +			else
 +			{
 +				$posttime = 0;
 +			}
 +		}
 +		
 +		if ( $posttime > $blog->getCorrectTime() )
 +		{
 +			$posted = 0;
 +			$blog->setFuturePost();
 +		}
 +		else
 +		{
 +			$posted = 1;
 +		}
 +		
 +		$itemid = $blog->additem($i_catid, $i_title, $i_body, $i_more, $i_blogid, $i_author, $posttime, $i_closed, $i_draft, $posted);
 +		
 +		//Setting the itemOptions
 +		$aOptions = requestArray('plugoption');
 +		NucleusPlugin::apply_plugin_options($aOptions, $itemid);
 +		$data = array(
 +			'context'	=> 'item',
 +			'itemid'	=> $itemid,
 +			'item'		=> array(
 +				'title'		=> $i_title,
 +				'body'		=> $i_body,
 +				'more'		=> $i_more,
 +				'closed'	=> $i_closed,
 +				'catid'		=> $i_catid
 +			)
 +		);
 +		
 +		$manager->notify('PostPluginOptionsUpdate', $data);
 +		
 +		if ( $i_draftid > 0 )
 +		{
 +			// delete permission is checked inside Item::delete()
 +			self::delete($i_draftid);
 +		}
 +		
 +		// success
 +		if ( $i_catid != intRequestVar('catid') )
 +		{
 +			return array('status' => 'newcategory', 'itemid' => $itemid, 'catid' => $i_catid);
 +		}
 +		
 +		return array('status' => 'added', 'itemid' => $itemid);
 +	}
 +	
 +	/**
 +	 * Item::update()
 +	 * Updates an item
 +	 *
 +	 * @static
 +	 * @param	integer	$itemid	item id
 +	 * @param	integer	$catid	category id
 +	 * @param	string	$title	title
 +	 * @param	string	$body	body text
 +	 * @param	string	$more	more text
 +	 * @param	boolean	$closed	closed or not
 +	 * @param	boolean	$wasdraft	previously draft or not
 +	 * @param	boolean	$publish	published or not
 +	 * @param	timestamp	$timestamp	timestamp
 +	 * @return	void
 +	 */
 +	static public function update($itemid, $catid, $title, $body, $more, $closed, $wasdraft, $publish, $timestamp = 0)
 +	{
 +		global $manager;
 +		
 +		$itemid = (integer) $itemid;
 +		$closed = (boolean) $closed;
 +		
 +		// get destination blogid
 +		$new_blogid = getBlogIDFromCatID($catid);
 +		$old_blogid = getBlogIDFromItemID($itemid);
 +		
 +		// move will be done on end of method
 +		$moveNeeded = 0;
 +		if ( $new_blogid != $old_blogid )
 +		{
 +			$moveNeeded = 1;
 +		}
 +		
 +		$blog =& $manager->getBlog($new_blogid);
 +		
 +		// begin if: convert line breaks to <br/>
 +		if ( $blog->convertBreaks() )
 +		{
 +			$body = addBreaks($body);
 +			$more = addBreaks($more);
 +		}
 +		
 +		// call plugins
 +		$data = array(
 +			'itemid'	=> $itemid,
 +			'title'		=> &$title,
 +			'body'		=> &$body,
 +			'more'		=> &$more,
 +			'blog'		=> &$blog,
 +			'closed'	=> &$closed,
 +			'catid'		=> &$catid
 +		);
 +		$manager->notify('PreUpdateItem', $data);
 +		
 +		// update item itself
 +		$query =  'UPDATE ' . sql_table('item')
 +				. ' SET'
 +				. ' ibody = ' . DB::quoteValue($body) . ','
 +				. ' ititle = ' . DB::quoteValue($title) . ','
 +				. ' imore = ' . DB::quoteValue($more) . ','
 +				. ' iclosed = ' . intval($closed) . ','
 +				. ' icat = ' . intval($catid);
 +		
 +		// if we received an updated timestamp that is in the past, but past posting is not allowed,
 +		// reject that date change (timestamp = 0 will make sure the current date is kept)
 +		if ( (!$blog->allowPastPosting()) && ($timestamp < $blog->getCorrectTime()) )
 +		{
 +			$timestamp = 0;
 +		}
 +		
 +		// begin if: post is in the future
 +		if ( $timestamp > $blog->getCorrectTime(time()) )
 +		{
 +			$isFuture = 1;
 +			$query .= ', iposted = 0';
 +		}
 +		else
 +		{
 +			$isFuture = 0;
 +			$query .= ', iposted = 1';
 +		}
 +		
 +		if ( $wasdraft && $publish )
 +		{
 +			// set timestamp to current date only if it's not a future item
 +			// draft items have timestamp == 0
 +			// don't allow timestamps in the past (unless otherwise defined in blogsettings)
 +			$query .= ', idraft = 0';
 +			
 +			if ( $timestamp == 0 )
 +			{
 +				$timestamp = $blog->getCorrectTime();
 +			}
 +			
 +			// send new item notification
 +			if ( !$isFuture && $blog->getNotifyAddress() && $blog->notifyOnNewItem() )
 +			{
 +				$blog->sendNewItemNotification($itemid, $title, $body);
 +			}
 +		}
 +		
 +		// save back to drafts
 +		if ( !$wasdraft && !$publish )
 +		{
 +			$query .= ', idraft = 1';
 +			// set timestamp back to zero for a draft
 +			$query .= ', itime = ' . DB::formatDateTime($timestamp);
 +		}
 +		
 +		// update timestamp when needed
 +		if ( $timestamp != 0 )
 +		{
 +			$query .= ', itime = ' . DB::formatDateTime($timestamp);
 +		}
 +		
 +		// make sure the correct item is updated
 +		$query .= ' WHERE inumber = ' . $itemid;
 +		
 +		// off we go!
 +		DB::execute($query);
 +		
 +		$manager->notify('PostUpdateItem', array('itemid' => $itemid));
 +		
 +		// when needed, move item and comments to new blog
 +		if ( $moveNeeded )
 +		{
 +			self::move($itemid, $catid);
 +		}
 +		
 +		//update the itemOptions
 +		$aOptions = requestArray('plugoption');
 +		NucleusPlugin::apply_plugin_options($aOptions);
 +		$data = array(
 +			'context'	=> 'item',
 +			'itemid'	=> $itemid,
 +			'item'		=> array(
 +				'title'		=> $title,
 +				'body'		=> $body,
 +				'more'		=> $more,
 +				'closed'	=> $closed,
 +				'catid'		=> $catid
 +			)
 +		);
 +		$manager->notify('PostPluginOptionsUpdate', $data);
 +		return;
 +	}
 +	
 +	/**
 +	 * Item::move()
 +	 * Move an item to another blog (no checks)
 +	 *
 +	 * @static
 +	 * @param	integer	$itemid
 +	 * @param	integer	$new_catid
 +	 * @return	void
 +	 */
 +	static public function move($itemid, $new_catid)
 +	{
 +		global $manager;
 +		
 +		$itemid = (integer) $itemid;
 +		$new_catid = (integer) $new_catid;
 +		$new_blogid = getBlogIDFromCatID($new_catid);
 +		
 +		$data = array(
 +			'itemid'		=> $itemid,
 +			'destblogid'	=> $new_blogid,
 +			'destcatid'		=> $new_catid
 +		);
 +		$manager->notify('PreMoveItem', $data);
 +		
 +		// update item table
 +		$query = "UPDATE %s SET iblog=%d, icat=%d WHERE inumber=%d";
 +		$query = sprintf($query, sql_table('item'), $new_blogid, $new_catid, $itemid);
 +		DB::execute($query);
 +		
 +		// update comments
 +		$query = "UPDATE %s SET cblog=%d WHERE citem=%d";
 +		$query = sprintf($query, sql_table('comment'), $new_blogid, $itemid);
 +		DB::execute($query);
 +		
 +		$data = array(
 +			'itemid'		=> $itemid,
 +			'destblogid'	=> $new_blogid,
 +			'destcatid'		=> $new_catid
 +		);
 +		$manager->notify('PostMoveItem', $data);
 +		return;
 +	}
 +	
 +	/**
 +	 * Item::delete()
 +	 * Deletes an item
 +	 * 
 +	 * @param	integer	$itemid
 +	 * @return	void
 +	 */
 +	static public function delete($itemid)
 +	{
 +		global $manager, $member;
 +		
 +		$itemid = (integer) $itemid;
 +		
 +		// check permission
 +		if ( !$member->canAlterItem($itemid) )
 +		{
 +			return 1;
 +		}
 +		
 +		$manager->notify('PreDeleteItem', array('itemid' => $itemid));
 +		
 +		// delete item
 +		$query = "DELETE FROM %s WHERE inumber=%d;";
 +		$query = sprintf($query, sql_table('item'), $itemid);
 +		DB::execute($query);
 +		
 +		// delete the comments associated with the item
 +		$query = "DELETE FROM %s WHERE citem=%d;";
 +		$query = sprintf($query, sql_table('comment'), $itemid);
 +		DB::execute($query);
 +		
 +		// delete all associated plugin options
 +		NucleusPlugin::delete_option_values('item', $itemid);
 +		
 +		$manager->notify('PostDeleteItem', array('itemid' => $itemid));
 +		
 +		return 0;
 +	}
 +	
 +	/**
 +	 * Item::exists()
 +	 * Returns true if there is an item with the given ID
 +	 *
 +	 * @static
 +	 * @param	integer	$itemid
 +	 * @param	boolean	$future
 +	 * @param	boolean	$draft
 +	 * @return	boolean	exists or not
 +	 */
 +	static public function exists($itemid, $future, $draft)
 +	{
 +		global $manager;
 +		
 +		$itemid = (integer) $itemid;
 +		
 +		$query = 'SELECT * FROM %s WHERE inumber=%d';
 +		$query = sprintf($query, sql_table('item'), $itemid);
 +		
 +		if ( !$future )
 +		{
 +			$blogid = getBlogIDFromItemID($itemid);
 +			if ( !$blogid )
 +			{
 +				return 0;
 +			}
 +			$blog =& $manager->getBlog($blogid);
 +			$query .= ' AND itime<=' . DB::formatDateTime($blog->getCorrectTime());
 +		}
 +		
 +		if ( !$draft )
 +		{
 +			$query .= ' AND idraft=0';
 +		}
 +		
 +		$result = DB::getResult($query);
 +		return ( $result->rowCount() != 0 );
 +	}
 +	
 +	/**
 +	 * Item::createDraftFromRequest()
 +	 * Tries to create an draft from the data
 +	 *  in the current request (comes from bookmarklet or admin area)
 +	 *   Used by xmlHTTPRequest AutoDraft
 +	 *
 +	 * Returns an array with status info:
 +	 * status = 'added', 'error', 'newcategory'
 +	 *
 +	 * @static
 +	 * @param	void
 +	 * @return	array	(status = added/error/newcategory, message)
 +	 */
 +	static public function createDraftFromRequest()
 +	{
 +		global $member, $manager;
 +		
 +		/*
 +		 * TODO: these values from user agent should be validated but not implemented yet
 +		 */
 +		$i_author	= $member->getID();
 +		$i_body		= postVar('body');
 +		$i_title	= postVar('title');
 +		$i_more		= postVar('more');
 +		$i_closed	= intPostVar('closed');
 +		$i_catid	= postVar('catid');
 +		$i_draft	= 1;
 +		$type		= postVar('type');
 +		$i_draftid	= intPostVar('draftid');
 +		
 +		if ( $type == 'edit' )
 +		{
 +			$itemid = intPostVar('itemid');
 +			$i_blogid = getBlogIDFromItemID($itemid);
 +		}
 +		else
 +		{
 +			$i_blogid = intPostVar('blogid');
 +		}
 +		
 +		if ( !$member->canAddItem($i_catid) )
 +		{
 +			return array('status' => 'error', 'message' => _ERROR_DISALLOWED);
 +		}
 +		
 +		if ( !trim($i_body) )
 +		{
 +			return array('status' => 'error', 'message' => _ERROR_NOEMPTYITEMS);
 +		}
 +		
 +		// create new category if needed
 +		if ( i18n::strpos($i_catid,'newcat') === 0 )
 +		{
 +			// Set in default category
 +			$blog =& $manager->getBlog($i_blogid);
 +			$i_catid = $blog->getDefaultCategory();
 +		}
 +		else
 +		{
 +			// force blogid (must be same as category id)
 +			$i_blogid = getBlogIDFromCatID($i_catid);
 +			$blog =& $manager->getBlog($i_blogid);
 +		}
 +		
 +		$posttime = 0;
 +		
 +		if ( $i_draftid > 0 )
 +		{
 +			self::update($i_draftid, $i_catid, $i_title, $i_body, $i_more, $i_closed, 1, 0, 0);
 +			$itemid = $i_draftid;
 +		}
 +		else
 +		{
 +			$itemid = $blog->additem($i_catid, $i_title, $i_body, $i_more, $i_blogid, $i_author, $posttime, $i_closed, $i_draft);
 +		}
 +		
 +		return array('status' => 'added', 'draftid' => $itemid);
 +	}
 +}
++=======
+ <?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: ITEM.php 1877 2012-06-17 07:40:11Z sakamocchi $
+  */
+ 
+ /**
+  * A class representing an item
+  *
+  */
+ class Item
+ {
+ 	/**
+ 	 * Item::$actiontypes
+ 	 * actiontype list for handling items
+ 	 * 
+ 	 * @static
+ 	 */
+ 	static private $actiontypes = array(
+ 		'addnow', 'adddraft', 'addfuture', 'edit',
+ 		'changedate', 'backtodrafts', 'delete'
+ 	);
+ 	
+ 	/**
+ 	 * Item::$itemid
+ 	 * item id
+ 	 * @deprecated
+ 	 */
+ 	public $itemid;
+ 	
+ 	/**
+ 	 * Item::__construct()
+ 	 * Creates a new ITEM object
+ 	 * 
+ 	 * @deprecated
+ 	 * @param integer	$item_id	id for item
+ 	 * @return void
+ 	 */
+ 	public function __construct($item_id)
+ 	{
+ 		$this->itemid = $item_id;
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Item::getitem()
+ 	 * Returns one item with the specific itemid
+ 	 * 
+ 	 * @static
+ 	 * @param int $item_id
+ 	 * @param bool $allow_draft
+ 	 * @param bool $allow_future
+ 	 * @return mixed
+ 	 */
+ 	static public function getitem($item_id, $allow_draft, $allow_future)
+ 	{
+ 		global $manager;
+ 		
+ 		$item_id = (integer) $item_id;
+ 		
+ 		$query = 'SELECT ' .
+ 			'i.idraft AS draft, ' .
+ 			'i.inumber AS itemid, ' .
+ 			'i.iclosed AS closed, ' .
+ 			'i.ititle AS title, ' .
+ 			'i.ibody AS body, ' .
+ 			'm.mname AS author, ' .
+ 			'i.iauthor AS authorid, ' .
+ 			'i.itime, ' .
+ 			'i.imore AS more, ' .
+ 			'i.ikarmapos AS karmapos, ' .
+ 			'i.ikarmaneg AS karmaneg, ' .
+ 			'i.icat AS catid, ' .
+ 			'i.iblog AS blogid ' .
+ 			'FROM %s AS i, %s AS m, %s AS b ' .
+ 			'WHERE i.inumber = %d ' .
+ 			'AND i.iauthor = m.mnumber ' .
+ 			'AND i.iblog = b.bnumber ';
+ 		
+ 		$query = sprintf($query, sql_table('item'), sql_table('member'), sql_table('blog'), $item_id);
+ 		
+ 		if ( !$allow_draft )
+ 		{
+ 			$query .= "AND i.idraft = 0 ";
+ 		}
+ 		
+ 		if ( !$allow_future )
+ 		{
+ 			$blog =& $manager->getBlog(getBlogIDFromItemID($item_id));
+ 			$query .= 'AND i.itime <= ' . DB::formatDateTime($blog->getCorrectTime());
+ 		}
+ 		
+ 		$query .= ' LIMIT 1';
+ 		$result = DB::getResult($query);
+ 		
+ 		if ( $result->rowCount() != 1 )
+ 		{
+ 			return 0;
+ 		}
+ 		
+ 		$aItemInfo = $result->fetch(PDO::FETCH_ASSOC);
+ 		$aItemInfo['timestamp'] = strtotime($aItemInfo['itime']);
+ 		return $aItemInfo;
+ 	}
+ 	
+ 	/**
+ 	 * Item::createFromRequest()
+ 	 * Tries to create an item from the data in the current request (comes from
+ 	 * bookmarklet or admin area
+ 	 *
+ 	 * @static
+ 	 * @param	void
+ 	 * @return	array	(status = added/error/newcategory, message)
+ 	 * 
+ 	 */
+ 	static public function createFromRequest()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		/*
+ 		 * TODO: these values from user agent should be validated but not implemented yet
+ 		 */
+ 		$i_author		= $member->getID();
+ 		$i_body			= postVar('body');
+ 		$i_title		= postVar('title');
+ 		$i_more			= postVar('more');
+ 		$i_actiontype	= postVar('actiontype');
+ 		$i_closed		= intPostVar('closed');
+ 		$i_hour			= intPostVar('hour');
+ 		$i_minutes		= intPostVar('minutes');
+ 		$i_month		= intPostVar('month');
+ 		$i_day			= intPostVar('day');
+ 		$i_year			= intPostVar('year');
+ 		$i_catid		= postVar('catid');
+ 		$i_draftid		= intPostVar('draftid');
+ 		
+ 		if ( !$member->canAddItem($i_catid) )
+ 		{
+ 			return array('status' => 'error', 'message' => _ERROR_DISALLOWED);
+ 		}
+ 		
+ 		if ( !in_array($i_actiontype, self::$actiontypes) )
+ 		{
+ 			$i_actiontype = 'addnow';
+ 		}
+ 		
+ 		$i_draft = (integer) ( $i_actiontype == 'adddraft' );
+ 		
+ 		if ( !trim($i_body) )
+ 		{
+ 			return array('status' => 'error', 'message' => _ERROR_NOEMPTYITEMS);
+ 		}
+ 		
+ 		// create new category if needed
+ 		if ( i18n::strpos($i_catid, 'newcat') === 0 )
+ 		{
+ 			// get blogid
+ 			list($i_blogid) = sscanf($i_catid, "newcat-%d");
+ 			
+ 			// create
+ 			$blog =& $manager->getBlog($i_blogid);
+ 			$i_catid = $blog->createNewCategory();
+ 			
+ 			// show error when sth goes wrong
+ 			if ( !$i_catid )
+ 			{
+ 				return array('status' => 'error','message' => 'Could not create new category');
+ 			}
+ 		}
+ 		else
+ 		{
+ 			// force blogid (must be same as category id)
+ 			$i_blogid = getBlogIDFromCatID($i_catid);
+ 			$blog =& $manager->getBlog($i_blogid);
+ 		}
+ 		
+ 		if ( $i_actiontype == 'addfuture' )
+ 		{
+ 			$posttime = mktime($i_hour, $i_minutes, 0, $i_month, $i_day, $i_year);
+ 			
+ 			// make sure the date is in the future, unless we allow past dates
+ 			if ( (!$blog->allowPastPosting()) && ($posttime < $blog->getCorrectTime()) )
+ 			{
+ 				$posttime = $blog->getCorrectTime();
+ 			}
+ 		}
+ 		else
+ 		{
+ 			if ( !$i_draft )
+ 			{
+ 				$posttime = $blog->getCorrectTime();
+ 			}
+ 			else
+ 			{
+ 				$posttime = 0;
+ 			}
+ 		}
+ 		
+ 		if ( $posttime > $blog->getCorrectTime() )
+ 		{
+ 			$posted = 0;
+ 			$blog->setFuturePost();
+ 		}
+ 		else
+ 		{
+ 			$posted = 1;
+ 		}
+ 		
+ 		$itemid = $blog->additem($i_catid, $i_title, $i_body, $i_more, $i_blogid, $i_author, $posttime, $i_closed, $i_draft, $posted);
+ 		
+ 		//Setting the itemOptions
+ 		$aOptions = requestArray('plugoption');
+ 		NucleusPlugin::apply_plugin_options($aOptions, $itemid);
+ 		$data = array(
+ 			'context'	=> 'item',
+ 			'itemid'	=> $itemid,
+ 			'item'		=> array(
+ 				'title'		=> $i_title,
+ 				'body'		=> $i_body,
+ 				'more'		=> $i_more,
+ 				'closed'	=> $i_closed,
+ 				'catid'		=> $i_catid
+ 			)
+ 		);
+ 		
+ 		$manager->notify('PostPluginOptionsUpdate', $data);
+ 		
+ 		if ( $i_draftid > 0 )
+ 		{
+ 			// delete permission is checked inside Item::delete()
+ 			self::delete($i_draftid);
+ 		}
+ 		
+ 		// success
+ 		if ( $i_catid != intRequestVar('catid') )
+ 		{
+ 			return array('status' => 'newcategory', 'itemid' => $itemid, 'catid' => $i_catid);
+ 		}
+ 		
+ 		return array('status' => 'added', 'itemid' => $itemid);
+ 	}
+ 	
+ 	/**
+ 	 * Item::update()
+ 	 * Updates an item
+ 	 *
+ 	 * @static
+ 	 * @param	integer	$itemid	item id
+ 	 * @param	integer	$catid	category id
+ 	 * @param	string	$title	title
+ 	 * @param	string	$body	body text
+ 	 * @param	string	$more	more text
+ 	 * @param	boolean	$closed	closed or not
+ 	 * @param	boolean	$wasdraft	previously draft or not
+ 	 * @param	boolean	$publish	published or not
+ 	 * @param	timestamp	$timestamp	timestamp
+ 	 * @return	void
+ 	 */
+ 	static public function update($itemid, $catid, $title, $body, $more, $closed, $wasdraft, $publish, $timestamp = 0)
+ 	{
+ 		global $manager;
+ 		
+ 		$itemid = (integer) $itemid;
+ 		$closed = (boolean) $closed;
+ 		
+ 		// get destination blogid
+ 		$new_blogid = getBlogIDFromCatID($catid);
+ 		$old_blogid = getBlogIDFromItemID($itemid);
+ 		
+ 		// move will be done on end of method
+ 		$moveNeeded = 0;
+ 		if ( $new_blogid != $old_blogid )
+ 		{
+ 			$moveNeeded = 1;
+ 		}
+ 		
+ 		$blog =& $manager->getBlog($new_blogid);
+ 		
+ 		// begin if: convert line breaks to <br/>
+ 		if ( $blog->convertBreaks() )
+ 		{
+ 			$body = addBreaks($body);
+ 			$more = addBreaks($more);
+ 		}
+ 		
+ 		// call plugins
+ 		$data = array(
+ 			'itemid'	=> $itemid,
+ 			'title'		=> &$title,
+ 			'body'		=> &$body,
+ 			'more'		=> &$more,
+ 			'blog'		=> &$blog,
+ 			'closed'	=> &$closed,
+ 			'catid'		=> &$catid
+ 		);
+ 		$manager->notify('PreUpdateItem', $data);
+ 		
+ 		// update item itself
+ 		$query =  'UPDATE ' . sql_table('item')
+ 				. ' SET'
+ 				. ' ibody = ' . DB::quoteValue($body) . ','
+ 				. ' ititle = ' . DB::quoteValue($title) . ','
+ 				. ' imore = ' . DB::quoteValue($more) . ','
+ 				. ' iclosed = ' . intval($closed) . ','
+ 				. ' icat = ' . intval($catid);
+ 		
+ 		// if we received an updated timestamp that is in the past, but past posting is not allowed,
+ 		// reject that date change (timestamp = 0 will make sure the current date is kept)
+ 		if ( (!$blog->allowPastPosting()) && ($timestamp < $blog->getCorrectTime()) )
+ 		{
+ 			$timestamp = 0;
+ 		}
+ 		
+ 		// begin if: post is in the future
+ 		if ( $timestamp > $blog->getCorrectTime(time()) )
+ 		{
+ 			$isFuture = 1;
+ 			$query .= ', iposted = 0';
+ 		}
+ 		else
+ 		{
+ 			$isFuture = 0;
+ 			$query .= ', iposted = 1';
+ 		}
+ 		
+ 		if ( $wasdraft && $publish )
+ 		{
+ 			// set timestamp to current date only if it's not a future item
+ 			// draft items have timestamp == 0
+ 			// don't allow timestamps in the past (unless otherwise defined in blogsettings)
+ 			$query .= ', idraft = 0';
+ 			
+ 			if ( $timestamp == 0 )
+ 			{
+ 				$timestamp = $blog->getCorrectTime();
+ 			}
+ 			
+ 			// send new item notification
+ 			if ( !$isFuture && $blog->getNotifyAddress() && $blog->notifyOnNewItem() )
+ 			{
+ 				$blog->sendNewItemNotification($itemid, $title, $body);
+ 			}
+ 		}
+ 		
+ 		// save back to drafts
+ 		if ( !$wasdraft && !$publish )
+ 		{
+ 			$query .= ', idraft = 1';
+ 			// set timestamp back to zero for a draft
+ 			$query .= ', itime = ' . DB::formatDateTime($timestamp);
+ 		}
+ 		
+ 		// update timestamp when needed
+ 		if ( $timestamp != 0 )
+ 		{
+ 			$query .= ', itime = ' . DB::formatDateTime($timestamp);
+ 		}
+ 		
+ 		// make sure the correct item is updated
+ 		$query .= ' WHERE inumber = ' . $itemid;
+ 		
+ 		// off we go!
+ 		DB::execute($query);
+ 
+ 		$data = array('itemid' => $itemid);
+ 		$manager->notify('PostUpdateItem', $data);
+ 		
+ 		// when needed, move item and comments to new blog
+ 		if ( $moveNeeded )
+ 		{
+ 			self::move($itemid, $catid);
+ 		}
+ 		
+ 		//update the itemOptions
+ 		$aOptions = requestArray('plugoption');
+ 		NucleusPlugin::apply_plugin_options($aOptions);
+ 		$data = array(
+ 			'context'	=> 'item',
+ 			'itemid'	=> $itemid,
+ 			'item'		=> array(
+ 				'title'		=> $title,
+ 				'body'		=> $body,
+ 				'more'		=> $more,
+ 				'closed'	=> $closed,
+ 				'catid'		=> $catid
+ 			)
+ 		);
+ 		$manager->notify('PostPluginOptionsUpdate', $data);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Item::move()
+ 	 * Move an item to another blog (no checks)
+ 	 *
+ 	 * @static
+ 	 * @param	integer	$itemid
+ 	 * @param	integer	$new_catid
+ 	 * @return	void
+ 	 */
+ 	static public function move($itemid, $new_catid)
+ 	{
+ 		global $manager;
+ 		
+ 		$itemid		= (integer) $itemid;
+ 		$new_catid	= (integer) $new_catid;
+ 		$new_blogid	= getBlogIDFromCatID($new_catid);
+ 		
+ 		$data = array(
+ 			'itemid'		=> $itemid,
+ 			'destblogid'	=> $new_blogid,
+ 			'destcatid'		=> $new_catid
+ 		);
+ 		$manager->notify('PreMoveItem', $data);
+ 		
+ 		// update item table
+ 		$query = "UPDATE %s SET iblog=%d, icat=%d WHERE inumber=%d";
+ 		$query = sprintf($query, sql_table('item'), $new_blogid, $new_catid, $itemid);
+ 		DB::execute($query);
+ 		
+ 		// update comments
+ 		$query = "UPDATE %s SET cblog=%d WHERE citem=%d";
+ 		$query = sprintf($query, sql_table('comment'), $new_blogid, $itemid);
+ 		DB::execute($query);
+ 		
+ 		$data = array(
+ 			'itemid'		=> $itemid,
+ 			'destblogid'	=> $new_blogid,
+ 			'destcatid'		=> $new_catid
+ 		);
+ 		$manager->notify('PostMoveItem', $data);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Item::delete()
+ 	 * Deletes an item
+ 	 * 
+ 	 * @param	integer	$itemid
+ 	 * @return	void
+ 	 */
+ 	static public function delete($itemid)
+ 	{
+ 		global $manager, $member;
+ 		
+ 		$itemid = (integer) $itemid;
+ 		
+ 		// check permission
+ 		if ( !$member->canAlterItem($itemid) )
+ 		{
+ 			return 1;
+ 		}
+ 
+ 		$data = array('itemid' => $itemid);
+ 		$manager->notify('PreDeleteItem', $data);
+ 		
+ 		// delete item
+ 		$query = "DELETE FROM %s WHERE inumber=%d;";
+ 		$query = sprintf($query, sql_table('item'), $itemid);
+ 		DB::execute($query);
+ 		
+ 		// delete the comments associated with the item
+ 		$query = "DELETE FROM %s WHERE citem=%d;";
+ 		$query = sprintf($query, sql_table('comment'), $itemid);
+ 		DB::execute($query);
+ 		
+ 		// delete all associated plugin options
+ 		NucleusPlugin::delete_option_values('item', $itemid);
+ 		
+ 		$manager->notify('PostDeleteItem', $data);
+ 		
+ 		return 0;
+ 	}
+ 	
+ 	/**
+ 	 * Item::exists()
+ 	 * Returns true if there is an item with the given ID
+ 	 *
+ 	 * @static
+ 	 * @param	integer	$itemid
+ 	 * @param	boolean	$future
+ 	 * @param	boolean	$draft
+ 	 * @return	boolean	exists or not
+ 	 */
+ 	static public function exists($itemid, $future, $draft)
+ 	{
+ 		global $manager;
+ 		
+ 		$itemid = (integer) $itemid;
+ 		
+ 		$query = 'SELECT * FROM %s WHERE inumber=%d';
+ 		$query = sprintf($query, sql_table('item'), $itemid);
+ 		
+ 		if ( !$future )
+ 		{
+ 			$blogid = getBlogIDFromItemID($itemid);
+ 			if ( !$blogid )
+ 			{
+ 				return 0;
+ 			}
+ 			$blog =& $manager->getBlog($blogid);
+ 			$query .= ' AND itime<=' . DB::formatDateTime($blog->getCorrectTime());
+ 		}
+ 		
+ 		if ( !$draft )
+ 		{
+ 			$query .= ' AND idraft=0';
+ 		}
+ 		
+ 		$result = DB::getResult($query);
+ 		return ( $result->rowCount() != 0 );
+ 	}
+ 	
+ 	/**
+ 	 * Item::createDraftFromRequest()
+ 	 * Tries to create an draft from the data
+ 	 *  in the current request (comes from bookmarklet or admin area)
+ 	 *   Used by xmlHTTPRequest AutoDraft
+ 	 *
+ 	 * Returns an array with status info:
+ 	 * status = 'added', 'error', 'newcategory'
+ 	 *
+ 	 * @static
+ 	 * @param	void
+ 	 * @return	array	(status = added/error/newcategory, message)
+ 	 */
+ 	static public function createDraftFromRequest()
+ 	{
+ 		global $member, $manager;
+ 		
+ 		/*
+ 		 * TODO: these values from user agent should be validated but not implemented yet
+ 		 */
+ 		$i_author	= $member->getID();
+ 		$i_body		= postVar('body');
+ 		$i_title	= postVar('title');
+ 		$i_more		= postVar('more');
+ 		$i_closed	= intPostVar('closed');
+ 		$i_catid	= postVar('catid');
+ 		$i_draft	= 1;
+ 		$type		= postVar('type');
+ 		$i_draftid	= intPostVar('draftid');
+ 		
+ 		if ( $type == 'edit' )
+ 		{
+ 			$itemid = intPostVar('itemid');
+ 			$i_blogid = getBlogIDFromItemID($itemid);
+ 		}
+ 		else
+ 		{
+ 			$i_blogid = intPostVar('blogid');
+ 		}
+ 		
+ 		if ( !$member->canAddItem($i_catid) )
+ 		{
+ 			return array('status' => 'error', 'message' => _ERROR_DISALLOWED);
+ 		}
+ 		
+ 		if ( !trim($i_body) )
+ 		{
+ 			return array('status' => 'error', 'message' => _ERROR_NOEMPTYITEMS);
+ 		}
+ 		
+ 		// create new category if needed
+ 		if ( i18n::strpos($i_catid,'newcat') === 0 )
+ 		{
+ 			// Set in default category
+ 			$blog =& $manager->getBlog($i_blogid);
+ 			$i_catid = $blog->getDefaultCategory();
+ 		}
+ 		else
+ 		{
+ 			// force blogid (must be same as category id)
+ 			$i_blogid = getBlogIDFromCatID($i_catid);
+ 			$blog =& $manager->getBlog($i_blogid);
+ 		}
+ 		
+ 		$posttime = 0;
+ 		
+ 		if ( $i_draftid > 0 )
+ 		{
+ 			self::update($i_draftid, $i_catid, $i_title, $i_body, $i_more, $i_closed, 1, 0, 0);
+ 			$itemid = $i_draftid;
+ 		}
+ 		else
+ 		{
+ 			$itemid = $blog->additem($i_catid, $i_title, $i_body, $i_more, $i_blogid, $i_author, $posttime, $i_closed, $i_draft);
+ 		}
+ 		
+ 		return array('status' => 'added', 'draftid' => $itemid);
+ 	}
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/libs/ITEMACTIONS.php
index 9aa96d4,2306fa3..7db9281
--- a/nucleus/libs/ITEMACTIONS.php
+++ b/nucleus/libs/ITEMACTIONS.php
@@@ -14,7 -14,7 +14,11 @@@
   *
   * @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 -101,7 +105,11 @@@
  	/* actions defined in BodyAction class */
  		'image',
  		'media',
++<<<<<<< HEAD
 +		'popup',
++=======
+ 		'popup'
++>>>>>>> skinnable-master
  		);
  	
  	/**
@@@ -753,9 -753,10 +761,16 @@@
  		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;
  	}
  	
@@@ -817,7 -818,8 +832,12 @@@
  		$handler->setCurrentItem($this->currentItem);
  		
  		$parser = new Parser($handler);
++<<<<<<< HEAD
 +		$parser->parse($handler->highlight($data));
++=======
+ 		$highlight = $handler->highlight($data);
+ 		$parser->parse($highlight);
++>>>>>>> skinnable-master
  		return;
  	}
  	
@@@ -847,8 -849,9 +867,14 @@@
  				$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();
@@@ -920,8 -923,6 +946,11 @@@
  	{
  		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 == '') )
  		{
@@@ -941,14 -942,12 +970,23 @@@
  		// 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;
@@@ -966,12 -965,12 +1004,20 @@@
  	{
  		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'];
@@@ -979,17 -978,17 +1025,28 @@@
  		// 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;
  	}
@@@ -1123,6 -1122,6 +1180,10 @@@
  		$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
  	}
  }
diff --combined nucleus/libs/KARMA.php
index 1c7dcb4,6370305..5471c04
--- a/nucleus/libs/KARMA.php
+++ b/nucleus/libs/KARMA.php
@@@ -1,116 -1,116 +1,235 @@@
++<<<<<<< HEAD
 +<?php
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2002-2012 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)
 + */
 +/**
 + * Class representing the karma votes for a certain item
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2012 The Nucleus Group
 + * @version $Id: KARMA.php 1470 2010-11-29 22:10:16Z ftruscot $
 + */
 +class Karma
 +{
 +	// id of item about which this object contains information
 +	var $itemid;
 +	
 +	// indicates if the karma vote info has already been intialized from the DB
 +	var $inforead;
 +	
 +	// amount of positive/negative votes
 +	var $karmapos;
 +	var $karmaneg;
 +	
 +	function KARMA($itemid, $initpos = 0, $initneg = 0, $initread = 0) {
 +		// itemid
 +		$this->itemid = intval($itemid);
 +
 +		// have we read the karma info yet?
 +		$this->inforead = intval($initread);
 +
 +		// number of positive and negative votes
 +		$this->karmapos = intval($initpos);
 +		$this->karmaneg = intval($initneg);
 +	}
 +
 +	function getNbPosVotes() {
 +		if (!$this->inforead) $this->readFromDatabase();
 +		return $this->karmapos;
 +	}
 +	function getNbNegVotes() {
 +		if (!$this->inforead) $this->readFromDatabase();
 +		return $this->karmaneg;
 +	}
 +	function getNbOfVotes() {
 +		if (!$this->inforead) $this->readFromDatabase();
 +		return ($this->karmapos + $this->karmaneg);
 +	}
 +	function getTotalScore() {
 +		if (!$this->inforead) $this->readFromDatabase();
 +		return ($this->karmapos - $this->karmaneg);
 +	}
 +
 +	function setNbPosVotes($val) {
 +		$this->karmapos = intval($val);
 +	}
 +	function setNbNegVotes($val) {
 +		$this->karmaneg = intval($val);
 +	}
 +
 +
 +	// adds a positive vote
 +	function votePositive() {
 +		$newKarma = $this->getNbPosVotes() + 1;
 +		$this->setNbPosVotes($newKarma);
 +		$this->writeToDatabase();
 +		$this->saveIP();
 +	}
 +
 +	// adds a negative vote
 +	function voteNegative() {
 +		$newKarma = $this->getNbNegVotes() + 1;
 +		$this->setNbNegVotes($newKarma);
 +		$this->writeToDatabase();
 +		$this->saveIP();
 +	}
 +
 +
 +
 +	// these methods shouldn't be called directly
 +	function readFromDatabase() {
 +		$query = 'SELECT ikarmapos, ikarmaneg FROM '.sql_table('item').' WHERE inumber=' . $this->itemid;
 +		$res = DB::getRow($query);
 +
 +		$this->karmapos = $res['ikarmapos'];
 +		$this->karmaneg = $res['ikarmaneg'];
 +		$this->inforead = 1;
 +	}
 +
 +
 +	function writeToDatabase() {
 +		$query = 'UPDATE '.sql_table('item').' SET ikarmapos=' . $this->karmapos . ', ikarmaneg='.$this->karmaneg.' WHERE inumber=' . $this->itemid;
 +		DB::execute($query);
 +	}
 +
 +	// checks if a vote is still allowed for an IP
 +	function isVoteAllowed($ip) {
 +		$query = 'SELECT * FROM '.sql_table('karma')." WHERE itemid={$this->itemid} and ip=". DB::quoteValue($ip);
 +		$res = DB::getResult($query);
 +		return ($res->rowCount() == 0);
 +	}
 +
 +	// save IP in database so no multiple votes are possible
 +	function saveIP() {
 +		$query = 'INSERT INTO ' . sql_table('karma') .' (itemid, ip) VALUES (' . $this->itemid . ','. DB::quoteValue(serverVar('REMOTE_ADDR')) .')';
 +		DB::execute($query);
 +	}
 +}
 +
 +?>
++=======
+ <?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)
+  */
+ /**
+  * Class representing the karma votes for a certain item
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: KARMA.php 1812 2012-05-01 14:59:07Z sakamocchi $
+  */
+ class Karma
+ {
+ 	// id of item about which this object contains information
+ 	var $itemid;
+ 	
+ 	// indicates if the karma vote info has already been intialized from the DB
+ 	var $inforead;
+ 	
+ 	// amount of positive/negative votes
+ 	var $karmapos;
+ 	var $karmaneg;
+ 	
+ 	function KARMA($itemid, $initpos = 0, $initneg = 0, $initread = 0) {
+ 		// itemid
+ 		$this->itemid = intval($itemid);
+ 
+ 		// have we read the karma info yet?
+ 		$this->inforead = intval($initread);
+ 
+ 		// number of positive and negative votes
+ 		$this->karmapos = intval($initpos);
+ 		$this->karmaneg = intval($initneg);
+ 	}
+ 
+ 	function getNbPosVotes() {
+ 		if (!$this->inforead) $this->readFromDatabase();
+ 		return $this->karmapos;
+ 	}
+ 	function getNbNegVotes() {
+ 		if (!$this->inforead) $this->readFromDatabase();
+ 		return $this->karmaneg;
+ 	}
+ 	function getNbOfVotes() {
+ 		if (!$this->inforead) $this->readFromDatabase();
+ 		return ($this->karmapos + $this->karmaneg);
+ 	}
+ 	function getTotalScore() {
+ 		if (!$this->inforead) $this->readFromDatabase();
+ 		return ($this->karmapos - $this->karmaneg);
+ 	}
+ 
+ 	function setNbPosVotes($val) {
+ 		$this->karmapos = intval($val);
+ 	}
+ 	function setNbNegVotes($val) {
+ 		$this->karmaneg = intval($val);
+ 	}
+ 
+ 
+ 	// adds a positive vote
+ 	function votePositive() {
+ 		$newKarma = $this->getNbPosVotes() + 1;
+ 		$this->setNbPosVotes($newKarma);
+ 		$this->writeToDatabase();
+ 		$this->saveIP();
+ 	}
+ 
+ 	// adds a negative vote
+ 	function voteNegative() {
+ 		$newKarma = $this->getNbNegVotes() + 1;
+ 		$this->setNbNegVotes($newKarma);
+ 		$this->writeToDatabase();
+ 		$this->saveIP();
+ 	}
+ 
+ 
+ 
+ 	// these methods shouldn't be called directly
+ 	function readFromDatabase() {
+ 		$query = 'SELECT ikarmapos, ikarmaneg FROM '.sql_table('item').' WHERE inumber=' . $this->itemid;
+ 		$res = DB::getRow($query);
+ 
+ 		$this->karmapos = $res['ikarmapos'];
+ 		$this->karmaneg = $res['ikarmaneg'];
+ 		$this->inforead = 1;
+ 	}
+ 
+ 
+ 	function writeToDatabase() {
+ 		$query = 'UPDATE '.sql_table('item').' SET ikarmapos=' . $this->karmapos . ', ikarmaneg='.$this->karmaneg.' WHERE inumber=' . $this->itemid;
+ 		DB::execute($query);
+ 	}
+ 
+ 	// checks if a vote is still allowed for an IP
+ 	function isVoteAllowed($ip) {
+ 		$query = 'SELECT * FROM '.sql_table('karma')." WHERE itemid={$this->itemid} and ip=". DB::quoteValue($ip);
+ 		$res = DB::getResult($query);
+ 		return ($res->rowCount() == 0);
+ 	}
+ 
+ 	// save IP in database so no multiple votes are possible
+ 	function saveIP() {
+ 		$query = 'INSERT INTO ' . sql_table('karma') .' (itemid, ip) VALUES (' . $this->itemid . ','. DB::quoteValue(serverVar('REMOTE_ADDR')) .')';
+ 		DB::execute($query);
+ 	}
+ }
+ 
 -?>
++?>
++>>>>>>> skinnable-master
diff --combined nucleus/libs/MANAGER.php
index 737899a,fa45dfa..d41bd3d
--- a/nucleus/libs/MANAGER.php
+++ b/nucleus/libs/MANAGER.php
@@@ -1,785 -1,787 +1,1575 @@@
++<<<<<<< HEAD
 +<?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)
 + */
 +/**
 + * This class makes sure each item/weblog/comment object gets requested from
 + * the database only once, by keeping them in a cache. The class also acts as
 + * a dynamic classloader, loading classes _only_ when they are first needed,
 + * hoping to diminish execution time
 + *
 + * The class is a singleton, meaning that there will be only one object of it
 + * active at all times. The object can be requested using Manager::instance()
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2009 The Nucleus Group
 + * @version $Id: MANAGER.php 1731 2012-04-08 15:10:35Z sakamocchi $
 + */
 +class Manager
 +{
 +	/**
 +	 * Cached ITEM, BLOG, PLUGIN, KARMA and MEMBER objects. When these objects are requested
 +	 * through the global $manager object (getItem, getBlog, ...), only the first call
 +	 * will create an object. Subsequent calls will return the same object.
 +	 *
 +	 * The $items, $blogs, ... arrays map an id to an object (for plugins, the name is used
 +	 * rather than an ID)
 +	 */
 +	private $items;
 +	private $blogs;
 +	private $plugins;
 +	private $karma;
 +	private $templates;
 +	private $members;
 +	
 +	/**
 +	 * cachedInfo to avoid repeated SQL queries (see pidInstalled/pluginInstalled/getPidFromName)
 +	 * e.g. which plugins exists?
 +	 *
 +	 * $cachedInfo['installedPlugins'] = array($pid -> $name)
 +	 */
 +	private $cachedInfo;
 +	
 +	/**
 +	 * The plugin subscriptionlist
 +	 *
 +	 * The subcription array has the following structure
 +	 *		$subscriptions[$EventName] = array containing names of plugin classes to be
 +	 *									 notified when that event happens
 +	 * 
 +	 * NOTE: this is referred by Comments::addComment() for spamcheck API
 +	 * TODO: we should add new methods to get this
 +	 */
 +	public $subscriptions;
 +	
 +	/**
 +	 * Ticket functions. These are uses by the admin area to make it impossible to simulate certain GET/POST
 +	 * requests. tickets are user specific
 +	 */
 +	private $currentRequestTicket = '';
 +	
 +	/**
 +	 * Returns the only instance of this class. Creates the instance if it
 +	 * does not yet exists. Users should use this function as
 +	 * $manager =& Manager::instance(); to get a reference to the object
 +	 * instead of a copy
 +	 */
 +	public function &instance()
 +	{
 +		static $instance = array();
 +		if ( empty($instance) )
 +		{
 +			$instance[0] = new Manager();
 +		}
 +		return $instance[0];
 +	}
 +	
 +	/**
 +	 * The constructor of this class initializes the object caches
 +	 */
 +	public function __construct()
 +	{
 +		$this->items = array();
 +		$this->blogs = array();
 +		$this->plugins = array();
 +		$this->karma = array();
 +		$this->parserPrefs = array();
 +		$this->cachedInfo = array();
 +		return;
 +	}
 +	
 +	/**
 +	 * Returns the requested item object. If it is not in the cache, it will
 +	 * first be loaded and then placed in the cache.
 +	 * Intended use: $item =& $manager->getItem(1234)
 +	 */
 +	public function &getItem($itemid, $allowdraft, $allowfuture)
 +	{
 +		$item =& $this->items[$itemid];
 +		
 +		// check the draft and future rules if the item was already cached
 +		if ( $item )
 +		{
 +			if ( (!$allowdraft) && ($item['draft']) )
 +			{
 +				return 0;
 +			}
 +			
 +			$blog =& $this->getBlog(getBlogIDFromItemID($itemid));
 +			
 +			if ( (!$allowfuture) && ($item['timestamp'] > $blog->getCorrectTime()) )
 +			{
 +				return 0;
 +			}
 +		}
 +		
 +		if ( !$item )
 +		{
 +			// load class if needed
 +			$this->loadClass('ITEM');
 +			// load item object
 +			$item = Item::getitem($itemid, $allowdraft, $allowfuture);
 +			$this->items[$itemid] = $item;
 +		}
 +		return $item;
 +	}
 +	
 +	/**
 +	 * Loads a class if it has not yet been loaded
 +	 */
 +	public function loadClass($name)
 +	{
 +		$this->_loadClass($name, $name . '.php');
 +		return;
 +	}
 +	
 +	/**
 +	 * Checks if an item exists
 +	 */
 +	public function existsItem($id,$future,$draft)
 +	{
 +		$this->_loadClass('ITEM','ITEM.php');
 +		return Item::exists($id,$future,$draft);
 +	}
 +	
 +	/**
 +	 * Checks if a category exists
 +	 */
 +	public function existsCategory($id)
 +	{
 +		return (DB::getValue('SELECT COUNT(*) as result FROM '.sql_table('category').' WHERE catid='.intval($id)) > 0);
 +	}
 +	
 +	/**
 +	 * Returns the blog object for a given blogid
 +	 */
 +	public function &getBlog($blogid)
 +	{
 +		$blog =& $this->blogs[$blogid];
 +		
 +		if ( !$blog )
 +		{
 +			// load class if needed
 +			$this->_loadClass('BLOG','BLOG.php');
 +			// load blog object
 +			$blog = new Blog($blogid);
 +			$this->blogs[$blogid] =& $blog;
 +		}
 +		return $blog;
 +	}
 +	
 +	/**
 +	 * Checks if a blog exists
 +	 */
 +	public function existsBlog($name)
 +	{
 +		$this->_loadClass('BLOG','BLOG.php');
 +		return Blog::exists($name);
 +	}
 +	
 +	/**
 +	 * Checks if a blog id exists
 +	 */
 +	public function existsBlogID($id)
 +	{
 +		$this->_loadClass('BLOG','BLOG.php');
 +		return Blog::existsID($id);
 +	}
 +	
 +	/**
 +	 * Returns a previously read template
 +	 */
 +	public function &getTemplate($templateName)
 +	{
 +		$template =& $this->templates[$templateName];
 +		
 +		if ( !$template )
 +		{
 +			$template = Template::read($templateName);
 +			$this->templates[$templateName] =& $template;
 +		}
 +		return $template;
 +	}
 +	
 +	/**
 +	 * Returns a KARMA object (karma votes)
 +	 */
 +	public function &getKarma($itemid)
 +	{
 +		$karma =& $this->karma[$itemid];
 +		
 +		if ( !$karma )
 +		{
 +			// load class if needed
 +			$this->_loadClass('KARMA','KARMA.php');
 +			// create KARMA object
 +			$karma = new Karma($itemid);
 +			$this->karma[$itemid] =& $karma;
 +		}
 +		return $karma;
 +	}
 +	
 +	/**
 +	 * Returns a MEMBER object
 +	 */
 +	public function &getMember($memberid)
 +	{
 +		$mem =& $this->members[$memberid];
 +		
 +		if ( !$mem )
 +		{
 +			// load class if needed
 +			$this->_loadClass('MEMBER','MEMBER.php');
 +			// create MEMBER object
 +			$mem =& Member::createFromID($memberid);
 +			$this->members[$memberid] =& $mem;
 +		}
 +		return $mem;
 +	}
 +	
 +	/**
 +	 * Set the global parser preferences
 +	 */
 +	public function setParserProperty($name, $value)
 +	{
 +		$this->parserPrefs[$name] = $value;
 +		return;
 +	}
 +	
 +	/**
 +	 * Get the global parser preferences
 +	 */
 +	public function getParserProperty($name)
 +	{
 +		return $this->parserPrefs[$name];
 +	}
 +	
 +	/**
 +	 * A helper function to load a class
 +	 * 
 +	 *	private
 +	 */
 +	private function _loadClass($name, $filename)
 +	{
 +		if ( !class_exists($name) )
 +		{
 +				global $DIR_LIBS;
 +				include($DIR_LIBS . $filename);
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * Manager::_loadPlugin()
 +	 * loading a certain plugin
 +	 * 
 +	 * @param	string $name plugin name
 +	 * @return	void
 +	 */
 +	private function _loadPlugin($name)
 +	{
 +		global $DIR_PLUGINS, $MYSQL_HANDLER, $MYSQL_PREFIX;
 +		
 +		if ( class_exists($name) )
 +		{
 +			return;
 +		}
 +		
 +		$fileName = "{$DIR_PLUGINS}{$name}.php";
 +		
 +		if ( !file_exists($fileName) )
 +		{
 +			if ( !defined('_MANAGER_PLUGINFILE_NOTFOUND') )
 +			{
 +				define('_MANAGER_PLUGINFILE_NOTFOUND', 'Plugin %s was not loaded (File not found)');
 +			}
 +			ActionLog::add(WARNING, sprintf(_MANAGER_PLUGINFILE_NOTFOUND, $name)); 
 +			return 0;
 +		}
 +		
 +		// load plugin
 +		include($fileName);
 +		
 +		// check if class exists (avoid errors in eval'd code)
 +		if ( !class_exists($name) )
 +		{
 +			ActionLog::add(WARNING, sprintf(_MANAGER_PLUGINFILE_NOCLASS, $name));
 +			return 0;
 +		}
 +		
 +		// add to plugin array
 +		$this->plugins[$name] = new $name();
 +		
 +		// get plugid
 +		$this->plugins[$name]->setID($this->getPidFromName($name));
 +		
 +		// unload plugin if a prefix is used and the plugin cannot handle this
 +		if ( ($MYSQL_PREFIX != '')
 +		  && !$this->plugins[$name]->supportsFeature('SqlTablePrefix') )
 +		{
 +			unset($this->plugins[$name]);
 +			ActionLog::add(WARNING, sprintf(_MANAGER_PLUGINTABLEPREFIX_NOTSUPPORT, $name));
 +			return 0;
 +		}
 +		
 +		// unload plugin if using non-mysql handler and plugin does not support it 
 +		if ( (!in_array('mysql',$MYSQL_HANDLER))
 +		  && !$this->plugins[$name]->supportsFeature('SqlApi') )
 +		{
 +			unset($this->plugins[$name]);
 +			ActionLog::add(WARNING, sprintf(_MANAGER_PLUGINSQLAPI_NOTSUPPORT, $name));
 +			return 0;
 +		}
 +		
 +		// call init method
 +		$this->plugins[$name]->init();
 +		
 +		return;
 +	}
 +
 +	/**
 +	 * Manager:getPlugin()
 +	 * Returns a PLUGIN object
 +	 * 
 +	 * @param	string	$name	name of plugin
 +	 * @return	object	plugin object
 +	 */
 +	public function &getPlugin($name)
 +	{
 +		// retrieve the name of the plugin in the right capitalisation
 +		$name = $this->getUpperCaseName ($name);
 +		
 +		// get the plugin	
 +		$plugin =& $this->plugins[$name]; 
 +		
 +		if ( !$plugin )
 +		{
 +			// load class if needed
 +			$this->_loadPlugin($name);
 +			$plugin =& $this->plugins[$name];
 +		}
 +		return $plugin;
 +	}
 +	
 +	/**
 +	 * Manager::pluginLoaded()
 +	 * Checks if the given plugin IS loaded or not
 +	 * 
 +	 * @param	string	$name	name of plugin
 +	 * @return	object	plugin object
 +	 */
 +	public function &pluginLoaded($name)
 +	{
 +		$plugin =& $this->plugins[$name];
 +		return $plugin;
 +	}
 +	
 +	/**
 +	 * Manager::pidLoaded()
 +	 * 
 +	 * @param	integer	$pid	id for plugin
 +	 * @return	object	plugin object
 +	 */
 +	public function &pidLoaded($pid)
 +	{
 +		$plugin=false;
 +		reset($this->plugins);
 +		while ( list($name) = each($this->plugins) )
 +		{
 +			if ( $pid!=$this->plugins[$name]->getId() )
 +			{
 +				continue;
 +			}
 +			$plugin= & $this->plugins[$name];
 +			break;
 +		}
 +		return $plugin;
 +	}
 +	
 +	/**
 +	 * Manager::pluginInstalled()
 +	 * checks if the given plugin IS installed or not
 +	 * 
 +	 * @param	string	$name	name of plugin
 +	 * @return	boolean	exists or not
 +	 */
 +	public function pluginInstalled($name)
 +	{
 +		$this->_initCacheInfo('installedPlugins');
 +		return ($this->getPidFromName($name) != -1);
 +	}
 +
 +	/**
 +	 * Manager::pidInstalled()
 +	 * checks if the given plugin IS installed or not
 +	 * 
 +	 * @param	integer	$pid	id of plugin
 +	 * @return	boolean	exists or not
 +	 */
 +	public function pidInstalled($pid)
 +	{
 +		$this->_initCacheInfo('installedPlugins');
 +		return ($this->cachedInfo['installedPlugins'][$pid] != '');
 +	}
 +	
 +	/**
 +	 * Manager::getPidFromName()
 +	 * 
 +	 * @param	string	$name	name of plugin
 +	 * @return	mixed	id for plugin or -1 if not exists
 +	 */
 +	public function getPidFromName($name)
 +	{
 +		$this->_initCacheInfo('installedPlugins');
 +		foreach ( $this->cachedInfo['installedPlugins'] as $pid => $pfile )
 +		{
 +			if (strtolower($pfile) == strtolower($name))
 +			{
 +				return $pid;
 +			}
 +		}
 +		return -1;
 +	}
 +	
 +	/**
 +	 * Manager::getPluginNameFromPid()
 +	 * 
 +	 * @param	string	$pid	ID for plugin
 +	 * @return	string	name of plugin
 +	 */
 +	public function getPluginNameFromPid($pid)
 +	{
 +		if ( !array_key_exists($pid, $this->cachedInfo['installedPlugins']) )
 +		{
 +			$query = 'SELECT pfile FROM %s WHERE pid=%d;';
 +			$query = sprintf($query, sql_table('plugin'), (integer) $pid);
 +			return DB::getValue($query);
 +		}
 +		return $this->cachedInfo['installedPlugins'][$pid];
 +	}
 +	
 +	/**
 +	 * Manager::getUpperCaseName()
 +	 * Retrieve the name of a plugin in the right capitalisation
 +	 * 
 +	 * @param	string	$name	name of plugin
 +	 * @return	string	name according to UpperCamelCase
 +	 */
 +	public function getUpperCaseName ($name)
 +	{
 +		$this->_initCacheInfo('installedPlugins');
 +		foreach ( $this->cachedInfo['installedPlugins'] as $pid => $pfile )
 +		{
 +			if ( strtolower($pfile) == strtolower($name) )
 +			{
 +				return $pfile;
 +			}
 +		}
 +		return -1;
 +	}
 +	
 +	/**
 +	 * Manager::clearCachedInfo()
 +	 * 
 +	 * @param	string	$what
 +	 * @return	void
 +	 */
 +	public function clearCachedInfo($what)
 +	{
 +		unset($this->cachedInfo[$what]);
 +		return;
 +	}
 +	
 +	/**
 +	 * Manager::_initCacheInfo()
 +	 * Loads some info on the first call only
 +	 * 
 +	 * @param	string	$what	'installedPlugins'
 +	 * @return	void
 +	 */
 +	private function _initCacheInfo($what)
 +	{
 +		if ( array_key_exists($what, $this->cachedInfo)
 +		  && is_array($this->cachedInfo[$what]) )
 +		{
 +			return;
 +		}
 +		
 +		switch ($what)
 +		{
 +			// 'installedPlugins' = array ($pid => $name)
 +			case 'installedPlugins':
 +				$this->cachedInfo['installedPlugins'] = array();
 +				$res = DB::getResult('SELECT pid, pfile FROM ' . sql_table('plugin'));
 +				foreach ( $res as $row )
 +				{
 +					$this->cachedInfo['installedPlugins'][$row['pid']] = $row['pfile'];
 +				}
 +				break;
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * Manager::notify()
 +	 * A function to notify plugins that something has happened. Only the plugins
 +	 * that are subscribed to the event will get notified.
 +	 * Upon the first call, the list of subscriptions will be fetched from the
 +	 * database. The plugins itsself will only get loaded when they are first needed
 +	 *
 +	 * @param	string	$eventName	Name of the event (method to be called on plugins)
 +	 * @param	string	$data		Can contain any type of data,
 +	 * 								depending on the event type. Usually this is an itemid, blogid, ...
 +	 * 								but it can also be an array containing multiple values
 +	 * @return	void
 +	 */
 +	public function notify($eventName, $data)
 +	{
 +		// load subscription list if needed
 +		if ( !is_array($this->subscriptions) )
 +		{
 +			$this->_loadSubscriptions();
 +		}
 +		
 +		// get listening objects
 +		$listeners = false;
 +		if ( array_key_exists($eventName, $this->subscriptions)
 +		  && !empty($this->subscriptions[$eventName]) )
 +		{
 +			$listeners = $this->subscriptions[$eventName];
 +		}
 +		
 +		// notify all of them
 +		if ( is_array($listeners) )
 +		{
 +			foreach( $listeners as $listener )
 +			{
 +				// load class if needed
 +				$this->_loadPlugin($listener);
 +				
 +				// do notify (if method exists)
 +				if ( array_key_exists($listener, $this->plugins)
 +				  && !empty($this->plugins[$listener])
 +				  && method_exists($this->plugins[$listener], 'event_' . $eventName) )
 +				{
 +					call_user_func(array(&$this->plugins[$listener],'event_' . $eventName), $data);
 +				}
 +			}
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * Manager::_loadSubscriptions()
 +	 * Loads plugin subscriptions
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	private function _loadSubscriptions()
 +	{
 +		// initialize as array
 +		$this->subscriptions = array();
 +		
 +		$query = "SELECT p.pfile as pfile, e.event as event"
 +		       . " FROM %s as e, %s as p"
 +		       . " WHERE e.pid=p.pid ORDER BY p.porder ASC";
 +		$query = sprintf($query, sql_table('plugin_event'), sql_table('plugin'));
 +		$res = DB::getResult($query);
 +		
 +		foreach ( $res as $row )
 +		{
 +			$pluginName = $row['pfile'];
 +			$eventName = $row['event'];
 +			$this->subscriptions[$eventName][] = $pluginName;
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * Manager::getNumberOfSubscribers()
 +	 * 
 +	 * @param	string	$event	name of events
 +	 * @return	integer	number of event subscriber
 +	 */
 +	public function getNumberOfSubscribers($event)
 +	{
 +		$query = 'SELECT COUNT(*) as count FROM %s WHERE event=%s;';
 +		$query = sprintf($query, sql_table('plugin_event'), DB::quoteValue($event));
 +		return (integer) DB::getValue($query);
 +	}
 +	
 +	/**
 +	 * Manager::addTicketToUrl()
 +	 * GET requests: Adds ticket to URL (URL should NOT be html-encoded!, ticket is added at the end)
 +	 * 
 +	 * @param	string	url	string for URI
 +	 * @return	void
 +	 */
 +	public function addTicketToUrl($url)
 +	{
 +		$ticketCode = 'ticket=' . $this->_generateTicket();
 +		if ( i18n::strpos($url, '?') === FALSE )
 +		{
 +			$ticketCode = "{$url}?{$ticketCode}";
 +		}
 +		else
 +		{
 +			$ticketCode = "{$url}&{$ticketCode}";
 +		}
 +		return $ticketCode;
 +	}
 +	
 +	/**
 +	 * Manager::addTicketHidden()
 +	 * POST requests: Adds ticket as hidden formvar
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	public function addTicketHidden()
 +	{
 +		$ticket = $this->_generateTicket();
 +		echo '<input type="hidden" name="ticket" value="', Entity::hsc($ticket), '" />';
 +		return;
 +	}
 +	
 +	/**
 +	 * Manager::getNewTicket()
 +	 * Get a new ticket
 +	 * (xmlHTTPRequest AutoSaveDraft uses this to refresh the ticket)
 +	 * 
 +	 * @param	void
 +	 * @return	string	string of ticket
 +	 */
 +	public function getNewTicket()
 +	{
 +		$this->currentRequestTicket = '';
 +		return $this->_generateTicket();
 +	}
 +	
 +	/**
 +	 * Manager::checkTicket()
 +	 * Checks the ticket that was passed along with the current request
 +	 * 
 +	 * @param	void
 +	 * @return	boolean	correct or not
 +	 */
 +	public function checkTicket()
 +	{
 +		global $member;
 +		
 +		// get ticket from request
 +		$ticket = requestVar('ticket');
 +		
 +		// no ticket -> don't allow
 +		if ( $ticket == '' )
 +		{
 +			return FALSE;
 +		}
 +		
 +		// remove expired tickets first
 +		$this->_cleanUpExpiredTickets();
 +		
 +		// get member id
 +		if (!$member->isLoggedIn())
 +		{
 +			$memberId = -1;
 +		}
 +		else
 +		{
 +			$memberId = $member->getID();
 +		}
 +		
 +		// check if ticket is a valid one
 +		$query = sprintf('SELECT COUNT(*) as result FROM %s WHERE member=%d and ticket=%s',
 +			sql_table('tickets'),
 +			intval($memberId),
 +			DB::quoteValue($ticket)
 +		);
 +		
 +		/*
 +		 * NOTE:
 +		 * [in the original implementation, the checked ticket was deleted. This would lead to invalid
 +		 * tickets when using the browsers back button and clicking another link/form
 +		 * leaving the keys in the database is not a real problem, since they're member-specific and
 +		 * only valid for a period of one hour]
 +		 */
 +		if ( DB::getValue($query) != 1 )
 +		{
 +			return FALSE;
 +		}
 +		
 +		return TRUE;
 +	}
 +
 +	/**
 +	 * Manager::_cleanUpExpiredTickets()
 +	 * Removes the expired tickets
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	private function _cleanUpExpiredTickets()
 +	{
 +		// remove tickets older than 1 hour
 +		$oldTime = time() - 60 * 60;
 +		$query = 'DELETE FROM %s WHERE ctime < %s';
 +		$query = sprintf($query, sql_table('tickets'), DB::formatDateTime($oldTime));
 +		DB::execute($query);
 +		return;
 +	}
 +	
 +	/**
 +	 * Manager::_generateTicket()
 +	 * Generates/returns a ticket (one ticket per page request)
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	private function _generateTicket()
 +	{
 +		if ( $this->currentRequestTicket == '' )
 +		{
 +			// generate new ticket (only one ticket will be generated per page request)
 +			// and store in database
 +			global $member;
 +			// get member id
 +			if ( !$member->isLoggedIn() )
 +			{
 +				$memberId = -1;
 +			}
 +			else
 +			{
 +				$memberId = $member->getID();
 +			}
 +			
 +			$ok = false;
 +			while ( !$ok )
 +			{
 +				// generate a random token
 +				srand((double)microtime()*1000000);
 +				$ticket = md5(uniqid(rand(), true));
 +				
 +				// add in database as non-active
 +				$query = 'INSERT INTO %s (ticket, member, ctime) VALUES (%s, %d, %s)';
 +				$query = sprintf($query, sql_table('tickets'), DB::quoteValue($ticket), (integer) $memberId, DB::formatDateTime());
 +				
 +				if ( DB::execute($query) !== FALSE )
 +				{
 +					$ok = true;
 +				}
 +			}
 +			$this->currentRequestTicket = $ticket;
 +		}
 +		return $this->currentRequestTicket;
 +	}
 +}
 +
++=======
+ <?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)
+  */
+ /**
+  * This class makes sure each item/weblog/comment object gets requested from
+  * the database only once, by keeping them in a cache. The class also acts as
+  * a dynamic classloader, loading classes _only_ when they are first needed,
+  * hoping to diminish execution time
+  *
+  * The class is a singleton, meaning that there will be only one object of it
+  * active at all times. The object can be requested using Manager::instance()
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: MANAGER.php 1878 2012-06-17 07:42:07Z sakamocchi $
+  */
+ class Manager
+ {
+ 	/**
+ 	 * Cached ITEM, BLOG, PLUGIN, KARMA and MEMBER objects. When these objects are requested
+ 	 * through the global $manager object (getItem, getBlog, ...), only the first call
+ 	 * will create an object. Subsequent calls will return the same object.
+ 	 *
+ 	 * The $items, $blogs, ... arrays map an id to an object (for plugins, the name is used
+ 	 * rather than an ID)
+ 	 */
+ 	private $items;
+ 	private $blogs;
+ 	private $plugins;
+ 	private $karma;
+ 	private $templates;
+ 	private $members;
+ 	private $skins;
+ 	
+ 	/**
+ 	 * cachedInfo to avoid repeated SQL queries (see pidInstalled/pluginInstalled/getPidFromName)
+ 	 * e.g. which plugins exists?
+ 	 *
+ 	 * $cachedInfo['installedPlugins'] = array($pid -> $name)
+ 	 */
+ 	private $cachedInfo;
+ 	
+ 	/**
+ 	 * The plugin subscriptionlist
+ 	 *
+ 	 * The subcription array has the following structure
+ 	 *		$subscriptions[$EventName] = array containing names of plugin classes to be
+ 	 *									 notified when that event happens
+ 	 * 
+ 	 * NOTE: this is referred by Comments::addComment() for spamcheck API
+ 	 * TODO: we should add new methods to get this
+ 	 */
+ 	public $subscriptions;
+ 	
+ 	/**
+ 	 * Ticket functions. These are uses by the admin area to make it impossible to simulate certain GET/POST
+ 	 * requests. tickets are user specific
+ 	 */
+ 	private $currentRequestTicket = '';
+ 	
+ 	/**
+ 	 * Returns the only instance of this class. Creates the instance if it
+ 	 * does not yet exists. Users should use this function as
+ 	 * $manager =& Manager::instance(); to get a reference to the object
+ 	 * instead of a copy
+ 	 */
+ 	static public function &instance()
+ 	{
+ 		static $instance = array();
+ 		if ( empty($instance) )
+ 		{
+ 			$instance[0] = new Manager();
+ 		}
+ 		return $instance[0];
+ 	}
+ 	
+ 	/**
+ 	 * The constructor of this class initializes the object caches
+ 	 */
+ 	public function __construct()
+ 	{
+ 		$this->items = array();
+ 		$this->blogs = array();
+ 		$this->plugins = array();
+ 		$this->karma = array();
+ 		$this->templates = array();
+ 		$this->skins = array();
+ 		$this->parserPrefs = array();
+ 		$this->cachedInfo = array();
+ 		$this->members = array();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Returns the requested item object. If it is not in the cache, it will
+ 	 * first be loaded and then placed in the cache.
+ 	 * Intended use: $item =& $manager->getItem(1234, 0, 0)
+ 	 */
+ 	public function &getItem($itemid, $allowdraft, $allowfuture)
+ 	{
+ 		/* confirm to cached */
+ 		if ( !array_key_exists($itemid, $this->items) )
+ 		{
+ 			$this->loadClass('ITEM');
+ 			$item = Item::getitem($itemid, $allowdraft, $allowfuture);
+ 			$this->items[$itemid] = $item;
+ 		}
+ 		
+ 		$item =& $this->items[$itemid];
+ 		if ( !$allowdraft && ($item['draft']) )
+ 		{
+ 			return 0;
+ 		}
+ 		
+ 		$blog =& $this->getBlog($item['blogid']);
+ 		if ( !$allowfuture && ($item['timestamp'] > $blog->getCorrectTime()) )
+ 		{
+ 			return 0;
+ 		}
+ 		
+ 		return $item;
+ 	}
+ 	
+ 	/**
+ 	 * Loads a class if it has not yet been loaded
+ 	 */
+ 	public function loadClass($name)
+ 	{
+ 		$this->_loadClass($name, $name . '.php');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Checks if an item exists
+ 	 */
+ 	public function existsItem($id,$future,$draft)
+ 	{
+ 		$this->_loadClass('ITEM','ITEM.php');
+ 		return Item::exists($id,$future,$draft);
+ 	}
+ 	
+ 	/**
+ 	 * Checks if a category exists
+ 	 */
+ 	public function existsCategory($id)
+ 	{
+ 		return (DB::getValue('SELECT COUNT(*) as result FROM '.sql_table('category').' WHERE catid='.intval($id)) > 0);
+ 	}
+ 	
+ 	/**
+ 	 * Returns the blog object for a given blogid
+ 	 */
+ 	public function &getBlog($blogid)
+ 	{
+ 		if ( !array_key_exists($blogid, $this->blogs) )
+ 		{
+ 			$this->_loadClass('BLOG','BLOG.php');
+ 			$this->blogs[$blogid] = new Blog($blogid);
+ 		}
+ 		return $this->blogs[$blogid];
+ 	}
+ 	
+ 	/**
+ 	 * Checks if a blog exists
+ 	 */
+ 	public function existsBlog($name)
+ 	{
+ 		$this->_loadClass('BLOG','BLOG.php');
+ 		return Blog::exists($name);
+ 	}
+ 	
+ 	/**
+ 	 * Checks if a blog id exists
+ 	 */
+ 	public function existsBlogID($id)
+ 	{
+ 		$this->_loadClass('BLOG','BLOG.php');
+ 		return Blog::existsID($id);
+ 	}
+ 	
+ 	/**
+ 	 * Returns a previously read template
+ 	 */
+ 	public function &getTemplate($templateName)
+ 	{
+ 		if ( !array_key_exists($templateName, $this->templates) )
+ 		{
+ 			$this->_loadClass('Template','TEMPLATE.php');
+ 			$tmplate_tmp = Template::read($templateName);
+ 			$this->templates[$templateName] =& $tmplate_tmp;
+ 		}
+ 		return $this->templates[$templateName];
+ 	}
+ 	
+ 	/**
+ 	 * Returns a KARMA object (karma votes)
+ 	 */
+ 	public function &getKarma($itemid)
+ 	{
+ 		if ( !array_key_exists($itemid, $this->karma) )
+ 		{
+ 			$this->_loadClass('Karma','KARMA.php');
+ 			$this->karma[$itemid] = new Karma($itemid);
+ 		}
+ 		return $this->karma[$itemid];
+ 	}
+ 	
+ 	/**
+ 	 * Returns a MEMBER object
+ 	 */
+ 	public function &getMember($memberid)
+ 	{
+ 		if ( !array_key_exists($memberid, $this->members) )
+ 		{
+ 			$this->_loadClass('Member','MEMBER.php');
+ 			$this->members[$memberid] =& Member::createFromID($memberid);;
+ 		}
+ 		return $this->members[$memberid];
+ 	}
+ 	
+ 	/**
+ 	 * Manager::getSkin()
+ 	 * 
+ 	 * @param	integer	$skinid				ID for skin
+ 	 * @param	string	$action_class		action class for handling skin variables
+ 	 * @param	string	$event_identifier	identifier for event name
+ 	 * @return	object	instance of Skin class
+ 	 */
+ 	public function &getSkin($skinid, $action_class='Actions', $event_identifier='Skin')
+ 	{
+ 		if ( !array_key_exists($skinid, $this->skins) )
+ 		{
+ 			$this->_loadClass('Skin', 'SKIN.php');
+ 			$this->skins[$skinid] = new Skin($skinid, $action_class, $event_identifier);
+ 		}
+ 		
+ 		return $this->skins[$skinid];
+ 	}
+ 	
+ 	/**
+ 	 * Set the global parser preferences
+ 	 */
+ 	public function setParserProperty($name, $value)
+ 	{
+ 		$this->parserPrefs[$name] = $value;
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Get the global parser preferences
+ 	 */
+ 	public function getParserProperty($name)
+ 	{
+ 		return $this->parserPrefs[$name];
+ 	}
+ 	
+ 	/**
+ 	 * A helper function to load a class
+ 	 * 
+ 	 *	private
+ 	 */
+ 	private function _loadClass($name, $filename)
+ 	{
+ 		global $DIR_LIBS;
+ 		
+ 		if ( !class_exists($name) )
+ 		{
+ 			include($DIR_LIBS . $filename);
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Manager::_loadPlugin()
+ 	 * loading a certain plugin
+ 	 * 
+ 	 * @param	string $name plugin name
+ 	 * @return	void
+ 	 */
+ 	private function _loadPlugin($name)
+ 	{
+ 		global $DIR_PLUGINS, $MYSQL_HANDLER, $MYSQL_PREFIX;
+ 		
+ 		if ( class_exists($name) )
+ 		{
+ 			return;
+ 		}
+ 		
+ 		$fileName = "{$DIR_PLUGINS}{$name}.php";
+ 		
+ 		if ( !file_exists($fileName) )
+ 		{
+ 			if ( !defined('_MANAGER_PLUGINFILE_NOTFOUND') )
+ 			{
+ 				define('_MANAGER_PLUGINFILE_NOTFOUND', 'Plugin %s was not loaded (File not found)');
+ 			}
+ 			ActionLog::add(WARNING, sprintf(_MANAGER_PLUGINFILE_NOTFOUND, $name)); 
+ 			return 0;
+ 		}
+ 		
+ 		// load plugin
+ 		include($fileName);
+ 		
+ 		// check if class exists (avoid errors in eval'd code)
+ 		if ( !class_exists($name) )
+ 		{
+ 			ActionLog::add(WARNING, sprintf(_MANAGER_PLUGINFILE_NOCLASS, $name));
+ 			return 0;
+ 		}
+ 		
+ 		// add to plugin array
+ 		$this->plugins[$name] = new $name();
+ 		
+ 		// get plugid
+ 		$this->plugins[$name]->setID($this->getPidFromName($name));
+ 		
+ 		// unload plugin if a prefix is used and the plugin cannot handle this
+ 		if ( ($MYSQL_PREFIX != '')
+ 		  && !$this->plugins[$name]->supportsFeature('SqlTablePrefix') )
+ 		{
+ 			unset($this->plugins[$name]);
+ 			ActionLog::add(WARNING, sprintf(_MANAGER_PLUGINTABLEPREFIX_NOTSUPPORT, $name));
+ 			return 0;
+ 		}
+ 		
+ 		// unload plugin if using non-mysql handler and plugin does not support it 
+ 		if ( (!in_array('mysql',$MYSQL_HANDLER))
+ 		  && !$this->plugins[$name]->supportsFeature('SqlApi') )
+ 		{
+ 			unset($this->plugins[$name]);
+ 			ActionLog::add(WARNING, sprintf(_MANAGER_PLUGINSQLAPI_NOTSUPPORT, $name));
+ 			return 0;
+ 		}
+ 		
+ 		// call init method
+ 		$this->plugins[$name]->init();
+ 		
+ 		return;
+ 	}
+ 
+ 	/**
+ 	 * Manager:getPlugin()
+ 	 * Returns a PLUGIN object
+ 	 * 
+ 	 * @param	string	$name	name of plugin
+ 	 * @return	object	plugin object
+ 	 */
+ 	public function &getPlugin($name)
+ 	{
+ 		// retrieve the name of the plugin in the right capitalisation
+ 		$name = $this->getUpperCaseName ($name);
+ 		
+ 		// get the plugin	
+ 		$plugin =& $this->plugins[$name]; 
+ 		
+ 		if ( !$plugin )
+ 		{
+ 			// load class if needed
+ 			$this->_loadPlugin($name);
+ 			$plugin =& $this->plugins[$name];
+ 		}
+ 		return $plugin;
+ 	}
+ 	
+ 	/**
+ 	 * Manager::pluginLoaded()
+ 	 * Checks if the given plugin IS loaded or not
+ 	 * 
+ 	 * @param	string	$name	name of plugin
+ 	 * @return	object	plugin object
+ 	 */
+ 	public function &pluginLoaded($name)
+ 	{
+ 		$plugin =& $this->plugins[$name];
+ 		return $plugin;
+ 	}
+ 	
+ 	/**
+ 	 * Manager::pidLoaded()
+ 	 * 
+ 	 * @param	integer	$pid	id for plugin
+ 	 * @return	object	plugin object
+ 	 */
+ 	public function &pidLoaded($pid)
+ 	{
+ 		$plugin=false;
+ 		reset($this->plugins);
+ 		while ( list($name) = each($this->plugins) )
+ 		{
+ 			if ( $pid!=$this->plugins[$name]->getId() )
+ 			{
+ 				continue;
+ 			}
+ 			$plugin= & $this->plugins[$name];
+ 			break;
+ 		}
+ 		return $plugin;
+ 	}
+ 	
+ 	/**
+ 	 * Manager::pluginInstalled()
+ 	 * checks if the given plugin IS installed or not
+ 	 * 
+ 	 * @param	string	$name	name of plugin
+ 	 * @return	boolean	exists or not
+ 	 */
+ 	public function pluginInstalled($name)
+ 	{
+ 		$this->_initCacheInfo('installedPlugins');
+ 		return ($this->getPidFromName($name) != -1);
+ 	}
+ 
+ 	/**
+ 	 * Manager::pidInstalled()
+ 	 * checks if the given plugin IS installed or not
+ 	 * 
+ 	 * @param	integer	$pid	id of plugin
+ 	 * @return	boolean	exists or not
+ 	 */
+ 	public function pidInstalled($pid)
+ 	{
+ 		$this->_initCacheInfo('installedPlugins');
+ 		return ($this->cachedInfo['installedPlugins'][$pid] != '');
+ 	}
+ 	
+ 	/**
+ 	 * Manager::getPidFromName()
+ 	 * 
+ 	 * @param	string	$name	name of plugin
+ 	 * @return	mixed	id for plugin or -1 if not exists
+ 	 */
+ 	public function getPidFromName($name)
+ 	{
+ 		$this->_initCacheInfo('installedPlugins');
+ 		foreach ( $this->cachedInfo['installedPlugins'] as $pid => $pfile )
+ 		{
+ 			if (strtolower($pfile) == strtolower($name))
+ 			{
+ 				return $pid;
+ 			}
+ 		}
+ 		return -1;
+ 	}
+ 	
+ 	/**
+ 	 * Manager::getPluginNameFromPid()
+ 	 * 
+ 	 * @param	string	$pid	ID for plugin
+ 	 * @return	string	name of plugin
+ 	 */
+ 	public function getPluginNameFromPid($pid)
+ 	{
+ 		if ( !array_key_exists($pid, $this->cachedInfo['installedPlugins']) )
+ 		{
+ 			$query = 'SELECT pfile FROM %s WHERE pid=%d;';
+ 			$query = sprintf($query, sql_table('plugin'), (integer) $pid);
+ 			return DB::getValue($query);
+ 		}
+ 		return $this->cachedInfo['installedPlugins'][$pid];
+ 	}
+ 	
+ 	/**
+ 	 * Manager::getUpperCaseName()
+ 	 * Retrieve the name of a plugin in the right capitalisation
+ 	 * 
+ 	 * @param	string	$name	name of plugin
+ 	 * @return	string	name according to UpperCamelCase
+ 	 */
+ 	public function getUpperCaseName ($name)
+ 	{
+ 		$this->_initCacheInfo('installedPlugins');
+ 		foreach ( $this->cachedInfo['installedPlugins'] as $pid => $pfile )
+ 		{
+ 			if ( strtolower($pfile) == strtolower($name) )
+ 			{
+ 				return $pfile;
+ 			}
+ 		}
+ 		return -1;
+ 	}
+ 	
+ 	/**
+ 	 * Manager::clearCachedInfo()
+ 	 * 
+ 	 * @param	string	$what
+ 	 * @return	void
+ 	 */
+ 	public function clearCachedInfo($what)
+ 	{
+ 		unset($this->cachedInfo[$what]);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Manager::_initCacheInfo()
+ 	 * Loads some info on the first call only
+ 	 * 
+ 	 * @param	string	$what	'installedPlugins'
+ 	 * @return	void
+ 	 */
+ 	private function _initCacheInfo($what)
+ 	{
+ 		if ( array_key_exists($what, $this->cachedInfo)
+ 		  && is_array($this->cachedInfo[$what]) )
+ 		{
+ 			return;
+ 		}
+ 		
+ 		switch ($what)
+ 		{
+ 			// 'installedPlugins' = array ($pid => $name)
+ 			case 'installedPlugins':
+ 				$this->cachedInfo['installedPlugins'] = array();
+ 				$res = DB::getResult('SELECT pid, pfile FROM ' . sql_table('plugin'));
+ 				foreach ( $res as $row )
+ 				{
+ 					$this->cachedInfo['installedPlugins'][$row['pid']] = $row['pfile'];
+ 				}
+ 				break;
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Manager::notify()
+ 	 * A function to notify plugins that something has happened. Only the plugins
+ 	 * that are subscribed to the event will get notified.
+ 	 * Upon the first call, the list of subscriptions will be fetched from the
+ 	 * database. The plugins itsself will only get loaded when they are first needed
+ 	 *
+ 	 * @param	string	$eventName	Name of the event (method to be called on plugins)
+ 	 * @param	string	$data		Can contain any type of data,
+ 	 * 								depending on the event type. Usually this is an itemid, blogid, ...
+ 	 * 								but it can also be an array containing multiple values
+ 	 * @return	void
+ 	 */
+ 	public function notify($eventName, &$data)
+ 	{
+ 		// load subscription list if needed
+ 		if ( !is_array($this->subscriptions) )
+ 		{
+ 			$this->_loadSubscriptions();
+ 		}
+ 		
+ 		// get listening objects
+ 		$listeners = false;
+ 		if ( array_key_exists($eventName, $this->subscriptions)
+ 		  && !empty($this->subscriptions[$eventName]) )
+ 		{
+ 			$listeners = $this->subscriptions[$eventName];
+ 		}
+ 		
+ 		// notify all of them
+ 		if ( is_array($listeners) )
+ 		{
+ 			foreach( $listeners as $listener )
+ 			{
+ 				// load class if needed
+ 				$this->_loadPlugin($listener);
+ 				
+ 				// do notify (if method exists)
+ 				if ( array_key_exists($listener, $this->plugins)
+ 				  && !empty($this->plugins[$listener])
+ 				  && method_exists($this->plugins[$listener], 'event_' . $eventName) )
+ 				{
+ 					call_user_func(array($this->plugins[$listener], 'event_' . $eventName), $data);
+ 				}
+ 			}
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Manager::_loadSubscriptions()
+ 	 * Loads plugin subscriptions
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	private function _loadSubscriptions()
+ 	{
+ 		// initialize as array
+ 		$this->subscriptions = array();
+ 		
+ 		$query = "SELECT p.pfile as pfile, e.event as event"
+ 		       . " FROM %s as e, %s as p"
+ 		       . " WHERE e.pid=p.pid ORDER BY p.porder ASC";
+ 		$query = sprintf($query, sql_table('plugin_event'), sql_table('plugin'));
+ 		$res = DB::getResult($query);
+ 		
+ 		foreach ( $res as $row )
+ 		{
+ 			$pluginName = $row['pfile'];
+ 			$eventName = $row['event'];
+ 			$this->subscriptions[$eventName][] = $pluginName;
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Manager::getNumberOfSubscribers()
+ 	 * 
+ 	 * @param	string	$event	name of events
+ 	 * @return	integer	number of event subscriber
+ 	 */
+ 	public function getNumberOfSubscribers($event)
+ 	{
+ 		$query = 'SELECT COUNT(*) as count FROM %s WHERE event=%s;';
+ 		$query = sprintf($query, sql_table('plugin_event'), DB::quoteValue($event));
+ 		return (integer) DB::getValue($query);
+ 	}
+ 	
+ 	/**
+ 	 * Manager::addTicketToUrl()
+ 	 * GET requests: Adds ticket to URL (URL should NOT be html-encoded!, ticket is added at the end)
+ 	 * 
+ 	 * @param	string	url	string for URI
+ 	 * @return	void
+ 	 */
+ 	public function addTicketToUrl($url)
+ 	{
+ 		$ticketCode = 'ticket=' . $this->_generateTicket();
+ 		if ( i18n::strpos($url, '?') === FALSE )
+ 		{
+ 			$ticketCode = "{$url}?{$ticketCode}";
+ 		}
+ 		else
+ 		{
+ 			$ticketCode = "{$url}&{$ticketCode}";
+ 		}
+ 		return $ticketCode;
+ 	}
+ 	
+ 	/**
+ 	 * Manager::addTicketHidden()
+ 	 * POST requests: Adds ticket as hidden formvar
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	public function addTicketHidden()
+ 	{
+ 		$ticket = $this->_generateTicket();
+ 		echo '<input type="hidden" name="ticket" value="', Entity::hsc($ticket), '" />';
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Manager::getNewTicket()
+ 	 * Get a new ticket
+ 	 * (xmlHTTPRequest AutoSaveDraft uses this to refresh the ticket)
+ 	 * 
+ 	 * @param	void
+ 	 * @return	string	string of ticket
+ 	 */
+ 	public function getNewTicket()
+ 	{
+ 		$this->currentRequestTicket = '';
+ 		return $this->_generateTicket();
+ 	}
+ 	
+ 	/**
+ 	 * Manager::checkTicket()
+ 	 * Checks the ticket that was passed along with the current request
+ 	 * 
+ 	 * @param	void
+ 	 * @return	boolean	correct or not
+ 	 */
+ 	public function checkTicket()
+ 	{
+ 		global $member;
+ 		
+ 		// get ticket from request
+ 		$ticket = requestVar('ticket');
+ 		
+ 		// no ticket -> don't allow
+ 		if ( $ticket == '' )
+ 		{
+ 			return FALSE;
+ 		}
+ 		
+ 		// remove expired tickets first
+ 		$this->_cleanUpExpiredTickets();
+ 		
+ 		// get member id
+ 		if (!$member->isLoggedIn())
+ 		{
+ 			$memberId = -1;
+ 		}
+ 		else
+ 		{
+ 			$memberId = $member->getID();
+ 		}
+ 		
+ 		// check if ticket is a valid one
+ 		$query = sprintf('SELECT COUNT(*) as result FROM %s WHERE member=%d and ticket=%s',
+ 			sql_table('tickets'),
+ 			intval($memberId),
+ 			DB::quoteValue($ticket)
+ 		);
+ 		
+ 		/*
+ 		 * NOTE:
+ 		 * [in the original implementation, the checked ticket was deleted. This would lead to invalid
+ 		 * tickets when using the browsers back button and clicking another link/form
+ 		 * leaving the keys in the database is not a real problem, since they're member-specific and
+ 		 * only valid for a period of one hour]
+ 		 */
+ 		if ( DB::getValue($query) != 1 )
+ 		{
+ 			return FALSE;
+ 		}
+ 		
+ 		return TRUE;
+ 	}
+ 
+ 	/**
+ 	 * Manager::_cleanUpExpiredTickets()
+ 	 * Removes the expired tickets
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	private function _cleanUpExpiredTickets()
+ 	{
+ 		// remove tickets older than 1 hour
+ 		$oldTime = time() - 60 * 60;
+ 		$query = 'DELETE FROM %s WHERE ctime < %s';
+ 		$query = sprintf($query, sql_table('tickets'), DB::formatDateTime($oldTime));
+ 		DB::execute($query);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Manager::_generateTicket()
+ 	 * Generates/returns a ticket (one ticket per page request)
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	private function _generateTicket()
+ 	{
+ 		if ( $this->currentRequestTicket == '' )
+ 		{
+ 			// generate new ticket (only one ticket will be generated per page request)
+ 			// and store in database
+ 			global $member;
+ 			// get member id
+ 			if ( !$member->isLoggedIn() )
+ 			{
+ 				$memberId = -1;
+ 			}
+ 			else
+ 			{
+ 				$memberId = $member->getID();
+ 			}
+ 			
+ 			$ok = false;
+ 			while ( !$ok )
+ 			{
+ 				// generate a random token
+ 				srand((double)microtime()*1000000);
+ 				$ticket = md5(uniqid(rand(), true));
+ 				
+ 				// add in database as non-active
+ 				$query = 'INSERT INTO %s (ticket, member, ctime) VALUES (%s, %d, %s)';
+ 				$query = sprintf($query, sql_table('tickets'), DB::quoteValue($ticket), (integer) $memberId, DB::formatDateTime());
+ 				
+ 				if ( DB::execute($query) !== FALSE )
+ 				{
+ 					$ok = true;
+ 				}
+ 			}
+ 			$this->currentRequestTicket = $ticket;
+ 		}
+ 		return $this->currentRequestTicket;
+ 	}
+ }
+ 
++>>>>>>> skinnable-master
diff --combined nucleus/libs/MEDIA.php
index 1c6ab00,422fd16..66f8c66
--- a/nucleus/libs/MEDIA.php
+++ b/nucleus/libs/MEDIA.php
@@@ -1,789 -1,791 +1,1583 @@@
++<<<<<<< HEAD
 +<?php
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2002-2012 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 classes for nucleus
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2012 The Nucleus Group
 + * @version $Id: MEDIA.php 1870 2012-05-22 14:57:15Z sakamocchi $
 + */
 +
 +define('PRIVATE_COLLECTION', 		'Private Collection');
 +define('READ_ONLY_MEDIA_FOLDER',	'(Read Only)');
 +
 +class Media
 +{
 +	static public $thumbdir = '.thumb';
 +	static public $algorism = 'md5';
 +	static public $image_mime = array(
 +		'image/jpeg'	=> '.jpeg',
 +		'image/png'		=> '.png',
 +		'image/gif'		=> '.gif',
 +	);
 +	
 +	/**
 +	 * Media::getCollectionList()
 +	 * Gets the list of collections available to the currently logged
 +	 * in member
 +	 * 
 +	 * @param	boolean	$exceptReadOnly
 +	 * @return array	dirname => display name
 +	 */
 +	static public function getCollectionList($exceptReadOnly = FALSE)
 +	{
 +		global $member, $DIR_MEDIA;
 +		
 +		$collections = array();
 +		
 +		// add private directory for member
 +		$collections[$member->getID()] = PRIVATE_COLLECTION;
 +		
 +		// add global collections
 +		if ( !is_dir($DIR_MEDIA) )
 +		{
 +			return $collections;
 +		}
 +		
 +		$dirhandle = opendir($DIR_MEDIA);
 +		while ( $dirname = readdir($dirhandle) )
 +		{
 +			// only add non-numeric (numeric=private) dirs
 +			if ( @is_dir($DIR_MEDIA . $dirname) &&
 +				($dirname != '.') &&
 +				($dirname != '..') &&
 +				($dirname != self::$thumbdir) &&
 +				(!is_numeric($dirname)) )
 +				{
 +				if ( @is_writable($DIR_MEDIA . $dirname) )
 +				{
 +					$collections[$dirname] = $dirname;
 +				}
 +				else if ( $exceptReadOnly == FALSE )
 +				{
 +					$collections[$dirname] = $dirname . ' ' . READ_ONLY_MEDIA_FOLDER;
 +				}
 +			}
 +		}
 +		closedir($dirhandle);
 +		
 +		return $collections;
 +	}
 +	
 +	/**
 +	 * Media::getMediaListByCollection()
 +	 * Returns an array of MediaObject objects for a certain collection
 +	 *
 +	 * @param	string	$collection	name of the collection
 +	 * @param	string	$filter		filter on filename (defaults to none)
 +	 * @return	void
 +	 */
 +	static public function getMediaListByCollection($collection, $filter = '')
 +	{
 +		global $CONF, $DIR_MEDIA;
 +		
 +		$filelist = array();
 +		
 +		// 1. go through all objects and add them to the filelist
 +		$mediadir = $DIR_MEDIA . $collection . '/';
 +		
 +		// return if dir does not exist
 +		if ( !is_dir($mediadir) )
 +		{
 +			return $filelist;
 +		}
 +		
 +		$dirhandle = opendir($mediadir);
 +		while ( $filename = readdir($dirhandle) )
 +		{
 +			// only add files that match the filter
 +			if ( !is_dir($mediadir . $filename) && self::checkFilter($filename, $filter) )
 +			{
 +				array_push($filelist, new MediaObject($collection, $filename, $DIR_MEDIA));
 +			}
 +		}
 +		closedir($dirhandle);
 +		
 +		/* sort array */
 +		if ( !$CONF['MediaPrefix'] )
 +		{
 +			usort($filelist,  array(__CLASS__, 'sort_media_by_timestamp'));
 +		}
 +		else
 +		{
 +			usort($filelist,  array(__CLASS__, 'sort_media_by_filename'));
 +		}
 +		
 +		return $filelist;
 +	}
 +	
 +	/**
 +	 * Media::checkFilter()
 +	 * 
 +	 * @param	string	$strText
 +	 * @param	string	$strFilter
 +	 * @return	boolean
 +	 */
 +	static public function checkFilter($strText, $strFilter)
 +	{
 +		if ( $strFilter == '' )
 +		{
 +			return 1;
 +		}
 +		else
 +		{
 +			return is_integer(i18n::strpos(strtolower($strText), strtolower($strFilter)));
 +		}
 +	}
 +	
 +	/**
 +	 * Media::isValidCollection()
 +	 * checks if a collection exists with the given name, and if it's
 +	 * allowed for the currently logged in member to upload files to it
 +	 * 
 +	 * @param	string	$collectionName
 +	 * @param	string	$exceptReadOnly
 +	 * @return	boolean
 +	 */
 +	static public function isValidCollection($collectionName, $exceptReadOnly = FALSE)
 +	{
 +		global $member, $DIR_MEDIA;
 +		
 +		// allow creating new private directory
 +		if ( $collectionName === (string)$member->getID() )
 +		{
 +			return TRUE;
 +		}
 +		
 +		$collections = self::getCollectionList($exceptReadOnly);
 +		$dirname = $collections[$collectionName];
 +		
 +		if ( $dirname == NULL || $dirname === PRIVATE_COLLECTION )
 +		{
 +			return FALSE;
 +		}
 +		
 +		// other collections should exist and be writable
 +		$collectionDir = $DIR_MEDIA . $collectionName;
 +		if ( $exceptReadOnly )
 +		{
 +			return ( @is_dir($collectionDir) && @is_writable($collectionDir) );
 +		}
 +		
 +		// other collections should exist
 +		return @is_dir($collectionDir);
 +	}
 +	
 +	/**
 +	 * Media::addMediaObject()
 +	 * Adds an uploaded file to the media archive
 +	 *
 +	 * @param	string	$collection	collection
 +	 * @param	array	$uploadfile	the postFileInfo(..) array
 +	 * @param	string	$filename	the filename that should be used to save the file as
 +	 * 								(date prefix should be already added here)
 +	 * @return	string	blank if success, message if failed
 +	 */
 +	static public function addMediaObject($collection, $uploadfile, $filename)
 +	{
 +		global $DIR_MEDIA, $manager;
 +		
 +		// clean filename of characters that may cause trouble in a filename using cleanFileName() function from globalfunctions.php
 +		$filename = cleanFileName($filename);
 +		
 +		// should already have tested for allowable types before calling this method. This will only catch files with no extension at all
 +		if ( $filename === FALSE )
 +		{
 +			return _ERROR_BADFILETYPE;
 +		}
 +		
 +		// trigger PreMediaUpload event
 +		$manager->notify('PreMediaUpload',array('collection' => &$collection, 'uploadfile' => $uploadfile, 'filename' => &$filename));
 +		
 +		// don't allow uploads to unknown or forbidden collections
 +		$exceptReadOnly = TRUE;
 +		if ( !self::isValidCollection($collection,$exceptReadOnly) )
 +		{
 +			return _ERROR_DISALLOWED;
 +		}
 +		
 +		// check dir permissions (try to create dir if it does not exist)
 +		$mediadir = $DIR_MEDIA . $collection;
 +		
 +		// try to create new private media directories if needed
 +		if ( !@is_dir($mediadir) && is_numeric($collection) )
 +		{
 +			$oldumask = umask(0000);
 +			if ( !@mkdir($mediadir, 0777) )
 +			{
 +				return _ERROR_BADPERMISSIONS;
 +			}
 +			umask($oldumask);
 +		}
 +		
 +		// if dir still not exists, the action is disallowed
 +		if ( !@is_dir($mediadir) )
 +		{
 +			return _ERROR_DISALLOWED;
 +		}
 +		
 +		if ( !is_writeable($mediadir) )
 +		{
 +			return _ERROR_BADPERMISSIONS;
 +		}
 +		
 +		// add trailing slash (don't add it earlier since it causes mkdir to fail on some systems)
 +		$mediadir .= '/';
 +		
 +		if ( file_exists($mediadir . $filename) )
 +		{
 +			return _ERROR_UPLOADDUPLICATE;
 +		}
 +		
 +		// move file to directory
 +		if ( is_uploaded_file($uploadfile) )
 +		{
 +			if ( !@move_uploaded_file($uploadfile, $mediadir . $filename) )
 +			{
 +				return _ERROR_UPLOADMOVEP;
 +			}
 +		}
 +		else
 +		{
 +			if ( !copy($uploadfile, $mediadir . $filename) )
 +			{
 +				return _ERROR_UPLOADCOPY ;
 +			}
 +		}
 +		
 +		// chmod uploaded file
 +		$oldumask = umask(0000);
 +		@chmod($mediadir . $filename, 0644);
 +		umask($oldumask);
 +		
 +		$manager->notify('PostMediaUpload',array('collection' => $collection, 'mediadir' => $mediadir, 'filename' => $filename));
 +		
 +		return '';
 +	}
 +	
 +	/**
 +	 * Media::addMediaObjectRaw()
 +	 * Adds an uploaded file to the media dir.
 +	 * 
 +	 * NOTE: does not check if $collection is valid.
 +	 * 
 +	 * @param	string	$collection	collection to use
 +	 * @param	string	$filename	the filename that should be used to save the file
 +	 * 								as (date prefix should be already added here)
 +	 * @param	&$data	File data (binary)
 +	 * @return	string	blank if success, message if failed
 +	 */
 +	static public function addMediaObjectRaw($collection, $filename, &$data)
 +	{
 +		global $DIR_MEDIA;
 +		
 +		// check dir permissions (try to create dir if it does not exist)
 +		$mediadir = $DIR_MEDIA . $collection;
 +		
 +		// try to create new private media directories if needed
 +		if ( !@is_dir($mediadir) && is_numeric($collection) )
 +		{
 +			$oldumask = umask(0000);
 +			if ( !@mkdir($mediadir, 0777) )
 +			{
 +				return _ERROR_BADPERMISSIONS;
 +			}
 +			umask($oldumask);
 +		}
 +		
 +		// if dir still not exists, the action is disallowed
 +		if ( !@is_dir($mediadir) )
 +		{
 +			return _ERROR_DISALLOWED;
 +		}
 +		
 +		if ( !is_writeable($mediadir) )
 +		{
 +			return _ERROR_BADPERMISSIONS;
 +		}
 +		
 +		// add trailing slash (don't add it earlier since it causes mkdir to fail on some systems)
 +		$mediadir .= '/';
 +		
 +		if ( file_exists($mediadir . $filename) )
 +		{
 +			return _ERROR_UPLOADDUPLICATE;
 +		}
 +		
 +		// create file
 +		$fh = @fopen($mediadir . $filename, 'wb');
 +		if ( !$fh )
 +		{
 +			return _ERROR_UPLOADFAILED;
 +		}
 +		$ok = @fwrite($fh, $data);
 +		@fclose($fh);
 +		if ( !$ok )
 +		{
 +			return _ERROR_UPLOADFAILED;
 +		}
 +		
 +		// chmod uploaded file
 +		$oldumask = umask(0000);
 +		@chmod($mediadir . $filename, 0644);
 +		umask($oldumask);
 +		
 +		return '';
 +	}
 +	
 +	/**
 +	 * Media::responseResampledImage()
 +	 * send resampled image via HTTP
 +	 * 
 +	 * @param	object	$medium		MediaObject Object
 +	 * @exit
 +	 */
 +	static public function responseResampledImage($medium, $maxwidth=0, $maxheight=0)
 +	{
 +		if ( get_class($medium) !== 'MediaObject' )
 +		{
 +			header("HTTP/1.1 500 Internal Server Error");
 +			exit('Nucleus CMS: Fail to generate resampled image');
 +			return;
 +		}
 +		
 +		$resampledimage = $medium->getResampledBinary($maxwidth, $maxheight);
 +		if ( $resampledimage === FALSE )
 +		{
 +			unset($resampledimage);
 +			header("HTTP/1.1 503 Service Unavailable");
 +			exit('Nucleus CMS: Fail to generate resampled image');
 +			return;
 +		}
 +		
 +		header("Content-type: {$medium->mime}");
 +		echo $resampledimage;
 +		
 +		unset($resampledimage);
 +		
 +		exit;
 +	}
 +	
 +	/**
 +	 * Media::storeResampledImage()
 +	 * Store resampled image binary to filesystem as file
 +	 * 
 +	 * @param	object	$medium		MediaObject Object
 +	 * @param	integer	$maxwidth	maximum width
 +	 * @param	integer	$maxheight	maximum height
 +	 * @param	string	$path		directory path for destination
 +	 * @param	string	$name		file name for destination
 +	 * @return	boolean
 +	 */
 +	static public function storeResampledImage($medium, $maxwidth=0, $maxheight=0, $path='', $name='')
 +	{
 +		global $DIR_MEDIA;
 +		
 +		if ( get_class($medium) !== 'MediaObject' )
 +		{
 +			return FALSE;
 +		}
 +		
 +		if ( $path !== '' )
 +		{
 +			$path = realpath($path);
 +			if ( !file_exists($path)
 +			  || strpos($path, $DIR_MEDIA) !== 0 )
 +			{
 +				return FALSE;
 +			}
 +		}
 +		else
 +		{
 +			$path = '$DIR_MEDIA/' . self::$thumbdir;
 +		}
 +		
 +		if ( $name === '' )
 +		{
 +			$name = $medium->getHashedname();
 +		}
 +		
 +		$resampledimage = $medium->getResampledBinary($maxwidth, $maxheight);
 +		if ( !$resampledimage )
 +		{
 +			unset($resampledimage);
 +			return FALSE;
 +		}
 +		
 +		$handle = @fopen("{$path}/{$name}", 'w');
 +		if ( !$handle )
 +		{
 +			unset ($resampledimage);
 +			return FALSE;
 +		}
 +		
 +		if ( !@fwrite($handle, $resampledimage) )
 +		{
 +			unset($resampledimage);
 +			@unlink("{$path}/{$name}");
 +			return FALSE;
 +		}
 +		
 +		unset($resampledimage);
 +		fclose($handle);
 +		
 +		if ( !@chmod("{$path}/{$name}", 0774) )
 +		{
 +			@unlink("{$path}/{$name}");
 +			return FALSE;
 +		}
 +		
 +		return TRUE;
 +	}
 +	
 +	/**
 +	 * Media::sort_media_by_timestamp()
 +	 * User-defined sort method to sort an array of MediaObjects
 +	 * 
 +	 * @param	object	$a
 +	 * @param	object	$b
 +	 * @return	boolean
 +	 */
 +	static private function sort_media_by_timestamp($a, $b)
 +	{
 +		if ($a->timestamp == $b->timestamp) return 0;
 +		return ($a->timestamp > $b->timestamp) ? -1 : 1;
 +	}
 +	
 +	/**
 +	 * Media::sort_media_by_filename()
 +	 * User-defined sort method to sort an array of MediaObjects
 +	 * 
 +	 * @param	object	$a
 +	 * @param	object	$b
 +	 * @return	boolean
 +	 */
 +	static private function sort_media_by_filename($a, $b)
 +	{
 +		if ($a->filename == $b->filename) return 0;
 +		return ($a->filename > $b->filename) ? -1 : 1;
 +	}
 +}
 +
 +class MediaObject
 +{
 +	public $mime = '';
 +	
 +	public $root = '';
 +	public $path = '';
 +	public $private;
 +	public $collection;
 +	public $filename = '';
 +	
 +	public $prefix = '';
 +	public $name = '';
 +	public $suffix = '';
 +	
 +	public $timestamp = 0;
 +	public $size = 0;
 +	
 +	public $width = 0;
 +	public $height = 0;
 +	public $resampledwidth = 0;
 +	public $resampledheight = 0;
 +	
 +	/**
 +	 * MediaObject::__construct()
 +	 * 
 +	 * @param	string		$collection	
 +	 * @param	string		$filename	
 +	 * @param	string		$root		fullpath to media directory
 +	 */
 +	public function __construct($collection, $filename, $root=0)
 +	{
 +		global $CONF, $DIR_MEDIA;
 +		
 +		/* for backward compatibility */
 +		if ( is_numeric($root) )
 +		{
 +			$root = $DIR_MEDIA;
 +		}
 +		
 +		$root = preg_replace('#/*$#', '', $root);
 +		
 +		/* get and validate fullpath for the medium */
 +		if ( !file_exists($root)
 +		  || FALSE === ($fullpath = realpath("{$root}/{$collection}/{$filename}"))
 +		  || strpos($fullpath, $root) !== 0
 +		  || !file_exists($fullpath) )
 +		{
 +			return FALSE;
 +		}
 +		
 +		/* store fundamentals */
 +		$this->root = $root;
 +		$this->private = (integer) $collection;
 +		$this->collection = $collection;
 +		$this->filename = basename($fullpath);
 +		$this->timestamp = filemtime($fullpath);
 +		
 +		/* store relative directory path from root directory for media */
 +		$this->path = preg_replace(array("#{$this->root}/#", "#/{$this->filename}#"), '', $fullpath);
 +		if ( $this->path === $this->name )
 +		{
 +			$this->path = ''; 
 +		}
 +		
 +		return;
 +	}
 +	
 +	/**
 +	 * MediaObject::refine()
 +	 * refine data
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	public function refine()
 +	{
 +		global $CONF;
 +		
 +		/* store size (byte order) */
 +		$this->size = filesize("{$this->root}/{$this->path}/{$this->filename}");
 +		
 +		/* get width and height if this is image binary */
 +		if ( FALSE === ($info = @getimagesize ("{$this->root}/{$this->path}/{$this->filename}")) )
 +		{
 +			$this->mime = 'application/octet-stream';
 +			$this->width = 0;
 +			$this->height = 0;
 +		}
 +		else
 +		{
 +			$this->mime = $info['mime'];
 +			$this->width = $info[0];
 +			$this->height = $info[1];
 +		}
 +		
 +		/* utilise Fileinfo subsystem if available */
 +		if ( defined('FILEINFO_MIME_TYPE') && function_exists ('finfo_open')
 +		  && (FALSE !== ($info = finfo_open(FILEINFO_MIME_TYPE))) )
 +		{
 +			$this->mime = finfo_file($info, "{$this->root}/{$this->path}/{$this->filename}");
 +		}
 +		
 +		/* store data with parsed filename */
 +		if ( preg_match('#^(.*)\.([a-zA-Z0-9]{2,})$#', $this->filename, $info) === 1 )
 +		{
 +			$this->name = $info[1];
 +			$this->suffix = $info[2];
 +			
 +			if ( $CONF['MediaPrefix'] && preg_match('#^([0-9]{8})\-(.*)$#', $this->name, $info) == 1 )
 +			{
 +				$this->prefix = preg_replace('#^([0-9]{4})([0-9]{2})([0-9]{2})$#', '$1/$2/$3', $info[1]);
 +				$this->name = $info[2];
 +			}
 +		}
 +		
 +		return;
 +	}
 +	
 +	/**
 +	 * MediaObject::setResampledSize()
 +	 * Set resampled size
 +	 * 
 +	 * @param	integer	$maxwidth
 +	 * @param	integer	$maxheight
 +	 * @return	boolean
 +	 */
 +	public function setResampledSize($maxwidth=0, $maxheight=0)
 +	{
 +		if ( ($maxwidth == 0) && ($maxheight == 0) )
 +		{
 +			return FALSE;
 +		}
 +		else if ( $this->width == 0 || $this->height  == 0 )
 +		{
 +			return FALSE;
 +		}
 +		else if ($this->width < $maxwidth && $this->height < $maxheight )
 +		{
 +			$this->resampledwidth = $this->width;
 +			$this->resampledheight = $this->height;
 +		}
 +		else if ( $maxheight == 0 || $this->width > $this->height )
 +		{
 +			$this->resampledheight = intval ($this->height * $maxwidth / $this->width);
 +			$this->resampledwidth = $maxwidth;
 +		}
 +		else if ( $maxwidth == 0 || $this->width <= $this->height )
 +		{
 +			$this->resampledwidth = intval ($this->width * $maxheight / $this->height);
 +			$this->resampledheight = $maxheight;
 +		}
 +		return TRUE;
 +	}
 +	
 +	/**
 +	 * MediaObject::getResampledBinary()
 +	 * Return resampled image binary
 +	 * 
 +	 * @param	void
 +	 * @return	mixed	binary if success, FALSE if failed
 +	 */
 +	public function getResampledBinary($maxwidth=0, $maxheight=0)
 +	{
 +		static $gdinfo = array();
 +		static $original;
 +		static $resampledimage;
 +		
 +		if ( !$this->setResampledSize($maxwidth, $maxheight) )
 +		{
 +			return FALSE;
 +		}
 +		
 +		if ( $gdinfo = array() )
 +		{
 +			$gdinfo = gd_info();
 +		}
 +		
 +		if ( $this->path !== '' )
 +		{
 +			$fullpath = "{$this->root}/{$this->path}/{$this->name}";
 +		}
 +		else
 +		{
 +			$fullpath = "{$this->root}/{$this->name}";
 +		}
 +		if ( !file_exists($fullpath) )
 +		{
 +			return FALSE;
 +		}
 +		
 +		if ( !array_key_exists($this->mime, Media::$image_mime)
 +		  || $this->width == 0
 +		  || $this->height == 0
 +		  || $this->resampledwidth == 0
 +		  || $this->resampledheight == 0 )
 +		{
 +			return FALSE;
 +		}
 +		
 +		/* check current available memory */
 +		$memorymax = trim(ini_get("memory_limit"));
 +		switch ( strtolower ($memorymax[strlen($memorymax)-1]) )
 +		{
 +			case 'g':
 +				$memorymax *= 1024;
 +			case 'm':
 +				$memorymax *= 1024;
 +			case 'k':
 +				$memorymax *= 1024;
 +		}
 +		
 +		/*
 +		 * this code is based on analyze if gd.c in php source code
 +		 * if you can read C/C++, please check these elements and notify us if you have some ideas
 +		 */
 +		if ( (memory_get_usage()
 +		   + ($this->resampledwidth * $this->resampledheight * 5 + $this->resampledheight * 24 + 10000)
 +		   + ($this->width * $this->height * 5 + $this->height * 24 + 10000))
 +		  > $memorymax )
 +		{
 +			return FALSE;
 +		}
 +		
 +		switch ( $this->mime )
 +		{
 +			case 'image/gif':
 +				if ( (!array_key_exists('GIF Read Support', $gdinfo) || !isset($gdinfo['GIF Read Support']))
 +				  || (!array_key_exists('GIF Create Support', $gdinfo) || !isset($gdinfo['GIF Create Support'])) )
 +				{
 +					return FALSE;
 +				}
 +				$function = 'imagecreatefromgif';
 +				break;
 +			case 'image/jpeg':
 +				if ( (!array_key_exists('JPEG Support', $gdinfo) || !isset($gdinfo['JPEG Support']))
 +				  && (!array_key_exists('JPG Support', $gdinfo) || !isset($gdinfo['JPG Support'])) )
 +				{
 +					return FALSE;
 +				}
 +				$function = 'imagecreatefromjpeg';
 +				break;
 +			case 'image/png':
 +				if ( !array_key_exists('PNG Support', $gdinfo) || !isset($gdinfo['PNG Support']) )
 +				{
 +					return FALSE;
 +				}
 +				$function = 'imagecreatefrompng';
 +				break;
 +			default:
 +				return FALSE;
 +		}
 +		
 +		if ( !is_callable($function) )
 +		{
 +			return FALSE;
 +		}
 +		
 +		$original = call_user_func_array($function, array(&$fullpath));
 +		if ( !$original )
 +		{
 +			return FALSE;
 +		}
 +		
 +		$resampledimage = imagecreatetruecolor($this->resampledwidth, $this->resampledheight);
 +		if ( !$resampledimage )
 +		{
 +			imagedestroy($original);
 +			return FALSE;
 +		}
 +		
 +		@set_time_limit(ini_get('max_execution_time'));
 +		if ( !ImageCopyResampled($resampledimage, $original, 0, 0, 0, 0, $this->resampledwidth, $this->resampledheight, $this->width, $this->height) )
 +		{
 +			return FALSE;
 +		}
 +		
 +		imagedestroy($original);
 +		
 +		ob_start();
 +		
 +		switch ( $this->mime )
 +		{
 +			case 'image/gif':
 +				imagegif($resampledimage);
 +				break;
 +			case 'image/jpeg':
 +				imagejpeg($resampledimage);
 +				break;
 +			case 'image/png':
 +				imagepng($resampledimage);
 +				break;
 +			case 'image/bmp':
 +			case 'image/x-ms-bmp':
 +				imagepng($resampledimage);
 +				break;
 +			default:
 +				return FALSE;
 +		}
 +		
 +		imagedestroy($resampledimage);
 +		
 +		return ob_get_clean();
 +	}
 +	
 +	public function getHashedName()
 +	{
 +		return (string) hash(Media::$algorism, "{$this->path}/{$this->name}", FALSE);
 +	}
 +}
++=======
+ <?php
+ /*
+  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+  * Copyright (C) 2002-2012 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 classes for nucleus
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+  * @version $Id: MEDIA.php 1875 2012-06-17 07:30:44Z sakamocchi $
+  */
+ 
+ define('PRIVATE_COLLECTION', 		'Private Collection');
+ define('READ_ONLY_MEDIA_FOLDER',	'(Read Only)');
+ 
+ class Media
+ {
+ 	static public $thumbdir = '.thumb';
+ 	static public $algorism = 'md5';
+ 	static public $image_mime = array(
+ 		'image/jpeg'	=> '.jpeg',
+ 		'image/png'		=> '.png',
+ 		'image/gif'		=> '.gif',
+ 	);
+ 	
+ 	/**
+ 	 * Media::getCollectionList()
+ 	 * Gets the list of collections available to the currently logged
+ 	 * in member
+ 	 * 
+ 	 * @param	boolean	$exceptReadOnly
+ 	 * @return array	dirname => display name
+ 	 */
+ 	static public function getCollectionList($exceptReadOnly = FALSE)
+ 	{
+ 		global $member, $DIR_MEDIA;
+ 		
+ 		$collections = array();
+ 		
+ 		// add private directory for member
+ 		$collections[$member->getID()] = PRIVATE_COLLECTION;
+ 		
+ 		// add global collections
+ 		if ( !is_dir($DIR_MEDIA) )
+ 		{
+ 			return $collections;
+ 		}
+ 		
+ 		$dirhandle = opendir($DIR_MEDIA);
+ 		while ( $dirname = readdir($dirhandle) )
+ 		{
+ 			// only add non-numeric (numeric=private) dirs
+ 			if ( @is_dir($DIR_MEDIA . $dirname) &&
+ 				($dirname != '.') &&
+ 				($dirname != '..') &&
+ 				($dirname != self::$thumbdir) &&
+ 				(!is_numeric($dirname)) )
+ 				{
+ 				if ( @is_writable($DIR_MEDIA . $dirname) )
+ 				{
+ 					$collections[$dirname] = $dirname;
+ 				}
+ 				else if ( $exceptReadOnly == FALSE )
+ 				{
+ 					$collections[$dirname] = $dirname . ' ' . READ_ONLY_MEDIA_FOLDER;
+ 				}
+ 			}
+ 		}
+ 		closedir($dirhandle);
+ 		
+ 		return $collections;
+ 	}
+ 	
+ 	/**
+ 	 * Media::getMediaListByCollection()
+ 	 * Returns an array of MediaObject objects for a certain collection
+ 	 *
+ 	 * @param	string	$collection	name of the collection
+ 	 * @param	string	$filter		filter on filename (defaults to none)
+ 	 * @return	void
+ 	 */
+ 	static public function getMediaListByCollection($collection, $filter = '')
+ 	{
+ 		global $CONF, $DIR_MEDIA;
+ 		
+ 		$filelist = array();
+ 		
+ 		// 1. go through all objects and add them to the filelist
+ 		$mediadir = $DIR_MEDIA . $collection . '/';
+ 		
+ 		// return if dir does not exist
+ 		if ( !is_dir($mediadir) )
+ 		{
+ 			return $filelist;
+ 		}
+ 		
+ 		$dirhandle = opendir($mediadir);
+ 		while ( $filename = readdir($dirhandle) )
+ 		{
+ 			// only add files that match the filter
+ 			if ( !is_dir($mediadir . $filename) && self::checkFilter($filename, $filter) )
+ 			{
+ 				array_push($filelist, new MediaObject($collection, $filename, $DIR_MEDIA));
+ 			}
+ 		}
+ 		closedir($dirhandle);
+ 		
+ 		/* sort array */
+ 		if ( !$CONF['MediaPrefix'] )
+ 		{
+ 			usort($filelist,  array(__CLASS__, 'sort_media_by_timestamp'));
+ 		}
+ 		else
+ 		{
+ 			usort($filelist,  array(__CLASS__, 'sort_media_by_filename'));
+ 		}
+ 		
+ 		return $filelist;
+ 	}
+ 	
+ 	/**
+ 	 * Media::checkFilter()
+ 	 * 
+ 	 * @param	string	$strText
+ 	 * @param	string	$strFilter
+ 	 * @return	boolean
+ 	 */
+ 	static public function checkFilter($strText, $strFilter)
+ 	{
+ 		if ( $strFilter == '' )
+ 		{
+ 			return 1;
+ 		}
+ 		else
+ 		{
+ 			return is_integer(i18n::strpos(strtolower($strText), strtolower($strFilter)));
+ 		}
+ 	}
+ 	
+ 	/**
+ 	 * Media::isValidCollection()
+ 	 * checks if a collection exists with the given name, and if it's
+ 	 * allowed for the currently logged in member to upload files to it
+ 	 * 
+ 	 * @param	string	$collectionName
+ 	 * @param	string	$exceptReadOnly
+ 	 * @return	boolean
+ 	 */
+ 	static public function isValidCollection($collectionName, $exceptReadOnly = FALSE)
+ 	{
+ 		global $member, $DIR_MEDIA;
+ 		
+ 		// allow creating new private directory
+ 		if ( $collectionName === (string)$member->getID() )
+ 		{
+ 			return TRUE;
+ 		}
+ 		
+ 		$collections = self::getCollectionList($exceptReadOnly);
+ 		$dirname = $collections[$collectionName];
+ 		
+ 		if ( $dirname == NULL || $dirname === PRIVATE_COLLECTION )
+ 		{
+ 			return FALSE;
+ 		}
+ 		
+ 		// other collections should exist and be writable
+ 		$collectionDir = $DIR_MEDIA . $collectionName;
+ 		if ( $exceptReadOnly )
+ 		{
+ 			return ( @is_dir($collectionDir) && @is_writable($collectionDir) );
+ 		}
+ 		
+ 		// other collections should exist
+ 		return @is_dir($collectionDir);
+ 	}
+ 	
+ 	/**
+ 	 * Media::addMediaObject()
+ 	 * Adds an uploaded file to the media archive
+ 	 *
+ 	 * @param	string	$collection	collection
+ 	 * @param	array	$uploadfile	the postFileInfo(..) array
+ 	 * @param	string	$filename	the filename that should be used to save the file as
+ 	 * 								(date prefix should be already added here)
+ 	 * @return	string	blank if success, message if failed
+ 	 */
+ 	static public function addMediaObject($collection, $uploadfile, $filename)
+ 	{
+ 		global $DIR_MEDIA, $manager;
+ 		
+ 		// clean filename of characters that may cause trouble in a filename using cleanFileName() function from globalfunctions.php
+ 		$filename = cleanFileName($filename);
+ 		
+ 		// should already have tested for allowable types before calling this method. This will only catch files with no extension at all
+ 		if ( $filename === FALSE )
+ 		{
+ 			return _ERROR_BADFILETYPE;
+ 		}
+ 		
+ 		// trigger PreMediaUpload event
+ 		$data = array('collection' => &$collection, 'uploadfile' => $uploadfile, 'filename' => &$filename);
+ 		$manager->notify('PreMediaUpload', $data);
+ 		
+ 		// don't allow uploads to unknown or forbidden collections
+ 		$exceptReadOnly = TRUE;
+ 		if ( !self::isValidCollection($collection,$exceptReadOnly) )
+ 		{
+ 			return _ERROR_DISALLOWED;
+ 		}
+ 		
+ 		// check dir permissions (try to create dir if it does not exist)
+ 		$mediadir = $DIR_MEDIA . $collection;
+ 		
+ 		// try to create new private media directories if needed
+ 		if ( !@is_dir($mediadir) && is_numeric($collection) )
+ 		{
+ 			$oldumask = umask(0000);
+ 			if ( !@mkdir($mediadir, 0777) )
+ 			{
+ 				return _ERROR_BADPERMISSIONS;
+ 			}
+ 			umask($oldumask);
+ 		}
+ 		
+ 		// if dir still not exists, the action is disallowed
+ 		if ( !@is_dir($mediadir) )
+ 		{
+ 			return _ERROR_DISALLOWED;
+ 		}
+ 		
+ 		if ( !is_writeable($mediadir) )
+ 		{
+ 			return _ERROR_BADPERMISSIONS;
+ 		}
+ 		
+ 		// add trailing slash (don't add it earlier since it causes mkdir to fail on some systems)
+ 		$mediadir .= '/';
+ 		
+ 		if ( file_exists($mediadir . $filename) )
+ 		{
+ 			return _ERROR_UPLOADDUPLICATE;
+ 		}
+ 		
+ 		// move file to directory
+ 		if ( is_uploaded_file($uploadfile) )
+ 		{
+ 			if ( !@move_uploaded_file($uploadfile, $mediadir . $filename) )
+ 			{
+ 				return _ERROR_UPLOADMOVEP;
+ 			}
+ 		}
+ 		else
+ 		{
+ 			if ( !copy($uploadfile, $mediadir . $filename) )
+ 			{
+ 				return _ERROR_UPLOADCOPY ;
+ 			}
+ 		}
+ 		
+ 		// chmod uploaded file
+ 		$oldumask = umask(0000);
+ 		@chmod($mediadir . $filename, 0644);
+ 		umask($oldumask);
+ 
+ 		$data = array('collection' => $collection, 'mediadir' => $mediadir, 'filename' => $filename);
+ 		$manager->notify('PostMediaUpload', $data);
+ 		
+ 		return '';
+ 	}
+ 	
+ 	/**
+ 	 * Media::addMediaObjectRaw()
+ 	 * Adds an uploaded file to the media dir.
+ 	 * 
+ 	 * NOTE: does not check if $collection is valid.
+ 	 * 
+ 	 * @param	string	$collection	collection to use
+ 	 * @param	string	$filename	the filename that should be used to save the file
+ 	 * 								as (date prefix should be already added here)
+ 	 * @param	&$data	File data (binary)
+ 	 * @return	string	blank if success, message if failed
+ 	 */
+ 	static public function addMediaObjectRaw($collection, $filename, &$data)
+ 	{
+ 		global $DIR_MEDIA;
+ 		
+ 		// check dir permissions (try to create dir if it does not exist)
+ 		$mediadir = $DIR_MEDIA . $collection;
+ 		
+ 		// try to create new private media directories if needed
+ 		if ( !@is_dir($mediadir) && is_numeric($collection) )
+ 		{
+ 			$oldumask = umask(0000);
+ 			if ( !@mkdir($mediadir, 0777) )
+ 			{
+ 				return _ERROR_BADPERMISSIONS;
+ 			}
+ 			umask($oldumask);
+ 		}
+ 		
+ 		// if dir still not exists, the action is disallowed
+ 		if ( !@is_dir($mediadir) )
+ 		{
+ 			return _ERROR_DISALLOWED;
+ 		}
+ 		
+ 		if ( !is_writeable($mediadir) )
+ 		{
+ 			return _ERROR_BADPERMISSIONS;
+ 		}
+ 		
+ 		// add trailing slash (don't add it earlier since it causes mkdir to fail on some systems)
+ 		$mediadir .= '/';
+ 		
+ 		if ( file_exists($mediadir . $filename) )
+ 		{
+ 			return _ERROR_UPLOADDUPLICATE;
+ 		}
+ 		
+ 		// create file
+ 		$fh = @fopen($mediadir . $filename, 'wb');
+ 		if ( !$fh )
+ 		{
+ 			return _ERROR_UPLOADFAILED;
+ 		}
+ 		$ok = @fwrite($fh, $data);
+ 		@fclose($fh);
+ 		if ( !$ok )
+ 		{
+ 			return _ERROR_UPLOADFAILED;
+ 		}
+ 		
+ 		// chmod uploaded file
+ 		$oldumask = umask(0000);
+ 		@chmod($mediadir . $filename, 0644);
+ 		umask($oldumask);
+ 		
+ 		return '';
+ 	}
+ 	
+ 	/**
+ 	 * Media::responseResampledImage()
+ 	 * send resampled image via HTTP
+ 	 * 
+ 	 * @param	object	$medium		MediaObject Object
+ 	 * @exit
+ 	 */
+ 	static public function responseResampledImage($medium, $maxwidth=0, $maxheight=0)
+ 	{
+ 		if ( get_class($medium) !== 'MediaObject' )
+ 		{
+ 			header("HTTP/1.1 500 Internal Server Error");
+ 			exit('Nucleus CMS: Fail to generate resampled image');
+ 			return;
+ 		}
+ 		
+ 		$resampledimage = $medium->getResampledBinary($maxwidth, $maxheight);
+ 		if ( $resampledimage === FALSE )
+ 		{
+ 			unset($resampledimage);
+ 			header("HTTP/1.1 503 Service Unavailable");
+ 			exit('Nucleus CMS: Fail to generate resampled image');
+ 			return;
+ 		}
+ 		
+ 		header("Content-type: {$medium->mime}");
+ 		echo $resampledimage;
+ 		
+ 		unset($resampledimage);
+ 		
+ 		exit;
+ 	}
+ 	
+ 	/**
+ 	 * Media::storeResampledImage()
+ 	 * Store resampled image binary to filesystem as file
+ 	 * 
+ 	 * @param	object	$medium		MediaObject Object
+ 	 * @param	integer	$maxwidth	maximum width
+ 	 * @param	integer	$maxheight	maximum height
+ 	 * @param	string	$path		directory path for destination
+ 	 * @param	string	$name		file name for destination
+ 	 * @return	boolean
+ 	 */
+ 	static public function storeResampledImage($medium, $maxwidth=0, $maxheight=0, $path='', $name='')
+ 	{
+ 		global $DIR_MEDIA;
+ 		
+ 		if ( get_class($medium) !== 'MediaObject' )
+ 		{
+ 			return FALSE;
+ 		}
+ 		
+ 		if ( $path !== '' )
+ 		{
+ 			$path = realpath($path);
+ 			if ( !file_exists($path)
+ 			  || strpos($path, $DIR_MEDIA) !== 0 )
+ 			{
+ 				return FALSE;
+ 			}
+ 		}
+ 		else
+ 		{
+ 			$path = '$DIR_MEDIA/' . self::$thumbdir;
+ 		}
+ 		
+ 		if ( $name === '' )
+ 		{
+ 			$name = $medium->getHashedname();
+ 		}
+ 		
+ 		$resampledimage = $medium->getResampledBinary($maxwidth, $maxheight);
+ 		if ( !$resampledimage )
+ 		{
+ 			unset($resampledimage);
+ 			return FALSE;
+ 		}
+ 		
+ 		$handle = @fopen("{$path}/{$name}", 'w');
+ 		if ( !$handle )
+ 		{
+ 			unset ($resampledimage);
+ 			return FALSE;
+ 		}
+ 		
+ 		if ( !@fwrite($handle, $resampledimage) )
+ 		{
+ 			unset($resampledimage);
+ 			@unlink("{$path}/{$name}");
+ 			return FALSE;
+ 		}
+ 		
+ 		unset($resampledimage);
+ 		fclose($handle);
+ 		
+ 		if ( !@chmod("{$path}/{$name}", 0774) )
+ 		{
+ 			@unlink("{$path}/{$name}");
+ 			return FALSE;
+ 		}
+ 		
+ 		return TRUE;
+ 	}
+ 	
+ 	/**
+ 	 * Media::sort_media_by_timestamp()
+ 	 * User-defined sort method to sort an array of MediaObjects
+ 	 * 
+ 	 * @param	object	$a
+ 	 * @param	object	$b
+ 	 * @return	boolean
+ 	 */
+ 	static private function sort_media_by_timestamp($a, $b)
+ 	{
+ 		if ($a->timestamp == $b->timestamp) return 0;
+ 		return ($a->timestamp > $b->timestamp) ? -1 : 1;
+ 	}
+ 	
+ 	/**
+ 	 * Media::sort_media_by_filename()
+ 	 * User-defined sort method to sort an array of MediaObjects
+ 	 * 
+ 	 * @param	object	$a
+ 	 * @param	object	$b
+ 	 * @return	boolean
+ 	 */
+ 	static private function sort_media_by_filename($a, $b)
+ 	{
+ 		if ($a->filename == $b->filename) return 0;
+ 		return ($a->filename > $b->filename) ? -1 : 1;
+ 	}
+ }
+ 
+ class MediaObject
+ {
+ 	public $mime = '';
+ 	
+ 	public $root = '';
+ 	public $path = '';
+ 	public $private;
+ 	public $collection;
+ 	public $filename = '';
+ 	
+ 	public $prefix = '';
+ 	public $name = '';
+ 	public $suffix = '';
+ 	
+ 	public $timestamp = 0;
+ 	public $size = 0;
+ 	
+ 	public $width = 0;
+ 	public $height = 0;
+ 	public $resampledwidth = 0;
+ 	public $resampledheight = 0;
+ 	
+ 	/**
+ 	 * MediaObject::__construct()
+ 	 * 
+ 	 * @param	string		$collection	
+ 	 * @param	string		$filename	
+ 	 * @param	string		$root		fullpath to media directory
+ 	 */
+ 	public function __construct($collection, $filename, $root=0)
+ 	{
+ 		global $CONF, $DIR_MEDIA;
+ 		
+ 		/* for backward compatibility */
+ 		if ( is_numeric($root) )
+ 		{
+ 			$root = $DIR_MEDIA;
+ 		}
+ 		
+ 		$root = preg_replace('#/*$#', '', $root);
+ 		
+ 		/* get and validate fullpath for the medium */
+ 		if ( !file_exists($root)
+ 		  || FALSE === ($fullpath = realpath("{$root}/{$collection}/{$filename}"))
+ 		  || strpos($fullpath, $root) !== 0
+ 		  || !file_exists($fullpath) )
+ 		{
+ 			return FALSE;
+ 		}
+ 		
+ 		/* store fundamentals */
+ 		$this->root = $root;
+ 		$this->private = (integer) $collection;
+ 		$this->collection = $collection;
+ 		$this->filename = basename($fullpath);
+ 		$this->timestamp = filemtime($fullpath);
+ 		
+ 		/* store relative directory path from root directory for media */
+ 		$this->path = preg_replace(array("#{$this->root}/#", "#/{$this->filename}#"), '', $fullpath);
+ 		if ( $this->path === $this->name )
+ 		{
+ 			$this->path = ''; 
+ 		}
+ 		
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * MediaObject::refine()
+ 	 * refine data
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	public function refine()
+ 	{
+ 		global $CONF;
+ 		
+ 		/* store size (byte order) */
+ 		$this->size = filesize("{$this->root}/{$this->path}/{$this->filename}");
+ 		
+ 		/* get width and height if this is image binary */
+ 		if ( FALSE === ($info = @getimagesize ("{$this->root}/{$this->path}/{$this->filename}")) )
+ 		{
+ 			$this->mime = 'application/octet-stream';
+ 			$this->width = 0;
+ 			$this->height = 0;
+ 		}
+ 		else
+ 		{
+ 			$this->mime = $info['mime'];
+ 			$this->width = $info[0];
+ 			$this->height = $info[1];
+ 		}
+ 		
+ 		/* utilise Fileinfo subsystem if available */
+ 		if ( defined('FILEINFO_MIME_TYPE') && function_exists ('finfo_open')
+ 		  && (FALSE !== ($info = finfo_open(FILEINFO_MIME_TYPE))) )
+ 		{
+ 			$this->mime = finfo_file($info, "{$this->root}/{$this->path}/{$this->filename}");
+ 		}
+ 		
+ 		/* store data with parsed filename */
+ 		if ( preg_match('#^(.*)\.([a-zA-Z0-9]{2,})$#', $this->filename, $info) === 1 )
+ 		{
+ 			$this->name = $info[1];
+ 			$this->suffix = $info[2];
+ 			
+ 			if ( $CONF['MediaPrefix'] && preg_match('#^([0-9]{8})\-(.*)$#', $this->name, $info) == 1 )
+ 			{
+ 				$this->prefix = preg_replace('#^([0-9]{4})([0-9]{2})([0-9]{2})$#', '$1/$2/$3', $info[1]);
+ 				$this->name = $info[2];
+ 			}
+ 		}
+ 		
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * MediaObject::setResampledSize()
+ 	 * Set resampled size
+ 	 * 
+ 	 * @param	integer	$maxwidth
+ 	 * @param	integer	$maxheight
+ 	 * @return	boolean
+ 	 */
+ 	public function setResampledSize($maxwidth=0, $maxheight=0)
+ 	{
+ 		if ( ($maxwidth == 0) && ($maxheight == 0) )
+ 		{
+ 			return FALSE;
+ 		}
+ 		else if ( $this->width == 0 || $this->height  == 0 )
+ 		{
+ 			return FALSE;
+ 		}
+ 		else if ($this->width < $maxwidth && $this->height < $maxheight )
+ 		{
+ 			$this->resampledwidth = $this->width;
+ 			$this->resampledheight = $this->height;
+ 		}
+ 		else if ( $maxheight == 0 || $this->width > $this->height )
+ 		{
+ 			$this->resampledheight = intval ($this->height * $maxwidth / $this->width);
+ 			$this->resampledwidth = $maxwidth;
+ 		}
+ 		else if ( $maxwidth == 0 || $this->width <= $this->height )
+ 		{
+ 			$this->resampledwidth = intval ($this->width * $maxheight / $this->height);
+ 			$this->resampledheight = $maxheight;
+ 		}
+ 		return TRUE;
+ 	}
+ 	
+ 	/**
+ 	 * MediaObject::getResampledBinary()
+ 	 * Return resampled image binary
+ 	 * 
+ 	 * @param	void
+ 	 * @return	mixed	binary if success, FALSE if failed
+ 	 */
+ 	public function getResampledBinary($maxwidth=0, $maxheight=0)
+ 	{
+ 		static $gdinfo = array();
+ 		static $original;
+ 		static $resampledimage;
+ 		
+ 		if ( !$this->setResampledSize($maxwidth, $maxheight) )
+ 		{
+ 			return FALSE;
+ 		}
+ 		
+ 		if ( $gdinfo = array() )
+ 		{
+ 			$gdinfo = gd_info();
+ 		}
+ 		
+ 		if ( $this->path !== '' )
+ 		{
+ 			$fullpath = "{$this->root}/{$this->path}/{$this->name}";
+ 		}
+ 		else
+ 		{
+ 			$fullpath = "{$this->root}/{$this->name}";
+ 		}
+ 		if ( !file_exists($fullpath) )
+ 		{
+ 			return FALSE;
+ 		}
+ 		
+ 		if ( !array_key_exists($this->mime, Media::$image_mime)
+ 		  || $this->width == 0
+ 		  || $this->height == 0
+ 		  || $this->resampledwidth == 0
+ 		  || $this->resampledheight == 0 )
+ 		{
+ 			return FALSE;
+ 		}
+ 		
+ 		/* check current available memory */
+ 		$memorymax = trim(ini_get("memory_limit"));
+ 		switch ( strtolower ($memorymax[strlen($memorymax)-1]) )
+ 		{
+ 			case 'g':
+ 				$memorymax *= 1024;
+ 			case 'm':
+ 				$memorymax *= 1024;
+ 			case 'k':
+ 				$memorymax *= 1024;
+ 		}
+ 		
+ 		/*
+ 		 * this code is based on analyze if gd.c in php source code
+ 		 * if you can read C/C++, please check these elements and notify us if you have some ideas
+ 		 */
+ 		if ( (memory_get_usage()
+ 		   + ($this->resampledwidth * $this->resampledheight * 5 + $this->resampledheight * 24 + 10000)
+ 		   + ($this->width * $this->height * 5 + $this->height * 24 + 10000))
+ 		  > $memorymax )
+ 		{
+ 			return FALSE;
+ 		}
+ 		
+ 		switch ( $this->mime )
+ 		{
+ 			case 'image/gif':
+ 				if ( (!array_key_exists('GIF Read Support', $gdinfo) || !isset($gdinfo['GIF Read Support']))
+ 				  || (!array_key_exists('GIF Create Support', $gdinfo) || !isset($gdinfo['GIF Create Support'])) )
+ 				{
+ 					return FALSE;
+ 				}
+ 				$function = 'imagecreatefromgif';
+ 				break;
+ 			case 'image/jpeg':
+ 				if ( (!array_key_exists('JPEG Support', $gdinfo) || !isset($gdinfo['JPEG Support']))
+ 				  && (!array_key_exists('JPG Support', $gdinfo) || !isset($gdinfo['JPG Support'])) )
+ 				{
+ 					return FALSE;
+ 				}
+ 				$function = 'imagecreatefromjpeg';
+ 				break;
+ 			case 'image/png':
+ 				if ( !array_key_exists('PNG Support', $gdinfo) || !isset($gdinfo['PNG Support']) )
+ 				{
+ 					return FALSE;
+ 				}
+ 				$function = 'imagecreatefrompng';
+ 				break;
+ 			default:
+ 				return FALSE;
+ 		}
+ 		
+ 		if ( !is_callable($function) )
+ 		{
+ 			return FALSE;
+ 		}
+ 		
+ 		$original = call_user_func_array($function, $fullpath);
+ 		if ( !$original )
+ 		{
+ 			return FALSE;
+ 		}
+ 		
+ 		$resampledimage = imagecreatetruecolor($this->resampledwidth, $this->resampledheight);
+ 		if ( !$resampledimage )
+ 		{
+ 			imagedestroy($original);
+ 			return FALSE;
+ 		}
+ 		
+ 		@set_time_limit(ini_get('max_execution_time'));
+ 		if ( !ImageCopyResampled($resampledimage, $original, 0, 0, 0, 0, $this->resampledwidth, $this->resampledheight, $this->width, $this->height) )
+ 		{
+ 			return FALSE;
+ 		}
+ 		
+ 		imagedestroy($original);
+ 		
+ 		ob_start();
+ 		
+ 		switch ( $this->mime )
+ 		{
+ 			case 'image/gif':
+ 				imagegif($resampledimage);
+ 				break;
+ 			case 'image/jpeg':
+ 				imagejpeg($resampledimage);
+ 				break;
+ 			case 'image/png':
+ 				imagepng($resampledimage);
+ 				break;
+ 			case 'image/bmp':
+ 			case 'image/x-ms-bmp':
+ 				imagepng($resampledimage);
+ 				break;
+ 			default:
+ 				return FALSE;
+ 		}
+ 		
+ 		imagedestroy($resampledimage);
+ 		
+ 		return ob_get_clean();
+ 	}
+ 	
+ 	public function getHashedName()
+ 	{
+ 		return (string) hash(Media::$algorism, "{$this->path}/{$this->name}", FALSE);
+ 	}
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/libs/MEMBER.php
index 8172d43,a0a1146..1047d78
--- a/nucleus/libs/MEMBER.php
+++ b/nucleus/libs/MEMBER.php
@@@ -1,1320 -1,1351 +1,2674 @@@
++<<<<<<< HEAD
 +<?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)
 + */
 +/**
 + * A class representing site members
 + * 
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2009 The Nucleus Group
 + * @version $Id: MEMBER.php 1616 2012-01-08 09:48:15Z sakamocchi $
 + */
 +class Member
 +{
 +	// 1 when authenticated, 0 when not
 +	public $loggedin = 0;
 +	public $password;		// not the actual password, but rather a MD5 hash
 +	private $algorism = 'md5';
 +	
 +	public $cookiekey;		// value that should also be in the client cookie to allow authentication
 +	private $cookie_salt = FALSE;
 +	
 +	// member info
 +	public $id = -1;
 +	public $realname;
 +	public $displayname;
 +	public $email;
 +	public $url;
 +	public $admin = 0;			// (either 0 or 1)
 +	public $canlogin = 0;		// (either 0 or 1)
 +	public $notes;
 +	public $autosave = 1;		// if the member use the autosave draft function
 +	private $locale = '';
 +	
 +	/**
 +	 * Member::__construct()
 +	 * Constructor for a member object
 +	 * 
 +	 * @param	Void
 +	 * @return	Void
 +	 * 
 +	 */
 +	public function __construct()
 +	{
 +		return;
 +	}
 +	
 +	/**
 +	 * Member::createFromName()
 +	 * Create a member object for a given displayname
 +	 * 
 +	 * @static
 +	 * @param	String	$displayname	login name
 +	 * @return	Object	member object
 +	 * 
 +	 */
 +	public static function &createFromName($displayname)
 +	{
 +		$mem = new Member();
 +		$mem->readFromName($displayname);
 +		return $mem;
 +	}
 +	
 +	/**
 +	 * Member::createFromID()
 +	 * Create a member object for a given ID
 +	 * 
 +	 * @static
 +	 * @param	Integer	$id	id for member
 +	 */
 +	public static function &createFromID($id)
 +	{
 +		$mem = new Member();
 +		$mem->readFromID($id);
 +		return $mem;
 +	}
 +	
 +	/**
 +	 * Member::readFromName()
 +	 * Read member table in database
 +	 * 
 +	 * @param	String	$displayname	login name
 +	 * @return	Object	SQL resource
 +	 * 
 +	 */
 +	public function readFromName($displayname)
 +	{
 +		return $this->read('mname='.DB::quoteValue($displayname));
 +	}
 +	
 +	/**
 +	 * Member::readFromID()
 +	 * Read member table in database
 +	 * 
 +	 * @param	Integer	$id	id for member
 +	 * @return	Object	SQL resource
 +	 * 
 +	 */
 +	public function readFromID($id)
 +	{
 +		return $this->read("mnumber=" . intval($id));
 +	}
 +	
 +	/**
 +	 * Member::hash()
 +	 * hash the target string
 +	 * 
 +	 * @param	String	$string	target string
 +	 * @return	Void	hashed string
 +	 */
 +	public function hash($string)
 +	{
 +		switch ( $this->algorism )
 +		{
 +			case 'md5':
 +			default:
 +				$string = md5($string);
 +		}
 +		return $string;
 +	}
 +	
 +	/**
 +	 * Member::set_cookie_salt()
 +	 * 
 +	 * @param	integer	$key	secureCookieKey value
 +	 * @return	void
 +	 * 
 +	 */
 +	private function set_cookie_salt($key = 0)
 +	{
 +		if ( !$key )
 +		{
 +			$key = 24;
 +		}
 +		
 +		switch( $key )
 +		{
 +			case 8:
 +				$this->cookie_salt = preg_replace('/\.[0-9]+\.[0-9]+\.[0-9]+$/', '', serverVar('REMOTE_ADDR'));
 +				break;
 +			case 16:
 +				$this->cookie_salt = preg_replace('/\.[0-9]+\.[0-9]+$/', '', serverVar('REMOTE_ADDR'));
 +				break;
 +			case 24:
 +				$this->cookie_salt = preg_replace('/\.[0-9]+$/', '', serverVar('REMOTE_ADDR'));
 +				break;
 +			case 32:
 +				$this->cookie_salt = serverVar('REMOTE_ADDR');
 +				break;
 +			default:
 +				$this->cookie_salt = 'none';
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * Member::login()
 +	 * Tries to login as a given user.
 +	 * Returns true when succeeded, returns false when failed
 +	 * 3.40 adds CustomLogin event
 +	 * 
 +	 * @param	String	$login	login name for member
 +	 * @param	String	$password	password for member
 +	 * @param	Integer	$shared	whether the user agent is shared or not
 +	 * 
 +	 */
 +	public function login($login, $password, $shared=1)
 +	{
 +		global $CONF, $errormessage, $manager;
 +		
 +		/* TODO: validation for $login, $password, $shared */
 +		if ( $login == '' || $password == '' )
 +		{
 +			return 0;
 +		}
 +		/* limiting the length of password to avoid hash collision */
 +		$password=i18n::substr($password, 0, 40);
 +		
 +		/* 
 +		 * generate cookie salt from secure cookie key settings
 +		* (either 'none', 0, 8, 16, 24, or 32)
 +		*/
 +		if ( !$this->cookie_salt )
 +		{
 +			$salt = 0;
 +			if ( array_key_exists('secureCookieKey', $CONF) )
 +			{
 +				$salt = $CONF['secureCookieKey'];
 +			}
 +			$this->set_cookie_salt($salt);
 +		}
 +		
 +		$success = 0;
 +		$allowlocal = 1;
 +		$manager->notify('CustomLogin', array('login' => &$login, 'password'=>&$password, 'success'=>&$success, 'allowlocal'=>&$allowlocal));
 +		
 +		$this->loggedin = 0;
 +		if ( $success )
 +		{
 +			$this->loggedin = ( $this->readFromName($login) );
 +		}
 +		elseif ( $allowlocal )
 +		{
 +			$this->loggedin = ( $this->readFromName($login) && $this->checkPassword($password) );
 +		}
 +		
 +		/* login failed */
 +		if ( !$this->loggedin )
 +		{
 +			$trimlogin = trim($login);
 +			if ( empty($trimlogin) )
 +			{
 +				$errormessage = "Please enter a username.";
 +			}
 +			else
 +			{
 +				$errormessage = 'Login failed for ' . $login;
 +			}
 +			$manager->notify('LoginFailed', array('username' => $login) );
 +			ActionLog::add(INFO, $errormessage);
 +		}
 +		/* login success */
 +		else
 +		{
 +			/* For lower compatibility */
 +			if ( strlen($this->password) === 32 )
 +			{
 +				$this->password = $this->hash($password);
 +			}
 +			
 +			$this->newCookieKey();
 +			$this->setCookies($shared);
 +			
 +			if ( $this->cookie_salt !== 'none' )
 +			{
 +				/* secure cookie key */
 +				$this->setCookieKey($this->hash($this->getCookieKey() . $this->cookie_salt));
 +				$this->write();
 +			}
 +			
 +			$errormessage = '';
 +			$manager->notify('LoginSuccess', array('member' => &$member, 'username' => $login) );
 +			ActionLog::add(INFO, "Login successful for $login (sharedpc=$shared)");
 +		}
 +		
 +		return $this->loggedin;
 +	}
 +	
 +	/**
 +	 * Member::cookielogin()
 +	 * Login using cookie key
 +	 * 
 +	 * @param	String	$login	not used
 +	 * @param	String	$cookiekey	not used
 +	 * @return	Boolean	login or not
 +	 */
 +	public function cookielogin($login='', $cookiekey='')
 +	{
 +		global $CONF, $manager;
 +		
 +		if ( !headers_sent() && cookieVar("{$CONF['CookiePrefix']}user") )
 +		{
 +			/* Cookie Authentication */
 +			$ck = cookieVar("{$CONF['CookiePrefix']}loginkey");
 +				
 +			/* TODO: validation for each cookie values */
 +			 	
 +			/* limiting the length of password to avoid hash collision */
 +			$ck = i18n::substr($ck,0,32);
 +				
 +			/* 
 +			 * generate cookie salt from secure cookie key settings
 +			* (either 'none', 0, 8, 16, 24, or 32)
 +			*/
 +			if ( !$this->cookie_salt )
 +			{
 +				$salt = 0;
 +				if ( array_key_exists('secureCookieKey', $CONF) )
 +				{
 +					$salt = $CONF['secureCookieKey'];
 +				}
 +				$this->set_cookie_salt($salt);
 +			}
 +			
 +			if ( $this->cookie_salt !== 'none' )
 +			{
 +				$ck = $this->hash($ck . $this->cookie_salt);
 +			}
 +			$this->loggedin = ( $this->readFromName(cookieVar("{$CONF['CookiePrefix']}user")) && $this->checkCookieKey($ck) );
 +			unset($ck);
 +				
 +			/* renew cookies when not on a shared computer */
 +			if ( $this->loggedin && (cookieVar($CONF['CookiePrefix'] . 'sharedpc') != 1) )
 +			{
 +				$this->setCookieKey(cookieVar("{$CONF['CookiePrefix']}loginkey"));
 +				$this->setCookies();
 +			}
 +		}
 +		return $this->loggedin;
 +	}
 +	
 +	/**
 +	 * Member::logout()
 +	 * logout and expire cookie
 +	 * 
 +	 * @param	Void
 +	 * @return	Void
 +	 */
 +	public function logout()
 +	{
 +		global $CONF, $manager;
 +		
 +		if ( !headers_sent() && cookieVar("{$CONF['CookiePrefix']}user") )
 +		{
 +			/* remove cookies on logout */
 +			setcookie("{$CONF['CookiePrefix']}user", '', (time() - 2592000), $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);
 +			setcookie("{$CONF['CookiePrefix']}loginkey", '', (time() - 2592000), $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);
 +			$manager->notify('Logout', array('username' => cookieVar("{$CONF['CookiePrefix']}user") ) );
 +		}
 +		
 +		$this->loggedin = 0;
 +		return;
 +	}
 +	
 +	/**
 +	 * Member::isLoggedIn()
 +	 * return member is loggedin or not
 +	 * 
 +	 * @param	Void
 +	 * @return	Void
 +	 */
 +	public function isLoggedIn()
 +	{
 +		return $this->loggedin;
 +	}
 +	
 +	/**
 +	 * MEMBER:read()
 +	 * Read member information from the database
 +	 * 
 +	 * @param	String	$where	where statement
 +	 * @return	Resource	SQL resource
 +	 * 
 +	 */
 +	public function read($where)
 +	{
 +		// read info
 +		$query =  'SELECT * FROM '.sql_table('member') . ' WHERE ' . $where;
 +		
 +		$row = DB::getRow($query);
 +		
 +		$this->setRealName($row['mrealname']);
 +		$this->setEmail($row['memail']);
 +		$this->password = $row['mpassword'];
 +		$this->setCookieKey($row['mcookiekey']);
 +		$this->setURL($row['murl']);
 +		$this->setDisplayName($row['mname']);
 +		$this->setAdmin($row['madmin']);
 +		$this->id = $row['mnumber'];
 +		$this->setCanLogin($row['mcanlogin']);
 +		$this->setNotes($row['mnotes']);
 +		$this->setLocale($row['mlocale']);
 +		$this->setAutosave($row['mautosave']);
 +		
 +		return $row ? TRUE : FALSE;
 +	}
 +	
 +	/**
 +	 * Member::isBlogAdmin()
 +	 * Returns true if member is an admin for the given blog
 +	 * (returns false if not a team member)
 +	 * 
 +	 * @param	Integer	$blogid	weblog id
 +	 * @return	Integer	weblog admin or not
 +	 * 
 +	 */
 +	public function isBlogAdmin($blogid)
 +	{
 +		$query = 'SELECT tadmin FROM '.sql_table('team').' WHERE'
 +		. ' tblog=' . intval($blogid)
 +		. ' and tmember='. $this->getID();
 +		$res = DB::getValue($query);
 +		if ( $res )
 +			return ($res == 1);
 +		else
 +			return 0;
 +	}
 +	
 +	/**
 +	 * Member::blogAdminRights()
 +	 * 
 +	 * @param	integer	$blogid	ID of target weblog
 +	 * @return	boolean	whether to have admin rights to the weblog or not
 +	 * 
 +	 */
 +	public function blogAdminRights($blogid)
 +	{
 +		return ($this->isAdmin() || $this->isBlogAdmin($blogid));
 +	}
 +	
 +	/**
 +	 * Member::teamRights()
 +	 * 
 +	 * @param	integer	$blogid	ID of target weblog
 +	 * @return	boolean	whether to have admin right to the weblog or not
 +	 * 
 +	 */
 +	public function teamRights($blogid)
 +	{
 +		return ($this->isAdmin() || $this->isTeamMember($blogid));
 +	}
 +	
 +	/**
 +	 * Member::isTeamMember()
 +	 * Returns true if this member is a team member of the given blog
 +	 * 
 +	 * @param	integer	$blogid	ID of target weblog
 +	 * @return	boolean	whether to join the weblog or not
 +	 * 
 +	 */
 +	public function isTeamMember($blogid)
 +	{
 +		$query = 'SELECT * FROM '.sql_table('team').' WHERE'
 +			   . ' tblog=' . intval($blogid)
 +			   . ' and tmember='. $this->getID();
 +		$res = DB::getResult($query);
 +		return ($res->rowCount() != 0);
 +	}
 +	
 +	/**
 +	 * Member::canAddItem()
 +	 * 
 +	 * @param	integer	$catid	ID of target category
 +	 * @return	boolean	whether to be able to add items to the category or not
 +	 * 
 +	 */
 +	public function canAddItem($catid)
 +	{
 +		global $manager;
 +		
 +		// if this is a 'newcat' style newcat
 +		// no blog admin of destination blog -> NOK
 +		// blog admin of destination blog -> OK
 +		if ( i18n::strpos($catid,'newcat') === 0 )
 +		{
 +			// get blogid
 +			list($blogid) = sscanf($catid,"newcat-%d");
 +			return $this->blogAdminRights($blogid);
 +		}
 +		
 +		// category does not exist -> NOK
 +		if ( !$manager->existsCategory($catid) )
 +		{
 +			return 0;
 +		}
 +		
 +		$blogid = getBlogIDFromCatID($catid);
 +		
 +		// no team rights for blog -> NOK
 +		if (!$this->teamRights($blogid))
 +		{
 +			return 0;
 +		}
 +		
 +		// all other cases: OK
 +		return 1;
 +	}
 +	
 +	/**
 +	 * Member::canAlterComment()
 +	 * Returns true if this member can edit/delete a commentitem. This can be in the
 +	 * following cases:
 +	 *	  - member is a super-admin
 +	 *   - member is the author of the comment
 +	 *   - member is admin of the blog associated with the comment
 +	 *   - member is author of the item associated with the comment
 +	 * 
 +	 * @param	integer	$commentid	ID of target comment
 +	 * @return	boolean	delete/edit the comment or not
 +	 * 
 +	 */
 +	public function canAlterComment($commentid)
 +	{
 +		if ( $this->isAdmin() )
 +		{
 +			return 1;
 +		}
 +		
 +		$query =  'SELECT citem as itemid, iblog as blogid, cmember as cauthor, iauthor'
 +			   . ' FROM '.sql_table('comment') .', '.sql_table('item').', '.sql_table('blog')
 +			   . ' WHERE citem=inumber and iblog=bnumber and cnumber=' . intval($commentid);
 +		$res = DB::getRow($query);
 +		
 +		return ($res['cauthor'] == $this->getID()) or $this->isBlogAdmin($res['blogid']) or ($res['iauthor'] == $this->getID());
 +	}
 +	
 +	/**
 +	 * Member::canAlterItem()
 +	 * Returns true if this member can edit/delete an item. This is true in the following
 +	 * cases: - member is a super-admin
 +	 *	       - member is the author of the item
 +	 *        - member is admin of the the associated blog
 +	 * 
 +	 * @param	integer	$itemid	ID of target item
 +	 * @return	boolean	delete/edit the item or not
 +	 * 
 +	 */
 +	public function canAlterItem($itemid)
 +	{
 +		if ($this->isAdmin()) return 1;
 +		
 +		$query =  'SELECT iblog, iauthor FROM '.sql_table('item').' WHERE inumber=' . intval($itemid);
 +		$res = DB::getRow($query);
 +		return ($res['iauthor'] == $this->getID()) or $this->isBlogAdmin($res['iblog']);
 +	}
 +	
 +	/**
 +	 * Member::canBeDeleted()
 +	 * Return true if member can be deleted. This means that there are no items posted by the member left
 +	 * 
 +	 * @param	void
 +	 * @return	boolean	whether there is no items or exists
 +	 * 
 +	 */
 +	public function canBeDeleted()
 +	{
 +		$res = DB::getResult('SELECT * FROM '.sql_table('item').' WHERE iauthor=' . $this->getID());
 +		return ( $res->rowCount() == 0 );
 +	}
 +	
 +	/**
 +	 * Member::canUpdateItem()
 +	 * returns true if this member can move/update an item to a given category,
 +	 * false if not (see comments fot the tests that are executed)
 +	 * 
 +	 * @param	integer	$itemid
 +	 * @param	string	$newcat (can also be of form 'newcat-x' with x=blogid)
 +	 * @return	boolean	whether being able to update the item or not
 +	 * 
 +	 */
 +	public function canUpdateItem($itemid, $newcat)
 +	{
 +		global $manager;
 +		
 +		// item does not exists -> NOK
 +		if ( !$manager->existsItem($itemid,1,1) )
 +		{
 +			return 0;
 +		}
 +		
 +		// cannot alter item -> NOK
 +		if (!$this->canAlterItem($itemid))
 +		{
 +			return 0;
 +		}
 +		
 +		// if this is a 'newcat' style newcat
 +		// no blog admin of destination blog -> NOK
 +		// blog admin of destination blog -> OK
 +		if ( i18n::strpos($newcat, 'newcat') === 0 )
 +		{
 +			// get blogid
 +			list($blogid) = sscanf($newcat, 'newcat-%d');
 +			return $this->blogAdminRights($blogid);
 +		}
 +		
 +		// category does not exist -> NOK
 +		if (!$manager->existsCategory($newcat))
 +		{
 +			return 0;
 +		}
 +		
 +		// get item
 +		$item =& $manager->getItem($itemid,1,1);
 +		
 +		// old catid = new catid -> OK
 +		if ($item['catid'] == $newcat)
 +		{
 +			return 1;
 +		}
 +		
 +		// not a valid category -> NOK
 +		$validCat = DB::getValue('SELECT COUNT(*) AS result FROM '.sql_table('category').' WHERE catid='.intval($newcat));
 +		if ( !$validCat )
 +		{
 +			return 0;
 +		}
 +		
 +		// get destination blog
 +		$source_blogid = getBlogIDFromItemID($itemid);
 +		$dest_blogid = getBlogIDFromCatID($newcat);
 +		
 +		// not a team member of destination blog -> NOK
 +		if ( !$this->teamRights($dest_blogid) )
 +		{
 +			return 0;
 +		}
 +		
 +		// if member is author of item -> OK
 +		if ( $item['authorid'] == $this->getID() )
 +		{
 +			return 1;
 +		}
 +		
 +		// if member has admin rights on both blogs: OK
 +		if ( ($this->blogAdminRights($dest_blogid)) && ($this->blogAdminRights($source_blogid)) )
 +		{
 +			return 1;
 +		}
 +		
 +		// all other cases: NOK
 +		return 0;
 +	}
 +	
 +	/**
 +	 * Member::setCookies()
 +	 * Sets the cookies for the member
 +	 * 
 +	 * @param boolean	$shared	set this to 1 when using a shared computer. Cookies will expire
 +	 *				at the end of the session in this case.
 +	 * @return	void
 +	 * 
 +	 */
 +	public function setCookies($shared = 0)
 +	{
 +		global $CONF;
 +		
 +		if ( $CONF['SessionCookie'] || $shared )
 +		{
 +			$lifetime = 0;
 +		}
 +		else
 +		{
 +			$lifetime = time()+2592000;
 +		}
 +		
 +		setcookie($CONF['CookiePrefix'] . 'user', $this->getDisplayName(), $lifetime, $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);
 +		setcookie($CONF['CookiePrefix'] . 'loginkey', $this->getCookieKey(), $lifetime, $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);
 +		
 +		// make sure cookies on shared pcs don't get renewed
 +		if ( $shared )
 +		{
 +			setcookie($CONF['CookiePrefix'] .'sharedpc', '1',$lifetime,$CONF['CookiePath'],$CONF['CookieDomain'],$CONF['CookieSecure']);
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * Member::sendActivationLink()
 +	 * Send activation mail
 +	 * 
 +	 * @param	string	$type	activation type
 +	 * @param	string	$extra	extra info
 +	 * @return	void
 +	 */
 +	public function sendActivationLink($type, $extra='')
 +	{
 +		global $CONF;
 +		
 +		if ( !isset($CONF['ActivationDays']) )
 +		{
 +			$CONF['ActivationDays'] = 2;
 +		}
 +		
 +		// generate key and URL
 +		$key = $this->generateActivationEntry($type, $extra);
 +		$url = $CONF['AdminURL'] . 'index.php?action=activate&key=' . $key;
 +		
 +		// choose text to use in mail
 +		switch ( $type )
 +		{
 +			case 'register':
 +				$message = _ACTIVATE_REGISTER_MAIL;
 +				$subject = _ACTIVATE_REGISTER_MAILTITLE;
 +				break;
 +			case 'forgot':
 +				$message = _ACTIVATE_FORGOT_MAIL;
 +				$subject = _ACTIVATE_FORGOT_MAILTITLE;
 +				break;
 +			case 'addresschange':
 +				$message = _ACTIVATE_CHANGE_MAIL;
 +				$subject = _ACTIVATE_CHANGE_MAILTITLE;
 +				break;
 +			default;
 +		}
 +		
 +		// fill out variables in text
 +		$aVars = array(
 +			'siteName' => $CONF['SiteName'],
 +			'siteUrl' => $CONF['IndexURL'],
 +			'memberName' => $this->getDisplayName(),
 +			'activationUrl' => $url,
 +			'activationDays' => $CONF['ActivationDays']
 +		);
 +		
 +		$message = Template::fill($message, $aVars);
 +		$subject = Template::fill($subject, $aVars);
 +		
 +		// send mail
 +		NOTIFICATION::mail($this->getEmail(), $subject ,$message, $CONF['AdminEmail'], i18n::get_current_charset());
 +		
 +		ActionLog::add(INFO, _ACTIONLOG_ACTIVATIONLINK . ' (' . $this->getDisplayName() . ' / type: ' . $type . ')');
 +		return;
 +	}
 +	
 +	/**
 +	 * Member::getAdminBlogs()
 +	 * Returns an array of all blogids for which member has admin rights
 +	 * 
 +	 * @param	void
 +	 * @return	array	weblog IDs in which this member has admin rights
 +	 * 
 +	 */
 +	public function getAdminBlogs()
 +	{
 +		$blogs = array();
 +		
 +		if ($this->isAdmin())
 +		{
 +			$query = 'SELECT bnumber as blogid from '.sql_table('blog');
 +		}
 +		else
 +		{
 +			$query = 'SELECT tblog as blogid from '.sql_table('team').' where tadmin=1 and tmember=' . $this->getID();
 +		}
 +		
 +		$res = DB::getResult($query);
 +		if ( $res->rowCount() > 0 )
 +		{
 +			foreach ( $res as $row )
 +			{
 +				array_push($blogs, $row['blogid']);
 +			}
 +		}
 +		return $blogs;
 +	}
 +	
 +	/**
 +	 * Member::getTeamBlogs()
 +	 * Returns an array of all blogids for which member has team rights
 +	 * 
 +	 * @param	boolean	$incAdmin	whether checking weblog admin rights or not
 +	 * @return	array	weblog IDs in which this member join
 +	 * 
 +	 */
 +	public function getTeamBlogs($incAdmin = 1)
 +	{
 +		$incAdmin = intval($incAdmin);
 +		$blogs = array();
 +		
 +		if ( $this->isAdmin() && $incAdmin )
 +		{
 +			$query = 'SELECT bnumber as blogid from '.sql_table('blog');
 +		}
 +		else
 +		{
 +			$query = 'SELECT tblog as blogid from '.sql_table('team').' where tmember=' . $this->getID();
 +		}
 +		
 +		$res = DB::getResult($query);
 +		if ( $res->rowCount() > 0 )
 +		{
 +			foreach ( $res as $row )
 +			{
 +				array_push($blogs, $row['blogid']);
 +			}
 +		}
 +		return $blogs;
 +	}
 +	
 +	/**
 +	 * Member::getNotifyFromMailAddress()
 +	 * 
 +	 * Returns an email address from which notification of commenting/karma voting can
 +	 * be sent. A suggestion can be given for when the member is not logged in
 +	 * 
 +	 * @param	String	$suggest
 +	 * @return	String	mail address or suggestion
 +	 */
 +	public function getNotifyFromMailAddress($suggest = "")
 +	{
 +		global $CONF;
 +		if ( $this->isLoggedIn() )
 +		{
 +			return $this->getDisplayName() . " <" . $this->getEmail() . ">";
 +		}
 +		else if ( NOTIFICATION::address_validation($suggest) )
 +		{
 +			return $suggest;
 +		}
 +		return $CONF['AdminEmail'];
 +	}
 +	
 +	/**
 +	 * Member::write()
 +	 * Write data to database
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 * 
 +	 */
 +	public function write()
 +	{
 +		$query =  'UPDATE '.sql_table('member')
 +		        . ' SET mname=' . DB::quoteValue($this->displayname) . ', '
 +		           . 'mrealname='. DB::quoteValue($this->realname) . ', '
 +		           . 'mpassword='. DB::quoteValue($this->password) . ', '
 +		           . 'mcookiekey='. DB::quoteValue($this->cookiekey) . ', '
 +		           . 'murl=' . DB::quoteValue($this->url) . ', '
 +		           . 'memail=' . DB::quoteValue($this->email) . ', '
 +		           . 'madmin=' . intval($this->admin) . ', '
 +		           . 'mnotes=' . DB::quoteValue($this->notes) . ', '
 +		           . 'mcanlogin=' . intval($this->canlogin) . ', '
 +		           . 'mlocale=' . DB::quoteValue($this->locale) . ', '
 +		           . 'mautosave=' . intval($this->autosave) . ' '
 +		        . 'WHERE mnumber=' . intval($this->id);
 +		DB::execute($query);
 +		return;
 +	}
 +	
 +	public function checkCookieKey($key)
 +	{
 +		return ( ($key != '') && ( $key == $this->getCookieKey() ) );
 +	}
 +	
 +	public function checkPassword($pw)
 +	{
 +		/* for lower compatibility (md5) */
 +		if ( strlen($this->password) === 32 )
 +		{
 +			return (md5($pw) == $this->password);
 +		}
 +		return ($this->hash($pw) == $this->password);
 +	}
 +	
 +	public function getRealName()
 +	{
 +		return $this->realname;
 +	}
 +	
 +	public function setRealName($name)
 +	{
 +		$this->realname = $name;
 +	}
 +	
 +	public function getEmail()
 +	{
 +		return $this->email;
 +	}
 +	
 +	public function setEmail($email)
 +	{
 +		$this->email = $email;
 +	}
 +	
 +	public function getPassword()
 +	{
 +		return $this->password;
 +	}
 +	
 +	public function setPassword($pwd)
 +	{
 +		$this->password = $this->hash($pwd);
 +	}
 +	
 +	public function getCookieKey()
 +	{
 +		return $this->cookiekey;
 +	}
 +	
 +	/**
 +	 * Member::newCookieKey()
 +	 * Generate new cookiekey, save it, and return it
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 * 
 +	 */
 +	public function newCookieKey()
 +	{
 +		mt_srand( (double) microtime() * 1000000);
 +		$this->cookiekey = $this->hash(uniqid(mt_rand()));
 +		$this->write();
 +		return $this->cookiekey;
 +	}
 +	
 +	public function setCookieKey($val)
 +	{
 +		$this->cookiekey = $val;
 +	}
 +	
 +	public function getURL()
 +	{
 +		return $this->url;
 +	}
 +	
 +	public function setURL($site)
 +	{
 +		$this->url = $site;
 +	}
 +	
 +	public function getLocale()
 +	{
 +		return $this->locale;
 +	}
 +	
 +	public function setLocale($locale)
 +	{
 +		if ( !preg_match('#^(.+)_(.+)_(.+)$#', $locale)
 +		 && ($locale = i18n::convert_old_language_file_name_to_locale($locale)) === FALSE )
 +		{
 +			$locale = '';
 +		}
 +		$this->locale = $locale;
 +		return;
 +	}
 +	
 +	public function setDisplayName($nick)
 +	{
 +		$this->displayname = $nick;
 +	}
 +	
 +	public function getDisplayName()
 +	{
 +		return $this->displayname;
 +	}
 +	
 +	public function isAdmin()
 +	{
 +		return $this->admin;
 +	}
 +	
 +	public function setAdmin($val)
 +	{
 +		$this->admin = $val;
 +	}
 +	
 +	public function canLogin()
 +	{
 +		return $this->canlogin;
 +	}
 +	
 +	public function setCanLogin($val)
 +	{
 +		$this->canlogin = $val;
 +	}
 +	
 +	public function getNotes()
 +	{
 +		return $this->notes;
 +	}
 +	
 +	public function setNotes($val)
 +	{
 +		$this->notes = $val;
 +	}
 +	
 +	public function getAutosave()
 +	{
 +		return $this->autosave;
 +	}
 +	
 +	public function setAutosave($val)
 +	{
 +		$this->autosave = $val;
 +		return;
 +	}
 +	
 +	/**
 +	 * Member::getID()
 +	 * 
 +	 * @param	void
 +	 * @return	integer	id of this member object
 +	 * 
 +	 */
 +	public function getID()
 +	{
 +		return $this->id;
 +	}
 +	
 +	/**
 +	 * Member::exists()
 +	 * Returns true if there is a member with the given login name
 +	 * 
 +	 * @static
 +	 * @param	string	$name	target name
 +	 * @return	boolean	whether target name exists or not
 +	 */
 +	public static function exists($name)
 +	{
 +		$r = DB::getResult('SELECT * FROM ' . sql_table('member') . ' WHERE mname=' . DB::quoteValue($name));
 +		return ( $r->rowCount() != 0 );
 +	}
 +	
 +	/**
 +	 * Member::existsID()
 +	 * Returns true if there is a member with the given ID
 +	 * 
 +	 * @static
 +	 * @param	integer	$id	target id
 +	 * @return	boolean	whether target id exists or not
 +	 * 
 +	 */
 +	public static function existsID($id)
 +	{
 +		$r = DB::getResult('SELECT * FROM ' . sql_table('member') . ' WHERE mnumber=' . intval($id));
 +		return ( $r->rowCount() != 0 );
 +	}
 +	
 +	/**
 +	 * Member::isNameProtected()
 +	 *  Checks if a username is protected.
 +	 *  If so, it can not be used on anonymous comments
 +	 * 
 +	 * @param	string	$name	target name
 +	 * @return	boolean	whether the name exists or not
 +	 * 
 +	 */
 +	public function isNameProtected($name)
 +	{
 +		// extract name
 +		$name = strip_tags($name);
 +		$name = trim($name);
 +		return self::exists($name);
 +	}
 +	
 +	/**
 +	 * Member::create()
 +	 * Adds a new member
 +	 * 
 +	 * @static
 +	 * @param	String	$name
 +	 * @param	String	$realname
 +	 * @param	String	$password
 +	 * @param	String	$email
 +	 * @param	String	$url
 +	 * @param	String	$admin
 +	 * @param	String	$canlogin
 +	 * @param	String	$notes
 +	 * @return	String	1 if success, others if fail
 +	 */
 +	static public function create($name, $realname, $password, $email, $url, $admin, $canlogin, $notes)
 +	{
 +		if ( !NOTIFICATION::address_validation($email) )
 +		{
 +			return _ERROR_BADMAILADDRESS;
 +		}
 +		
 +		/* TODO: this method should be in MEMBER class, not globalfunctions */
 +		if ( !isValidDisplayName($name) )
 +		{
 +			return _ERROR_BADNAME;
 +		}
 +		
 +		if ( self::exists($name) )
 +		{
 +			return _ERROR_NICKNAMEINUSE;
 +		}
 +		
 +		if ( !$realname )
 +		{
 +			return _ERROR_REALNAMEMISSING;
 +		}
 +		
 +		/* TODO: check the number of characters */
 +		if ( !$password )
 +		{
 +			return _ERROR_PASSWORDMISSING;
 +		}
 +		
 +		/* 
 +		 *  begin if: sometimes user didn't prefix the URL with http:// or https://,
 +		 *  this cause a malformed URL. Let's fix it.
 +		 */
 +		
 +		if ( !preg_match('#^https?://#', $url) )
 +		{
 +			$url = 'http://' . $url;
 +		}
 +		
 +		$name		= DB::quoteValue($name);
 +		$realname	= DB::quoteValue($realname);
 +		/* NOTE: hashed password is automatically updated if the length is 32 bytes when logging in */
 +		$password	= DB::quoteValue(md5($password));
 +		$email		= DB::quoteValue($email);
 +		$url		= DB::quoteValue($url);
 +		$admin		= (integer) $admin;
 +		$canlogin	= (integer) $canlogin;
 +		$notes		= DB::quoteValue($notes);
 +		
 +		$query = "INSERT INTO %s"
 +		       . " (MNAME,MREALNAME,MPASSWORD,MEMAIL,MURL, MADMIN, MCANLOGIN, MNOTES)"
 +		       . " VALUES (%s, %s, %s, %s, %s, %d, %d, %s)";
 +		$query = sprintf($query, sql_table('member'), $name, $realname, $password, $email, $url, $admin, $canlogin, $notes);
 +		DB::execute($query);
 +		
 +		ActionLog::add(INFO, _ACTIONLOG_NEWMEMBER . ' ' . $name);
 +		
 +		return 1;
 +	}
 +	
 +	/**
 +	 * Member::getActivationInfo()
 +	 * Returns activation info for a certain key (an object with properties vkey, vmember, ...)
 +	 * 
 +	 * @static
 +	 * @param	string	$key	activation key
 +	 * @return	mixed	return 0 if failed, else return activation table object
 +	 * 
 +	 */
 +	public static function getActivationInfo($key)
 +	{
 +		$query = 'SELECT * FROM ' . sql_table('activation') . ' WHERE vkey=' . DB::quoteValue($key);
 +		$res = DB::getResult($query);
 +		
 +		if ( !$res || ($res->rowCount() == 0) )
 +		{
 +			return 0;
 +		}
 +		return $res->fetch();
 +	}
 +	
 +	/**
 +	 * Member::generateActivationEntry()
 +	 * Creates an account activation key
 +	 * addresschange -> old email address
 +	 * 
 +	 * @param	string	$type	one of the following values (determines what to do when activation expires)
 +	 * 				'register'	(new member registration)
 +	 * 				'forgot'	(forgotton password)
 +	 * 				'addresschange'	(member address has changed)
 +	 * @param	string	$extra	extra info (needed when validation link expires)
 +	 * @return	string	activation key
 +	 */
 +	public function generateActivationEntry($type, $extra = '')
 +	{
 +		// clean up old entries
 +		$this->cleanupActivationTable();
 +		
 +		// kill any existing entries for the current member (delete is ok)
 +		// (only one outstanding activation key can be present for a member)
 +		DB::execute('DELETE FROM ' . sql_table('activation') . ' WHERE vmember=' . intval($this->getID()));
 +		
 +		// indicates if the member can log in while the link is active
 +		$canLoginWhileActive = false;
 +		switch ( $type )
 +		{
 +			case 'forgot':
 +				$canLoginWhileActive = true;
 +				break;
 +			case 'register':
 +				break;
 +			case 'addresschange':
 +				$extra = $extra . '/' . ( $this->canLogin() ? '1' : '0' );
 +				break;
 +		}
 +		
 +		$ok = false;
 +		while ( !$ok )
 +		{
 +			// generate a random key
 +			srand((double)microtime()*1000000);
 +			$key = $this->hash(uniqid(rand(), true));
 +			
 +			// attempt to add entry in database
 +			// add in database as non-active
 +			$query = 'INSERT INTO %s (vkey, vtime, vmember, vtype, vextra) VALUES (%s, %s, %d, %s, %s)';
 +			$query = sprintf($query
 +				, sql_table('activation')
 +				, DB::quoteValue($key)
 +				, DB::formatDateTime()
 +				, intval($this->getID())
 +				, DB::quoteValue($type)
 +				, DB::quoteValue($extra)
 +			);
 +			if ( DB::execute($query) !== FALSE )
 +				$ok = true;
 +		}
 +		
 +		// mark member as not allowed to log in
 +		if ( !$canLoginWhileActive )
 +		{
 +			$this->setCanLogin(0);
 +			$this->write();
 +		}
 +		
 +		// return the key
 +		return $key;
 +	}
 +	
 +	/**
 +	 * Member::activate()
 +	 * Inidicates that an activation link has been clicked and any forms displayed
 +	 * there have been successfully filled out.
 +	 * 
 +	 * @param	string	$key	activation key
 +	 * @return	boolean
 +	 * 
 +	 */
 +	public function activate($key)
 +	{
 +		// get activate info
 +		$info = self::getActivationInfo($key);
 +		
 +		// no active key
 +		if ( !$info )
 +		{
 +			return false;
 +		}
 +		
 +		switch ( $info['vtype'] )
 +		{
 +			case 'forgot':
 +				// nothing to do
 +				break;
 +			case 'register':
 +				// set canlogin value
 +				global $CONF;
 +				DB::execute('UPDATE ' . sql_table('member') . ' SET mcanlogin=' . intval($CONF['NewMemberCanLogon']). ' WHERE mnumber=' . intval($info['vmember']));
 +				break;
 +			case 'addresschange':
 +				// reset old 'canlogin' value
 +				list($oldEmail, $oldCanLogin) = preg_split('#/#', $info['vextra']);
 +				DB::execute('UPDATE ' . sql_table('member') . ' SET mcanlogin=' . intval($oldCanLogin). ' WHERE mnumber=' . intval($info['vmember']));
 +				break;
 +		}
 +		
 +		// delete from activation table
 +		DB::execute('DELETE FROM ' . sql_table('activation') . ' WHERE vkey=' . DB::quoteValue($key));
 +		
 +		// success!
 +		return true;
 +	}
 +	
 +	/**
 +	 * Member::cleanupActivationTable()
 +	 * Cleans up entries in the activation table. All entries older than 2 days are removed.
 +	 * (static)
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	public function cleanupActivationTable()
 +	{
 +		$actdays = 2;
 +		if ( isset($CONF['ActivationDays']) && intval($CONF['ActivationDays']) > 0 )
 +		{
 +			$actdays = intval($CONF['ActivationDays']);
 +		}
 +		else
 +		{
 +			$CONF['ActivationDays'] = 2;
 +		}
 +		$boundary = time() - (60 * 60 * 24 * $actdays);
 +		
 +		// 1. walk over all entries, and see if special actions need to be performed
 +		$query = sprintf('SELECT * FROM %s WHERE vtime < %s', sql_table('activation'), DB::formatDateTime($boundary));
 +		$res = DB::getResult($query);
 +		
 +		foreach ( $res as $row )
 +		{
 +			switch ( $row['vtype'] )
 +			{
 +				case 'register':
 +					// delete all information about this site member. registration is undone because there was
 +					// no timely activation
 +					include_once($DIR_LIBS . 'ADMIN.php');
 +					Admin::deleteOneMember(intval($row['vmember']));
 +					break;
 +				case 'addresschange':
 +					// revert the e-mail address of the member back to old address
 +					list($oldEmail, $oldCanLogin) = preg_split('#/#', $row['vextra']);
 +					DB::execute('UPDATE ' . sql_table('member') . ' SET mcanlogin=' . intval($oldCanLogin). ', memail=' . DB::quoteValue($oldEmail). ' WHERE mnumber=' . intval($row['vmember']));
 +					break;
 +				case 'forgot':
 +					// delete the activation link and ignore. member can request a new password using the
 +					// forgot password link
 +					break;
 +			}
 +		}
 +		
 +		// 2. delete activation entries for real
 +		$query = sprintf('DELETE FROM %s WHERE vtime < %s', sql_table('activation'), DB::formatDateTime($boundary));
 +		DB::execute($query);
 +		return;
 +	}
 +	
 +	/**
 +	 * Member::$language
 +	 * 
 +	 * @obsolete
 +	 * @param	void
 +	 * @return	void
 +	 * 
 +	 */
 +	public $language = '';
 +	/**
 +	 * Member::getLanguage()
 +	 * 
 +	 * @obsolete
 +	 * @param	void
 +	 * @return	void
 +	 * 
 +	 */
 +	public function getLanguage()
 +	{
 +		if ( ($language = i18n::convert_locale_to_old_language_file_name($this->locale)) === FALSE )
 +		{
 +			$language = '';
 +		}
 +		return $language;
 +	}
 +}
++=======
+ <?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)
+  */
+ /**
+  * A class representing site members
+  * 
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: MEMBER.php 1616 2012-01-08 09:48:15Z sakamocchi $
+  */
+ class Member
+ {
+ 	// 1 when authenticated, 0 when not
+ 	public $loggedin = 0;
+ 	public $password;		// not the actual password, but rather a MD5 hash
+ 	private $algorism = 'md5';
+ 	
+ 	public $cookiekey;		// value that should also be in the client cookie to allow authentication
+ 	private $cookie_salt = FALSE;
+ 	
+ 	// member info
+ 	public $id = -1;
+ 	public $realname;
+ 	public $displayname;
+ 	public $email;
+ 	public $url;
+ 	public $admin = 0;			// (either 0 or 1)
+ 	public $canlogin = 0;		// (either 0 or 1)
+ 	public $notes;
+ 	public $autosave = 1;		// if the member use the autosave draft function
+ 	public $adminskin = 0;		// if the member use the autosave draft function
+ 	public $bookmarklet = 0;		// if the member use the autosave draft function
+ 	private $locale = '';
+ 	
+ 	/**
+ 	 * Member::__construct()
+ 	 * Constructor for a member object
+ 	 * 
+ 	 * @param	Void
+ 	 * @return	Void
+ 	 * 
+ 	 */
+ 	public function __construct()
+ 	{
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Member::createFromName()
+ 	 * Create a member object for a given displayname
+ 	 * 
+ 	 * @static
+ 	 * @param	String	$displayname	login name
+ 	 * @return	Object	member object
+ 	 * 
+ 	 */
+ 	public static function &createFromName($displayname)
+ 	{
+ 		$mem = new Member();
+ 		$mem->readFromName($displayname);
+ 		return $mem;
+ 	}
+ 	
+ 	/**
+ 	 * Member::createFromID()
+ 	 * Create a member object for a given ID
+ 	 * 
+ 	 * @static
+ 	 * @param	Integer	$id	id for member
+ 	 */
+ 	public static function &createFromID($id)
+ 	{
+ 		$mem = new Member();
+ 		$mem->readFromID($id);
+ 		return $mem;
+ 	}
+ 	
+ 	/**
+ 	 * Member::readFromName()
+ 	 * Read member table in database
+ 	 * 
+ 	 * @param	String	$displayname	login name
+ 	 * @return	Object	SQL resource
+ 	 * 
+ 	 */
+ 	public function readFromName($displayname)
+ 	{
+ 		return $this->read('mname='.DB::quoteValue($displayname));
+ 	}
+ 	
+ 	/**
+ 	 * Member::readFromID()
+ 	 * Read member table in database
+ 	 * 
+ 	 * @param	Integer	$id	id for member
+ 	 * @return	Object	SQL resource
+ 	 * 
+ 	 */
+ 	public function readFromID($id)
+ 	{
+ 		return $this->read("mnumber=" . intval($id));
+ 	}
+ 	
+ 	/**
+ 	 * Member::hash()
+ 	 * hash the target string
+ 	 * 
+ 	 * @param	String	$string	target string
+ 	 * @return	Void	hashed string
+ 	 */
+ 	public function hash($string)
+ 	{
+ 		switch ( $this->algorism )
+ 		{
+ 			case 'md5':
+ 			default:
+ 				$string = md5($string);
+ 		}
+ 		return $string;
+ 	}
+ 	
+ 	/**
+ 	 * Member::set_cookie_salt()
+ 	 * 
+ 	 * @param	integer	$key	secureCookieKey value
+ 	 * @return	void
+ 	 * 
+ 	 */
+ 	private function set_cookie_salt($key = 0)
+ 	{
+ 		if ( !$key )
+ 		{
+ 			$key = 24;
+ 		}
+ 		
+ 		switch( $key )
+ 		{
+ 			case 8:
+ 				$this->cookie_salt = preg_replace('/\.[0-9]+\.[0-9]+\.[0-9]+$/', '', serverVar('REMOTE_ADDR'));
+ 				break;
+ 			case 16:
+ 				$this->cookie_salt = preg_replace('/\.[0-9]+\.[0-9]+$/', '', serverVar('REMOTE_ADDR'));
+ 				break;
+ 			case 24:
+ 				$this->cookie_salt = preg_replace('/\.[0-9]+$/', '', serverVar('REMOTE_ADDR'));
+ 				break;
+ 			case 32:
+ 				$this->cookie_salt = serverVar('REMOTE_ADDR');
+ 				break;
+ 			default:
+ 				$this->cookie_salt = 'none';
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Member::login()
+ 	 * Tries to login as a given user.
+ 	 * Returns true when succeeded, returns false when failed
+ 	 * 3.40 adds CustomLogin event
+ 	 * 
+ 	 * @param	String	$login	login name for member
+ 	 * @param	String	$password	password for member
+ 	 * @param	Integer	$shared	whether the user agent is shared or not
+ 	 * 
+ 	 */
+ 	public function login($login, $password, $shared=1)
+ 	{
+ 		global $CONF, $errormessage, $manager;
+ 		
+ 		/* TODO: validation for $login, $password, $shared */
+ 		if ( $login == '' || $password == '' )
+ 		{
+ 			return 0;
+ 		}
+ 		/* limiting the length of password to avoid hash collision */
+ 		$password=i18n::substr($password, 0, 40);
+ 		
+ 		/* 
+ 		 * generate cookie salt from secure cookie key settings
+ 		* (either 'none', 0, 8, 16, 24, or 32)
+ 		*/
+ 		if ( !$this->cookie_salt )
+ 		{
+ 			$salt = 0;
+ 			if ( array_key_exists('secureCookieKey', $CONF) )
+ 			{
+ 				$salt = $CONF['secureCookieKey'];
+ 			}
+ 			$this->set_cookie_salt($salt);
+ 		}
+ 		
+ 		$success = 0;
+ 		$allowlocal = 1;
+ 		$data = array('login' => &$login, 'password'=>&$password, 'success'=>&$success, 'allowlocal'=>&$allowlocal);
+ 		$manager->notify('CustomLogin', $data);
+ 		
+ 		$this->loggedin = 0;
+ 		if ( $success )
+ 		{
+ 			$this->loggedin = ( $this->readFromName($login) );
+ 		}
+ 		elseif ( $allowlocal )
+ 		{
+ 			$this->loggedin = ( $this->readFromName($login) && $this->checkPassword($password) );
+ 		}
+ 		
+ 		/* login failed */
+ 		if ( !$this->loggedin )
+ 		{
+ 			$trimlogin = trim($login);
+ 			if ( empty($trimlogin) )
+ 			{
+ 				$errormessage = "Please enter a username.";
+ 			}
+ 			else
+ 			{
+ 				$errormessage = 'Login failed for ' . $login;
+ 			}
+ 			$data = array('username' => $login);
+ 			$manager->notify('LoginFailed', $data);
+ 			ActionLog::add(INFO, $errormessage);
+ 		}
+ 		/* login success */
+ 		else
+ 		{
+ 			/* For lower compatibility */
+ 			if ( strlen($this->password) === 32 )
+ 			{
+ 				$this->password = $this->hash($password);
+ 			}
+ 			
+ 			$this->newCookieKey();
+ 			$this->setCookies($shared);
+ 			
+ 			if ( $this->cookie_salt !== 'none' )
+ 			{
+ 				/* secure cookie key */
+ 				$this->setCookieKey($this->hash($this->getCookieKey() . $this->cookie_salt));
+ 				$this->write();
+ 			}
+ 			
+ 			$errormessage = '';
+ 			$data = array('member' => &$this, 'username' => $login);
+ 			$manager->notify('LoginSuccess', $data);
+ 			ActionLog::add(INFO, "Login successful for $login (sharedpc=$shared)");
+ 		}
+ 		
+ 		return $this->loggedin;
+ 	}
+ 	
+ 	/**
+ 	 * Member::cookielogin()
+ 	 * Login using cookie key
+ 	 * 
+ 	 * @param	String	$login	not used
+ 	 * @param	String	$cookiekey	not used
+ 	 * @return	Boolean	login or not
+ 	 */
+ 	public function cookielogin($login='', $cookiekey='')
+ 	{
+ 		global $CONF, $manager;
+ 		
+ 		if ( !headers_sent() && cookieVar("{$CONF['CookiePrefix']}user") )
+ 		{
+ 			/* Cookie Authentication */
+ 			$ck = cookieVar("{$CONF['CookiePrefix']}loginkey");
+ 				
+ 			/* TODO: validation for each cookie values */
+ 			 	
+ 			/* limiting the length of password to avoid hash collision */
+ 			$ck = i18n::substr($ck,0,32);
+ 				
+ 			/* 
+ 			 * generate cookie salt from secure cookie key settings
+ 			* (either 'none', 0, 8, 16, 24, or 32)
+ 			*/
+ 			if ( !$this->cookie_salt )
+ 			{
+ 				$salt = 0;
+ 				if ( array_key_exists('secureCookieKey', $CONF) )
+ 				{
+ 					$salt = $CONF['secureCookieKey'];
+ 				}
+ 				$this->set_cookie_salt($salt);
+ 			}
+ 			
+ 			if ( $this->cookie_salt !== 'none' )
+ 			{
+ 				$ck = $this->hash($ck . $this->cookie_salt);
+ 			}
+ 			$this->loggedin = ( $this->readFromName(cookieVar("{$CONF['CookiePrefix']}user")) && $this->checkCookieKey($ck) );
+ 			unset($ck);
+ 				
+ 			/* renew cookies when not on a shared computer */
+ 			if ( $this->loggedin && (cookieVar($CONF['CookiePrefix'] . 'sharedpc') != 1) )
+ 			{
+ 				$this->setCookieKey(cookieVar("{$CONF['CookiePrefix']}loginkey"));
+ 				$this->setCookies();
+ 			}
+ 		}
+ 		return $this->loggedin;
+ 	}
+ 	
+ 	/**
+ 	 * Member::logout()
+ 	 * logout and expire cookie
+ 	 * 
+ 	 * @param	Void
+ 	 * @return	Void
+ 	 */
+ 	public function logout()
+ 	{
+ 		global $CONF, $manager;
+ 		
+ 		if ( !headers_sent() && cookieVar("{$CONF['CookiePrefix']}user") )
+ 		{
+ 			/* remove cookies on logout */
+ 			setcookie("{$CONF['CookiePrefix']}user", '', (time() - 2592000), $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);
+ 			setcookie("{$CONF['CookiePrefix']}loginkey", '', (time() - 2592000), $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);
+ 			$data = array('username' => cookieVar("{$CONF['CookiePrefix']}user"));
+ 			$manager->notify('Logout', $data);
+ 		}
+ 		
+ 		$this->loggedin = 0;
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Member::isLoggedIn()
+ 	 * return member is loggedin or not
+ 	 * 
+ 	 * @param	Void
+ 	 * @return	Void
+ 	 */
+ 	public function isLoggedIn()
+ 	{
+ 		return $this->loggedin;
+ 	}
+ 	
+ 	/**
+ 	 * MEMBER:read()
+ 	 * Read member information from the database
+ 	 * 
+ 	 * @param	String	$where	where statement
+ 	 * @return	Resource	SQL resource
+ 	 * 
+ 	 */
+ 	public function read($where)
+ 	{
+ 		// read info
+ 		$query =  'SELECT * FROM '.sql_table('member') . ' WHERE ' . $where;
+ 		
+ 		$row = DB::getRow($query);
+ 		
+ 		$this->setRealName($row['mrealname']);
+ 		$this->setEmail($row['memail']);
+ 		$this->password = $row['mpassword'];
+ 		$this->setCookieKey($row['mcookiekey']);
+ 		$this->setURL($row['murl']);
+ 		$this->setDisplayName($row['mname']);
+ 		$this->setAdmin($row['madmin']);
+ 		$this->id = $row['mnumber'];
+ 		$this->setCanLogin($row['mcanlogin']);
+ 		$this->setNotes($row['mnotes']);
+ 		$this->setLocale($row['mlocale']);
+ 		$this->setAutosave($row['mautosave']);
+ 		$this->setAdminSkin($row['madminskin']);
+ 		$this->setBookmarklet($row['mbkmklt']);
+ 		
+ 		return $row ? TRUE : FALSE;
+ 	}
+ 	
+ 	/**
+ 	 * Member::isBlogAdmin()
+ 	 * Returns true if member is an admin for the given blog
+ 	 * (returns false if not a team member)
+ 	 * 
+ 	 * @param	Integer	$blogid	weblog id
+ 	 * @return	Integer	weblog admin or not
+ 	 * 
+ 	 */
+ 	public function isBlogAdmin($blogid)
+ 	{
+ 		$query = 'SELECT tadmin FROM '.sql_table('team').' WHERE'
+ 		. ' tblog=' . intval($blogid)
+ 		. ' and tmember='. $this->getID();
+ 		$res = DB::getValue($query);
+ 		if ( $res )
+ 			return ($res == 1);
+ 		else
+ 			return 0;
+ 	}
+ 	
+ 	/**
+ 	 * Member::blogAdminRights()
+ 	 * 
+ 	 * @param	integer	$blogid	ID of target weblog
+ 	 * @return	boolean	whether to have admin rights to the weblog or not
+ 	 * 
+ 	 */
+ 	public function blogAdminRights($blogid)
+ 	{
+ 		return ($this->isAdmin() || $this->isBlogAdmin($blogid));
+ 	}
+ 	
+ 	/**
+ 	 * Member::teamRights()
+ 	 * 
+ 	 * @param	integer	$blogid	ID of target weblog
+ 	 * @return	boolean	whether to have admin right to the weblog or not
+ 	 * 
+ 	 */
+ 	public function teamRights($blogid)
+ 	{
+ 		return ($this->isAdmin() || $this->isTeamMember($blogid));
+ 	}
+ 	
+ 	/**
+ 	 * Member::isTeamMember()
+ 	 * Returns true if this member is a team member of the given blog
+ 	 * 
+ 	 * @param	integer	$blogid	ID of target weblog
+ 	 * @return	boolean	whether to join the weblog or not
+ 	 * 
+ 	 */
+ 	public function isTeamMember($blogid)
+ 	{
+ 		$query = 'SELECT * FROM '.sql_table('team').' WHERE'
+ 			   . ' tblog=' . intval($blogid)
+ 			   . ' and tmember='. $this->getID();
+ 		$res = DB::getResult($query);
+ 		return ($res->rowCount() != 0);
+ 	}
+ 	
+ 	/**
+ 	 * Member::canAddItem()
+ 	 * 
+ 	 * @param	integer	$catid	ID of target category
+ 	 * @return	boolean	whether to be able to add items to the category or not
+ 	 * 
+ 	 */
+ 	public function canAddItem($catid)
+ 	{
+ 		global $manager;
+ 		
+ 		// if this is a 'newcat' style newcat
+ 		// no blog admin of destination blog -> NOK
+ 		// blog admin of destination blog -> OK
+ 		if ( i18n::strpos($catid,'newcat') === 0 )
+ 		{
+ 			// get blogid
+ 			list($blogid) = sscanf($catid,"newcat-%d");
+ 			return $this->blogAdminRights($blogid);
+ 		}
+ 		
+ 		// category does not exist -> NOK
+ 		if ( !$manager->existsCategory($catid) )
+ 		{
+ 			return 0;
+ 		}
+ 		
+ 		$blogid = getBlogIDFromCatID($catid);
+ 		
+ 		// no team rights for blog -> NOK
+ 		if (!$this->teamRights($blogid))
+ 		{
+ 			return 0;
+ 		}
+ 		
+ 		// all other cases: OK
+ 		return 1;
+ 	}
+ 	
+ 	/**
+ 	 * Member::canAlterComment()
+ 	 * Returns true if this member can edit/delete a commentitem. This can be in the
+ 	 * following cases:
+ 	 *	  - member is a super-admin
+ 	 *   - member is the author of the comment
+ 	 *   - member is admin of the blog associated with the comment
+ 	 *   - member is author of the item associated with the comment
+ 	 * 
+ 	 * @param	integer	$commentid	ID of target comment
+ 	 * @return	boolean	delete/edit the comment or not
+ 	 * 
+ 	 */
+ 	public function canAlterComment($commentid)
+ 	{
+ 		if ( $this->isAdmin() )
+ 		{
+ 			return 1;
+ 		}
+ 		
+ 		$query =  'SELECT citem as itemid, iblog as blogid, cmember as cauthor, iauthor'
+ 			   . ' FROM '.sql_table('comment') .', '.sql_table('item').', '.sql_table('blog')
+ 			   . ' WHERE citem=inumber and iblog=bnumber and cnumber=' . intval($commentid);
+ 		$res = DB::getRow($query);
+ 		
+ 		return ($res['cauthor'] == $this->getID()) or $this->isBlogAdmin($res['blogid']) or ($res['iauthor'] == $this->getID());
+ 	}
+ 	
+ 	/**
+ 	 * Member::canAlterItem()
+ 	 * Returns true if this member can edit/delete an item. This is true in the following
+ 	 * cases: - member is a super-admin
+ 	 *	       - member is the author of the item
+ 	 *        - member is admin of the the associated blog
+ 	 * 
+ 	 * @param	integer	$itemid	ID of target item
+ 	 * @return	boolean	delete/edit the item or not
+ 	 * 
+ 	 */
+ 	public function canAlterItem($itemid)
+ 	{
+ 		if ($this->isAdmin()) return 1;
+ 		
+ 		$query =  'SELECT iblog, iauthor FROM '.sql_table('item').' WHERE inumber=' . intval($itemid);
+ 		$res = DB::getRow($query);
+ 		return ($res['iauthor'] == $this->getID()) or $this->isBlogAdmin($res['iblog']);
+ 	}
+ 	
+ 	/**
+ 	 * Member::canBeDeleted()
+ 	 * Return true if member can be deleted. This means that there are no items posted by the member left
+ 	 * 
+ 	 * @param	void
+ 	 * @return	boolean	whether there is no items or exists
+ 	 * 
+ 	 */
+ 	public function canBeDeleted()
+ 	{
+ 		$res = DB::getResult('SELECT * FROM '.sql_table('item').' WHERE iauthor=' . $this->getID());
+ 		return ( $res->rowCount() == 0 );
+ 	}
+ 	
+ 	/**
+ 	 * Member::canUpdateItem()
+ 	 * returns true if this member can move/update an item to a given category,
+ 	 * false if not (see comments fot the tests that are executed)
+ 	 * 
+ 	 * @param	integer	$itemid
+ 	 * @param	string	$newcat (can also be of form 'newcat-x' with x=blogid)
+ 	 * @return	boolean	whether being able to update the item or not
+ 	 * 
+ 	 */
+ 	public function canUpdateItem($itemid, $newcat)
+ 	{
+ 		global $manager;
+ 		
+ 		// item does not exists -> NOK
+ 		if ( !$manager->existsItem($itemid,1,1) )
+ 		{
+ 			return 0;
+ 		}
+ 		
+ 		// cannot alter item -> NOK
+ 		if (!$this->canAlterItem($itemid))
+ 		{
+ 			return 0;
+ 		}
+ 		
+ 		// if this is a 'newcat' style newcat
+ 		// no blog admin of destination blog -> NOK
+ 		// blog admin of destination blog -> OK
+ 		if ( i18n::strpos($newcat, 'newcat') === 0 )
+ 		{
+ 			// get blogid
+ 			list($blogid) = sscanf($newcat, 'newcat-%d');
+ 			return $this->blogAdminRights($blogid);
+ 		}
+ 		
+ 		// category does not exist -> NOK
+ 		if (!$manager->existsCategory($newcat))
+ 		{
+ 			return 0;
+ 		}
+ 		
+ 		// get item
+ 		$item =& $manager->getItem($itemid,1,1);
+ 		
+ 		// old catid = new catid -> OK
+ 		if ($item['catid'] == $newcat)
+ 		{
+ 			return 1;
+ 		}
+ 		
+ 		// not a valid category -> NOK
+ 		$validCat = DB::getValue('SELECT COUNT(*) AS result FROM '.sql_table('category').' WHERE catid='.intval($newcat));
+ 		if ( !$validCat )
+ 		{
+ 			return 0;
+ 		}
+ 		
+ 		// get destination blog
+ 		$item =& $manager->getItem($itemid, 1, 1);
+ 		$source_blogid = $item['blogid'];
+ 		$dest_blogid = getBlogIDFromCatID($newcat);
+ 		
+ 		// not a team member of destination blog -> NOK
+ 		if ( !$this->teamRights($dest_blogid) )
+ 		{
+ 			return 0;
+ 		}
+ 		
+ 		// if member is author of item -> OK
+ 		if ( $item['authorid'] == $this->getID() )
+ 		{
+ 			return 1;
+ 		}
+ 		
+ 		// if member has admin rights on both blogs: OK
+ 		if ( ($this->blogAdminRights($dest_blogid)) && ($this->blogAdminRights($source_blogid)) )
+ 		{
+ 			return 1;
+ 		}
+ 		
+ 		// all other cases: NOK
+ 		return 0;
+ 	}
+ 	
+ 	/**
+ 	 * Member::setCookies()
+ 	 * Sets the cookies for the member
+ 	 * 
+ 	 * @param boolean	$shared	set this to 1 when using a shared computer. Cookies will expire
+ 	 *				at the end of the session in this case.
+ 	 * @return	void
+ 	 * 
+ 	 */
+ 	public function setCookies($shared = 0)
+ 	{
+ 		global $CONF;
+ 		
+ 		if ( $CONF['SessionCookie'] || $shared )
+ 		{
+ 			$lifetime = 0;
+ 		}
+ 		else
+ 		{
+ 			$lifetime = time()+2592000;
+ 		}
+ 		
+ 		setcookie($CONF['CookiePrefix'] . 'user', $this->getDisplayName(), $lifetime, $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);
+ 		setcookie($CONF['CookiePrefix'] . 'loginkey', $this->getCookieKey(), $lifetime, $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);
+ 		
+ 		// make sure cookies on shared pcs don't get renewed
+ 		if ( $shared )
+ 		{
+ 			setcookie($CONF['CookiePrefix'] .'sharedpc', '1',$lifetime,$CONF['CookiePath'],$CONF['CookieDomain'],$CONF['CookieSecure']);
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Member::sendActivationLink()
+ 	 * Send activation mail
+ 	 * 
+ 	 * @param	string	$type	activation type
+ 	 * @param	string	$extra	extra info
+ 	 * @return	void
+ 	 */
+ 	public function sendActivationLink($type, $extra='')
+ 	{
+ 		global $CONF;
+ 		
+ 		if ( !isset($CONF['ActivationDays']) )
+ 		{
+ 			$CONF['ActivationDays'] = 2;
+ 		}
+ 		
+ 		// generate key and URL
+ 		$key = $this->generateActivationEntry($type, $extra);
+ 		$url = $CONF['AdminURL'] . 'index.php?action=activate&key=' . $key;
+ 		
+ 		// choose text to use in mail
+ 		switch ( $type )
+ 		{
+ 			case 'register':
+ 				$message = _ACTIVATE_REGISTER_MAIL;
+ 				$subject = _ACTIVATE_REGISTER_MAILTITLE;
+ 				break;
+ 			case 'forgot':
+ 				$message = _ACTIVATE_FORGOT_MAIL;
+ 				$subject = _ACTIVATE_FORGOT_MAILTITLE;
+ 				break;
+ 			case 'addresschange':
+ 				$message = _ACTIVATE_CHANGE_MAIL;
+ 				$subject = _ACTIVATE_CHANGE_MAILTITLE;
+ 				break;
+ 			default;
+ 		}
+ 		
+ 		// fill out variables in text
+ 		$aVars = array(
+ 			'siteName' => $CONF['SiteName'],
+ 			'siteUrl' => $CONF['IndexURL'],
+ 			'memberName' => $this->getDisplayName(),
+ 			'activationUrl' => $url,
+ 			'activationDays' => $CONF['ActivationDays']
+ 		);
+ 		
+ 		$message = Template::fill($message, $aVars);
+ 		$subject = Template::fill($subject, $aVars);
+ 		
+ 		// send mail
+ 		NOTIFICATION::mail($this->getEmail(), $subject ,$message, $CONF['AdminEmail'], i18n::get_current_charset());
+ 		
+ 		ActionLog::add(INFO, _ACTIONLOG_ACTIVATIONLINK . ' (' . $this->getDisplayName() . ' / type: ' . $type . ')');
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Member::getAdminBlogs()
+ 	 * Returns an array of all blogids for which member has admin rights
+ 	 * 
+ 	 * @param	void
+ 	 * @return	array	weblog IDs in which this member has admin rights
+ 	 * 
+ 	 */
+ 	public function getAdminBlogs()
+ 	{
+ 		$blogs = array();
+ 		
+ 		if ($this->isAdmin())
+ 		{
+ 			$query = 'SELECT bnumber as blogid from '.sql_table('blog');
+ 		}
+ 		else
+ 		{
+ 			$query = 'SELECT tblog as blogid from '.sql_table('team').' where tadmin=1 and tmember=' . $this->getID();
+ 		}
+ 		
+ 		$res = DB::getResult($query);
+ 		if ( $res->rowCount() > 0 )
+ 		{
+ 			foreach ( $res as $row )
+ 			{
+ 				array_push($blogs, $row['blogid']);
+ 			}
+ 		}
+ 		return $blogs;
+ 	}
+ 	
+ 	/**
+ 	 * Member::getTeamBlogs()
+ 	 * Returns an array of all blogids for which member has team rights
+ 	 * 
+ 	 * @param	boolean	$incAdmin	whether checking weblog admin rights or not
+ 	 * @return	array	weblog IDs in which this member join
+ 	 * 
+ 	 */
+ 	public function getTeamBlogs($incAdmin = 1)
+ 	{
+ 		$incAdmin = intval($incAdmin);
+ 		$blogs = array();
+ 		
+ 		if ( $this->isAdmin() && $incAdmin )
+ 		{
+ 			$query = 'SELECT bnumber as blogid from '.sql_table('blog');
+ 		}
+ 		else
+ 		{
+ 			$query = 'SELECT tblog as blogid from '.sql_table('team').' where tmember=' . $this->getID();
+ 		}
+ 		
+ 		$res = DB::getResult($query);
+ 		if ( $res->rowCount() > 0 )
+ 		{
+ 			foreach ( $res as $row )
+ 			{
+ 				array_push($blogs, $row['blogid']);
+ 			}
+ 		}
+ 		return $blogs;
+ 	}
+ 	
+ 	/**
+ 	 * Member::getNotifyFromMailAddress()
+ 	 * 
+ 	 * Returns an email address from which notification of commenting/karma voting can
+ 	 * be sent. A suggestion can be given for when the member is not logged in
+ 	 * 
+ 	 * @param	String	$suggest
+ 	 * @return	String	mail address or suggestion
+ 	 */
+ 	public function getNotifyFromMailAddress($suggest = "")
+ 	{
+ 		global $CONF;
+ 		if ( $this->isLoggedIn() )
+ 		{
+ 			return $this->getDisplayName() . " <" . $this->getEmail() . ">";
+ 		}
+ 		else if ( NOTIFICATION::address_validation($suggest) )
+ 		{
+ 			return $suggest;
+ 		}
+ 		return $CONF['AdminEmail'];
+ 	}
+ 	
+ 	/**
+ 	 * Member::write()
+ 	 * Write data to database
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 * 
+ 	 */
+ 	public function write()
+ 	{
+ 		$query =  'UPDATE '.sql_table('member')
+ 		        . ' SET mname=' . DB::quoteValue($this->displayname) . ', '
+ 		           . 'mrealname='. DB::quoteValue($this->realname) . ', '
+ 		           . 'mpassword='. DB::quoteValue($this->password) . ', '
+ 		           . 'mcookiekey='. DB::quoteValue($this->cookiekey) . ', '
+ 		           . 'murl=' . DB::quoteValue($this->url) . ', '
+ 		           . 'memail=' . DB::quoteValue($this->email) . ', '
+ 		           . 'madmin=' . intval($this->admin) . ', '
+ 		           . 'mnotes=' . DB::quoteValue($this->notes) . ', '
+ 		           . 'mcanlogin=' . intval($this->canlogin) . ', '
+ 		           . 'mlocale=' . DB::quoteValue($this->locale) . ', '
+ 		           . 'madminskin=' . DB::quoteValue($this->adminskin) . ', '
+ 		           . 'mbkmklt=' . DB::quoteValue($this->bookmarklet) . ', '
+ 		           . 'mautosave=' . intval($this->autosave) . ' '
+ 		        . 'WHERE mnumber=' . intval($this->id);
+ 		DB::execute($query);
+ 		return;
+ 	}
+ 	
+ 	public function checkCookieKey($key)
+ 	{
+ 		return ( ($key != '') && ( $key == $this->getCookieKey() ) );
+ 	}
+ 	
+ 	public function checkPassword($pw)
+ 	{
+ 		/* for lower compatibility (md5) */
+ 		if ( strlen($this->password) === 32 )
+ 		{
+ 			return (md5($pw) == $this->password);
+ 		}
+ 		return ($this->hash($pw) == $this->password);
+ 	}
+ 	
+ 	public function getRealName()
+ 	{
+ 		return $this->realname;
+ 	}
+ 	
+ 	public function setRealName($name)
+ 	{
+ 		$this->realname = $name;
+ 	}
+ 	
+ 	public function getEmail()
+ 	{
+ 		return $this->email;
+ 	}
+ 	
+ 	public function setEmail($email)
+ 	{
+ 		$this->email = $email;
+ 	}
+ 	
+ 	public function getPassword()
+ 	{
+ 		return $this->password;
+ 	}
+ 	
+ 	public function setPassword($pwd)
+ 	{
+ 		$this->password = $this->hash($pwd);
+ 	}
+ 	
+ 	public function getCookieKey()
+ 	{
+ 		return $this->cookiekey;
+ 	}
+ 	
+ 	/**
+ 	 * Member::newCookieKey()
+ 	 * Generate new cookiekey, save it, and return it
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 * 
+ 	 */
+ 	public function newCookieKey()
+ 	{
+ 		mt_srand( (double) microtime() * 1000000);
+ 		$this->cookiekey = $this->hash(uniqid(mt_rand()));
+ 		$this->write();
+ 		return $this->cookiekey;
+ 	}
+ 	
+ 	public function setCookieKey($val)
+ 	{
+ 		$this->cookiekey = $val;
+ 	}
+ 	
+ 	public function getURL()
+ 	{
+ 		return $this->url;
+ 	}
+ 	
+ 	public function setURL($site)
+ 	{
+ 		$this->url = $site;
+ 	}
+ 	
+ 	public function setAdminSkin($skin)
+ 	{
+ 		$this->adminskin = $skin;
+ 	}
+ 
+ 	public function setBookmarklet($skin)
+ 	{
+ 		$this->bookmarklet = $skin;
+ 	}
+ 	
+ 	public function getAdminSkin()
+ 	{
+ 		return $this->adminskin;
+ 	}
+ 
+ 	public function getBookmarklet()
+ 	{
+ 		return $this->bookmarklet;
+ 	}
+ 
+ 	public function getLocale()
+ 	{
+ 		return $this->locale;
+ 	}
+ 	
+ 	public function setLocale($locale)
+ 	{
+ 		if ( !preg_match('#^(.+)_(.+)_(.+)$#', $locale)
+ 		 && ($locale = i18n::convert_old_language_file_name_to_locale($locale)) === FALSE )
+ 		{
+ 			$locale = '';
+ 		}
+ 		$this->locale = $locale;
+ 		return;
+ 	}
+ 	
+ 	public function setDisplayName($nick)
+ 	{
+ 		$this->displayname = $nick;
+ 	}
+ 	
+ 	public function getDisplayName()
+ 	{
+ 		return $this->displayname;
+ 	}
+ 	
+ 	public function isAdmin()
+ 	{
+ 		return $this->admin;
+ 	}
+ 	
+ 	public function setAdmin($val)
+ 	{
+ 		$this->admin = $val;
+ 	}
+ 	
+ 	public function canLogin()
+ 	{
+ 		return $this->canlogin;
+ 	}
+ 	
+ 	public function setCanLogin($val)
+ 	{
+ 		$this->canlogin = $val;
+ 	}
+ 	
+ 	public function getNotes()
+ 	{
+ 		return $this->notes;
+ 	}
+ 	
+ 	public function setNotes($val)
+ 	{
+ 		$this->notes = $val;
+ 	}
+ 	
+ 	public function getAutosave()
+ 	{
+ 		return $this->autosave;
+ 	}
+ 	
+ 	public function setAutosave($val)
+ 	{
+ 		$this->autosave = $val;
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Member::getID()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	integer	id of this member object
+ 	 * 
+ 	 */
+ 	public function getID()
+ 	{
+ 		return $this->id;
+ 	}
+ 	
+ 	/**
+ 	 * Member::exists()
+ 	 * Returns true if there is a member with the given login name
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$name	target name
+ 	 * @return	boolean	whether target name exists or not
+ 	 */
+ 	public static function exists($name)
+ 	{
+ 		$r = DB::getResult('SELECT * FROM ' . sql_table('member') . ' WHERE mname=' . DB::quoteValue($name));
+ 		return ( $r->rowCount() != 0 );
+ 	}
+ 	
+ 	/**
+ 	 * Member::existsID()
+ 	 * Returns true if there is a member with the given ID
+ 	 * 
+ 	 * @static
+ 	 * @param	integer	$id	target id
+ 	 * @return	boolean	whether target id exists or not
+ 	 * 
+ 	 */
+ 	public static function existsID($id)
+ 	{
+ 		$r = DB::getResult('SELECT * FROM ' . sql_table('member') . ' WHERE mnumber=' . intval($id));
+ 		return ( $r->rowCount() != 0 );
+ 	}
+ 	
+ 	/**
+ 	 * Member::isNameProtected()
+ 	 *  Checks if a username is protected.
+ 	 *  If so, it can not be used on anonymous comments
+ 	 * 
+ 	 * @param	string	$name	target name
+ 	 * @return	boolean	whether the name exists or not
+ 	 * 
+ 	 */
+ 	public function isNameProtected($name)
+ 	{
+ 		// extract name
+ 		$name = strip_tags($name);
+ 		$name = trim($name);
+ 		return self::exists($name);
+ 	}
+ 	
+ 	/**
+ 	 * Member::create()
+ 	 * Adds a new member
+ 	 * 
+ 	 * @static
+ 	 * @param	String	$name
+ 	 * @param	String	$realname
+ 	 * @param	String	$password
+ 	 * @param	String	$email
+ 	 * @param	String	$url
+ 	 * @param	String	$admin
+ 	 * @param	String	$canlogin
+ 	 * @param	String	$notes
+ 	 * @return	String	1 if success, others if fail
+ 	 */
+ 	static public function create($name, $realname, $password, $email, $url, $admin, $canlogin, $notes)
+ 	{
+ 		if ( !NOTIFICATION::address_validation($email) )
+ 		{
+ 			return _ERROR_BADMAILADDRESS;
+ 		}
+ 		
+ 		/* TODO: this method should be in MEMBER class, not globalfunctions */
+ 		if ( !isValidDisplayName($name) )
+ 		{
+ 			return _ERROR_BADNAME;
+ 		}
+ 		
+ 		if ( self::exists($name) )
+ 		{
+ 			return _ERROR_NICKNAMEINUSE;
+ 		}
+ 		
+ 		if ( !$realname )
+ 		{
+ 			return _ERROR_REALNAMEMISSING;
+ 		}
+ 		
+ 		/* TODO: check the number of characters */
+ 		if ( !$password )
+ 		{
+ 			return _ERROR_PASSWORDMISSING;
+ 		}
+ 		
+ 		/* 
+ 		 *  begin if: sometimes user didn't prefix the URL with http:// or https://,
+ 		 *  this cause a malformed URL. Let's fix it.
+ 		 */
+ 		
+ 		if ( !preg_match('#^https?://#', $url) )
+ 		{
+ 			$url = 'http://' . $url;
+ 		}
+ 		
+ 		$name		= DB::quoteValue($name);
+ 		$realname	= DB::quoteValue($realname);
+ 		/* NOTE: hashed password is automatically updated if the length is 32 bytes when logging in */
+ 		$password	= DB::quoteValue(md5($password));
+ 		$email		= DB::quoteValue($email);
+ 		$url		= DB::quoteValue($url);
+ 		$admin		= (integer) $admin;
+ 		$canlogin	= (integer) $canlogin;
+ 		$notes		= DB::quoteValue($notes);
+ 		
+ 		$query = "INSERT INTO %s"
+ 		       . " (MNAME,MREALNAME,MPASSWORD,MEMAIL,MURL, MADMIN, MCANLOGIN, MNOTES)"
+ 		       . " VALUES (%s, %s, %s, %s, %s, %d, %d, %s)";
+ 		$query = sprintf($query, sql_table('member'), $name, $realname, $password, $email, $url, $admin, $canlogin, $notes);
+ 		DB::execute($query);
+ 		
+ 		ActionLog::add(INFO, _ACTIONLOG_NEWMEMBER . ' ' . $name);
+ 		
+ 		return 1;
+ 	}
+ 	
+ 	/**
+ 	 * Member::getActivationInfo()
+ 	 * Returns activation info for a certain key (an object with properties vkey, vmember, ...)
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$key	activation key
+ 	 * @return	mixed	return 0 if failed, else return activation table object
+ 	 * 
+ 	 */
+ 	public static function getActivationInfo($key)
+ 	{
+ 		$query = 'SELECT * FROM ' . sql_table('activation') . ' WHERE vkey=' . DB::quoteValue($key);
+ 		$res = DB::getResult($query);
+ 		
+ 		if ( !$res || ($res->rowCount() == 0) )
+ 		{
+ 			return 0;
+ 		}
+ 		return $res->fetch();
+ 	}
+ 	
+ 	/**
+ 	 * Member::generateActivationEntry()
+ 	 * Creates an account activation key
+ 	 * addresschange -> old email address
+ 	 * 
+ 	 * @param	string	$type	one of the following values (determines what to do when activation expires)
+ 	 * 				'register'	(new member registration)
+ 	 * 				'forgot'	(forgotton password)
+ 	 * 				'addresschange'	(member address has changed)
+ 	 * @param	string	$extra	extra info (needed when validation link expires)
+ 	 * @return	string	activation key
+ 	 */
+ 	public function generateActivationEntry($type, $extra = '')
+ 	{
+ 		// clean up old entries
+ 		$this->cleanupActivationTable();
+ 		
+ 		// kill any existing entries for the current member (delete is ok)
+ 		// (only one outstanding activation key can be present for a member)
+ 		DB::execute('DELETE FROM ' . sql_table('activation') . ' WHERE vmember=' . intval($this->getID()));
+ 		
+ 		// indicates if the member can log in while the link is active
+ 		$canLoginWhileActive = false;
+ 		switch ( $type )
+ 		{
+ 			case 'forgot':
+ 				$canLoginWhileActive = true;
+ 				break;
+ 			case 'register':
+ 				break;
+ 			case 'addresschange':
+ 				$extra = $extra . '/' . ( $this->canLogin() ? '1' : '0' );
+ 				break;
+ 		}
+ 		
+ 		$ok = false;
+ 		while ( !$ok )
+ 		{
+ 			// generate a random key
+ 			srand((double)microtime()*1000000);
+ 			$key = $this->hash(uniqid(rand(), true));
+ 			
+ 			// attempt to add entry in database
+ 			// add in database as non-active
+ 			$query = 'INSERT INTO %s (vkey, vtime, vmember, vtype, vextra) VALUES (%s, %s, %d, %s, %s)';
+ 			$query = sprintf($query
+ 				, sql_table('activation')
+ 				, DB::quoteValue($key)
+ 				, DB::formatDateTime()
+ 				, intval($this->getID())
+ 				, DB::quoteValue($type)
+ 				, DB::quoteValue($extra)
+ 			);
+ 			if ( DB::execute($query) !== FALSE )
+ 				$ok = true;
+ 		}
+ 		
+ 		// mark member as not allowed to log in
+ 		if ( !$canLoginWhileActive )
+ 		{
+ 			$this->setCanLogin(0);
+ 			$this->write();
+ 		}
+ 		
+ 		// return the key
+ 		return $key;
+ 	}
+ 	
+ 	/**
+ 	 * Member::activate()
+ 	 * Inidicates that an activation link has been clicked and any forms displayed
+ 	 * there have been successfully filled out.
+ 	 * 
+ 	 * @param	string	$key	activation key
+ 	 * @return	boolean
+ 	 * 
+ 	 */
+ 	public function activate($key)
+ 	{
+ 		// get activate info
+ 		$info = self::getActivationInfo($key);
+ 		
+ 		// no active key
+ 		if ( !$info )
+ 		{
+ 			return false;
+ 		}
+ 		
+ 		switch ( $info['vtype'] )
+ 		{
+ 			case 'forgot':
+ 				// nothing to do
+ 				break;
+ 			case 'register':
+ 				// set canlogin value
+ 				global $CONF;
+ 				DB::execute('UPDATE ' . sql_table('member') . ' SET mcanlogin=' . intval($CONF['NewMemberCanLogon']). ' WHERE mnumber=' . intval($info['vmember']));
+ 				break;
+ 			case 'addresschange':
+ 				// reset old 'canlogin' value
+ 				list($oldEmail, $oldCanLogin) = preg_split('#/#', $info['vextra']);
+ 				DB::execute('UPDATE ' . sql_table('member') . ' SET mcanlogin=' . intval($oldCanLogin). ' WHERE mnumber=' . intval($info['vmember']));
+ 				break;
+ 		}
+ 		
+ 		// delete from activation table
+ 		DB::execute('DELETE FROM ' . sql_table('activation') . ' WHERE vkey=' . DB::quoteValue($key));
+ 		
+ 		// success!
+ 		return true;
+ 	}
+ 	
+ 	/**
+ 	 * Member::cleanupActivationTable()
+ 	 * Cleans up entries in the activation table. All entries older than 2 days are removed.
+ 	 * (static)
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	public function cleanupActivationTable()
+ 	{
+ 		$actdays = 2;
+ 		if ( isset($CONF['ActivationDays']) && intval($CONF['ActivationDays']) > 0 )
+ 		{
+ 			$actdays = intval($CONF['ActivationDays']);
+ 		}
+ 		else
+ 		{
+ 			$CONF['ActivationDays'] = 2;
+ 		}
+ 		$boundary = time() - (60 * 60 * 24 * $actdays);
+ 		
+ 		// 1. walk over all entries, and see if special actions need to be performed
+ 		$query = sprintf('SELECT * FROM %s WHERE vtime < %s', sql_table('activation'), DB::formatDateTime($boundary));
+ 		$res = DB::getResult($query);
+ 		
+ 		foreach ( $res as $row )
+ 		{
+ 			switch ( $row['vtype'] )
+ 			{
+ 				case 'register':
+ 					// delete all information about this site member. registration is undone because there was
+ 					// no timely activation
+ 					include_once($DIR_LIBS . 'ADMIN.php');
+ 					Admin::deleteOneMember(intval($row['vmember']));
+ 					break;
+ 				case 'addresschange':
+ 					// revert the e-mail address of the member back to old address
+ 					list($oldEmail, $oldCanLogin) = preg_split('#/#', $row['vextra']);
+ 					DB::execute('UPDATE ' . sql_table('member') . ' SET mcanlogin=' . intval($oldCanLogin). ', memail=' . DB::quoteValue($oldEmail). ' WHERE mnumber=' . intval($row['vmember']));
+ 					break;
+ 				case 'forgot':
+ 					// delete the activation link and ignore. member can request a new password using the
+ 					// forgot password link
+ 					break;
+ 			}
+ 		}
+ 		
+ 		// 2. delete activation entries for real
+ 		$query = sprintf('DELETE FROM %s WHERE vtime < %s', sql_table('activation'), DB::formatDateTime($boundary));
+ 		DB::execute($query);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Member::$language
+ 	 * 
+ 	 * @obsolete
+ 	 * @param	void
+ 	 * @return	void
+ 	 * 
+ 	 */
+ 	public $language = '';
+ 	/**
+ 	 * Member::getLanguage()
+ 	 * 
+ 	 * @obsolete
+ 	 * @param	void
+ 	 * @return	void
+ 	 * 
+ 	 */
+ 	public function getLanguage()
+ 	{
+ 		if ( ($language = i18n::convert_locale_to_old_language_file_name($this->locale)) === FALSE )
+ 		{
+ 			$language = '';
+ 		}
+ 		return $language;
+ 	}
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/libs/NOTIFICATION.php
index 22fe7e1,1d708d1..e7f3d38
--- a/nucleus/libs/NOTIFICATION.php
+++ b/nucleus/libs/NOTIFICATION.php
@@@ -1,399 -1,399 +1,801 @@@
++<<<<<<< HEAD
 +<?php
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2002-2012 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)
 + */
 +/**
 + * Class used to represent a collection of e-mail addresses, to which a
 + * message can be sent (e.g. comment or karma vote notification).
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2012 The Nucleus Group
 + * @version $Id: NOTIFICATION.php 1534 2011-06-22 06:13:23Z sakamocchi $
 + */
 +class Notification
 +{
 +	static private $charset;
 +	static private $scheme = 'B';
 +	
 +	/**
 +	 * NOTIFICATION::address_validation()
 +	 * Validating the string as address
 +	 * 
 +	 * FIXME: this is just migrated from globalfunctions.php
 +	 *  we should confirm this regular expression refering to RFC 5322
 +	 * 
 +	 * @link	http://www.ietf.org/rfc/rfc5322.txt
 +	 * @see		3.4. Address Specification
 +	 * 
 +	 * @static
 +	 * @param	String	$address	Address
 +	 * @return	Boolean	valid or not
 +	 */
 +	static public function address_validation($address)
 +	{
 +		return (boolean) preg_match('#^(?!\\.)(?:\\.?[-a-zA-Z0-9!\\#$%&\'*+/=?^_`{|}~]+)+@(?!\\.)(?:\\.?(?!-)[-a-zA-Z0-9]+(?<!-)){2,}$#', $address);
 +	}
 +	
 +	/**
 +	 * NOTIFICATION::get_mail_footer()
 +	 * Return mail footer with Nucleus CMS singnature
 +	 * 
 +	 * @static
 +	 * @param	void
 +	 * @return	String	Message body with 
 +	 */
 +	static public function get_mail_footer()
 +	{
 +		$message  = "\n";
 +		$message .= "\n";
 +		$message .= "-----------------------------\n";
 +		$message .=  "   Powered by Nucleus CMS\n";
 +		$message .=  "(http://www.nucleuscms.org/)\n";
 +		return $message;
 +	}
 +	
 +	/**
 +	 * NOTIFICATION::mail
 +	 * Send mails with headers including 7bit-encoded multibyte string
 +	 * 
 +	 * @static
 +	 * @param	string	$to		receivers including singlebyte and multibyte strings, based on RFC 5322
 +	 * @param	string	$subject	subject including singlebyte and multibyte strings
 +	 * @param	string	$message	message including singlebyte and multibyte strings
 +	 * @param	string	$from		senders including singlebyte and multibyte strings, based on RFC 5322
 +	 * @param	string(B/Q)	$scheme	7bit-encoder scheme based on RFC 2047
 +	 * @return	boolean	accepted delivery or not
 +	 */
 +	static public function mail($to, $subject, $message, $from, $charset, $scheme='B')
 +	{
 +		self::$charset = $charset;
 +		self::$scheme = $scheme;
 +		
 +		$to = self::mailbox_list_encoder($to);
 +		$subject = self::seven_bit_characters_encoder($subject);
 +		$from = 'From: ' . self::mailbox_list_encoder($from);
 +		
 +		/*
 +		 * All of 7bit character encoding derives from ISO/IEC 646
 +		 * So we can decide the body's encoding bit count by this regular expression.
 +		 * 
 +		 */
 +		$bitcount = '8bit';
 +		if ( preg_match('#\A[\x00-\x7f]*\z#', $message) )
 +		{
 +			$bitcount = '7bit';
 +		}
 +		
 +		$header  = 'Content-Type: text/html; charset=' . self::$charset . "; format=flowed; delsp=yes\n";
 +		$header .= "Content-Transfer-Encoding: {$bitcount}\n";
 +		$header .= "X-Mailer: Nucleus CMS NOTIFICATION class\n";
 +		
 +		return mail($to, $subject, $message, "{$from}\n{$header}");
 +	}
 +	
 +	/**
 +	 * NOTIFICATION::mailbox_list_encoder
 +	 * Encode multi byte strings included in mailbox.
 +	 * The format of mailbox is based on RFC 5322, which obsoletes RFC 2822
 +	 * 
 +	 * @link	http://www.ietf.org/rfc/rfc5322.txt
 +	 * @see		3.4. Address Specification
 +	 * 
 +	 * @static
 +	 * @param	string	$mailbox_list		mailbox list
 +	 * @return	string	encoded string	
 +	 * 
 +	 */
 +	static private function mailbox_list_encoder ($mailbox_list)
 +	{
 +		$encoded_mailboxes = array();
 +		$mailboxes = preg_split('#,#', $mailbox_list);
 +		foreach ( $mailboxes as $mailbox )
 +		{
 +			if ( preg_match("#^([^,]+)?<([^,]+)?@([^,]+)?>$#", $mailbox, $match) )
 +			{
 +				$display_name = self::seven_bit_characters_encoder(trim($match[1]));
 +				$local_part = trim($match[2]);
 +				$domain = trim($match[3]);
 +				$encoded_mailboxes[] = "{$display_name} <{$local_part}@{$domain}>";
 +			}
 +			else if ( preg_match("#([^,]+)?@([^,]+)?#", $mailbox) )
 +			{
 +				$encoded_mailboxes[] = $mailbox;
 +			}
 +			else
 +			{
 +				continue;
 +			}
 +		}
 +		if ( $encoded_mailboxes == array() )
 +		{
 +			return FALSE;
 +		}
 +		return implode(',', $encoded_mailboxes);
 +	}
 +	
 +	/**
 +	 * NOTIFICATION::seven_bit_characters_encoder
 +	 * Encoder into 7bit ASCII expression for Non-ASCII Text based on RFC 2047.
 +	 * 
 +	 * @link http://www.ietf.org/rfc/rfc2047.txt
 +	 * @see 2. Syntax of encoded-words
 +	 * 
 +	 * NOTE: RFC 2047 has a ambiguousity for dealing with 'linear-white-space'.
 +	 *  This causes a trouble related to line breaking between single byte and multi-byte strings.
 +	 *  To avoid this, single byte string is encoded as well as multi byte string here.
 +	 * 
 +	 * NOTE: RFC 2231 also defines the way to use non-ASCII characters in MIME header.
 +	 * http://www.ietf.org/rfc/rfc2231.txt
 +	 * 
 +	 * NOTE: iconv extension give the same functions as this in PHP5
 +	 * iconv_mime_encode():
 +	 * http://www.php.net/manual/en/function.iconv-mime-encode.php
 +	 * 
 +	 * @static
 +	 * @param	string	$charset	Character set encoding
 +	 * @param	string	$type	type of 7 bit encoding, should be 'B' or 'Q'
 +	 * @param	string	$string	Target string with header field
 +	 * @return	string	encoded string
 +	 * 
 +	 */
 +	static private function seven_bit_characters_encoder($string)
 +	{
 +		$header = chr(13) . chr(10) . chr(32) . '=?' . self::$charset . '?' . self::$scheme . '?';
 +		$footer = "?=";
 +		$restriction = 78 - strlen($header) - strlen($footer) ;
 +		
 +		$encoded_words = array();
 +		for ( $i = 0; $i < i18n::strlen($string); $i++ )
 +		{
 +			if ( self::$scheme == 'B' )
 +			{
 +				if ( $i == 0 )
 +				{
 +					$letters = '';
 +				}
 +				
 +				$letter = i18n::substr($string, $i, 1);
 +				$expected_length = strlen($letters) + strlen($letter) * 4 / 3;
 +				
 +				if ( $expected_length > $restriction )
 +				{
 +					$encoded_text = self::b_encoder($letters);
 +					$encoded_words[] = "{$header}{$encoded_text}{$footer}";
 +					$letters = '';
 +				}
 +				
 +				$letters .= $letter;
 +				
 +				if ( $i == i18n::strlen($string) - 1 )
 +				{
 +					$encoded_text = self::b_encoder($letters);
 +					$encoded_words[] = "{$header}{$encoded_text}{$footer}";
 +					break;
 +				}
 +				continue;
 +			}
 +			else
 +			{
 +				if ( $i == 0 )
 +				{
 +					$encoded_text = '';
 +				}
 +				
 +				$encoded_letter = self::q_encoder(i18n::substr($string, $i, 1));
 +				$expected_length = strlen($encoded_text) + strlen($encoded_letter);
 +				
 +				if ( $expected_length > $restriction )
 +				{
 +					$encoded_words[] = "{$header}{$encoded_text}{$footer}";
 +					$letters = '';
 +				}
 +				
 +				$encoded_text .= $encoded_letter;
 +				
 +				if ( $i == i18n::strlen($string) - 1 )
 +				{
 +					$encoded_words[] = "{$header}{$encoded_text}{$footer}";
 +					break;
 +				}
 +				continue;
 +			}
 +		}
 +		
 +		return implode('', $encoded_words);
 +	}
 +	
 +	/**
 +	 * NOTIFICATION::b_encoder()
 +	 * 
 +	 * B encoder according to RFC 2047.
 +	 * The "B" encoding is identical to the "BASE64" encoding defined by RFC 4648.
 +	 * 
 +	 * @link http://www.ietf.org/rfc/rfc4648.txt
 +	 * @see 6.8. Base64 Content-Transfer-Encoding
 +	 * 
 +	 * NOTE: According to RFC 4648
 +	 * (1)	The final quantum of encoding input is an integral multiple of 24 bits;
 +	 * 		here, the final unit of encoded output will be an integral multiple
 +	 * 		of 4 characters with no "=" padding.
 +	 * (2)	The final quantum of encoding input is exactly 8 bits; here,
 +	 * 		the final unit of encoded output will be two characters followed
 +	 * 		by two "=" padding characters.
 +	 * (3)	The final quantum of encoding input is exactly 16 bits; here,
 +	 * 		the final unit of encoded output will be three characters followed
 +	 * 		by one "=" padding character.
 +	 * 
 +	 * @static
 +	 * @param	string	$target	targetted string
 +	 * @return	string	encoded string
 +	 */
 +	static private function b_encoder($target)
 +	{
 +		return base64_encode($target);
 +	}
 +	
 +	/**
 +	 * NOTIFICATION::q_encoder()
 +	 * 
 +	 * Q encoder according to RFC 2047.
 +	 * The "Q" encoding is similar to "Quoted-Printable" content-transfer-encoding defined in RFC 2045,
 +	 *  but the "Q" encoding and the "Quoted-Printable" are different a bit.
 +	 * 
 +	 * @link http://www.ietf.org/rfc/rfc2047.txt
 +	 * @see 4.2. The "Q" encoding
 +	 * 
 +	 * NOTE: According to RFC 2047
 +	 * (1)	Any 8-bit value may be represented by a "=" followed by two hexadecimal digits.
 +	 * 		For example, if the character set in use were ISO-8859-1,
 +	 * 		the "=" character would thus be encoded as "=3D", and a SPACE by "=20".
 +	 * 		(Upper case should be used for hexadecimal digits "A" through "F".)
 +	 * (2)	The 8-bit hexadecimal value 20 (e.g., ISO-8859-1 SPACE) may be
 +	 * 		represented as "_" (underscore, ASCII 95.).
 +	 * 		(This character may not pass through some internetwork mail gateways,
 +	 * 		but its use will greatly enhance readability of "Q" encoded data
 +	 * 		with mail readers that do not support this encoding.)
 +	 * 		Note that the "_" always represents hexadecimal 20,
 +	 * 		even if the SPACE character occupies a different code position
 +	 * 		in the character set in use.
 +	 * (3)	8-bit values which correspond to printable ASCII characters
 +	 * 		other than "=", "?", and "_" (underscore), MAY be represented as those characters.
 +	 * 		(But see section 5 for restrictions.)
 +	 * 		In particular, SPACE and TAB MUST NOT be represented as themselves within encoded words.
 +	 * 
 +	 * @static
 +	 * @param	string	$target	targetted string
 +	 * @return	string	encoded string
 +	 */
 +	static private function q_encoder($target)
 +	{
 +		$string = '';
 +		
 +		for ( $i = 0; $i < strlen($target); $i++ )
 +		{
 +			$letter = substr ($target, $i, 1);
 +			$order = ord($letter);
 +			
 +			// Printable ASCII characters without "=", "?", "_"
 +			if ((33 <= $order && $order <= 60)
 +			 || (62 == $order)
 +			 || (64 <= $order && $order <= 94)
 +			 || (96 <= $order && $order <= 126))
 +			{
 +				$string .= strtoupper(dechex($order));
 +			}
 +			// Space shuold be encoded as the same strings as "_"
 +			else if ($order == 32)
 +			{
 +				$string .= '_';
 +			}
 +			// Other characters
 +			else
 +			{
 +				$string .= '=' . strtoupper(dechex($order));
 +			}
 +		}
 +		
 +		return $string;
 +	}
 +	
 +	/**
 +	 * NOTICE: Deprecated
 +	 * NOTIFICATION::$addresses
 +	 * 
 +	 * @deprecated
 +	 */
 +	private $addresses = array();
 +	
 +	/**
 +	 * NOTICE: Deprecated
 +	 * takes one string as argument, containing multiple e-mail addresses
 +	 * separated by semicolons
 +	 * eg: site@demuynck.org;nucleus@demuynck.org;foo@bar.com
 +	 * 
 +	 * @deprecated
 +	 */
 +	function __construct($addresses)
 +	{
 +		$this->addresses = preg_split('#;#' , $addresses);
 +	}
 +	
 +	/**
 +	 * NOTICE: Deprecated
 +	 * NOTIFICATION::validAddresses()
 +	 * 
 +	 * returns true if all addresses are valid
 +	 * 
 +	 * @deprecated
 +	 * @param	Void
 +	 * @return	Boolean
 +	 */
 +	function validAddresses()
 +	{
 +		foreach ( $this->addresses as $address )
 +		{
 +			if ( !self::address_validation(trim($address)) )
 +			{
 +				return 0;
 +			}
 +		}
 +		return 1;
 +	}
 +	
 +	/**
 +	 * NOTICE: Deprecated
 +	 * NOTIFICATION::notify()
 +	 * 
 +	 * Sends email messages to all the email addresses
 +	 * 
 +	 * @deprecated
 +	 * @param	String	$title	
 +	 * @param	String	$message	
 +	 * @param	String	$from	
 +	 * @return	Void
 +	 */
 +	function notify($title, $message, $from)
 +	{
 +		global $member;
 +		$addresses = array();
 +		
 +		foreach ($this->addresses as $address)
 +		{
 +			if ( $member->isLoggedIn() && ($member->getEmail() == $address) )
 +			{
 +				continue;
 +			}
 +			$addresses[] = $address;
 +		}
 +		
 +		self::mail(implode(',', $addresses), $title, $message , $from);
 +		return;
 +	}
 +}
++=======
+ <?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)
+  */
+ /**
+  * Class used to represent a collection of e-mail addresses, to which a
+  * message can be sent (e.g. comment or karma vote notification).
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: NOTIFICATION.php 1836 2012-05-12 10:38:31Z sakamocchi $
+  */
+ class Notification
+ {
+ 	static private $charset;
+ 	static private $scheme = 'B';
+ 	
+ 	/**
+ 	 * NOTIFICATION::address_validation()
+ 	 * Validating the string as address
+ 	 * 
+ 	 * FIXME: this is just migrated from globalfunctions.php
+ 	 *  we should confirm this regular expression refering to RFC 5322
+ 	 * 
+ 	 * @link	http://www.ietf.org/rfc/rfc5322.txt
+ 	 * @see		3.4. Address Specification
+ 	 * 
+ 	 * @static
+ 	 * @param	String	$address	Address
+ 	 * @return	Boolean	valid or not
+ 	 */
+ 	static public function address_validation($address)
+ 	{
+ 		return (boolean) preg_match('#^(?!\\.)(?:\\.?[-a-zA-Z0-9!\\#$%&\'*+/=?^_`{|}~]+)+@(?!\\.)(?:\\.?(?!-)[-a-zA-Z0-9]+(?<!-)){2,}$#', $address);
+ 	}
+ 	
+ 	/**
+ 	 * NOTIFICATION::get_mail_footer()
+ 	 * Return mail footer with Nucleus CMS singnature
+ 	 * 
+ 	 * @static
+ 	 * @param	void
+ 	 * @return	String	Message body with 
+ 	 */
+ 	static public function get_mail_footer()
+ 	{
+ 		$message  = "\n";
+ 		$message .= "\n";
+ 		$message .= "-----------------------------\n";
+ 		$message .=  "   Powered by Nucleus CMS\n";
+ 		$message .=  "(http://www.nucleuscms.org/)\n";
+ 		return $message;
+ 	}
+ 	
+ 	/**
+ 	 * NOTIFICATION::mail
+ 	 * Send mails with headers including 7bit-encoded multibyte string
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$to		receivers including singlebyte and multibyte strings, based on RFC 5322
+ 	 * @param	string	$subject	subject including singlebyte and multibyte strings
+ 	 * @param	string	$message	message including singlebyte and multibyte strings
+ 	 * @param	string	$from		senders including singlebyte and multibyte strings, based on RFC 5322
+ 	 * @param	string(B/Q)	$scheme	7bit-encoder scheme based on RFC 2047
+ 	 * @return	boolean	accepted delivery or not
+ 	 */
+ 	static public function mail($to, $subject, $message, $from, $charset, $scheme='B')
+ 	{
+ 		self::$charset = $charset;
+ 		self::$scheme = $scheme;
+ 		
+ 		$to = self::mailbox_list_encoder($to);
+ 		$subject = self::seven_bit_characters_encoder($subject);
+ 		$from = 'From: ' . self::mailbox_list_encoder($from);
+ 		
+ 		/*
+ 		 * All of 7bit character encoding derives from ISO/IEC 646
+ 		 * So we can decide the body's encoding bit count by this regular expression.
+ 		 * 
+ 		 */
+ 		$bitcount = '8bit';
+ 		if ( preg_match('#\A[\x00-\x7f]*\z#', $message) )
+ 		{
+ 			$bitcount = '7bit';
+ 		}
+ 		
+ 		$header  = 'Content-Type: text/plain; charset=' . self::$charset . "; format=flowed; delsp=yes\n";
+ 		$header .= "Content-Transfer-Encoding: {$bitcount}\n";
+ 		$header .= "X-Mailer: Nucleus CMS NOTIFICATION class\n";
+ 		
+ 		return mail($to, $subject, $message, "{$from}\n{$header}");
+ 	}
+ 	
+ 	/**
+ 	 * NOTIFICATION::mailbox_list_encoder
+ 	 * Encode multi byte strings included in mailbox.
+ 	 * The format of mailbox is based on RFC 5322, which obsoletes RFC 2822
+ 	 * 
+ 	 * @link	http://www.ietf.org/rfc/rfc5322.txt
+ 	 * @see		3.4. Address Specification
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$mailbox_list		mailbox list
+ 	 * @return	string	encoded string	
+ 	 * 
+ 	 */
+ 	static private function mailbox_list_encoder ($mailbox_list)
+ 	{
+ 		$encoded_mailboxes = array();
+ 		$mailboxes = preg_split('#,#', $mailbox_list);
+ 		foreach ( $mailboxes as $mailbox )
+ 		{
+ 			if ( preg_match("#^([^,]+)?<([^,]+)?@([^,]+)?>$#", $mailbox, $match) )
+ 			{
+ 				$display_name = self::seven_bit_characters_encoder(trim($match[1]));
+ 				$local_part = trim($match[2]);
+ 				$domain = trim($match[3]);
+ 				$encoded_mailboxes[] = "{$display_name} <{$local_part}@{$domain}>";
+ 			}
+ 			else if ( preg_match("#([^,]+)?@([^,]+)?#", $mailbox) )
+ 			{
+ 				$encoded_mailboxes[] = $mailbox;
+ 			}
+ 			else
+ 			{
+ 				continue;
+ 			}
+ 		}
+ 		if ( $encoded_mailboxes == array() )
+ 		{
+ 			return FALSE;
+ 		}
+ 		return implode(',', $encoded_mailboxes);
+ 	}
+ 	
+ 	/**
+ 	 * NOTIFICATION::seven_bit_characters_encoder
+ 	 * Encoder into 7bit ASCII expression for Non-ASCII Text based on RFC 2047.
+ 	 * 
+ 	 * @link http://www.ietf.org/rfc/rfc2047.txt
+ 	 * @see 2. Syntax of encoded-words
+ 	 * 
+ 	 * NOTE: RFC 2047 has a ambiguousity for dealing with 'linear-white-space'.
+ 	 *  This causes a trouble related to line breaking between single byte and multi-byte strings.
+ 	 *  To avoid this, single byte string is encoded as well as multi byte string here.
+ 	 * 
+ 	 * NOTE: RFC 2231 also defines the way to use non-ASCII characters in MIME header.
+ 	 * http://www.ietf.org/rfc/rfc2231.txt
+ 	 * 
+ 	 * NOTE: iconv extension give the same functions as this in PHP5
+ 	 * iconv_mime_encode():
+ 	 * http://www.php.net/manual/en/function.iconv-mime-encode.php
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$charset	Character set encoding
+ 	 * @param	string	$type	type of 7 bit encoding, should be 'B' or 'Q'
+ 	 * @param	string	$string	Target string with header field
+ 	 * @return	string	encoded string
+ 	 * 
+ 	 */
+ 	static private function seven_bit_characters_encoder($string)
+ 	{
+ 		$header = chr(13) . chr(10) . chr(32) . '=?' . self::$charset . '?' . self::$scheme . '?';
+ 		$footer = "?=";
+ 		$restriction = 78 - strlen($header) - strlen($footer) ;
+ 		
+ 		$encoded_words = array();
+ 		for ( $i = 0; $i < i18n::strlen($string); $i++ )
+ 		{
+ 			if ( self::$scheme == 'B' )
+ 			{
+ 				if ( $i == 0 )
+ 				{
+ 					$letters = '';
+ 				}
+ 				
+ 				$letter = i18n::substr($string, $i, 1);
+ 				$expected_length = strlen($letters) + strlen($letter) * 4 / 3;
+ 				
+ 				if ( $expected_length > $restriction )
+ 				{
+ 					$encoded_text = self::b_encoder($letters);
+ 					$encoded_words[] = "{$header}{$encoded_text}{$footer}";
+ 					$letters = '';
+ 				}
+ 				
+ 				$letters .= $letter;
+ 				
+ 				if ( $i == i18n::strlen($string) - 1 )
+ 				{
+ 					$encoded_text = self::b_encoder($letters);
+ 					$encoded_words[] = "{$header}{$encoded_text}{$footer}";
+ 					break;
+ 				}
+ 				continue;
+ 			}
+ 			else
+ 			{
+ 				if ( $i == 0 )
+ 				{
+ 					$encoded_text = '';
+ 				}
+ 				
+ 				$encoded_letter = self::q_encoder(i18n::substr($string, $i, 1));
+ 				$expected_length = strlen($encoded_text) + strlen($encoded_letter);
+ 				
+ 				if ( $expected_length > $restriction )
+ 				{
+ 					$encoded_words[] = "{$header}{$encoded_text}{$footer}";
+ 					$letters = '';
+ 				}
+ 				
+ 				$encoded_text .= $encoded_letter;
+ 				
+ 				if ( $i == i18n::strlen($string) - 1 )
+ 				{
+ 					$encoded_words[] = "{$header}{$encoded_text}{$footer}";
+ 					break;
+ 				}
+ 				continue;
+ 			}
+ 		}
+ 		
+ 		return implode('', $encoded_words);
+ 	}
+ 	
+ 	/**
+ 	 * NOTIFICATION::b_encoder()
+ 	 * 
+ 	 * B encoder according to RFC 2047.
+ 	 * The "B" encoding is identical to the "BASE64" encoding defined by RFC 4648.
+ 	 * 
+ 	 * @link http://www.ietf.org/rfc/rfc4648.txt
+ 	 * @see 6.8. Base64 Content-Transfer-Encoding
+ 	 * 
+ 	 * NOTE: According to RFC 4648
+ 	 * (1)	The final quantum of encoding input is an integral multiple of 24 bits;
+ 	 * 		here, the final unit of encoded output will be an integral multiple
+ 	 * 		of 4 characters with no "=" padding.
+ 	 * (2)	The final quantum of encoding input is exactly 8 bits; here,
+ 	 * 		the final unit of encoded output will be two characters followed
+ 	 * 		by two "=" padding characters.
+ 	 * (3)	The final quantum of encoding input is exactly 16 bits; here,
+ 	 * 		the final unit of encoded output will be three characters followed
+ 	 * 		by one "=" padding character.
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$target	targetted string
+ 	 * @return	string	encoded string
+ 	 */
+ 	static private function b_encoder($target)
+ 	{
+ 		return base64_encode($target);
+ 	}
+ 	
+ 	/**
+ 	 * NOTIFICATION::q_encoder()
+ 	 * 
+ 	 * Q encoder according to RFC 2047.
+ 	 * The "Q" encoding is similar to "Quoted-Printable" content-transfer-encoding defined in RFC 2045,
+ 	 *  but the "Q" encoding and the "Quoted-Printable" are different a bit.
+ 	 * 
+ 	 * @link http://www.ietf.org/rfc/rfc2047.txt
+ 	 * @see 4.2. The "Q" encoding
+ 	 * 
+ 	 * NOTE: According to RFC 2047
+ 	 * (1)	Any 8-bit value may be represented by a "=" followed by two hexadecimal digits.
+ 	 * 		For example, if the character set in use were ISO-8859-1,
+ 	 * 		the "=" character would thus be encoded as "=3D", and a SPACE by "=20".
+ 	 * 		(Upper case should be used for hexadecimal digits "A" through "F".)
+ 	 * (2)	The 8-bit hexadecimal value 20 (e.g., ISO-8859-1 SPACE) may be
+ 	 * 		represented as "_" (underscore, ASCII 95.).
+ 	 * 		(This character may not pass through some internetwork mail gateways,
+ 	 * 		but its use will greatly enhance readability of "Q" encoded data
+ 	 * 		with mail readers that do not support this encoding.)
+ 	 * 		Note that the "_" always represents hexadecimal 20,
+ 	 * 		even if the SPACE character occupies a different code position
+ 	 * 		in the character set in use.
+ 	 * (3)	8-bit values which correspond to printable ASCII characters
+ 	 * 		other than "=", "?", and "_" (underscore), MAY be represented as those characters.
+ 	 * 		(But see section 5 for restrictions.)
+ 	 * 		In particular, SPACE and TAB MUST NOT be represented as themselves within encoded words.
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$target	targetted string
+ 	 * @return	string	encoded string
+ 	 */
+ 	static private function q_encoder($target)
+ 	{
+ 		$string = '';
+ 		
+ 		for ( $i = 0; $i < strlen($target); $i++ )
+ 		{
+ 			$letter = substr ($target, $i, 1);
+ 			$order = ord($letter);
+ 			
+ 			// Printable ASCII characters without "=", "?", "_"
+ 			if ((33 <= $order && $order <= 60)
+ 			 || (62 == $order)
+ 			 || (64 <= $order && $order <= 94)
+ 			 || (96 <= $order && $order <= 126))
+ 			{
+ 				$string .= strtoupper(dechex($order));
+ 			}
+ 			// Space shuold be encoded as the same strings as "_"
+ 			else if ($order == 32)
+ 			{
+ 				$string .= '_';
+ 			}
+ 			// Other characters
+ 			else
+ 			{
+ 				$string .= '=' . strtoupper(dechex($order));
+ 			}
+ 		}
+ 		
+ 		return $string;
+ 	}
+ 	
+ 	/**
+ 	 * NOTICE: Deprecated
+ 	 * NOTIFICATION::$addresses
+ 	 * 
+ 	 * @deprecated
+ 	 */
+ 	private $addresses = array();
+ 	
+ 	/**
+ 	 * NOTICE: Deprecated
+ 	 * takes one string as argument, containing multiple e-mail addresses
+ 	 * separated by semicolons
+ 	 * eg: site@demuynck.org;nucleus@demuynck.org;foo@bar.com
+ 	 * 
+ 	 * @deprecated
+ 	 */
+ 	function __construct($addresses)
+ 	{
+ 		$this->addresses = preg_split('#;#' , $addresses);
+ 	}
+ 	
+ 	/**
+ 	 * NOTICE: Deprecated
+ 	 * NOTIFICATION::validAddresses()
+ 	 * 
+ 	 * returns true if all addresses are valid
+ 	 * 
+ 	 * @deprecated
+ 	 * @param	Void
+ 	 * @return	Boolean
+ 	 */
+ 	function validAddresses()
+ 	{
+ 		foreach ( $this->addresses as $address )
+ 		{
+ 			if ( !self::address_validation(trim($address)) )
+ 			{
+ 				return 0;
+ 			}
+ 		}
+ 		return 1;
+ 	}
+ 	
+ 	/**
+ 	 * NOTICE: Deprecated
+ 	 * NOTIFICATION::notify()
+ 	 * 
+ 	 * Sends email messages to all the email addresses
+ 	 * 
+ 	 * @deprecated
+ 	 * @param	String	$title	
+ 	 * @param	String	$message	
+ 	 * @param	String	$from	
+ 	 * @return	Void
+ 	 */
+ 	function notify($title, $message, $from)
+ 	{
+ 		global $member;
+ 		$addresses = array();
+ 		
+ 		foreach ($this->addresses as $address)
+ 		{
+ 			if ( $member->isLoggedIn() && ($member->getEmail() == $address) )
+ 			{
+ 				continue;
+ 			}
+ 			$addresses[] = $address;
+ 		}
+ 		
+ 		self::mail(implode(',', $addresses), $title, $message , $from);
+ 		return;
+ 	}
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/libs/PARSER.php
index c23d297,406fe8c..79f372e
--- a/nucleus/libs/PARSER.php
+++ b/nucleus/libs/PARSER.php
@@@ -12,7 -12,7 +12,11 @@@
  /**
   * @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,8 -62,6 +66,11 @@@ class Parse
  		$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;
@@@ -137,7 -135,7 +144,11 @@@
  		
  		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
  		{
diff --combined nucleus/libs/PLUGIN.php
index 5a175c2,4cebb26..b52b93c
--- a/nucleus/libs/PLUGIN.php
+++ b/nucleus/libs/PLUGIN.php
@@@ -1,984 -1,984 +1,1971 @@@
++<<<<<<< HEAD
 +<?php
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2002-2012 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)
 + */
 +/**
 + * This is an (abstract) class of which all Nucleus Plugins must inherit
 + *
 + * for more information on plugins and how to write your own, see the
 + * plugins.html file that is included with the Nucleus documenation
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2012 The Nucleus Group
 + * @version $Id: PLUGIN.php 1630 2012-01-28 12:16:14Z sakamocchi $
 + */
 +abstract class NucleusPlugin
 +{
 +	// these public functions should to be redefined in your plugin
 +	public function getName()
 +	{
 +		return __CLASS__;
 +	}
 +	
 +	public function getAuthor()
 +	{
 +		return 'Undefined';
 +	}
 +	
 +	public function getURL()
 +	{
 +		return 'Undefined';
 +	}
 +	
 +	public function getVersion()
 +	{
 +		return '0.0';
 +	}
 +	
 +	public function getDescription()
 +	{
 +		return 'Undefined';
 +	}
 +	
 +	// these final public function _may_ be redefined in your plugin
 +	
 +	public function getMinNucleusVersion()
 +	{
 +		return 150;
 +	}
 +	
 +	public function getMinNucleusPatchLevel()
 +	{
 +		return 0;
 +	}
 +	
 +	public function getEventList()
 +	{
 +		return array();
 +	}
 +	
 +	public function getTableList()
 +	{
 +		return array();
 +	}
 +	
 +	public function hasAdminArea()
 +	{
 +		return 0;
 +	}
 +	
 +	public function install()
 +	{
 +		return;
 +	}
 +	
 +	public function unInstall()
 +	{
 +		return;
 +	}
 +	
 +	public function init()
 +	{
 +		return;
 +	}
 +	
 +	public function doSkinVar($skinType)
 +	{
 +		return;
 +	}
 +	
 +	public function doTemplateVar(&$item)
 +	{
 +		$args = func_get_args();
 +		array_shift($args);
 +		array_unshift($args, 'template');
 +		call_user_func_array(array(&$this,'doSkinVar'),$args);
 +		return;
 +	}
 +	
 +	public function doTemplateCommentsVar(&$item, &$comment)
 +	{
 +		$args = func_get_args();
 +		array_shift($args);
 +		array_shift($args);
 +		array_unshift($args, 'template');
 +		call_user_func_array(array(&$this,'doSkinVar'),$args);
 +		return;
 +	}
 +	
 +	public function doAction($type)
 +	{
 +		return _ERROR_PLUGIN_NOSUCHACTION;
 +	}
 +	
 +	public function doIf($key,$value)
 +	{
 +		return false;
 +	}
 +	
 +	public function doItemVar (&$item)
 +	{
 +		return;
 +	}
 +	
 +	/**
 +	 * Checks if a plugin supports a certain feature.
 +	 *
 +	 * @returns 1 if the feature is reported, 0 if not
 +	 * @param $feature
 +	 *  Name of the feature. See plugin documentation for more info
 +	 *   'SqlTablePrefix' -> if the plugin uses the sql_table() method to get table names
 +	 *   'HelpPage' -> if the plugin provides a helppage
 +	 *   'SqlApi' -> if the plugin uses the complete sql_* or DB::* api (must also require nucleuscms 3.5)
 +	 */
 +	public function supportsFeature($feature)
 +	{
 +		return 0;
 +	}
 +	
 +	/**
 +	 * Report a list of plugin that is required to final public function
 +	 *
 +	 * @returns an array of names of plugin, an empty array indicates no dependency
 +	 */
 +	public function getPluginDep()
 +	{
 +		return array();
 +	}
 +	
 +	// these helper final public functions should not be redefined in your plugin
 +	
 +	/**
 +	 * Creates a new option for this plugin
 +	 *
 +	 * @param name
 +	 *		A string uniquely identifying your option. (max. length is 20 characters)
 +	 * @param description
 +	 *		A description that will show up in the nucleus admin area (max. length: 255 characters)
 +	 * @param type
 +	 *		Either 'text', 'yesno' or 'password'
 +	 *		This info is used when showing 'edit plugin options' screens
 +	 * @param value
 +	 *		Initial value for the option (max. value length is 128 characters)
 +	 */
 +	final public function createOption($name, $desc, $type, $defValue = '', $typeExtras = '')
 +	{
 +		return $this->create_option('global', $name, $desc, $type, $defValue, $typeExtras);
 +	}
 +	
 +	final public function createBlogOption($name, $desc, $type, $defValue = '', $typeExtras = '')
 +	{
 +		return $this->create_option('blog', $name, $desc, $type, $defValue, $typeExtras);
 +	}
 +	
 +	final public function createMemberOption($name, $desc, $type, $defValue = '', $typeExtras = '')
 +	{
 +		return $this->create_option('member', $name, $desc, $type, $defValue, $typeExtras);
 +	}
 +	
 +	final public function createCategoryOption($name, $desc, $type, $defValue = '', $typeExtras = '')
 +	{
 +		return $this->create_option('category', $name, $desc, $type, $defValue, $typeExtras);
 +	}
 +	
 +	final public function createItemOption($name, $desc, $type, $defValue = '', $typeExtras = '')
 +	{
 +		return $this->create_option('item', $name, $desc, $type, $defValue, $typeExtras);
 +	}
 +	
 +	/**
 +	 * Removes the option from the database
 +	 *
 +	 * Note: Options get erased automatically on plugin uninstall
 +	 */
 +	final public function deleteOption($name)
 +	{
 +		return $this->delete_option('global', $name);
 +	}
 +	
 +	final public function deleteBlogOption($name)
 +	{
 +		return $this->delete_option('blog', $name);
 +	}
 +	
 +	final public function deleteMemberOption($name)
 +	{
 +		return $this->delete_option('member', $name);
 +	}
 +	
 +	final public function deleteCategoryOption($name)
 +	{
 +		return $this->delete_option('category', $name);
 +	}
 +	
 +	final public function deleteItemOption($name)
 +	{
 +		return $this->delete_option('item', $name);
 +	}
 +	
 +	/**
 +	 * Sets the value of an option to something new
 +	 */
 +	final public function setOption($name, $value)
 +	{
 +		return $this->set_option('global', 0, $name, $value);
 +	}
 +	
 +	final public function setBlogOption($blogid, $name, $value)
 +	{
 +		return $this->set_option('blog', $blogid, $name, $value);
 +	}
 +	
 +	final public function setMemberOption($memberid, $name, $value)
 +	{
 +		return $this->set_option('member', $memberid, $name, $value);
 +	}
 +	
 +	final public function setCategoryOption($catid, $name, $value)
 +	{
 +		return $this->set_option('category', $catid, $name, $value);
 +	}
 +	
 +	final public function setItemOption($itemid, $name, $value) {
 +		return $this->set_option('item', $itemid, $name, $value);
 +	}
 +	
 +	/**
 +	 * Retrieves the current value for an option
 +	 */
 +	final public function getOption($name)
 +	{
 +		// only request the options the very first time. On subsequent requests
 +		// the static collection is used to save SQL queries.
 +		if ( $this->plugin_options == 0 )
 +		{
 +			$this->plugin_options = array();
 +			
 +			$query =  "SELECT d.oname as name, o.ovalue as value FROM %s o, %s d WHERE d.opid=%d AND d.oid=o.oid;";
 +			$query = sprintf($query, sql_table('plugin_option'), sql_table('plugin_option_desc'), (integer) $this->plugid);
 +			$result = DB::getResult($query);
 +			foreach ( $result as $row )
 +			{
 +				$this->plugin_options[strtolower($row['name'])] = $row['value'];
 +			}
 +		}
 +		if ( isset($this->plugin_options[strtolower($name)]) )
 +		{
 +			return $this->plugin_options[strtolower($name)];
 +		}
 +		else
 +		{
 +			return $this->get_option('global', 0, $name);
 +		}
 +	}
 +	
 +	final public function getBlogOption($blogid, $name)
 +	{
 +		return $this->get_option('blog', $blogid, $name);
 +	}
 +	
 +	final public function getMemberOption($memberid, $name)
 +	{
 +		return $this->get_option('member', $memberid, $name);
 +	}
 +	
 +	final public function getCategoryOption($catid, $name)
 +	{
 +		return $this->get_option('category', $catid, $name);
 +	}
 +	
 +	final public function getItemOption($itemid, $name)
 +	{
 +		return $this->get_option('item', $itemid, $name);
 +	}
 +	
 +	/**
 +	 * Retrieves an associative array with the option value for each
 +	 * context id
 +	 */
 +	final public function getAllBlogOptions($name)
 +	{
 +		return $this->get_all_options('blog', $name);
 +	}
 +	
 +	final public function getAllMemberOptions($name)
 +	{
 +		return $this->get_all_options('member', $name);
 +	}
 +	
 +	final public function getAllCategoryOptions($name)
 +	{
 +		return $this->get_all_options('category', $name);
 +	}
 +	
 +	final public function getAllItemOptions($name)
 +	{
 +		return $this->get_all_options('item', $name);
 +	}
 +	
 +	/**
 +	 * Retrieves an indexed array with the top (or bottom) of an option
 +	 * (delegates to getOptionTop())
 +	 */
 +	final public function getBlogOptionTop($name, $amount = 10, $sort = 'desc')
 +	{
 +		return $this->get_option_top('blog', $name, $amount, $sort);
 +	}
 +	
 +	final public function getMemberOptionTop($name, $amount = 10, $sort = 'desc')
 +	{
 +		return $this->get_option_top('member', $name, $amount, $sort);
 +	}
 +	
 +	final public function getCategoryOptionTop($name, $amount = 10, $sort = 'desc')
 +	{
 +		return $this->get_option_top('category', $name, $amount, $sort);
 +	}
 +	
 +	final public function getItemOptionTop($name, $amount = 10, $sort = 'desc')
 +	{
 +		return $this->get_option_top('item', $name, $amount, $sort);
 +	}
 +	
 +	/**
 +	 * NucleusPlugin::getID()
 +	 * get id for this plugin
 +	 * 
 +	 * @access	public
 +	 * @param	void
 +	 * @return	integer	this plugid id
 +	 */
 +	final public function getID()
 +	{
 +		return (integer) $this->plugid;
 +	}
 +	
 +	/**
 +	 * NucleusPlugin::setID()
 +	 * set favorite id for this plugin
 +	 * 
 +	 * @access	public
 +	 * @param	integer	$plugid	favorite id for plugin
 +	 * @return	void
 +	 */
 +	final public function setID($plugid)
 +	{
 +		$this->plugid = (integer) $plugid;
 +		return;
 +	}
 +	
 +	/**
 +	 * Returns the URL of the admin area for this plugin (in case there's
 +	 * no such area, the returned information is invalid)
 +	 *
 +	 * public
 +	 */
 +	final public function getAdminURL()
 +	{
 +		global $CONF;
 +		return $CONF['PluginURL'] . $this->getShortName() . '/';
 +	}
 +	
 +	/**
 +	 * Returns the directory where the admin directory is located and
 +	 * where the plugin can maintain his extra files
 +	 *
 +	 * public
 +	 */
 +	final public function getDirectory()
 +	{
 +		global $DIR_PLUGINS;
 +		return $DIR_PLUGINS . $this->getShortName() . '/';
 +	}
 +	
 +	/**
 +	 * Derives the short name for the plugin from the classname (all
 +	 * lowercase)
 +	 *
 +	 * public
 +	 */
 +	final public function getShortName()
 +	{
 +		return str_replace('np_','',strtolower(get_class($this)));
 +	}
 +	
 +	/**
 +	 *	Clears the option value cache which saves the option values during
 +	 *	the plugin execution. This function is usefull if the options has
 +	 *	changed during the plugin execution (especially in association with
 +	 *	the PrePluginOptionsUpdate and the PostPluginOptionsUpdate events)
 +	 *	
 +	 *  public
 +	 **/
 +	final public function clearOptionValueCache()
 +	{
 +		$this->option_values = array();
 +		$this->plugin_options = 0;
 +		return;
 +	}
 +	
 +	// internal functions of the class starts here
 +	protected $option_values;	// oid_contextid => value
 +	protected $option_info;		// context_name => array('oid' => ..., 'default' => ...)
 +	protected $plugin_options;	// see getOption()
 +	protected $plugid;			// plugin id
 +	
 +	/**
 +	 * Class constructor: Initializes some internal data
 +	 */
 +	public function __construct()
 +	{
 +		$this->option_values = array();	// oid_contextid => value
 +		$this->option_info = array();	// context_name => array('oid' => ..., 'default' => ...)
 +		$this->plugin_options = 0;
 +	}
 +	
 +	/**
 +	 * Retrieves an array of the top (or bottom) of an option from a plugin.
 +	 * @author TeRanEX
 +	 * @param  string $context the context for the option: item, blog, member,...
 +	 * @param  string $name    the name of the option
 +	 * @param  int    $amount  how many rows must be returned
 +	 * @param  string $sort    desc or asc
 +	 * @return array           array with both values and contextid's
 +	 * @access private
 +	 */
 +	final protected function get_option_top($context, $name, $amount = 10, $sort = 'desc')
 +	{
 +		if ( ($sort != 'desc') && ($sort != 'asc') )
 +		{
 +			$sort= 'desc';
 +		}
 +		
 +		$oid = $this->get_option_id($context, $name);
 +		
 +		// retrieve the data and return
 +		$query = "SELECT otype, oextra FROM %s WHERE oid = %d;";
 +		$query = sprintf($query, sql_table('plugin_option_desc'), $oid);
 +		$row = DB::getRow($query);
 +		
 +		if ( ($this->optionCanBeNumeric($row['otype'])) && ($row['oextra'] == 'number' ) )
 +		{
 +			$orderby = 'CAST(ovalue AS SIGNED)';
 +		}
 +		else
 +		{
 +			$orderby = 'ovalue';
 +		}
 +		$query = "SELECT ovalue value, ocontextid id FROM %s WHERE oid = %d ORDER BY %s %s LIMIT 0,%d;";
 +		$query = sprintf($query, sql_table('plugin_option'), $oid, $orderby, $sort, (integer) $amount);
 +		$result = DB::getResult($query);
 +		
 +		// create the array
 +		$i = 0;
 +		$top = array();
 +		foreach( $result as $row )
 +		{
 +			$top[$i++] = $row;
 +		}
 +		
 +		// return the array (duh!)
 +		return $top;
 +	}
 +	
 +	/**
 +	 * Creates an option in the database table plugin_option_desc
 +	 *	
 +	 * private
 +	 */
 +	final protected function create_option($context, $name, $desc, $type, $defValue, $typeExtras = '')
 +	{
 +		// create in plugin_option_desc
 +		$query = 'INSERT INTO ' . sql_table('plugin_option_desc')
 +				.' (opid, oname, ocontext, odesc, otype, odef, oextra)'
 +				.' VALUES ('.intval($this->plugid)
 +					.', '.DB::quoteValue($name)
 +					.', '.DB::quoteValue($context)
 +					.', '.DB::quoteValue($desc)
 +					.', '.DB::quoteValue($type)
 +					.', '.DB::quoteValue($defValue)
 +					.', '.DB::quoteValue($typeExtras).')';
 +		DB::execute($query);
 +		$oid = DB::getInsertId();
 +		
 +		$key = $context . '_' . $name;
 +		$this->option_info[$key] = array('oid' => $oid, 'default' => $defValue);
 +		return 1;
 +	}
 +	
 +	/**
 +	 * Deletes an option from the database tables
 +	 * plugin_option and plugin_option_desc
 +	 *
 +	 * private
 +	 */
 +	final protected function delete_option($context, $name)
 +	{
 +		$oid = $this->get_option_id($context, $name);
 +		if ( !$oid )
 +		{
 +			return 0; // no such option
 +		}
 +		
 +		// delete all things from plugin_option
 +		$query = "DELETE FROM %s WHERE oid=%d;";
 +		$query = sprintf($query, sql_table('plugin_option'), (integer) $oid);
 +		DB::execute($query);
 +		
 +		// delete entry from plugin_option_desc
 +		$query = "DELETE FROM %s WHERE oid=%d;";
 +		$query = sprintf($query, sql_table('plugin_option_desc'), $oid);
 +		DB::execute($query);
 +		
 +		// clear from cache
 +		unset($this->option_info["{$context}_{$name}"]);
 +		$this->option_values = array();
 +		return 1;
 +	}
 +	
 +	/**
 +	 * Update an option in the database table plugin_option
 +	 * 		
 +	 * returns: 1 on success, 0 on failure
 +	 * private
 +	 */
 +	final protected function set_option($context, $contextid, $name, $value)
 +	{
 +		global $manager;
 +		
 +		$oid = $this->get_option_id($context, $name);
 +		if ( !$oid )
 +		{
 +			return 0;
 +		}
 +		
 +		// check if context id exists
 +		switch ( $context )
 +		{
 +			case 'member':
 +				if ( !Member::existsID($contextid) )
 +				{
 +					return 0;
 +				}
 +				break;
 +			case 'blog':
 +				if ( !$manager->existsBlogID($contextid) )
 +				{
 +					return 0;
 +				}
 +				break;
 +			case 'category':
 +				if ( !$manager->existsCategory($contextid) )
 +				{
 +					return 0;
 +				}
 +				break;
 +			case 'item':
 +				if ( !$manager->existsItem($contextid, true, true) )
 +				{
 +					return 0;
 +				}
 +				break;
 +			case 'global':
 +				if ( $contextid != 0 )
 +				{
 +					return 0;
 +				}
 +				break;
 +		}
 +		
 +		// update plugin_option
 +		$query = "DELETE FROM %s WHERE oid=%d and ocontextid=%d;";
 +		$query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid);
 +		DB::execute($query);
 +		
 +		$query = "INSERT INTO %s (ovalue, oid, ocontextid) VALUES (%s, %d, %d);";
 +		$query = sprintf($query, sql_table('plugin_option'), DB::quoteValue($value), $oid, $contextid);
 +		DB::execute($query);
 +		
 +		// update cache
 +		$this->option_values["{$oid}_{$contextid}"] = $value;
 +		if ( $context == 'global' )
 +		{
 +			$this->plugin_options[strtolower($name)] = $value;
 +		}
 +		
 +		return 1;
 +	}
 +	
 +	/**
 +	 * Get an option from Cache or database
 +	 * 	 - if not in the option Cache read it from the database
 +	 *   - if not in the database write default values into the database
 +	 *   		
 +	 * private		
 +	 */		 		 		
 +	final protected function get_option($context, $contextid, $name)
 +	{
 +		$oid = $this->get_option_id($context, $name);
 +		if ( !$oid )
 +		{
 +			return '';
 +		}
 +		
 +		$key = "{$oid}_{$contextid}";
 +		
 +		if ( isset($this->option_values[$key]) )
 +		{
 +			return $this->option_values[$key];
 +		}
 +		
 +		// get from DB
 +		$query = "SELECT ovalue FROM %s WHERE oid=%d and ocontextid=%d;";
 +		$query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid);
 +		$result = DB::getResult($query);
 +		
 +		if ( !$result || ($result->rowCount() == 0) )
 +		{
 +			// fill DB with default value
 +			$this->option_values[$key] = $this->get_default_value($context, $name);
 +			$query = "INSERT INTO %s (oid, ocontextid, ovalue) VALUES (%d, %d, %s);";
 +			$query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid, DB::quoteValue($this->option_values[$key]));
 +			DB::execute($query);
 +		}
 +		else
 +		{
 +			$row = $result->fetch();
 +			$this->option_values[$key] = $row['ovalue'];
 +		}
 +		
 +		return $this->option_values[$key];
 +	}
 +	
 +	/**
 +	 * Returns assoc array with all values for a given option
 +	 * (one option per possible context id)
 +	 *
 +	 * private		 		
 +	 */
 +	final protected function get_all_options($context, $name)
 +	{
 +		$oid = $this->get_option_id($context, $name);
 +		if ( !$oid )
 +		{
 +			return array();
 +		}
 +		$default_value = $this->get_default_value($context, $name);
 +		
 +		$options = array();
 +		$query = "SELECT %s as contextid FROM %s;";
 +		switch ( $context )
 +		{
 +			case 'blog':
 +				$query = sprintf($query, 'bnumber', sql_table('blog'));
 +				break;
 +			case 'category':
 +				$query = sprintf($query, 'catid', sql_table('category'));
 +				break;
 +			case 'member':
 +				$query = sprintf($query, 'mnumber', sql_table('member'));
 +				break;
 +			case 'item':
 +				$query = sprintf($query, 'inumber', sql_table('item'));
 +				break;
 +		}
 +		
 +		$result = DB::getResult($query);
 +		if ( $result )
 +		{
 +			foreach ( $result as $row )
 +			{
 +				$options[$row['contextid']] = $default_value;
 +			}
 +		}
 +		
 +		$query = "SELECT ocontextid, ovalue FROM %s WHERE oid=%d;";
 +		$query = sprintf($query, sql_table('plugin_option'), $oid);
 +		$result = DB::getResult($query);
 +		foreach ( $result as $row )
 +		{
 +			$options[$row['ocontextid']] = $row['ovalue'];
 +		}
 +
 +		return $options;
 +	}
 +	
 +	/**
 +	 * NucleusPlugin::get_option_id
 +	 * 
 +	 * Gets the 'option identifier' that corresponds to a given option name.
 +	 * When this method is called for the first time, all the OIDs for the plugin
 +	 * are loaded into memory, to avoid re-doing the same query all over.
 +	 * 
 +	 * @param	string	$context	option context
 +	 * @param	string	$name		plugin name
 +	 * @return		integer	option id
 +	 */
 +	final protected function get_option_id($context, $name)
 +	{
 +		$key = "{$context}_{$name}";
 +		
 +		if ( array_key_exists($key, $this->option_info)
 +		 && array_key_exists('oid', $this->option_info[$key]) )
 +		{
 +			return $this->option_info[$key]['oid'];
 +		}
 +		
 +		// load all OIDs for this plugin from the database
 +		$this->option_info = array();
 +		$query = "SELECT oid, oname, ocontext, odef FROM %s WHERE opid=%d;";
 +		$query = sprintf($query, sql_table('plugin_option_desc'), $this->plugid);
 +		$result = DB::getResult($query);
 +		foreach ( $result as $row )
 +		{
 +			$k = $row['ocontext'] . '_' . $row['oname'];
 +			$this->option_info[$k] = array('oid' => $row['oid'], 'default' => $row['odef']);
 +		}
 +		$result->closeCursor();
 +		
 +		return $this->option_info[$key]['oid'];
 +	}
 +	final protected function get_default_value($context, $name)
 +	{
 +		$key = $context . '_' . $name;
 +		
 +		if ( array_key_exists($key, $this->option_info)
 +		 && array_key_exists('default', $this->option_info[$key]) )
 +		{
 +			return $this->option_info[$key]['default'];
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * NucleusPlugin::delete_option_values()
 +	 * Deletes all option values for a given context and contextid
 +	 * (used when e.g. a blog, member or category is deleted)
 +	 *
 +	 *@static
 +	 *@param	String	$context	global/blog/category/item/member
 +	 *@param	Integer	$contextid		ID
 +	 *@return	Void
 +	 */
 +	static public function delete_option_values($context, $contextid)
 +	{
 +		// delete all associated plugin options
 +		$aOIDs = array();
 +		// find ids
 +		$query = "SELECT oid FROM %s WHERE ocontext=%s;";
 +		$query = sprintf($query, sql_table('plugin_option_desc'), DB::quoteValue($context));
 +		
 +		$result = DB::getResult($query);
 +		foreach ( $result as $row )
 +		{
 +			array_push($aOIDs, $row['oid']);
 +		}
 +		$result->closeCursor();
 +		// delete those options. go go go
 +		if ( count($aOIDs) > 0 )
 +		{
 +			$query = "DELETE FROM %s WHERE oid in (%s) and ocontextid=%d;";
 +			$query = sprintf($query, sql_table('plugin_option'), implode(',',$aOIDs), (integer) $contextid);
 +			DB::execute($query);
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * NucleusPlugin::getOptionMeta()
 +	 * splits the option's typeextra field (at ;'s) to split the meta collection
 +	 * 
 +	 * @static
 +	 * @param string $typeExtra the value of the typeExtra field of an option
 +	 * @return array array of the meta-key/value-pairs
 +	 */
 +	static public function getOptionMeta($typeExtra)
 +	{
 +		$meta = array();
 +		
 +		/* 1. if $typeExtra includes delimiter ';', split it to tokens */
 +		$tokens = preg_split('#;#', $typeExtra);
 +		
 +		/*
 +		 * 2. if each of tokens includes "=", it consists of key => value
 +		 *    else it's 'select' option
 +		 */
 +		foreach ( $tokens as $token )
 +		{
 +			$matches = array();
 +			if ( preg_match("#^([^=]+)?=([^=]+)?$#", $token, $matches) )
 +			{
 +				$meta[$matches[1]] = $matches[2];
 +			}
 +			else
 +			{
 +				$meta['select'] = $token;
 +			}
 +		}
 +		return $meta;
 +	}
 +	
 +	/**
 +	 * NucleusPlugin::getOptionSelectValues()
 +	 * filters the selectlists out of the meta collection
 +	 * 
 +	 * @static
 +	 * @param string $typeExtra the value of the typeExtra field of an option
 +	 * @return string the selectlist
 +	 */
 +	static public function getOptionSelectValues($typeExtra)
 +	{
 +		$meta = NucleusPlugin::getOptionMeta($typeExtra);
 +		
 +		if ( array_key_exists('select', $meta) )
 +		{
 +			return $meta['select'];
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * checks if the eventlist in the database is up-to-date
 +	 * @return bool if it is up-to-date it return true, else false
 +	 * @author TeRanEX
 +	 */
 +	public function subscribtionListIsUptodate()
 +	{
 +		$res = DB::getResult('SELECT event FROM '.sql_table('plugin_event').' WHERE pid = '.$this->plugid);
 +		$ev = array();
 +		foreach ( $res as $row )
 +		{
 +			array_push($ev, $row['event']);
 +		}
 +		if ( count($ev) != count($this->getEventList()) )
 +		{
 +			return false;
 +		}
 +		$d = array_diff($ev, $this->getEventList());
 +		if ( count($d) > 0 )
 +		{
 +			// there are differences so the db is not up-to-date
 +			return false;
 +		}
 +		return true;
 +	}
 +	
 +	/**
 +	 * NucleusPlugin::apply_plugin_options()
 +	 * Update its entry in database table
 +	 * 
 +	 * @static
 +	 * @param	$options: array ( 'oid' => array( 'contextid' => 'value'))
 +	 * 			 (taken from request using requestVar())
 +	 * @param	$new_contextid: integer (accepts a contextid when it is for a new
 +	 *			 contextid there was no id available at the moment of writing the
 +	 *			  formcontrols into the page (by ex: itemOptions for new item)
 +	 * @return void
 +	 */
 +	static public function apply_plugin_options(&$options, $new_contextid = 0)
 +	{
 +		global $manager;
 +		
 +		if ( !is_array($options) )
 +		{
 +			return;
 +		}
 +		
 +		foreach ( $options as $oid => $values )
 +		{
 +			// get option type info
 +			$query = "SELECT opid, oname, ocontext, otype, oextra, odef FROM %s WHERE oid=%d;";
 +			$query = sprintf($query, sql_table('plugin_option_desc'), (integer) $oid);
 +			$result = DB::getRow($query);
 +			if ( $result )
 +			{
 +				foreach ( $values as $id => $value )
 +				{
 +					// decide wether we are using the contextid of newContextid
 +					if ( $new_contextid != 0 )
 +					{
 +						$contextid = $new_contextid;
 +					}
 +					else
 +					{
 +						$contextid = $id;
 +					}
 +					
 +					// retreive any metadata
 +					$meta = NucleusPlugin::getOptionMeta($result['oextra']);
 +					
 +					// if the option is readonly or hidden it may not be saved
 +					if ( array_key_exists('access', $meta)
 +					 && in_array($meta['access'], array('readonly', 'hidden')) )
 +					{
 +						return;
 +					}
 +					
 +					// value comes from request
 +					$value = undoMagic($value);
 +					
 +					/* validation the value according to its type */
 +					switch ( $result['otype'] )
 +					{
 +						case 'yesno':
 +							if ( ($value != 'yes') && ($value != 'no') )
 +							{
 +								$value = 'no';
 +							}
 +							break;
 +						case 'text':
 +						case 'select':
 +							if ( array_key_exists('datatype', $meta)
 +							 && ($meta['datatype'] == 'numerical') && ($value != (integer) $value) )
 +							{
 +								$value = (integer) $result['odef'];
 +							}
 +							break;
 +						case 'password':
 +						case 'textarea':
 +						default:
 +							break;
 +					}
 +					
 +					/*
 +					 * trigger event PrePluginOptionsUpdate to give the plugin the
 +					 * possibility to change/validate the new value for the option
 +					 */
 +					$data = array(
 +						'context'		=> $result['ocontext'],
 +						'plugid'		=> $result['opid'],
 +						'optionname'	=> $result['oname'],
 +						'contextid'		=> $contextid,
 +						'value'			=> &$value);
 +					$manager->notify('PrePluginOptionsUpdate', $data);
 +					
 +					// delete and insert its fields of table in database
 +					$query = "DELETE FROM %s WHERE oid=%d AND ocontextid=%d;";
 +					$query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid);
 +					DB::execute($query);
 +					$query = "INSERT INTO %s (oid, ocontextid, ovalue) VALUES (%d, %d, %s);";
 +					$query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid, DB::quoteValue($value));
 +					DB::execute($query);
 +					
 +					// clear option value cache if the plugin object is already loaded
 +					$plugin=& $manager->pidLoaded($result['opid']);
 +					if ( $plugin )
 +					{
 +						$plugin->clearOptionValueCache();
 +					}
 +					
 +					continue;
 +				}
 +			}
 +			continue;
 +		}
 +		return;
 +	}
 +}
++=======
+ <?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)
+  */
+ /**
+  * This is an (abstract) class of which all Nucleus Plugins must inherit
+  *
+  * for more information on plugins and how to write your own, see the
+  * plugins.html file that is included with the Nucleus documenation
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: PLUGIN.php 1866 2012-05-20 13:21:55Z sakamocchi $
+  */
+ abstract class NucleusPlugin
+ {
+ 	// these public functions should to be redefined in your plugin
+ 	public function getName()
+ 	{
+ 		return __CLASS__;
+ 	}
+ 	
+ 	public function getAuthor()
+ 	{
+ 		return 'Undefined';
+ 	}
+ 	
+ 	public function getURL()
+ 	{
+ 		return 'Undefined';
+ 	}
+ 	
+ 	public function getVersion()
+ 	{
+ 		return '0.0';
+ 	}
+ 	
+ 	public function getDescription()
+ 	{
+ 		return 'Undefined';
+ 	}
+ 	
+ 	// these final public function _may_ be redefined in your plugin
+ 	
+ 	public function getMinNucleusVersion()
+ 	{
+ 		return 150;
+ 	}
+ 	
+ 	public function getMinNucleusPatchLevel()
+ 	{
+ 		return 0;
+ 	}
+ 	
+ 	public function getEventList()
+ 	{
+ 		return array();
+ 	}
+ 	
+ 	public function getTableList()
+ 	{
+ 		return array();
+ 	}
+ 	
+ 	public function hasAdminArea()
+ 	{
+ 		return 0;
+ 	}
+ 	
+ 	public function install()
+ 	{
+ 		return;
+ 	}
+ 	
+ 	public function unInstall()
+ 	{
+ 		return;
+ 	}
+ 	
+ 	public function init()
+ 	{
+ 		return;
+ 	}
+ 	
+ 	public function doSkinVar($skinType)
+ 	{
+ 		return;
+ 	}
+ 	
+ 	public function doTemplateVar(&$item)
+ 	{
+ 		$args = func_get_args();
+ 		array_shift($args);
+ 		array_unshift($args, 'template');
+ 		call_user_func_array(array($this, 'doSkinVar'), $args);
+ 		return;
+ 	}
+ 	
+ 	public function doTemplateCommentsVar(&$item, &$comment)
+ 	{
+ 		$args = func_get_args();
+ 		array_shift($args);
+ 		array_shift($args);
+ 		array_unshift($args, 'template');
+ 		call_user_func_array(array($this, 'doSkinVar'), $args);
+ 		return;
+ 	}
+ 	
+ 	public function doAction($type)
+ 	{
+ 		return _ERROR_PLUGIN_NOSUCHACTION;
+ 	}
+ 	
+ 	public function doIf($key,$value)
+ 	{
+ 		return false;
+ 	}
+ 	
+ 	public function doItemVar (&$item)
+ 	{
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Checks if a plugin supports a certain feature.
+ 	 *
+ 	 * @returns 1 if the feature is reported, 0 if not
+ 	 * @param $feature
+ 	 *  Name of the feature. See plugin documentation for more info
+ 	 *   'SqlTablePrefix' -> if the plugin uses the sql_table() method to get table names
+ 	 *   'HelpPage' -> if the plugin provides a helppage
+ 	 *   'SqlApi' -> if the plugin uses the complete sql_* or DB::* api (must also require nucleuscms 3.5)
+ 	 */
+ 	public function supportsFeature($feature)
+ 	{
+ 		return 0;
+ 	}
+ 	
+ 	/**
+ 	 * Report a list of plugin that is required to final public function
+ 	 *
+ 	 * @returns an array of names of plugin, an empty array indicates no dependency
+ 	 */
+ 	public function getPluginDep()
+ 	{
+ 		return array();
+ 	}
+ 	
+ 	// these helper final public functions should not be redefined in your plugin
+ 	
+ 	/**
+ 	 * Creates a new option for this plugin
+ 	 *
+ 	 * @param name
+ 	 *		A string uniquely identifying your option. (max. length is 20 characters)
+ 	 * @param description
+ 	 *		A description that will show up in the nucleus admin area (max. length: 255 characters)
+ 	 * @param type
+ 	 *		Either 'text', 'yesno' or 'password'
+ 	 *		This info is used when showing 'edit plugin options' screens
+ 	 * @param value
+ 	 *		Initial value for the option (max. value length is 128 characters)
+ 	 */
+ 	final public function createOption($name, $desc, $type, $defValue = '', $typeExtras = '')
+ 	{
+ 		return $this->create_option('global', $name, $desc, $type, $defValue, $typeExtras);
+ 	}
+ 	
+ 	final public function createBlogOption($name, $desc, $type, $defValue = '', $typeExtras = '')
+ 	{
+ 		return $this->create_option('blog', $name, $desc, $type, $defValue, $typeExtras);
+ 	}
+ 	
+ 	final public function createMemberOption($name, $desc, $type, $defValue = '', $typeExtras = '')
+ 	{
+ 		return $this->create_option('member', $name, $desc, $type, $defValue, $typeExtras);
+ 	}
+ 	
+ 	final public function createCategoryOption($name, $desc, $type, $defValue = '', $typeExtras = '')
+ 	{
+ 		return $this->create_option('category', $name, $desc, $type, $defValue, $typeExtras);
+ 	}
+ 	
+ 	final public function createItemOption($name, $desc, $type, $defValue = '', $typeExtras = '')
+ 	{
+ 		return $this->create_option('item', $name, $desc, $type, $defValue, $typeExtras);
+ 	}
+ 	
+ 	/**
+ 	 * Removes the option from the database
+ 	 *
+ 	 * Note: Options get erased automatically on plugin uninstall
+ 	 */
+ 	final public function deleteOption($name)
+ 	{
+ 		return $this->delete_option('global', $name);
+ 	}
+ 	
+ 	final public function deleteBlogOption($name)
+ 	{
+ 		return $this->delete_option('blog', $name);
+ 	}
+ 	
+ 	final public function deleteMemberOption($name)
+ 	{
+ 		return $this->delete_option('member', $name);
+ 	}
+ 	
+ 	final public function deleteCategoryOption($name)
+ 	{
+ 		return $this->delete_option('category', $name);
+ 	}
+ 	
+ 	final public function deleteItemOption($name)
+ 	{
+ 		return $this->delete_option('item', $name);
+ 	}
+ 	
+ 	/**
+ 	 * Sets the value of an option to something new
+ 	 */
+ 	final public function setOption($name, $value)
+ 	{
+ 		return $this->set_option('global', 0, $name, $value);
+ 	}
+ 	
+ 	final public function setBlogOption($blogid, $name, $value)
+ 	{
+ 		return $this->set_option('blog', $blogid, $name, $value);
+ 	}
+ 	
+ 	final public function setMemberOption($memberid, $name, $value)
+ 	{
+ 		return $this->set_option('member', $memberid, $name, $value);
+ 	}
+ 	
+ 	final public function setCategoryOption($catid, $name, $value)
+ 	{
+ 		return $this->set_option('category', $catid, $name, $value);
+ 	}
+ 	
+ 	final public function setItemOption($itemid, $name, $value) {
+ 		return $this->set_option('item', $itemid, $name, $value);
+ 	}
+ 	
+ 	/**
+ 	 * Retrieves the current value for an option
+ 	 */
+ 	final public function getOption($name)
+ 	{
+ 		// only request the options the very first time. On subsequent requests
+ 		// the static collection is used to save SQL queries.
+ 		if ( $this->plugin_options == 0 )
+ 		{
+ 			$this->plugin_options = array();
+ 			
+ 			$query =  "SELECT d.oname as name, o.ovalue as value FROM %s o, %s d WHERE d.opid=%d AND d.oid=o.oid;";
+ 			$query = sprintf($query, sql_table('plugin_option'), sql_table('plugin_option_desc'), (integer) $this->plugid);
+ 			$result = DB::getResult($query);
+ 			foreach ( $result as $row )
+ 			{
+ 				$this->plugin_options[strtolower($row['name'])] = $row['value'];
+ 			}
+ 		}
+ 		if ( isset($this->plugin_options[strtolower($name)]) )
+ 		{
+ 			return $this->plugin_options[strtolower($name)];
+ 		}
+ 		else
+ 		{
+ 			return $this->get_option('global', 0, $name);
+ 		}
+ 	}
+ 	
+ 	final public function getBlogOption($blogid, $name)
+ 	{
+ 		return $this->get_option('blog', $blogid, $name);
+ 	}
+ 	
+ 	final public function getMemberOption($memberid, $name)
+ 	{
+ 		return $this->get_option('member', $memberid, $name);
+ 	}
+ 	
+ 	final public function getCategoryOption($catid, $name)
+ 	{
+ 		return $this->get_option('category', $catid, $name);
+ 	}
+ 	
+ 	final public function getItemOption($itemid, $name)
+ 	{
+ 		return $this->get_option('item', $itemid, $name);
+ 	}
+ 	
+ 	/**
+ 	 * Retrieves an associative array with the option value for each
+ 	 * context id
+ 	 */
+ 	final public function getAllBlogOptions($name)
+ 	{
+ 		return $this->get_all_options('blog', $name);
+ 	}
+ 	
+ 	final public function getAllMemberOptions($name)
+ 	{
+ 		return $this->get_all_options('member', $name);
+ 	}
+ 	
+ 	final public function getAllCategoryOptions($name)
+ 	{
+ 		return $this->get_all_options('category', $name);
+ 	}
+ 	
+ 	final public function getAllItemOptions($name)
+ 	{
+ 		return $this->get_all_options('item', $name);
+ 	}
+ 	
+ 	/**
+ 	 * Retrieves an indexed array with the top (or bottom) of an option
+ 	 * (delegates to getOptionTop())
+ 	 */
+ 	final public function getBlogOptionTop($name, $amount = 10, $sort = 'desc')
+ 	{
+ 		return $this->get_option_top('blog', $name, $amount, $sort);
+ 	}
+ 	
+ 	final public function getMemberOptionTop($name, $amount = 10, $sort = 'desc')
+ 	{
+ 		return $this->get_option_top('member', $name, $amount, $sort);
+ 	}
+ 	
+ 	final public function getCategoryOptionTop($name, $amount = 10, $sort = 'desc')
+ 	{
+ 		return $this->get_option_top('category', $name, $amount, $sort);
+ 	}
+ 	
+ 	final public function getItemOptionTop($name, $amount = 10, $sort = 'desc')
+ 	{
+ 		return $this->get_option_top('item', $name, $amount, $sort);
+ 	}
+ 	
+ 	/**
+ 	 * NucleusPlugin::getID()
+ 	 * get id for this plugin
+ 	 * 
+ 	 * @access	public
+ 	 * @param	void
+ 	 * @return	integer	this plugid id
+ 	 */
+ 	final public function getID()
+ 	{
+ 		return (integer) $this->plugid;
+ 	}
+ 	
+ 	/**
+ 	 * NucleusPlugin::setID()
+ 	 * set favorite id for this plugin
+ 	 * 
+ 	 * @access	public
+ 	 * @param	integer	$plugid	favorite id for plugin
+ 	 * @return	void
+ 	 */
+ 	final public function setID($plugid)
+ 	{
+ 		$this->plugid = (integer) $plugid;
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Returns the URL of the admin area for this plugin (in case there's
+ 	 * no such area, the returned information is invalid)
+ 	 *
+ 	 * public
+ 	 */
+ 	final public function getAdminURL()
+ 	{
+ 		global $CONF;
+ 		return $CONF['PluginURL'] . $this->getShortName() . '/';
+ 	}
+ 	
+ 	/**
+ 	 * Returns the directory where the admin directory is located and
+ 	 * where the plugin can maintain his extra files
+ 	 *
+ 	 * public
+ 	 */
+ 	final public function getDirectory()
+ 	{
+ 		global $DIR_PLUGINS;
+ 		return $DIR_PLUGINS . $this->getShortName() . '/';
+ 	}
+ 	
+ 	/**
+ 	 * Derives the short name for the plugin from the classname (all
+ 	 * lowercase)
+ 	 *
+ 	 * public
+ 	 */
+ 	final public function getShortName()
+ 	{
+ 		return str_replace('np_','',strtolower(get_class($this)));
+ 	}
+ 	
+ 	/**
+ 	 *	Clears the option value cache which saves the option values during
+ 	 *	the plugin execution. This function is usefull if the options has
+ 	 *	changed during the plugin execution (especially in association with
+ 	 *	the PrePluginOptionsUpdate and the PostPluginOptionsUpdate events)
+ 	 *	
+ 	 *  public
+ 	 **/
+ 	final public function clearOptionValueCache()
+ 	{
+ 		$this->option_values = array();
+ 		$this->plugin_options = 0;
+ 		return;
+ 	}
+ 	
+ 	// internal functions of the class starts here
+ 	protected $option_values;	// oid_contextid => value
+ 	protected $option_info;		// context_name => array('oid' => ..., 'default' => ...)
+ 	protected $plugin_options;	// see getOption()
+ 	protected $plugid;			// plugin id
+ 	
+ 	/**
+ 	 * Class constructor: Initializes some internal data
+ 	 */
+ 	public function __construct()
+ 	{
+ 		$this->option_values = array();	// oid_contextid => value
+ 		$this->option_info = array();	// context_name => array('oid' => ..., 'default' => ...)
+ 		$this->plugin_options = 0;
+ 	}
+ 	
+ 	/**
+ 	 * Retrieves an array of the top (or bottom) of an option from a plugin.
+ 	 * @author TeRanEX
+ 	 * @param  string $context the context for the option: item, blog, member,...
+ 	 * @param  string $name    the name of the option
+ 	 * @param  int    $amount  how many rows must be returned
+ 	 * @param  string $sort    desc or asc
+ 	 * @return array           array with both values and contextid's
+ 	 * @access private
+ 	 */
+ 	final protected function get_option_top($context, $name, $amount = 10, $sort = 'desc')
+ 	{
+ 		if ( ($sort != 'desc') && ($sort != 'asc') )
+ 		{
+ 			$sort= 'desc';
+ 		}
+ 		
+ 		$oid = $this->get_option_id($context, $name);
+ 		
+ 		// retrieve the data and return
+ 		$query = "SELECT otype, oextra FROM %s WHERE oid = %d;";
+ 		$query = sprintf($query, sql_table('plugin_option_desc'), $oid);
+ 		$row = DB::getRow($query);
+ 		
+ 		if ( ($this->optionCanBeNumeric($row['otype'])) && ($row['oextra'] == 'number' ) )
+ 		{
+ 			$orderby = 'CAST(ovalue AS SIGNED)';
+ 		}
+ 		else
+ 		{
+ 			$orderby = 'ovalue';
+ 		}
+ 		$query = "SELECT ovalue value, ocontextid id FROM %s WHERE oid = %d ORDER BY %s %s LIMIT 0,%d;";
+ 		$query = sprintf($query, sql_table('plugin_option'), $oid, $orderby, $sort, (integer) $amount);
+ 		$result = DB::getResult($query);
+ 		
+ 		// create the array
+ 		$i = 0;
+ 		$top = array();
+ 		foreach( $result as $row )
+ 		{
+ 			$top[$i++] = $row;
+ 		}
+ 		
+ 		// return the array (duh!)
+ 		return $top;
+ 	}
+ 	
+ 	/**
+ 	 * Creates an option in the database table plugin_option_desc
+ 	 *	
+ 	 * private
+ 	 */
+ 	final protected function create_option($context, $name, $desc, $type, $defValue, $typeExtras = '')
+ 	{
+ 		// create in plugin_option_desc
+ 		$query = 'INSERT INTO ' . sql_table('plugin_option_desc')
+ 				.' (opid, oname, ocontext, odesc, otype, odef, oextra)'
+ 				.' VALUES ('.intval($this->plugid)
+ 					.', '.DB::quoteValue($name)
+ 					.', '.DB::quoteValue($context)
+ 					.', '.DB::quoteValue($desc)
+ 					.', '.DB::quoteValue($type)
+ 					.', '.DB::quoteValue($defValue)
+ 					.', '.DB::quoteValue($typeExtras).')';
+ 		DB::execute($query);
+ 		$oid = DB::getInsertId();
+ 		
+ 		$key = $context . '_' . $name;
+ 		$this->option_info[$key] = array('oid' => $oid, 'default' => $defValue);
+ 		return 1;
+ 	}
+ 	
+ 	/**
+ 	 * Deletes an option from the database tables
+ 	 * plugin_option and plugin_option_desc
+ 	 *
+ 	 * private
+ 	 */
+ 	final protected function delete_option($context, $name)
+ 	{
+ 		$oid = $this->get_option_id($context, $name);
+ 		if ( !$oid )
+ 		{
+ 			return 0; // no such option
+ 		}
+ 		
+ 		// delete all things from plugin_option
+ 		$query = "DELETE FROM %s WHERE oid=%d;";
+ 		$query = sprintf($query, sql_table('plugin_option'), (integer) $oid);
+ 		DB::execute($query);
+ 		
+ 		// delete entry from plugin_option_desc
+ 		$query = "DELETE FROM %s WHERE oid=%d;";
+ 		$query = sprintf($query, sql_table('plugin_option_desc'), $oid);
+ 		DB::execute($query);
+ 		
+ 		// clear from cache
+ 		unset($this->option_info["{$context}_{$name}"]);
+ 		$this->option_values = array();
+ 		return 1;
+ 	}
+ 	
+ 	/**
+ 	 * Update an option in the database table plugin_option
+ 	 * 		
+ 	 * returns: 1 on success, 0 on failure
+ 	 * private
+ 	 */
+ 	final protected function set_option($context, $contextid, $name, $value)
+ 	{
+ 		global $manager;
+ 		
+ 		$oid = $this->get_option_id($context, $name);
+ 		if ( !$oid )
+ 		{
+ 			return 0;
+ 		}
+ 		
+ 		// check if context id exists
+ 		switch ( $context )
+ 		{
+ 			case 'member':
+ 				if ( !Member::existsID($contextid) )
+ 				{
+ 					return 0;
+ 				}
+ 				break;
+ 			case 'blog':
+ 				if ( !$manager->existsBlogID($contextid) )
+ 				{
+ 					return 0;
+ 				}
+ 				break;
+ 			case 'category':
+ 				if ( !$manager->existsCategory($contextid) )
+ 				{
+ 					return 0;
+ 				}
+ 				break;
+ 			case 'item':
+ 				if ( !$manager->existsItem($contextid, true, true) )
+ 				{
+ 					return 0;
+ 				}
+ 				break;
+ 			case 'global':
+ 				if ( $contextid != 0 )
+ 				{
+ 					return 0;
+ 				}
+ 				break;
+ 		}
+ 		
+ 		// update plugin_option
+ 		$query = "DELETE FROM %s WHERE oid=%d and ocontextid=%d;";
+ 		$query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid);
+ 		DB::execute($query);
+ 		
+ 		$query = "INSERT INTO %s (ovalue, oid, ocontextid) VALUES (%s, %d, %d);";
+ 		$query = sprintf($query, sql_table('plugin_option'), DB::quoteValue($value), $oid, $contextid);
+ 		DB::execute($query);
+ 		
+ 		// update cache
+ 		$this->option_values["{$oid}_{$contextid}"] = $value;
+ 		if ( $context == 'global' )
+ 		{
+ 			$this->plugin_options[strtolower($name)] = $value;
+ 		}
+ 		
+ 		return 1;
+ 	}
+ 	
+ 	/**
+ 	 * Get an option from Cache or database
+ 	 * 	 - if not in the option Cache read it from the database
+ 	 *   - if not in the database write default values into the database
+ 	 *   		
+ 	 * private		
+ 	 */		 		 		
+ 	final protected function get_option($context, $contextid, $name)
+ 	{
+ 		$oid = $this->get_option_id($context, $name);
+ 		if ( !$oid )
+ 		{
+ 			return '';
+ 		}
+ 		
+ 		$key = "{$oid}_{$contextid}";
+ 		
+ 		if ( isset($this->option_values[$key]) )
+ 		{
+ 			return $this->option_values[$key];
+ 		}
+ 		
+ 		// get from DB
+ 		$query = "SELECT ovalue FROM %s WHERE oid=%d and ocontextid=%d;";
+ 		$query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid);
+ 		$result = DB::getResult($query);
+ 		
+ 		if ( !$result || ($result->rowCount() == 0) )
+ 		{
+ 			// fill DB with default value
+ 			$this->option_values[$key] = $this->get_default_value($context, $name);
+ 			$query = "INSERT INTO %s (oid, ocontextid, ovalue) VALUES (%d, %d, %s);";
+ 			$query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid, DB::quoteValue($this->option_values[$key]));
+ 			DB::execute($query);
+ 		}
+ 		else
+ 		{
+ 			$row = $result->fetch();
+ 			$this->option_values[$key] = $row['ovalue'];
+ 		}
+ 		
+ 		return $this->option_values[$key];
+ 	}
+ 	
+ 	/**
+ 	 * Returns assoc array with all values for a given option
+ 	 * (one option per possible context id)
+ 	 *
+ 	 * private		 		
+ 	 */
+ 	final protected function get_all_options($context, $name)
+ 	{
+ 		$oid = $this->get_option_id($context, $name);
+ 		if ( !$oid )
+ 		{
+ 			return array();
+ 		}
+ 		$default_value = $this->get_default_value($context, $name);
+ 		
+ 		$options = array();
+ 		$query = "SELECT %s as contextid FROM %s;";
+ 		switch ( $context )
+ 		{
+ 			case 'blog':
+ 				$query = sprintf($query, 'bnumber', sql_table('blog'));
+ 				break;
+ 			case 'category':
+ 				$query = sprintf($query, 'catid', sql_table('category'));
+ 				break;
+ 			case 'member':
+ 				$query = sprintf($query, 'mnumber', sql_table('member'));
+ 				break;
+ 			case 'item':
+ 				$query = sprintf($query, 'inumber', sql_table('item'));
+ 				break;
+ 		}
+ 		
+ 		$result = DB::getResult($query);
+ 		if ( $result )
+ 		{
+ 			foreach ( $result as $row )
+ 			{
+ 				$options[$row['contextid']] = $default_value;
+ 			}
+ 		}
+ 		
+ 		$query = "SELECT ocontextid, ovalue FROM %s WHERE oid=%d;";
+ 		$query = sprintf($query, sql_table('plugin_option'), $oid);
+ 		$result = DB::getResult($query);
+ 		foreach ( $result as $row )
+ 		{
+ 			$options[$row['ocontextid']] = $row['ovalue'];
+ 		}
+ 
+ 		return $options;
+ 	}
+ 	
+ 	/**
+ 	 * NucleusPlugin::get_option_id
+ 	 * 
+ 	 * Gets the 'option identifier' that corresponds to a given option name.
+ 	 * When this method is called for the first time, all the OIDs for the plugin
+ 	 * are loaded into memory, to avoid re-doing the same query all over.
+ 	 * 
+ 	 * @param	string	$context	option context
+ 	 * @param	string	$name		plugin name
+ 	 * @return		integer	option id
+ 	 */
+ 	final protected function get_option_id($context, $name)
+ 	{
+ 		$key = "{$context}_{$name}";
+ 		
+ 		if ( array_key_exists($key, $this->option_info)
+ 		 && array_key_exists('oid', $this->option_info[$key]) )
+ 		{
+ 			return $this->option_info[$key]['oid'];
+ 		}
+ 		
+ 		// load all OIDs for this plugin from the database
+ 		$this->option_info = array();
+ 		$query = "SELECT oid, oname, ocontext, odef FROM %s WHERE opid=%d;";
+ 		$query = sprintf($query, sql_table('plugin_option_desc'), $this->plugid);
+ 		$result = DB::getResult($query);
+ 		foreach ( $result as $row )
+ 		{
+ 			$k = $row['ocontext'] . '_' . $row['oname'];
+ 			$this->option_info[$k] = array('oid' => $row['oid'], 'default' => $row['odef']);
+ 		}
+ 		$result->closeCursor();
+ 		
+ 		return $this->option_info[$key]['oid'];
+ 	}
+ 	final protected function get_default_value($context, $name)
+ 	{
+ 		$key = $context . '_' . $name;
+ 		
+ 		if ( array_key_exists($key, $this->option_info)
+ 		 && array_key_exists('default', $this->option_info[$key]) )
+ 		{
+ 			return $this->option_info[$key]['default'];
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * NucleusPlugin::delete_option_values()
+ 	 * Deletes all option values for a given context and contextid
+ 	 * (used when e.g. a blog, member or category is deleted)
+ 	 *
+ 	 *@static
+ 	 *@param	String	$context	global/blog/category/item/member
+ 	 *@param	Integer	$contextid		ID
+ 	 *@return	Void
+ 	 */
+ 	static public function delete_option_values($context, $contextid)
+ 	{
+ 		// delete all associated plugin options
+ 		$aOIDs = array();
+ 		// find ids
+ 		$query = "SELECT oid FROM %s WHERE ocontext=%s;";
+ 		$query = sprintf($query, sql_table('plugin_option_desc'), DB::quoteValue($context));
+ 		
+ 		$result = DB::getResult($query);
+ 		foreach ( $result as $row )
+ 		{
+ 			array_push($aOIDs, $row['oid']);
+ 		}
+ 		$result->closeCursor();
+ 		// delete those options. go go go
+ 		if ( count($aOIDs) > 0 )
+ 		{
+ 			$query = "DELETE FROM %s WHERE oid in (%s) and ocontextid=%d;";
+ 			$query = sprintf($query, sql_table('plugin_option'), implode(',',$aOIDs), (integer) $contextid);
+ 			DB::execute($query);
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * NucleusPlugin::getOptionMeta()
+ 	 * splits the option's typeextra field (at ;'s) to split the meta collection
+ 	 * 
+ 	 * @static
+ 	 * @param string $typeExtra the value of the typeExtra field of an option
+ 	 * @return array array of the meta-key/value-pairs
+ 	 */
+ 	static public function getOptionMeta($typeExtra)
+ 	{
+ 		$meta = array();
+ 		
+ 		/* 1. if $typeExtra includes delimiter ';', split it to tokens */
+ 		$tokens = preg_split('#;#', $typeExtra);
+ 		
+ 		/*
+ 		 * 2. if each of tokens includes "=", it consists of key => value
+ 		 *    else it's 'select' option
+ 		 */
+ 		foreach ( $tokens as $token )
+ 		{
+ 			$matches = array();
+ 			if ( preg_match("#^([^=]+)?=([^=]+)?$#", $token, $matches) )
+ 			{
+ 				$meta[$matches[1]] = $matches[2];
+ 			}
+ 			else
+ 			{
+ 				$meta['select'] = $token;
+ 			}
+ 		}
+ 		return $meta;
+ 	}
+ 	
+ 	/**
+ 	 * NucleusPlugin::getOptionSelectValues()
+ 	 * filters the selectlists out of the meta collection
+ 	 * 
+ 	 * @static
+ 	 * @param string $typeExtra the value of the typeExtra field of an option
+ 	 * @return string the selectlist
+ 	 */
+ 	static public function getOptionSelectValues($typeExtra)
+ 	{
+ 		$meta = NucleusPlugin::getOptionMeta($typeExtra);
+ 		
+ 		if ( array_key_exists('select', $meta) )
+ 		{
+ 			return $meta['select'];
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * checks if the eventlist in the database is up-to-date
+ 	 * @return bool if it is up-to-date it return true, else false
+ 	 * @author TeRanEX
+ 	 */
+ 	public function subscribtionListIsUptodate()
+ 	{
+ 		$res = DB::getResult('SELECT event FROM '.sql_table('plugin_event').' WHERE pid = '.$this->plugid);
+ 		$ev = array();
+ 		foreach ( $res as $row )
+ 		{
+ 			array_push($ev, $row['event']);
+ 		}
+ 		if ( count($ev) != count($this->getEventList()) )
+ 		{
+ 			return false;
+ 		}
+ 		$d = array_diff($ev, $this->getEventList());
+ 		if ( count($d) > 0 )
+ 		{
+ 			// there are differences so the db is not up-to-date
+ 			return false;
+ 		}
+ 		return true;
+ 	}
+ 	
+ 	/**
+ 	 * NucleusPlugin::apply_plugin_options()
+ 	 * Update its entry in database table
+ 	 * 
+ 	 * @static
+ 	 * @param	$options: array ( 'oid' => array( 'contextid' => 'value'))
+ 	 * 			 (taken from request using requestVar())
+ 	 * @param	$new_contextid: integer (accepts a contextid when it is for a new
+ 	 *			 contextid there was no id available at the moment of writing the
+ 	 *			  formcontrols into the page (by ex: itemOptions for new item)
+ 	 * @return void
+ 	 */
+ 	static public function apply_plugin_options(&$options, $new_contextid = 0)
+ 	{
+ 		global $manager;
+ 		
+ 		if ( !is_array($options) )
+ 		{
+ 			return;
+ 		}
+ 		
+ 		foreach ( $options as $oid => $values )
+ 		{
+ 			// get option type info
+ 			$query = "SELECT opid, oname, ocontext, otype, oextra, odef FROM %s WHERE oid=%d;";
+ 			$query = sprintf($query, sql_table('plugin_option_desc'), (integer) $oid);
+ 			$result = DB::getRow($query);
+ 			if ( $result )
+ 			{
+ 				foreach ( $values as $id => $value )
+ 				{
+ 					// decide wether we are using the contextid of newContextid
+ 					if ( $new_contextid != 0 )
+ 					{
+ 						$contextid = $new_contextid;
+ 					}
+ 					else
+ 					{
+ 						$contextid = $id;
+ 					}
+ 					
+ 					// retreive any metadata
+ 					$meta = NucleusPlugin::getOptionMeta($result['oextra']);
+ 					
+ 					// if the option is readonly or hidden it may not be saved
+ 					if ( array_key_exists('access', $meta)
+ 					 && in_array($meta['access'], array('readonly', 'hidden')) )
+ 					{
+ 						return;
+ 					}
+ 					
+ 					// value comes from request
+ 					$value = undoMagic($value);
+ 					
+ 					/* validation the value according to its type */
+ 					switch ( $result['otype'] )
+ 					{
+ 						case 'yesno':
+ 							if ( ($value != 'yes') && ($value != 'no') )
+ 							{
+ 								$value = 'no';
+ 							}
+ 							break;
+ 						case 'text':
+ 						case 'select':
+ 							if ( array_key_exists('datatype', $meta)
+ 							 && ($meta['datatype'] == 'numerical') && ($value != (integer) $value) )
+ 							{
+ 								$value = (integer) $result['odef'];
+ 							}
+ 							break;
+ 						case 'password':
+ 						case 'textarea':
+ 						default:
+ 							break;
+ 					}
+ 					
+ 					/*
+ 					 * trigger event PrePluginOptionsUpdate to give the plugin the
+ 					 * possibility to change/validate the new value for the option
+ 					 */
+ 					$data = array(
+ 						'context'		=> $result['ocontext'],
+ 						'plugid'		=> $result['opid'],
+ 						'optionname'	=> $result['oname'],
+ 						'contextid'	=> $contextid,
+ 						'value'		=> &$value);
+ 					$manager->notify('PrePluginOptionsUpdate', $data);
+ 					
+ 					// delete and insert its fields of table in database
+ 					$query = "DELETE FROM %s WHERE oid=%d AND ocontextid=%d;";
+ 					$query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid);
+ 					DB::execute($query);
+ 					$query = "INSERT INTO %s (oid, ocontextid, ovalue) VALUES (%d, %d, %s);";
+ 					$query = sprintf($query, sql_table('plugin_option'), (integer) $oid, (integer) $contextid, DB::quoteValue($value));
+ 					DB::execute($query);
+ 					
+ 					// clear option value cache if the plugin object is already loaded
+ 					$plugin=& $manager->pidLoaded($result['opid']);
+ 					if ( $plugin )
+ 					{
+ 						$plugin->clearOptionValueCache();
+ 					}
+ 					
+ 					continue;
+ 				}
+ 			}
+ 			continue;
+ 		}
+ 		return;
+ 	}
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/libs/PLUGINADMIN.php
index 56f2df6,9d2b208..e1fce52
--- a/nucleus/libs/PLUGINADMIN.php
+++ b/nucleus/libs/PLUGINADMIN.php
@@@ -1,160 -1,167 +1,330 @@@
++<<<<<<< HEAD
 +<?php
 +
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2002-2012 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)
 + */
 +/**
 + * code to make it easier to create plugin admin areas
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2012 The Nucleus Group
 + * @version $Id: PLUGINADMIN.php 1626 2012-01-09 15:46:54Z sakamocchi $
 + */
 +
 +class PluginAdmin
 +{
 +	public $strFullName;		// NP_SomeThing
 +	public $plugin;			// ref. to plugin object
 +	public $bValid;			// evaluates to true when object is considered valid
 +	public $admin;				// ref to an admin object
 +	
 +	public function __construct($pluginName)
 +	{
 +		global $manager, $DIR_LIBS;
 +		
 +		if ( !class_exists('Admin', FALSE) )
 +		{
 +			include($DIR_LIBS . 'ADMIN.php');
 +		}
 +		
 +		$this->strFullName = "NP_{$pluginName}";
 +		
 +		// check if plugin exists and is installed
 +		if ( !$manager->pluginInstalled($this->strFullName) )
 +		{
 +			doError(_ERROR_INVALID_PLUGIN);
 +		}
 +		
 +		$this->plugin =& $manager->getPlugin($this->strFullName);
 +		$this->bValid = $this->plugin;
 +		
 +		if ( !$this->bValid )
 +		{
 +			doError(_ERROR_INVALID_PLUGIN);
 +		}
 +		
 +		$this->admin = new Admin();
 +		$this->admin->action = "plugin_{$pluginName}";
 +		return;
 +	}
 +	
 +	/**
 +	 * PluginAdmin::start()
 +	 * 
 +	 * @param	string	$extraHead	child elements for header element
 +	 * @return	void
 +	 */
 +	public function start($extraHead = '')
 +	{
 +		global $CONF;
 +		$strBaseHref  = '<base href="' . Entity::hsc($CONF['AdminURL']) . '" />';
 +		$extraHead .= $strBaseHref;
 +		
 +		$this->admin->pagehead($extraHead);
 +		return;
 +	}
 +	
 +	/**
 +	 * PluginAdmin::end()
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	public function end()
 +	{
 +		$this->_AddTicketByJS();
 +		$this->admin->pagefoot();
 +		return;
 +	}
 +	
 +	/**
 +	 * PluginAdmin::_AddTicketByJS()
 +	 * Add ticket when not used in plugin's admin page
 +	 * to avoid CSRF.
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	public function _AddTicketByJS()
 +	{
 +		global $CONF,$ticketforplugin;
 +		if ( !($ticket=$ticketforplugin['ticket']) ) 
 +		{
 +			return;
 +		}
 +		$ticket=Entity::hsc($ticket);
 +
 +?><script type="text/javascript">
 +/*<![CDATA[*/
 +/* Add tickets for available links (outside blog excluded) */
 +for (i=0;document.links[i];i++){
 +  if (document.links[i].href.indexOf('<?php echo $CONF['PluginURL']; ?>',0)<0
 +    && !(document.links[i].href.indexOf('//',0)<0)) continue;
 +  if ((j=document.links[i].href.indexOf('?',0))<0) continue;
 +  if (document.links[i].href.indexOf('ticket=',j)>=0) continue;
 +  document.links[i].href=document.links[i].href.substring(0,j+1)+'ticket=<?php echo $ticket; ?>&'+document.links[i].href.substring(j+1);
 +}
 +/* Add tickets for forms (outside blog excluded) */
 +for (i=0;document.forms[i];i++){
 +  /* check if ticket is already used */
 +  for (j=0;document.forms[i].elements[j];j++) {
 +    if (document.forms[i].elements[j].name=='ticket') {
 +      j=-1;
 +      break;
 +    }
 +  }
 +  if (j==-1) continue;
 + 
 +  /* check if the modification works */
 +  try{document.forms[i].innerHTML+='';}catch(e){
 +    /* Modificaion falied: this sometime happens on IE */
 +    if (!document.forms[i].action.name && document.forms[i].method.toUpperCase()=="POST") {
 +      /* <input name="action"/> is not used for POST method*/
 +      if (document.forms[i].action.indexOf('<?php echo $CONF['PluginURL']; ?>',0)<0
 +        && !(document.forms[i].action.indexOf('//',0)<0)) continue;
 +      if (0<(j=document.forms[i].action.indexOf('?',0))) if (0<document.forms[i].action.indexOf('ticket=',j)) continue;
 +      if (j<0) document.forms[i].action+='?'+'ticket=<?php echo $ticket; ?>';
 +      else document.forms[i].action+='&'+'ticket=<?php echo $ticket; ?>';
 +      continue;
 +    }
 +    document.write('<?php echo _PLUGINADMIN_TICKETS_JAVASCRIPT ?>');
 +    j=document.forms[i].outerHTML;
 +    while (j!=j.replace('<','&lt;')) j=j.replace('<','&lt;');
 +    document.write('<p>'+j+'</p>');
 +    continue;
 +  }
 +  /* check the action paramer in form tag */
 +  /* note that <input name="action"/> may be used here */
 +  j=document.forms[i].innerHTML;
 +  document.forms[i].innerHTML='';
 +  if ((document.forms[i].action+'').indexOf('<?php echo $CONF['PluginURL']; ?>',0)<0
 +      && !((document.forms[i].action+'').indexOf('//',0)<0)) {
 +    document.forms[i].innerHTML=j;
 +    continue;
 +  }
 +  /* add ticket */
 +  document.forms[i].innerHTML=j+'<input type="hidden" name="ticket" value="<?php echo $ticket; ?>"/>';
 +}
 +/*]]>*/
 +</script><?php
 +	return;
 +	}
 +}
 +
++=======
+ <?php
+ 
+ /*
+  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+  * Copyright (C) 2002-2012 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)
+  */
+ /**
+  * code to make it easier to create plugin admin areas
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2012 The Nucleus Group
+  * @version $Id: PLUGINADMIN.php 1886 2012-06-17 08:27:27Z sakamocchi $
+  */
+ 
+ class PluginAdmin
+ {
+ 	public $strFullName;	// NP_SomeThing
+ 	public $plugin;		// ref. to plugin object
+ 	public $bValid;		// evaluates to true when object is considered valid
+ 	public $admin;			// ref to an admin object
+ 
+ 	private $skinContents;	// PluginAdmin contents
+ 	private $extrahead;		// extrahead
+ 
+ 	public function __construct($pluginName)
+ 	{
+ 		global $manager, $DIR_LIBS;
+ 		
+ 		if ( !class_exists('Admin', FALSE) )
+ 		{
+ 			include($DIR_LIBS . 'ADMIN.php');
+ 		}
+ 		
+ 		$this->strFullName = "NP_{$pluginName}";
+ 		
+ 		// check if plugin exists and is installed
+ 		if ( !$manager->pluginInstalled($this->strFullName) )
+ 		{
+ 			doError(_ERROR_INVALID_PLUGIN);
+ 			return;
+ 		}
+ 		
+ 		$this->plugin = &$manager->getPlugin($this->strFullName);
+ 		$this->bValid =  $this->plugin;
+ 		
+ 		if ( !$this->bValid )
+ 		{
+ 			doError(_ERROR_INVALID_PLUGIN);
+ 			return;
+ 		}
+ 		
+ 		Admin::initialize();
+ 		Admin::$action = "plugin_{$pluginName}";
+ 		
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * PluginAdmin::start()
+ 	 * 
+ 	 * @param	string	$extraHead	child elements for header element
+ 	 * @return	void
+ 	 */
+ 	public function start($extraHead = '')
+ 	{
+ 		global $CONF;
+ 		$this->extrahead = $extraHead . '<base href="' . Entity::hsc($CONF['AdminURL']) . '" />' . "\n";
+ 		ob_start();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * PluginAdmin::end()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	public function end()
+ 	{
+ 		$this->AddTicketByJS();
+ 		$contents = ob_get_contents();
+ 		ob_end_clean();
+ 		$this->skinContents = '<%pagehead%>' . $contents . '<%pagefoot%>';
+ 		Admin::action_PluginAdmin($this->skinContents, $this->extrahead);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * PluginAdmin::_AddTicketByJS()
+ 	 * Add ticket when not used in plugin's admin page
+ 	 * to avoid CSRF.
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	private function AddTicketByJS()
+ 	{
+ 		global $CONF,$ticketforplugin;
+ 		if ( !($ticket = $ticketforplugin['ticket']) )
+ 		{
+ 			return;
+ 		}
+ 		$ticket=Entity::hsc($ticket);
+ 
+ ?><script type="text/javascript">
+ /*<![CDATA[*/
+ /* Add tickets for available links (outside blog excluded) */
+ for (i=0;document.links[i];i++){
+   if (document.links[i].href.indexOf('<?php echo $CONF['PluginURL']; ?>',0)<0
+     && !(document.links[i].href.indexOf('//',0)<0)) continue;
+   if ((j=document.links[i].href.indexOf('?',0))<0) continue;
+   if (document.links[i].href.indexOf('ticket=',j)>=0) continue;
+   document.links[i].href=document.links[i].href.substring(0,j+1)+'ticket=<?php echo $ticket; ?>&'+document.links[i].href.substring(j+1);
+ }
+ /* Add tickets for forms (outside blog excluded) */
+ for (i=0;document.forms[i];i++){
+   /* check if ticket is already used */
+   for (j=0;document.forms[i].elements[j];j++) {
+     if (document.forms[i].elements[j].name=='ticket') {
+       j=-1;
+       break;
+     }
+   }
+   if (j==-1) continue;
+  
+   /* check if the modification works */
+   try{document.forms[i].innerHTML+='';}catch(e){
+     /* Modificaion falied: this sometime happens on IE */
+     if (!document.forms[i].action.name && document.forms[i].method.toUpperCase()=="POST") {
+       /* <input name="action"/> is not used for POST method*/
+       if (document.forms[i].action.indexOf('<?php echo $CONF['PluginURL']; ?>',0)<0
+         && !(document.forms[i].action.indexOf('//',0)<0)) continue;
+       if (0<(j=document.forms[i].action.indexOf('?',0))) if (0<document.forms[i].action.indexOf('ticket=',j)) continue;
+       if (j<0) document.forms[i].action+='?'+'ticket=<?php echo $ticket; ?>';
+       else document.forms[i].action+='&'+'ticket=<?php echo $ticket; ?>';
+       continue;
+     }
+     document.write('<?php echo _PLUGINADMIN_TICKETS_JAVASCRIPT ?>');
+     j=document.forms[i].outerHTML;
+     while (j!=j.replace('<','&lt;')) j=j.replace('<','&lt;');
+     document.write('<p>'+j+'</p>');
+     continue;
+   }
+   /* check the action paramer in form tag */
+   /* note that <input name="action"/> may be used here */
+   j=document.forms[i].innerHTML;
+   document.forms[i].innerHTML='';
+   if ((document.forms[i].action+'').indexOf('<?php echo $CONF['PluginURL']; ?>',0)<0
+       && !((document.forms[i].action+'').indexOf('//',0)<0)) {
+     document.forms[i].innerHTML=j;
+     continue;
+   }
+   /* add ticket */
+   document.forms[i].innerHTML=j+'<input type="hidden" name="ticket" value="<?php echo $ticket; ?>"/>';
+ }
+ /*]]>*/
+ </script><?php
+ 	return;
+ 	}
+ }
+ 
++>>>>>>> skinnable-master
diff --combined nucleus/libs/SEARCH.php
index ae28362,534152f..81edfb5
--- a/nucleus/libs/SEARCH.php
+++ b/nucleus/libs/SEARCH.php
@@@ -1,221 -1,221 +1,445 @@@
++<<<<<<< HEAD
 +<?php
 +
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2003-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)
 + */
 +/**
 + * SEARCH(querystring) offers different functionality to create an
 + * SQL query to find certain items. (and comments)
 + *
 + * based on code by David Altherr:
 + * http://www.evolt.org/article/Boolean_Fulltext_Searching_with_PHP_and_MySQL/18/15665/
 + * http://davidaltherr.net/web/php_functions/boolean/funcs.mysql.boolean.txt
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2012 The Nucleus Group
 + * @version $Id: SEARCH.php 1556 2011-07-11 14:18:48Z ftruscot $
 + */
 +
 +
 +
 +class Search
 +{
 +	var $querystring;
 +	var $marked;
 +	var $inclusive;
 +	var $blogs;
 +
 +
 +	function SEARCH($text) {
 +		global $blogid;
 +		$text = preg_replace ("/[<,>,=,?,!,#,^,(,),[,\],:,;,\\\,%]/","",$text);
 +		$this->querystring	= $text;
 +		$this->marked		= $this->boolean_mark_atoms($text);
 +		$this->inclusive	= $this->boolean_inclusive_atoms($text);
 +		$this->blogs		= array();
 +
 +		// get all public searchable blogs, no matter what, include the current blog allways.
 +		$res = DB::getResult('SELECT bnumber FROM '.sql_table('blog').' WHERE bincludesearch=1 ');
 +		foreach ( $res as $row )
 +			$this->blogs[] = intval($row['bnumber']);
 +	}
 +
 +	function  boolean_sql_select($match){
 +		if (i18n::strlen($this->inclusive) > 0) {
 +		   /* build sql for determining score for each record */
 +		   $result=preg_split("# #",$this->inclusive);
 +		   for($cth=0;$cth<count($result);$cth++){
 +			   if(i18n::strlen($result[$cth])>=4){
 +				   $stringsum_long .=  " $result[$cth] ";
 +			   }else{
 +				   $stringsum_a[] = ' '.$this->boolean_sql_select_short($result[$cth],$match).' ';
 +			   }
 +		   }
 +
 +		   if(i18n::strlen($stringsum_long)>0){
 +				$stringsum_long = DB::quoteValue($stringsum_long);
 +				$stringsum_a[] = " match ({$match}) against ({$stringsum_long}) ";
 +		   }
 +
 +		   $stringsum .= implode("+",$stringsum_a);
 +		   return $stringsum;
 +		}
 +	}
 +
 +	function boolean_inclusive_atoms($string){
 +		$result = trim($string);
 +		$result = preg_replace("#([[:space:]]{2,})#", ' ', $result);
 +
 +		# replaced eregi_replace() below with preg_replace(). ereg* functions are deprecated in PHP 5.3.0
 +		# just added delimiters to regex and the 'i' for case-insensitive matching
 +
 +		/* convert normal boolean operators to shortened syntax */
 +		$result = preg_replace('# not #i', ' -', $result);
 +		$result = preg_replace('# and #i', ' ', $result);
 +		$result = preg_replace('# or #i', ',', $result);
 +
 +		/* drop unnecessary spaces */
 +		$result = str_replace(' ,', ',', $result);
 +		$result = str_replace(', ', ',', $result);
 +		$result = str_replace('- ', '-', $result);
 +		$result = str_replace('+', '', $result);
 +
 +		/* strip exlusive atoms */
 +		$result = preg_replace(
 +			"#\-\([A-Za-z0-9]{1,}[A-Za-z0-9\-\.\_\,]{0,}\)#",
 +			'',
 +			$result);
 +
 +		$result = str_replace('(', ' ', $result);
 +		$result = str_replace(')', ' ', $result);
 +		$result = str_replace(',', ' ', $result);
 +
 +		return $result;
 +	}
 +
 +    function boolean_sql_where($match){
 +
 +        $result = $this->marked;
 +
 +        $this->boolean_sql_where_cb1($match); // set the static $match
 +
 +        $result = preg_replace_callback(
 +
 +            "/foo\[\(\'([^\)]{4,})\'\)\]bar/",
 +
 +            array($this,'boolean_sql_where_cb1'),
 +
 +            $result);
 +
 +        $this->boolean_sql_where_cb2($match); // set the static $match
 +
 +        $result = preg_replace_callback(
 +
 +            "/foo\[\(\'([^\)]{1,3})\'\)\]bar/",
 +
 +            array($this,'boolean_sql_where_cb2'),
 +
 +            $result);
 +
 +        return $result;
 +
 +    }
 +
 +    function boolean_sql_where_cb1($matches){
 +
 +        static $match;
 +
 +        if (!is_array($matches)) $match=$matches;
 +
 +        else return ' match ('.$match.') against ('.DB::quoteValue($matches[1]).') > 0 ';
 +
 +    }
 +
 +    function boolean_sql_where_cb2($matches){
 +
 +        static $match;
 +
 +        if (!is_array($matches)) $match=$matches;
 +
 +        else return ' ('.$this->boolean_sql_where_short($matches[1], $match).') ';
 +
 +    }	
 +
 +	function boolean_mark_atoms($string){
 +		$result = trim($string);
 +		$result = preg_replace("/([[:space:]]{2,})/",' ',$result);
 +
 +		# replaced eregi_replace() below with preg_replace(). ereg* functions are deprecated in PHP 5.3.0
 +		# just added delimiters to regex and the 'i' for case-insensitive matching
 +
 +		/* convert normal boolean operators to shortened syntax */
 +		$result = preg_replace('# not #i', ' -', $result);
 +		$result = preg_replace('# and #i', ' ', $result);
 +		$result = preg_replace('# or #i', ',', $result);
 +
 +		/* strip excessive whitespace */
 +		$result = str_replace('( ', '(', $result);
 +		$result = str_replace(' )', ')', $result);
 +		$result = str_replace(', ', ',', $result);
 +		$result = str_replace(' ,', ',', $result);
 +		$result = str_replace('- ', '-', $result);
 +		$result = str_replace('+', '', $result);
 +
 +		// remove double spaces (we might have introduced some new ones above)
 +		$result = trim($result);
 +		$result = preg_replace("#([[:space:]]{2,})#", ' ', $result);
 +
 +		/* apply arbitrary function to all 'word' atoms */
 +
 +		$result_a = preg_split('# #', $result);
 +
 +		for($word = 0;$word<count($result_a);$word++)
 +		{
 +			$result_a[$word] = "foo[('" . $result_a[$word] . "')]bar";
 +		}
 +
 +		$result = implode(' ', $result_a);
 +
 +		/* dispatch ' ' to ' AND ' */
 +		$result = str_replace(' ', ' AND ', $result);
 +
 +		/* dispatch ',' to ' OR ' */
 +		$result = str_replace(',', ' OR ', $result);
 +
 +		/* dispatch '-' to ' NOT ' */
 +		$result = str_replace(' -', ' NOT ', $result);
 +		return $result;
 +	}
 +
 +	function boolean_sql_where_short($string,$match){
 +		$match_a = preg_split('#,#',$match);
 +		for($ith=0;$ith<count($match_a);$ith++){
 +			$like_a[$ith] = ' $match_a[$ith] LIKE ' . DB::quoteValue("% {$string} %") . ' ';
 +		}
 +		$like = implode(" OR ",$like_a);
 +
 +		return $like;
 +	}
 +	function boolean_sql_select_short($string,$match){
 +		$match_a = preg_split('#,#',$match);
 +		$score_unit_weight = .2;
 +		for($ith=0;$ith<count($match_a);$ith++){
 +			$score_a[$ith] =
 +						   " $score_unit_weight*(
 +						   LENGTH(" . DB::quoteValue($match_a[$ith]) . ") -
 +						   LENGTH(REPLACE(LOWER(" . DB::quoteValue($match_a[$ith]) . "),LOWER(" . DB::quoteValue($string) . "),'')))
 +						   /LENGTH(" . DB::quoteValue($string) . ") ";
 +		}
 +		$score = implode(" + ",$score_a);
 +
 +		return $score;
 +	}
 +}
 +?>
++=======
+ <?php
+ 
+ /*
+  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+  * Copyright (C) 2003-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)
+  */
+ /**
+  * SEARCH(querystring) offers different functionality to create an
+  * SQL query to find certain items. (and comments)
+  *
+  * based on code by David Altherr:
+  * http://www.evolt.org/article/Boolean_Fulltext_Searching_with_PHP_and_MySQL/18/15665/
+  * http://davidaltherr.net/web/php_functions/boolean/funcs.mysql.boolean.txt
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: SEARCH.php 1886 2012-06-17 08:27:27Z sakamocchi $
+  */
+ 
+ 
+ 
+ class Search
+ {
+ 	var $querystring;
+ 	var $marked;
+ 	var $inclusive;
+ 	var $blogs;
+ 
+ 
+ 	function SEARCH($text) {
+ 		global $blogid;
+ 		$text = preg_replace ("/[<,>,=,?,!,#,^,(,),[,\],:,;,\\\,%]/","",$text);
+ 		$this->querystring	= $text;
+ 		$this->marked		= $this->boolean_mark_atoms($text);
+ 		$this->inclusive	= $this->boolean_inclusive_atoms($text);
+ 		$this->blogs		= array();
+ 
+ 		// get all public searchable blogs, no matter what, include the current blog allways.
+ 		$res = DB::getResult('SELECT bnumber FROM '.sql_table('blog').' WHERE bincludesearch=1 ');
+ 		foreach ( $res as $row )
+ 			$this->blogs[] = intval($row['bnumber']);
+ 	}
+ 
+ 	function  boolean_sql_select($match){
+ 		if (i18n::strlen($this->inclusive) > 0) {
+ 		   /* build sql for determining score for each record */
+ 		   $result=preg_split("# #",$this->inclusive);
+ 		   for($cth=0;$cth<count($result);$cth++){
+ 			   if(i18n::strlen($result[$cth])>=4){
+ 				   $stringsum_long .=  " $result[$cth] ";
+ 			   }else{
+ 				   $stringsum_a[] = ' '.$this->boolean_sql_select_short($result[$cth],$match).' ';
+ 			   }
+ 		   }
+ 
+ 		   if(i18n::strlen($stringsum_long)>0){
+ 				$stringsum_long = DB::quoteValue($stringsum_long);
+ 				$stringsum_a[] = " match ({$match}) against ({$stringsum_long}) ";
+ 		   }
+ 
+ 		   $stringsum .= implode("+",$stringsum_a);
+ 		   return $stringsum;
+ 		}
+ 	}
+ 
+ 	function boolean_inclusive_atoms($string){
+ 		$result = trim($string);
+ 		$result = preg_replace("#([[:space:]]{2,})#", ' ', $result);
+ 
+ 		# replaced eregi_replace() below with preg_replace(). ereg* functions are deprecated in PHP 5.3.0
+ 		# just added delimiters to regex and the 'i' for case-insensitive matching
+ 
+ 		/* convert normal boolean operators to shortened syntax */
+ 		$result = preg_replace('# not #i', ' -', $result);
+ 		$result = preg_replace('# and #i', ' ', $result);
+ 		$result = preg_replace('# or #i', ',', $result);
+ 
+ 		/* drop unnecessary spaces */
+ 		$result = str_replace(' ,', ',', $result);
+ 		$result = str_replace(', ', ',', $result);
+ 		$result = str_replace('- ', '-', $result);
+ 		$result = str_replace('+', '', $result);
+ 
+ 		/* strip exlusive atoms */
+ 		$result = preg_replace(
+ 			"#\-\([A-Za-z0-9]{1,}[A-Za-z0-9\-\.\_\,]{0,}\)#",
+ 			'',
+ 			$result);
+ 
+ 		$result = str_replace('(', ' ', $result);
+ 		$result = str_replace(')', ' ', $result);
+ 		$result = str_replace(',', ' ', $result);
+ 
+ 		return $result;
+ 	}
+ 
+     function boolean_sql_where($match){
+ 
+         $result = $this->marked;
+ 
+         $this->boolean_sql_where_cb1($match); // set the static $match
+ 
+         $result = preg_replace_callback(
+ 
+             "/foo\[\(\'([^\)]{4,})\'\)\]bar/",
+ 
+             array($this,'boolean_sql_where_cb1'),
+ 
+             $result);
+ 
+         $this->boolean_sql_where_cb2($match); // set the static $match
+ 
+         $result = preg_replace_callback(
+ 
+             "/foo\[\(\'([^\)]{1,3})\'\)\]bar/",
+ 
+             array($this,'boolean_sql_where_cb2'),
+ 
+             $result);
+ 
+         return $result;
+ 
+     }
+ 
+     function boolean_sql_where_cb1($matches){
+ 
+         static $match;
+ 
+         if (!is_array($matches)) $match=$matches;
+ 
+         else return ' match ('.$match.') against ('.DB::quoteValue($matches[1]).') > 0 ';
+ 
+     }
+ 
+     function boolean_sql_where_cb2($matches){
+ 
+         static $match;
+ 
+         if (!is_array($matches)) $match=$matches;
+ 
+         else return ' ('.$this->boolean_sql_where_short($matches[1], $match).') ';
+ 
+     }	
+ 
+ 	function boolean_mark_atoms($string){
+ 		$result = trim($string);
+ 		$result = preg_replace("/([[:space:]]{2,})/",' ',$result);
+ 
+ 		# replaced eregi_replace() below with preg_replace(). ereg* functions are deprecated in PHP 5.3.0
+ 		# just added delimiters to regex and the 'i' for case-insensitive matching
+ 
+ 		/* convert normal boolean operators to shortened syntax */
+ 		$result = preg_replace('# not #i', ' -', $result);
+ 		$result = preg_replace('# and #i', ' ', $result);
+ 		$result = preg_replace('# or #i', ',', $result);
+ 
+ 		/* strip excessive whitespace */
+ 		$result = str_replace('( ', '(', $result);
+ 		$result = str_replace(' )', ')', $result);
+ 		$result = str_replace(', ', ',', $result);
+ 		$result = str_replace(' ,', ',', $result);
+ 		$result = str_replace('- ', '-', $result);
+ 		$result = str_replace('+', '', $result);
+ 
+ 		// remove double spaces (we might have introduced some new ones above)
+ 		$result = trim($result);
+ 		$result = preg_replace("#([[:space:]]{2,})#", ' ', $result);
+ 
+ 		/* apply arbitrary function to all 'word' atoms */
+ 
+ 		$result_a = preg_split('# #', $result);
+ 
+ 		for($word = 0;$word<count($result_a);$word++)
+ 		{
+ 			$result_a[$word] = "foo[('" . $result_a[$word] . "')]bar";
+ 		}
+ 
+ 		$result = implode(' ', $result_a);
+ 
+ 		/* dispatch ' ' to ' AND ' */
+ 		$result = str_replace(' ', ' AND ', $result);
+ 
+ 		/* dispatch ',' to ' OR ' */
+ 		$result = str_replace(',', ' OR ', $result);
+ 
+ 		/* dispatch '-' to ' NOT ' */
+ 		$result = str_replace(' -', ' NOT ', $result);
+ 		return $result;
+ 	}
+ 
+ 	function boolean_sql_where_short($string,$match){
+ 		$match_a = preg_split('#,#',$match);
+ 		for($ith=0;$ith<count($match_a);$ith++){
+ 			$like_a[$ith] = ' $match_a[$ith] LIKE ' . DB::quoteValue("% {$string} %") . ' ';
+ 		}
+ 		$like = implode(" OR ",$like_a);
+ 
+ 		return $like;
+ 	}
+ 	function boolean_sql_select_short($string,$match){
+ 		$match_a = preg_split('#,#',$match);
+ 		$score_unit_weight = .2;
+ 		for($ith=0;$ith<count($match_a);$ith++){
+ 			$score_a[$ith] =
+ 						   " $score_unit_weight*(
+ 						   LENGTH(" . DB::quoteValue($match_a[$ith]) . ") -
+ 						   LENGTH(REPLACE(LOWER(" . DB::quoteValue($match_a[$ith]) . "),LOWER(" . DB::quoteValue($string) . "),'')))
+ 						   /LENGTH(" . DB::quoteValue($string) . ") ";
+ 		}
+ 		$score = implode(" + ",$score_a);
+ 
+ 		return $score;
+ 	}
+ }
+ ?>
++>>>>>>> skinnable-master
diff --combined nucleus/libs/SKIN.php
index e6a8a8f,1cd58ea..55547be
--- a/nucleus/libs/SKIN.php
+++ b/nucleus/libs/SKIN.php
@@@ -14,7 -14,7 +14,11 @@@
   *
   * @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,9 -54,7 +58,13 @@@ class Ski
  		
  		$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)
@@@ -338,13 -336,20 +346,30 @@@
  		
  		// 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;
+ 		}
+ 		else
+ 		{
+ 			if ( $type != 'fileparse' && $type != 'importAdmin')
+ 			{
+ 				$contents = $this->getContentFromDB($type);
+ 			}
+ 			else if ( $path !== ''  && i18n::strpos(realpath($path), realpath("$DIR_NUCLEUS/../")) == 0 )
+ 			{
+ 				$contents = $this->getContentFromFile($path);
+ 			}
++>>>>>>> skinnable-master
  		}
  		// use base skin if this skin does not have contents
  		if ( $contents === FALSE )
@@@ -450,7 -455,7 +475,11 @@@
  		$res = DB::getValue($query);
  		
  		$skintypeexists = !empty($res);
++<<<<<<< HEAD
 +		$skintypevalue = ($content == true);
++=======
+ 		$skintypevalue = !empty($content);
++>>>>>>> skinnable-master
  		
  		if( $skintypevalue && $skintypeexists )
  		{
@@@ -459,39 -464,35 +488,65 @@@
  				'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 )
+ 		{
+ 			$data = array(
+ 				'skinid'	=>  $this->id,
+ 				'type'		=>  $type,
+ 				'content'	=> &$content
+ 			);
+ 			$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);
  		}
@@@ -499,32 -500,27 +554,54 @@@
  		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
+ 			);
+ 			$manager->notify("PostUpdate{$this->event_identifier}Part", $data);
+ 		}
+ 		else if( $skintypevalue )
+ 		{
+ 			$data = array(
+ 				'skinid'	=>  $this->id,
+ 				'type'		=>  $type,
+ 				'content'	=> &$content
+ 			);
+ 			$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;
@@@ -613,14 -609,14 +690,24 @@@
  	}
  	
  	/**
++<<<<<<< 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
  	}
  	
  	/**
@@@ -631,7 -627,7 +718,11 @@@
  	 */
  	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);
  		
@@@ -659,7 -655,7 +750,11 @@@
  	 * 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
  	 */
diff --combined nucleus/libs/TEMPLATE.php
index 8421d64,10af5d1..ea7a6ac
--- a/nucleus/libs/TEMPLATE.php
+++ b/nucleus/libs/TEMPLATE.php
@@@ -1,292 -1,273 +1,568 @@@
++<<<<<<< HEAD
 +<?php
 +
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2002-2012 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)
 + */
 +/**
 + * A class representing a template
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2012 The Nucleus Group
 + * @version $Id: TEMPLATE.php 1726 2012-04-07 02:23:46Z sakamocchi $
 + */
 +class Template
 +{
 +	/**
 +	 * Template::$id
 +	 */
 +	private $id;
 +	
 +	/**
 +	 * Template::__construct()
 +	 * 
 +	 * @param	integer	$templateid	id for template
 +	 * @return	void
 +	 */
 +	public function __construct($templateid)
 +	{
 +		$this->id = intval($templateid);
 +		return;
 +	}
 +	
 +	/**
 +	 * Template::getID()
 +	 * 
 +	 * @param	void
 +	 * @return	integer	id for this instance of Template class
 +	 */
 +	public function getID()
 +	{
 +		return (integer) $this->id;
 +	}
 +	
 +	/**
 +	 * Template::createFromName()
 +	 * 
 +	 * @statc
 +	 * @param	string	$name	template name
 +	 * @return	object	instance of Template class generated by the name
 +	 */
 +	static public function createFromName($name)
 +	{
 +		return new Template(Template::getIdFromName($name));
 +	}
 +	
 +	/**
 +	 * Template::getIdFromName()
 +	 * 
 +	 * @static
 +	 * @param	string	$name	template name
 +	 * @return	integer	id for the template
 +	 */
 +	static public function getIdFromName($name)
 +	{
 +		$name = DB::quoteValue($name);
 +		$query = "SELECT tdnumber FROM %s WHERE tdname=%s";
 +		$query = sprintf($query, sql_table('template_desc'), $name);
 +		return DB::getValue($query);
 +	}
 +	
 +	/**
 +	 * Template::updateGeneralInfo()
 +	 * Updates the general information about the template
 +	 * 
 +	 * @param	string	$name	template name
 +	 * @param	string	$desc	description for this template
 +	 * @return	void
 +	 */
 +	public function updateGeneralInfo($name, $desc)
 +	{
 +		$query =  "UPDATE %s SET tdname=%s, tddesc=%s WHERE tdnumber=%d";
 +		$query = sprintf($query, sql_table('template_desc'), DB::quoteValue($name), DB::quoteValue($desc), (integer) $this->getID());
 +		DB::execute($query);
 +		return;
 +	}
 +	
 +	/**
 +	 * Template::update()
 +	 * Updates the contents of one part of the template
 +	 * 
 +	 * @param	String	$type	value for nucleus_template.tpartname
 +	 * @param	String	$content	value for nucleus_template.tcontent
 +	 * @return	Void
 +	 */
 +	public function update($type, $content)
 +	{
 +		// delete old thingie
 +		$query = "DELETE FROM %s WHERE tpartname=%s and tdesc=%d";
 +		$query = sprintf($query, sql_table('template'), DB::quoteValue($type), (integer) $this->getID());
 +		DB::execute($query);
 +		
 +		// write new thingie
 +		if ( $content )
 +		{
 +			$query = "INSERT %s (tcontent, tpartname, tdesc) VALUE (%s, %s, %d)";
 +			$query = sprintf($query, sql_table('template'), DB::quoteValue($content), DB::quoteValue($type), (integer) $this->getID());
 +			DB::execute($query);
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * Template::deleteAllParts()
 +	 * Deletes all template parts from the database
 +	 * 
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	public function deleteAllParts()
 +	{
 +		$query = "DELETE FROM %s WHERE tdesc=%d";
 +		$query = sprintf($query, sql_table('template'), (integer) $this->getID());
 +		DB::execute($query);
 +		return;
 +	}
 +	
 +	/**
 +	 * Template::createNew()
 +	 * Creates a new template
 +	 *
 +	 * @static
 +	 * @param	string	$name	name for new template
 +	 * @param	string	$desc	description for new template
 +	 * @return	integer	id for new template
 +	 */
 +	static public function createNew($name, $desc)
 +	{
 +		global $manager;
 +		
 +		$manager->notify(
 +			'PreAddTemplate',
 +			array(
 +				'name' => &$name,
 +				'description' => &$desc
 +			)
 +		);
 +		
 +		DB::execute('INSERT INTO '.sql_table('template_desc').' (tdname, tddesc) VALUES (' . DB::quoteValue($name) . ',' . DB::quoteValue($desc) . ')');
 +		$newId = DB::getInsertId();
 +		
 +		$manager->notify(
 +			'PostAddTemplate',
 +			array(
 +				'templateid' => $newId,
 +				'name' => $name,
 +				'description' => $desc
 +			)
 +		);
 +		
 +		return $newId;
 +	}
 +	
 +	/**
 +	 * Reads a template and returns an array with the parts.
 +	 *
 +	 * @static
 +	 * @param 	string	$name name of the template file
 +	 * @return	array	template array
 +	 */
 +	static public function read($name)
 +	{
 +		global $manager;
 +		$manager->notify(
 +			'PreTemplateRead',
 +			array(
 +				'template' => &$name
 +			)
 +		);
 +		
 +		$query = "SELECT tpartname, tcontent FROM %s, %s WHERE tdesc=tdnumber and tdname=%s";
 +		$query = sprintf($query, sql_table('template_desc'), sql_table('template'), DB::quoteValue($name));
 +		$res = DB::getResult($query);
 +		
 +		foreach ( $res as $row )
 +		{
 +			$template[$row['tpartname']] = $row['tcontent'];
 +		}
 +		
 +		/*
 +		 * TODO: this is appropriate or not?
 +		 */
 +		if ( array_key_exists('LOCALE', $template) && !empty($template['LOCALE']) )
 +		{
 +			setlocale(LC_TIME, $template['LOCALE']);
 +		}
 +		else
 +		{
 +			setlocale(LC_TIME,'');
 +		}
 +		
 +		return $template;
 +	}
 +	
 +	/**
 +	 * fills a template with values
 +	 * 
 +	 * @static
 +	 * @param	string	$template	Template to be used
 +	 * @param	array	$values		Array of all the values
 +	 * @return	string	string filled with tag contents
 +	 */
 +	static public function fill($template, $values)
 +	{
 +		
 +		if ( sizeof($values) != 0 )
 +		{
 +			foreach ( $values as $key => $value )
 +			{
 +				$template = preg_replace('#<%' . preg_quote($key, '#') . '%>#', $value, $template);
 +			}
 +		}
 +		
 +		// remove non matched template-tags
 +		return preg_replace('#<%([a-zA-Z]+)?%>#', '', $template);
 +	}
 +	
 +	/**
 +	 * TEMPLATE::exists()
 +	 * returns true if there is a template with the given shortname
 +	 * 
 +	 * @static
 +	 * @param	string	$name	template name
 +	 * @return	boolean	exists or not
 +	 */
 +	static public function exists($name)
 +	{
 +		$query = "SELECT * FROM %s WHERE tdname=%s";
 +		$query = sprintf($query, sql_table('template_desc'), DB::quoteValue($name));
 +		$r = DB::getResult($query);
 +		return ($r->rowCount() != 0);
 +	}
 +	
 +	/**
 +	 * TEMPLATE::existsID()
 +	 * returns true if there is a template with the given ID
 +	 * 
 +	 * @static
 +	 * @param	integer	$id	id for template
 +	 * @return	bookean	exists or not
 +	 */
 +	static public function existsID($id)
 +	{
 +		$query = "SELECT * FROM %s WHERE tdnumber=%d";
 +		$query = sprintf($query, sql_table('template_desc'), (integer) $id);
 +		$r = DB::getResult($query);
 +		return ($r->rowCount() != 0);
 +	}
 +	
 +	/**
 +	 * TEMPLATE::getNameFromId()
 +	 * 
 +	 * @static
 +	 * @param	integer	$id	id for template
 +	 * @return	object	sql object
 +	 */
 +	static public function getNameFromId($id)
 +	{
 +		$query = "SELECT tdname as result FROM %s WHERE tdnumber=%d";
 +		$query = sprintf($query, sql_table('template_desc'), (integer) $id);
 +		return DB::getValue($query);
 +	}
 +	
 +	/**
 +	 * TEMPLATE::getDesc()
 +	 * 
 +	 * @static
 +	 * @param	integer	$id	id for template
 +	 * @return	string	description for the template
 +	 */
 +	static public function getDesc($id)
 +	{
 +		$query = "SELECT tddesc FROM %s WHERE tdnumber=%d";
 +		$query = sprintf($query, sql_table('template_desc'), (integer) $id);
 +		return DB::getValue($query);
 +	}
 +}
++=======
+ <?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)
+  */
+ /**
+  * A class representing a template
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: TEMPLATE.php 1880 2012-06-17 07:48:14Z sakamocchi $
+  */
+ class Template
+ {
+ 	/**
+ 	 * Template::$id
+ 	 */
+ 	private $id;
+ 	
+ 	/**
+ 	 * Template::__construct()
+ 	 * 
+ 	 * @param	integer	$templateid	id for template
+ 	 * @return	void
+ 	 */
+ 	public function __construct($templateid)
+ 	{
+ 		$this->id = intval($templateid);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Template::getID()
+ 	 * 
+ 	 * @param	void
+ 	 * @return	integer	id for this instance of Template class
+ 	 */
+ 	public function getID()
+ 	{
+ 		return (integer) $this->id;
+ 	}
+ 	
+ 	/**
+ 	 * Template::createFromName()
+ 	 * 
+ 	 * @statc
+ 	 * @param	string	$name	template name
+ 	 * @return	object	instance of Template class generated by the name
+ 	 */
+ 	static public function createFromName($name)
+ 	{
+ 		return new Template(Template::getIdFromName($name));
+ 	}
+ 	
+ 	/**
+ 	 * Template::getIdFromName()
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$name	template name
+ 	 * @return	integer	id for the template
+ 	 */
+ 	static public function getIdFromName($name)
+ 	{
+ 		$name = DB::quoteValue($name);
+ 		$query = "SELECT tdnumber FROM %s WHERE tdname=%s";
+ 		$query = sprintf($query, sql_table('template_desc'), $name);
+ 		return DB::getValue($query);
+ 	}
+ 	
+ 	/**
+ 	 * Template::updateGeneralInfo()
+ 	 * Updates the general information about the template
+ 	 * 
+ 	 * @param	string	$name	template name
+ 	 * @param	string	$desc	description for this template
+ 	 * @return	void
+ 	 */
+ 	public function updateGeneralInfo($name, $desc)
+ 	{
+ 		$query =  "UPDATE %s SET tdname=%s, tddesc=%s WHERE tdnumber=%d";
+ 		$query = sprintf($query, sql_table('template_desc'), DB::quoteValue($name), DB::quoteValue($desc), (integer) $this->getID());
+ 		DB::execute($query);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Template::update()
+ 	 * Updates the contents of one part of the template
+ 	 * 
+ 	 * @param	String	$type	value for nucleus_template.tpartname
+ 	 * @param	String	$content	value for nucleus_template.tcontent
+ 	 * @return	Void
+ 	 */
+ 	public function update($type, $content)
+ 	{
+ 		// delete old thingie
+ 		$query = "DELETE FROM %s WHERE tpartname=%s and tdesc=%d";
+ 		$query = sprintf($query, sql_table('template'), DB::quoteValue($type), (integer) $this->getID());
+ 		DB::execute($query);
+ 		
+ 		// write new thingie
+ 		if ( $content )
+ 		{
+ 			$query = "INSERT INTO %s (tcontent, tpartname, tdesc) VALUES (%s, %s, %d)";
+ 			$query = sprintf($query, sql_table('template'), DB::quoteValue($content), DB::quoteValue($type), (integer) $this->getID());
+ 			DB::execute($query);
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Template::deleteAllParts()
+ 	 * Deletes all template parts from the database
+ 	 * 
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	public function deleteAllParts()
+ 	{
+ 		$query = "DELETE FROM %s WHERE tdesc=%d";
+ 		$query = sprintf($query, sql_table('template'), (integer) $this->getID());
+ 		DB::execute($query);
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Template::createNew()
+ 	 * Creates a new template
+ 	 *
+ 	 * @static
+ 	 * @param	string	$name	name for new template
+ 	 * @param	string	$desc	description for new template
+ 	 * @return	integer	id for new template
+ 	 */
+ 	static public function createNew($name, $desc)
+ 	{
+ 		global $manager;
+ 
+ 		$data = array(
+ 			'name'			=> &$name,
+ 			'description'	=> &$desc
+ 		);
+ 		$manager->notify('PreAddTemplate', $data);
+ 		
+ 		DB::execute('INSERT INTO '.sql_table('template_desc').' (tdname, tddesc) VALUES (' . DB::quoteValue($name) . ',' . DB::quoteValue($desc) . ')');
+ 		$newId = DB::getInsertId();
+ 
+ 		$data = array(
+ 			'templateid'	=> $newId,
+ 			'name'			=> $name,
+ 			'description'	=> $desc
+ 		);
+ 		$manager->notify('PostAddTemplate', $data);
+ 		
+ 		return $newId;
+ 	}
+ 	
+ 	/**
+ 	 * Reads a template and returns an array with the parts.
+ 	 *
+ 	 * @static
+ 	 * @param 	string	$name name of the template file
+ 	 * @return	array	template array
+ 	 */
+ 	static public function read($name)
+ 	{
+ 		global $manager;
+ 		$data = array('template' => &$name);
+ 		$manager->notify('PreTemplateRead', $data);
+ 		
+ 		$query = "SELECT tpartname, tcontent FROM %s, %s WHERE tdesc=tdnumber and tdname=%s";
+ 		$query = sprintf($query, sql_table('template_desc'), sql_table('template'), DB::quoteValue($name));
+ 		$res = DB::getResult($query);
+ 		
+ 		$template = array();
+ 		foreach ( $res as $row )
+ 		{
+ 			$template[$row['tpartname']] = $row['tcontent'];
+ 		}
+ 		
+ 		return $template;
+ 	}
+ 	
+ 	/**
+ 	 * fills a template with values
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$template	Template to be used
+ 	 * @param	array	$values		Array of all the values
+ 	 * @return	string	string filled with tag contents
+ 	 */
+ 	static public function fill($template, $values)
+ 	{
+ 		
+ 		if ( sizeof($values) != 0 )
+ 		{
+ 			foreach ( $values as $key => $value )
+ 			{
+ 				$template = preg_replace('#<%' . preg_quote($key, '#') . '%>#', $value, $template);
+ 			}
+ 		}
+ 		
+ 		// remove non matched template-tags
+ 		return preg_replace('#<%([a-zA-Z]+)?%>#', '', $template);
+ 	}
+ 	
+ 	/**
+ 	 * Template::exists()
+ 	 * returns true if there is a template with the given shortname
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$name	template name
+ 	 * @return	boolean	exists or not
+ 	 */
+ 	static public function exists($name)
+ 	{
+ 		$query = "SELECT * FROM %s WHERE tdname=%s";
+ 		$query = sprintf($query, sql_table('template_desc'), DB::quoteValue($name));
+ 		$r = DB::getResult($query);
+ 		return ($r->rowCount() != 0);
+ 	}
+ 	
+ 	/**
+ 	 * Template::existsID()
+ 	 * returns true if there is a template with the given ID
+ 	 * 
+ 	 * @static
+ 	 * @param	integer	$id	id for template
+ 	 * @return	bookean	exists or not
+ 	 */
+ 	static public function existsID($id)
+ 	{
+ 		$query = "SELECT * FROM %s WHERE tdnumber=%d";
+ 		$query = sprintf($query, sql_table('template_desc'), (integer) $id);
+ 		$r = DB::getResult($query);
+ 		return ($r->rowCount() != 0);
+ 	}
+ 	
+ 	/**
+ 	 * Template::getNameFromId()
+ 	 * 
+ 	 * @static
+ 	 * @param	integer	$id	id for template
+ 	 * @return	object	sql object
+ 	 */
+ 	static public function getNameFromId($id)
+ 	{
+ 		$query = "SELECT tdname as result FROM %s WHERE tdnumber=%d";
+ 		$query = sprintf($query, sql_table('template_desc'), (integer) $id);
+ 		return DB::getValue($query);
+ 	}
+ 	
+ 	/**
+ 	 * Template::getDesc()
+ 	 * 
+ 	 * @static
+ 	 * @param	integer	$id	id for template
+ 	 * @return	string	description for the template
+ 	 */
+ 	static public function getDesc($id)
+ 	{
+ 		$query = "SELECT tddesc FROM %s WHERE tdnumber=%d";
+ 		$query = sprintf($query, sql_table('template_desc'), (integer) $id);
+ 		return DB::getValue($query);
+ 	}
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/libs/backup.php
index 64ae2da,dcc5d71..ecc4762
--- a/nucleus/libs/backup.php
+++ b/nucleus/libs/backup.php
@@@ -1,432 -1,433 +1,867 @@@
++<<<<<<< HEAD
 +<?php
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2002-2012 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)
 + */
 +/**
 + * Scripts to create/restore a backup of the Nucleus database
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2012 The Nucleus Group
 + * @version $Id: backup.php 1624 2012-01-09 11:36:20Z sakamocchi $
 + */
 +
 +class Backup
 +{
 +	/**
 +	 * Backup::Backup()
 +	 * Constructor, just for compatibility
 +	 *
 +	 * @deprecated
 +	 * @param	void
 +	 * @return	void
 +	 *
 +	 */
 +	public function Backup()
 +	{
 +		return;
 +	}
 +
 +	/**
 +	 * Backup::do_backup()
 +	 * This function creates an sql dump of the database and sends it to
 +	 * the user as a file (can be gzipped if they want)
 +	 *
 +	 * NOTE: this remains not-static for compatibility
 +	 *
 +	 * @param boolean	$gzip	1 = compress backup file, 0 = no compression (default)
 +	 * @return	void
 +	 *
 +	 */
 +	public function do_backup($gzip = 0)
 +	{
 +		global $manager, $nucleus;
 +
 +		// tables of which backup is needed
 +		$tables = array(
 +				sql_table('actionlog'),
 +				sql_table('ban'),
 +				sql_table('blog'),
 +				sql_table('comment'),
 +				sql_table('config'),
 +				sql_table('item'),
 +				sql_table('karma'),
 +				sql_table('member'),
 +				sql_table('skin'),
 +				sql_table('skin_desc'),
 +				sql_table('team'),
 +				sql_table('template'),
 +				sql_table('template_desc'),
 +				sql_table('plugin'),
 +				sql_table('plugin_event'),
 +				sql_table('plugin_option'),
 +				sql_table('plugin_option_desc'),
 +				sql_table('category'),
 +				sql_table('activation'),
 +				sql_table('tickets'),
 +		);
 +
 +		// add tables that plugins want to backup to the list
 +		// catch all output generated by plugins
 +		ob_start();
 +		$query = sprintf('SELECT pfile FROM %s', sql_table('plugin'));
 +		$res = DB::getResult($query);
 +		foreach ( $res as $row )
 +		{
 +			$plug =& $manager->getPlugin($row['pfile']);
 +			if ( $plug )
 +			{
 +				$tables = array_merge($tables, (array) $plug->getTableList());
 +			}
 +		}
 +		ob_end_clean();
 +
 +		// remove duplicates
 +		$tables = array_unique($tables);
 +
 +		// make sure browsers don't cache the backup
 +		header("Pragma: no-cache");
 +
 +		// don't allow gzip compression when extension is not loaded
 +		if ( ($gzip != 0) && !extension_loaded("zlib") )
 +		{
 +			$gzip = 0;
 +		}
 +
 +		if ( !$gzip )
 +		{
 +			$filename = 'nucleus_db_backup_' . i18n::formatted_datetime('%Y-%m-%d-%H-%M-%S', time()) . ".sql";
 +		}
 +		else
 +		{
 +			// use an output buffer
 +			@ob_start();
 +			@ob_implicit_flush(0);
 +
 +			// set filename
 +			$filename = 'nucleus_db_backup_' . i18n::formatted_datetime('%Y-%m-%d-%H-%M-%S', time()) . ".sql.gz";
 +		}
 +
 +		// send headers that tell the browser a file is coming
 +		header("Content-Type: text/x-delimtext; name=\"$filename\"");
 +		header("Content-disposition: attachment; filename=$filename");
 +
 +		// dump header
 +		echo "/*\n";
 +		echo " * This is a backup file generated by Nucleus \n";
 +		echo " * http://www.nucleuscms.org/\n";
 +		echo " * \n";
 +		echo " * backup-date: " . i18n::formatted_datetime('rfc822GMT', time()) . "\n";
 +		echo " * Nucleus CMS version: " . $nucleus['version'] . "\n";
 +		echo " * \n";
 +		echo " * WARNING: Only try to restore on servers running the exact same version of Nucleus\n";
 +		echo " */\n";
 +
 +		// dump all tables
 +		reset($tables);
 +		array_walk($tables, array(__CLASS__, 'dump_table'));
 +
 +		if ( $gzip )
 +		{
 +			$Size = ob_get_length();
 +			$Crc = crc32(ob_get_contents());
 +			$contents = gzcompress(ob_get_contents());
 +			ob_end_clean();
 +			echo "\x1f\x8b\x08\x00\x00\x00\x00\x00" . substr($contents, 0, strlen($contents) - 4)
 +			. self::gzip_print_four_characters($Crc) . self::gzip_print_four_characters($Size);
 +		}
 +		exit;
 +	}
 +
 +	/**
 +	 * Backup::dump_table()
 +	 * Creates a dump for a single table
 +	 * ($tablename and $key are filled in by array_walk)
 +	 *
 +	 * @static
 +	 * @param	string	$tablename
 +	 * @param	string	$key
 +	 */
 +	static private function dump_table($tablename, $key)
 +	{
 +		echo "/*\n";
 +		echo " * TABLE: " . $tablename . "\n";
 +		echo " */\n";
 +
 +		// dump table structure
 +		self::dump_structure($tablename);
 +
 +		// dump table contents
 +		self::dump_contents($tablename);
 +		return;
 +	}
 +
 +	/**
 +	 * Backup::dump_structure()
 +	 * Creates a dump of the table structure for one table
 +	 *
 +	 * @static
 +	 * @param	string	$tablename
 +	 * @return	void
 +	 *
 +	 */
 +	static private function dump_structure($tablename)
 +	{
 +		// add command to drop table on restore
 +		echo "DROP TABLE IF EXISTS {$tablename};\n\n";
 +		$result = DB::getRow("SHOW CREATE TABLE {$tablename}");
 +		echo $result['Create Table'];
 +		echo ";\n\n";
 +		return;
 +	}
 +
 +	/**
 +	 * Backup::get_field_names()
 +	 * Returns the field named for the given table in the
 +	 * following format:
 +	 * (column1, column2, ..., columnn)
 +	 *
 +	 * @static
 +	 * @param	resource	$result
 +	 * @param	integer	$num_fields
 +	 * @return	string
 +	 */
 +	static private function get_field_names($result, $num_fields)
 +	{
 +		$fields = array();
 +		for ( $j = 0; $j < $num_fields; $j++ )
 +		{
 +			$col = $result->getColumnMeta($j);
 +			$fields[] = $col['name'];
 +		}
 +
 +		return '(' . implode(', ', $fields) . ')';
 +	}
 +
 +	/**
 +	 * Backup::dump_contents()
 +	 * Creates a dump of the table content for one table
 +	 *
 +	 * @static
 +	 * @param	string	$tablename
 +	 * @return	void
 +	 *
 +	 */
 +	static private function dump_contents($tablename)
 +	{
 +		/*
 +		 * Grab the data from the table.
 +		*/
 +		$result = DB::getResult("SELECT * FROM $tablename");
 +
 +		if ( $result->rowCount() > 0 )
 +		{
 +			echo "\n";
 +			echo "/*\n";
 +			echo " * Table Data for {$tablename}\n";
 +			echo " */\n";
 +		}
 +
 +		$num_fields = $result->columnCount();
 +
 +		/*
 +		 * Compose fieldname list
 +		*/
 +		$tablename_list = self::get_field_names($result, $num_fields);
 +
 +		/*
 +		 * Loop through the resulting rows and build the sql statement.
 +		*/
 +		foreach ( $result as $row )
 +		{
 +			// Start building the SQL statement.
 +			echo 'INSERT INTO ' . $tablename . ' ' . $tablename_list . ' VALUES(';
 +
 +			// Loop through the rows and fill in data for each column
 +			for ( $j = 0; $j < $num_fields; $j++ )
 +			{
 +				if ( !isset($row[$j]) )
 +				{
 +					// no data for column
 +					echo ' NULL';
 +				}
 +				elseif ( $row[$j] != '' )
 +				{
 +					// data
 +					echo ' ' . DB::quoteValue($row[$j]);
 +				}
 +				else
 +				{
 +					// empty column (!= no data!)
 +					echo "''";
 +				}
 +
 +				// only add comma when not last column
 +				if ( $j != ($num_fields - 1) )
 +				{
 +					echo ',';
 +				}
 +			}
 +			echo ");\n";
 +		}
 +		echo "\n";
 +		return;
 +	}
 +
 +	/**
 +	 * Backup::gzip_print_four_characters()
 +	 *
 +	 * @static
 +	 * @param	integer	$val
 +	 * @return	integer
 +	 */
 +	static private function gzip_print_four_characters($Val)
 +	{
 +		for ( $i = 0; $i < 4; $i ++ )
 +		{
 +			$return .= chr($Val % 256);
 +			$Val = floor($Val / 256);
 +		}
 +		return $return;
 +	}
 +
 +	/**
 +	 * Backup::do_restore()
 +	 * Restores a database backup
 +	 *
 +	 * NOTE: this remains not-static for compatibility
 +	 *
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	public function do_restore()
 +	{
 +		$uploadInfo = postFileInfo('backup_file');
 +
 +		// first of all: get uploaded file:
 +		if ( array_key_exists('name', $uploadInfo) && empty($uploadInfo['name']) )
 +		{
 +			return 'No file uploaded';
 +		}
 +		if ( !is_uploaded_file($uploadInfo['tmp_name']) )
 +		{
 +			return 'No file uploaded';
 +		}
 +
 +		$backup_file_name = $uploadInfo['name'];
 +		$backup_file_tmpname = $uploadInfo['tmp_name'];
 +		$backup_file_type = $uploadInfo['type'];
 +
 +		if ( !file_exists($backup_file_tmpname) )
 +		{
 +			return 'File Upload Error';
 +		}
 +
 +		if ( !preg_match("#^(text/[a-zA-Z]+)|(application/(x\-)?gzip(\-compressed)?)|(application/octet-stream)$#i", $backup_file_type) )
 +		{
 +			return 'The uploaded file is not of the correct type';
 +		}
 +
 +		$gzip = 0;
 +		if ( preg_match("#\.gz#i", $backup_file_name) )
 +		{
 +			$gzip = 1;
 +		}
 +
 +		if ( !extension_loaded("zlib") && $gzip )
 +		{
 +			return 'Cannot decompress gzipped backup (zlib package not installed)';
 +		}
 +
 +		// get sql query according to gzip setting (either decompress, or not)
 +		$contents = self::get_contents($backup_file_tmpname, $gzip);
 +		if ( $contents == '' )
 +		{
 +			return 'Cannot get contents from this file.';
 +		}
 +
 +		/* detect lines */
 +		$lines = preg_split('/[\r\n]/', $contents);
 +		if( $lines === $contents )
 +		{
 +			return 'Cannot parse contents from this file';
 +		}
 +
 +		/* get sql statements from each lines */
 +		$queries = self::get_queries($lines);
 +		if ( $queries === array() )
 +		{
 +			return "Cannot get SQL queries from this file.";
 +		}
 +
 +		/* execute sql statements */
 +		foreach ( $queries as $query )
 +		{
 +			if ( DB::execute($query) === FALSE )
 +			{
 +				$error = DB::getError();
 +				debug('SQL Error: ' . $error[2]);
 +				break;
 +			}
 +			continue;
 +		}
 +		return;
 +	}
 +
 +	static private function get_contents($temporary_name, $gzip = 0)
 +	{
 +		$contents = '';
 +		if ( $gzip )
 +		{
 +			// decompress and read
 +			$gz_ptr = gzopen($temporary_name, 'rb');
 +			while ( !gzeof($gz_ptr) )
 +			{
 +				$contents .= gzgets($gz_ptr, 100000);
 +			}
 +		}
 +		else
 +		{
 +			// just read
 +			$fsize = filesize($temporary_name);
 +			if ( $fsize > 0 )
 +			{
 +				$contents = fread(fopen($temporary_name, 'r'), $fsize);
 +			}
 +		}
 +		return $contents;
 +	}
 +
 +	static private function get_queries($lines)
 +	{
 +		$query = '';
 +		$queries = array();
 +		foreach ( $lines as $line )
 +		{
 +			$line = trim($line);
 +			if ( !$line || $line[0] == '#' || preg_match('#^[\s|/]?\*#', $line) )
 +			{
 +				continue;
 +			}
 +
 +			if ( preg_match('/^(.*);$/', $line, $matches) === 0 )
 +			{
 +				$query .= $line;
 +			}
 +			else
 +			{
 +				$query .= $matches[1];
 +				$queries[] = $query;
 +				$query = '';
 +			}
 +			continue;
 +		}
 +		return $queries;
 +	}
++=======
+ <?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)
+  */
+ /**
+  * Scripts to create/restore a backup of the Nucleus database
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: backup.php 1812 2012-05-01 14:59:07Z sakamocchi $
+  */
+ 
+ class Backup
+ {
+ 	/**
+ 	 * Backup::Backup()
+ 	 * Constructor, just for compatibility
+ 	 *
+ 	 * @deprecated
+ 	 * @param	void
+ 	 * @return	void
+ 	 *
+ 	 */
+ 	public function Backup()
+ 	{
+ 		return;
+ 	}
+ 
+ 	/**
+ 	 * Backup::do_backup()
+ 	 * This function creates an sql dump of the database and sends it to
+ 	 * the user as a file (can be gzipped if they want)
+ 	 *
+ 	 * NOTE: this remains not-static for compatibility
+ 	 *
+ 	 * @param boolean	$gzip	1 = compress backup file, 0 = no compression (default)
+ 	 * @return	void
+ 	 *
+ 	 */
+ 	public function do_backup($gzip = 0)
+ 	{
+ 		global $manager, $nucleus;
+ 
+ 		// tables of which backup is needed
+ 		$tables = array(
+ 				sql_table('actionlog'),
+ 				sql_table('ban'),
+ 				sql_table('blog'),
+ 				sql_table('comment'),
+ 				sql_table('config'),
+ 				sql_table('item'),
+ 				sql_table('karma'),
+ 				sql_table('member'),
+ 				sql_table('skin'),
+ 				sql_table('skin_desc'),
+ 				sql_table('team'),
+ 				sql_table('template'),
+ 				sql_table('template_desc'),
+ 				sql_table('plugin'),
+ 				sql_table('plugin_event'),
+ 				sql_table('plugin_option'),
+ 				sql_table('plugin_option_desc'),
+ 				sql_table('category'),
+ 				sql_table('activation'),
+ 				sql_table('tickets'),
+ 		);
+ 
+ 		// add tables that plugins want to backup to the list
+ 		// catch all output generated by plugins
+ 		ob_start();
+ 		$query = sprintf('SELECT pfile FROM %s', sql_table('plugin'));
+ 		$res = DB::getResult($query);
+ 		foreach ( $res as $row )
+ 		{
+ 			$plug =& $manager->getPlugin($row['pfile']);
+ 			if ( $plug )
+ 			{
+ 				$tables = array_merge($tables, (array) $plug->getTableList());
+ 			}
+ 		}
+ 		ob_end_clean();
+ 
+ 		// remove duplicates
+ 		$tables = array_unique($tables);
+ 
+ 		// make sure browsers don't cache the backup
+ 		header("Pragma: no-cache");
+ 
+ 		// don't allow gzip compression when extension is not loaded
+ 		if ( ($gzip != 0) && !extension_loaded("zlib") )
+ 		{
+ 			$gzip = 0;
+ 		}
+ 
+ 		if ( !$gzip )
+ 		{
+ 			$filename = 'nucleus_db_backup_' . i18n::formatted_datetime('%Y-%m-%d-%H-%M-%S', time()) . ".sql";
+ 		}
+ 		else
+ 		{
+ 			// use an output buffer
+ 			@ob_start();
+ 			@ob_implicit_flush(0);
+ 				
+ 			// set filename
+ 			$filename = 'nucleus_db_backup_' . i18n::formatted_datetime('%Y-%m-%d-%H-%M-%S', time()) . ".sql.gz";
+ 		}
+ 
+ 		// send headers that tell the browser a file is coming
+ 		header("Content-Type: text/x-delimtext; name=\"$filename\"");
+ 		header("Content-disposition: attachment; filename=$filename");
+ 
+ 		// dump header
+ 		echo "/*\n";
+ 		echo " * This is a backup file generated by Nucleus \n";
+ 		echo " * http://www.nucleuscms.org/\n";
+ 		echo " * \n";
+ 		echo " * backup-date: " . i18n::formatted_datetime('rfc822GMT', time()) . "\n";
+ 		echo " * Nucleus CMS version: " . $nucleus['version'] . "\n";
+ 		echo " * \n";
+ 		echo " * WARNING: Only try to restore on servers running the exact same version of Nucleus\n";
+ 		echo " */\n";
+ 
+ 		// dump all tables
+ 		reset($tables);
+ 		/* NOTE: hope to use 'self' keyword here but works bad so here use __CLASS__ macro. */
+ 		array_walk($tables, array(__CLASS__, 'dump_table'));
+ 
+ 		if ( $gzip )
+ 		{
+ 			$Size = ob_get_length();
+ 			$Crc = crc32(ob_get_contents());
+ 			$contents = gzcompress(ob_get_contents());
+ 			ob_end_clean();
+ 			echo "\x1f\x8b\x08\x00\x00\x00\x00\x00" . substr($contents, 0, strlen($contents) - 4)
+ 			. self::gzip_print_four_characters($Crc) . self::gzip_print_four_characters($Size);
+ 		}
+ 		exit;
+ 	}
+ 
+ 	/**
+ 	 * Backup::dump_table()
+ 	 * Creates a dump for a single table
+ 	 * ($tablename and $key are filled in by array_walk)
+ 	 *
+ 	 * @static
+ 	 * @param	string	$tablename
+ 	 * @param	string	$key
+ 	 */
+ 	static private function dump_table($tablename, $key)
+ 	{
+ 		echo "/*\n";
+ 		echo " * TABLE: " . $tablename . "\n";
+ 		echo " */\n";
+ 
+ 		// dump table structure
+ 		self::dump_structure($tablename);
+ 
+ 		// dump table contents
+ 		self::dump_contents($tablename);
+ 		return;
+ 	}
+ 
+ 	/**
+ 	 * Backup::dump_structure()
+ 	 * Creates a dump of the table structure for one table
+ 	 *
+ 	 * @static
+ 	 * @param	string	$tablename
+ 	 * @return	void
+ 	 *
+ 	 */
+ 	static private function dump_structure($tablename)
+ 	{
+ 		// add command to drop table on restore
+ 		echo "DROP TABLE IF EXISTS {$tablename};\n\n";
+ 		$result = DB::getRow("SHOW CREATE TABLE {$tablename}");
+ 		echo $result['Create Table'];
+ 		echo ";\n\n";
+ 		return;
+ 	}
+ 
+ 	/**
+ 	 * Backup::get_field_names()
+ 	 * Returns the field named for the given table in the
+ 	 * following format:
+ 	 * (column1, column2, ..., columnn)
+ 	 *
+ 	 * @static
+ 	 * @param	resource	$result
+ 	 * @param	integer	$num_fields
+ 	 * @return	string
+ 	 */
+ 	static private function get_field_names($result, $num_fields)
+ 	{
+ 		$fields = array();
+ 		for ( $j = 0; $j < $num_fields; $j++ )
+ 		{
+ 			$col = $result->getColumnMeta($j);
+ 			$fields[] = $col['name'];
+ 		}
+ 
+ 		return '(' . implode(', ', $fields) . ')';
+ 	}
+ 
+ 	/**
+ 	 * Backup::dump_contents()
+ 	 * Creates a dump of the table content for one table
+ 	 *
+ 	 * @static
+ 	 * @param	string	$tablename
+ 	 * @return	void
+ 	 *
+ 	 */
+ 	static private function dump_contents($tablename)
+ 	{
+ 		/*
+ 		 * Grab the data from the table.
+ 		*/
+ 		$result = DB::getResult("SELECT * FROM $tablename");
+ 
+ 		if ( $result->rowCount() > 0 )
+ 		{
+ 			echo "\n";
+ 			echo "/*\n";
+ 			echo " * Table Data for {$tablename}\n";
+ 			echo " */\n";
+ 		}
+ 
+ 		$num_fields = $result->columnCount();
+ 
+ 		/*
+ 		 * Compose fieldname list
+ 		*/
+ 		$tablename_list = self::get_field_names($result, $num_fields);
+ 
+ 		/*
+ 		 * Loop through the resulting rows and build the sql statement.
+ 		*/
+ 		foreach ( $result as $row )
+ 		{
+ 			// Start building the SQL statement.
+ 			echo 'INSERT INTO ' . $tablename . ' ' . $tablename_list . ' VALUES(';
+ 				
+ 			// Loop through the rows and fill in data for each column
+ 			for ( $j = 0; $j < $num_fields; $j++ )
+ 			{
+ 				if ( !isset($row[$j]) )
+ 				{
+ 					// no data for column
+ 					echo ' NULL';
+ 				}
+ 				elseif ( $row[$j] != '' )
+ 				{
+ 					// data
+ 					echo ' ' . DB::quoteValue($row[$j]);
+ 				}
+ 				else
+ 				{
+ 					// empty column (!= no data!)
+ 					echo "''";
+ 				}
+ 
+ 				// only add comma when not last column
+ 				if ( $j != ($num_fields - 1) )
+ 				{
+ 					echo ',';
+ 				}
+ 			}
+ 			echo ");\n";
+ 		}
+ 		echo "\n";
+ 		return;
+ 	}
+ 
+ 	/**
+ 	 * Backup::gzip_print_four_characters()
+ 	 *
+ 	 * @static
+ 	 * @param	integer	$val
+ 	 * @return	integer
+ 	 */
+ 	static private function gzip_print_four_characters($Val)
+ 	{
+ 		for ( $i = 0; $i < 4; $i ++ )
+ 		{
+ 			$return .= chr($Val % 256);
+ 			$Val = floor($Val / 256);
+ 		}
+ 		return $return;
+ 	}
+ 
+ 	/**
+ 	 * Backup::do_restore()
+ 	 * Restores a database backup
+ 	 *
+ 	 * NOTE: this remains not-static for compatibility
+ 	 *
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	public function do_restore()
+ 	{
+ 		$uploadInfo = postFileInfo('backup_file');
+ 
+ 		// first of all: get uploaded file:
+ 		if ( array_key_exists('name', $uploadInfo) && empty($uploadInfo['name']) )
+ 		{
+ 			return 'No file uploaded';
+ 		}
+ 		if ( !is_uploaded_file($uploadInfo['tmp_name']) )
+ 		{
+ 			return 'No file uploaded';
+ 		}
+ 
+ 		$backup_file_name = $uploadInfo['name'];
+ 		$backup_file_tmpname = $uploadInfo['tmp_name'];
+ 		$backup_file_type = $uploadInfo['type'];
+ 
+ 		if ( !file_exists($backup_file_tmpname) )
+ 		{
+ 			return 'File Upload Error';
+ 		}
+ 
+ 		if ( !preg_match("#^(text/[a-zA-Z]+)|(application/(x\-)?gzip(\-compressed)?)|(application/octet-stream)$#i", $backup_file_type) )
+ 		{
+ 			return 'The uploaded file is not of the correct type';
+ 		}
+ 
+ 		$gzip = 0;
+ 		if ( preg_match("#\.gz#i", $backup_file_name) )
+ 		{
+ 			$gzip = 1;
+ 		}
+ 
+ 		if ( !extension_loaded("zlib") && $gzip )
+ 		{
+ 			return 'Cannot decompress gzipped backup (zlib package not installed)';
+ 		}
+ 
+ 		// get sql query according to gzip setting (either decompress, or not)
+ 		$contents = self::get_contents($backup_file_tmpname, $gzip);
+ 		if ( $contents == '' )
+ 		{
+ 			return 'Cannot get contents from this file.';
+ 		}
+ 
+ 		/* detect lines */
+ 		$lines = preg_split('/[\r\n]/', $contents);
+ 		if( $lines === $contents )
+ 		{
+ 			return 'Cannot parse contents from this file';
+ 		}
+ 
+ 		/* get sql statements from each lines */
+ 		$queries = self::get_queries($lines);
+ 		if ( $queries === array() )
+ 		{
+ 			return "Cannot get SQL queries from this file.";
+ 		}
+ 
+ 		/* execute sql statements */
+ 		foreach ( $queries as $query )
+ 		{
+ 			if ( DB::execute($query) === FALSE )
+ 			{
+ 				$error = DB::getError();
+ 				debug('SQL Error: ' . $error[2]);
+ 				break;
+ 			}
+ 			continue;
+ 		}
+ 		return;
+ 	}
+ 
+ 	static private function get_contents($temporary_name, $gzip = 0)
+ 	{
+ 		$contents = '';
+ 		if ( $gzip )
+ 		{
+ 			// decompress and read
+ 			$gz_ptr = gzopen($temporary_name, 'rb');
+ 			while ( !gzeof($gz_ptr) )
+ 			{
+ 				$contents .= gzgets($gz_ptr, 100000);
+ 			}
+ 		}
+ 		else
+ 		{
+ 			// just read
+ 			$fsize = filesize($temporary_name);
+ 			if ( $fsize > 0 )
+ 			{
+ 				$contents = fread(fopen($temporary_name, 'r'), $fsize);
+ 			}
+ 		}
+ 		return $contents;
+ 	}
+ 
+ 	static private function get_queries($lines)
+ 	{
+ 		$query = '';
+ 		$queries = array();
+ 		foreach ( $lines as $line )
+ 		{
+ 			$line = trim($line);
+ 			if ( !$line || $line[0] == '#' || preg_match('#^[\s|/]?\*#', $line) )
+ 			{
+ 				continue;
+ 			}
+ 
+ 			if ( preg_match('/^(.*);$/', $line, $matches) === 0 )
+ 			{
+ 				$query .= $line;
+ 			}
+ 			else
+ 			{
+ 				$query .= $matches[1];
+ 				$queries[] = $query;
+ 				$query = '';
+ 			}
+ 			continue;
+ 		}
+ 		return $queries;
+ 	}
++>>>>>>> skinnable-master
  }
diff --combined nucleus/libs/globalfunctions.php
index 9a7688a,2c443f6..e6448a8
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@@ -1,1809 -1,1839 +1,3648 @@@
++<<<<<<< HEAD
 +<?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: globalfunctions.php 1856 2012-05-18 09:30:16Z sakamocchi $
 + */
 +
 +/* needed if we include globalfunctions from install.php */
 +global $nucleus, $CONF, $DIR_LIBS, $DIR_LOCALES, $manager, $member, $MYSQL_HANDLER, $StartTime;
 +
 +/* just for benchmark tag */
 +$StartTime = microtime(TRUE);
 +
 +$nucleus['version'] = 'v4.00 SVN';
 +$nucleus['codename'] = '';
 +
 +/*
 + * make sure there's no unnecessary escaping:
 + * set_magic_quotes_runtime(0);
 + */
 +if ( version_compare(PHP_VERSION, '5.3.0', '<') )
 +{
 +	ini_set('magic_quotes_runtime', '0');
 +}
 +
 +/* check and die if someone is trying to override internal globals (when register_globals turn on) */
 +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'));
 +
 +if ( !isset($CONF) )
 +{
 +	$CONF = array();
 +}
 +
 +/* debug mode */
 +if ( array_key_exists('debug', $CONF) && $CONF['debug'] )
 +{
 +	/* report all errors! */
 +	error_reporting(E_ALL);
 +}
 +else
 +{
 +	ini_set('display_errors','0');
 +	error_reporting(E_ERROR | E_WARNING | E_PARSE);
 +}
 +
 +/*
 + * alertOnHeadersSent
 + *  Displays an error when visiting a public Nucleus page and headers have
 + *  been sent out to early. This usually indicates an error in either a
 + *  configuration file or a translation file, and could cause Nucleus to
 + *  malfunction
 + */
 +if ( !array_key_exists('alertOnHeadersSent', $CONF) )
 +{
 +	$CONF['alertOnHeadersSent'] = 1;
 +}
 +
 +/*
 + * alertOnSecurityRisk
 + * Displays an error only when visiting the admin area, and when one or
 + *  more of the installation files (install.php, install.sql, upgrades/
 + *  directory) are still on the server.
 + */
 +if ( !array_key_exists('alertOnSecurityRisk', $CONF) )
 +{
 +	$CONF['alertOnSecurityRisk'] = 1;
 +}
 +
 +/*
 + * Set these to 1 to allow viewing of future items or draft items
 + * Should really never do this, but can be useful for some plugins that might need to
 + * Could cause some other issues if you use future posts otr drafts
 + * So use with care
 + */
 +$CONF['allowDrafts'] = 0;
 +$CONF['allowFuture'] = 0;
 +
 +if ( getNucleusPatchLevel() > 0 )
 +{
 +	$nucleus['version'] .= '/' . getNucleusPatchLevel();
 +}
 +
 +/* Avoid notices */
 +if ( !array_key_exists('installscript', $CONF) || empty($CONF['installscript']) )
 +{
 +	$CONF['installscript'] = 0;
 +}
 +if ( !array_key_exists('UsingAdminArea', $CONF) )
 +{
 +	$CONF['UsingAdminArea'] = 0;
 +}
 +
 +if ( !headers_sent() )
 +{
 +	header('Generator: Nucleus CMS ' . $nucleus['version']);
 +}
 +
 +
 +/* TODO: This is for compatibility since 4.0, should be obsoleted at future release. */
 +if ( !isset($DIR_LOCALES) )
 +{
 +	$DIR_LOCALES = $DIR_NUCLEUS . 'locales/';
 +}
 +global $DIR_LANG;
 +if ( !isset($DIR_LANG) )
 +{
 +	$DIR_LANG = $DIR_LOCALES;
 +}
 +
 +/* load and initialize i18n class */
 +if (!class_exists('i18n', FALSE))
 +{
 +	include($DIR_LIBS . 'i18n.php');
 +}
 +if ( !i18n::init('UTF-8', $DIR_LOCALES) )
 +{
 +	exit('Fail to initialize i18n class.');
 +}
 +
 +/* TODO: This is just for compatibility since 4.0, should be obsoleted at future release. */
 +define('_CHARSET', i18n::get_current_charset());
 +
 +
 +/*
 + * NOTE: Since 4.0 release, Entity class becomes to be important class
 + *  with some wrapper functions for htmlspechalchars/htmlentity PHP's built-in function
 + */
 +include($DIR_LIBS . 'ENTITY.php');
 +
 +/* we will use postVar, getVar, ... methods instead of $_GET, $_POST ... */
 +if ( $CONF['installscript'] != 1 )
 +{
 +	/* vars were already included in install.php */
 +	include_once($DIR_LIBS . 'vars4.1.0.php');
 +	
 +	/* added for 4.0 DB::* wrapper and compatibility sql_* */
 +	include_once($DIR_LIBS . 'sql/sql.php');
 +}
 +
 +/* include core classes that are needed for login & plugin handling */
 +include($DIR_LIBS . 'MEMBER.php');
 +include($DIR_LIBS . 'ACTIONLOG.php');
 +include($DIR_LIBS . 'MANAGER.php');
 +include($DIR_LIBS . 'PLUGIN.php');
 +
 +$manager =& MANAGER::instance();
 +
 +/* only needed when updating logs */
 +if ( $CONF['UsingAdminArea'] )
 +{
 +	/* XML-RPC client classes */
 +	include($DIR_LIBS . 'xmlrpc.inc.php');
 +	include($DIR_LIBS . 'ADMIN.php');
 +}
 +
 +
 +/* connect to database */
 +if ( !isset($MYSQL_HANDLER) )
 +{
 +	$MYSQL_HANDLER = array('mysql','');
 +}
 +if ( $MYSQL_HANDLER[0] == '' )
 +{
 +	$MYSQL_HANDLER[0] = 'mysql';
 +}
 +DB::setConnectionInfo($MYSQL_HANDLER[1], $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE);
 +
 +
 +/* force locale or charset */
 +$locale = '';
 +$charset = i18n::get_current_charset();
 +
 +$data = array(
 +	'locale'	=> &$locale,
 +	'charset'	=> &$charset
 +);
 +$manager->notify('ForceLocale', $data);
 +
 +if ( $data['locale'] !== '' )
 +{
 +	i18n::set_forced_locale($data['locale']);
 +}
 +if ( $data['charset'] !== '' )
 +{
 +	i18n::set_forced_charset($data['charset']);
 +}
 +unset($locale);
 +unset($charset);
 +
 +
 +/* convert forced charset to current charset */
 +if ( i18n::get_forced_charset() != i18n::get_current_charset() )
 +{
 +	$_POST		= i18n::convert_array($_POST, i18n::get_forced_charset());
 +	$_GET		= i18n::convert_array($_GET, i18n::get_forced_charset());
 +	$_REQUEST	= i18n::convert_array($_REQUEST, i18n::get_forced_charset());
 +	$_COOKIE	= i18n::convert_array($_COOKIE, i18n::get_forced_charset());
 +	$_FILES		= i18n::convert_array($_FILES, i18n::get_forced_charset());
 +	
 +	if ( session_id() !== '' )
 +	{
 +		$_SESSION = i18n::convert_array($_SESSION, i18n::get_forced_charset());
 +	}
 +}
 +
 +
 +/* sanitize option */
 +$bLoggingSanitizedResult = 0;
 +$bSanitizeAndContinue = 0;
 +$orgRequestURI = serverVar('REQUEST_URI');
 +sanitizeParams();
 +
 +/* logs sanitized result if need */
 +if ( $orgRequestURI !== serverVar('REQUEST_URI') )
 +{
 +	$msg = "Sanitized [" . serverVar('REMOTE_ADDR') . "] ";
 +	$msg .= $orgRequestURI . " -> " . serverVar('REQUEST_URI');
 +	if ( $bLoggingSanitizedResult )
 +	{
 +		addToLog(WARNING, $msg);
 +	}
 +	if ( !$bSanitizeAndContinue )
 +	{
 +		die("");
 +	}
 +}
 +
 +/* get all variables that can come from the request and put them in the global scope */
 +$blogid		= requestVar('blogid');
 +$itemid		= intRequestVar('itemid');
 +$catid		= intRequestVar('catid');
 +$skinid		= requestVar('skinid');
 +$memberid	= requestVar('memberid');
 +$archivelist = requestVar('archivelist');
 +$imagepopup	= requestVar('imagepopup');
 +$archive	= requestVar('archive');
 +$query		= requestVar('query');
 +$highlight	= requestVar('highlight');
 +$amount		= requestVar('amount');
 +$action		= requestVar('action');
 +$nextaction	= requestVar('nextaction');
 +$maxresults	= requestVar('maxresults');
 +$startpos	= intRequestVar('startpos');
 +$errormessage = '';
 +$error		= '';
 +$special	= requestVar('special');
 +
 +
 +/* read config */
 +getConfig();
 +
 +
 +/* Properly set $CONF['Self'] and others if it's not set...
 + * usually when we are access from admin menu
 + */
 +if ( !array_key_exists('Self', $CONF) )
 +{
 +	$CONF['Self'] = $CONF['IndexURL'];
 +	/* strip trailing */
 +	if ( $CONF['Self'][i18n::strlen($CONF['Self']) -1] == "/" )
 +	{
 +		$CONF['Self'] = i18n::substr($CONF['Self'], 0, i18n::strlen($CONF['Self']) -1);
 +	}
 +}
 +
 +$CONF['ItemURL']		= $CONF['Self'];
 +$CONF['ArchiveURL']		= $CONF['Self'];
 +$CONF['ArchiveListURL']	= $CONF['Self'];
 +$CONF['MemberURL']		= $CONF['Self'];
 +$CONF['SearchURL']		= $CONF['Self'];
 +$CONF['BlogURL']		= $CONF['Self'];
 +$CONF['CategoryURL']	= $CONF['Self'];
 +
 +/* automatically use simpler toolbar for mozilla */
 +if ( ($CONF['DisableJsTools'] == 0)
 +   && i18n::strpos(serverVar('HTTP_USER_AGENT'), 'Mozilla/5.0') !== FALSE
 +   && i18n::strpos(serverVar('HTTP_USER_AGENT'), 'Gecko') !== FALSE )
 +{
 +	$CONF['DisableJsTools'] = 2;
 +}
 +
 +/* login processing */
 +$member = new Member();
 +
 +if ( $action == 'login' )
 +{
 +	$login = postVar('login');
 +	$password = postVar('password');
 +	$shared = intPostVar('shared');
 +	$member->login($login, $password, $shared);
 +}
 +elseif ( ($action == 'logout') )
 +{
 +	$member->logout();
 +}
 +else
 +{
 +	$member->cookielogin();
 +}
 +
 +
 +/* TODO: This is for backward compatibility, should be obsoleted near future. */
 +if ( !preg_match('#^(.+)_(.+)_(.+)$#', $CONF['Locale'])
 +  && ($CONF['Locale'] = i18n::convert_old_language_file_name_to_locale($CONF['Locale'])) === FALSE )
 +{
 +	$CONF['Locale'] = 'en_Latn_US';
 +}
 +if ( !array_key_exists('Language', $CONF) )
 +{
 +	$CONF['Language'] = i18n::convert_locale_to_old_language_file_name($CONF['Locale']);
 +}
 +$locale = $CONF['Locale'];
 +
 +
 +/* NOTE: include translation file and set locale */
 +if ( $member->isLoggedIn() )
 +{
 +	if ( $member->getLocale() )
 +	{
 +		$locale = $member->getLocale();
 +	}
 +}
 +else
 +{
 +	if ( i18n::get_forced_locale() !== '' )
 +	{
 +		$locale = i18n::get_forced_locale();
 +	}
 +}
 +include_translation($locale);
 +i18n::set_current_locale($locale);
 +
 +
 +/* login completed */
 +$manager->notify('PostAuthentication', array('loggedIn' => $member->isLoggedIn() ) );
 +
 +/* next action */
 +if ( $member->isLoggedIn() && $nextaction )
 +{
 +	$action = $nextaction;
 +}
 +
 +/* first, let's see if the site is disabled or not. always allow admin area access. */
 +if ( $CONF['DisableSite'] && !$member->isAdmin() && !$CONF['UsingAdminArea'] )
 +{
 +	redirect($CONF['DisableSiteURL']);
 +	exit;
 +}
 +
 +/* load other classes */
 +include($DIR_LIBS . 'PARSER.php');
 +include($DIR_LIBS . 'SKIN.php');
 +include($DIR_LIBS . 'TEMPLATE.php');
 +include($DIR_LIBS . 'BLOG.php');
 +include($DIR_LIBS . 'BODYACTIONS.php');
 +include($DIR_LIBS . 'COMMENTS.php');
 +include($DIR_LIBS . 'COMMENT.php');
 +include($DIR_LIBS . 'NOTIFICATION.php');
 +include($DIR_LIBS . 'BAN.php');
 +include($DIR_LIBS . 'PAGEFACTORY.php');
 +include($DIR_LIBS . 'SEARCH.php');
 +include($DIR_LIBS . 'LINK.php');
 +
 +/* set lastVisit cookie (if allowed) */
 +if ( !headers_sent() )
 +{
 +	if ( $CONF['LastVisit'] )
 +	{
 +		setcookie($CONF['CookiePrefix'] . 'lastVisit', time(), time() + 2592000, $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);
 +	}
 +	else
 +	{
 +		setcookie($CONF['CookiePrefix'] . 'lastVisit', '', (time() - 2592000), $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);
 +	}
 +}
 +
 +if ( !defined('_ARCHIVETYPE_MONTH') )
 +{
 +	define('_ARCHIVETYPE_DAY', 'day');
 +	define('_ARCHIVETYPE_MONTH', 'month');
 +	define('_ARCHIVETYPE_YEAR', 'year');
 +}
 +
 +/* for path resolving */
 +$virtualpath = getVar('virtualpath');
 +if ( getVar('virtualpath') == '' )
 +					{
 +	$virtualpath = serverVar('PATH_INFO');
 +					}
 +				
 +/*
 + * 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') )
 +					{
 +	$CONF['URLMode'] = 'normal';
 +					}
 +else
 +					{
 +	if ( i18n::substr($CONF['Self'], i18n::strlen($CONF['Self']) - 4) != '.php' )
 +					{
 +		decodePathInfo($virtualpath);
 +	}
 +}
 +
 +/*
 + * PostParseURL is a place to cleanup any of the path-related global variables before the selector function is run.
 + * It has 2 values in the data in case the original virtualpath is needed, but most the use will be in tweaking
 + * global variables to clean up (scrub out catid or add catid) or to set someother global variable based on
 + * the values of something like catid or itemid
 + * New in 3.60
 + */
 +$data = array(
 +	'type' => basename(serverVar('SCRIPT_NAME')),
 +	'info' => $virtualpath
 +);
 +$manager->notify('PostParseURL', $data);
 +
 +/*
 + * NOTE: Here is the end of initialization
 + */
 +
 +/**
 + * include_libs()
 + * This function includes or requires the specified library file
 + * 
 + * @param	string	$file
 + * @param	boolean	$once use the _once() version
 + * @param	boolean	$require use require() instead of include()
 + * @return	void
 + */
 +function include_libs($file, $once = TRUE, $require = TRUE)
 +{
 +	global $DIR_LIBS;
 +	
 +	// $DIR_LIBS isn't a directory
 +	if ( !is_dir($DIR_LIBS) )
 +	{
 +		exit;
 +	}
 +	
 +	$lib_path = $DIR_LIBS . $file;
 +	
 +	if ( $once && $require )
 +	{
 +		require_once($lib_path);
 +	}
 +	else if ( $once && !$require )
 +	{
 +		include_once($lib_path);
 +	}
 +	else if ( $require )
 +	{
 +		require($lib_path);
 +	}
 +	else
 +	{
 +		include($lib_path);
 +	}
 +	return;
 +}
 +
 +/**
 + * include_plugins()
 + * This function includes or requires the specified plugin file
 + * 
 + * @param	string	$file
 + * @param	boolean	$once use the _once() version
 + * @param	boolean	$require use require() instead of include()
 + * @return	
 + */
 +function include_plugins($file, $once = TRUE, $require = TRUE)
 +{
 +	global $DIR_PLUGINS;
 +	
 +	// begin if: $DIR_LIBS isn't a directory
 +	if ( !is_dir($DIR_PLUGINS) )
 +	{
 +		exit;
 +	}
 +	
 +	$plugin_path = $DIR_PLUGINS . $file;
 +	
 +	// begin if: 
 +	if ( $once && $require )
 +	{
 +		require_once($plugin_path);
 +	}
 +	else if ( $once && !$require )
 +	{
 +		include_once($plugin_path);
 +	}
 +	elseif ( $require )
 +	{
 +		require($plugin_path);
 +	}
 +	else
 +	{
 +		include($plugin_path);
 +	}
 +	return;
 +}
 +
 +/**
 + * include_translation()
 + * This function decide which locale is used and include translation
 + * 
 + * @param	string	&$locale	locale name referring to 'language tags' defined in RFC 5646
 + * @return	void
 + */
 +function include_translation(&$locale)
 +{
 +	global $DIR_LOCALES;
 +	
 +	$translation_file = $DIR_LOCALES . $locale . '.' . i18n::get_current_charset() . '.php';
 +	if ( !file_exists($translation_file) )
 +	{
 +		$locale = 'en_Latn_US';
 +		$translation_file = $DIR_LOCALES . 'en_Latn_US.ISO-8859-1.php';
 +	}
 +	include($translation_file);
 +	return;
 +}
 +
 +/**
 + * intPostVar()
 + * This function returns the integer value of $_POST for the variable $name
 + * 
 + * @param	string	$name	field to get the integer value of
 + * @return	integer
 + */
 +function intPostVar($name)
 +{
 +	return (integer) postVar($name);
 +}
 +
 +
 +/**
 + * intGetVar()
 + * This function returns the integer value of $_GET for the variable $name
 + * 
 + * @param	string	$name	field to get the integer value of
 + * @return	integer
 + */
 +function intGetVar($name)
 +{
 +	return (integer) getVar($name);
 +}
 +
 +
 +/**
 + * intRequestVar()
 + * This function returns the integer value of $_REQUEST for the variable $name. Also checks $_GET and $_POST if not found in $_REQUEST
 + * 
 + * @param string $name field to get the integer value of
 + * @return int
 + */
 +function intRequestVar($name)
 +{
 +	return (integer) requestVar($name);
 +}
 +
 +
 +/**
 + * intCookieVar()
 + * This function returns the integer value of $_COOKIE for the variable $name
 + * 
 + * @param	string	$name	field to get the integer value of
 + * @return	integer
 + */
 +function intCookieVar($name)
 +{
 +	return (integer) cookieVar($name);
 +}
 +
 +/**
 + * getNucleusVersion()
 + * This function returns the current Nucleus version (100 = 1.00, 101 = 1.01, etc...)
 + * 
 + * @param	void
 + * @return	integer
 + */
 +function getNucleusVersion()
 +{
 +	return 400;
 +}
 +
 +/**
 + * getNucleusPatchLevel()
 + * TODO: Better description of this function.
 + *
 + * Power users can install patches in between nucleus releases. These patches
 + * usually add new functionality in the plugin API and allow those to
 + * be tested without having to install CVS.
 + *
 + *@param	void
 + * @return	integer
 + */
 +function getNucleusPatchLevel()
 +{
 +	return 0;
 +}
 +
 +/**
 + * getLatestVersion()
 + * This function returns the latest Nucleus version available for download from nucleuscms.org or FALSE if unable to attain data
 + * Format will be major.minor/patachlevel e.g. 3.41 or 3.41/02
 + * 
 + * @param	void
 + * @return	mixed
 + */
 +function getLatestVersion()
 +{
 +	// begin if: cURL is not available in this PHP installation
 +	if ( !function_exists('curl_init') )
 +	{
 +		return FALSE;
 +	}
 +	
 +	$curl = curl_init();
 +	$timeout = 5;
 +	
 +	curl_setopt ($curl, CURLOPT_URL, 'http://nucleuscms.org/version_check.php');
 +	curl_setopt ($curl, CURLOPT_RETURNTRANSFER, 1);
 +	curl_setopt ($curl, CURLOPT_CONNECTTIMEOUT, $timeout);
 +	
 +	$return = curl_exec($curl);
 +	
 +	curl_close($curl);
 +	
 +	return $return;
 +}
 +
 +/**
 + * sql_table()
 + * This function returns a Nucleus table name with the appropriate prefix
 + * @param string $name
 + * @return string
 + */
 +function sql_table($name)
 +{
 +	global $MYSQL_PREFIX;
 +	
 +	// begin if: no MySQL prefix
 +	if ( empty($MYSQL_PREFIX) )
 +	{
 +		return 'nucleus_' . $name;
 +	}
 +	// else: use MySQL prefix
 +	else
 +	{
 +		return $MYSQL_PREFIX . 'nucleus_' . $name;
 +	}
 +	return;
 +}
 +
 +/**
 + * sendContentType()
 + * This function sends the Content-Type header if headers have not already been sent
 + * It also determines if the browser can accept application/xhtml+xml and sends it only to those that can.
 + * 
 + * if content type is application/xhtml+xml, only send it to browsers
 + * that can handle it (IE6 cannot). Otherwise, send text/html
 + *
 + * v2.5:
 + * For admin area pages, keep sending text/html (unless it's a debug version)
 + * application/xhtml+xml still causes too much problems with the javascript implementations
 + *
 + * v3.3:
 + * ($CONF['UsingAdminArea'] && !$CONF['debug']) gets removed,
 + * application/xhtml+xml seems to be working, so we're going to use it if we can.
 + * 
 + * @param	string	$content_type	MIME media type registered to IANA, http://www.iana.org/assignments/media-types/index.html
 + * @param	string	$page_type		
 + * @param	string	$charset		Deprecated. This has no meaning.
 + * @return	void
 + * 
 + */
 +function sendContentType($content_type, $page_type = '', $charset = '')
 +{
 +	global $manager, $CONF;
 +	
 +	if ( headers_sent() )
 +	{
 +		return;
 +	}
 +	
 +	/* NOTE: MIME Media Type */
 +	if ( ($content_type == 'application/xhtml+xml')
 +		&& (!stristr(serverVar('HTTP_ACCEPT'), 'application/xhtml+xml') ) )
 +	{
 +		$content_type = 'text/html';
 +	}
 +	
 +	/* NOTE: generate event */
 +	$data = array(
 +		'pageType'		=>  $page_type,
 +		'contentType'	=> &$content_type
 +	);
 +	$manager->notify('PreSendContentType', $data);
 +	
 +	/* NOTE: confirm MIME Media Type */
 +	$content_type = preg_replace('#[^a-zA-Z0-9-+./]#', '', $content_type);
 +	
 +	/* NOTE: confirm character set */
 +	$charset = i18n::get_current_charset();
 +	if ( i18n::get_forced_charset() !== '' )
 +	{
 +		$charset = i18n::get_forced_charset();
 +	}
 +	
 +	/* NOTE: send HTTP 1.1 header */
 +	header("Content-Type: {$content_type}; charset={$charset}");
 +	
 +	/* NOTE: set handler for translating character set */
 +	if ( $charset != i18n::get_current_charset() )
 +	{
 +		ob_start(array('i18n', 'convert_handler'));
 +	}
 +	
 +	return;
 +}
 +
 +/**
 + * parseHighlight()
 + * This function parses a query into an array of expressions that can be passed on to the highlight method
 + * @param	string	$query
 + * @return	void
 + */
 +function parseHighlight($query)
 +{
 +	// TODO: add more intelligent splitting logic
 +	
 +	// get rid of quotes
 +	$query = preg_replace('/\'|"/', '', $query);
 +	
 +	if ( !$query )
 +	{
 +		return array();
 +	}
 +	
 +	$aHighlight = preg_split('# #', $query);
 +	
 +	for ( $i = 0; $i < count($aHighlight); $i++ )
 +	{
 +		$aHighlight[$i] = trim($aHighlight[$i]);
 +		
 +		if ( i18n::strlen($aHighlight[$i]) < 3 )
 +		{
 +			unset($aHighlight[$i]);
 +		}
 +	}
 +	
 +	if ( count($aHighlight) == 1 )
 +	{
 +		return $aHighlight[0];
 +	}
 +	else
 +	{
 +		return $aHighlight;
 +	}
 +	return;
 +}
 +
 +/**
 + * getConfig()
 + * 
 + * @param	void
 + * @return	void
 + */
 +function getConfig()
 +{
 +	global $CONF;
 +	
 +	$query = sprintf('SELECT * FROM %s', sql_table('config'));
 +	$res = DB::getResult($query);
 +	
 +	foreach ( $res as $row )
 +	{
 +		$CONF[$row['name']] = $row['value'];
 +	}
 +	return;
 +}
 +
 +/**
 + * This function gets the blog ID from the blog name
 + * @param string $name
 + * @return
 + */
 +function getBlogIDFromName($name)
 +{
 +	$query = sprintf('SELECT bnumber AS result FROM %s WHERE bshortname=%s', sql_table('blog'), DB::quoteValue($name));
 +	return DB::getValue($query);
 +}
 +
 +/**
 + * This function gets the blog name from the blog ID
 + * @param int $id
 + * @return object
 + */
 +function getBlogNameFromID($id)
 +{
 +	$query = sprintf('SELECT bname AS result FROM %s WHERE bnumber=%d', sql_table('blog'), intval($id));
 +	return DB::getValue($query);
 +}
 +
 +/**
 + * This function gets the blog ID from the item ID
 + * @param int $item_id
 + * @return object
 + */
 +function getBlogIDFromItemID($item_id)
 +{
 +	$query = sprintf('SELECT iblog AS result FROM %s WHERE inumber=%d', sql_table('item'), intval($item_id));
 +	return DB::getValue($query);
 +}
 +
 +/**
 + * This function gets the blog ID from the comment ID
 + * @param int $comment_id
 + * @return object
 + */
 +function getBlogIDFromCommentID($comment_id)
 +{
 +	$query = sprintf('SELECT cblog AS result FROM %s WHERE cnumber=%d', sql_table('comment'), intval($comment_id));
 +	return DB::getValue($query);
 +}
 +
 +/**
 + * This function gets the blog ID from the category ID
 + * @param int $category_id
 + * @return object
 + */
 +function getBlogIDFromCatID($category_id)
 +{
 +	$query = sprintf('SELECT cblog AS result FROM %s WHERE catid=%d', sql_table('category'), intval($category_id));
 +	return DB::getValue($query);
 +}
 +
 +/**
 + * This function gets the category ID from the category name
 + * @param int $name
 + * @return object
 + */
 +function getCatIDFromName($name)
 +{
 +	$query = sprintf('SELECT catid AS result FROM %s WHERE cname=%s', sql_table('category'), DB::quoteValue($name));
 +	return DB::getValue($query);
 +}
 +
 +
 +/**
 + * functions to be used in index.php to select something
 + */
 +function selectBlog($shortname)
 +{
 +	global $blogid, $archivelist;
 +	$blogid = getBlogIDFromName($shortname);
 +	
 +	// also force archivelist variable, if it is set
 +	if ( $archivelist )
 +	{
 +		$archivelist = $blogid;
 +	}
 +	return;
 +}
 +function selectSkin($skinname)
 +{
 +	global $skinid;
 +	$skinid = SKIN::getIdFromName($skinname);
 +	return;
 +}
 +function selectCategory($cat)
 +{
 +	global $catid;
 +	if ( is_numeric($cat) )
 +	{
 +		$catid = (integer) $cat;
 +	}
 +	else
 +	{
 +		$catid = getCatIDFromName($cat);
 +	}
 +	return;
 +}
 +function selectItem($id)
 +{
 +	global $itemid;
 +	$itemid = (integer) $id;
 +	return;
 +}
 +function selectSpecialSkinType($id)
 +{
 +	global $special;
 +	$special = strtolower($id);
 +	return;
 +}
 +function selector()
 +{
 +	global $archive, $archivelist, $archivenext, $archivenextexists, $archiveprev, $archiveprevexists, $archivetype;
 +	global $blog, $blogid;
 +	global $catid;
 +	global $itemid, $itemidnext, $itemidprev, $itemtitlenext, $itemtitleprev;
 +	global $CONF, $DIR_LIBS, $amount, $errormessage, $imagepopup;
 +	global $manager, $maxresults, $query;
 +	global $member, $memberid, $memberinfo;
 +	global $skinid, $skinpart, $special;
 +	
 +	$actionNames = array('addcomment', 'sendmessage', 'createaccount', 'forgotpassword', 'votepositive', 'votenegative', 'plugin');
 +	$action = requestVar('action');
 +	
 +	if ( in_array($action, $actionNames) )
 +	{
 +		include_once($DIR_LIBS . 'ACTION.php');
 +		$a = new Action();
 +		$errorInfo = $a->doAction($action);
 +		
 +		if ( $errorInfo )
 +		{
 +			$errormessage = $errorInfo['message'];
 +		}
 +	}
 +	
 +	// show error when headers already sent out
 +	if ( headers_sent() && $CONF['alertOnHeadersSent'] )
 +	{
 +		// try to get line number/filename (extra headers_sent params only exists in PHP 4.3+)
 +		if ( function_exists('version_compare') && version_compare('4.3.0', phpversion(), '<=') )
 +		{
 +			headers_sent($hsFile, $hsLine);
 +			$extraInfo = ' in <code>' . $hsFile . '</code> line <code>' . $hsLine . '</code>';
 +		}
 +		else
 +		{
 +			$extraInfo = '';
 +		}
 +		
 +		startUpError(
 +		   "<p>The page headers have already been sent out{$extraInfo}. 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.</p>"
 +		 . "<p>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>"
 +		 . "Page headers already sent"
 +		);
 +		exit;
 +	}
 +	
 +	// make is so ?archivelist without blogname or blogid shows the archivelist
 +	// for the default weblog
 +	if ( serverVar('QUERY_STRING') == 'archivelist' )
 +	{
 +		$archivelist = $CONF['DefaultBlog'];
 +	}
 +	
 +	// now decide which type of skin we need
 +	if ( $itemid )
 +	{
 +		// itemid given -> only show that item
 +		$type = 'item';
 +		
 +		if ( !$manager->existsItem($itemid,intval($CONF['allowFuture']),intval($CONF['allowDrafts'])) )
 +		{
 +			doError(_ERROR_NOSUCHITEM);
 +		}
 +		
 +		// 1. get timestamp, blogid and catid for item
 +		$query = 'SELECT itime, iblog, icat FROM %s WHERE inumber=%d';
 +		$query = sprintf($query, sql_table('item'), intval($itemid));
 +		$row = DB::getRow($query);
 +		
 +		// if a different blog id has been set through the request or selectBlog(),
 +		// deny access
 +		
 +		if ( $blogid && (intval($blogid) != $row['iblog']) )
 +		{
 +			doError(_ERROR_NOSUCHITEM);
 +		}
 +		
 +		// if a category has been selected which doesn't match the item, ignore the
 +		// category. #85
 +		if ( ($catid != 0) && ($catid != $row['icat']) )
 +		{
 +			$catid = 0;
 +		}
 +		
 +		$blogid = $row['iblog'];
 +		$timestamp = strtotime($row['itime']);
 +		
 +		$b =& $manager->getBlog($blogid);
 +		
 +		if ( !$b->isValidCategory($catid) )
 +		{
 +			$query = "SELECT inumber, ititle FROM %s WHERE itime<%s AND idraft=0 AND iblog=%d ORDER BY itime DESC LIMIT 1";
 +			$query = sprintf($query, sql_table('item'), DB::formatDateTime($timestamp), intval($blogid));
 +		}
 +		else
 +		{
 +			$query = "SELECT inumber, ititle FROM %s WHERE itime<%s AND idraft=0 AND iblog=%d AND icat=%d ORDER BY itime DESC LIMIT 1";
 +			$query = sprintf($query, sql_table('item'), DB::formatDateTime($timestamp), intval($blogid), intval($catid));
 +		}
 +		$row = DB::getRow($query);
 +		
 +		if ( $row )
 +		{
 +			$itemidprev = $row['inumber'];
 +			$itemtitleprev = $row['ititle'];
 +		}
 +		
 +		// get next itemid and title
 +		if ( !$b->isValidCategory($catid) )
 +		{
 +			$query = "SELECT inumber, ititle FROM %s WHERE itime>%s AND itime<=%s AND idraft=0 AND iblog=%d ORDER BY itime ASC LIMIT 1";
 +			$query = sprintf($query, sql_table('item'), DB::formatDateTime($timestamp), DB::formatDateTime($b->getCorrectTime()), intval($blogid));
 +		}
 +		else
 +		{
 +			$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";
 +			$query = sprintf($query, sql_table('item'), DB::formatDateTime($timestamp), DB::formatDateTime($b->getCorrectTime()), intval($blogid), intval($catid));
 +		}
 +		$row = DB::getRow($query);
 +		
 +		if ( $row )
 +		{
 +			$itemidnext = $row['inumber'];
 +			$itemtitlenext = $row['ititle'];
 +		}
 +	}
 +	elseif ( $archive )
 +	{
 +		// show archive
 +		$type = 'archive';
 +		
 +		// sql queries for the timestamp of the first and the last published item
 +		$query = sprintf('SELECT UNIX_TIMESTAMP(itime) as result FROM %s WHERE idraft=0 ORDER BY itime ASC', sql_table('item'));
 +		$first_timestamp = DB::getValue($query);
 +		$query = sprintf('SELECT UNIX_TIMESTAMP(itime) as result FROM %s WHERE idraft=0 ORDER BY itime DESC', sql_table('item'));
 +		$last_timestamp = DB::getValue($query);
 +		
 +		sscanf($archive, '%d-%d-%d', $y, $m, $d);
 +		
 +		if ( $d != 0 )
 +		{
 +			$archivetype = _ARCHIVETYPE_DAY;
 +			$t = mktime(0, 0, 0, $m, $d, $y);
 +			// one day has 24 * 60 * 60 = 86400 seconds
 +			$archiveprev = i18n::formatted_datetime('%Y-%m-%d', $t - 86400 );
 +			// check for published items
 +			if ( $t > $first_timestamp )
 +			{
 +				$archiveprevexists = true;
 +			}
 +			else
 +			{
 +				$archiveprevexists = false;
 +			}
 +			
 +			// one day later
 +			$t += 86400;
 +			$archivenext = i18n::formatted_datetime('%Y-%m-%d', $t);
 +			if ( $t < $last_timestamp )
 +			{
 +				$archivenextexists = true;
 +			}
 +			else
 +			{
 +				$archivenextexists = false;
 +			}
 +		}
 +		elseif ( $m == 0 )
 +		{
 +			$archivetype = _ARCHIVETYPE_YEAR;
 +			$t = mktime(0, 0, 0, 12, 31, $y - 1);
 +			// one day before is in the previous year
 +			$archiveprev = i18n::formatted_datetime('%Y', $t);
 +			if ( $t > $first_timestamp )
 +			{
 +				$archiveprevexists = true;
 +			}
 +			else
 +			{
 +				$archiveprevexists = false;
 +			}
 +
 +			// timestamp for the next year
 +			$t = mktime(0, 0, 0, 1, 1, $y + 1);
 +			$archivenext = i18n::formatted_datetime('%Y', $t);
 +			if ( $t < $last_timestamp )
 +			{
 +				$archivenextexists = true;
 +			}
 +			else
 +			{
 +				$archivenextexists = false;
 +			}
 +		}
 +		else
 +		{
 +			$archivetype = _ARCHIVETYPE_MONTH;
 +			$t = mktime(0, 0, 0, $m, 1, $y);
 +			// one day before is in the previous month
 +			$archiveprev = i18n::formatted_datetime('%Y-%m', $t - 86400);
 +			if ( $t > $first_timestamp )
 +			{
 +				$archiveprevexists = true;
 +			}
 +			else
 +			{
 +				$archiveprevexists = false;
 +			}
 +			
 +			// timestamp for the next month
 +			$t = mktime(0, 0, 0, $m+1, 1, $y);
 +			$archivenext = i18n::formatted_datetime('%Y-%m', $t);
 +			if ( $t < $last_timestamp )
 +			{
 +				$archivenextexists = true;
 +			}
 +			else
 +			{
 +				$archivenextexists = false;
 +			}
 +		}
 +	}
 +	elseif ( $archivelist )
 +	{
 +		$type = 'archivelist';
 +		
 +		if ( is_numeric($archivelist) )
 +		{
 +			$blogid = intVal($archivelist);
 +		}
 +		else
 +		{
 +			$blogid = getBlogIDFromName($archivelist);
 +		}
 +	
 +		if ( !$blogid )
 +		{
 +			doError(_ERROR_NOSUCHBLOG);
 +		}
 +	}
 +	elseif ( $query )
 +	{
 +		global $startpos;
 +		$type = 'search';
 +		$query = stripslashes($query);
 +		
 +		if ( is_numeric($blogid) )
 +		{
 +			$blogid = intVal($blogid);
 +		}
 +		else
 +		{
 +			$blogid = getBlogIDFromName($blogid);
 +		}
 +		
 +		if ( !$blogid )
 +		{
 +			doError(_ERROR_NOSUCHBLOG);
 +		}
 +	}
 +	elseif ( $memberid )
 +	{
 +		$type = 'member';
 +		
 +		if ( !Member::existsID($memberid) )
 +		{
 +			doError(_ERROR_NOSUCHMEMBER);
 +		}
 +		$memberinfo = $manager->getMember($memberid);
 +	}
 +	elseif ( $imagepopup )
 +	{
 +		// media object (images etc.)
 +		$type = 'imagepopup';
 +		
 +		// TODO: check if media-object exists
 +		// TODO: set some vars?
 +	}
 +	else
 +	{
 +		// show regular index page
 +		global $startpos;
 +		$type = 'index';
 +	}
 +	
 +	// any type of skin with catid
 +	if ( $catid && !$blogid )
 +	{
 +		$blogid = getBlogIDFromCatID($catid);
 +	}
 +	
 +	// decide which blog should be displayed
 +	if ( !$blogid )
 +	{
 +		$blogid = $CONF['DefaultBlog'];
 +	}
 +	
 +	$b =& $manager->getBlog($blogid);
 +	$blog = $b; // references can't be placed in global variables?
 +	
 +	if ( !$blog->isValid )
 +	{
 +		doError(_ERROR_NOSUCHBLOG);
 +	}
 +	
 +	// set catid if necessary
 +	if ( $catid )
 +	{
 +		// check if the category is valid
 +		if ( !$blog->isValidCategory($catid) )
 +		{
 +			doError(_ERROR_NOSUCHCATEGORY);
 +		}
 +		else
 +		{
 +			$blog->setSelectedCategory($catid);
 +		}
 +	}
 +	
 +	if ( !$skinid )
 +	{
 +		$skinid = $blog->getDefaultSkin();
 +	}
 +	
 +	if ( !empty($special) && isValidShortName($special) )
 +	{
 +		$type = strtolower($special);
 +	}
 +	
 +	$skin = new SKIN($skinid);
 +	
 +	if ( !$skin->isValid() )
 +	{
 +		doError(_ERROR_NOSUCHSKIN);
 +	}
 +	
 +	// set global skinpart variable so can determine quickly what is being parsed from any plugin or phpinclude
 +	$skinpart = $type;
 +	
 +	// parse the skin
 +	$skin->parse($type);
 +	
 +	// check to see we should throw JustPosted event
 +	$blog->checkJustPosted();
 +	return;
 +}
 +
 +/**
 + * doError()
 + * Show error skin with given message. An optional skin-object to use can be given
 + * 
 + * @param	string	$msg
 + * @param	string	$skin
 + * @return	void
 + */
 +function doError($msg, $skin = '')
 +{
 +	global $errormessage, $CONF, $skinid, $blogid, $manager;
 +	
 +	if ( $skin == '' )
 +	{
 +		if ( Skin::existsID($skinid) )
 +		{
 +			$id = $skinid;
 +		}
 +		elseif ( $manager->existsBlogID($blogid) )
 +		{
 +			$blog =& $manager->getBlog($blogid);
 +			$id = $blog->getDefaultSkin();
 +		}
 +		elseif ($CONF['DefaultBlog'] )
 +		{
 +			$blog =& $manager->getBlog($CONF['DefaultBlog']);
 +			$id = $blog->getDefaultSkin();
 +		}
 +		else
 +		{
 +			// this statement should actually never be executed
 +			$id = $CONF['BaseSkin'];
 +		}
 +		$skin = new Skin($id);
 +	}
 +	
 +	$errormessage = $msg;
 +	$skin->parse('error');
 +	return;
 +}
 +
 +/**
 + * Errors before the database connection has been made
 + * 
 + * @param	string	$msg	message to notify
 + * @param	string	$title	page title
 + * @return	void
 + */
 +function startUpError($msg, $title)
 +{
 +	header('Content-Type: text/xml; charset=' . i18n::get_current_charset());
 +	echo "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n";
 +	echo "<head>\n";
 +	echo "<title>{$title}</title></head>\n";
 +	echo "<body>\n";
 +	echo "<h1>{$title}</h1>\n";
 +	echo $msg;
 +	echo "</body>\n";
 +	echo "</html>\n";
 +	exit;
 +}
 +
 +function isValidShortName($name)
 +{
 +	return preg_match('#^[a-z0-9]+$#i', $name);
 +}
 +function isValidDisplayName($name)
 +{
 +	return preg_match('#^[a-z0-9]+[a-z0-9 ]*[a-z0-9]+$#i', $name);
 +}
 +function isValidCategoryName($name)
 +{
 +	return 1;
 +}
 +function isValidTemplateName($name)
 +{
 +	return preg_match('#^[a-z0-9/_\-]+$#i', $name);
 +}
 +function isValidSkinName($name)
 +{
 +	return preg_match('#^[a-z0-9/_\-]+$#i', $name);
 +}
 +
 +// add and remove linebreaks
 +function addBreaks($var)
 +{
 +	return nl2br($var);
 +}
 +function removeBreaks($var)
 +{
 +	return preg_replace("/<br \/>([\r\n])/", "$1", $var);
 +}
 +
 +/**
 + * parseFile()
 + * 
 + * @param	string	$filename
 + * @param	string	$includeMode
 + * @param	string	$includePrefix
 + * @return	void
 + */
 +function parseFile($filename, $includeMode = 'normal', $includePrefix = '')
 +{
 +	global $skinid;
 +	
 +	if ( !$skinid || !existsID($skinid) )
 +	{
 +		$skin = new Skin($CONF['BaseSkin']);
 +	}
 +	else
 +	{
 +		$skin = new Skin($skinid);
 +	}
 +	
 +	$oldIncludeMode = Parser::getProperty('IncludeMode');
 +	$oldIncludePrefix = Parser::getProperty('IncludePrefix');
 +	
 +	$skin->parse('fileparse', $filename);
 +	
 +	Parser::setProperty('IncludeMode', $oldIncludeMode);
 +	Parser::setProperty('IncludePrefix', $oldIncludePrefix);
 +	
 +	return;
 +}
 +
 +/**
 + * debug()
 + * Outputs a debug message
 + * 
 + * @param	string	$msg
 + * @return	void
 + */
 +function debug($msg)
 +{
 +	echo '<p><b>' . $msg . "</b></p>\n";
 +	return;
 +}
 +
 +// shows a link to help file
 +function help($id)
 +{
 +	echo helpHtml($id);
 +	return;
 +}
 +function helpHtml($id)
 +{
 +	global $CONF;
 +	return helplink($id) . '<img src="' . $CONF['AdminURL'] . 'documentation/icon-help.gif" width="15" height="15" alt="' . _HELP_TT . '" title="' . _HELP_TT . '" /></a>';
 +}
 +function helplink($id)
 +{
 +	global $CONF;
 +	return '<a href="' . $CONF['AdminURL'] . 'documentation/help.html#'. $id . '" onclick="if (event &amp;&amp; event.preventDefault) event.preventDefault(); return help(this.href);">';
 +}
 +
 +/**
 + * includephp()
 + * Includes a PHP file. This method can be called while parsing templates and skins
 + * 
 + * @param	string	$filename	name of file to parse
 + * @return	void
 + */
 +function includephp($filename)
 +{
 +	// make predefined variables global, so most simple scripts can be used here
 +	
 +	// apache (names taken from PHP doc)
 +	global $GATEWAY_INTERFACE, $SERVER_NAME, $SERVER_SOFTWARE, $SERVER_PROTOCOL;
 +	global $REQUEST_METHOD, $QUERY_STRING, $DOCUMENT_ROOT, $HTTP_ACCEPT;
 +	global $HTTP_ACCEPT_CHARSET, $HTTP_ACCEPT_ENCODING, $HTTP_ACCEPT_LANGUAGE;
 +	global $HTTP_CONNECTION, $HTTP_HOST, $HTTP_REFERER, $HTTP_USER_AGENT;
 +	global $REMOTE_ADDR, $REMOTE_PORT, $SCRIPT_FILENAME, $SERVER_ADMIN;
 +	global $SERVER_PORT, $SERVER_SIGNATURE, $PATH_TRANSLATED, $SCRIPT_NAME;
 +	global $REQUEST_URI;
 +	
 +	// php (taken from PHP doc)
 +	global $argv, $argc, $PHP_SELF, $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $HTTP_POST_VARS;
 +	global $HTTP_POST_FILES, $HTTP_ENV_VARS, $HTTP_SERVER_VARS, $HTTP_SESSION_VARS;
 +	
 +	// other
 +	global $PATH_INFO, $HTTPS, $HTTP_RAW_POST_DATA, $HTTP_X_FORWARDED_FOR;
 +	
 +	if ( @file_exists($filename) )
 +	{
 +		include($filename);
 +	}
 +	return;
 +}
 +
 +/**
 + * Checks if a certain plugin exists
 + * @param	string	$plug	name of plugin
 + * @return	boolean	exists or not
 + */
 +function checkPlugin($name)
 +{
 +	global $DIR_PLUGINS;
 +	return file_exists($DIR_PLUGINS . preg_replace('#[\\\\|/]#', '', $name) . '.php');
 +}
 +
 +/**
 + * alterQueryStr()
 + * 
 + * @param	string	$querystr	querystring to alter (e.g. foo=1&bar=2&x=y)
 + * @param	string	$param	name of parameter to change (e.g. 'foo')
 + * @param	string	$value	New value for that parameter (e.g. 3)
 + * @return	string	altered query string (for the examples above: foo=3&bar=2&x=y)
 + */
 +function alterQueryStr($querystr, $param, $value)
 +{
 +	$vars = preg_split('#&#', $querystr);
 +	$set = FALSE;
 +	
 +	for ( $i = 0; $i < count($vars); $i++ )
 +	{
 +		$v = preg_split('#=#', $vars[$i]);
 +		
 +		if ( $v[0] == $param )
 +		{
 +			$v[1] = $value;
 +			$vars[$i] = implode('=', $v);
 +			$set = true;
 +			break;
 +		}
 +	}
 +	if ( !$set )
 +	{
 +		$vars[] = "{$param}={$value}";
 +	}
 +	return ltrim(implode('&', $vars), '&');
 +}
 +
 +/**
 + * passVar()
 + * passes one variable as hidden input field (multiple fields for arrays)
 + * @see passRequestVars in varsx.x.x.php
 + * 
 + * @param	string	$key
 + * @param	string	$value
 + * @return	void
 + */
 +function passVar($key, $value)
 +{
 +	// array ?
 +	if ( is_array($value) )
 +	{
 +		for ( $i = 0; $i < sizeof($value); $i++ )
 +		{
 +			passVar($key . '[' . $i . ']', $value[$i]);
 +		}
 +		return;
 +	}
 +	
 +	// other values: do stripslashes if needed
 +	echo '<input type="hidden" name="' . Entity::hsc($key) . '" value="' . Entity::hsc(undoMagic($value)) . '" />' . "\n";
 +	return;
 +}
 +
 +/**
 + * checkVars()
 + * 
 + * @param	string	$variables
 + * @return	void
 + */
 +function checkVars($variables)
 +{
 +	foreach ( $variables as $variable )
 +	{
 +		if ( array_key_exists($variable, $_GET)
 +		  || array_key_exists($variable, $_POST)
 +		  || array_key_exists($variable, $_COOKIE)
 +		  || array_key_exists($variable, $_ENV)
 +		  || (session_id() !== '' && array_key_exists($variable, $_SESSION))
 +		  || array_key_exists($variable, $_FILES) )
 +		{
 +			die('Sorry. An error occurred.');
 +		}
 +	}
 +	return;
 +}
 +
 +/**
 + * sanitizeParams()
 + * Sanitize parameters such as $_GET and $_SERVER['REQUEST_URI'] etc.
 + * to avoid XSS.
 + * 
 + * @param	void
 + * @return	void
 + */
 +function sanitizeParams()
 +{
 +	$array = array();
 +	$str = '';
 +	$frontParam = '';
 +	
 +	// REQUEST_URI of $_SERVER
 +	$str =& $_SERVER["REQUEST_URI"];
 +	serverStringToArray($str, $array, $frontParam);
 +	sanitizeArray($array);
 +	arrayToServerString($array, $frontParam, $str);
 +	
 +	// QUERY_STRING of $_SERVER
 +	$str =& $_SERVER["QUERY_STRING"];
 +	serverStringToArray($str, $array, $frontParam);
 +	sanitizeArray($array);
 +	arrayToServerString($array, $frontParam, $str);
 +	
 +	// $_GET
 +	convArrayForSanitizing($_GET, $array);
 +	sanitizeArray($array);
 +	revertArrayForSanitizing($array, $_GET);
 +	
 +	// $_REQUEST (only GET param)
 +	convArrayForSanitizing($_REQUEST, $array);
 +	sanitizeArray($array);
 +	revertArrayForSanitizing($array, $_REQUEST);
 +	
 +	return;
 +}
 +
 +function _addInputTags(&$keys,$prefix='')
 +{
 +	foreach ( $keys as $key=>$value )
 +	{
 +		if ( $prefix )
 +		{
 +			$key=$prefix.'['.$key.']';
 +		}
 +		if ( is_array($value) )
 +		{
 +			_addInputTags($value,$key);
 +		}
 +		else
 +		{
 +			if ( get_magic_quotes_gpc() )
 +				{$value=stripslashes($value);
 +			}
 +			if ( $key == 'ticket' )
 +			{
 +				continue;
 +			}
 +			echo '<input type="hidden" name="'.Entity::hsc($key).
 +			     '" value="'.Entity::hsc($value).'" />'."\n";
 +		}
 +	}
 +	return;
 +}
 +
 +/**
 + * serverStringToArray()
 + * Convert the server string such as $_SERVER['REQUEST_URI']
 + * to arry like arry['blogid']=1 and array['page']=2 etc.
 + * 
 + * @param	string	 $uri				string
 + * @param	string	&$query_elements	elements of query according to application/x-www-form-urlencoded
 + * @param	string	&$hier_part			hierarchical part includes path
 + * 
 + * NOTE:
 + * RFC 3986: Uniform Resource Identifiers (URI): Generic Syntax
 + * 3.  Syntax Components
 + * http://www.ietf.org/rfc/rfc3986.txt
 + * 
 + * Hypertext Markup Language - 2.0
 + * 8.2.1. The form-urlencoded Media Type
 + * http://tools.ietf.org/html/rfc1866#section-8.2.1
 + * 
 + * $_SERVER > Language Reference > Predefined Variables > PHP Manual
 + * http://www.php.net/manual/en/reserved.variables.server.php
 + */
 +function serverStringToArray($uri, &$query_elements, &$hier_part)
 +{
 +	// init param
 +	$query_elements = array();
 +	$hier_part = "";
 +	
 +	// split hierarchical part, e.g. /index.php, query and fragment, e.g. blogid=1&page=2#section1
 +	if ( i18n::strpos($uri, "?") > 0 )
 +	{
 +		list($hier_part, $query_and_fragment) = preg_split("#\?#", $uri, 2);
 +	}
 +	else
 +	{
 +		$query_and_fragment = $uri;
 +		$hier_part = '';
 +	}
 +	
 +	// If there is no query like blogid=1&page=2, return
 +	if ( i18n::strpos($uri, "=") == FALSE && !i18n::strlen($hier_part) )
 +	{
 +		$hier_part = $uri;
 +		return;
 +	}
 +	
 +	$query_elements = preg_split("#&#", $query_and_fragment);
 +	return;
 +}
 +
 +/**
 + * arrayToServerString()
 + * Convert array like array['blogid'] to server string
 + * such as $_SERVER['REQUEST_URI']
 + * 
 + * @param	array	 $query_elements	elements of query according to application/x-www-form-urlencoded
 + * @param	string	 $hier_part			hier-part defined in RFC3986
 + * @param	string	&$uri				return value
 + * @return	void
 + * 
 + * NOTE:
 + * RFC 3986: Uniform Resource Identifiers (URI): Generic Syntax
 + * 3.  Syntax Components
 + * http://www.ietf.org/rfc/rfc3986.txt
 + * 
 + * Hypertext Markup Language - 2.0
 + * 8.2.1. The form-urlencoded Media Type
 + * http://tools.ietf.org/html/rfc1866#section-8.2.1
 + * 
 + * $_SERVER > Language Reference > Predefined Variables > PHP Manual
 + * http://www.php.net/manual/en/reserved.variables.server.php
 + */
 +function arrayToServerString($query_elements, $hier_part, &$uri)
 +{
 +	if ( i18n::strpos($uri, "?") !== FALSE )
 +	{
 +		$uri = $hier_part . "?";
 +	}
 +	else
 +	{
 +		$uri = $hier_part;
 +	}
 +	if ( count($query_elements) > 0 )
 +	{
 +		$uri .= implode("&", $query_elements);
 +	}
 +	return;
 +}
 +
 +/**
 + * sanitizeArray()
 + * Sanitize array parameters.
 + * This function checks both key and value.
 + * - check key if it inclues " (double quote),  remove from array
 + * - check value if it includes \ (escape sequece), remove remaining string
 + * 
 + * @param	array	&$array	elements of query according to application/x-www-form-urlencoded
 + * @return	void
 + */
 +function sanitizeArray(&$array)
 +{
 +	$excludeListForSanitization = array('query');
 +	
 +	foreach ( $array as $k => $v )
 +	{
 +		// split to key and value
 +		list($key, $val) = preg_split("#=#", $v, 2);
 +		if ( !isset($val) )
 +		{
 +			continue;
 +		}
 +		
 +		// when magic quotes is on, need to use stripslashes,
 +		// and then addslashes
 +		if ( get_magic_quotes_gpc() )
 +		{
 +			$val = stripslashes($val);
 +		}
 +		
 +		// note that we must use addslashes here because this function is called before the db connection is made
 +		// and sql_real_escape_string needs a db connection
 +		$val = addslashes($val);
 +		
 +		// if $key is included in exclude list, skip this param
 +		if ( !in_array($key, $excludeListForSanitization) )
 +		{
 +			// check value
 +			if ( i18n::strpos($val, '\\') > 0 )
 +			{
 +				list($val, $tmp) = preg_split('#\\\\#', $val);
 +			}
 +			
 +			// remove control code etc.
 +			$val = strtr($val, "\0\r\n<>'\"", "       ");
 +			
 +			// check key
 +			if ( preg_match('#\"#', $key) > 0 )
 +			{
 +				unset($array[$k]);
 +				continue;
 +			}
 +			
 +			// set sanitized info
 +			$array[$k] = sprintf("%s=%s", $key, $val);
 +		}
 +	}
 +	return;
 +}
 +
 +/**
 + * convArrayForSanitizing()
 + * Convert array for sanitizeArray function
 + * 
 + * @param	string	$src	array to be sanitized
 + * @param	array	&$array	array to be temporarily stored
 + * @return	void
 + */
 +function convArrayForSanitizing($src, &$array)
 +{
 +	$array = array();
 +	foreach ( $src as $key => $val )
 +	{
 +		if ( !key_exists($key, $_GET) )
 +		{
 +			continue;
 +		}
 +		$array[] = sprintf("%s=%s", $key, $val);
 +		continue;
 +	}
 +	return;
 +}
 +
 +/**
 + * revertArrayForSanitizing()
 + * Revert array after sanitizeArray function
 + * 
 + * @param	array	$array	element of query according to application/x-www-form-urlencoded
 + * @param	array	&$dst	combination of key and value
 + * @return	void
 + */
 +function revertArrayForSanitizing($array, &$dst)
 +{
 +	foreach ( $array as $v )
 +	{
 +		list($key, $val) = preg_split("#=#", $v, 2);
 +		$dst[$key] = $val;
 +		continue;
 +	}
 +	return;
 +}
 +
 +/**
++=======
+ <?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: globalfunctions.php 1886 2012-06-17 08:27:27Z sakamocchi $
+  */
+ 
+ /* needed if we include globalfunctions from install.php */
+ global $nucleus, $CONF, $DIR_LIBS, $DIR_LOCALES, $manager, $member, $MYSQL_HANDLER, $StartTime;
+ 
+ /* just for benchmark tag */
+ $StartTime = microtime(TRUE);
+ 
+ $nucleus['version'] = 'v4.00 SVN';
+ $nucleus['codename'] = '';
+ 
+ /*
+  * make sure there's no unnecessary escaping:
+  * set_magic_quotes_runtime(0);
+  */
+ if ( version_compare(PHP_VERSION, '5.3.0', '<') )
+ {
+ 	ini_set('magic_quotes_runtime', '0');
+ }
+ 
+ /* check and die if someone is trying to override internal globals (when register_globals turn on) */
+ 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'));
+ 
+ if ( !isset($CONF) )
+ {
+ 	$CONF = array();
+ }
+ 
+ /* debug mode */
+ if ( array_key_exists('debug', $CONF) && $CONF['debug'] )
+ {
+ 	/* report all errors! */
+ 	error_reporting(E_ALL | E_STRICT);
+ }
+ else
+ {
+ 	ini_set('display_errors','0');
+ 	error_reporting(E_ERROR | E_WARNING | E_PARSE);
+ }
+ 
+ /*
+  * alertOnHeadersSent
+  *  Displays an error when visiting a public Nucleus page and headers have
+  *  been sent out to early. This usually indicates an error in either a
+  *  configuration file or a translation file, and could cause Nucleus to
+  *  malfunction
+  */
+ if ( !array_key_exists('alertOnHeadersSent', $CONF) )
+ {
+ 	$CONF['alertOnHeadersSent'] = 1;
+ }
+ /*
+  * alertOnSecurityRisk
+  * Displays an error only when visiting the admin area, and when one or
+  *  more of the installation files (install.php, install.sql, upgrades/
+  *  directory) are still on the server.
+  */
+ if ( !array_key_exists('alertOnSecurityRisk', $CONF) )
+ {
+ 	$CONF['alertOnSecurityRisk'] = 1;
+ }
+ /*
+  * Set these to 1 to allow viewing of future items or draft items
+  * Should really never do this, but can be useful for some plugins that might need to
+  * Could cause some other issues if you use future posts otr drafts
+  * So use with care
+  */
+ $CONF['allowDrafts'] = 0;
+ $CONF['allowFuture'] = 0;
+ 
+ if ( getNucleusPatchLevel() > 0 )
+ {
+ 	$nucleus['version'] .= '/' . getNucleusPatchLevel();
+ }
+ 
+ /* Avoid notices */
+ if ( !array_key_exists('installscript', $CONF) || empty($CONF['installscript']) )
+ {
+ 	$CONF['installscript'] = 0;
+ }
+ if ( !array_key_exists('UsingAdminArea', $CONF) )
+ {
+ 	$CONF['UsingAdminArea'] = 0;
+ }
+ 
+ if ( !headers_sent() )
+ {
+ 	header('Generator: Nucleus CMS ' . $nucleus['version']);
+ }
+ 
+ 
+ /* TODO: This is for compatibility since 4.0, should be obsoleted at future release. */
+ if ( !isset($DIR_LOCALES) )
+ {
+ 	$DIR_LOCALES = $DIR_NUCLEUS . 'locales/';
+ }
+ global $DIR_LANG;
+ if ( !isset($DIR_LANG) )
+ {
+ 	$DIR_LANG = $DIR_LOCALES;
+ }
+ 
+ /* load and initialize i18n class */
+ if (!class_exists('i18n', FALSE))
+ {
+ 	include($DIR_LIBS . 'i18n.php');
+ }
+ if ( !i18n::init('UTF-8', $DIR_LOCALES) )
+ {
+ 	exit('Fail to initialize i18n class.');
+ }
+ 
+ /* TODO: This is just for compatibility since 4.0, should be obsoleted at future release. */
+ define('_CHARSET', i18n::get_current_charset());
+ 
+ 
+ /*
+  * NOTE: Since 4.0 release, Entity class becomes to be important class
+  *  with some wrapper functions for htmlspechalchars/htmlentity PHP's built-in function
+  */
+ include($DIR_LIBS . 'ENTITY.php');
+ 
+ /* we will use postVar, getVar, ... methods instead of $_GET, $_POST ... */
+ if ( $CONF['installscript'] != 1 )
+ {
+ 	/* vars were already included in install.php */
+ 	include_once($DIR_LIBS . 'vars4.1.0.php');
+ 	
+ 	/* added for 4.0 DB::* wrapper and compatibility sql_* */
+ 	include_once($DIR_LIBS . 'sql/sql.php');
+ }
+ 
+ /* include core classes that are needed for login & plugin handling */
+ include($DIR_LIBS . 'MEMBER.php');
+ include($DIR_LIBS . 'ACTIONLOG.php');
+ include($DIR_LIBS . 'MANAGER.php');
+ include($DIR_LIBS . 'PLUGIN.php');
+ 
+ $manager =& MANAGER::instance();
+ 
+ /* only needed when updating logs */
+ if ( $CONF['UsingAdminArea'] )
+ {
+ 	/* XML-RPC client classes */
+ 	include($DIR_LIBS . 'xmlrpc.inc.php');
+ 	include($DIR_LIBS . 'ADMIN.php');
+ }
+ 
+ 
+ /* connect to database */
+ if ( !isset($MYSQL_HANDLER) )
+ {
+ 	$MYSQL_HANDLER = array('mysql','');
+ }
+ if ( $MYSQL_HANDLER[0] == '' )
+ {
+ 	$MYSQL_HANDLER[0] = 'mysql';
+ }
+ DB::setConnectionInfo($MYSQL_HANDLER[1], $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE);
+ 
+ 
+ /* force locale or charset */
+ $locale = '';
+ $charset = i18n::get_current_charset();
+ 
+ $data = array(
+ 	'locale'	=> &$locale,
+ 	'charset'	=> &$charset
+ );
+ $manager->notify('ForceLocale', $data);
+ 
+ if ( $data['locale'] !== '' )
+ {
+ 	i18n::set_forced_locale($data['locale']);
+ }
+ if ( $data['charset'] !== '' )
+ {
+ 	i18n::set_forced_charset($data['charset']);
+ }
+ unset($locale);
+ unset($charset);
+ 
+ 
+ /* convert forced charset to current charset */
+ if ( i18n::get_forced_charset() != i18n::get_current_charset() )
+ {
+ 	$_POST		= i18n::convert_array($_POST, i18n::get_forced_charset());
+ 	$_GET		= i18n::convert_array($_GET, i18n::get_forced_charset());
+ 	$_REQUEST	= i18n::convert_array($_REQUEST, i18n::get_forced_charset());
+ 	$_COOKIE	= i18n::convert_array($_COOKIE, i18n::get_forced_charset());
+ 	$_FILES		= i18n::convert_array($_FILES, i18n::get_forced_charset());
+ 	
+ 	if ( session_id() !== '' )
+ 	{
+ 		$_SESSION = i18n::convert_array($_SESSION, i18n::get_forced_charset());
+ 	}
+ }
+ 
+ 
+ /* sanitize option */
+ $bLoggingSanitizedResult = 0;
+ $bSanitizeAndContinue = 0;
+ $orgRequestURI = serverVar('REQUEST_URI');
+ sanitizeParams();
+ 
+ /* logs sanitized result if need */
+ if ( $orgRequestURI !== serverVar('REQUEST_URI') )
+ {
+ 	$msg = "Sanitized [" . serverVar('REMOTE_ADDR') . "] ";
+ 	$msg .= $orgRequestURI . " -> " . serverVar('REQUEST_URI');
+ 	if ( $bLoggingSanitizedResult )
+ 	{
+ 		addToLog(WARNING, $msg);
+ 	}
+ 	if ( !$bSanitizeAndContinue )
+ 	{
+ 		die("");
+ 	}
+ }
+ 
+ /* get all variables that can come from the request and put them in the global scope */
+ $blogid		= requestVar('blogid');
+ $itemid		= intRequestVar('itemid');
+ $catid		= intRequestVar('catid');
+ $skinid		= requestVar('skinid');
+ $memberid	= requestVar('memberid');
+ $archivelist = requestVar('archivelist');
+ $imagepopup	= requestVar('imagepopup');
+ $archive	= requestVar('archive');
+ $query		= requestVar('query');
+ $highlight	= requestVar('highlight');
+ $amount		= requestVar('amount');
+ $action		= requestVar('action');
+ $nextaction	= requestVar('nextaction');
+ $maxresults	= requestVar('maxresults');
+ $startpos	= intRequestVar('startpos');
+ $errormessage = '';
+ $error		= '';
+ $special	= requestVar('special');
+ 
+ 
+ /* read config */
+ getConfig();
+ 
+ 
+ /* Properly set $CONF['Self'] and others if it's not set...
+  * usually when we are access from admin menu
+  */
+ if ( !array_key_exists('Self', $CONF) )
+ {
+ 	$CONF['Self'] = $CONF['IndexURL'];
+ 	/* strip trailing */
+ 	if ( $CONF['Self'][i18n::strlen($CONF['Self']) -1] == "/" )
+ 	{
+ 		$CONF['Self'] = i18n::substr($CONF['Self'], 0, i18n::strlen($CONF['Self']) -1);
+ 	}
+ }
+ 
+ $CONF['ItemURL']		= $CONF['Self'];
+ $CONF['ArchiveURL']		= $CONF['Self'];
+ $CONF['ArchiveListURL']	= $CONF['Self'];
+ $CONF['MemberURL']		= $CONF['Self'];
+ $CONF['SearchURL']		= $CONF['Self'];
+ $CONF['BlogURL']		= $CONF['Self'];
+ $CONF['CategoryURL']	= $CONF['Self'];
+ 
+ /* automatically use simpler toolbar for mozilla */
+ if ( ($CONF['DisableJsTools'] == 0)
+    && i18n::strpos(serverVar('HTTP_USER_AGENT'), 'Mozilla/5.0') !== FALSE
+    && i18n::strpos(serverVar('HTTP_USER_AGENT'), 'Gecko') !== FALSE )
+ {
+ 	$CONF['DisableJsTools'] = 2;
+ }
+ 
+ /* login processing */
+ $member = new Member();
+ if ( $action == 'login' )
+ {
+ 	$login = postVar('login');
+ 	$password = postVar('password');
+ 	$shared = intPostVar('shared');
+ 	$member->login($login, $password, $shared);
+ }
+ elseif ( ($action == 'logout') )
+ {
+ 	$member->logout();
+ }
+ else
+ {
+ 	$member->cookielogin();
+ }
+ 
+ /* TODO: This is for backward compatibility, should be obsoleted near future. */
+ if ( !preg_match('#^(.+)_(.+)_(.+)$#', $CONF['Locale'])
+   && ($CONF['Locale'] = i18n::convert_old_language_file_name_to_locale($CONF['Locale'])) === FALSE )
+ {
+ 	$CONF['Locale'] = 'en_Latn_US';
+ }
+ if ( !array_key_exists('Language', $CONF) )
+ {
+ 	$CONF['Language'] = i18n::convert_locale_to_old_language_file_name($CONF['Locale']);
+ }
+ $locale = $CONF['Locale'];
+ 
+ 
+ /* NOTE: include translation file and set locale */
+ if ( $member->isLoggedIn() )
+ {
+ 	if ( $member->getLocale() )
+ 	{
+ 		$locale = $member->getLocale();
+ 	}
+ }
+ else
+ {
+ 	if ( i18n::get_forced_locale() !== '' )
+ 	{
+ 		$locale = i18n::get_forced_locale();
+ 	}
+ }
+ include_translation($locale);
+ i18n::set_current_locale($locale);
+ 
+ 
+ /* login completed */
+ $data = array('loggedIn' => $member->isLoggedIn());
+ $manager->notify('PostAuthentication', $data);
+ 
+ /* next action */
+ if ( $member->isLoggedIn() && $nextaction )
+ {
+ 	$action = $nextaction;
+ }
+ 
+ /* first, let's see if the site is disabled or not. always allow admin area access. */
+ if ( $CONF['DisableSite'] && !$member->isAdmin() && !$CONF['UsingAdminArea'] )
+ {
+ 	redirect($CONF['DisableSiteURL']);
+ 	exit;
+ }
+ 
+ /* load other classes */
+ include($DIR_LIBS . 'PARSER.php');
+ include($DIR_LIBS . 'SKIN.php');
+ include($DIR_LIBS . 'TEMPLATE.php');
+ include($DIR_LIBS . 'BLOG.php');
+ include($DIR_LIBS . 'BODYACTIONS.php');
+ include($DIR_LIBS . 'COMMENTS.php');
+ include($DIR_LIBS . 'COMMENT.php');
+ include($DIR_LIBS . 'NOTIFICATION.php');
+ include($DIR_LIBS . 'BAN.php');
+ include($DIR_LIBS . 'SEARCH.php');
+ include($DIR_LIBS . 'LINK.php');
+ 
+ /* set lastVisit cookie (if allowed) */
+ if ( !headers_sent() )
+ {
+ 	if ( $CONF['LastVisit'] )
+ 	{
+ 		setcookie($CONF['CookiePrefix'] . 'lastVisit', time(), time() + 2592000, $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);
+ 	}
+ 	else
+ 	{
+ 		setcookie($CONF['CookiePrefix'] . 'lastVisit', '', (time() - 2592000), $CONF['CookiePath'], $CONF['CookieDomain'], $CONF['CookieSecure']);
+ 	}
+ }
+ 
+ /* for path resolving */
+ $virtualpath = getVar('virtualpath');
+ if ( getVar('virtualpath') == '' )
+ {
+ 	$virtualpath = serverVar('PATH_INFO');
+ }
+ 
+ /*
+  * 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') )
+ {
+ 	$CONF['URLMode'] = 'normal';
+ }
+ else
+ {
+ 	if ( i18n::substr($CONF['Self'], i18n::strlen($CONF['Self']) - 4) != '.php' )
+ 	{
+ 		decodePathInfo($virtualpath);
+ 	}
+ }
+ 
+ /*
+  * PostParseURL is a place to cleanup any of the path-related global variables before the selector function is run.
+  * It has 2 values in the data in case the original virtualpath is needed, but most the use will be in tweaking
+  * global variables to clean up (scrub out catid or add catid) or to set someother global variable based on
+  * the values of something like catid or itemid
+  * New in 3.60
+  */
+ $data = array(
+ 	'type' => basename(serverVar('SCRIPT_NAME')),
+ 	'info' => $virtualpath
+ );
+ $manager->notify('PostParseURL', $data);
+ 
+ /*
+  * NOTE: Here is the end of initialization
+  */
+ 
+ /**
+  * include_libs()
+  * This function includes or requires the specified library file
+  * 
+  * @param	string	$file
+  * @param	boolean	$once use the _once() version
+  * @param	boolean	$require use require() instead of include()
+  * @return	void
+  */
+ function include_libs($file, $once = TRUE, $require = TRUE)
+ {
+ 	global $DIR_LIBS;
+ 	
+ 	// $DIR_LIBS isn't a directory
+ 	if ( !is_dir($DIR_LIBS) )
+ 	{
+ 		exit;
+ 	}
+ 	
+ 	$lib_path = $DIR_LIBS . $file;
+ 	
+ 	if ( $once && $require )
+ 	{
+ 		require_once($lib_path);
+ 	}
+ 	else if ( $once && !$require )
+ 	{
+ 		include_once($lib_path);
+ 	}
+ 	else if ( $require )
+ 	{
+ 		require($lib_path);
+ 	}
+ 	else
+ 	{
+ 		include($lib_path);
+ 	}
+ 	return;
+ }
+ 
+ /**
+  * include_plugins()
+  * This function includes or requires the specified plugin file
+  * 
+  * @param	string	$file
+  * @param	boolean	$once use the _once() version
+  * @param	boolean	$require use require() instead of include()
+  * @return	
+  */
+ function include_plugins($file, $once = TRUE, $require = TRUE)
+ {
+ 	global $DIR_PLUGINS;
+ 	
+ 	// begin if: $DIR_LIBS isn't a directory
+ 	if ( !is_dir($DIR_PLUGINS) )
+ 	{
+ 		exit;
+ 	}
+ 	
+ 	$plugin_path = $DIR_PLUGINS . $file;
+ 	
+ 	// begin if: 
+ 	if ( $once && $require )
+ 	{
+ 		require_once($plugin_path);
+ 	}
+ 	else if ( $once && !$require )
+ 	{
+ 		include_once($plugin_path);
+ 	}
+ 	elseif ( $require )
+ 	{
+ 		require($plugin_path);
+ 	}
+ 	else
+ 	{
+ 		include($plugin_path);
+ 	}
+ 	return;
+ }
+ 
+ /**
+  * include_translation()
+  * This function decide which locale is used and include translation
+  * 
+  * @param	string	&$locale	locale name referring to 'language tags' defined in RFC 5646
+  * @return	void
+  */
+ function include_translation(&$locale)
+ {
+ 	global $DIR_LOCALES;
+ 	
+ 	$translation_file = $DIR_LOCALES . $locale . '.' . i18n::get_current_charset() . '.php';
+ 	if ( !file_exists($translation_file) )
+ 	{
+ 		$locale = 'en_Latn_US';
+ 		$translation_file = $DIR_LOCALES . 'en_Latn_US.ISO-8859-1.php';
+ 	}
+ 	include($translation_file);
+ 	
+ 	/*
+ 	 * NOTE:
+ 	 * PHP is written by C and utilize C library, whose APIs are defined in POSIX.
+ 	 * 
+ 	 * setlocale() is one of APIs of C library.
+ 	 * but the argument value for setlocale() depends on each implements
+ 	 * 
+ 	 * The latest POSIX standard:
+ 	 * The Open Group Base Specifications Issue 7
+ 	 * IEEE Std 1003.1™-2008
+ 	 * http://pubs.opengroup.org/onlinepubs/9699919799/mindex.html
+ 	 * 
+ 	 * Microsoft's operating system uses their own implementation
+ 	 *  Language Strings
+ 	 *   http://msdn.microsoft.com/en-us/library/39cwe7zf%28v=vs.110%29.aspx
+ 	 *  Country/Region Strings
+ 	 *   http://msdn.microsoft.com/en-us/library/cdax410z%28v=vs.110%29.aspx
+ 	 * 
+ 	 * Linux and Unix (in this meaning, Apple's OS X derives from UNIX) uses ISO standard.
+ 	 *  two characters language tag (ISO 639-1)
+ 	 *  two characters region and country lag (ISO 3166-1 alpha-1)
+ 	 * 
+ 	 */
+ 	if ( PHP_OS == "WIN32" || PHP_OS == "WINNT" )
+ 	{
+ 		/* LOCALE_IN_WINDOWS is defined in each translation files */
+ 		setlocale(LC_ALL, _LOCALE_IN_WINDOWS);
+ 	}
+ 	else
+ 	{
+ 		setlocale(LC_ALL, preg_replace('#(.+)_(.+)_(.+)#', '$1-$3', $locale));
+ 	}
+ 	return;
+ }
+ 
+ /**
+  * intPostVar()
+  * This function returns the integer value of $_POST for the variable $name
+  * 
+  * @param	string	$name	field to get the integer value of
+  * @return	integer
+  */
+ function intPostVar($name)
+ {
+ 	return (integer) postVar($name);
+ }
+ 
+ 
+ /**
+  * intGetVar()
+  * This function returns the integer value of $_GET for the variable $name
+  * 
+  * @param	string	$name	field to get the integer value of
+  * @return	integer
+  */
+ function intGetVar($name)
+ {
+ 	return (integer) getVar($name);
+ }
+ 
+ 
+ /**
+  * intRequestVar()
+  * This function returns the integer value of $_REQUEST for the variable $name. Also checks $_GET and $_POST if not found in $_REQUEST
+  * 
+  * @param string $name field to get the integer value of
+  * @return int
+  */
+ function intRequestVar($name)
+ {
+ 	return (integer) requestVar($name);
+ }
+ 
+ 
+ /**
+  * intCookieVar()
+  * This function returns the integer value of $_COOKIE for the variable $name
+  * 
+  * @param	string	$name	field to get the integer value of
+  * @return	integer
+  */
+ function intCookieVar($name)
+ {
+ 	return (integer) cookieVar($name);
+ }
+ 
+ /**
+  * getNucleusVersion()
+  * This function returns the current Nucleus version (100 = 1.00, 101 = 1.01, etc...)
+  * 
+  * @param	void
+  * @return	integer
+  */
+ function getNucleusVersion()
+ {
+ 	return 400;
+ }
+ 
+ /**
+  * getNucleusPatchLevel()
+  * TODO: Better description of this function.
+  *
+  * Power users can install patches in between nucleus releases. These patches
+  * usually add new functionality in the plugin API and allow those to
+  * be tested without having to install CVS.
+  *
+  *@param	void
+  * @return	integer
+  */
+ function getNucleusPatchLevel()
+ {
+ 	return 0;
+ }
+ 
+ /**
+  * getLatestVersion()
+  * This function returns the latest Nucleus version available for download from nucleuscms.org or FALSE if unable to attain data
+  * Format will be major.minor/patachlevel e.g. 3.41 or 3.41/02
+  * 
+  * @param	void
+  * @return	mixed
+  */
+ function getLatestVersion()
+ {
+ 	// begin if: cURL is not available in this PHP installation
+ 	if ( !function_exists('curl_init') )
+ 	{
+ 		return FALSE;
+ 	}
+ 	
+ 	$curl = curl_init();
+ 	$timeout = 5;
+ 	
+ 	curl_setopt ($curl, CURLOPT_URL, 'http://nucleuscms.org/version_check.php');
+ 	curl_setopt ($curl, CURLOPT_RETURNTRANSFER, 1);
+ 	curl_setopt ($curl, CURLOPT_CONNECTTIMEOUT, $timeout);
+ 	
+ 	$return = curl_exec($curl);
+ 	
+ 	curl_close($curl);
+ 	
+ 	return $return;
+ }
+ 
+ /**
+  * sql_table()
+  * This function returns a Nucleus table name with the appropriate prefix
+  * @param string $name
+  * @return string
+  */
+ function sql_table($name)
+ {
+ 	global $MYSQL_PREFIX;
+ 	
+ 	// begin if: no MySQL prefix
+ 	if ( empty($MYSQL_PREFIX) )
+ 	{
+ 		return 'nucleus_' . $name;
+ 	}
+ 	// else: use MySQL prefix
+ 	else
+ 	{
+ 		return $MYSQL_PREFIX . 'nucleus_' . $name;
+ 	}
+ 	return;
+ }
+ 
+ /**
+  * sendContentType()
+  * This function sends the Content-Type header if headers have not already been sent
+  * It also determines if the browser can accept application/xhtml+xml and sends it only to those that can.
+  * 
+  * if content type is application/xhtml+xml, only send it to browsers
+  * that can handle it (IE6 cannot). Otherwise, send text/html
+  *
+  * v2.5:
+  * For admin area pages, keep sending text/html (unless it's a debug version)
+  * application/xhtml+xml still causes too much problems with the javascript implementations
+  *
+  * v3.3:
+  * ($CONF['UsingAdminArea'] && !$CONF['debug']) gets removed,
+  * application/xhtml+xml seems to be working, so we're going to use it if we can.
+  * 
+  * @param	string	$content_type	MIME media type registered to IANA, http://www.iana.org/assignments/media-types/index.html
+  * @param	string	$page_type		
+  * @param	string	$charset		Deprecated. This has no meaning.
+  * @return	void
+  * 
+  */
+ function sendContentType($content_type, $page_type = '', $charset = '')
+ {
+ 	global $manager, $CONF;
+ 	
+ 	if ( headers_sent() )
+ 	{
+ 		return;
+ 	}
+ 	
+ 	/* NOTE: MIME Media Type */
+ 	if ( ($content_type == 'application/xhtml+xml')
+ 		&& (!stristr(serverVar('HTTP_ACCEPT'), 'application/xhtml+xml') ) )
+ 	{
+ 		$content_type = 'text/html';
+ 	}
+ 	
+ 	/* NOTE: generate event */
+ 	$data = array(
+ 		'pageType'		=>  $page_type,
+ 		'contentType'	=> &$content_type
+ 	);
+ 	$manager->notify('PreSendContentType', $data);
+ 	
+ 	/* NOTE: confirm MIME Media Type */
+ 	$content_type = preg_replace('#[^a-zA-Z0-9-+./]#', '', $content_type);
+ 	
+ 	/* NOTE: confirm character set */
+ 	$charset = i18n::get_current_charset();
+ 	if ( i18n::get_forced_charset() !== '' )
+ 	{
+ 		$charset = i18n::get_forced_charset();
+ 	}
+ 	
+ 	/* NOTE: send HTTP 1.1 header */
+ 	header("Content-Type: {$content_type}; charset={$charset}");
+ 	
+ 	/* NOTE: set handler for translating character set */
+ 	if ( $charset != i18n::get_current_charset() )
+ 	{
+ 		ob_start(array('i18n', 'convert_handler'));
+ 	}
+ 	
+ 	return;
+ }
+ 
+ /**
+  * parseHighlight()
+  * This function parses a query into an array of expressions that can be passed on to the highlight method
+  * @param	string	$query
+  * @return	void
+  */
+ function parseHighlight($query)
+ {
+ 	// TODO: add more intelligent splitting logic
+ 	
+ 	// get rid of quotes
+ 	$query = preg_replace('/\'|"/', '', $query);
+ 	
+ 	if ( !$query )
+ 	{
+ 		return array();
+ 	}
+ 	
+ 	$aHighlight = preg_split('# #', $query);
+ 	
+ 	for ( $i = 0; $i < count($aHighlight); $i++ )
+ 	{
+ 		$aHighlight[$i] = trim($aHighlight[$i]);
+ 		
+ 		if ( i18n::strlen($aHighlight[$i]) < 3 )
+ 		{
+ 			unset($aHighlight[$i]);
+ 		}
+ 	}
+ 	
+ 	if ( count($aHighlight) == 1 )
+ 	{
+ 		return $aHighlight[0];
+ 	}
+ 	else
+ 	{
+ 		return $aHighlight;
+ 	}
+ 	return;
+ }
+ 
+ /**
+  * getConfig()
+  * 
+  * @param	void
+  * @return	void
+  */
+ function getConfig()
+ {
+ 	global $CONF;
+ 	
+ 	$query = sprintf('SELECT * FROM %s', sql_table('config'));
+ 	$res = DB::getResult($query);
+ 	
+ 	foreach ( $res as $row )
+ 	{
+ 		$CONF[$row['name']] = $row['value'];
+ 	}
+ 	return;
+ }
+ 
+ /**
+  * This function gets the blog ID from the blog name
+  * @param string $name
+  * @return
+  */
+ function getBlogIDFromName($name)
+ {
+ 	$query = sprintf('SELECT bnumber AS result FROM %s WHERE bshortname=%s', sql_table('blog'), DB::quoteValue($name));
+ 	return DB::getValue($query);
+ }
+ 
+ /**
+  * This function gets the blog name from the blog ID
+  * @param int $id
+  * @return object
+  */
+ function getBlogNameFromID($id)
+ {
+ 	$query = sprintf('SELECT bname AS result FROM %s WHERE bnumber=%d', sql_table('blog'), intval($id));
+ 	return DB::getValue($query);
+ }
+ 
+ /**
+  * This function gets the blog ID from the item ID
+  * @param int $item_id
+  * @return object
+  */
+ function getBlogIDFromItemID($item_id)
+ {
+ 	$query = sprintf('SELECT iblog AS result FROM %s WHERE inumber=%d', sql_table('item'), intval($item_id));
+ 	return DB::getValue($query);
+ }
+ 
+ /**
+  * This function gets the blog ID from the comment ID
+  * @param int $comment_id
+  * @return object
+  */
+ function getBlogIDFromCommentID($comment_id)
+ {
+ 	$query = sprintf('SELECT cblog AS result FROM %s WHERE cnumber=%d', sql_table('comment'), intval($comment_id));
+ 	return DB::getValue($query);
+ }
+ 
+ /**
+  * This function gets the blog ID from the category ID
+  * @param int $category_id
+  * @return object
+  */
+ function getBlogIDFromCatID($category_id)
+ {
+ 	$query = sprintf('SELECT cblog AS result FROM %s WHERE catid=%d', sql_table('category'), intval($category_id));
+ 	return DB::getValue($query);
+ }
+ 
+ /**
+  * This function gets the category ID from the category name
+  * @param int $name
+  * @return object
+  */
+ function getCatIDFromName($name)
+ {
+ 	$query = sprintf('SELECT catid AS result FROM %s WHERE cname=%s', sql_table('category'), DB::quoteValue($name));
+ 	return DB::getValue($query);
+ }
+ 
+ 
+ /**
+  * functions to be used in index.php to select something
+  */
+ function selectBlog($shortname)
+ {
+ 	global $blogid, $archivelist;
+ 	$blogid = getBlogIDFromName($shortname);
+ 	
+ 	// also force archivelist variable, if it is set
+ 	if ( $archivelist )
+ 	{
+ 		$archivelist = $blogid;
+ 	}
+ 	return;
+ }
+ function selectSkin($skinname)
+ {
+ 	global $skinid;
+ 	$skinid = SKIN::getIdFromName($skinname);
+ 	return;
+ }
+ function selectCategory($cat)
+ {
+ 	global $catid;
+ 	if ( is_numeric($cat) )
+ 	{
+ 		$catid = (integer) $cat;
+ 	}
+ 	else
+ 	{
+ 		$catid = getCatIDFromName($cat);
+ 	}
+ 	return;
+ }
+ function selectItem($id)
+ {
+ 	global $itemid;
+ 	$itemid = (integer) $id;
+ 	return;
+ }
+ function selectSpecialSkinType($id)
+ {
+ 	global $special;
+ 	$special = strtolower($id);
+ 	return;
+ }
+ function selector()
+ {
+ 	global $archive, $archivelist, $archivenext, $archivenextexists, $archiveprev, $archiveprevexists, $archivetype;
+ 	global $blog, $blogid;
+ 	global $catid;
+ 	global $itemid, $itemidnext, $itemidprev, $itemtitlenext, $itemtitleprev;
+ 	global $CONF, $DIR_LIBS, $amount, $errormessage, $imagepopup;
+ 	global $manager, $maxresults, $query;
+ 	global $member, $memberid, $memberinfo;
+ 	global $skinid, $skinpart, $special;
+ 	
+ 	$actionNames = array('addcomment', 'sendmessage', 'createaccount', 'forgotpassword', 'votepositive', 'votenegative', 'plugin');
+ 	$action = requestVar('action');
+ 	
+ 	if ( in_array($action, $actionNames) )
+ 	{
+ 		include_once($DIR_LIBS . 'ACTION.php');
+ 		$a = new Action();
+ 		$errorInfo = $a->doAction($action);
+ 		
+ 		if ( $errorInfo )
+ 		{
+ 			$errormessage = $errorInfo['message'];
+ 		}
+ 	}
+ 	
+ 	// show error when headers already sent out
+ 	if ( headers_sent() && $CONF['alertOnHeadersSent'] )
+ 	{
+ 		// try to get line number/filename (extra headers_sent params only exists in PHP 4.3+)
+ 		if ( function_exists('version_compare') && version_compare('4.3.0', phpversion(), '<=') )
+ 		{
+ 			headers_sent($hsFile, $hsLine);
+ 			$extraInfo = ' in <code>' . $hsFile . '</code> line <code>' . $hsLine . '</code>';
+ 		}
+ 		else
+ 		{
+ 			$extraInfo = '';
+ 		}
+ 		
+ 		startUpError(
+ 		   "<p>The page headers have already been sent out{$extraInfo}. 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.</p>"
+ 		 . "<p>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>"
+ 		 . "Page headers already sent"
+ 		);
+ 		exit;
+ 	}
+ 	
+ 	// make is so ?archivelist without blogname or blogid shows the archivelist
+ 	// for the default weblog
+ 	if ( serverVar('QUERY_STRING') == 'archivelist' )
+ 	{
+ 		$archivelist = $CONF['DefaultBlog'];
+ 	}
+ 	
+ 	// now decide which type of skin we need
+ 	if ( $itemid )
+ 	{
+ 		// itemid given -> only show that item
+ 		$type = 'item';
+ 		
+ 		if ( !$manager->existsItem($itemid,intval($CONF['allowFuture']),intval($CONF['allowDrafts'])) )
+ 		{
+ 			doError(_ERROR_NOSUCHITEM);
+ 			return;
+ 		}
+ 		
+ 		// 1. get timestamp, blogid and catid for item
+ 		$query = 'SELECT itime, iblog, icat FROM %s WHERE inumber=%d';
+ 		$query = sprintf($query, sql_table('item'), intval($itemid));
+ 		$row = DB::getRow($query);
+ 		
+ 		// if a different blog id has been set through the request or selectBlog(),
+ 		// deny access
+ 		
+ 		if ( $blogid && (intval($blogid) != $row['iblog']) )
+ 		{
+ 			doError(_ERROR_NOSUCHITEM);
+ 			return;
+ 		}
+ 		
+ 		// if a category has been selected which doesn't match the item, ignore the
+ 		// category. #85
+ 		if ( ($catid != 0) && ($catid != $row['icat']) )
+ 		{
+ 			$catid = 0;
+ 		}
+ 		
+ 		$blogid = $row['iblog'];
+ 		$timestamp = strtotime($row['itime']);
+ 		
+ 		$b =& $manager->getBlog($blogid);
+ 		
+ 		if ( !$b->isValidCategory($catid) )
+ 		{
+ 			$query = "SELECT inumber, ititle FROM %s WHERE itime<%s AND idraft=0 AND iblog=%d ORDER BY itime DESC LIMIT 1";
+ 			$query = sprintf($query, sql_table('item'), DB::formatDateTime($timestamp), intval($blogid));
+ 		}
+ 		else
+ 		{
+ 			$query = "SELECT inumber, ititle FROM %s WHERE itime<%s AND idraft=0 AND iblog=%d AND icat=%d ORDER BY itime DESC LIMIT 1";
+ 			$query = sprintf($query, sql_table('item'), DB::formatDateTime($timestamp), intval($blogid), intval($catid));
+ 		}
+ 		$row = DB::getRow($query);
+ 		
+ 		if ( $row )
+ 		{
+ 			$itemidprev = $row['inumber'];
+ 			$itemtitleprev = $row['ititle'];
+ 		}
+ 		
+ 		// get next itemid and title
+ 		if ( !$b->isValidCategory($catid) )
+ 		{
+ 			$query = "SELECT inumber, ititle FROM %s WHERE itime>%s AND itime<=%s AND idraft=0 AND iblog=%d ORDER BY itime ASC LIMIT 1";
+ 			$query = sprintf($query, sql_table('item'), DB::formatDateTime($timestamp), DB::formatDateTime($b->getCorrectTime()), intval($blogid));
+ 		}
+ 		else
+ 		{
+ 			$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";
+ 			$query = sprintf($query, sql_table('item'), DB::formatDateTime($timestamp), DB::formatDateTime($b->getCorrectTime()), intval($blogid), intval($catid));
+ 		}
+ 		$row = DB::getRow($query);
+ 		
+ 		if ( $row )
+ 		{
+ 			$itemidnext = $row['inumber'];
+ 			$itemtitlenext = $row['ititle'];
+ 		}
+ 	}
+ 	elseif ( $archive )
+ 	{
+ 		// show archive
+ 		$type = 'archive';
+ 		
+ 		// sql queries for the timestamp of the first and the last published item
+ 		$query = sprintf('SELECT UNIX_TIMESTAMP(itime) as result FROM %s WHERE idraft=0 ORDER BY itime ASC', sql_table('item'));
+ 		$first_timestamp = DB::getValue($query);
+ 		$query = sprintf('SELECT UNIX_TIMESTAMP(itime) as result FROM %s WHERE idraft=0 ORDER BY itime DESC', sql_table('item'));
+ 		$last_timestamp = DB::getValue($query);
+ 		
+ 		sscanf($archive, '%d-%d-%d', $y, $m, $d);
+ 		
+ 		if ( $d != 0 )
+ 		{
+ 			$archivetype = _LABEL_DAY_UNIT;
+ 			$t = mktime(0, 0, 0, $m, $d, $y);
+ 			// one day has 24 * 60 * 60 = 86400 seconds
+ 			$archiveprev = i18n::formatted_datetime('%Y-%m-%d', $t - 86400 );
+ 			// check for published items
+ 			if ( $t > $first_timestamp )
+ 			{
+ 				$archiveprevexists = true;
+ 			}
+ 			else
+ 			{
+ 				$archiveprevexists = false;
+ 			}
+ 			
+ 			// one day later
+ 			$t += 86400;
+ 			$archivenext = i18n::formatted_datetime('%Y-%m-%d', $t);
+ 			if ( $t < $last_timestamp )
+ 			{
+ 				$archivenextexists = true;
+ 			}
+ 			else
+ 			{
+ 				$archivenextexists = false;
+ 			}
+ 		}
+ 		elseif ( $m == 0 )
+ 		{
+ 			$archivetype = _LABEL_YEAR_UNIT;
+ 			$t = mktime(0, 0, 0, 12, 31, $y - 1);
+ 			// one day before is in the previous year
+ 			$archiveprev = i18n::formatted_datetime('%Y', $t);
+ 			if ( $t > $first_timestamp )
+ 			{
+ 				$archiveprevexists = true;
+ 			}
+ 			else
+ 			{
+ 				$archiveprevexists = false;
+ 			}
+ 
+ 			// timestamp for the next year
+ 			$t = mktime(0, 0, 0, 1, 1, $y + 1);
+ 			$archivenext = i18n::formatted_datetime('%Y', $t);
+ 			if ( $t < $last_timestamp )
+ 			{
+ 				$archivenextexists = true;
+ 			}
+ 			else
+ 			{
+ 				$archivenextexists = false;
+ 			}
+ 		}
+ 		else
+ 		{
+ 			$archivetype = _LABEL_MONTH_UNIT;
+ 			$t = mktime(0, 0, 0, $m, 1, $y);
+ 			// one day before is in the previous month
+ 			$archiveprev = i18n::formatted_datetime('%Y-%m', $t - 86400);
+ 			if ( $t > $first_timestamp )
+ 			{
+ 				$archiveprevexists = true;
+ 			}
+ 			else
+ 			{
+ 				$archiveprevexists = false;
+ 			}
+ 			
+ 			// timestamp for the next month
+ 			$t = mktime(0, 0, 0, $m+1, 1, $y);
+ 			$archivenext = i18n::formatted_datetime('%Y-%m', $t);
+ 			if ( $t < $last_timestamp )
+ 			{
+ 				$archivenextexists = true;
+ 			}
+ 			else
+ 			{
+ 				$archivenextexists = false;
+ 			}
+ 		}
+ 	}
+ 	elseif ( $archivelist )
+ 	{
+ 		$type = 'archivelist';
+ 		
+ 		if ( is_numeric($archivelist) )
+ 		{
+ 			$blogid = intVal($archivelist);
+ 		}
+ 		else
+ 		{
+ 			$blogid = getBlogIDFromName($archivelist);
+ 		}
+ 	
+ 		if ( !$blogid )
+ 		{
+ 			doError(_ERROR_NOSUCHBLOG);
+ 			return;
+ 		}
+ 	}
+ 	elseif ( $query )
+ 	{
+ 		global $startpos;
+ 		$type = 'search';
+ 		$query = stripslashes($query);
+ 		
+ 		if ( is_numeric($blogid) )
+ 		{
+ 			$blogid = intVal($blogid);
+ 		}
+ 		else
+ 		{
+ 			$blogid = getBlogIDFromName($blogid);
+ 		}
+ 		
+ 		if ( !$blogid )
+ 		{
+ 			doError(_ERROR_NOSUCHBLOG);
+ 			return;
+ 		}
+ 	}
+ 	elseif ( $memberid )
+ 	{
+ 		$type = 'member';
+ 		
+ 		if ( !Member::existsID($memberid) )
+ 		{
+ 			doError(_ERROR_NOSUCHMEMBER);
+ 			return;
+ 		}
+ 		$memberinfo = $manager->getMember($memberid);
+ 	}
+ 	elseif ( $imagepopup )
+ 	{
+ 		// media object (images etc.)
+ 		$type = 'imagepopup';
+ 		
+ 		// TODO: check if media-object exists
+ 		// TODO: set some vars?
+ 	}
+ 	else
+ 	{
+ 		// show regular index page
+ 		global $startpos;
+ 		$type = 'index';
+ 	}
+ 	
+ 	// any type of skin with catid
+ 	if ( $catid && !$blogid )
+ 	{
+ 		$blogid = getBlogIDFromCatID($catid);
+ 	}
+ 	
+ 	// decide which blog should be displayed
+ 	if ( !$blogid )
+ 	{
+ 		$blogid = $CONF['DefaultBlog'];
+ 	}
+ 	
+ 	$b =& $manager->getBlog($blogid);
+ 	$blog = $b; // references can't be placed in global variables?
+ 	
+ 	if ( !$blog->isValid )
+ 	{
+ 		doError(_ERROR_NOSUCHBLOG);
+ 		return;
+ 	}
+ 	
+ 	// set catid if necessary
+ 	if ( $catid )
+ 	{
+ 		// check if the category is valid
+ 		if ( !$blog->isValidCategory($catid) )
+ 		{
+ 			doError(_ERROR_NOSUCHCATEGORY);
+ 			return;
+ 		}
+ 		else
+ 		{
+ 			$blog->setSelectedCategory($catid);
+ 		}
+ 	}
+ 	
+ 	if ( !$skinid )
+ 	{
+ 		$skinid = $blog->getDefaultSkin();
+ 	}
+ 	
+ 	if ( !empty($special) && isValidShortName($special) )
+ 	{
+ 		$type = strtolower($special);
+ 	}
+ 	
+ 	$skin =& $manager->getSkin($skinid);
+ 	
+ 	if ( !$skin->isValid() )
+ 	{
+ 		doError(_ERROR_NOSUCHSKIN);
+ 		return;
+ 	}
+ 	
+ 	// set global skinpart variable so can determine quickly what is being parsed from any plugin or phpinclude
+ 	$skinpart = $type;
+ 	
+ 	// parse the skin
+ 	$skin->parse($type);
+ 	
+ 	// check to see we should throw JustPosted event
+ 	$blog->checkJustPosted();
+ 	return;
+ }
+ 
+ /**
+  * doError()
+  * Show error skin with given message. An optional skin-object to use can be given
+  * 
+  * @param	string	$msg
+  * @param	string	$skin
+  * @return	void
+  */
+ function doError($msg, $skin = '')
+ {
+ 	global $errormessage, $CONF, $skinid, $blogid, $manager;
+ 	
+ 	if ( $skin == '' )
+ 	{
+ 		if ( Skin::existsID($skinid) )
+ 		{
+ 			$id = $skinid;
+ 		}
+ 		elseif ( $manager->existsBlogID($blogid) )
+ 		{
+ 			$blog =& $manager->getBlog($blogid);
+ 			$id = $blog->getDefaultSkin();
+ 		}
+ 		elseif ($CONF['DefaultBlog'] )
+ 		{
+ 			$blog =& $manager->getBlog($CONF['DefaultBlog']);
+ 			$id = $blog->getDefaultSkin();
+ 		}
+ 		else
+ 		{
+ 			// this statement should actually never be executed
+ 			$id = $CONF['BaseSkin'];
+ 		}
+ 		$skin =& $manager->getSkin($id);
+ 	}
+ 	
+ 	$errormessage = $msg;
+ 	$skin->parse('error');
+ 	return;
+ }
+ 
+ /**
+  * Errors before the database connection has been made
+  * 
+  * @param	string	$msg	message to notify
+  * @param	string	$title	page title
+  * @return	void
+  */
+ function startUpError($msg, $title)
+ {
+ 	header('Content-Type: text/xml; charset=' . i18n::get_current_charset());
+ 	echo "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n";
+ 	echo "<head>\n";
+ 	echo "<title>{$title}</title></head>\n";
+ 	echo "<body>\n";
+ 	echo "<h1>{$title}</h1>\n";
+ 	echo $msg;
+ 	echo "</body>\n";
+ 	echo "</html>\n";
+ 	exit;
+ }
+ 
+ function isValidShortName($name)
+ {
+ 	return preg_match('#^[a-z0-9]+$#i', $name);
+ }
+ function isValidDisplayName($name)
+ {
+ 	return preg_match('#^[a-z0-9]+[a-z0-9 ]*[a-z0-9]+$#i', $name);
+ }
+ function isValidCategoryName($name)
+ {
+ 	return 1;
+ }
+ function isValidTemplateName($name)
+ {
+ 	return preg_match('#^[a-z0-9/_\-]+$#i', $name);
+ }
+ function isValidSkinName($name)
+ {
+ 	return preg_match('#^[a-z0-9/_\-]+$#i', $name);
+ }
+ 
+ // add and remove linebreaks
+ function addBreaks($var)
+ {
+ 	return nl2br($var);
+ }
+ function removeBreaks($var)
+ {
+ 	return preg_replace("/<br \/>([\r\n])/", "$1", $var);
+ }
+ 
+ /**
+  * parseFile()
+  * 
+  * @param	string	$filename
+  * @param	string	$includeMode
+  * @param	string	$includePrefix
+  * @return	void
+  */
+ function parseFile($filename, $includeMode = 'normal', $includePrefix = '')
+ {
+ 	global $manager, $skinid;
+ 	
+ 	if ( !$skinid || !existsID($skinid) )
+ 	{
+ 		$skin =& $manager->getSkin($CONF['BaseSkin']);
+ 	}
+ 	else
+ 	{
+ 		$skin =& $manager->getSkin($skinid);
+ 	}
+ 	
+ 	$oldIncludeMode = Parser::getProperty('IncludeMode');
+ 	$oldIncludePrefix = Parser::getProperty('IncludePrefix');
+ 	
+ 	$skin->parse('fileparse', $filename);
+ 	
+ 	Parser::setProperty('IncludeMode', $oldIncludeMode);
+ 	Parser::setProperty('IncludePrefix', $oldIncludePrefix);
+ 	
+ 	return;
+ }
+ 
+ /**
+  * debug()
+  * Outputs a debug message
+  * 
+  * @param	string	$msg
+  * @return	void
+  */
+ function debug($msg)
+ {
+ 	echo '<p><b>' . $msg . "</b></p>\n";
+ 	return;
+ }
+ 
+ // shows a link to help file
+ function help($id)
+ {
+ 	echo helpHtml($id);
+ 	return;
+ }
+ function helpHtml($id)
+ {
+ 	global $CONF;
+ 	return helplink($id) . '<img src="' . $CONF['AdminURL'] . 'documentation/icon-help.gif" width="15" height="15" alt="' . _HELP_TT . '" title="' . _HELP_TT . '" /></a>';
+ }
+ function helplink($id)
+ {
+ 	global $CONF;
+ 	return '<a href="' . $CONF['AdminURL'] . 'documentation/help.html#'. $id . '" onclick="if (event &amp;&amp; event.preventDefault) event.preventDefault(); return help(this.href);">';
+ }
+ 
+ /**
+  * includephp()
+  * Includes a PHP file. This method can be called while parsing templates and skins
+  * 
+  * @param	string	$filename	name of file to parse
+  * @return	void
+  */
+ function includephp($filename)
+ {
+ 	// make predefined variables global, so most simple scripts can be used here
+ 	
+ 	// apache (names taken from PHP doc)
+ 	global $GATEWAY_INTERFACE, $SERVER_NAME, $SERVER_SOFTWARE, $SERVER_PROTOCOL;
+ 	global $REQUEST_METHOD, $QUERY_STRING, $DOCUMENT_ROOT, $HTTP_ACCEPT;
+ 	global $HTTP_ACCEPT_CHARSET, $HTTP_ACCEPT_ENCODING, $HTTP_ACCEPT_LANGUAGE;
+ 	global $HTTP_CONNECTION, $HTTP_HOST, $HTTP_REFERER, $HTTP_USER_AGENT;
+ 	global $REMOTE_ADDR, $REMOTE_PORT, $SCRIPT_FILENAME, $SERVER_ADMIN;
+ 	global $SERVER_PORT, $SERVER_SIGNATURE, $PATH_TRANSLATED, $SCRIPT_NAME;
+ 	global $REQUEST_URI;
+ 	
+ 	// php (taken from PHP doc)
+ 	global $argv, $argc, $PHP_SELF, $HTTP_COOKIE_VARS, $HTTP_GET_VARS, $HTTP_POST_VARS;
+ 	global $HTTP_POST_FILES, $HTTP_ENV_VARS, $HTTP_SERVER_VARS, $HTTP_SESSION_VARS;
+ 	
+ 	// other
+ 	global $PATH_INFO, $HTTPS, $HTTP_RAW_POST_DATA, $HTTP_X_FORWARDED_FOR;
+ 	
+ 	if ( @file_exists($filename) )
+ 	{
+ 		include($filename);
+ 	}
+ 	return;
+ }
+ 
+ /**
+  * Checks if a certain plugin exists
+  * @param	string	$plug	name of plugin
+  * @return	boolean	exists or not
+  */
+ function checkPlugin($name)
+ {
+ 	global $DIR_PLUGINS;
+ 	return file_exists($DIR_PLUGINS . preg_replace('#[\\\\|/]#', '', $name) . '.php');
+ }
+ 
+ /**
+  * alterQueryStr()
+  * 
+  * @param	string	$querystr	querystring to alter (e.g. foo=1&bar=2&x=y)
+  * @param	string	$param	name of parameter to change (e.g. 'foo')
+  * @param	string	$value	New value for that parameter (e.g. 3)
+  * @return	string	altered query string (for the examples above: foo=3&bar=2&x=y)
+  */
+ function alterQueryStr($querystr, $param, $value)
+ {
+ 	$vars = preg_split('#&#', $querystr);
+ 	$set = FALSE;
+ 	
+ 	for ( $i = 0; $i < count($vars); $i++ )
+ 	{
+ 		$v = preg_split('#=#', $vars[$i]);
+ 		
+ 		if ( $v[0] == $param )
+ 		{
+ 			$v[1] = $value;
+ 			$vars[$i] = implode('=', $v);
+ 			$set = true;
+ 			break;
+ 		}
+ 	}
+ 	if ( !$set )
+ 	{
+ 		$vars[] = "{$param}={$value}";
+ 	}
+ 	return ltrim(implode('&', $vars), '&');
+ }
+ 
+ /**
+  * passVar()
+  * passes one variable as hidden input field (multiple fields for arrays)
+  * @see passRequestVars in varsx.x.x.php
+  * 
+  * @param	string	$key
+  * @param	string	$value
+  * @return	void
+  */
+ function passVar($key, $value)
+ {
+ 	// array ?
+ 	if ( is_array($value) )
+ 	{
+ 		for ( $i = 0; $i < sizeof($value); $i++ )
+ 		{
+ 			passVar($key . '[' . $i . ']', $value[$i]);
+ 		}
+ 		return;
+ 	}
+ 	
+ 	// other values: do stripslashes if needed
+ 	echo '<input type="hidden" name="' . Entity::hsc($key) . '" value="' . Entity::hsc(undoMagic($value)) . '" />' . "\n";
+ 	return;
+ }
+ 
+ /**
+  * checkVars()
+  * 
+  * @param	string	$variables
+  * @return	void
+  */
+ function checkVars($variables)
+ {
+ 	foreach ( $variables as $variable )
+ 	{
+ 		if ( array_key_exists($variable, $_GET)
+ 		  || array_key_exists($variable, $_POST)
+ 		  || array_key_exists($variable, $_COOKIE)
+ 		  || array_key_exists($variable, $_ENV)
+ 		  || (session_id() !== '' && array_key_exists($variable, $_SESSION))
+ 		  || array_key_exists($variable, $_FILES) )
+ 		{
+ 			die('Sorry. An error occurred.');
+ 		}
+ 	}
+ 	return;
+ }
+ 
+ /**
+  * sanitizeParams()
+  * Sanitize parameters such as $_GET and $_SERVER['REQUEST_URI'] etc.
+  * to avoid XSS.
+  * 
+  * @param	void
+  * @return	void
+  */
+ function sanitizeParams()
+ {
+ 	$array = array();
+ 	$str = '';
+ 	$frontParam = '';
+ 	
+ 	// REQUEST_URI of $_SERVER
+ 	$str =& $_SERVER["REQUEST_URI"];
+ 	serverStringToArray($str, $array, $frontParam);
+ 	sanitizeArray($array);
+ 	arrayToServerString($array, $frontParam, $str);
+ 	
+ 	// QUERY_STRING of $_SERVER
+ 	$str =& $_SERVER["QUERY_STRING"];
+ 	serverStringToArray($str, $array, $frontParam);
+ 	sanitizeArray($array);
+ 	arrayToServerString($array, $frontParam, $str);
+ 	
+ 	// $_GET
+ 	convArrayForSanitizing($_GET, $array);
+ 	sanitizeArray($array);
+ 	revertArrayForSanitizing($array, $_GET);
+ 	
+ 	// $_REQUEST (only GET param)
+ 	convArrayForSanitizing($_REQUEST, $array);
+ 	sanitizeArray($array);
+ 	revertArrayForSanitizing($array, $_REQUEST);
+ 	
+ 	return;
+ }
+ 
+ function _addInputTags(&$keys,$prefix='')
+ {
+ 	foreach ( $keys as $key=>$value )
+ 	{
+ 		if ( $prefix )
+ 		{
+ 			$key=$prefix.'['.$key.']';
+ 		}
+ 		if ( is_array($value) )
+ 		{
+ 			_addInputTags($value,$key);
+ 		}
+ 		else
+ 		{
+ 			if ( get_magic_quotes_gpc() )
+ 				{$value=stripslashes($value);
+ 			}
+ 			if ( $key == 'ticket' )
+ 			{
+ 				continue;
+ 			}
+ 			echo '<input type="hidden" name="'.Entity::hsc($key).
+ 			     '" value="'.Entity::hsc($value).'" />'."\n";
+ 		}
+ 	}
+ 	return;
+ }
+ 
+ /**
+  * serverStringToArray()
+  * Convert the server string such as $_SERVER['REQUEST_URI']
+  * to arry like arry['blogid']=1 and array['page']=2 etc.
+  * 
+  * @param	string	 $uri				string
+  * @param	string	&$query_elements	elements of query according to application/x-www-form-urlencoded
+  * @param	string	&$hier_part			hierarchical part includes path
+  * 
+  * NOTE:
+  * RFC 3986: Uniform Resource Identifiers (URI): Generic Syntax
+  * 3.  Syntax Components
+  * http://www.ietf.org/rfc/rfc3986.txt
+  * 
+  * Hypertext Markup Language - 2.0
+  * 8.2.1. The form-urlencoded Media Type
+  * http://tools.ietf.org/html/rfc1866#section-8.2.1
+  * 
+  * $_SERVER > Language Reference > Predefined Variables > PHP Manual
+  * http://www.php.net/manual/en/reserved.variables.server.php
+  */
+ function serverStringToArray($uri, &$query_elements, &$hier_part)
+ {
+ 	// init param
+ 	$query_elements = array();
+ 	$hier_part = "";
+ 	
+ 	// split hierarchical part, e.g. /index.php, query and fragment, e.g. blogid=1&page=2#section1
+ 	if ( i18n::strpos($uri, "?") > 0 )
+ 	{
+ 		list($hier_part, $query_and_fragment) = preg_split("#\?#", $uri, 2);
+ 	}
+ 	else
+ 	{
+ 		$query_and_fragment = $uri;
+ 		$hier_part = '';
+ 	}
+ 	
+ 	// If there is no query like blogid=1&page=2, return
+ 	if ( i18n::strpos($uri, "=") == FALSE && !i18n::strlen($hier_part) )
+ 	{
+ 		$hier_part = $uri;
+ 		return;
+ 	}
+ 	
+ 	$query_elements = preg_split("#&#", $query_and_fragment);
+ 	return;
+ }
+ 
+ /**
+  * arrayToServerString()
+  * Convert array like array['blogid'] to server string
+  * such as $_SERVER['REQUEST_URI']
+  * 
+  * @param	array	 $query_elements	elements of query according to application/x-www-form-urlencoded
+  * @param	string	 $hier_part			hier-part defined in RFC3986
+  * @param	string	&$uri				return value
+  * @return	void
+  * 
+  * NOTE:
+  * RFC 3986: Uniform Resource Identifiers (URI): Generic Syntax
+  * 3.  Syntax Components
+  * http://www.ietf.org/rfc/rfc3986.txt
+  * 
+  * Hypertext Markup Language - 2.0
+  * 8.2.1. The form-urlencoded Media Type
+  * http://tools.ietf.org/html/rfc1866#section-8.2.1
+  * 
+  * $_SERVER > Language Reference > Predefined Variables > PHP Manual
+  * http://www.php.net/manual/en/reserved.variables.server.php
+  */
+ function arrayToServerString($query_elements, $hier_part, &$uri)
+ {
+ 	if ( i18n::strpos($uri, "?") !== FALSE )
+ 	{
+ 		$uri = $hier_part . "?";
+ 	}
+ 	else
+ 	{
+ 		$uri = $hier_part;
+ 	}
+ 	if ( count($query_elements) > 0 )
+ 	{
+ 		$uri .= implode("&", $query_elements);
+ 	}
+ 	return;
+ }
+ 
+ /**
+  * sanitizeArray()
+  * Sanitize array parameters.
+  * This function checks both key and value.
+  * - check key if it inclues " (double quote),  remove from array
+  * - check value if it includes \ (escape sequece), remove remaining string
+  * 
+  * @param	array	&$array	elements of query according to application/x-www-form-urlencoded
+  * @return	void
+  */
+ function sanitizeArray(&$array)
+ {
+ 	$excludeListForSanitization = array('query');
+ 	
+ 	foreach ( $array as $k => $v )
+ 	{
+ 		// split to key and value
+ 		list($key, $val) = preg_split("#=#", $v, 2);
+ 		if ( !isset($val) )
+ 		{
+ 			continue;
+ 		}
+ 		
+ 		// when magic quotes is on, need to use stripslashes,
+ 		// and then addslashes
+ 		if ( get_magic_quotes_gpc() )
+ 		{
+ 			$val = stripslashes($val);
+ 		}
+ 		
+ 		// note that we must use addslashes here because this function is called before the db connection is made
+ 		// and sql_real_escape_string needs a db connection
+ 		$val = addslashes($val);
+ 		
+ 		// if $key is included in exclude list, skip this param
+ 		if ( !in_array($key, $excludeListForSanitization) )
+ 		{
+ 			// check value
+ 			if ( i18n::strpos($val, '\\') > 0 )
+ 			{
+ 				list($val, $tmp) = preg_split('#\\\\#', $val);
+ 			}
+ 			
+ 			// remove control code etc.
+ 			$val = strtr($val, "\0\r\n<>'\"", "       ");
+ 			
+ 			// check key
+ 			if ( preg_match('#\"#', $key) > 0 )
+ 			{
+ 				unset($array[$k]);
+ 				continue;
+ 			}
+ 			
+ 			// set sanitized info
+ 			$array[$k] = sprintf("%s=%s", $key, $val);
+ 		}
+ 	}
+ 	return;
+ }
+ 
+ /**
+  * convArrayForSanitizing()
+  * Convert array for sanitizeArray function
+  * 
+  * @param	string	$src	array to be sanitized
+  * @param	array	&$array	array to be temporarily stored
+  * @return	void
+  */
+ function convArrayForSanitizing($src, &$array)
+ {
+ 	$array = array();
+ 	foreach ( $src as $key => $val )
+ 	{
+ 		if ( !key_exists($key, $_GET) )
+ 		{
+ 			continue;
+ 		}
+ 		$array[] = sprintf("%s=%s", $key, $val);
+ 		continue;
+ 	}
+ 	return;
+ }
+ 
+ /**
+  * revertArrayForSanitizing()
+  * Revert array after sanitizeArray function
+  * 
+  * @param	array	$array	element of query according to application/x-www-form-urlencoded
+  * @param	array	&$dst	combination of key and value
+  * @return	void
+  */
+ function revertArrayForSanitizing($array, &$dst)
+ {
+ 	foreach ( $array as $v )
+ 	{
+ 		list($key, $val) = preg_split("#=#", $v, 2);
+ 		$dst[$key] = $val;
+ 		continue;
+ 	}
+ 	return;
+ }
+ 
+ /**
++>>>>>>> skinnable-master
   * decodePathInfo()
   * 
   * @param	string	$virtualpath
@@@ -1948,399 -1978,399 +3787,798 @@@ function decodePathInfo($virtualpath
  
  
  /**
++<<<<<<< HEAD
 + * redirect()
 + * Stops processing the request and redirects to the given URL.
 + * - no actual contents should have been sent to the output yet
 + * - the URL will be stripped of illegal or dangerous characters
 + * 
 + * @param	string	$uri
 + * @return	void
 + */
 +function redirect($url)
 +{
 +	$url = preg_replace('#[^a-z0-9-~+_.?\#=&;,/:@%*]#i', '', $url);
 +	header('Location: ' . $url);
 +	exit;
 +}
 +
 +/**
 + * getBookmarklet()
 + * Returns the Javascript code for a bookmarklet that works on most modern browsers
 + * 
 + * @param	integer	$blogid	ID for weblog
 + * @return	script to call Bookmarklet
 + */
 +function getBookmarklet($blogid, $width=600,  $height=500)
 +{
 +	global $CONF;
 +	
 +	$script = "Q='';"
 +	        . "x=document;"
 +	        . "y=window;"
 +	        . "if ( x.selection )"
 +	        . "{"
 +	        . " Q=x.selection.createRange().text;"
 +	        . "}"
 +	        . "else if ( y.getSelection )"
 +	        . "{"
 +	        . " Q=y.getSelection();"
 +	        . "}"
 +	        . "else if ( x.getSelection )"
 +	        . "{"
 +	        . " Q=x.getSelection();"
 +	        . "}"
 +	        . "wingm = window.open('{$CONF['AdminURL']}bookmarklet.php?blogid={$blogid}"
 +	        . " &logtext=' + encodeURIComponent(Q) +"
 +	        . " '&loglink=' + encodeURIComponent(x.location.href) +"
 +	        . " '&loglinktitle=' + encodeURIComponent(x.title),"
 +	        . " 'nucleusbm',"
 +	        . " 'scrollbars=yes,width={$width},height={$height},left=10,top=10,status=yes,resizable=yes');"
 +	        . "wingm.focus();";
 +	
 +	return $script;
 +}
 +
 +/**
 + * cleanFileName()
 + * cleans filename of uploaded file for writing to file system
 + *
 + * @param	string	$str
 + * @return	string	$cleaned filename ready for use
 + */
 +function cleanFileName($str)
 +{
 +	$str = strtolower($str);
 +	$ext_point = i18n::strrpos($str,".");
 +	if ( $ext_point === FALSE )
 +	{
 +		return FALSE;
 +	}
 +	$ext = i18n::substr($str,$ext_point,i18n::strlen($str));
 +	$str = i18n::substr($str,0,$ext_point);
 +	
 +	return preg_replace("#[^a-z0-9-]#", "_", $str) . $ext;
 +}
 +
 +/**
 + * use Notification class instead of this
 + * Deprecated since 4.0:
 + */
 +function getMailFooter()
 +{
 +	NOTIFICATION::get_mail_footer();
 +}
 +function isValidMailAddress($address)
 +{
 +	return NOTIFICATION::address_validation($address);
 +}
 +/**
 + * use Entity class instead of this
 + * Deprecated since 4.0:
 + */
 +function highlight($text, $expression, $highlight)
 +{
 +	return Entity::highlight($text, $expression, $highlight);
 +}
 +function shorten($string, $maxlength, $suffix)
 +{
 +	return Entity::shorten($string, $maxlength, $suffix);
 +}
 +function stringStripTags ($string)
 +{
 +	return Entity::strip_tags($string);
 +}
 +function toAscii($string)
 +{
 +	return Entity::anchor_footnoting($string);
 +}
 +function stringToAttribute ($string)
 +{
 +	return Entity::hsc($string);
 +}
 +function stringToXML ($string)
 +{
 +	return Entity::hen($string);
 +}
 +function encode_desc($data)
 +{
 +	return Entity::hen($data);
 +}
 +/**
 + * Centralisation of the functions that deals with locales
 + * This functions is based on the old way to deal with languages
 + * Deprecated since 4.0:
 + */
 +function getLanguageName()
 +{
 +	if( ($language = i18n::convert_locale_to_old_language_file_name(i18n::get_current_locale())) === FALSE )
 +	{
 +		$language ='english';
 +	}
 +	return $language;
 +}
 +function selectLanguage($language)
 +{
 +	global $DIR_LANG;
 +	include($DIR_LANG . preg_replace('#[\\\\|/]#', '', $language) . '.php');
 +	return;
 +}
 +/**
 + * use i18n class instead of these
 + * Deprecated since 4.0
 + */
 +function checkLanguage($lang)
 +{
 +	return ( preg_match('#^(.+)_(.+)_(.+)$#', $lang)
 +	  || i18n::convert_old_language_file_name_to_locale($lang) );
 +}
 +function formatDate($format, $timestamp, $default_format, &$blog)
 +{
 +	$offset = date('Z', $timestamp);
 +	if ( $blog )
 +	{
 +		$offset += $blog->getTimeOffset() * 3600;
 +	}
 +	return i18n::formatted_datetime($format, $timestamp, $offset, $default_format);
 +}
 +
 +/**
 + * use DB class instead of these
 + * Deprecated since 4.0
 + */
 +function quickQuery($query)
 +{
 +	$row = DB::getRow($query);
 +	return $row['result'];
 +}
 +function mysqldate($timestamp)
 +{
 +	return DB::formatDateTime($timestamp);
 + }
 +/**
 + * Centralisation of the functions that generate links
 + * Deprecated since 4.0:
 + * Please use Link::FunctionName(...) instead
 + */
 +function createItemLink($itemid, $extra = '')
 +{
 +	return Link::create_item_link($itemid, $extra);
 +}
 +function createMemberLink($memberid, $extra = '')
 +{
 +	return Link::create_member_link($memberid, $extra);
 +}
 +function createCategoryLink($catid, $extra = '')
 +{
 +	return Link::create_category_link($catid, $extra);
 +}
 +function createArchiveListLink($blogid = '', $extra = '')
 +{
 +	return Link::create_archivelist_link($blogid, $extra);
 +}
 +function createArchiveLink($blogid, $archive, $extra = '')
 +{
 +	return Link::create_archive_link($blogid, $archive, $extra);
 +}
 +function createBlogidLink($blogid, $params = '')
 +{
 +	return Link::create_blogid_link($blogid, $params = '');
 +}
 +function createLink($type, $params)
 +{
 +	return Link::create_link($type, $params);
 +}
 +function createBlogLink($url, $params)
 +{
 +	return Link::create_blog_link($url, $params);
 +}
 +/**
 + * use ActionLog class instead of this
 + * Deprecated since 4.0
 + */
 +function addToLog($level, $msg)
 +{
 +	ActionLog::add($level, $msg);
 +}
 +/**
 + * use PHP's implement
 + * Deprecated since 4.0
 + */
 +function ifset(&$var)
 +{
 +	if ( isset($var) )
 +	{
 +		return $var;
 +	}
 +	
 +	return NULL;
 +}
 +/**
 + * use Manager::getPluginNameFromPid() instead of this
 + * Deprecated since 4.0
 + */
 +function getPluginNameFromPid($pid)
 +{
 +	global $manager;
 +	return $manager->getPluginNameFromPid($pid);
 +}
 +/**
 + * use Manager::numberOfEventSubscribers() instead of this
 + * Deprecated since 4.0
 + */
 +function numberOfEventSubscribers($event)
 +{
 +	global $manager;
 +	return $manager->getNumberOfSubscribers($event);
 +}
 +
 +/**
 + * PluginAdmin has already the alternative implement
 + * Deprecated since 4.0
 + */
 +function ticketForPlugin()
 +{
 +	global $CONF, $DIR_LIBS, $DIR_LOCALES, $DIR_PLUGINS, $manager, $member, $ticketforplugin;
 +	
 +	/* initialize */
 +	$ticketforplugin = array();
 +	$ticketforplugin['ticket'] = FALSE;
 +	
 +	/* Check if using plugin's php file. */
 +	$p_translated = serverVar('SCRIPT_FILENAME');
 +	
 +	if (!file_exists($p_translated) )
 +	{
 +		header("HTTP/1.0 404 Not Found");
 +		exit('');
 +	}
 +	
 +	// check whether this is plugin or not
 +	$p_translated = str_replace('\\', '/', $p_translated);
 +	$d_plugins = str_replace('\\', '/', $DIR_PLUGINS);
 +	if ( i18n::strpos($p_translated, $d_plugins) !== 0 )
 +	{
 +		return;
 +	}
 +	
 +	// Solve the plugin php file or admin directory
 +	$phppath = i18n::substr($p_translated, i18n::strlen($d_plugins) );
 +	// Remove the first "/" if exists.
 +	$phppath = preg_replace('#^/#', '', $phppath);
 +	// Remove the first "NP_" and the last ".php" if exists.
 +	$path = preg_replace('#^NP_(.*)\.php$#', '$1', $phppath);
 +	// Remove the "/" and beyond.
 +	$path = preg_replace('#^([^/]*)/(.*)$#', '$1', $path);
 +	
 +	// Solve the plugin name.
 +	$plugins = array();
 +	$query = sprintf('SELECT pfile FROM %s;', sql_table('plugin'));
 +	$res = DB::getResult($query);
 +	
 +	foreach ( $res as $row )
 +	{
 +		$name = i18n::substr($row['pfile'], 3);
 +		$plugins[strtolower($name)] = $name;
 +	}
 +	
 +	$res->closeCursor();
 +	
 +	if ( !array_key_exists($path, $plugins) )
 +	{
 +		header("HTTP/1.0 404 Not Found");
 +		exit('');
 +	}
 +	else
 +	{
 +		$plugin_name = $plugins[$path];
 +	}
 +	
 +	/* Return if not index.php */
 +	if ( ($phppath != strtolower($plugin_name) . '/')
 +	  && ($phppath != strtolower($plugin_name) . '/index.php') )
 +	{
 +		return;
 +	}
 +	
 +	/* Exit if not logged in. */
 +	if ( !$member->isLoggedIn() )
 +	{
 +		exit('You aren\'t logged in.');
 +	}
 +	
 +	/* Check if this feature is needed (ie, if "$manager->checkTicket()" is not included in the script). */
 +	if ( $file = @file($p_translated) )
 +	{
 +		$prevline = '';
 +		
 +		foreach($file as $line)
 +		{
 +			if (preg_match('#[\$]manager([\s]*)[\-]>([\s]*)checkTicket([\s]*)[\(]#i', $prevline . $line) )
 +			{
 +				return;
 +			}
 +			
 +			$prevline = $line;
 +		}
 +	}
 +	
 +	/* Show a form if not valid ticket */
 +	if ( (i18n::strpos(serverVar('REQUEST_URI'), '?') !== FALSE
 +	  || serverVar('QUERY_STRING')
 +	  || strtoupper(serverVar('REQUEST_METHOD') ) == 'POST')
 +	  && !$manager->checkTicket() )
 +	{
 +		$oPluginAdmin = new PluginAdmin($plugin_name);
 +		$oPluginAdmin->start();
 +		
 +		echo '<p>' . _ERROR_BADTICKET . "</p>\n";
 +		
 +		// Resolve URI and QUERY_STRING
 +		if ($uri = serverVar('REQUEST_URI') )
 +		{
 +			list($uri, $qstring) = preg_split('#\?#', $uri);
 +		}
 +		else
 +		{
 +			if ( !($uri = serverVar('PHP_SELF') ) )
 +			{
 +				$uri = serverVar('SCRIPT_NAME');
 +			}
 +			$qstring = serverVar('QUERY_STRING');
 +		}
 +		if ($qstring)
 +		{
 +			$qstring = '?' . $qstring;
 +		}
 +		
 +		echo '<p>' . _SETTINGS_UPDATE . ' : ' . _QMENU_PLUGINS . ' <span style="color:red;">' . Entity::hsc($plugin_name) . "</span> ?</p>\n";
 +		
 +		switch(strtoupper(serverVar('REQUEST_METHOD') ) )
 +		{
 +			case 'POST':
 +				echo '<form method="POST" action="'.Entity::hsc($uri.$qstring).'">';
 +				$manager->addTicketHidden();
 +				_addInputTags($_POST);
 +				break;
 +			
 +			case 'GET':
 +				echo '<form method="GET" action="'.Entity::hsc($uri).'">';
 +				$manager->addTicketHidden();
 +				_addInputTags($_GET);
 +			
 +			default:
 +				break;
 +		}
 +		
 +		echo '<input type="submit" value="' . _YES . '" />&nbsp;&nbsp;&nbsp;&nbsp;';
 +		echo '<input type="button" value="' . _NO . '" onclick="history.back(); return false;" />';
 +		echo "</form>\n";
 +		
 +		$oPluginAdmin->end();
 +		exit;
 +	}
 +	
 +	/* Create new ticket */
 +	$ticket=$manager->addTicketToUrl('');
 +	$ticketforplugin['ticket'] = preg_split($ticket, i18n::strpos($ticket, 'ticket=') + 7);
 +	return;
 +}
++=======
+  * redirect()
+  * Stops processing the request and redirects to the given URL.
+  * - no actual contents should have been sent to the output yet
+  * - the URL will be stripped of illegal or dangerous characters
+  * 
+  * @param	string	$uri
+  * @return	void
+  */
+ function redirect($url)
+ {
+ 	$url = preg_replace('#[^a-z0-9-~+_.?\#=&;,/:@%*]#i', '', $url);
+ 	header('Location: ' . $url);
+ 	exit;
+ }
+ 
+ /**
+  * getBookmarklet()
+  * Returns the Javascript code for a bookmarklet that works on most modern browsers
+  * 
+  * @param	integer	$blogid	ID for weblog
+  * @return	script to call Bookmarklet
+  */
+ function getBookmarklet($blogid, $width=600,  $height=500)
+ {
+ 	global $CONF;
+ 	
+ 	$script = "Q='';"
+ 	        . "x=document;"
+ 	        . "y=window;"
+ 	        . "if ( x.selection )"
+ 	        . "{"
+ 	        . " Q=x.selection.createRange().text;"
+ 	        . "}"
+ 	        . "else if ( y.getSelection )"
+ 	        . "{"
+ 	        . " Q=y.getSelection();"
+ 	        . "}"
+ 	        . "else if ( x.getSelection )"
+ 	        . "{"
+ 	        . " Q=x.getSelection();"
+ 	        . "}"
+ 	        . "wingm = window.open('{$CONF['AdminURL']}bookmarklet.php?blogid={$blogid}"
+ 	        . " &logtext=' + encodeURIComponent(Q) +"
+ 	        . " '&loglink=' + encodeURIComponent(x.location.href) +"
+ 	        . " '&loglinktitle=' + encodeURIComponent(x.title),"
+ 	        . " 'nucleusbm',"
+ 	        . " 'scrollbars=yes,width={$width},height={$height},left=10,top=10,status=yes,resizable=yes');"
+ 	        . "wingm.focus();";
+ 	
+ 	return $script;
+ }
+ 
+ /**
+  * cleanFileName()
+  * cleans filename of uploaded file for writing to file system
+  *
+  * @param	string	$str
+  * @return	string	$cleaned filename ready for use
+  */
+ function cleanFileName($str)
+ {
+ 	$str = strtolower($str);
+ 	$ext_point = i18n::strrpos($str,".");
+ 	if ( $ext_point === FALSE )
+ 	{
+ 		return FALSE;
+ 	}
+ 	$ext = i18n::substr($str,$ext_point,i18n::strlen($str));
+ 	$str = i18n::substr($str,0,$ext_point);
+ 	
+ 	return preg_replace("#[^a-z0-9-]#", "_", $str) . $ext;
+ }
+ 
+ /**
+  * use Notification class instead of this
+  * Deprecated since 4.0:
+  */
+ function getMailFooter()
+ {
+ 	NOTIFICATION::get_mail_footer();
+ }
+ function isValidMailAddress($address)
+ {
+ 	return NOTIFICATION::address_validation($address);
+ }
+ /**
+  * use Entity class instead of this
+  * Deprecated since 4.0:
+  */
+ function highlight($text, $expression, $highlight)
+ {
+ 	return Entity::highlight($text, $expression, $highlight);
+ }
+ function shorten($string, $maxlength, $suffix)
+ {
+ 	return Entity::shorten($string, $maxlength, $suffix);
+ }
+ function stringStripTags ($string)
+ {
+ 	return Entity::strip_tags($string);
+ }
+ function toAscii($string)
+ {
+ 	return Entity::anchor_footnoting($string);
+ }
+ function stringToAttribute ($string)
+ {
+ 	return Entity::hsc($string);
+ }
+ function stringToXML ($string)
+ {
+ 	return Entity::hen($string);
+ }
+ function encode_desc($data)
+ {
+ 	return Entity::hen($data);
+ }
+ /**
+  * Centralisation of the functions that deals with locales
+  * This functions is based on the old way to deal with languages
+  * Deprecated since 4.0:
+  */
+ function getLanguageName()
+ {
+ 	if( ($language = i18n::convert_locale_to_old_language_file_name(i18n::get_current_locale())) === FALSE )
+ 	{
+ 		$language ='english';
+ 	}
+ 	return $language;
+ }
+ function selectLanguage($language)
+ {
+ 	global $DIR_LANG;
+ 	include($DIR_LANG . preg_replace('#[\\\\|/]#', '', $language) . '.php');
+ 	return;
+ }
+ /**
+  * use i18n class instead of these
+  * Deprecated since 4.0
+  */
+ function checkLanguage($lang)
+ {
+ 	return ( preg_match('#^(.+)_(.+)_(.+)$#', $lang)
+ 	  || i18n::convert_old_language_file_name_to_locale($lang) );
+ }
+ function formatDate($format, $timestamp, $default_format, &$blog)
+ {
+ 	$offset = date('Z', $timestamp);
+ 	if ( $blog )
+ 	{
+ 		$offset += $blog->getTimeOffset() * 3600;
+ 	}
+ 	return i18n::formatted_datetime($format, $timestamp, $offset, $default_format);
+ }
+ 
+ /**
+  * use DB class instead of these
+  * Deprecated since 4.0
+  */
+ function quickQuery($query)
+ {
+ 	$row = DB::getRow($query);
+ 	return $row['result'];
+ }
+ function mysqldate($timestamp)
+ {
+ 	return DB::formatDateTime($timestamp);
+  }
+ /**
+  * Centralisation of the functions that generate links
+  * Deprecated since 4.0:
+  * Please use Link::FunctionName(...) instead
+  */
+ function createItemLink($itemid, $extra = '')
+ {
+ 	return Link::create_item_link($itemid, $extra);
+ }
+ function createMemberLink($memberid, $extra = '')
+ {
+ 	return Link::create_member_link($memberid, $extra);
+ }
+ function createCategoryLink($catid, $extra = '')
+ {
+ 	return Link::create_category_link($catid, $extra);
+ }
+ function createArchiveListLink($blogid = '', $extra = '')
+ {
+ 	return Link::create_archivelist_link($blogid, $extra);
+ }
+ function createArchiveLink($blogid, $archive, $extra = '')
+ {
+ 	return Link::create_archive_link($blogid, $archive, $extra);
+ }
+ function createBlogidLink($blogid, $params = '')
+ {
+ 	return Link::create_blogid_link($blogid, $params = '');
+ }
+ function createLink($type, $params)
+ {
+ 	return Link::create_link($type, $params);
+ }
+ function createBlogLink($url, $params)
+ {
+ 	return Link::create_blog_link($url, $params);
+ }
+ /**
+  * use ActionLog class instead of this
+  * Deprecated since 4.0
+  */
+ function addToLog($level, $msg)
+ {
+ 	ActionLog::add($level, $msg);
+ }
+ /**
+  * use PHP's implement
+  * Deprecated since 4.0
+  */
+ function ifset(&$var)
+ {
+ 	if ( isset($var) )
+ 	{
+ 		return $var;
+ 	}
+ 	
+ 	return NULL;
+ }
+ /**
+  * use Manager::getPluginNameFromPid() instead of this
+  * Deprecated since 4.0
+  */
+ function getPluginNameFromPid($pid)
+ {
+ 	global $manager;
+ 	return $manager->getPluginNameFromPid($pid);
+ }
+ /**
+  * use Manager::numberOfEventSubscribers() instead of this
+  * Deprecated since 4.0
+  */
+ function numberOfEventSubscribers($event)
+ {
+ 	global $manager;
+ 	return $manager->getNumberOfSubscribers($event);
+ }
+ 
+ /**
+  * PluginAdmin has already the alternative implement
+  * Deprecated since 4.0
+  */
+ function ticketForPlugin()
+ {
+ 	global $CONF, $DIR_LIBS, $DIR_LOCALES, $DIR_PLUGINS, $manager, $member, $ticketforplugin;
+ 	
+ 	/* initialize */
+ 	$ticketforplugin = array();
+ 	$ticketforplugin['ticket'] = FALSE;
+ 	
+ 	/* Check if using plugin's php file. */
+ 	$p_translated = serverVar('SCRIPT_FILENAME');
+ 	
+ 	if (!file_exists($p_translated) )
+ 	{
+ 		header("HTTP/1.0 404 Not Found");
+ 		exit('');
+ 	}
+ 	
+ 	// check whether this is plugin or not
+ 	$p_translated = str_replace('\\', '/', $p_translated);
+ 	$d_plugins = str_replace('\\', '/', $DIR_PLUGINS);
+ 	if ( i18n::strpos($p_translated, $d_plugins) !== 0 )
+ 	{
+ 		return;
+ 	}
+ 	
+ 	// Solve the plugin php file or admin directory
+ 	$phppath = i18n::substr($p_translated, i18n::strlen($d_plugins) );
+ 	// Remove the first "/" if exists.
+ 	$phppath = preg_replace('#^/#', '', $phppath);
+ 	// Remove the first "NP_" and the last ".php" if exists.
+ 	$path = preg_replace('#^NP_(.*)\.php$#', '$1', $phppath);
+ 	// Remove the "/" and beyond.
+ 	$path = preg_replace('#^([^/]*)/(.*)$#', '$1', $path);
+ 	
+ 	// Solve the plugin name.
+ 	$plugins = array();
+ 	$query = sprintf('SELECT pfile FROM %s;', sql_table('plugin'));
+ 	$res = DB::getResult($query);
+ 	
+ 	foreach ( $res as $row )
+ 	{
+ 		$name = i18n::substr($row['pfile'], 3);
+ 		$plugins[strtolower($name)] = $name;
+ 	}
+ 	
+ 	$res->closeCursor();
+ 	
+ 	if ( !array_key_exists($path, $plugins) )
+ 	{
+ 		header("HTTP/1.0 404 Not Found");
+ 		exit('');
+ 	}
+ 	else
+ 	{
+ 		$plugin_name = $plugins[$path];
+ 	}
+ 	
+ 	/* Return if not index.php */
+ 	if ( ($phppath != strtolower($plugin_name) . '/')
+ 	  && ($phppath != strtolower($plugin_name) . '/index.php') )
+ 	{
+ 		return;
+ 	}
+ 	
+ 	/* Exit if not logged in. */
+ 	if ( !$member->isLoggedIn() )
+ 	{
+ 		exit('You aren\'t logged in.');
+ 	}
+ 	
+ 	/* Check if this feature is needed (ie, if "$manager->checkTicket()" is not included in the script). */
+ 	if ( $file = @file($p_translated) )
+ 	{
+ 		$prevline = '';
+ 		
+ 		foreach($file as $line)
+ 		{
+ 			if (preg_match('#[\$]manager([\s]*)[\-]>([\s]*)checkTicket([\s]*)[\(]#i', $prevline . $line) )
+ 			{
+ 				return;
+ 			}
+ 			
+ 			$prevline = $line;
+ 		}
+ 	}
+ 	
+ 	/* Show a form if not valid ticket */
+ 	if ( (i18n::strpos(serverVar('REQUEST_URI'), '?') !== FALSE
+ 	  || serverVar('QUERY_STRING')
+ 	  || strtoupper(serverVar('REQUEST_METHOD') ) == 'POST')
+ 	  && !$manager->checkTicket() )
+ 	{
+ 		$oPluginAdmin = new PluginAdmin($plugin_name);
+ 		$oPluginAdmin->start();
+ 		
+ 		echo '<p>' . _ERROR_BADTICKET . "</p>\n";
+ 		
+ 		// Resolve URI and QUERY_STRING
+ 		if ($uri = serverVar('REQUEST_URI') )
+ 		{
+ 			list($uri, $qstring) = preg_split('#\?#', $uri);
+ 		}
+ 		else
+ 		{
+ 			if ( !($uri = serverVar('PHP_SELF') ) )
+ 			{
+ 				$uri = serverVar('SCRIPT_NAME');
+ 			}
+ 			$qstring = serverVar('QUERY_STRING');
+ 		}
+ 		if ($qstring)
+ 		{
+ 			$qstring = '?' . $qstring;
+ 		}
+ 		
+ 		echo '<p>' . _SETTINGS_UPDATE . ' : ' . _QMENU_PLUGINS . ' <span style="color:red;">' . Entity::hsc($plugin_name) . "</span> ?</p>\n";
+ 		
+ 		switch(strtoupper(serverVar('REQUEST_METHOD') ) )
+ 		{
+ 			case 'POST':
+ 				echo '<form method="POST" action="'.Entity::hsc($uri.$qstring).'">';
+ 				$manager->addTicketHidden();
+ 				_addInputTags($_POST);
+ 				break;
+ 			
+ 			case 'GET':
+ 				echo '<form method="GET" action="'.Entity::hsc($uri).'">';
+ 				$manager->addTicketHidden();
+ 				_addInputTags($_GET);
+ 			
+ 			default:
+ 				break;
+ 		}
+ 		
+ 		echo '<input type="submit" value="' . _YES . '" />&nbsp;&nbsp;&nbsp;&nbsp;';
+ 		echo '<input type="button" value="' . _NO . '" onclick="history.back(); return false;" />';
+ 		echo "</form>\n";
+ 		
+ 		$oPluginAdmin->end();
+ 		exit;
+ 	}
+ 	
+ 	/* Create new ticket */
+ 	$ticket=$manager->addTicketToUrl('');
+ 	$ticketforplugin['ticket'] = preg_split($ticket, i18n::strpos($ticket, 'ticket=') + 7);
+ 	return;
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/libs/i18n.php
index 1b494ea,b8628eb..9f846df
--- a/nucleus/libs/i18n.php
+++ b/nucleus/libs/i18n.php
@@@ -1,683 -1,684 +1,1370 @@@
++<<<<<<< HEAD
 +<?php
 +/**
 + * i18n class for Nucleus CMS
 + * written by Takashi Sakamoto as of Feb 03, 2012
 + * 
 + * This includes wrapper functions of iconv and mbstring
 + * for multibyte processing and includes parameters related to locale.
 + * 
 + * 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-2011 The Nucleus Group
 + * @version $Id: i18n.php 1678 2012-02-26 07:31:36Z sakamocchi $
 + */
 +class i18n
 +{
 +	static private $mode = FALSE;
 +	
 +	static private $current_charset = '';
 +	static private $current_language = '';
 +	static private $current_script = '';
 +	static private $current_region = '';
 +	
 +	static private $locale_list = array();
 +	static private $timezone = 'UTC';
 +	
 +	static private $forced_charset = '';
 +	static private $forced_language = '';
 +	static private $forced_script = '';
 +	static private $forced_region = '';
 +	
 +	/**
 +	 * i18n::init
 +	 * Initializing i18n class
 +	 * 
 +	 * @static
 +	 * @param	string	$charset	character set
 +	 * @return	boolean	
 +	 */
 +	static public function init($charset, $dir)
 +	{
 +		/* i18n is already initialized */
 +		if ( self::$mode )
 +		{
 +			return TRUE;
 +		}
 +		
 +		/* make locale list in this Nucleus CMS */
 +		if ( ($handle = opendir($dir)) === FALSE )
 +		{
 +			return FALSE;
 +		}
 +		while ($filename = readdir($handle))
 +		{
 +			if (preg_match("#^(.+_.+_.+)\.{$charset}\.php$#", $filename, $matches) )
 +			{
 +				if ( !in_array($matches[1], self::$locale_list) )
 +				{
 +					self::$locale_list[] = $matches[1];
 +				}
 +			}
 +		}
 +		closedir($handle);
 +		
 +		/* set i18n backend and validate character set */
 +		if ( extension_loaded('iconv') )
 +		{
 +			/* this is just for checking the charset. */
 +			if ( iconv_set_encoding('internal_encoding', $charset)
 +			 && iconv_set_encoding('output_encoding', $charset)
 +			 && iconv_set_encoding('internal_encoding', $charset) )
 +			{
 +				self::$current_charset = $charset;
 +				self::$mode = 'iconv';
 +			}
 +		}
 +		else if ( extension_loaded('mbstring') )
 +		{
 +			/* this is just for checking the charset. */
 +			if ( mb_http_output($charset)
 +			 && mb_internal_encoding($charset)
 +			 && mb_regex_encoding($charset) )
 +			{
 +				self::$current_charset = $charset;
 +				self::$mode = 'mbstring';
 +			}
 +		}
 +		
 +		return TRUE;
 +	}
 +	
 +	/**
 +	 * i18n::get_available_locale_list
 +	 * return available locale list with current charset
 +	 * 
 +	 * @static
 +	 * @param	void
 +	 * @return	array	available locale list
 +	 */
 +	static public function get_available_locale_list()
 +	{
 +		return self::$locale_list;
 +	}
 +	
 +	/**
 +	 * i18n::get_current_charset
 +	 * return current charset
 +	 * 
 +	 * @static
 +	 * @param	void
 +	 * @return	string	$charset	current character set
 +	 */
 +	static public function get_current_charset()
 +	{
 +		return self::$current_charset;
 +	}
 +	
 +	/**
 +	 * i18n::set_locale
 +	 * Set current locale
 +	 * 
 +	 * NOTE:
 +	 * naming rule is "$language_$script_$region.$charset.php", refer to RFC 5646.
 +	 * @link http://www.ietf.org/rfc/rfc5646.txt
 +	 * @see 2.  The Language Tag
 +	 * 
 +	 * @static
 +	 * @param	string	$locale
 +	 * @return	bool	TRUE/FALSE
 +	 * 
 +	 */
 +	static public function set_current_locale($locale)
 +	{
 +		if ( preg_match('#^(.+)_(.+)_(.+)$#', $locale, $match) )
 +		{
 +			self::$current_language = $match[1];
 +			self::$current_script   = $match[2];
 +			self::$current_region   = $match[3];
 +			return TRUE;
 +		}
 +		return FALSE;
 +	}
 +	
 +	/**
 +	 * i18n::get_locale
 +	 * Get current locale
 +	 * 
 +	 * @static
 +	 * @param	void
 +	 * @return	$locale
 +	 */
 +	static public function get_current_locale()
 +	{
 +		$elements = array(self::$current_language, self::$current_script, self::$current_region);
 +		return implode('_', $elements);
 +	}
 +	
 +	/**
 +	 * i18n::set_forced_locale()
 +	 * Set forced locale
 +	 * 
 +	 * @static
 +	 * @param	string	$forced_locale
 +	 * @return	bool	TRUE/FALSE
 +	 * 
 +	 */
 +	static public function set_forced_locale($forced_locale)
 +	{
 +		if ( preg_match('#^(.+)_(.+)_(.+)$#', $forced_locale, $match) )
 +		{
 +			self::$forced_language	= $match[1];
 +			self::$forced_script	= $match[2];
 +			self::$forced_region	= $match[3];
 +			return TRUE;
 +		}
 +		return FALSE;
 +	}
 +	
 +	/**
 +	 * i18n::get_forced_locale
 +	 * Get forced locale
 +	 * 
 +	 * @static
 +	 * @param	void
 +	 * @return	$forced_locale
 +	 */
 +	static public function get_forced_locale()
 +	{
 +		if ( !self::$forced_language )
 +		{
 +			return '';
 +		}
 +		
 +		$elements = array(self::$forced_language, self::$forced_script, self::$forced_region);
 +		return implode('_', $elements);
 +	}
 +	
 +	/**
 +	 * i18n::set_forced_charset
 +	 * return forced charset
 +	 * 
 +	 * @static
 +	 * @param	void	$charset	forced character set
 +	 * @return	void
 +	 */
 +	static public function set_forced_charset($forced_charset)
 +	{
 +		self::$forced_charset = $forced_charset;
 +		return;
 +	}
 +	
 +	/**
 +	 * i18n::get_forced_charset
 +	 * return forced charset
 +	 * 
 +	 * @static
 +	 * @param	void
 +	 * @return	string	$charset	forced character set
 +	 */
 +	static public function get_forced_charset()
 +	{
 +		return self::$forced_charset;
 +	}
 +	
 +	/**
 +	 * i18n::confirm_default_date_timezone
 +	 * to avoid E_NOTICE or E_WARNING generated when every calling to a date/time function.
 +	 * 
 +	 * NOTE:
 +	 * Some private servers are lack of its timezone setting
 +	 * http://www.php.net/manual/en/function.date-default-timezone-set.php
 +	 * 
 +	 * @static
 +	 * @param	void
 +	 * @return	void
 +	 */
 +	static public function confirm_default_date_timezone()
 +	{
 +		if ( function_exists('date_default_timezone_get') 
 +		 && FALSE !== ($timezone = @date_default_timezone_get()))
 +		{
 +			self::$timezone = $timezone;
 +		}
 +		if (function_exists('date_default_timezone_set')) {
 +			 @date_default_timezone_set(self::$timezone);
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * i18n::get_current_date_timezone()
 +	 * get current timezone
 +	 * 
 +	 * @static
 +	 * @param	void
 +	 * @return	$timezone
 +	 */
 +	static public function get_date_timezone()
 +	{
 +		return self::$timezone;
 +	}
 +	
 +	/**
 +	 * i18n::convert
 +	 * character set converter
 +	 * 
 +	 * @static
 +	 * @param	string	$string	target string binary
 +	 * @param	string	$from	original character set encoding
 +	 * @param	string	$to	target character set encoding
 +	 * @return	string	converted string
 +	 */
 +	static public function convert($string, $from, $to='')
 +	{
 +		if ( $to == '' )
 +		{
 +			$to = self::$current_charset;
 +		}
 +		
 +		if ( $from == $to )
 +		{
 +			/* do nothing */
 +		}
 +		else if ( self::$mode == 'iconv' )
 +		{
 +			$string = iconv($from, $to.'//TRANSLIT', $string);
 +		}
 +		else if ( self::$mode == 'mbstring' )
 +		{
 +			$string = mb_convert_encoding($string, $to, $from);
 +		}
 +		return (string) $string;
 +	}
 +	
 +	/**
 +	 * i18n::convert_handler
 +	 * callable handler for character set converter
 +	 * 
 +	 * @static
 +	 * @param	string	$string	target string binary
 +	 * @return	void
 +	 */
 +	static public function convert_handler($string)
 +	{
 +		return self::convert($string, self::$current_charset, self::$forced_charset);
 +	}
 +	
 +	/**
 +	 * i18n::convert_array
 +	 * recursively converting array
 +	 * 
 +	 * @static
 +	 * @param	array	$array	array to convert
 +	 * @return	void
 +	 */
 +	static public function convert_array($array, $from, $to='')
 +	{
 +		if ( !is_array($array) )
 +		{
 +			$array = self::convert($array, $from, $to);
 +		}
 +		else
 +		{
 +			foreach ( $array as $key => $value )
 +			{
 +				if ( !is_array($value) )
 +				{
 +					$array[$key] = self::convert($value, $from, $to);
 +				}
 +				else
 +				{
 +					self::convert_array($array[$key]);
 +				}
 +			}
 +		}
 +		
 +		return $array;
 +	}
 +	
 +	/**
 +	 * i18n::strlen
 +	 * strlen wrapper
 +	 * 
 +	 * @static
 +	 * @param	string	$string	target string
 +	 * @return	integer	the number of letters
 +	 */
 +	static public function strlen($string)
 +	{
 +		$length = 0;
 +		if ( self::$mode == 'iconv' )
 +		{
 +			$length = iconv_strlen($string, self::$current_charset);
 +		}
 +		else if ( self::$mode == 'mbstring' )
 +		{
 +			$length = mb_strlen($string, self::$current_charset);
 +		}
 +		else
 +		{
 +			$length = strlen($string);
 +		}
 +		return (integer) $length;
 +	}
 +	
 +	/**
 +	 * i18n::strpos
 +	 * strpos wrapper
 +	 * 
 +	 * @static
 +	 * @param	string	$haystack	string to search
 +	 * @param	string	$needle	string for search
 +	 * @param	integer	$offset	the position from which the search should be performed. 
 +	 * @return	integer/FALSE	the numeric position of the first occurrence of needle in haystack
 +	 */
 +	static public function strpos($haystack, $needle, $offset=0)
 +	{
 +		$position = 0;
 +		if ( self::$mode == 'iconv' )
 +		{
 +			$position = iconv_strpos($haystack, $needle, $offset, self::$current_charset);
 +		}
 +		else if ( self::$mode == 'mbstring' )
 +		{
 +			$position = mb_strpos($haystack, $needle, $offset, self::$current_charset);
 +		}
 +		else
 +		{
 +			$position = strpos($haystack, $needle, $offset);
 +		}
 +		
 +		if ( $position !== FALSE)
 +		{
 +			$position = (integer) $position;
 +		}
 +		return $position;
 +	}
 +	
 +	/**
 +	 * i18n::strrpos
 +	 * strrpos wrapper
 +	 * 
 +	 * @static
 +	 * @param	string	$haystack	string to search
 +	 * @param	string	$needle	string for search
 +	 * @return	integer/FALSE	the numeric position of the last occurrence of needle in haystack
 +	 */
 +	static public function strrpos ($haystack, $needle)
 +	{
 +		$position = 0;
 +		if ( self::$mode == 'iconv' )
 +		{
 +			$position = iconv_strrpos($haystack, $needle, self::$current_charset);
 +		}
 +		else if ( self::$mode == 'mbstring' )
 +		{
 +			$position = mb_strrpos($haystack, $needle, 0, self::$current_charset);
 +		}
 +		else
 +		{
 +			$position = strrpos($haystack, $needle, 0);
 +		}
 +		
 +		if ( $position !== FALSE)
 +		{
 +			$position = (integer) $position;
 +		}
 +		return $position;
 +	}
 +	
 +	/**
 +	 * i18n::substr
 +	 * substr wrapper
 +	 * 
 +	 * @static
 +	 * @param	string	$string	string to be cut
 +	 * @param	string	$start	the position of starting
 +	 * @param	integer	$length	the length to be cut
 +	 * @return	string	the extracted part of string
 +	 */
 +	static public function substr($string, $start, $length=0)
 +	{
 +		$return = '';
 +		
 +		if ( $length == 0 )
 +		{
 +			$length = self::strlen($string) - $start;
 +		}
 +		
 +		if ( self::$mode == 'iconv' )
 +		{
 +			$return = iconv_substr($string, $start, $length, self::$current_charset);
 +		}
 +		else if ( self::$mode == 'mbstring' )
 +		{
 +			$return = mb_substr($string, $start, $length, self::$current_charset);
 +		}
 +		else
 +		{
 +			$return = strrpos($string, $start, $length);
 +		}
 +		return (string) $return;
 +	}
 +	
 +	/**
 +	 * i18n::strftime
 +	 * strftime function based on multibyte processing
 +	 * 
 +	 * @static
 +	 * @param	string	$format	format with singlebyte or multibyte
 +	 * @param	timestamp	$timestamp	UNIX timestamp
 +	 * @return	string	formatted timestamp
 +	 */
 +	static public function strftime($format, $timestamp='')
 +	{
 +		return preg_replace_callback('/(%[a-z%])/i',
 +			create_function('$matches', 'return strftime($matches[1], ' . intval($timestamp) . ');'),
 +			$format
 +		);
 +	}
 +	
 +	/**
 +	 * i18n::formatted_datetime()
 +	 * return formatted datetime string
 +	 * 
 +	 * Date and Time Formats
 +	 * @link	http://www.w3.org/TR/NOTE-datetime
 +	 * 
 +	 * Working with Time Zones
 +	 * @link	http://www.w3.org/TR/timezone/
 +	 * 
 +	 * @param	String	$format	time expression format
 +	 * @param	String	$timestamp	UNIX timestamp
 +	 * @param	Integer	$offset	timestamp offset
 +	 * @return	String	formatted datetime
 +	 */
 +	static public function formatted_datetime($format, $timestamp, $offset=0)
 +	{
 +		$suffix = '';
 +		$string = '';
 +		
 +		switch ( $format )
 +		{
 +			case 'mysql':
 +				/*
 +				 * MySQL 5.0 Reference Manual
 +				 *  10.3.1. The DATE, DATETIME, and TIMESTAMP Types
 +				 *   http://dev.mysql.com/doc/refman/5.0/en/datetime.html
 +				 */
 +				$timestamp += $offset;
 +				$format = '%Y-%m-%d %H:%M:%S';
 +				$suffix ='';
 +				break;
 +			case 'rfc822':
 +				/*
 +				 * RFC 822: STANDARD FOR THE FORMAT OF ARPA INTERNET TEXT MESSAGES
 +				 *  5.  DATE AND TIME SPECIFICATION
 +				 *   http://www.ietf.org/rfc/rfc0822.txt
 +				 */
 +				$format = '%a, %d %m %y %H:%M:%S ';
 +				if ( $offset < 0 )
 +				{
 +					$suffix = '-';
 +					$offset = -$offset;
 +				}
 +				else
 +				{
 +					$suffix = '+';
 +				}
 +				
 +				$suffix .= sprintf("%02d%02d", floor($offset / 3600), round(($offset % 3600) / 60) );
 +				break;
 +			case 'rfc822GMT':
 +				/*
 +				 * RFC 822: STANDARD FOR THE FORMAT OF ARPA INTERNET TEXT MESSAGES
 +				 *  5.  DATE AND TIME SPECIFICATION
 +				 *   http://www.ietf.org/rfc/rfc0822.txt
 +				 */
 +				$format = '%a, %d %m %y %H:%M:%S ';
 +				$timestamp -= $offset;
 +				$suffix = 'GMT';
 +				break;
 +			case 'iso8601':
 +			case 'rfc3339':
 +				/*
 +				 * RFC3339: Date and Time on the Internet: Timestamps
 +				 *  5. Date and Time format
 +				 *   http://www.ietf.org/rfc/rfc3339.txt
 +				 */
 +				$format = '%Y-%m-%dT%H:%M:%S';
 +				if ( $offset < 0 )
 +				{
 +					$suffix = '-';
 +					$offset = -$offset;
 +				}
 +				else
 +				{
 +					$suffix = '+';
 +				}
 +				$suffix .= sprintf("%02d:%02d", floor($offset / 3600), round(($offset % 3600) / 60) );
 +				break;
 +			case 'utc':
 +			case 'iso8601UTC':
 +			case 'rfc3339UTC':
 +				/*
 +				 * RFC3339: Date and Time on the Internet: Timestamps
 +				 *  5. Date and Time format
 +				 *   http://www.ietf.org/rfc/rfc3339.txt
 +				 */
 +				$timestamp -= $offset;
 +				$format = '%Y-%m-%dT%H:%M:%SZ';
 +				$suffix = '';
 +				break;
 +			case '':
 +				$format = '%X %x';
 +				$offset = '';
 +				break;
 +			default:
 +				$suffix = '';
 +				break;
 +		}
 +		return i18n::strftime($format, $timestamp) . $suffix;
 +	}
 +	
 +	/**
 +	 * i18n::convert_locale_to_old_language_file_name()
 +	 * NOTE: this should be obsoleted near future.
 +	 * 
 +	 * @static
 +	 * @param	string	$target_locale	locale name as language_script_region
 +	 * @return	string	old translation file name
 +	 */
 +	static public function convert_locale_to_old_language_file_name($target_locale)
 +	{
 +		$target_language = '';
 +		foreach ( self::$lang_refs as $language => $locale )
 +		{
 +			if ( preg_match('#-#', $language) )
 +			{
 +				if ( $target_locale . '.' . self::$current_charset == $locale )
 +				{
 +					$target_language = $language;
 +					break;
 +				}
 +			}
 +			else if ( $target_locale == $locale )
 +			{
 +				$target_language = $language;
 +			}
 +		}
 +		return $target_language;
 +	}
 +	
 +	/**
 +	 * i18n::convert_old_language_file_name_to_locale()
 +	 * NOTE: this should be obsoleted near future.
 +	 * 
 +	 * @static
 +	 * @param	string	$target_language	old translation file name
 +	 * @return	string	locale name as language_script_region
 +	 */
 +	static public function convert_old_language_file_name_to_locale($target_language)
 +	{
 +		$target_locale = '';
 +		foreach ( self::$lang_refs as $language => $locale )
 +		{
 +			if ( $target_language == $language )
 +			{
 +				if ( preg_match('#^(.+)\.(.+)$#', $locale, $match) )
 +				{
 +					$target_locale = $match[1];
 +				}
 +				else
 +				{
 +					$target_locale = $locale;
 +				}
 +				break;
 +			}
 +		}
 +		return $target_locale;
 +	}
 +	
 +	/**
 +	 * i18n::$lang_refs
 +	 * reference table to convert old and new way to name translation files.
 +	 * NOTE: this should be obsoleted as soon as possible.
 +	 * 
 +	 * @static
 +	 */
 +	static private $lang_refs = array(
 +		"english"		=> "en_Latn_US",
 +		"english-utf8"	=> "en_Latn_US.UTF-8",
 +		"bulgarian"	=> "bg_Cyrl_BG",
 +		"finnish"		=> "fi_Latn_FU",
 +		"catalan"		=> "ca_Latn_ES",
 +		"french"		=> "fr_Latn_FR",
 +		"russian"		=> "ru_Cyrl_RU",
 +		"chinese"		=> "zh_Hans_CN",
 +		"simchinese"	=> "zh_Hans_CN",
 +		"chineseb5"	=> "zh_Hant_TW",
 +		"traditional_chinese"	=>	"zh_Hant_TW",
 +		"galego"		=> "gl_Latn_ES",
 +		"german"		=> "de_Latn_DE",
 +		"korean-utf"	=> "ko_Kore_KR.UTF-8",
 +		"korean-euc-kr"	=> "ko_Kore_KR.EUC-KR",
 +		"slovak"		=> "sk_Latn_SK",
 +		"czech"		=> "cs_Latn_CZ",
 +		"hungarian"	=> "hu_Latn_HU",
 +		"latvian"		=> "lv_Latn_LV",
 +		"nederlands"	=> "nl_Latn_NL",
 +		"italiano"		=> "it_Latn_IT",
 +		"persian"		=> "fa_Arab_IR",
 +		"spanish"		=> "es_Latn_ES",
 +		"spanish-utf8"	=> "es_Latn_ES.UTF-8",
 +		"japanese-euc"	=> "ja_Jpan_JP.EUC-JP",
 +		"japanese-utf8"	=> "ja_Jpan_JP.UTF-8",
 +		"portuguese_brazil"	=> "pt_Latn_BR"
 +	);
 +}
++=======
+ <?php
+ /**
+  * i18n class for Nucleus CMS
+  * written by Takashi Sakamoto as of Feb 03, 2012
+  * 
+  * This includes wrapper functions of iconv and mbstring
+  * for multibyte processing and includes parameters related to locale.
+  * 
+  * 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-2011 The Nucleus Group
+  * @version $Id: i18n.php 1876 2012-06-17 07:33:00Z sakamocchi $
+  */
+ class i18n
+ {
+ 	static private $mode = FALSE;
+ 	
+ 	static private $current_charset = '';
+ 	static private $current_language = '';
+ 	static private $current_script = '';
+ 	static private $current_region = '';
+ 	
+ 	static private $locale_list = array();
+ 	static private $timezone = 'UTC';
+ 	
+ 	static private $forced_charset = '';
+ 	static private $forced_language = '';
+ 	static private $forced_script = '';
+ 	static private $forced_region = '';
+ 	
+ 	/**
+ 	 * i18n::init
+ 	 * Initializing i18n class
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$charset	character set
+ 	 * @return	boolean	
+ 	 */
+ 	static public function init($charset, $dir)
+ 	{
+ 		/* i18n is already initialized */
+ 		if ( self::$mode )
+ 		{
+ 			return TRUE;
+ 		}
+ 		
+ 		/* make locale list in this Nucleus CMS */
+ 		if ( ($handle = opendir($dir)) === FALSE )
+ 		{
+ 			return FALSE;
+ 		}
+ 		while ($filename = readdir($handle))
+ 		{
+ 			if (preg_match("#^(.+_.+_.+)\.{$charset}\.php$#", $filename, $matches) )
+ 			{
+ 				if ( !in_array($matches[1], self::$locale_list) )
+ 				{
+ 					self::$locale_list[] = $matches[1];
+ 				}
+ 			}
+ 		}
+ 		closedir($handle);
+ 		
+ 		/* set i18n backend and validate character set */
+ 		if ( extension_loaded('iconv') )
+ 		{
+ 			/* this is just for checking the charset. */
+ 			if ( iconv_set_encoding('internal_encoding', $charset)
+ 			 && iconv_set_encoding('output_encoding', $charset)
+ 			 && iconv_set_encoding('internal_encoding', $charset) )
+ 			{
+ 				self::$current_charset = $charset;
+ 				self::$mode = 'iconv';
+ 			}
+ 		}
+ 		else if ( extension_loaded('mbstring') )
+ 		{
+ 			/* this is just for checking the charset. */
+ 			if ( mb_http_output($charset)
+ 			 && mb_internal_encoding($charset)
+ 			 && mb_regex_encoding($charset) )
+ 			{
+ 				self::$current_charset = $charset;
+ 				self::$mode = 'mbstring';
+ 			}
+ 		}
+ 		
+ 		return TRUE;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::get_available_locale_list
+ 	 * return available locale list with current charset
+ 	 * 
+ 	 * @static
+ 	 * @param	void
+ 	 * @return	array	available locale list
+ 	 */
+ 	static public function get_available_locale_list()
+ 	{
+ 		return self::$locale_list;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::get_current_charset
+ 	 * return current charset
+ 	 * 
+ 	 * @static
+ 	 * @param	void
+ 	 * @return	string	$charset	current character set
+ 	 */
+ 	static public function get_current_charset()
+ 	{
+ 		return self::$current_charset;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::set_locale
+ 	 * Set current locale
+ 	 * 
+ 	 * NOTE:
+ 	 * naming rule is "$language_$script_$region.$charset.php", refer to RFC 5646.
+ 	 * @link http://www.ietf.org/rfc/rfc5646.txt
+ 	 * @see 2.  The Language Tag
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$locale
+ 	 * @return	bool	TRUE/FALSE
+ 	 * 
+ 	 */
+ 	static public function set_current_locale($locale)
+ 	{
+ 		if ( preg_match('#^(.+)_(.+)_(.+)$#', $locale, $match) )
+ 		{
+ 			self::$current_language = $match[1];
+ 			self::$current_script   = $match[2];
+ 			self::$current_region   = $match[3];
+ 			return TRUE;
+ 		}
+ 		return FALSE;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::get_locale
+ 	 * Get current locale
+ 	 * 
+ 	 * @static
+ 	 * @param	void
+ 	 * @return	$locale
+ 	 */
+ 	static public function get_current_locale()
+ 	{
+ 		$elements = array(self::$current_language, self::$current_script, self::$current_region);
+ 		return implode('_', $elements);
+ 	}
+ 	
+ 	/**
+ 	 * i18n::set_forced_locale()
+ 	 * Set forced locale
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$forced_locale
+ 	 * @return	bool	TRUE/FALSE
+ 	 * 
+ 	 */
+ 	static public function set_forced_locale($forced_locale)
+ 	{
+ 		if ( preg_match('#^(.+)_(.+)_(.+)$#', $forced_locale, $match) )
+ 		{
+ 			self::$forced_language	= $match[1];
+ 			self::$forced_script	= $match[2];
+ 			self::$forced_region	= $match[3];
+ 			return TRUE;
+ 		}
+ 		return FALSE;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::get_forced_locale
+ 	 * Get forced locale
+ 	 * 
+ 	 * @static
+ 	 * @param	void
+ 	 * @return	$forced_locale
+ 	 */
+ 	static public function get_forced_locale()
+ 	{
+ 		if ( !self::$forced_language )
+ 		{
+ 			return '';
+ 		}
+ 		
+ 		$elements = array(self::$forced_language, self::$forced_script, self::$forced_region);
+ 		return implode('_', $elements);
+ 	}
+ 	
+ 	/**
+ 	 * i18n::set_forced_charset
+ 	 * return forced charset
+ 	 * 
+ 	 * @static
+ 	 * @param	void	$charset	forced character set
+ 	 * @return	void
+ 	 */
+ 	static public function set_forced_charset($forced_charset)
+ 	{
+ 		self::$forced_charset = $forced_charset;
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::get_forced_charset
+ 	 * return forced charset
+ 	 * 
+ 	 * @static
+ 	 * @param	void
+ 	 * @return	string	$charset	forced character set
+ 	 */
+ 	static public function get_forced_charset()
+ 	{
+ 		return self::$forced_charset;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::confirm_default_date_timezone
+ 	 * to avoid E_NOTICE or E_WARNING generated when every calling to a date/time function.
+ 	 * 
+ 	 * NOTE:
+ 	 * Some private servers are lack of its timezone setting
+ 	 * http://www.php.net/manual/en/function.date-default-timezone-set.php
+ 	 * 
+ 	 * @static
+ 	 * @param	void
+ 	 * @return	void
+ 	 */
+ 	static public function confirm_default_date_timezone()
+ 	{
+ 		if ( function_exists('date_default_timezone_get') 
+ 		 && FALSE !== ($timezone = @date_default_timezone_get()))
+ 		{
+ 			self::$timezone = $timezone;
+ 		}
+ 		if (function_exists('date_default_timezone_set')) {
+ 			 @date_default_timezone_set(self::$timezone);
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::get_current_date_timezone()
+ 	 * get current timezone
+ 	 * 
+ 	 * @static
+ 	 * @param	void
+ 	 * @return	$timezone
+ 	 */
+ 	static public function get_date_timezone()
+ 	{
+ 		return self::$timezone;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::convert
+ 	 * character set converter
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$string	target string binary
+ 	 * @param	string	$from	original character set encoding
+ 	 * @param	string	$to	target character set encoding
+ 	 * @return	string	converted string
+ 	 */
+ 	static public function convert($string, $from, $to='')
+ 	{
+ 		if ( $to == '' )
+ 		{
+ 			$to = self::$current_charset;
+ 		}
+ 		
+ 		if ( $from == $to )
+ 		{
+ 			/* do nothing */
+ 		}
+ 		else if ( self::$mode == 'iconv' )
+ 		{
+ 			$string = iconv($from, $to.'//TRANSLIT', $string);
+ 		}
+ 		else if ( self::$mode == 'mbstring' )
+ 		{
+ 			$string = mb_convert_encoding($string, $to, $from);
+ 		}
+ 		return (string) $string;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::convert_handler
+ 	 * callable handler for character set converter
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$string	target string binary
+ 	 * @return	void
+ 	 */
+ 	static public function convert_handler($string)
+ 	{
+ 		return self::convert($string, self::$current_charset, self::$forced_charset);
+ 	}
+ 	
+ 	/**
+ 	 * i18n::convert_array
+ 	 * recursively converting array
+ 	 * 
+ 	 * @static
+ 	 * @param	array	$array	array to convert
+ 	 * @return	void
+ 	 */
+ 	static public function convert_array($array, $from, $to='')
+ 	{
+ 		if ( !is_array($array) )
+ 		{
+ 			$array = self::convert($array, $from, $to);
+ 		}
+ 		else
+ 		{
+ 			foreach ( $array as $key => $value )
+ 			{
+ 				if ( !is_array($value) )
+ 				{
+ 					$array[$key] = self::convert($value, $from, $to);
+ 				}
+ 				else
+ 				{
+ 					self::convert_array($array[$key]);
+ 				}
+ 			}
+ 		}
+ 		
+ 		return $array;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::strlen
+ 	 * strlen wrapper
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$string	target string
+ 	 * @return	integer	the number of letters
+ 	 */
+ 	static public function strlen($string)
+ 	{
+ 		$length = 0;
+ 		if ( self::$mode == 'iconv' )
+ 		{
+ 			$length = iconv_strlen($string, self::$current_charset);
+ 		}
+ 		else if ( self::$mode == 'mbstring' )
+ 		{
+ 			$length = mb_strlen($string, self::$current_charset);
+ 		}
+ 		else
+ 		{
+ 			$length = strlen($string);
+ 		}
+ 		return (integer) $length;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::strpos
+ 	 * strpos wrapper
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$haystack	string to search
+ 	 * @param	string	$needle	string for search
+ 	 * @param	integer	$offset	the position from which the search should be performed. 
+ 	 * @return	integer/FALSE	the numeric position of the first occurrence of needle in haystack
+ 	 */
+ 	static public function strpos($haystack, $needle, $offset=0)
+ 	{
+ 		$position = 0;
+ 		if ( self::$mode == 'iconv' )
+ 		{
+ 			$position = iconv_strpos($haystack, $needle, $offset, self::$current_charset);
+ 		}
+ 		else if ( self::$mode == 'mbstring' )
+ 		{
+ 			$position = mb_strpos($haystack, $needle, $offset, self::$current_charset);
+ 		}
+ 		else
+ 		{
+ 			$position = strpos($haystack, $needle, $offset);
+ 		}
+ 		
+ 		if ( $position !== FALSE)
+ 		{
+ 			$position = (integer) $position;
+ 		}
+ 		return $position;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::strrpos
+ 	 * strrpos wrapper
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$haystack	string to search
+ 	 * @param	string	$needle	string for search
+ 	 * @return	integer/FALSE	the numeric position of the last occurrence of needle in haystack
+ 	 */
+ 	static public function strrpos ($haystack, $needle)
+ 	{
+ 		$position = 0;
+ 		if ( self::$mode == 'iconv' )
+ 		{
+ 			$position = iconv_strrpos($haystack, $needle, self::$current_charset);
+ 		}
+ 		else if ( self::$mode == 'mbstring' )
+ 		{
+ 			$position = mb_strrpos($haystack, $needle, 0, self::$current_charset);
+ 		}
+ 		else
+ 		{
+ 			$position = strrpos($haystack, $needle, 0);
+ 		}
+ 		
+ 		if ( $position !== FALSE)
+ 		{
+ 			$position = (integer) $position;
+ 		}
+ 		return $position;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::substr
+ 	 * substr wrapper
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$string	string to be cut
+ 	 * @param	string	$start	the position of starting
+ 	 * @param	integer	$length	the length to be cut
+ 	 * @return	string	the extracted part of string
+ 	 */
+ 	static public function substr($string, $start, $length=0)
+ 	{
+ 		$return = '';
+ 		
+ 		if ( $length == 0 )
+ 		{
+ 			$length = self::strlen($string) - $start;
+ 		}
+ 		
+ 		if ( self::$mode == 'iconv' )
+ 		{
+ 			$return = iconv_substr($string, $start, $length, self::$current_charset);
+ 		}
+ 		else if ( self::$mode == 'mbstring' )
+ 		{
+ 			$return = mb_substr($string, $start, $length, self::$current_charset);
+ 		}
+ 		else
+ 		{
+ 			$return = strrpos($string, $start, $length);
+ 		}
+ 		return (string) $return;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::strftime
+ 	 * strftime function based on multibyte processing
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$format	format with singlebyte or multibyte
+ 	 * @param	timestamp	$timestamp	UNIX timestamp
+ 	 * @return	string	formatted timestamp
+ 	 */
+ 	static public function strftime($format, $timestamp='')
+ 	{
+ 		return preg_replace_callback('/(%[a-z%])/i',
+ 			create_function('$matches', 'return strftime($matches[1], ' . intval($timestamp) . ');'),
+ 			$format
+ 		);
+ 		}
+ 		
+ 	/**
+ 	 * i18n::formatted_datetime()
+ 	 * return formatted datetime string
+ 	 * 
+ 	 * Date and Time Formats
+ 	 * @link	http://www.w3.org/TR/NOTE-datetime
+ 	 * 
+ 	 * Working with Time Zones
+ 	 * @link	http://www.w3.org/TR/timezone/
+ 	 * 
+ 	 * @param	String	$format	time expression format
+ 	 * @param	String	$timestamp	UNIX timestamp
+ 	 * @param	Integer	$offset	timestamp offset
+ 	 * @return	String	formatted datetime
+ 	 */
+ 	static public function formatted_datetime($format, $timestamp, $offset=0)
+ 	{
+ 		$suffix = '';
+ 		$string = '';
+ 		
+ 		switch ( $format )
+ 		{
+ 			case 'mysql':
+ 				/*
+ 				 * MySQL 5.0 Reference Manual
+ 				 *  10.3.1. The DATE, DATETIME, and TIMESTAMP Types
+ 				 *   http://dev.mysql.com/doc/refman/5.0/en/datetime.html
+ 				 */
+ 				$timestamp += $offset;
+ 				$format = '%Y-%m-%d %H:%M:%S';
+ 				$suffix ='';
+ 				break;
+ 			
+ 			case 'rfc822':
+ 				/*
+ 				 * RFC 822: STANDARD FOR THE FORMAT OF ARPA INTERNET TEXT MESSAGES
+ 				 *  5.  DATE AND TIME SPECIFICATION
+ 				 *   http://www.ietf.org/rfc/rfc0822.txt
+ 				 */
+ 				$format = '%a, %d %m %y %H:%M:%S ';
+ 				if ( $offset < 0 )
+ 				{
+ 					$suffix = '-';
+ 					$offset = -$offset;
+ 				}
+ 				else
+ 				{
+ 					$suffix = '+';
+ 				}
+ 				
+ 				$suffix .= sprintf("%02d%02d", floor($offset / 3600), round(($offset % 3600) / 60) );
+ 				break;
+ 			case 'rfc822GMT':
+ 				/*
+ 				 * RFC 822: STANDARD FOR THE FORMAT OF ARPA INTERNET TEXT MESSAGES
+ 				 *  5.  DATE AND TIME SPECIFICATION
+ 				 *   http://www.ietf.org/rfc/rfc0822.txt
+ 				 */
+ 				$format = '%a, %d %m %y %H:%M:%S ';
+ 				$timestamp -= $offset;
+ 				$suffix = 'GMT';
+ 				break;
+ 			case 'iso8601':
+ 			case 'rfc3339':
+ 				/*
+ 				 * RFC3339: Date and Time on the Internet: Timestamps
+ 				 *  5. Date and Time format
+ 				 *   http://www.ietf.org/rfc/rfc3339.txt
+ 				 */
+ 				$format = '%Y-%m-%dT%H:%M:%S';
+ 				if ( $offset < 0 )
+ 				{
+ 					$suffix = '-';
+ 					$offset = -$offset;
+ 				}
+ 				else
+ 				{
+ 					$suffix = '+';
+ 				}
+ 				$suffix .= sprintf("%02d:%02d", floor($offset / 3600), round(($offset % 3600) / 60) );
+ 				break;
+ 			case 'utc':
+ 			case 'iso8601UTC':
+ 			case 'rfc3339UTC':
+ 				/*
+ 				 * RFC3339: Date and Time on the Internet: Timestamps
+ 				 *  5. Date and Time format
+ 				 *   http://www.ietf.org/rfc/rfc3339.txt
+ 				 */
+ 				$timestamp -= $offset;
+ 				$format = '%Y-%m-%dT%H:%M:%SZ';
+ 				$suffix = '';
+ 				break;
+ 			case '':
+ 				$format = '%X %x';
+ 				$offset = '';
+ 				break;
+ 			default:
+ 				$suffix = '';
+ 				break;
+ 		}
+ 		return i18n::strftime($format, $timestamp) . $suffix;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::convert_locale_to_old_language_file_name()
+ 	 * NOTE: this should be obsoleted near future.
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$target_locale	locale name as language_script_region
+ 	 * @return	string	old translation file name
+ 	 */
+ 	static public function convert_locale_to_old_language_file_name($target_locale)
+ 	{
+ 		$target_language = '';
+ 		foreach ( self::$lang_refs as $language => $locale )
+ 		{
+ 			if ( preg_match('#-#', $language) )
+ 			{
+ 				if ( $target_locale . '.' . self::$current_charset == $locale )
+ 				{
+ 					$target_language = $language;
+ 					break;
+ 				}
+ 			}
+ 			else if ( $target_locale == $locale )
+ 			{
+ 				$target_language = $language;
+ 			}
+ 		}
+ 		return $target_language;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::convert_old_language_file_name_to_locale()
+ 	 * NOTE: this should be obsoleted near future.
+ 	 * 
+ 	 * @static
+ 	 * @param	string	$target_language	old translation file name
+ 	 * @return	string	locale name as language_script_region
+ 	 */
+ 	static public function convert_old_language_file_name_to_locale($target_language)
+ 	{
+ 		$target_locale = '';
+ 		foreach ( self::$lang_refs as $language => $locale )
+ 		{
+ 			if ( $target_language == $language )
+ 			{
+ 				if ( preg_match('#^(.+)\.(.+)$#', $locale, $match) )
+ 				{
+ 					$target_locale = $match[1];
+ 				}
+ 				else
+ 				{
+ 					$target_locale = $locale;
+ 				}
+ 				break;
+ 			}
+ 		}
+ 		return $target_locale;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::$lang_refs
+ 	 * reference table to convert old and new way to name translation files.
+ 	 * NOTE: this should be obsoleted as soon as possible.
+ 	 * 
+ 	 * @static
+ 	 */
+ 	static private $lang_refs = array(
+ 		"english"		=> "en_Latn_US",
+ 		"english-utf8"	=> "en_Latn_US.UTF-8",
+ 		"bulgarian"	=> "bg_Cyrl_BG",
+ 		"finnish"		=> "fi_Latn_FI",
+ 		"catalan"		=> "ca_Latn_ES",
+ 		"french"		=> "fr_Latn_FR",
+ 		"russian"		=> "ru_Cyrl_RU",
+ 		"chinese"		=> "zh_Hans_CN",
+ 		"simchinese"	=> "zh_Hans_CN",
+ 		"chineseb5"	=> "zh_Hant_TW",
+ 		"traditional_chinese"	=>	"zh_Hant_TW",
+ 		"galego"		=> "gl_Latn_ES",
+ 		"german"		=> "de_Latn_DE",
+ 		"korean-utf"	=> "ko_Kore_KR.UTF-8",
+ 		"korean-euc-kr"	=> "ko_Kore_KR.EUC-KR",
+ 		"slovak"		=> "sk_Latn_SK",
+ 		"czech"		=> "cs_Latn_CZ",
+ 		"hungarian"	=> "hu_Latn_HU",
+ 		"latvian"		=> "lv_Latn_LV",
+ 		"nederlands"	=> "nl_Latn_NL",
+ 		"italiano"		=> "it_Latn_IT",
+ 		"persian"		=> "fa_Arab_IR",
+ 		"spanish"		=> "es_Latn_ES",
+ 		"spanish-utf8"	=> "es_Latn_ES.UTF-8",
+ 		"japanese-euc"	=> "ja_Jpan_JP.EUC-JP",
+ 		"japanese-utf8"	=> "ja_Jpan_JP.UTF-8",
+ 		"portuguese_brazil"	=> "pt_Latn_BR"
+ 	);
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/libs/showlist.php
index 8fcbccc,bc687f2..a0eaba9
--- a/nucleus/libs/showlist.php
+++ b/nucleus/libs/showlist.php
@@@ -14,264 -14,505 +14,764 @@@
   *
   * @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 = '';
+ 	
+ 	/* count */
+ 	if ( is_string($query) )
+ 	{
+ 		$resource = DB::getResult($query);
+ 	}
+ 	else
+ 	{
+ 		$resource = $query;
+ 	}
+ 	
+ 	/* HEAD */
+ 	$contents .= call_user_func("listplug_{$type}", $vars, 'HEAD', $template_name);
+ 	
+ 	/* BODY */
+ 	foreach ( $resource as $row )
+ 	{
+ 		$vars['current'] = $row;
+ 		$contents .= call_user_func("listplug_{$type}", $vars, 'BODY', $template_name);
+ 	}
+ 	
+ 	/* FOOT */
+ 	$contents .= call_user_func("listplug_{$type}", $vars, 'FOOT', $template_name);
+ 	
+ 	/* close SQL resource */
+ 	if ( is_string($query) )
+ 	{
+ 		$resource->closeCursor();
+ 	}
+ 	
+ 	return $contents;
+ }
+ 
+ function listplug_select($vars, $type, $template_name = '')
+ {
+ 	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_SELECT_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_SELECT_HEAD']) )
+ 			{
+ 				$template = "<select name=\"<%name%>\" tabindex=\"<%tabindex%>\" <%javascript%>>\n"
+ 				          . "<%extraoption%>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_SELECT_HEAD'];
+ 			}
+ 			$data = array(
+ 				'name'			=> $vars['name'],
+ 				'tabindex'		=> $vars['tabindex'],
+ 				'javascript'	=> !array_key_exists('javascript', $vars) ? '' : $vars['javascript'],
+ 				'extraoption'	=> !array_key_exists('extra', $vars) ? '' : "<option value=\"\">{$vars['extra']}</option>"
+ 			);
+ 			break;
+ 		case 'BODY':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_SELECT_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_SELECT_BODY']) )
+ 			{
+ 				$template = "<option value=\"<%value%>\" <%selected%> title=\"<%title%>\"><%option%></option>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_SELECT_BODY'];
+ 			}
+ 			$data = array(
+ 				'value'		=> Entity::hsc($current['value']),
+ 				'selected'	=> ($vars['selected'] == $current['value']) ? 'selected="selected"' : '',
+ 			);
+ 			if ( array_key_exists('shorten', $vars) && $vars['shorten'] > 0 )
+ 			{
+ 				$data['title'] = Entity::hsc($current['text']);
+ 				$data['option'] = Entity::hsc(Entity::shorten($current['text'], $vars['shorten'], $vars['shortenel']));
+ 			}
+ 			else
+ 			{
+ 				$data['title'] = '';
+ 			}
+ 			$data['option'] = Entity::hsc($current['text']);
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_SELECT_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_SELECT_FOOT']) )
+ 			{
+ 				$template = "</select>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_SELECT_FOOT'];
+ 			}
+ 			$data = array();
+ 			break;
+ 	}
+ 	
+ 	return Template::fill($template, $data);
+ }
+ 
+ function listplug_table($vars, $type, $template_name = '')
+ {
+ 	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_HEAD']) )
+ 			{
+ 				$template = "<table frame=\"box\" rules=\"all\" summary=\"{$vars['content']}\">\n"
+ 				          . "<thead>\n"
+ 				          . "<tr>\n"
+ 				          . "<%typehead%>\n"
+ 				          . "</tr>\n"
+ 				          . "</thead>\n"
+ 				          . "<tbody>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_HEAD'];
+ 			}
+ 			$data = array(
+ 				'summary'	=>	$vars['content'],
+ 				'typehead' => call_user_func("listplug_table_" . $vars['content'] , $vars, 'HEAD', $template_name)
+ 			);
+ 			break;
+ 		case 'BODY':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BODY']) )
+ 			{
+ 				$template = "<tr onmouseover=\"focusRow(this);\" onmouseout=\"blurRow(this);\">\n"
+ 				          . "<%typebody%>\n"
+ 				          . "</tr>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_BODY'];
+ 			}
+ 			// tabletype specific thingies
+ 			$data = array(
+ 				'typebody' => call_user_func("listplug_table_" . $vars['content'] , $vars, 'BODY', $template_name)
+ 			);
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_FOOT']) )
+ 			{
+ 				$template = "<%typefoot%>\n"
+ 				          . "</tbody>\n"
+ 				          . "</table>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_FOOT'];
+ 			}
+ 			// tabletype specific thingies
+ 			$data = array(
+ 				'typefoot' => call_user_func("listplug_table_" . $vars['content'] , $vars, 'FOOT', $template_name)
+ 			);
+ 			break;
+ 	}
+ 	
+ 	return Template::fill($template, $data);
+ }
+ 
+ function listplug_table_memberlist($vars, $type, $template_name = '')
+ {
+ 	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD']) )
+ 			{
+ 				$template = "<th><%colmembername%></th>\n"
+ 				          . "<th><%colmemberrname%></th>\n"
+ 				          . "<th><%colmemberurl%></th>\n"
+ 				          . "<th><%colmemberadmin%><%helplink(superadmin)%></th>\n"
+ 				          . "<th><%colmemberlogin%><%helplink(canlogin)%></th>\n"
+ 				          . "<th colspan=\"2\"><%colactions%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_MEMBLIST_HEAD'];
+ 			}
+ 			$data = array(
+ 				'colmembername'		=> _LIST_MEMBER_NAME,
+ 				'colmemberrname'	=> _LIST_MEMBER_RNAME,
+ 				'colmemberurl'		=> _LIST_MEMBER_URL,
+ 				'colmemberadmin'	=> _LIST_MEMBER_ADMIN,
+ 				'colmemberlogin'	=> _LIST_MEMBER_LOGIN,
+ 				'colactions'		=> _LISTS_ACTIONS,
+ 			);
+ 			break;
+ 		case 'BODY':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY']) )
+ 			{
+ 				$template = "<td>\n"
+ 				          . "<input type=\"checkbox\" id=\"batch<%id%>\" name=\"batch[<%id%>]\" value=\"<%memberid%>\" />\n"
+ 				          . "<label for=\"batch<%id%>\">\n"
+ 				          . "<a href=\"mailto:<%mailaddress%>\" tabindex=\"<%tabindex%>\"><%name%></a>\n"
+ 				          . "</label>\n</td>\n"
+ 				          . "<td><%realname%></td>\n"
+ 				          . "<td><a href=\"<%url%>\" tabindex=\"<%tabindex%>\"><%url%></a></td>\n"
+ 				          . "<td><%admin%></td>\n"
+ 				          . "<td><%login%></td>\n"
+ 				          . "<td><a href=\"index.php?action=memberedit&amp;memberid=<%memberid%>\" tabindex=\"<%tabindex%>\"><%editbtn%></a></td>\n"
+ 				          . "<td><a href=\"index.php?action=memberdelete&amp;memberid=<%memberid%>\" tabindex=\"<%tabindex%>\"><%deletebtn%></a></td>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_MEMBLIST_BODY'];
+ 			}
+ 			$data = array(
+ 				'id'			=> listplug_nextBatchId(),
+ 				'memberid'		=> $current['mnumber'],
+ 				'mailaddress'	=> Entity::hsc($current['memail']),
+ 				'tabindex'		=> $vars['tabindex'],
+ 				'name'			=> Entity::hsc($current['mname']),
+ 				'realname'		=> Entity::hsc($current['mrealname']),
+ 				'url'			=> Entity::hsc($current['murl']),
+ 				'admin'			=> $current['madmin'] ? _YES : _NO,
+ 				'login'			=> $current['mcanlogin'] ? _YES : _NO,
+ 				'editbtn'		=> _LISTS_EDIT,
+ 				'deletebtn'		=> _LISTS_DELETE,
+ 			);
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT']) )
+ 			{
+ 				$template = "";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_MEMBLIST_FOOT'];
+ 			}
+ 			$data = array();
+ 			break;
+ 	}
+ 	return Template::fill($template, $data);
+ }
+ 
+ function listplug_table_teamlist($vars, $type, $template_name = '')
+ {
+ 	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD']) )
+ 			{
+ 				$template = "<th><%colmembername%></th>\n"
+ 				          . "<th><%colmemberrname%></th>\n"
+ 				          . "<th><%colteamadmin%><%helplink(teamadmin)%></th>\n"
+ 				          . "<th colspan=\"2\"><%colactions%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_TEAMLIST_HEAD'];
+ 			}
+ 			$data = array(
+ 				'colmembername'		=> _LIST_MEMBER_NAME,
+ 				'colmemberrname'	=> _LIST_MEMBER_RNAME,
+ 				'colteamadmin'		=> _LIST_TEAM_ADMIN,
+ 				'colactions'		=> _LISTS_ACTIONS,
+ 			);
+ 			break;
+ 		case 'BODY':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY']) )
+ 			{
+ 				$template = "<td>\n"
+ 				          . "<input type=\"checkbox\" id=\"batch<%id%>\" name=\"batch[<%id%>]\" value=\"<%memberid%>\" />\n"
+ 				          . "<label for=\"batch<%id%>\">\n"
+ 				          . "<a href=\"mailto:<%mailaddress%>\" tabindex=\"<%tabindex%>\"><%name%></a>\n"
+ 				          . "</label>\n</td>\n"
+ 				          . "<td><%realname%></td>\n"
+ 				          . "<td><%admin%></td>\n"
+ 				          . "<td><a href=\"index.php?action=teamdelete&amp;memberid=<%memberid%>&amp;blogid=<%blogid%>\" tabindex=\"<%tabindex%>\"><%deletebtn%></a></td>\n"
+ 				          . "<td><a href=\"<%chadminurl%>\" tabindex=\"<%tabindex%>\"><%chadminbtn%></a></td>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_TEAMLIST_BODY'];
+ 			}
+ 			$url  = 'index.php?action=teamchangeadmin&memberid=' . intval($current['tmember']) . '&blogid=' . intval($current['tblog']);
+ 			$url  = $manager->addTicketToUrl($url);
+ 			$data = array(
+ 					'id'			=> listplug_nextBatchId(),
+ 					'memberid'		=> $current['tmember'],
+ 					'mailaddress'	=> Entity::hsc($current['memail']),
+ 					'tabindex'		=> $vars['tabindex'],
+ 					'name'			=> Entity::hsc($current['mname']),
+ 					'realname'		=> Entity::hsc($current['mrealname']),
+ 					'admin'			=> ($current['tadmin'] ? _YES : _NO),
+ 					'blogid'		=> $current['tblog'],
+ 					'deletebtn'		=> '<%text(_LISTS_DELETE)%>',
+ 					'chadminurl'	=> Entity::hsc($url),
+ 					'chadminbtn'	=> '<%text(_LIST_TEAM_CHADMIN)%>'
+ 			);
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT']) )
+ 			{
+ 				$template = "";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_TEAMLIST_FOOT'];
+ 			}
+ 			$data = array();
+ 			break;
+ 	}
+ 	return Template::fill($template, $data);
+ }
+ 
+ function listplug_table_pluginlist($vars, $type, $template_name = '')
+ {
+ 	static $plugins = array();
+ 	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD']) )
+ 			{
+ 				$template = "<th><%colinfo%></th>\n"
+ 				          . "<th><%coldesc%></th>\n"
+ 				          . "<th colspan=\"2\"><%colactions%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HEAD'];
+ 			}
+ 			$data = array(
+ 				'colinfo'    => _LISTS_INFO,
+ 				'coldesc'    => _LISTS_DESC,
+ 				'colactions' => _LISTS_ACTIONS,
+ 			);
+ 			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"
+ 					          . "<strong><%plugname%></strong><br />\n"
+ 					          . "<%autherlabel%> <%plugauther%><br />\n"
+ 					          . "<%versionlabel%> <%plugversion%><br />\n"
+ 					          . "<%pluggeturl%><br />\n"
+ 					          . "</td>\n"
+ 					          . "<td>\n"
+ 					          . "<%desclabel%><br /><%plugdesc%>\n"
+ 					          . "<%eventlist%>\n"
+ 					          . "<%needupdate%>\n"
+ 					          . "<%dependlist%>\n"
+ 					          . "<%depreqlist%>\n"
+ 					          . "</td>\n";
+ 				}
+ 				else
+ 				{
+ 					$template = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY'];
+ 				}
+ 				$data = array(
+ 					'plugname'		=> Entity::hsc($plug->getName()),
+ 					'autherlabel'	=> _LIST_PLUGS_AUTHOR,
+ 					'plugauther'	=> Entity::hsc($plug->getAuthor()),
+ 					'versionlabel'	=> _LIST_PLUGS_VER,
+ 					'plugversion'	=> Entity::hsc($plug->getVersion()),
+ 					'tabindex'		=> $vars['tabindex'],
+ 					'desclabel'		=> _LIST_PLUGS_DESC,
+ 					'plugdesc'		=> Entity::hen($plug->getDescription()),
+ 				);
+ 				if ( $plug->getURL() )
+ 				{
+ 					if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL']) )
+ 					{
+ 						$subTpl = "<a href=\"<%plugurl%>\" tabindex=\"<%tabindex%>\"><%plugsite%></a>";
+ 					}
+ 					else
+ 					{
+ 						$subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL'];
+ 					}
+ 					$subData = array(
+ 						'plugurl'	=> Entity::hsc($plug->getURL()),
+ 						'tabindex'	=> $vars['tabindex'],
+ 						'plugsite'	=> _LIST_PLUGS_SITE,
+ 					);
+ 					$data['pluggeturl'] = Template::fill($subTpl, $subData);
+ 				}
+ 				else
+ 				{
+ 					$data['pluggeturl'] = '';
+ 				}
+ 				if ( count($plug->getEventList()) > 0 )
+ 				{
+ 					if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST']) )
+ 					{
+ 						$subTpl = "<br /><br /><%evntlstlbl%><br /><%eventlist%>";
+ 					}
+ 					else
+ 					{
+ 						$subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST'];
+ 					}
+ 					$subData = array(
+ 						'evntlstlbl'	=> _LIST_PLUGS_SUBS,
+ 						'eventlist'		=> Entity::hsc(implode(', ', $plug->getEventList())),
+ 					);
+ 					$data['eventlist'] = Template::fill($subTpl, $subData);
+ 				}
+ 				else
+ 				{
+ 					$data['eventlist'] = '';
+ 				}
+ 				if ( !$plug->subscribtionListIsUptodate() )
+ 				{
+ 					if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE']) )
+ 					{
+ 						$subTpl = "<br /><br /><strong><%updatealert%></strong>";
+ 					}
+ 					else
+ 					{
+ 						$subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE'];
+ 					}
+ 					$subData = array(
+ 						'updatealert' => _LIST_PLUG_SUBS_NEEDUPDATE,
+ 					);
+ 					$data['needupdate'] = Template::fill($subTpl, $subData);
+ 				}
+ 				else
+ 				{
+ 					$data['needupdate'] = '';
+ 				}
+ 				if ( count($plug->getPluginDep() ) > 0)
+ 				{
+ 					if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND']) )
+ 					{
+ 						$subTpl = "<br /><br /><%deplistlbl%><br /><%dependlist%>";
+ 					}
+ 					else
+ 					{
+ 						$subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND'];
+ 					}
+ 					$subData = array(
+ 						'deplistlbl' => _LIST_PLUGS_DEP,
+ 						'dependlist' => Entity::hsc(implode(', ', $plug->getPluginDep())),
+ 					);
+ 					$data['dependlist'] = Template::fill($subTpl, $subData);
+ 				}
+ 				else
+ 				{
+ 					$data['dependlist'] = '';
+ 				}
+ 				/* check dependency */
+ 				if ( empty($plugins) )
+ 				{
+ 					$plugins = DB::getResult('SELECT pfile FROM ' . sql_table('plugin'));
+ 				}
+ 				$req = array();
+ 				foreach ( $plugins as $plugin )
+ 				{
+ 					$preq =& $manager->getPlugin($plugin['pfile']);
++>>>>>>> skinnable-master
  					if ( $preq )
  					{
  						$depList = $preq->getPluginDep();
@@@ -279,7 -520,7 +779,11 @@@
  						{
  							if ( $current['pfile'] == $depName )
  							{
++<<<<<<< HEAD
 +								$req[] = $row['pfile'];
++=======
+ 								$req[] = $plugin['pfile'];
++>>>>>>> skinnable-master
  							}
  						}
  					}
@@@ -287,681 -528,1937 +791,2596 @@@
  				
  				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)
 +{
- 	$varname = "plugoption[{$current['oid']}][{$current['contextid']}]";
- 	
- 	// retreive the optionmeta
- 	$meta = NucleusPlugin::getOptionMeta($current['typeinfo']);
- 	
- 	// only if it is not a hidden option write the controls to the page
- 	if ( in_array('access', $meta) && $meta['access'] == 'hidden' )
- 	{
- 		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);
++=======
+ 					if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ']) )
+ 					{
+ 						$subTpl = "<br /><br /><%deprlstlbl%><br /><%depreqlist%>";
+ 					}
+ 					else
+ 					{
+ 						$subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ'];
+ 					}
+ 					$subData = array(
+ 						'deprlstlbl' => _LIST_PLUGS_DEPREQ,
+ 						'depreqlist' => Entity::hsc(implode(', ', $req)),
+ 					);
+ 					$data['depreqlist'] = Template::fill($subTpl, $subData);
+ 				}
+ 				else
+ 				{
+ 					$data['depreqlist'] = '';
+ 				}
+ 			}
+ 			else
+ 			{
+ 				if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE']) )
+ 				{
+ 					$template = "<td colspan=\"2\"><%noplugalert%></td>\n";
+ 				}
+ 				else
+ 				{
+ 					$template = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE'];
+ 				}
+ 				$data = array(
+ 					'noplugalert' => sprintf(_PLUGINFILE_COULDNT_BELOADED, Entity::hsc($current['pfile'])),
+ 				);
+ 			}
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN']) )
+ 			{
+ 				$template .= "<td>\n"
+ 				           . "<a href=\"<%actionupurl%>\" tabindex=\"<%tabindex%>\"><%actionuptxt%></a><br />\n"
+ 				           . "<a href=\"<%actiondownurl%>\" tabindex=\"<%tabindex%>\"><%actiondowntxt%></a><br />\n"
+ 				           . "<a href=\"<%actuninsturl%>\" tabindex=\"<%tabindex%>\"><%actuninsttxt%></a><br />"
+ 				           . "<%plugadminurl%>\n"
+ 				           . "<%plughelpurl%>\n"
+ 				           . "<%plugoptsetting%>\n"
+ 				           . "</td>\n";
+ 			}
+ 			else
+ 			{
+ 				$template .= $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN'];
+ 			}
+ 			
+ 			$baseUrl	= 'index.php?plugid=' . $current['pid'] . '&action=';
+ 			$upUrl		= $manager->addTicketToUrl($baseUrl . 'pluginup');
+ 			$downUrl	= $manager->addTicketToUrl($baseUrl . 'plugindown');
+ 			
+ 			$data['actionuptxt']	= _LIST_PLUGS_UP;
+ 			$data['actionupurl']	= Entity::hsc($upUrl);
+ 			$data['actiondowntxt']	= _LIST_PLUGS_DOWN;
+ 			$data['actiondownurl']	= Entity::hsc($downUrl);
+ 			$data['actuninsttxt']	= _LIST_PLUGS_UNINSTALL;
+ 			$data['actuninsturl']	= 'index.php?action=plugindelete&amp;plugid=' . $current['pid'];
+ 			
+ 			if ( $plug && ($plug->hasAdminArea() > 0) )
+ 			{
+ 				if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN']) )
+ 				{
+ 					$subTpl = "<a href=\"<%actadminurl%>\" tabindex=\"<%tabindex%>\"><%actadmintxt%></a><br />\n";
+ 				}
+ 				else
+ 				{
+ 					$subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN'];
+ 				}
+ 				$subData = array(
+ 					'actadminurl'	=> Entity::hsc($plug->getAdminURL()),
+ 					'tabindex'		=> $vars['tabindex'],
+ 					'actadmintxt'	=> _LIST_PLUGS_ADMIN,
+ 				);
+ 				$data['plugadminurl'] = Template::fill($subTpl, $subData);
+ 			}
+ 			else
+ 			{
+ 				$data['plugadminurl'] = '';
+ 			}
+ 			if ( $plug && ($plug->supportsFeature('HelpPage') > 0) )
+ 			{
+ 				if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP']) )
+ 				{
+ 					$subTpl = "<a href=\"<%acthelpurl%>\" tabindex=\"<%tabindex%>\"><%acthelptxt%></a><br />\n";
+ 				}
+ 				else
+ 				{
+ 					$subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP'];
+ 				}
+ 				$subData = array(
+ 					'acthelpurl'	=> 'index.php?action=pluginhelp&amp;plugid=' . $current['pid'],
+ 					'tabindex'		=> $vars['tabindex'],
+ 					'acthelptxt'	=> _LIST_PLUGS_HELP,
+ 				);
+ 				$data['plughelpurl'] = Template::fill($subTpl, $subData);
+ 			}
+ 			else
+ 			{
+ 				$data['plughelpurl'] = '';
+ 			}
+ 			$optQuery = 'SELECT '
+ 			          . '    COUNT(*) AS result '
+ 			          . 'FROM '
+ 			          .      sql_table('plugin_option_desc') . ' '
+ 			          . 'WHERE '
+ 			          . '    ocontext = "global" '
+ 			          . 'AND opid     = %d';
+ 			$pOptions = DB::getValue(sprintf($optQuery, $current['pid']));
+ 			if ( $pOptions > 0 )
+ 			{
+ 				if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL']) )
+ 				{
+ 					$subTpl = "<a href=\"<%actoptionurl%>\" tabindex=\"<%tabindex%>\"><%actoptiontxt%></a>\n";
+ 				}
+ 				else
+ 				{
+ 					$subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL'];
+ 				}
+ 				$subData = array(
+ 					'actoptionurl'	=> 'index.php?action=pluginoptions&amp;plugid=' . $current['pid'],
+ 					'tabindex'		=> $vars['tabindex'],
+ 					'actoptiontxt'	=> _LIST_PLUGS_OPTIONS,
+ 				);
+ 				$data['plugoptsetting'] = Template::fill($subTpl, $subData);
+ 			}
+ 			else
+ 			{
+ 				$data['plugoptsetting'] = '';
+ 			}
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT']) )
+ 			{
+ 				$template = "";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_PLUGLIST_FOOT'];
+ 			}
+ 			$data = array();
+ 			break;
+ 	}
+ 	return Template::fill($template, $data);
+ }
+ 
+ function listplug_table_plugoptionlist($vars, $type, $template_name = '')
+ {
+ 	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD']) )
+ 			{
+ 				$template = "<th><%colinfo%></th>\n"
+ 				          . "<th><%colvalue%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_POPTLIST_HEAD'];
+ 			}
+ 			$data = array(
+ 				'colinfo'	=> _LISTS_INFO,
+ 				'colvalue'	=> _LISTS_VALUE,
+ 			);
+ 			break;
+ 		case 'BODY':
+ 			$current = $vars['current'];
+ 			$template = listplug_plugOptionRow($current, $template_name);
+ 			$data = array();
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT']) )
+ 			{
+ 				$template = "<tr>\n"
+ 				          . "<th colspan=\"2\"><%savetext%></th>\n"
+ 				          . "</tr>\n"
+ 				          . "<tr>\n"
+ 				          . "<td><%savetext%></td>\n"
+ 				          . "<td><input type=\"submit\" value=\"<%savetext%>\" /></td>\n"
+ 				          . "</tr>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_POPTLIST_FOOT'];
+ 			}
+ 			$data = array(
+ 				'savetext' => _PLUGS_SAVE,
+ 			);
+ 			break;
+ 	}
+ 	
+ 	return Template::fill($template, $data);
+ }
+ 
+ function listplug_plugOptionRow($current, $template_name = '')
+ {
+ 	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
++>>>>>>> skinnable-master
+ 	$varname = "plugoption[{$current['oid']}][{$current['contextid']}]";
+ 	
+ 	// retreive the optionmeta
+ 	$meta = NucleusPlugin::getOptionMeta($current['typeinfo']);
+ 	
+ 	// 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 = '';
- 	
- 	switch( $type )
- 	{
- 		case '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 false;
  	}
- 	return;
- }
- 
- // for batch operations: generates the index numbers for checkboxes
- function listplug_nextBatchId()
- {
- 	static $id = 0;
- 	return $id++;
- }
- 
- function listplug_table_commentlist($template, $type)
- {
- 	switch( $type )
+ 	else
  	{
- 		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";
+ 		if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY']) )
+ 		{
+ 			$template = "<td><%description%></td>\n"
+ 			          . "<td>\n";
+ 		}
+ 		else
+ 		{
+ 			$template = $templates['SHOWLIST_LISTPLUG_TABLE_POPTLIST_BODY'];
+ 		}
+ 		
+ 		$data = array();
+ 		
+ 		switch($current['type'])
+ 		{
+ 			case 'yesno':
+ 				$template .= listplug_input_yesno($varname, $current['value'], 0, 'yes', 'no', _YES, _NO, 0, $template_name, 1);
+ 				break;
+ 			case 'password':
+ 				if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD']) )
+ 				{
+ 					$template .= "<input type=\"password\" size=\"40\" maxlength=\"128\" name=\"<%varname%>\" value=\"<%value%>\" />\n";
+ 				}
+ 				else
+ 				{
+ 					$template .= $templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OPWORD'];
+ 				}
+ 				$data = array(
+ 					'varname'	=> Entity::hsc($varname),
+ 					'value'		=> Entity::hsc($current['value']),
+ 				);
+ 				break;
+ 			case 'select':
+ 				if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP']) )
+ 				{
+ 					$template .= "<select name=\"<%varname%>\">\n";
+ 				}
+ 				else
+ 				{
+ 					$template .= $templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEP'];
+ 				}
+ 				if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO']) )
+ 				{
+ 					$subTpl = "<option value=\"<%value%>\"<%selected%>><%optname%></option>\n";
+ 				}
+ 				else
+ 				{
+ 					$subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEO'];
+ 				}
+ 				$options = NucleusPlugin::getOptionSelectValues($current['typeinfo']);
+ 				$options = preg_split('#\|#', $options);
+ 				
+ 				for ( $i=0; $i<(count($options)-1); $i+=2 )
+ 				{
+ 					$name	= $options[$i];
+ 					$value	= $options[$i+1];
+ 					if ( defined($name) )
+ 					{
+ 						$name = constant($name);
+ 					}
+ 					
+ 					$subData = array(
+ 						'optname'	=> Entity::hsc($name),
+ 						'value'		=> Entity::hsc($value)
+ 					);
+ 					if ($value != $current['value'])
+ 					{
+ 						$subData['selected'] = '';
+ 					}
+ 					else
+ 					{
+ 						$subData['selected'] = ' selected="selected"';
+ 					}
+ 					$template .= Template::fill($subTpl, $subData);
+ 				}
+ 				if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC']) )
+ 				{
+ 					$template .= "</select>\n";
+ 				}
+ 				else
+ 				{
+ 					$template .= $templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OSELEC'];
+ 				}
+ 				$data['varname'] = Entity::hsc($varname);
+ 				break;
+ 			case 'textarea':
+ 				if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA']) )
+ 				{
+ 					$template .= "<textarea class=\"pluginoption\" cols=\"30\" rows=\"5\" name=\"<%varname%>\"<%readonly%>><%value%></textarea>\n";
+ 				}
+ 				else
+ 				{
+ 					$template .= $templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OTAREA'];
+ 				}
+ 				$data = array(
+ 					'varname'	=> Entity::hsc($varname),
+ 					'value'		=> Entity::hsc($current['value'])
+ 				);
+ 				if ( !array_key_exists('access', $current) || $current['access'] != 'readonly')
+ 				{
+ 					$data['readonly'] = '';
+ 				}
+ 				else
+ 				{
+ 					$data['readonly'] = ' readonly="readonly"';
+ 				}
+ 				break;
+ 			case 'text':
+ 			default:
+ 				if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT']) )
+ 				{
+ 					$template .= "<input type=\"text\" size=\"40\" maxlength=\"128\" name=\"<%varname%>\" value=\"<%value%>\"<%datatype%><%readonly%> />\n";
+ 				}
+ 				else
+ 				{
+ 					$template .= $templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OITEXT'];
+ 				}
+ 				$data = array(
+ 					'varname'	=> Entity::hsc($varname),
+ 					'value'		=> Entity::hsc($current['value'])
+ 				);
+ 				if ( !array_key_exists('datatype', $current) || $current['datatype'] != 'numerical')
+ 				{
+ 					$data['datatype'] = '';
+ 				}
+ 				else
+ 				{
+ 					$data['datatype'] = ' onkeyup="checkNumeric(this)" onblur="checkNumeric(this)"';
+ 				}
+ 				if ( !array_key_exists('access', $current) || $current['access'] != 'readonly')
+ 				{
+ 					$data['readonly'] = '';
+ 				}
+ 				else
+ 				{
+ 					$data['readonly'] = ' readonly="readonly"';
+ 				}
+ 		}
+ 		
+ 		if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT']) )
+ 		{
+ 			$template .= "<%extra%></td>\n";
+ 		}
+ 		else
+ 		{
+ 			$template .= $templates['SHOWLIST_LISTPLUG_TABLE_PLUGOPTN_FOOT'];
+ 		}
+ 		
+ 		if ( !array_key_exists('extra', $current) )
+ 		{
+ 			$data['extra'] = '';
+ 		}
+ 		else
+ 		{
+ 			$data['extra'] = Entity::hsc($current['extra']);
+ 		}
+ 		
+ 		if ( !array_key_exists('description', $current) )
+ 		{
+ 			$data['description'] = Entity::hsc($current['name']);
+ 		}
+ 		else if ( !defined($current['description']) )
+ 		{
+ 			$data['description'] = Entity::hsc($current['description']);
+ 		}
+ 		else
+ 		{
+ 			$data['description'] = Entity::hsc(constant($current['description']));
+ 		}
+ 	}
+ 	return Template::fill($template, $data, 1);
+ }
+ 
+ /**
+  * listplug_templateEditRow()
+  * 
+  * @param	array	$content		content of target template
+  * @param	string	$desc			description of target template
+  * @param	string	$name			name of target template
+  * @param	string	$help			help text
+  * @param	integer	$tabindex		a number for tab index
+  * @param	boolean	$big			large or small textarea
+  * @param	array	$template_name	name of template for filling
+  * @return	void
+  */
+ function listplug_templateEditRow($content, $desc, $name, $help = '', $tabindex = 0, $big = 0, $template_name = '')
+ {
+ 	global $manager;
+ 	
+ 	static $count = 0;
+ 	
+ 	$tmplt = array();
+ 	$base  = array();
+ 	
+ 	$templates = array();
+ 	if ( $template_name )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	$data = array(
+ 		'description'	=> $desc,
+ 		'help'			=> empty($help) ? '' : helpHtml('template' . $help),
+ 		'count'			=> $count++,
+ 		'name'			=> $name,
+ 		'tabindex'		=> $tabindex,
+ 		'rows'			=> $big ? 10 : 5,
+ 	);
+ 	
+ 	$message = '';
+ 	
+ 	/* row head */
+ 	if ( !array_key_exists('TEMPLATE_EDIT_ROW_HEAD', $templates) || empty($tmplt['TEMPLATE_EDIT_ROW_HEAD']) )
+ 	{
+ 		$template = "<tr>\n"
+ 		          . "<td><%description%><%help%></td>\n"
+ 		          . "<td id=\"td<%count%>\">\n"
+ 		          . "<textarea class=\"templateedit\" name=\"<%name%>\" tabindex=\"<%tabindex%>\" cols=\"50\" rows=\"<%rows%>\" id=\"textarea<%count%>\">";
+ 	}
+ 	else
+ 	{
+ 		$template = $tmplt['TEMPLATE_EDIT_ROW_HEAD'];
+ 	}
+ 	$message .= TEMPLATE::fill($template, $data);
+ 	
+ 	/* row content */
+ 	$message .= ENTITY::hsc($content);
+ 	
+ 	/* row tail */
+ 	if ( !array_key_exists('TEMPLATE_EDIT_ROW_TAIL', $templates) || empty($tmplt['TEMPLATE_EDIT_ROW_TAIL']) )
+ 	{
+ 		$template = "</textarea>\n"
+ 		          . "</td>\n"
+ 		          . "</tr>\n";
+ 	}
+ 	else
+ 	{
+ 		$template = $tmplt['TEMPLATE_EDIT_ROW_TAIL'];
+ 	}
+ 	$message .= TEMPLATE::fill($template, $data);
+ 	
+ 	return $message;
+ }
+ 
+ function listplug_table_itemlist($vars, $type, $template_name = '')
+ {
+ 	global $manager;
+ 	
+ 	$cssclass  = '';
+ 	
+ 	$templates = array();
+ 	if ( !empty($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"
+ 				          . "<th><%colcontent%></th>\n"
+ 				          . "<th style=\"white-space:nowrap\"><%colaction%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_ITEMLIST_HEAD'];
+ 			}
+ 			$data = array(
+ 				'colinfo'		=> _LIST_ITEM_INFO,
+ 				'colcontent'	=> _LIST_ITEM_CONTENT,
+ 				'colaction'		=> _LISTS_ACTIONS
+ 			);
+ 			break;
+ 		case 'BODY':
+ 			$current = $vars['current'];
+ 			// string -> unix timestamp
+ 			$current['itime'] = strtotime($current['itime']);
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY']) )
+ 			{
+ 				$template = "<td<%cssclass%>>\n"
+ 				          . "<%bshortlabel%> <%bshortnameval%><br />\n"
+ 				          . "<%categorylabel%> <%categorynameval%><br />\n"
+ 				          . "<%authorlabel%> <%authornameval%><br />\n"
+ 				          . "<%itemdatelabel%> <%itemdateval%><br />\n"
+ 				          . "<%itemtimelabel%> <%itemtimeval%>\n"
+ 				          . "</td>\n"
+ 				          . "<td<%cssclass%>>\n"
+ 				          . "<input type=\"checkbox\" id=\"batch<%batchid%>\" name=\"batch[<%batchid%>]\" value=\"<%itemid%>\" />\n"
+ 				          . "<label for=\"batch<%batchid%>\"><b><%itemtitle%></b></label><br />\n"
+ 				          . "<%itembody%>\n"
+ 				          . "</td>\n"
+ 				          . "<td<%cssclass%>>\n"
+ 				          . "<a href=\"index.php?action=itemedit&amp;itemid=<%itemid%>\"><%editbtn%></a><br />\n"
+ 				          . "<a href=\"index.php?action=itemmove&amp;itemid=<%itemid%>\"><%movebtn%></a><br />\n"
+ 				          . "<a href=\"index.php?action=itemdelete&amp;itemid=<%itemid%>\"><%delbtn%></a><br />\n"
+ 				          . "<%camount%>\n"
+ 				          . "</td>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_ITEMLIST_BODY'];
+ 			}
+ 			$cssclass  = '';
+ 			
+ 			if ( $current['idraft'] == 1 )
+ 			{
+ 				$cssclass = ' class="draft"';
+ 			}
+ 			
+ 			// (can't use offset time since offsets might vary between blogs)
+ 			if ( $current['itime'] > $vars['now'] )
+ 			{
+ 				$cssclass = ' class="future"';
+ 			}
+ 			$body = strip_tags($current['ibody']);
+ 			$data = array(
+ 				'cssclass'			=> $cssclass,
+ 				'bshortlabel'		=> _LIST_ITEM_BLOG,
+ 				'bshortnameval'		=> Entity::hsc($current['bshortname']),
+ 				'categorylabel'		=> _LIST_ITEM_CAT,
+ 				'categorynameval'	=> Entity::hsc($current['cname']),
+ 				'authorlabel'		=> _LIST_ITEM_AUTHOR,
+ 				'authornameval'		=> Entity::hsc($current['mname']),
+ 				'itemdatelabel'		=> _LIST_ITEM_DATE,
+ 				'itemdateval'		=> date("Y-m-d",$current['itime']),
+ 				'itemdatelabel'		=> _LIST_ITEM_TIME,
+ 				'itemdateval'		=> date("H:i",$current['itime']),
+ 				'batchid'			=> listplug_nextBatchId(),
+ 				'itemid'			=> $current['inumber'],
+ 				'itemtitle'			=> Entity::hsc(strip_tags($current['ititle'])),
+ 				'itembody'			=> Entity::hsc(Entity::shorten($body, 300, '...')),
+ 				'editbtn'			=> _LISTS_EDIT,
+ 				'movebtn'			=> _LISTS_MOVE,
+ 				'delbtn'			=> _LISTS_DELETE,
+ 			);
+ 			// evaluate amount of comments for the item
+ 			$comment = new Comments($current['inumber']);
+ 			$camount = $comment->amountComments();
+ 			if ( $camount > 0 )
+ 			{
+ 				$data['camount'] = "<a href=\"index.php?action=itemcommentlist&amp;itemid={$current['inumber']}\">(" . sprintf(_LIST_ITEM_COMMENTS, $comment->amountComments()) . ")</a><br />\n";
+ 			}
+ 			else
+ 			{
+ 				$data['camount'] = _LIST_ITEM_NOCONTENT . "<br />\n";
+ 			}
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT']) )
+ 			{
+ 				$template = "\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_ITEMLIST_FOOT'];
+ 			}
+ 			$data = array();
+ 			break;
+ 	}
+ 	return Template::fill($template, $data);
++>>>>>>> skinnable-master
+ }
  
- 			$id = listplug_nextBatchId();
+ // for batch operations: generates the index numbers for checkboxes
+ function listplug_nextBatchId()
+ {
+ 	static $id = 0;
+ 	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>';
- 			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 "<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";
- 			}
++			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;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD']) )
+ 			{
+ 				$template = "<th><%colinfo%></th>\n"
+ 				          . "<th><%colcontent%></th>\n"
+ 				          . "<th colspan=\"3\"><%colaction%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_HEAD'];
+ 			}
+ 			$data = array(
+ 				'colinfo'		=> _LISTS_INFO,
+ 				'colcontent'	=> _LIST_COMMENT,
+ 				'colaction'		=> _LISTS_ACTIONS
+ 			);
+ 			break;
+ 		case 'BODY':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY']) )
+ 			{
+ 				$template = "<td><%commentdate%><br /><%commentator%><br /><%commentsite%><br /><%commentmail%><br /></td>\n"
+ 				          . "<td>\n"
+ 				          . "<input type=\"checkbox\" id=\"batch<%batchid%>\" name=\"batch[<%batchid%>]\" value=\"<%commentid%>\" />"
+ 				          . "<label for=\"batch<%batchid%>\"><%commentbody%></label>\n"
+ 				          . "</td>\n"
+ 				          . "<td style=\"white-space:nowrap\">\n"
+ 				          . "<a href=\"index.php?action=commentedit&amp;commentid=<%commentid%>\"><%editbtn%></a>\n"
+ 				          . "</td>\n"
+ 				          . "<td style=\"white-space:nowrap\">\n"
+ 				          . "<a href=\"index.php?action=commentdelete&amp;commentid=<%commentid%>\"><%delbtn%></a>\n"
+ 				          . "</td>\n"
+ 				          . "<%addbanlist%>";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_BODY'];
+ 			}
+ 			$current = $vars['current'];
+ 			$body = strip_tags($current['cbody']);
+ 			$data = array(
+ 				'commentdate'	=> date("Y-m-d@H:i", strtotime($current['ctime'])),
+ 				'batchid'		=> listplug_nextBatchId(),
+ 				'commentid'		=> $current['cnumber'],
+ 				'commentbody'	=> Entity::hsc(Entity::shorten($current['cbody'], 300, '...')),
+ 				'editbtn'		=> _LISTS_EDIT,
+ 				'delbtn'		=> _LISTS_DELETE,
+ 			);
+ 			if ( isset($current['mname']) )
+ 			{
+ 				$data['commentator'] = Entity::hsc($current['mname']) . ' ' . _LIST_COMMENTS_MEMBER;
+ 			}
+ 			else
+ 			{
+ 				$data['commentator'] = Entity::hsc($current['cuser']);
+ 			}
+ 			if ( isset($current['cmail']) && $current['cmail'] )
+ 			{
+ 				$data['commentsite'] = Entity::hsc($current['cmail']);
+ 			}
+ 				else
+ 			{
+ 				$data['commentsite'] = '';
+ 			}
+ 			if ( isset($current['cemail']) && $current['cemail'] )
+ 			{
+ 				$data['commentmail'] = Entity::hsc($current['cemail']);
+ 			}
+ 				else
+ 			{
+ 				$data['commentmail'] = '';
+ 			}
+ 			if ( $vars['canAddBan'] )
+ 			{
+ 				if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN']) )
+ 				{
+ 					$subTpl = "<td style=\"white-space:nowrap\">"
+ 					        . "<a href=\"index.php?action=banlistnewfromitem&amp;itemid=<%itemid%>&amp;ip=<%banip%>\" title=\"<%banhost%>\"><%banbtn%></a>"
+ 					        . "</td>\n";
+ 				}
+ 				else
+ 				{
+ 					$subTpl = $templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN'];
+ 				}
+ 				$subData = array(
+ 					'itemid'	=> $current['citem'],
+ 					'banip'		=> Entity::hsc($current['cip']),
+ 					'banbtn'	=> _LIST_COMMENT_BANIP,
+ 				);
+ 				$data['addbanlist'] = Template::fill($subTpl, $subData);
+ 			}
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT']) )
+ 			{
+ 				$template = "";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_CMNTLIST_FOOT'];
+ 			}
+ 			$data = array();
+ 			break;
+ 	}
+ 	return Template::fill($template, $data);
+ }
+ 
+ function listplug_table_bloglist($vars, $type, $template_name = '')
+ {
+ 	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD']) )
+ 			{
+ 				$template = "<th><%blognames%></th>\n"
+ 				          . "<th colspan=\"7\"><%actionshead%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD'];
+ 			}
+ 			$data = array(
+ 				'blognames'   => _NAME,
+ 				'actionshead' => _LISTS_ACTIONS,
+ 			);
+ 			break;
+ 		case 'BODY':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY']) )
+ 			{
+ 				$template = "<td title=\"blogid:<%blogid%> shortname:<%shortname%>\">\n"
+ 				          . "<a href=\"<%blogurl%>\"><img src=\"images/globe.gif\" width=\"13\" height=\"13\" alt=\"<%iconalt%>\" /></a><%blogname%></td>\n"
+ 				          . "<td><a href=\"index.php?action=createitem&amp;blogid=<%blogid%>\" title=\"<%ttaddtext%>\"><%addtext%></a></td>\n"
+ 				          . "<td><a href=\"index.php?action=itemlist&amp;blogid=<%blogid%>\" title=\"<%ttedittext%>\"><%edittext%></a></td>\n"
+ 				          . "<td><a href=\"index.php?action=blogcommentlist&amp;blogid=<%blogid%>\" title=\"<%ttcommenttext%>\"><%commenttext%></a></td>\n"
+ 				          . "<td><a href=\"index.php?action=bookmarklet&amp;blogid=<%blogid%>\" title=\"<%ttbmlettext%>\"><%bmlettext%></a></td>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY'];
+ 			}
+ 			$data = array(
+ 				'blogid'		=> $current['bnumber'],
+ 				'shortname'		=> Entity::hsc($current['bshortname']),
+ 				'blogurl'		=> $current['burl'],
+ 				'blogname'		=> Entity::hsc($current['bname']),
+ 				'ttaddtext'		=> _BLOGLIST_TT_ADD,
+ 				'addtext'		=> _BLOGLIST_ADD,
+ 				'ttedittext'	=> _BLOGLIST_TT_EDIT,
+ 				'edittext'		=> _BLOGLIST_EDIT,
+ 				'ttcommenttext'	=> _BLOGLIST_TT_COMMENTS,
+ 				'commenttext'	=> _BLOGLIST_COMMENTS,
+ 				'ttbmlettext'	=> _BLOGLIST_TT_BMLET,
+ 				'bmlettext'		=> _BLOGLIST_BMLET,
+ 			);
+ 			if ( $current['tadmin'] == 1 )
+ 			{
+ 				if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM']) )
+ 				{
+ 					$template .= "<td><a href=\"index.php?action=blogsettings&amp;blogid=<%blogid%>\" title=\"<%ttsettingtext%>\"><%settingtext%></a></td>\n"
+ 					           . "<td><a href=\"index.php?action=banlist&amp;blogid=<%blogid%>\" title=\"<%ttbanstext%>\"><%banstext%></a></td>\n";
+ 				}
+ 				else
+ 				{
+ 					$template .= $templates['SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM'];
+ 				}
+ 				$data['ttsettingtext']	= _BLOGLIST_TT_SETTINGS;
+ 				$data['settingtext']	= _BLOGLIST_SETTINGS;
+ 				$data['ttbanstext']		= _BLOGLIST_TT_BANS;
+ 				$data['banstext']		= _BLOGLIST_BANS;
+ 			}
+ 			
+ 			if ( $vars['superadmin'] )
+ 			{
+ 				if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM']) )
+ 				{
+ 					$template .= "<td><a href=\"index.php?action=deleteblog&amp;blogid=<%blogid%>\" title=\"<%ttdeletetext%>\"><%deletetext%></a></td>\n";
+ 				}
+ 				else
+ 				{
+ 					$template .= $templates['SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM'];
+ 				}
+ 				$data['ttdeletetext']	= _BLOGLIST_TT_DELETE;
+ 				$data['deletetext']		= _BLOGLIST_DELETE;
+ 			}
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT']) )
+ 			{
+ 				$template = "\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_BLOGLIST_FOOT'];
+ 			}
+ 			$data = array();
+ 			break;
+ 	}
+ 	return Template::fill($template, $data);
+ }
+ 
+ function listplug_table_shortblognames($vars, $type, $template_name = '')
+ {
+ 	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD']) )
+ 			{
+ 				$template = "<th><%colshortname%></th>\n"
+ 				          . "<th><%colblogname%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_HEAD'];
+ 			}
+ 			$data = array(
+ 				'colshortname' => _EBLOG_SHORTNAME,
+ 				'colblogname'  => _EBLOG_NAME,
+ 			);
+ 			break;
+ 		case 'BODY':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY']) )
+ 			{
+ 				$template = "<td><%bshortname%></td>\n"
+ 				          . "<td><%blogname%></td>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_BODY'];
+ 			}
+ 			$data = array(
+ 				'bshortname' => Entity::hsc($current['bshortname']),
+ 				'blogname'   => Entity::hsc($current['bname']),
+ 			);
+ 			break;
+ 		case 'FOOT':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT']) )
+ 			{
+ 				$template = "\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_BLOGSNAM_FOOT'];
+ 			}
+ 			$data = array();
+ 			break;
+ 	}
+ 	return Template::fill($template, $data);
+ }
+ 
+ function listplug_table_shortnames($vars, $type, $template_name = '')
+ {
+ 	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD']) )
+ 			{
+ 				$template = "<th><%colname%></th>\n"
+ 				          . "<th><%coldesc%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_SHORTNAM_HEAD'];
+ 			}
+ 			$data = array(
+ 				'colname' => _NAME,
+ 				'coldesc' => _LISTS_DESC,
+ 			);
+ 			break;
+ 		case 'BODY':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY']) )
+ 			{
+ 				$template = "<td><%name%></td>\n"
+ 				          . "<td><%desc%></td>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_SHORTNAM_BODY'];
+ 			}
+ 			$data = array(
+ 				'name' => Entity::hsc($current['name']),
+ 				'desc' => Entity::hsc($current['description']),
+ 			);
+ 			break;
+ 		case 'FOOT':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT']) )
+ 			{
+ 				$template = "\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_SHORTNAM_FOOT'];
+ 			}
+ 			$data = array();
+ 			break;
+ 	}
+ 	return Template::fill($template, $data);
+ }
+ 
+ function listplug_table_categorylist($vars, $type, $template_name = '')
+ {
+ 	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD']) )
+ 			{
+ 				$template = "<th><%colname%></th>\n"
+ 				          . "<th><%coldesc%></th>\n"
+ 				          . "<th colspan=\"2\"><%colact%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_CATELIST_HEAD'];
+ 			}
+ 			$data = array(
+ 				'colname' => _LISTS_NAME,
+ 				'coldesc' => _LISTS_DESC,
+ 				'colact'  => _LISTS_ACTIONS,
+ 			);
+ 			break;
+ 		case 'BODY':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY']) )
+ 			{
+ 				$template = "<td>\n"
+ 				          . "<input type=\"checkbox\" id=\"batch<%batchid%>\" name=\"batch[<%batchid%>]\" value=\"<%catid%>\" />\n"
+ 				          . "<label for=\"batch<%batchid%>\"><%catname%></label>\n"
+ 				          . "</td>\n"
+ 				          . "<td><%catdesc%></td>\n"
+ 				          . "<td><a href=\"index.php?action=categoryedit&amp;blogid=<%blogid%>&amp;catid=<%catid%>\" tabindex=\"<%tabindex%>\"><%editbtn%></a></td>\n"
+ 				          . "<td><a href=\"index.php?action=categorydelete&amp;blogid=<%blogid%>&amp;catid=<%catid%>\" tabindex=\"<%tabindex%>\"><%delbtn%></a></td>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_CATELIST_BODY'];
+ 			}
+ 			
+ 			$data = array(
+ 				'batchid'	=> listplug_nextBatchId(),
+ 				'catid'		=> intval($current['catid']),
+ 				'catname'	=> Entity::hsc($current['cname']),
+ 				'catdesc'	=> Entity::hsc($current['cdesc']),
+ 				'blogid'	=> intval($current['cblog']),
+ 				'tabindex'	=> intval($vars['tabindex']),
+ 				'editbtn'	=> _LISTS_EDIT,
+ 				'delbtn'	=> _LISTS_DELETE,
+ 			);
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT']) )
+ 			{
+ 				$template = "\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_CATELIST_FOOT'];
+ 			}
+ 			$data = array();
+ 			break;
+ 	}
+ 	return Template::fill($template, $data);
+ }
+ 
+ function listplug_table_templatelist($vars, $type, $template_name = '')
+ {
+ 	global $manager, $CONF;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD']) )
+ 			{
+ 				$template = "<th><%colname%></th>\n"
+ 				          . "<th><%coldesc%></th>\n"
+ 				          . "<th colspan=\"3\"><%colact%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_HEAD'];
+ 			}
+ 			$data = array(
+ 				'colname' => _LISTS_NAME,
+ 				'coldesc' => _LISTS_DESC,
+ 				'colact'  => _LISTS_ACTIONS,
+ 			);
+ 			break;
+ 		case 'BODY':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY']) )
+ 			{
+ 				$template = "<td><%templatename%></td>\n"
+ 				          . "<td><%templatedesc%></td>\n"
+ 				          . "<td style=\"white-space:nowrap\">"
+ 				          . "<a href=\"<%editurl%>\" tabindex=\"<%tabindex%>\"><%editbtn%></a>\n"
+ 				          . "</td>\n"
+ 				          . "<td style=\"white-space:nowrap\">\n"
+ 				          . "<a href=\"<%cloneurl%>\" tabindex=\"<%tabindex%>\"><%clonebtn%></a>\n"
+ 				          . "</td>\n"
+ 				          . "<td style=\"white-space:nowrap\">\n"
+ 				          . "<a href=\"<%deleteurl%>\" tabindex=\"<%tabindex%>\"><%delbtn%></a>\n"
+ 				          . "</td>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_BODY'];
+ 			}
+ 			
+ 			$data = array(
+ 				'templatename'	=> Entity::hsc($current['tdname']),
+ 				'templatedesc'	=> Entity::hsc($current['tddesc']),
+ 				'templateid'	=> (integer) $current['tdnumber'],
+ 				'tabindex'		=> (integer) $vars['tabindex'],
+ 				
+ 				'clonebtn'		=> _LISTS_CLONE,
+ 				'cloneaction'	=> $vars['cloneaction'],
+ 				'cloneurl'		=> "{$CONF['AdminURL']}index.php?action={$vars['cloneaction']}&amp;templateid={$current['tdnumber']}",
+ 				
+ 				'delbtn'		=> _LISTS_DELETE,
+ 				'deleteaction'	=> $vars['deleteaction'],
+ 				'deleteurl'		=> "{$CONF['AdminURL']}index.php?action={$vars['deleteaction']}&amp;templateid={$current['tdnumber']}",
+ 				
+ 				'editbtn'		=> _LISTS_EDIT,
+ 				'editaction'	=> $vars['editaction'],
+ 				'editurl'		=> "{$CONF['AdminURL']}index.php?action={$vars['editaction']}&amp;templateid={$current['tdnumber']}"
+ 			);
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT']) )
+ 			{
+ 				$template = "\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_TPLTLIST_FOOT'];
+ 			}
+ 			$data = array();
+ 			break;
+ 	}
+ 	return Template::fill($template, $data);
+ }
+ 
+ function listplug_table_skinlist($vars, $type, $template_name = '')
+ {
+ 	global $CONF, $DIR_SKINS, $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD']) )
+ 			{
+ 				$template = "<th><%colname%></th>\n"
+ 				          . "<th><%coldesc%></th>\n"
+ 				          . "<th colspan=\"3\"><%colact%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_HEAD'];
+ 			}
+ 			$data = array(
+ 				'colname'	=> _LISTS_NAME,
+ 				'coldesc'	=> _LISTS_DESC,
+ 				'colact'	=> _LISTS_ACTIONS,
+ 			);
+ 			break;
+ 		case 'BODY':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY']) )
+ 			{
+ 				$template = "<td><%skinname%><br /><br />\n"
+ 				          . "<%skintypelabel%> <%skintype%><br />\n"
+ 				          . "<%incmodelabel%> <%incmode%><br />\n"
+ 				          . "<%incpreflabel%> <%incpref%><br />\n"
+ 				          . "<%skinthumb%>"
+ 				          . "<%readme%></td>\n"
+ 				          . "<td class=\"availableSkinTypes\"><%skindesc%><%skinparts%></td>\n"
+ 				          . "<td style=\"white-space:nowrap\">"
+ 				          . "<a href=\"index.php?action=skinedit&amp;skinid=<%skinid%>\" tabindex=\"<%tabindex%>\"><%editbtn%></a>"
+ 				          . "</td>\n"
+ 				          . "<td style=\"white-space:nowrap\">"
+ 				          . "<a href=\"<%cloneurl%>\" tabindex=\"<%tabindex%>\"><%clonebtn%></a>"
+ 				          . "</td>\n"
+ 				          . "<td style=\"white-space:nowrap\">"
+ 				          . "<a href=\"index.php?action=skindelete&amp;skinid=<%skinid%>\" tabindex=\"<%tabindex%>\"><%delbtn%></a>"
+ 				          . "</td>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_BODY'];
+ 			}
+ 			
+ 			$data = array(
+ 				'tabindex'		=> $vars['tabindex']++,
+ 				
+ 				'skinid'		=> (integer) $current['sdnumber'],
+ 				'skindesc'		=> Entity::hsc($current['sddesc']),
+ 				
+ 				'skintypelabel'	=> _LISTS_TYPE,
+ 				'skintype'		=> Entity::hsc($current['sdtype']),
+ 				
+ 				'incmodelabel'	=> _LIST_SKINS_INCMODE,
+ 				'incmode'		=> ($current['sdincmode'] == 'skindir') ? _PARSER_INCMODE_SKINDIR : _PARSER_INCMODE_NORMAL,
+ 				
+ 				'incpreflabel'	=> ($current['sdincpref']) ? _SKIN_INCLUDE_PREFIX : '',
+ 				'incpref'		=> ($current['sdincpref']) ? Entity::hsc($current['sdincpref']) : '',
+ 				
+ 				'editbtn'		=> _LISTS_EDIT,
+ 				'editaction'	=> $vars['editaction'],
+ 				'editurl'		=> "{$CONF['AdminURL']}index.php?action={$vars['editaction']}&skinid={$current['sdnumber']}",
+ 				
+ 				'clonebtn'		=> _LISTS_CLONE,
+ 				'cloneaction'	=> $vars['cloneaction'],
+ 				'cloneurl'		=> "{$CONF['AdminURL']}index.php?action={$vars['cloneaction']}&skinid={$current['sdnumber']}",
+ 				
+ 				'delbtn'		=> _LISTS_DELETE,
+ 				'deleteaction'	=> $vars['deleteaction'],
+ 				'deleteurl'		=> "{$CONF['AdminURL']}index.php?action={$vars['deleteaction']}&skinid={$current['sdnumber']}"
+ 			);
+ 			
+ 			if ( $current['sdnumber'] != $vars['default'] )
+ 			{
+ 				$data['skinname'] = Entity::hsc($current['sdname']);
+ 			}
+ 			else
+ 			{
+ 				$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
+ 				{
+ 					$data['readme'] ="";
+ 				}
+ 				
+ 				$data['skinthumb'] .=  "</p>\n";
+ 			}
+ 			
+ 			$skin =& $manager->getSkin($current['sdnumber'], $vars['handler']);
+ 			$available_types = $skin->getAvailableTypes();
+ 			
+ 			$data['skinparts'] = _LIST_SKINS_DEFINED
+ 			                   . "<ul>\n";
+ 			foreach ( $available_types as $type => $label )
+ 			{
+ 				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_bloglist($template, $type)
++function listplug_table_draftlist($template, $type)
 +{
 +	switch( $type )
 +	{
 +		case 'HEAD':
- 			echo '<th>' . _NAME . "</th>\n";
- 			echo '<th colspan="7">' . _LISTS_ACTIONS . "</th>\n";
++			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['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";
- 			}
++			$current['bshortname'] = Entity::hsc($current['bshortname']);
++			$current['ititle'] = Entity::hsc(strip_tags($current['ititle']));
 +			
- 			if ( $template['superadmin'] )
- 			{
- 				echo "<td><a href=\"index.php?action=deleteblog&amp;blogid={$current['bnumber']}\" title=\"". _BLOGLIST_TT_DELETE."\">" ._BLOGLIST_DELETE. "</a></td>\n";
- 			}
++			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_shortblognames($template, $type)
++function listplug_table_otherdraftlist($template, $type)
 +{
 +	switch( $type )
 +	{
 +		case 'HEAD':
- 			echo '<th>' . _EBLOG_SHORTNAME . "</th>\n";
- 			echo '<th>' . _EBLOG_NAME. "</th>";
++			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['bname'] = Entity::hsc($current['bname']);
++			$current['ititle'] = Entity::hsc(strip_tags($current['ititle']));
++			$current['mname'] = Entity::hsc($current['mname']);
 +			
 +			echo "<td>{$current['bshortname']}</td>\n";
- 			echo "<td>{$current['bname']}</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_shortnames($template, $type)
++function listplug_table_actionlist($template, $type)
 +{
 +	switch( $type )
 +	{
 +		case 'HEAD':
- 			echo '<th>' . _NAME . "</th>\n";
- 			echo '<th>' . _LISTS_DESC. "</th>\n";
++			echo '<th>' . _LISTS_TIME . "</th>\n";
++			echo '<th>' . _LIST_ACTION_MSG . "</th>\n";
 +			break;
 +		case 'BODY':
 +			$current = $template['current'];
- 			$current['name'] = Entity::hsc($current['name']);
- 			$current['description'] = Entity::hsc($current['description']);
++			$current['timestamp'] = Entity::hsc($current['timestamp']);
++			$current['message'] = Entity::hsc($current['message']);
 +			
- 			echo "<td>{$current['name']}</td>\n";
- 			echo "<td>{$current['description']}</td>\n";
++			echo "<td>{$current['timestamp']}</td>\n";
++			echo "<td>{$current['message']}</td>\n";
 +			break;
 +	}
 +	return;
 +}
 +
- 
- function listplug_table_categorylist($template, $type)
++function listplug_table_banlist($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";
++			echo '<th>' . _LIST_BAN_IPRANGE . "</th>\n";
++			echo '<th>' . _LIST_BAN_REASON."</th>\n";
++			echo '<th>' . _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']);
++			$current['blogid'] = (integer) $current['blogid'];
++			$current['iprange'] = Entity::hsc($current['iprange']);
++			$current['reason'] = Entity::hsc($current['reason']);
 +			
- 			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";
++			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']}\">"
+ 				                   . Entity::hsc($label)
+ 				                   . "</a>\n"
+ 				                   . "</li>\n";
+ 			}
+ 			$data['skinparts'] .= "</ul>\n";
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT']) )
+ 			{
+ 				$template = "";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_SKINLIST_FOOT'];
+ 			}
+ 			$data = array();
+ 			break;
+ 	}
+ 	return Template::fill($template, $data);
  }
  
- function listplug_table_templatelist($template, $type)
+ function listplug_table_draftlist($vars, $type, $template_name = '')
  {
  	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
  	switch( $type )
  	{
  		case 'HEAD':
- 			echo '<th>' . _LISTS_NAME . "</th>\n";
- 			echo '<th>' . _LISTS_DESC . "</th>\n";
- 			echo '<th colspan="3">' . _LISTS_ACTIONS . "</th>\n";
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD']) )
+ 			{
+ 				$template = "<th><%colblog%></th>\n"
+ 				          . "<th><%coldesc%></th>\n"
+ 				          . "<th colspan=\"2\"><%colact%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_DRFTLIST_HEAD'];
+ 			}
+ 			$data = array(
+ 				'colblog'	=> _LISTS_BLOG,
+ 				'coldesc'	=> _LISTS_TITLE,
+ 				'colact'	=> _LISTS_ACTIONS,
+ 			);
  			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";
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY']) )
+ 			{
+ 				$template = "<td><%bshortname%></td>\n"
+ 				          . "<td><%ititle%></td>\n"
+ 				          . "<td><a href=\"index.php?action=itemedit&amp;itemid=<%itemid%>\"><%editbtn%></a></td>\n"
+ 				          . "<td><a href=\"index.php?action=itemdelete&amp;itemid=<%itemid%>\"><%delbtn%></a></td>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_DRFTLIST_BODY'];
+ 			}
+ 			$data = array(
+ 				'bshortname'	=> Entity::hsc($current['bshortname']),
+ 				'ititle'		=> Entity::hsc(strip_tags($current['ititle'])),
+ 				'itemid'		=> intval($current['inumber']),
+ 				'editbtn'		=> _LISTS_EDIT,
+ 				'delbtn'		=> _LISTS_DELETE,
+ 			);
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT']) )
+ 			{
+ 				$template = "\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_DRFTLIST_FOOT'];
+ 			}
+ 			$data = array();
  			break;
  	}
- 	return;
+ 	return Template::fill($template, $data);
  }
  
- function listplug_table_skinlist($template, $type)
+ function listplug_table_otherdraftlist($vars, $type, $template_name = '')
  {
- 	global $CONF, $DIR_SKINS, $manager;
+ 	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
  	switch( $type )
  	{
  		case 'HEAD':
- 			echo '<th>' . _LISTS_NAME . "</th>\n";
- 			echo '<th>' . _LISTS_DESC . "</th>\n";
- 			echo '<th colspan="3">' . _LISTS_ACTIONS . "</th>\n";
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_ODRFTLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_ODRFTLIST_HEAD']) )
+ 			{
+ 				$template = "<th><%colblog%></th>\n"
+ 				          . "<th><%coldesc%></th>\n"
+ 				          . "<th><%colautr%></th>\n"
+ 				          . "<th colspan=\"2\"><%colact%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_ODRFTLIST_HEAD'];
+ 			}
+ 			$data = array(
+ 				'colblog'	=> _LISTS_BLOG,
+ 				'coldesc'	=> _LISTS_TITLE,
+ 				'colautr'	=> _LISTS_AUTHOR,
+ 				'colact'	=> _LISTS_ACTIONS,
+ 			);
  			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'] )
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_ODRFTLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_ODRFTLIST_BODY']) )
+ 			{
+ 				$template = "<td><%bshortname%></td>\n"
+ 				          . "<td><%ititle%></td>\n"
+ 				          . "<td><%iauthor%></td>\n"
+ 				          . "<td><a href=\"index.php?action=itemedit&amp;itemid=<%itemid%>\"><%editbtn%></a></td>\n"
+ 				          . "<td><a href=\"index.php?action=itemdelete&amp;itemid=<%itemid%>\"><%delbtn%></a></td>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_ODRFTLIST_BODY'];
+ 			}
+ 			$data = array(
+ 				'bshortname'	=> Entity::hsc($current['bshortname']),
+ 				'ititle'		=> Entity::hsc(strip_tags($current['ititle'])),
+ 				'iauthor'		=> Entity::hsc(strip_tags($current['mname'])),
+ 				'itemid'		=> intval($current['inumber']),
+ 				'editbtn'		=> _LISTS_EDIT,
+ 				'delbtn'		=> _LISTS_DELETE,
+ 			);
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_ODRFTLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_ODRFTLIST_FOOT']) )
+ 			{
+ 				$template = "\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_ODRFTLIST_FOOT'];
+ 			}
+ 			$data = array();
+ 			break;
+ 	}
+ 	return Template::fill($template, $data);
+ }
+ 
+ function listplug_table_actionlist($vars, $type, $template_name = '')
+ {
+ 	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD']) )
+ 			{
+ 				$template = "<th><%coltime%></th>\n"
+ 				          . "<th><%colmesg%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_ACTNLIST_HEAD'];
+ 			}
+ 			$data = array(
+ 				'coltime' => _LISTS_TIME,
+ 				'colmesg' => _LIST_ACTION_MSG,
+ 			);
+ 			break;
+ 		case 'BODY':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY']) )
+ 			{
+ 				$template = "<td><%timestamp%></td>\n"
+ 				          . "<td><%message%></td>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_ACTNLIST_BODY'];
+ 			}
+ 			$data = array(
+ 				'timestamp'	=> Entity::hsc($current['timestamp']),
+ 				'message'	=> Entity::hsc($current['message']),
+ 			);
+ 			break;
+ 		case 'FOOT':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT']) )
+ 			{
+ 				$template = "\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_ACTNLIST_FOOT'];
+ 			}
+ 			$data = array();
+ 			break;
+ 	}
+ 	return Template::fill($template, $data);
+ }
+ 
+ function listplug_table_banlist($vars, $type, $template_name = '')
+ {
+ 	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( !empty($template_name) )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD']) )
+ 			{
+ 				$template = "<th><%iprange%></th>\n"
+ 				          . "<th><%reason%></th>\n"
+ 				          . "<th><%colact%></th>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_IBANLIST_HEAD'];
+ 			}
+ 			$data = array(
+ 				'iprange'	=> _LIST_BAN_IPRANGE,
+ 				'reason'	=> _LIST_BAN_REASON,
+ 				'colact'	=> _LISTS_ACTIONS,
+ 			);
+ 			break;
+ 		case 'BODY':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY']) )
+ 			{
+ 				$template = "<td><%iprange%></td>\n"
+ 				          . "<td><%reason%></td>\n"
+ 				          . "<td><a href=\"index.php?action=banlistdelete&amp;blogid=<%blogid%>&amp;iprange=<%iprange%>\"><%delbtn%></a></td>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_IBANLIST_BODY'];
+ 			}
+ 			$data = array(
+ 				'iprange'	=> Entity::hsc($current['iprange']),
+ 				'reason'	=> Entity::hsc($current['reason']),
+ 				'blogid'	=> intval($current['blogid']),
+ 				'delbtn'	=> _LISTS_DELETE,
+ 			);
+ 			break;
+ 		case 'FOOT':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT']) )
+ 			{
+ 				$template = "\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SHOWLIST_LISTPLUG_TABLE_IBANLIST_FOOT'];
+ 			}
+ 			$data = array();
+ 			break;
+ 	}
+ 	return Template::fill($template, $data);
+ }
+ 
+ /**
+  * listplug_list_normalskinlist()
+  * 
+  * @param	array	$vars			array for variables
+  * @param	string	$type			HEAD/BODY/FOOT
+  * @param	string	$template_name	name of template
+  * @return	string	marked-up string
+  */
+ function listplug_list_normalskinlist($vars, $type, $template_name = '')
+ {
+ 	global $manager, $CONF;
+ 	
+ 	/* available variables as a default */
+ 	$data = array(
+ 		'skinid'	=> (integer) $vars['skinid'],
+ 		'skinname'	=> Entity::hsc($vars['skinname']),
+ 	);
+ 	
+ 	$templates = array();
+ 	if ( $template_name )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch ( $type )
+ 	{
+ 		case 'HEAD':
+ 			if ( !array_key_exists('NORMALSKINLIST_HEAD', $templates) || empty($templates['NORMALSKINLIST_HEAD']) )
  			{
- 				echo '<h3 id="base_skin">' . $current['sdname'] . "</h3>\n";
+ 				$template = "<ul>\n";
  			}
  			else
  			{
- 				echo '<h3>' . $current['sdname'] . "</h3>\n";
+ 				$template = $templates['NORMALSKINLIST_HEAD'];
  			}
  			
- 			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' )
+ 			break;
+ 		case 'BODY':
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('NORMALSKINLIST_BODY', $templates) || empty($templates['NORMALSKINLIST_BODY']) )
  			{
- 				echo '<dd>' . _PARSER_INCMODE_SKINDIR . "</dd>\n";
+ 				$template = "<li>"
+ 				          . "<a href=\"<%editurl%>\" tabindex=\"<%tabindex%>\"><%skintypename%></a>"
+ 				          . " <%help%>"
+ 				          . "</li>\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";
+ 				$template = $templates['NORMALSKINLIST_BODY'];
  			}
- 			echo "</dl>\n";
  			
- 			// add preview image when present
- 			if ( $current['sdincpref'] && @file_exists("{$DIR_SKINS}{$current['sdincpref']}preview.png") )
+ 			$data['tabindex']		= $vars['tabindex']++;
+ 			$data['skintype']		= $current['skintype'];
+ 			$data['skintypename']	= $current['skintypename'];
+ 			$data['editaction']		= $vars['editaction'];
+ 			$data['editurl']		= "{$CONF['AdminURL']}?action={$vars['editaction']}&amp;skinid={$vars['skinid']}&amp;type={$current['skintype']}";
+ 			/* TODO: removeaction? */
+ 			/* TODO: customHelpHtml("skinpart{$skintype}-{$template_name}") */
+ 			$data['help']			= '';
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('NORMALSKINLIST_FOOT', $templates) || empty($templates['NORMALSKINLIST_FOOT']) )
  			{
- 				echo "<p>\n";
- 				
- 				$alternatve_text = sprintf(_LIST_SKIN_PREVIEW, $current['sdname']);
- 				$has_enlargement = @file_exists($DIR_SKINS . $current['sdincpref'] . 'preview-large.png');
- 				if ( $has_enlargement )
- 				{
- 					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";
- 				}
- 				
- 				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']);
- 					echo "<a href=\"{$url}\" title=\"{$title}\">" . _LIST_SKIN_README_TXT . "</a>\n";
- 				}
- 				
- 				echo "</p>\n";
+ 				$template = "</ul>\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 )
+ 			else
  			{
- 				if ( $friendlyName === FALSE )
- 				{
- 					$friendlyName = ucfirst($type);
- 					$article = 'skinpartspecial';
- 				}
- 				else
- 				{
- 					$article = "skinpart{$type}";
- 				}
- 				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";
+ 				$template = $templates['NORMALSKINLIST_FOOT'];
  			}
- 			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;
+ 	
+ 	return Template::fill($template, $data);
  }
  
- function listplug_table_draftlist($template, $type)
+ /**
+  * listplug_list_specialskinlist()
+  * 
+  * @param	array	$vars			array for variables
+  * @param	string	$type			HEAD/BODY/FOOT
+  * @param	string	$template_name	name of template
+  * @return	string	marked-up string
+  */
+ function listplug_list_specialskinlist($vars, $type, $template_name = '')
  {
- 	switch( $type )
+ 	global $manager, $CONF;
+ 	
+ 	/* available variables as a default */
+ 	$data = array(
+ 		'skinid'	=> (integer) $vars['skinid'],
+ 		'skinname'	=> Entity::hsc($vars['skinname']),
+ 	);
+ 	
+ 	/* retrieve templates */
+ 	$templates = array();
+ 	if ( $template_name )
+ 	{
+ 		$templates =& $manager->getTemplate($template_name);
+ 	}
+ 	
+ 	switch ( $type )
  	{
  		case 'HEAD':
- 			echo '<th>' . _LISTS_BLOG . "</th>\n";
- 			echo '<th>' . _LISTS_TITLE . "</th>\n";
- 			echo '<th colspan="2">' . _LISTS_ACTIONS . "</th>\n";
+ 			if ( !array_key_exists('SPECIALSKINLIST_HEAD', $templates) || empty($templates['SPECIALSKINLIST_HEAD']) )
+ 			{
+ 				$template = "<ul>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SPECIALSKINLIST_HEAD'];
+ 			}
  			break;
  		case 'BODY':
- 			$current = $template['current'];
- 			$current['bshortname'] = Entity::hsc($current['bshortname']);
- 			$current['ititle'] = Entity::hsc(strip_tags($current['ititle']));
+ 			$current = $vars['current'];
+ 			if ( !array_key_exists('SPECIALSKINLIST_BODY', $templates) || empty($templates['SPECIALSKINLIST_BODY']) )
+ 			{
+ 				$template = "<li>"
+ 				          . "<a href=\"<%editurl%>\" tabindex=\"<%tabindex%>\">"
+ 				          . "<%skintype%>"
+ 				          . "</a>"
+ 				          . " ("
+ 				          . "<a href=\"<%removeurl%>\" tabindex=\"<%tabindex%>\" >"
+ 				          . "<%text(_LISTS_DELETE)%>"
+ 				          . "</a>"
+ 				          . ")"
+ 				          . "</li>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SPECIALSKINLIST_BODY'];
+ 			}
  			
- 			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";
+ 			$data['tabindex']		= (integer) $vars['tabindex']++;
+ 			$data['skintype']		= Entity::hsc($current['skintype']);
+ 			$data['skintypename']	= Entity::hsc($current['skintypename']);
+ 			$data['editaction']		= $vars['editaction'];
+ 			$data['editurl']		= "{$CONF['AdminURL']}?action={$vars['editaction']}&amp;skinid={$vars['skinid']}&amp;type={$current['skintype']}";
+ 			$data['removeaction']	= $vars['editaction'];
+ 			$data['removeurl']		= "{$CONF['AdminURL']}?action={$vars['removeaction']}&amp;skinid={$vars['skinid']}&amp;type={$current['skintype']}";
+ 			
+ 			break;
+ 		case 'FOOT':
+ 			if ( !array_key_exists('SPECIALSKINLIST_FOOT', $templates) || empty($templates['SPECIALSKINLIST_FOOT']) )
+ 			{
+ 				$template = "</ul>\n";
+ 			}
+ 			else
+ 			{
+ 				$template = $templates['SPECIALSKINLIST_FOOT'];
+ 			}
  			break;
  	}
- 	return;
+ 	
+ 	return Template::fill($template, $data);
  }
  
- function listplug_table_otherdraftlist($template, $type)
+ /**
+  * listplug_input_yesno()
+  *
+  * @param	string	$name			name of input element with radio type attribute
+  * @param	string	$checkedval		value which should be checked
+  * @param	integer	$tabindex		tabindex number
+  * @param	string	$value1			value of radio 1
+  * @param	string	$value2			value of radio 2
+  * @param	string	$yesval			label for yes
+  * @param	string	$noval			label for no
+  * @param	boolean	$isAdmin		super admin or not
+  * @param	string	$template_name	name of template
+  * @param	boolean	$showlist		used in showlist or not
+  * @return	string	marked-up string
+  */
+ function listplug_input_yesno($name, $checkedval, $tabindex = 0,
+ 	$value1 = 1, $value2 = 0, $yesval = _YES, $noval = _NO,
+ 	$isAdmin = 0, $template_name = '', $showlist = FALSE)
  {
- 	switch( $type )
+ 	global $manager;
+ 	
+ 	$templates = array();
+ 	if ( $template_name )
  	{
- 		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;
+ 		$templates =& $manager->getTemplate($template_name);
  	}
- 	return;
+ 	
+ 	if ( $name == 'admin' )
+ 	{
+ 		if ( !array_key_exists('INPUTYESNO_TEMPLATE_ADMIN', $templates) || empty($templates['INPUTYESNO_TEMPLATE_ADMIN']) )
+ 		{
+ 			$template = "<input type=\"radio\" id=\"<%yesid%>\" name=\"<%name%>\" value=\"<%yesval%>\" <%yescheckedval%> onclick=\"selectCanLogin(true);\" />\n"
+ 			          . "<label for=\"<%yesid%>\"><%yesvaltext%></label>\n"
+ 			          . "<input type=\"radio\" id=\"<%noid%>\" name=\"<%name%>\" value=\"<%noval%>\" <%nocheckedval%> <%disabled%> onclick=\"selectCanLogin(false);\" />\n"
+ 			          . "<label for=\"<%noid%>\"><%novaltext%></label>\n";
+ 		}
+ 		else
+ 		{
+ 			$template = $templates['INPUTYESNO_TEMPLATE_ADMIN'];
+ 		}
+ 	}
+ 	else
+ 	{
+ 		if ( array_key_exists('INPUTYESNO_TEMPLATE_NORMAL', $templates) && !empty($templates['INPUTYESNO_TEMPLATE_NORMAL']) )
+ 		{
+ 			$template = $templates['INPUTYESNO_TEMPLATE_NORMAL'];
+ 		}
+ 		else if ( $showlist && array_key_exists('SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO', $templates) && !empty($templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO']) )
+ 		{
+ 			$template = $templates['SHOWLIST_LISTPLUG_TABLE_PLGOPT_OYESNO'];
+ 		}
+ 		else
+ 		{
+ 		$template = "<input type=\"radio\" id=\"<%yesid%>\" name=\"<%name%>\" value=\"<%yesval%>\" <%yescheckedval%> />\n"
+ 		          . "<label for=\"<%yesid%>\"><%yesvaltext%></label>\n"
+ 		          . "<input type=\"radio\" id=\"<%noid%>\" name=\"<%name%>\" value=\"<%noval%>\" <%nocheckedval%> <%disabled%> />\n"
+ 		          . "<label for=\"<%noid%>\"><%novaltext%></label>\n";
+ 		}
+ 	}
+ 	
+ 	$id		= preg_replace('#[|]#', '-', $name);
+ 	$id1	= $id . $value1;
+ 	$id2	= $id . $value2;
+ 	$dat = array(
+ 		'name'			=> Entity::hsc($name),
+ 		'yesval'		=> Entity::hsc($value1),
+ 		'noval'			=> Entity::hsc($value2),
+ 		'yesid'			=> Entity::hsc($id1),
+ 		'noid'			=> Entity::hsc($id2),
+ 		'yesvaltext'	=> $yesval,
+ 		'novaltext'		=> $noval,
+ 		'yescheckedval'	=> ($checkedval == $value1) ? 'checked="checked" tabindex="' . $tabindex . '"': '',
+ 		'nocheckedval'	=> ($checkedval != $value1) ? 'checked="checked" tabindex="' . $tabindex . '"': '',
+ 		'disabled'		=> ($isAdmin && $name == 'canlogin') ? ' disabled="disabled"' : '',
+ 	);
+ 	
+ 	return Template::fill($template, $dat);
  }
  
- function listplug_table_actionlist($template, $type)
+ /**
+  * listplug_batchlist()
+  * 
+  * @param	string		$attr	item/member/team/category/comment
+  * @param	resource	$query	SQL resorce
+  * @param	string		$type	type for showlist()
+  * @param	array		$vars	array for variables
+  */
+ function listplug_batchlist($attr, $query, $type, $vars, $template_name)
  {
- 	switch( $type )
+ 	global $manager;
+ 	
+ 	/* HEAD */
+ 	$content = "<form method=\"post\" action=\"index.php\">\n";
+ 	
+ 	/* BODY */
+ 	$content .= showlist($query, $type, $vars, $template_name);
+ 	
+ 	/* FOOT */
+ 	switch ( $attr )
  	{
- 		case 'HEAD':
- 			echo '<th>' . _LISTS_TIME . "</th>\n";
- 			echo '<th>' . _LIST_ACTION_MSG . "</th>\n";
+ 		case 'item':
+ 			$options = array(
+ 				'delete'	=> _BATCH_ITEM_DELETE,
+ 				'move'		=> _BATCH_ITEM_MOVE
+ 			);
  			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";
+ 		case 'member':
+ 			$options = array(
+ 				'delete'	=> _BATCH_MEMBER_DELETE,
+ 				'setadmin'	=> _BATCH_MEMBER_SET_ADM,
+ 				'unsetadmin' => _BATCH_MEMBER_UNSET_ADM
+ 			);
+ 			break;
+ 		case 'team':
+ 			$options = array(
+ 				'delete' 	=> _BATCH_TEAM_DELETE,
+ 				'setadmin'	=> _BATCH_TEAM_SET_ADM,
+ 				'unsetadmin' => _BATCH_TEAM_UNSET_ADM,
+ 			);
+ 			break;
+ 		case 'category':
+ 			$options = array(
+ 				'delete'	=> _BATCH_CAT_DELETE,
+ 				'move'		=> _BATCH_CAT_MOVE,
+ 			);
+ 			break;
+ 		case 'comment':
+ 			$options = array(
+ 				'delete'	=> _BATCH_COMMENT_DELETE,
+ 			);
+ 			break;
+ 		default:
+ 			$options = array();
  			break;
  	}
- 	return;
+ 	
+ 	$content .= "<p class=\"batchoperations\">\n"
+ 	           . _BATCH_WITH_SEL
+ 	           . "<select name=\"batchaction\">\n";
+ 	
+ 	foreach ( $options as $option => $label )
+ 	{
+ 		$content .= "<option value=\"{$option}\">{$label}</option>\n";
+ 	}
+ 	$content .= "</select>\n";
+ 	
+ 	if ( $attr == 'team' )
+ 	{
+ 		$content .= '<input type="hidden" name="blogid" value="' . intRequestVar('blogid') . '" />';
+ 	}
+ 	else if ( $attr == 'comment' )
+ 	{
+ 		$content .= '<input type="hidden" name="itemid" value="' . intRequestVar('itemid') . '" />';
+ 	}
+ 	
+ 	$content .= '<input type="submit" value="' . _BATCH_EXEC . '" />'
+ 	           . "("
+ 	           . "<a href=\"\" onclick=\"if( event &amp;&amp; event.preventDefault ) event.preventDefault(); return batchSelectAll(1); \">" . _BATCH_SELECTALL . "</a>"
+ 	           . " - "
+ 	           . "<a href=\"\" onclick=\"if( event &amp;&amp; event.preventDefault ) event.preventDefault(); return batchSelectAll(0); \">" . _BATCH_DESELECTALL . "</a>"
+ 	           . ")\n"
+ 	           . "<input type=\"hidden\" name=\"action\" value=\"batch{$attr}\" />\n"
+ 	           . '<input type="hidden" name="ticket" value="' . Entity::hsc($manager->getNewTicket()) . '" />' . "\n"
+ 	           . "</p>\n"
+ 	           . "</form>\n";
+ 	
+ 	return $content;
  }
  
- function listplug_table_banlist($template, $type)
+ /**
+  * listplug_navlist()
+  * 
+  * @param	string		$attr			item/member/team/category/comment
+  * @param	resource	$query			SQL resorce
+  * @param	string		$type			type for showlist()
+  * @param	array		$vars			array for variables
+  * @param	string		$template_name	name of template
+  * @return	string		contents
+  */
+ function listplug_navlist($attribute, $query, $type, $vars, $template_name)
  {
- 	switch( $type )
+ 	global $CONF, $manager;
+ 	$dat['adminurl'] = $CONF['AdminURL'];
+ 	
+ 	$templates = array();
+ 	if ( $template_name )
  	{
- 		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;
+ 		$templates =& $manager->getTemplate($template_name);
  	}
- 	return;
+ 	
+ 	$dat['prev'] = $vars['start'] - $vars['amount'];
+ 	if ( $dat['prev'] < $vars['minamount'] )
+ 	{
+ 		$dat['prev'] = $vars['minamount'];
+ 	}
+ 	
+ 	$dat['next'] = $vars['start'] + $vars['amount'];
+ 	
+ 	$navi = "\n";
+ 	if ( !array_key_exists('SHOWLIST_LISTPLUG_TABLE_NAVILIST', $templates) || empty($templates['SHOWLIST_LISTPLUG_TABLE_NAVILIST']) )
+ 	{
+ 		$navi .= "<table frame=\"box\" rules=\"all\" sumamry=\"navigation actions\" class=\"navigation\">\n"
+ 		       . "<tr>\n";
+ 		$navi .= "<td>\n"
+ 		       . "<form method=\"post\" action=\"<%adminurl%>\">\n"
+ 		       . "<input type=\"hidden\" name=\"start\" value=\"<%prev%>\" />\n"
+ 		       . "<button type=\"submit\" name=\"action\" value=\"<%action%>\">&lt; &lt; <%listsprev%></button>\n"
+ 		       . "<input type=\"hidden\" name=\"blogid\" value=\"<%blogid%>\" />\n"
+ 		       . "<input type=\"hidden\" name=\"itemid\" value=\"<%itemid%>\" />\n"
+ 		       . "<input type=\"hidden\" name=\"search\" value=\"<%search%>\" />\n"
+ 		       . "<input type=\"hidden\" name=\"amount\" value=\"<%amount%>\" />\n"
+ 		       . "</form>\n"
+ 		       . "</td>\n";
+ 		$navi .= "<td>\n"
+ 		       . "<form method=\"post\" action=\"<%adminurl%>\">\n"
+ 		       . "<input type=\"text\" name=\"amount\" size=\"3\" value=\"<%amount%>\" />\n"
+ 		       . "<%listsperpage%>"
+ 		       . "<input type=\"hidden\" name=\"start\" value=\"0\" />\n"
+ 		       . "<button type=\"submit\" name=\"action\" value=\"<%action%>\">&gt; <%listschange%></button>\n"
+ 		       . "<input type=\"hidden\" name=\"blogid\" value=\"<%blogid%>\" />\n"
+ 		       . "<input type=\"hidden\" name=\"itemid\" value=\"<%itemid%>\" />\n"
+ 		       . "<input type=\"hidden\" name=\"search\" value=\"<%search%>\" />\n"
+ 		       . "<input type=\"hidden\" name=\"amount\" value=\"<%amount%>\" />\n"
+ 		       . "</form>\n"
+ 		       . "</td>\n";
+ 		$navi .= "<td>\n"
+ 		       . "<form method=\"post\" action=\"<%adminurl%>\">\n"
+ 		       . "<input type=\"text\" name=\"search\" value=\"<%search%>\" size=\"7\" />\n"
+ 		       . "<input type=\"hidden\" name=\"start\" value=\"0\" />\n"
+ 		       . "<button type=\"submit\" name=\"action\" value=\"<%action%>\">&gt; <%listssearch%></button>\n"
+ 		       . "<input type=\"hidden\" name=\"blogid\" value=\"<%blogid%>\" />\n"
+ 		       . "<input type=\"hidden\" name=\"itemid\" value=\"<%itemid%>\" />\n"
+ 		       . "<input type=\"hidden\" name=\"search\" value=\"<%search%>\" />\n"
+ 		       . "<input type=\"hidden\" name=\"amount\" value=\"<%amount%>\" />\n"
+ 		       . "</form>\n"
+ 		       . "</td>\n";
+ 		$navi .= "<td>\n"
+ 		       . "<form method=\"post\" action=\"<%adminurl%>\">\n"
+ 		       . "<input type=\"hidden\" name=\"start\" value=\"<%next%>\" />\n"
+ 		       . "<button type=\"submit\" name=\"action\" value=\"<%action%>\"><%listsnext%>&gt; &gt; </button>\n"
+ 		       . "<input type=\"hidden\" name=\"blogid\" value=\"<%blogid%>\" />\n"
+ 		       . "<input type=\"hidden\" name=\"itemid\" value=\"<%itemid%>\" />\n"
+ 		       . "<input type=\"hidden\" name=\"search\" value=\"<%search%>\" />\n"
+ 		       . "<input type=\"hidden\" name=\"amount\" value=\"<%amount%>\" />\n"
+ 		       . "</form>\n"
+ 		       . "</td>\n";
+ 		$navi .= "</tr>\n"
+ 		       . "</table>\n";
+ 	}
+ 	else
+ 	{
+ 		$navi .= $templates['SHOWLIST_LISTPLUG_TABLE_NAVILIST'];
+ 	}
+ 	$dat['listsprev']		= _LISTS_PREV;
+ 	$dat['listschange']		= _LISTS_CHANGE;
+ 	$dat['listssearch']		= _LISTS_SEARCH;
+ 	$dat['listsnext']		= _LISTS_NEXT;
+ 	$dat['listsperpage']	= _LISTS_PERPAGE;
+ 	/* HEAD */
+ 	$template = Template::fill($navi, $dat);
+ 	
+ 	/* BODY */
+ 	$template .= listplug_batchlist($attribute, $query, $type, $vars, $template_name);
+ 	
+ 	/* FOOT */
+ 	$template .= Template::fill($navi, $dat);
+ 	
+ 	return $template;
++>>>>>>> skinnable-master
  }
diff --combined nucleus/libs/skinie.php
index e15d0bd,8e7e8a1..03be6c1
--- a/nucleus/libs/skinie.php
+++ b/nucleus/libs/skinie.php
@@@ -1,744 -1,748 +1,1495 @@@
++<<<<<<< HEAD
 +<?php
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2002-2012 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)
 + */
 +/**
 + *	This class contains two classes that can be used for importing and
 + *	exporting Nucleus skins: SKINIMPORT and SKINEXPORT
 + *
 + * @license http://nucleuscms.org/license.txt GNU General Public License
 + * @copyright Copyright (C) 2002-2012 The Nucleus Group
 + * @version $Id: skinie.php 1624 2012-01-09 11:36:20Z sakamocchi $
 + */
 +
 +class SkinImport
 +{
 +	// hardcoded value (see constructor). When 1, interesting info about the
 +	// parsing process is sent to the output
 +	private $debug;
 +	
 +	// parser/file pointer
 +	private $parser;
 +	private $fp;
 +	
 +	// parset internal charset, US-ASCII/ISO-8859-1/UTF-8
 +	private $parse_charset = 'UTF-8';
 +	
 +	// which data has been read?
 +	private $metaDataRead;
 +	private $allRead;
 +	
 +	// extracted data
 +	private $skins;
 +	private $templates;
 +	private $info;
 +	
 +	// to maintain track of where we are inside the XML file
 +	private $inXml;
 +	private $inData;
 +	private $inMeta;
 +	private $inSkin;
 +	private $inTemplate;
 +	private $currentName;
 +	private $currentPartName;
 +	private $cdata;
 +	
 +	/**
 +	 * constructor initializes data structures
 +	 */
 +	public function __construct()
 +	{
 +		// disable magic_quotes_runtime if it's turned on
 +		//set_magic_quotes_runtime(0);
 +		if ( version_compare(PHP_VERSION, '5.3.0', '<') )
 +		{
 +			ini_set('magic_quotes_runtime', '0');
 +		}
 +		
 +		// debugging mode?
 +		$this->debug = 0;
 +		
 +		$this->reset();
 +		return;
 +	}
 +	
 +	public function __destruct()
 +	{
 +		return;
 +	}
 +	
 +	public function reset()
 +	{
 +		if ( $this->parser )
 +		{
 +			xml_parser_free($this->parser);
 +		}
 +		
 +		// XML file pointer
 +		$this->fp = 0;
 +		
 +		// which data has been read?
 +		$this->metaDataRead = 0;
 +		$this->allRead = 0;
 +		
 +		// to maintain track of where we are inside the XML file
 +		$this->inXml = 0;
 +		$this->inData = 0;
 +		$this->inMeta = 0;
 +		$this->inSkin = 0;
 +		$this->inTemplate = 0;
 +		$this->currentName = '';
 +		$this->currentPartName = '';
 +		
 +		// character data pile
 +		$this->cdata = '';
 +		
 +		// list of skinnames and templatenames (will be array of array)
 +		$this->skins = array();
 +		$this->templates = array();
 +		
 +		// extra info included in the XML files (e.g. installation notes)
 +		$this->info = '';
 +		
 +		// init XML parser, this parser deal with characters as encoded by UTF-8
 +		$this->parser = xml_parser_create($this->parse_charset);
 +		xml_set_object($this->parser, $this);
 +		xml_set_element_handler($this->parser, 'start_element', 'end_element');
 +		xml_set_character_data_handler($this->parser, 'character_data');
 +		xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
 +		
 +		return;
 +	}
 +	
 +	/**
 +	 * Reads an XML file into memory
 +	 *
 +	 * @param $filename
 +	 *		Which file to read
 +	 * @param $metaOnly
 +	 *		Set to 1 when only the metadata needs to be read (optional, default 0)
 +	 */
 +	public function readFile($filename, $metaOnly = 0)
 +	{
 +		// open file
 +		$this->fp = @fopen($filename, 'r');
 +		if ( !$this->fp )
 +		{
 +			return _SKINIE_ERROR_FAILEDOPEN_FILEURL;
 +		}
 +		
 +		// here we go!
 +		$this->inXml = 1;
 +		
 +		$tempbuffer = null;
 +		
 +		while ( !feof($this->fp) )
 +		{
 +			$tempbuffer .= fread($this->fp, 4096);
 +		}
 +		fclose($this->fp);
 +		
 +		/*
 +		 * NOTE: conver character set.
 +		 * We hope all characters in the file also includes UTF-8 coded character set,
 +		 *  because this PHP extension implements support for James Clark's expat in PHP
 +		 *   and it supports juust US-ASCII, ISO-8859-1, UTF-8 character coding scheme.
 +		 */
 +		if ( i18n::get_current_charset() != $this->parse_charset )
 +		{
 +			$tempbuffer = i18n::convert($tempbuffer, i18n::get_current_charset(), $this->parse_charset);
 +		}
 +		
 +		$temp = tmpfile();
 +		fwrite($temp, $tempbuffer);
 +		rewind($temp);
 +		
 +		while ( ($buffer = fread($temp, 4096) )
 +		 && (!$metaOnly || ($metaOnly && !$this->metaDataRead)) )
 +		 {
 +			$err = xml_parse( $this->parser, $buffer, feof($temp) );
 +			if ( !$err && $this->debug )
 +			{
 +				echo 'ERROR: ', xml_error_string(xml_get_error_code($this->parser)), '<br />';
 +			}
 +		}
 +		
 +		// all done
 +		$this->inXml = 0;
 +		fclose($temp);
 +		
 +		return;
 +	}
 +	
 +	/**
 +	 * Returns the list of skin names
 +	 */
 +	public function getSkinNames()
 +	{
 +		return array_keys($this->skins);
 +	}
 +	
 +	/**
 +	 * Returns the list of template names
 +	 */
 +	public function getTemplateNames()
 +	{
 +		return array_keys($this->templates);
 +	}
 +	
 +	/**
 +	 * Returns the extra information included in the XML file
 +	 */
 +	public function getInfo()
 +	{
 +		return $this->info;
 +	}
 +	
 +	/**
 +	 * Writes the skins and templates to the database
 +	 *
 +	 * @param $allowOverwrite
 +	 *		set to 1 when allowed to overwrite existing skins with the same name
 +	 *		(default = 0)
 +	 */
 +	public function writeToDatabase($allowOverwrite = 0)
 +	{
 +		$existingSkins = $this->checkSkinNameClashes();
 +		$existingTemplates = $this->checkTemplateNameClashes();
 +		$invalidSkinNames = $this->checkSkinNamesValid();
 +		$invalidTemplateNames = $this->checkTemplateNamesValid();
 +		
 +		// if there are invalid skin or template names, stop executioin and return and error
 +		if ( (sizeof($invalidSkinNames) > 0) || (sizeof($invalidTemplateNames) > 0) )
 +		{
 +			$inames_error = "<p>"._SKINIE_INVALID_NAMES_DETECTED."</p>\n";
 +			$inames_error .= "<ul>";
 +			foreach( $invalidSkinNames as $sName )
 +			{
 +				$inames_error .= "<li>".Entity::hsc($sName)."</li>";
 +			}
 +			foreach( $invalidTemplateNames as $sName )
 +			{
 +				$inames_error .= "<li>".Entity::hsc($sName)."</li>";
 +			}
 +			$inames_error .= "</ul>";
 +			return $inames_error;
 +		}
 +		
 +		// if not allowed to overwrite, check if any nameclashes exists
 +		if ( !$allowOverwrite )
 +		{
 +			if ( (sizeof($existingSkins) > 0) || (sizeof($existingTemplates) > 0) )
 +			{
 +				return _SKINIE_NAME_CLASHES_DETECTED;
 +			}
 +		}
 +		
 +		foreach ( $this->skins as $skinName => $data )
 +		{
 +			// 1. if exists: delete all part data, update desc data
 +			//    if not exists: create desc
 +			if ( in_array($skinName, $existingSkins) )
 +			{
 +				$skinObj = SKIN::createFromName($skinName);
 +				
 +				// delete all parts of the skin
 +				$skinObj->deleteAllParts();
 +				
 +				// update general info
 +				$skinObj->updateGeneralInfo(
 +					$skinName,
 +					$data['description'],
 +					$data['type'],
 +					$data['includeMode'],
 +					$data['includePrefix']
 +				);
 +			}
 +			else
 +			{
 +				$skinid = SKIN::createNew(
 +					$skinName,
 +					$data['description'],
 +					$data['type'],
 +					$data['includeMode'],
 +					$data['includePrefix']
 +				);
 +				$skinObj = new SKIN($skinid);
 +			}
 +			
 +			// 2. add parts
 +			foreach ( $data['parts'] as $partName => $partContent )
 +			{
 +				$skinObj->update($partName, $partContent);
 +			}
 +		}
 +		
 +		foreach ( $this->templates as $templateName => $data )
 +		{
 +			// 1. if exists: delete all part data, update desc data
 +			//    if not exists: create desc
 +			if ( in_array($templateName, $existingTemplates) )
 +			{
 +				$templateObj = Template::createFromName($templateName);
 +				
 +				// delete all parts of the template
 +				$templateObj->deleteAllParts();
 +				
 +				// update general info
 +				$templateObj->updateGeneralInfo($templateName, $data['description']);
 +			}
 +			else
 +			{
 +				$templateid = Template::createNew($templateName, $data['description']);
 +				$templateObj = new Template($templateid);
 +			}
 +			
 +			// 2. add parts
 +			foreach ( $data['parts'] as $partName => $partContent )
 +			{
 +				$templateObj->update($partName, $partContent);
 +			}
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	  * returns an array of all the skin nameclashes (empty array when no name clashes)
 +	  */
 +	public function checkSkinNameClashes()
 +	{
 +		$clashes = array();
 +		
 +		foreach ( $this->skins as $skinName => $data )
 +		{
 +			if ( SKIN::exists($skinName) )
 +			{
 +				array_push($clashes, $skinName);
 +			}
 +		}
 +		return $clashes;
 +	}
 +	
 +	/**
 +	  * returns an array of all the template nameclashes
 +	  * (empty array when no name clashes)
 +	  */
 +	public function checkTemplateNameClashes()
 +	{
 +		$clashes = array();
 +		
 +		foreach ( $this->templates as $templateName => $data )
 +		{
 +			if ( Template::exists($templateName) )
 +			{
 +				array_push($clashes, $templateName);
 +			}
 +		}
 +		return $clashes;
 +	}
 +	
 +	/**
 +	  * returns an array of all the invalid skin names (empty array when no invalid names )
 +	  */
 +	private function checkSkinNamesValid()
 +	{
 +		$notValid = array();
 +		
 +		foreach ( $this->skins as $skinName => $data )
 +		{
 +			if ( !isValidSkinName($skinName) )
 +			{
 +				array_push($notValid, $skinName);
 +			}
 +		}
 +		return $notValid;
 +	}
 +	
 +	/**
 +	  * returns an array of all the invalid template names (empty array when no invalid names )
 +	  */
 +	private function checkTemplateNamesValid()
 +	{
 +		$notValid = array();
 +		
 +		foreach ( $this->templates as $templateName => $data )
 +		{
 +			if ( !isValidTemplateName($templateName) )
 +			{
 +				array_push($notValid, $templateName);
 +			}
 +		}
 +		return $notValid;
 +	}
 +	
 +	/**
 +	 * Called by XML parser for each new start element encountered
 +	 */
 +	private function start_element($parser, $name, $attrs)
 +	{
 +		foreach( $attrs as $key=>$value )
 +		{
 +			if ( $this->parse_charset != i18n::get_current_charset() )
 +			{
 +				$name = i18n::convert($name, $this->parse_charset, i18n::get_current_charset());
 +				$value = i18n::convert($value, $this->parse_charset, i18n::get_current_charset());
 +			}
 +			
 +			$attrs[$key] = $value;
 +		}
 +		
 +		if ( $this->debug )
 +		{
 +			echo 'START: ', Entity::hsc($name), '<br />';
 +		}
 +		
 +		switch ( $name )
 +		{
 +			case 'nucleusskin':
 +				$this->inData = 1;
 +				break;
 +			case 'meta':
 +				$this->inMeta = 1;
 +				break;
 +			case 'info':
 +				// no action needed
 +				break;
 +			case 'skin':
 +				if ( !$this->inMeta )
 +				{
 +					$this->inSkin = 1;
 +					$this->currentName = $attrs['name'];
 +					$this->skins[$this->currentName]['type'] = $attrs['type'];
 +					$this->skins[$this->currentName]['includeMode'] = $attrs['includeMode'];
 +					$this->skins[$this->currentName]['includePrefix'] = $attrs['includePrefix'];
 +					$this->skins[$this->currentName]['parts'] = array();
 +				}
 +				else
 +				{
 +					$this->skins[$attrs['name']] = array();
 +					$this->skins[$attrs['name']]['parts'] = array();
 +				}
 +				break;
 +			case 'template':
 +				if ( !$this->inMeta )
 +				{
 +					$this->inTemplate = 1;
 +					$this->currentName = $attrs['name'];
 +					$this->templates[$this->currentName]['parts'] = array();
 +				}
 +				else
 +				{
 +					$this->templates[$attrs['name']] = array();
 +					$this->templates[$attrs['name']]['parts'] = array();
 +				}
 +				break;
 +			case 'description':
 +				// no action needed
 +				break;
 +			case 'part':
 +				$this->currentPartName = $attrs['name'];
 +				break;
 +			default:
 +				echo _SKINIE_SEELEMENT_UNEXPECTEDTAG . Entity::hsc($name) . '<br />';
 +				break;
 +		}
 +		// character data never contains other tags
 +		$this->clear_character_data();
 +		return;
 +	}
 +	
 +	/**
 +	  * Called by the XML parser for each closing tag encountered
 +	  */
 +	private function end_element($parser, $name)
 +	{
 +		if ( $this->debug )
 +		{
 +			echo 'END: ' . Entity::hsc($name) . '<br />';
 +		}
 +		
 +		if ( $this->parse_charset != i18n::get_current_charset() )
 +		{
 +			$name = i18n::convert($name, $this->parse_charset, i18n::get_current_charset());
 +			$charset_data = i18n::convert($this->get_character_data(), $this->parse_charset, i18n::get_current_charset());
 +		}
 +		else
 +		{
 +			$charset_data = $this->get_character_data();
 +		}
 +		
 +		switch ( $name )
 +		{
 +			case 'nucleusskin':
 +				$this->inData = 0;
 +				$this->allRead = 1;
 +				break;
 +			case 'meta':
 +				$this->inMeta = 0;
 +				$this->metaDataRead = 1;
 +				break;
 +			case 'info':
 +				$this->info = $charset_data;
 +			case 'skin':
 +				if ( !$this->inMeta )
 +				{
 +					$this->inSkin = 0;
 +				}
 +				break;
 +			case 'template':
 +				if ( !$this->inMeta )
 +				{
 +					$this->inTemplate = 0;
 +				}
 +				break;
 +			case 'description':
 +				if ( $this->inSkin )
 +				{
 +					$this->skins[$this->currentName]['description'] = $charset_data;
 +				}
 +				else
 +				{
 +					$this->templates[$this->currentName]['description'] = $charset_data;
 +				}
 +				break;
 +			case 'part':
 +				if ( $this->inSkin )
 +				{
 +					$this->skins[$this->currentName]['parts'][$this->currentPartName] = $charset_data;
 +				}
 +				else
 +				{
 +					$this->templates[$this->currentName]['parts'][$this->currentPartName] = $charset_data;
 +				}
 +				break;
 +			default:
 +				echo _SKINIE_SEELEMENT_UNEXPECTEDTAG . Entity::hsc($name) . '<br />';
 +				break;
 +		}
 +		$this->clear_character_data();
 +		return;
 +	}
 +	
 +	/**
 +	 * Called by XML parser for data inside elements
 +	 */
 +	private function character_data ($parser, $data)
 +	{
 +		if ( $this->debug )
 +		{
 +			echo 'NEW DATA: ' . Entity::hsc($data) . '<br />';
 +		}
 +		$this->cdata .= $data;
 +		return;
 +	}
 +	
 +	/**
 +	 * Returns the data collected so far
 +	 */
 +	private function get_character_data()
 +	{
 +		return $this->cdata;
 +	}
 +	
 +	/**
 +	 * Clears the data buffer
 +	 */
 +	private function clear_character_data()
 +	{
 +		$this->cdata = '';
 +		return;
 +	}
 +	
 +	/**
 +	 * Static method that looks for importable XML files in subdirs of the given dir
 +	 */
 +	static public function searchForCandidates($dir)
 +	{
 +		$candidates = array();
 +		
 +		$dirhandle = opendir($dir);
 +		while ( $filename = readdir($dirhandle) )
 +		{
 +			if ( @is_dir($dir . $filename) && ($filename != '.') && ($filename != '..') )
 +			{
 +				$xml_file = $dir . $filename . '/skinbackup.xml';
 +				if ( file_exists($xml_file) && is_readable($xml_file) )
 +				{
 +					//$xml_file;
 +					$candidates[$filename] = $filename;
 +				}
 +				
 +				// backwards compatibility
 +				$xml_file = $dir . $filename . '/skindata.xml';
 +				if ( file_exists($xml_file) && is_readable($xml_file) )
 +				{
 +					//$xml_file;
 +					$candidates[$filename] = $filename;
 +				}
 +			}
 +		}
 +		closedir($dirhandle);
 +		return $candidates;
 +	}
 +}
 +
 +class SkinExport
 +{
 +	private $templates;
 +	private $skins;
 +	private $info;
 +	
 +	/**
 +	 * Constructor initializes data structures
 +	 */
 +	public function __construct()
 +	{
 +		// list of templateIDs to export
 +		$this->templates = array();
 +		
 +		// list of skinIDs to export
 +		$this->skins = array();
 +		
 +		// extra info to be in XML file
 +		$this->info = '';
 +	}
 +	
 +	/**
 +	 * Adds a template to be exported
 +	 *
 +	 * @param id
 +	 *		template ID
 +	 * @result false when no such ID exists
 +	 */
 +	public function addTemplate($id)
 +	{
 +		if ( !Template::existsID($id) )
 +		{
 +			return 0;
 +		}
 +		
 +		$this->templates[$id] = Template::getNameFromId($id);
 +		return 1;
 +	}
 +	
 +	/**
 +	 * Adds a skin to be exported
 +	 *
 +	 * @param id
 +	 *		skin ID
 +	 * @result false when no such ID exists
 +	 */
 +	public function addSkin($id)
 +	{
 +		if ( !SKIN::existsID($id) )
 +		{
 +			return 0;
 +		}
 +		
 +		$this->skins[$id] = SKIN::getNameFromId($id);
 +		return 1;
 +	}
 +	
 +	/**
 +	 * Sets the extra info to be included in the exported file
 +	 */
 +	public function setInfo($info)
 +	{
 +		$this->info = $info;
 +	}
 +	
 +	/**
 +	 * Outputs the XML contents of the export file
 +	 *
 +	 * @param $setHeaders
 +	 *		set to 0 if you don't want to send out headers
 +	 *		(optional, default 1)
 +	 */
 +	public function export($setHeaders = 1)
 +	{
 +		if ( $setHeaders )
 +		{
 +			// make sure the mimetype is correct, and that the data does not show up
 +			// in the browser, but gets saved into and XML file (popup download window)
 +			header('Content-Type: text/xml; charset=' . i18n::get_current_charset());
 +			header('Content-Disposition: attachment; filename="skinbackup.xml"');
 +			header('Expires: 0');
 +			header('Pragma: no-cache');
 +		}
 +		
 +		echo "<nucleusskin>\n";
 +		
 +		// meta
 +		echo "\t<meta>\n";
 +		// skins
 +		foreach ( $this->skins as $skinId => $skinName )
 +		{
 +			echo "\t\t" . '<skin name="' . Entity::hsc($skinName) . '" />' . "\n";
 +		}
 +		// templates
 +		foreach ( $this->templates as $templateId => $templateName )
 +		{
 +			echo "\t\t" . '<template name="' . Entity::hsc($templateName) . '" />' . "\n";
 +		}
 +		// extra info
 +		if ( $this->info )
 +		{
 +			echo "\t\t<info><![CDATA[" . $this->info . "]]></info>\n";
 +		}
 +		echo "\t</meta>\n\n\n";
 +		
 +		// contents skins
 +		foreach ($this->skins as $skinId => $skinName)
 +		{
 +			$skinId = intval($skinId);
 +			$skinObj = new SKIN($skinId);
 +			
 +			echo "\t" . '<skin name="' . Entity::hsc($skinName) . '" type="' . Entity::hsc($skinObj->getContentType()) . '" includeMode="' . Entity::hsc($skinObj->getIncludeMode()) . '" includePrefix="' . Entity::hsc($skinObj->getIncludePrefix()) . '">' . "\n";
 +			echo "\t\t<description>" . Entity::hsc($skinObj->getDescription()) . "</description>\n";
 +			
 +			$res = DB::getResult('SELECT stype, scontent FROM '. sql_table('skin') .' WHERE sdesc=' . $skinId);
 +			foreach ( $res as $row )
 +			{
 +				echo "\t\t" . '<part name="',Entity::hsc($row['stype']) . '">';
 +				echo '<![CDATA[' . $this->escapeCDATA($row['scontent']) . ']]>';
 +				echo "</part>\n\n";
 +			}
 +			echo "\t</skin>\n\n\n";
 +		}
 +		
 +		// contents templates
 +		foreach ( $this->templates as $templateId => $templateName )
 +		{
 +			$templateId = intval($templateId);
 +			
 +			echo "\t" . '<template name="' . Entity::hsc($templateName) . '">' . "\n";
 +			echo "\t\t<description>" . Entity::hsc(Template::getDesc($templateId)) . "</description>\n";
 +			
 +			$res = DB::getResult('SELECT tpartname, tcontent FROM '. sql_table('template') .' WHERE tdesc=' . $templateId);
 +			foreach ( $res as $row )
 +			{
 +				echo "\t\t" . '<part name="' . Entity::hsc($row['tpartname']) . '">';
 +				echo '<![CDATA[' . $this->escapeCDATA($row['tcontent']) . ']]>';
 +				echo "</part>\n\n";
 +			}
 +			
 +			echo "\t</template>\n\n\n";
 +		}
 +		echo '</nucleusskin>';
 +	}
 +	
 +	/**
 +	 * Escapes CDATA content so it can be included in another CDATA section
 +	 */
 +	private function escapeCDATA($cdata)
 +	{
 +		return preg_replace('/]]>/', ']]]]><![CDATA[>', $cdata);
 +	}
 +}
++=======
+ <?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)
+  */
+ /**
+  *	This class contains two classes that can be used for importing and
+  *	exporting Nucleus skins: SKINIMPORT and SKINEXPORT
+  *
+  * @license http://nucleuscms.org/license.txt GNU General Public License
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: skinie.php 1883 2012-06-17 07:55:47Z sakamocchi $
+  */
+ 
+ class SkinImport
+ {
+ 	// hardcoded value (see constructor). When 1, interesting info about the
+ 	// parsing process is sent to the output
+ 	private $debug;
+ 	
+ 	// parser/file pointer
+ 	private $parser;
+ 	private $fp;
+ 	
+ 	// parset internal charset, US-ASCII/ISO-8859-1/UTF-8
+ 	private $parse_charset = 'UTF-8';
+ 	
+ 	// which data has been read?
+ 	private $metaDataRead;
+ 	private $allRead;
+ 	
+ 	// extracted data
+ 	private $skins;
+ 	private $templates;
+ 	private $info;
+ 	
+ 	// to maintain track of where we are inside the XML file
+ 	private $inXml;
+ 	private $inData;
+ 	private $inMeta;
+ 	private $inSkin;
+ 	private $inTemplate;
+ 	private $currentName;
+ 	private $currentPartName;
+ 	private $cdata;
+ 	
+ 	/**
+ 	 * constructor initializes data structures
+ 	 */
+ 	public function __construct()
+ 	{
+ 		// disable magic_quotes_runtime if it's turned on
+ 		//set_magic_quotes_runtime(0);
+ 		if ( version_compare(PHP_VERSION, '5.3.0', '<') )
+ 		{
+ 			ini_set('magic_quotes_runtime', '0');
+ 		}
+ 		
+ 		// debugging mode?
+ 		$this->debug = 0;
+ 		
+ 		$this->reset();
+ 		return;
+ 	}
+ 	
+ 	public function __destruct()
+ 	{
+ 		return;
+ 	}
+ 	
+ 	public function reset()
+ 	{
+ 		if ( $this->parser )
+ 		{
+ 			xml_parser_free($this->parser);
+ 		}
+ 		
+ 		// XML file pointer
+ 		$this->fp = 0;
+ 		
+ 		// which data has been read?
+ 		$this->metaDataRead = 0;
+ 		$this->allRead = 0;
+ 		
+ 		// to maintain track of where we are inside the XML file
+ 		$this->inXml = 0;
+ 		$this->inData = 0;
+ 		$this->inMeta = 0;
+ 		$this->inSkin = 0;
+ 		$this->inTemplate = 0;
+ 		$this->currentName = '';
+ 		$this->currentPartName = '';
+ 		
+ 		// character data pile
+ 		$this->cdata = '';
+ 		
+ 		// list of skinnames and templatenames (will be array of array)
+ 		$this->skins = array();
+ 		$this->templates = array();
+ 		
+ 		// extra info included in the XML files (e.g. installation notes)
+ 		$this->info = '';
+ 		
+ 		// init XML parser, this parser deal with characters as encoded by UTF-8
+ 		$this->parser = xml_parser_create($this->parse_charset);
+ 		xml_set_object($this->parser, $this);
+ 		xml_set_element_handler($this->parser, 'start_element', 'end_element');
+ 		xml_set_character_data_handler($this->parser, 'character_data');
+ 		xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
+ 		
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Reads an XML file into memory
+ 	 *
+ 	 * @param $filename
+ 	 *		Which file to read
+ 	 * @param $metaOnly
+ 	 *		Set to 1 when only the metadata needs to be read (optional, default 0)
+ 	 */
+ 	public function readFile($filename, $metaOnly = 0)
+ 	{
+ 		// open file
+ 		$this->fp = @fopen($filename, 'r');
+ 		if ( !$this->fp )
+ 		{
+ 			return _SKINIE_ERROR_FAILEDOPEN_FILEURL;
+ 		}
+ 		
+ 		// here we go!
+ 		$this->inXml = 1;
+ 		
+ 		$tempbuffer = null;
+ 		
+ 		while ( !feof($this->fp) )
+ 		{
+ 			$tempbuffer .= fread($this->fp, 4096);
+ 		}
+ 		fclose($this->fp);
+ 		
+ 		/*
+ 		 * NOTE: conver character set.
+ 		 * We hope all characters in the file also includes UTF-8 coded character set,
+ 		 *  because this PHP extension implements support for James Clark's expat in PHP
+ 		 *   and it supports juust US-ASCII, ISO-8859-1, UTF-8 character coding scheme.
+ 		 */
+ 		if ( i18n::get_current_charset() != $this->parse_charset )
+ 		{
+ 			$tempbuffer = i18n::convert($tempbuffer, i18n::get_current_charset(), $this->parse_charset);
+ 		}
+ 		
+ 		$temp = tmpfile();
+ 		fwrite($temp, $tempbuffer);
+ 		rewind($temp);
+ 		
+ 		while ( ($buffer = fread($temp, 4096) )
+ 		 && (!$metaOnly || ($metaOnly && !$this->metaDataRead)) )
+ 		 {
+ 			$err = xml_parse( $this->parser, $buffer, feof($temp) );
+ 			if ( !$err && $this->debug )
+ 			{
+ 				echo 'ERROR: ', xml_error_string(xml_get_error_code($this->parser)), '<br />';
+ 			}
+ 		}
+ 		
+ 		// all done
+ 		$this->inXml = 0;
+ 		fclose($temp);
+ 		
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Returns the list of skin names
+ 	 */
+ 	public function getSkinNames()
+ 	{
+ 		return array_keys($this->skins);
+ 	}
+ 	
+ 	/**
+ 	 * Returns the list of template names
+ 	 */
+ 	public function getTemplateNames()
+ 	{
+ 		return array_keys($this->templates);
+ 	}
+ 	
+ 	/**
+ 	 * Returns the extra information included in the XML file
+ 	 */
+ 	public function getInfo()
+ 	{
+ 		return $this->info;
+ 	}
+ 	
+ 	/**
+ 	 * Writes the skins and templates to the database
+ 	 *
+ 	 * @param $allowOverwrite
+ 	 *		set to 1 when allowed to overwrite existing skins with the same name
+ 	 *		(default = 0)
+ 	 */
+ 	public function writeToDatabase($allowOverwrite = 0)
+ 	{
+ 		global $manager;
+ 		
+ 		$existingSkins = $this->checkSkinNameClashes();
+ 		$existingTemplates = $this->checkTemplateNameClashes();
+ 		$invalidSkinNames = $this->checkSkinNamesValid();
+ 		$invalidTemplateNames = $this->checkTemplateNamesValid();
+ 		
+ 		// if there are invalid skin or template names, stop executioin and return and error
+ 		if ( (sizeof($invalidSkinNames) > 0) || (sizeof($invalidTemplateNames) > 0) )
+ 		{
+ 			$inames_error = "<p>"._SKINIE_INVALID_NAMES_DETECTED."</p>\n";
+ 			$inames_error .= "<ul>";
+ 			foreach( $invalidSkinNames as $sName )
+ 			{
+ 				$inames_error .= "<li>".Entity::hsc($sName)."</li>";
+ 			}
+ 			foreach( $invalidTemplateNames as $sName )
+ 			{
+ 				$inames_error .= "<li>".Entity::hsc($sName)."</li>";
+ 			}
+ 			$inames_error .= "</ul>";
+ 			return $inames_error;
+ 		}
+ 		
+ 		// if not allowed to overwrite, check if any nameclashes exists
+ 		if ( !$allowOverwrite )
+ 		{
+ 			if ( (sizeof($existingSkins) > 0) || (sizeof($existingTemplates) > 0) )
+ 			{
+ 				return _SKINIE_NAME_CLASHES_DETECTED;
+ 			}
+ 		}
+ 		
+ 		foreach ( $this->skins as $skinName => $data )
+ 		{
+ 			// 1. if exists: delete all part data, update desc data
+ 			//    if not exists: create desc
+ 			if ( in_array($skinName, $existingSkins) )
+ 			{
+ 				$skinObj = SKIN::createFromName($skinName);
+ 				
+ 				// delete all parts of the skin
+ 				$skinObj->deleteAllParts();
+ 				
+ 				// update general info
+ 				$skinObj->updateGeneralInfo(
+ 					$skinName,
+ 					$data['description'],
+ 					$data['type'],
+ 					$data['includeMode'],
+ 					$data['includePrefix']
+ 				);
+ 			}
+ 			else
+ 			{
+ 				$skinid = SKIN::createNew(
+ 					$skinName,
+ 					$data['description'],
+ 					$data['type'],
+ 					$data['includeMode'],
+ 					$data['includePrefix']
+ 				);
+ 				$skinObj =& $manager->getSkin($skinid);
+ 			}
+ 			
+ 			// 2. add parts
+ 			foreach ( $data['parts'] as $partName => $partContent )
+ 			{
+ 				$skinObj->update($partName, $partContent);
+ 			}
+ 		}
+ 		
+ 		foreach ( $this->templates as $templateName => $data )
+ 		{
+ 			// 1. if exists: delete all part data, update desc data
+ 			//    if not exists: create desc
+ 			if ( in_array($templateName, $existingTemplates) )
+ 			{
+ 				$templateObj = Template::createFromName($templateName);
+ 				
+ 				// delete all parts of the template
+ 				$templateObj->deleteAllParts();
+ 				
+ 				// update general info
+ 				$templateObj->updateGeneralInfo($templateName, $data['description']);
+ 			}
+ 			else
+ 			{
+ 				$templateid = Template::createNew($templateName, $data['description']);
+ 				$templateObj = new Template($templateid);
+ 			}
+ 			
+ 			// 2. add parts
+ 			foreach ( $data['parts'] as $partName => $partContent )
+ 			{
+ 				$templateObj->update($partName, $partContent);
+ 			}
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	  * returns an array of all the skin nameclashes (empty array when no name clashes)
+ 	  */
+ 	public function checkSkinNameClashes()
+ 	{
+ 		$clashes = array();
+ 		
+ 		foreach ( $this->skins as $skinName => $data )
+ 		{
+ 			if ( SKIN::exists($skinName) )
+ 			{
+ 				array_push($clashes, $skinName);
+ 			}
+ 		}
+ 		return $clashes;
+ 	}
+ 	
+ 	/**
+ 	  * returns an array of all the template nameclashes
+ 	  * (empty array when no name clashes)
+ 	  */
+ 	public function checkTemplateNameClashes()
+ 	{
+ 		$clashes = array();
+ 		
+ 		foreach ( $this->templates as $templateName => $data )
+ 		{
+ 			if ( Template::exists($templateName) )
+ 			{
+ 				array_push($clashes, $templateName);
+ 			}
+ 		}
+ 		return $clashes;
+ 	}
+ 	
+ 	/**
+ 	  * returns an array of all the invalid skin names (empty array when no invalid names )
+ 	  */
+ 	private function checkSkinNamesValid()
+ 	{
+ 		$notValid = array();
+ 		
+ 		foreach ( $this->skins as $skinName => $data )
+ 		{
+ 			if ( !isValidSkinName($skinName) )
+ 			{
+ 				array_push($notValid, $skinName);
+ 			}
+ 		}
+ 		return $notValid;
+ 	}
+ 	
+ 	/**
+ 	  * returns an array of all the invalid template names (empty array when no invalid names )
+ 	  */
+ 	private function checkTemplateNamesValid()
+ 	{
+ 		$notValid = array();
+ 		
+ 		foreach ( $this->templates as $templateName => $data )
+ 		{
+ 			if ( !isValidTemplateName($templateName) )
+ 			{
+ 				array_push($notValid, $templateName);
+ 			}
+ 		}
+ 		return $notValid;
+ 	}
+ 	
+ 	/**
+ 	 * Called by XML parser for each new start element encountered
+ 	 */
+ 	private function start_element($parser, $name, $attrs)
+ 	{
+ 		foreach( $attrs as $key=>$value )
+ 		{
+ 			if ( $this->parse_charset != i18n::get_current_charset() )
+ 			{
+ 				$name = i18n::convert($name, $this->parse_charset, i18n::get_current_charset());
+ 				$value = i18n::convert($value, $this->parse_charset, i18n::get_current_charset());
+ 			}
+ 			
+ 			$attrs[$key] = $value;
+ 		}
+ 		
+ 		if ( $this->debug )
+ 		{
+ 			echo 'START: ', Entity::hsc($name), '<br />';
+ 		}
+ 		
+ 		switch ( $name )
+ 		{
+ 			case 'nucleusskin':
+ 				$this->inData = 1;
+ 				break;
+ 			case 'meta':
+ 				$this->inMeta = 1;
+ 				break;
+ 			case 'info':
+ 				// no action needed
+ 				break;
+ 			case 'skin':
+ 				if ( !$this->inMeta )
+ 				{
+ 					$this->inSkin = 1;
+ 					$this->currentName = $attrs['name'];
+ 					$this->skins[$this->currentName]['type'] = $attrs['type'];
+ 					$this->skins[$this->currentName]['includeMode'] = $attrs['includeMode'];
+ 					$this->skins[$this->currentName]['includePrefix'] = $attrs['includePrefix'];
+ 					$this->skins[$this->currentName]['parts'] = array();
+ 				}
+ 				else
+ 				{
+ 					$this->skins[$attrs['name']] = array();
+ 					$this->skins[$attrs['name']]['parts'] = array();
+ 				}
+ 				break;
+ 			case 'template':
+ 				if ( !$this->inMeta )
+ 				{
+ 					$this->inTemplate = 1;
+ 					$this->currentName = $attrs['name'];
+ 					$this->templates[$this->currentName]['parts'] = array();
+ 				}
+ 				else
+ 				{
+ 					$this->templates[$attrs['name']] = array();
+ 					$this->templates[$attrs['name']]['parts'] = array();
+ 				}
+ 				break;
+ 			case 'description':
+ 				// no action needed
+ 				break;
+ 			case 'part':
+ 				$this->currentPartName = $attrs['name'];
+ 				break;
+ 			default:
+ 				echo _SKINIE_SEELEMENT_UNEXPECTEDTAG . Entity::hsc($name) . '<br />';
+ 				break;
+ 		}
+ 		// character data never contains other tags
+ 		$this->clear_character_data();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	  * Called by the XML parser for each closing tag encountered
+ 	  */
+ 	private function end_element($parser, $name)
+ 	{
+ 		if ( $this->debug )
+ 		{
+ 			echo 'END: ' . Entity::hsc($name) . '<br />';
+ 		}
+ 		
+ 		if ( $this->parse_charset != i18n::get_current_charset() )
+ 		{
+ 			$name = i18n::convert($name, $this->parse_charset, i18n::get_current_charset());
+ 			$charset_data = i18n::convert($this->get_character_data(), $this->parse_charset, i18n::get_current_charset());
+ 		}
+ 		else
+ 		{
+ 			$charset_data = $this->get_character_data();
+ 		}
+ 		
+ 		switch ( $name )
+ 		{
+ 			case 'nucleusskin':
+ 				$this->inData = 0;
+ 				$this->allRead = 1;
+ 				break;
+ 			case 'meta':
+ 				$this->inMeta = 0;
+ 				$this->metaDataRead = 1;
+ 				break;
+ 			case 'info':
+ 				$this->info = $charset_data;
+ 			case 'skin':
+ 				if ( !$this->inMeta )
+ 				{
+ 					$this->inSkin = 0;
+ 				}
+ 				break;
+ 			case 'template':
+ 				if ( !$this->inMeta )
+ 				{
+ 					$this->inTemplate = 0;
+ 				}
+ 				break;
+ 			case 'description':
+ 				if ( $this->inSkin )
+ 				{
+ 					$this->skins[$this->currentName]['description'] = $charset_data;
+ 				}
+ 				else
+ 				{
+ 					$this->templates[$this->currentName]['description'] = $charset_data;
+ 				}
+ 				break;
+ 			case 'part':
+ 				if ( $this->inSkin )
+ 				{
+ 					$this->skins[$this->currentName]['parts'][$this->currentPartName] = $charset_data;
+ 				}
+ 				else
+ 				{
+ 					$this->templates[$this->currentName]['parts'][$this->currentPartName] = $charset_data;
+ 				}
+ 				break;
+ 			default:
+ 				echo _SKINIE_SEELEMENT_UNEXPECTEDTAG . Entity::hsc($name) . '<br />';
+ 				break;
+ 		}
+ 		$this->clear_character_data();
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Called by XML parser for data inside elements
+ 	 */
+ 	private function character_data ($parser, $data)
+ 	{
+ 		if ( $this->debug )
+ 		{
+ 			echo 'NEW DATA: ' . Entity::hsc($data) . '<br />';
+ 		}
+ 		$this->cdata .= $data;
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Returns the data collected so far
+ 	 */
+ 	private function get_character_data()
+ 	{
+ 		return $this->cdata;
+ 	}
+ 	
+ 	/**
+ 	 * Clears the data buffer
+ 	 */
+ 	private function clear_character_data()
+ 	{
+ 		$this->cdata = '';
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * Static method that looks for importable XML files in subdirs of the given dir
+ 	 */
+ 	static public function searchForCandidates($dir)
+ 	{
+ 		$candidates = array();
+ 		
+ 		$dirhandle = opendir($dir);
+ 		while ( $filename = readdir($dirhandle) )
+ 		{
+ 			if ( @is_dir($dir . $filename) && ($filename != '.') && ($filename != '..') )
+ 			{
+ 				$xml_file = $dir . $filename . '/skinbackup.xml';
+ 				if ( file_exists($xml_file) && is_readable($xml_file) )
+ 				{
+ 					//$xml_file;
+ 					$candidates[$filename] = $filename;
+ 				}
+ 				
+ 				// backwards compatibility
+ 				$xml_file = $dir . $filename . '/skindata.xml';
+ 				if ( file_exists($xml_file) && is_readable($xml_file) )
+ 				{
+ 					//$xml_file;
+ 					$candidates[$filename] = $filename;
+ 				}
+ 			}
+ 		}
+ 		closedir($dirhandle);
+ 		return $candidates;
+ 	}
+ }
+ 
+ class SkinExport
+ {
+ 	private $templates;
+ 	private $skins;
+ 	private $info;
+ 	
+ 	/**
+ 	 * Constructor initializes data structures
+ 	 */
+ 	public function __construct()
+ 	{
+ 		// list of templateIDs to export
+ 		$this->templates = array();
+ 		
+ 		// list of skinIDs to export
+ 		$this->skins = array();
+ 		
+ 		// extra info to be in XML file
+ 		$this->info = '';
+ 	}
+ 	
+ 	/**
+ 	 * Adds a template to be exported
+ 	 *
+ 	 * @param id
+ 	 *		template ID
+ 	 * @result false when no such ID exists
+ 	 */
+ 	public function addTemplate($id)
+ 	{
+ 		if ( !Template::existsID($id) )
+ 		{
+ 			return 0;
+ 		}
+ 		
+ 		$this->templates[$id] = Template::getNameFromId($id);
+ 		return 1;
+ 	}
+ 	
+ 	/**
+ 	 * Adds a skin to be exported
+ 	 *
+ 	 * @param id
+ 	 *		skin ID
+ 	 * @result false when no such ID exists
+ 	 */
+ 	public function addSkin($id)
+ 	{
+ 		if ( !SKIN::existsID($id) )
+ 		{
+ 			return 0;
+ 		}
+ 		
+ 		$this->skins[$id] = SKIN::getNameFromId($id);
+ 		return 1;
+ 	}
+ 	
+ 	/**
+ 	 * Sets the extra info to be included in the exported file
+ 	 */
+ 	public function setInfo($info)
+ 	{
+ 		$this->info = $info;
+ 	}
+ 	
+ 	/**
+ 	 * Outputs the XML contents of the export file
+ 	 *
+ 	 * @param $setHeaders
+ 	 *		set to 0 if you don't want to send out headers
+ 	 *		(optional, default 1)
+ 	 */
+ 	public function export($setHeaders = 1)
+ 	{
+ 		global $manager;
+ 		
+ 		if ( $setHeaders )
+ 		{
+ 			// make sure the mimetype is correct, and that the data does not show up
+ 			// in the browser, but gets saved into and XML file (popup download window)
+ 			header('Content-Type: text/xml; charset=' . i18n::get_current_charset());
+ 			header('Content-Disposition: attachment; filename="skinbackup.xml"');
+ 			header('Expires: 0');
+ 			header('Pragma: no-cache');
+ 		}
+ 		
+ 		echo "<nucleusskin>\n";
+ 		
+ 		// meta
+ 		echo "\t<meta>\n";
+ 		// skins
+ 		foreach ( $this->skins as $skinId => $skinName )
+ 		{
+ 			echo "\t\t" . '<skin name="' . Entity::hsc($skinName) . '" />' . "\n";
+ 		}
+ 		// templates
+ 		foreach ( $this->templates as $templateId => $templateName )
+ 		{
+ 			echo "\t\t" . '<template name="' . Entity::hsc($templateName) . '" />' . "\n";
+ 		}
+ 		// extra info
+ 		if ( $this->info )
+ 		{
+ 			echo "\t\t<info><![CDATA[" . $this->info . "]]></info>\n";
+ 		}
+ 		echo "\t</meta>\n\n\n";
+ 		
+ 		// contents skins
+ 		foreach ($this->skins as $skinId => $skinName)
+ 		{
+ 			$skinId = (integer) $skinId;
+ 			$skinObj =& $manager->getSkin($skinId);
+ 			
+ 			echo "\t" . '<skin name="' . Entity::hsc($skinName) . '" type="' . Entity::hsc($skinObj->getContentType()) . '" includeMode="' . Entity::hsc($skinObj->getIncludeMode()) . '" includePrefix="' . Entity::hsc($skinObj->getIncludePrefix()) . '">' . "\n";
+ 			echo "\t\t<description>" . Entity::hsc($skinObj->getDescription()) . "</description>\n";
+ 			
+ 			$res = DB::getResult('SELECT stype, scontent FROM '. sql_table('skin') .' WHERE sdesc=' . $skinId);
+ 			foreach ( $res as $row )
+ 			{
+ 				echo "\t\t" . '<part name="',Entity::hsc($row['stype']) . '">';
+ 				echo '<![CDATA[' . $this->escapeCDATA($row['scontent']) . ']]>';
+ 				echo "</part>\n\n";
+ 			}
+ 			echo "\t</skin>\n\n\n";
+ 		}
+ 		
+ 		// contents templates
+ 		foreach ( $this->templates as $templateId => $templateName )
+ 		{
+ 			$templateId = intval($templateId);
+ 			
+ 			echo "\t" . '<template name="' . Entity::hsc($templateName) . '">' . "\n";
+ 			echo "\t\t<description>" . Entity::hsc(Template::getDesc($templateId)) . "</description>\n";
+ 			
+ 			$res = DB::getResult('SELECT tpartname, tcontent FROM '. sql_table('template') .' WHERE tdesc=' . $templateId);
+ 			foreach ( $res as $row )
+ 			{
+ 				echo "\t\t" . '<part name="' . Entity::hsc($row['tpartname']) . '">';
+ 				echo '<![CDATA[' . $this->escapeCDATA($row['tcontent']) . ']]>';
+ 				echo "</part>\n\n";
+ 			}
+ 			
+ 			echo "\t</template>\n\n\n";
+ 		}
+ 		echo '</nucleusskin>';
+ 	}
+ 	
+ 	/**
+ 	 * Escapes CDATA content so it can be included in another CDATA section
+ 	 */
+ 	private function escapeCDATA($cdata)
+ 	{
+ 		return preg_replace('/]]>/', ']]]]><![CDATA[>', $cdata);
+ 	}
 -}
++}
++>>>>>>> skinnable-master
diff --combined nucleus/libs/sql/DB.php
index bc0dd90,18b9898..d8f1d5a
--- a/nucleus/libs/sql/DB.php
+++ b/nucleus/libs/sql/DB.php
@@@ -1,319 -1,318 +1,640 @@@
++<<<<<<< HEAD
 +<?php
 +
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2012 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) 2012 The Nucleus Group
 + * @version $Id$
 + */
 +
 +class DB
 +{
 +	private static $dbh;
 +	private static $execCount = 0;
 +	private static $dateFormat = '\'%Y-%m-%d %H:%M:%S\'';
 +	
 +	/**
 +	 * DB::setConnectionInfo()
 +	 * Set the information to connect to the database, it will attempt to connect.
 +	 * @param string $engine Engine
 +	 * @param string $host Host
 +	 * @param string $user User
 +	 * @param string $password Password
 +	 * @param string $database Database
 +	 * @return bool Returns TRUE if able to connect, otherwise it returns FALSE.
 +	 */
 +	public static function setConnectionInfo($engine, $host, $user, $password, $database)
 +	{
 +		self::disConnect();
 +
 +		try
 +		{
 +			if ( i18n::strpos($host, ':') === false )
 +			{
 +				$portnum = '';
 +			}
 +			else
 +			{
 +				list($host, $portnum) = i18n::explode(":", $host);
 +				if ( isset($portnum) )
 +				{
 +					$portnum = trim($portnum);
 +				}
 +				else
 +				{
 +					$portnum = '';
 +				}
 +			}
 +
 +			switch ( $engine )
 +			{
 +				case 'sybase':
 +				case 'dblib':
 +					$port = is_numeric($portnum) ? ':' . intval($portnum) : '';
 +					$db = $database ? ';dbname=' . $database : '';
 +					self::$dbh = new PDO($engine . ':host=' . $host . $port . $db, $user, $password);
 +					break;
 +				case 'mssql':
 +					$port = is_numeric($portnum) ? ',' . intval($portnum) : '';
 +					$db = $database ? ';dbname=' . $database : '';
 +					self::$dbh = new PDO($engine . ':host=' . $host . $port . $db, $user, $password);
 +					break;
 +				case 'oci':
 +					$port = is_numeric($portnum) ? ':' . intval($portnum) : '';
 +					self::$dbh = new PDO($engine . ':dbname=//' . $host . $port . '/' . $database, $user, $password);
 +					break;
 +				case 'odbc':
 +					$port = is_numeric($portnum) ? ';PORT=' . intval($portnum) : '';
 +					self::$dbh = new PDO(
 +						$engine . ':DRIVER={IBM DB2 ODBC DRIVER};HOSTNAME=' . $host . $port . ';DATABASE=' . $database . ';PROTOCOL=TCPIP;UID='
 +							. $user . ';PWD=' . $password);
 +					break;
 +				case 'pgsql':
 +					$port = is_numeric($portnum) ? ';port=' . intval($portnum) : '';
 +					$db = $database ? ';dbname=' . $database : '';
 +					self::$dbh = new PDO($engine . ':host=' . $host . $port . $db, $user, $password);
 +					break;
 +				case 'sqlite':
 +				case 'sqlite2':
 +					$port = is_numeric($portnum) ? ':' . intval($portnum) : '';
 +					self::$dbh = new PDO($engine . ':' . $database, $user, $password);
 +					if ( self::$dbh )
 +					{
 +						self::$dbh->sqliteCreateFunction('SUBSTRING', 'substr', 3);
 +						self::$dbh->sqliteCreateFunction('UNIX_TIMESTAMP', 'strtotime', 1);
 +					}
 +					break;
 +				case 'mysql':
 +					$port = is_numeric($portnum) ? ';port=' . intval($portnum) : '';
 +					$db = $database ? ';dbname=' . $database : '';
 +					self::$dbh = new PDO(
 +						'mysql' . ':host=' . $host . $port . $db,
 +						$user,
 +						$password,
 +						array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES \'utf8\''));
 +					break;
 +				default: // mysql
 +					if ( !class_exists('MysqlPDO') )
 +					{
 +						include_once realpath(dirname(__FILE__)) . '/MYSQLPDO.php';
 +					}
 +					$port = is_numeric($portnum) ? ';port=' . intval($portnum) : '';
 +					$db = $database ? ';dbname=' . $database : '';
 +					self::$dbh = new MysqlPDO(
 +						'mysql' . ':host=' . $host . $port . $db,
 +						$user,
 +						$password,
 +						array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES \'utf8\''));
 +					break;
 +			}
 +		}
 +		catch (PDOException $e)
 +		{
 +			self::disConnect();
 +			return FALSE;
 +		}
 +		return TRUE;
 +	}
 +
 +	/**
 +	 * DB::disConnect()
 +	 * Disconnect the connection to the database.
 +	 */
 +	public static function disConnect()
 +	{
 +		self::$dbh = null;
 +	}
 +
 +	/**
 +	 * DB::getExecCount()
 +	 * To get the number of times you run the statement.
 +	 * @return int Number of executions
 +	 */
 +	public static function getExecCount()
 +	{
 +		return self::$execCount;
 +	}
 +
 +	/**
 +	 * DB::formatDateTime()
 +	 * The value converted to a format that can be passed to the database datetime.
 +	 * @param int $timestamp UNIX timestamp
 +	 * @param int $offset timestamp offset
 +	 * @return string formatted datetime (quart treated)
 +	 */
 +	public static function formatDateTime($timestamp = null, $offset=0)
 +	{
 +		if ( $timestamp == null )
 +		{
 +			$timestamp = time();
 +		}
 +		$timestamp += $offset;
 +		return preg_replace_callback('/(%[a-z%])/i',
 +			create_function('$matches', 'return strftime($matches[1], ' . intval($timestamp) . ');'),
 +			self::$dateFormat
 +		);
 +	}
 +	
 +	/**
 +	 * DB::getValue()
 +	 * Gets the value of the first column of the first row of the results obtained in the statement.
 +	 * @param string $statement SQL Statement
 +	 * @return mixed Result value. If the call fails, it will return FALSE.
 +	 */
 +	public static function getValue($statement)
 +	{
 +		if ( self::$dbh == null ) return FALSE;
 +		self::$execCount++;
 +		$result = self::callQuery($statement);
 +		if ( $row = $result->fetch(PDO::FETCH_NUM) )
 +		{
 +			return $row[0];
 +		}
 +		return FALSE;
 +	}
 +
 +	/**
 +	 * DB::getRow()
 +	 * Gets the first row of the results obtained in the statement.
 +	 * @param string $statement SQL Statement
 +	 * @return array Result row. If the call fails, it will return FALSE.
 +	 */
 +	public static function getRow($statement)
 +	{
 +		if ( self::$dbh == null ) return FALSE;
 +		self::$execCount++;
 +		$result = self::callQuery($statement);
 +		return $result->fetch(PDO::FETCH_BOTH);
 +	}
 +
 +	/**
 +	 * DB::getResult()
 +	 * Gets the set of results obtained in the statement.
 +	 * @param string $statement SQL Statement
 +	 * @return PDOStatement Result set object. If the call fails, it will return FALSE.
 +	 */
 +	public static function getResult($statement)
 +	{
 +		if ( self::$dbh == null ) return FALSE;
 +		self::$execCount++;
 +		return self::callQuery($statement);
 +	}
 +
 +	/**
 +	 * DB::execute()
 +	 * Execute an SQL statement and return the number of affected rows.
 +	 * @param string $statement SQL Statement
 +	 * @return int number of rows that were modified or deleted by the SQL statement you issued. If the call fails, it will return FALSE.
 +	 */
 +	public static function execute($statement)
 +	{
 +		if ( self::$dbh == null ) return FALSE;
 +		self::$execCount++;
 +		return self::callExec($statement);
 +	}
 +
 +	/**
 +	 * DB::callQuery()
 +	 * Run the query to retrieve the result set.
 +	 * @param string $statement query to be executed
 +	 * @return PDOStatement Result set object. If the call fails, it will return FALSE.
 +	 */
 +	private static function callQuery($statement)
 +	{
 +		$result = self::$dbh->query($statement);
 +		if ( $result === FALSE )
 +		{
 +			self::showErrorDisplay($statement);
 +		}
 +		return $result;
 +	}
 +	
 +	/**
 +	 * DB::callExec()
 +	 * Run the query and returns the number of rows affected.
 +	 * @param string $statement query to be executed
 +	 * @return int number of rows that were modified or deleted by the SQL statement you issued. If the call fails, it will return FALSE.
 +	 */
 +	private static function callExec($statement)
 +	{
 +		$result = self::$dbh->exec($statement);
 +		if ( $result === FALSE )
 +		{
 +			self::showErrorDisplay($statement);
 +		}
 +		return $result;
 +	}
 +	
 +	/**
 +	 * DB::showErrorDisplay()
 +	 * The error message is output to the screen of the query.
 +	 * @param string $statement query output to the screen
 +	 */
 +	private static function showErrorDisplay($statement)
 +	{
 +		global $CONF;
 +		if ( array_key_exists('debug', $CONF) && $CONF['debug'] )
 +		{
 +			$err = self::getError();
 +			print("mySQL error with query '{$statement}' : " . $err[2]);
 +		}
 +		return;
 +	}
 +	
 +	/**
 +	 * DB::getError()
 +	 * Gets the error information associated with the last operation.
 +	 * @return array Error info
 +	 */
 +	public static function getError()
 +	{
 +		if ( self::$dbh == null ) return FALSE;
 +		return self::$dbh->errorInfo();
 +	}
 +
 +	/**
 +	 * DB::quoteValue()
 +	 * Quotes a string for use in a query.
 +	 * @param string $value Value to quote
 +	 * @return string Quoted value
 +	 */
 +	public static function quoteValue($value)
 +	{
 +		if ( self::$dbh == null ) return FALSE;
 +		return self::$dbh->quote($value);
 +	}
 +
 +	/**
 +	 * DB::getInsertId()
 +	 * Get the value of the ID of the rows that are inserted at the end.
 +	 * @return string ID of the row
 +	 */
 +	public static function getInsertId()
 +	{
 +		if ( self::$dbh == null ) return FALSE;
 +		return self::$dbh->lastInsertId();
 +	}
 +
 +	/**
 +	 * DB::getAttribute()
 +	 * Gets the attribute of the database.
 +	 * @return string Attribute
 +	 */
 +	public static function getAttribute($attribute)
 +	{
 +		if ( self::$dbh == null ) return FALSE;
 +		return self::$dbh->getAttribute($attribute);
 +	}
 +	
 +}
++=======
+ <?php
+ 
+ /*
+  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+  * Copyright (C) 2012 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) 2012 The Nucleus Group
+  * @version $Id$
+  */
+ 
+ class DB
+ {
+ 	private static $dbh;
+ 	private static $execCount = 0;
+ 	private static $dateFormat = '\'%Y-%m-%d %H:%M:%S\'';
+ 	
+ 	/**
+ 	 * DB::setConnectionInfo()
+ 	 * Set the information to connect to the database, it will attempt to connect.
+ 	 * @param string $engine Engine
+ 	 * @param string $host Host
+ 	 * @param string $user User
+ 	 * @param string $password Password
+ 	 * @param string $database Database
+ 	 * @return bool Returns TRUE if able to connect, otherwise it returns FALSE.
+ 	 */
+ 	public static function setConnectionInfo($engine, $host, $user, $password, $database)
+ 	{
+ 		self::disConnect();
+ 
+ 		try
+ 		{
+ 			if ( i18n::strpos($host, ':') === false )
+ 			{
+ 				$portnum = '';
+ 			}
+ 			else
+ 			{
+ 				list($host, $portnum) = i18n::explode(":", $host);
+ 				if ( isset($portnum) )
+ 				{
+ 					$portnum = trim($portnum);
+ 				}
+ 				else
+ 				{
+ 					$portnum = '';
+ 				}
+ 			}
+ 
+ 			switch ( $engine )
+ 			{
+ 				case 'sybase':
+ 				case 'dblib':
+ 					$port = is_numeric($portnum) ? ':' . intval($portnum) : '';
+ 					$db = $database ? ';dbname=' . $database : '';
+ 					self::$dbh = new PDO($engine . ':host=' . $host . $port . $db, $user, $password);
+ 					break;
+ 				case 'mssql':
+ 					$port = is_numeric($portnum) ? ',' . intval($portnum) : '';
+ 					$db = $database ? ';dbname=' . $database : '';
+ 					self::$dbh = new PDO($engine . ':host=' . $host . $port . $db, $user, $password);
+ 					break;
+ 				case 'oci':
+ 					$port = is_numeric($portnum) ? ':' . intval($portnum) : '';
+ 					self::$dbh = new PDO($engine . ':dbname=//' . $host . $port . '/' . $database, $user, $password);
+ 					break;
+ 				case 'odbc':
+ 					$port = is_numeric($portnum) ? ';PORT=' . intval($portnum) : '';
+ 					self::$dbh = new PDO(
+ 						$engine . ':DRIVER={IBM DB2 ODBC DRIVER};HOSTNAME=' . $host . $port . ';DATABASE=' . $database . ';PROTOCOL=TCPIP;UID='
+ 							. $user . ';PWD=' . $password);
+ 					break;
+ 				case 'pgsql':
+ 					$port = is_numeric($portnum) ? ';port=' . intval($portnum) : '';
+ 					$db = $database ? ';dbname=' . $database : '';
+ 					self::$dbh = new PDO($engine . ':host=' . $host . $port . $db, $user, $password);
+ 					break;
+ 				case 'sqlite':
+ 				case 'sqlite2':
+ 					$port = is_numeric($portnum) ? ':' . intval($portnum) : '';
+ 					self::$dbh = new PDO($engine . ':' . $database, $user, $password);
+ 					if ( self::$dbh )
+ 					{
+ 						self::$dbh->sqliteCreateFunction('SUBSTRING', 'substr', 3);
+ 						self::$dbh->sqliteCreateFunction('UNIX_TIMESTAMP', 'strtotime', 1);
+ 					}
+ 					break;
+ 				case 'mysql':
+ 					$port = is_numeric($portnum) ? ';port=' . intval($portnum) : '';
+ 					$db = $database ? ';dbname=' . $database : '';
+ 					self::$dbh = new PDO(
+ 						'mysql' . ':host=' . $host . $port . $db,
+ 						$user,
+ 						$password,
+ 						array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES \'utf8\''));
+ 					break;
+ 				default: // mysql
+ 					if ( !class_exists('MysqlPDO') )
+ 					{
+ 						include_once realpath(dirname(__FILE__)) . '/MYSQLPDO.php';
+ 					}
+ 					$port = is_numeric($portnum) ? ';port=' . intval($portnum) : '';
+ 					$db = $database ? ';dbname=' . $database : '';
+ 					self::$dbh = new MysqlPDO(
+ 						'mysql' . ':host=' . $host . $port . $db,
+ 						$user,
+ 						$password,
+ 						array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES \'utf8\''));
+ 					break;
+ 			}
+ 		}
+ 		catch (PDOException $e)
+ 		{
+ 			self::disConnect();
+ 			return FALSE;
+ 		}
+ 		return TRUE;
+ 	}
+ 
+ 	/**
+ 	 * DB::disConnect()
+ 	 * Disconnect the connection to the database.
+ 	 */
+ 	public static function disConnect()
+ 	{
+ 		self::$dbh = null;
+ 	}
+ 
+ 	/**
+ 	 * DB::getExecCount()
+ 	 * To get the number of times you run the statement.
+ 	 * @return int Number of executions
+ 	 */
+ 	public static function getExecCount()
+ 	{
+ 		return self::$execCount;
+ 	}
+ 
+ 	/**
+ 	 * DB::formatDateTime()
+ 	 * The value converted to a format that can be passed to the database datetime.
+ 	 * @param int $timestamp UNIX timestamp
+ 	 * @param int $offset timestamp offset
+ 	 * @return string formatted datetime (quart treated)
+ 	 */
+ 	public static function formatDateTime($timestamp = null, $offset=0)
+ 	{
+ 		if ( $timestamp == null )
+ 		{
+ 			$timestamp = time();
+ 		}
+ 		$timestamp += $offset;
+ 		return preg_replace_callback('/(%[a-z%])/i',
+ 			create_function('$matches', 'return strftime($matches[1], ' . intval($timestamp) . ');'),
+ 			self::$dateFormat
+ 		);
+ 	}
+ 	
+ 	/**
+ 	 * DB::getValue()
+ 	 * Gets the value of the first column of the first row of the results obtained in the statement.
+ 	 * @param string $statement SQL Statement
+ 	 * @return mixed Result value. If the call fails, it will return FALSE.
+ 	 */
+ 	public static function getValue($statement)
+ 	{
+ 		if ( self::$dbh == null ) return FALSE;
+ 		self::$execCount++;
+ 		$result = self::callQuery($statement);
+ 		if ( $row = $result->fetch(PDO::FETCH_NUM) )
+ 		{
+ 			return $row[0];
+ 		}
+ 		return FALSE;
+ 	}
+ 
+ 	/**
+ 	 * DB::getRow()
+ 	 * Gets the first row of the results obtained in the statement.
+ 	 * @param string $statement SQL Statement
+ 	 * @return array Result row. If the call fails, it will return FALSE.
+ 	 */
+ 	public static function getRow($statement)
+ 	{
+ 		if ( self::$dbh == null ) return FALSE;
+ 		self::$execCount++;
+ 		$result = self::callQuery($statement);
+ 		return $result->fetch(PDO::FETCH_BOTH);
+ 	}
+ 
+ 	/**
+ 	 * DB::getResult()
+ 	 * Gets the set of results obtained in the statement.
+ 	 * @param string $statement SQL Statement
+ 	 * @return PDOStatement Result set object. If the call fails, it will return FALSE.
+ 	 */
+ 	public static function getResult($statement)
+ 	{
+ 		if ( self::$dbh == null ) return FALSE;
+ 		self::$execCount++;
+ 		return self::callQuery($statement);
+ 	}
+ 
+ 	/**
+ 	 * DB::execute()
+ 	 * Execute an SQL statement and return the number of affected rows.
+ 	 * @param string $statement SQL Statement
+ 	 * @return int number of rows that were modified or deleted by the SQL statement you issued. If the call fails, it will return FALSE.
+ 	 */
+ 	public static function execute($statement)
+ 	{
+ 		if ( self::$dbh == null ) return FALSE;
+ 		self::$execCount++;
+ 		return self::callExec($statement);
+ 	}
+ 
+ 	/**
+ 	 * DB::callQuery()
+ 	 * Run the query to retrieve the result set.
+ 	 * @param string $statement query to be executed
+ 	 * @return PDOStatement Result set object. If the call fails, it will return FALSE.
+ 	 */
+ 	private static function callQuery($statement)
+ 	{
+ 		$result = self::$dbh->query($statement);
+ 		if ( $result === FALSE )
+ 		{
+ 			self::showErrorDisplay($statement);
+ 		}
+ 		return $result;
+ 	}
+ 	
+ 	/**
+ 	 * DB::callExec()
+ 	 * Run the query and returns the number of rows affected.
+ 	 * @param string $statement query to be executed
+ 	 * @return int number of rows that were modified or deleted by the SQL statement you issued. If the call fails, it will return FALSE.
+ 	 */
+ 	private static function callExec($statement)
+ 	{
+ 		$result = self::$dbh->exec($statement);
+ 		if ( $result === FALSE )
+ 		{
+ 			self::showErrorDisplay($statement);
+ 		}
+ 		return $result;
+ 	}
+ 	
+ 	/**
+ 	 * DB::showErrorDisplay()
+ 	 * The error message is output to the screen of the query.
+ 	 * @param string $statement query output to the screen
+ 	 */
+ 	private static function showErrorDisplay($statement)
+ 	{
+ 		global $CONF;
+ 		if ( array_key_exists('debug', $CONF) && $CONF['debug'] )
+ 		{
+ 			$err = self::getError();
+ 			print("mySQL error with query '{$statement}' : " . $err[2]);
+ 		}
+ 		return;
+ 	}
+ 	
+ 	/**
+ 	 * DB::getError()
+ 	 * Gets the error information associated with the last operation.
+ 	 * @return array Error info
+ 	 */
+ 	public static function getError()
+ 	{
+ 		if ( self::$dbh == null ) return FALSE;
+ 		return self::$dbh->errorInfo();
+ 	}
+ 
+ 	/**
+ 	 * DB::quoteValue()
+ 	 * Quotes a string for use in a query.
+ 	 * @param string $value Value to quote
+ 	 * @return string Quoted value
+ 	 */
+ 	public static function quoteValue($value)
+ 	{
+ 		if ( self::$dbh == null ) return FALSE;
+ 		return self::$dbh->quote($value);
+ 	}
+ 
+ 	/**
+ 	 * DB::getInsertId()
+ 	 * Get the value of the ID of the rows that are inserted at the end.
+ 	 * @return string ID of the row
+ 	 */
+ 	public static function getInsertId()
+ 	{
+ 		if ( self::$dbh == null ) return FALSE;
+ 		return self::$dbh->lastInsertId();
+ 	}
+ 
+ 	/**
+ 	 * DB::getAttribute()
+ 	 * Gets the attribute of the database.
+ 	 * @return string Attribute
+ 	 */
+ 	public static function getAttribute($attribute)
+ 	{
+ 		if ( self::$dbh == null ) return FALSE;
+ 		return self::$dbh->getAttribute($attribute);
+ 	}
+ 	
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/libs/sql/MYSQLPDO.php
index 2142ff5,da9e3ed..65bcb48
--- a/nucleus/libs/sql/MYSQLPDO.php
+++ b/nucleus/libs/sql/MYSQLPDO.php
@@@ -1,662 -1,661 +1,1326 @@@
++<<<<<<< HEAD
 +<?php
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2012 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) 2012 The Nucleus Group
 + * @version $Id$
 + */
 +
 +if ( !class_exists('PDO') )
 +{
 +
 +	/**
 +	 * Dummy constant of the PDO class
 +	 */
 +	class PDO
 +	{
 +		/* constant values */
 +		const PARAM_NULL = 0;
 +		const PARAM_INT = 1;
 +		const PARAM_STR = 2;
 +		const PARAM_LOB = 3;
 +		const PARAM_STMT = 4;
 +		const PARAM_BOOL = 5;
 +		const PARAM_INPUT_OUTPUT = 128; // orignal is undefined.
 +		const FETCH_LAZY = 1;
 +		const FETCH_ASSOC = 2;
 +		const FETCH_NUM = 3;
 +		const FETCH_BOTH = 4;
 +		const FETCH_OBJ = 5;
 +		const FETCH_BOUND = 6;
 +		const FETCH_COLUMN = 7;
 +		const FETCH_CLASS = 8;
 +		const FETCH_INTO = 9;
 +		const FETCH_FUNC = 10;
 +		const FETCH_NAMED = 11;
 +		const FETCH_KEY_PAIR = 12;
 +		const FETCH_GROUP = 65536;
 +		const FETCH_UNIQUE = 196608;
 +		const FETCH_CLASSTYPE = 262144;
 +		const FETCH_SERIALIZE = 524288;
 +		const FETCH_PROPS_LATE = 1048576;
 +		const ATTR_AUTOCOMMIT = 0;
 +		const ATTR_PREFETCH = 1;
 +		const ATTR_TIMEOUT = 2;
 +		const ATTR_ERRMODE = 3;
 +		const ATTR_SERVER_VERSION = 4;
 +		const ATTR_CLIENT_VERSION = 5;
 +		const ATTR_SERVER_INFO = 6;
 +		const ATTR_CONNECTION_STATUS = 7;
 +		const ATTR_CASE = 8;
 +		const ATTR_CURSOR_NAME = 9;
 +		const ATTR_CURSOR = 10;
 +		const ATTR_ORACLE_NULLS = 11;
 +		const ATTR_PERSISTENT = 12;
 +		const ATTR_STATEMENT_CLASS = 13;
 +		const ATTR_FETCH_TABLE_NAMES = 14;
 +		const ATTR_FETCH_CATALOG_NAMES = 15;
 +		const ATTR_DRIVER_NAME = 16;
 +		const ATTR_STRINGIFY_FETCHES = 17;
 +		const ATTR_MAX_COLUMN_LEN = 18;
 +		const ATTR_DEFAULT_FETCH_MODE = 19;
 +		const ATTR_EMULATE_PREPARES = 20;
 +		const ERRMODE_SILENT = 0;
 +		const ERRMODE_WARNING = 1;
 +		const ERRMODE_EXCEPTION = 2;
 +		const CASE_NATURAL = 0;
 +		const CASE_UPPER = 1;
 +		const CASE_LOWER = 2;
 +		const NULL_NATURAL = 0;
 +		const NULL_EMPTY_STRING = 1;
 +		const NULL_TO_STRING = 2;
 +		const FETCH_ORI_NEXT = 0;
 +		const FETCH_ORI_PRIOR = 1;
 +		const FETCH_ORI_FIRST = 2;
 +		const FETCH_ORI_LAST = 3;
 +		const FETCH_ORI_ABS = 4;
 +		const FETCH_ORI_REL = 5;
 +		const CURSOR_FWDONLY = 0;
 +		const CURSOR_SCROLL = 1;
 +		// from here orignal is undefined.
 +		const ERR_CANT_MAP = 0;
 +		const ERR_SYNTAX = 0;
 +		const ERR_CONSTRAINT = 0;
 +		const ERR_NOT_FOUND = 0;
 +		const ERR_ALREADY_EXISTS = 0;
 +		const ERR_NOT_IMPLEMENTED = 0;
 +		const ERR_MISMATCH = 0;
 +		const ERR_TRUNCATED = 0;
 +		const ERR_DISCONNECTED = 0;
 +		const ERR_NO_PERM = 0;
 +		// so far
 +		const ERR_NONE = '00000';
 +		const PARAM_EVT_ALLOC = 0;
 +		const PARAM_EVT_FREE = 1;
 +		const PARAM_EVT_EXEC_PRE = 2;
 +		const PARAM_EVT_EXEC_POST = 3;
 +		const PARAM_EVT_FETCH_PRE = 4;
 +		const PARAM_EVT_FETCH_POST = 5;
 +		const PARAM_EVT_NORMALIZE = 6;
 +
 +		const MYSQL_ATTR_INIT_COMMAND = 1002;
 +	}
 +
 +	/**
 +	 * PDOException class of dummy
 +	 */
 +	class PDOException extends Exception
 +	{}
 +}
 +
 +/**
 + * MysqlPDO class that wraps the mysql_ or mysqli_ function like PDO class
 + */
 +class MysqlPDO
 +{
 +	// Prefix function name
 +	public static $handler;
 +
 +	private $dbcon;
 +
 +	/**
 +	 * Creates a PDO instance representing a connection to a MySQL database.
 +	 * @param string $dsn DSN
 +	 * @param string $username UserName
 +	 * @param string $password Password
 +	 * @param mixed $driver_options Options[optional]
 +	 * @throws PDOException Thrown when failed to connect to the database.
 +	 */
 +	public function __construct($dsn, $username, $password, $driver_options = '')
 +	{
 +		// select use function
 +		if ( function_exists('mysql_query') )
 +		{
 +			MysqlPDO::$handler = 'mysql_';
 +		}
 +		else if ( function_exists('mysqli_query') )
 +		{
 +			MysqlPDO::$handler = 'mysqli_';
 +		}
 +		else
 +		{
 +			throw new PDOException('Can not be found mysql_ or mysqli_ functions.', 'IM000');
 +		}
 +
 +		if ( preg_match('/host=([^;]+)/', $dsn, $matches) )
 +		{
 +			$host = $matches[1];
 +		}
 +		else
 +		{
 +			throw new PDOException('Host has not been set.', '01000');
 +		}
 +		if ( preg_match('/port=([^;]+)/', $dsn, $matches) )
 +		{
 +			$host .= ':' . $matches[1];
 +		}
 +
 +		// mysql connect
 +		$this->dbcon = @call_user_func(MysqlPDO::$handler . 'connect', $host, $username, $password);
 +
 +		if ( $this->dbcon == FALSE )
 +		{
 +			throw new PDOException('Failed to connect to the server.', '01000');
 +		}
 +
 +		// select database
 +		if ( preg_match('/dbname=([^;]+)/', $dsn, $matches) )
 +		{
 +			$dbname = $matches[1];
 +			if ( $dbname )
 +			{
 +				if ( MysqlPDO::$handler == 'mysql_' )
 +				{
 +					call_user_func(MysqlPDO::$handler . 'select_db', $dbname, $this->dbcon);
 +				}
 +				else
 +				{
 +					call_user_func(MysqlPDO::$handler . 'select_db', $this->dbcon, $dbname);
 +				}
 +
 +				// set use character
 +				$charset = 'utf8';
 +				if ( is_array($driver_options) && array_key_exists(PDO::MYSQL_ATTR_INIT_COMMAND, $driver_options) )
 +				{
 +					if ( preg_match('/SET\s+CHARACTER\s+SET\s+\'?([a-z0-9_-]+)\'?/', $driver_options[PDO::MYSQL_ATTR_INIT_COMMAND], $matches) )
 +					{
 +						$charset = $matches[1];
 +					}
 +				}
 +				$server_info = call_user_func(MysqlPDO::$handler . 'get_server_info', $this->dbcon);
 +				$mysql_version = preg_replace('/^([0-9]{1,2})\.([0-9]{1,2})\.([0-9]{1,2})(.*)$/', '$1.$2.$3', $server_info);
 +
 +				if ( version_compare($mysql_version, '5.0.7', '>=') && function_exists(MysqlPDO::$handler . 'set_charset') )
 +				{
 +					call_user_func(MysqlPDO::$handler . 'set_charset', $charset);
 +				}
 +				else if ( version_compare($mysql_version, '5.0.7', '<') )
 +				{
 +					$this->exec("SET CHARACTER SET '{$charset}';");
 +				}
 +				else
 +				{
 +					$this->exec("SET NAMES '{$charset}';");
 +				}
 +			}
 +		}
 +	}
 +
 +	/**
 +	 * Close the connection to the MySQL server.
 +	 */
 +	public function __destruct()
 +	{
 +		if ( $this->dbcon )
 +		{
 +			@call_user_func(MysqlPDO::$handler . 'close', $this->dbcon);
 +		}
 +	}
 +
 +	/**
 +	 * Not supported
 +	 */
 +	public function beginTransaction()
 +	{
 +		return FALSE;
 +	}
 +
 +	/**
 +	 * Not supported
 +	 */
 +	public function commit()
 +	{
 +		return FALSE;
 +	}
 +
 +	/**
 +	 * Fetch the SQLSTATE associated with the last operation.
 +	 * However, if successful '00000' Otherwise, the return to '01000'.
 +	 * @return string Error code
 +	 */
 +	public function errorCode()
 +	{
 +		$errno = call_user_func(MysqlPDO::$handler . 'errno', $this->dbcon);
 +		return $errno === 0 ? '00000' : '01000';
 +	}
 +
 +	/**
 +	 * To get extended error information associated with the last operation.
 +	 * Element 0: if successful '00000' Otherwise, the return to '01000'
 +	 * Element 1: The return value of mysql_errno()
 +	 * Element 2: The return value of mysql_error()
 +	 * @return array Array of error information
 +	 */
 +	public function errorInfo()
 +	{
 +		$errno = call_user_func(MysqlPDO::$handler . 'errno', $this->dbcon);
 +		$error = call_user_func(MysqlPDO::$handler . 'error', $this->dbcon);
 +		return array($errno === 0 ? '00000' : '01000', $errno, $error);
 +	}
 +
 +	public function exec($statement)
 +	{
 +		$result = @call_user_func(MysqlPDO::$handler . 'query', $statement, $this->dbcon);
 +		if ( $result === TRUE )
 +		{
 +			return @call_user_func(MysqlPDO::$handler . 'affected_rows', $this->dbcon);
 +		}
 +		else if ( is_resource($result) )
 +		{
 +			return;
 +		}
 +		return FALSE;
 +	}
 +
 +	public function getAttribute($attribute)
 +	{
 +		switch ( $attribute )
 +		{
 +			case PDO::ATTR_SERVER_VERSION:
 +				return call_user_func(MysqlPDO::$handler . 'get_server_info', $this->dbcon);
 +				break;
 +			case PDO::ATTR_CLIENT_VERSION:
 +				return call_user_func(MysqlPDO::$handler . 'get_client_info');
 +				break;
 +			default:
 +				return FALSE;
 +		}
 +	}
 +
 +	public static function getAvailableDrivers()
 +	{
 +		return array('mysql');
 +	}
 +
 +	/**
 +	 * Not supported
 +	 */
 +	public function inTransaction()
 +	{
 +		return FALSE;
 +	}
 +
 +	public function lastInsertId($name = null)
 +	{
 +		return call_user_func(MysqlPDO::$handler . 'insert_id', $this->dbcon);
 +	}
 +
 +	/**
 +	 * Not supported
 +	 */
 +	public function prepare($statement, $driver_options = array())
 +	{
 +		return FALSE;
 +	}
 +
 +	public function query($statement)
 +	{
 +		$result = @call_user_func(MysqlPDO::$handler . 'query', $statement, $this->dbcon);
 +		return ($result == FALSE) ? FALSE : new MysqlPDOStatement($statement, $result, $this->dbcon);
 +	}
 +
 +	public function quote($string, $parameter_type = PDO::PARAM_STR)
 +	{
 +		switch ( $parameter_type )
 +		{
 +			case PDO::PARAM_NULL:
 +				return 'null';
 +			case PDO::PARAM_BOOL:
 +				return $string ? '1' : '0';
 +			default:
 +				if ( $parameter_type == PDO::PARAM_INT && is_numeric($string) )
 +				{
 +					return $string;
 +				}
 +				else
 +				{
 +					return '\'' . call_user_func(MysqlPDO::$handler . 'real_escape_string', $string) . '\'';
 +				}
 +		}
 +	}
 +
 +	/**
 +	 * Not supported
 +	 */
 +	public function rollBack()
 +	{
 +		return FALSE;
 +	}
 +
 +	/**
 +	 * Not supported
 +	 */
 +	public function setAttribute($attribute, $value)
 +	{
 +		return FALSE;
 +	}
 +}
 +
 +/**
 + * MysqlPDOStatement class PDOStatement class like.
 + */
 +class MysqlPDOStatement implements Iterator
 +{
 +	private $result;
 +	private $dbcon;
 +	private $_queryString = '';
 +
 +	private $def_fetch_mode = PDO::FETCH_BOTH;
 +	private $def_col_num = 0;
 +	private $def_class_name = 'stdClass';
 +	private $def_ctorargs = null;
 +	private $bind_object = null;
 +
 +	public function __get($name)
 +	{
 +		if ( $name == 'queryString' )
 +		{
 +			return $this->_queryString;
 +		}
 +	}
 +
 +	public function __construct($query, $result, $dbconnect = null)
 +	{
 +		$this->dbcon = $dbconnect;
 +		$this->_queryString = $query;
 +		$this->result = $result;
 +	}
 +
 +	public function __destruct()
 +	{
 +		$this->result = null;
 +	}
 +
 +	/**
 +	 * Not supported
 +	 */
 +	public function bindColumn($column, &$param, $type, $maxlen, $driverdata)
 +	{
 +		return FALSE;
 +	}
 +
 +	/**
 +	 * Not supported
 +	 */
 +	public function bindParam($parameter, &$variable, $data_type = PDO::PARAM_STR, $length, $driver_options)
 +	{
 +		return FALSE;
 +	}
 +
 +	/**
 +	 * Not supported
 +	 */
 +	public function bindValue($parameter, $value, $data_type = PDO::PARAM_STR)
 +	{
 +		return FALSE;
 +	}
 +
 +	public function closeCursor()
 +	{
 +		return call_user_func(MysqlPDO::$handler . 'free_result', $this->result);
 +	}
 +
 +	public function columnCount()
 +	{
 +		return call_user_func(MysqlPDO::$handler . 'num_fields', $this->result);
 +	}
 +
 +	/**
 +	 * Not supported
 +	 */
 +	public function debugDumpParams()
 +	{
 +		return;
 +	}
 +
 +	public function errorCode()
 +	{
 +		$errno = call_user_func(MysqlPDO::$handler . 'errno', $this->dbcon);
 +		return $errno === 0 ? '00000' : '01000';
 +	}
 +
 +	public function errorInfo()
 +	{
 +		$errno = call_user_func(MysqlPDO::$handler . 'errno', $this->dbcon);
 +		$error = call_user_func(MysqlPDO::$handler . 'error', $this->dbcon);
 +		return array($errno === 0 ? '00000' : '01000', $errno, $error);
 +	}
 +
 +	/**
 +	 * Not supported
 +	 */
 +	public function execute($input_parameters)
 +	{
 +		return FALSE;
 +	}
 +
 +	public function fetch($fetch_style = PDO::ATTR_DEFAULT_FETCH_MODE, $cursor_orientation = PDO::FETCH_ORI_NEXT, $cursor_offset = 0)
 +	{
 +		if ( !is_resource($this->result) || $cursor_orientation != PDO::FETCH_ORI_NEXT )
 +		{
 +			return FALSE;
 +		}
 +		
 +		if ( $fetch_style == PDO::ATTR_DEFAULT_FETCH_MODE )
 +		{
 +			$fetch_style = $this->def_fetch_mode;
 +		}
 +
 +		switch ( $fetch_style )
 +		{
 +			case PDO::FETCH_ASSOC:
 +				return @call_user_func(MysqlPDO::$handler . 'fetch_array', $this->result, MYSQL_ASSOC);
 +			case PDO::FETCH_BOTH:
 +				return @call_user_func(MysqlPDO::$handler . 'fetch_array', $this->result, MYSQL_BOTH);
 +			case PDO::FETCH_NUM:
 +				return @call_user_func(MysqlPDO::$handler . 'fetch_array', $this->result, MYSQL_NUM);
 +			case PDO::FETCH_OBJ:
 +				return $this->fetchObject();
 +			case PDO::FETCH_CLASS:
 +				return $this->fetchObject($this->def_class_name, $this->def_ctorargs);
 +			case PDO::FETCH_COLUMN:
 +				return $this->fetchColumn($this->def_col_num);
 +			case PDO::FETCH_BOUND:
 +				return FALSE; // Not supported
 +			case PDO::FETCH_INTO:
 +				return FALSE; // Not supported
 +			case PDO::FETCH_LAZY:
 +				return FALSE; // Not supported
 +			default:
 +				return FALSE;
 +		}
 +	}
 +
 +	public function fetchAll($fetch_style = PDO::ATTR_DEFAULT_FETCH_MODE, $fetch_argument = null, $ctor_args = array())
 +	{
 +		if ( $fetch_style == PDO::ATTR_DEFAULT_FETCH_MODE )
 +		{
 +			$fetch_style = PDO::FETCH_BOTH;
 +		}
 +		
 +		$ret = array();
 +		if ( ($fetch_style & PDO::FETCH_COLUMN) != 0 )
 +		{
 +			if ( $fetch_style == PDO::FETCH_COLUMN )
 +			{
 +				$column = $fetch_argument == null ? 0 : intval($fetch_argument);
 +				while ( $row = $this->fetchColumn($column) )
 +				{
 +					$ret[] = $row;
 +				}
 +			}
 +			elseif ( ($fetch_style & PDO::FETCH_UNIQUE) != 0 )
 +			{
 +				return FALSE;
 +			}
 +			elseif ( ($fetch_style & PDO::FETCH_GROUP) != 0 )
 +			{
 +				return FALSE;
 +			}
 +		}
 +		elseif ( $fetch_style == PDO::FETCH_CLASS )
 +		{
 +			while ( $row = $this->fetchObject($fetch_argument, $ctor_args) )
 +			{
 +				$ret[] = $row;
 +			}
 +		}
 +		elseif ( $fetch_style == PDO::FETCH_FUNC )
 +		{
 +			while ( $row = $this->fetch(PDO::FETCH_ASSOC) )
 +			{
 +				$ret[] = call_user_func_array($fetch_argument, array_values($row));
 +			}
 +		}
 +		else
 +		{
 +			while ( $row = $this->fetch($fetch_style) )
 +			{
 +				$ret[] = $row;
 +			}
 +		}
 +		return $ret;
 +	}
 +
 +	public function fetchColumn($column_number = 0)
 +	{
 +		if ( $ret = $this->fetch(PDO::FETCH_NUM) )
 +		{
 +			return $ret[$column_number];
 +		}
 +		return FALSE;
 +	}
 +
 +	public function fetchObject($class_name = 'stdClass', $ctor_args = null)
 +	{
 +		if ( is_array($ctor_args) && !empty($ctor_args) )
 +		{
 +			return @call_user_func(MysqlPDO::$handler . 'fetch_object', $this->result, $class_name, $ctor_args);
 +		}
 +		else
 +		{
 +			return @call_user_func(MysqlPDO::$handler . 'fetch_object', $this->result, $class_name);
 +		}
 +	}
 +
 +	public function getAttribute($attribute)
 +	{
 +		switch ( $attribute )
 +		{
 +			default:
 +				return FALSE;
 +		}
 +	}
 +
 +	/**
 +	 * Not supported
 +	 */
 +	public function getColumnMeta($column)
 +	{
 +		$result = array();
 +		if ( MysqlPDO::$handler == 'mysql_' )
 +		{
 +			$result['name'] = @call_user_func(MysqlPDO::$handler . 'field_name', $this->result, $column);
 +		}
 +		return $result;
 +	}
 +
 +	/**
 +	 * Not supported
 +	 */
 +	public function nextRowset()
 +	{
 +		return FALSE;
 +	}
 +
 +	public function rowCount()
 +	{
 +		return @call_user_func(MysqlPDO::$handler . 'affected_rows', $this->dbcon);
 +	}
 +
 +	/**
 +	 * Not supported
 +	 */
 +	public function setAttribute($attribute, $value)
 +	{
 +		return FALSE;
 +	}
 +
 +	public function setFetchMode($mode, &$mode_argument, $ctorargs)
 +	{
 +		switch ( $mode )
 +		{
 +			case PDO::FETCH_COLUMN:
 +				$this->def_col_num = $mode_argument;
 +				break;
 +			case PDO::FETCH_CLASS:
 +				$this->def_class_name = $mode_argument;
 +				$this->def_ctorargs = $ctorargs;
 +				break;
 +			case PDO::FETCH_INTO:
 +				$this->bind_object = &$mode_argument;
 +				return FALSE; // Not supported
 +			default:
 +				$this->def_fetch_mode = $mode;
 +				break;
 +		}
 +		return 1;
 +	}
 +
 +	// Iterator
 +	private $iterator_value;
 +
 +	function rewind()
 +	{}
 +
 +	function next()
 +	{}
 +
 +	function valid()
 +	{
 +		return ($this->iterator_value = $this->fetch());
 +	}
 +
 +	function current()
 +	{
 +		return $this->iterator_value;
 +	}
 +
 +	function key()
 +	{
 +		return null;
 +	}
 +}
++=======
+ <?php
+ /*
+  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+  * Copyright (C) 2012 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) 2012 The Nucleus Group
+  * @version $Id$
+  */
+ 
+ if ( !class_exists('PDO') )
+ {
+ 	/**
+ 	 * Dummy constant of the PDO class
+ 	 */
+ 	class PDO
+ 	{
+ 		/* constant values */
+ 		const PARAM_NULL = 0;
+ 		const PARAM_INT = 1;
+ 		const PARAM_STR = 2;
+ 		const PARAM_LOB = 3;
+ 		const PARAM_STMT = 4;
+ 		const PARAM_BOOL = 5;
+ 		const PARAM_INPUT_OUTPUT = 128; // orignal is undefined.
+ 		const FETCH_LAZY = 1;
+ 		const FETCH_ASSOC = 2;
+ 		const FETCH_NUM = 3;
+ 		const FETCH_BOTH = 4;
+ 		const FETCH_OBJ = 5;
+ 		const FETCH_BOUND = 6;
+ 		const FETCH_COLUMN = 7;
+ 		const FETCH_CLASS = 8;
+ 		const FETCH_INTO = 9;
+ 		const FETCH_FUNC = 10;
+ 		const FETCH_NAMED = 11;
+ 		const FETCH_KEY_PAIR = 12;
+ 		const FETCH_GROUP = 65536;
+ 		const FETCH_UNIQUE = 196608;
+ 		const FETCH_CLASSTYPE = 262144;
+ 		const FETCH_SERIALIZE = 524288;
+ 		const FETCH_PROPS_LATE = 1048576;
+ 		const ATTR_AUTOCOMMIT = 0;
+ 		const ATTR_PREFETCH = 1;
+ 		const ATTR_TIMEOUT = 2;
+ 		const ATTR_ERRMODE = 3;
+ 		const ATTR_SERVER_VERSION = 4;
+ 		const ATTR_CLIENT_VERSION = 5;
+ 		const ATTR_SERVER_INFO = 6;
+ 		const ATTR_CONNECTION_STATUS = 7;
+ 		const ATTR_CASE = 8;
+ 		const ATTR_CURSOR_NAME = 9;
+ 		const ATTR_CURSOR = 10;
+ 		const ATTR_ORACLE_NULLS = 11;
+ 		const ATTR_PERSISTENT = 12;
+ 		const ATTR_STATEMENT_CLASS = 13;
+ 		const ATTR_FETCH_TABLE_NAMES = 14;
+ 		const ATTR_FETCH_CATALOG_NAMES = 15;
+ 		const ATTR_DRIVER_NAME = 16;
+ 		const ATTR_STRINGIFY_FETCHES = 17;
+ 		const ATTR_MAX_COLUMN_LEN = 18;
+ 		const ATTR_DEFAULT_FETCH_MODE = 19;
+ 		const ATTR_EMULATE_PREPARES = 20;
+ 		const ERRMODE_SILENT = 0;
+ 		const ERRMODE_WARNING = 1;
+ 		const ERRMODE_EXCEPTION = 2;
+ 		const CASE_NATURAL = 0;
+ 		const CASE_UPPER = 1;
+ 		const CASE_LOWER = 2;
+ 		const NULL_NATURAL = 0;
+ 		const NULL_EMPTY_STRING = 1;
+ 		const NULL_TO_STRING = 2;
+ 		const FETCH_ORI_NEXT = 0;
+ 		const FETCH_ORI_PRIOR = 1;
+ 		const FETCH_ORI_FIRST = 2;
+ 		const FETCH_ORI_LAST = 3;
+ 		const FETCH_ORI_ABS = 4;
+ 		const FETCH_ORI_REL = 5;
+ 		const CURSOR_FWDONLY = 0;
+ 		const CURSOR_SCROLL = 1;
+ 		// from here orignal is undefined.
+ 		const ERR_CANT_MAP = 0;
+ 		const ERR_SYNTAX = 0;
+ 		const ERR_CONSTRAINT = 0;
+ 		const ERR_NOT_FOUND = 0;
+ 		const ERR_ALREADY_EXISTS = 0;
+ 		const ERR_NOT_IMPLEMENTED = 0;
+ 		const ERR_MISMATCH = 0;
+ 		const ERR_TRUNCATED = 0;
+ 		const ERR_DISCONNECTED = 0;
+ 		const ERR_NO_PERM = 0;
+ 		// so far
+ 		const ERR_NONE = '00000';
+ 		const PARAM_EVT_ALLOC = 0;
+ 		const PARAM_EVT_FREE = 1;
+ 		const PARAM_EVT_EXEC_PRE = 2;
+ 		const PARAM_EVT_EXEC_POST = 3;
+ 		const PARAM_EVT_FETCH_PRE = 4;
+ 		const PARAM_EVT_FETCH_POST = 5;
+ 		const PARAM_EVT_NORMALIZE = 6;
+ 
+ 		const MYSQL_ATTR_INIT_COMMAND = 1002;
+ 	}
+ 
+ 	/**
+ 	 * PDOException class of dummy
+ 	 */
+ 	class PDOException extends Exception
+ 	{}
+ }
+ 
+ /**
+  * MysqlPDO class that wraps the mysql_ or mysqli_ function like PDO class
+  */
+ class MysqlPDO
+ {
+ 	// Prefix function name
+ 	public static $handler;
+ 
+ 	private $dbcon;
+ 
+ 	/**
+ 	 * Creates a PDO instance representing a connection to a MySQL database.
+ 	 * @param string $dsn DSN
+ 	 * @param string $username UserName
+ 	 * @param string $password Password
+ 	 * @param mixed $driver_options Options[optional]
+ 	 * @throws PDOException Thrown when failed to connect to the database.
+ 	 */
+ 	public function __construct($dsn, $username, $password, $driver_options = '')
+ 	{
+ 		// select use function
+ 		if ( function_exists('mysql_query') )
+ 		{
+ 			MysqlPDO::$handler = 'mysql_';
+ 		}
+ 		else if ( function_exists('mysqli_query') )
+ 		{
+ 			MysqlPDO::$handler = 'mysqli_';
+ 		}
+ 		else
+ 		{
+ 			throw new PDOException('Can not be found mysql_ or mysqli_ functions.', 'IM000');
+ 		}
+ 
+ 		if ( preg_match('/host=([^;]+)/', $dsn, $matches) )
+ 		{
+ 			$host = $matches[1];
+ 		}
+ 		else
+ 		{
+ 			throw new PDOException('Host has not been set.', '01000');
+ 		}
+ 		if ( preg_match('/port=([^;]+)/', $dsn, $matches) )
+ 		{
+ 			$host .= ':' . $matches[1];
+ 		}
+ 
+ 		// mysql connect
+ 		$this->dbcon = @call_user_func(MysqlPDO::$handler . 'connect', $host, $username, $password);
+ 
+ 		if ( $this->dbcon == FALSE )
+ 		{
+ 			throw new PDOException('Failed to connect to the server.', '01000');
+ 		}
+ 
+ 		// select database
+ 		if ( preg_match('/dbname=([^;]+)/', $dsn, $matches) )
+ 		{
+ 			$dbname = $matches[1];
+ 			if ( $dbname )
+ 			{
+ 				if ( MysqlPDO::$handler == 'mysql_' )
+ 				{
+ 					call_user_func(MysqlPDO::$handler . 'select_db', $dbname, $this->dbcon);
+ 				}
+ 				else
+ 				{
+ 					call_user_func(MysqlPDO::$handler . 'select_db', $this->dbcon, $dbname);
+ 				}
+ 
+ 				// set use character
+ 				$charset = 'utf8';
+ 				if ( is_array($driver_options) && array_key_exists(PDO::MYSQL_ATTR_INIT_COMMAND, $driver_options) )
+ 				{
+ 					if ( preg_match('/SET\s+CHARACTER\s+SET\s+\'?([a-z0-9_-]+)\'?/', $driver_options[PDO::MYSQL_ATTR_INIT_COMMAND], $matches) )
+ 					{
+ 						$charset = $matches[1];
+ 					}
+ 				}
+ 				$server_info = call_user_func(MysqlPDO::$handler . 'get_server_info', $this->dbcon);
+ 				$mysql_version = preg_replace('/^([0-9]{1,2})\.([0-9]{1,2})\.([0-9]{1,2})(.*)$/', '$1.$2.$3', $server_info);
+ 
+ 				if ( version_compare($mysql_version, '5.0.7', '>=') && function_exists(MysqlPDO::$handler . 'set_charset') )
+ 				{
+ 					call_user_func(MysqlPDO::$handler . 'set_charset', $charset);
+ 				}
+ 				else if ( version_compare($mysql_version, '5.0.7', '<') )
+ 				{
+ 					$this->exec("SET CHARACTER SET '{$charset}';");
+ 				}
+ 				else
+ 				{
+ 					$this->exec("SET NAMES '{$charset}';");
+ 				}
+ 			}
+ 		}
+ 	}
+ 
+ 	/**
+ 	 * Close the connection to the MySQL server.
+ 	 */
+ 	public function __destruct()
+ 	{
+ 		if ( $this->dbcon )
+ 		{
+ 			@call_user_func(MysqlPDO::$handler . 'close', $this->dbcon);
+ 		}
+ 	}
+ 
+ 	/**
+ 	 * Not supported
+ 	 */
+ 	public function beginTransaction()
+ 	{
+ 		return FALSE;
+ 	}
+ 
+ 	/**
+ 	 * Not supported
+ 	 */
+ 	public function commit()
+ 	{
+ 		return FALSE;
+ 	}
+ 
+ 	/**
+ 	 * Fetch the SQLSTATE associated with the last operation.
+ 	 * However, if successful '00000' Otherwise, the return to '01000'.
+ 	 * @return string Error code
+ 	 */
+ 	public function errorCode()
+ 	{
+ 		$errno = call_user_func(MysqlPDO::$handler . 'errno', $this->dbcon);
+ 		return $errno === 0 ? '00000' : '01000';
+ 	}
+ 
+ 	/**
+ 	 * To get extended error information associated with the last operation.
+ 	 * Element 0: if successful '00000' Otherwise, the return to '01000'
+ 	 * Element 1: The return value of mysql_errno()
+ 	 * Element 2: The return value of mysql_error()
+ 	 * @return array Array of error information
+ 	 */
+ 	public function errorInfo()
+ 	{
+ 		$errno = call_user_func(MysqlPDO::$handler . 'errno', $this->dbcon);
+ 		$error = call_user_func(MysqlPDO::$handler . 'error', $this->dbcon);
+ 		return array($errno === 0 ? '00000' : '01000', $errno, $error);
+ 	}
+ 
+ 	public function exec($statement)
+ 	{
+ 		$result = @call_user_func(MysqlPDO::$handler . 'query', $statement, $this->dbcon);
+ 		if ( $result === TRUE )
+ 		{
+ 			return @call_user_func(MysqlPDO::$handler . 'affected_rows', $this->dbcon);
+ 		}
+ 		else if ( is_resource($result) )
+ 		{
+ 			return;
+ 		}
+ 		return FALSE;
+ 	}
+ 
+ 	public function getAttribute($attribute)
+ 	{
+ 		switch ( $attribute )
+ 		{
+ 			case PDO::ATTR_SERVER_VERSION:
+ 				return call_user_func(MysqlPDO::$handler . 'get_server_info', $this->dbcon);
+ 				break;
+ 			case PDO::ATTR_CLIENT_VERSION:
+ 				return call_user_func(MysqlPDO::$handler . 'get_client_info');
+ 				break;
+ 			default:
+ 				return FALSE;
+ 		}
+ 	}
+ 
+ 	public static function getAvailableDrivers()
+ 	{
+ 		return array('mysql');
+ 	}
+ 
+ 	/**
+ 	 * Not supported
+ 	 */
+ 	public function inTransaction()
+ 	{
+ 		return FALSE;
+ 	}
+ 
+ 	public function lastInsertId($name = null)
+ 	{
+ 		return call_user_func(MysqlPDO::$handler . 'insert_id', $this->dbcon);
+ 	}
+ 
+ 	/**
+ 	 * Not supported
+ 	 */
+ 	public function prepare($statement, $driver_options = array())
+ 	{
+ 		return FALSE;
+ 	}
+ 
+ 	public function query($statement)
+ 	{
+ 		$result = @call_user_func(MysqlPDO::$handler . 'query', $statement, $this->dbcon);
+ 		return ($result == FALSE) ? FALSE : new MysqlPDOStatement($statement, $result, $this->dbcon);
+ 	}
+ 
+ 	public function quote($string, $parameter_type = PDO::PARAM_STR)
+ 	{
+ 		switch ( $parameter_type )
+ 		{
+ 			case PDO::PARAM_NULL:
+ 				return 'null';
+ 			case PDO::PARAM_BOOL:
+ 				return $string ? '1' : '0';
+ 			default:
+ 				if ( $parameter_type == PDO::PARAM_INT && is_numeric($string) )
+ 				{
+ 					return $string;
+ 				}
+ 				else
+ 				{
+ 					return '\'' . call_user_func(MysqlPDO::$handler . 'real_escape_string', $string) . '\'';
+ 				}
+ 		}
+ 	}
+ 
+ 	/**
+ 	 * Not supported
+ 	 */
+ 	public function rollBack()
+ 	{
+ 		return FALSE;
+ 	}
+ 
+ 	/**
+ 	 * Not supported
+ 	 */
+ 	public function setAttribute($attribute, $value)
+ 	{
+ 		return FALSE;
+ 	}
+ }
+ 
+ /**
+  * MysqlPDOStatement class PDOStatement class like.
+  */
+ class MysqlPDOStatement implements Iterator
+ {
+ 	private $result;
+ 	private $dbcon;
+ 	private $_queryString = '';
+ 
+ 	private $def_fetch_mode = PDO::FETCH_BOTH;
+ 	private $def_col_num = 0;
+ 	private $def_class_name = 'stdClass';
+ 	private $def_ctorargs = null;
+ 	private $bind_object = null;
+ 
+ 	public function __get($name)
+ 	{
+ 		if ( $name == 'queryString' )
+ 		{
+ 			return $this->_queryString;
+ 		}
+ 	}
+ 
+ 	public function __construct($query, $result, $dbconnect = null)
+ 	{
+ 		$this->dbcon = $dbconnect;
+ 		$this->_queryString = $query;
+ 		$this->result = $result;
+ 	}
+ 
+ 	public function __destruct()
+ 	{
+ 		$this->result = null;
+ 	}
+ 
+ 	/**
+ 	 * Not supported
+ 	 */
+ 	public function bindColumn($column, &$param, $type, $maxlen, $driverdata)
+ 	{
+ 		return FALSE;
+ 	}
+ 
+ 	/**
+ 	 * Not supported
+ 	 */
+ 	public function bindParam($parameter, &$variable, $data_type = PDO::PARAM_STR, $length, $driver_options)
+ 	{
+ 		return FALSE;
+ 	}
+ 
+ 	/**
+ 	 * Not supported
+ 	 */
+ 	public function bindValue($parameter, $value, $data_type = PDO::PARAM_STR)
+ 	{
+ 		return FALSE;
+ 	}
+ 
+ 	public function closeCursor()
+ 	{
+ 		return call_user_func(MysqlPDO::$handler . 'free_result', $this->result);
+ 	}
+ 
+ 	public function columnCount()
+ 	{
+ 		return call_user_func(MysqlPDO::$handler . 'num_fields', $this->result);
+ 	}
+ 
+ 	/**
+ 	 * Not supported
+ 	 */
+ 	public function debugDumpParams()
+ 	{
+ 		return;
+ 	}
+ 
+ 	public function errorCode()
+ 	{
+ 		$errno = call_user_func(MysqlPDO::$handler . 'errno', $this->dbcon);
+ 		return $errno === 0 ? '00000' : '01000';
+ 	}
+ 
+ 	public function errorInfo()
+ 	{
+ 		$errno = call_user_func(MysqlPDO::$handler . 'errno', $this->dbcon);
+ 		$error = call_user_func(MysqlPDO::$handler . 'error', $this->dbcon);
+ 		return array($errno === 0 ? '00000' : '01000', $errno, $error);
+ 	}
+ 
+ 	/**
+ 	 * Not supported
+ 	 */
+ 	public function execute($input_parameters)
+ 	{
+ 		return FALSE;
+ 	}
+ 
+ 	public function fetch($fetch_style = PDO::ATTR_DEFAULT_FETCH_MODE, $cursor_orientation = PDO::FETCH_ORI_NEXT, $cursor_offset = 0)
+ 	{
+ 		if ( !is_resource($this->result) || $cursor_orientation != PDO::FETCH_ORI_NEXT )
+ 		{
+ 			return FALSE;
+ 		}
+ 		
+ 		if ( $fetch_style == PDO::ATTR_DEFAULT_FETCH_MODE )
+ 		{
+ 			$fetch_style = $this->def_fetch_mode;
+ 		}
+ 
+ 		switch ( $fetch_style )
+ 		{
+ 			case PDO::FETCH_ASSOC:
+ 				return @call_user_func(MysqlPDO::$handler . 'fetch_array', $this->result, MYSQL_ASSOC);
+ 			case PDO::FETCH_BOTH:
+ 				return @call_user_func(MysqlPDO::$handler . 'fetch_array', $this->result, MYSQL_BOTH);
+ 			case PDO::FETCH_NUM:
+ 				return @call_user_func(MysqlPDO::$handler . 'fetch_array', $this->result, MYSQL_NUM);
+ 			case PDO::FETCH_OBJ:
+ 				return $this->fetchObject();
+ 			case PDO::FETCH_CLASS:
+ 				return $this->fetchObject($this->def_class_name, $this->def_ctorargs);
+ 			case PDO::FETCH_COLUMN:
+ 				return $this->fetchColumn($this->def_col_num);
+ 			case PDO::FETCH_BOUND:
+ 				return FALSE; // Not supported
+ 			case PDO::FETCH_INTO:
+ 				return FALSE; // Not supported
+ 			case PDO::FETCH_LAZY:
+ 				return FALSE; // Not supported
+ 			default:
+ 				return FALSE;
+ 		}
+ 	}
+ 
+ 	public function fetchAll($fetch_style = PDO::ATTR_DEFAULT_FETCH_MODE, $fetch_argument = null, $ctor_args = array())
+ 	{
+ 		if ( $fetch_style == PDO::ATTR_DEFAULT_FETCH_MODE )
+ 		{
+ 			$fetch_style = PDO::FETCH_BOTH;
+ 		}
+ 		
+ 		$ret = array();
+ 		if ( ($fetch_style & PDO::FETCH_COLUMN) != 0 )
+ 		{
+ 			if ( $fetch_style == PDO::FETCH_COLUMN )
+ 			{
+ 				$column = $fetch_argument == null ? 0 : intval($fetch_argument);
+ 				while ( $row = $this->fetchColumn($column) )
+ 				{
+ 					$ret[] = $row;
+ 				}
+ 			}
+ 			elseif ( ($fetch_style & PDO::FETCH_UNIQUE) != 0 )
+ 			{
+ 				return FALSE;
+ 			}
+ 			elseif ( ($fetch_style & PDO::FETCH_GROUP) != 0 )
+ 			{
+ 				return FALSE;
+ 			}
+ 		}
+ 		elseif ( $fetch_style == PDO::FETCH_CLASS )
+ 		{
+ 			while ( $row = $this->fetchObject($fetch_argument, $ctor_args) )
+ 			{
+ 				$ret[] = $row;
+ 			}
+ 		}
+ 		elseif ( $fetch_style == PDO::FETCH_FUNC )
+ 		{
+ 			while ( $row = $this->fetch(PDO::FETCH_ASSOC) )
+ 			{
+ 				$ret[] = call_user_func_array($fetch_argument, array_values($row));
+ 			}
+ 		}
+ 		else
+ 		{
+ 			while ( $row = $this->fetch($fetch_style) )
+ 			{
+ 				$ret[] = $row;
+ 			}
+ 		}
+ 		return $ret;
+ 	}
+ 
+ 	public function fetchColumn($column_number = 0)
+ 	{
+ 		if ( $ret = $this->fetch(PDO::FETCH_NUM) )
+ 		{
+ 			return $ret[$column_number];
+ 		}
+ 		return FALSE;
+ 	}
+ 
+ 	public function fetchObject($class_name = 'stdClass', $ctor_args = null)
+ 	{
+ 		if ( is_array($ctor_args) && !empty($ctor_args) )
+ 		{
+ 			return @call_user_func(MysqlPDO::$handler . 'fetch_object', $this->result, $class_name, $ctor_args);
+ 		}
+ 		else
+ 		{
+ 			return @call_user_func(MysqlPDO::$handler . 'fetch_object', $this->result, $class_name);
+ 		}
+ 	}
+ 
+ 	public function getAttribute($attribute)
+ 	{
+ 		switch ( $attribute )
+ 		{
+ 			default:
+ 				return FALSE;
+ 		}
+ 	}
+ 
+ 	/**
+ 	 * Not supported
+ 	 */
+ 	public function getColumnMeta($column)
+ 	{
+ 		$result = array();
+ 		if ( MysqlPDO::$handler == 'mysql_' )
+ 		{
+ 			$result['name'] = @call_user_func(MysqlPDO::$handler . 'field_name', $this->result, $column);
+ 		}
+ 		return $result;
+ 	}
+ 
+ 	/**
+ 	 * Not supported
+ 	 */
+ 	public function nextRowset()
+ 	{
+ 		return FALSE;
+ 	}
+ 
+ 	public function rowCount()
+ 	{
+ 		return @call_user_func(MysqlPDO::$handler . 'affected_rows', $this->dbcon);
+ 	}
+ 
+ 	/**
+ 	 * Not supported
+ 	 */
+ 	public function setAttribute($attribute, $value)
+ 	{
+ 		return FALSE;
+ 	}
+ 
+ 	public function setFetchMode($mode, &$mode_argument, $ctorargs)
+ 	{
+ 		switch ( $mode )
+ 		{
+ 			case PDO::FETCH_COLUMN:
+ 				$this->def_col_num = $mode_argument;
+ 				break;
+ 			case PDO::FETCH_CLASS:
+ 				$this->def_class_name = $mode_argument;
+ 				$this->def_ctorargs = $ctorargs;
+ 				break;
+ 			case PDO::FETCH_INTO:
+ 				$this->bind_object = &$mode_argument;
+ 				return FALSE; // Not supported
+ 			default:
+ 				$this->def_fetch_mode = $mode;
+ 				break;
+ 		}
+ 		return 1;
+ 	}
+ 
+ 	// Iterator
+ 	private $iterator_value;
+ 
+ 	function rewind()
+ 	{}
+ 
+ 	function next()
+ 	{}
+ 
+ 	function valid()
+ 	{
+ 		return ($this->iterator_value = $this->fetch());
+ 	}
+ 
+ 	function current()
+ 	{
+ 		return $this->iterator_value;
+ 	}
+ 
+ 	function key()
+ 	{
+ 		return null;
+ 	}
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/libs/sql/sql.php
index 84d42bd,77d9ff6..e1b5e42
--- a/nucleus/libs/sql/sql.php
+++ b/nucleus/libs/sql/sql.php
@@@ -1,316 -1,315 +1,634 @@@
++<<<<<<< HEAD
 +<?php
 +
 +/*
 + * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
 + * Copyright (C) 2012 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) 2012 The Nucleus Group
 + * @version $Id$
 + */
 +
 +/*
 + * sql_* wrappers for DB class access
 + */
 +if ( !class_exists('DB') )
 +{
 +	include_once realpath(dirname(__FILE__)) . '/DB.php';
 +}
 +
 +/**
 + * Connects to database server with arguments
 + * @deprecated
 + */
 +function sql_connect_args($host = 'localhost', $user = '', $password = '', $database = '', $new_link = FALSE)
 +{
 +	global $MYSQL_HANDLER;
 +	return DB::setConnectionInfo($MYSQL_HANDLER[1], $host, $user, $password, $database);
 +}
 +
 +/**
 + * Connects to database server
 + * @deprecated
 + */
 +function sql_connect()
 +{
 +	global $MYSQL_HANDLER, $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE;
 +
 +	return DB::setConnectionInfo($MYSQL_HANDLER[1], $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE);
 +}
 +
 +/**
 + * disconnects from SQL server
 + * @deprecated
 + */
 +function sql_disconnect($conn = false)
 +{
 +	DB::disConnect();
 +}
 +
 +/**
 + * disconnects from SQL server
 + * @deprecated
 + * @param unknown_type $conn
 + */
 +function sql_close($conn = false)
 +{
 +	DB::disConnect();
 +}
 +
 +/**
 + * executes an SQL query
 + * @deprecated
 + */
 +function sql_query($query, $conn = false)
 +{
 +	global $mysql_affected_row;
 +	$mysql_affected_row = -1;
 +	if ( preg_match('/^\W*(INSERT|UPDATE|DELETE|DROP)/i', $query) )
 +	{
 +		$mysql_affected_row = DB::execute($query);
 +		return $mysql_affected_row !== FALSE ? TRUE : FALSE;
 +	}
 +	return DB::getResult($query);
 +}
 +
 +/**
 + * executes an SQL error
 + * @deprecated
 + */
 +function sql_error($conn = false)
 +{
 +	$err = DB::getError();
 +	return $err[2];
 +}
 +
 +/**
 + * executes an SQL db select
 + * @deprecated
 + */
 +function sql_select_db($db, $conn = false)
 +{
 +	sql_disconnect();
 +	return sql_connect();
 +}
 +
 +/**
 + * executes an SQL real escape
 + * @deprecated
 + */
 +function sql_real_escape_string($val, $conn = false)
 +{
 +	if ( is_numeric($val) )
 +	{
 +		return $val;
 +	}
 +	$escapeval = DB::quoteValue($val);
 +	if ( preg_match("/^'(.*)'$/", $escapeval, $matches) )
 +	{
 +		$escapeval = $matches[1];
 +	}
 +	return $escapeval;
 +}
 +
 +/**
 + * executes an PDO::quote() like escape, ie adds quotes arround the string and escapes chars as needed
 + * @deprecated
 + */
 +function sql_quote_string($val, $conn = false)
 +{
 +	if ( is_numeric($val) )
 +	{
 +		return $val;
 +	}
 +	return DB::quoteValue($val);
 +}
 +
 +/**
 + * executes an SQL insert id
 + * @deprecated
 + */
 +function sql_insert_id($conn = false)
 +{
 +	return DB::getInsertId();
 +}
 +
 +/**
 + * executes an SQL result request
 + * @deprecated
 + */
 +function sql_result($res, $row, $col)
 +{
 +	if ( !method_exists($res, 'fetch') ) return FALSE;
 +	for ( $i = 0; $i < $row; $i++ )
 +		$res->fetch();
 +	return $res->fetchColumn($col);
 +}
 +
 +/**
 + * frees sql result resources
 + * @deprecated
 + */
 +function sql_free_result($res)
 +{
 +	if ( !method_exists($res, 'closeCursor') ) return FALSE;
 +	return $res->closeCursor();
 +}
 +
 +/**
 + * returns number of rows in SQL result
 + * @deprecated
 + */
 +function sql_num_rows($res)
 +{
 +	if ( !method_exists($res, 'rowCount') ) return FALSE;
 +	return $res->rowCount();
 +}
 +
 +/**
 + * returns number of rows affected by SQL query
 + * @deprecated
 + */
 +function sql_affected_rows($conn = false)
 +{
 +	global $mysql_affected_row;
 +	return $mysql_affected_row;
 +}
 +
 +/**
 + * Get number of fields in result
 + * @deprecated
 + */
 +function sql_num_fields($res)
 +{
 +	if ( !method_exists($res, 'columnCount') ) return FALSE;
 +	return $res->columnCount();
 +}
 +
 +/**
 + * fetches next row of SQL result as an associative array
 + * @deprecated
 + */
 +function sql_fetch_assoc($res)
 +{
 +	if ( !method_exists($res, 'fetch') ) return FALSE;
 +	return $res->fetch(PDO::FETCH_ASSOC);
 +}
 +
 +/**
 + * Fetch a result row as an associative array, a numeric array, or both
 + * @deprecated
 + */
 +function sql_fetch_array($res)
 +{
 +	if ( !method_exists($res, 'fetch') ) return FALSE;
 +	return $res->fetch(PDO::FETCH_BOTH);
 +}
 +
 +/**
 + * fetches next row of SQL result as an object
 + * @deprecated
 + */
 +function sql_fetch_object($res)
 +{
 +	if ( !method_exists($res, 'fetch') ) return FALSE;
 +	return $res->fetch(PDO::FETCH_OBJ);
 +}
 +
 +/**
 + * Get a result row as an enumerated array
 + * @deprecated
 + */
 +function sql_fetch_row($res)
 +{
 +	if ( !method_exists($res, 'fetch') ) return FALSE;
 +	return $res->fetch(PDO::FETCH_NUM);
 +}
 +
 +/**
 + * Get column information from a result and return as an object
 + * @deprecated
 + */
 +function sql_fetch_field($res, $offset = 0)
 +{
 +	return FALSE;
 +}
 +
 +/**
 + * Get current system status (returns string)
 + * @deprecated
 + */
 +function sql_stat($conn = false)
 +{
 +	return FALSE;
 +}
 +
 +/**
 + * Returns the name of the character set
 + * @deprecated
 + */
 +function sql_client_encoding($conn = false)
 +{
 +	return FALSE;
 +}
 +
 +/**
 + * Get SQL client version
 + * @deprecated
 + */
 +function sql_get_client_info()
 +{
 +	return DB::getAttribute(PDO::ATTR_CLIENT_VERSION);
 +}
 +
 +/**
 + * Get SQL server version
 + * @deprecated
 + */
 +function sql_get_server_info($conn = false)
 +{
 +	return DB::getAttribute(PDO::ATTR_SERVER_VERSION);
 +}
 +
 +/**
 + * Returns a string describing the type of SQL connection in use for the connection or FALSE on failure
 + * @deprecated
 + */
 +function sql_get_host_info($conn = false)
 +{
 +	return FALSE;
 +}
 +
 +/**
 + * Returns the SQL protocol on success, or FALSE on failure.
 + * @deprecated
 + */
 +function sql_get_proto_info($conn = false)
 +{
 +	return FALSE;
 +}
 +
 +/**
 + * Get the name of the specified field in a result
 + * @deprecated
 + */
 +function sql_field_name($res, $offset = 0)
 +{
 +	if ( !method_exists($res, 'getColumnMeta') ) return FALSE;
 +	$column = $res->getColumnMeta($offset);
 +	return $column['name'];
 +}
 +
 +/**
 + * Set character encodings in each fields related to MySQL connection.
 + * @deprecated
 + */
 +function sql_set_charset($charset)
 +{
 +	return TRUE;
 +}
++=======
+ <?php
+ 
+ /*
+  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
+  * Copyright (C) 2012 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) 2012 The Nucleus Group
+  * @version $Id$
+  */
+ /*
+  * sql_* wrappers for DB class access
+  */
+ if ( !class_exists('DB') )
+ {
+ 	include_once realpath(dirname(__FILE__)) . '/DB.php';
+ }
+ 
+ /**
+  * Connects to database server with arguments
+  * @deprecated
+  */
+ function sql_connect_args($host = 'localhost', $user = '', $password = '', $database = '', $new_link = FALSE)
+ {
+ 	global $MYSQL_HANDLER;
+ 	return DB::setConnectionInfo($MYSQL_HANDLER[1], $host, $user, $password, $database);
+ }
+ 
+ /**
+  * Connects to database server
+  * @deprecated
+  */
+ function sql_connect()
+ {
+ 	global $MYSQL_HANDLER, $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE;
+ 
+ 	return DB::setConnectionInfo($MYSQL_HANDLER[1], $MYSQL_HOST, $MYSQL_USER, $MYSQL_PASSWORD, $MYSQL_DATABASE);
+ }
+ 
+ /**
+  * disconnects from SQL server
+  * @deprecated
+  */
+ function sql_disconnect($conn = false)
+ {
+ 	DB::disConnect();
+ }
+ 
+ /**
+  * disconnects from SQL server
+  * @deprecated
+  * @param unknown_type $conn
+  */
+ function sql_close($conn = false)
+ {
+ 	DB::disConnect();
+ }
+ 
+ /**
+  * executes an SQL query
+  * @deprecated
+  */
+ function sql_query($query, $conn = false)
+ {
+ 	global $mysql_affected_row;
+ 	$mysql_affected_row = -1;
+ 	if ( preg_match('/^\W*(INSERT|UPDATE|DELETE|DROP)/i', $query) )
+ 	{
+ 		$mysql_affected_row = DB::execute($query);
+ 		return $mysql_affected_row !== FALSE ? TRUE : FALSE;
+ 	}
+ 	return DB::getResult($query);
+ }
+ 
+ /**
+  * executes an SQL error
+  * @deprecated
+  */
+ function sql_error($conn = false)
+ {
+ 	$err = DB::getError();
+ 	return $err[2];
+ }
+ 
+ /**
+  * executes an SQL db select
+  * @deprecated
+  */
+ function sql_select_db($db, $conn = false)
+ {
+ 	sql_disconnect();
+ 	return sql_connect();
+ }
+ 
+ /**
+  * executes an SQL real escape
+  * @deprecated
+  */
+ function sql_real_escape_string($val, $conn = false)
+ {
+ 	if ( is_numeric($val) )
+ 	{
+ 		return $val;
+ 	}
+ 	$escapeval = DB::quoteValue($val);
+ 	if ( preg_match("/^'(.*)'$/", $escapeval, $matches) )
+ 	{
+ 		$escapeval = $matches[1];
+ 	}
+ 	return $escapeval;
+ }
+ 
+ /**
+  * executes an PDO::quote() like escape, ie adds quotes arround the string and escapes chars as needed
+  * @deprecated
+  */
+ function sql_quote_string($val, $conn = false)
+ {
+ 	if ( is_numeric($val) )
+ 	{
+ 		return $val;
+ 	}
+ 	return DB::quoteValue($val);
+ }
+ 
+ /**
+  * executes an SQL insert id
+  * @deprecated
+  */
+ function sql_insert_id($conn = false)
+ {
+ 	return DB::getInsertId();
+ }
+ 
+ /**
+  * executes an SQL result request
+  * @deprecated
+  */
+ function sql_result($res, $row, $col)
+ {
+ 	if ( !method_exists($res, 'fetch') ) return FALSE;
+ 	for ( $i = 0; $i < $row; $i++ )
+ 		$res->fetch();
+ 	return $res->fetchColumn($col);
+ }
+ 
+ /**
+  * frees sql result resources
+  * @deprecated
+  */
+ function sql_free_result($res)
+ {
+ 	if ( !method_exists($res, 'closeCursor') ) return FALSE;
+ 	return $res->closeCursor();
+ }
+ 
+ /**
+  * returns number of rows in SQL result
+  * @deprecated
+  */
+ function sql_num_rows($res)
+ {
+ 	if ( !method_exists($res, 'rowCount') ) return FALSE;
+ 	return $res->rowCount();
+ }
+ 
+ /**
+  * returns number of rows affected by SQL query
+  * @deprecated
+  */
+ function sql_affected_rows($conn = false)
+ {
+ 	global $mysql_affected_row;
+ 	return $mysql_affected_row;
+ }
+ 
+ /**
+  * Get number of fields in result
+  * @deprecated
+  */
+ function sql_num_fields($res)
+ {
+ 	if ( !method_exists($res, 'columnCount') ) return FALSE;
+ 	return $res->columnCount();
+ }
+ 
+ /**
+  * fetches next row of SQL result as an associative array
+  * @deprecated
+  */
+ function sql_fetch_assoc($res)
+ {
+ 	if ( !method_exists($res, 'fetch') ) return FALSE;
+ 	return $res->fetch(PDO::FETCH_ASSOC);
+ }
+ 
+ /**
+  * Fetch a result row as an associative array, a numeric array, or both
+  * @deprecated
+  */
+ function sql_fetch_array($res)
+ {
+ 	if ( !method_exists($res, 'fetch') ) return FALSE;
+ 	return $res->fetch(PDO::FETCH_BOTH);
+ }
+ 
+ /**
+  * fetches next row of SQL result as an object
+  * @deprecated
+  */
+ function sql_fetch_object($res)
+ {
+ 	if ( !method_exists($res, 'fetch') ) return FALSE;
+ 	return $res->fetch(PDO::FETCH_OBJ);
+ }
+ 
+ /**
+  * Get a result row as an enumerated array
+  * @deprecated
+  */
+ function sql_fetch_row($res)
+ {
+ 	if ( !method_exists($res, 'fetch') ) return FALSE;
+ 	return $res->fetch(PDO::FETCH_NUM);
+ }
+ 
+ /**
+  * Get column information from a result and return as an object
+  * @deprecated
+  */
+ function sql_fetch_field($res, $offset = 0)
+ {
+ 	return FALSE;
+ }
+ 
+ /**
+  * Get current system status (returns string)
+  * @deprecated
+  */
+ function sql_stat($conn = false)
+ {
+ 	return FALSE;
+ }
+ 
+ /**
+  * Returns the name of the character set
+  * @deprecated
+  */
+ function sql_client_encoding($conn = false)
+ {
+ 	return FALSE;
+ }
+ 
+ /**
+  * Get SQL client version
+  * @deprecated
+  */
+ function sql_get_client_info()
+ {
+ 	return DB::getAttribute(PDO::ATTR_CLIENT_VERSION);
+ }
+ 
+ /**
+  * Get SQL server version
+  * @deprecated
+  */
+ function sql_get_server_info($conn = false)
+ {
+ 	return DB::getAttribute(PDO::ATTR_SERVER_VERSION);
+ }
+ 
+ /**
+  * Returns a string describing the type of SQL connection in use for the connection or FALSE on failure
+  * @deprecated
+  */
+ function sql_get_host_info($conn = false)
+ {
+ 	return FALSE;
+ }
+ 
+ /**
+  * Returns the SQL protocol on success, or FALSE on failure.
+  * @deprecated
+  */
+ function sql_get_proto_info($conn = false)
+ {
+ 	return FALSE;
+ }
+ 
+ /**
+  * Get the name of the specified field in a result
+  * @deprecated
+  */
+ function sql_field_name($res, $offset = 0)
+ {
+ 	if ( !method_exists($res, 'getColumnMeta') ) return FALSE;
+ 	$column = $res->getColumnMeta($offset);
+ 	return $column['name'];
+ }
+ 
+ /**
+  * Set character encodings in each fields related to MySQL connection.
+  * @deprecated
+  */
+ function sql_set_charset($charset)
+ {
+ 	return TRUE;
+ }
++>>>>>>> skinnable-master
diff --combined nucleus/locales/bg_Cyrl_BG.ISO-8859-5.php
index 285c733,e770271..d76fb27
--- a/nucleus/locales/bg_Cyrl_BG.ISO-8859-5.php
+++ b/nucleus/locales/bg_Cyrl_BG.ISO-8859-5.php
@@@ -8,16 -8,97 +8,104 @@@
   *
   * @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                 *
   ********************************************/
- 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');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -86,10 -167,10 +174,10 @@@ define('_ERROR_INSREQPLUGIN',		'Plugin 
  define('_ERROR_DELREQPLUGIN',		'Plugin deletion failed, required by %s');
  
  //define('_ADD_ADDLATER',								'Add Later');
- define('_ADD_ADDLATER',								'Add the dates specified');
+ define('_ADD_ADDLATER',				'Äîáàâè ïî-êúñíî');
  
- define('_LOGIN_NAME',				'Name:');
- define('_LOGIN_PASSWORD',			'Password:');
+ define('_LOGIN_NAME',				'Èìå');
+ define('_LOGIN_PASSWORD',			'Ïàðîëà');
  
  // changed from _BOOKMARLET_BMARKLFOLLOW
  define('_BOOKMARKLET_BMARKFOLLOW',					' (Works with nearly all browsers)');
@@@ -187,13 -268,7 +275,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -323,7 -398,7 +405,7 @@@ define('_ERROR_PLUGIN_LOAD',		'Plugin c
  // 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_MAIL',			'E-mail/HTTP');
  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');
@@@ -757,7 -832,6 +839,6 @@@ define('_COMMENTFORM_YOUARE',		'Âèå ñòå
  define('_COMMENTFORM_SUBMIT',		'Äîáàâè êîìåíòàð');
  define('_COMMENTFORM_COMMENT',		'Âàøèÿ êîìåíòàð');
  define('_COMMENTFORM_NAME',			'Èìå');
- define('_COMMENTFORM_MAIL',			'E-mail/HTTP');
  define('_COMMENTFORM_REMEMBER',		'Çàïîìíè ìå');
  
  // loginform
@@@ -784,7 -858,6 +865,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Çàáðà
  define('_ADD_DRAFTNFUTURE',			'Draft &amp; Future Items');
  define('_ADD_ADDITEM',				'Äîáàâè Item');
  define('_ADD_ADDNOW',				'Äîáàâè ñåãà');
- define('_ADD_ADDLATER',				'Äîáàâè ïî-êúñíî');
  define('_ADD_PLACE_ON',				'Ïîñòàâè íà');
  define('_ADD_ADDDRAFT',				'Äîáàâè êúì drafts');
  define('_ADD_NOPASTDATES',			'(äàòè è âðåìå â ìèíàëîòî ÍÅ ñà âàëèäíè, â òàêúâ ñëó÷àé ùå ñå èçïîëçâà ñåãàøíîòî âðåìå)');
@@@ -1128,8 -1201,6 +1208,6 @@@ define('_BAN_ADD_BTN',				'Äîáàâè Ban')
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Ñúîáùåíèå');
- define('_LOGIN_NAME',				'Èìå');
- define('_LOGIN_PASSWORD',			'Ïàðîëà');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Çàáðàâåíà ïàðîëà?');
  
@@@ -1261,3 -1332,19 +1339,19 @@@ define('_EDITC_NONMEMBER',			'non membe
  // move item
  define('_MOVE_TITLE',				'Ïðåìåñòè êúì êîé blog?');
  define('_MOVE_BTN',					'Ïðåìåñòè Item');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/bg_Cyrl_BG.UTF-8.php
index e8a93fa,f3faa34..4562794
--- a/nucleus/locales/bg_Cyrl_BG.UTF-8.php
+++ b/nucleus/locales/bg_Cyrl_BG.UTF-8.php
@@@ -8,16 -8,97 +8,101 @@@
   *
   * @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
   */
  
-  /********************************************
+ /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'C');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -86,10 -167,10 +171,10 @@@ define('_ERROR_INSREQPLUGIN',		'Plugin 
  define('_ERROR_DELREQPLUGIN',		'Plugin deletion failed, required by %s');
  
  //define('_ADD_ADDLATER',								'Add Later');
- define('_ADD_ADDLATER',								'Add the dates specified');
+ define('_ADD_ADDLATER',				'Фюсртш яю-ъњёэю');
  
- define('_LOGIN_NAME',				'Name:');
- define('_LOGIN_PASSWORD',			'Password:');
+ define('_LOGIN_NAME',				'Шьх');
+ define('_LOGIN_PASSWORD',			'Яр№юыр');
  
  // changed from _BOOKMARLET_BMARKLFOLLOW
  define('_BOOKMARKLET_BMARKFOLLOW',					' (Works with nearly all browsers)');
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -323,7 -398,7 +402,7 @@@ define('_ERROR_PLUGIN_LOAD',		'Plugin c
  // 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_MAIL',			'E-mail/HTTP');
  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');
@@@ -757,7 -832,6 +836,6 @@@ define('_COMMENTFORM_YOUARE',		'Тшх 
  define('_COMMENTFORM_SUBMIT',		'Фюсртш ъюьхэђр№');
  define('_COMMENTFORM_COMMENT',		'Трјшџ ъюьхэђр№');
  define('_COMMENTFORM_NAME',			'Шьх');
- define('_COMMENTFORM_MAIL',			'E-mail/HTTP');
  define('_COMMENTFORM_REMEMBER',		'Чряюьэш ьх');
  
  // loginform
@@@ -784,7 -858,6 +862,6 @@@ define('_ADD_DISABLE_COMMENTS',		'ЧрÑ
  define('_ADD_DRAFTNFUTURE',			'Draft &amp; Future Items');
  define('_ADD_ADDITEM',				'Фюсртш Item');
  define('_ADD_ADDNOW',				'Фюсртш ёхур');
- define('_ADD_ADDLATER',				'Фюсртш яю-ъњёэю');
  define('_ADD_PLACE_ON',				'Яюёђртш эр');
  define('_ADD_ADDDRAFT',				'Фюсртш ъњь drafts');
  define('_ADD_NOPASTDATES',			'(фрђш ш т№хьх т ьшэрыюђю ЭХ ёр трышфэш, т ђръњт ёыѓїрщ љх ёх шчяюычтр ёхурјэюђю т№хьх)');
@@@ -1128,8 -1201,6 +1205,6 @@@ define('_BAN_ADD_BTN',				'ФюсртÑ
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'бњюсљхэшх');
- define('_LOGIN_NAME',				'Шьх');
- define('_LOGIN_PASSWORD',			'Яр№юыр');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Чрс№ртхэр яр№юыр?');
  
@@@ -1261,3 -1332,19 +1336,19 @@@ define('_EDITC_NONMEMBER',			'non membe
  // move item
  define('_MOVE_TITLE',				'Я№хьхёђш ъњь ъющ blog?');
  define('_MOVE_BTN',					'Я№хьхёђш Item');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/ca_Latn_ES.ISO-8859-1.php
index f29e628,4360d76..0a4e1ac
--- a/nucleus/locales/ca_Latn_ES.ISO-8859-1.php
+++ b/nucleus/locales/ca_Latn_ES.ISO-8859-1.php
@@@ -8,16 -8,97 +8,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'C');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -81,15 -162,15 +166,15 @@@ 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');
+ // plugin dependency
+ define('_ERROR_INSREQPLUGIN',		'La instal·lació dels plugin ha fallat, necessita ');
+ define('_ERROR_DELREQPLUGIN',		'No es pot eliminar el plugin, es necessitat per ');
  
  //define('_ADD_ADDLATER',								'Add Later');
- define('_ADD_ADDLATER',								'Add the dates specified');
+ define('_ADD_ADDLATER',				'Afegir després');
  
- define('_LOGIN_NAME',				'Name:');
- define('_LOGIN_PASSWORD',			'Password:');
+ define('_LOGIN_NAME',				'Nom');
+ define('_LOGIN_PASSWORD',			'Contrasenya');
  
  // changed from _BOOKMARLET_BMARKLFOLLOW
  define('_BOOKMARKLET_BMARKFOLLOW',					' (Works with nearly all browsers)');
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -323,7 -398,7 +402,7 @@@ define('_ERROR_PLUGIN_LOAD',		'Plugin c
  // 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_MAIL',			'E-correu/web');
  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');
@@@ -352,10 -427,6 +431,6 @@@ define('_ARCHIVETYPE_MONTH',		'mes')
  // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
  define('_ERROR_BADTICKET',			'Tiquet invàlid o caducat.');
  
- // plugin dependency
- define('_ERROR_INSREQPLUGIN',		'La instal·lació dels plugin ha fallat, necessita ');
- define('_ERROR_DELREQPLUGIN',		'No es pot eliminar el plugin, es necessitat per ');
- 
  // cookie prefix
  define('_SETTINGS_COOKIEPREFIX',	'Prefix de la "galeta"');
  
@@@ -474,9 -545,6 +549,6 @@@ define('_ADD_ALIGNLEFT_TT',			'Alinea 
  define('_ADD_ALIGNRIGHT_TT',		'Alinea a la dreta');
  define('_ADD_ALIGNCENTER_TT',		'Alinea al centre');
  
- // searchable blog setting (yes/no)
- define('_EBLOG_SEARCH',				'Inclou a la cerca');
- 
  // generic upload failure
  define('_ERROR_UPLOADFAILED',		'Enviament fallat');
  
@@@ -763,7 -831,6 +835,6 @@@ define('_COMMENTFORM_YOUARE',		'Tu ets'
  define('_COMMENTFORM_SUBMIT',		'Afegir comentari');
  define('_COMMENTFORM_COMMENT',		'El teu comentari');
  define('_COMMENTFORM_NAME',			'Nom');
- define('_COMMENTFORM_MAIL',			'E-correu/web');
  define('_COMMENTFORM_REMEMBER',		'Recorda\'t de mi');
  
  // loginform
@@@ -790,7 -857,6 +861,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Imped
  define('_ADD_DRAFTNFUTURE',			'Esborrany &amp; articles futurs');
  define('_ADD_ADDITEM',				'Afegir un article');
  define('_ADD_ADDNOW',				'Afegir ara');
- define('_ADD_ADDLATER',				'Afegir després');
  define('_ADD_PLACE_ON',				'Posar a');
  define('_ADD_ADDDRAFT',				'Afegir a esborranys');
  define('_ADD_NOPASTDATES',			'(Les dates passades no són valides, el temps actual s\'utilitzarà si és dona el cas)');
@@@ -1134,8 -1200,6 +1204,6 @@@ define('_BAN_ADD_BTN',				'Afegir un ba
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Missatge');
- define('_LOGIN_NAME',				'Nom');
- define('_LOGIN_PASSWORD',			'Contrasenya');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Has oblidat la teva contrasenya?');
  
@@@ -1267,3 -1331,19 +1335,19 @@@ define('_EDITC_NONMEMBER',			'usuari n
  // move item
  define('_MOVE_TITLE',				'Moure a quin weblog?');
  define('_MOVE_BTN',					'Moure l\'article');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/ca_Latn_ES.UTF-8.php
index 176328a,247ba4e..57acb07
--- a/nucleus/locales/ca_Latn_ES.UTF-8.php
+++ b/nucleus/locales/ca_Latn_ES.UTF-8.php
@@@ -8,16 -8,97 +8,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'C');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -81,15 -162,15 +166,15 @@@ 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');
+ // plugin dependency
+ define('_ERROR_INSREQPLUGIN',		'La instal·lació dels plugin ha fallat, necessita ');
+ define('_ERROR_DELREQPLUGIN',		'No es pot eliminar el plugin, es necessitat per ');
  
  //define('_ADD_ADDLATER',								'Add Later');
- define('_ADD_ADDLATER',								'Add the dates specified');
+ define('_ADD_ADDLATER',				'Afegir després');
  
- define('_LOGIN_NAME',				'Name:');
- define('_LOGIN_PASSWORD',			'Password:');
+ define('_LOGIN_NAME',				'Nom');
+ define('_LOGIN_PASSWORD',			'Contrasenya');
  
  // changed from _BOOKMARLET_BMARKLFOLLOW
  define('_BOOKMARKLET_BMARKFOLLOW',					' (Works with nearly all browsers)');
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -323,7 -398,7 +402,7 @@@ define('_ERROR_PLUGIN_LOAD',		'Plugin c
  // 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_MAIL',			'E-correu/web');
  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');
@@@ -352,10 -427,6 +431,6 @@@ define('_ARCHIVETYPE_MONTH',		'mes')
  // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
  define('_ERROR_BADTICKET',			'Tiquet invàlid o caducat.');
  
- // plugin dependency
- define('_ERROR_INSREQPLUGIN',		'La instal·lació dels plugin ha fallat, necessita ');
- define('_ERROR_DELREQPLUGIN',		'No es pot eliminar el plugin, es necessitat per ');
- 
  // cookie prefix
  define('_SETTINGS_COOKIEPREFIX',	'Prefix de la "galeta"');
  
@@@ -474,9 -545,6 +549,6 @@@ define('_ADD_ALIGNLEFT_TT',			'Alinea 
  define('_ADD_ALIGNRIGHT_TT',		'Alinea a la dreta');
  define('_ADD_ALIGNCENTER_TT',		'Alinea al centre');
  
- // searchable blog setting (yes/no)
- define('_EBLOG_SEARCH',				'Inclou a la cerca');
- 
  // generic upload failure
  define('_ERROR_UPLOADFAILED',		'Enviament fallat');
  
@@@ -763,7 -831,6 +835,6 @@@ define('_COMMENTFORM_YOUARE',		'Tu ets'
  define('_COMMENTFORM_SUBMIT',		'Afegir comentari');
  define('_COMMENTFORM_COMMENT',		'El teu comentari');
  define('_COMMENTFORM_NAME',			'Nom');
- define('_COMMENTFORM_MAIL',			'E-correu/web');
  define('_COMMENTFORM_REMEMBER',		'Recorda\'t de mi');
  
  // loginform
@@@ -790,7 -857,6 +861,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Imped
  define('_ADD_DRAFTNFUTURE',			'Esborrany &amp; articles futurs');
  define('_ADD_ADDITEM',				'Afegir un article');
  define('_ADD_ADDNOW',				'Afegir ara');
- define('_ADD_ADDLATER',				'Afegir després');
  define('_ADD_PLACE_ON',				'Posar a');
  define('_ADD_ADDDRAFT',				'Afegir a esborranys');
  define('_ADD_NOPASTDATES',			'(Les dates passades no són valides, el temps actual s\'utilitzarà si és dona el cas)');
@@@ -1134,8 -1200,6 +1204,6 @@@ define('_BAN_ADD_BTN',				'Afegir un ba
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Missatge');
- define('_LOGIN_NAME',				'Nom');
- define('_LOGIN_PASSWORD',			'Contrasenya');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Has oblidat la teva contrasenya?');
  
@@@ -1267,3 -1331,19 +1335,19 @@@ define('_EDITC_NONMEMBER',			'usuari n
  // move item
  define('_MOVE_TITLE',				'Moure a quin weblog?');
  define('_MOVE_BTN',					'Moure l\'article');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/cs_Latn_CZ.UTF-8.php
index 57d8d62,aa2f1a1..cc39ecf
--- a/nucleus/locales/cs_Latn_CZ.UTF-8.php
+++ b/nucleus/locales/cs_Latn_CZ.UTF-8.php
@@@ -8,16 -8,97 +8,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'csy_cze');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -86,10 -167,10 +171,10 @@@ define('_ERROR_INSREQPLUGIN',		'Plugin 
  define('_ERROR_DELREQPLUGIN',		'Plugin deletion failed, required by %s');
  
  //define('_ADD_ADDLATER',								'Add Later');
- define('_ADD_ADDLATER',								'Add the dates specified');
+ define('_ADD_ADDLATER',				'Přidat později');
  
- define('_LOGIN_NAME',				'Name:');
- define('_LOGIN_PASSWORD',			'Password:');
+ define('_LOGIN_NAME',				'Jméno');
+ define('_LOGIN_PASSWORD',			'Heslo');
  
  // changed from _BOOKMARLET_BMARKLFOLLOW
  define('_BOOKMARKLET_BMARKFOLLOW',					' (Works with nearly all browsers)');
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -323,7 -398,7 +402,7 @@@ define('_ERROR_PLUGIN_LOAD',		'Plugin c
  // 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_MAIL',			'E-mail/HTTP');
  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');
@@@ -449,7 -524,7 +528,7 @@@ define('_WARNING_EXTAUTH',			'Warning: 
  define('_MEMBERS_BYPASS',			'Use External Authentication');
  
  // 'always include in search' blog setting (yes/no) [in v2.5beta, the 'always' part wasn't clear]
- define('_EBLOG_SEARCH',				'<em>Always</em> include in search');
+ define('_EBLOG_SEARCH',				'Zahrnout do hledání');
  
  // END changed/added after v2.5beta
  
@@@ -472,9 -547,6 +551,6 @@@ define('_ADD_ALIGNLEFT_TT',			'Zarovna
  define('_ADD_ALIGNRIGHT_TT',		'Zarovnat doprava');
  define('_ADD_ALIGNCENTER_TT',		'Zarovnat na střed');
  
- // searchable blog setting (yes/no)
- define('_EBLOG_SEARCH',				'Zahrnout do hledání');
- 
  // generic upload failure
  define('_ERROR_UPLOADFAILED',		'Nahrávání selhalo');
  
@@@ -761,7 -833,6 +837,6 @@@ define('_COMMENTFORM_YOUARE',		'Jste')
  define('_COMMENTFORM_SUBMIT',		'Přidat komentář');
  define('_COMMENTFORM_COMMENT',		'Váš komentář');
  define('_COMMENTFORM_NAME',			'Jméno');
- define('_COMMENTFORM_MAIL',			'E-mail/HTTP');
  define('_COMMENTFORM_REMEMBER',		'Pamatuj si mne');
  
  // loginform
@@@ -788,7 -859,6 +863,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Zaká
  define('_ADD_DRAFTNFUTURE',			'Koncepty a články pro pozdější publikování');
  define('_ADD_ADDITEM',				'Přidat článek');
  define('_ADD_ADDNOW',				'Přidat nyní');
- define('_ADD_ADDLATER',				'Přidat později');
  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žit aktuální čas)');
@@@ -1132,8 -1202,6 +1206,6 @@@ define('_BAN_ADD_BTN',				'Přidat omez
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Zpráva');
- define('_LOGIN_NAME',				'Jméno');
- define('_LOGIN_PASSWORD',			'Heslo');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Zapomněl jste heslo?');
  
@@@ -1265,3 -1333,19 +1337,19 @@@ define('_EDITC_NONMEMBER',			'není čl
  // move item
  define('_MOVE_TITLE',				'Přesunout do jakého blogu?');
  define('_MOVE_BTN',					'Přesunout článek');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/cs_Latn_CZ.WINDOWS-1250.php
index 6252d61,b948b17..71f0587
--- a/nucleus/locales/cs_Latn_CZ.WINDOWS-1250.php
+++ b/nucleus/locales/cs_Latn_CZ.WINDOWS-1250.php
@@@ -1,23 -1,104 +1,116 @@@
  <?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)
+  * 
+  * Nucleus version: v1.0-v2.0
+  * Author: Mnemonic (mnemonic@dead-code.org)
+  * 
+  * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'csy_cze');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -86,10 -167,10 +179,10 @@@ define('_ERROR_INSREQPLUGIN',		'Plugin 
  define('_ERROR_DELREQPLUGIN',		'Plugin deletion failed, required by %s');
  
  //define('_ADD_ADDLATER',								'Add Later');
- define('_ADD_ADDLATER',								'Add the dates specified');
+ define('_ADD_ADDLATER',				'Pøidat pozdìji');
  
- define('_LOGIN_NAME',				'Name:');
- define('_LOGIN_PASSWORD',			'Password:');
+ define('_LOGIN_NAME',				'Jméno');
+ define('_LOGIN_PASSWORD',			'Heslo');
  
  // changed from _BOOKMARLET_BMARKLFOLLOW
  define('_BOOKMARKLET_BMARKFOLLOW',					' (Works with nearly all browsers)');
@@@ -187,13 -268,7 +280,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -323,7 -398,7 +410,7 @@@ define('_ERROR_PLUGIN_LOAD',		'Plugin c
  // 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_MAIL',			'E-mail/HTTP');
  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');
@@@ -449,7 -524,7 +536,7 @@@ define('_WARNING_EXTAUTH',			'Warning: 
  define('_MEMBERS_BYPASS',			'Use External Authentication');
  
  // 'always include in search' blog setting (yes/no) [in v2.5beta, the 'always' part wasn't clear]
- define('_EBLOG_SEARCH',				'<em>Always</em> include in search');
+ define('_EBLOG_SEARCH',				'Zahrnout do hledání');
  
  // END changed/added after v2.5beta
  
@@@ -471,9 -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');
@@@ -761,7 -833,6 +851,10 @@@ define('_COMMENTFORM_YOUARE',		'Jste')
  define('_COMMENTFORM_SUBMIT',		'Pøidat komentáø');
  define('_COMMENTFORM_COMMENT',		'Vᚠkomentáø');
  define('_COMMENTFORM_NAME',			'Jméno');
++<<<<<<< HEAD
 +define('_COMMENTFORM_MAIL',			'E-mail/HTTP');
++=======
++>>>>>>> skinnable-master
  define('_COMMENTFORM_REMEMBER',		'Pamatuj si mne');
  
  // loginform
@@@ -788,7 -859,6 +881,10 @@@ define('_ADD_DISABLE_COMMENTS',		'Zakáz
  define('_ADD_DRAFTNFUTURE',			'Koncepty a èlánky pro pozdìjší 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žit aktuální èas)');
@@@ -1132,8 -1202,6 +1228,11 @@@ define('_BAN_ADD_BTN',				'Pøidat omeze
  
  // 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?');
  
@@@ -1265,3 -1333,19 +1364,22 @@@ define('_EDITC_NONMEMBER',			'není èlen
  // 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');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/de_Latn_DE.ISO-8859-1.php
index f02904a,0bb11fb..05a8472
--- a/nucleus/locales/de_Latn_DE.ISO-8859-1.php
+++ b/nucleus/locales/de_Latn_DE.ISO-8859-1.php
@@@ -10,16 -10,97 +10,101 @@@
   *
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'deu_deu');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -88,7 -169,7 +173,11 @@@ define('_ERROR_INSREQPLUGIN',						'Plu
  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:');
@@@ -188,13 -269,7 +277,17 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -304,6 -379,6 +397,7 @@@ define('_CREATED_NEW_CATEGORY_DESC'
  
  // ADMIN.php blog settings
  define('_EBLOG_CURRENT_TEAM_MEMBER',				'Mitglieder im Team:');
++<<<<<<< HEAD
  
  /********************************************
   *        End New for 3.40                  *
@@@ -330,6 -405,6 +424,34 @@@ define('_EBLOG_REQUIREDEMAIL',		'E-Mai
  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.');
@@@ -720,16 -795,8 +842,21 @@@ define('_MANAGE_GENERAL',			'Verschiede
  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');
@@@ -784,7 -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');
@@@ -1259,3 -1325,19 +1389,19 @@@ define('_EDITC_NONMEMBER',			'kein Mitg
  // move item
  define('_MOVE_TITLE',				'In welchen Hauptpunkt verschieben?');
  define('_MOVE_BTN',					'Artikel verschieben');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/de_Latn_DE.UTF-8.php
index d28c90e,30b2164..7a56157
--- a/nucleus/locales/de_Latn_DE.UTF-8.php
+++ b/nucleus/locales/de_Latn_DE.UTF-8.php
@@@ -10,16 -10,97 +10,101 @@@
   *
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'deu_deu');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -88,7 -169,7 +173,11 @@@ define('_ERROR_INSREQPLUGIN',						'Plu
  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:');
@@@ -188,13 -269,7 +277,17 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -720,16 -795,8 +813,21 @@@ define('_MANAGE_GENERAL',			'Verschiede
  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');
@@@ -784,7 -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');
@@@ -1259,3 -1325,19 +1360,19 @@@ define('_EDITC_NONMEMBER',			'kein Mitg
  // move item
  define('_MOVE_TITLE',				'In welchen Hauptpunkt verschieben?');
  define('_MOVE_BTN',					'Artikel verschieben');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/en_Latn_US.ISO-8859-1.php
index 153d81b,8a7afc0..e117a62
--- a/nucleus/locales/en_Latn_US.ISO-8859-1.php
+++ b/nucleus/locales/en_Latn_US.ISO-8859-1.php
@@@ -5,16 -5,97 +5,101 @@@
   *
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'enu_usa');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -183,13 -264,7 +268,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -1254,3 -1329,20 +1333,20 @@@ define('_EDITC_NONMEMBER',			'non membe
  // move item
  define('_MOVE_TITLE',				'Move to which blog?');
  define('_MOVE_BTN',					'Move Item');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
diff --combined nucleus/locales/en_Latn_US.UTF-8.php
index a6abc02,a03c0bb..1a8d328
--- a/nucleus/locales/en_Latn_US.UTF-8.php
+++ b/nucleus/locales/en_Latn_US.UTF-8.php
@@@ -1,20 -1,101 +1,109 @@@
  <?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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'enu_usa');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -183,13 -264,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -1254,3 -1329,19 +1337,19 @@@ define('_EDITC_NONMEMBER',			'non membe
  // move item
  define('_MOVE_TITLE',				'Move to which blog?');
  define('_MOVE_BTN',					'Move Item');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/es_Latn_ES.ISO-8859-1.php
index 2eaa516,8db84f7..ce5a376
--- a/nucleus/locales/es_Latn_ES.ISO-8859-1.php
+++ b/nucleus/locales/es_Latn_ES.ISO-8859-1.php
@@@ -10,16 -10,97 +10,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'esp_esp');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -83,15 -164,15 +168,15 @@@ 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');
+ // plugin dependency
+ define('_ERROR_INSREQPLUGIN',		'Fracasó la instalación del plugin, requiere ');
+ define('_ERROR_DELREQPLUGIN',		'Fracasó la eliminación del plugin, es requerido por ');
  
  //define('_ADD_ADDLATER',								'Add Later');
- define('_ADD_ADDLATER',								'Add the dates specified');
+ define('_ADD_ADDLATER',				'Introducir luego');
  
- define('_LOGIN_NAME',				'Name:');
- define('_LOGIN_PASSWORD',			'Password:');
+ define('_LOGIN_NAME',				'Nombre');
+ define('_LOGIN_PASSWORD',			'Clave');
  
  // changed from _BOOKMARLET_BMARKLFOLLOW
  define('_BOOKMARKLET_BMARKFOLLOW',					' (Works with nearly all browsers)');
@@@ -189,13 -270,7 +274,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -325,7 -400,7 +404,7 @@@ define('_ERROR_PLUGIN_LOAD',		'Plugin c
  // 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_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');
@@@ -333,114 -408,110 +412,202 @@@
  
  // 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');
+ define('_MSG_ACTIVATION_SENT',		'Un enlace de activación ha sido enviado por correo electrónico.');
+ 
+ // activation link emails
+ define('_ACTIVATE_REGISTER_MAIL',	"Hola <%memberName%>,\n\nNecesitas activar tu cuenta en <%siteName%> (<%siteUrl%>).\nPuedes hacerlo visitando el siguiente enlace: \n\n\t<%activationUrl%>\n\nTienes 2 dias para hacerlo. Después, el enlace de activación pierde su validez.");
+ define('_ACTIVATE_REGISTER_MAILTITLE',	"Activa tu cuenta '<%memberName%>'");
+ define('_ACTIVATE_REGISTER_TITLE',	'Bienvenido <%memberName%>');
+ define('_ACTIVATE_REGISTER_TEXT',	'Ya casi está. Por favor, selecciona una clave para tu cuenta aquí.');
+ define('_ACTIVATE_FORGOT_MAIL',		"Hola <%memberName%>,\n\nUsando el enlace inferior, puedes seleccionar una nueva clave para tu cuenta en <%siteName%> (<%siteUrl%>).\n\n\t<%activationUrl%>\n\nTienes 2 dias para hacerlo. Después, el enlace de activación pierde su validez.");
+ define('_ACTIVATE_FORGOT_MAILTITLE',"Reactiva tu cuenta '<%memberName%>'");
+ define('_ACTIVATE_FORGOT_TITLE',	'Bienvenido <%memberName%>');
+ define('_ACTIVATE_FORGOT_TEXT',		'Puedes elegir una nueva clave para tu cuenta aquí:');
+ define('_ACTIVATE_CHANGE_MAIL',		"Hola <%memberName%>,\n\nPuesto que tu dirección de correo electrónico ha cambiado, necesitarás reactivar tu cuenta en <%siteName%> (<%siteUrl%>).\nPuedes hacerlo visitando el siguiente enlace: \n\n\t<%activationUrl%>\n\nTienes 2 dias para hacerlo. Después, el enlace de activación pierde su validez.");
+ define('_ACTIVATE_CHANGE_MAILTITLE',"Reactiva tu cuenta '<%memberName%>'");
+ define('_ACTIVATE_CHANGE_TITLE',	'Bienvenido <%memberName%>');
+ define('_ACTIVATE_CHANGE_TEXT',		'Tu cambio de dirección ha sido verificado. ¡Gracias!');
+ define('_ACTIVATE_SUCCESS_TITLE',	'Activation Succeeded');
+ define('_ACTIVATE_SUCCESS_TEXT',	'Tu cuenta ha sido activada con éxito.');
+ define('_MEMBERS_SETPWD',			'Introduce clave');
+ define('_MEMBERS_SETPWD_BTN',		'Introduce clave');
+ define('_QMENU_ACTIVATE',			'Activación de la cuenta');
+ define('_QMENU_ACTIVATE_TEXT',		'<p>Después de que hayas activado tu cuenta, puedes empezar a usarla <a href="index.php?action=showlogin">accediendo</a>.</p>');
+ 
+ define('_PLUGS_BTN_UPDATE',			'Lista de suscripción de actualizaciones');
+ 
+ // global settings 
+ define('_SETTINGS_JSTOOLBAR',		'Estilo de barra de herramientas Javascript');
+ define('_SETTINGS_JSTOOLBAR_FULL',	'Barra de herramientas completa (IE)');
+ define('_SETTINGS_JSTOOLBAR_SIMPLE','Barra de herramientas simple (No IE)');
+ define('_SETTINGS_JSTOOLBAR_NONE',	'Deshabilita la barra de herramientas');
+ define('_SETTINGS_URLMODE_HELP',	'(Info: <a href="documentation/tips.html#searchengines-fancyurls">Cómo activar URLs atractivas</a>)');
+ 
+ // extra plugin settings part when editing categories/members/blogs/...
+ define('_PLUGINS_EXTRA',			'Configuración Extra de Plugins');
+ 
+ // 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 --');
+ define('_QMENU_USER_SETTINGS',		'Configuración');
+ define('_QMENU_USER_ITEMS',			'Elementos');
+ define('_QMENU_USER_COMMENTS',		'Comentarios');
+ define('_QMENU_MANAGE',				'Gestión');
+ define('_QMENU_MANAGE_LOG',			'Historial de acciones');
+ define('_QMENU_MANAGE_SETTINGS',	'Configuración global');
+ define('_QMENU_MANAGE_MEMBERS',		'Miembros');
+ define('_QMENU_MANAGE_NEWBLOG',		'Nueva bitácora');
+ define('_QMENU_MANAGE_BACKUPS',		'Copias de seguridad');
+ define('_QMENU_MANAGE_PLUGINS',		'Plugins');
+ define('_QMENU_LAYOUT',				'Distribución');
+ define('_QMENU_LAYOUT_SKINS',		'Pieles');
+ define('_QMENU_LAYOUT_TEMPL',		'Plantillas');
+ define('_QMENU_LAYOUT_IEXPORT',		'Import/Export');
+ define('_QMENU_PLUGINS',			'Plugins');
+ 
+ // quickmenu on logon screen
+ define('_QMENU_INTRO',				'Introducción');
+ define('_QMENU_INTRO_TEXT',			'<p>Esta es la pantalla de entrada de Nucleus CMS, el sistema de gestión de contenido usado para mantener este sitio.</p><p>Si tienes una cuenta, puedes acceder e introducir nuevos elementos (historias o posts).</p>');
+ 
+ // helppages for plugins
+ 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
@@@ -448,193 -519,192 +615,326 @@@
  // 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.');
+ 
+ // member profile
+ define('_MEMBERS_BYPASS',			'Usar Autenticación Externa');
+ 
+ // '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');
+ define('_BATCH_MEMBERS',			'Operación de lotes sobre miembros');
+ define('_BATCH_TEAM',				'Operación de lotes sobre miembros de equipos');
+ define('_BATCH_COMMENTS',			'Operación de lotes sobre comentarios');
+ define('_BATCH_UNKNOWN',			'Operación de lotes desconocida: ');
+ define('_BATCH_EXECUTING',			'Ejecutando');
+ define('_BATCH_ONCATEGORY',			'sobre la categoría');
+ define('_BATCH_ONITEM',				'sobre el elemento');
+ define('_BATCH_ONCOMMENT',			'sobre el comentario');
+ define('_BATCH_ONMEMBER',			'sobre el miembro');
+ define('_BATCH_ONTEAM',				'sobre el miembro de equipo');
+ define('_BATCH_SUCCESS',			'¡Sin problemas!');
+ define('_BATCH_DONE',				'¡Hecho!');
+ define('_BATCH_DELETE_CONFIRM',		'Confirmar eliminación de lote');
+ define('_BATCH_DELETE_CONFIRM_BTN',	'Confirmar eliminación de lote');
+ define('_BATCH_SELECTALL',			'seleccionar todo');
+ define('_BATCH_DESELECTALL',		'deseleccionar todo');
+ 
+ // batch operations: options in dropdowns
+ define('_BATCH_ITEM_DELETE',		'Eliminar');
+ define('_BATCH_ITEM_MOVE',			'Mover');
+ define('_BATCH_MEMBER_DELETE',		'Eliminar');
+ define('_BATCH_MEMBER_SET_ADM',		'Dar derechos de administración');
+ define('_BATCH_MEMBER_UNSET_ADM',	'Quitar derechos de administración');
+ define('_BATCH_TEAM_DELETE',		'Borrar del equipo');
+ define('_BATCH_TEAM_SET_ADM',		'Dar derechos de administración');
+ define('_BATCH_TEAM_UNSET_ADM',		'Quitar derechos de administración');
+ 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: ');
+ 
+ // backlinks
+ define('_BACK_TO_BLOGSETTINGS',		'Volver a preferencias de bitácora');
+ 
+ // skin import export
+ define('_SKINIE_TITLE_IMPORT',		'Importar');
+ define('_SKINIE_TITLE_EXPORT',		'Exportar');
+ define('_SKINIE_BTN_IMPORT',		'Importar');
+ define('_SKINIE_BTN_EXPORT',		'Exportar pieles/plantillas seleccionadas');
+ define('_SKINIE_LOCAL',				'Importar desde un archivo local:');
+ define('_SKINIE_NOCANDIDATES',		'No se han encontrado candidatos para importar en el directorio de pieles');
+ define('_SKINIE_FROMURL',			'Importar desde URL:');
+ define('_SKINIE_EXPORT_INTRO',		'Seleccionar abajo las pieles y plantillas a exportar');
+ define('_SKINIE_EXPORT_SKINS',		'Pieles');
+ define('_SKINIE_EXPORT_TEMPLATES',	'Plantillas');
+ define('_SKINIE_EXPORT_EXTRA',		'Información Extra');
+ define('_SKINIE_CONFIRM_OVERWRITE',	'Sobreescribe pieles que ya existan (ver conflictos de nombre)');
+ define('_SKINIE_CONFIRM_IMPORT',	'Sí, quiero importar ésto');
+ define('_SKINIE_CONFIRM_TITLE',		'Sobre importar pieles y plantillas');
+ define('_SKINIE_INFO_SKINS',		'Pieles en archivo:');
+ define('_SKINIE_INFO_TEMPLATES',	'Plantillas en archivo:');
+ define('_SKINIE_INFO_GENERAL',		'Información:');
+ define('_SKINIE_INFO_SKINCLASH',	'Nombre de piel conflictivo:');
+ define('_SKINIE_INFO_TEMPLCLASH',	'Nombre de plantilla conflictivo:');
+ define('_SKINIE_INFO_IMPORTEDSKINS','Pieles importadas:');
+ define('_SKINIE_INFO_IMPORTEDTEMPLS','Plantillas importadas:');
+ define('_SKINIE_DONE',				'Importación realizada');
+ 
+ define('_AND',						'y');
+ 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.');
+ define('_BACKUP_ZIP_YES',			'Intente usar la compresión');
+ define('_BACKUP_ZIP_NO',			'No use compresión');
+ define('_BACKUP_BTN',				'Crear copia de seguridad');
+ define('_BACKUP_NOTE',				'<b>Nota:</b> Sólo los contenidos de la base de datos se guardan en la copia de seguridad. Archivos de medios, imágenes y preferencias de config.php <b>NO</b> se incluyen en la copia de seguridad.');
+ define('_RESTORE_TITLE',			'Restaurar');
+ define('_RESTORE_NOTE',				'<b>AVISO:</b> Restaurar desde una copia de seguridad <b>BORRARÁ</b> todos los datos de Nucleus actuales! ¡Hacer ésto sólo se esté totalmente seguro!	<br />	<b>Nota:</b> Comprobar que la versión de Nucleus en la que se creó la copia es la misma que la versión que se está usando ahora! No funcionará si no es así');
+ define('_RESTORE_INTRO',			'Seleccionar el archivo de copia de seguridad (será enviado al servidor) y haga clic sobre el botón "Restaurar" para empezar.');
+ define('_RESTORE_IMSURE',			'¡Sí, estoy seguro de que quiero hacer eso!');
+ 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:');
+ 
+ // member mail message
+ define('_MMAIL_MSG',				'Un mensaje enviado por');
+ define('_MMAIL_FROMANON',			'un visitante anónimo');
+ 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
  
@@@ -642,91 -712,91 +942,160 @@@
  // 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');
+ 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');
+ define('_ERROR_PLUGFILEERROR',		'No existe ese plugin, o los permisos no son los correctos');
+ define('_PLUGS_NOCANDIDATES',		'No se han encontrado candidatos para el plugin');
+ 
+ define('_PLUGS_TITLE_MANAGE',		'Gestionar plugins');
+ define('_PLUGS_TITLE_INSTALLED',	'Actualmente instalado');
+ define('_PLUGS_TITLE_UPDATE',		'Actualizar la lista de suscripción');
+ define('_PLUGS_TEXT_UPDATE',		'Nucleus mantiene una caché de las suscripciones a eventos de los plugins. Cuando se actualiza un plugin sustituyendo su archivo, se debe ejecutar esta actualización para asegurar que las suscripciones de la caché son correctas');
+ 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
+ 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
+ define('_LISTS_INFO',				'Información');
+ define('_LIST_PLUGS_AUTHOR',		'Por:');
+ define('_LIST_PLUGS_VER',			'Versión:');
+ define('_LIST_PLUGS_SITE',			'Visitar sitio');
+ define('_LIST_PLUGS_DESC',			'Descripción:');
+ define('_LIST_PLUGS_SUBS',			'Suscribir a los siguientes eventos:');
+ define('_LIST_PLUGS_UP',			'desplazar arriba');
+ 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');
+ define('_PLUGS_OPTIONS_UPDATED',	'Opciones de plugin actualizadas');
+ 
+ define('_OVERVIEW_MANAGEMENT',		'Gestión');
+ define('_OVERVIEW_MANAGE',			'Gestión de Nucleus...');
+ define('_MANAGE_GENERAL',			'Gestión general');
+ 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
@@@ -736,535 -806,547 +1105,1051 @@@
  
  
  // 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í');
+ define('_NO',						'No');
+ define('_SUBMIT',					'Enviar');
+ define('_ERROR',					'Error');
+ define('_ERRORMSG',					'Ha sucedido un error!');
+ define('_BACK',						'Volver');
+ define('_NOTLOGGEDIN',				'No registrado');
+ define('_LOGGEDINAS',				'Registrado como');
+ define('_ADMINHOME',				'Administración');
+ define('_NAME',						'Nombre');
+ define('_BACKHOME',					'Volver a la administración');
+ define('_BADACTION',				'No existe la acción requerida');
+ 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
+ define('_COMMENTFORM_YOUARE',		'Eres');
+ 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');
+ define('_ADD_TITLE',				'Título');
+ define('_ADD_MORE',					'Extensión (opcional)');
+ define('_ADD_CATEGORY',				'Categoría');
+ define('_ADD_PREVIEW',				'Previsualizar');
+ define('_ADD_DISABLE_COMMENTS',		'Deshabilitar comentarios?');
+ define('_ADD_DRAFTNFUTURE',			'Borrador y futuras entradas');
+ define('_ADD_ADDITEM',				'Introducir entrada');
+ define('_ADD_ADDNOW',				'Introducir ahora');
+ define('_ADD_PLACE_ON',				'Colocar en');
+ define('_ADD_ADDDRAFT',				'Introducir en el borrador');
+ define('_ADD_NOPASTDATES',			'(las fechas y horas pasadas no son válidas, se usará el momento actual)');
+ define('_ADD_BOLD_TT',				'Negrita');
+ define('_ADD_ITALIC_TT',			'Itálica');
+ define('_ADD_HREF_TT',				'Crear enlace');
+ define('_ADD_MEDIA_TT',				'Introducir imagen o multimedia');
+ define('_ADD_PREVIEW_TT',			'Mostrar/ocultar previsualización');
+ define('_ADD_CUT_TT',				'Cortar');
+ define('_ADD_COPY_TT',				'Copiar');
+ define('_ADD_PASTE_TT',				'Pegar');
+ 
+ 
+ // edit item form
+ define('_EDIT_ITEM',				'Editar entrada');
+ define('_EDIT_SUBMIT',				'Editar entrada');
+ define('_EDIT_ORIG_AUTHOR',			'Autor original');
+ define('_EDIT_BACKTODRAFTS',		'Enviar al borrador');
+ define('_EDIT_COMMENTSNOTE',		'(nota: deshabilitar los comentarios no ocultará los existentes)');
+ 
+ // used on delete screens
+ define('_DELETE_CONFIRM',			'Confirmar la eliminación');
+ define('_DELETE_CONFIRM_BTN',		'Confirmar la eliminación');
+ define('_CONFIRMTXT_ITEM',			'A punto de eliminar la siguiente entrada:');
+ define('_CONFIRMTXT_COMMENT',		'A punto de eliminar el siguiente comentario:');
+ define('_CONFIRMTXT_TEAM1',			'A punto de eliminar ');
+ define('_CONFIRMTXT_TEAM2',			' del equipo para la bitácora ');
+ define('_CONFIRMTXT_BLOG',			'La bitácora a eliminar es: ');
+ define('_WARNINGTXT_BLOGDEL',		'Cuidado! Eliminar una bitácora eliminará TODAS sus entradas y comentarios. Confirmar definitivamente la eliminación!<br />No interrumpir el sistema durante la eliminación.');
+ define('_CONFIRMTXT_MEMBER',		'A punto de eliminar al siguiente miembro: ');
+ define('_CONFIRMTXT_TEMPLATE',		'A punto de eliminar la plantilla llamada ');
+ define('_CONFIRMTXT_SKIN',			'A punto de eliminar la piel llamada ');
+ define('_CONFIRMTXT_BAN',			'A punto de eliminar la restricción para el rango IP');
+ define('_CONFIRMTXT_CATEGORY',		'A punto de eliminar la categoría ');
+ 
+ // some status messages
+ define('_DELETED_ITEM',				'Entrada eliminada');
+ define('_DELETED_MEMBER',			'Miembro eliminado');
+ define('_DELETED_COMMENT',			'Comentario eliminado');
+ define('_DELETED_BLOG',				'Bitácora eliminada');
+ define('_DELETED_CATEGORY',			'Categoría eliminada');
+ define('_ITEM_MOVED',				'Entrada movida');
+ define('_ITEM_ADDED',				'Entrada introducida');
+ define('_COMMENT_UPDATED',			'Comentario actualizado');
+ define('_SKIN_UPDATED',				'Datos de la piel actualizados');
+ define('_TEMPLATE_UPDATED',			'Datos de la plantilla guardados');
+ 
+ // errors
+ define('_ERROR_COMMENT_LONGWORD',	'No usar palabras de longitud mayor a 90 carácteres en los comentarios');
+ define('_ERROR_COMMENT_NOCOMMENT',	'Introducir el comentario');
+ define('_ERROR_COMMENT_NOUSERNAME',	'Usuario incorrecto');
+ define('_ERROR_COMMENT_TOOLONG',	'Comentario  demasiado largo (máximo : 5000 carácteres)');
+ define('_ERROR_COMMENTS_DISABLED',	'Comentarios deshabilitados para esta bitácora.');
+ define('_ERROR_COMMENTS_NONPUBLIC',	'Registrarse primero como miembro para introducir comentarios a esta bitácora');
+ define('_ERROR_COMMENTS_MEMBERNICK','El nombre indicado para introducir comentarios está siendo usado por otro miembro. Probar con otro distinto.');
+ define('_ERROR_SKIN',				'Error de piel');
+ define('_ERROR_ITEMCLOSED',			'Esta entrada ha sido cerrada, no es posible introducir nuevos comentarios o votar');
+ define('_ERROR_NOSUCHITEM',			'La entrada indicada no existe');
+ define('_ERROR_NOSUCHBLOG',			'La bitácora indicada no existe');
+ define('_ERROR_NOSUCHSKIN',			'La piel indicada no existe');
+ define('_ERROR_NOSUCHMEMBER',		'El miembro indicado no existe');
+ define('_ERROR_NOTONTEAM',			'El usuario no pertenece al equipo de esta bitácora.');
+ define('_ERROR_BADDESTBLOG',		'La bitácora de destino no existe');
+ define('_ERROR_NOTONDESTTEAM',		'No es posible mover la entrada, ya que el usuario no pertenece al equipo de la bitácora de destino');
+ define('_ERROR_NOEMPTYITEMS',		'No es posible introducir entradas vacias!');
+ define('_ERROR_BADMAILADDRESS',		'Dirección de correo incorrecta');
+ define('_ERROR_BADNOTIFY',			'Una o más de las direcciones de notificación no son direcciones correctas');
+ define('_ERROR_BADNAME',			'El nombre no es válido (sólo a-z y 0-9 permitidos, sin espacios al principio ni al final)');
+ define('_ERROR_NICKNAMEINUSE',		'Otro miembro está usando ya ese nombre');
+ define('_ERROR_PASSWORDMISMATCH',	'Las claves deben coincidir');
+ define('_ERROR_PASSWORDTOOSHORT',	'La clave debe tener al menos 6 carácteres');
+ define('_ERROR_PASSWORDMISSING',	'La clave no puede estar vacia');
+ define('_ERROR_REALNAMEMISSING',	'El nombre real introducido no es válido');
+ define('_ERROR_ATLEASTONEADMIN',	'Debe existir siempre al menos un superadministrador que pueda registrarse en la zona de administración.');
+ define('_ERROR_ATLEASTONEBLOGADMIN','Ejecutar esta acción dejaría la bitácora inmantenible. Debe existir siempre al menos un administrador.');
+ define('_ERROR_ALREADYONTEAM',		'No es posible introducir un miembro que ya pertenezca al equipo');
+ define('_ERROR_BADSHORTBLOGNAME',	'El nombre corto de la bitácora sólo debe contener a-z y 0-9, y sin espacios');
+ define('_ERROR_DUPSHORTBLOGNAME',	'Otra bitácora ya tiene ese nombre corto. Los nombres cortos deben ser únicos');
+ define('_ERROR_UPDATEFILE',			'Sin permiso de escritura para actualizar el archivo. Los permisos deben ser correctos (probar chmod 666). La localización debe ser relativa al directorio de administración, por lo que quizás convendría usar un camino absoluto (como /camino/hasta/nucleus/)');
+ define('_ERROR_DELDEFBLOG',			'No es posible eliminar la bitácora principal');
+ define('_ERROR_DELETEMEMBER',		'Este miembro no puede ser eliminado, probablemente porque es el autor de entradas o comentarios');
+ define('_ERROR_BADTEMPLATENAME',	'Nombre incorrecto para la plantilla, usar sólo a-z y 0-9, y sin espacios');
+ define('_ERROR_DUPTEMPLATENAME',	'Ya existe otra plantilla con ese nombre');
+ define('_ERROR_BADSKINNAME',		'Nombre incorrecto para la piel (sólo a-z, 0-9 están permitidos, y sin espacios)');
+ define('_ERROR_DUPSKINNAME',		'Ya existe otra piel con ese nombre');
+ define('_ERROR_DEFAULTSKIN',		'Siempre debe existir una piel llamada "default"');
+ define('_ERROR_SKINDEFDELETE',		'No es posible eliminar la piel ya que es la piel predeterminada para la siguiente bitácora: ');
+ define('_ERROR_DISALLOWED',			'Sin suficiente permiso para ejecutar esa acción');
+ define('_ERROR_DELETEBAN',			'Error al eliminar la restricción (la restricción no existe)');
+ define('_ERROR_ADDBAN',				'Error al introducir restricción. La restricción podría no haberse introducido correctamente en las bitácoras.');
+ define('_ERROR_BADACTION',			'La acción indicada no existe');
+ define('_ERROR_MEMBERMAILDISABLED',	'Los mensajes de miembro a miembro están deshabilitados');
+ define('_ERROR_MEMBERCREATEDISABLED','La creación de cuentas para miembros está deshabilitada');
+ define('_ERROR_INCORRECTEMAIL',		'Dirección de correo incorrecta');
+ define('_ERROR_VOTEDBEFORE',		'El voto del usuario para esta entrada ya existe');
+ define('_ERROR_BANNED1',			'No es posible ejecutar la acción ya que el (rango IP ');
+ define('_ERROR_BANNED2',			') está restringido. El mensaje era: \'');
+ define('_ERROR_BANNED3',			'\'');
+ define('_ERROR_LOGINNEEDED',		'El usuario debe estar registrado para hacer eso');
+ define('_ERROR_CONNECT',			'Error de conexión');
+ define('_ERROR_FILE_TOO_BIG',		'El archivo es demasiado grande!');
+ define('_ERROR_BADFILETYPE',		'Tipo de archivo no permitido');
+ define('_ERROR_BADREQUEST',			'Error en el envío del archivo');
+ define('_ERROR_DISALLOWEDUPLOAD',	'El usuario no pertenece al equipo de ninguna bitácora. No es posible enviar archivos');
+ define('_ERROR_BADPERMISSIONS',		'Los permisos no son correctos');
+ define('_ERROR_UPLOADMOVEP',		'Error al mover el archivo enviado');
+ define('_ERROR_UPLOADCOPY',			'Error al copiar el archivo enviado');
+ define('_ERROR_UPLOADDUPLICATE',	'Ya existe otro archivo con ese nombre. Intentar renombrarlo antes de enviarlo.');
+ define('_ERROR_LOGINDISALLOWED',	'Sin permiso para entrar en la administración. Es posible registrarse como otro usuario');
+ define('_ERROR_DBCONNECT',			'No es posible conectar con MySQL server');
+ define('_ERROR_DBSELECT',			'No es posible seleccionar la base de datos de Nucleus.');
+ define('_ERROR_NOSUCHLOCALE',		'No existe el archivo para el idioma');
+ define('_ERROR_NOSUCHCATEGORY',		'No existe la categoría');
+ define('_ERROR_DELETELASTCATEGORY',	'Debe haber al menos una categoría');
+ 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');
+ define('_MEDIA_DIMENSIONS',			'dimensiones');
+ define('_MEDIA_INLINE',				'Conectado');
+ define('_MEDIA_POPUP',				'Ventana popup');
+ define('_UPLOAD_TITLE',				'Seleccionar archivo');
+ define('_UPLOAD_MSG',				'Seleccionar el archivo a enviar, y pulsar el botón \'Enviar\'.');
+ define('_UPLOAD_BUTTON',			'Enviar');
+ 
+ // some status messages
+ define('_MSG_ACCOUNTCREATED',		'Cuenta creada, la clave será enviada por correo');
+ define('_MSG_PASSWORDSENT',			'La clave ha sido enviada por correo.');
+ define('_MSG_LOGINAGAIN',			'Es necesario registrarse de nuevo ya que los datos del usuario han sido modificados');
+ define('_MSG_SETTINGSCHANGED',		'Preferencias modificadas');
+ define('_MSG_ADMINCHANGED',			'Administrador modificado');
+ define('_MSG_NEWBLOG',				'Nueva bitácora creada');
+ define('_MSG_ACTIONLOGCLEARED',		'Registro de actividades vaciado');
+ 
+ // actionlog in admin area
+ define('_ACTIONLOG_DISALLOWED',		'Acción no permitida: ');
+ define('_ACTIONLOG_PWDREMINDERSENT','Nueva clave enviada a ');
+ define('_ACTIONLOG_TITLE',			'Registro de actividades');
+ define('_ACTIONLOG_CLEAR_TITLE',	'Limpiar el registro de actividades');
+ define('_ACTIONLOG_CLEAR_TEXT',		'Limpiar el registro de actividades ahora');
+ 
+ // team management
+ define('_TEAM_TITLE',				'Modificar el equipo de la bitácora ');
+ define('_TEAM_CURRENT',				'Equipo actual');
+ define('_TEAM_ADDNEW',				'Introducir un nuevo miembro en el equipo');
+ define('_TEAM_CHOOSEMEMBER',		'Seleccionar miembro');
+ define('_TEAM_ADMIN',				'Privilegios de administración? ');
+ define('_TEAM_ADD',					'Introducir en el equipo');
+ define('_TEAM_ADD_BTN',				'Introducir en el equipo');
+ 
+ // blogsettings
+ define('_EBLOG_TITLE',				'Modificar las preferencias de la bitácora');
+ define('_EBLOG_TEAM_TITLE',			'Modificar el equipo');
+ define('_EBLOG_TEAM_TEXT',			'Pulsa aquí para modificar el equipo.');
+ define('_EBLOG_SETTINGS_TITLE',		'Preferencias de la bitácora');
+ define('_EBLOG_NAME',				'Nombre de la bitácora');
+ define('_EBLOG_SHORTNAME',			'Nombre corto de la bitácora');
+ define('_EBLOG_SHORTNAME_EXTRA',	'<br />(debe contener sólo letras y sin espacios)');
+ define('_EBLOG_DESC',				'Descripción de la bitácora');
+ define('_EBLOG_URL',				'URL');
+ define('_EBLOG_DEFSKIN',			'Piel por defecto');
+ define('_EBLOG_DEFCAT',				'Categoría por defecto');
+ define('_EBLOG_LINEBREAKS',			'Convertir saltos de línea');
+ define('_EBLOG_DISABLECOMMENTS',	'Habilitar comentarios?<br /><small>(Deshabilitar los comentarios implica no poder introducir nuevos.)</small>');
+ define('_EBLOG_ANONYMOUS',			'Se permite la introducción de comentarios por no miembros?');
+ define('_EBLOG_NOTIFY',				'Dirección(es) de notificación (usa ; como separador)');
+ define('_EBLOG_NOTIFY_ON',			'Notificar');
+ define('_EBLOG_NOTIFY_COMMENT',		'Nuevos comentarios');
+ define('_EBLOG_NOTIFY_KARMA',		'Nuevos votos');
+ define('_EBLOG_NOTIFY_ITEM',		'Nuevas entradas');
+ define('_EBLOG_PING',				'Ping Weblogs.com al actualizar?');
+ define('_EBLOG_MAXCOMMENTS',		'Máxima cantidad de comentarios');
+ define('_EBLOG_UPDATE',				'Actualizar archivo');
+ define('_EBLOG_OFFSET',				'Zona horaria');
+ define('_EBLOG_STIME',				'La hora actual del servidor es');
+ define('_EBLOG_BTIME',				'La hora actual de la bitácora es');
+ define('_EBLOG_CHANGE',				'Modificar las preferencias');
+ define('_EBLOG_CHANGE_BTN',			'Modificar preferencias');
+ define('_EBLOG_ADMIN',				'Administración de la bitácora');
+ define('_EBLOG_ADMIN_MSG',			'Se asignarán privilegios de administrador al usuario');
+ define('_EBLOG_CREATE_TITLE',		'Crear nueva bitácora');
+ define('_EBLOG_CREATE_TEXT',		'Rellenar el siguiente formulario para crear una nueva bitácora. <br /><br /> <b>Nota:</b> Sólo las opciones necesarios están listadas. Para opciones extra, entrar en la página de preferencias de la bitácora después de crearla.');
+ define('_EBLOG_CREATE',				'Crear!');
+ define('_EBLOG_CREATE_BTN',			'Crear bitácora');
+ define('_EBLOG_CAT_TITLE',			'Categorías');
+ define('_EBLOG_CAT_NAME',			'Nombre de la categoría');
+ define('_EBLOG_CAT_DESC',			'Descripción de la categoría');
+ define('_EBLOG_CAT_CREATE',			'Crear nueva categoría');
+ define('_EBLOG_CAT_UPDATE',			'Actualizar categoría');
+ define('_EBLOG_CAT_UPDATE_BTN',		'Actualizar categoría');
+ 
+ // templates
+ define('_TEMPLATE_TITLE',			'Modificar plantillas');
+ define('_TEMPLATE_AVAILABLE_TITLE',	'Plantillas disponibles');
+ define('_TEMPLATE_NEW_TITLE',		'Nueva plantilla');
+ define('_TEMPLATE_NAME',			'Nombre de plantilla');
+ define('_TEMPLATE_DESC',			'Descripción de la plantilla');
+ define('_TEMPLATE_CREATE',			'Crear plantilla');
+ define('_TEMPLATE_CREATE_BTN',		'Crear plantilla');
+ define('_TEMPLATE_EDIT_TITLE',		'Editar plantilla');
+ define('_TEMPLATE_BACK',			'Volver a la página de la plantilla');
+ define('_TEMPLATE_EDIT_MSG',		'No todas las partes de la plantilla son necesarias, es posible dejar en blanco las innecesarias.');
+ define('_TEMPLATE_SETTINGS',		'Preferencias de las plantillas');
+ define('_TEMPLATE_ITEMS',			'Entradas');
+ define('_TEMPLATE_ITEMHEADER',		'Cabecera de entrada');
+ define('_TEMPLATE_ITEMBODY',		'Cuerpo de la entrada');
+ define('_TEMPLATE_ITEMFOOTER',		'Pie de la entrada');
+ define('_TEMPLATE_MORELINK',		'Enlazar a extensión de la entrada');
+ define('_TEMPLATE_NEW',				'Indicación de nueva entrada');
+ define('_TEMPLATE_COMMENTS_ANY',	'Comentarios (si los hay)');
+ define('_TEMPLATE_CHEADER',			'Cabecera de los comentarios');
+ define('_TEMPLATE_CBODY',			'Cuerpo de los comentarios');
+ define('_TEMPLATE_CFOOTER',			'Pie de los comentarios');
+ define('_TEMPLATE_CONE',			'Un comentario');
+ define('_TEMPLATE_CMANY',			'Dos (o más) comentarios');
+ define('_TEMPLATE_CMORE',			'Comentarios Leer más');
+ define('_TEMPLATE_CMEXTRA',			'Miembro Extra');
+ define('_TEMPLATE_COMMENTS_NONE',	'Comentarios (si no hay)');
+ define('_TEMPLATE_CNONE',			'Sin comentarios');
+ define('_TEMPLATE_COMMENTS_TOOMUCH','Comentarios (si los hay, pero son demasiados para mostrar directamente)');
+ define('_TEMPLATE_CTOOMUCH',		'Demasiados comentarios');
+ define('_TEMPLATE_ARCHIVELIST',		'Listas de archivos');
+ define('_TEMPLATE_AHEADER',			'Cabecera de la lista de archivos');
+ define('_TEMPLATE_AITEM',			'Elemento de la lista de archivos');
+ define('_TEMPLATE_AFOOTER',			'Pie de la lista de archivos');
+ define('_TEMPLATE_DATETIME',		'Fecha y hora');
+ define('_TEMPLATE_DHEADER',			'Cabecera de la fecha');
+ define('_TEMPLATE_DFOOTER',			'Pie de la fecha');
+ define('_TEMPLATE_DFORMAT',			'Formato de la fecha');
+ define('_TEMPLATE_TFORMAT',			'Formato de hora');
+ define('_TEMPLATE_LOCALE',			'Local');
+ define('_TEMPLATE_IMAGE',			'Ventanas de imagen');
+ define('_TEMPLATE_PCODE',			'Código de enlace popup');
+ define('_TEMPLATE_ICODE',			'Código de imagen insertada');
+ define('_TEMPLATE_MCODE',			'Código de enlace a imagen o multimedia');
+ define('_TEMPLATE_SEARCH',			'Buscar');
+ define('_TEMPLATE_SHIGHLIGHT',		'Resaltar');
+ define('_TEMPLATE_SNOTFOUND',		'Nada encontrado en la búsqueda');
+ define('_TEMPLATE_UPDATE',			'Actualizar');
+ define('_TEMPLATE_UPDATE_BTN',		'Actualizar plantilla');
+ define('_TEMPLATE_RESET_BTN',		'Inicializar datos');
+ define('_TEMPLATE_CATEGORYLIST',	'Lista de categorías');
+ define('_TEMPLATE_CATHEADER',		'Cabecera de lista de categorías');
+ define('_TEMPLATE_CATITEM',			'Elemento de lista de categorías');
+ define('_TEMPLATE_CATFOOTER',		'Pie de lista de categorías');
+ 
+ // skins
+ define('_SKIN_EDIT_TITLE',			'Modificar pieles');
+ define('_SKIN_AVAILABLE_TITLE',		'Pieles disponibles');
+ define('_SKIN_NEW_TITLE',			'Nueva piel');
+ define('_SKIN_NAME',				'Nombre');
+ define('_SKIN_DESC',				'Descripción');
+ define('_SKIN_TYPE',				'Tipo de contenido');
+ define('_SKIN_CREATE',				'Crear');
+ define('_SKIN_CREATE_BTN',			'Crear piel');
+ define('_SKIN_EDITONE_TITLE',		'Modificar piel');
+ define('_SKIN_BACK',				'Volver a la página de la piel');
+ define('_SKIN_PARTS_TITLE',			'Partes de la piel');
+ define('_SKIN_PARTS_MSG',			'No todos los tipos son necesarios para cada piel. Dejar en blanco los innecesarios. Selecciona el tipo de piel a modificar:');
+ define('_SKIN_PART_MAIN',			'Índice principal');
+ define('_SKIN_PART_ITEM',			'Páginas del elemento');
+ define('_SKIN_PART_ALIST',			'Lista de archivo');
+ define('_SKIN_PART_ARCHIVE',		'Archivo');
+ define('_SKIN_PART_SEARCH',			'Buscar');
+ define('_SKIN_PART_ERROR',			'Errores');
+ define('_SKIN_PART_MEMBER',			'Detalles del miembro');
+ define('_SKIN_PART_POPUP',			'Imágenes de popup');
+ define('_SKIN_GENSETTINGS_TITLE',	'Preferencias generales');
+ define('_SKIN_CHANGE',				'Modificar');
+ define('_SKIN_CHANGE_BTN',			'Modificar estas preferencias');
+ define('_SKIN_UPDATE_BTN',			'Actualizar piel');
+ define('_SKIN_RESET_BTN',			'Inicializar datos');
+ define('_SKIN_EDITPART_TITLE',		'Modificar piel');
+ define('_SKIN_GOBACK',				'Volver');
+ define('_SKIN_ALLOWEDVARS',			'Variables permitidas (hacer clic para mayor información):');
+ 
+ // global settings
+ define('_SETTINGS_TITLE',			'Preferencias generales');
+ define('_SETTINGS_SUB_GENERAL',		'Preferencias generales');
+ define('_SETTINGS_DEFBLOG',			'Bitácora principal');
+ define('_SETTINGS_ADMINMAIL',		'Administrador de correo');
+ define('_SETTINGS_SITENAME',		'Nombre de la web');
+ define('_SETTINGS_SITEURL',			'URL de la web ( debe terminar con una barra / )');
+ define('_SETTINGS_ADMINURL',		'URL de la administración ( debe terminar con una barra / )');
+ define('_SETTINGS_DIRS',			'Directorios de Nucleus');
+ define('_SETTINGS_MEDIADIR',		'Directorios de imagenes y multimedia');
+ define('_SETTINGS_SEECONFIGPHP',	'(ver config.php)');
+ define('_SETTINGS_MEDIAURL',		'URL para imágenes o multimedia ( debe terminar con una barra / )');
+ define('_SETTINGS_ALLOWUPLOAD',		'Permitir el envío de archivos?');
+ define('_SETTINGS_ALLOWUPLOADTYPES','Tipos de archivo permitidos para envío');
+ define('_SETTINGS_CHANGELOGIN',		'Permitir a los miembros modificar sus datos de registro / clave');
+ define('_SETTINGS_COOKIES_TITLE',	'Preferencias de cookies');
+ define('_SETTINGS_COOKIELIFE',		'Tiempo de vida de la cookie de registro');
+ define('_SETTINGS_COOKIESESSION',	'Cookies de sesión');
+ define('_SETTINGS_COOKIEMONTH',		'Tiempo de vida de un mes');
+ define('_SETTINGS_COOKIEPATH',		'Camino de las cookies (avanzado)');
+ define('_SETTINGS_COOKIEDOMAIN',	'Dominio de las cookies (avanzado)');
+ define('_SETTINGS_COOKIESECURE',	'Cookies seguras (avanzado)');
+ define('_SETTINGS_LASTVISIT',		'Guardar las cookies de la última visita');
+ define('_SETTINGS_ALLOWCREATE',		'Permitir a los visitantes crear una cuenta de miembro');
+ define('_SETTINGS_NEWLOGIN',		'Registro permitido para las cuentas creadas por el usuario');
+ define('_SETTINGS_NEWLOGIN2',		'(sólo para cuentas nuevas)');
+ define('_SETTINGS_MEMBERMSGS',		'Permite un servicio de miembro a miembro');
+ define('_SETTINGS_LOCALE',		'Idioma por defecto');
+ define('_SETTINGS_DISABLESITE',		'Deshabilitar web');
+ define('_SETTINGS_DBLOGIN',			'MySQL Registro y base de datos');
+ define('_SETTINGS_UPDATE',			'Actualizar preferencias');
+ define('_SETTINGS_UPDATE_BTN',		'Actualizar preferencias');
+ define('_SETTINGS_DISABLEJS',		'Deshabilitar la barra de herramientas de JavaScript');
+ define('_SETTINGS_MEDIA',			'Preferencias de envío / imágenes / multimedia');
+ define('_SETTINGS_MEDIAPREFIX',		'Prefijar los archivos enviados con la fecha');
+ define('_SETTINGS_MEMBERS',			'Preferencias de los miembros');
+ 
+ // bans
+ define('_BAN_TITLE',				'Lista de restricciones para');
+ define('_BAN_NONE',					'No hay restricciones para esta bitácora');
+ define('_BAN_NEW_TITLE',			'Introducir nueva restricción');
+ define('_BAN_NEW_TEXT',				'Introducir una nueva restricción ahora');
+ define('_BAN_REMOVE_TITLE',			'Eliminar restricción');
+ define('_BAN_IPRANGE',				'Rango IP');
+ define('_BAN_BLOGS',				'Qué bitácoras?');
+ define('_BAN_DELETE_TITLE',			'Eliminar restricción');
+ define('_BAN_ALLBLOGS',				'Bitácoras para las que el usuario tiene privilegios de administrador.');
+ define('_BAN_REMOVED_TITLE',		'Restricción eliminada');
+ define('_BAN_REMOVED_TEXT',			'Restricción eliminada para las siguientes bitácoras:');
+ define('_BAN_ADD_TITLE',			'Introducir restricción');
+ define('_BAN_IPRANGE_TEXT',			'Seleccionar el rango IP a restringir. A menor cantidad de números, más direcciones restringidas.');
+ define('_BAN_BLOGS_TEXT',			'Es posible optar por restringir la IP para una sóla bitácora, o restringir la IP en todas las bitácoras en las que el usuario tenga privilegios de administrador.');
+ define('_BAN_REASON_TITLE',			'Razón');
+ define('_BAN_REASON_TEXT',			'Es posible incluir una razón para la restricción, que será mostrada cuando el usuario con esa IP intente añadir un comentario o votar. La longitud máxima es de 256 carácteres.');
+ define('_BAN_ADD_BTN',				'Introducir restricción');
+ 
+ // 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');
+ define('_MEMBERS_DISPLAY',			'Nombre mostrado');
+ define('_MEMBERS_DISPLAY_INFO',		'(Este es el nombre usado para registrarse)');
+ define('_MEMBERS_REALNAME',			'Nombre real');
+ define('_MEMBERS_PWD',				'Clave');
+ define('_MEMBERS_REPPWD',			'Repetir la clave');
+ define('_MEMBERS_EMAIL',			'Dirección de correo');
+ define('_MEMBERS_EMAIL_EDIT',		'(Cuando se cambie la dirección de correo, una nueva clave será enviada automáticamente a esa dirección)');
+ define('_MEMBERS_URL',				'Dirección de la web (URL)');
+ define('_MEMBERS_SUPERADMIN',		'Privilegios de administrador');
+ define('_MEMBERS_CANLOGIN',			'El usuario puede entrar en la administración');
+ define('_MEMBERS_NOTES',			'Notas');
+ define('_MEMBERS_NEW_BTN',			'Introducir miembro');
+ define('_MEMBERS_EDIT',				'Modificar miembro');
+ define('_MEMBERS_EDIT_BTN',			'Modificar las preferencias');
+ define('_MEMBERS_BACKTOOVERVIEW',	'Volver a la página del miembro');
+ define('_MEMBERS_LOCALE',			'Idioma');
+ define('_MEMBERS_USESITELANG',		'- usar las preferencias de la web -');
+ 
+ // List of blogs (TT = tooltip)
+ define('_BLOGLIST_TT_VISIT',		'Visitar web');
+ define('_BLOGLIST_ADD',				'Introducir entrada');
+ define('_BLOGLIST_TT_ADD',			'Introducir una nueva entrada en esta bitácora');
+ define('_BLOGLIST_EDIT',			'Modificar/Eliminar entradas');
+ define('_BLOGLIST_TT_EDIT',			'');
+ define('_BLOGLIST_BMLET',			'Bookmarklet');
+ define('_BLOGLIST_TT_BMLET',		'');
+ define('_BLOGLIST_SETTINGS',		'Preferencias');
+ define('_BLOGLIST_TT_SETTINGS',		'Modificar preferencias o gestionar equipo');
+ define('_BLOGLIST_BANS',			'Restricciones');
+ define('_BLOGLIST_TT_BANS',			'Ver, introducir o eliminar IPs restringidas');
+ define('_BLOGLIST_DELETE',			'Eliminar todo');
+ define('_BLOGLIST_TT_DELETE',		'Eliminar esta bitácora');
+ 
+ // OVERVIEW screen
+ define('_OVERVIEW_YRBLOGS',			'Tus bitácoras');
+ define('_OVERVIEW_YRDRAFTS',		'Tus borradores');
+ define('_OVERVIEW_YRSETTINGS',		'Preferencias personales');
+ define('_OVERVIEW_GSETTINGS',		'Preferencias generales');
+ define('_OVERVIEW_NOBLOGS',			'El usuario no está en ningún equipo de bitácora');
+ define('_OVERVIEW_NODRAFTS',		'No hay borradores');
+ define('_OVERVIEW_EDITSETTINGS',	'Modificar preferencias personales...');
+ define('_OVERVIEW_BROWSEITEMS',		'Examinar entradas...');
+ define('_OVERVIEW_BROWSECOMM',		'Examinar comentarios...');
+ define('_OVERVIEW_VIEWLOG',			'Ver el registro de actividades...');
+ define('_OVERVIEW_MEMBERS',			'Gestionar los miembros...');
+ define('_OVERVIEW_NEWLOG',			'Crear nueva bitácora...');
+ define('_OVERVIEW_SETTINGS',		'Modificar preferencias...');
+ define('_OVERVIEW_TEMPLATES',		'Modificar plantillas...');
+ define('_OVERVIEW_SKINS',			'Modificar pieles...');
+ define('_OVERVIEW_BACKUP',			'Copia de seguridad / Restauración...');
+ 
+ // ITEMLIST
+ define('_ITEMLIST_BLOG',			'Entradas para la bitácora'); 
+ define('_ITEMLIST_YOUR',			'Entradas');
+ 
+ // Comments
+ define('_COMMENTS',					'Comentarios');
+ define('_NOCOMMENTS',				'Entrada sin comentarios');
+ define('_COMMENTS_YOUR',			'Comentarios');
+ define('_NOCOMMENTS_YOUR',			'No se ha escrito ningún comentario');
+ 
+ // LISTS (general)
+ define('_LISTS_NOMORE',				'No hay resultados (adicionales)');
+ define('_LISTS_PREV',				'Anterior');
+ define('_LISTS_NEXT',				'Siguiente');
+ define('_LISTS_SEARCH',				'Buscar');
+ define('_LISTS_CHANGE',				'Modificar');
+ define('_LISTS_PERPAGE',			'Entradas por página');
+ define('_LISTS_ACTIONS',			'Acciones');
+ define('_LISTS_DELETE',				'Eliminar');
+ define('_LISTS_EDIT',				'Modificar');
+ define('_LISTS_MOVE',				'Mover');
+ define('_LISTS_CLONE',				'Clonar');
+ define('_LISTS_TITLE',				'Título');
+ define('_LISTS_BLOG',				'Bitácora');
+ 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');
+ 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?');
+ define('_EDITC_WHEN',				'Cuándo?');
+ define('_EDITC_TEXT',				'Texto');
+ define('_EDITC_EDIT',				'Modificar comentario');
+ define('_EDITC_MEMBER',				'miembro');
+ define('_EDITC_NONMEMBER',			'no miembro');
+ 
+ // move item
+ define('_MOVE_TITLE',				'Mover a qué bitácora?');
+ define('_MOVE_BTN',					'Mover entrada');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/es_Latn_ES.UTF-8.php
index db057eb,3e6e6e2..14d7d30
--- a/nucleus/locales/es_Latn_ES.UTF-8.php
+++ b/nucleus/locales/es_Latn_ES.UTF-8.php
@@@ -10,16 -10,97 +10,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'esp_esp');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -83,15 -164,15 +168,15 @@@ 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');
+ // plugin dependency
+ define('_ERROR_INSREQPLUGIN',		'Fracasó la instalación del plugin, requiere ');
+ define('_ERROR_DELREQPLUGIN',		'Fracasó la eliminación del plugin, es requerido por ');
  
  //define('_ADD_ADDLATER',								'Add Later');
- define('_ADD_ADDLATER',								'Add the dates specified');
+ define('_ADD_ADDLATER',				'Introducir luego');
  
- define('_LOGIN_NAME',				'Name:');
- define('_LOGIN_PASSWORD',			'Password:');
+ define('_LOGIN_NAME',				'Nombre');
+ define('_LOGIN_PASSWORD',			'Clave');
  
  // changed from _BOOKMARLET_BMARKLFOLLOW
  define('_BOOKMARKLET_BMARKFOLLOW',					' (Works with nearly all browsers)');
@@@ -189,13 -270,7 +274,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -325,7 -400,7 +404,7 @@@ define('_ERROR_PLUGIN_LOAD',		'Plugin c
  // 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_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');
@@@ -354,10 -429,6 +433,6 @@@ define('_ARCHIVETYPE_MONTH',		'mes')
  // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
  define('_ERROR_BADTICKET',			'Ticket inválido o caducado.');
  
- // plugin dependency
- define('_ERROR_INSREQPLUGIN',		'Fracasó la instalación del plugin, requiere ');
- define('_ERROR_DELREQPLUGIN',		'Fracasó la eliminación del plugin, es requerido por ');
- 
  // cookie prefix
  define('_SETTINGS_COOKIEPREFIX',	'Prefijo de la Cookie');
  
@@@ -455,7 -526,7 +530,7 @@@ define('_WARNING_EXTAUTH',			'Aviso: Ha
  define('_MEMBERS_BYPASS',			'Usar Autenticación Externa');
  
  // 'always include in search' blog setting (yes/no) [in v2.5beta, the 'always' part wasn't clear]
- define('_EBLOG_SEARCH',				'<em>Siempre</em> incluir en la búsqueda');
+ define('_EBLOG_SEARCH',				'Incluir en búsquedas');
  
  // END changed/added after v2.5beta
  
@@@ -477,9 -548,6 +552,6 @@@ define('_ADD_ALIGNLEFT_TT',			'Alinear 
  define('_ADD_ALIGNRIGHT_TT',		'Alinear a la derecha');
  define('_ADD_ALIGNCENTER_TT',		'Alinear al centro');
  
- // searchable blog setting (yes/no)
- define('_EBLOG_SEARCH',				'Incluir en búsquedas');
- 
  // generic upload failure
  define('_ERROR_UPLOADFAILED',		'Error al subir');
  
@@@ -766,7 -834,6 +838,6 @@@ define('_COMMENTFORM_YOUARE',		'Eres')
  define('_COMMENTFORM_SUBMIT',		'Introducir comentario');
  define('_COMMENTFORM_COMMENT',		'Comentario');
  define('_COMMENTFORM_NAME',			'Nombre');
- define('_COMMENTFORM_MAIL',			'Email/HTTP');
  define('_COMMENTFORM_REMEMBER',		'Recordar usuario');
  
  // loginform
@@@ -793,7 -860,6 +864,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Desha
  define('_ADD_DRAFTNFUTURE',			'Borrador y futuras entradas');
  define('_ADD_ADDITEM',				'Introducir entrada');
  define('_ADD_ADDNOW',				'Introducir ahora');
- define('_ADD_ADDLATER',				'Introducir luego');
  define('_ADD_PLACE_ON',				'Colocar en');
  define('_ADD_ADDDRAFT',				'Introducir en el borrador');
  define('_ADD_NOPASTDATES',			'(las fechas y horas pasadas no son válidas, se usará el momento actual)');
@@@ -1137,8 -1203,6 +1207,6 @@@ define('_BAN_ADD_BTN',				'Introducir r
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Mensaje');
- define('_LOGIN_NAME',				'Nombre');
- define('_LOGIN_PASSWORD',			'Clave');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Has olvidado la clave?');
  
@@@ -1270,3 -1334,19 +1338,19 @@@ define('_EDITC_NONMEMBER',			'no miembr
  // move item
  define('_MOVE_TITLE',				'Mover a qué bitácora?');
  define('_MOVE_BTN',					'Mover entrada');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/fa_Arab_IR.UTF-8.php
index aa3f981,a074c3d..3ac45ec
--- a/nucleus/locales/fa_Arab_IR.UTF-8.php
+++ b/nucleus/locales/fa_Arab_IR.UTF-8.php
@@@ -8,16 -8,97 +8,101 @@@
   * 
   * @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
   */
  
   /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'C');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -86,10 -167,10 +171,10 @@@ define('_ERROR_INSREQPLUGIN',		'Plugin 
  define('_ERROR_DELREQPLUGIN',		'Plugin deletion failed, required by %s');
  
  //define('_ADD_ADDLATER',								'Add Later');
- define('_ADD_ADDLATER',								'Add the dates specified');
+ define('_ADD_ADDLATER',				'بعدا اضافه كن');
  
- define('_LOGIN_NAME',				'Name:');
- define('_LOGIN_PASSWORD',			'Password:');
+ define('_LOGIN_NAME',				'نام كاربري');
+ define('_LOGIN_PASSWORD',			'گذرواژه');
  
  // changed from _BOOKMARLET_BMARKLFOLLOW
  define('_BOOKMARKLET_BMARKFOLLOW',					' (Works with nearly all browsers)');
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -323,7 -398,7 +402,7 @@@ define('_ERROR_PLUGIN_LOAD',		'Plugin c
  // 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_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');
@@@ -449,7 -524,7 +528,7 @@@ define('_WARNING_EXTAUTH',			'Warning: 
  define('_MEMBERS_BYPASS',			'Use External Authentication');
  
  // 'always include in search' blog setting (yes/no) [in v2.5beta, the 'always' part wasn't clear]
- define('_EBLOG_SEARCH',				'<em>Always</em> include in search');
+ define('_EBLOG_SEARCH',				'شامل جستجو بودن');
  
  // END changed/added after v2.5beta
  
@@@ -471,9 -546,6 +550,6 @@@ define('_ADD_ALIGNLEFT_TT',			'تراØ
  define('_ADD_ALIGNRIGHT_TT',		'تراز از راست');
  define('_ADD_ALIGNCENTER_TT',		'تراز از وسط');
  
- // searchable blog setting (yes/no)
- define('_EBLOG_SEARCH',				'شامل جستجو بودن');
- 
  // generic upload failure
  define('_ERROR_UPLOADFAILED',		'خطا در بارگذاري');
  
@@@ -760,7 -832,6 +836,6 @@@ define('_COMMENTFORM_YOUARE',		'You are
  define('_COMMENTFORM_SUBMIT',		'ارسال نظر');
  define('_COMMENTFORM_COMMENT',		'نظر شما');
  define('_COMMENTFORM_NAME',			'نام');
- define('_COMMENTFORM_MAIL',			'E-mail/HTTP');
  define('_COMMENTFORM_REMEMBER',		'مرا به ياد آر');
  
  // loginform
@@@ -787,7 -858,6 +862,6 @@@ define('_ADD_DISABLE_COMMENTS',		'فعØ
  define('_ADD_DRAFTNFUTURE',			'Draft &amp; Future Items');
  define('_ADD_ADDITEM',				'اضافه كردن نوشته');
  define('_ADD_ADDNOW',				'اكنون اضافه كن');
- define('_ADD_ADDLATER',				'بعدا اضافه كن');
  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)');
@@@ -1131,8 -1201,6 +1205,6 @@@ define('_BAN_ADD_BTN',				'Add Ban')
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'پيغام');
- define('_LOGIN_NAME',				'نام كاربري');
- define('_LOGIN_PASSWORD',			'گذرواژه');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'گذرواژه را فراموش كرده ايد؟');
  
@@@ -1264,3 -1332,19 +1336,19 @@@ define('_EDITC_NONMEMBER',			'غير ك
  // move item
  define('_MOVE_TITLE',				'انتقال به كدام وبلاگ؟');
  define('_MOVE_BTN',					'جابجايي نوشته');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/fi_Latn_FI.ISO-8859-1.php
index cb1b849,f8443b2..fe5d807
--- a/nucleus/locales/fi_Latn_FI.ISO-8859-1.php
+++ b/nucleus/locales/fi_Latn_FI.ISO-8859-1.php
@@@ -10,16 -10,97 +10,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'fin_fin');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -83,15 -164,16 +168,16 @@@ 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');
+ // plugin dependency
+ define('_ERROR_INSREQPLUGIN',		'Laajennuksen asennus ei onnistunut, syynä ');
+ define('_ERROR_DELREQPLUGIN',		'Laajennuksen poistaminen ei onnistunut, syynä ');
+ 
  
  //define('_ADD_ADDLATER',								'Add Later');
- define('_ADD_ADDLATER',								'Add the dates specified');
+ define('_ADD_ADDLATER',				'Lisää myöhemmin');
  
- define('_LOGIN_NAME',				'Name:');
- define('_LOGIN_PASSWORD',			'Password:');
+ define('_LOGIN_NAME',				'Tunnus');
+ define('_LOGIN_PASSWORD',			'Salasana');
  
  // changed from _BOOKMARLET_BMARKLFOLLOW
  define('_BOOKMARKLET_BMARKFOLLOW',					' (Works with nearly all browsers)');
@@@ -189,13 -271,7 +275,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -325,7 -401,7 +405,7 @@@ define('_ERROR_PLUGIN_LOAD',		'Plugin c
  // 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_MAIL',			'Sähköpostiosoite tai WWW-osoite');
  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');
@@@ -354,10 -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');
  
@@@ -454,7 -526,7 +537,11 @@@ define('_WARNING_EXTAUTH',			'Varoitus
  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
  
@@@ -476,9 -548,6 +563,12 @@@ define('_MEDIA_COLLECTION_LABEL',	'Vali
  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');
@@@ -768,7 -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
@@@ -795,7 -863,6 +888,10 @@@ define('_ADD_DISABLE_COMMENTS',		'Komme
  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.)');
@@@ -1139,8 -1206,6 +1235,6 @@@ 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?');
  
@@@ -1272,3 -1337,19 +1366,22 @@@ define('_EDITC_NONMEMBER',			'ei-käyttä
  // move item
  define('_MOVE_TITLE',				'Siirrä mihin blogiin?');
  define('_MOVE_BTN',					'Siirrä artikkeli');
++<<<<<<< HEAD
++=======
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/fi_Latn_FI.UTF-8.php
index 92808a2,b69ade8..082ac66
--- a/nucleus/locales/fi_Latn_FI.UTF-8.php
+++ b/nucleus/locales/fi_Latn_FI.UTF-8.php
@@@ -10,16 -10,97 +10,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'fin_fin');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -83,15 -164,16 +168,16 @@@ 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');
+ // plugin dependency
+ define('_ERROR_INSREQPLUGIN',		'Laajennuksen asennus ei onnistunut, syynä ');
+ define('_ERROR_DELREQPLUGIN',		'Laajennuksen poistaminen ei onnistunut, syynä ');
+ 
  
  //define('_ADD_ADDLATER',								'Add Later');
- define('_ADD_ADDLATER',								'Add the dates specified');
+ define('_ADD_ADDLATER',				'Lisää myöhemmin');
  
- define('_LOGIN_NAME',				'Name:');
- define('_LOGIN_PASSWORD',			'Password:');
+ define('_LOGIN_NAME',				'Tunnus');
+ define('_LOGIN_PASSWORD',			'Salasana');
  
  // changed from _BOOKMARLET_BMARKLFOLLOW
  define('_BOOKMARKLET_BMARKFOLLOW',					' (Works with nearly all browsers)');
@@@ -189,13 -271,7 +275,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -325,7 -401,7 +405,7 @@@ define('_ERROR_PLUGIN_LOAD',		'Plugin c
  // 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_MAIL',			'Sähköpostiosoite tai WWW-osoite');
  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');
@@@ -354,10 -430,6 +434,6 @@@ 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.');
  
- // 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');
  
@@@ -454,7 -526,7 +530,7 @@@ define('_WARNING_EXTAUTH',			'Varoitus
  define('_MEMBERS_BYPASS',			'Käytä ulkoista varmennusta');
  
  // 'always include in search' blog setting (yes/no) [in v2.5beta, the 'always' part wasn't clear]
- define('_EBLOG_SEARCH',				'Sisällytä <em>aina</em> hakuun');
+ define('_EBLOG_SEARCH',				'Sisällytä hakuun');
  
  // END changed/added after v2.5beta
  
@@@ -477,9 -549,6 +553,6 @@@ define('_ADD_ALIGNLEFT_TT',			'Tasaa va
  define('_ADD_ALIGNRIGHT_TT',		'Tasaa oikealle');
  define('_ADD_ALIGNCENTER_TT',		'Keskitä');
  
- // searchable blog setting (yes/no)
- define('_EBLOG_SEARCH',				'Sisällytä hakuun');
- 
  // generic upload failure
  define('_ERROR_UPLOADFAILED',		'Lähetys epäonnistui');
  
@@@ -768,7 -837,6 +841,6 @@@ 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
@@@ -795,7 -863,6 +867,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Komme
  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.)');
@@@ -1139,8 -1206,6 +1210,6 @@@ 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?');
  
@@@ -1272,3 -1337,19 +1341,19 @@@ define('_EDITC_NONMEMBER',			'ei-käytt
  // move item
  define('_MOVE_TITLE',				'Siirrä mihin blogiin?');
  define('_MOVE_BTN',					'Siirrä artikkeli');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/fr_Latn_FR.ISO-8859-15.php
index 8a43b92,90e6031..8b51872
--- a/nucleus/locales/fr_Latn_FR.ISO-8859-15.php
+++ b/nucleus/locales/fr_Latn_FR.ISO-8859-15.php
@@@ -10,16 -10,97 +10,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'fra_fra');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -83,15 -164,15 +168,15 @@@ 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');
+ // plugin dependency
+ define('_ERROR_INSREQPLUGIN',		'L\'installation a échoué car le module nécessite ');
+ define('_ERROR_DELREQPLUGIN',		'L\'désinstallation a échoué car le module est requis par ');
  
  //define('_ADD_ADDLATER',								'Add Later');
- define('_ADD_ADDLATER',								'Add the dates specified');
+ define('_ADD_ADDLATER',			'Ajouter plus tard');
  
- define('_LOGIN_NAME',				'Name:');
- define('_LOGIN_PASSWORD',			'Password:');
+ define('_LOGIN_NAME',			'Nom');
+ define('_LOGIN_PASSWORD',		'Mot de passe');
  
  // changed from _BOOKMARLET_BMARKLFOLLOW
  define('_BOOKMARKLET_BMARKFOLLOW',					' (Works with nearly all browsers)');
@@@ -189,13 -270,7 +274,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -325,7 -400,7 +404,7 @@@ define('_ERROR_PLUGIN_LOAD',		'Plugin c
  // 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_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');
@@@ -333,311 -408,304 +412,577 @@@
  
  // 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
+ define('_SETTINGS_COOKIEPREFIX',	'Préfixe du cookie');
+ 
+ // account activation
+ define('_ERROR_NOLOGON_NOACTIVATE',	'Impossible d\'envoyer le lien d\'activation. Vous n\'êtes pas autorisé à vous authentifier.');
+ define('_ERROR_ACTIVATE',		'La clef d\'activation key n\'existe pas, est invalide, ou a expiré.');
+ define('_ACTIONLOG_ACTIVATIONLINK', 	'Lien d\'activation envoyé');
+ define('_MSG_ACTIVATION_SENT',		'Lien d\'activation a été envoyé par mail.');
+ 
+ // activation link emails
+ define('_ACTIVATE_REGISTER_MAIL',	"Bonjour <%memberName%>,\n\nvous devez activer votre compte sur <%siteName%> (<%siteUrl%>).\nVous pouvez le faire en suivant le lien ci-dessous :\n\n\t<%activationUrl%>\n\nPassés 2 jours le lien d\'activation sera invalide.");
+ define('_ACTIVATE_REGISTER_MAILTITLE',	"Activez votre compte '<%memberName%>'");
+ define('_ACTIVATE_REGISTER_TITLE',	'Bienvenue <%memberName%>');
+ define('_ACTIVATE_REGISTER_TEXT',	'Une dernière étape : choisissez un mot de passe pour votre compte.');
+ define('_ACTIVATE_FORGOT_MAIL',		"Bonjour <%memberName%>,\n\nEn suivant le lien ci-dessous, vous pouvez choisir un nouveau mot de passe pour votre compte sur <%siteName%> (<%siteUrl%>).\n\n\t<%activationUrl%>\n\nPassés 2 jours le lien d\'activation sera invalide.");
+ define('_ACTIVATE_FORGOT_MAILTITLE',	"Procédez à la réactivation de votre compte '<%memberName%>'");
+ define('_ACTIVATE_FORGOT_TITLE',	'Bienvenue <%memberName%>');
+ define('_ACTIVATE_FORGOT_TEXT',		'Vous pouvez choisir un nouveau mot de passe pour votre compte ci-dessous :');
+ define('_ACTIVATE_CHANGE_MAIL',		"Bonjour <%memberName%>,\n\nMaintenant que votre adresse email a été changée, vous devez réactivation de votre compte sur <%siteName%> (<%siteUrl%>).\nVous pouvez le faire en suivant le lien ci-dessous :\n\n\t<%activationUrl%>\n\nPassés 2 jours le lien d\'activation sera invalide.");
+ define('_ACTIVATE_CHANGE_MAILTITLE',	"Procédez à la réactivation de votre compte '<%memberName%>'");
+ define('_ACTIVATE_CHANGE_TITLE',	'Bienvenue <%memberName%>');
+ define('_ACTIVATE_CHANGE_TEXT',		'Votre changement d\'adresse email a été validé. Merci !');
+ define('_ACTIVATE_SUCCESS_TITLE',	'Activation réussie');
+ define('_ACTIVATE_SUCCESS_TEXT',	'Votre compte a été réactivé.');
+ define('_MEMBERS_SETPWD',		'Choisissez un mot de passe');
+ define('_MEMBERS_SETPWD_BTN',		'Choisissez un mot de passe');
+ define('_QMENU_ACTIVATE',		'Activation de compte');
+ define('_QMENU_ACTIVATE_TEXT',		'<p>Dès l\'activation de votre compte, vous pouvez commencer à l\'utiliser en <a href="index.php?action=showlogin">vous authentifiant</a>.</p>');
+ 
+ define('_PLUGS_BTN_UPDATE',		'Mettre à jour la liste des installations');
+ 
+ // global settings
+ define('_SETTINGS_JSTOOLBAR',		'Type de barre d\'édition');
+ define('_SETTINGS_JSTOOLBAR_FULL',	'Barre d\'édition complète (IE)');
+ define('_SETTINGS_JSTOOLBAR_SIMPLE',	'Barre d\'édition simplifiée (Non-IE)');
+ define('_SETTINGS_JSTOOLBAR_NONE',	'Désactiver la barre d\'édition');
+ define('_SETTINGS_URLMODE_HELP',	'(Info: <a href="documentation/tips.html#searchengines-fancyurls">activer l\'utilisation des URLs pour la recherche</a>)');
+ 
+ // extra plugin settings part when editing categories/members/blogs/...
+ define('_PLUGINS_EXTRA',		'Autres paramètres du module');
+ 
+ // itemlist info column keys
+ define('_LIST_ITEM_BLOG',		'blog:');
+ define('_LIST_ITEM_CAT',		'thème:');
+ 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');
+ 
+ // quickmenu
+ define('_QMENU_HOME',			'Accueil');
+ define('_QMENU_ADD',			'Ajouter un billet');
+ define('_QMENU_ADD_SELECT',		'-- sélectionnez --');
+ define('_QMENU_USER_SETTINGS',		'Préférences');
+ define('_QMENU_USER_ITEMS',		'Billets');
+ define('_QMENU_USER_COMMENTS',		'Commentaires');
+ define('_QMENU_MANAGE',			'Paramètres');
+ define('_QMENU_MANAGE_LOG',		'Log');
+ define('_QMENU_MANAGE_SETTINGS',	'Configuration');
+ define('_QMENU_MANAGE_MEMBERS',		'Participants');
+ define('_QMENU_MANAGE_NEWBLOG',		'Nouveau blog');
+ define('_QMENU_MANAGE_BACKUPS',		'Sauvegardes');
+ define('_QMENU_MANAGE_PLUGINS',		'Modules');
+ define('_QMENU_LAYOUT',			'Mise en page');
+ define('_QMENU_LAYOUT_SKINS',		'Habillages');
+ define('_QMENU_LAYOUT_TEMPL',		'Modèles');
+ define('_QMENU_LAYOUT_IEXPORT',		'Importer/Exporter');
+ define('_QMENU_PLUGINS',		'Modules');
+ 
+ // quickmenu on logon screen
+ define('_QMENU_INTRO',			'Introduction');
+ define('_QMENU_INTRO_TEXT',		'<p>Ceci est la page d\'authentification de Nucleus CMS, le système permettant la mise à jour du contenu de ce site.</p><p>Pour mettre en ligne de nouveaux billets, authentifiez-vous.</p>');
+ 
+ // helppages for plugins
+ define('_ERROR_PLUGNOHELPFILE',		'Impossible de trouver le fichier d\'aide correspondant à ce module');
+ 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');
+ define('_MEDIA_FILTER_LABEL',		'Filtre: ');
+ define('_MEDIA_UPLOAD_TO',		'Télécharger dans...');
+ define('_MEDIA_UPLOAD_NEW',		'Télécharger un nouveau fichier...');
+ define('_MEDIA_COLLECTION_SELECT',	'Sélectionner');
+ define('_MEDIA_COLLECTION_TT',		'Changer de bibliothèque');
+ define('_MEDIA_COLLECTION_LABEL',	'Bibliothèque actuelle: ');
+ 
+ // tooltips on toolbar
+ 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');
+ define('_BATCH_MEMBERS',		'Action sur les participants');
+ define('_BATCH_TEAM',			'Action sur les participants d\'un blog');
+ define('_BATCH_COMMENTS',		'Action sur les commentaires');
+ define('_BATCH_UNKNOWN',		'Action inconnue: ');
+ define('_BATCH_EXECUTING',		'En cours');
+ define('_BATCH_ONCATEGORY',		'sur un thème');
+ define('_BATCH_ONITEM',			'sur un élément');
+ define('_BATCH_ONCOMMENT',		'sur un commentaire');
+ define('_BATCH_ONMEMBER',		'sur un participant');
+ define('_BATCH_ONTEAM',			'sur le participant du blog');
+ define('_BATCH_SUCCESS',		'Action réussie!');
+ define('_BATCH_DONE',			'Terminé!');
+ define('_BATCH_DELETE_CONFIRM',		'Confirmer la suppression');
+ define('_BATCH_DELETE_CONFIRM_BTN',	'Confirmer');
+ define('_BATCH_SELECTALL',		'Tout sélectionner');
+ define('_BATCH_DESELECTALL',		'Annuler la sélection');
+ 
+ // batch operations: options in dropdowns
+ define('_BATCH_ITEM_DELETE',		'Supprimer');
+ define('_BATCH_ITEM_MOVE',		'Déplacer');
+ define('_BATCH_MEMBER_DELETE',		'Supprimer');
+ define('_BATCH_MEMBER_SET_ADM',		'Donner les droits d\'administrateur');
+ define('_BATCH_MEMBER_UNSET_ADM',	'Retirer les droits d\'administrateur');
+ define('_BATCH_TEAM_DELETE',		'Retirer de l\'équipe');
+ define('_BATCH_TEAM_SET_ADM',		'Donner les droits d\'administrateur');
+ define('_BATCH_TEAM_UNSET_ADM',		'Retirer les droits d\'administrateur');
+ define('_BATCH_CAT_DELETE',		'Supprimer');
+ define('_BATCH_CAT_MOVE',		'Déplacer vers un autre blog');
+ define('_BATCH_COMMENT_DELETE',		'Supprimer');
+ 
+ // itemlist: Add new item...
+ define('_ITEMLIST_ADDNEW',		'Ajouter un nouveau billet...');
+ define('_ADD_PLUGIN_EXTRAS',		'Options supplémentaires des modules');
+ 
+ // 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');
+ define('_SKINIE_BTN_EXPORT',		'Exporter les habillages/modèles sélectionnés');
+ define('_SKINIE_LOCAL',			'Importer depuis un fichier local:');
+ define('_SKINIE_NOCANDIDATES',		'Aucun habillage trouvé dans le répertoire skins');
+ define('_SKINIE_FROMURL',		'Importer à partir d\'un lien:');
+ define('_SKINIE_EXPORT_INTRO',		'Sélectionnez ci-dessous les habillages et modèles que vous souhaitez exporter:');
+ define('_SKINIE_EXPORT_SKINS',		'Habillages');
+ define('_SKINIE_EXPORT_TEMPLATES',	'Modèles');
+ define('_SKINIE_EXPORT_EXTRA',		'Notes');
+ define('_SKINIE_CONFIRM_OVERWRITE',	'Ecraser l\'ancienne version?');
+ define('_SKINIE_CONFIRM_IMPORT',	'Oui, je veux importer ceci');
+ define('_SKINIE_CONFIRM_TITLE',		'A propos de l\'importation d\'habillage et de modèle');
+ define('_SKINIE_INFO_SKINS',		'Habillages dans le fichier:');
+ define('_SKINIE_INFO_TEMPLATES',	'Modèles dans le fichier:');
+ define('_SKINIE_INFO_GENERAL',		'Notes:');
+ define('_SKINIE_INFO_SKINCLASH',	'Nom de l\'habillage:');
+ define('_SKINIE_INFO_TEMPLCLASH',	'Nom du modèle:');
+ define('_SKINIE_INFO_IMPORTEDSKINS',	'Habillage importé:');
+ define('_SKINIE_INFO_IMPORTEDTEMPLS',	'Modèle importé:');
+ define('_SKINIE_DONE',			'Importation réussie');
+ 
+ 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:');
+ 
+ // backup
+ define('_BACKUPS_TITLE',		'Sauvegarde / Récupération');
+ define('_BACKUP_TITLE',			'Sauvegarde');
+ define('_BACKUP_INTRO',			'Cliquez sur le bouton ci-dessous pour créer une sauvegarde de votre base de données Nucleus. Enregistrez-la dans un fichier. Gardez-le en lieu sûr.');
+ define('_BACKUP_ZIP_YES',		'Essayer d\'utiliser la compression');
+ define('_BACKUP_ZIP_NO',		'Ne pas utiliser la compression');
+ define('_BACKUP_BTN',			'Sauvegarder!');
+ define('_BACKUP_NOTE',			'<b>NB:</b> Seul le contenu de la base de données est sauvegardé. Les fichiers Media importés et la configuration de config.php <b>NE SONT PAS</b> inclus dans la sauvegarde.');
+ define('_RESTORE_TITLE',		'Récupération');
+ define('_RESTORE_NOTE',			'<b>ATTENTION:</b> Restaurer une sauvegarde <b>EFFACERA</b> toutes les données contenues dans la base de données Nucleus! N\'agissez qu\'en connaissance de cause!<br /><b>NB:</b> Vérifiez que la version de Nucleus de votre sauvegarde soit la même que celle que vous utilisez actuellement autrement cela ne fonctionnera pas.');
+ define('_RESTORE_INTRO',		'Sélectionnez le fichier de récupération ci-dessous (il sera téléchargé sur le serveur) et cliquez sur le bouton "Récupération" pour procéder.');
+ define('_RESTORE_IMSURE',		'Oui, je suis sûr!');
+ define('_RESTORE_BTN',			'Récupération');
+ define('_RESTORE_WARNING',		'(Vérifiez que vous restaurez le bon fichier de sauvegarde. Faites une nouvelle sauvegarde avant de commencer si vous n\'êtes pas sûr.)');
+ define('_ERROR_BACKUP_NOTSURE',		'Vous devez cliquer sur le bouton \'je suis sûr\'');
+ define('_RESTORE_COMPLETE',		'Récupération terminée');
+ 
+ // new item notification
+ define('_NOTIFY_NI_MSG',		'Nouveau billet:');
+ define('_NOTIFY_NI_TITLE',		'Nouveau!');
+ define('_NOTIFY_KV_MSG',		'Votes Karma pour le billet:');
+ define('_NOTIFY_KV_TITLE',		'Nucleus karma:');
+ define('_NOTIFY_NC_MSG',		'Commentaires sur le billet:');
+ define('_NOTIFY_NC_TITLE',		'Commentaire Nucleus:');
+ define('_NOTIFY_USERID',		'Utilisateur:');
+ define('_NOTIFY_USER',			'Utilisateur:');
+ define('_NOTIFY_COMMENT',		'Commentaire:');
+ define('_NOTIFY_VOTE',			'Vote:');
+ define('_NOTIFY_HOST',			'Hôte:');
+ define('_NOTIFY_IP',			'IP:');
+ define('_NOTIFY_MEMBER',		'Participant:');
+ define('_NOTIFY_TITLE',			'Titre:');
+ define('_NOTIFY_CONTENTS',		'Contenu:');
+ 
+ // member mail message
+ define('_MMAIL_MSG',			'Vous avez reçu un message de');
+ 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
  
@@@ -645,92 -713,91 +990,169 @@@
  // 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');
+ define('_BMLET_BODY',			'Corps');
+ define('_BMLET_MORE',			'Développement');
+ define('_BMLET_OPTIONS',		'Options');
+ define('_BMLET_PREVIEW',		'Prévisualisation');
+ 
+ // used in bookmarklet
+ define('_ITEM_UPDATED',			'Billet mis à jour');
+ define('_ITEM_DELETED',			'Billet effacé');
+ 
+ // plugins
+ define('_CONFIRMTXT_PLUGIN',		'Etes-vous sur de vouloir supprimer ce module?');
+ define('_ERROR_NOSUCHPLUGIN',		'Pas de module correspondant');
+ define('_ERROR_DUPPLUGIN',		'Désolé, ce module est déjà installé');
+ define('_ERROR_PLUGFILEERROR',		'Ce module n\'existe pas, ou les permissions sont mal configurées');
+ define('_PLUGS_NOCANDIDATES',		'Pas de module valide trouvé');
+ 
+ define('_PLUGS_TITLE_MANAGE',		'Gérer les modules');
+ define('_PLUGS_TITLE_INSTALLED',	'Déjà installés');
+ define('_PLUGS_TITLE_UPDATE',		'Mettre à jour la liste des installations');
+ define('_PLUGS_TEXT_UPDATE',		'Nucleus garde un cache des inscriptions des modules. Quand vous mettez à jour un module en remplaçant son fichier, vous devez utiliser cette fonction pour mettre à jour le cache.');
+ 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');
+ 
+ // add/edit item: new category (in dropdown box)
+ define('_ADD_NEWCAT',			'Nouveau thème...');
+ 
+ // new settings
+ define('_SETTINGS_PLUGINURL',		'URL des modules');
+ define('_SETTINGS_MAXUPLOADSIZE',	'Taille maxi. du fichier téléchargé (bytes)');
+ define('_SETTINGS_NONMEMBERMSGS',	'Autoriser les non-participants à envoyer des messages');
+ define('_SETTINGS_PROTECTMEMNAMES',	'Protéger les noms des participants');
+ 
+ // 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
+ define('_LISTS_INFO',			'Information');
+ define('_LIST_PLUGS_AUTHOR',		'de:');
+ define('_LIST_PLUGS_VER',		'Version:');
+ define('_LIST_PLUGS_SITE',		'Visiter le site');
+ define('_LIST_PLUGS_DESC',		'Description:');
+ define('_LIST_PLUGS_SUBS',		'Inscription aux évènements suivants:');
+ define('_LIST_PLUGS_UP',		'monter');
+ 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');
+ define('_PLUGS_OPTIONS_UPDATED',	'Options du module mises à jour');
+ 
+ define('_OVERVIEW_MANAGEMENT',		'Gestion');
+ 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
@@@ -740,535 -807,547 +1162,1060 @@@
  
  
  // 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');
+ define('_NO',				'Non');
+ define('_SUBMIT',			'Envoyer');
+ define('_ERROR',			'Erreur');
+ define('_ERRORMSG',			'Une erreur est survenue!');
+ define('_BACK',				'Retour');
+ define('_NOTLOGGEDIN',			'Non connecté');
+ define('_LOGGEDINAS',			'Connecté en tant que');
+ define('_ADMINHOME',			'Accueil');
+ define('_NAME',				'Nom');
+ define('_BACKHOME',			'Retour à l\'accueil');
+ define('_BADACTION',			'Action inconnue');
+ define('_MESSAGE',			'Message');
+ define('_HELP_TT',			'Aide!');
+ define('_YOURSITE',			'Votre site');
+ 
+ 
+ define('_POPUP_CLOSE',			'Fermer la fenêtre');
+ 
+ define('_LOGIN_PLEASE',			'Connectez-vous d\'abord, SVP');
+ 
+ // commentform
+ define('_COMMENTFORM_YOUARE',		'Vous êtes');
+ define('_COMMENTFORM_SUBMIT',		'Ajouter un commentaire');
+ define('_COMMENTFORM_COMMENT',		'Votre commentaire');
+ define('_COMMENTFORM_NAME',		'Nom');
+ define('_COMMENTFORM_REMEMBER',		'Retenir votre nom');
+ 
+ // loginform
+ 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');
+ define('_ADD_TITLE',			'Titre');
+ define('_ADD_MORE',			'Développement (facultatif)');
+ define('_ADD_CATEGORY',			'Thème');
+ define('_ADD_PREVIEW',			'Prévisualisation');
+ define('_ADD_DISABLE_COMMENTS',		'Interdire les commentaires?');
+ define('_ADD_DRAFTNFUTURE',		'Brouillons &amp; billets à venir');
+ define('_ADD_ADDITEM',			'Ajouter le billet');
+ define('_ADD_ADDNOW',			'Ajouter maintenant');
+ define('_ADD_PLACE_ON',			'Daté du');
+ define('_ADD_ADDDRAFT',			'Ajouter aux brouillons');
+ define('_ADD_NOPASTDATES',		'(Les dates et heures passées ne sont pas valides, la date d\'aujourd\'hui sera utilisée)');
+ define('_ADD_BOLD_TT',			'Gras');
+ define('_ADD_ITALIC_TT',		'Italiques');
+ define('_ADD_HREF_TT',			'Faire un lien');
+ define('_ADD_MEDIA_TT',			'Ajouter un document');
+ define('_ADD_PREVIEW_TT',		'Montrer/cacher la prévisualisation');
+ define('_ADD_CUT_TT',			'Couper');
+ define('_ADD_COPY_TT',			'Copier');
+ define('_ADD_PASTE_TT',			'Coller');
+ 
+ 
+ // edit item form
+ define('_EDIT_ITEM',			'Modifier le billet');
+ define('_EDIT_SUBMIT',			'Valider');
+ define('_EDIT_ORIG_AUTHOR',		'Auteur');
+ define('_EDIT_BACKTODRAFTS',		'Remettre aux brouillons');
+ define('_EDIT_COMMENTSNOTE',		'(NB: Désactiver les commentaires ne cachera pas les anciens)');
+ 
+ // used on delete screens
+ define('_DELETE_CONFIRM',		'SVP, confirmez la suppression');
+ define('_DELETE_CONFIRM_BTN',		'Confirmer');
+ define('_CONFIRMTXT_ITEM',		'Vous allez effacer le billet suivant:');
+ define('_CONFIRMTXT_COMMENT',		'Vous allez effacer le commentaire suivant:');
+ define('_CONFIRMTXT_TEAM1',		'Vous allez effacer ');
+ define('_CONFIRMTXT_TEAM2',		' de l\'équipe pour le blog ');
+ define('_CONFIRMTXT_BLOG',		'Le blog que vous allez effacer est: ');
+ define('_WARNINGTXT_BLOGDEL',		'Attention! Effacer un blog effarcera TOUS les billets de ce blog et tous les commentaires associés. Soyez certain de ne pas faire erreur. <br />Et n\'interrompez pas le processus.');
+ define('_CONFIRMTXT_MEMBER',		'Vous allez effacer le profil du participant suivant: ');
+ define('_CONFIRMTXT_TEMPLATE',		'Vous allez effacer le modèle  ');
+ define('_CONFIRMTXT_SKIN',		'Vous allez effacer l\'habillage ');
+ define('_CONFIRMTXT_BAN',		'Vous allez annuler l\'exclusion de la plage IP');
+ define('_CONFIRMTXT_CATEGORY',		'Vous allez effacer le thème ');
+ 
+ // some status messages
+ define('_DELETED_ITEM',			'Billet supprimé');
+ define('_DELETED_MEMBER',		'Participant effacé');
+ define('_DELETED_COMMENT',		'Commentaire supprimé');
+ define('_DELETED_BLOG',			'Blog effacé');
+ define('_DELETED_CATEGORY',		'Categorie supprimée');
+ define('_ITEM_MOVED',			'Billet déplacé');
+ define('_ITEM_ADDED',			'Billet ajouté');
+ define('_COMMENT_UPDATED',		'Commentaire mis à jour');
+ define('_SKIN_UPDATED',			'Habillage modifié');
+ define('_TEMPLATE_UPDATED',		'Modèle modifié');
+ 
+ // errors
+ define('_ERROR_COMMENT_LONGWORD',	'SVP, n\'employez pas de mot de plus de 90 caractères dans votre commentaire');
+ define('_ERROR_COMMENT_NOCOMMENT',	'Tapez votre commentaire');
+ define('_ERROR_COMMENT_NOUSERNAME',	'Nom invalide');
+ define('_ERROR_COMMENT_TOOLONG',	'Votre commentaire est trop long (max. 5000 cars)');
+ define('_ERROR_COMMENTS_DISABLED',	'Les commentaires sur ce blog sont actuellement désactivés.');
+ define('_ERROR_COMMENTS_NONPUBLIC',	'Vous devez être connecté en tant que participant pour pouvoir commenter ce blog.');
+ define('_ERROR_COMMENTS_MEMBERNICK',	'Ce nom est déjà utilisé par un participant du blog. Choisissez autre chose.');
+ define('_ERROR_SKIN',			'Erreur d\'habillage');
+ define('_ERROR_ITEMCLOSED',		'Ce billet est protégé. Il n\'est pas possible de le commenter ni de voter pour lui.');
+ define('_ERROR_NOSUCHITEM',		'Billet inexistant');
+ define('_ERROR_NOSUCHBLOG',		'Blog inexistant');
+ define('_ERROR_NOSUCHSKIN',		'Habillage inexistant');
+ define('_ERROR_NOSUCHMEMBER',		'Participant inexistant');
+ define('_ERROR_NOTONTEAM',		'Vous n\'appartenez pas à l\'équipe de ce blog.');
+ define('_ERROR_BADDESTBLOG',		'Le blog de destination n\'existe pas.');
+ define('_ERROR_NOTONDESTTEAM',		'Impossible de déplacer le billet car vous ne faites pas partie de l\'équipe du blog de destination.');
+ define('_ERROR_NOEMPTYITEMS',		'Impossible d\'ajouter un billet vide!');
+ define('_ERROR_BADMAILADDRESS',		'Adresse email incorrecte');
+ define('_ERROR_BADNOTIFY',		'Adresse(s) de notification incorrecte(s)');
+ define('_ERROR_BADNAME',		'Nom incorrect (seuls les lettres de a à z et les chiffres de 0 à 9 sont autorisés, sans espace au début ni à la fin)');
+ define('_ERROR_NICKNAMEINUSE',		'Un autre participant utilise déjà ce nom');
+ define('_ERROR_PASSWORDMISMATCH',	'Les mots de passe doivent correspondre');
+ define('_ERROR_PASSWORDTOOSHORT',	'Le mot de passe doit commprendre au moins 6 caractères');
+ define('_ERROR_PASSWORDMISSING',	'Il FAUT un mot de passe');
+ define('_ERROR_REALNAMEMISSING',	'Vous devez inscrire votre nom');
+ define('_ERROR_ATLEASTONEADMIN',	'Il doit toujours y avoir un super admin qui puisse se connecter.');
+ define('_ERROR_ATLEASTONEBLOGADMIN',	'Cela empêcherait la gestion de votre blog. Assurez-vous qu\'il y ait toujours au-moins un administrateur.');
+ define('_ERROR_ALREADYONTEAM',		'Ce participant est déjà dans l\'équipe');
+ define('_ERROR_BADSHORTBLOGNAME',	'Le diminutif du blog ne peut contenir que des lettres de a à z et des chiffres de 0 à 9, sans espace.');
+ define('_ERROR_DUPSHORTBLOGNAME',	'Un autre blog utilise déjà ce diminutif. Les diminutifs doivent être uniques.');
+ define('_ERROR_UPDATEFILE',		'Impossible de mettre à jour le fichier. Vérifiez le réglage de permissions d\'écriture (faites un chmod 666). Remarquez aussi que le chemin est relatif au répertoire de la zone admin ; vous devriez utiliser un chemin absolu (quelque chose comme /votre/chemin/vers/nucleus/)');
+ define('_ERROR_DELDEFBLOG',		'Impossible d\'effacer le blog par défaut');
+ define('_ERROR_DELETEMEMBER',		'Impossible de supprimer ce participant car il est probablement l\'auteur de billets ou de commentaires.');
+ define('_ERROR_BADTEMPLATENAME',	'Nom de modèle incorrect, n\'utilisez que des lettres de a à z et des chiffres de 0 à 9, sans espace.');
+ define('_ERROR_DUPTEMPLATENAME',	'Il existe déjà un modèle de ce nom');
+ define('_ERROR_BADSKINNAME',		'Nom d\'habillage incorrect, n\'utilisez que des lettres de a à z et des chiffres de 0 à 9, sans espace.');
+ define('_ERROR_DUPSKINNAME',		'Il existe déjà un habillage de ce nom');
+ define('_ERROR_DEFAULTSKIN',		'Il doit toujours subsister un habillage nommé "default"');
+ define('_ERROR_SKINDEFDELETE',		'Impossible de supprimer l\'habillage car il s\'agit de l\'habillage par défaut du blog: ');
+ define('_ERROR_DISALLOWED',		'Vous n\'êtes pas autorisé à faire cela');
+ define('_ERROR_DELETEBAN',		'Erreur en essayant de supprimer l\'exclusion (elle n\'existe pas)');
+ define('_ERROR_ADDBAN',			'Erreur en essayant d\'ajouter l\'exclusion. L\'exclusion n\'a pas été ajoutée correctement dans tous vos blogs.');
+ define('_ERROR_BADACTION',		'L\'action demandée n\'existe pas');
+ define('_ERROR_MEMBERMAILDISABLED',	'Messages de participant à participant désactivés');
+ define('_ERROR_MEMBERCREATEDISABLED',	'Creation de nouveaux comptes désactivée');
+ define('_ERROR_INCORRECTEMAIL',		'Email incorrect');
+ define('_ERROR_VOTEDBEFORE',		'Vous avez déjà voté pour ce billet');
+ define('_ERROR_BANNED1',		'Action impossible car vous (plage IP ');
+ define('_ERROR_BANNED2',			') êtes exclu. Le message était: \'');
+ define('_ERROR_BANNED3',			'\'');
+ define('_ERROR_LOGINNEEDED',		'Vous devez être connecté pour faire cela');
+ define('_ERROR_CONNECT',		'Erreur de connexion');
+ define('_ERROR_FILE_TOO_BIG',		'Fichier trop gros!');
+ define('_ERROR_BADFILETYPE',		'Désolé, cette extension n\'est pas autorisée');
+ define('_ERROR_BADREQUEST',		'Mauvaise demande de téléchargement');
+ define('_ERROR_DISALLOWEDUPLOAD',	'Vous ne faites partie d\'aucune équipe. Vous n\'êtes donc pas autorisé à télécharger des fichiers.');
+ define('_ERROR_BADPERMISSIONS',		'Les permissions de fichiers/répertoires ne sont pas correctement configurées');
+ define('_ERROR_UPLOADMOVEP',		'Erreur de déplacement de fichier');
+ define('_ERROR_UPLOADCOPY',		'Erreur de copie de fichier');
+ define('_ERROR_UPLOADDUPLICATE',	'Un fichier de ce nom existe déjà. Essayez de le renommer avant de le télécharger.');
+ define('_ERROR_LOGINDISALLOWED',	'Désolé, vous n\'êtes pas autorisé à vous connecter à la zone admin. Vous pouvez vous connecter sous un autre nom');
+ define('_ERROR_DBCONNECT',		'Impossible de se connecter au serveur mySQL');
+ define('_ERROR_DBSELECT',		'Impossible de sélectionner la base Nucleus.');
+ define('_ERROR_NOSUCHLOCALE',		'Fichier de langue indisponible');
+ define('_ERROR_NOSUCHCATEGORY',		'Thème indisponible');
+ define('_ERROR_DELETELASTCATEGORY',	'Il doit y avoir au moins un thème');
+ define('_ERROR_DELETEDEFCATEGORY',	'Impossible d\'effacerle thème par défaut');
+ define('_ERROR_BADCATEGORYNAME',	'Nom de thème incorrect');
+ define('_ERROR_DUPCATEGORYNAME',	'Ce thème existe déjà');
+ 
+ // some warnings (used for mediadir setting)
+ define('_WARNING_NOTADIR',		'Attention: ceci n\'est pas un répertoire!');
+ define('_WARNING_NOTREADABLE',		'Attention: ceci n\'est pas un répertoire avec droit de lecture!');
+ define('_WARNING_NOTWRITABLE',		'Attention: ceci n\'est pas un répertoire avec droit d\'écriture!');
+ 
+ // media and upload
+ define('_MEDIA_UPLOADLINK',		'Télécharger un nouveau fichier');
+ define('_MEDIA_MODIFIED',		'modifié');
+ define('_MEDIA_FILENAME',		'nom de fichier');
+ define('_MEDIA_DIMENSIONS',		'dimensions');
+ define('_MEDIA_INLINE',			'Inséré');
+ define('_MEDIA_POPUP',			'Popup');
+ define('_UPLOAD_TITLE',			'Choisir le fichier');
+ define('_UPLOAD_MSG',			'Sélectionnez le fichier à télécharger ci-dessous et pressez le bouton \'Télécharger\'.');
+ define('_UPLOAD_BUTTON',		'Télécharger');
+ 
+ // some status messages
+ //define('_MSG_ACCOUNTCREATED',		'Compte créé, le mot de passe sera envoyé par email');
+ //define('_MSG_PASSWORDSENT',		'Mot de passe envoyé par email');
+ define('_MSG_LOGINAGAIN',		'Vous devrez vous reconnecter car vos informations ont changé');
+ define('_MSG_SETTINGSCHANGED',		'Réglages modifiés');
+ define('_MSG_ADMINCHANGED',		'Admin changé');
+ define('_MSG_NEWBLOG',			'Nouveau blog créé');
+ define('_MSG_ACTIONLOGCLEARED',		'Journal effacé');
+ 
+ // actionlog in admin area
+ define('_ACTIONLOG_DISALLOWED',		'Action interdite: ');
+ define('_ACTIONLOG_PWDREMINDERSENT',	'Nouveau mot de passe envoyé pour ');
+ define('_ACTIONLOG_TITLE',		'Journal des événements');
+ define('_ACTIONLOG_CLEAR_TITLE',	'Effacer le journal des événements');
+ define('_ACTIONLOG_CLEAR_TEXT',		'Effacer le journal des événements maintenant');
+ 
+ // team management
+ define('_TEAM_TITLE',			'Gérer les participants ');
+ define('_TEAM_CURRENT',			'Equipe actuelle');
+ define('_TEAM_ADDNEW',			'Ajouter un participant');
+ define('_TEAM_CHOOSEMEMBER',		'Choisir un participant');
+ define('_TEAM_ADMIN',			'Privilèges d\'administrateur? ');
+ define('_TEAM_ADD',			'Ajouter à l\'équipe');
+ define('_TEAM_ADD_BTN',			'Ajouter!');
+ 
+ // blogsettings
+ define('_EBLOG_TITLE',			'Modifier les réglages du blog');
+ define('_EBLOG_TEAM_TITLE',		'Modifier l\'équipe');
+ define('_EBLOG_TEAM_TEXT',		'Cliquez ici pour modifier votre équipe...');
+ define('_EBLOG_SETTINGS_TITLE',		'Réglages du blog');
+ define('_EBLOG_NAME',			'Nom du blog');
+ define('_EBLOG_SHORTNAME',		'Diminutif');
+ define('_EBLOG_SHORTNAME_EXTRA',	'<br />(seulement de a à z et sans espace)');
+ define('_EBLOG_DESC',			'Description');
+ define('_EBLOG_URL',			'URL');
+ define('_EBLOG_DEFSKIN',		'Habillage par défaut');
+ define('_EBLOG_DEFCAT',			'Thème par défaut');
+ define('_EBLOG_LINEBREAKS',		'Convertir les sauts de ligne');
+ define('_EBLOG_DISABLECOMMENTS',	'Activer les commentaires?<br /><small>(Cela signifie qu\'il sera impossible d\'en ajouter.)</small>');
+ define('_EBLOG_ANONYMOUS',		'Autoriser les commentaires par des non-participants?');
+ define('_EBLOG_NOTIFY',			'Adresse(s) de notification (séparées par des ;)');
+ define('_EBLOG_NOTIFY_ON',		'Notification activée');
+ define('_EBLOG_NOTIFY_COMMENT',		'Nouveaux commentaires');
+ define('_EBLOG_NOTIFY_KARMA',		'Nouveaux votes karma');
+ define('_EBLOG_NOTIFY_ITEM',		'Nouveau billet');
+ define('_EBLOG_PING',			'Pinger Weblogs.com à la mise à jour?');
+ define('_EBLOG_MAXCOMMENTS',		'Nombre maximum de commentaires');
+ define('_EBLOG_UPDATE',			'Fichier de mise-à-jour');
+ define('_EBLOG_OFFSET',			'Décalage horaire');
+ define('_EBLOG_STIME',			'Heure du serveur:');
+ define('_EBLOG_BTIME',			'Heure du blog:');
+ define('_EBLOG_CHANGE',			'Changer les réglages');
+ define('_EBLOG_CHANGE_BTN',		'Valider');
+ define('_EBLOG_ADMIN',			'Gérer le blog');
+ define('_EBLOG_ADMIN_MSG',		'Les privilèges d\'administrateur vous seront attribués');
+ define('_EBLOG_CREATE_TITLE',		'Créer un nouveau blog');
+ define('_EBLOG_CREATE_TEXT',		'Remplissez le formulaire ci-dessous pour créer un nouveau blog. <br /><br /> <b>NB:</b> Seules les options nécessaires sont listées. Pour plus d\'options, changez les paramètres après la création.');
+ define('_EBLOG_CREATE',			'Créer le blog');
+ define('_EBLOG_CREATE_BTN',		'Créer');
+ define('_EBLOG_CAT_TITLE',		'Thèmes');
+ define('_EBLOG_CAT_NAME',		'Thèmes');
+ define('_EBLOG_CAT_DESC',		'Description du thème');
+ define('_EBLOG_CAT_CREATE',		'Créer un nouveau thème');
+ define('_EBLOG_CAT_UPDATE',		'Mettre à jour le thème');
+ define('_EBLOG_CAT_UPDATE_BTN',		'Mettre à jour le thème');
+ 
+ // templates
+ define('_TEMPLATE_TITLE',		'Modifier les modèles');
+ define('_TEMPLATE_AVAILABLE_TITLE',	'Modèles disponibles');
+ define('_TEMPLATE_NEW_TITLE',		'Nouveau modèle');
+ define('_TEMPLATE_NAME',		'Nom du modèle');
+ define('_TEMPLATE_DESC',		'Description du modèle');
+ define('_TEMPLATE_CREATE',		'Créer le modèle');
+ define('_TEMPLATE_CREATE_BTN',		'Créer le modèle');
+ define('_TEMPLATE_EDIT_TITLE',		'Modifier le modèle');
+ define('_TEMPLATE_BACK',		'Retour au sommaire des modèles');
+ define('_TEMPLATE_EDIT_MSG',		'Tous les éléments de modèle ne sont pas nécessaires. Laissez vides ceux dont vous n\'avez pas besoin');
+ define('_TEMPLATE_SETTINGS',		'Réglages de modèle');
+ define('_TEMPLATE_ITEMS',		'Billet');
+ define('_TEMPLATE_ITEMHEADER',		'En-tête du billet');
+ define('_TEMPLATE_ITEMBODY',		'Corps du billet');
+ define('_TEMPLATE_ITEMFOOTER',		'Pied du billet');
+ define('_TEMPLATE_MORELINK',		'Lien vers le développement');
+ define('_TEMPLATE_NEW',			'Indication de nouveau billet');
+ define('_TEMPLATE_COMMENTS_ANY',	'Commentaires (si nécessaire)');
+ define('_TEMPLATE_CHEADER',		'En-tête des commentaires');
+ define('_TEMPLATE_CBODY',		'Corps des commentaires');
+ define('_TEMPLATE_CFOOTER',		'Pied des commentaires');
+ define('_TEMPLATE_CONE',		'Un seul commentaire');
+ define('_TEMPLATE_CMANY',		'Deux (ou plus) commentaires');
+ define('_TEMPLATE_CMORE',		'Commentaires: en voir plus');
+ define('_TEMPLATE_CMEXTRA',		'Infos participant');
+ define('_TEMPLATE_COMMENTS_NONE',	'Commentaire (si aucun)');
+ define('_TEMPLATE_CNONE',		'Pas de commentaire');
+ define('_TEMPLATE_COMMENTS_TOOMUCH',	'Commentaires (s\'il y en a, mais trop pour les montrer tous)');
+ define('_TEMPLATE_CTOOMUCH',		'Trop de commentaires');
+ define('_TEMPLATE_ARCHIVELIST',		'Listes d\'archives');
+ define('_TEMPLATE_AHEADER',		'En-tête d\'archives');
+ define('_TEMPLATE_AITEM',		'Archive (billet)');
+ define('_TEMPLATE_AFOOTER',		'Pied de liste d\'archives');
+ define('_TEMPLATE_DATETIME',		'Date et heure');
+ define('_TEMPLATE_DHEADER',		'En-tête de date');
+ define('_TEMPLATE_DFOOTER',		'Pied de date');
+ define('_TEMPLATE_DFORMAT',		'Format de la date');
+ define('_TEMPLATE_TFORMAT',		'Format de l\'heure');
+ define('_TEMPLATE_LOCALE',		'Locale');
+ define('_TEMPLATE_IMAGE',		'Fenêtre popup');
+ define('_TEMPLATE_PCODE',		'Code de lien popup');
+ define('_TEMPLATE_ICODE',		'Code d\'image insérée');
+ define('_TEMPLATE_MCODE',		'Code lien objet media');
+ define('_TEMPLATE_SEARCH',		'Recherche');
+ define('_TEMPLATE_SHIGHLIGHT',		'Surbrillance');
+ define('_TEMPLATE_SNOTFOUND',		'Rien trouvé');
+ define('_TEMPLATE_UPDATE',		'Mettre à jour');
+ define('_TEMPLATE_UPDATE_BTN',		'Mettre à jour le modème');
+ define('_TEMPLATE_RESET_BTN',		'Rétablir les données');
+ define('_TEMPLATE_CATEGORYLIST',	'Listes de thèmes');
+ define('_TEMPLATE_CATHEADER',		'En-tête de liste de thèmes');
+ define('_TEMPLATE_CATITEM',		'Liste des thèmes (billet)');
+ define('_TEMPLATE_CATFOOTER',		'Pied de liste de thèmes');
+ 
+ // skins
+ define('_SKIN_EDIT_TITLE',		'Modification des habillages');
+ define('_SKIN_AVAILABLE_TITLE',		'Habillages disponibles');
+ define('_SKIN_NEW_TITLE',		'Nouvel habillage');
+ define('_SKIN_NAME',			'Nom');
+ define('_SKIN_DESC',			'Description');
+ define('_SKIN_TYPE',			'Type de contenu');
+ define('_SKIN_CREATE',			'Créer l\'habillage');
+ define('_SKIN_CREATE_BTN',		'Créer');
+ define('_SKIN_EDITONE_TITLE',		'Modifier l\'habillage');
+ define('_SKIN_BACK',			'Retour au menu habillage');
+ define('_SKIN_PARTS_TITLE',		'Elements d\'habillage');
+ define('_SKIN_PARTS_MSG',		'Tous les éléments ne sont pas requis. Laissez vides ceux dont vous n\'avez pas esoin. Choisissez ci-dessous l\'élément d\'habillage à modifier:');
+ define('_SKIN_PART_MAIN',		'Page index');
+ define('_SKIN_PART_ITEM',		'Page billet');
+ define('_SKIN_PART_ALIST',		'Liste des archives');
+ define('_SKIN_PART_ARCHIVE',		'Archive');
+ define('_SKIN_PART_SEARCH',		'Recherche');
+ define('_SKIN_PART_ERROR',		'Erreurs');
+ define('_SKIN_PART_MEMBER',		'Fiches des participants');
+ define('_SKIN_PART_POPUP',		'Fenêtres Popups');
+ define('_SKIN_GENSETTINGS_TITLE',	'Réglages d\'ensemble');
+ define('_SKIN_CHANGE',			'Modifier');
+ define('_SKIN_CHANGE_BTN',		'Modifier ces réglages');
+ define('_SKIN_UPDATE_BTN',		'Mettre à jour');
+ define('_SKIN_RESET_BTN',		'Rétablir');
+ define('_SKIN_EDITPART_TITLE',		'Modifier l\'habillage');
+ define('_SKIN_GOBACK',			'Retour');
+ define('_SKIN_ALLOWEDVARS',		'Variables autorisées (cliquer pour info):');
+ 
+ // global settings
+ define('_SETTINGS_TITLE',		'Réglages d\'ensemble');
+ define('_SETTINGS_SUB_GENERAL',		'Réglages d\'ensemble');
+ define('_SETTINGS_DEFBLOG',		'Blog par défaut');
+ define('_SETTINGS_ADMINMAIL',		'Email de l\'administrateur');
+ define('_SETTINGS_SITENAME',		'Nom du site');
+ define('_SETTINGS_SITEURL',		'URL du site (terminé par un /)');
+ define('_SETTINGS_ADMINURL',		'URL de la zone admin (terminé par un /)');
+ define('_SETTINGS_DIRS',		'Répertoires Nucleus');
+ define('_SETTINGS_MEDIADIR',		'Répertoire media');
+ define('_SETTINGS_SEECONFIGPHP',	'(voir config.php)');
+ define('_SETTINGS_MEDIAURL',		'URL du repertoire media (terminé par un /)');
+ define('_SETTINGS_ALLOWUPLOAD',		'Autoriser le téléchargement ascendant de fichier?');
+ define('_SETTINGS_ALLOWUPLOADTYPES',	'Indiquer les extensions de fichier autorisées');
+ define('_SETTINGS_CHANGELOGIN',		'Autoriser les participants à changer de login/mot de passe?');
+ define('_SETTINGS_COOKIES_TITLE',	'Paramètres des cookies');
+ define('_SETTINGS_COOKIELIFE',		'Durée de vie du cookie de connexion');
+ define('_SETTINGS_COOKIESESSION',	'Cookies de session');
+ define('_SETTINGS_COOKIEMONTH',		'Durée de vie d\'un mois');
+ define('_SETTINGS_COOKIEPATH',		'Chemin du cookie (utilisateur averti)');
+ define('_SETTINGS_COOKIEDOMAIN',	'Domaine du cookie (utilisateur averti)');
+ define('_SETTINGS_COOKIESECURE',	'Cookie de sécurité (utilisateur averti)');
+ define('_SETTINGS_LASTVISIT',		'Garder les cookies de la dernière visite');
+ define('_SETTINGS_ALLOWCREATE',		'Autoriser les visiteurs à créer un compte');
+ define('_SETTINGS_NEWLOGIN',		'Connexion autorisée pour les comptes créés par des utilisateurs');
+ define('_SETTINGS_NEWLOGIN2',		'(ne vaut que pour les comptes récemment créés)');
+ define('_SETTINGS_MEMBERMSGS',		'Autoriser les services de participant à participant');
+ define('_SETTINGS_LOCALE',		'Langue par défaut');
+ define('_SETTINGS_DISABLESITE',		'Désactiver le site');
+ define('_SETTINGS_DBLOGIN',		'mySQL Login &amp; Database');
+ define('_SETTINGS_UPDATE',		'Mettre à jour les réglages');
+ define('_SETTINGS_UPDATE_BTN',		'Mettre à jour');
+ define('_SETTINGS_DISABLEJS',		'Désactiver la barre d\'outils JavaScript');
+ define('_SETTINGS_MEDIA',		'Paramètres de téléchargement de médias');
+ define('_SETTINGS_MEDIAPREFIX',		'Préfixer le nom des fichiers avec la date');
+ define('_SETTINGS_MEMBERS',		'Réglages des participants');
+ 
+ // bans
+ define('_BAN_TITLE',			'Liste des exclusions pour');
+ define('_BAN_NONE',			'Pas d\'exclusion pour ce blog');
+ define('_BAN_NEW_TITLE',		'Ajouter une exclusion');
+ define('_BAN_NEW_TEXT',			'Ajouter une exclusion maintenant');
+ define('_BAN_REMOVE_TITLE',		'Retirer une exclusion');
+ define('_BAN_IPRANGE',			'Plage IP');
+ define('_BAN_BLOGS',			'Quels blogs?');
+ define('_BAN_DELETE_TITLE',		'Supprimer une exclusion');
+ define('_BAN_ALLBLOGS',			'Tous les blogs dont vous êtes administrateur.');
+ define('_BAN_REMOVED_TITLE',		'Exclusion supprimée');
+ define('_BAN_REMOVED_TEXT',		'L\'exclusion a été supprimée pour les blogs suivants:');
+ define('_BAN_ADD_TITLE',		'Définir des exclusions');
+ define('_BAN_IPRANGE_TEXT',		'Choisissez la plage IP que vous voulez bloquer. Moins il y aura de nombres, plus il y aura d\'IP bloquées.');
+ define('_BAN_BLOGS_TEXT',		'Vous pouvez choisir d\'exclure une IP pour un blog seulement ou pour tous ceux dont vous êtes admin. Choisissez ici.');
+ define('_BAN_REASON_TITLE',		'Motif');
+ define('_BAN_REASON_TEXT',		'Vous pouvez motiver l\'exclusion: La raison s\'affichera quand l\'IP concernée essaiera d\'ajouter un commentaire ou un vote. Longueur max. 256 caractères.');
+ define('_BAN_ADD_BTN',			'Exclure');
+ 
+ // LOGIN screen
+ define('_LOGIN_MESSAGE',		'Message');
+ define('_LOGIN_SHARED',			_LOGINFORM_SHARED);
+ define('_LOGIN_FORGOT',			'Mot de passe oublié?');
+ 
+ // membermanagement
+ define('_MEMBERS_TITLE',		'Gestion des participants');
+ define('_MEMBERS_CURRENT',		'Participants actuels');
+ define('_MEMBERS_NEW',			'Nouveau participant');
+ define('_MEMBERS_DISPLAY',		'Nom affiché');
+ define('_MEMBERS_DISPLAY_INFO',		'(C\'est le nom que vous utilisez pour vous connecter)');
+ define('_MEMBERS_REALNAME',		'Nom');
+ define('_MEMBERS_PWD',			'Mot de passe');
+ define('_MEMBERS_REPPWD',		'Répéter le mot de passe');
+ define('_MEMBERS_EMAIL',		'Adresse email');
+ define('_MEMBERS_EMAIL_EDIT',		'(Quand vous changez d\'adresse email, un nouveau mot de passe est envoyé à cette adresse)');
+ define('_MEMBERS_URL',			'Adresse du site (URL)');
+ define('_MEMBERS_SUPERADMIN',		'Privilèges de super admin');
+ define('_MEMBERS_CANLOGIN',		'Peut ouvrir une session comme admin');
+ define('_MEMBERS_NOTES',		'Notes');
+ define('_MEMBERS_NEW_BTN',		'Ajouter un participant');
+ define('_MEMBERS_EDIT',			'Modifier les participants');
+ define('_MEMBERS_EDIT_BTN',		'Modifier');
+ define('_MEMBERS_BACKTOOVERVIEW',	'Retour au sommaire des participants');
+ define('_MEMBERS_LOCALE',		'Langue');
+ define('_MEMBERS_USESITELANG',		'- utiliser les réglages du site -');
+ 
+ // List of blogs (TT = tooltip)
+ define('_BLOGLIST_TT_VISIT',		'Visiter le site');
+ define('_BLOGLIST_ADD',			'Ajouter un billet');
+ define('_BLOGLIST_TT_ADD',		'Ajouter un billet à ce blog');
+ define('_BLOGLIST_EDIT',		'Modifier/Supprimer les billets');
+ define('_BLOGLIST_TT_EDIT',		'');
+ define('_BLOGLIST_BMLET',		'Bookmarklet');
+ define('_BLOGLIST_TT_BMLET',		'');
+ define('_BLOGLIST_SETTINGS',		'Paramètres');
+ define('_BLOGLIST_TT_SETTINGS',		'Modifier réglages ou gérer équipe');
+ define('_BLOGLIST_BANS',		'Exclusions');
+ define('_BLOGLIST_TT_BANS',		'Consulter, ajouter ou supprimer les exclusions IP');
+ define('_BLOGLIST_DELETE',		'Tout effacer');
+ define('_BLOGLIST_TT_DELETE',		'Effacer ce blog');
+ 
+ // OVERVIEW screen
+ define('_OVERVIEW_YRBLOGS',		'Vos blogs');
+ define('_OVERVIEW_YRDRAFTS',		'Vos brouillons');
+ define('_OVERVIEW_YRSETTINGS',		'Vos réglages');
+ define('_OVERVIEW_GSETTINGS',		'Réglages d\'ensemble');
+ define('_OVERVIEW_NOBLOGS',		'Vous ne faites partie d\'aucune équipe');
+ define('_OVERVIEW_NODRAFTS',		'Pas  de brouillon');
+ define('_OVERVIEW_EDITSETTINGS',	'Modifier vos réglages...');
+ define('_OVERVIEW_BROWSEITEMS',		'Consulter vos billets...');
+ define('_OVERVIEW_BROWSECOMM',		'Consulter vos commentaires...');
+ define('_OVERVIEW_VIEWLOG',		'Consulter le journal des événements...');
+ define('_OVERVIEW_MEMBERS',		'Gérer les participants...');
+ define('_OVERVIEW_NEWLOG',		'Créer un nouveau blog...');
+ define('_OVERVIEW_SETTINGS',		'Modifier les réglages...');
+ 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');
+ define('_NOCOMMENTS_YOUR',		'Vous n\'avez pas écrit de commentaire');
+ 
+ // LISTS (general)
+ define('_LISTS_NOMORE',			'Rien de plus ou pas de résultat du tout');
+ define('_LISTS_PREV',			'Précédent');
+ define('_LISTS_NEXT',			'Suivant');
+ define('_LISTS_SEARCH',			'Rechercher');
+ define('_LISTS_CHANGE',			'Changer');
+ define('_LISTS_PERPAGE',		'billets/page');
+ define('_LISTS_ACTIONS',		'Actions');
+ define('_LISTS_DELETE',			'Supprimer');
+ define('_LISTS_EDIT',			'Modifier');
+ define('_LISTS_MOVE',			'Déplacer');
+ define('_LISTS_CLONE',			'Dupliquer');
+ define('_LISTS_TITLE',			'Titre');
+ define('_LISTS_BLOG',			'Blog');
+ define('_LISTS_NAME',			'Nom');
+ define('_LISTS_DESC',			'Description');
+ define('_LISTS_TIME',			'Heure');
+ define('_LISTS_COMMENTS',		'Commentaires');
+ define('_LISTS_TYPE',			'Type');
+ 
+ 
+ // member list
+ define('_LIST_MEMBER_NAME',		'Nom affiché');
+ 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ù?');
+ define('_EDITC_WHEN',			'Quand?');
+ define('_EDITC_TEXT',			'Contenu');
+ define('_EDITC_EDIT',			'Modifier le commentaire');
+ define('_EDITC_MEMBER',			'participant');
+ define('_EDITC_NONMEMBER',		'non participant');
+ 
+ // move item
+ define('_MOVE_TITLE',			'Déplacer dans quel blog?');
+ define('_MOVE_BTN',			'Déplacer le billet');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/fr_Latn_FR.UTF-8.php
index 9901f39,1219d6f..0ad5844
--- a/nucleus/locales/fr_Latn_FR.UTF-8.php
+++ b/nucleus/locales/fr_Latn_FR.UTF-8.php
@@@ -10,16 -10,97 +10,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'fra_fra');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -83,15 -164,15 +168,15 @@@ 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');
+ // plugin dependency
+ define('_ERROR_INSREQPLUGIN',		'L\'installation a échoué car le module nécessite ');
+ define('_ERROR_DELREQPLUGIN',		'L\'désinstallation a échoué car le module est requis par ');
  
  //define('_ADD_ADDLATER',								'Add Later');
- define('_ADD_ADDLATER',								'Add the dates specified');
+ define('_ADD_ADDLATER',			'Ajouter plus tard');
  
- define('_LOGIN_NAME',				'Name:');
- define('_LOGIN_PASSWORD',			'Password:');
+ define('_LOGIN_NAME',			'Nom');
+ define('_LOGIN_PASSWORD',		'Mot de passe');
  
  // changed from _BOOKMARLET_BMARKLFOLLOW
  define('_BOOKMARKLET_BMARKFOLLOW',					' (Works with nearly all browsers)');
@@@ -189,13 -270,7 +274,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -325,7 -400,7 +404,7 @@@ define('_ERROR_PLUGIN_LOAD',		'Plugin c
  // 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_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');
@@@ -354,10 -429,6 +433,6 @@@ define('_ARCHIVETYPE_MONTH',		'mois')
  // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
  define('_ERROR_BADTICKET',		'Ticket invalide ou expiré.');
  
- // plugin dependency
- define('_ERROR_INSREQPLUGIN',		'L\'installation a échoué car le module nécessite ');
- define('_ERROR_DELREQPLUGIN',		'L\'désinstallation a échoué car le module est requis par ');
- 
  // cookie prefix
  define('_SETTINGS_COOKIEPREFIX',	'Préfixe du cookie');
  
@@@ -764,7 -835,6 +839,6 @@@ define('_COMMENTFORM_YOUARE',		'Vous ê
  define('_COMMENTFORM_SUBMIT',		'Ajouter un commentaire');
  define('_COMMENTFORM_COMMENT',		'Votre commentaire');
  define('_COMMENTFORM_NAME',		'Nom');
- define('_COMMENTFORM_MAIL',		'Email/HTTP');
  define('_COMMENTFORM_REMEMBER',		'Retenir votre nom');
  
  // loginform
@@@ -791,7 -861,6 +865,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Inter
  define('_ADD_DRAFTNFUTURE',		'Brouillons &amp; billets à venir');
  define('_ADD_ADDITEM',			'Ajouter le billet');
  define('_ADD_ADDNOW',			'Ajouter maintenant');
- define('_ADD_ADDLATER',			'Ajouter plus tard');
  define('_ADD_PLACE_ON',			'Daté du');
  define('_ADD_ADDDRAFT',			'Ajouter aux brouillons');
  define('_ADD_NOPASTDATES',		'(Les dates et heures passées ne sont pas valides, la date d\'aujourd\'hui sera utilisée)');
@@@ -1135,8 -1204,6 +1208,6 @@@ define('_BAN_ADD_BTN',			'Exclure')
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',		'Message');
- define('_LOGIN_NAME',			'Nom');
- define('_LOGIN_PASSWORD',		'Mot de passe');
  define('_LOGIN_SHARED',			_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',			'Mot de passe oublié?');
  
@@@ -1268,3 -1335,19 +1339,19 @@@ define('_EDITC_NONMEMBER',		'non partic
  // move item
  define('_MOVE_TITLE',			'Déplacer dans quel blog?');
  define('_MOVE_BTN',			'Déplacer le billet');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/gl_Latn_ES.ISO-8859-1.php
index c2bb4dc,f60f99f..bf5512b
--- a/nucleus/locales/gl_Latn_ES.ISO-8859-1.php
+++ b/nucleus/locales/gl_Latn_ES.ISO-8859-1.php
@@@ -8,16 -8,97 +8,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'C');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -86,10 -167,10 +171,10 @@@ define('_ERROR_INSREQPLUGIN',		'Plugin 
  define('_ERROR_DELREQPLUGIN',		'Plugin deletion failed, required by %s');
  
  //define('_ADD_ADDLATER',								'Add Later');
- define('_ADD_ADDLATER',								'Add the dates specified');
+ define('_ADD_ADDLATER',				'Introducir logo');
  
- define('_LOGIN_NAME',				'Name:');
- define('_LOGIN_PASSWORD',			'Password:');
+ define('_LOGIN_NAME',				'nome');
+ define('_LOGIN_PASSWORD',			'contrasinal');
  
  // changed from _BOOKMARLET_BMARKLFOLLOW
  define('_BOOKMARKLET_BMARKFOLLOW',					' (Works with nearly all browsers)');
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -323,7 -398,7 +402,7 @@@ define('_ERROR_PLUGIN_LOAD',		'Plugin c
  // 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_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');
@@@ -449,7 -524,7 +528,7 @@@ define('_WARNING_EXTAUTH',			'Warning: 
  define('_MEMBERS_BYPASS',			'Use External Authentication');
  
  // 'always include in search' blog setting (yes/no) [in v2.5beta, the 'always' part wasn't clear]
- define('_EBLOG_SEARCH',				'<em>Always</em> include in search');
+ define('_EBLOG_SEARCH',				'Incluir en búsquedas');
  
  // END changed/added after v2.5beta
  
@@@ -470,9 -545,6 +549,12 @@@ define('_MEDIA_COLLECTION_LABEL',	'Cole
  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');
@@@ -760,7 -832,6 +842,6 @@@ define('_COMMENTFORM_YOUARE',		'Eres')
  define('_COMMENTFORM_SUBMIT',		'Introducir comentario');
  define('_COMMENTFORM_COMMENT',		'Comentario');
  define('_COMMENTFORM_NAME',			'Nome');
- define('_COMMENTFORM_MAIL',			'Email/HTTP');
  define('_COMMENTFORM_REMEMBER',		'Lembrar usuario');
  
  // loginform
@@@ -787,7 -858,6 +868,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Desha
  define('_ADD_DRAFTNFUTURE',			'Borrador e futuras entradas');
  define('_ADD_ADDITEM',				'Introducir entrada');
  define('_ADD_ADDNOW',				'Introducir agora');
- define('_ADD_ADDLATER',				'Introducir logo');
  define('_ADD_PLACE_ON',				'Colocar en');
  define('_ADD_ADDDRAFT',				'Introducir no borrador');
  define('_ADD_NOPASTDATES',			'(As datas e horas pasadas non son válidas, usarase o momento actual)');
@@@ -1131,8 -1201,6 +1211,6 @@@ define('_BAN_ADD_BTN',				'Introducir r
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Mensaxe');
- define('_LOGIN_NAME',				'nome');
- define('_LOGIN_PASSWORD',			'contrasinal');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'¿Esquencichela contrasinal?');
  
@@@ -1264,3 -1332,19 +1342,19 @@@ define('_EDITC_NONMEMBER',			'Non membr
  // move item
  define('_MOVE_TITLE',				'Mover a qué bitácora?');
  define('_MOVE_BTN',					'Mover entrada');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/gl_Latn_ES.UTF-8.php
index 8664750,a478e8f..df67a07
--- a/nucleus/locales/gl_Latn_ES.UTF-8.php
+++ b/nucleus/locales/gl_Latn_ES.UTF-8.php
@@@ -1,4 -1,4 +1,8 @@@
++<<<<<<< HEAD
 +<?
++=======
+ <?php
++>>>>>>> skinnable-master
  /**
   * Nucleus Translation File
   * Galician in Spain (Latin script)
@@@ -8,16 -8,97 +12,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'C');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -86,10 -167,10 +175,10 @@@ define('_ERROR_INSREQPLUGIN',		'Plugin 
  define('_ERROR_DELREQPLUGIN',		'Plugin deletion failed, required by %s');
  
  //define('_ADD_ADDLATER',								'Add Later');
- define('_ADD_ADDLATER',								'Add the dates specified');
+ define('_ADD_ADDLATER',				'Introducir logo');
  
- define('_LOGIN_NAME',				'Name:');
- define('_LOGIN_PASSWORD',			'Password:');
+ define('_LOGIN_NAME',				'nome');
+ define('_LOGIN_PASSWORD',			'contrasinal');
  
  // changed from _BOOKMARLET_BMARKLFOLLOW
  define('_BOOKMARKLET_BMARKFOLLOW',					' (Works with nearly all browsers)');
@@@ -187,13 -268,7 +276,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -323,7 -398,7 +406,7 @@@ define('_ERROR_PLUGIN_LOAD',		'Plugin c
  // 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_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');
@@@ -449,7 -524,7 +532,7 @@@ define('_WARNING_EXTAUTH',			'Warning: 
  define('_MEMBERS_BYPASS',			'Use External Authentication');
  
  // 'always include in search' blog setting (yes/no) [in v2.5beta, the 'always' part wasn't clear]
- define('_EBLOG_SEARCH',				'<em>Always</em> include in search');
+ define('_EBLOG_SEARCH',				'Incluir en búsquedas');
  
  // END changed/added after v2.5beta
  
@@@ -471,9 -546,6 +554,6 @@@ define('_ADD_ALIGNLEFT_TT',			'Alinear 
  define('_ADD_ALIGNRIGHT_TT',		'Alinear á derieta');
  define('_ADD_ALIGNCENTER_TT',		'Alinear ó centro');
  
- // searchable blog setting (yes/no)
- define('_EBLOG_SEARCH',				'Incluir en búsquedas');
- 
  // generic upload failure
  define('_ERROR_UPLOADFAILED',		'Erro ó subir');
  
@@@ -760,7 -832,6 +840,6 @@@ define('_COMMENTFORM_YOUARE',		'Eres')
  define('_COMMENTFORM_SUBMIT',		'Introducir comentario');
  define('_COMMENTFORM_COMMENT',		'Comentario');
  define('_COMMENTFORM_NAME',			'Nome');
- define('_COMMENTFORM_MAIL',			'Email/HTTP');
  define('_COMMENTFORM_REMEMBER',		'Lembrar usuario');
  
  // loginform
@@@ -787,7 -858,6 +866,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Desha
  define('_ADD_DRAFTNFUTURE',			'Borrador e futuras entradas');
  define('_ADD_ADDITEM',				'Introducir entrada');
  define('_ADD_ADDNOW',				'Introducir agora');
- define('_ADD_ADDLATER',				'Introducir logo');
  define('_ADD_PLACE_ON',				'Colocar en');
  define('_ADD_ADDDRAFT',				'Introducir no borrador');
  define('_ADD_NOPASTDATES',			'(As datas e horas pasadas non son válidas, usarase o momento actual)');
@@@ -1131,8 -1201,6 +1209,6 @@@ define('_BAN_ADD_BTN',				'Introducir r
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Mensaxe');
- define('_LOGIN_NAME',				'nome');
- define('_LOGIN_PASSWORD',			'contrasinal');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'¿Esquencichela contrasinal?');
  
@@@ -1264,3 -1332,19 +1340,19 @@@ define('_EDITC_NONMEMBER',			'Non membr
  // move item
  define('_MOVE_TITLE',				'Mover a qué bitácora?');
  define('_MOVE_BTN',					'Mover entrada');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/hr_Latn_HR.UTF-8.php
index 442448f,45c1e87..4752532
--- a/nucleus/locales/hr_Latn_HR.UTF-8.php
+++ b/nucleus/locales/hr_Latn_HR.UTF-8.php
@@@ -14,10 -14,91 +14,98 @@@
  /********************************************
   *        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');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script) (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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                *
   ********************************************/
@@@ -81,15 -162,15 +169,27 @@@ 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 ');
+ 
+ //define('_ADD_ADDLATER',								'Add Later');
+ 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)');
@@@ -186,13 -267,7 +286,17 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -350,10 -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');
  
@@@ -756,7 -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
@@@ -783,7 -853,6 +893,10 @@@ define('_ADD_DISABLE_COMMENTS'
  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.)');
@@@ -1128,8 -1197,6 +1241,11 @@@ define('_BAN_ADD_BTN',					'Postavi blo
  
  // 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?');
  
@@@ -1260,3 -1327,19 +1376,22 @@@ define('_EDITC_NONMEMBER',				'posjetit
  // 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');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/hr_Latn_HR.WINDOWS-1250.php
index 2f6ebee,a10d3ef..2025736
--- a/nucleus/locales/hr_Latn_HR.WINDOWS-1250.php
+++ b/nucleus/locales/hr_Latn_HR.WINDOWS-1250.php
@@@ -14,10 -14,91 +14,98 @@@
  /********************************************
   *        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');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script) (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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                *
   ********************************************/
@@@ -81,15 -162,15 +169,27 @@@ 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 ');
+ 
+ //define('_ADD_ADDLATER',								'Add Later');
+ 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)');
@@@ -186,13 -267,7 +286,17 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -350,10 -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');
  
@@@ -756,7 -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
@@@ -783,7 -853,6 +893,10 @@@ define('_ADD_DISABLE_COMMENTS'
  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.)');
@@@ -1128,8 -1197,6 +1241,11 @@@ define('_BAN_ADD_BTN',					'Postavi blo
  
  // 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?');
  
@@@ -1260,3 -1327,19 +1376,22 @@@ define('_EDITC_NONMEMBER',				'posjetit
  // 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');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/hu_Latn_HU.ISO-8859-2.php
index 0cb16a6,46ff41c..10d7242
--- a/nucleus/locales/hu_Latn_HU.ISO-8859-2.php
+++ b/nucleus/locales/hu_Latn_HU.ISO-8859-2.php
@@@ -8,16 -8,97 +8,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'hun_hun');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -351,10 -426,6 +430,13 @@@ define('_ARCHIVETYPE_MONTH',		'hónap')
  
  // 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');
@@@ -762,7 -833,6 +844,6 @@@ define('_COMMENTFORM_YOUARE',		'Te vagy
  define('_COMMENTFORM_SUBMIT',		'Megjegyzés írása');
  define('_COMMENTFORM_COMMENT',		'Üzeneted');
  define('_COMMENTFORM_NAME',			'Neved');
- define('_COMMENTFORM_MAIL',			'E-mail/HTTP');
  define('_COMMENTFORM_REMEMBER',		'Megjegyez');
  
  // loginform
@@@ -789,7 -859,6 +870,10 @@@ define('_ADD_DISABLE_COMMENTS',		'Megje
  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)');
@@@ -1133,8 -1202,6 +1217,11 @@@ define('_BAN_ADD_BTN',				'Ban hozzáadá
  
  // 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?');
  
@@@ -1266,3 -1333,19 +1353,22 @@@ 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');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/hu_Latn_HU.UTF-8.php
index 10952d5,b784f3d..eda94cf
--- a/nucleus/locales/hu_Latn_HU.UTF-8.php
+++ b/nucleus/locales/hu_Latn_HU.UTF-8.php
@@@ -8,16 -8,97 +8,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'hun_hun');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -352,10 -427,6 +431,6 @@@ define('_ARCHIVETYPE_MONTH',		'hónap')
  // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
  define('_ERROR_BADTICKET',			'Hamis vagy lejárt címke.');
  
- // plugin dependency
- define('_ERROR_INSREQPLUGIN',		'Plugin installáció sikertelen, szükséges: ');
- define('_ERROR_DELREQPLUGIN',		'Plugin törlése sikertelen, szükséges: ');
- 
  // cookie prefix
  define('_SETTINGS_COOKIEPREFIX',	'Süti előtag');
  
@@@ -762,7 -833,6 +837,6 @@@ define('_COMMENTFORM_YOUARE',		'Te vagy
  define('_COMMENTFORM_SUBMIT',		'Megjegyzés írása');
  define('_COMMENTFORM_COMMENT',		'Üzeneted');
  define('_COMMENTFORM_NAME',			'Neved');
- define('_COMMENTFORM_MAIL',			'E-mail/HTTP');
  define('_COMMENTFORM_REMEMBER',		'Megjegyez');
  
  // loginform
@@@ -789,7 -859,6 +863,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Megje
  define('_ADD_DRAFTNFUTURE',			'Piszkozat &amp; Jövőbeni elemek');
  define('_ADD_ADDITEM',				'Elem hozzáadása');
  define('_ADD_ADDNOW',				'Hozzáadás azonnal');
- define('_ADD_ADDLATER',				'Hozzáadás később');
  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)');
@@@ -1133,8 -1202,6 +1206,6 @@@ define('_BAN_ADD_BTN',				'Ban hozzáad
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Üzenet');
- define('_LOGIN_NAME',				'Név');
- define('_LOGIN_PASSWORD',			'Jelszó');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Elfelejetted a jelszavad?');
  
@@@ -1266,3 -1333,19 +1337,19 @@@ define('_EDITC_NONMEMBER',			'Nem tag')
  // move item
  define('_MOVE_TITLE',				'Melyik blogba mozgassam?');
  define('_MOVE_BTN',					'Elem áthelyezése');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/id_Latn_ID.ISO-8859-1.php
index 7e814e3,5882e1e..4e751bc
--- a/nucleus/locales/id_Latn_ID.ISO-8859-1.php
+++ b/nucleus/locales/id_Latn_ID.ISO-8859-1.php
@@@ -14,10 -14,91 +14,98 @@@
  /********************************************
   *        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');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script) (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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                *
   ********************************************/
@@@ -186,13 -267,7 +274,17 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -352,10 -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');
  
@@@ -758,7 -829,6 +853,10 @@@ define('_COMMENTFORM_YOUARE',		'Anda ad
  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
@@@ -785,7 -855,6 +883,10 @@@ define('_ADD_DISABLE_COMMENTS',		'Tida
  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)');
@@@ -1129,8 -1198,6 +1230,11 @@@ define('_BAN_ADD_BTN',				'Tambah dafta
  
  // 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?');
  
@@@ -1262,3 -1329,19 +1366,22 @@@ define('_EDITC_NONMEMBER',			'bukan ang
  // move item
  define('_MOVE_TITLE',				'Pindahkan ke blog mana?');
  define('_MOVE_BTN',					'Pindahkan Isi');
++<<<<<<< HEAD
++=======
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/id_Latn_ID.UTF-8.php
index 6bd4688,be71884..e85be38
--- a/nucleus/locales/id_Latn_ID.UTF-8.php
+++ b/nucleus/locales/id_Latn_ID.UTF-8.php
@@@ -14,10 -14,91 +14,98 @@@
  /********************************************
   *        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');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script) (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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                *
   ********************************************/
@@@ -186,13 -267,7 +274,17 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -352,10 -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');
  
@@@ -758,7 -829,6 +853,10 @@@ define('_COMMENTFORM_YOUARE',		'Anda ad
  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
@@@ -785,7 -855,6 +883,10 @@@ define('_ADD_DISABLE_COMMENTS',		'Tida
  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)');
@@@ -1129,8 -1198,6 +1230,11 @@@ define('_BAN_ADD_BTN',				'Tambah dafta
  
  // 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?');
  
@@@ -1262,3 -1329,19 +1366,22 @@@ define('_EDITC_NONMEMBER',			'bukan ang
  // move item
  define('_MOVE_TITLE',				'Pindahkan ke blog mana?');
  define('_MOVE_BTN',					'Pindahkan Isi');
++<<<<<<< HEAD
++=======
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/it_Latn_IT.ISO-8859-1.php
index ce85742,ea5f92e..19a370e
--- a/nucleus/locales/it_Latn_IT.ISO-8859-1.php
+++ b/nucleus/locales/it_Latn_IT.ISO-8859-1.php
@@@ -10,16 -10,97 +10,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'ita_ita');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -189,13 -270,7 +274,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -354,10 -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');
  
@@@ -764,7 -835,6 +846,6 @@@ define('_COMMENTFORM_YOUARE',		'Sei col
  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');
  
  // loginform
@@@ -791,7 -861,6 +872,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Disab
  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)');
@@@ -1135,8 -1204,6 +1215,6 @@@ define('_BAN_ADD_BTN',				'Aggiungi ban
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Messaggio');
- define('_LOGIN_NAME',				'Nome');
- define('_LOGIN_PASSWORD',			'Password');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Hai dimenticato la password?');
  
@@@ -1268,3 -1335,19 +1346,19 @@@ define('_EDITC_NONMEMBER',			'utente no
  // move item
  define('_MOVE_TITLE',				'Sposta in quale blog?');
  define('_MOVE_BTN',					'Sposta articolo');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/it_Latn_IT.UTF-8.php
index efb2c40,4401962..7b10313
--- a/nucleus/locales/it_Latn_IT.UTF-8.php
+++ b/nucleus/locales/it_Latn_IT.UTF-8.php
@@@ -10,16 -10,97 +10,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'ita_ita');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -189,13 -270,7 +274,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -354,10 -429,6 +433,6 @@@ 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.');
  
- // plugin dependency
- define('_ERROR_INSREQPLUGIN',		'Installazione del plugin fallita, richiede ');
- define('_ERROR_DELREQPLUGIN',		'Cancellazione del plugin fallita, è richiesto da ');
- 
  // cookie prefix
  define('_SETTINGS_COOKIEPREFIX',	'Prefisso dei Cookie');
  
@@@ -764,7 -835,6 +839,6 @@@ define('_COMMENTFORM_YOUARE',		'Sei col
  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');
  
  // loginform
@@@ -791,7 -861,6 +865,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Disab
  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)');
@@@ -1135,8 -1204,6 +1208,6 @@@ define('_BAN_ADD_BTN',				'Aggiungi ban
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Messaggio');
- define('_LOGIN_NAME',				'Nome');
- define('_LOGIN_PASSWORD',			'Password');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Hai dimenticato la password?');
  
@@@ -1268,3 -1335,19 +1339,19 @@@ define('_EDITC_NONMEMBER',			'utente no
  // move item
  define('_MOVE_TITLE',				'Sposta in quale blog?');
  define('_MOVE_BTN',					'Sposta articolo');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/ja_Jpan_JP.EUC-JP.php
index 87da4e1,1134954..2b0b807
--- a/nucleus/locales/ja_Jpan_JP.EUC-JP.php
+++ b/nucleus/locales/ja_Jpan_JP.EUC-JP.php
@@@ -10,16 -10,97 +10,105 @@@
   * 
   * @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
   ********************************************/
- 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', 'Ãø¼Ô');
- define('_OVERVIEW_OTHER_DRAFTS', '¤½¤Î¾¤Î¥É¥é¥Õ¥È');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'jpn_jpn');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'ǯ');
+ define('_LABEL_MONTH_UNIT',		'·î');
+ define('_LABEL_DAY_UNIT',		'Æü');
+ define('_LABEL_HOUR_UNIT',		'»þ');
+ define('_LABEL_MINUTE_UNIT',	'ʬ');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'¥×¥é¥°¥¤¥ó¤òºï½ü¤¹¤ë¤È¤­¤Ë´ÉÍý¥¨¥ê¥¢ÍÑ¥¹¥­¥ó¤Î¥Ç¡¼¥¿¤âºï½ü¤·¤Þ¤¹¤«¡©');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'´ÉÍýÎΰè¤Î¥Ç¥Õ¥©¥ë¥È¤Î¥¹¥­¥ó');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'¤¢¤Ê¤¿¤¬»È¤¦´ÉÍýÎΰè¤Î¥¹¥­¥ó');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'´ÉÍý¥¨¥ê¥¢ÍÑÀßÄê');
+ define('_SKINABLEADMIN_PAGE_STR',					'¥Ú¡¼¥¸');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'¥¢¥¤¥Æ¥à¤Î¥«¥Æ¥´¥ê°ÜÆ°/¥«¥Æ¥´¥ê¤Î¥Ö¥í¥°°ÜÆ°');
+ define('_SKINABLEADMIN_BATCH',						'¥Ð¥Ã¥Á½èÍý');
+ define('_SKINABLEADMIN_PAGEHEAD',					'´ÉÍý¥Ú¡¼¥¸¤Î¥Ø¥Ã¥À');
+ define('_SKINABLEADMIN_PAGEFOOT',					'´ÉÍý¥Ú¡¼¥¸¤Î¥Õ¥Ã¥¿');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'¥Æ¥ó¥×¥ì¡¼¥È°ìÍ÷');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[¥µ¥¤¥È¤Î³Îǧ]¥ê¥ó¥¯');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'Á´ÈÌŪ¤Ë»ÈÍÑ');
+ define('_SKINABLEADMIN_HEAD_STR',					' ¤Î¥Ø¥Ã¥À');
+ define('_SKINABLEADMIN_BODY_STR',					' ¤ÎËÜÂÎ');
+ define('_SKINABLEADMIN_FOOT_STR',					' ¤Î¥Õ¥Ã¥¿');
+ define('_SKINABLEADMIN_TEXT_STR',					' ¤ÎËÜÂÎ');
+ define('_SKINABLEADMIN_TITLE_STR',					' ¤Î¥¿¥¤¥È¥ë');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' ´ÉÍý¼ÔÀßÄêÍÑ');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' Ä̾ï»ÅÍÍ');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' ¤Ç»ÈÍѤ¹¤ë¥¢¥¤¥³¥ó¤ÎURL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' ¤Ç»ÈÍѤ¹¤ë¥Ø¥ë¥×¥Õ¥¡¥¤¥ë¤ÎURL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' ¥¹¥­¥óÊÑ¿ô');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'´ÉÍý¥¨¥ê¥¢¤Ç»ÈÍѤ¹¤ë¥»¥ì¥¯¥È¥Ü¥Ã¥¯¥¹');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'°ìÍ÷ɽ¼¨Íѥơ¼¥Ö¥ë');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'¥¯¥¤¥Ã¥¯¥á¥Ë¥å¡¼¤Ëɽ¼¨¤¹¤ë¥×¥é¥°¥¤¥ó¤Î´ÉÍý¥Ú¡¼¥¸¤Ø¤Î¥ê¥ó¥¯');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'¥ª¥×¥·¥ç¥ó¥¿¥¤¥×%s¤Î¥Æ¥ó¥×¥ì¡¼¥È');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'¥ª¥×¥·¥ç¥ó¡¦¥á¥¿¥Ç¡¼¥¿%s¤Î¥Æ¥ó¥×¥ì¡¼¥È');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			'»ÈÍѤ¹¤ë´ÉÍýÎΰè¤Î¥¹¥­¥ó');
+ 
+ define('_LOCALE_BG_CYRL_BG',	'¥Ö¥ë¥¬¥ê¥¢¸ì¡Ê¥Ö¥ë¥¬¥ê¥¢¡Ë');
+ define('_LOCALE_CA_LATN_ES',	'¥«¥¿¥ë¡¼¥Ë¥ã¸ì¡Ê¥¹¥Ú¥¤¥ó¡Ë');
+ define('_LOCALE_CS_LATN_CZ',	'¥Á¥§¥³¸ì¡Ê¥Á¥§¥³¡Ë');
+ define('_LOCALE_DE_LATN_DE',	'¥É¥¤¥Ä¸ì¡Ê¥É¥¤¥Ä¡Ë');
+ define('_LOCALE_EL_GREK_GR',	'¥®¥ê¥·¥ã¸ì¡Ê¥®¥ê¥·¥ã¡¢¥®¥ê¥·¥ãʸ»ú¡Ë');
+ define('_LOCALE_EN_LATN_US',	'±Ñ¸ì¡Ê¥¢¥á¥ê¥«¡Ë');
+ define('_LOCALE_ES_LATN_ES',	'¥¹¥Ú¥¤¥ó¸ì¡Ê¥¹¥Ú¥¤¥ó¡Ë');
+ define('_LOCALE_FA_ARAB_IR',	'¥Ú¥ë¥·¥ã¸ì¡Ê¥¤¥é¥ó¡Ë');
+ define('_LOCALE_FI_LATN_FI',	'¥Õ¥£¥ó¥é¥ó¥É¸ì¡Ê¥Õ¥£¥ó¥é¥ó¥É¡Ë');
+ define('_LOCALE_FR_LATN_FR',	'¥Õ¥é¥ó¥¹¸ì¡Ê¥Õ¥é¥ó¥¹¡Ë');
+ define('_LOCALE_GL_LATN_ES',	'¥¬¥ê¥·¥¢¸ì¡Ê¥¹¥Ú¥¤¥ó¡Ë');
+ define('_LOCALE_HR_LATN_HR',	'¥¯¥í¥¢¥Á¥¢¸ì¡Ê¥¯¥í¥¢¥Á¥¢¡Ë');
+ define('_LOCALE_HU_LATN_HU',	'¥Ï¥ó¥¬¥ê¡¼¸ì¡Ê¥Ï¥ó¥¬¥ê¡¼¡Ë');
+ define('_LOCALE_ID_LATN_ID',	'¥¤¥ó¥É¥Í¥·¥¢¸ì¡Ê¥¤¥ó¥É¥Í¥·¥¢¡¢¥é¥Æ¥óʸ»ú¡Ë');
+ define('_LOCALE_IT_LATN_IT',	'¥¤¥¿¥ê¥¢¸ì¡Ê¥¤¥¿¥ê¥¢¡Ë');
+ define('_LOCALE_JA_JPAN_JP',	'ÆüËܸì¡ÊÆüËÜ¡Ë');
+ define('_LOCALE_KO_KORE_KR',	'´Ú¹ñ¸ì¡Ê´Ú¹ñ¡Ë');
+ define('_LOCALE_KU_ARAB_TR',	'¥¯¥ë¥É¸ì¡Ê¥È¥ë¥³¡¢¥¢¥é¥Ó¥¢Ê¸»ú¡Ë');
+ define('_LOCALE_LV_LATN_LV',	'¥é¥È¥Ó¥¢¸ì¡Ê¥é¥È¥Ó¥¢¡Ë');
+ define('_LOCALE_NL_LATN_NL',	'¥ª¥é¥ó¥À¸ì¡Ê¥ª¥é¥ó¥À¡Ë');
+ define('_LOCALE_PL_LATN_PL',	'¥Ý¡¼¥é¥ó¥É¸ì¡Ê¥Ý¡¼¥é¥ó¥É¡Ë');
+ define('_LOCALE_PT_LATN_BR',	'¥Ý¥ë¥È¥¬¥ë¸ì¡Ê¥Ö¥é¥¸¥ë¡Ë');
+ define('_LOCALE_RO_LATN_RO',	'¥ë¡¼¥Þ¥Ë¥¢¸ì¡Ê¥ë¡¼¥Þ¥Ë¥¢¡Ë');
+ define('_LOCALE_RU_CYRL_RU',	'¥í¥·¥¢¸ì¡Ê¥í¥·¥¢¡Ë');
+ define('_LOCALE_SK_LATN_SK',	'¥¹¥í¥Ð¥­¥¢¸ì¡Ê¥¹¥í¥Ð¥­¥¢¡Ë');
+ define('_LOCALE_SR_CYRL_RS',	'¥»¥ë¥Ó¥¢¸ì¡Ê¥»¥ë¥Ó¥¢¡Ë');
+ define('_LOCALE_UR_ARAB_PK',	'¥¦¥ë¥É¥¥¡¼¸ì¡Ê¥Ñ¥­¥¹¥¿¥ó¡Ë');
+ define('_LOCALE_VI_LATN_VN',	'¥Ù¥È¥Ê¥à¸ì¡Ê¥Ù¥È¥Ê¥à¡¢¥é¥Æ¥óʸ»ú¡Ë');
+ define('_LOCALE_ZH_HANS_CN',	'Ãæ¹ñ¸ì¡ÊÃæ¹ñ¡¢´ÊÂλú¡Ë');
+ define('_LOCALE_ZH_HANT_TW',	'Ãæ¹ñ¸ì¡ÊÂæÏÑ¡¢ÈËÂλú¡Ë');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'¥Ñ¥¹¥ï¡¼¥É¤ò˺¤ì¤Þ¤·¤¿¤«¡©');
+ define('_FORGOTPASSWORD_MSG',				'°Ê²¼¤Ë¥æ¡¼¥¶¡¼Ì¾¤È¥á¡¼¥ë¥¢¥É¥ì¥¹¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£¿·¤·¤¤¥Ñ¥¹¥ï¡¼¥É¤òÀßÄꤹ¤ë¥Ú¡¼¥¸¤Ø¤Î¥ê¥ó¥¯¤ÎÆþ¤Ã¤¿¥á¡¼¥ë¤¬Á÷¿®¤µ¤ì¤Þ¤¹¡£');
+ define('_FORGOTPASSWORD_SUBMIT',			'ǧ¾ÚÍÑ¥ê¥ó¥¯¤ÎÁ÷¿®');
+ define('_FORGOTPASSWORD_CONTACT',			'¤â¤·¥æ¡¼¥¶¡¼Ì¾¤ò¤ªËº¤ì¤Ê¤é¡¢¤¢¤Ê¤¿¤ÎNucleus¥µ¥¤¥È´ÉÍý¼Ô¤ËÏ¢Íí¤·¤Æ¤¯¤À¤µ¤¤¡£');
+ 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',						'Ãø¼Ô');
+ define('_OVERVIEW_OTHER_DRAFTS',			'¤½¤Î¾¤Î¥É¥é¥Õ¥È');
+ define('_ERROR_BADADMINSKINNAME',			'´ÉÍý²èÌÌÍÑ¥¹¥­¥ó̾¤ÏÀèƬ¤¬¡Öadmin/¡×¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£');
+ define('_ERROR_BADADMINTEMPLATENAME',		'´ÉÍý²èÌÌÍÑ¥¹¥­¥ó¤Î¥Æ¥ó¥×¥ì¡¼¥È̾¤ÏÀèƬ¤¬¡Öadmin/¡×¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£');
+ define('_SETTINGS_ADMINSKIN',				'¥Ç¥Õ¥©¥ë¥È¤Î´ÉÍý²èÌÌÍÑ¥¹¥­¥ó');
+ define('_SETTINGS_BKMKLTSKIN',				'¥Ç¥Õ¥©¥ë¥È¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯¥ì¥Ã¥ÈÍÑ¥¹¥­¥ó');
+ define('_MEMBERS_BKMKLTSKIN',				'»ÈÍѤ¹¤ë¥Ö¥Ã¥¯¥Þ¡¼¥¯¥ì¥Ã¥ÈÍѤΥ¹¥­¥ó');
+ define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',		'»ÈÍÑÃæ¤Î¥Ð¡¼¥¸¥ç¥ó¤ÏºÇ¿·¤Ç¤¹');
+ 
  /********************************************
   *        Start New for 3.64                *
   ********************************************/
@@@ -188,13 -269,7 +277,7 @@@ define('_PLUGIN_OPTIONS_TITLE',						'%
  // Plugin file loda error
  define('_PLUGINFILE_COULDNT_BELOADED',				'¥¨¥é¡¼: ¥×¥é¥°¥¤¥ó¥Õ¥¡¥¤¥ë <strong>%s.php</strong> ¤òÆɤ߹þ¤á¤Þ¤»¤ó¤Ç¤·¤¿¡£¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Ê¤¤¡¢¤â¤¯¤Ï»ÈÍÑÃæ¤Î Nucleus ¾å¤ÇÆ°ºî¤µ¤»¤ë¤¿¤á¤ËɬÍפʵ¡Ç½¤¬¥×¥é¥°¥¤¥ó¤Ç¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£(<a href="?action=actionlog">´ÉÍýÁàºîÍúÎò</a>¤Ë¾ÜºÙ¤¬¤¢¤ê¤Þ¤¹¡£)');
  
- //ITEM add/edit template (for japanese only)
  define('_ITEM_ADDEDITTEMPLATE_FORMAT',				'¥Õ¥©¡¼¥Þ¥Ã¥È¡§');
- define('_ITEM_ADDEDITTEMPLATE_YEAR',				'ǯ');
- define('_ITEM_ADDEDITTEMPLATE_MONTH',				'·î');
- define('_ITEM_ADDEDITTEMPLATE_DAY',					'Æü');
- define('_ITEM_ADDEDITTEMPLATE_HOUR',				'»þ');
- define('_ITEM_ADDEDITTEMPLATE_MINUTE',				'ʬ');
  
  // Errors
  define('_ERRORS_INSTALLSQL',						'Ž¢install.sqlŽ£¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Æ¤¯¤À¤µ¤¤');
@@@ -1273,3 -1348,19 +1356,19 @@@ define('_EDITC_NONMEMBER',							'Èó¥á¥
  // move item
  define('_MOVE_TITLE',								'¤É¤ÎBlog¤Ë°ÜÆ°¤·¤Þ¤¹¤«¡©');
  define('_MOVE_BTN',									'¥¢¥¤¥Æ¥à¤ò°ÜÆ°¤¹¤ë');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'¥¢¥¤¥Æ¥à/¥³¥á¥ó¥È¤Î¥ê¥¹¥È¤Î¥Ê¥Ó¥²¡¼¥·¥ç¥ó');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] ¥á¥ó¥Ð¡¼¤¬¥Ö¥í¥°´ÉÍý¸¢¸Â¤ò»ý¤Ã¤Æ¤¤¤ë»þ¤ÎÄɲùàÌÜ');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] ¥á¥ó¥Ð¡¼¤¬ºÇ¹â´ÉÍý¸¢¸Â¤ò»ý¤Ã¤Æ¤¤¤ë»þ¤ÎÄɲùàÌÜ');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . '¥×¥é¥°¥¤¥ó¤ÎÆþ¼ê¥ê¥ó¥¯');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'ÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¥¤¥Ù¥ó¥È');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . '¥¤¥Ù¥ó¥È¾ðÊó¤Î¥¢¥Ã¥×¥Ç¡¼¥È¤¬É¬Íפʻþ¤Î¥¢¥é¡¼¥È');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . '°Í¸¤¹¤ë¥×¥é¥°¥¤¥ó');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . '°Í¸¤µ¤ì¤Æ¤¤¤ë¥×¥é¥°¥¤¥ó');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . '¥×¥é¥°¥¤¥ó¤¬Æɤ߹þ¤á¤Ê¤«¤Ã¤¿»þ¤Î¥¢¥é¡¼¥È');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . '¡Ö¥¢¥¯¥·¥ç¥ó¡×Îó¤Î¥Æ¥ó¥×¥ì¡¼¥È');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . '¥×¥é¥°¥¤¥ó¤Î´ÉÍýÎΰè¤Ø¤Î¥ê¥ó¥¯');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . '¥×¥é¥°¥¤¥ó¤Î¥Ø¥ë¥×¤Ø¤Î¥ê¥ó¥¯');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . '¥×¥é¥°¥¤¥ó¤Î¥ª¥×¥·¥ç¥óÀßÄê²èÌ̤ؤΥê¥ó¥¯');
diff --combined nucleus/locales/ja_Jpan_JP.UTF-8.php
index 9868eaa,64f72fa..a6af85b
--- a/nucleus/locales/ja_Jpan_JP.UTF-8.php
+++ b/nucleus/locales/ja_Jpan_JP.UTF-8.php
@@@ -10,16 -10,97 +10,105 @@@
   * 
   * @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
   ********************************************/
- 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', '著者');
- define('_OVERVIEW_OTHER_DRAFTS', 'その他のドラフト');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'jpn_jpn');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'å¹´');
+ define('_LABEL_MONTH_UNIT',		'月');
+ define('_LABEL_DAY_UNIT',		'日');
+ define('_LABEL_HOUR_UNIT',		'時');
+ define('_LABEL_MINUTE_UNIT',	'分');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'プラグインを削除するときに管理エリア用スキンのデータも削除しますか？');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'管理領域のデフォルトのスキン');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'あなたが使う管理領域のスキン');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'管理エリア用設定');
+ define('_SKINABLEADMIN_PAGE_STR',					'ページ');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'アイテムのカテゴリ移動/カテゴリのブログ移動');
+ define('_SKINABLEADMIN_BATCH',						'バッチ処理');
+ define('_SKINABLEADMIN_PAGEHEAD',					'管理ページのヘッダ');
+ define('_SKINABLEADMIN_PAGEFOOT',					'管理ページのフッタ');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'テンプレート一覧');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[サイトの確認]リンク');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'全般的に使用');
+ define('_SKINABLEADMIN_HEAD_STR',					' のヘッダ');
+ define('_SKINABLEADMIN_BODY_STR',					' の本体');
+ define('_SKINABLEADMIN_FOOT_STR',					' のフッタ');
+ define('_SKINABLEADMIN_TEXT_STR',					' の本体');
+ define('_SKINABLEADMIN_TITLE_STR',					' のタイトル');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' 管理者設定用');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' 通常仕様');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' で使用するアイコンのURL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' で使用するヘルプファイルのURL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' スキン変数');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'管理エリアで使用するセレクトボックス');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'一覧表示用テーブル');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'クイックメニューに表示するプラグインの管理ページへのリンク');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'オプションタイプ%sのテンプレート');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'オプション・メタデータ%sのテンプレート');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			'使用する管理領域のスキン');
+ 
+ define('_LOCALE_BG_CYRL_BG',	'ブルガリア語（ブルガリア）');
+ define('_LOCALE_CA_LATN_ES',	'カタルーニャ語（スペイン）');
+ define('_LOCALE_CS_LATN_CZ',	'チェコ語（チェコ）');
+ define('_LOCALE_DE_LATN_DE',	'ドイツ語（ドイツ）');
+ define('_LOCALE_EL_GREK_GR',	'ギリシャ語（ギリシャ、ギリシャ文字）');
+ define('_LOCALE_EN_LATN_US',	'英語（アメリカ）');
+ define('_LOCALE_ES_LATN_ES',	'スペイン語（スペイン）');
+ define('_LOCALE_FA_ARAB_IR',	'ペルシャ語（イラン）');
+ define('_LOCALE_FI_LATN_FI',	'フィンランド語（フィンランド）');
+ define('_LOCALE_FR_LATN_FR',	'フランス語（フランス）');
+ define('_LOCALE_GL_LATN_ES',	'ガリシア語（スペイン）');
+ define('_LOCALE_HR_LATN_HR',	'クロアチア語（クロアチア）');
+ define('_LOCALE_HU_LATN_HU',	'ハンガリー語（ハンガリー）');
+ define('_LOCALE_ID_LATN_ID',	'インドネシア語（インドネシア、ラテン文字）');
+ define('_LOCALE_IT_LATN_IT',	'イタリア語（イタリア）');
+ define('_LOCALE_JA_JPAN_JP',	'日本語（日本）');
+ define('_LOCALE_KO_KORE_KR',	'韓国語（韓国）');
+ define('_LOCALE_KU_ARAB_TR',	'クルド語（トルコ、アラビア文字）');
+ define('_LOCALE_LV_LATN_LV',	'ラトビア語（ラトビア）');
+ define('_LOCALE_NL_LATN_NL',	'オランダ語（オランダ）');
+ define('_LOCALE_PL_LATN_PL',	'ポーランド語（ポーランド）');
+ define('_LOCALE_PT_LATN_BR',	'ポルトガル語（ブラジル）');
+ define('_LOCALE_RO_LATN_RO',	'ルーマニア語（ルーマニア）');
+ define('_LOCALE_RU_CYRL_RU',	'ロシア語（ロシア）');
+ define('_LOCALE_SK_LATN_SK',	'スロバキア語（スロバキア）');
+ define('_LOCALE_SR_CYRL_RS',	'セルビア語（セルビア）');
+ define('_LOCALE_UR_ARAB_PK',	'ウルドゥー語（パキスタン）');
+ define('_LOCALE_VI_LATN_VN',	'ベトナム語（ベトナム、ラテン文字）');
+ define('_LOCALE_ZH_HANS_CN',	'中国語（中国、簡体字）');
+ define('_LOCALE_ZH_HANT_TW',	'中国語（台湾、繁体字）');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'パスワードを忘れましたか？');
+ define('_FORGOTPASSWORD_MSG',				'以下にユーザー名とメールアドレスを入力してください。新しいパスワードを設定するページへのリンクの入ったメールが送信されます。');
+ define('_FORGOTPASSWORD_SUBMIT',			'認証用リンクの送信');
+ define('_FORGOTPASSWORD_CONTACT',			'もしユーザー名をお忘れなら、あなたのNucleusサイト管理者に連絡してください。');
+ 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',						'著者');
+ define('_OVERVIEW_OTHER_DRAFTS',			'その他のドラフト');
+ define('_ERROR_BADADMINSKINNAME',			'管理画面用スキン名は先頭が「admin/」で始まっている必要があります。');
+ define('_ERROR_BADADMINTEMPLATENAME',		'管理画面用スキンのテンプレート名は先頭が「admin/」で始まっている必要があります。');
+ define('_SETTINGS_ADMINSKIN',				'デフォルトの管理画面用スキン');
+ define('_SETTINGS_BKMKLTSKIN',				'デフォルトのブックマークレット用スキン');
+ define('_MEMBERS_BKMKLTSKIN',				'使用するブックマークレット用のスキン');
+ define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',		'使用中のバージョンは最新です');
+ 
  /********************************************
   *        Start New for 3.64                *
   ********************************************/
@@@ -188,13 -269,7 +277,7 @@@ define('_PLUGIN_OPTIONS_TITLE',						'%
  // Plugin file loda error
  define('_PLUGINFILE_COULDNT_BELOADED',				'エラー: プラグインファイル <strong>%s.php</strong> を読み込めませんでした。ファイルが存在しない、もくは使用中の Nucleus 上で動作させるために必要な機能がプラグインでサポートされていません。(<a href="?action=actionlog">管理操作履歴</a>に詳細があります。)');
  
- //ITEM add/edit template (for japanese only)
  define('_ITEM_ADDEDITTEMPLATE_FORMAT',				'フォーマット：');
- define('_ITEM_ADDEDITTEMPLATE_YEAR',				'å¹´');
- define('_ITEM_ADDEDITTEMPLATE_MONTH',				'月');
- define('_ITEM_ADDEDITTEMPLATE_DAY',					'日');
- define('_ITEM_ADDEDITTEMPLATE_HOUR',				'時');
- define('_ITEM_ADDEDITTEMPLATE_MINUTE',				'分');
  
  // Errors
  define('_ERRORS_INSTALLSQL',						'｢install.sql｣ファイルを削除してください');
@@@ -1273,3 -1348,20 +1356,20 @@@ define('_EDITC_NONMEMBER',							'非ãƒ
  // move item
  define('_MOVE_TITLE',								'どのBlogに移動しますか？');
  define('_MOVE_BTN',									'アイテムを移動する');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'アイテム/コメントのリストのナビゲーション');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] メンバーがブログ管理権限を持っている時の追加項目');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] メンバーが最高管理権限を持っている時の追加項目');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'プラグインの入手リンク');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . '登録されているイベント');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'イベント情報のアップデートが必要な時のアラート');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . '依存するプラグイン');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . '依存されているプラグイン');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'プラグインが読み込めなかった時のアラート');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . '「アクション」列のテンプレート');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ADMN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'プラグインの管理領域へのリンク');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_HELP',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'プラグインのヘルプへのリンク');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGOPTSETURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'プラグインのオプション設定画面へのリンク');
+ 
diff --combined nucleus/locales/ko_Kore_KR.EUC-KR.php
index 433e62c,cd16e8a..b75dae9
--- a/nucleus/locales/ko_Kore_KR.EUC-KR.php
+++ b/nucleus/locales/ko_Kore_KR.EUC-KR.php
@@@ -9,16 -9,97 +9,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'kor_kor');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -188,13 -269,7 +273,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -339,6 -414,23 +418,23 @@@ define('_LIST_PLUGS_DEP',			'Plugin(s) 
  
  // START changed/added after 3.1 START
  
+ // comments list per weblog
+ define('_COMMENTS_BLOG',			'All Comments for blog');
+ define('_NOCOMMENTS_BLOG',			'No comments were made on items of this blog');
+ define('_BLOGLIST_COMMENTS',		'Comments');
+ define('_BLOGLIST_TT_COMMENTS',		'A list of all comments made on items of this blog');
+ 
+ 
+ // for use in archivetype-skinvar
+ define('_ARCHIVETYPE_DAY',			'day');
+ define('_ARCHIVETYPE_MONTH',		'month');
+ 
+ // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
+ define('_ERROR_BADTICKET',			'Invalid or expired ticket.');
+ 
+ // cookie prefix
+ define('_SETTINGS_COOKIEPREFIX',	'Cookie Prefix');
+ 
  // account activation
  define('_ERROR_NOLOGON_NOACTIVATE',	'È­¼³È­ ¸µÅ©¸¦ º¸³¾¼ö ¾ø½À´Ï´Ù. ·Î±×ÀÎ ÇϽǼö ¾ø½À´Ï´Ù.');
  define('_ERROR_ACTIVATE',			'È°¼ºÈ­ Å°°¡ ¾ø°Å³ª ¸ÂÁö¾Ê°Å³ª Æó±âµÇ¾ú½À´Ï´Ù.');
@@@ -346,7 -438,7 +442,7 @@@ define('_ACTIONLOG_ACTIVATIONLINK', 'È°
  define('_MSG_ACTIVATION_SENT',		'È°¼ºÈ­ ¸µÅ©°¡ À̸ÞÀÏ·Î º¸³»Á³½À´Ï´Ù.');
  
  // activation link emails
- define('_ACTIVATE_REGISTER_MAIL',	"¾È³çÇϼ¼¿ä <%memberName%>´Ô,\n\n<%siteName%> (<%siteUrl%>)ÀÇ °èÁ¤À» È°¼ºÈ­ Çϱâ À§Çؼ­´Â\n´ÙÀ½ÀÇ ¸µÅ©¸¦ Ŭ¸¯ÇϽʽÿÀ: \n\n\t<%activationUrl%>\n\nÀÌ ¸ÞÀÏÀ» ¹ÞÀºÁö 2ÀÏÀÌ Áö³¯°æ¿ì È°¼ºÈ­ ¸µÅ©°¡ ¹Ù¸£Áö ¾Ê´Ù°í Ç¥½ÃµË´Ï´Ù.");
+ define('_ACTIVATE_REGISTER_MAIL',	"Hi <%memberName%>,\n\nYou need to activate your account at <%siteName%> (<%siteUrl%>).\nYou can do this by visiting the link below: \n\n\t<%activationUrl%>\n\nYou have <%activationDays%> days to do this. After this, the activation link becomes invalid.");
  define('_ACTIVATE_REGISTER_MAILTITLE',	"'<%memberName%>'ÀÇ °èÁ¤ È°¼ºÈ­");
  define('_ACTIVATE_REGISTER_TITLE',	'ȯ¿µÇÕ´Ï´Ù <%memberName%>´Ô');
  define('_ACTIVATE_REGISTER_TEXT',	'¾Æ·¡ÀÇ °èÁ¤¿¡ ¸Â´Â ¾ÏÈ£¸¦ ¼±ÅÃÇØ ÁֽʽÿÀ');
@@@ -740,7 -832,6 +836,6 @@@ define('_COMMENTFORM_YOUARE',		'´ç½ÅÀº'
  define('_COMMENTFORM_SUBMIT',		'ÄÚ¸àÆ® Ãß°¡');
  define('_COMMENTFORM_COMMENT',		'´ç½ÅÀÇ ÄÚ¸àÆ®');
  define('_COMMENTFORM_NAME',			'À̸§');
- define('_COMMENTFORM_MAIL',			'À̸ÞÀÏ/ȨÆäÀÌÁö');
  define('_COMMENTFORM_REMEMBER',		'³»Á¤º¸ ±â¾ï');
  
  // loginform
@@@ -767,7 -858,6 +862,6 @@@ 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',			'(³¯Â¥³ª ½Ã°£À» ÇöÀç ÀÌÀüÀ¸·Î ¼³Á¤ÇÒ ¼ö´Â ¾øÀ¸¸ç, ±×·± °æ¿ì ÇöÀç ½Ã°£À¸·Î ¼³Á¤µË´Ï´Ù)');
@@@ -1111,8 -1201,6 +1205,6 @@@ define('_BAN_ADD_BTN',				'Á¢±Ù±ÝÁö ¼³Á
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'¸Þ½ÃÁö');
- define('_LOGIN_NAME',				'À̸§');
- define('_LOGIN_PASSWORD',			'¾ÏÈ£');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'¾ÏÈ£¸¦ ÀØÀ¸¼Ì´Ù¸é?');
  
@@@ -1244,3 -1332,19 +1336,19 @@@ define('_EDITC_NONMEMBER',			'ºñȸ¿ø')
  // move item
  define('_MOVE_TITLE',				'¾î´À ºí·Î±×·Î À̵¿ÇÒ±î¿ä?');
  define('_MOVE_BTN',					'¾ÆÀÌÅÛ À̵¿');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/ko_Kore_KR.UTF-8.php
index 2ba56db,7a93863..8b6cbb8
--- a/nucleus/locales/ko_Kore_KR.UTF-8.php
+++ b/nucleus/locales/ko_Kore_KR.UTF-8.php
@@@ -9,16 -9,97 +9,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'kor_kor');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -188,13 -269,7 +273,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -339,6 -414,23 +418,23 @@@ define('_LIST_PLUGS_DEP',			'Plugin(s) 
  
  // START changed/added after 3.1 START
  
+ // comments list per weblog
+ define('_COMMENTS_BLOG',			'All Comments for blog');
+ define('_NOCOMMENTS_BLOG',			'No comments were made on items of this blog');
+ define('_BLOGLIST_COMMENTS',		'Comments');
+ define('_BLOGLIST_TT_COMMENTS',		'A list of all comments made on items of this blog');
+ 
+ 
+ // for use in archivetype-skinvar
+ define('_ARCHIVETYPE_DAY',			'day');
+ define('_ARCHIVETYPE_MONTH',		'month');
+ 
+ // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
+ define('_ERROR_BADTICKET',			'Invalid or expired ticket.');
+ 
+ // cookie prefix
+ define('_SETTINGS_COOKIEPREFIX',	'Cookie Prefix');
+ 
  // account activation
  define('_ERROR_NOLOGON_NOACTIVATE',	'화설화 링크를 보낼수 없습니다. 로그인 하실수 없습니다.');
  define('_ERROR_ACTIVATE',			'활성화 키가 없거나 맞지않거나 폐기되었습니다.');
@@@ -740,7 -832,6 +836,6 @@@ define('_COMMENTFORM_YOUARE',		'당신ì
  define('_COMMENTFORM_SUBMIT',		'코멘트 추가');
  define('_COMMENTFORM_COMMENT',		'당신의 코멘트');
  define('_COMMENTFORM_NAME',			'이름');
- define('_COMMENTFORM_MAIL',			'이메일/홈페이지');
  define('_COMMENTFORM_REMEMBER',		'내정보 기억');
  
  // loginform
@@@ -767,7 -858,6 +862,6 @@@ 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',			'(날짜나 시간을 현재 이전으로 설정할 수는 없으며, 그런 경우 현재 시간으로 설정됩니다)');
@@@ -1111,8 -1201,6 +1205,6 @@@ define('_BAN_ADD_BTN',				'접근금ì§
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'메시지');
- define('_LOGIN_NAME',				'이름');
- define('_LOGIN_PASSWORD',			'암호');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'암호를 잊으셨다면?');
  
@@@ -1244,3 -1332,19 +1336,19 @@@ define('_EDITC_NONMEMBER',			'비회원
  // move item
  define('_MOVE_TITLE',				'어느 블로그로 이동할까요?');
  define('_MOVE_BTN',					'아이템 이동');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/ku_Arab_TR.UTF-8.php
index 8d441e4,d10d1cc..e1dd678
--- a/nucleus/locales/ku_Arab_TR.UTF-8.php
+++ b/nucleus/locales/ku_Arab_TR.UTF-8.php
@@@ -15,10 -15,91 +15,98 @@@
  /********************************************
   *        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');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script) (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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                *
   ********************************************/
@@@ -187,13 -268,7 +275,17 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -352,10 -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',	'پرێفیكسی كووكیزه‌كان');
  
@@@ -758,7 -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
@@@ -785,7 -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)');
@@@ -1129,8 -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',				'وشه‌ی تێپه‌ڕبوونت له‌بیركردوه‌؟');
  
@@@ -1263,4 -1330,18 +1367,22 @@@ 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');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/lv_Latn_LV.ISO-8859-13.php
index 9498471,a3d3974..6e54fff
--- a/nucleus/locales/lv_Latn_LV.ISO-8859-13.php
+++ b/nucleus/locales/lv_Latn_LV.ISO-8859-13.php
@@@ -8,16 -8,97 +8,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'C');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -470,9 -545,6 +549,12 @@@ define('_MEDIA_COLLECTION_LABEL',	'Paðr
  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.');
@@@ -772,7 -844,6 +854,10 @@@ define('_COMMENTFORM_YOUARE',        'T
  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
@@@ -799,7 -870,6 +884,10 @@@ define('_ADD_DISABLE_COMMENTS',        
  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)');
@@@ -1147,8 -1217,6 +1235,11 @@@ define('_BAN_ADD_BTN',                '
  
  // 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?');
  
@@@ -1280,3 -1348,19 +1371,22 @@@ define('_EDITC_NONMEMBER',            '
  // move item
  define('_MOVE_TITLE',                'Uz kuru blogu?');
  define('_MOVE_BTN',                    'Pârvietot...');
++<<<<<<< HEAD
++=======
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/lv_Latn_LV.UTF-8.php
index 860af4f,9edb53d..6ec7fb7
--- a/nucleus/locales/lv_Latn_LV.UTF-8.php
+++ b/nucleus/locales/lv_Latn_LV.UTF-8.php
@@@ -8,16 -8,97 +8,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'C');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -471,9 -546,6 +550,6 @@@ define('_ADD_ALIGNLEFT_TT',			'KreisajÄ
  define('_ADD_ALIGNRIGHT_TT',		'Labajā pusē');
  define('_ADD_ALIGNCENTER_TT',		'Iecentrēts');
  
- // searchable blog setting (yes/no)
- define('_EBLOG_SEARCH',				'Pievienot meklēšanas indeksam');
- 
  // generic upload failure
  define('_ERROR_UPLOADFAILED',		'Kļūdas rezultātā fails netika pievienots.');
  
@@@ -772,7 -844,6 +848,6 @@@ define('_COMMENTFORM_YOUARE',        'T
  define('_COMMENTFORM_SUBMIT',        'Komentēt');
  define('_COMMENTFORM_COMMENT',        'Tavs komentārs');
  define('_COMMENTFORM_NAME',            'Vārds');
- define('_COMMENTFORM_MAIL',            'Epasts/HTTP');
  define('_COMMENTFORM_REMEMBER',        'Atcerēties mani turpmāk');
  
  // loginform
@@@ -799,7 -870,6 +874,6 @@@ define('_ADD_DISABLE_COMMENTS',        
  define('_ADD_DRAFTNFUTURE',            'Sagataves nākotnei');
  define('_ADD_ADDITEM',                'Pievienot');
  define('_ADD_ADDNOW',                'Pievienot tagad');
- define('_ADD_ADDLATER',                'Pievienot vēlāk');
  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)');
@@@ -1147,8 -1217,6 +1221,6 @@@ define('_BAN_ADD_BTN',                '
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',            'Ziņojums');
- define('_LOGIN_NAME',                'Vārds/nosaukums');
- define('_LOGIN_PASSWORD',            'Parole');
  define('_LOGIN_SHARED',                _LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',                'Aizmirsās parole?');
  
@@@ -1280,3 -1348,19 +1352,19 @@@ define('_EDITC_NONMEMBER',            '
  // move item
  define('_MOVE_TITLE',                'Uz kuru blogu?');
  define('_MOVE_BTN',                    'Pārvietot...');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/nl_Latn_NL.ISO-8859-15.php
index 148f7d7,1a056ad..4ef6abf
--- a/nucleus/locales/nl_Latn_NL.ISO-8859-15.php
+++ b/nucleus/locales/nl_Latn_NL.ISO-8859-15.php
@@@ -1,10 -1,8 +1,14 @@@
  <?php
  /**
-  * Nucleus Language File
+  * 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)
@@@ -12,16 -10,97 +16,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'nld_nld');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -191,13 -270,7 +280,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -353,10 -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');
  
@@@ -761,7 -830,6 +847,6 @@@ define('_COMMENTFORM_YOUARE',		'U bent'
  define('_COMMENTFORM_SUBMIT',		'Reactie toevoegen');
  define('_COMMENTFORM_COMMENT',		'Uw reactie');
  define('_COMMENTFORM_NAME',			'Naam');
- define('_COMMENTFORM_MAIL',			'E-mail/HTTP');
  define('_COMMENTFORM_REMEMBER',		'Onthoud wie ik ben');
  
  // loginform
@@@ -788,7 -856,6 +873,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Comme
  define('_ADD_DRAFTNFUTURE',			'Kladversies &amp; Future Items');
  define('_ADD_ADDITEM',				'Toevoegen');
  define('_ADD_ADDNOW',				'Nu toevoegen');
- define('_ADD_ADDLATER',				'Later toevoegen');
  define('_ADD_PLACE_ON',				'Toevoegen op');
  define('_ADD_ADDDRAFT',				'Als kladversie bewaren');
  define('_ADD_NOPASTDATES',			'(Data in het verleden gelden niet. In dat geval wordt de huidige datum genomen)');
@@@ -1134,8 -1201,6 +1218,6 @@@ define('_BAN_ADD_BTN',				'Ban Toevoege
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Bericht:');
- define('_LOGIN_NAME',				'Naam');
- define('_LOGIN_PASSWORD',			'Wachtwoord');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Paswoord vergeten?');
  
@@@ -1268,3 -1333,19 +1350,19 @@@ define('_EDITC_NONMEMBER',			'niet gere
  // move item
  define('_MOVE_TITLE',				'Verplaatsen naar welk blog?');
  define('_MOVE_BTN',					'Verplaats');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/nl_Latn_NL.UTF-8.php
index babed62,c5c4a20..167200a
--- a/nucleus/locales/nl_Latn_NL.UTF-8.php
+++ b/nucleus/locales/nl_Latn_NL.UTF-8.php
@@@ -10,16 -10,97 +10,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'nld_nld');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -189,13 -270,7 +274,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -351,10 -426,6 +430,6 @@@ define('_ARCHIVETYPE_MONTH',		'maand')
  // tickets (prevents malicious users to trick an admin to perform actions he doesn't want)
  define('_ERROR_BADTICKET',			'Ongeldig ticket.');
  
- // plugin dependency
- define('_ERROR_INSREQPLUGIN',		'Plugin kon niet geïnstalleerd worden: vereist ');
- define('_ERROR_DELREQPLUGIN',		'Plugin kon niet verwijderd worden: vereist door ');
- 
  // cookie prefix
  define('_SETTINGS_COOKIEPREFIX',	'Cookie Prefix');
  
@@@ -759,7 -830,6 +834,6 @@@ define('_COMMENTFORM_YOUARE',		'U bent'
  define('_COMMENTFORM_SUBMIT',		'Reactie toevoegen');
  define('_COMMENTFORM_COMMENT',		'Uw reactie');
  define('_COMMENTFORM_NAME',			'Naam');
- define('_COMMENTFORM_MAIL',			'E-mail/HTTP');
  define('_COMMENTFORM_REMEMBER',		'Onthoud wie ik ben');
  
  // loginform
@@@ -786,7 -856,6 +860,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Comme
  define('_ADD_DRAFTNFUTURE',			'Kladversies &amp; Future Items');
  define('_ADD_ADDITEM',				'Toevoegen');
  define('_ADD_ADDNOW',				'Nu toevoegen');
- define('_ADD_ADDLATER',				'Later toevoegen');
  define('_ADD_PLACE_ON',				'Toevoegen op');
  define('_ADD_ADDDRAFT',				'Als kladversie bewaren');
  define('_ADD_NOPASTDATES',			'(Data in het verleden gelden niet. In dat geval wordt de huidige datum genomen)');
@@@ -1132,8 -1201,6 +1205,6 @@@ define('_BAN_ADD_BTN',				'Ban Toevoege
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Bericht:');
- define('_LOGIN_NAME',				'Naam');
- define('_LOGIN_PASSWORD',			'Wachtwoord');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Paswoord vergeten?');
  
@@@ -1266,3 -1333,19 +1337,19 @@@ define('_EDITC_NONMEMBER',			'niet gere
  // move item
  define('_MOVE_TITLE',				'Verplaatsen naar welk blog?');
  define('_MOVE_BTN',					'Verplaats');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/pl_Latn_PL.UTF-8.php
index ad9449c,65ff9c3..29bc0a8
--- a/nucleus/locales/pl_Latn_PL.UTF-8.php
+++ b/nucleus/locales/pl_Latn_PL.UTF-8.php
@@@ -19,10 -19,91 +19,98 @@@
  /********************************************
   *        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');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'Rok');
+ define('_LABEL_MONTH_UNIT',		'Miesiąc');
+ define('_LABEL_DAY_UNIT',		'Dzień');
+ define('_LABEL_HOUR_UNIT',		'Godzina');
+ define('_LABEL_MINUTE_UNIT',	'Minuta');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script) (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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                *
   ********************************************/
@@@ -208,13 -289,7 +296,17 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -413,10 -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');
  
@@@ -822,7 -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
@@@ -849,7 -919,6 +947,10 @@@ define('_ADD_DISABLE_COMMENTS',		'WyłÄ
  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.)');
@@@ -1193,8 -1262,6 +1294,11 @@@ define('_BAN_ADD_BTN',				'Dodaj blkoka
  
  // 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?');
  
@@@ -1327,4 -1394,18 +1431,22 @@@ define('_EDITC_NONMEMBER',			'odwiedzaj
  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');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/pt_Latn_BR.ISO-8859-1.php
index f1e5742,7b4ce89..1980557
--- a/nucleus/locales/pt_Latn_BR.ISO-8859-1.php
+++ b/nucleus/locales/pt_Latn_BR.ISO-8859-1.php
@@@ -8,16 -8,97 +8,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'ptb_prt');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -471,9 -546,6 +550,6 @@@ define('_ADD_ALIGNLEFT_TT',			'Alinhar 
  define('_ADD_ALIGNRIGHT_TT',		'Alinhar à direita');
  define('_ADD_ALIGNCENTER_TT',		'Alinhar ao centro');
  
- // searchable blog setting (yes/no)
- define('_EBLOG_SEARCH',				'Incluir na busca');
- 
  // generic upload failure
  define('_ERROR_UPLOADFAILED',		'Upload failed');
  
@@@ -756,7 -828,6 +832,10 @@@ define('_COMMENTFORM_YOUARE',		'Você es
  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
@@@ -783,7 -854,6 +862,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Desat
  define('_ADD_DRAFTNFUTURE',			'Rascunhos &amp; itens futuros');
  define('_ADD_ADDITEM',				'Novo post');
  define('_ADD_ADDNOW',				'Publicar agora');
- define('_ADD_ADDLATER',				'Publicar mais tarde');
  define('_ADD_PLACE_ON',				'Publicar no dia');
  define('_ADD_ADDDRAFT',				'Colocar nos rascunhos');
  define('_ADD_NOPASTDATES',			'');
@@@ -1127,8 -1197,6 +1205,6 @@@ define('_BAN_ADD_BTN',				'Banir novo I
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Mensagem');
- define('_LOGIN_NAME',				'Nome');
- define('_LOGIN_PASSWORD',			'Senha');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Esqueceu sua senha?');
  
@@@ -1260,3 -1328,19 +1336,19 @@@ define('_EDITC_NONMEMBER',			'não membr
  // move item
  define('_MOVE_TITLE',				'Mover o post para qual blog?');
  define('_MOVE_BTN',					'Mover');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/pt_Latn_BR.UTF-8.php
index 123ff01,784f466..fedefb1
--- a/nucleus/locales/pt_Latn_BR.UTF-8.php
+++ b/nucleus/locales/pt_Latn_BR.UTF-8.php
@@@ -8,16 -8,97 +8,101 @@@
   *
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'ptb_prt');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -471,9 -546,6 +550,6 @@@ define('_ADD_ALIGNLEFT_TT',			'Alinhar 
  define('_ADD_ALIGNRIGHT_TT',		'Alinhar à direita');
  define('_ADD_ALIGNCENTER_TT',		'Alinhar ao centro');
  
- // searchable blog setting (yes/no)
- define('_EBLOG_SEARCH',				'Incluir na busca');
- 
  // generic upload failure
  define('_ERROR_UPLOADFAILED',		'Upload failed');
  
@@@ -756,7 -828,6 +832,6 @@@ define('_COMMENTFORM_YOUARE',		'Você e
  define('_COMMENTFORM_SUBMIT',		'Envia');
  define('_COMMENTFORM_COMMENT',		'Seu comentário');
  define('_COMMENTFORM_NAME',			'Nome');
- define('_COMMENTFORM_MAIL',			'E-mail ou site');
  define('_COMMENTFORM_REMEMBER',		'auto-completar na próxima visita');
  
  // loginform
@@@ -783,7 -854,6 +858,6 @@@ define('_ADD_DISABLE_COMMENTS',		'Desat
  define('_ADD_DRAFTNFUTURE',			'Rascunhos &amp; itens futuros');
  define('_ADD_ADDITEM',				'Novo post');
  define('_ADD_ADDNOW',				'Publicar agora');
- define('_ADD_ADDLATER',				'Publicar mais tarde');
  define('_ADD_PLACE_ON',				'Publicar no dia');
  define('_ADD_ADDDRAFT',				'Colocar nos rascunhos');
  define('_ADD_NOPASTDATES',			'');
@@@ -1127,8 -1197,6 +1201,6 @@@ define('_BAN_ADD_BTN',				'Banir novo I
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Mensagem');
- define('_LOGIN_NAME',				'Nome');
- define('_LOGIN_PASSWORD',			'Senha');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Esqueceu sua senha?');
  
@@@ -1260,3 -1328,19 +1332,19 @@@ define('_EDITC_NONMEMBER',			'não memb
  // move item
  define('_MOVE_TITLE',				'Mover o post para qual blog?');
  define('_MOVE_BTN',					'Mover');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/ro_Latn_RO.ISO-8859-1.php
index bd3f09c,d0f057e..1f57a34
--- a/nucleus/locales/ro_Latn_RO.ISO-8859-1.php
+++ b/nucleus/locales/ro_Latn_RO.ISO-8859-1.php
@@@ -20,10 -20,91 +20,98 @@@
  /********************************************
   *        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');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script) (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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                *
   ********************************************/
@@@ -94,9 -175,6 +182,12 @@@ define('_ERROR_DELREQPLUGIN',		'Plugin 
  //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
@@@ -192,13 -270,7 +283,17 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -357,10 -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');
  
@@@ -482,9 -550,6 +580,12 @@@ define('_ADD_ALIGNLEFT_TT',		'Aliniaza 
  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');
  
@@@ -767,7 -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
@@@ -794,7 -858,6 +898,10 @@@ define('_ADD_DISABLE_COMMENTS',		'Inter
  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)');
@@@ -1272,4 -1335,18 +1379,22 @@@ 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');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/ro_Latn_RO.UTF-8.php
index 1aad190,64efdf1..0e88985
--- a/nucleus/locales/ro_Latn_RO.UTF-8.php
+++ b/nucleus/locales/ro_Latn_RO.UTF-8.php
@@@ -20,10 -20,91 +20,98 @@@
  /********************************************
   *        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');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script) (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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                *
   ********************************************/
@@@ -94,9 -175,6 +182,12 @@@ define('_ERROR_DELREQPLUGIN',		'Plugin 
  //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
@@@ -192,13 -270,7 +283,17 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -357,10 -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');
  
@@@ -482,9 -550,6 +580,12 @@@ define('_ADD_ALIGNLEFT_TT',		'Aliniaza 
  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');
  
@@@ -767,7 -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
@@@ -794,7 -858,6 +898,10 @@@ define('_ADD_DISABLE_COMMENTS',		'Inter
  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)');
@@@ -1272,4 -1335,18 +1379,22 @@@ 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');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/ru_Cyrl_RU.UTF-8.php
index 303efc0,3a59854..b4bcf9a
--- a/nucleus/locales/ru_Cyrl_RU.UTF-8.php
+++ b/nucleus/locales/ru_Cyrl_RU.UTF-8.php
@@@ -12,16 -12,97 +12,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'rus_rus');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -191,13 -272,7 +276,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -356,10 -431,6 +435,6 @@@ 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');
  
@@@ -766,7 -837,6 +841,6 @@@ define('_COMMENTFORM_YOUARE',		'Вы')
  define('_COMMENTFORM_SUBMIT',		'Комментировать!');
  define('_COMMENTFORM_COMMENT',		'Ваш комментарий');
  define('_COMMENTFORM_NAME',			'Имя');
- define('_COMMENTFORM_MAIL',			'E-mail/HTTP');
  define('_COMMENTFORM_REMEMBER',		'Запомнить меня');
  
  // loginform
@@@ -793,7 -863,6 +867,6 @@@ 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',			'(дата и время в прошлом недействительны, будут использовано текущее время)');
@@@ -1137,8 -1206,6 +1210,6 @@@ define('_BAN_ADD_BTN',				'Устано
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Сообщение');
- define('_LOGIN_NAME',				'Имя');
- define('_LOGIN_PASSWORD',			'Пароль');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Вспомнить пароль');
  
@@@ -1270,3 -1337,19 +1341,19 @@@ define('_EDITC_NONMEMBER',			'гостÑ
  // move item
  define('_MOVE_TITLE',				'Выберите раздел для перемещения');
  define('_MOVE_BTN',					'Переместить сообщение');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/ru_Cyrl_RU.WINDOWS-1251.php
index a460229,fac5681..cbd5b1f
--- a/nucleus/locales/ru_Cyrl_RU.WINDOWS-1251.php
+++ b/nucleus/locales/ru_Cyrl_RU.WINDOWS-1251.php
@@@ -12,16 -12,97 +12,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'rus_rus');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -191,13 -272,7 +276,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -355,10 -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');
@@@ -766,7 -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
@@@ -793,7 -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',			'(äàòà è âðåìÿ â ïðîøëîì íåäåéñòâèòåëüíû, áóäóò èñïîëüçîâàíî òåêóùåå âðåìÿ)');
@@@ -1137,8 -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',				'Âñïîìíèòü ïàðîëü');
  
@@@ -1270,3 -1337,19 +1361,22 @@@ define('_EDITC_NONMEMBER',			'ãîñòü')
  // move item
  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');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/sk_Latn_SK.ISO-8859-2.php
index e729643,8f4a93c..1b151a3
--- a/nucleus/locales/sk_Latn_SK.ISO-8859-2.php
+++ b/nucleus/locales/sk_Latn_SK.ISO-8859-2.php
@@@ -8,16 -8,97 +8,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'sky_svk');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -470,9 -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');
@@@ -760,7 -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
@@@ -787,7 -858,6 +872,10 @@@ define('_ADD_DISABLE_COMMENTS',		'Zakáz
  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)');
@@@ -1131,8 -1201,6 +1219,11 @@@ define('_BAN_ADD_BTN',				'Prida» obmed
  
  // 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?');
  
@@@ -1264,3 -1332,19 +1355,22 @@@ define('_EDITC_NONMEMBER',			'nie je èl
  // 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');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/sk_Latn_SK.UTF-8.php
index e1f564d,521c326..6572790
--- a/nucleus/locales/sk_Latn_SK.UTF-8.php
+++ b/nucleus/locales/sk_Latn_SK.UTF-8.php
@@@ -8,16 -8,97 +8,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'sky_svk');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -471,9 -546,6 +550,6 @@@ define('_ADD_ALIGNLEFT_TT',			'ZarovnaÅ
  define('_ADD_ALIGNRIGHT_TT',		'Zarovnať doprava');
  define('_ADD_ALIGNCENTER_TT',		'Zarovnať na stred');
  
- // searchable blog setting (yes/no)
- define('_EBLOG_SEARCH',				'Zahrnúť do hľadania');
- 
  // generic upload failure
  define('_ERROR_UPLOADFAILED',		'Nahrávanie zlyhalo');
  
@@@ -760,7 -832,6 +836,6 @@@ define('_COMMENTFORM_YOUARE',		'Ste')
  define('_COMMENTFORM_SUBMIT',		'Pridať komentár');
  define('_COMMENTFORM_COMMENT',		'Váš komentár');
  define('_COMMENTFORM_NAME',			'Meno');
- define('_COMMENTFORM_MAIL',			'E-mail/HTTP');
  define('_COMMENTFORM_REMEMBER',		'Pamätaj si mna');
  
  // loginform
@@@ -787,7 -858,6 +862,6 @@@ 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');
- define('_ADD_ADDLATER',				'Pridať neskôr');
  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)');
@@@ -1131,8 -1201,6 +1205,6 @@@ define('_BAN_ADD_BTN',				'Pridať obme
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'Správa');
- define('_LOGIN_NAME',				'Meno');
- define('_LOGIN_PASSWORD',			'Heslo');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Zabudli ste heslo?');
  
@@@ -1264,3 -1332,19 +1336,19 @@@ define('_EDITC_NONMEMBER',			'nie je č
  // move item
  define('_MOVE_TITLE',				'Presunúť do akého blogu?');
  define('_MOVE_BTN',					'Presunúť článok');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/sr_Cyrl_RS.UTF-8.php
index ee0f3ec,229ccb8..7ad8355
--- a/nucleus/locales/sr_Cyrl_RS.UTF-8.php
+++ b/nucleus/locales/sr_Cyrl_RS.UTF-8.php
@@@ -14,10 -14,91 +14,98 @@@
  /********************************************
   *        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');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script) (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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                *
   ********************************************/
@@@ -186,13 -267,7 +274,17 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -350,10 -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');
  
@@@ -756,7 -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
@@@ -783,7 -853,6 +881,10 @@@ define('_ADD_DISABLE_COMMENTS'
  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.)');
@@@ -1128,8 -1197,6 +1229,11 @@@ define('_BAN_ADD_BTN',					'Postavi blo
  
  // 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?');
  
@@@ -1261,4 -1328,18 +1365,22 @@@ define('_EDITC_NONMEMBER',				'posetila
  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');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/ur_Arab_PK.UTF-8.php
index 9a00010,b67a33c..ea8bcb8
--- a/nucleus/locales/ur_Arab_PK.UTF-8.php
+++ b/nucleus/locales/ur_Arab_PK.UTF-8.php
@@@ -14,10 -14,91 +14,98 @@@
  /********************************************
   *        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');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script) (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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                *
   ********************************************/
@@@ -186,13 -267,7 +274,17 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -351,10 -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',	'کوکی پریفکس');
  
@@@ -783,7 -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',			'(ماضی کی تاریخیں اور وقت موزوں نہیں، اس صورت میں حالیہ وقت استعمال کی جائے گا)');
@@@ -1127,8 -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',				'پاس ورڈ بھول گئے؟');
  
@@@ -1261,4 -1329,18 +1362,22 @@@ 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');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/vi_Latn_VN.UTF-8.php
index c8a087e,101b50b..fc6736c
--- a/nucleus/locales/vi_Latn_VN.UTF-8.php
+++ b/nucleus/locales/vi_Latn_VN.UTF-8.php
@@@ -14,10 -14,91 +14,98 @@@
  /********************************************
   *        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');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script) (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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                *
   ********************************************/
@@@ -186,13 -267,7 +274,17 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -351,10 -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',                        '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');
  
@@@ -757,7 -828,6 +852,10 @@@ define('_COMMENTFORM_YOUARE'
  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
@@@ -784,7 -854,6 +882,10 @@@ define('_ADD_DISABLE_COMMENTS'
  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ỗ đó)');
@@@ -1128,8 -1197,6 +1229,11 @@@ define('_BAN_ADD_BTN'
  
  // 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?');
  
@@@ -1262,4 -1329,19 +1366,23 @@@ define('_EDITC_NONMEMBER'
  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');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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
diff --combined nucleus/locales/zh_Hans_CN.GB2312.php
index d64577e,a8cbbac..34d92ca
--- a/nucleus/locales/zh_Hans_CN.GB2312.php
+++ b/nucleus/locales/zh_Hans_CN.GB2312.php
@@@ -8,16 -8,97 +8,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'chs_chn');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -471,9 -546,6 +550,6 @@@ define('_ADD_ALIGNLEFT_TT',			'×ó¶ÔÆë')
  define('_ADD_ALIGNRIGHT_TT',		'ÓÒ¶ÔÆë');
  define('_ADD_ALIGNCENTER_TT',		'¾ÓÖÐ');
  
- // searchable blog setting (yes/no)
- define('_EBLOG_SEARCH',				'ËÑË÷ʱ°üÀ¨');
- 
  // generic upload failure
  define('_ERROR_UPLOADFAILED',		'ÉÏÔØʧ°Ü');
  
@@@ -760,7 -832,6 +836,6 @@@ define('_COMMENTFORM_YOUARE',		'ÄãÊÇ')
  define('_COMMENTFORM_SUBMIT',		'Ìí¼ÓÆÀÂÛ');
  define('_COMMENTFORM_COMMENT',		'ÄãµÄÆÀÂÛ');
  define('_COMMENTFORM_NAME',			'Ãû×Ö');
- define('_COMMENTFORM_MAIL',			'Óʼþ/ÍøÕ¾');
  define('_COMMENTFORM_REMEMBER',		'ÌáÐÑÎÒ');
  
  // loginform
@@@ -787,7 -858,6 +862,6 @@@ 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',			'£¨¹ýÈ¥µÄÈÕÆÚºÍʱ¼äÊÇÎÞЧµÄ£¬ÏµÍ³½«Ê¹Óõ±Ç°Ê±¼ä£©');
@@@ -1131,8 -1201,6 +1205,6 @@@ define('_BAN_ADD_BTN',				'Ìí¼Ó·âËø')
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'ÏûÏ¢');
- define('_LOGIN_NAME',				'Ãû×Ö');
- define('_LOGIN_PASSWORD',			'ÃÜÂë');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'Íü¼ÇÃÜÂ룿');
  
@@@ -1264,3 -1332,19 +1336,19 @@@ define('_EDITC_NONMEMBER',			'·Ç»áÔ±')
  // move item
  define('_MOVE_TITLE',				'Òƶ¯µ½ÄĸöÈÕÖ¾£¿');
  define('_MOVE_BTN',					'Òƶ¯ÎÄÕÂ');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/zh_Hans_CN.UTF-8.php
index 9f3731d,2e66ef3..3443848
--- a/nucleus/locales/zh_Hans_CN.UTF-8.php
+++ b/nucleus/locales/zh_Hans_CN.UTF-8.php
@@@ -8,16 -8,97 +8,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'chs_chn');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -187,13 -268,7 +272,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -471,9 -546,6 +550,6 @@@ define('_ADD_ALIGNLEFT_TT',			'左对é½
  define('_ADD_ALIGNRIGHT_TT',		'右对齐');
  define('_ADD_ALIGNCENTER_TT',		'居中');
  
- // searchable blog setting (yes/no)
- define('_EBLOG_SEARCH',				'搜索时包括');
- 
  // generic upload failure
  define('_ERROR_UPLOADFAILED',		'上载失败');
  
@@@ -760,7 -832,6 +836,6 @@@ define('_COMMENTFORM_YOUARE',		'你是'
  define('_COMMENTFORM_SUBMIT',		'添加评论');
  define('_COMMENTFORM_COMMENT',		'你的评论');
  define('_COMMENTFORM_NAME',			'名字');
- define('_COMMENTFORM_MAIL',			'邮件/网站');
  define('_COMMENTFORM_REMEMBER',		'提醒我');
  
  // loginform
@@@ -787,7 -858,6 +862,6 @@@ 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',			'（过去的日期和时间是无效的，系统将使用当前时间）');
@@@ -1131,8 -1201,6 +1205,6 @@@ define('_BAN_ADD_BTN',				'添加封锁
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'消息');
- define('_LOGIN_NAME',				'名字');
- define('_LOGIN_PASSWORD',			'密码');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'忘记密码？');
  
@@@ -1264,3 -1332,19 +1336,19 @@@ define('_EDITC_NONMEMBER',			'非会员
  // move item
  define('_MOVE_TITLE',				'移动到哪个日志？');
  define('_MOVE_BTN',					'移动文章');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/locales/zh_Hant_TW.UTF-8.php
index af7ec34,b14fecf..a068c26
--- a/nucleus/locales/zh_Hant_TW.UTF-8.php
+++ b/nucleus/locales/zh_Hant_TW.UTF-8.php
@@@ -7,16 -7,97 +7,101 @@@
   * 
   * @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
   */
  
  /********************************************
   *        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');
-  
+ /* argument value for setlocale() in Microsoft's windows operating system */
+ define('_LOCALE_IN_WINDOWS',	'cht_twn');
+ 
+ /* labels for date and time measurement unit */
+ define('_LABEL_YEAR_UNIT',		'year');
+ define('_LABEL_MONTH_UNIT',		'month');
+ define('_LABEL_DAY_UNIT',		'day');
+ define('_LABEL_HOUR_UNIT',		'hour');
+ define('_LABEL_MINUTE_UNIT',	'minute');
+ 
+ // SkinableAdminArea vars
+ define('_SKINABLEADMIN_DEL_UNINSTALL_DATA',			'Delete ADMIN skin data table on uninstall?');
+ define('_SKINABLEADMIN_DEFAULT_SKIN',				'Choose a skin of the management area of the default.');
+ define('_SKINABLEADMIN_MEMBER_DEFAULT_SKIN',		'Choose a skin of the management area of you use.');
+ define('_SKINABLEADMIN_QMENU_LAYOUT',				'Admin layout');
+ define('_SKINABLEADMIN_PAGE_STR',					'page');
+ define('_SKINABLEADMIN_BATCH_MOVE',					'Item move other category/Category move other blog');
+ define('_SKINABLEADMIN_BATCH',						'batch');
+ define('_SKINABLEADMIN_PAGEHEAD',					'Admin page head');
+ define('_SKINABLEADMIN_PAGEFOOT',					'Admin page foot');
+ define('_SKINABLEADMIN_TEMPLATEOVERVIEW',			'Template overview');
+ define('_SKINABLEADMIN_ADMINAREAHEADLINK',			'[Your site]link');
+ define('_SKINABLEADMIN_TPLSETTING_INGENERAL',		'In general');
+ define('_SKINABLEADMIN_HEAD_STR',					' head');
+ define('_SKINABLEADMIN_BODY_STR',					' body');
+ define('_SKINABLEADMIN_FOOT_STR',					' foot');
+ define('_SKINABLEADMIN_TEXT_STR',					' text');
+ define('_SKINABLEADMIN_TITLE_STR',					' title');
+ define('_SKINABLEADMIN_ADMINSETTING_STR',			' set editmember is \'admin\'');
+ define('_SKINABLEADMIN_NORMALSETTING_STR',			' normal');
+ define('_SKINABLEADMIN_HELPICONURL_STR',			' icon URL');
+ define('_SKINABLEADMIN_HELPFILEURL_STR',			' help file URL');
+ define('_SKINABLEADMIN_ADMINSKINVAR_STR',			' skinvars');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_SELECT',	'selectbox used in ADMIN area');
+ define('_SKINABLEADMIN_SHOWLIST_LISTPLUG_TABLE',	'Table for list indication');
+ define('_SKINABLEADMIN_PLUGIN_QUICKMENU',			'Link to admin page of the plugin shown to the quick-menu');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTTYPE',		'Template for option-type %s');
+ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',		'Template for option-meta-data %s');
+ define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',			"ADMIN-Area's skin");
+ 
+ define('_LOCALE_BG_CYRL_BG',	'Bulgarian in Bulgaria');
+ define('_LOCALE_CA_LATN_ES',	'Catalan in Spain');
+ define('_LOCALE_CS_LATN_CZ',	'Czech in Czech Republic');
+ define('_LOCALE_DE_LATN_DE',	'German in Germany');
+ define('_LOCALE_EL_GREK_GR',	'Greek in Greece (Greek script)');
+ define('_LOCALE_EN_LATN_US',	'English in United States');
+ define('_LOCALE_ES_LATN_ES',	'Spanish in Spain');
+ define('_LOCALE_FA_ARAB_IR',	'Persian in Islamic Republic of Iran');
+ define('_LOCALE_FI_LATN_FI',	'Finnish in Finland');
+ define('_LOCALE_FR_LATN_FR',	'French in France');
+ define('_LOCALE_GL_LATN_ES',	'Galician in Spain');
+ define('_LOCALE_HR_LATN_HR',	'Croatian in Croatia');
+ define('_LOCALE_HU_LATN_HU',	'Hungarian in Hungary');
+ define('_LOCALE_ID_LATN_ID',	'Indonesian in Indonesia (Latin script)');
+ define('_LOCALE_IT_LATN_IT',	'Italian in Italy');
+ define('_LOCALE_JA_JPAN_JP',	'Japanese in Japan');
+ define('_LOCALE_KO_KORE_KR',	'Korean in Korea');
+ define('_LOCALE_KU_ARAB_TR',	'Kurdish in Turkey (Arabic script)');
+ define('_LOCALE_LV_LATN_LV',	'Latvian in Latvia');
+ define('_LOCALE_NL_LATN_NL',	'Dutch in Netherlands');
+ define('_LOCALE_PL_LATN_PL',	'Polish in Poland');
+ define('_LOCALE_PT_LATN_BR',	'Portuguese in Brazil');
+ define('_LOCALE_RO_LATN_RO',	'Romainan in Romania');
+ define('_LOCALE_RU_CYRL_RU',	'Russian in Russia');
+ define('_LOCALE_SK_LATN_SK',	'Slovak in Slovakia');
+ define('_LOCALE_SR_CYRL_RS',	'Serbian in Serbia');
+ define('_LOCALE_UR_ARAB_PK',	'Urdu in Pakistan');
+ define('_LOCALE_VI_LATN_VN',	'Vietnamese in Vietnam (Latin script)');
+ define('_LOCALE_ZH_HANS_CN',	'Chinese in China (simplified script)');
+ define('_LOCALE_ZH_HANT_TW',	'Chinese in Taiwan (Traditional script)');
+ 
+ define('_FORGOTPASSWORD_TITLE',				'Forgot your password?');
+ define('_FORGOTPASSWORD_MSG',				'Enter your username and email address below, and you\'ll be sent an e-mail with a link where you can choose a new password.');
+ define('_FORGOTPASSWORD_SUBMIT',			'Send Activation Link" class="transparent');
+ define('_FORGOTPASSWORD_CONTACT',			'If you don\'t remember your exact username, contact the site administrator.');
+ 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');
+ define('_ERROR_BADADMINSKINNAME',			'the name of skin for admin area must start with \'admin/\'.');
+ define('_ERROR_BADADMINTEMPLATENAME',		'the name of template for admin area must start with \'admin/\'.');
+ define('_SETTINGS_ADMINSKIN',				'default skin for admin area');
+ 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.');
+ 
  /********************************************
   *        Start New for 3.6x                *
   ********************************************/
@@@ -186,13 -267,7 +271,7 @@@ define('_PLUGIN_OPTIONS_TITLE',							'
  // 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');
@@@ -470,9 -545,6 +549,6 @@@ define('_ADD_ALIGNLEFT_TT',			'左對é½
  define('_ADD_ALIGNRIGHT_TT',		'右對齊');
  define('_ADD_ALIGNCENTER_TT',		'居中');
  
- // searchable blog setting (yes/no)
- define('_EBLOG_SEARCH',				'搜索時包括');
- 
  // generic upload failure
  define('_ERROR_UPLOADFAILED',		'上載失敗');
  
@@@ -759,7 -831,6 +835,6 @@@ define('_COMMENTFORM_YOUARE',		'你是'
  define('_COMMENTFORM_SUBMIT',		'添加評論');
  define('_COMMENTFORM_COMMENT',		'你的評論');
  define('_COMMENTFORM_NAME',			'名字');
- define('_COMMENTFORM_MAIL',			'郵件/網站');
  define('_COMMENTFORM_REMEMBER',		'提醒我');
  
  // loginform
@@@ -786,7 -857,6 +861,6 @@@ 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',			'（過去的日期和時間是無效的，系統將使用當前時間）');
@@@ -1130,8 -1200,6 +1204,6 @@@ define('_BAN_ADD_BTN',				'添加封鎖
  
  // LOGIN screen
  define('_LOGIN_MESSAGE',			'消息');
- define('_LOGIN_NAME',				'名字');
- define('_LOGIN_PASSWORD',			'密碼');
  define('_LOGIN_SHARED',				_LOGINFORM_SHARED);
  define('_LOGIN_FORGOT',				'忘記密碼？');
  
@@@ -1263,3 -1331,19 +1335,19 @@@ define('_EDITC_NONMEMBER',			'非會員
  // move item
  define('_MOVE_TITLE',				'移動到哪個日誌？');
  define('_MOVE_BTN',					'移動文章');
+ 
+ // ADMIN-template template types
+ include_once('adminskinTypes.php');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_NAVILIST',		'navibar for item/comment list');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_TADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is blog ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_BLIST_BD_SADM',  _SKINABLEADMIN_ADMINSKINVAR_STR . ' [yrbloglist] member is super ADMIN');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_GURL',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin URL');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGEVENTLIST',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'API entry');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGNEDUPDATE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'eventlist updates');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPEND',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency to');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGIN_DEPREQ',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'dependency by');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLISTFALSE',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'couldn\'t load file');
+ define('_ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_ACTN',  _ADM_TPLPT_SHOWLIST_LISTPLUG_TABLE_PLUGLIST_BODY . 'plugin actions');
+ 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');
diff --combined nucleus/plugins/NP_SecurityEnforcer.php
index 0d18525,a66c1a8..ca5017c
--- a/nucleus/plugins/NP_SecurityEnforcer.php
+++ b/nucleus/plugins/NP_SecurityEnforcer.php
@@@ -14,7 -14,7 +14,11 @@@ This program is distributed in the hop
  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 -85,7 +89,11 @@@
  		$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',
@@@ -123,7 -123,7 +131,7 @@@
  		return;
  	}
  	
- 	public function event_QuickMenu($data)
+ 	public function event_QuickMenu(&$data)
  	{
  		// only show when option enabled
  		global $member;
@@@ -143,7 -143,7 +151,7 @@@
  		return;
  	}
  	
- 	public function event_PrePasswordSet($data)
+ 	public function event_PrePasswordSet(&$data)
  	{
  		//password, errormessage, valid
  		if ( $this->enable_security == 'no' )
@@@ -172,7 -172,7 +180,7 @@@
  		return;
  	}
  	
- 	public function event_PostRegister($data)
+ 	public function event_PostRegister(&$data)
  	{
  		if ( $this->enable_security != 'yes' )
  		{
@@@ -192,7 -192,7 +200,7 @@@
  		return;
  	}
  	
- 	public function event_CustomLogin($data)
+ 	public function event_CustomLogin(&$data)
  	{
  		if ( $this->enable_security != 'yes' || $this->max_failed_login <= 0 )
  		{
@@@ -203,12 -203,17 +211,26 @@@
  		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)));
+ 		DB::execute($query);
+ 		
+ 		$query = "SELECT fails as result FROM %s WHERE login=%s;";
+ 		$query = sprintf($query, sql_table('plug_securityenforcer'), DB::quoteValue($login));
+ 		$flogin = DB::getValue($query); 
+ 		
+ 		$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 )
@@@ -221,7 -226,7 +243,7 @@@
  		return;
  	}
  	
- 	public function event_LoginSuccess($data)
+ 	public function event_LoginSuccess(&$data)
  	{
  		//member(obj),username
  		if ( $this->enable_security != 'yes' || $this->max_failed_login <= 0 )
@@@ -231,12 -236,12 +253,17 @@@
  		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;
  	}
  	
- 	public function event_LoginFailed($data)
+ 	public function event_LoginFailed(&$data)
  	{
  		//username
  		if ( $this->enable_security != 'yes' || $this->max_failed_login <= 0 )
@@@ -246,23 -251,23 +273,43 @@@
  		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 )
+ 		{
+ 			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::getResult('SELECT * FROM ' . sql_table('plug_securityenforcer') . ' WHERE login=' . DB::quoteValue($ip));
+ 		if ( $lres->rowCount() > 0 )
+ 		{
+ 			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() . ')');
++>>>>>>> skinnable-master
  		}
  		return;
  	}
@@@ -271,6 -276,7 +318,7 @@@
  	{
  		$minlength = intval($minlength);
  		$complexity = intval($complexity);
+ 		$message = '';
  		
  		if ( $minlength < 6 )
  		{
@@@ -286,17 -292,17 +334,24 @@@
  			$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;
  		
  		foreach ( $chartypes as $value )
  		{
- 			$tot[$i] = preg_match("#{$value}#", $passwd);
+ 			$tot[$i] = preg_match("/" . $value . "/", $passwd);
  			$i = $i + 1;
  		}
  		
diff --combined nucleus/plugins/NP_SkinFiles.php
index d5081d8,8f8005a..ad88a68
--- a/nucleus/plugins/NP_SkinFiles.php
+++ b/nucleus/plugins/NP_SkinFiles.php
@@@ -7,7 -7,7 +7,11 @@@ class NP_SkinFiles extends NucleusPlugi
  	*
  	* 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 $
  	*
  	* ==========================================================================================
@@@ -104,7 -104,7 +108,7 @@@
  		return;
  	}
  	
- 	public function event_QuickMenu($data)
+ 	public function event_QuickMenu(&$data)
  	{
  		global $member;
  		
diff --combined nucleus/upgrades/upgrade.functions.php
index c8a67c0,41d8d4f..45b7e14
--- a/nucleus/upgrades/upgrade.functions.php
+++ b/nucleus/upgrades/upgrade.functions.php
@@@ -13,7 -13,7 +13,7 @@@
  /**
   * @license http://nucleuscms.org/license.txt GNU General Public License
   * @copyright Copyright (C) 2002-2012 The Nucleus Group
-  * @version $Id: upgrade.functions.php 1690 2012-03-08 22:45:08Z ftruscot $
+  * @version $Id: upgrade.functions.php 1889 2012-06-17 08:46:45Z sakamocchi $
   */
  
  	/**
@@@ -147,9 -147,9 +147,15 @@@
  			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;
  	}
  
@@@ -202,9 -202,9 +208,9 @@@
  		echo "<head>\n";
  		echo "<title> Nucleus Upgrade </title>\n";
  		
- 		if ( file_exists('../styles/manual.css') )
+ 		if ( file_exists('../documentation/styles/manual.css') )
  		{
- 			echo "<link rel=\"stylesheet\" href=\"../styles/manual.css\" type=\"text/css\" />\n";
+ 			echo "<link rel=\"stylesheet\" href=\"../documentation/styles/manual.css\" type=\"text/css\" />\n";
  		}
  		else
  		{
@@@ -302,14 -302,13 +308,14 @@@
  		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
@@@ -365,19 -364,19 +371,19 @@@
  		$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
@@@ -405,10 -404,10 +411,10 @@@
  	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;
  		}
@@@ -430,10 -429,10 +436,10 @@@
  	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;
  		}
@@@ -456,10 -455,10 +462,10 @@@
  	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;
  		}
diff --combined nucleus/upgrades/upgrade0.96.php
index d0bf3f1,8099dfe..4d0f269
--- a/nucleus/upgrades/upgrade0.96.php
+++ b/nucleus/upgrades/upgrade0.96.php
@@@ -12,7 -12,7 +12,7 @@@
  /**
   * @license http://nucleuscms.org/license.txt GNU General Public License
   * @copyright Copyright (C) 2002-2012 The Nucleus Group
-  * @version $Id: upgrade0.96.php 1546 2011-06-30 15:36:25Z ftruscot $
+  * @version $Id: upgrade0.96.php 1809 2012-05-01 14:48:30Z sakamocchi $
   */
  
  function upgrade_do96() {
@@@ -74,15 -74,17 +74,15 @@@
  	// 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%>');";
diff --combined nucleus/upgrades/upgrade1.0.php
index a8e96d0,5cb0b81..50e21e6
--- a/nucleus/upgrades/upgrade1.0.php
+++ b/nucleus/upgrades/upgrade1.0.php
@@@ -12,7 -12,7 +12,7 @@@
  /**
   * @license http://nucleuscms.org/license.txt GNU General Public License
   * @copyright Copyright (C) 2002-2012 The Nucleus Group
-  * @version $Id: upgrade1.0.php 1388 2009-07-18 06:31:28Z shizuki $
+  * @version $Id: upgrade1.0.php 1809 2012-05-01 14:48:30Z sakamocchi $
   */
  
  function upgrade_do100() {
@@@ -51,11 -51,11 +51,11 @@@
  		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{
diff --combined nucleus/upgrades/upgrade1.1.php
index 6403ab4,f324ea2..7c6cf8a
--- a/nucleus/upgrades/upgrade1.1.php
+++ b/nucleus/upgrades/upgrade1.1.php
@@@ -12,7 -12,7 +12,7 @@@
  /**
   * @license http://nucleuscms.org/license.txt GNU General Public License
   * @copyright Copyright (C) 2002-2012 The Nucleus Group
-  * @version $Id: upgrade1.1.php 1388 2009-07-18 06:31:28Z shizuki $
+  * @version $Id: upgrade1.1.php 1809 2012-05-01 14:48:30Z sakamocchi $
   */
  
  function upgrade_do110() {
@@@ -71,9 -71,9 +71,9 @@@
  		// 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 +92,9 @@@
  		
  		// 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>');";
diff --combined nucleus/upgrades/upgrade1.5.php
index 61e3ede,0c58171..fc4f885
--- a/nucleus/upgrades/upgrade1.5.php
+++ b/nucleus/upgrades/upgrade1.5.php
@@@ -12,7 -12,7 +12,7 @@@
  /**
   * @license http://nucleuscms.org/license.txt GNU General Public License
   * @copyright Copyright (C) 2002-2012 The Nucleus Group
-  * @version $Id: upgrade1.5.php 1546 2011-06-30 15:36:25Z ftruscot $
+  * @version $Id: upgrade1.5.php 1889 2012-06-17 08:46:45Z sakamocchi $
   */
  
  function upgrade_do150() {
@@@ -54,11 -54,11 +54,11 @@@
  		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 +72,9 @@@
  	
  	// 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,22 -82,20 +82,22 @@@
  	}
  	
  	// 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);
  		}
  	}
  
diff --combined nucleus/upgrades/upgrade2.5.php
index a602734,9cade8a..0041e40
--- a/nucleus/upgrades/upgrade2.5.php
+++ b/nucleus/upgrades/upgrade2.5.php
@@@ -12,7 -12,7 +12,7 @@@
  /**
   * @license http://nucleuscms.org/license.txt GNU General Public License
   * @copyright Copyright (C) 2002-2012 The Nucleus Group
-  * @version $Id: upgrade2.5.php 1685 2012-03-01 15:28:00Z sakamocchi $
+  * @version $Id: upgrade2.5.php 1889 2012-06-17 08:46:45Z sakamocchi $
   */
  
  function upgrade_do250() {
@@@ -47,23 -47,23 +47,23 @@@
  			$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']
  							);
  			}
  		}
diff --combined nucleus/upgrades/upgrade3.3.php
index 64fd207,2666fb4..5cd17b6
--- a/nucleus/upgrades/upgrade3.3.php
+++ b/nucleus/upgrades/upgrade3.3.php
@@@ -12,7 -12,7 +12,7 @@@
  /**
   * @license http://nucleuscms.org/license.txt GNU General Public License
   * @copyright Copyright (C) 2002-2012 The Nucleus Group
-  * @version $Id: upgrade3.3.php 1388 2009-07-18 06:31:28Z shizuki $
+  * @version $Id: upgrade3.3.php 1809 2012-05-01 14:48:30Z sakamocchi $
   */
  
  function upgrade_do330() {
@@@ -35,7 -35,7 +35,7 @@@
  	}
  
  	// 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 +61,8 @@@
  
  	// 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>";
  	}
  }
diff --combined nucleus/upgrades/upgrade4.0.php
index 8896fbf,07a122b..ed756b5
--- a/nucleus/upgrades/upgrade4.0.php
+++ b/nucleus/upgrades/upgrade4.0.php
@@@ -12,7 -12,7 +12,7 @@@
  /**
   * @license http://nucleuscms.org/license.txt GNU General Public License
   * @copyright Copyright (C) 2002-2012 The Nucleus Group
-  * @version $Id: upgrade2.0.php 1388 2009-07-18 06:31:28Z shizuki $
+  * @version $Id$
   */
  
  function upgrade_do400()
@@@ -22,29 -22,160 +22,167 @@@
  		return "already installed";
  	}
  	
- 	/* config.Language to config.Locale  */
- 	if ( !upgrade_checkIfColumnExists('config','Locale') )
+ 	// 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!';
+ 	}
+ 	
+ 	/* config table */
+ 	/* change Language setting to Locale */
+ 	if ( upgrade_checkIfCVExists('Language') )
+ 	{
+ 		$res = sql_query("SELECT value FROM " . sql_table('config') . " WHERE name='Language'");
+ 		if ( $res !== FALSE )
+ 		{
+ 			$row = sql_fetch_assoc($res);
+ 			$locale = i18n_upg::convert_old_language_file_name_to_locale($row['value']);
+ 			if ( $locale )
+ 			{
+ 				$query = 'INSERT INTO ' . sql_table('config') . " VALUES ('Locale','{$locale}')";
+ 				upgrade_query('Creating Locale config value', $query);
+ 				
+ 				$query = 'DELETE FROM ' . sql_table('config') . " WHERE name='Language'";
+ 				upgrade_query("Removing Language config value", $query);
+ 			}
++>>>>>>> skinnable-master
  		}
- 		$query = 'INSERT INTO ' . sql_table('config') . " (name, value) VALUE('Locale', '{$locale}');";
- 		upgrade_query("Renaming Language for configs to Locale", $query);
  	}
  	
- 	if ( !upgrade_checkIfColumnExists('config','Language') )
+ 	/* change AdminCSS setting */
+ 	if ( upgrade_checkIfCVExists('AdminCSS') )
+ 	{
+ 		$query = 'UPDATE ' . sql_table('config') . " SET value='original' WHERE name='AdminCSS'";
+ 		upgrade_query('Changing AdminCSS config value', $query);
+ 	}
+ 	
+ 	/* create AdminSkin setting */
+ 	if ( !upgrade_checkIfCVExists('AdminSkin') )
+ 	{
+ 		$query = 'INSERT INTO ' . sql_table('config') . " VALUES ('AdminSkin','0')";
+ 		upgrade_query('Creating AdminSkin config value', $query);
+ 	}
+ 	
+ 	/* create BookmarkletSkin setting */
+ 	if ( !upgrade_checkIfCVExists('BookmarkletSkin') )
  	{
- 		$query = "DELETE * FROM " . sql_table('config') . " WHERE name='Language'";
- 		upgrade_query("Renaming Language for configs to Locale", $query);
+ 		$query = 'INSERT INTO ' . sql_table('config') . " VALUES ('BookmarkletSkin','0')";
+ 		upgrade_query('Creating BookmarkletSkin config value', $query);
  	}
  	
- 	/* member.deflang to member.mlocale   */
+ 	
+ 	/* member table */
+ 	/* changing the member table to rename deflang to mlocale */
  	if ( !upgrade_checkIfColumnExists('member','mlocale') )
  	{
- 		$query =  'ALTER TABLE '.sql_table('member') . " CHANGE deflang mlocale varchar(10) NOT NULL default ''";
+ 		$query =  'ALTER TABLE '.sql_table('member') . " CHANGE deflang mlocale varchar(20) NOT NULL default '' AFTER mcookiekey";
  		upgrade_query("Renaming deflang column for members to mlocale", $query);
  	}
+ 	
+ 	/* changing the member table to add madminskin column */
+ 	if ( !upgrade_checkIfColumnExists('member','madminskin') )
+ 	{
+ 		$query =  'ALTER TABLE '.sql_table('member') . " ADD madminskin tinyint(2) NOT NULL default '0'";
+ 		upgrade_query("Adding a new row for the adminskin member option", $query);
+ 	}
+ 	
+ 	/* changing the member table to add mbkmklt column */
+ 		if ( !upgrade_checkIfColumnExists('member','mbkmklt') )
+ 	{
+ 		$query =  'ALTER TABLE '.sql_table('member') . " ADD mbkmklt tinyint(2) NOT NULL default '0'";
+ 		upgrade_query("Adding a new row for the bkmklt member option", $query);
+ 	}
+ 	
+ 	// all member default value set
+ 	$result = sql_query("SELECT * FROM " . sql_table('member'));
+ 	while ( $row = mysql_fetch_assoc($result) )
+ 	{
+ 		$locale = i18n_upg::convert_old_language_file_name_to_locale($row['mlocale']);
+ 		if ( $locale )
+ 		{
+ 			$query = 'UPDATE $s SET mlocale=$s WHERE mnumber=$d';
+ 			$query = sprintf($query, sql_table('member'), addslashes($locale), $row['mnumber']);
+ 			upgrade_query('Changing mlocale value', $query);
+ 		}
+ 	}
+ 	
+ 	// 3.6 -> 4.0
+ 	// update database version
+ 	update_version('400');
+ 	
  }
  
+ class i18n_upg
+ {
+ 	/**
+ 	* i18n::convert_old_language_file_name_to_locale()
+ 	* NOTE: this should be obsoleted near future.
+ 	*
+ 	* @static
+ 	* @param	string	$target_language	old translation file name
+ 	* @return	string	locale name as language_script_region
+ 	*/
+ 	static public function convert_old_language_file_name_to_locale($target_language)
+ 	{
+ 		$target_locale = '';
+ 		foreach ( self::$lang_refs as $language => $locale )
+ 		{
+ 			if ( $target_language == $language )
+ 			{
+ 				if ( preg_match('#^(.+)\.(.+)$#', $locale, $match) )
+ 				{
+ 					$target_locale = $match[1];
+ 				}
+ 				else
+ 				{
+ 					$target_locale = $locale;
+ 				}
+ 				break;
+ 			}
+ 		}
+ 		return $target_locale;
+ 	}
+ 	
+ 	/**
+ 	 * i18n::$lang_refs
+ 	 * reference table to convert old and new way to name translation files.
+ 	 * NOTE: this should be obsoleted as soon as possible.
+ 	 *
+ 	 * @static
+ 	 */
+ 	static private $lang_refs = array(
+ 			"english"		=> "en_Latn_US",
+ 			"english-utf8"	=> "en_Latn_US.UTF-8",
+ 			"bulgarian"	=> "bg_Cyrl_BG",
+ 			"finnish"		=> "fi_Latn_FI",
+ 			"catalan"		=> "ca_Latn_ES",
+ 			"french"		=> "fr_Latn_FR",
+ 			"russian"		=> "ru_Cyrl_RU",
+ 			"chinese"		=> "zh_Hans_CN",
+ 			"simchinese"	=> "zh_Hans_CN",
+ 			"chineseb5"	=> "zh_Hant_TW",
+ 			"traditional_chinese"	=>	"zh_Hant_TW",
+ 			"galego"		=> "gl_Latn_ES",
+ 			"german"		=> "de_Latn_DE",
+ 			"korean-utf"	=> "ko_Kore_KR.UTF-8",
+ 			"korean-euc-kr"	=> "ko_Kore_KR.EUC-KR",
+ 			"slovak"		=> "sk_Latn_SK",
+ 			"czech"		=> "cs_Latn_CZ",
+ 			"hungarian"	=> "hu_Latn_HU",
+ 			"latvian"		=> "lv_Latn_LV",
+ 			"nederlands"	=> "nl_Latn_NL",
+ 			"italiano"		=> "it_Latn_IT",
+ 			"persian"		=> "fa_Arab_IR",
+ 			"spanish"		=> "es_Latn_ES",
+ 			"spanish-utf8"	=> "es_Latn_ES.UTF-8",
+ 			"japanese-euc"	=> "ja_Jpan_JP.EUC-JP",
+ 			"japanese-utf8"	=> "ja_Jpan_JP.UTF-8",
+ 			"portuguese_brazil"	=> "pt_Latn_BR"
+ 			);
+ }
diff --combined nucleus/xmlrpc/server.php
index 462e340,5ac0922..2a03069
--- a/nucleus/xmlrpc/server.php
+++ b/nucleus/xmlrpc/server.php
@@@ -1,7 -1,7 +1,7 @@@
  <?php
  /*
   * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
-  * Copyright (C) 2002-2012 The Nucleus Group
+  * 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
@@@ -61,8 -61,8 +61,8 @@@
   * mt.supportedMethods
   *
   * @license http://nucleuscms.org/license.txt GNU General Public License
-  * @copyright Copyright (C) 2002-2012 The Nucleus Group
-  * @version $Id: server.php 1622 2012-01-09 03:18:59Z sakamocchi $
+  * @copyright Copyright (C) 2002-2009 The Nucleus Group
+  * @version $Id: server.php 1889 2012-06-17 08:46:45Z sakamocchi $
   */
  $CONF = array();
  $DIR_LIBS = '';
@@@ -282,7 -282,7 +282,11 @@@ function _getSkinPart($blogid, $usernam
  
  	// 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 -303,7 +307,11 @@@ function _setSkinPart($blogid, $usernam
  
  	// 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'));
diff --combined skins/admin/bookmarklet/javascripts/edit.js
index c1cc3c0,2f00ebc..266790f
--- a/skins/admin/bookmarklet/javascripts/edit.js
+++ b/skins/admin/bookmarklet/javascripts/edit.js
@@@ -137,16 -137,14 +137,14 @@@ var nonie_FormType = 'body'
  
  // Add media to new item
  function addMedia() {
- 
- 	var mediapopup = window.open(nucleusMediaPopupURL + 'media.php','name',
- 		'status=yes,toolbar=no,scrollbars=yes,resizable=yes,width=500,height=450,top=0,left=0');
- 
- 	return;
- }
- 
- 
- function setMediaPopupURL(url) {
- 	nucleusMediaPopupURL = url;
+ 	if ( typeof(medium) != 'undefined' )
+ 	{
+ 		medium.addMedia();
+ 	}
+ 	else
+ 	{
+ 		alert('Media Plugin Not Found');
+ 	}
  }
  
  function includeImage(collection, filename, type, width, height) {
@@@ -338,6 -336,7 +336,6 @@@ function BtnHighlight(el) 
  
  function BtnNormal(el) {
  	with(el.style){
 -		padding="3px";
  		border="1px solid #dddddd";
  	}
  }
diff --combined skins/admin/bookmarklet/styles/addedit.css
index 0000000,f8749f1..29a7d99
mode 000000,100644..100644
--- a/skins/admin/bookmarklet/styles/addedit.css
+++ b/skins/admin/bookmarklet/styles/addedit.css
@@@ -1,0 -1,46 +1,53 @@@
+ /*
+ 	This stylesheet serves to make item previews look nicer, and to markup the 
+ 	buttonbar
+ 	
+ 	$Id: addedit.css 757 2005-08-12 07:29:40Z dekarma $
+ */
+ 
+ .leftbox, .rightbox {
+ 	margin: 3px;
+ 	padding: 3px;
+ 	font-size: larger;
+ 	width: 20%;
+ }
+ .leftbox {
+ 	float: left;
+ 	border-right: 2px solid #888;	
+ }
+ .rightbox {
+ 	float: right;
+ 	border-left: 2px solid #888;	
+ }
+ 
+ /* markup buttons */
+ .jsbuttonbar {
++<<<<<<< HEAD:nucleus/styles/addedit.css
++	height: 30px;
++=======
+ 	padding: 3px;
++>>>>>>> skinnable-master:skins/admin/bookmarklet/styles/addedit.css
+ 	cursor: default;
+ }
+ 
+ .jsbutton {
+ 	float: left;
+ 	padding: 3px;
+ 	margin-right: 4px;
+ 	height: 16px;
+ 	width: 16px;
+ 	border: 1px solid #dddddd;
+ 	background-color: white;
+ }
+ 
+ .jsbuttonspacer {
+ 	float: left;
+ 	width: 10px;
++<<<<<<< HEAD:nucleus/styles/addedit.css
++=======
+ }
+ 
+ .jsbuttonend {
+ 	clear: both;
++>>>>>>> skinnable-master:skins/admin/bookmarklet/styles/addedit.css
+ }
diff --combined skins/admin/default/styles/admin_original.css
index e477d43,d25f9a7..113fc9e
--- a/skins/admin/default/styles/admin_original.css
+++ b/skins/admin/default/styles/admin_original.css
@@@ -1,7 -1,7 +1,7 @@@
  /*
  	admin area style
  
- 	$Id: admin_original.css 1652 2012-02-11 06:02:05Z sakamocchi $
+ 	$Id: admin_original.css 1888 2012-06-17 08:38:54Z sakamocchi $
  */
  
  body {
@@@ -269,9 -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;
@@@ -279,23 -277,17 +279,23 @@@
  }
  
  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;
diff --combined skins/default/nicetitle.js
index c8f073f,43372af..30c2286
--- a/skins/default/nicetitle.js
+++ b/skins/default/nicetitle.js
@@@ -433,9 -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 -446,7 +452,11 @@@
  		{
  		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;
  		}