diff --git a/upload/blocks/1_notify.php b/upload/blocks/1_notify.php
index 9fbf20b..d9f7631 100644
--- a/upload/blocks/1_notify.php
+++ b/upload/blocks/1_notify.php
@@ -2,22 +2,32 @@
 
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
-if(isset($_SESSION['mcr_notify'])){
+class block_notify{
+	private $core, $db;
 
-	$new_data = array(
-		"TYPE" => $this->db->HSC($_SESSION['notify_type']),
-		"TITLE" => $this->db->HSC($_SESSION['notify_title']),
-		"MESSAGE" => $this->db->HSC($_SESSION['notify_msg'])
-	);
+	public function __construct($core){
+		$this->core = $core;
+		$this->db = $core->db;
+	}
 
-	echo $this->sp(MCR_THEME_PATH."blocks/notify/alert.html", $new_data);
+	public function content(){
+		if(!isset($_SESSION['mcr_notify'])){ return ''; }
+
+		$new_data = array(
+			"TYPE" => $this->db->HSC($_SESSION['notify_type']),
+			"TITLE" => $this->db->HSC($_SESSION['notify_title']),
+			"MESSAGE" => $this->db->HSC($_SESSION['notify_msg'])
+		);
+
+		$result = $this->core->sp(MCR_THEME_PATH."blocks/notify/alert.html", $new_data);
 	
-	unset($_SESSION['mcr_notify']);
-	unset($_SESSION['notify_type']);
-	unset($_SESSION['notify_title']);
-	unset($_SESSION['notify_msg']);
+		unset($_SESSION['mcr_notify']);
+		unset($_SESSION['notify_type']);
+		unset($_SESSION['notify_title']);
+		unset($_SESSION['notify_msg']);
+
+		return $result;
+	}
 }
 
-
-
 ?>
\ No newline at end of file
diff --git a/upload/blocks/2_profile.php b/upload/blocks/2_profile.php
index 7457109..9f43399 100644
--- a/upload/blocks/2_profile.php
+++ b/upload/blocks/2_profile.php
@@ -2,8 +2,19 @@
 
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
-$authfile = (!$this->user->is_auth) ? "unauth" : "auth";
+class block_profile{
+	private $core, $user;
 
-echo $this->sp(MCR_THEME_PATH."blocks/profile/$authfile.html");
+	public function __construct($core){
+		$this->core = $core;
+		$this->user = $core->user;
+	}
+
+	public function content(){
+		$authfile = (!$this->user->is_auth) ? "unauth" : "auth";
+
+		return $this->core->sp(MCR_THEME_PATH."blocks/profile/$authfile.html");
+	}
+}
 
 ?>
\ No newline at end of file
diff --git a/upload/blocks/3_monitor.php b/upload/blocks/3_monitor.php
index 65096ed..78a693c 100644
--- a/upload/blocks/3_monitor.php
+++ b/upload/blocks/3_monitor.php
@@ -2,8 +2,59 @@
 
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
-if($this->is_access("sys_monitoring")){
-	echo $this->sp(MCR_THEME_PATH."blocks/monitor/main.html");
+class block_monitor{
+	private $core, $db, $user, $lng;
+
+	public function __construct($core){
+		$this->core	= $core;
+		$this->db	= $core->db;
+		$this->user	= $core->user;
+		$this->lng	= $core->lng_b;
+	}
+
+	private function server_array(){
+		$query = $this->db->query("SELECT id, title, `text`, ip, `port`, `status`, online, slots, players FROM `mcr_monitoring`");
+
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->lng['empty']; }
+
+		ob_start();
+
+		while($ar = $this->db->fetch_assoc($query)){
+
+			$status = (intval($ar['status'])===1) ? 'progress-info' : 'progress-danger';
+			$slots = intval($ar['slots']);
+			$online = intval($ar['online']);
+
+			$progress = ($online<=0) ? 0 : ceil(100 / ($slots / $online));
+
+			if(intval($ar['status'])!=1){ $progress = 100; }
+
+			$data = array(
+				'ID' => intval($ar['id']),
+				'TITLE' => $this->db->HSC($ar['title']),
+				'TEXT' => $this->db->HSC($ar['text']),
+				'IP' => $this->db->HSC($ar['ip']),
+				'PORT' => intval($ar['port']),
+				'PROGRESS' => $progress,
+				'STATUS' => $status,
+				'STATS' => (intval($ar['status'])===1) ? $online.' / '.$slots : $this->lng['offline'],
+			);
+
+			echo $this->core->sp(MCR_THEME_PATH."blocks/monitor/monitor-id.html", $data);
+		}
+
+		return ob_get_clean();
+	}
+
+	public function content(){
+		if(!$this->core->is_access("sys_monitoring")){ return; }
+
+		$data = array(
+			'CONTENT' => $this->server_array(),
+		);
+
+		return $this->core->sp(MCR_THEME_PATH."blocks/monitor/main.html", $data);
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/upload/blocks/4_banner.php b/upload/blocks/4_banner.php
new file mode 100644
index 0000000..5dfcf70
--- /dev/null
+++ b/upload/blocks/4_banner.php
@@ -0,0 +1,19 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class block_banner{
+	private $core;
+
+	public function __construct($core){
+		$this->core = $core;
+	}
+
+	public function content(){
+		if(!$this->core->is_access("sys_adm_main")){ return; }
+
+		return $this->core->sp(MCR_THEME_PATH."blocks/banner/main.html");
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/blocks/4_top.php b/upload/blocks/4_top.php
deleted file mode 100644
index 6abc466..0000000
--- a/upload/blocks/4_top.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(!defined("MCR")){ exit("Hacking Attempt!"); }
-
-if($this->is_access("sys_adm_main")){
-	echo $this->sp(MCR_THEME_PATH."blocks/top/main.html");
-}
-
-?>
\ No newline at end of file
diff --git a/upload/cache/.htaccess b/upload/cache/.htaccess
new file mode 100644
index 0000000..3a42882
--- /dev/null
+++ b/upload/cache/.htaccess
@@ -0,0 +1 @@
+Deny from all
diff --git a/upload/configs/db.php b/upload/configs/db.php
index ceec5b0..0206a38 100644
--- a/upload/configs/db.php
+++ b/upload/configs/db.php
@@ -3,8 +3,9 @@
   'host' => 'localhost',
   'user' => 'root',
   'pass' => '',
-  'base' => 'webmcr',
+  'base' => 'minecraft',
   'port' => 3306,
   'backend' => 'mysqli',
+  'log' => true,
 );
 ?>
\ No newline at end of file
diff --git a/upload/configs/main.php b/upload/configs/main.php
index df373bc..f722765 100644
--- a/upload/configs/main.php
+++ b/upload/configs/main.php
@@ -9,18 +9,17 @@
   'log' => false,
   'install' => true,
   'p_logic' => 'usual',
-  'debug' => false,
+  'debug' => true,
   's_lang' => 'ru_RU',
   's_root' => '/',
-  's_root_full' => 'http://site.ru',
-  'mcr_secury' => '',
+  's_root_full' => 'http://localhost',
+  'mcr_secury' => 'IRmMO5hR$U3IypSR@KBH',
   'crypt' => 0,
   'reg_accept' => true,
-  'captcha' => 0,
-  'rc_public' => '',
-  'rc_private' => '',
-  'kc_public' => '',
-  'kc_private' => '',
-  'mon_type' => 1
+  'captcha' => 1,
+  'rc_public' => '6LdNLf8SAAAAABs0jjSANg543acy6NGi4bH1MX-A',
+  'rc_private' => '6LdNLf8SAAAAAO-XQUcGglTRw4ZZw2tO8163hudD',
+  'kc_public' => '78758',
+  'kc_private' => 'nBJjeiTqRAuXZlqwklPHSgtlCj',
 );
 ?>
\ No newline at end of file
diff --git a/upload/configs/modules/admin.php b/upload/configs/modules/admin.php
new file mode 100644
index 0000000..a9dea8c
--- /dev/null
+++ b/upload/configs/modules/admin.php
@@ -0,0 +1,17 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+$cfg = array(
+	'MOD_ENABLE'		=> true,
+	'MOD_TITLE'			=> 'Панель управления',
+	'MOD_DESC'			=> 'Модуль панели управления',
+	'MOD_AUTHOR'		=> 'Qexy',
+	'MOD_SITE'			=> 'http://qexy.org',
+	'MOD_EMAIL'			=> 'admin@qexy.org',
+	'MOD_VERSION'		=> '1.0',
+	'MOD_URL_UPDATE'	=> 'http://update.webmcr.com/?do=modules&op=admin',
+	'MOD_CHECK_UPDATE'	=> true,
+);
+
+?>
\ No newline at end of file
diff --git a/upload/configs/modules/ajax.php b/upload/configs/modules/ajax.php
new file mode 100644
index 0000000..59482c3
--- /dev/null
+++ b/upload/configs/modules/ajax.php
@@ -0,0 +1,17 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+$cfg = array(
+	'MOD_ENABLE'		=> true,
+	'MOD_TITLE'			=> 'Ajax',
+	'MOD_DESC'			=> 'Модуль Ajax запросов',
+	'MOD_AUTHOR'		=> 'Qexy',
+	'MOD_SITE'			=> 'http://qexy.org',
+	'MOD_EMAIL'			=> 'admin@qexy.org',
+	'MOD_VERSION'		=> '1.0',
+	'MOD_URL_UPDATE'	=> 'http://update.webmcr.com/?do=modules&op=ajax',
+	'MOD_CHECK_UPDATE'	=> true,
+);
+
+?>
\ No newline at end of file
diff --git a/upload/configs/modules/auth.php b/upload/configs/modules/auth.php
new file mode 100644
index 0000000..f234f2d
--- /dev/null
+++ b/upload/configs/modules/auth.php
@@ -0,0 +1,17 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+$cfg = array(
+	'MOD_ENABLE'		=> true,
+	'MOD_TITLE'			=> 'Авторизация',
+	'MOD_DESC'			=> 'Модуль авторизации пользователей',
+	'MOD_AUTHOR'		=> 'Qexy',
+	'MOD_SITE'			=> 'http://qexy.org',
+	'MOD_EMAIL'			=> 'admin@qexy.org',
+	'MOD_VERSION'		=> '1.0',
+	'MOD_URL_UPDATE'	=> 'http://update.webmcr.com/?do=modules&op=auth',
+	'MOD_CHECK_UPDATE'	=> true,
+);
+
+?>
\ No newline at end of file
diff --git a/upload/configs/modules/file.php b/upload/configs/modules/file.php
new file mode 100644
index 0000000..8105fff
--- /dev/null
+++ b/upload/configs/modules/file.php
@@ -0,0 +1,13 @@
+<?php
+$cfg = array (
+  'MOD_ENABLE' => true,
+  'MOD_TITLE' => 'Файловый загрузчик',
+  'MOD_DESC' => 'Модуль скачивания файлов',
+  'MOD_AUTHOR' => 'Qexy',
+  'MOD_SITE' => 'http://qexy.org',
+  'MOD_EMAIL' => 'admin@qexy.org',
+  'MOD_VERSION' => '1.0',
+  'MOD_URL_UPDATE' => 'http://update.webmcr.com/?do=modules&op=file',
+  'MOD_CHECK_UPDATE' => true,
+);
+?>
\ No newline at end of file
diff --git a/upload/configs/modules/logout.php b/upload/configs/modules/logout.php
new file mode 100644
index 0000000..5613ab1
--- /dev/null
+++ b/upload/configs/modules/logout.php
@@ -0,0 +1,13 @@
+<?php
+$cfg = array (
+  'MOD_ENABLE' => true,
+  'MOD_TITLE' => 'Выход',
+  'MOD_DESC' => 'Модуль выхода пользователя с сайта',
+  'MOD_AUTHOR' => 'Qexy',
+  'MOD_SITE' => 'http://qexy.org',
+  'MOD_EMAIL' => 'admin@qexy.org',
+  'MOD_VERSION' => '1.0',
+  'MOD_URL_UPDATE' => 'http://update.webmcr.com/?do=modules&op=logout',
+  'MOD_CHECK_UPDATE' => true,
+);
+?>
\ No newline at end of file
diff --git a/upload/configs/modules/news.php b/upload/configs/modules/news.php
new file mode 100644
index 0000000..53d5f30
--- /dev/null
+++ b/upload/configs/modules/news.php
@@ -0,0 +1,13 @@
+<?php
+$cfg = array (
+  'MOD_ENABLE' => true,
+  'MOD_TITLE' => 'Новости',
+  'MOD_DESC' => 'Модуль новостей',
+  'MOD_AUTHOR' => 'Qexy',
+  'MOD_SITE' => 'http://qexy.org',
+  'MOD_EMAIL' => 'admin@qexy.org',
+  'MOD_VERSION' => '1.0',
+  'MOD_URL_UPDATE' => 'http://update.webmcr.com/?do=modules&amp;amp;amp;op=news',
+  'MOD_CHECK_UPDATE' => true,
+);
+?>
\ No newline at end of file
diff --git a/upload/configs/modules/profile.php b/upload/configs/modules/profile.php
new file mode 100644
index 0000000..6f78ab4
--- /dev/null
+++ b/upload/configs/modules/profile.php
@@ -0,0 +1,13 @@
+<?php
+$cfg = array (
+  'MOD_ENABLE' => true,
+  'MOD_TITLE' => 'Профиль пользователя',
+  'MOD_DESC' => 'Модуль личного кабинета пользователя',
+  'MOD_AUTHOR' => 'Qexy',
+  'MOD_SITE' => 'http://qexy.org',
+  'MOD_EMAIL' => 'admin@qexy.org',
+  'MOD_VERSION' => '1.0',
+  'MOD_URL_UPDATE' => 'http://update.webmcr.com/?do=modules&op=profile',
+  'MOD_CHECK_UPDATE' => true,
+);
+?>
\ No newline at end of file
diff --git a/upload/configs/modules/register.php b/upload/configs/modules/register.php
new file mode 100644
index 0000000..d6e90a5
--- /dev/null
+++ b/upload/configs/modules/register.php
@@ -0,0 +1,13 @@
+<?php
+$cfg = array (
+  'MOD_ENABLE' => true,
+  'MOD_TITLE' => 'Регистрация',
+  'MOD_DESC' => 'Модуль регистрации',
+  'MOD_AUTHOR' => 'Qexy',
+  'MOD_SITE' => 'http://qexy.org',
+  'MOD_EMAIL' => 'admin@qexy.org',
+  'MOD_VERSION' => '1.0',
+  'MOD_URL_UPDATE' => 'http://update.webmcr.com/?do=modules&op=register',
+  'MOD_CHECK_UPDATE' => true,
+);
+?>
\ No newline at end of file
diff --git a/upload/configs/modules/restore.php b/upload/configs/modules/restore.php
new file mode 100644
index 0000000..6384204
--- /dev/null
+++ b/upload/configs/modules/restore.php
@@ -0,0 +1,17 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+$cfg = array(
+	'MOD_ENABLE'		=> true,
+	'MOD_TITLE'			=> 'Сброс пароля',
+	'MOD_DESC'			=> 'Модуль сброса пароля пользователя',
+	'MOD_AUTHOR'		=> 'Qexy',
+	'MOD_SITE'			=> 'http://qexy.org',
+	'MOD_EMAIL'			=> 'admin@qexy.org',
+	'MOD_VERSION'		=> '1.0',
+	'MOD_URL_UPDATE'	=> 'http://update.webmcr.com/?do=modules&op=restore',
+	'MOD_CHECK_UPDATE'	=> true,
+);
+
+?>
\ No newline at end of file
diff --git a/upload/configs/modules/search.php b/upload/configs/modules/search.php
new file mode 100644
index 0000000..a2822d0
--- /dev/null
+++ b/upload/configs/modules/search.php
@@ -0,0 +1,13 @@
+<?php
+$cfg = array (
+  'MOD_ENABLE' => true,
+  'MOD_TITLE' => 'Поиск',
+  'MOD_DESC' => 'Модуль поиска',
+  'MOD_AUTHOR' => 'Qexy',
+  'MOD_SITE' => 'http://qexy.org',
+  'MOD_EMAIL' => 'admin@qexy.org',
+  'MOD_VERSION' => '1.0',
+  'MOD_URL_UPDATE' => 'http://update.webmcr.com/?do=modules&op=search',
+  'MOD_CHECK_UPDATE' => true,
+);
+?>
\ No newline at end of file
diff --git a/upload/configs/modules/statics.php b/upload/configs/modules/statics.php
new file mode 100644
index 0000000..947c577
--- /dev/null
+++ b/upload/configs/modules/statics.php
@@ -0,0 +1,13 @@
+<?php
+$cfg = array (
+  'MOD_ENABLE' => true,
+  'MOD_TITLE' => 'Статические страницы',
+  'MOD_DESC' => 'Модуль статических страниц',
+  'MOD_AUTHOR' => 'Qexy',
+  'MOD_SITE' => 'http://qexy.org',
+  'MOD_EMAIL' => 'admin@qexy.org',
+  'MOD_VERSION' => '1.0',
+  'MOD_URL_UPDATE' => 'http://update.webmcr.com/?do=modules&op=statics',
+  'MOD_CHECK_UPDATE' => true,
+);
+?>
\ No newline at end of file
diff --git a/upload/configs/pagin.php b/upload/configs/pagin.php
index c3890d7..31d2990 100644
--- a/upload/configs/pagin.php
+++ b/upload/configs/pagin.php
@@ -19,5 +19,6 @@
   'adm_groups' => 10,
   'adm_permissions' => 10,
   'adm_statics' => 10,
+  'adm_logs' => 10,
 );
 ?>
\ No newline at end of file
diff --git a/upload/engine/cloak.class.php b/upload/engine/cloak.class.php
index 0d35518..102ebe3 100644
--- a/upload/engine/cloak.class.php
+++ b/upload/engine/cloak.class.php
@@ -13,7 +13,7 @@
 		$this->db	= $core->db;
 		$this->lng	= $core->lng;
 
-		if(!is_writable(MCR_CLOAK_PATH)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_load_cloak_folder'], 2, '?mode=profile'); }
+		if(!is_writable(MCR_CLOAK_PATH)){ $this->core->notify($this->lng['e_msg'], $this->lng['cloak_e_folder_perm'], 2, '?mode=profile'); }
 
 		$size = intval($obj['size']);
 		$tmp = $obj['tmp_name'];
@@ -22,52 +22,52 @@
 			case 0: break;
 
 			case 1:
-			case 2: $this->core->notify($this->lng['e_msg'], $this->lng['e_load_size'], 2, '?mode=profile'); break;
+			case 2: $this->core->notify($this->lng['e_msg'], $this->lng['cloak_e_size'], 2, '?mode=profile'); break;
 
 			case 3:
-			case 4: $this->core->notify("", $this->lng['e_load_cloak'], 2, '?mode=profile'); break;
+			case 4: $this->core->notify("", $this->lng['cloak_e'], 2, '?mode=profile'); break;
 
-			case 6: $this->core->notify($this->lng['e_msg'], $this->lng['e_load_temp'], 2, '?mode=profile'); break;
+			case 6: $this->core->notify($this->lng['e_msg'], $this->lng['cloak_e_temp'], 2, '?mode=profile'); break;
 
-			case 7: $this->core->notify($this->lng['e_msg'], $this->lng['e_load_perm'], 2, '?mode=profile'); break;
+			case 7: $this->core->notify($this->lng['e_msg'], $this->lng['cloak_e_perm'], 2, '?mode=profile'); break;
 
-			default: $this->core->notify("", $this->lng['e_load_undefined'], 2, '?mode=profile'); break;
+			default: $this->core->notify("", $this->lng['cloak_e_undefined'], 2, '?mode=profile'); break;
 		}
 
-		if(($size/1024)>$this->user->permissions->sys_max_file_size){ $this->core->notify($this->lng['e_msg'], $this->lng['e_load_size'], 2, '?mode=profile'); }
+		if(($size/1024)>$this->user->permissions->sys_max_file_size){ $this->core->notify($this->lng['e_msg'], $this->lng['cloak_e_size'], 2, '?mode=profile'); }
 		
 		if(!file_exists($tmp)){
-			$this->core->notify($this->lng['e_msg'], $this->lng['e_load_tempfile'], 2, '?mode=profile');
+			$this->core->notify($this->lng['e_msg'], $this->lng['cloak_e_tempfile'], 2, '?mode=profile');
 		}
 
-		if(substr($obj['name'], -4)!='.png'){ $this->core->notify($this->lng['e_msg'], $this->lng['e_load_png'], 2, '?mode=profile'); }
+		if(substr($obj['name'], -4)!='.png'){ $this->core->notify($this->lng['e_msg'], $this->lng['cloak_e_png'], 2, '?mode=profile'); }
 
 		$get_size = @getimagesize($tmp);
 
-		if(!$get_size){ $this->core->notify($this->lng['e_msg'], $this->lng['e_load_png'], 2, '?mode=profile'); }
+		if(!$get_size){ $this->core->notify($this->lng['e_msg'], $this->lng['cloak_e_png'], 2, '?mode=profile'); }
 
 		$width = $get_size[0];
 		$height = $get_size[1];
 
-		if(!$this->is_cloak_valid($get_size)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_load_format'], 2, '?mode=profile'); }
+		if(!$this->is_cloak_valid($get_size)){ $this->core->notify($this->lng['e_msg'], $this->lng['cloak_e_format'], 2, '?mode=profile'); }
 
 		// Resave head of skin +
 		if(!file_exists(MCR_SKIN_PATH.'interface/'.$this->user->login.'_mini.png')){
-			if(!copy(MCR_SKIN_PATH.'interface/.default_mini.png', MCR_SKIN_PATH.'interface/'.$this->user->login.'_mini.png')){ $this->core->notify("", $this->lng['e_load_save'], 2, '?mode=profile'); }
+			if(!copy(MCR_SKIN_PATH.'interface/default_mini.png', MCR_SKIN_PATH.'interface/'.$this->user->login.'_mini.png')){ $this->core->notify("", $this->lng['cloak_e_save'], 2, '?mode=profile'); }
 		}
 		// Resave head of skin -
 
 		// Create and save preview of cloak +
 		$new_preview = $this->create_preview($tmp);
 
-		if($new_preview===false){ $this->core->notify($this->lng['e_msg'], $this->lng['e_load_png'], 2, '?mode=profile'); }
+		if($new_preview===false){ $this->core->notify($this->lng['e_msg'], $this->lng['cloak_e_png'], 2, '?mode=profile'); }
 
 		imagepng($new_preview, MCR_SKIN_PATH.'interface/'.$this->user->login.'.png');
 		// Create and save preview of cloak -
 
 		// Save new cloak +
 		if(!file_exists(MCR_CLOAK_PATH.$this->user->login.'.png')){
-			if(!copy($tmp, MCR_CLOAK_PATH.$this->user->login.'.png')){ $this->core->notify("", $this->lng['e_load_save'], 2, '?mode=profile'); }
+			if(!copy($tmp, MCR_CLOAK_PATH.$this->user->login.'.png')){ $this->core->notify("", $this->lng['cloak_e_save'], 2, '?mode=profile'); }
 		}
 		// Save new cloak -
 	}
@@ -90,8 +90,8 @@
 			$skin_path_int = MCR_SKIN_PATH.'interface/'.$this->user->skin.'.png';
 			$skin_path = MCR_SKIN_PATH.$this->user->skin.'.png';
 		}else{
-			$skin_path_int = MCR_SKIN_PATH.'interface/.default.png';
-			$skin_path = MCR_SKIN_PATH.'.default.png';
+			$skin_path_int = MCR_SKIN_PATH.'interface/default.png';
+			$skin_path = MCR_SKIN_PATH.'default.png';
 		}
 
 		$skin_string = file_get_contents($skin_path_int);
diff --git a/upload/engine/config.class.php b/upload/engine/config.class.php
index 8336a28..c32ec8f 100644
--- a/upload/engine/config.class.php
+++ b/upload/engine/config.class.php
@@ -24,6 +24,23 @@
 		$this->pagin	= $pagin;
 		$this->search	= $search;
 	}
+	
+	public function savecfg($cfg=array(), $file='main.php', $var='main'){
+
+		if(!is_array($cfg) || empty($cfg)){ return false; }
+
+		$filename = MCR_ROOT."configs/".$file;
+
+		$txt  = '<?php'.PHP_EOL;
+		$txt .= '$'.$var.' = '.var_export($cfg, true).';'.PHP_EOL;
+		$txt .= '?>';
+
+		$result = file_put_contents($filename, $txt);
+
+		if($result === false){ return false; }
+
+		return true;
+	}
 }
 
 
diff --git a/upload/engine/core.class.php b/upload/engine/core.class.php
index 61a6d2b..d5dc68d 100644
--- a/upload/engine/core.class.php
+++ b/upload/engine/core.class.php
@@ -4,17 +4,14 @@
 
 class core{
 	// Set default scope and values
-	public $config		= array();
 
 	public $bc, $title, $header, $r_block, $l_block, $menu;
 
 	public $def_header	= '';
 
-	public $db			= false;
+	public $db, $user, $config = false;
 
-	public $user		= false;
-
-	public $lng			= array();
+	public $lng, $lng_m, $lng_b = array();
 
 	public $csrf_time	= 1800;
 
@@ -32,10 +29,10 @@
 		// Create & set new object of config
 		$this->config = new config();
 
-		if(!file_exists(MCR_LANG_PATH.$this->config->main['s_lang'].'/main.php')){ exit("Language path not found"); }
+		if(!file_exists(MCR_LANG_PATH.$this->config->main['s_lang'].'/system.php')){ exit("Language path not found"); }
 
 		// Load language package
-		require_once(MCR_LANG_PATH.$this->config->main['s_lang'].'/main.php');
+		require_once(MCR_LANG_PATH.$this->config->main['s_lang'].'/system.php');
 
 		// Set language var
 		$this->lng = $lng;
@@ -60,8 +57,26 @@
 		// Create & set new object of menu
 		$this->menu = new menu($this);
 
+		$base_url = ($this->config->main['install']) ? $this->base_url() : $this->config->main['s_root'];
+
 		// Generate CSRF Secure key
-		define("MCR_SECURE_KEY", $this->gen_csrf_secure());
+		define("MCR_SECURE_KEY", $this->gen_csrf_secure());// System constants
+		define('MCR_LANG', $this->config->main['s_lang']);
+		define('MCR_LANG_DIR', MCR_LANG_PATH.MCR_LANG.'/');
+		define('MCR_THEME_PATH', MCR_ROOT.'themes/'.$this->config->main['s_theme'].'/');
+		define('MCR_THEME_MOD', MCR_THEME_PATH.'modules/');
+		define('MCR_THEME_BLOCK', MCR_THEME_PATH.'blocks/');
+		define('BASE_URL', $base_url);
+		define('ADMIN_URL', BASE_URL.'?mode=admin');
+		define('STYLE_URL', BASE_URL.'themes/'.$this->config->main['s_theme'].'/');
+		define('UPLOAD_URL', BASE_URL.'uploads/');
+		define('LANG_URL', BASE_URL.'language/'.MCR_LANG.'/');
+
+		$bc = array(
+			$this->lng['e_msg'] => BASE_URL,
+		);
+
+		$this->bc = $this->gen_bc($bc);
 	}
 
 	/**
@@ -95,16 +110,20 @@
 
 	/**
 	 * Генерация AJAX оповещений
+	 * @param String $title - Название
 	 * @param String $message - Сообщение
-	 * @param Boolean $status - Статус ошибки (true|false - Истина|Ложь)
+	 * @param Boolean $type - Тип ошибки (true|false - Истина|Ложь)
 	 * @param Array $data - Основное содержимое оповещения и доп. поля
 	 * @return JSON exit
 	 */
-	public function js_notify($message='', $status=false, $data=array()){
+	public function js_notify($message='', $title='', $type=false, $data=array()){
+
+		if(empty($title)){ $title = $this->lng['e_msg']; }
 
 		$data = array(
-			"_status" => $status,
+			"_title" => $title,
 			"_message" => $message,
+			"_type" => $type,
 			"_data" => $data
 		);
 
@@ -268,9 +287,9 @@
 	 * @return object
 	 */
 	public function load_bb_class(){
-		include(MCR_TOOL_PATH.'libs/bb.class.php');
+		include(MCR_TOOL_PATH.'libs/bbcode.parse.php');
 
-		return new bb($this);
+		return new bbcode($this);
 	}
 
 	/**
@@ -279,21 +298,21 @@
 	 */
 	public function csrf_check(){
 		if($_SERVER['REQUEST_METHOD']=='POST'){
-			if(!isset($_POST['mcr_secure'])){ $this->notify('Hacking Attempt!'); }
+			if(!isset($_POST['mcr_secure'])){ $this->notify($this->lng['e_hack']); }
 
 			$secure_key = explode('_', $_POST['mcr_secure']);
 
-			if(!isset($secure_key[1])){ $this->notify('Hacking Attempt!'); }
+			if(!isset($secure_key[1])){ $this->notify($this->lng['e_hack']); }
 
 			$secure_time = intval($secure_key[0]);
 
-			if(($secure_time+$this->csrf_time)<time()){ $this->notify('Hacking Attempt!'); }
+			if(($secure_time+$this->csrf_time)<time()){ $this->notify($this->lng['e_hack']); }
 
 			$secure_var = $secure_key[1];
 			
 			$mcr_secure = $secure_time.'_'.md5($this->user->ip.$this->config->main['mcr_secury'].$secure_time);
 
-			if($mcr_secure!==$_POST['mcr_secure']){ $this->notify('Hacking Attempt!'); }
+			if($mcr_secure!==$_POST['mcr_secure']){ $this->notify($this->lng['e_hack']); }
 		}
 	}
 
@@ -333,6 +352,7 @@
 		ob_start();
 
 		foreach($array as $title => $url){
+			$string .= ($i==0) ? $title : ' — '.$title;
 			if($count==$i){
 				echo $this->sp(MCR_THEME_PATH."breadcrumbs/id-active.html", array("TITLE" => $title));
 			}else{
@@ -343,6 +363,8 @@
 			$i++;
 		}
 
+		$this->title = $this->db->HSC($string);
+
 		return ob_get_clean();
 	}
 
@@ -352,32 +374,81 @@
 	 * @return Buffer string
 	 */
 	public function gen_bc($array=array()){
-		if(!$this->config->func['breadcrumbs']){ return false; }
 
 		$data['LIST'] = $this->gen_bc_list($array);
 
+		if(!$this->config->func['breadcrumbs']){ return false; }
+
 		return $this->sp(MCR_THEME_PATH."breadcrumbs/list.html", $data);
 	}
 
+	public function check_cfg($cfg){
+		$validator = array('MOD_ENABLE',
+			'MOD_TITLE',
+			'MOD_DESC',
+			'MOD_AUTHOR',
+			'MOD_SITE',
+			'MOD_EMAIL',
+			'MOD_VERSION',
+			'MOD_URL_UPDATE',
+			'MOD_CHECK_UPDATE',
+		);
+
+		$result = true;
+
+		foreach($validator as $key => $val){
+			if(!isset($cfg[$val])){ $result = false; }
+		}
+
+		return $result;
+	}
+
 	/**
 	 * Подгрузчик модулей
 	 * @param String $mode - название модуля
 	 * @return Object
 	 */
 	public function load_mode($mode){
-		if(!preg_match("/^\w+$/i", $mode) || !file_exists(MCR_MODE_PATH.$mode.".php")){ $this->title = $this->lng['e_mode_found']; return $this->sp(MCR_THEME_PATH."default_sp/404.html"); }
+		if(!preg_match("/^\w+$/i", $mode) || !file_exists(MCR_MODE_PATH.$mode.".php")){
+			$this->title = $this->lng['e_mode_found'];
+			return $this->sp(MCR_THEME_PATH."default_sp/404.html");
+		}
 		
+		if(!file_exists(MCR_CONF_PATH.'modules/'.$mode.'.php')){
+			return $this->sp(MCR_THEME_PATH."default_sp/mod_disable.html");
+		}
+
+		require_once(MCR_CONF_PATH.'modules/'.$mode.'.php');
+
+		if(!isset($cfg) || !$this->check_cfg($cfg) || !$cfg['MOD_ENABLE']){
+			return $this->sp(MCR_THEME_PATH."default_sp/mod_disable.html");
+		}
+
 		include_once(MCR_MODE_PATH.$mode.".php");
 
 		if(!class_exists("module")){ return $this->lng['e_mode_class']; }
 
+		$this->lng_m = $this->load_language($mode);
+
 		$module = new module($this);
+
+		@$module->cfg = $cfg;
 		
 		if(!method_exists($module, "content")){ return $this->lng['e_mode_method']; }
 
 		return $module->content();
 	}
 
+	private function load_language($mod){
+		if(!file_exists(MCR_LANG_DIR.$mod.'.php')){
+			return array();
+		}
+
+		require(MCR_LANG_DIR.$mod.'.php');
+
+		return $lng;
+	}
+
 	/**
 	 * Системный генератор хэшей паролей пользователей
 	 * @param String $string - исходный пароль
@@ -431,8 +502,18 @@
 		
 		include_once(MCR_MODE_PATH.$mode.".php");
 
+		require_once(MCR_CONF_PATH.'modules/'.$mode.'.php');
+
+		require(MCR_LANG_PATH.$this->config->main['s_lang'].'/'.$mode.'.php');
+
+		if(!$cfg['MOD_ENABLE']){ return $this->sp(MCR_THEME_PATH."default_sp/mod_disable.html"); }
+
+		$this->lng_m = $lng;
+
 		$module = new module($this);
 
+		$module->cfg = $cfg;
+
 		return $module->content();
 	}
 
@@ -443,18 +524,39 @@
 	public function load_def_blocks(){
 		$list = scandir(MCR_SIDE_PATH);
 
-		if(empty($list)){ return false;; }
+		if(empty($list)){ return false; }
 
-		ob_start();
+		$content = '';
 
 		foreach($list as $key => $file){
 			if($file=='.' || $file=='..' || substr($file, -4)!='.php'){ continue; }
 
+			$expl = explode('_', $file);
+
+			if(file_exists(MCR_LANG_DIR.'blocks/'.$expl[1])){
+				require_once(MCR_LANG_DIR.'blocks/'.$expl[1]);
+				$this->lng_b = $lng;
+			}else{
+				$this->lng_b = array();
+			}
+			
 			include_once(MCR_SIDE_PATH.$file);
 
+			$classname = 'block_'.substr($expl[1], 0, -4);
+
+			if(!class_exists($classname)){ continue; }
+
+			$obj = new $classname($this);
+
+			if(!method_exists($obj, 'content')){ continue; }
+
+			$content .= $obj->content();
+
+			unset($obj);
+
 		}
 
-		return ob_get_clean();
+		return $content;
 	}
 
 	/**
@@ -570,11 +672,11 @@
 	  * @return Boolean
 	  */
 	public function send_mail($to, $subject='[WebMCR]', $message='', $altmassage='', $smtp=false, $cc=false){
-		require(MCR_TOOL_PATH.'smtp/PHPMailerAutoload.php');
+		require(MCR_LIBS_PATH.'smtp/PHPMailerAutoload.php');
 
 		PHPMailerAutoload('smtp');
 
-		include_once(MCR_TOOL_PATH.'smtp/class.phpmailer.php');
+		include_once(MCR_LIBS_PATH.'smtp/class.phpmailer.php');
 
 		$mail = new PHPMailer;
 
@@ -591,7 +693,7 @@
 		}
 
 		$mail->CharSet = 'UTF-8';
-		$mail->setLanguage('ru', MCR_TOOL_PATH.'smpt/language/');
+		$mail->setLanguage('ru', MCR_LANG_DIR.'smpt/');
 		$mail->From = ($this->config->mail['smtp']) ? $this->config->mail['smtp_user'] : $this->config->mail['from'];
 		$mail->FromName = $this->config->mail['from_name'];
 		if(is_array($to)){
@@ -733,25 +835,6 @@
 
 		return ob_get_clean();
 	}
-	
-	public function savecfg($cfg=array(), $file='main.php', $var='main'){
-
-		if(empty($cfg)){ return false; }
-
-		$filename = MCR_ROOT."configs/".$file;
-
-		$txt  = '<?php'.PHP_EOL;
-		$txt .= '$'.$var.' = '.var_export($cfg, true).';'.PHP_EOL;
-		$txt .= '?>';
-
-		if(file_exists($filename) && !is_writable($filename)){ return false; }
-
-		$result = file_put_contents($filename, $txt);
-
-		if (is_bool($result) and $result == false){return false;}
-
-		return true;
-	}
 
 	public function validate_perm($perm){
 		$perm = $this->db->safesql($perm);
@@ -763,6 +846,14 @@
 
 		return ($ar[0]<=0) ? false : true;
 	}
+
+	public function file_manager(){
+
+		if(!$this->is_access('sys_adm_manager')){ return; }
+
+
+		return $this->sp(MCR_THEME_PATH."default_sp/file_manager.html");
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/upload/engine/db/mysql.class.php b/upload/engine/db/mysql.class.php
index 91f264d..f164e66 100644
--- a/upload/engine/db/mysql.class.php
+++ b/upload/engine/db/mysql.class.php
@@ -60,6 +60,54 @@
 	public function error(){
 		return mysql_error();
 	}
+
+	public function remove_fast($from="", $where=""){
+		if(empty($from) || empty($where)){ return false; }
+
+		$delete = $this->query("DELETE FROM `$from` WHERE $where");
+
+		if(!$delete){ return false; }
+
+		return true;
+	}
+
+	public function actlog($msg='', $uid=0){
+		if(!$this->config->db['log']){ return false; }
+
+		$uid = intval($uid);
+		$msg = $this->safesql($msg);
+		$date = time();
+
+		$insert = $this->query("INSERT INTO `mcr_logs`
+										(uid, `message`, `date`)
+									VALUES
+										('$uid', '$msg', '$date')");
+
+		if(!$insert){ return false; }
+
+		return true;
+	}
+
+	public function update_user($user){
+		if(!$user->is_auth){ return false; }
+
+		$data = array(
+			'time_create' => $user->data->time_create,
+			'time_last' => time(),
+			'firstname' => $user->data->firstname,
+			'lastname' => $user->data->lastname,
+			'gender' => $user->data->gender,
+			'birthday' => $user->data->birthday,
+		);
+
+		$data = $this->safesql(json_encode($data));
+
+		$update = $this->query("UPDATE `mcr_users` SET `ip_last`='{$user->ip}', `data`='$data' WHERE id='{$user->id}'");
+
+		if(!$update){ return false; }
+
+		return true;
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/upload/engine/db/mysqli.class.php b/upload/engine/db/mysqli.class.php
index 337083e..172ba13 100644
--- a/upload/engine/db/mysqli.class.php
+++ b/upload/engine/db/mysqli.class.php
@@ -12,6 +12,8 @@
 
 	public function __construct($config, $lng){
 
+		$this->config = $config;
+
 		$this->obj = @new mysqli($config->db['host'], $config->db['user'], $config->db['pass'], $config->db['base'], $config->db['port']);
 
 		if(mysqli_connect_errno($this->obj)){ return; }
@@ -62,6 +64,54 @@
 	public function error(){
 		return $this->obj->error;
 	}
+
+	public function remove_fast($from="", $where=""){
+		if(empty($from) || empty($where)){ return false; }
+
+		$delete = $this->query("DELETE FROM `$from` WHERE $where");
+
+		if(!$delete){ return false; }
+
+		return true;
+	}
+
+	public function actlog($msg='', $uid=0){
+		if(!$this->config->db['log']){ return false; }
+
+		$uid = intval($uid);
+		$msg = $this->safesql($msg);
+		$date = time();
+
+		$insert = $this->query("INSERT INTO `mcr_logs`
+										(uid, `message`, `date`)
+									VALUES
+										('$uid', '$msg', '$date')");
+
+		if(!$insert){ return false; }
+
+		return true;
+	}
+
+	public function update_user($user){
+		if(!$user->is_auth){ return false; }
+
+		$data = array(
+			'time_create' => $user->data->time_create,
+			'time_last' => time(),
+			'firstname' => $user->data->firstname,
+			'lastname' => $user->data->lastname,
+			'gender' => $user->data->gender,
+			'birthday' => $user->data->birthday,
+		);
+
+		$data = $this->safesql(json_encode($data));
+
+		$update = $this->query("UPDATE `mcr_users` SET `ip_last`='{$user->ip}', `data`='$data' WHERE id='{$user->id}'");
+
+		if(!$update){ return false; }
+
+		return true;
+	}
 }
 
 ?>
\ No newline at end of file
diff --git a/upload/engine/libs/bb.class.php b/upload/engine/libs/bb.class.php
deleted file mode 100644
index 790216d..0000000
--- a/upload/engine/libs/bb.class.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-if(!defined("MCR")){ exit("Hacking Attempt!"); }
-
-class bb{
-	private $core, $lng;
-
-	public function __construct($core){
-		$this->core		= $core;
-		$this->lng		= $core->lng;
-	}
-
-	public function bb_panel($for=''){
-
-		$data['PANEL_ID'] = $for;
-		$data['SMILES'] = $this->get_smiles_bb();
-
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_PATH.'default_sp/bb-panel.html', $data);
-
-		return ob_get_clean();
-	}
-
-	/**
-	 * BBquote(@param) - Recursive function for bb codes
-	 *
-	 * @param - String
-	 *
-	 * @return callback function
-	 *
-	*/
-	private function BBquote($text){
-
-		$reg = '#\[quote]((?:[^[]|\[(?!/?quote])|(?R)?)+)\[/quote]#isu';
-
-		if (is_array($text)){$text = '<blockquote>'.$text[1].'</blockquote>';}
-
-		return preg_replace_callback($reg, 'self::BBquote', $text);
-	}
-
-	public function get_smiles_bb(){
-		include(MCR_TOOL_PATH.'libs/smiles.php');
-
-		ob_start();
-
-		foreach($smiles as $key => $img){
-
-			$data = array(
-				"NAME" => $key,
-				"IMG" => $img
-			);
-
-			echo $this->core->sp(MCR_THEME_PATH.'default_sp/smile-id.html', $data);
-		}
-
-		return ob_get_clean();
-	}
-
-	private function smile_decode($text){
-		include(MCR_TOOL_PATH.'libs/smiles.php');
-
-		foreach($smiles as $key => $value){
-			$smiles[$key] = '<img src="'.BASE_URL.'uploads/smiles/'.$value.'" alt="'.$key.'">';
-		}
-
-		$search = array_keys($smiles);
-		$replace = array_values($smiles);
-
-		return str_replace($search, $replace, $text);
-	}
-
-	/**
-	 * bb_decode(@param) - Change BB-code to HTML
-	 *
-	 * @param - String
-	 *
-	 * @return String
-	 *
-	*/
-	public function decode($text){
-
-		$text = nl2br($text);
-
-		$patern = array(
-			'/\[b\](.*?)\[\/b\]/Usi',
-			'/\[i\](.*?)\[\/i\]/Usi',
-			'/\[s\](.*?)\[\/s\]/Usi',
-			'/\[u\](.*?)\[\/u\]/Usi',
-			'/\[left\](.*?)\[\/left\]/Usi',
-			'/\[center\](.*?)\[\/center\]/Usi',
-			'/\[right\](.*?)\[\/right\]/Usi',
-			'/\[code\](.*?)\[\/code\]/Usi',
-		);
-
-		$replace = array(
-			'<b>$1</b>',
-			'<i>$1</i>',
-			'<s>$1</s>',
-			'<u>$1</u>',
-			'<p align="left">$1</p>',
-			'<p align="center">$1</p>',
-			'<p align="right">$1</p>',
-			'<code>$1</code>',
-		);
-
-		$text = preg_replace($patern, $replace, $text);
-		$text = preg_replace("/\[url=(?:&#039;|&quot;|\'|\")((((ht|f)tps?|mailto):(?:\/\/)?)(?:[^<\s\'\"]+))(?:&#039;|&quot;|\'|\")\](.*?)\[\/url\]/Usi", "<a href=\"$1\">$5</a>", $text);
-		$text = preg_replace("/\[img\](((ht|f)tps?:(?:\/\/)?)(?:[^<\s\'\"]+))\[\/img\]/Usi", "<img src=\"$1\">", $text);
-		$text = preg_replace("/\[color=(?:&#039;|&quot;|\'|\")((\#[a-z0-9]{6})|([a-z]{1,30}))(?:&#039;|&quot;|\'|\")\](.*?)\[\/color\]/Usi", "<font color=\"$1\">$4</font>", $text);
-		$text = preg_replace("/\[size=(?:&#039;|&quot;|\'|\")([1-6]{1})(?:&#039;|&quot;|\'|\")\](.*?)\[\/size\]/Usi", "<font size=\"$1\">$2</font>", $text);
-
-		$text = $this->smile_decode($text);
-
-		$text = $this->BBquote($text);
-
-		return $text;
-
-	}
-
-}
-?>
\ No newline at end of file
diff --git a/upload/engine/libs/bbcode.parse.php b/upload/engine/libs/bbcode.parse.php
new file mode 100644
index 0000000..8df8cbf
--- /dev/null
+++ b/upload/engine/libs/bbcode.parse.php
@@ -0,0 +1,368 @@
+<?php
+
+/**
+ *
+ * @author Qexy
+ *
+ * @contact admin@qexy.org
+ *
+ * @version 1.0.0
+ *
+ * @copyright Qexy.org
+ *
+ * @license https://github.com/qexyorg/BB-Code-Parser/blob/master/LICENSE
+ *
+ */
+
+class bbcode{
+
+	// URL до папки со смайликами
+	private $smiles_url = '/qx_upload/api/smiles/';
+
+	private $core;
+
+	public function __construct($core){
+		$this->core		= $core;
+		$this->smiles_url = MCR_ROOT.'qx_upload/smiles/';
+	}
+
+	public function get_smiles_bb(){
+		include(MCR_TOOL_PATH.'libs/smiles.php');
+
+		ob_start();
+
+		foreach($smiles as $key => $img){
+
+			$data = array(
+				"NAME" => $key,
+				"IMG" => $img
+			);
+
+			echo $this->core->sp(MCR_THEME_PATH.'default_sp/smile-id.html', $data);
+		}
+
+		return ob_get_clean();
+	}
+
+	public function bb_panel($for=''){
+
+		$data['PANEL_ID'] = $for;
+		$data['SMILES'] = $this->get_smiles_bb();
+
+		return $this->core->sp(MCR_THEME_PATH.'default_sp/bb-panel.html', $data);
+	}
+
+	// Шаблоны обычных ББ-кодов (рекурсивные)
+	public $codes = array(
+		'b' => array(
+			'left_tag' => '<b>',
+			'right_tag' => '</b>'
+		),
+		
+		'i' => array(
+			'left_tag' => '<i>',
+			'right_tag' => '</i>'
+		),
+		
+		'u' => array(
+			'left_tag' => '<u>',
+			'right_tag' => '</u>'
+		),
+		
+		's' => array(
+			'left_tag' => '<s>',
+			'right_tag' => '</s>'
+		),
+		
+		'code' => array(
+			'left_tag' => '<div class="qxbb-code">',
+			'right_tag' => '</div>'
+		),
+		
+		'quote' => array(
+			'left_tag' => '<div class="qxbb-quote">',
+			'right_tag' => '</div>'
+		),
+		
+		'offtop' => array(
+			'left_tag' => '<span class="qxbb-offtop" title="Offtop">',
+			'right_tag' => '</span>'
+		),
+		
+		'spoiler' => array(
+			'left_tag' => '<div class="qxbb-spoiler"><button type="button" class="qxbb-spoiler-btn">Спойлер</button><div class="qxbb-spoiler-body">',
+			'right_tag' => '</div></div>'
+		),
+		
+		'reverse' => array(
+			'left_tag' => '<bdo class="qxbb-reverse" dir="rtl">',
+			'right_tag' => '</bdo>'
+		),
+		
+		'left' => array(
+			'left_tag' => '<div class="qxbb-left">',
+			'right_tag' => '</div>'
+		),
+		
+		'center' => array(
+			'left_tag' => '<div class="qxbb-center">',
+			'right_tag' => '</div>'
+		),
+		
+		'right' => array(
+			'left_tag' => '<div class="qxbb-right">',
+			'right_tag' => '</div>'
+		),
+	);
+
+	// Шаблоны ББ-кодов с опциями и тонкими настройками регулярок (рекурсивные)
+	private $codes_options = array(
+		'quote' => array(
+			'pattern' => '/\[(quote)\=\"(([\w]+) \| (\d{2}\.\d{2}\.\d{2} \- \d{2}\:\d{2}\:\d{2}))\"\]((?:[^[]|(?R))*)\[\/quote\]/Usi',
+			'replace' => '<div class="qxbb-quote"><div class="qxbb-quote-info">{2}</div>{5}</div>',
+			'values' => array(1,2,5),
+			'escapes' => false,
+		),
+
+		'code' => array(
+			'pattern' => '/\[(code)\=\"(php|html|css|javascript)\"\]((?:[^[]|(?R))*)\[\/code\]/Usi',
+			'replace' => '<div class="qxbb-code"><div class="qxbb-code-info">Тип: {2}</div>{3}</div>',
+			'values' => array(1,2,3),
+			'escapes' => 3,
+		),
+
+		'color' => array(
+			'pattern' => '/\[(color)\=\"(\#[0-9a-f]{6})\"\]((?:[^[]|\[(?!\/?(color)\])|(?R))+)\[\/color\]/Usi',
+			'replace' => '<font color="{2}" class="qxbb-color">{3}</font>',
+			'values' => array(1,2,3),
+			'escapes' => false,
+		),
+
+		'background' => array(
+			'pattern' => '/\[(background)\=\"(\#[0-9a-f]{6})\"\]((?:[^[]|(?R))*)\[\/background\]/Usi',
+			'replace' => '<font style="background-color:{2};" class="qxbb-background">{3}</font>',
+			'values' => array(1,2,3),
+			'escapes' => false,
+		),
+
+		'size' => array(
+			'pattern' => '/\[(size)\=\"([1-7])\"\]((?:[^[]|(?R))*)\[\/size\]/Usi',
+			'replace' => '<font size="{2}" class="qxbb-size">{3}</font>',
+			'values' => array(1,2,3),
+			'escapes' => false,
+		),
+
+		'font' => array(
+			'pattern' => '/\[(font)\=\"(Arial|Arial Black|Comic Sans MS|Courier New|Georgia|Impact|Tahoma|Times New Roman|Trebuchet MS|Verdana)\"\]((?:[^[]|(?R))*)\[\/font\]/Usi',
+			'replace' => '<font face="{2}" class="qxbb-font">{3}</font>',
+			'values' => array(1,2,3),
+			'escapes' => false,
+		),
+
+		'url' => array(
+			'pattern' => '/\[(url)\=\"(http(s)?\:\/\/[\w\.\/\?\=\&\%\+\~\*\-]+)\"\]((?:[^[]|(?R))*)\[\/url\]/Usi',
+			'replace' => '<a href="{2}" class="qxbb-url">{4}</a>',
+			'values' => array(1,2,4),
+			'escapes' => false,
+		),
+
+		'spoiler' => array(
+			'pattern' => '/\[(spoiler)\=\"([\w\s\-\.\:\;\+\|\,]{1,32})\"\]((?:[^[]|(?R))*)\[\/spoiler\]/Usui',
+			'replace' => '<div class="qxbb-spoiler"><button type="button" class="qxbb-spoiler-btn">{2}</button><div class="qxbb-spoiler-body">{3}</div></div>',
+			'values' => array(1,2,3),
+			'escapes' => false,
+		),
+	);
+
+	// Шаблоны ББ-кодов с опциями и тонкими настройками регулярок (не рекурсивные)
+	private $codes_once = array(
+		'img' => array(
+			'pattern' => '/\[img\](http(s)?\:\/\/[\w\.\/\?\=\&\%\+\~\*\-]+)\[\/img\]/Usi',
+			'replace' => '<img src="$1" class="qxbb-img" alt="IMG" />',
+		),
+
+		'line' => array(
+			'pattern' => '/\[line\]/Usi',
+			'replace' => '<hr class="qxbb-line">',
+		),
+
+		'url' => array(
+			'pattern' => '/\[url\](http(s)?\:\/\/[\w\.\/\?\=\&\%\+\~\*\-]+)\[\/url\]/Usi',
+			'replace' => '<a href="$1" class="qxbb-url">$1</a>',
+		),
+
+		'email' => array(
+			'pattern' => '/\[email\]([\w\.\-]+\@[a-z0-9\.\-]+)\[\/email\]/Usi',
+			'replace' => '<a href="mailto:$1" class="qxbb-email">$1</a>',
+		),
+	);
+
+	// Шаблоны ББ-кодов для обработки тегов видео ([video]) с тонкими настройками регулярок (не рекурсивные)
+	private $codes_video = array(
+		'youtube' => array(
+			'pattern' => '((youtube\.com\/watch\?v\=([\w\-]+))|(youtu\.be\/([\w\-]+))|(youtube.com\/embed\/([\w\-]+)))',
+			'replace' => 'https://www.youtube.com/embed/$5',
+		),
+
+		'vk' => array(
+			'pattern' => 'vk.com\/video_ext.php\?oid=(\d+)\&amp;id\=(\d+)\&amp;hash\=(\w+)',
+			'replace' => 'http://vk.com/video_ext.php?oid=$3&id=$4&hash=$5',
+		),
+
+		'vimeo' => array(
+			'pattern' => 'vimeo\.com\/(\d+)',
+			'replace' => 'https://player.vimeo.com/video/$3',
+		),
+
+		'coub' => array(
+			'pattern' => 'coub.com\/view\/(\w+)',
+			'replace' => 'http://coub.com/embed/$3',
+		),
+
+		'twitch' => array(
+			'pattern' => 'twitch\.tv\/(\w+)',
+			'replace' => 'http://www.twitch.tv/$3/embed',
+		),
+
+		'vine' => array(
+			'pattern' => 'vine\.co\/v\/(\w+)',
+			'replace' => 'https://vine.co/v/$3/embed/simple',
+		),
+	);
+
+	// Обработчик смайликов
+	private function parse_smiles($text){
+
+		$smile_list = $smile_replace = array();
+
+		include(MCR_TOOL_PATH.'libs/smiles.php');
+
+		foreach($smiles as $key => $val){
+			$smile_list[] = $key;
+			$smile_replace[] = '<img src="'.$this->smiles_url.$val.'" alt="'.$key.'" />';
+		}
+
+		return str_replace($smile_list, $smile_replace, $text);
+	}
+
+	// Обработчик единичных тегов
+	private function parse_once($text){
+
+		$replace = $pattern = array();
+
+		foreach($this->codes_once as $key => $value){
+			$pattern[] = $value['pattern'];
+			$replace[] = $value['replace'];
+		}
+
+		return preg_replace($pattern, $replace, $text);
+	}
+
+	// Обработчик обычных тегов с открывающими и загрывающими тегами
+	private function parse_simple_tags($text){
+
+		$pattern = '/\[('.implode('|', array_keys($this->codes)).')\]((?:[^[]|\[(?!\/?(\\1)\])|(?R))+)\[\/\\1\]/Usi';
+
+		if(is_array($text)){
+			$left_tag = $this->codes[$text[1]]['left_tag'];
+			$right_tag = $this->codes[$text[1]]['right_tag'];
+			$content = $text[2];
+
+			if($text[1]=='code'){
+				$content = str_replace(array('[', ']'), array('&#91;', '&#93;'), $content);
+			}
+
+			$text = $left_tag.$content.$right_tag; // result
+		}else{
+			$text = nl2br(htmlspecialchars($text, ENT_NOQUOTES));
+		}
+
+		return preg_replace_callback($pattern, array($this, 'parse_simple_tags'), $text);
+	}
+
+	// Обработчик тегов с опциями
+	private function parse_with_options($text){
+
+		if(is_array($text)){
+			$codes = $this->codes_options;
+
+			if(isset($codes[$text[1]])){
+				$escape = $codes[$text[1]]['escapes'];
+
+				if($escape!==false){
+					$text[$escape] = str_replace(array('[', ']'), array('&#91;', '&#93;'), $text[$escape]);
+				}
+				
+				$replace = $codes[$text[1]]['replace'];
+
+				unset($codes[$text[1]]['values'][0]);
+
+				foreach($codes[$text[1]]['values'] as $key => $value){
+
+					$replace = str_replace('{'.$value.'}', $text[$value], $replace);
+				}
+
+				$text = $replace;
+			}
+		}
+
+		$patterns = array();
+
+		foreach($this->codes_options as $key => $value){
+			$patterns[] = $value['pattern'];
+		}
+
+		return preg_replace_callback($patterns, array($this, 'parse_with_options'), $text);
+	}
+
+	// Обработчик видео тегов
+	private function parse_video($text){
+
+		$pattern = $replace = array();
+
+		foreach($this->codes_video as $name => $value){
+			$pattern[] = '/\[video\=\"'.$name.'\"\]http(s)?\:\/\/(www\.)?'.$value['pattern'].'\[\/video\]/Usi';
+			$replace[] = '<iframe width="854" class="qxbb-iframe" height="480" src="'.$value['replace'].'" frameborder="0"></iframe>';
+		}
+
+		return preg_replace($pattern, $replace, $text);
+	}
+
+	// Обработчик списковых тегов
+	private function parse_list_line($text){
+
+		if(is_array($text)){
+			$text = '<li>'.$text[1].'</li>';
+		}
+
+		return preg_replace_callback('/\[\*\]((?:[^[]|(?R))*)/si', array($this, 'parse_list_line'), $text);
+	}
+
+	private function parse_list($text){
+
+		if(is_array($text)){
+			
+			$text = ($text['1']=='numbers') ? '<ol class="qxbb-list-numbers">'.$text[2].'</ol>' : '<ul class="qxbb-list-markers">'.$text[2].'</ul>';
+		}else{
+			$text = $this->parse_list_line($text);
+		}
+
+		return preg_replace_callback('/\[list\=\"(markers|numbers)\"\]((?:[^[]|(?R))*)\[\/list\]/Usi', array($this, 'parse_list'), $text);
+	}
+
+	public function parse($text){
+		$text = $this->parse_simple_tags($text);
+
+		$text = $this->parse_smiles($text);
+
+		$text = $this->parse_once($text);
+
+		$text = $this->parse_video($text);
+
+		$text = $this->parse_list($text);
+
+		return $this->parse_with_options($text);
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/engine/libs/smiles.php b/upload/engine/libs/smiles.php
index 82a5ddb..c8379fb 100644
--- a/upload/engine/libs/smiles.php
+++ b/upload/engine/libs/smiles.php
@@ -1,20 +1,20 @@
 <?php
 
 $smiles = array(
-	":)"			=> "1.gif",
-	":("			=> "2.gif",
-	";)"			=> "3.gif",
-	":bear:"		=> "4.gif",
-	":like:"		=> "5.gif",
-	":wall:"		=> "6.gif",
-	":D"			=> "7.gif",
-	":shy:"			=> "8.gif",
-	":secret:"		=> "9.gif",
-	":party:"		=> "10.gif",
-	":steep:"		=> "11.gif",
-	":help:"		=> "12.gif",
-	":girl:"		=> "13.gif",
-	":facepalm:"	=> "14.gif",
+	"[:)]"			=> "1.gif",
+	"[:(]"			=> "2.gif",
+	"[;)]"			=> "3.gif",
+	"[:bear:]"		=> "4.gif",
+	"[:like:]"		=> "5.gif",
+	"[:wall:]"		=> "6.gif",
+	"[:D]"			=> "7.gif",
+	"[:shy:]"		=> "8.gif",
+	"[:secret:]"	=> "9.gif",
+	"[:party:]"		=> "10.gif",
+	"[:steep:]"		=> "11.gif",
+	"[:help:]"		=> "12.gif",
+	"[:girl:]"		=> "13.gif",
+	"[:facepalm:]"	=> "14.gif",
 );
 
 ?>
\ No newline at end of file
diff --git a/upload/engine/libs/smtp/PHPMailerAutoload.php b/upload/engine/libs/smtp/PHPMailerAutoload.php
new file mode 100644
index 0000000..eaa2e30
--- /dev/null
+++ b/upload/engine/libs/smtp/PHPMailerAutoload.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * PHPMailer SPL autoloader.
+ * PHP Version 5
+ * @package PHPMailer
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * PHPMailer SPL autoloader.
+ * @param string $classname The name of the class to load
+ */
+function PHPMailerAutoload($classname)
+{
+    //Can't use __DIR__ as it's only in PHP 5.3+
+    $filename = dirname(__FILE__).DIRECTORY_SEPARATOR.'class.'.strtolower($classname).'.php';
+    if (is_readable($filename)) {
+        require $filename;
+    }
+}
+
+if (version_compare(PHP_VERSION, '5.1.2', '>=')) {
+    //SPL autoloading was introduced in PHP 5.1.2
+    if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
+        spl_autoload_register('PHPMailerAutoload', true, true);
+    } else {
+        spl_autoload_register('PHPMailerAutoload');
+    }
+} else {
+    /**
+     * Fall back to traditional autoload for old PHP versions
+     * @param string $classname The name of the class to load
+     */
+    function __autoload($classname)
+    {
+        PHPMailerAutoload($classname);
+    }
+}
diff --git a/upload/engine/libs/smtp/class.html2text.php b/upload/engine/libs/smtp/class.html2text.php
new file mode 100644
index 0000000..2060991
--- /dev/null
+++ b/upload/engine/libs/smtp/class.html2text.php
@@ -0,0 +1,677 @@
+<?php
+/*************************************************************************
+ *                                                                       *
+ * Converts HTML to formatted plain text                                 *
+ *                                                                       *
+ * Portions Copyright (c) 2005-2007 Jon Abernathy <jon@chuggnutt.com>    *
+ *                                                                       *
+ * This script 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.                                   *
+ *                                                                       *
+ * The GNU General Public License can be found at                        *
+ * http://www.gnu.org/copyleft/gpl.html.                                 *
+ *                                                                       *
+ * This script is distributed in the hope that it will be useful,        *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the          *
+ * GNU General Public License for more details.                          *
+ *                                                                       *
+ *************************************************************************/
+
+/**
+ * Converts HTML to formatted plain text
+ */
+class Html2Text
+{
+    /**
+     * Contains the HTML content to convert.
+     *
+     * @type string
+     */
+    protected $html;
+
+    /**
+     * Contains the converted, formatted text.
+     *
+     * @type string
+     */
+    protected $text;
+
+    /**
+     * Maximum width of the formatted text, in columns.
+     *
+     * Set this value to 0 (or less) to ignore word wrapping
+     * and not constrain text to a fixed-width column.
+     *
+     * @type integer
+     */
+    protected $width = 70;
+
+    /**
+     * List of preg* regular expression patterns to search for,
+     * used in conjunction with $replace.
+     *
+     * @type array
+     * @see $replace
+     */
+    protected $search = array(
+        "/\r/",                                  // Non-legal carriage return
+        "/[\n\t]+/",                             // Newlines and tabs
+        '/<head[^>]*>.*?<\/head>/i',             // <head>
+        '/<script[^>]*>.*?<\/script>/i',         // <script>s -- which strip_tags supposedly has problems with
+        '/<style[^>]*>.*?<\/style>/i',           // <style>s -- which strip_tags supposedly has problems with
+        '/<p[^>]*>/i',                           // <P>
+        '/<br[^>]*>/i',                          // <br>
+        '/<i[^>]*>(.*?)<\/i>/i',                 // <i>
+        '/<em[^>]*>(.*?)<\/em>/i',               // <em>
+        '/(<ul[^>]*>|<\/ul>)/i',                 // <ul> and </ul>
+        '/(<ol[^>]*>|<\/ol>)/i',                 // <ol> and </ol>
+        '/(<dl[^>]*>|<\/dl>)/i',                 // <dl> and </dl>
+        '/<li[^>]*>(.*?)<\/li>/i',               // <li> and </li>
+        '/<dd[^>]*>(.*?)<\/dd>/i',               // <dd> and </dd>
+        '/<dt[^>]*>(.*?)<\/dt>/i',               // <dt> and </dt>
+        '/<li[^>]*>/i',                          // <li>
+        '/<hr[^>]*>/i',                          // <hr>
+        '/<div[^>]*>/i',                         // <div>
+        '/(<table[^>]*>|<\/table>)/i',           // <table> and </table>
+        '/(<tr[^>]*>|<\/tr>)/i',                 // <tr> and </tr>
+        '/<td[^>]*>(.*?)<\/td>/i',               // <td> and </td>
+        '/<span class="_html2text_ignore">.+?<\/span>/i'  // <span class="_html2text_ignore">...</span>
+    );
+
+    /**
+     * List of pattern replacements corresponding to patterns searched.
+     *
+     * @type array
+     * @see $search
+     */
+    protected $replace = array(
+        '',                                     // Non-legal carriage return
+        ' ',                                    // Newlines and tabs
+        '',                                     // <head>
+        '',                                     // <script>s -- which strip_tags supposedly has problems with
+        '',                                     // <style>s -- which strip_tags supposedly has problems with
+        "\n\n",                                 // <P>
+        "\n",                                   // <br>
+        '_\\1_',                                // <i>
+        '_\\1_',                                // <em>
+        "\n\n",                                 // <ul> and </ul>
+        "\n\n",                                 // <ol> and </ol>
+        "\n\n",                                 // <dl> and </dl>
+        "\t* \\1\n",                            // <li> and </li>
+        " \\1\n",                               // <dd> and </dd>
+        "\t* \\1",                              // <dt> and </dt>
+        "\n\t* ",                               // <li>
+        "\n-------------------------\n",        // <hr>
+        "<div>\n",                              // <div>
+        "\n\n",                                 // <table> and </table>
+        "\n",                                   // <tr> and </tr>
+        "\t\t\\1\n",                            // <td> and </td>
+        ""                                      // <span class="_html2text_ignore">...</span>
+    );
+
+    /**
+     * List of preg* regular expression patterns to search for,
+     * used in conjunction with $ent_replace.
+     *
+     * @type array
+     * @see $ent_replace
+     */
+    protected $ent_search = array(
+        '/&(nbsp|#160);/i',                      // Non-breaking space
+        '/&(quot|rdquo|ldquo|#8220|#8221|#147|#148);/i',
+        // Double quotes
+        '/&(apos|rsquo|lsquo|#8216|#8217);/i',   // Single quotes
+        '/&gt;/i',                               // Greater-than
+        '/&lt;/i',                               // Less-than
+        '/&(copy|#169);/i',                      // Copyright
+        '/&(trade|#8482|#153);/i',               // Trademark
+        '/&(reg|#174);/i',                       // Registered
+        '/&(mdash|#151|#8212);/i',               // mdash
+        '/&(ndash|minus|#8211|#8722);/i',        // ndash
+        '/&(bull|#149|#8226);/i',                // Bullet
+        '/&(pound|#163);/i',                     // Pound sign
+        '/&(euro|#8364);/i',                     // Euro sign
+        '/&(amp|#38);/i',                        // Ampersand: see _converter()
+        '/[ ]{2,}/',                             // Runs of spaces, post-handling
+    );
+
+    /**
+     * List of pattern replacements corresponding to patterns searched.
+     *
+     * @type array
+     * @see $ent_search
+     */
+    protected $ent_replace = array(
+        ' ',                                    // Non-breaking space
+        '"',                                    // Double quotes
+        "'",                                    // Single quotes
+        '>',
+        '<',
+        '(c)',
+        '(tm)',
+        '(R)',
+        '--',
+        '-',
+        '*',
+        '£',
+        'EUR',                                  // Euro sign. € ?
+        '|+|amp|+|',                            // Ampersand: see _converter()
+        ' ',                                    // Runs of spaces, post-handling
+    );
+
+    /**
+     * List of preg* regular expression patterns to search for
+     * and replace using callback function.
+     *
+     * @type array
+     */
+    protected $callback_search = array(
+        '/<(a) [^>]*href=("|\')([^"\']+)\2([^>]*)>(.*?)<\/a>/i', // <a href="">
+        '/<(h)[123456]( [^>]*)?>(.*?)<\/h[123456]>/i',           // h1 - h6
+        '/<(b)( [^>]*)?>(.*?)<\/b>/i',                           // <b>
+        '/<(strong)( [^>]*)?>(.*?)<\/strong>/i',                 // <strong>
+        '/<(th)( [^>]*)?>(.*?)<\/th>/i',                         // <th> and </th>
+    );
+
+    /**
+     * List of preg* regular expression patterns to search for in PRE body,
+     * used in conjunction with $pre_replace.
+     *
+     * @type array
+     * @see $pre_replace
+     */
+    protected $pre_search = array(
+        "/\n/",
+        "/\t/",
+        '/ /',
+        '/<pre[^>]*>/',
+        '/<\/pre>/'
+    );
+
+    /**
+     * List of pattern replacements corresponding to patterns searched for PRE body.
+     *
+     * @type array
+     * @see $pre_search
+     */
+    protected $pre_replace = array(
+        '<br>',
+        '&nbsp;&nbsp;&nbsp;&nbsp;',
+        '&nbsp;',
+        '',
+        ''
+    );
+
+    /**
+     * Temporary workspace used during PRE processing.
+     *
+     * @type string
+     */
+    protected $pre_content = '';
+
+    /**
+     * Contains a list of HTML tags to allow in the resulting text.
+     *
+     * @type string
+     * @see set_allowed_tags()
+     */
+    protected $allowed_tags = '';
+
+    /**
+     * Contains the base URL that relative links should resolve to.
+     *
+     * @type string
+     */
+    protected $url;
+
+    /**
+     * Indicates whether content in the $html variable has been converted yet.
+     *
+     * @type boolean
+     * @see $html, $text
+     */
+    protected $_converted = false;
+
+    /**
+     * Contains URL addresses from links to be rendered in plain text.
+     *
+     * @type array
+     * @see _build_link_list()
+     */
+    protected $_link_list = array();
+
+    /**
+     * Various configuration options (able to be set in the constructor)
+     *
+     * @type array
+     */
+    protected $_options = array(
+        // 'none'
+        // 'inline' (show links inline)
+        // 'nextline' (show links on the next line)
+        // 'table' (if a table of link URLs should be listed after the text.
+        'do_links' => 'inline',
+        //  Maximum width of the formatted text, in columns.
+        //  Set this value to 0 (or less) to ignore word wrapping
+        //  and not constrain text to a fixed-width column.
+        'width' => 70,
+    );
+
+    /**
+     * Constructor.
+     *
+     * If the HTML source string (or file) is supplied, the class
+     * will instantiate with that source propagated, all that has
+     * to be done it to call get_text().
+     *
+     * @param string $source HTML content
+     * @param boolean $from_file Indicates $source is a file to pull content from
+     * @param array $options Set configuration options
+     */
+    public function __construct($source = '', $from_file = false, $options = array())
+    {
+        $this->_options = array_merge($this->_options, $options);
+
+        if (!empty($source)) {
+            $this->set_html($source, $from_file);
+        }
+
+        $this->set_base_url();
+    }
+
+    /**
+     * Loads source HTML into memory, either from $source string or a file.
+     *
+     * @param string $source HTML content
+     * @param boolean $from_file Indicates $source is a file to pull content from
+     */
+    public function set_html($source, $from_file = false)
+    {
+        if ($from_file && file_exists($source)) {
+            $this->html = file_get_contents($source);
+        } else {
+            $this->html = $source;
+        }
+
+        $this->_converted = false;
+    }
+
+    /**
+     * Returns the text, converted from HTML.
+     *
+     * @return string
+     */
+    public function get_text()
+    {
+        if (!$this->_converted) {
+            $this->_convert();
+        }
+
+        return $this->text;
+    }
+
+    /**
+     * Prints the text, converted from HTML.
+     */
+    public function print_text()
+    {
+        print $this->get_text();
+    }
+
+    /**
+     * Alias to print_text(), operates identically.
+     *
+     * @see print_text()
+     */
+    public function p()
+    {
+        print $this->get_text();
+    }
+
+    /**
+     * Sets the allowed HTML tags to pass through to the resulting text.
+     *
+     * Tags should be in the form "<p>", with no corresponding closing tag.
+     * @param string $allowed_tags
+     */
+    public function set_allowed_tags($allowed_tags = '')
+    {
+        if (!empty($allowed_tags)) {
+            $this->allowed_tags = $allowed_tags;
+        }
+    }
+
+    /**
+     * Sets a base URL to handle relative links.
+     *
+     * @param string $url
+     */
+    public function set_base_url($url = '')
+    {
+        if (empty($url)) {
+            if (!empty($_SERVER['HTTP_HOST'])) {
+                $this->url = 'http://' . $_SERVER['HTTP_HOST'];
+            } else {
+                $this->url = '';
+            }
+        } else {
+            // Strip any trailing slashes for consistency (relative
+            // URLs may already start with a slash like "/file.html")
+            if (substr($url, -1) == '/') {
+                $url = substr($url, 0, -1);
+            }
+            $this->url = $url;
+        }
+    }
+
+    /**
+     * Workhorse function that does actual conversion (calls _converter() method).
+     */
+    protected function _convert()
+    {
+        // Variables used for building the link list
+        $this->_link_list = array();
+
+        $text = trim(stripslashes($this->html));
+
+        // Convert HTML to TXT
+        $this->_converter($text);
+
+        // Add link list
+        if (!empty($this->_link_list)) {
+            $text .= "\n\nLinks:\n------\n";
+            foreach ($this->_link_list as $idx => $url) {
+                $text .= '[' . ($idx + 1) . '] ' . $url . "\n";
+            }
+        }
+
+        $this->text = $text;
+
+        $this->_converted = true;
+    }
+
+    /**
+     * Workhorse function that does actual conversion.
+     *
+     * First performs custom tag replacement specified by $search and
+     * $replace arrays. Then strips any remaining HTML tags, reduces whitespace
+     * and newlines to a readable format, and word wraps the text to
+     * $this->_options['width'] characters.
+     *
+     * @param string $text Reference to HTML content string
+     */
+    protected function _converter(&$text)
+    {
+        // Convert <BLOCKQUOTE> (before PRE!)
+        $this->_convert_blockquotes($text);
+
+        // Convert <PRE>
+        $this->_convert_pre($text);
+
+        // Run our defined tags search-and-replace
+        $text = preg_replace($this->search, $this->replace, $text);
+
+        // Run our defined tags search-and-replace with callback
+        $text = preg_replace_callback($this->callback_search, array($this, '_preg_callback'), $text);
+
+        // Strip any other HTML tags
+        $text = strip_tags($text, $this->allowed_tags);
+
+        // Run our defined entities/characters search-and-replace
+        $text = preg_replace($this->ent_search, $this->ent_replace, $text);
+
+        // Replace known html entities
+        $text = html_entity_decode($text, ENT_QUOTES);
+
+        // Remove unknown/unhandled entities (this cannot be done in search-and-replace block)
+        $text = preg_replace('/&([a-zA-Z0-9]{2,6}|#[0-9]{2,4});/', '', $text);
+
+        // Convert "|+|amp|+|" into "&", need to be done after handling of unknown entities
+        // This properly handles situation of "&amp;quot;" in input string
+        $text = str_replace('|+|amp|+|', '&', $text);
+
+        // Bring down number of empty lines to 2 max
+        $text = preg_replace("/\n\s+\n/", "\n\n", $text);
+        $text = preg_replace("/[\n]{3,}/", "\n\n", $text);
+
+        // remove leading empty lines (can be produced by eg. P tag on the beginning)
+        $text = ltrim($text, "\n");
+
+        // Wrap the text to a readable format
+        // for PHP versions >= 4.0.2. Default width is 75
+        // If width is 0 or less, don't wrap the text.
+        if ($this->_options['width'] > 0) {
+            $text = wordwrap($text, $this->_options['width']);
+        }
+    }
+
+    /**
+     * Helper function called by preg_replace() on link replacement.
+     *
+     * Maintains an internal list of links to be displayed at the end of the
+     * text, with numeric indices to the original point in the text they
+     * appeared. Also makes an effort at identifying and handling absolute
+     * and relative links.
+     *
+     * @param string $link URL of the link
+     * @param string $display Part of the text to associate number with
+     * @param null $link_override
+     * @return string
+     */
+    protected function _build_link_list($link, $display, $link_override = null)
+    {
+        $link_method = ($link_override) ? $link_override : $this->_options['do_links'];
+        if ($link_method == 'none') {
+            return $display;
+        }
+
+
+        // Ignored link types
+        if (preg_match('!^(javascript:|mailto:|#)!i', $link)) {
+            return $display;
+        }
+
+        if (preg_match('!^([a-z][a-z0-9.+-]+:)!i', $link)) {
+            $url = $link;
+        } else {
+            $url = $this->url;
+            if (substr($link, 0, 1) != '/') {
+                $url .= '/';
+            }
+            $url .= "$link";
+        }
+
+        if ($link_method == 'table') {
+            if (($index = array_search($url, $this->_link_list)) === false) {
+                $index = count($this->_link_list);
+                $this->_link_list[] = $url;
+            }
+
+            return $display . ' [' . ($index + 1) . ']';
+        } elseif ($link_method == 'nextline') {
+            return $display . "\n[" . $url . ']';
+        } else { // link_method defaults to inline
+
+            return $display . ' [' . $url . ']';
+        }
+    }
+
+    /**
+     * Helper function for PRE body conversion.
+     *
+     * @param string $text HTML content
+     */
+    protected function _convert_pre(&$text)
+    {
+        // get the content of PRE element
+        while (preg_match('/<pre[^>]*>(.*)<\/pre>/ismU', $text, $matches)) {
+            $this->pre_content = $matches[1];
+
+            // Run our defined tags search-and-replace with callback
+            $this->pre_content = preg_replace_callback(
+                $this->callback_search,
+                array($this, '_preg_callback'),
+                $this->pre_content
+            );
+
+            // convert the content
+            $this->pre_content = sprintf(
+                '<div><br>%s<br></div>',
+                preg_replace($this->pre_search, $this->pre_replace, $this->pre_content)
+            );
+
+            // replace the content (use callback because content can contain $0 variable)
+            $text = preg_replace_callback(
+                '/<pre[^>]*>.*<\/pre>/ismU',
+                array($this, '_preg_pre_callback'),
+                $text,
+                1
+            );
+
+            // free memory
+            $this->pre_content = '';
+        }
+    }
+
+    /**
+     * Helper function for BLOCKQUOTE body conversion.
+     *
+     * @param string $text HTML content
+     */
+    protected function _convert_blockquotes(&$text)
+    {
+        if (preg_match_all('/<\/*blockquote[^>]*>/i', $text, $matches, PREG_OFFSET_CAPTURE)) {
+            $start = 0;
+            $taglen = 0;
+            $level = 0;
+            $diff = 0;
+            foreach ($matches[0] as $m) {
+                if ($m[0][0] == '<' && $m[0][1] == '/') {
+                    $level--;
+                    if ($level < 0) {
+                        $level = 0; // malformed HTML: go to next blockquote
+                    } elseif ($level > 0) {
+                        // skip inner blockquote
+                    } else {
+                        $end = $m[1];
+                        $len = $end - $taglen - $start;
+                        // Get blockquote content
+                        $body = substr($text, $start + $taglen - $diff, $len);
+
+                        // Set text width
+                        $p_width = $this->_options['width'];
+                        if ($this->_options['width'] > 0) $this->_options['width'] -= 2;
+                        // Convert blockquote content
+                        $body = trim($body);
+                        $this->_converter($body);
+                        // Add citation markers and create PRE block
+                        $body = preg_replace('/((^|\n)>*)/', '\\1> ', trim($body));
+                        $body = '<pre>' . htmlspecialchars($body) . '</pre>';
+                        // Re-set text width
+                        $this->_options['width'] = $p_width;
+                        // Replace content
+                        $text = substr($text, 0, $start - $diff)
+                            . $body . substr($text, $end + strlen($m[0]) - $diff);
+
+                        $diff = $len + $taglen + strlen($m[0]) - strlen($body);
+                        unset($body);
+                    }
+                } else {
+                    if ($level == 0) {
+                        $start = $m[1];
+                        $taglen = strlen($m[0]);
+                    }
+                    $level++;
+                }
+            }
+        }
+    }
+
+    /**
+     * Callback function for preg_replace_callback use.
+     *
+     * @param array $matches PREG matches
+     * @return string
+     */
+    protected function _preg_callback($matches)
+    {
+        switch (strtolower($matches[1])) {
+            case 'b':
+            case 'strong':
+                return $this->_toupper($matches[3]);
+            case 'th':
+                return $this->_toupper("\t\t" . $matches[3] . "\n");
+            case 'h':
+                return $this->_toupper("\n\n" . $matches[3] . "\n\n");
+            case 'a':
+                // override the link method
+                $link_override = null;
+                if (preg_match('/_html2text_link_(\w+)/', $matches[4], $link_override_match)) {
+                    $link_override = $link_override_match[1];
+                }
+                // Remove spaces in URL (#1487805)
+                $url = str_replace(' ', '', $matches[3]);
+
+                return $this->_build_link_list($url, $matches[5], $link_override);
+        }
+        return '';
+    }
+
+    /**
+     * Callback function for preg_replace_callback use in PRE content handler.
+     *
+     * @param array $matches PREG matches
+     * @return string
+     */
+    protected function _preg_pre_callback(
+        /** @noinspection PhpUnusedParameterInspection */
+        $matches)
+    {
+        return $this->pre_content;
+    }
+
+    /**
+     * Strtoupper function with HTML tags and entities handling.
+     *
+     * @param string $str Text to convert
+     * @return string Converted text
+     */
+    private function _toupper($str)
+    {
+        // string can contain HTML tags
+        $chunks = preg_split('/(<[^>]*>)/', $str, null, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+
+        // convert toupper only the text between HTML tags
+        foreach ($chunks as $idx => $chunk) {
+            if ($chunk[0] != '<') {
+                $chunks[$idx] = $this->_strtoupper($chunk);
+            }
+        }
+
+        return implode($chunks);
+    }
+
+    /**
+     * Strtoupper multibyte wrapper function with HTML entities handling.
+     * Forces mb_strtoupper-call to UTF-8.
+     *
+     * @param string $str Text to convert
+     * @return string Converted text
+     */
+    private function _strtoupper($str)
+    {
+        $str = html_entity_decode($str, ENT_COMPAT);
+
+        if (function_exists('mb_strtoupper'))
+            $str = mb_strtoupper($str, 'UTF-8');
+        else
+            $str = strtoupper($str);
+
+        $str = htmlspecialchars($str, ENT_COMPAT);
+
+        return $str;
+    }
+}
diff --git a/upload/engine/libs/smtp/class.phpmailer.php b/upload/engine/libs/smtp/class.phpmailer.php
new file mode 100644
index 0000000..fef7a6b
--- /dev/null
+++ b/upload/engine/libs/smtp/class.phpmailer.php
@@ -0,0 +1,3455 @@
+<?php
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5
+ * @package PHPMailer
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * @package PHPMailer
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ */
+class PHPMailer
+{
+    /**
+     * The PHPMailer Version number.
+     * @type string
+     */
+    public $Version = '5.2.9';
+
+    /**
+     * Email priority.
+     * Options: 1 = High, 3 = Normal, 5 = low.
+     * @type integer
+     */
+    public $Priority = 3;
+
+    /**
+     * The character set of the message.
+     * @type string
+     */
+    public $CharSet = 'iso-8859-1';
+
+    /**
+     * The MIME Content-type of the message.
+     * @type string
+     */
+    public $ContentType = 'text/plain';
+
+    /**
+     * The message encoding.
+     * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable".
+     * @type string
+     */
+    public $Encoding = '8bit';
+
+    /**
+     * Holds the most recent mailer error message.
+     * @type string
+     */
+    public $ErrorInfo = '';
+
+    /**
+     * The From email address for the message.
+     * @type string
+     */
+    public $From = 'root@localhost';
+
+    /**
+     * The From name of the message.
+     * @type string
+     */
+    public $FromName = 'Root User';
+
+    /**
+     * The Sender email (Return-Path) of the message.
+     * If not empty, will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
+     * @type string
+     */
+    public $Sender = '';
+
+    /**
+     * The Return-Path of the message.
+     * If empty, it will be set to either From or Sender.
+     * @type string
+     * @deprecated Email senders should never set a return-path header;
+     * it's the receiver's job (RFC5321 section 4.4), so this no longer does anything.
+     * @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference
+     */
+    public $ReturnPath = '';
+
+    /**
+     * The Subject of the message.
+     * @type string
+     */
+    public $Subject = '';
+
+    /**
+     * An HTML or plain text message body.
+     * If HTML then call isHTML(true).
+     * @type string
+     */
+    public $Body = '';
+
+    /**
+     * The plain-text message body.
+     * This body can be read by mail clients that do not have HTML email
+     * capability such as mutt & Eudora.
+     * Clients that can read HTML will view the normal Body.
+     * @type string
+     */
+    public $AltBody = '';
+
+    /**
+     * An iCal message part body.
+     * Only supported in simple alt or alt_inline message types
+     * To generate iCal events, use the bundled extras/EasyPeasyICS.php class or iCalcreator
+     * @link http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
+     * @link http://kigkonsult.se/iCalcreator/
+     * @type string
+     */
+    public $Ical = '';
+
+    /**
+     * The complete compiled MIME message body.
+     * @access protected
+     * @type string
+     */
+    protected $MIMEBody = '';
+
+    /**
+     * The complete compiled MIME message headers.
+     * @type string
+     * @access protected
+     */
+    protected $MIMEHeader = '';
+
+    /**
+     * Extra headers that createHeader() doesn't fold in.
+     * @type string
+     * @access protected
+     */
+    protected $mailHeader = '';
+
+    /**
+     * Word-wrap the message body to this number of chars.
+     * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance.
+     * @type integer
+     */
+    public $WordWrap = 0;
+
+    /**
+     * Which method to use to send mail.
+     * Options: "mail", "sendmail", or "smtp".
+     * @type string
+     */
+    public $Mailer = 'mail';
+
+    /**
+     * The path to the sendmail program.
+     * @type string
+     */
+    public $Sendmail = '/usr/sbin/sendmail';
+
+    /**
+     * Whether mail() uses a fully sendmail-compatible MTA.
+     * One which supports sendmail's "-oi -f" options.
+     * @type boolean
+     */
+    public $UseSendmailOptions = true;
+
+    /**
+     * Path to PHPMailer plugins.
+     * Useful if the SMTP class is not in the PHP include path.
+     * @type string
+     * @deprecated Should not be needed now there is an autoloader.
+     */
+    public $PluginDir = '';
+
+    /**
+     * The email address that a reading confirmation should be sent to.
+     * @type string
+     */
+    public $ConfirmReadingTo = '';
+
+    /**
+     * The hostname to use in Message-Id and Received headers
+     * and as default HELO string.
+     * If empty, the value returned
+     * by SERVER_NAME is used or 'localhost.localdomain'.
+     * @type string
+     */
+    public $Hostname = '';
+
+    /**
+     * An ID to be used in the Message-Id header.
+     * If empty, a unique id will be generated.
+     * @type string
+     */
+    public $MessageID = '';
+
+    /**
+     * The message Date to be used in the Date header.
+     * If empty, the current date will be added.
+     * @type string
+     */
+    public $MessageDate = '';
+
+    /**
+     * SMTP hosts.
+     * Either a single hostname or multiple semicolon-delimited hostnames.
+     * You can also specify a different port
+     * for each host by using this format: [hostname:port]
+     * (e.g. "smtp1.example.com:25;smtp2.example.com").
+     * You can also specify encryption type, for example:
+     * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465").
+     * Hosts will be tried in order.
+     * @type string
+     */
+    public $Host = 'localhost';
+
+    /**
+     * The default SMTP server port.
+     * @type integer
+     * @TODO Why is this needed when the SMTP class takes care of it?
+     */
+    public $Port = 25;
+
+    /**
+     * The SMTP HELO of the message.
+     * Default is $Hostname.
+     * @type string
+     * @see PHPMailer::$Hostname
+     */
+    public $Helo = '';
+
+    /**
+     * The secure connection prefix.
+     * Options: "", "ssl" or "tls"
+     * @type string
+     */
+    public $SMTPSecure = '';
+
+    /**
+     * Whether to use SMTP authentication.
+     * Uses the Username and Password properties.
+     * @type boolean
+     * @see PHPMailer::$Username
+     * @see PHPMailer::$Password
+     */
+    public $SMTPAuth = false;
+
+    /**
+     * SMTP username.
+     * @type string
+     */
+    public $Username = '';
+
+    /**
+     * SMTP password.
+     * @type string
+     */
+    public $Password = '';
+
+    /**
+     * SMTP auth type.
+     * Options are LOGIN (default), PLAIN, NTLM, CRAM-MD5
+     * @type string
+     */
+    public $AuthType = '';
+
+    /**
+     * SMTP realm.
+     * Used for NTLM auth
+     * @type string
+     */
+    public $Realm = '';
+
+    /**
+     * SMTP workstation.
+     * Used for NTLM auth
+     * @type string
+     */
+    public $Workstation = '';
+
+    /**
+     * The SMTP server timeout in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+     * @type integer
+     */
+    public $Timeout = 300;
+
+    /**
+     * SMTP class debug output mode.
+     * Debug output level.
+     * Options:
+     * * `0` No output
+     * * `1` Commands
+     * * `2` Data and commands
+     * * `3` As 2 plus connection status
+     * * `4` Low-level data output
+     * @type integer
+     * @see SMTP::$do_debug
+     */
+    public $SMTPDebug = 0;
+
+    /**
+     * How to handle debug output.
+     * Options:
+     * * `echo` Output plain-text as-is, appropriate for CLI
+     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+     * * `error_log` Output to error log as configured in php.ini
+     *
+     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
+     * <code>
+     * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+     * </code>
+     * @type string|callable
+     * @see SMTP::$Debugoutput
+     */
+    public $Debugoutput = 'echo';
+
+    /**
+     * Whether to keep SMTP connection open after each message.
+     * If this is set to true then to close the connection
+     * requires an explicit call to smtpClose().
+     * @type boolean
+     */
+    public $SMTPKeepAlive = false;
+
+    /**
+     * Whether to split multiple to addresses into multiple messages
+     * or send them all in one message.
+     * @type boolean
+     */
+    public $SingleTo = false;
+
+    /**
+     * Storage for addresses when SingleTo is enabled.
+     * @type array
+     * @TODO This should really not be public
+     */
+    public $SingleToArray = array();
+
+    /**
+     * Whether to generate VERP addresses on send.
+     * Only applicable when sending via SMTP.
+     * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
+     * @link http://www.postfix.org/VERP_README.html Postfix VERP info
+     * @type boolean
+     */
+    public $do_verp = false;
+
+    /**
+     * Whether to allow sending messages with an empty body.
+     * @type boolean
+     */
+    public $AllowEmpty = false;
+
+    /**
+     * The default line ending.
+     * @note The default remains "\n". We force CRLF where we know
+     *        it must be used via self::CRLF.
+     * @type string
+     */
+    public $LE = "\n";
+
+    /**
+     * DKIM selector.
+     * @type string
+     */
+    public $DKIM_selector = '';
+
+    /**
+     * DKIM Identity.
+     * Usually the email address used as the source of the email
+     * @type string
+     */
+    public $DKIM_identity = '';
+
+    /**
+     * DKIM passphrase.
+     * Used if your key is encrypted.
+     * @type string
+     */
+    public $DKIM_passphrase = '';
+
+    /**
+     * DKIM signing domain name.
+     * @example 'example.com'
+     * @type string
+     */
+    public $DKIM_domain = '';
+
+    /**
+     * DKIM private key file path.
+     * @type string
+     */
+    public $DKIM_private = '';
+
+    /**
+     * Callback Action function name.
+     *
+     * The function that handles the result of the send email action.
+     * It is called out by send() for each email sent.
+     *
+     * Value can be any php callable: http://www.php.net/is_callable
+     *
+     * Parameters:
+     *   boolean $result        result of the send action
+     *   string  $to            email address of the recipient
+     *   string  $cc            cc email addresses
+     *   string  $bcc           bcc email addresses
+     *   string  $subject       the subject
+     *   string  $body          the email body
+     *   string  $from          email address of sender
+     * @type string
+     */
+    public $action_function = '';
+
+    /**
+     * What to use in the X-Mailer header.
+     * Options: null for default, whitespace for none, or a string to use
+     * @type string
+     */
+    public $XMailer = '';
+
+    /**
+     * An instance of the SMTP sender class.
+     * @type SMTP
+     * @access protected
+     */
+    protected $smtp = null;
+
+    /**
+     * The array of 'to' addresses.
+     * @type array
+     * @access protected
+     */
+    protected $to = array();
+
+    /**
+     * The array of 'cc' addresses.
+     * @type array
+     * @access protected
+     */
+    protected $cc = array();
+
+    /**
+     * The array of 'bcc' addresses.
+     * @type array
+     * @access protected
+     */
+    protected $bcc = array();
+
+    /**
+     * The array of reply-to names and addresses.
+     * @type array
+     * @access protected
+     */
+    protected $ReplyTo = array();
+
+    /**
+     * An array of all kinds of addresses.
+     * Includes all of $to, $cc, $bcc, $replyto
+     * @type array
+     * @access protected
+     */
+    protected $all_recipients = array();
+
+    /**
+     * The array of attachments.
+     * @type array
+     * @access protected
+     */
+    protected $attachment = array();
+
+    /**
+     * The array of custom headers.
+     * @type array
+     * @access protected
+     */
+    protected $CustomHeader = array();
+
+    /**
+     * The most recent Message-ID (including angular brackets).
+     * @type string
+     * @access protected
+     */
+    protected $lastMessageID = '';
+
+    /**
+     * The message's MIME type.
+     * @type string
+     * @access protected
+     */
+    protected $message_type = '';
+
+    /**
+     * The array of MIME boundary strings.
+     * @type array
+     * @access protected
+     */
+    protected $boundary = array();
+
+    /**
+     * The array of available languages.
+     * @type array
+     * @access protected
+     */
+    protected $language = array();
+
+    /**
+     * The number of errors encountered.
+     * @type integer
+     * @access protected
+     */
+    protected $error_count = 0;
+
+    /**
+     * The S/MIME certificate file path.
+     * @type string
+     * @access protected
+     */
+    protected $sign_cert_file = '';
+
+    /**
+     * The S/MIME key file path.
+     * @type string
+     * @access protected
+     */
+    protected $sign_key_file = '';
+
+    /**
+     * The S/MIME password for the key.
+     * Used only if the key is encrypted.
+     * @type string
+     * @access protected
+     */
+    protected $sign_key_pass = '';
+
+    /**
+     * Whether to throw exceptions for errors.
+     * @type boolean
+     * @access protected
+     */
+    protected $exceptions = false;
+
+    /**
+     * Error severity: message only, continue processing.
+     */
+    const STOP_MESSAGE = 0;
+
+    /**
+     * Error severity: message, likely ok to continue processing.
+     */
+    const STOP_CONTINUE = 1;
+
+    /**
+     * Error severity: message, plus full stop, critical error reached.
+     */
+    const STOP_CRITICAL = 2;
+
+    /**
+     * SMTP RFC standard line ending.
+     */
+    const CRLF = "\r\n";
+
+    /**
+     * Constructor.
+     * @param boolean $exceptions Should we throw external exceptions?
+     */
+    public function __construct($exceptions = false)
+    {
+        $this->exceptions = (boolean)$exceptions;
+    }
+
+    /**
+     * Destructor.
+     */
+    public function __destruct()
+    {
+        if ($this->Mailer == 'smtp') { //close any open SMTP connection nicely
+            $this->smtpClose();
+        }
+    }
+
+    /**
+     * Call mail() in a safe_mode-aware fashion.
+     * Also, unless sendmail_path points to sendmail (or something that
+     * claims to be sendmail), don't pass params (not a perfect fix,
+     * but it will do)
+     * @param string $to To
+     * @param string $subject Subject
+     * @param string $body Message Body
+     * @param string $header Additional Header(s)
+     * @param string $params Params
+     * @access private
+     * @return boolean
+     */
+    private function mailPassthru($to, $subject, $body, $header, $params)
+    {
+        //Check overloading of mail function to avoid double-encoding
+        if (ini_get('mbstring.func_overload') & 1) {
+            $subject = $this->secureHeader($subject);
+        } else {
+            $subject = $this->encodeHeader($this->secureHeader($subject));
+        }
+        if (ini_get('safe_mode') || !($this->UseSendmailOptions)) {
+            $result = @mail($to, $subject, $body, $header);
+        } else {
+            $result = @mail($to, $subject, $body, $header, $params);
+        }
+        return $result;
+    }
+
+    /**
+     * Output debugging info via user-defined method.
+     * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).
+     * @see PHPMailer::$Debugoutput
+     * @see PHPMailer::$SMTPDebug
+     * @param string $str
+     */
+    protected function edebug($str)
+    {
+        if ($this->SMTPDebug <= 0) {
+            return;
+        }
+        //Avoid clash with built-in function names
+        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+            call_user_func($this->Debugoutput, $str, $this->SMTPDebug);
+            return;
+        }
+        switch ($this->Debugoutput) {
+            case 'error_log':
+                //Don't output, just log
+                error_log($str);
+                break;
+            case 'html':
+                //Cleans up output a bit for a better looking, HTML-safe output
+                echo htmlentities(
+                    preg_replace('/[\r\n]+/', '', $str),
+                    ENT_QUOTES,
+                    'UTF-8'
+                )
+                . "<br>\n";
+                break;
+            case 'echo':
+            default:
+                //Normalize line breaks
+                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
+                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                    "\n",
+                    "\n                   \t                  ",
+                    trim($str)
+                ) . "\n";
+        }
+    }
+
+    /**
+     * Sets message type to HTML or plain.
+     * @param boolean $isHtml True for HTML mode.
+     * @return void
+     */
+    public function isHTML($isHtml = true)
+    {
+        if ($isHtml) {
+            $this->ContentType = 'text/html';
+        } else {
+            $this->ContentType = 'text/plain';
+        }
+    }
+
+    /**
+     * Send messages using SMTP.
+     * @return void
+     */
+    public function isSMTP()
+    {
+        $this->Mailer = 'smtp';
+    }
+
+    /**
+     * Send messages using PHP's mail() function.
+     * @return void
+     */
+    public function isMail()
+    {
+        $this->Mailer = 'mail';
+    }
+
+    /**
+     * Send messages using $Sendmail.
+     * @return void
+     */
+    public function isSendmail()
+    {
+        $ini_sendmail_path = ini_get('sendmail_path');
+
+        if (!stristr($ini_sendmail_path, 'sendmail')) {
+            $this->Sendmail = '/usr/sbin/sendmail';
+        } else {
+            $this->Sendmail = $ini_sendmail_path;
+        }
+        $this->Mailer = 'sendmail';
+    }
+
+    /**
+     * Send messages using qmail.
+     * @return void
+     */
+    public function isQmail()
+    {
+        $ini_sendmail_path = ini_get('sendmail_path');
+
+        if (!stristr($ini_sendmail_path, 'qmail')) {
+            $this->Sendmail = '/var/qmail/bin/qmail-inject';
+        } else {
+            $this->Sendmail = $ini_sendmail_path;
+        }
+        $this->Mailer = 'qmail';
+    }
+
+    /**
+     * Add a "To" address.
+     * @param string $address
+     * @param string $name
+     * @return boolean true on success, false if address already used
+     */
+    public function addAddress($address, $name = '')
+    {
+        return $this->addAnAddress('to', $address, $name);
+    }
+
+    /**
+     * Add a "CC" address.
+     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
+     * @param string $address
+     * @param string $name
+     * @return boolean true on success, false if address already used
+     */
+    public function addCC($address, $name = '')
+    {
+        return $this->addAnAddress('cc', $address, $name);
+    }
+
+    /**
+     * Add a "BCC" address.
+     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
+     * @param string $address
+     * @param string $name
+     * @return boolean true on success, false if address already used
+     */
+    public function addBCC($address, $name = '')
+    {
+        return $this->addAnAddress('bcc', $address, $name);
+    }
+
+    /**
+     * Add a "Reply-to" address.
+     * @param string $address
+     * @param string $name
+     * @return boolean
+     */
+    public function addReplyTo($address, $name = '')
+    {
+        return $this->addAnAddress('Reply-To', $address, $name);
+    }
+
+    /**
+     * Add an address to one of the recipient arrays.
+     * Addresses that have been added already return false, but do not throw exceptions
+     * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
+     * @param string $address The email address to send to
+     * @param string $name
+     * @throws phpmailerException
+     * @return boolean true on success, false if address already used or invalid in some way
+     * @access protected
+     */
+    protected function addAnAddress($kind, $address, $name = '')
+    {
+        if (!preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) {
+            $this->setError($this->lang('Invalid recipient array') . ': ' . $kind);
+            $this->edebug($this->lang('Invalid recipient array') . ': ' . $kind);
+            if ($this->exceptions) {
+                throw new phpmailerException('Invalid recipient array: ' . $kind);
+            }
+            return false;
+        }
+        $address = trim($address);
+        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        if (!$this->validateAddress($address)) {
+            $this->setError($this->lang('invalid_address') . ': ' . $address);
+            $this->edebug($this->lang('invalid_address') . ': ' . $address);
+            if ($this->exceptions) {
+                throw new phpmailerException($this->lang('invalid_address') . ': ' . $address);
+            }
+            return false;
+        }
+        if ($kind != 'Reply-To') {
+            if (!isset($this->all_recipients[strtolower($address)])) {
+                array_push($this->$kind, array($address, $name));
+                $this->all_recipients[strtolower($address)] = true;
+                return true;
+            }
+        } else {
+            if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
+                $this->ReplyTo[strtolower($address)] = array($address, $name);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Set the From and FromName properties.
+     * @param string $address
+     * @param string $name
+     * @param boolean $auto Whether to also set the Sender address, defaults to true
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function setFrom($address, $name = '', $auto = true)
+    {
+        $address = trim($address);
+        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        if (!$this->validateAddress($address)) {
+            $this->setError($this->lang('invalid_address') . ': ' . $address);
+            $this->edebug($this->lang('invalid_address') . ': ' . $address);
+            if ($this->exceptions) {
+                throw new phpmailerException($this->lang('invalid_address') . ': ' . $address);
+            }
+            return false;
+        }
+        $this->From = $address;
+        $this->FromName = $name;
+        if ($auto) {
+            if (empty($this->Sender)) {
+                $this->Sender = $address;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Return the Message-ID header of the last email.
+     * Technically this is the value from the last time the headers were created,
+     * but it's also the message ID of the last sent message except in
+     * pathological cases.
+     * @return string
+     */
+    public function getLastMessageID()
+    {
+        return $this->lastMessageID;
+    }
+
+    /**
+     * Check that a string looks like an email address.
+     * @param string $address The email address to check
+     * @param string $patternselect A selector for the validation pattern to use :
+     * * `auto` Pick strictest one automatically;
+     * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14;
+     * * `pcre` Use old PCRE implementation;
+     * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL; same as pcre8 but does not allow 'dotless' domains;
+     * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
+     * * `noregex` Don't use a regex: super fast, really dumb.
+     * @return boolean
+     * @static
+     * @access public
+     */
+    public static function validateAddress($address, $patternselect = 'auto')
+    {
+        if (!$patternselect or $patternselect == 'auto') {
+            //Check this constant first so it works when extension_loaded() is disabled by safe mode
+            //Constant was added in PHP 5.2.4
+            if (defined('PCRE_VERSION')) {
+                //This pattern can get stuck in a recursive loop in PCRE <= 8.0.2
+                if (version_compare(PCRE_VERSION, '8.0.3') >= 0) {
+                    $patternselect = 'pcre8';
+                } else {
+                    $patternselect = 'pcre';
+                }
+            } elseif (function_exists('extension_loaded') and extension_loaded('pcre')) {
+                //Fall back to older PCRE
+                $patternselect = 'pcre';
+            } else {
+                //Filter_var appeared in PHP 5.2.0 and does not require the PCRE extension
+                if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
+                    $patternselect = 'php';
+                } else {
+                    $patternselect = 'noregex';
+                }
+            }
+        }
+        switch ($patternselect) {
+            case 'pcre8':
+                /**
+                 * Uses the same RFC5322 regex on which FILTER_VALIDATE_EMAIL is based, but allows dotless domains.
+                 * @link http://squiloople.com/2009/12/20/email-address-validation/
+                 * @copyright 2009-2010 Michael Rushton
+                 * Feel free to use and redistribute this code. But please keep this copyright notice.
+                 */
+                return (boolean)preg_match(
+                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
+                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
+                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' .
+                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' .
+                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' .
+                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' .
+                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' .
+                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+                    '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
+                    $address
+                );
+            case 'pcre':
+                //An older regex that doesn't need a recent PCRE
+                return (boolean)preg_match(
+                    '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' .
+                    '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' .
+                    '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' .
+                    '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})' .
+                    '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:' .
+                    '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?' .
+                    '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:' .
+                    '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?' .
+                    '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+                    '|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD',
+                    $address
+                );
+            case 'html5':
+                /**
+                 * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
+                 * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
+                 */
+                return (boolean)preg_match(
+                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
+                    '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD',
+                    $address
+                );
+            case 'noregex':
+                //No PCRE! Do something _very_ approximate!
+                //Check the address is 3 chars or longer and contains an @ that's not the first or last char
+                return (strlen($address) >= 3
+                    and strpos($address, '@') >= 1
+                    and strpos($address, '@') != strlen($address) - 1);
+            case 'php':
+            default:
+                return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL);
+        }
+    }
+
+    /**
+     * Create a message and send it.
+     * Uses the sending method specified by $Mailer.
+     * @throws phpmailerException
+     * @return boolean false on error - See the ErrorInfo property for details of the error.
+     */
+    public function send()
+    {
+        try {
+            if (!$this->preSend()) {
+                return false;
+            }
+            return $this->postSend();
+        } catch (phpmailerException $exc) {
+            $this->mailHeader = '';
+            $this->setError($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Prepare a message for sending.
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function preSend()
+    {
+        try {
+            $this->mailHeader = '';
+            if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
+                throw new phpmailerException($this->lang('provide_address'), self::STOP_CRITICAL);
+            }
+
+            // Set whether the message is multipart/alternative
+            if (!empty($this->AltBody)) {
+                $this->ContentType = 'multipart/alternative';
+            }
+
+            $this->error_count = 0; // reset errors
+            $this->setMessageType();
+            // Refuse to send an empty message unless we are specifically allowing it
+            if (!$this->AllowEmpty and empty($this->Body)) {
+                throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL);
+            }
+
+            $this->MIMEHeader = $this->createHeader();
+            $this->MIMEBody = $this->createBody();
+
+            // To capture the complete message when using mail(), create
+            // an extra header list which createHeader() doesn't fold in
+            if ($this->Mailer == 'mail') {
+                if (count($this->to) > 0) {
+                    $this->mailHeader .= $this->addrAppend('To', $this->to);
+                } else {
+                    $this->mailHeader .= $this->headerLine('To', 'undisclosed-recipients:;');
+                }
+                $this->mailHeader .= $this->headerLine(
+                    'Subject',
+                    $this->encodeHeader($this->secureHeader(trim($this->Subject)))
+                );
+            }
+
+            // Sign with DKIM if enabled
+            if (!empty($this->DKIM_domain)
+                && !empty($this->DKIM_private)
+                && !empty($this->DKIM_selector)
+                && !empty($this->DKIM_domain)
+                && file_exists($this->DKIM_private)) {
+                $header_dkim = $this->DKIM_Add(
+                    $this->MIMEHeader . $this->mailHeader,
+                    $this->encodeHeader($this->secureHeader($this->Subject)),
+                    $this->MIMEBody
+                );
+                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . self::CRLF .
+                    str_replace("\r\n", "\n", $header_dkim) . self::CRLF;
+            }
+            return true;
+
+        } catch (phpmailerException $exc) {
+            $this->setError($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Actually send a message.
+     * Send the email via the selected mechanism
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function postSend()
+    {
+        try {
+            // Choose the mailer and send through it
+            switch ($this->Mailer) {
+                case 'sendmail':
+                case 'qmail':
+                    return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody);
+                case 'smtp':
+                    return $this->smtpSend($this->MIMEHeader, $this->MIMEBody);
+                case 'mail':
+                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
+                default:
+                    $sendMethod = $this->Mailer.'Send';
+                    if (method_exists($this, $sendMethod)) {
+                        return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
+                    }
+
+                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
+            }
+        } catch (phpmailerException $exc) {
+            $this->setError($exc->getMessage());
+            $this->edebug($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Send mail using the $Sendmail program.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @see PHPMailer::$Sendmail
+     * @throws phpmailerException
+     * @access protected
+     * @return boolean
+     */
+    protected function sendmailSend($header, $body)
+    {
+        if ($this->Sender != '') {
+            if ($this->Mailer == 'qmail') {
+                $sendmail = sprintf('%s -f%s', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
+            } else {
+                $sendmail = sprintf('%s -oi -f%s -t', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
+            }
+        } else {
+            if ($this->Mailer == 'qmail') {
+                $sendmail = sprintf('%s', escapeshellcmd($this->Sendmail));
+            } else {
+                $sendmail = sprintf('%s -oi -t', escapeshellcmd($this->Sendmail));
+            }
+        }
+        if ($this->SingleTo) {
+            foreach ($this->SingleToArray as $toAddr) {
+                if (!@$mail = popen($sendmail, 'w')) {
+                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                }
+                fputs($mail, 'To: ' . $toAddr . "\n");
+                fputs($mail, $header);
+                fputs($mail, $body);
+                $result = pclose($mail);
+                $this->doCallback(
+                    ($result == 0),
+                    array($toAddr),
+                    $this->cc,
+                    $this->bcc,
+                    $this->Subject,
+                    $body,
+                    $this->From
+                );
+                if ($result != 0) {
+                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                }
+            }
+        } else {
+            if (!@$mail = popen($sendmail, 'w')) {
+                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            }
+            fputs($mail, $header);
+            fputs($mail, $body);
+            $result = pclose($mail);
+            $this->doCallback(($result == 0), $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
+            if ($result != 0) {
+                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Send mail using the PHP mail() function.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @link http://www.php.net/manual/en/book.mail.php
+     * @throws phpmailerException
+     * @access protected
+     * @return boolean
+     */
+    protected function mailSend($header, $body)
+    {
+        $toArr = array();
+        foreach ($this->to as $toaddr) {
+            $toArr[] = $this->addrFormat($toaddr);
+        }
+        $to = implode(', ', $toArr);
+
+        if (empty($this->Sender)) {
+            $params = ' ';
+        } else {
+            $params = sprintf('-f%s', $this->Sender);
+        }
+        if ($this->Sender != '' and !ini_get('safe_mode')) {
+            $old_from = ini_get('sendmail_from');
+            ini_set('sendmail_from', $this->Sender);
+        }
+        $result = false;
+        if ($this->SingleTo && count($toArr) > 1) {
+            foreach ($toArr as $toAddr) {
+                $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
+                $this->doCallback($result, array($toAddr), $this->cc, $this->bcc, $this->Subject, $body, $this->From);
+            }
+        } else {
+            $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params);
+            $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
+        }
+        if (isset($old_from)) {
+            ini_set('sendmail_from', $old_from);
+        }
+        if (!$result) {
+            throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL);
+        }
+        return true;
+    }
+
+    /**
+     * Get an instance to use for SMTP operations.
+     * Override this function to load your own SMTP implementation
+     * @return SMTP
+     */
+    public function getSMTPInstance()
+    {
+        if (!is_object($this->smtp)) {
+            $this->smtp = new SMTP;
+        }
+        return $this->smtp;
+    }
+
+    /**
+     * Send mail via SMTP.
+     * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
+     * Uses the PHPMailerSMTP class by default.
+     * @see PHPMailer::getSMTPInstance() to use a different class.
+     * @param string $header The message headers
+     * @param string $body The message body
+     * @throws phpmailerException
+     * @uses SMTP
+     * @access protected
+     * @return boolean
+     */
+    protected function smtpSend($header, $body)
+    {
+        $bad_rcpt = array();
+
+        if (!$this->smtpConnect()) {
+            throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
+        }
+        $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
+        if (!$this->smtp->mail($smtp_from)) {
+            $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
+            throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL);
+        }
+
+        // Attempt to send to all recipients
+        foreach ($this->to as $to) {
+            if (!$this->smtp->recipient($to[0])) {
+                $bad_rcpt[] = $to[0];
+                $isSent = false;
+            } else {
+                $isSent = true;
+            }
+            $this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From);
+        }
+        foreach ($this->cc as $cc) {
+            if (!$this->smtp->recipient($cc[0])) {
+                $bad_rcpt[] = $cc[0];
+                $isSent = false;
+            } else {
+                $isSent = true;
+            }
+            $this->doCallback($isSent, array(), array($cc[0]), array(), $this->Subject, $body, $this->From);
+        }
+        foreach ($this->bcc as $bcc) {
+            if (!$this->smtp->recipient($bcc[0])) {
+                $bad_rcpt[] = $bcc[0];
+                $isSent = false;
+            } else {
+                $isSent = true;
+            }
+            $this->doCallback($isSent, array(), array(), array($bcc[0]), $this->Subject, $body, $this->From);
+        }
+
+        // Only send the DATA command if we have viable recipients
+        if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
+            throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL);
+        }
+        if ($this->SMTPKeepAlive) {
+            $this->smtp->reset();
+        } else {
+            $this->smtp->quit();
+            $this->smtp->close();
+        }
+        if (count($bad_rcpt) > 0) { // Create error message for any bad addresses
+            throw new phpmailerException(
+                $this->lang('recipients_failed') . implode(', ', $bad_rcpt),
+                self::STOP_CONTINUE
+            );
+        }
+        return true;
+    }
+
+    /**
+     * Initiate a connection to an SMTP server.
+     * Returns false if the operation failed.
+     * @param array $options An array of options compatible with stream_context_create()
+     * @uses SMTP
+     * @access public
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function smtpConnect($options = array())
+    {
+        if (is_null($this->smtp)) {
+            $this->smtp = $this->getSMTPInstance();
+        }
+
+        // Already connected?
+        if ($this->smtp->connected()) {
+            return true;
+        }
+
+        $this->smtp->setTimeout($this->Timeout);
+        $this->smtp->setDebugLevel($this->SMTPDebug);
+        $this->smtp->setDebugOutput($this->Debugoutput);
+        $this->smtp->setVerp($this->do_verp);
+        $hosts = explode(';', $this->Host);
+        $lastexception = null;
+
+        foreach ($hosts as $hostentry) {
+            $hostinfo = array();
+            if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) {
+                // Not a valid host entry
+                continue;
+            }
+            // $hostinfo[2]: optional ssl or tls prefix
+            // $hostinfo[3]: the hostname
+            // $hostinfo[4]: optional port number
+            // The host string prefix can temporarily override the current setting for SMTPSecure
+            // If it's not specified, the default value is used
+            $prefix = '';
+            $tls = ($this->SMTPSecure == 'tls');
+            if ($hostinfo[2] == 'ssl' or ($hostinfo[2] == '' and $this->SMTPSecure == 'ssl')) {
+                $prefix = 'ssl://';
+                $tls = false; // Can't have SSL and TLS at once
+            } elseif ($hostinfo[2] == 'tls') {
+                $tls = true;
+                // tls doesn't use a prefix
+            }
+            $host = $hostinfo[3];
+            $port = $this->Port;
+            $tport = (integer)$hostinfo[4];
+            if ($tport > 0 and $tport < 65536) {
+                $port = $tport;
+            }
+            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
+                try {
+                    if ($this->Helo) {
+                        $hello = $this->Helo;
+                    } else {
+                        $hello = $this->serverHostname();
+                    }
+                    $this->smtp->hello($hello);
+
+                    if ($tls) {
+                        if (!$this->smtp->startTLS()) {
+                            throw new phpmailerException($this->lang('connect_host'));
+                        }
+                        // We must resend HELO after tls negotiation
+                        $this->smtp->hello($hello);
+                    }
+                    if ($this->SMTPAuth) {
+                        if (!$this->smtp->authenticate(
+                            $this->Username,
+                            $this->Password,
+                            $this->AuthType,
+                            $this->Realm,
+                            $this->Workstation
+                        )
+                        ) {
+                            throw new phpmailerException($this->lang('authenticate'));
+                        }
+                    }
+                    return true;
+                } catch (phpmailerException $exc) {
+                    $lastexception = $exc;
+                    // We must have connected, but then failed TLS or Auth, so close connection nicely
+                    $this->smtp->quit();
+                }
+            }
+        }
+        // If we get here, all connection attempts have failed, so close connection hard
+        $this->smtp->close();
+        // As we've caught all exceptions, just report whatever the last one was
+        if ($this->exceptions and !is_null($lastexception)) {
+            throw $lastexception;
+        }
+        return false;
+    }
+
+    /**
+     * Close the active SMTP session if one exists.
+     * @return void
+     */
+    public function smtpClose()
+    {
+        if ($this->smtp !== null) {
+            if ($this->smtp->connected()) {
+                $this->smtp->quit();
+                $this->smtp->close();
+            }
+        }
+    }
+
+    /**
+     * Set the language for error messages.
+     * Returns false if it cannot load the language file.
+     * The default language is English.
+     * @param string $langcode ISO 639-1 2-character language code (e.g. French is "fr")
+     * @param string $lang_path Path to the language file directory, with trailing separator (slash)
+     * @return boolean
+     * @access public
+     */
+    public function setLanguage($langcode = 'en', $lang_path = '')
+    {
+        // Define full set of translatable strings in English
+        $PHPMAILER_LANG = array(
+            'authenticate' => 'SMTP Error: Could not authenticate.',
+            'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
+            'data_not_accepted' => 'SMTP Error: data not accepted.',
+            'empty_message' => 'Message body empty',
+            'encoding' => 'Unknown encoding: ',
+            'execute' => 'Could not execute: ',
+            'file_access' => 'Could not access file: ',
+            'file_open' => 'File Error: Could not open file: ',
+            'from_failed' => 'The following From address failed: ',
+            'instantiate' => 'Could not instantiate mail function.',
+            'invalid_address' => 'Invalid address',
+            'mailer_not_supported' => ' mailer is not supported.',
+            'provide_address' => 'You must provide at least one recipient email address.',
+            'recipients_failed' => 'SMTP Error: The following recipients failed: ',
+            'signing' => 'Signing Error: ',
+            'smtp_connect_failed' => 'SMTP connect() failed.',
+            'smtp_error' => 'SMTP server error: ',
+            'variable_set' => 'Cannot set or reset variable: '
+        );
+        if (empty($lang_path)) {
+            // Calculate an absolute path so it can work if CWD is not here
+            $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR;
+        }
+        $foundlang = true;
+        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
+        if ($langcode != 'en') { // There is no English translation file
+            // Make sure language file path is readable
+            if (!is_readable($lang_file)) {
+                $foundlang = false;
+            } else {
+                // Overwrite language-specific strings.
+                // This way we'll never have missing translations.
+                $foundlang = include $lang_file;
+            }
+        }
+        $this->language = $PHPMAILER_LANG;
+        return (boolean)$foundlang; // Returns false if language not found
+    }
+
+    /**
+     * Get the array of strings for the current language.
+     * @return array
+     */
+    public function getTranslations()
+    {
+        return $this->language;
+    }
+
+    /**
+     * Create recipient headers.
+     * @access public
+     * @param string $type
+     * @param array $addr An array of recipient,
+     * where each recipient is a 2-element indexed array with element 0 containing an address
+     * and element 1 containing a name, like:
+     * array(array('joe@example.com', 'Joe User'), array('zoe@example.com', 'Zoe User'))
+     * @return string
+     */
+    public function addrAppend($type, $addr)
+    {
+        $addresses = array();
+        foreach ($addr as $address) {
+            $addresses[] = $this->addrFormat($address);
+        }
+        return $type . ': ' . implode(', ', $addresses) . $this->LE;
+    }
+
+    /**
+     * Format an address for use in a message header.
+     * @access public
+     * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name
+     *      like array('joe@example.com', 'Joe User')
+     * @return string
+     */
+    public function addrFormat($addr)
+    {
+        if (empty($addr[1])) { // No name provided
+            return $this->secureHeader($addr[0]);
+        } else {
+            return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
+                $addr[0]
+            ) . '>';
+        }
+    }
+
+    /**
+     * Word-wrap message.
+     * For use with mailers that do not automatically perform wrapping
+     * and for quoted-printable encoded messages.
+     * Original written by philippe.
+     * @param string $message The message to wrap
+     * @param integer $length The line length to wrap to
+     * @param boolean $qp_mode Whether to run in Quoted-Printable mode
+     * @access public
+     * @return string
+     */
+    public function wrapText($message, $length, $qp_mode = false)
+    {
+        $soft_break = ($qp_mode) ? sprintf(' =%s', $this->LE) : $this->LE;
+        // If utf-8 encoding is used, we will need to make sure we don't
+        // split multibyte characters when we wrap
+        $is_utf8 = (strtolower($this->CharSet) == 'utf-8');
+        $lelen = strlen($this->LE);
+        $crlflen = strlen(self::CRLF);
+
+        $message = $this->fixEOL($message);
+        if (substr($message, -$lelen) == $this->LE) {
+            $message = substr($message, 0, -$lelen);
+        }
+
+        $line = explode($this->LE, $message); // Magic. We know fixEOL uses $LE
+        $message = '';
+        for ($i = 0; $i < count($line); $i++) {
+            $line_part = explode(' ', $line[$i]);
+            $buf = '';
+            for ($e = 0; $e < count($line_part); $e++) {
+                $word = $line_part[$e];
+                if ($qp_mode and (strlen($word) > $length)) {
+                    $space_left = $length - strlen($buf) - $crlflen;
+                    if ($e != 0) {
+                        if ($space_left > 20) {
+                            $len = $space_left;
+                            if ($is_utf8) {
+                                $len = $this->utf8CharBoundary($word, $len);
+                            } elseif (substr($word, $len - 1, 1) == '=') {
+                                $len--;
+                            } elseif (substr($word, $len - 2, 1) == '=') {
+                                $len -= 2;
+                            }
+                            $part = substr($word, 0, $len);
+                            $word = substr($word, $len);
+                            $buf .= ' ' . $part;
+                            $message .= $buf . sprintf('=%s', self::CRLF);
+                        } else {
+                            $message .= $buf . $soft_break;
+                        }
+                        $buf = '';
+                    }
+                    while (strlen($word) > 0) {
+                        if ($length <= 0) {
+                            break;
+                        }
+                        $len = $length;
+                        if ($is_utf8) {
+                            $len = $this->utf8CharBoundary($word, $len);
+                        } elseif (substr($word, $len - 1, 1) == '=') {
+                            $len--;
+                        } elseif (substr($word, $len - 2, 1) == '=') {
+                            $len -= 2;
+                        }
+                        $part = substr($word, 0, $len);
+                        $word = substr($word, $len);
+
+                        if (strlen($word) > 0) {
+                            $message .= $part . sprintf('=%s', self::CRLF);
+                        } else {
+                            $buf = $part;
+                        }
+                    }
+                } else {
+                    $buf_o = $buf;
+                    $buf .= ($e == 0) ? $word : (' ' . $word);
+
+                    if (strlen($buf) > $length and $buf_o != '') {
+                        $message .= $buf_o . $soft_break;
+                        $buf = $word;
+                    }
+                }
+            }
+            $message .= $buf . self::CRLF;
+        }
+
+        return $message;
+    }
+
+    /**
+     * Find the last character boundary prior to $maxLength in a utf-8
+     * quoted (printable) encoded string.
+     * Original written by Colin Brown.
+     * @access public
+     * @param string $encodedText utf-8 QP text
+     * @param integer $maxLength   find last character boundary prior to this length
+     * @return integer
+     */
+    public function utf8CharBoundary($encodedText, $maxLength)
+    {
+        $foundSplitPos = false;
+        $lookBack = 3;
+        while (!$foundSplitPos) {
+            $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
+            $encodedCharPos = strpos($lastChunk, '=');
+            if (false !== $encodedCharPos) {
+                // Found start of encoded character byte within $lookBack block.
+                // Check the encoded byte value (the 2 chars after the '=')
+                $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
+                $dec = hexdec($hex);
+                if ($dec < 128) { // Single byte character.
+                    // If the encoded char was found at pos 0, it will fit
+                    // otherwise reduce maxLength to start of the encoded char
+                    $maxLength = ($encodedCharPos == 0) ? $maxLength :
+                        $maxLength - ($lookBack - $encodedCharPos);
+                    $foundSplitPos = true;
+                } elseif ($dec >= 192) { // First byte of a multi byte character
+                    // Reduce maxLength to split at start of character
+                    $maxLength = $maxLength - ($lookBack - $encodedCharPos);
+                    $foundSplitPos = true;
+                } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
+                    $lookBack += 3;
+                }
+            } else {
+                // No encoded character found
+                $foundSplitPos = true;
+            }
+        }
+        return $maxLength;
+    }
+
+    /**
+     * Set the body wrapping.
+     * @access public
+     * @return void
+     */
+    public function setWordWrap()
+    {
+        if ($this->WordWrap < 1) {
+            return;
+        }
+
+        switch ($this->message_type) {
+            case 'alt':
+            case 'alt_inline':
+            case 'alt_attach':
+            case 'alt_inline_attach':
+                $this->AltBody = $this->wrapText($this->AltBody, $this->WordWrap);
+                break;
+            default:
+                $this->Body = $this->wrapText($this->Body, $this->WordWrap);
+                break;
+        }
+    }
+
+    /**
+     * Assemble message headers.
+     * @access public
+     * @return string The assembled headers
+     */
+    public function createHeader()
+    {
+        $result = '';
+
+        // Set the boundaries
+        $uniq_id = md5(uniqid(time()));
+        $this->boundary[1] = 'b1_' . $uniq_id;
+        $this->boundary[2] = 'b2_' . $uniq_id;
+        $this->boundary[3] = 'b3_' . $uniq_id;
+
+        if ($this->MessageDate == '') {
+            $this->MessageDate = self::rfcDate();
+        }
+        $result .= $this->headerLine('Date', $this->MessageDate);
+
+
+        // To be created automatically by mail()
+        if ($this->SingleTo) {
+            if ($this->Mailer != 'mail') {
+                foreach ($this->to as $toaddr) {
+                    $this->SingleToArray[] = $this->addrFormat($toaddr);
+                }
+            }
+        } else {
+            if (count($this->to) > 0) {
+                if ($this->Mailer != 'mail') {
+                    $result .= $this->addrAppend('To', $this->to);
+                }
+            } elseif (count($this->cc) == 0) {
+                $result .= $this->headerLine('To', 'undisclosed-recipients:;');
+            }
+        }
+
+        $result .= $this->addrAppend('From', array(array(trim($this->From), $this->FromName)));
+
+        // sendmail and mail() extract Cc from the header before sending
+        if (count($this->cc) > 0) {
+            $result .= $this->addrAppend('Cc', $this->cc);
+        }
+
+        // sendmail and mail() extract Bcc from the header before sending
+        if ((
+                $this->Mailer == 'sendmail' or $this->Mailer == 'qmail' or $this->Mailer == 'mail'
+            )
+            and count($this->bcc) > 0
+        ) {
+            $result .= $this->addrAppend('Bcc', $this->bcc);
+        }
+
+        if (count($this->ReplyTo) > 0) {
+            $result .= $this->addrAppend('Reply-To', $this->ReplyTo);
+        }
+
+        // mail() sets the subject itself
+        if ($this->Mailer != 'mail') {
+            $result .= $this->headerLine('Subject', $this->encodeHeader($this->secureHeader($this->Subject)));
+        }
+
+        if ($this->MessageID != '') {
+            $this->lastMessageID = $this->MessageID;
+        } else {
+            $this->lastMessageID = sprintf('<%s@%s>', $uniq_id, $this->ServerHostname());
+        }
+        $result .= $this->HeaderLine('Message-ID', $this->lastMessageID);
+        $result .= $this->headerLine('X-Priority', $this->Priority);
+        if ($this->XMailer == '') {
+            $result .= $this->headerLine(
+                'X-Mailer',
+                'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer/)'
+            );
+        } else {
+            $myXmailer = trim($this->XMailer);
+            if ($myXmailer) {
+                $result .= $this->headerLine('X-Mailer', $myXmailer);
+            }
+        }
+
+        if ($this->ConfirmReadingTo != '') {
+            $result .= $this->headerLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
+        }
+
+        // Add custom headers
+        for ($index = 0; $index < count($this->CustomHeader); $index++) {
+            $result .= $this->headerLine(
+                trim($this->CustomHeader[$index][0]),
+                $this->encodeHeader(trim($this->CustomHeader[$index][1]))
+            );
+        }
+        if (!$this->sign_key_file) {
+            $result .= $this->headerLine('MIME-Version', '1.0');
+            $result .= $this->getMailMIME();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get the message MIME type headers.
+     * @access public
+     * @return string
+     */
+    public function getMailMIME()
+    {
+        $result = '';
+        $ismultipart = true;
+        switch ($this->message_type) {
+            case 'inline':
+                $result .= $this->headerLine('Content-Type', 'multipart/related;');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            case 'attach':
+            case 'inline_attach':
+            case 'alt_attach':
+            case 'alt_inline_attach':
+                $result .= $this->headerLine('Content-Type', 'multipart/mixed;');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            case 'alt':
+            case 'alt_inline':
+                $result .= $this->headerLine('Content-Type', 'multipart/alternative;');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            default:
+                // Catches case 'plain': and case '':
+                $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet);
+                $ismultipart = false;
+                break;
+        }
+        // RFC1341 part 5 says 7bit is assumed if not specified
+        if ($this->Encoding != '7bit') {
+            // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
+            if ($ismultipart) {
+                if ($this->Encoding == '8bit') {
+                    $result .= $this->headerLine('Content-Transfer-Encoding', '8bit');
+                }
+                // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
+            } else {
+                $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding);
+            }
+        }
+
+        if ($this->Mailer != 'mail') {
+            $result .= $this->LE;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the whole MIME message.
+     * Includes complete headers and body.
+     * Only valid post preSend().
+     * @see PHPMailer::preSend()
+     * @access public
+     * @return string
+     */
+    public function getSentMIMEMessage()
+    {
+        return $this->MIMEHeader . $this->mailHeader . self::CRLF . $this->MIMEBody;
+    }
+
+
+    /**
+     * Assemble the message body.
+     * Returns an empty string on failure.
+     * @access public
+     * @throws phpmailerException
+     * @return string The assembled message body
+     */
+    public function createBody()
+    {
+        $body = '';
+
+        if ($this->sign_key_file) {
+            $body .= $this->getMailMIME() . $this->LE;
+        }
+
+        $this->setWordWrap();
+
+        $bodyEncoding = $this->Encoding;
+        $bodyCharSet = $this->CharSet;
+        if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) {
+            $bodyEncoding = '7bit';
+            $bodyCharSet = 'us-ascii';
+        }
+        $altBodyEncoding = $this->Encoding;
+        $altBodyCharSet = $this->CharSet;
+        if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) {
+            $altBodyEncoding = '7bit';
+            $altBodyCharSet = 'us-ascii';
+        }
+        switch ($this->message_type) {
+            case 'inline':
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[1]);
+                break;
+            case 'attach':
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'inline_attach':
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/related;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'alt':
+                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                if (!empty($this->Ical)) {
+                    $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', '');
+                    $body .= $this->encodeString($this->Ical, $this->Encoding);
+                    $body .= $this->LE . $this->LE;
+                }
+                $body .= $this->endBoundary($this->boundary[1]);
+                break;
+            case 'alt_inline':
+                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/related;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->endBoundary($this->boundary[1]);
+                break;
+            case 'alt_attach':
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->endBoundary($this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'alt_inline_attach':
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->textLine('--' . $this->boundary[2]);
+                $body .= $this->headerLine('Content-Type', 'multipart/related;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"');
+                $body .= $this->LE;
+                $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= $this->LE . $this->LE;
+                $body .= $this->attachAll('inline', $this->boundary[3]);
+                $body .= $this->LE;
+                $body .= $this->endBoundary($this->boundary[2]);
+                $body .= $this->LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            default:
+                // catch case 'plain' and case ''
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                break;
+        }
+
+        if ($this->isError()) {
+            $body = '';
+        } elseif ($this->sign_key_file) {
+            try {
+                if (!defined('PKCS7_TEXT')) {
+                    throw new phpmailerException($this->lang('signing') . ' OpenSSL extension missing.');
+                }
+                // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
+                $file = tempnam(sys_get_temp_dir(), 'mail');
+                if (false === file_put_contents($file, $body)) {
+                    throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
+                }
+                $signed = tempnam(sys_get_temp_dir(), 'signed');
+                if (@openssl_pkcs7_sign(
+                    $file,
+                    $signed,
+                    'file://' . realpath($this->sign_cert_file),
+                    array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
+                    null
+                )
+                ) {
+                    @unlink($file);
+                    $body = file_get_contents($signed);
+                    @unlink($signed);
+                } else {
+                    @unlink($file);
+                    @unlink($signed);
+                    throw new phpmailerException($this->lang('signing') . openssl_error_string());
+                }
+            } catch (phpmailerException $exc) {
+                $body = '';
+                if ($this->exceptions) {
+                    throw $exc;
+                }
+            }
+        }
+        return $body;
+    }
+
+    /**
+     * Return the start of a message boundary.
+     * @access protected
+     * @param string $boundary
+     * @param string $charSet
+     * @param string $contentType
+     * @param string $encoding
+     * @return string
+     */
+    protected function getBoundary($boundary, $charSet, $contentType, $encoding)
+    {
+        $result = '';
+        if ($charSet == '') {
+            $charSet = $this->CharSet;
+        }
+        if ($contentType == '') {
+            $contentType = $this->ContentType;
+        }
+        if ($encoding == '') {
+            $encoding = $this->Encoding;
+        }
+        $result .= $this->textLine('--' . $boundary);
+        $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet);
+        $result .= $this->LE;
+        // RFC1341 part 5 says 7bit is assumed if not specified
+        if ($encoding != '7bit') {
+            $result .= $this->headerLine('Content-Transfer-Encoding', $encoding);
+        }
+        $result .= $this->LE;
+
+        return $result;
+    }
+
+    /**
+     * Return the end of a message boundary.
+     * @access protected
+     * @param string $boundary
+     * @return string
+     */
+    protected function endBoundary($boundary)
+    {
+        return $this->LE . '--' . $boundary . '--' . $this->LE;
+    }
+
+    /**
+     * Set the message type.
+     * PHPMailer only supports some preset message types,
+     * not arbitrary MIME structures.
+     * @access protected
+     * @return void
+     */
+    protected function setMessageType()
+    {
+        $type = array();
+        if ($this->alternativeExists()) {
+            $type[] = 'alt';
+        }
+        if ($this->inlineImageExists()) {
+            $type[] = 'inline';
+        }
+        if ($this->attachmentExists()) {
+            $type[] = 'attach';
+        }
+        $this->message_type = implode('_', $type);
+        if ($this->message_type == '') {
+            $this->message_type = 'plain';
+        }
+    }
+
+    /**
+     * Format a header line.
+     * @access public
+     * @param string $name
+     * @param string $value
+     * @return string
+     */
+    public function headerLine($name, $value)
+    {
+        return $name . ': ' . $value . $this->LE;
+    }
+
+    /**
+     * Return a formatted mail line.
+     * @access public
+     * @param string $value
+     * @return string
+     */
+    public function textLine($value)
+    {
+        return $value . $this->LE;
+    }
+
+    /**
+     * Add an attachment from a path on the filesystem.
+     * Returns false if the file could not be found or read.
+     * @param string $path Path to the attachment.
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
+     * @param string $disposition Disposition to use
+     * @throws phpmailerException
+     * @return boolean
+     */
+    public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment')
+    {
+        try {
+            if (!@is_file($path)) {
+                throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE);
+            }
+
+            // If a MIME type is not specified, try to work it out from the file name
+            if ($type == '') {
+                $type = self::filenameToType($path);
+            }
+
+            $filename = basename($path);
+            if ($name == '') {
+                $name = $filename;
+            }
+
+            $this->attachment[] = array(
+                0 => $path,
+                1 => $filename,
+                2 => $name,
+                3 => $encoding,
+                4 => $type,
+                5 => false, // isStringAttachment
+                6 => $disposition,
+                7 => 0
+            );
+
+        } catch (phpmailerException $exc) {
+            $this->setError($exc->getMessage());
+            $this->edebug($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Return the array of attachments.
+     * @return array
+     */
+    public function getAttachments()
+    {
+        return $this->attachment;
+    }
+
+    /**
+     * Attach all file, string, and binary attachments to the message.
+     * Returns an empty string on failure.
+     * @access protected
+     * @param string $disposition_type
+     * @param string $boundary
+     * @return string
+     */
+    protected function attachAll($disposition_type, $boundary)
+    {
+        // Return text of body
+        $mime = array();
+        $cidUniq = array();
+        $incl = array();
+
+        // Add all attachments
+        foreach ($this->attachment as $attachment) {
+            // Check if it is a valid disposition_filter
+            if ($attachment[6] == $disposition_type) {
+                // Check for string attachment
+                $string = '';
+                $path = '';
+                $bString = $attachment[5];
+                if ($bString) {
+                    $string = $attachment[0];
+                } else {
+                    $path = $attachment[0];
+                }
+
+                $inclhash = md5(serialize($attachment));
+                if (in_array($inclhash, $incl)) {
+                    continue;
+                }
+                $incl[] = $inclhash;
+                $name = $attachment[2];
+                $encoding = $attachment[3];
+                $type = $attachment[4];
+                $disposition = $attachment[6];
+                $cid = $attachment[7];
+                if ($disposition == 'inline' && isset($cidUniq[$cid])) {
+                    continue;
+                }
+                $cidUniq[$cid] = true;
+
+                $mime[] = sprintf('--%s%s', $boundary, $this->LE);
+                $mime[] = sprintf(
+                    'Content-Type: %s; name="%s"%s',
+                    $type,
+                    $this->encodeHeader($this->secureHeader($name)),
+                    $this->LE
+                );
+                // RFC1341 part 5 says 7bit is assumed if not specified
+                if ($encoding != '7bit') {
+                    $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, $this->LE);
+                }
+
+                if ($disposition == 'inline') {
+                    $mime[] = sprintf('Content-ID: <%s>%s', $cid, $this->LE);
+                }
+
+                // If a filename contains any of these chars, it should be quoted,
+                // but not otherwise: RFC2183 & RFC2045 5.1
+                // Fixes a warning in IETF's msglint MIME checker
+                // Allow for bypassing the Content-Disposition header totally
+                if (!(empty($disposition))) {
+                    $encoded_name = $this->encodeHeader($this->secureHeader($name));
+                    if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) {
+                        $mime[] = sprintf(
+                            'Content-Disposition: %s; filename="%s"%s',
+                            $disposition,
+                            $encoded_name,
+                            $this->LE . $this->LE
+                        );
+                    } else {
+                        $mime[] = sprintf(
+                            'Content-Disposition: %s; filename=%s%s',
+                            $disposition,
+                            $encoded_name,
+                            $this->LE . $this->LE
+                        );
+                    }
+                } else {
+                    $mime[] = $this->LE;
+                }
+
+                // Encode as string attachment
+                if ($bString) {
+                    $mime[] = $this->encodeString($string, $encoding);
+                    if ($this->isError()) {
+                        return '';
+                    }
+                    $mime[] = $this->LE . $this->LE;
+                } else {
+                    $mime[] = $this->encodeFile($path, $encoding);
+                    if ($this->isError()) {
+                        return '';
+                    }
+                    $mime[] = $this->LE . $this->LE;
+                }
+            }
+        }
+
+        $mime[] = sprintf('--%s--%s', $boundary, $this->LE);
+
+        return implode('', $mime);
+    }
+
+    /**
+     * Encode a file attachment in requested format.
+     * Returns an empty string on failure.
+     * @param string $path The full path to the file
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+     * @throws phpmailerException
+     * @see EncodeFile(encodeFile
+     * @access protected
+     * @return string
+     */
+    protected function encodeFile($path, $encoding = 'base64')
+    {
+        try {
+            if (!is_readable($path)) {
+                throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
+            }
+            $magic_quotes = get_magic_quotes_runtime();
+            if ($magic_quotes) {
+                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+                    set_magic_quotes_runtime(false);
+                } else {
+                    //Doesn't exist in PHP 5.4, but we don't need to check because
+                    //get_magic_quotes_runtime always returns false in 5.4+
+                    //so it will never get here
+                    ini_set('magic_quotes_runtime', 0);
+                }
+            }
+            $file_buffer = file_get_contents($path);
+            $file_buffer = $this->encodeString($file_buffer, $encoding);
+            if ($magic_quotes) {
+                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+                    set_magic_quotes_runtime($magic_quotes);
+                } else {
+                    ini_set('magic_quotes_runtime', ($magic_quotes?'1':'0'));
+                }
+            }
+            return $file_buffer;
+        } catch (Exception $exc) {
+            $this->setError($exc->getMessage());
+            return '';
+        }
+    }
+
+    /**
+     * Encode a string in requested format.
+     * Returns an empty string on failure.
+     * @param string $str The text to encode
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+     * @access public
+     * @return string
+     */
+    public function encodeString($str, $encoding = 'base64')
+    {
+        $encoded = '';
+        switch (strtolower($encoding)) {
+            case 'base64':
+                $encoded = chunk_split(base64_encode($str), 76, $this->LE);
+                break;
+            case '7bit':
+            case '8bit':
+                $encoded = $this->fixEOL($str);
+                // Make sure it ends with a line break
+                if (substr($encoded, -(strlen($this->LE))) != $this->LE) {
+                    $encoded .= $this->LE;
+                }
+                break;
+            case 'binary':
+                $encoded = $str;
+                break;
+            case 'quoted-printable':
+                $encoded = $this->encodeQP($str);
+                break;
+            default:
+                $this->setError($this->lang('encoding') . $encoding);
+                break;
+        }
+        return $encoded;
+    }
+
+    /**
+     * Encode a header string optimally.
+     * Picks shortest of Q, B, quoted-printable or none.
+     * @access public
+     * @param string $str
+     * @param string $position
+     * @return string
+     */
+    public function encodeHeader($str, $position = 'text')
+    {
+        $matchcount = 0;
+        switch (strtolower($position)) {
+            case 'phrase':
+                if (!preg_match('/[\200-\377]/', $str)) {
+                    // Can't use addslashes as we don't know the value of magic_quotes_sybase
+                    $encoded = addcslashes($str, "\0..\37\177\\\"");
+                    if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
+                        return ($encoded);
+                    } else {
+                        return ("\"$encoded\"");
+                    }
+                }
+                $matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
+                break;
+            /** @noinspection PhpMissingBreakStatementInspection */
+            case 'comment':
+                $matchcount = preg_match_all('/[()"]/', $str, $matches);
+                // Intentional fall-through
+            case 'text':
+            default:
+                $matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
+                break;
+        }
+
+        if ($matchcount == 0) { // There are no chars that need encoding
+            return ($str);
+        }
+
+        $maxlen = 75 - 7 - strlen($this->CharSet);
+        // Try to select the encoding which should produce the shortest output
+        if ($matchcount > strlen($str) / 3) {
+            // More than a third of the content will need encoding, so B encoding will be most efficient
+            $encoding = 'B';
+            if (function_exists('mb_strlen') && $this->hasMultiBytes($str)) {
+                // Use a custom function which correctly encodes and wraps long
+                // multibyte strings without breaking lines within a character
+                $encoded = $this->base64EncodeWrapMB($str, "\n");
+            } else {
+                $encoded = base64_encode($str);
+                $maxlen -= $maxlen % 4;
+                $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
+            }
+        } else {
+            $encoding = 'Q';
+            $encoded = $this->encodeQ($str, $position);
+            $encoded = $this->wrapText($encoded, $maxlen, true);
+            $encoded = str_replace('=' . self::CRLF, "\n", trim($encoded));
+        }
+
+        $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
+        $encoded = trim(str_replace("\n", $this->LE, $encoded));
+
+        return $encoded;
+    }
+
+    /**
+     * Check if a string contains multi-byte characters.
+     * @access public
+     * @param string $str multi-byte text to wrap encode
+     * @return boolean
+     */
+    public function hasMultiBytes($str)
+    {
+        if (function_exists('mb_strlen')) {
+            return (strlen($str) > mb_strlen($str, $this->CharSet));
+        } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
+            return false;
+        }
+    }
+
+    /**
+     * Does a string contain any 8-bit chars (in any charset)?
+     * @param string $text
+     * @return boolean
+     */
+    public function has8bitChars($text)
+    {
+        return (boolean)preg_match('/[\x80-\xFF]/', $text);
+    }
+
+    /**
+     * Encode and wrap long multibyte strings for mail headers
+     * without breaking lines within a character.
+     * Adapted from a function by paravoid
+     * @link http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
+     * @access public
+     * @param string $str multi-byte text to wrap encode
+     * @param string $linebreak string to use as linefeed/end-of-line
+     * @return string
+     */
+    public function base64EncodeWrapMB($str, $linebreak = null)
+    {
+        $start = '=?' . $this->CharSet . '?B?';
+        $end = '?=';
+        $encoded = '';
+        if ($linebreak === null) {
+            $linebreak = $this->LE;
+        }
+
+        $mb_length = mb_strlen($str, $this->CharSet);
+        // Each line must have length <= 75, including $start and $end
+        $length = 75 - strlen($start) - strlen($end);
+        // Average multi-byte ratio
+        $ratio = $mb_length / strlen($str);
+        // Base64 has a 4:3 ratio
+        $avgLength = floor($length * $ratio * .75);
+
+        for ($i = 0; $i < $mb_length; $i += $offset) {
+            $lookBack = 0;
+            do {
+                $offset = $avgLength - $lookBack;
+                $chunk = mb_substr($str, $i, $offset, $this->CharSet);
+                $chunk = base64_encode($chunk);
+                $lookBack++;
+            } while (strlen($chunk) > $length);
+            $encoded .= $chunk . $linebreak;
+        }
+
+        // Chomp the last linefeed
+        $encoded = substr($encoded, 0, -strlen($linebreak));
+        return $encoded;
+    }
+
+    /**
+     * Encode a string in quoted-printable format.
+     * According to RFC2045 section 6.7.
+     * @access public
+     * @param string $string The text to encode
+     * @param integer $line_max Number of chars allowed on a line before wrapping
+     * @return string
+     * @link http://www.php.net/manual/en/function.quoted-printable-decode.php#89417 Adapted from this comment
+     */
+    public function encodeQP($string, $line_max = 76)
+    {
+        if (function_exists('quoted_printable_encode')) { // Use native function if it's available (>= PHP5.3)
+            return $this->fixEOL(quoted_printable_encode($string));
+        }
+        // Fall back to a pure PHP implementation
+        $string = str_replace(
+            array('%20', '%0D%0A.', '%0D%0A', '%'),
+            array(' ', "\r\n=2E", "\r\n", '='),
+            rawurlencode($string)
+        );
+        $string = preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string);
+        return $this->fixEOL($string);
+    }
+
+    /**
+     * Backward compatibility wrapper for an old QP encoding function that was removed.
+     * @see PHPMailer::encodeQP()
+     * @access public
+     * @param string $string
+     * @param integer $line_max
+     * @param boolean $space_conv
+     * @return string
+     * @deprecated Use encodeQP instead.
+     */
+    public function encodeQPphp(
+        $string,
+        $line_max = 76,
+        /** @noinspection PhpUnusedParameterInspection */ $space_conv = false
+    ) {
+        return $this->encodeQP($string, $line_max);
+    }
+
+    /**
+     * Encode a string using Q encoding.
+     * @link http://tools.ietf.org/html/rfc2047
+     * @param string $str the text to encode
+     * @param string $position Where the text is going to be used, see the RFC for what that means
+     * @access public
+     * @return string
+     */
+    public function encodeQ($str, $position = 'text')
+    {
+        // There should not be any EOL in the string
+        $pattern = '';
+        $encoded = str_replace(array("\r", "\n"), '', $str);
+        switch (strtolower($position)) {
+            case 'phrase':
+                // RFC 2047 section 5.3
+                $pattern = '^A-Za-z0-9!*+\/ -';
+                break;
+            /** @noinspection PhpMissingBreakStatementInspection */
+            case 'comment':
+                // RFC 2047 section 5.2
+                $pattern = '\(\)"';
+                // intentional fall-through
+                // for this reason we build the $pattern without including delimiters and []
+            case 'text':
+            default:
+                // RFC 2047 section 5.1
+                // Replace every high ascii, control, =, ? and _ characters
+                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
+                break;
+        }
+        $matches = array();
+        if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) {
+            // If the string contains an '=', make sure it's the first thing we replace
+            // so as to avoid double-encoding
+            $eqkey = array_search('=', $matches[0]);
+            if (false !== $eqkey) {
+                unset($matches[0][$eqkey]);
+                array_unshift($matches[0], '=');
+            }
+            foreach (array_unique($matches[0]) as $char) {
+                $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
+            }
+        }
+        // Replace every spaces to _ (more readable than =20)
+        return str_replace(' ', '_', $encoded);
+    }
+
+
+    /**
+     * Add a string or binary attachment (non-filesystem).
+     * This method can be used to attach ascii or binary data,
+     * such as a BLOB record from a database.
+     * @param string $string String attachment data.
+     * @param string $filename Name of the attachment.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File extension (MIME) type.
+     * @param string $disposition Disposition to use
+     * @return void
+     */
+    public function addStringAttachment(
+        $string,
+        $filename,
+        $encoding = 'base64',
+        $type = '',
+        $disposition = 'attachment'
+    ) {
+        // If a MIME type is not specified, try to work it out from the file name
+        if ($type == '') {
+            $type = self::filenameToType($filename);
+        }
+        // Append to $attachment array
+        $this->attachment[] = array(
+            0 => $string,
+            1 => $filename,
+            2 => basename($filename),
+            3 => $encoding,
+            4 => $type,
+            5 => true, // isStringAttachment
+            6 => $disposition,
+            7 => 0
+        );
+    }
+
+    /**
+     * Add an embedded (inline) attachment from a file.
+     * This can include images, sounds, and just about any other document type.
+     * These differ from 'regular' attachments in that they are intended to be
+     * displayed inline with the message, not just attached for download.
+     * This is used in HTML messages that embed the images
+     * the HTML refers to using the $cid value.
+     * @param string $path Path to the attachment.
+     * @param string $cid Content ID of the attachment; Use this to reference
+     *        the content when using an embedded image in HTML.
+     * @param string $name Overrides the attachment name.
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type File MIME type.
+     * @param string $disposition Disposition to use
+     * @return boolean True on successfully adding an attachment
+     */
+    public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline')
+    {
+        if (!@is_file($path)) {
+            $this->setError($this->lang('file_access') . $path);
+            return false;
+        }
+
+        // If a MIME type is not specified, try to work it out from the file name
+        if ($type == '') {
+            $type = self::filenameToType($path);
+        }
+
+        $filename = basename($path);
+        if ($name == '') {
+            $name = $filename;
+        }
+
+        // Append to $attachment array
+        $this->attachment[] = array(
+            0 => $path,
+            1 => $filename,
+            2 => $name,
+            3 => $encoding,
+            4 => $type,
+            5 => false, // isStringAttachment
+            6 => $disposition,
+            7 => $cid
+        );
+        return true;
+    }
+
+    /**
+     * Add an embedded stringified attachment.
+     * This can include images, sounds, and just about any other document type.
+     * Be sure to set the $type to an image type for images:
+     * JPEG images use 'image/jpeg', GIF uses 'image/gif', PNG uses 'image/png'.
+     * @param string $string The attachment binary data.
+     * @param string $cid Content ID of the attachment; Use this to reference
+     *        the content when using an embedded image in HTML.
+     * @param string $name
+     * @param string $encoding File encoding (see $Encoding).
+     * @param string $type MIME type.
+     * @param string $disposition Disposition to use
+     * @return boolean True on successfully adding an attachment
+     */
+    public function addStringEmbeddedImage(
+        $string,
+        $cid,
+        $name = '',
+        $encoding = 'base64',
+        $type = '',
+        $disposition = 'inline'
+    ) {
+        // If a MIME type is not specified, try to work it out from the name
+        if ($type == '') {
+            $type = self::filenameToType($name);
+        }
+
+        // Append to $attachment array
+        $this->attachment[] = array(
+            0 => $string,
+            1 => $name,
+            2 => $name,
+            3 => $encoding,
+            4 => $type,
+            5 => true, // isStringAttachment
+            6 => $disposition,
+            7 => $cid
+        );
+        return true;
+    }
+
+    /**
+     * Check if an inline attachment is present.
+     * @access public
+     * @return boolean
+     */
+    public function inlineImageExists()
+    {
+        foreach ($this->attachment as $attachment) {
+            if ($attachment[6] == 'inline') {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check if an attachment (non-inline) is present.
+     * @return boolean
+     */
+    public function attachmentExists()
+    {
+        foreach ($this->attachment as $attachment) {
+            if ($attachment[6] == 'attachment') {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check if this message has an alternative body set.
+     * @return boolean
+     */
+    public function alternativeExists()
+    {
+        return !empty($this->AltBody);
+    }
+
+    /**
+     * Clear all To recipients.
+     * @return void
+     */
+    public function clearAddresses()
+    {
+        foreach ($this->to as $to) {
+            unset($this->all_recipients[strtolower($to[0])]);
+        }
+        $this->to = array();
+    }
+
+    /**
+     * Clear all CC recipients.
+     * @return void
+     */
+    public function clearCCs()
+    {
+        foreach ($this->cc as $cc) {
+            unset($this->all_recipients[strtolower($cc[0])]);
+        }
+        $this->cc = array();
+    }
+
+    /**
+     * Clear all BCC recipients.
+     * @return void
+     */
+    public function clearBCCs()
+    {
+        foreach ($this->bcc as $bcc) {
+            unset($this->all_recipients[strtolower($bcc[0])]);
+        }
+        $this->bcc = array();
+    }
+
+    /**
+     * Clear all ReplyTo recipients.
+     * @return void
+     */
+    public function clearReplyTos()
+    {
+        $this->ReplyTo = array();
+    }
+
+    /**
+     * Clear all recipient types.
+     * @return void
+     */
+    public function clearAllRecipients()
+    {
+        $this->to = array();
+        $this->cc = array();
+        $this->bcc = array();
+        $this->all_recipients = array();
+    }
+
+    /**
+     * Clear all filesystem, string, and binary attachments.
+     * @return void
+     */
+    public function clearAttachments()
+    {
+        $this->attachment = array();
+    }
+
+    /**
+     * Clear all custom headers.
+     * @return void
+     */
+    public function clearCustomHeaders()
+    {
+        $this->CustomHeader = array();
+    }
+
+    /**
+     * Add an error message to the error container.
+     * @access protected
+     * @param string $msg
+     * @return void
+     */
+    protected function setError($msg)
+    {
+        $this->error_count++;
+        if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
+            $lasterror = $this->smtp->getError();
+            if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
+                $msg .= '<p>' . $this->lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
+            }
+        }
+        $this->ErrorInfo = $msg;
+    }
+
+    /**
+     * Return an RFC 822 formatted date.
+     * @access public
+     * @return string
+     * @static
+     */
+    public static function rfcDate()
+    {
+        // Set the time zone to whatever the default is to avoid 500 errors
+        // Will default to UTC if it's not set properly in php.ini
+        date_default_timezone_set(@date_default_timezone_get());
+        return date('D, j M Y H:i:s O');
+    }
+
+    /**
+     * Get the server hostname.
+     * Returns 'localhost.localdomain' if unknown.
+     * @access protected
+     * @return string
+     */
+    protected function serverHostname()
+    {
+        $result = 'localhost.localdomain';
+        if (!empty($this->Hostname)) {
+            $result = $this->Hostname;
+        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
+            $result = $_SERVER['SERVER_NAME'];
+        } elseif (function_exists('gethostname') && gethostname() !== false) {
+            $result = gethostname();
+        } elseif (php_uname('n') !== false) {
+            $result = php_uname('n');
+        }
+        return $result;
+    }
+
+    /**
+     * Get an error message in the current language.
+     * @access protected
+     * @param string $key
+     * @return string
+     */
+    protected function lang($key)
+    {
+        if (count($this->language) < 1) {
+            $this->setLanguage('en'); // set the default language
+        }
+
+        if (isset($this->language[$key])) {
+            return $this->language[$key];
+        } else {
+            return 'Language string failed to load: ' . $key;
+        }
+    }
+
+    /**
+     * Check if an error occurred.
+     * @access public
+     * @return boolean True if an error did occur.
+     */
+    public function isError()
+    {
+        return ($this->error_count > 0);
+    }
+
+    /**
+     * Ensure consistent line endings in a string.
+     * Changes every end of line from CRLF, CR or LF to $this->LE.
+     * @access public
+     * @param string $str String to fixEOL
+     * @return string
+     */
+    public function fixEOL($str)
+    {
+        // Normalise to \n
+        $nstr = str_replace(array("\r\n", "\r"), "\n", $str);
+        // Now convert LE as needed
+        if ($this->LE !== "\n") {
+            $nstr = str_replace("\n", $this->LE, $nstr);
+        }
+        return $nstr;
+    }
+
+    /**
+     * Add a custom header.
+     * $name value can be overloaded to contain
+     * both header name and value (name:value)
+     * @access public
+     * @param string $name Custom header name
+     * @param string $value Header value
+     * @return void
+     */
+    public function addCustomHeader($name, $value = null)
+    {
+        if ($value === null) {
+            // Value passed in as name:value
+            $this->CustomHeader[] = explode(':', $name, 2);
+        } else {
+            $this->CustomHeader[] = array($name, $value);
+        }
+    }
+
+    /**
+     * Create a message from an HTML string.
+     * Automatically makes modifications for inline images and backgrounds
+     * and creates a plain-text version by converting the HTML.
+     * Overwrites any existing values in $this->Body and $this->AltBody
+     * @access public
+     * @param string $message HTML message string
+     * @param string $basedir baseline directory for path
+     * @param boolean $advanced Whether to use the advanced HTML to text converter
+     * @return string $message
+     */
+    public function msgHTML($message, $basedir = '', $advanced = false)
+    {
+        preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images);
+        if (isset($images[2])) {
+            foreach ($images[2] as $imgindex => $url) {
+                // Convert data URIs into embedded images
+                if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) {
+                    $data = substr($url, strpos($url, ','));
+                    if ($match[2]) {
+                        $data = base64_decode($data);
+                    } else {
+                        $data = rawurldecode($data);
+                    }
+                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
+                    if ($this->addStringEmbeddedImage($data, $cid, '', 'base64', $match[1])) {
+                        $message = str_replace($images[0][$imgindex], $images[1][$imgindex] . '="cid:' . $cid . '"', $message);
+                    }
+                } elseif (!preg_match('#^[A-z]+://#', $url)) {
+                    // Do not change urls for absolute images (thanks to corvuscorax)
+                    $filename = basename($url);
+                    $directory = dirname($url);
+                    if ($directory == '.') {
+                        $directory = '';
+                    }
+                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
+                    if (strlen($basedir) > 1 && substr($basedir, -1) != '/') {
+                        $basedir .= '/';
+                    }
+                    if (strlen($directory) > 1 && substr($directory, -1) != '/') {
+                        $directory .= '/';
+                    }
+                    if ($this->addEmbeddedImage(
+                        $basedir . $directory . $filename,
+                        $cid,
+                        $filename,
+                        'base64',
+                        self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION))
+                    )
+                    ) {
+                        $message = preg_replace(
+                            '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
+                            $images[1][$imgindex] . '="cid:' . $cid . '"',
+                            $message
+                        );
+                    }
+                }
+            }
+        }
+        $this->isHTML(true);
+        // Convert all message body line breaks to CRLF, makes quoted-printable encoding work much better
+        $this->Body = $this->normalizeBreaks($message);
+        $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced));
+        if (empty($this->AltBody)) {
+            $this->AltBody = 'To view this email message, open it in a program that understands HTML!' .
+                self::CRLF . self::CRLF;
+        }
+        return $this->Body;
+    }
+
+    /**
+     * Convert an HTML string into plain text.
+     * @param string $html The HTML text to convert
+     * @param boolean $advanced Should this use the more complex html2text converter or just a simple one?
+     * @return string
+     */
+    public function html2text($html, $advanced = false)
+    {
+        if ($advanced) {
+            require_once(MCR_TOOL_PATH.'smtp/class.html2text.php');
+            $htmlconverter = new html2text($html);
+            return $htmlconverter->get_text();
+        }
+        return html_entity_decode(
+            trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))),
+            ENT_QUOTES,
+            $this->CharSet
+        );
+    }
+
+    /**
+     * Get the MIME type for a file extension.
+     * @param string $ext File extension
+     * @access public
+     * @return string MIME type of file.
+     * @static
+     */
+    public static function _mime_types($ext = '')
+    {
+        $mimes = array(
+            'xl'    => 'application/excel',
+            'js'    => 'application/javascript',
+            'hqx'   => 'application/mac-binhex40',
+            'cpt'   => 'application/mac-compactpro',
+            'bin'   => 'application/macbinary',
+            'doc'   => 'application/msword',
+            'word'  => 'application/msword',
+            'class' => 'application/octet-stream',
+            'dll'   => 'application/octet-stream',
+            'dms'   => 'application/octet-stream',
+            'exe'   => 'application/octet-stream',
+            'lha'   => 'application/octet-stream',
+            'lzh'   => 'application/octet-stream',
+            'psd'   => 'application/octet-stream',
+            'sea'   => 'application/octet-stream',
+            'so'    => 'application/octet-stream',
+            'oda'   => 'application/oda',
+            'pdf'   => 'application/pdf',
+            'ai'    => 'application/postscript',
+            'eps'   => 'application/postscript',
+            'ps'    => 'application/postscript',
+            'smi'   => 'application/smil',
+            'smil'  => 'application/smil',
+            'mif'   => 'application/vnd.mif',
+            'xls'   => 'application/vnd.ms-excel',
+            'ppt'   => 'application/vnd.ms-powerpoint',
+            'wbxml' => 'application/vnd.wap.wbxml',
+            'wmlc'  => 'application/vnd.wap.wmlc',
+            'dcr'   => 'application/x-director',
+            'dir'   => 'application/x-director',
+            'dxr'   => 'application/x-director',
+            'dvi'   => 'application/x-dvi',
+            'gtar'  => 'application/x-gtar',
+            'php3'  => 'application/x-httpd-php',
+            'php4'  => 'application/x-httpd-php',
+            'php'   => 'application/x-httpd-php',
+            'phtml' => 'application/x-httpd-php',
+            'phps'  => 'application/x-httpd-php-source',
+            'swf'   => 'application/x-shockwave-flash',
+            'sit'   => 'application/x-stuffit',
+            'tar'   => 'application/x-tar',
+            'tgz'   => 'application/x-tar',
+            'xht'   => 'application/xhtml+xml',
+            'xhtml' => 'application/xhtml+xml',
+            'zip'   => 'application/zip',
+            'mid'   => 'audio/midi',
+            'midi'  => 'audio/midi',
+            'mp2'   => 'audio/mpeg',
+            'mp3'   => 'audio/mpeg',
+            'mpga'  => 'audio/mpeg',
+            'aif'   => 'audio/x-aiff',
+            'aifc'  => 'audio/x-aiff',
+            'aiff'  => 'audio/x-aiff',
+            'ram'   => 'audio/x-pn-realaudio',
+            'rm'    => 'audio/x-pn-realaudio',
+            'rpm'   => 'audio/x-pn-realaudio-plugin',
+            'ra'    => 'audio/x-realaudio',
+            'wav'   => 'audio/x-wav',
+            'bmp'   => 'image/bmp',
+            'gif'   => 'image/gif',
+            'jpeg'  => 'image/jpeg',
+            'jpe'   => 'image/jpeg',
+            'jpg'   => 'image/jpeg',
+            'png'   => 'image/png',
+            'tiff'  => 'image/tiff',
+            'tif'   => 'image/tiff',
+            'eml'   => 'message/rfc822',
+            'css'   => 'text/css',
+            'html'  => 'text/html',
+            'htm'   => 'text/html',
+            'shtml' => 'text/html',
+            'log'   => 'text/plain',
+            'text'  => 'text/plain',
+            'txt'   => 'text/plain',
+            'rtx'   => 'text/richtext',
+            'rtf'   => 'text/rtf',
+            'vcf'   => 'text/vcard',
+            'vcard' => 'text/vcard',
+            'xml'   => 'text/xml',
+            'xsl'   => 'text/xml',
+            'mpeg'  => 'video/mpeg',
+            'mpe'   => 'video/mpeg',
+            'mpg'   => 'video/mpeg',
+            'mov'   => 'video/quicktime',
+            'qt'    => 'video/quicktime',
+            'rv'    => 'video/vnd.rn-realvideo',
+            'avi'   => 'video/x-msvideo',
+            'movie' => 'video/x-sgi-movie'
+        );
+        return (array_key_exists(strtolower($ext), $mimes) ? $mimes[strtolower($ext)]: 'application/octet-stream');
+    }
+
+    /**
+     * Map a file name to a MIME type.
+     * Defaults to 'application/octet-stream', i.e.. arbitrary binary data.
+     * @param string $filename A file name or full path, does not need to exist as a file
+     * @return string
+     * @static
+     */
+    public static function filenameToType($filename)
+    {
+        // In case the path is a URL, strip any query string before getting extension
+        $qpos = strpos($filename, '?');
+        if (false !== $qpos) {
+            $filename = substr($filename, 0, $qpos);
+        }
+        $pathinfo = self::mb_pathinfo($filename);
+        return self::_mime_types($pathinfo['extension']);
+    }
+
+    /**
+     * Multi-byte-safe pathinfo replacement.
+     * Drop-in replacement for pathinfo(), but multibyte-safe, cross-platform-safe, old-version-safe.
+     * Works similarly to the one in PHP >= 5.2.0
+     * @link http://www.php.net/manual/en/function.pathinfo.php#107461
+     * @param string $path A filename or path, does not need to exist as a file
+     * @param integer|string $options Either a PATHINFO_* constant,
+     *      or a string name to return only the specified piece, allows 'filename' to work on PHP < 5.2
+     * @return string|array
+     * @static
+     */
+    public static function mb_pathinfo($path, $options = null)
+    {
+        $ret = array('dirname' => '', 'basename' => '', 'extension' => '', 'filename' => '');
+        $pathinfo = array();
+        if (preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $pathinfo)) {
+            if (array_key_exists(1, $pathinfo)) {
+                $ret['dirname'] = $pathinfo[1];
+            }
+            if (array_key_exists(2, $pathinfo)) {
+                $ret['basename'] = $pathinfo[2];
+            }
+            if (array_key_exists(5, $pathinfo)) {
+                $ret['extension'] = $pathinfo[5];
+            }
+            if (array_key_exists(3, $pathinfo)) {
+                $ret['filename'] = $pathinfo[3];
+            }
+        }
+        switch ($options) {
+            case PATHINFO_DIRNAME:
+            case 'dirname':
+                return $ret['dirname'];
+            case PATHINFO_BASENAME:
+            case 'basename':
+                return $ret['basename'];
+            case PATHINFO_EXTENSION:
+            case 'extension':
+                return $ret['extension'];
+            case PATHINFO_FILENAME:
+            case 'filename':
+                return $ret['filename'];
+            default:
+                return $ret;
+        }
+    }
+
+    /**
+     * Set or reset instance properties.
+     *
+     * Usage Example:
+     * $page->set('X-Priority', '3');
+     *
+     * @access public
+     * @param string $name
+     * @param mixed $value
+     * NOTE: will not work with arrays, there are no arrays to set/reset
+     * @throws phpmailerException
+     * @return boolean
+     * @TODO Should this not be using __set() magic function?
+     */
+    public function set($name, $value = '')
+    {
+        try {
+            if (isset($this->$name)) {
+                $this->$name = $value;
+            } else {
+                throw new phpmailerException($this->lang('variable_set') . $name, self::STOP_CRITICAL);
+            }
+        } catch (Exception $exc) {
+            $this->setError($exc->getMessage());
+            if ($exc->getCode() == self::STOP_CRITICAL) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Strip newlines to prevent header injection.
+     * @access public
+     * @param string $str
+     * @return string
+     */
+    public function secureHeader($str)
+    {
+        return trim(str_replace(array("\r", "\n"), '', $str));
+    }
+
+    /**
+     * Normalize line breaks in a string.
+     * Converts UNIX LF, Mac CR and Windows CRLF line breaks into a single line break format.
+     * Defaults to CRLF (for message bodies) and preserves consecutive breaks.
+     * @param string $text
+     * @param string $breaktype What kind of line break to use, defaults to CRLF
+     * @return string
+     * @access public
+     * @static
+     */
+    public static function normalizeBreaks($text, $breaktype = "\r\n")
+    {
+        return preg_replace('/(\r\n|\r|\n)/ms', $breaktype, $text);
+    }
+
+
+    /**
+     * Set the public and private key files and password for S/MIME signing.
+     * @access public
+     * @param string $cert_filename
+     * @param string $key_filename
+     * @param string $key_pass Password for private key
+     */
+    public function sign($cert_filename, $key_filename, $key_pass)
+    {
+        $this->sign_cert_file = $cert_filename;
+        $this->sign_key_file = $key_filename;
+        $this->sign_key_pass = $key_pass;
+    }
+
+    /**
+     * Quoted-Printable-encode a DKIM header.
+     * @access public
+     * @param string $txt
+     * @return string
+     */
+    public function DKIM_QP($txt)
+    {
+        $line = '';
+        for ($i = 0; $i < strlen($txt); $i++) {
+            $ord = ord($txt[$i]);
+            if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
+                $line .= $txt[$i];
+            } else {
+                $line .= '=' . sprintf('%02X', $ord);
+            }
+        }
+        return $line;
+    }
+
+    /**
+     * Generate a DKIM signature.
+     * @access public
+     * @param string $signHeader
+     * @throws phpmailerException
+     * @return string
+     */
+    public function DKIM_Sign($signHeader)
+    {
+        if (!defined('PKCS7_TEXT')) {
+            if ($this->exceptions) {
+                throw new phpmailerException($this->lang('signing') . ' OpenSSL extension missing.');
+            }
+            return '';
+        }
+        $privKeyStr = file_get_contents($this->DKIM_private);
+        if ($this->DKIM_passphrase != '') {
+            $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
+        } else {
+            $privKey = $privKeyStr;
+        }
+        if (openssl_sign($signHeader, $signature, $privKey)) {
+            return base64_encode($signature);
+        }
+        return '';
+    }
+
+    /**
+     * Generate a DKIM canonicalization header.
+     * @access public
+     * @param string $signHeader Header
+     * @return string
+     */
+    public function DKIM_HeaderC($signHeader)
+    {
+        $signHeader = preg_replace('/\r\n\s+/', ' ', $signHeader);
+        $lines = explode("\r\n", $signHeader);
+        foreach ($lines as $key => $line) {
+            list($heading, $value) = explode(':', $line, 2);
+            $heading = strtolower($heading);
+            $value = preg_replace('/\s+/', ' ', $value); // Compress useless spaces
+            $lines[$key] = $heading . ':' . trim($value); // Don't forget to remove WSP around the value
+        }
+        $signHeader = implode("\r\n", $lines);
+        return $signHeader;
+    }
+
+    /**
+     * Generate a DKIM canonicalization body.
+     * @access public
+     * @param string $body Message Body
+     * @return string
+     */
+    public function DKIM_BodyC($body)
+    {
+        if ($body == '') {
+            return "\r\n";
+        }
+        // stabilize line endings
+        $body = str_replace("\r\n", "\n", $body);
+        $body = str_replace("\n", "\r\n", $body);
+        // END stabilize line endings
+        while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
+            $body = substr($body, 0, strlen($body) - 2);
+        }
+        return $body;
+    }
+
+    /**
+     * Create the DKIM header and body in a new message header.
+     * @access public
+     * @param string $headers_line Header lines
+     * @param string $subject Subject
+     * @param string $body Body
+     * @return string
+     */
+    public function DKIM_Add($headers_line, $subject, $body)
+    {
+        $DKIMsignatureType = 'rsa-sha1'; // Signature & hash algorithms
+        $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
+        $DKIMquery = 'dns/txt'; // Query method
+        $DKIMtime = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
+        $subject_header = "Subject: $subject";
+        $headers = explode($this->LE, $headers_line);
+        $from_header = '';
+        $to_header = '';
+        $current = '';
+        foreach ($headers as $header) {
+            if (strpos($header, 'From:') === 0) {
+                $from_header = $header;
+                $current = 'from_header';
+            } elseif (strpos($header, 'To:') === 0) {
+                $to_header = $header;
+                $current = 'to_header';
+            } else {
+                if ($current && strpos($header, ' =?') === 0) {
+                    $current .= $header;
+                } else {
+                    $current = '';
+                }
+            }
+        }
+        $from = str_replace('|', '=7C', $this->DKIM_QP($from_header));
+        $to = str_replace('|', '=7C', $this->DKIM_QP($to_header));
+        $subject = str_replace(
+            '|',
+            '=7C',
+            $this->DKIM_QP($subject_header)
+        ); // Copied header fields (dkim-quoted-printable)
+        $body = $this->DKIM_BodyC($body);
+        $DKIMlen = strlen($body); // Length of body
+        $DKIMb64 = base64_encode(pack('H*', sha1($body))); // Base64 of packed binary SHA-1 hash of body
+        $ident = ($this->DKIM_identity == '') ? '' : ' i=' . $this->DKIM_identity . ';';
+        $dkimhdrs = 'DKIM-Signature: v=1; a=' .
+            $DKIMsignatureType . '; q=' .
+            $DKIMquery . '; l=' .
+            $DKIMlen . '; s=' .
+            $this->DKIM_selector .
+            ";\r\n" .
+            "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" .
+            "\th=From:To:Subject;\r\n" .
+            "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" .
+            "\tz=$from\r\n" .
+            "\t|$to\r\n" .
+            "\t|$subject;\r\n" .
+            "\tbh=" . $DKIMb64 . ";\r\n" .
+            "\tb=";
+        $toSign = $this->DKIM_HeaderC(
+            $from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs
+        );
+        $signed = $this->DKIM_Sign($toSign);
+        return $dkimhdrs . $signed . "\r\n";
+    }
+
+    /**
+     * Allows for public read access to 'to' property.
+     * @access public
+     * @return array
+     */
+    public function getToAddresses()
+    {
+        return $this->to;
+    }
+
+    /**
+     * Allows for public read access to 'cc' property.
+     * @access public
+     * @return array
+     */
+    public function getCcAddresses()
+    {
+        return $this->cc;
+    }
+
+    /**
+     * Allows for public read access to 'bcc' property.
+     * @access public
+     * @return array
+     */
+    public function getBccAddresses()
+    {
+        return $this->bcc;
+    }
+
+    /**
+     * Allows for public read access to 'ReplyTo' property.
+     * @access public
+     * @return array
+     */
+    public function getReplyToAddresses()
+    {
+        return $this->ReplyTo;
+    }
+
+    /**
+     * Allows for public read access to 'all_recipients' property.
+     * @access public
+     * @return array
+     */
+    public function getAllRecipientAddresses()
+    {
+        return $this->all_recipients;
+    }
+
+    /**
+     * Perform a callback.
+     * @param boolean $isSent
+     * @param array $to
+     * @param array $cc
+     * @param array $bcc
+     * @param string $subject
+     * @param string $body
+     * @param string $from
+     */
+    protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from)
+    {
+        if (!empty($this->action_function) && is_callable($this->action_function)) {
+            $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from);
+            call_user_func_array($this->action_function, $params);
+        }
+    }
+}
+
+/**
+ * PHPMailer exception handler
+ * @package PHPMailer
+ */
+class phpmailerException extends Exception
+{
+    /**
+     * Prettify error message output
+     * @return string
+     */
+    public function errorMessage()
+    {
+        $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
+        return $errorMsg;
+    }
+}
diff --git a/upload/engine/libs/smtp/class.pop3.php b/upload/engine/libs/smtp/class.pop3.php
new file mode 100644
index 0000000..984885f
--- /dev/null
+++ b/upload/engine/libs/smtp/class.pop3.php
@@ -0,0 +1,397 @@
+<?php
+/**
+ * PHPMailer POP-Before-SMTP Authentication Class.
+ * PHP Version 5
+ * @package PHPMailer
+ * @link https://github.com/PHPMailer/PHPMailer/
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * PHPMailer POP-Before-SMTP Authentication Class.
+ * Specifically for PHPMailer to use for RFC1939 POP-before-SMTP authentication.
+ * Does not support APOP.
+ * @package PHPMailer
+ * @author Richard Davey (original author) <rich@corephp.co.uk>
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ */
+class POP3
+{
+    /**
+     * The POP3 PHPMailer Version number.
+     * @type string
+     * @access public
+     */
+    public $Version = '5.2.9';
+
+    /**
+     * Default POP3 port number.
+     * @type integer
+     * @access public
+     */
+    public $POP3_PORT = 110;
+
+    /**
+     * Default timeout in seconds.
+     * @type integer
+     * @access public
+     */
+    public $POP3_TIMEOUT = 30;
+
+    /**
+     * POP3 Carriage Return + Line Feed.
+     * @type string
+     * @access public
+     * @deprecated Use the constant instead
+     */
+    public $CRLF = "\r\n";
+
+    /**
+     * Debug display level.
+     * Options: 0 = no, 1+ = yes
+     * @type integer
+     * @access public
+     */
+    public $do_debug = 0;
+
+    /**
+     * POP3 mail server hostname.
+     * @type string
+     * @access public
+     */
+    public $host;
+
+    /**
+     * POP3 port number.
+     * @type integer
+     * @access public
+     */
+    public $port;
+
+    /**
+     * POP3 Timeout Value in seconds.
+     * @type integer
+     * @access public
+     */
+    public $tval;
+
+    /**
+     * POP3 username
+     * @type string
+     * @access public
+     */
+    public $username;
+
+    /**
+     * POP3 password.
+     * @type string
+     * @access public
+     */
+    public $password;
+
+    /**
+     * Resource handle for the POP3 connection socket.
+     * @type resource
+     * @access private
+     */
+    private $pop_conn;
+
+    /**
+     * Are we connected?
+     * @type boolean
+     * @access private
+     */
+    private $connected = false;
+
+    /**
+     * Error container.
+     * @type array
+     * @access private
+     */
+    private $errors = array();
+
+    /**
+     * Line break constant
+     */
+    const CRLF = "\r\n";
+
+    /**
+     * Simple static wrapper for all-in-one POP before SMTP
+     * @param $host
+     * @param boolean $port
+     * @param boolean $tval
+     * @param string $username
+     * @param string $password
+     * @param integer $debug_level
+     * @return boolean
+     */
+    public static function popBeforeSmtp(
+        $host,
+        $port = false,
+        $tval = false,
+        $username = '',
+        $password = '',
+        $debug_level = 0
+    ) {
+        $pop = new POP3;
+        return $pop->authorise($host, $port, $tval, $username, $password, $debug_level);
+    }
+
+    /**
+     * Authenticate with a POP3 server.
+     * A connect, login, disconnect sequence
+     * appropriate for POP-before SMTP authorisation.
+     * @access public
+     * @param string $host The hostname to connect to
+     * @param integer|boolean $port The port number to connect to
+     * @param integer|boolean $timeout The timeout value
+     * @param string $username
+     * @param string $password
+     * @param integer $debug_level
+     * @return boolean
+     */
+    public function authorise($host, $port = false, $timeout = false, $username = '', $password = '', $debug_level = 0)
+    {
+        $this->host = $host;
+        // If no port value provided, use default
+        if (false === $port) {
+            $this->port = $this->POP3_PORT;
+        } else {
+            $this->port = (integer)$port;
+        }
+        // If no timeout value provided, use default
+        if (false === $timeout) {
+            $this->tval = $this->POP3_TIMEOUT;
+        } else {
+            $this->tval = (integer)$timeout;
+        }
+        $this->do_debug = $debug_level;
+        $this->username = $username;
+        $this->password = $password;
+        //  Reset the error log
+        $this->errors = array();
+        //  connect
+        $result = $this->connect($this->host, $this->port, $this->tval);
+        if ($result) {
+            $login_result = $this->login($this->username, $this->password);
+            if ($login_result) {
+                $this->disconnect();
+                return true;
+            }
+        }
+        // We need to disconnect regardless of whether the login succeeded
+        $this->disconnect();
+        return false;
+    }
+
+    /**
+     * Connect to a POP3 server.
+     * @access public
+     * @param string $host
+     * @param integer|boolean $port
+     * @param integer $tval
+     * @return boolean
+     */
+    public function connect($host, $port = false, $tval = 30)
+    {
+        //  Are we already connected?
+        if ($this->connected) {
+            return true;
+        }
+
+        //On Windows this will raise a PHP Warning error if the hostname doesn't exist.
+        //Rather than suppress it with @fsockopen, capture it cleanly instead
+        set_error_handler(array($this, 'catchWarning'));
+
+        if (false === $port) {
+            $port = $this->POP3_PORT;
+        }
+
+        //  connect to the POP3 server
+        $this->pop_conn = fsockopen(
+            $host, //  POP3 Host
+            $port, //  Port #
+            $errno, //  Error Number
+            $errstr, //  Error Message
+            $tval
+        ); //  Timeout (seconds)
+        //  Restore the error handler
+        restore_error_handler();
+
+        //  Did we connect?
+        if (false === $this->pop_conn) {
+            //  It would appear not...
+            $this->setError(array(
+                'error' => "Failed to connect to server $host on port $port",
+                'errno' => $errno,
+                'errstr' => $errstr
+            ));
+            return false;
+        }
+
+        //  Increase the stream time-out
+        stream_set_timeout($this->pop_conn, $tval, 0);
+
+        //  Get the POP3 server response
+        $pop3_response = $this->getResponse();
+        //  Check for the +OK
+        if ($this->checkResponse($pop3_response)) {
+            //  The connection is established and the POP3 server is talking
+            $this->connected = true;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Log in to the POP3 server.
+     * Does not support APOP (RFC 2828, 4949).
+     * @access public
+     * @param string $username
+     * @param string $password
+     * @return boolean
+     */
+    public function login($username = '', $password = '')
+    {
+        if (!$this->connected) {
+            $this->setError('Not connected to POP3 server');
+        }
+        if (empty($username)) {
+            $username = $this->username;
+        }
+        if (empty($password)) {
+            $password = $this->password;
+        }
+
+        // Send the Username
+        $this->sendString("USER $username" . self::CRLF);
+        $pop3_response = $this->getResponse();
+        if ($this->checkResponse($pop3_response)) {
+            // Send the Password
+            $this->sendString("PASS $password" . self::CRLF);
+            $pop3_response = $this->getResponse();
+            if ($this->checkResponse($pop3_response)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Disconnect from the POP3 server.
+     * @access public
+     */
+    public function disconnect()
+    {
+        $this->sendString('QUIT');
+        //The QUIT command may cause the daemon to exit, which will kill our connection
+        //So ignore errors here
+        try {
+            @fclose($this->pop_conn);
+        } catch (Exception $e) {
+            //Do nothing
+        };
+    }
+
+    /**
+     * Get a response from the POP3 server.
+     * $size is the maximum number of bytes to retrieve
+     * @param integer $size
+     * @return string
+     * @access private
+     */
+    private function getResponse($size = 128)
+    {
+        $response = fgets($this->pop_conn, $size);
+        if ($this->do_debug >= 1) {
+            echo "Server -> Client: $response";
+        }
+        return $response;
+    }
+
+    /**
+     * Send raw data to the POP3 server.
+     * @param string $string
+     * @return integer
+     * @access private
+     */
+    private function sendString($string)
+    {
+        if ($this->pop_conn) {
+            if ($this->do_debug >= 2) { //Show client messages when debug >= 2
+                echo "Client -> Server: $string";
+            }
+            return fwrite($this->pop_conn, $string, strlen($string));
+        }
+        return 0;
+    }
+
+    /**
+     * Checks the POP3 server response.
+     * Looks for for +OK or -ERR.
+     * @param string $string
+     * @return boolean
+     * @access private
+     */
+    private function checkResponse($string)
+    {
+        if (substr($string, 0, 3) !== '+OK') {
+            $this->setError(array(
+                'error' => "Server reported an error: $string",
+                'errno' => 0,
+                'errstr' => ''
+            ));
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Add an error to the internal error store.
+     * Also display debug output if it's enabled.
+     * @param $error
+     */
+    private function setError($error)
+    {
+        $this->errors[] = $error;
+        if ($this->do_debug >= 1) {
+            echo '<pre>';
+            foreach ($this->errors as $error) {
+                print_r($error);
+            }
+            echo '</pre>';
+        }
+    }
+
+    /**
+     * POP3 connection error handler.
+     * @param integer $errno
+     * @param string $errstr
+     * @param string $errfile
+     * @param integer $errline
+     * @access private
+     */
+    private function catchWarning($errno, $errstr, $errfile, $errline)
+    {
+        $this->setError(array(
+            'error' => "Connecting to the POP3 server raised a PHP warning: ",
+            'errno' => $errno,
+            'errstr' => $errstr,
+            'errfile' => $errfile,
+            'errline' => $errline
+        ));
+    }
+}
diff --git a/upload/engine/libs/smtp/class.smtp.php b/upload/engine/libs/smtp/class.smtp.php
new file mode 100644
index 0000000..d699197
--- /dev/null
+++ b/upload/engine/libs/smtp/class.smtp.php
@@ -0,0 +1,1132 @@
+<?php
+/**
+ * PHPMailer RFC821 SMTP email transport class.
+ * PHP Version 5
+ * @package PHPMailer
+ * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2014 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+/**
+ * PHPMailer RFC821 SMTP email transport class.
+ * Implements RFC 821 SMTP commands and provides some utility methods for sending mail to an SMTP server.
+ * @package PHPMailer
+ * @author Chris Ryan
+ * @author Marcus Bointon <phpmailer@synchromedia.co.uk>
+ */
+class SMTP
+{
+    /**
+     * The PHPMailer SMTP version number.
+     * @type string
+     */
+    const VERSION = '5.2.9';
+
+    /**
+     * SMTP line break constant.
+     * @type string
+     */
+    const CRLF = "\r\n";
+
+    /**
+     * The SMTP port to use if one is not specified.
+     * @type integer
+     */
+    const DEFAULT_SMTP_PORT = 25;
+
+    /**
+     * The maximum line length allowed by RFC 2822 section 2.1.1
+     * @type integer
+     */
+    const MAX_LINE_LENGTH = 998;
+
+    /**
+     * Debug level for no output
+     */
+    const DEBUG_OFF = 0;
+
+    /**
+     * Debug level to show client -> server messages
+     */
+    const DEBUG_CLIENT = 1;
+
+    /**
+     * Debug level to show client -> server and server -> client messages
+     */
+    const DEBUG_SERVER = 2;
+
+    /**
+     * Debug level to show connection status, client -> server and server -> client messages
+     */
+    const DEBUG_CONNECTION = 3;
+
+    /**
+     * Debug level to show all messages
+     */
+    const DEBUG_LOWLEVEL = 4;
+
+    /**
+     * The PHPMailer SMTP Version number.
+     * @type string
+     * @deprecated Use the `VERSION` constant instead
+     * @see SMTP::VERSION
+     */
+    public $Version = '5.2.9';
+
+    /**
+     * SMTP server port number.
+     * @type integer
+     * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead
+     * @see SMTP::DEFAULT_SMTP_PORT
+     */
+    public $SMTP_PORT = 25;
+
+    /**
+     * SMTP reply line ending.
+     * @type string
+     * @deprecated Use the `CRLF` constant instead
+     * @see SMTP::CRLF
+     */
+    public $CRLF = "\r\n";
+
+    /**
+     * Debug output level.
+     * Options:
+     * * self::DEBUG_OFF (`0`) No debug output, default
+     * * self::DEBUG_CLIENT (`1`) Client commands
+     * * self::DEBUG_SERVER (`2`) Client commands and server responses
+     * * self::DEBUG_CONNECTION (`3`) As DEBUG_SERVER plus connection status
+     * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages
+     * @type integer
+     */
+    public $do_debug = self::DEBUG_OFF;
+
+    /**
+     * How to handle debug output.
+     * Options:
+     * * `echo` Output plain-text as-is, appropriate for CLI
+     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+     * * `error_log` Output to error log as configured in php.ini
+     *
+     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
+     * <code>
+     * $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+     * </code>
+     * @type string|callable
+     */
+    public $Debugoutput = 'echo';
+
+    /**
+     * Whether to use VERP.
+     * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
+     * @link http://www.postfix.org/VERP_README.html Info on VERP
+     * @type boolean
+     */
+    public $do_verp = false;
+
+    /**
+     * The timeout value for connection, in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+     * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
+     * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2
+     * @type integer
+     */
+    public $Timeout = 300;
+
+    /**
+     * How long to wait for commands to complete, in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
+     * @type integer
+     */
+    public $Timelimit = 300;
+
+    /**
+     * The socket for the server connection.
+     * @type resource
+     */
+    protected $smtp_conn;
+
+    /**
+     * Error message, if any, for the last call.
+     * @type array
+     */
+    protected $error = array();
+
+    /**
+     * The reply the server sent to us for HELO.
+     * If null, no HELO string has yet been received.
+     * @type string|null
+     */
+    protected $helo_rply = null;
+
+    /**
+     * The set of SMTP extensions sent in reply to EHLO command.
+     * Indexes of the array are extension names.
+     * Value at index 'HELO' or 'EHLO' (according to command that was sent)
+     * represents the server name. In case of HELO it is the only element of the array.
+     * Other values can be boolean TRUE or an array containing extension options.
+     * If null, no HELO/EHLO string has yet been received.
+     * @type array|null
+     */
+    protected $server_caps = null;
+
+    /**
+     * The most recent reply received from the server.
+     * @type string
+     */
+    protected $last_reply = '';
+
+    /**
+     * Output debugging info via a user-selected method.
+     * @see SMTP::$Debugoutput
+     * @see SMTP::$do_debug
+     * @param string $str Debug string to output
+     * @param integer $level The debug level of this message; see DEBUG_* constants
+     * @return void
+     */
+    protected function edebug($str, $level = 0)
+    {
+        if ($level > $this->do_debug) {
+            return;
+        }
+        //Avoid clash with built-in function names
+        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
+            call_user_func($this->Debugoutput, $str, $this->do_debug);
+            return;
+        }
+        switch ($this->Debugoutput) {
+            case 'error_log':
+                //Don't output, just log
+                error_log($str);
+                break;
+            case 'html':
+                //Cleans up output a bit for a better looking, HTML-safe output
+                echo htmlentities(
+                    preg_replace('/[\r\n]+/', '', $str),
+                    ENT_QUOTES,
+                    'UTF-8'
+                )
+                . "<br>\n";
+                break;
+            case 'echo':
+            default:
+                //Normalize line breaks
+                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
+                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
+                    "\n",
+                    "\n                   \t                  ",
+                    trim($str)
+                )."\n";
+        }
+    }
+
+    /**
+     * Connect to an SMTP server.
+     * @param string $host SMTP server IP or host name
+     * @param integer $port The port number to connect to
+     * @param integer $timeout How long to wait for the connection to open
+     * @param array $options An array of options for stream_context_create()
+     * @access public
+     * @return boolean
+     */
+    public function connect($host, $port = null, $timeout = 30, $options = array())
+    {
+        static $streamok;
+        //This is enabled by default since 5.0.0 but some providers disable it
+        //Check this once and cache the result
+        if (is_null($streamok)) {
+            $streamok = function_exists('stream_socket_client');
+        }
+        // Clear errors to avoid confusion
+        $this->error = array();
+        // Make sure we are __not__ connected
+        if ($this->connected()) {
+            // Already connected, generate error
+            $this->error = array('error' => 'Already connected to a server');
+            return false;
+        }
+        if (empty($port)) {
+            $port = self::DEFAULT_SMTP_PORT;
+        }
+        // Connect to the SMTP server
+        $this->edebug(
+            "Connection: opening to $host:$port, t=$timeout, opt=".var_export($options, true),
+            self::DEBUG_CONNECTION
+        );
+        $errno = 0;
+        $errstr = '';
+        if ($streamok) {
+            $socket_context = stream_context_create($options);
+            //Suppress errors; connection failures are handled at a higher level
+            $this->smtp_conn = @stream_socket_client(
+                $host . ":" . $port,
+                $errno,
+                $errstr,
+                $timeout,
+                STREAM_CLIENT_CONNECT,
+                $socket_context
+            );
+        } else {
+            //Fall back to fsockopen which should work in more places, but is missing some features
+            $this->edebug(
+                "Connection: stream_socket_client not available, falling back to fsockopen",
+                self::DEBUG_CONNECTION
+            );
+            $this->smtp_conn = fsockopen(
+                $host,
+                $port,
+                $errno,
+                $errstr,
+                $timeout
+            );
+        }
+        // Verify we connected properly
+        if (!is_resource($this->smtp_conn)) {
+            $this->error = array(
+                'error' => 'Failed to connect to server',
+                'errno' => $errno,
+                'errstr' => $errstr
+            );
+            $this->edebug(
+                'SMTP ERROR: ' . $this->error['error']
+                . ": $errstr ($errno)",
+                self::DEBUG_CLIENT
+            );
+            return false;
+        }
+        $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
+        // SMTP server can take longer to respond, give longer timeout for first read
+        // Windows does not have support for this timeout function
+        if (substr(PHP_OS, 0, 3) != 'WIN') {
+            $max = ini_get('max_execution_time');
+            if ($max != 0 && $timeout > $max) { // Don't bother if unlimited
+                @set_time_limit($timeout);
+            }
+            stream_set_timeout($this->smtp_conn, $timeout, 0);
+        }
+        // Get any announcement
+        $announce = $this->get_lines();
+        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
+        return true;
+    }
+
+    /**
+     * Initiate a TLS (encrypted) session.
+     * @access public
+     * @return boolean
+     */
+    public function startTLS()
+    {
+        if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
+            return false;
+        }
+        // Begin encrypted connection
+        if (!stream_socket_enable_crypto(
+            $this->smtp_conn,
+            true,
+            STREAM_CRYPTO_METHOD_TLS_CLIENT
+        )) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Perform SMTP authentication.
+     * Must be run after hello().
+     * @see hello()
+     * @param string $username    The user name
+     * @param string $password    The password
+     * @param string $authtype    The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5)
+     * @param string $realm       The auth realm for NTLM
+     * @param string $workstation The auth workstation for NTLM
+     * @access public
+     * @return boolean True if successfully authenticated.
+     */
+    public function authenticate(
+        $username,
+        $password,
+        $authtype = null,
+        $realm = '',
+        $workstation = ''
+    ) {
+        if (!$this->server_caps) {
+            $this->error = array('error' => 'Authentication is not allowed before HELO/EHLO');
+            return false;
+        }
+
+        if (array_key_exists('EHLO', $this->server_caps)) {
+        // SMTP extensions are available. Let's try to find a proper authentication method
+
+            if (!array_key_exists('AUTH', $this->server_caps)) {
+                $this->error = array( 'error' => 'Authentication is not allowed at this stage' );
+                // 'at this stage' means that auth may be allowed after the stage changes
+                // e.g. after STARTTLS
+                return false;
+            }
+
+            self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
+            self::edebug(
+                'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
+                self::DEBUG_LOWLEVEL
+            );
+
+            if (empty($authtype)) {
+                foreach (array('LOGIN', 'CRAM-MD5', 'NTLM', 'PLAIN') as $method) {
+                    if (in_array($method, $this->server_caps['AUTH'])) {
+                        $authtype = $method;
+                        break;
+                    }
+                }
+                if (empty($authtype)) {
+                    $this->error = array( 'error' => 'No supported authentication methods found' );
+                    return false;
+                }
+                self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL);
+            }
+
+            if (!in_array($authtype, $this->server_caps['AUTH'])) {
+                $this->error = array( 'error' => 'The requested authentication method "'
+                    . $authtype . '" is not supported by the server' );
+                return false;
+            }
+        } elseif (empty($authtype)) {
+            $authtype = 'LOGIN';
+        }
+        switch ($authtype) {
+            case 'PLAIN':
+                // Start authentication
+                if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
+                    return false;
+                }
+                // Send encoded username and password
+                if (!$this->sendCommand(
+                    'User & Password',
+                    base64_encode("\0" . $username . "\0" . $password),
+                    235
+                )
+                ) {
+                    return false;
+                }
+                break;
+            case 'LOGIN':
+                // Start authentication
+                if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
+                    return false;
+                }
+                if (!$this->sendCommand("Username", base64_encode($username), 334)) {
+                    return false;
+                }
+                if (!$this->sendCommand("Password", base64_encode($password), 235)) {
+                    return false;
+                }
+                break;
+            case 'NTLM':
+                /*
+                 * ntlm_sasl_client.php
+                 * Bundled with Permission
+                 *
+                 * How to telnet in windows:
+                 * http://technet.microsoft.com/en-us/library/aa995718%28EXCHG.65%29.aspx
+                 * PROTOCOL Docs http://curl.haxx.se/rfc/ntlm.html#ntlmSmtpAuthentication
+                 */
+                require_once 'extras/ntlm_sasl_client.php';
+                $temp = new stdClass();
+                $ntlm_client = new ntlm_sasl_client_class;
+                //Check that functions are available
+                if (!$ntlm_client->Initialize($temp)) {
+                    $this->error = array('error' => $temp->error);
+                    $this->edebug(
+                        'You need to enable some modules in your php.ini file: '
+                        . $this->error['error'],
+                        self::DEBUG_CLIENT
+                    );
+                    return false;
+                }
+                //msg1
+                $msg1 = $ntlm_client->TypeMsg1($realm, $workstation); //msg1
+
+                if (!$this->sendCommand(
+                    'AUTH NTLM',
+                    'AUTH NTLM ' . base64_encode($msg1),
+                    334
+                )
+                ) {
+                    return false;
+                }
+                //Though 0 based, there is a white space after the 3 digit number
+                //msg2
+                $challenge = substr($this->last_reply, 3);
+                $challenge = base64_decode($challenge);
+                $ntlm_res = $ntlm_client->NTLMResponse(
+                    substr($challenge, 24, 8),
+                    $password
+                );
+                //msg3
+                $msg3 = $ntlm_client->TypeMsg3(
+                    $ntlm_res,
+                    $username,
+                    $realm,
+                    $workstation
+                );
+                // send encoded username
+                return $this->sendCommand('Username', base64_encode($msg3), 235);
+            case 'CRAM-MD5':
+                // Start authentication
+                if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
+                    return false;
+                }
+                // Get the challenge
+                $challenge = base64_decode(substr($this->last_reply, 4));
+
+                // Build the response
+                $response = $username . ' ' . $this->hmac($challenge, $password);
+
+                // send encoded credentials
+                return $this->sendCommand('Username', base64_encode($response), 235);
+            default:
+                $this->error = array( 'error' => 'Authentication method "' . $authtype . '" is not supported' );
+                return false;
+        }
+        return true;
+    }
+
+    /**
+     * Calculate an MD5 HMAC hash.
+     * Works like hash_hmac('md5', $data, $key)
+     * in case that function is not available
+     * @param string $data The data to hash
+     * @param string $key  The key to hash with
+     * @access protected
+     * @return string
+     */
+    protected function hmac($data, $key)
+    {
+        if (function_exists('hash_hmac')) {
+            return hash_hmac('md5', $data, $key);
+        }
+
+        // The following borrowed from
+        // http://php.net/manual/en/function.mhash.php#27225
+
+        // RFC 2104 HMAC implementation for php.
+        // Creates an md5 HMAC.
+        // Eliminates the need to install mhash to compute a HMAC
+        // by Lance Rushing
+
+        $bytelen = 64; // byte length for md5
+        if (strlen($key) > $bytelen) {
+            $key = pack('H*', md5($key));
+        }
+        $key = str_pad($key, $bytelen, chr(0x00));
+        $ipad = str_pad('', $bytelen, chr(0x36));
+        $opad = str_pad('', $bytelen, chr(0x5c));
+        $k_ipad = $key ^ $ipad;
+        $k_opad = $key ^ $opad;
+
+        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
+    }
+
+    /**
+     * Check connection state.
+     * @access public
+     * @return boolean True if connected.
+     */
+    public function connected()
+    {
+        if (is_resource($this->smtp_conn)) {
+            $sock_status = stream_get_meta_data($this->smtp_conn);
+            if ($sock_status['eof']) {
+                // The socket is valid but we are not connected
+                $this->edebug(
+                    'SMTP NOTICE: EOF caught while checking if connected',
+                    self::DEBUG_CLIENT
+                );
+                $this->close();
+                return false;
+            }
+            return true; // everything looks good
+        }
+        return false;
+    }
+
+    /**
+     * Close the socket and clean up the state of the class.
+     * Don't use this function without first trying to use QUIT.
+     * @see quit()
+     * @access public
+     * @return void
+     */
+    public function close()
+    {
+        $this->error = array();
+        $this->server_caps = null;
+        $this->helo_rply = null;
+        if (is_resource($this->smtp_conn)) {
+            // close the connection and cleanup
+            fclose($this->smtp_conn);
+            $this->smtp_conn = null; //Makes for cleaner serialization
+            $this->edebug('Connection: closed', self::DEBUG_CONNECTION);
+        }
+    }
+
+    /**
+     * Send an SMTP DATA command.
+     * Issues a data command and sends the msg_data to the server,
+     * finializing the mail transaction. $msg_data is the message
+     * that is to be send with the headers. Each header needs to be
+     * on a single line followed by a <CRLF> with the message headers
+     * and the message body being separated by and additional <CRLF>.
+     * Implements rfc 821: DATA <CRLF>
+     * @param string $msg_data Message data to send
+     * @access public
+     * @return boolean
+     */
+    public function data($msg_data)
+    {
+        //This will use the standard timelimit
+        if (!$this->sendCommand('DATA', 'DATA', 354)) {
+            return false;
+        }
+
+        /* The server is ready to accept data!
+         * According to rfc821 we should not send more than 1000 characters on a single line (including the CRLF)
+         * so we will break the data up into lines by \r and/or \n then if needed we will break each of those into
+         * smaller lines to fit within the limit.
+         * We will also look for lines that start with a '.' and prepend an additional '.'.
+         * NOTE: this does not count towards line-length limit.
+         */
+
+        // Normalize line breaks before exploding
+        $lines = explode("\n", str_replace(array("\r\n", "\r"), "\n", $msg_data));
+
+        /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
+         * of the first line (':' separated) does not contain a space then it _should_ be a header and we will
+         * process all lines before a blank line as headers.
+         */
+
+        $field = substr($lines[0], 0, strpos($lines[0], ':'));
+        $in_headers = false;
+        if (!empty($field) && strpos($field, ' ') === false) {
+            $in_headers = true;
+        }
+
+        foreach ($lines as $line) {
+            $lines_out = array();
+            if ($in_headers and $line == '') {
+                $in_headers = false;
+            }
+            //We need to break this line up into several smaller lines
+            //This is a small micro-optimisation: isset($str[$len]) is equivalent to (strlen($str) > $len)
+            while (isset($line[self::MAX_LINE_LENGTH])) {
+                //Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on
+                //so as to avoid breaking in the middle of a word
+                $pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' ');
+                if (!$pos) { //Deliberately matches both false and 0
+                    //No nice break found, add a hard break
+                    $pos = self::MAX_LINE_LENGTH - 1;
+                    $lines_out[] = substr($line, 0, $pos);
+                    $line = substr($line, $pos);
+                } else {
+                    //Break at the found point
+                    $lines_out[] = substr($line, 0, $pos);
+                    //Move along by the amount we dealt with
+                    $line = substr($line, $pos + 1);
+                }
+                //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
+                if ($in_headers) {
+                    $line = "\t" . $line;
+                }
+            }
+            $lines_out[] = $line;
+
+            //Send the lines to the server
+            foreach ($lines_out as $line_out) {
+                //RFC2821 section 4.5.2
+                if (!empty($line_out) and $line_out[0] == '.') {
+                    $line_out = '.' . $line_out;
+                }
+                $this->client_send($line_out . self::CRLF);
+            }
+        }
+
+        //Message data has been sent, complete the command
+        //Increase timelimit for end of DATA command
+        $savetimelimit = $this->Timelimit;
+        $this->Timelimit = $this->Timelimit * 2;
+        $result = $this->sendCommand('DATA END', '.', 250);
+        //Restore timelimit
+        $this->Timelimit = $savetimelimit;
+        return $result;
+    }
+
+    /**
+     * Send an SMTP HELO or EHLO command.
+     * Used to identify the sending server to the receiving server.
+     * This makes sure that client and server are in a known state.
+     * Implements RFC 821: HELO <SP> <domain> <CRLF>
+     * and RFC 2821 EHLO.
+     * @param string $host The host name or IP to connect to
+     * @access public
+     * @return boolean
+     */
+    public function hello($host = '')
+    {
+        //Try extended hello first (RFC 2821)
+        return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
+    }
+
+    /**
+     * Send an SMTP HELO or EHLO command.
+     * Low-level implementation used by hello()
+     * @see hello()
+     * @param string $hello The HELO string
+     * @param string $host The hostname to say we are
+     * @access protected
+     * @return boolean
+     */
+    protected function sendHello($hello, $host)
+    {
+        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
+        $this->helo_rply = $this->last_reply;
+        if ($noerror) {
+            $this->parseHelloFields($hello);
+        } else {
+            $this->server_caps = null;
+        }
+        return $noerror;
+    }
+
+    /**
+     * Parse a reply to HELO/EHLO command to discover server extensions.
+     * In case of HELO, the only parameter that can be discovered is a server name.
+     * @access protected
+     * @param string $type - 'HELO' or 'EHLO'
+     */
+    protected function parseHelloFields($type)
+    {
+        $this->server_caps = array();
+        $lines = explode("\n", $this->last_reply);
+        foreach ($lines as $n => $s) {
+            $s = trim(substr($s, 4));
+            if (!$s) {
+                continue;
+            }
+            $fields = explode(' ', $s);
+            if ($fields) {
+                if (!$n) {
+                    $name = $type;
+                    $fields = $fields[0];
+                } else {
+                    $name = array_shift($fields);
+                    if ($name == 'SIZE') {
+                        $fields = ($fields) ? $fields[0] : 0;
+                    }
+                }
+                $this->server_caps[$name] = ($fields ? $fields : true);
+            }
+        }
+    }
+
+    /**
+     * Send an SMTP MAIL command.
+     * Starts a mail transaction from the email address specified in
+     * $from. Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more recipient
+     * commands may be called followed by a data command.
+     * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
+     * @param string $from Source address of this message
+     * @access public
+     * @return boolean
+     */
+    public function mail($from)
+    {
+        $useVerp = ($this->do_verp ? ' XVERP' : '');
+        return $this->sendCommand(
+            'MAIL FROM',
+            'MAIL FROM:<' . $from . '>' . $useVerp,
+            250
+        );
+    }
+
+    /**
+     * Send an SMTP QUIT command.
+     * Closes the socket if there is no error or the $close_on_error argument is true.
+     * Implements from rfc 821: QUIT <CRLF>
+     * @param boolean $close_on_error Should the connection close if an error occurs?
+     * @access public
+     * @return boolean
+     */
+    public function quit($close_on_error = true)
+    {
+        $noerror = $this->sendCommand('QUIT', 'QUIT', 221);
+        $err = $this->error; //Save any error
+        if ($noerror or $close_on_error) {
+            $this->close();
+            $this->error = $err; //Restore any error from the quit command
+        }
+        return $noerror;
+    }
+
+    /**
+     * Send an SMTP RCPT command.
+     * Sets the TO argument to $toaddr.
+     * Returns true if the recipient was accepted false if it was rejected.
+     * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
+     * @param string $toaddr The address the message is being sent to
+     * @access public
+     * @return boolean
+     */
+    public function recipient($toaddr)
+    {
+        return $this->sendCommand(
+            'RCPT TO',
+            'RCPT TO:<' . $toaddr . '>',
+            array(250, 251)
+        );
+    }
+
+    /**
+     * Send an SMTP RSET command.
+     * Abort any transaction that is currently in progress.
+     * Implements rfc 821: RSET <CRLF>
+     * @access public
+     * @return boolean True on success.
+     */
+    public function reset()
+    {
+        return $this->sendCommand('RSET', 'RSET', 250);
+    }
+
+    /**
+     * Send a command to an SMTP server and check its return code.
+     * @param string $command       The command name - not sent to the server
+     * @param string $commandstring The actual command to send
+     * @param integer|array $expect     One or more expected integer success codes
+     * @access protected
+     * @return boolean True on success.
+     */
+    protected function sendCommand($command, $commandstring, $expect)
+    {
+        if (!$this->connected()) {
+            $this->error = array(
+                'error' => "Called $command without being connected"
+            );
+            return false;
+        }
+        $this->client_send($commandstring . self::CRLF);
+
+        $this->last_reply = $this->get_lines();
+        // Fetch SMTP code and possible error code explanation
+        $matches = array();
+        if (preg_match("/^([0-9]{3})[ -](?:([0-9]\\.[0-9]\\.[0-9]) )?/", $this->last_reply, $matches)) {
+            $code = $matches[1];
+            $code_ex = (count($matches) > 2 ? $matches[2] : null);
+            // Cut off error code from each response line
+            $detail = preg_replace(
+                "/{$code}[ -]".($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '')."/m",
+                '',
+                $this->last_reply
+            );
+        } else { // Fall back to simple parsing if regex fails
+            $code = substr($this->last_reply, 0, 3);
+            $code_ex = null;
+            $detail = substr($this->last_reply, 4);
+        }
+
+        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
+
+        if (!in_array($code, (array)$expect)) {
+            $this->error = array(
+                'error' => "$command command failed",
+                'smtp_code' => $code,
+                'smtp_code_ex' => $code_ex,
+                'detail' => $detail
+            );
+            $this->edebug(
+                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
+                self::DEBUG_CLIENT
+            );
+            return false;
+        }
+
+        $this->error = array();
+        return true;
+    }
+
+    /**
+     * Send an SMTP SAML command.
+     * Starts a mail transaction from the email address specified in $from.
+     * Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more recipient
+     * commands may be called followed by a data command. This command
+     * will send the message to the users terminal if they are logged
+     * in and send them an email.
+     * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
+     * @param string $from The address the message is from
+     * @access public
+     * @return boolean
+     */
+    public function sendAndMail($from)
+    {
+        return $this->sendCommand('SAML', "SAML FROM:$from", 250);
+    }
+
+    /**
+     * Send an SMTP VRFY command.
+     * @param string $name The name to verify
+     * @access public
+     * @return boolean
+     */
+    public function verify($name)
+    {
+        return $this->sendCommand('VRFY', "VRFY $name", array(250, 251));
+    }
+
+    /**
+     * Send an SMTP NOOP command.
+     * Used to keep keep-alives alive, doesn't actually do anything
+     * @access public
+     * @return boolean
+     */
+    public function noop()
+    {
+        return $this->sendCommand('NOOP', 'NOOP', 250);
+    }
+
+    /**
+     * Send an SMTP TURN command.
+     * This is an optional command for SMTP that this class does not support.
+     * This method is here to make the RFC821 Definition complete for this class
+     * and _may_ be implemented in future
+     * Implements from rfc 821: TURN <CRLF>
+     * @access public
+     * @return boolean
+     */
+    public function turn()
+    {
+        $this->error = array(
+            'error' => 'The SMTP TURN command is not implemented'
+        );
+        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
+        return false;
+    }
+
+    /**
+     * Send raw data to the server.
+     * @param string $data The data to send
+     * @access public
+     * @return integer|boolean The number of bytes sent to the server or false on error
+     */
+    public function client_send($data)
+    {
+        $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT);
+        return fwrite($this->smtp_conn, $data);
+    }
+
+    /**
+     * Get the latest error.
+     * @access public
+     * @return array
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Get SMTP extensions available on the server
+     * @access public
+     * @return array|null
+     */
+    public function getServerExtList()
+    {
+        return $this->server_caps;
+    }
+
+    /**
+     * A multipurpose method
+     * The method works in three ways, dependent on argument value and current state
+     *   1. HELO/EHLO was not sent - returns null and set up $this->error
+     *   2. HELO was sent
+     *     $name = 'HELO': returns server name
+     *     $name = 'EHLO': returns boolean false
+     *     $name = any string: returns null and set up $this->error
+     *   3. EHLO was sent
+     *     $name = 'HELO'|'EHLO': returns server name
+     *     $name = any string: if extension $name exists, returns boolean True
+     *       or its options. Otherwise returns boolean False
+     * In other words, one can use this method to detect 3 conditions:
+     *  - null returned: handshake was not or we don't know about ext (refer to $this->error)
+     *  - false returned: the requested feature exactly not exists
+     *  - positive value returned: the requested feature exists
+     * @param string $name Name of SMTP extension or 'HELO'|'EHLO'
+     * @return mixed
+     */
+    public function getServerExt($name)
+    {
+        if (!$this->server_caps) {
+            $this->error = array('No HELO/EHLO was sent');
+            return null;
+        }
+
+        // the tight logic knot ;)
+        if (!array_key_exists($name, $this->server_caps)) {
+            if ($name == 'HELO') {
+                return $this->server_caps['EHLO'];
+            }
+            if ($name == 'EHLO' || array_key_exists('EHLO', $this->server_caps)) {
+                return false;
+            }
+            $this->error = array('HELO handshake was used. Client knows nothing about server extensions');
+            return null;
+        }
+
+        return $this->server_caps[$name];
+    }
+
+    /**
+     * Get the last reply from the server.
+     * @access public
+     * @return string
+     */
+    public function getLastReply()
+    {
+        return $this->last_reply;
+    }
+
+    /**
+     * Read the SMTP server's response.
+     * Either before eof or socket timeout occurs on the operation.
+     * With SMTP we can tell if we have more lines to read if the
+     * 4th character is '-' symbol. If it is a space then we don't
+     * need to read anything else.
+     * @access protected
+     * @return string
+     */
+    protected function get_lines()
+    {
+        // If the connection is bad, give up straight away
+        if (!is_resource($this->smtp_conn)) {
+            return '';
+        }
+        $data = '';
+        $endtime = 0;
+        stream_set_timeout($this->smtp_conn, $this->Timeout);
+        if ($this->Timelimit > 0) {
+            $endtime = time() + $this->Timelimit;
+        }
+        while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
+            $str = @fgets($this->smtp_conn, 515);
+            $this->edebug("SMTP -> get_lines(): \$data was \"$data\"", self::DEBUG_LOWLEVEL);
+            $this->edebug("SMTP -> get_lines(): \$str is \"$str\"", self::DEBUG_LOWLEVEL);
+            $data .= $str;
+            $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
+            // If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen
+            if ((isset($str[3]) and $str[3] == ' ')) {
+                break;
+            }
+            // Timed-out? Log and break
+            $info = stream_get_meta_data($this->smtp_conn);
+            if ($info['timed_out']) {
+                $this->edebug(
+                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                    self::DEBUG_LOWLEVEL
+                );
+                break;
+            }
+            // Now check if reads took too long
+            if ($endtime and time() > $endtime) {
+                $this->edebug(
+                    'SMTP -> get_lines(): timelimit reached ('.
+                    $this->Timelimit . ' sec)',
+                    self::DEBUG_LOWLEVEL
+                );
+                break;
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Enable or disable VERP address generation.
+     * @param boolean $enabled
+     */
+    public function setVerp($enabled = false)
+    {
+        $this->do_verp = $enabled;
+    }
+
+    /**
+     * Get VERP address generation mode.
+     * @return boolean
+     */
+    public function getVerp()
+    {
+        return $this->do_verp;
+    }
+
+    /**
+     * Set debug output method.
+     * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it.
+     */
+    public function setDebugOutput($method = 'echo')
+    {
+        $this->Debugoutput = $method;
+    }
+
+    /**
+     * Get debug output method.
+     * @return string
+     */
+    public function getDebugOutput()
+    {
+        return $this->Debugoutput;
+    }
+
+    /**
+     * Set debug output level.
+     * @param integer $level
+     */
+    public function setDebugLevel($level = 0)
+    {
+        $this->do_debug = $level;
+    }
+
+    /**
+     * Get debug output level.
+     * @return integer
+     */
+    public function getDebugLevel()
+    {
+        return $this->do_debug;
+    }
+
+    /**
+     * Set SMTP timeout.
+     * @param integer $timeout
+     */
+    public function setTimeout($timeout = 0)
+    {
+        $this->Timeout = $timeout;
+    }
+
+    /**
+     * Get SMTP timeout.
+     * @return integer
+     */
+    public function getTimeout()
+    {
+        return $this->Timeout;
+    }
+}
diff --git a/upload/engine/libs/status_query/MinecraftPing.php b/upload/engine/libs/status_query/MinecraftPing.php
deleted file mode 100644
index 5079ce4..0000000
--- a/upload/engine/libs/status_query/MinecraftPing.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-
-namespace xPaw;
-
-class MinecraftPing
-{
-	/*
-	 * Queries Minecraft server
-	 * Returns array on success, false on failure.
-	 *
-	 * WARNING: This method was added in snapshot 13w41a (Minecraft 1.7)
-	 *
-	 * Written by xPaw
-	 *
-	 * Website: http://xpaw.me
-	 * GitHub: https://github.com/xPaw/PHP-Minecraft-Query
-	 *
-	 * ---------
-	 *
-	 * This method can be used to get server-icon.png too.
-	 * Something like this:
-	 *
-	 * $Server = new MinecraftPing( 'localhost' );
-	 * $Info = $Server->Query();
-	 * echo '<img width="64" height="64" src="' . Str_Replace( "\n", "", $Info[ 'favicon' ] ) . '">';
-	 *
-	 */
-
-	private $Socket;
-	private $ServerAddress;
-	private $ServerPort;
-	private $Timeout;
-
-	public function __construct( $Address, $Port = 25565, $Timeout = 2 )
-	{
-		$this->ServerAddress = $Address;
-		$this->ServerPort = (int)$Port;
-		$this->Timeout = (int)$Timeout;
-
-		$this->Connect( );
-	}
-
-	public function __destruct( )
-	{
-		$this->Close( );
-	}
-
-	public function Close( )
-	{
-		if( $this->Socket !== null )
-		{
-			fclose( $this->Socket );
-
-			$this->Socket = null;
-		}
-	}
-
-	public function Connect( )
-	{
-		$connectTimeout = $this->Timeout;
-		$this->Socket = @fsockopen( $this->ServerAddress, $this->ServerPort, $errno, $errstr, $connectTimeout );
-
-		if( !$this->Socket )
-		{
-			throw new MinecraftPingException( "Failed to connect or create a socket: $errno ($errstr)" );
-		}
-
-		// Set Read/Write timeout
-		stream_set_timeout( $this->Socket, $this->Timeout );
-	}
-
-	public function Query( )
-	{
-		$TimeStart = microtime(true); // for read timeout purposes
-
-		// See http://wiki.vg/Protocol (Status Ping)
-		$Data = "\x00"; // packet ID = 0 (varint)
-
-		$Data .= "\x04"; // Protocol version (varint)
-		$Data .= Pack( 'c', StrLen( $this->ServerAddress ) ) . $this->ServerAddress; // Server (varint len + UTF-8 addr)
-		$Data .= Pack( 'n', $this->ServerPort ); // Server port (unsigned short)
-		$Data .= "\x01"; // Next state: status (varint)
-
-		$Data = Pack( 'c', StrLen( $Data ) ) . $Data; // prepend length of packet ID + data
-
-		fwrite( $this->Socket, $Data ); // handshake
-		fwrite( $this->Socket, "\x01\x00" ); // status ping
-
-		$Length = $this->ReadVarInt( ); // full packet length
-
-		if( $Length < 10 )
-		{
-			return FALSE;
-		}
-
-		fgetc( $this->Socket ); // packet type, in server ping it's 0
-
-		$Length = $this->ReadVarInt( ); // string length
-
-		$Data = "";
-		do
-		{
-			if (microtime(true) - $TimeStart > $this->Timeout)
-			{
-				throw new MinecraftPingException( 'Server read timed out' );
-			}
-
-			$Remainder = $Length - StrLen( $Data );
-			$block = fread( $this->Socket, $Remainder ); // and finally the json string
-			// abort if there is no progress
-			if (!$block)
-			{
-				throw new MinecraftPingException( 'Server returned too few data' );
-			}
-
-			$Data .= $block;
-		} while( StrLen($Data) < $Length );
-
-		if( $Data === FALSE )
-		{
-			throw new MinecraftPingException( 'Server didn\'t return any data' );
-		}
-
-		$Data = JSON_Decode( $Data, true );
-
-		if( JSON_Last_Error( ) !== JSON_ERROR_NONE )
-		{
-			if( Function_Exists( 'json_last_error_msg' ) )
-			{
-				throw new MinecraftPingException( JSON_Last_Error_Msg( ) );
-			}
-			else
-			{
-				throw new MinecraftPingException( 'JSON parsing failed' );
-			}
-
-			return FALSE;
-		}
-
-		return $Data;
-	}
-
-	public function QueryOldPre17( )
-	{
-		fwrite( $this->Socket, "\xFE\x01" );
-		$Data = fread( $this->Socket, 512 );
-		$Len = StrLen( $Data );
-
-		if( $Len < 4 || $Data[ 0 ] !== "\xFF" )
-		{
-			return FALSE;
-		}
-
-		$Data = SubStr( $Data, 3 ); // Strip packet header (kick message packet and short length)
-		$Data = iconv( 'UTF-16BE', 'UTF-8', $Data );
-
-		// Are we dealing with Minecraft 1.4+ server?
-		if( $Data[ 1 ] === "\xA7" && $Data[ 2 ] === "\x31" )
-		{
-			$Data = Explode( "\x00", $Data );
-
-			return Array(
-				'HostName'   => $Data[ 3 ],
-				'Players'    => IntVal( $Data[ 4 ] ),
-				'MaxPlayers' => IntVal( $Data[ 5 ] ),
-				'Protocol'   => IntVal( $Data[ 1 ] ),
-				'Version'    => $Data[ 2 ]
-			);
-		}
-
-		$Data = Explode( "\xA7", $Data );
-
-		return Array(
-			'HostName'   => SubStr( $Data[ 0 ], 0, -1 ),
-			'Players'    => isset( $Data[ 1 ] ) ? IntVal( $Data[ 1 ] ) : 0,
-			'MaxPlayers' => isset( $Data[ 2 ] ) ? IntVal( $Data[ 2 ] ) : 0,
-			'Protocol'   => 0,
-			'Version'    => '1.3'
-		);
-	}
-
-	private function ReadVarInt( )
-	{
-		$i = 0;
-		$j = 0;
-
-		while( true )
-		{
-			$k = @fgetc( $this->Socket );
-
-			if( $k === FALSE )
-			{
-				return 0;
-			}
-
-			$k = Ord( $k );
-
-			$i |= ( $k & 0x7F ) << $j++ * 7;
-
-			if( $j > 5 )
-			{
-				throw new MinecraftPingException( 'VarInt too big' );
-			}
-
-			if( ( $k & 0x80 ) != 128 )
-			{
-				break;
-			}
-		}
-
-		return $i;
-	}
-}
diff --git a/upload/engine/libs/status_query/MinecraftPingException.php b/upload/engine/libs/status_query/MinecraftPingException.php
deleted file mode 100644
index bc6b927..0000000
--- a/upload/engine/libs/status_query/MinecraftPingException.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace xPaw;
-
-class MinecraftPingException extends \Exception
-{
-	// Exception thrown by MinecraftPing class
-}
diff --git a/upload/engine/libs/status_query/MinecraftQuery.php b/upload/engine/libs/status_query/MinecraftQuery.php
deleted file mode 100644
index d920983..0000000
--- a/upload/engine/libs/status_query/MinecraftQuery.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-namespace xPaw;
-
-class MinecraftQuery
-{
-	/*
-	 * Class written by xPaw
-	 *
-	 * Website: http://xpaw.me
-	 * GitHub: https://github.com/xPaw/PHP-Minecraft-Query
-	 */
-
-	const STATISTIC = 0x00;
-	const HANDSHAKE = 0x09;
-
-	private $Socket;
-	private $Players;
-	private $Info;
-
-	public function Connect( $Ip, $Port = 25565, $Timeout = 3 )
-	{
-		if( !is_int( $Timeout ) || $Timeout < 0 )
-		{
-			throw new \InvalidArgumentException( 'Timeout must be an integer.' );
-		}
-
-		$this->Socket = @FSockOpen( 'udp://' . $Ip, (int)$Port, $ErrNo, $ErrStr, $Timeout );
-
-		if( $ErrNo || $this->Socket === false )
-		{
-			throw new MinecraftQueryException( 'Could not create socket: ' . $ErrStr );
-		}
-
-		Stream_Set_Timeout( $this->Socket, $Timeout );
-		Stream_Set_Blocking( $this->Socket, true );
-
-		try
-		{
-			$Challenge = $this->GetChallenge( );
-
-			$this->GetStatus( $Challenge );
-		}
-		// We catch this because we want to close the socket, not very elegant
-		catch( MinecraftQueryException $e )
-		{
-			FClose( $this->Socket );
-
-			throw new MinecraftQueryException( $e->getMessage( ) );
-		}
-
-		FClose( $this->Socket );
-	}
-
-	public function GetInfo( )
-	{
-		return isset( $this->Info ) ? $this->Info : false;
-	}
-
-	public function GetPlayers( )
-	{
-		return isset( $this->Players ) ? $this->Players : false;
-	}
-
-	private function GetChallenge( )
-	{
-		$Data = $this->WriteData( self :: HANDSHAKE );
-
-		if( $Data === false )
-		{
-			throw new MinecraftQueryException( 'Failed to receive challenge.' );
-		}
-
-		return Pack( 'N', $Data );
-	}
-
-	private function GetStatus( $Challenge )
-	{
-		$Data = $this->WriteData( self :: STATISTIC, $Challenge . Pack( 'c*', 0x00, 0x00, 0x00, 0x00 ) );
-
-		if( !$Data )
-		{
-			throw new MinecraftQueryException( 'Failed to receive status.' );
-		}
-
-		$Last = '';
-		$Info = Array( );
-
-		$Data    = SubStr( $Data, 11 ); // splitnum + 2 int
-		$Data    = Explode( "\x00\x00\x01player_\x00\x00", $Data );
-
-		if( Count( $Data ) !== 2 )
-		{
-			throw new MinecraftQueryException( 'Failed to parse server\'s response.' );
-		}
-
-		$Players = SubStr( $Data[ 1 ], 0, -2 );
-		$Data    = Explode( "\x00", $Data[ 0 ] );
-
-		// Array with known keys in order to validate the result
-		// It can happen that server sends custom strings containing bad things (who can know!)
-		$Keys = Array(
-			'hostname'   => 'HostName',
-			'gametype'   => 'GameType',
-			'version'    => 'Version',
-			'plugins'    => 'Plugins',
-			'map'        => 'Map',
-			'numplayers' => 'Players',
-			'maxplayers' => 'MaxPlayers',
-			'hostport'   => 'HostPort',
-			'hostip'     => 'HostIp',
-			'game_id'    => 'GameName'
-		);
-
-		foreach( $Data as $Key => $Value )
-		{
-			if( ~$Key & 1 )
-			{
-				if( !Array_Key_Exists( $Value, $Keys ) )
-				{
-					$Last = false;
-					continue;
-				}
-
-				$Last = $Keys[ $Value ];
-				$Info[ $Last ] = '';
-			}
-			else if( $Last != false )
-			{
-				$Info[ $Last ] = mb_convert_encoding( $Value, 'UTF-8' );
-			}
-		}
-
-		// Ints
-		$Info[ 'Players' ]    = IntVal( $Info[ 'Players' ] );
-		$Info[ 'MaxPlayers' ] = IntVal( $Info[ 'MaxPlayers' ] );
-		$Info[ 'HostPort' ]   = IntVal( $Info[ 'HostPort' ] );
-
-		// Parse "plugins", if any
-		if( $Info[ 'Plugins' ] )
-		{
-			$Data = Explode( ": ", $Info[ 'Plugins' ], 2 );
-
-			$Info[ 'RawPlugins' ] = $Info[ 'Plugins' ];
-			$Info[ 'Software' ]   = $Data[ 0 ];
-
-			if( Count( $Data ) == 2 )
-			{
-				$Info[ 'Plugins' ] = Explode( "; ", $Data[ 1 ] );
-			}
-		}
-		else
-		{
-			$Info[ 'Software' ] = 'Vanilla';
-		}
-
-		$this->Info = $Info;
-
-		if( empty( $Players ) )
-		{
-			$this->Players = null;
-		}
-		else
-		{
-			$this->Players = Explode( "\x00", $Players );
-		}
-	}
-
-	private function WriteData( $Command, $Append = "" )
-	{
-		$Command = Pack( 'c*', 0xFE, 0xFD, $Command, 0x01, 0x02, 0x03, 0x04 ) . $Append;
-		$Length  = StrLen( $Command );
-
-		if( $Length !== FWrite( $this->Socket, $Command, $Length ) )
-		{
-			throw new MinecraftQueryException( "Failed to write on socket." );
-		}
-
-		$Data = FRead( $this->Socket, 4096 );
-
-		if( $Data === false )
-		{
-			throw new MinecraftQueryException( "Failed to read from socket." );
-		}
-
-		if( StrLen( $Data ) < 5 || $Data[ 0 ] != $Command[ 2 ] )
-		{
-			return false;
-		}
-
-		return SubStr( $Data, 5 );
-	}
-}
diff --git a/upload/engine/libs/status_query/MinecraftQueryException.php b/upload/engine/libs/status_query/MinecraftQueryException.php
deleted file mode 100644
index 5984bf0..0000000
--- a/upload/engine/libs/status_query/MinecraftQueryException.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace xPaw;
-
-class MinecraftQueryException extends \Exception
-{
-	// Exception thrown by MinecraftQuery class
-}
diff --git a/upload/engine/menu.class.php b/upload/engine/menu.class.php
index 741551b..b90196d 100644
--- a/upload/engine/menu.class.php
+++ b/upload/engine/menu.class.php
@@ -90,16 +90,18 @@
 	}
 
 	private function menu_array(){
-		ob_start();
+		
 
 		$query = $this->db->query("SELECT id, title, `parent`, `url`, `target`, `permissions`
 									FROM `mcr_menu`
 									ORDER BY `parent` DESC");
 
-		if(!$query || $this->db->num_rows($query)<=0){ return ob_get_clean(); }
+		if(!$query || $this->db->num_rows($query)<=0){ return; }
 
 		$array = array();
 
+		ob_start();
+
 		while($ar = $this->db->fetch_assoc($query)){
 
 			if(!$this->core->is_access($ar['permissions'])){ continue; }
@@ -122,11 +124,8 @@
 	}
 
 	public function _list(){
-		ob_start();
 
-		echo $this->menu_array();
-
-		return ob_get_clean();
+		return $this->menu_array();
 	}
 }
 
diff --git a/upload/engine/monitoring.class.php b/upload/engine/monitoring.class.php
index b1e702e..5dcfc7b 100644
--- a/upload/engine/monitoring.class.php
+++ b/upload/engine/monitoring.class.php
@@ -2,105 +2,27 @@
 
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
-use xPaw\MinecraftQuery;
-use xPaw\MinecraftQueryException;
-
 class monitoring{
-	private $ip, $port, $socket;
-	public $data, $type;
+	public $type = 'MineToolsAPIPing';
+	public $connect = false;
+	public $loaded = array();
 
-	public function __construct($type=0){
+	public function __construct($type='MineToolsAPIPing'){
 		$this->type = $type;
-
-		switch($type){
-
-			default:
-				$this->socket = $this->get_socket_libs();
-			break;
-		}
-
 	}
 
-	private function get_socket_libs(){
+	public function loading($type=false){
+		if($type===false){ $type = $this->type; }
 
-		require_once(MCR_TOOL_PATH.'libs/status_query/MinecraftQuery.php');
-		require_once(MCR_TOOL_PATH.'libs/status_query/MinecraftQueryException.php');
+		if(!file_exists(MCR_MON_PATH.$type.'.php')){ return false; }
 
-		return new MinecraftQuery();
-	}
+		require(MCR_MON_PATH.$type.'.php');
 
-	private function socket_connection($ip, $port){
-		try{
-			$this->socket->Connect($ip, $port, 5);
-		} catch( MinecraftQueryException $e ) {
-			$exception = $e;
-		}
+		if(!class_exists($type)){ return false; }
 
-		if(isset($exception) || ($data = $this->socket->GetInfo()) === false){ return false; }
+		$this->loaded[$type] = new $type();
 
-		$array = array(
-			'status'		=> 'online',
-			'title'			=> $data['HostName'],
-			'type'			=> $data['GameType'],
-			'version'		=> $data['Version'],
-			'players'		=> intval($data['Players']),
-			'slots'			=> intval($data['MaxPlayers']),
-			'player_list'	=> array()
-		);
-
-		if(($list = $this->socket->GetPlayers()) !== false){ $array['player_list'] = $list; }
-
-		return $array;
-	}
-
-	private function minetools_connection($ip, $port){
-		$json = file_get_contents("http://www.api.minetools.eu/query/$ip/$port");
-
-		if(!$json){ return false; }
-
-		$data = @json_decode($json, true);
-
-		if(!$data || isset($data['error'])){ return false; }
-
-		$array = array(
-			'status'		=> 'online',
-			'type'			=> $data['GameType'],
-			'version'		=> $data['Version'],
-			'players'		=> intval($data['Players']),
-			'slots'			=> intval($data['MaxPlayers'])
-		);
-
-		$array['title'] = (is_null($data['HostName'])) ? '' : $data['HostName'];
-		$array['player_list'] = ($data['Playerlist']=='null') ? array() : $data['Playerlist'];
-
-		return $array;
-	}
-
-	public function connect($ip='localhost', $port=25565){
-
-		$array = array(
-			'status'		=> 'offline',
-			'title'			=> '',
-			'type'			=> 'SMT',
-			'version'		=> 0,
-			'players'		=> 0,
-			'slots'			=> 0,
-			'player_list'	=> array()
-		);
-
-		$this->data = json_encode($array);
-		
-		if($this->type==1){
-			$data = $this->minetools_connection($ip, $port);
-			if($data===false){ return false; }
-		}else{
-			$data = $this->socket_connection($ip, $port);
-			if($data===false){ return false; }
-		}
-
-		$this->data = json_encode($data);
-		
-		return true;
+		return $this->loaded[$type];
 	}
 
 }
diff --git a/upload/engine/monitoring/McAPIcaPing.php b/upload/engine/monitoring/McAPIcaPing.php
new file mode 100644
index 0000000..4ed1436
--- /dev/null
+++ b/upload/engine/monitoring/McAPIcaPing.php
@@ -0,0 +1,49 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class McAPIcaPing{
+
+	// Get server information from https://mcapi.ca/
+
+	// Set default values
+	public $ip			= '127.0.0.1';
+	public $port		= 25565;
+
+	public $status		= 0; // server status
+	public $version		= '';
+	public $online		= 0;
+	public $slots		= 0;
+	public $players		= '';
+	public $motd		= '';
+	public $plugins		= '';
+	public $map			= '';
+	public $error		= '';
+
+	public function connect($ip='127.0.0.1', $port=25565){
+		$this->ip = $ip;
+		$this->port = $port;
+
+		$json = file_get_contents("https://mcapi.ca/query/$ip:$port/info");
+
+		if($json===false){ $this->error = var_export($json, true); return false; }
+
+		$array = @json_decode($json, true);
+
+		if(isset($array['error'])){ $this->error = $array['error']; return false; }
+
+		$this->status = 1;
+
+		$this->version = @$array['version'];
+
+		$this->motd = @$array['motd'];
+
+		$this->online = intval(@$array['players']['online']);
+
+		$this->slots = intval(@$array['players']['max']);
+
+		return true;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/engine/monitoring/McAPIcaQuery.php b/upload/engine/monitoring/McAPIcaQuery.php
new file mode 100644
index 0000000..cc44f50
--- /dev/null
+++ b/upload/engine/monitoring/McAPIcaQuery.php
@@ -0,0 +1,49 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class McAPIcaQuery{
+
+	// Get server information from https://mcapi.ca/
+
+	// Set default values
+	public $ip			= '127.0.0.1';
+	public $port		= 25565;
+
+	public $status		= 0; // server status
+	public $version		= '';
+	public $online		= 0;
+	public $slots		= 0;
+	public $players		= '';
+	public $motd		= '';
+	public $plugins		= '';
+	public $map			= '';
+	public $error		= '';
+
+	public function connect($ip='127.0.0.1', $port=25565){
+		$this->ip = $ip;
+		$this->port = $port;
+
+		$json = file_get_contents("https://mcapi.ca/query/$ip:$port/list");
+
+		if($json===false){ $this->error = var_export($json, true); return false; }
+
+		$array = @json_decode($json, true);
+
+		if(@$array['Status']===false){ $this->error = 'Connection error'; return false; }
+
+		$this->status = 1;
+
+		$this->version = @$array['Version'];
+
+		$this->online = intval(@$array['Players']['online']);
+
+		$this->slots = intval(@$array['Players']['max']);
+
+		$this->players = implode(', ', @$array['Players']['list']);
+
+		return true;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/engine/monitoring/McAPIusPing.php b/upload/engine/monitoring/McAPIusPing.php
new file mode 100644
index 0000000..2af9439
--- /dev/null
+++ b/upload/engine/monitoring/McAPIusPing.php
@@ -0,0 +1,49 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class McAPIusPing{
+
+	// Get server information from https://mcapi.us/
+
+	// Set default values
+	public $ip			= '127.0.0.1';
+	public $port		= 25565;
+
+	public $status		= 0; // server status
+	public $version		= '';
+	public $online		= 0;
+	public $slots		= 0;
+	public $players		= '';
+	public $motd		= '';
+	public $plugins		= '';
+	public $map			= '';
+	public $error		= '';
+
+	public function connect($ip='127.0.0.1', $port=25565){
+		$this->ip = $ip;
+		$this->port = $port;
+
+		$json = file_get_contents("https://mcapi.us/server/status?ip=$ip&port=$port");
+
+		if($json===false){ $this->error = var_export($json, true); return false; }
+
+		$array = @json_decode($json, true);
+
+		if(@$array['online']===false){ $this->error = 'Connection error'; return false; }
+
+		$this->status	= 1;
+
+		$this->version	= @$array['server']['name'];
+
+		$this->online	= intval(@$array['players']['now']);
+
+		$this->slots	= intval(@$array['players']['max']);
+
+		$this->motd		= @$array['motd'];
+
+		return true;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/engine/monitoring/MineToolsAPIPing.php b/upload/engine/monitoring/MineToolsAPIPing.php
new file mode 100644
index 0000000..e149656
--- /dev/null
+++ b/upload/engine/monitoring/MineToolsAPIPing.php
@@ -0,0 +1,47 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class MineToolsAPIPing{
+
+	// Set default values
+	public $ip			= '127.0.0.1';
+	public $port		= 25565;
+
+	public $status		= 0; // server status
+	public $version		= '';
+	public $online		= 0;
+	public $slots		= 0;
+	public $players		= '';
+	public $motd		= '';
+	public $plugins		= '';
+	public $map			= '';
+	public $error		= '';
+
+	public function connect($ip='127.0.0.1', $port=25565){
+		$this->ip = $ip;
+		$this->port = $port;
+
+		$json = file_get_contents("http://www.api.minetools.eu/ping/$ip/$port");
+
+		if($json===false){ $this->error = var_export($json, true); return false; }
+
+		$array = @json_decode($json, true);
+
+		if(isset($array['error'])){ $this->error = $array['error']; return false; }
+
+		$this->status = 1;
+
+		$this->version = @$array['version']['name'].' | '.@$array['version']['protocol'];
+
+		$this->online = intval(@$array['players']['online']);
+
+		$this->slots = intval(@$array['players']['max']);
+
+		$this->motd = $array['description'];
+
+		return true;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/engine/monitoring/MineToolsAPIQuery.php b/upload/engine/monitoring/MineToolsAPIQuery.php
new file mode 100644
index 0000000..dd252b1
--- /dev/null
+++ b/upload/engine/monitoring/MineToolsAPIQuery.php
@@ -0,0 +1,51 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class MineToolsAPIQuery{
+
+	// Set default values
+	public $ip			= '127.0.0.1';
+	public $port		= 25565;
+
+	public $status		= 0; // server status
+	public $version		= '';
+	public $online		= 0;
+	public $slots		= 0;
+	public $players		= '';
+	public $motd		= '';
+	public $plugins		= '';
+	public $map			= '';
+	public $error		= '';
+
+	public function connect($ip='127.0.0.1', $port=25565){
+		$this->ip = $ip;
+		$this->port = $port;
+
+		$json = file_get_contents("http://www.api.minetools.eu/query/$ip/$port");
+
+		if($json===false){ $this->error = var_export($json, true); return false; }
+
+		$array = @json_decode($json, true);
+
+		if(isset($array['error'])){ $this->error = $array['error']; return false; }
+
+		$this->status = 1;
+
+		$this->version = @$array['Version'];
+
+		$this->online = intval(@$array['Players']);
+
+		$this->slots = intval(@$array['MaxPlayers']);
+
+		$this->players = implode(', ', @$array['Playerlist']);
+
+		$this->plugins = implode(', ', @$array['Plugins']);
+
+		$this->map = $array['Map'];
+
+		return true;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/engine/skin.class.php b/upload/engine/skin.class.php
index 737a4c0..c20b721 100644
--- a/upload/engine/skin.class.php
+++ b/upload/engine/skin.class.php
@@ -13,8 +13,8 @@
 		$this->db	= $core->db;
 		$this->lng	= $core->lng;
 
-		if(!is_writable(MCR_SKIN_PATH)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_load_skin_folder'], 2, '?mode=profile'); }
-		if(!is_writable(MCR_SKIN_PATH.'interface/')){ $this->core->notify($this->lng['e_msg'], $this->lng['e_load_intf'], 2, '?mode=profile'); }
+		if(!is_writable(MCR_SKIN_PATH)){ $this->core->notify($this->lng['e_msg'], $this->lng['skin_e_folder_perm'], 2, '?mode=profile'); }
+		if(!is_writable(MCR_SKIN_PATH.'interface/')){ $this->core->notify($this->lng['e_msg'], $this->lng['skin_e_intf_perm'], 2, '?mode=profile'); }
 
 		$size = intval($obj['size']);
 		$tmp = $obj['tmp_name'];
@@ -23,39 +23,39 @@
 			case 0: break;
 
 			case 1:
-			case 2: $this->core->notify($this->lng['e_msg'], $this->lng['e_load_size'], 2, '?mode=profile'); break;
+			case 2: $this->core->notify($this->lng['e_msg'], $this->lng['skin_e_size'], 2, '?mode=profile'); break;
 
 			case 3:
-			case 4: $this->core->notify("", $this->lng['e_load_skin'], 2, '?mode=profile'); break;
+			case 4: $this->core->notify("", $this->lng['skin_e'], 2, '?mode=profile'); break;
 
-			case 6: $this->core->notify($this->lng['e_msg'], $this->lng['e_load_temp'], 2, '?mode=profile'); break;
+			case 6: $this->core->notify($this->lng['e_msg'], $this->lng['skin_e_temp'], 2, '?mode=profile'); break;
 
-			case 7: $this->core->notify($this->lng['e_msg'], $this->lng['e_load_perm'], 2, '?mode=profile'); break;
+			case 7: $this->core->notify($this->lng['e_msg'], $this->lng['skin_e_perm'], 2, '?mode=profile'); break;
 
-			default: $this->core->notify("", $this->lng['e_load_undefined'], 2, '?mode=profile'); break;
+			default: $this->core->notify("", $this->lng['skin_e_undefined'], 2, '?mode=profile'); break;
 		}
 
-		if(($size/1024)>$this->user->permissions->sys_max_file_size){ $this->core->notify($this->lng['e_msg'], $this->lng['e_load_size'], 2, '?mode=profile'); }
+		if(($size/1024)>$this->user->permissions->sys_max_file_size){ $this->core->notify($this->lng['e_msg'], $this->lng['skin_e_size'], 2, '?mode=profile'); }
 		
-		if(!file_exists($tmp)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_load_tempfile'], 2, '?mode=profile'); }
+		if(!file_exists($tmp)){ $this->core->notify($this->lng['e_msg'], $this->lng['skin_e_tempfile'], 2, '?mode=profile'); }
 
-		if(substr($obj['name'], -4)!='.png'){ $this->core->notify($this->lng['e_msg'], $this->lng['e_load_png'], 2, '?mode=profile'); }
+		if(substr($obj['name'], -4)!='.png'){ $this->core->notify($this->lng['e_msg'], $this->lng['skin_e_png'], 2, '?mode=profile'); }
 
 		$get_size = @getimagesize($tmp);
 
-		if(!$get_size){ $this->core->notify($this->lng['e_msg'], $this->lng['e_load_png'], 2, '?mode=profile'); }
+		if(!$get_size){ $this->core->notify($this->lng['e_msg'], $this->lng['skin_e_png'], 2, '?mode=profile'); }
 
 		$width = $get_size[0];
 		$height = $get_size[1];
 
-		if(!$this->is_skin_valid($get_size)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_load_format'], 2, '?mode=profile'); }
+		if(!$this->is_skin_valid($get_size)){ $this->core->notify($this->lng['e_msg'], $this->lng['skin_e_format'], 2, '?mode=profile'); }
 
 		$multiple = $get_size[0] / $this->mp;
 
 		// Create and save head of skin +
 		$new_head = $this->create_head($tmp, $multiple);
 
-		if($new_head===false){ $this->core->notify($this->lng['e_msg'], $this->lng['e_load_png'], 2, '?mode=profile'); }
+		if($new_head===false){ $this->core->notify($this->lng['e_msg'], $this->lng['skin_e_png'], 2, '?mode=profile'); }
 
 		imagepng($new_head, MCR_SKIN_PATH.'interface/'.$this->user->login.'_mini.png');
 		// Create and save head of skin -
@@ -63,14 +63,14 @@
 		// Create and save preview of skin +
 		$new_preview = $this->create_preview($tmp, $multiple);
 
-		if($new_preview===false){ $this->core->notify($this->lng['e_msg'], $this->lng['e_load_png'], 2, '?mode=profile'); }
+		if($new_preview===false){ $this->core->notify($this->lng['e_msg'], $this->lng['skin_e_png'], 2, '?mode=profile'); }
 
 		imagepng($new_preview, MCR_SKIN_PATH.'interface/'.$this->user->login.'.png');
 		// Create and save preview of skin -
 
 		// Save new skin +
 		if(!file_exists(MCR_SKIN_PATH.$this->user->login.'.png')){
-			if(!copy($tmp, MCR_SKIN_PATH.$this->user->login.'.png')){ $this->core->notify("", $this->lng['e_load_save'], 2, '?mode=profile'); }
+			if(!copy($tmp, MCR_SKIN_PATH.$this->user->login.'.png')){ $this->core->notify("", $this->lng['skin_e_save'], 2, '?mode=profile'); }
 		}
 		// Save new skin -
 	}
diff --git a/upload/engine/smtp/PHPMailerAutoload.php b/upload/engine/smtp/PHPMailerAutoload.php
deleted file mode 100644
index eaa2e30..0000000
--- a/upload/engine/smtp/PHPMailerAutoload.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * PHPMailer SPL autoloader.
- * PHP Version 5
- * @package PHPMailer
- * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2014 Marcus Bointon
- * @copyright 2010 - 2012 Jim Jagielski
- * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @note This program is distributed in the hope that it will be useful - WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * PHPMailer SPL autoloader.
- * @param string $classname The name of the class to load
- */
-function PHPMailerAutoload($classname)
-{
-    //Can't use __DIR__ as it's only in PHP 5.3+
-    $filename = dirname(__FILE__).DIRECTORY_SEPARATOR.'class.'.strtolower($classname).'.php';
-    if (is_readable($filename)) {
-        require $filename;
-    }
-}
-
-if (version_compare(PHP_VERSION, '5.1.2', '>=')) {
-    //SPL autoloading was introduced in PHP 5.1.2
-    if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-        spl_autoload_register('PHPMailerAutoload', true, true);
-    } else {
-        spl_autoload_register('PHPMailerAutoload');
-    }
-} else {
-    /**
-     * Fall back to traditional autoload for old PHP versions
-     * @param string $classname The name of the class to load
-     */
-    function __autoload($classname)
-    {
-        PHPMailerAutoload($classname);
-    }
-}
diff --git a/upload/engine/smtp/class.html2text.php b/upload/engine/smtp/class.html2text.php
deleted file mode 100644
index 2060991..0000000
--- a/upload/engine/smtp/class.html2text.php
+++ /dev/null
@@ -1,677 +0,0 @@
-<?php
-/*************************************************************************
- *                                                                       *
- * Converts HTML to formatted plain text                                 *
- *                                                                       *
- * Portions Copyright (c) 2005-2007 Jon Abernathy <jon@chuggnutt.com>    *
- *                                                                       *
- * This script 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.                                   *
- *                                                                       *
- * The GNU General Public License can be found at                        *
- * http://www.gnu.org/copyleft/gpl.html.                                 *
- *                                                                       *
- * This script is distributed in the hope that it will be useful,        *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the          *
- * GNU General Public License for more details.                          *
- *                                                                       *
- *************************************************************************/
-
-/**
- * Converts HTML to formatted plain text
- */
-class Html2Text
-{
-    /**
-     * Contains the HTML content to convert.
-     *
-     * @type string
-     */
-    protected $html;
-
-    /**
-     * Contains the converted, formatted text.
-     *
-     * @type string
-     */
-    protected $text;
-
-    /**
-     * Maximum width of the formatted text, in columns.
-     *
-     * Set this value to 0 (or less) to ignore word wrapping
-     * and not constrain text to a fixed-width column.
-     *
-     * @type integer
-     */
-    protected $width = 70;
-
-    /**
-     * List of preg* regular expression patterns to search for,
-     * used in conjunction with $replace.
-     *
-     * @type array
-     * @see $replace
-     */
-    protected $search = array(
-        "/\r/",                                  // Non-legal carriage return
-        "/[\n\t]+/",                             // Newlines and tabs
-        '/<head[^>]*>.*?<\/head>/i',             // <head>
-        '/<script[^>]*>.*?<\/script>/i',         // <script>s -- which strip_tags supposedly has problems with
-        '/<style[^>]*>.*?<\/style>/i',           // <style>s -- which strip_tags supposedly has problems with
-        '/<p[^>]*>/i',                           // <P>
-        '/<br[^>]*>/i',                          // <br>
-        '/<i[^>]*>(.*?)<\/i>/i',                 // <i>
-        '/<em[^>]*>(.*?)<\/em>/i',               // <em>
-        '/(<ul[^>]*>|<\/ul>)/i',                 // <ul> and </ul>
-        '/(<ol[^>]*>|<\/ol>)/i',                 // <ol> and </ol>
-        '/(<dl[^>]*>|<\/dl>)/i',                 // <dl> and </dl>
-        '/<li[^>]*>(.*?)<\/li>/i',               // <li> and </li>
-        '/<dd[^>]*>(.*?)<\/dd>/i',               // <dd> and </dd>
-        '/<dt[^>]*>(.*?)<\/dt>/i',               // <dt> and </dt>
-        '/<li[^>]*>/i',                          // <li>
-        '/<hr[^>]*>/i',                          // <hr>
-        '/<div[^>]*>/i',                         // <div>
-        '/(<table[^>]*>|<\/table>)/i',           // <table> and </table>
-        '/(<tr[^>]*>|<\/tr>)/i',                 // <tr> and </tr>
-        '/<td[^>]*>(.*?)<\/td>/i',               // <td> and </td>
-        '/<span class="_html2text_ignore">.+?<\/span>/i'  // <span class="_html2text_ignore">...</span>
-    );
-
-    /**
-     * List of pattern replacements corresponding to patterns searched.
-     *
-     * @type array
-     * @see $search
-     */
-    protected $replace = array(
-        '',                                     // Non-legal carriage return
-        ' ',                                    // Newlines and tabs
-        '',                                     // <head>
-        '',                                     // <script>s -- which strip_tags supposedly has problems with
-        '',                                     // <style>s -- which strip_tags supposedly has problems with
-        "\n\n",                                 // <P>
-        "\n",                                   // <br>
-        '_\\1_',                                // <i>
-        '_\\1_',                                // <em>
-        "\n\n",                                 // <ul> and </ul>
-        "\n\n",                                 // <ol> and </ol>
-        "\n\n",                                 // <dl> and </dl>
-        "\t* \\1\n",                            // <li> and </li>
-        " \\1\n",                               // <dd> and </dd>
-        "\t* \\1",                              // <dt> and </dt>
-        "\n\t* ",                               // <li>
-        "\n-------------------------\n",        // <hr>
-        "<div>\n",                              // <div>
-        "\n\n",                                 // <table> and </table>
-        "\n",                                   // <tr> and </tr>
-        "\t\t\\1\n",                            // <td> and </td>
-        ""                                      // <span class="_html2text_ignore">...</span>
-    );
-
-    /**
-     * List of preg* regular expression patterns to search for,
-     * used in conjunction with $ent_replace.
-     *
-     * @type array
-     * @see $ent_replace
-     */
-    protected $ent_search = array(
-        '/&(nbsp|#160);/i',                      // Non-breaking space
-        '/&(quot|rdquo|ldquo|#8220|#8221|#147|#148);/i',
-        // Double quotes
-        '/&(apos|rsquo|lsquo|#8216|#8217);/i',   // Single quotes
-        '/&gt;/i',                               // Greater-than
-        '/&lt;/i',                               // Less-than
-        '/&(copy|#169);/i',                      // Copyright
-        '/&(trade|#8482|#153);/i',               // Trademark
-        '/&(reg|#174);/i',                       // Registered
-        '/&(mdash|#151|#8212);/i',               // mdash
-        '/&(ndash|minus|#8211|#8722);/i',        // ndash
-        '/&(bull|#149|#8226);/i',                // Bullet
-        '/&(pound|#163);/i',                     // Pound sign
-        '/&(euro|#8364);/i',                     // Euro sign
-        '/&(amp|#38);/i',                        // Ampersand: see _converter()
-        '/[ ]{2,}/',                             // Runs of spaces, post-handling
-    );
-
-    /**
-     * List of pattern replacements corresponding to patterns searched.
-     *
-     * @type array
-     * @see $ent_search
-     */
-    protected $ent_replace = array(
-        ' ',                                    // Non-breaking space
-        '"',                                    // Double quotes
-        "'",                                    // Single quotes
-        '>',
-        '<',
-        '(c)',
-        '(tm)',
-        '(R)',
-        '--',
-        '-',
-        '*',
-        '£',
-        'EUR',                                  // Euro sign. € ?
-        '|+|amp|+|',                            // Ampersand: see _converter()
-        ' ',                                    // Runs of spaces, post-handling
-    );
-
-    /**
-     * List of preg* regular expression patterns to search for
-     * and replace using callback function.
-     *
-     * @type array
-     */
-    protected $callback_search = array(
-        '/<(a) [^>]*href=("|\')([^"\']+)\2([^>]*)>(.*?)<\/a>/i', // <a href="">
-        '/<(h)[123456]( [^>]*)?>(.*?)<\/h[123456]>/i',           // h1 - h6
-        '/<(b)( [^>]*)?>(.*?)<\/b>/i',                           // <b>
-        '/<(strong)( [^>]*)?>(.*?)<\/strong>/i',                 // <strong>
-        '/<(th)( [^>]*)?>(.*?)<\/th>/i',                         // <th> and </th>
-    );
-
-    /**
-     * List of preg* regular expression patterns to search for in PRE body,
-     * used in conjunction with $pre_replace.
-     *
-     * @type array
-     * @see $pre_replace
-     */
-    protected $pre_search = array(
-        "/\n/",
-        "/\t/",
-        '/ /',
-        '/<pre[^>]*>/',
-        '/<\/pre>/'
-    );
-
-    /**
-     * List of pattern replacements corresponding to patterns searched for PRE body.
-     *
-     * @type array
-     * @see $pre_search
-     */
-    protected $pre_replace = array(
-        '<br>',
-        '&nbsp;&nbsp;&nbsp;&nbsp;',
-        '&nbsp;',
-        '',
-        ''
-    );
-
-    /**
-     * Temporary workspace used during PRE processing.
-     *
-     * @type string
-     */
-    protected $pre_content = '';
-
-    /**
-     * Contains a list of HTML tags to allow in the resulting text.
-     *
-     * @type string
-     * @see set_allowed_tags()
-     */
-    protected $allowed_tags = '';
-
-    /**
-     * Contains the base URL that relative links should resolve to.
-     *
-     * @type string
-     */
-    protected $url;
-
-    /**
-     * Indicates whether content in the $html variable has been converted yet.
-     *
-     * @type boolean
-     * @see $html, $text
-     */
-    protected $_converted = false;
-
-    /**
-     * Contains URL addresses from links to be rendered in plain text.
-     *
-     * @type array
-     * @see _build_link_list()
-     */
-    protected $_link_list = array();
-
-    /**
-     * Various configuration options (able to be set in the constructor)
-     *
-     * @type array
-     */
-    protected $_options = array(
-        // 'none'
-        // 'inline' (show links inline)
-        // 'nextline' (show links on the next line)
-        // 'table' (if a table of link URLs should be listed after the text.
-        'do_links' => 'inline',
-        //  Maximum width of the formatted text, in columns.
-        //  Set this value to 0 (or less) to ignore word wrapping
-        //  and not constrain text to a fixed-width column.
-        'width' => 70,
-    );
-
-    /**
-     * Constructor.
-     *
-     * If the HTML source string (or file) is supplied, the class
-     * will instantiate with that source propagated, all that has
-     * to be done it to call get_text().
-     *
-     * @param string $source HTML content
-     * @param boolean $from_file Indicates $source is a file to pull content from
-     * @param array $options Set configuration options
-     */
-    public function __construct($source = '', $from_file = false, $options = array())
-    {
-        $this->_options = array_merge($this->_options, $options);
-
-        if (!empty($source)) {
-            $this->set_html($source, $from_file);
-        }
-
-        $this->set_base_url();
-    }
-
-    /**
-     * Loads source HTML into memory, either from $source string or a file.
-     *
-     * @param string $source HTML content
-     * @param boolean $from_file Indicates $source is a file to pull content from
-     */
-    public function set_html($source, $from_file = false)
-    {
-        if ($from_file && file_exists($source)) {
-            $this->html = file_get_contents($source);
-        } else {
-            $this->html = $source;
-        }
-
-        $this->_converted = false;
-    }
-
-    /**
-     * Returns the text, converted from HTML.
-     *
-     * @return string
-     */
-    public function get_text()
-    {
-        if (!$this->_converted) {
-            $this->_convert();
-        }
-
-        return $this->text;
-    }
-
-    /**
-     * Prints the text, converted from HTML.
-     */
-    public function print_text()
-    {
-        print $this->get_text();
-    }
-
-    /**
-     * Alias to print_text(), operates identically.
-     *
-     * @see print_text()
-     */
-    public function p()
-    {
-        print $this->get_text();
-    }
-
-    /**
-     * Sets the allowed HTML tags to pass through to the resulting text.
-     *
-     * Tags should be in the form "<p>", with no corresponding closing tag.
-     * @param string $allowed_tags
-     */
-    public function set_allowed_tags($allowed_tags = '')
-    {
-        if (!empty($allowed_tags)) {
-            $this->allowed_tags = $allowed_tags;
-        }
-    }
-
-    /**
-     * Sets a base URL to handle relative links.
-     *
-     * @param string $url
-     */
-    public function set_base_url($url = '')
-    {
-        if (empty($url)) {
-            if (!empty($_SERVER['HTTP_HOST'])) {
-                $this->url = 'http://' . $_SERVER['HTTP_HOST'];
-            } else {
-                $this->url = '';
-            }
-        } else {
-            // Strip any trailing slashes for consistency (relative
-            // URLs may already start with a slash like "/file.html")
-            if (substr($url, -1) == '/') {
-                $url = substr($url, 0, -1);
-            }
-            $this->url = $url;
-        }
-    }
-
-    /**
-     * Workhorse function that does actual conversion (calls _converter() method).
-     */
-    protected function _convert()
-    {
-        // Variables used for building the link list
-        $this->_link_list = array();
-
-        $text = trim(stripslashes($this->html));
-
-        // Convert HTML to TXT
-        $this->_converter($text);
-
-        // Add link list
-        if (!empty($this->_link_list)) {
-            $text .= "\n\nLinks:\n------\n";
-            foreach ($this->_link_list as $idx => $url) {
-                $text .= '[' . ($idx + 1) . '] ' . $url . "\n";
-            }
-        }
-
-        $this->text = $text;
-
-        $this->_converted = true;
-    }
-
-    /**
-     * Workhorse function that does actual conversion.
-     *
-     * First performs custom tag replacement specified by $search and
-     * $replace arrays. Then strips any remaining HTML tags, reduces whitespace
-     * and newlines to a readable format, and word wraps the text to
-     * $this->_options['width'] characters.
-     *
-     * @param string $text Reference to HTML content string
-     */
-    protected function _converter(&$text)
-    {
-        // Convert <BLOCKQUOTE> (before PRE!)
-        $this->_convert_blockquotes($text);
-
-        // Convert <PRE>
-        $this->_convert_pre($text);
-
-        // Run our defined tags search-and-replace
-        $text = preg_replace($this->search, $this->replace, $text);
-
-        // Run our defined tags search-and-replace with callback
-        $text = preg_replace_callback($this->callback_search, array($this, '_preg_callback'), $text);
-
-        // Strip any other HTML tags
-        $text = strip_tags($text, $this->allowed_tags);
-
-        // Run our defined entities/characters search-and-replace
-        $text = preg_replace($this->ent_search, $this->ent_replace, $text);
-
-        // Replace known html entities
-        $text = html_entity_decode($text, ENT_QUOTES);
-
-        // Remove unknown/unhandled entities (this cannot be done in search-and-replace block)
-        $text = preg_replace('/&([a-zA-Z0-9]{2,6}|#[0-9]{2,4});/', '', $text);
-
-        // Convert "|+|amp|+|" into "&", need to be done after handling of unknown entities
-        // This properly handles situation of "&amp;quot;" in input string
-        $text = str_replace('|+|amp|+|', '&', $text);
-
-        // Bring down number of empty lines to 2 max
-        $text = preg_replace("/\n\s+\n/", "\n\n", $text);
-        $text = preg_replace("/[\n]{3,}/", "\n\n", $text);
-
-        // remove leading empty lines (can be produced by eg. P tag on the beginning)
-        $text = ltrim($text, "\n");
-
-        // Wrap the text to a readable format
-        // for PHP versions >= 4.0.2. Default width is 75
-        // If width is 0 or less, don't wrap the text.
-        if ($this->_options['width'] > 0) {
-            $text = wordwrap($text, $this->_options['width']);
-        }
-    }
-
-    /**
-     * Helper function called by preg_replace() on link replacement.
-     *
-     * Maintains an internal list of links to be displayed at the end of the
-     * text, with numeric indices to the original point in the text they
-     * appeared. Also makes an effort at identifying and handling absolute
-     * and relative links.
-     *
-     * @param string $link URL of the link
-     * @param string $display Part of the text to associate number with
-     * @param null $link_override
-     * @return string
-     */
-    protected function _build_link_list($link, $display, $link_override = null)
-    {
-        $link_method = ($link_override) ? $link_override : $this->_options['do_links'];
-        if ($link_method == 'none') {
-            return $display;
-        }
-
-
-        // Ignored link types
-        if (preg_match('!^(javascript:|mailto:|#)!i', $link)) {
-            return $display;
-        }
-
-        if (preg_match('!^([a-z][a-z0-9.+-]+:)!i', $link)) {
-            $url = $link;
-        } else {
-            $url = $this->url;
-            if (substr($link, 0, 1) != '/') {
-                $url .= '/';
-            }
-            $url .= "$link";
-        }
-
-        if ($link_method == 'table') {
-            if (($index = array_search($url, $this->_link_list)) === false) {
-                $index = count($this->_link_list);
-                $this->_link_list[] = $url;
-            }
-
-            return $display . ' [' . ($index + 1) . ']';
-        } elseif ($link_method == 'nextline') {
-            return $display . "\n[" . $url . ']';
-        } else { // link_method defaults to inline
-
-            return $display . ' [' . $url . ']';
-        }
-    }
-
-    /**
-     * Helper function for PRE body conversion.
-     *
-     * @param string $text HTML content
-     */
-    protected function _convert_pre(&$text)
-    {
-        // get the content of PRE element
-        while (preg_match('/<pre[^>]*>(.*)<\/pre>/ismU', $text, $matches)) {
-            $this->pre_content = $matches[1];
-
-            // Run our defined tags search-and-replace with callback
-            $this->pre_content = preg_replace_callback(
-                $this->callback_search,
-                array($this, '_preg_callback'),
-                $this->pre_content
-            );
-
-            // convert the content
-            $this->pre_content = sprintf(
-                '<div><br>%s<br></div>',
-                preg_replace($this->pre_search, $this->pre_replace, $this->pre_content)
-            );
-
-            // replace the content (use callback because content can contain $0 variable)
-            $text = preg_replace_callback(
-                '/<pre[^>]*>.*<\/pre>/ismU',
-                array($this, '_preg_pre_callback'),
-                $text,
-                1
-            );
-
-            // free memory
-            $this->pre_content = '';
-        }
-    }
-
-    /**
-     * Helper function for BLOCKQUOTE body conversion.
-     *
-     * @param string $text HTML content
-     */
-    protected function _convert_blockquotes(&$text)
-    {
-        if (preg_match_all('/<\/*blockquote[^>]*>/i', $text, $matches, PREG_OFFSET_CAPTURE)) {
-            $start = 0;
-            $taglen = 0;
-            $level = 0;
-            $diff = 0;
-            foreach ($matches[0] as $m) {
-                if ($m[0][0] == '<' && $m[0][1] == '/') {
-                    $level--;
-                    if ($level < 0) {
-                        $level = 0; // malformed HTML: go to next blockquote
-                    } elseif ($level > 0) {
-                        // skip inner blockquote
-                    } else {
-                        $end = $m[1];
-                        $len = $end - $taglen - $start;
-                        // Get blockquote content
-                        $body = substr($text, $start + $taglen - $diff, $len);
-
-                        // Set text width
-                        $p_width = $this->_options['width'];
-                        if ($this->_options['width'] > 0) $this->_options['width'] -= 2;
-                        // Convert blockquote content
-                        $body = trim($body);
-                        $this->_converter($body);
-                        // Add citation markers and create PRE block
-                        $body = preg_replace('/((^|\n)>*)/', '\\1> ', trim($body));
-                        $body = '<pre>' . htmlspecialchars($body) . '</pre>';
-                        // Re-set text width
-                        $this->_options['width'] = $p_width;
-                        // Replace content
-                        $text = substr($text, 0, $start - $diff)
-                            . $body . substr($text, $end + strlen($m[0]) - $diff);
-
-                        $diff = $len + $taglen + strlen($m[0]) - strlen($body);
-                        unset($body);
-                    }
-                } else {
-                    if ($level == 0) {
-                        $start = $m[1];
-                        $taglen = strlen($m[0]);
-                    }
-                    $level++;
-                }
-            }
-        }
-    }
-
-    /**
-     * Callback function for preg_replace_callback use.
-     *
-     * @param array $matches PREG matches
-     * @return string
-     */
-    protected function _preg_callback($matches)
-    {
-        switch (strtolower($matches[1])) {
-            case 'b':
-            case 'strong':
-                return $this->_toupper($matches[3]);
-            case 'th':
-                return $this->_toupper("\t\t" . $matches[3] . "\n");
-            case 'h':
-                return $this->_toupper("\n\n" . $matches[3] . "\n\n");
-            case 'a':
-                // override the link method
-                $link_override = null;
-                if (preg_match('/_html2text_link_(\w+)/', $matches[4], $link_override_match)) {
-                    $link_override = $link_override_match[1];
-                }
-                // Remove spaces in URL (#1487805)
-                $url = str_replace(' ', '', $matches[3]);
-
-                return $this->_build_link_list($url, $matches[5], $link_override);
-        }
-        return '';
-    }
-
-    /**
-     * Callback function for preg_replace_callback use in PRE content handler.
-     *
-     * @param array $matches PREG matches
-     * @return string
-     */
-    protected function _preg_pre_callback(
-        /** @noinspection PhpUnusedParameterInspection */
-        $matches)
-    {
-        return $this->pre_content;
-    }
-
-    /**
-     * Strtoupper function with HTML tags and entities handling.
-     *
-     * @param string $str Text to convert
-     * @return string Converted text
-     */
-    private function _toupper($str)
-    {
-        // string can contain HTML tags
-        $chunks = preg_split('/(<[^>]*>)/', $str, null, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-
-        // convert toupper only the text between HTML tags
-        foreach ($chunks as $idx => $chunk) {
-            if ($chunk[0] != '<') {
-                $chunks[$idx] = $this->_strtoupper($chunk);
-            }
-        }
-
-        return implode($chunks);
-    }
-
-    /**
-     * Strtoupper multibyte wrapper function with HTML entities handling.
-     * Forces mb_strtoupper-call to UTF-8.
-     *
-     * @param string $str Text to convert
-     * @return string Converted text
-     */
-    private function _strtoupper($str)
-    {
-        $str = html_entity_decode($str, ENT_COMPAT);
-
-        if (function_exists('mb_strtoupper'))
-            $str = mb_strtoupper($str, 'UTF-8');
-        else
-            $str = strtoupper($str);
-
-        $str = htmlspecialchars($str, ENT_COMPAT);
-
-        return $str;
-    }
-}
diff --git a/upload/engine/smtp/class.phpmailer.php b/upload/engine/smtp/class.phpmailer.php
deleted file mode 100644
index fef7a6b..0000000
--- a/upload/engine/smtp/class.phpmailer.php
+++ /dev/null
@@ -1,3455 +0,0 @@
-<?php
-/**
- * PHPMailer - PHP email creation and transport class.
- * PHP Version 5
- * @package PHPMailer
- * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2014 Marcus Bointon
- * @copyright 2010 - 2012 Jim Jagielski
- * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @note This program is distributed in the hope that it will be useful - WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * PHPMailer - PHP email creation and transport class.
- * @package PHPMailer
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author Brent R. Matzelle (original founder)
- */
-class PHPMailer
-{
-    /**
-     * The PHPMailer Version number.
-     * @type string
-     */
-    public $Version = '5.2.9';
-
-    /**
-     * Email priority.
-     * Options: 1 = High, 3 = Normal, 5 = low.
-     * @type integer
-     */
-    public $Priority = 3;
-
-    /**
-     * The character set of the message.
-     * @type string
-     */
-    public $CharSet = 'iso-8859-1';
-
-    /**
-     * The MIME Content-type of the message.
-     * @type string
-     */
-    public $ContentType = 'text/plain';
-
-    /**
-     * The message encoding.
-     * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable".
-     * @type string
-     */
-    public $Encoding = '8bit';
-
-    /**
-     * Holds the most recent mailer error message.
-     * @type string
-     */
-    public $ErrorInfo = '';
-
-    /**
-     * The From email address for the message.
-     * @type string
-     */
-    public $From = 'root@localhost';
-
-    /**
-     * The From name of the message.
-     * @type string
-     */
-    public $FromName = 'Root User';
-
-    /**
-     * The Sender email (Return-Path) of the message.
-     * If not empty, will be sent via -f to sendmail or as 'MAIL FROM' in smtp mode.
-     * @type string
-     */
-    public $Sender = '';
-
-    /**
-     * The Return-Path of the message.
-     * If empty, it will be set to either From or Sender.
-     * @type string
-     * @deprecated Email senders should never set a return-path header;
-     * it's the receiver's job (RFC5321 section 4.4), so this no longer does anything.
-     * @link https://tools.ietf.org/html/rfc5321#section-4.4 RFC5321 reference
-     */
-    public $ReturnPath = '';
-
-    /**
-     * The Subject of the message.
-     * @type string
-     */
-    public $Subject = '';
-
-    /**
-     * An HTML or plain text message body.
-     * If HTML then call isHTML(true).
-     * @type string
-     */
-    public $Body = '';
-
-    /**
-     * The plain-text message body.
-     * This body can be read by mail clients that do not have HTML email
-     * capability such as mutt & Eudora.
-     * Clients that can read HTML will view the normal Body.
-     * @type string
-     */
-    public $AltBody = '';
-
-    /**
-     * An iCal message part body.
-     * Only supported in simple alt or alt_inline message types
-     * To generate iCal events, use the bundled extras/EasyPeasyICS.php class or iCalcreator
-     * @link http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
-     * @link http://kigkonsult.se/iCalcreator/
-     * @type string
-     */
-    public $Ical = '';
-
-    /**
-     * The complete compiled MIME message body.
-     * @access protected
-     * @type string
-     */
-    protected $MIMEBody = '';
-
-    /**
-     * The complete compiled MIME message headers.
-     * @type string
-     * @access protected
-     */
-    protected $MIMEHeader = '';
-
-    /**
-     * Extra headers that createHeader() doesn't fold in.
-     * @type string
-     * @access protected
-     */
-    protected $mailHeader = '';
-
-    /**
-     * Word-wrap the message body to this number of chars.
-     * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance.
-     * @type integer
-     */
-    public $WordWrap = 0;
-
-    /**
-     * Which method to use to send mail.
-     * Options: "mail", "sendmail", or "smtp".
-     * @type string
-     */
-    public $Mailer = 'mail';
-
-    /**
-     * The path to the sendmail program.
-     * @type string
-     */
-    public $Sendmail = '/usr/sbin/sendmail';
-
-    /**
-     * Whether mail() uses a fully sendmail-compatible MTA.
-     * One which supports sendmail's "-oi -f" options.
-     * @type boolean
-     */
-    public $UseSendmailOptions = true;
-
-    /**
-     * Path to PHPMailer plugins.
-     * Useful if the SMTP class is not in the PHP include path.
-     * @type string
-     * @deprecated Should not be needed now there is an autoloader.
-     */
-    public $PluginDir = '';
-
-    /**
-     * The email address that a reading confirmation should be sent to.
-     * @type string
-     */
-    public $ConfirmReadingTo = '';
-
-    /**
-     * The hostname to use in Message-Id and Received headers
-     * and as default HELO string.
-     * If empty, the value returned
-     * by SERVER_NAME is used or 'localhost.localdomain'.
-     * @type string
-     */
-    public $Hostname = '';
-
-    /**
-     * An ID to be used in the Message-Id header.
-     * If empty, a unique id will be generated.
-     * @type string
-     */
-    public $MessageID = '';
-
-    /**
-     * The message Date to be used in the Date header.
-     * If empty, the current date will be added.
-     * @type string
-     */
-    public $MessageDate = '';
-
-    /**
-     * SMTP hosts.
-     * Either a single hostname or multiple semicolon-delimited hostnames.
-     * You can also specify a different port
-     * for each host by using this format: [hostname:port]
-     * (e.g. "smtp1.example.com:25;smtp2.example.com").
-     * You can also specify encryption type, for example:
-     * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465").
-     * Hosts will be tried in order.
-     * @type string
-     */
-    public $Host = 'localhost';
-
-    /**
-     * The default SMTP server port.
-     * @type integer
-     * @TODO Why is this needed when the SMTP class takes care of it?
-     */
-    public $Port = 25;
-
-    /**
-     * The SMTP HELO of the message.
-     * Default is $Hostname.
-     * @type string
-     * @see PHPMailer::$Hostname
-     */
-    public $Helo = '';
-
-    /**
-     * The secure connection prefix.
-     * Options: "", "ssl" or "tls"
-     * @type string
-     */
-    public $SMTPSecure = '';
-
-    /**
-     * Whether to use SMTP authentication.
-     * Uses the Username and Password properties.
-     * @type boolean
-     * @see PHPMailer::$Username
-     * @see PHPMailer::$Password
-     */
-    public $SMTPAuth = false;
-
-    /**
-     * SMTP username.
-     * @type string
-     */
-    public $Username = '';
-
-    /**
-     * SMTP password.
-     * @type string
-     */
-    public $Password = '';
-
-    /**
-     * SMTP auth type.
-     * Options are LOGIN (default), PLAIN, NTLM, CRAM-MD5
-     * @type string
-     */
-    public $AuthType = '';
-
-    /**
-     * SMTP realm.
-     * Used for NTLM auth
-     * @type string
-     */
-    public $Realm = '';
-
-    /**
-     * SMTP workstation.
-     * Used for NTLM auth
-     * @type string
-     */
-    public $Workstation = '';
-
-    /**
-     * The SMTP server timeout in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
-     * @type integer
-     */
-    public $Timeout = 300;
-
-    /**
-     * SMTP class debug output mode.
-     * Debug output level.
-     * Options:
-     * * `0` No output
-     * * `1` Commands
-     * * `2` Data and commands
-     * * `3` As 2 plus connection status
-     * * `4` Low-level data output
-     * @type integer
-     * @see SMTP::$do_debug
-     */
-    public $SMTPDebug = 0;
-
-    /**
-     * How to handle debug output.
-     * Options:
-     * * `echo` Output plain-text as-is, appropriate for CLI
-     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
-     * * `error_log` Output to error log as configured in php.ini
-     *
-     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
-     * <code>
-     * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
-     * </code>
-     * @type string|callable
-     * @see SMTP::$Debugoutput
-     */
-    public $Debugoutput = 'echo';
-
-    /**
-     * Whether to keep SMTP connection open after each message.
-     * If this is set to true then to close the connection
-     * requires an explicit call to smtpClose().
-     * @type boolean
-     */
-    public $SMTPKeepAlive = false;
-
-    /**
-     * Whether to split multiple to addresses into multiple messages
-     * or send them all in one message.
-     * @type boolean
-     */
-    public $SingleTo = false;
-
-    /**
-     * Storage for addresses when SingleTo is enabled.
-     * @type array
-     * @TODO This should really not be public
-     */
-    public $SingleToArray = array();
-
-    /**
-     * Whether to generate VERP addresses on send.
-     * Only applicable when sending via SMTP.
-     * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
-     * @link http://www.postfix.org/VERP_README.html Postfix VERP info
-     * @type boolean
-     */
-    public $do_verp = false;
-
-    /**
-     * Whether to allow sending messages with an empty body.
-     * @type boolean
-     */
-    public $AllowEmpty = false;
-
-    /**
-     * The default line ending.
-     * @note The default remains "\n". We force CRLF where we know
-     *        it must be used via self::CRLF.
-     * @type string
-     */
-    public $LE = "\n";
-
-    /**
-     * DKIM selector.
-     * @type string
-     */
-    public $DKIM_selector = '';
-
-    /**
-     * DKIM Identity.
-     * Usually the email address used as the source of the email
-     * @type string
-     */
-    public $DKIM_identity = '';
-
-    /**
-     * DKIM passphrase.
-     * Used if your key is encrypted.
-     * @type string
-     */
-    public $DKIM_passphrase = '';
-
-    /**
-     * DKIM signing domain name.
-     * @example 'example.com'
-     * @type string
-     */
-    public $DKIM_domain = '';
-
-    /**
-     * DKIM private key file path.
-     * @type string
-     */
-    public $DKIM_private = '';
-
-    /**
-     * Callback Action function name.
-     *
-     * The function that handles the result of the send email action.
-     * It is called out by send() for each email sent.
-     *
-     * Value can be any php callable: http://www.php.net/is_callable
-     *
-     * Parameters:
-     *   boolean $result        result of the send action
-     *   string  $to            email address of the recipient
-     *   string  $cc            cc email addresses
-     *   string  $bcc           bcc email addresses
-     *   string  $subject       the subject
-     *   string  $body          the email body
-     *   string  $from          email address of sender
-     * @type string
-     */
-    public $action_function = '';
-
-    /**
-     * What to use in the X-Mailer header.
-     * Options: null for default, whitespace for none, or a string to use
-     * @type string
-     */
-    public $XMailer = '';
-
-    /**
-     * An instance of the SMTP sender class.
-     * @type SMTP
-     * @access protected
-     */
-    protected $smtp = null;
-
-    /**
-     * The array of 'to' addresses.
-     * @type array
-     * @access protected
-     */
-    protected $to = array();
-
-    /**
-     * The array of 'cc' addresses.
-     * @type array
-     * @access protected
-     */
-    protected $cc = array();
-
-    /**
-     * The array of 'bcc' addresses.
-     * @type array
-     * @access protected
-     */
-    protected $bcc = array();
-
-    /**
-     * The array of reply-to names and addresses.
-     * @type array
-     * @access protected
-     */
-    protected $ReplyTo = array();
-
-    /**
-     * An array of all kinds of addresses.
-     * Includes all of $to, $cc, $bcc, $replyto
-     * @type array
-     * @access protected
-     */
-    protected $all_recipients = array();
-
-    /**
-     * The array of attachments.
-     * @type array
-     * @access protected
-     */
-    protected $attachment = array();
-
-    /**
-     * The array of custom headers.
-     * @type array
-     * @access protected
-     */
-    protected $CustomHeader = array();
-
-    /**
-     * The most recent Message-ID (including angular brackets).
-     * @type string
-     * @access protected
-     */
-    protected $lastMessageID = '';
-
-    /**
-     * The message's MIME type.
-     * @type string
-     * @access protected
-     */
-    protected $message_type = '';
-
-    /**
-     * The array of MIME boundary strings.
-     * @type array
-     * @access protected
-     */
-    protected $boundary = array();
-
-    /**
-     * The array of available languages.
-     * @type array
-     * @access protected
-     */
-    protected $language = array();
-
-    /**
-     * The number of errors encountered.
-     * @type integer
-     * @access protected
-     */
-    protected $error_count = 0;
-
-    /**
-     * The S/MIME certificate file path.
-     * @type string
-     * @access protected
-     */
-    protected $sign_cert_file = '';
-
-    /**
-     * The S/MIME key file path.
-     * @type string
-     * @access protected
-     */
-    protected $sign_key_file = '';
-
-    /**
-     * The S/MIME password for the key.
-     * Used only if the key is encrypted.
-     * @type string
-     * @access protected
-     */
-    protected $sign_key_pass = '';
-
-    /**
-     * Whether to throw exceptions for errors.
-     * @type boolean
-     * @access protected
-     */
-    protected $exceptions = false;
-
-    /**
-     * Error severity: message only, continue processing.
-     */
-    const STOP_MESSAGE = 0;
-
-    /**
-     * Error severity: message, likely ok to continue processing.
-     */
-    const STOP_CONTINUE = 1;
-
-    /**
-     * Error severity: message, plus full stop, critical error reached.
-     */
-    const STOP_CRITICAL = 2;
-
-    /**
-     * SMTP RFC standard line ending.
-     */
-    const CRLF = "\r\n";
-
-    /**
-     * Constructor.
-     * @param boolean $exceptions Should we throw external exceptions?
-     */
-    public function __construct($exceptions = false)
-    {
-        $this->exceptions = (boolean)$exceptions;
-    }
-
-    /**
-     * Destructor.
-     */
-    public function __destruct()
-    {
-        if ($this->Mailer == 'smtp') { //close any open SMTP connection nicely
-            $this->smtpClose();
-        }
-    }
-
-    /**
-     * Call mail() in a safe_mode-aware fashion.
-     * Also, unless sendmail_path points to sendmail (or something that
-     * claims to be sendmail), don't pass params (not a perfect fix,
-     * but it will do)
-     * @param string $to To
-     * @param string $subject Subject
-     * @param string $body Message Body
-     * @param string $header Additional Header(s)
-     * @param string $params Params
-     * @access private
-     * @return boolean
-     */
-    private function mailPassthru($to, $subject, $body, $header, $params)
-    {
-        //Check overloading of mail function to avoid double-encoding
-        if (ini_get('mbstring.func_overload') & 1) {
-            $subject = $this->secureHeader($subject);
-        } else {
-            $subject = $this->encodeHeader($this->secureHeader($subject));
-        }
-        if (ini_get('safe_mode') || !($this->UseSendmailOptions)) {
-            $result = @mail($to, $subject, $body, $header);
-        } else {
-            $result = @mail($to, $subject, $body, $header, $params);
-        }
-        return $result;
-    }
-
-    /**
-     * Output debugging info via user-defined method.
-     * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).
-     * @see PHPMailer::$Debugoutput
-     * @see PHPMailer::$SMTPDebug
-     * @param string $str
-     */
-    protected function edebug($str)
-    {
-        if ($this->SMTPDebug <= 0) {
-            return;
-        }
-        //Avoid clash with built-in function names
-        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
-            call_user_func($this->Debugoutput, $str, $this->SMTPDebug);
-            return;
-        }
-        switch ($this->Debugoutput) {
-            case 'error_log':
-                //Don't output, just log
-                error_log($str);
-                break;
-            case 'html':
-                //Cleans up output a bit for a better looking, HTML-safe output
-                echo htmlentities(
-                    preg_replace('/[\r\n]+/', '', $str),
-                    ENT_QUOTES,
-                    'UTF-8'
-                )
-                . "<br>\n";
-                break;
-            case 'echo':
-            default:
-                //Normalize line breaks
-                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
-                    "\n",
-                    "\n                   \t                  ",
-                    trim($str)
-                ) . "\n";
-        }
-    }
-
-    /**
-     * Sets message type to HTML or plain.
-     * @param boolean $isHtml True for HTML mode.
-     * @return void
-     */
-    public function isHTML($isHtml = true)
-    {
-        if ($isHtml) {
-            $this->ContentType = 'text/html';
-        } else {
-            $this->ContentType = 'text/plain';
-        }
-    }
-
-    /**
-     * Send messages using SMTP.
-     * @return void
-     */
-    public function isSMTP()
-    {
-        $this->Mailer = 'smtp';
-    }
-
-    /**
-     * Send messages using PHP's mail() function.
-     * @return void
-     */
-    public function isMail()
-    {
-        $this->Mailer = 'mail';
-    }
-
-    /**
-     * Send messages using $Sendmail.
-     * @return void
-     */
-    public function isSendmail()
-    {
-        $ini_sendmail_path = ini_get('sendmail_path');
-
-        if (!stristr($ini_sendmail_path, 'sendmail')) {
-            $this->Sendmail = '/usr/sbin/sendmail';
-        } else {
-            $this->Sendmail = $ini_sendmail_path;
-        }
-        $this->Mailer = 'sendmail';
-    }
-
-    /**
-     * Send messages using qmail.
-     * @return void
-     */
-    public function isQmail()
-    {
-        $ini_sendmail_path = ini_get('sendmail_path');
-
-        if (!stristr($ini_sendmail_path, 'qmail')) {
-            $this->Sendmail = '/var/qmail/bin/qmail-inject';
-        } else {
-            $this->Sendmail = $ini_sendmail_path;
-        }
-        $this->Mailer = 'qmail';
-    }
-
-    /**
-     * Add a "To" address.
-     * @param string $address
-     * @param string $name
-     * @return boolean true on success, false if address already used
-     */
-    public function addAddress($address, $name = '')
-    {
-        return $this->addAnAddress('to', $address, $name);
-    }
-
-    /**
-     * Add a "CC" address.
-     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
-     * @param string $address
-     * @param string $name
-     * @return boolean true on success, false if address already used
-     */
-    public function addCC($address, $name = '')
-    {
-        return $this->addAnAddress('cc', $address, $name);
-    }
-
-    /**
-     * Add a "BCC" address.
-     * @note: This function works with the SMTP mailer on win32, not with the "mail" mailer.
-     * @param string $address
-     * @param string $name
-     * @return boolean true on success, false if address already used
-     */
-    public function addBCC($address, $name = '')
-    {
-        return $this->addAnAddress('bcc', $address, $name);
-    }
-
-    /**
-     * Add a "Reply-to" address.
-     * @param string $address
-     * @param string $name
-     * @return boolean
-     */
-    public function addReplyTo($address, $name = '')
-    {
-        return $this->addAnAddress('Reply-To', $address, $name);
-    }
-
-    /**
-     * Add an address to one of the recipient arrays.
-     * Addresses that have been added already return false, but do not throw exceptions
-     * @param string $kind One of 'to', 'cc', 'bcc', 'ReplyTo'
-     * @param string $address The email address to send to
-     * @param string $name
-     * @throws phpmailerException
-     * @return boolean true on success, false if address already used or invalid in some way
-     * @access protected
-     */
-    protected function addAnAddress($kind, $address, $name = '')
-    {
-        if (!preg_match('/^(to|cc|bcc|Reply-To)$/', $kind)) {
-            $this->setError($this->lang('Invalid recipient array') . ': ' . $kind);
-            $this->edebug($this->lang('Invalid recipient array') . ': ' . $kind);
-            if ($this->exceptions) {
-                throw new phpmailerException('Invalid recipient array: ' . $kind);
-            }
-            return false;
-        }
-        $address = trim($address);
-        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        if (!$this->validateAddress($address)) {
-            $this->setError($this->lang('invalid_address') . ': ' . $address);
-            $this->edebug($this->lang('invalid_address') . ': ' . $address);
-            if ($this->exceptions) {
-                throw new phpmailerException($this->lang('invalid_address') . ': ' . $address);
-            }
-            return false;
-        }
-        if ($kind != 'Reply-To') {
-            if (!isset($this->all_recipients[strtolower($address)])) {
-                array_push($this->$kind, array($address, $name));
-                $this->all_recipients[strtolower($address)] = true;
-                return true;
-            }
-        } else {
-            if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
-                $this->ReplyTo[strtolower($address)] = array($address, $name);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Set the From and FromName properties.
-     * @param string $address
-     * @param string $name
-     * @param boolean $auto Whether to also set the Sender address, defaults to true
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function setFrom($address, $name = '', $auto = true)
-    {
-        $address = trim($address);
-        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        if (!$this->validateAddress($address)) {
-            $this->setError($this->lang('invalid_address') . ': ' . $address);
-            $this->edebug($this->lang('invalid_address') . ': ' . $address);
-            if ($this->exceptions) {
-                throw new phpmailerException($this->lang('invalid_address') . ': ' . $address);
-            }
-            return false;
-        }
-        $this->From = $address;
-        $this->FromName = $name;
-        if ($auto) {
-            if (empty($this->Sender)) {
-                $this->Sender = $address;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Return the Message-ID header of the last email.
-     * Technically this is the value from the last time the headers were created,
-     * but it's also the message ID of the last sent message except in
-     * pathological cases.
-     * @return string
-     */
-    public function getLastMessageID()
-    {
-        return $this->lastMessageID;
-    }
-
-    /**
-     * Check that a string looks like an email address.
-     * @param string $address The email address to check
-     * @param string $patternselect A selector for the validation pattern to use :
-     * * `auto` Pick strictest one automatically;
-     * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0, PHP >= 5.3.2, 5.2.14;
-     * * `pcre` Use old PCRE implementation;
-     * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL; same as pcre8 but does not allow 'dotless' domains;
-     * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
-     * * `noregex` Don't use a regex: super fast, really dumb.
-     * @return boolean
-     * @static
-     * @access public
-     */
-    public static function validateAddress($address, $patternselect = 'auto')
-    {
-        if (!$patternselect or $patternselect == 'auto') {
-            //Check this constant first so it works when extension_loaded() is disabled by safe mode
-            //Constant was added in PHP 5.2.4
-            if (defined('PCRE_VERSION')) {
-                //This pattern can get stuck in a recursive loop in PCRE <= 8.0.2
-                if (version_compare(PCRE_VERSION, '8.0.3') >= 0) {
-                    $patternselect = 'pcre8';
-                } else {
-                    $patternselect = 'pcre';
-                }
-            } elseif (function_exists('extension_loaded') and extension_loaded('pcre')) {
-                //Fall back to older PCRE
-                $patternselect = 'pcre';
-            } else {
-                //Filter_var appeared in PHP 5.2.0 and does not require the PCRE extension
-                if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
-                    $patternselect = 'php';
-                } else {
-                    $patternselect = 'noregex';
-                }
-            }
-        }
-        switch ($patternselect) {
-            case 'pcre8':
-                /**
-                 * Uses the same RFC5322 regex on which FILTER_VALIDATE_EMAIL is based, but allows dotless domains.
-                 * @link http://squiloople.com/2009/12/20/email-address-validation/
-                 * @copyright 2009-2010 Michael Rushton
-                 * Feel free to use and redistribute this code. But please keep this copyright notice.
-                 */
-                return (boolean)preg_match(
-                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
-                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
-                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' .
-                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' .
-                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' .
-                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' .
-                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' .
-                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
-                    '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
-                    $address
-                );
-            case 'pcre':
-                //An older regex that doesn't need a recent PCRE
-                return (boolean)preg_match(
-                    '/^(?!(?>"?(?>\\\[ -~]|[^"])"?){255,})(?!(?>"?(?>\\\[ -~]|[^"])"?){65,}@)(?>' .
-                    '[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*")' .
-                    '(?>\.(?>[!#-\'*+\/-9=?^-~-]+|"(?>(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\xFF]))*"))*' .
-                    '@(?>(?![a-z0-9-]{64,})(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)(?>\.(?![a-z0-9-]{64,})' .
-                    '(?>[a-z0-9](?>[a-z0-9-]*[a-z0-9])?)){0,126}|\[(?:(?>IPv6:(?>(?>[a-f0-9]{1,4})(?>:' .
-                    '[a-f0-9]{1,4}){7}|(?!(?:.*[a-f0-9][:\]]){8,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?' .
-                    '::(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,6})?))|(?>(?>IPv6:(?>[a-f0-9]{1,4}(?>:' .
-                    '[a-f0-9]{1,4}){5}:|(?!(?:.*[a-f0-9]:){6,})(?>[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4})?' .
-                    '::(?>(?:[a-f0-9]{1,4}(?>:[a-f0-9]{1,4}){0,4}):)?))?(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
-                    '|[1-9]?[0-9])(?>\.(?>25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}))\])$/isD',
-                    $address
-                );
-            case 'html5':
-                /**
-                 * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
-                 * @link http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
-                 */
-                return (boolean)preg_match(
-                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
-                    '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD',
-                    $address
-                );
-            case 'noregex':
-                //No PCRE! Do something _very_ approximate!
-                //Check the address is 3 chars or longer and contains an @ that's not the first or last char
-                return (strlen($address) >= 3
-                    and strpos($address, '@') >= 1
-                    and strpos($address, '@') != strlen($address) - 1);
-            case 'php':
-            default:
-                return (boolean)filter_var($address, FILTER_VALIDATE_EMAIL);
-        }
-    }
-
-    /**
-     * Create a message and send it.
-     * Uses the sending method specified by $Mailer.
-     * @throws phpmailerException
-     * @return boolean false on error - See the ErrorInfo property for details of the error.
-     */
-    public function send()
-    {
-        try {
-            if (!$this->preSend()) {
-                return false;
-            }
-            return $this->postSend();
-        } catch (phpmailerException $exc) {
-            $this->mailHeader = '';
-            $this->setError($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Prepare a message for sending.
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function preSend()
-    {
-        try {
-            $this->mailHeader = '';
-            if ((count($this->to) + count($this->cc) + count($this->bcc)) < 1) {
-                throw new phpmailerException($this->lang('provide_address'), self::STOP_CRITICAL);
-            }
-
-            // Set whether the message is multipart/alternative
-            if (!empty($this->AltBody)) {
-                $this->ContentType = 'multipart/alternative';
-            }
-
-            $this->error_count = 0; // reset errors
-            $this->setMessageType();
-            // Refuse to send an empty message unless we are specifically allowing it
-            if (!$this->AllowEmpty and empty($this->Body)) {
-                throw new phpmailerException($this->lang('empty_message'), self::STOP_CRITICAL);
-            }
-
-            $this->MIMEHeader = $this->createHeader();
-            $this->MIMEBody = $this->createBody();
-
-            // To capture the complete message when using mail(), create
-            // an extra header list which createHeader() doesn't fold in
-            if ($this->Mailer == 'mail') {
-                if (count($this->to) > 0) {
-                    $this->mailHeader .= $this->addrAppend('To', $this->to);
-                } else {
-                    $this->mailHeader .= $this->headerLine('To', 'undisclosed-recipients:;');
-                }
-                $this->mailHeader .= $this->headerLine(
-                    'Subject',
-                    $this->encodeHeader($this->secureHeader(trim($this->Subject)))
-                );
-            }
-
-            // Sign with DKIM if enabled
-            if (!empty($this->DKIM_domain)
-                && !empty($this->DKIM_private)
-                && !empty($this->DKIM_selector)
-                && !empty($this->DKIM_domain)
-                && file_exists($this->DKIM_private)) {
-                $header_dkim = $this->DKIM_Add(
-                    $this->MIMEHeader . $this->mailHeader,
-                    $this->encodeHeader($this->secureHeader($this->Subject)),
-                    $this->MIMEBody
-                );
-                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . self::CRLF .
-                    str_replace("\r\n", "\n", $header_dkim) . self::CRLF;
-            }
-            return true;
-
-        } catch (phpmailerException $exc) {
-            $this->setError($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Actually send a message.
-     * Send the email via the selected mechanism
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function postSend()
-    {
-        try {
-            // Choose the mailer and send through it
-            switch ($this->Mailer) {
-                case 'sendmail':
-                case 'qmail':
-                    return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody);
-                case 'smtp':
-                    return $this->smtpSend($this->MIMEHeader, $this->MIMEBody);
-                case 'mail':
-                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
-                default:
-                    $sendMethod = $this->Mailer.'Send';
-                    if (method_exists($this, $sendMethod)) {
-                        return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
-                    }
-
-                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
-            }
-        } catch (phpmailerException $exc) {
-            $this->setError($exc->getMessage());
-            $this->edebug($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Send mail using the $Sendmail program.
-     * @param string $header The message headers
-     * @param string $body The message body
-     * @see PHPMailer::$Sendmail
-     * @throws phpmailerException
-     * @access protected
-     * @return boolean
-     */
-    protected function sendmailSend($header, $body)
-    {
-        if ($this->Sender != '') {
-            if ($this->Mailer == 'qmail') {
-                $sendmail = sprintf('%s -f%s', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
-            } else {
-                $sendmail = sprintf('%s -oi -f%s -t', escapeshellcmd($this->Sendmail), escapeshellarg($this->Sender));
-            }
-        } else {
-            if ($this->Mailer == 'qmail') {
-                $sendmail = sprintf('%s', escapeshellcmd($this->Sendmail));
-            } else {
-                $sendmail = sprintf('%s -oi -t', escapeshellcmd($this->Sendmail));
-            }
-        }
-        if ($this->SingleTo) {
-            foreach ($this->SingleToArray as $toAddr) {
-                if (!@$mail = popen($sendmail, 'w')) {
-                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-                }
-                fputs($mail, 'To: ' . $toAddr . "\n");
-                fputs($mail, $header);
-                fputs($mail, $body);
-                $result = pclose($mail);
-                $this->doCallback(
-                    ($result == 0),
-                    array($toAddr),
-                    $this->cc,
-                    $this->bcc,
-                    $this->Subject,
-                    $body,
-                    $this->From
-                );
-                if ($result != 0) {
-                    throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-                }
-            }
-        } else {
-            if (!@$mail = popen($sendmail, 'w')) {
-                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-            }
-            fputs($mail, $header);
-            fputs($mail, $body);
-            $result = pclose($mail);
-            $this->doCallback(($result == 0), $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
-            if ($result != 0) {
-                throw new phpmailerException($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Send mail using the PHP mail() function.
-     * @param string $header The message headers
-     * @param string $body The message body
-     * @link http://www.php.net/manual/en/book.mail.php
-     * @throws phpmailerException
-     * @access protected
-     * @return boolean
-     */
-    protected function mailSend($header, $body)
-    {
-        $toArr = array();
-        foreach ($this->to as $toaddr) {
-            $toArr[] = $this->addrFormat($toaddr);
-        }
-        $to = implode(', ', $toArr);
-
-        if (empty($this->Sender)) {
-            $params = ' ';
-        } else {
-            $params = sprintf('-f%s', $this->Sender);
-        }
-        if ($this->Sender != '' and !ini_get('safe_mode')) {
-            $old_from = ini_get('sendmail_from');
-            ini_set('sendmail_from', $this->Sender);
-        }
-        $result = false;
-        if ($this->SingleTo && count($toArr) > 1) {
-            foreach ($toArr as $toAddr) {
-                $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
-                $this->doCallback($result, array($toAddr), $this->cc, $this->bcc, $this->Subject, $body, $this->From);
-            }
-        } else {
-            $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params);
-            $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From);
-        }
-        if (isset($old_from)) {
-            ini_set('sendmail_from', $old_from);
-        }
-        if (!$result) {
-            throw new phpmailerException($this->lang('instantiate'), self::STOP_CRITICAL);
-        }
-        return true;
-    }
-
-    /**
-     * Get an instance to use for SMTP operations.
-     * Override this function to load your own SMTP implementation
-     * @return SMTP
-     */
-    public function getSMTPInstance()
-    {
-        if (!is_object($this->smtp)) {
-            $this->smtp = new SMTP;
-        }
-        return $this->smtp;
-    }
-
-    /**
-     * Send mail via SMTP.
-     * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
-     * Uses the PHPMailerSMTP class by default.
-     * @see PHPMailer::getSMTPInstance() to use a different class.
-     * @param string $header The message headers
-     * @param string $body The message body
-     * @throws phpmailerException
-     * @uses SMTP
-     * @access protected
-     * @return boolean
-     */
-    protected function smtpSend($header, $body)
-    {
-        $bad_rcpt = array();
-
-        if (!$this->smtpConnect()) {
-            throw new phpmailerException($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
-        }
-        $smtp_from = ($this->Sender == '') ? $this->From : $this->Sender;
-        if (!$this->smtp->mail($smtp_from)) {
-            $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
-            throw new phpmailerException($this->ErrorInfo, self::STOP_CRITICAL);
-        }
-
-        // Attempt to send to all recipients
-        foreach ($this->to as $to) {
-            if (!$this->smtp->recipient($to[0])) {
-                $bad_rcpt[] = $to[0];
-                $isSent = false;
-            } else {
-                $isSent = true;
-            }
-            $this->doCallback($isSent, array($to[0]), array(), array(), $this->Subject, $body, $this->From);
-        }
-        foreach ($this->cc as $cc) {
-            if (!$this->smtp->recipient($cc[0])) {
-                $bad_rcpt[] = $cc[0];
-                $isSent = false;
-            } else {
-                $isSent = true;
-            }
-            $this->doCallback($isSent, array(), array($cc[0]), array(), $this->Subject, $body, $this->From);
-        }
-        foreach ($this->bcc as $bcc) {
-            if (!$this->smtp->recipient($bcc[0])) {
-                $bad_rcpt[] = $bcc[0];
-                $isSent = false;
-            } else {
-                $isSent = true;
-            }
-            $this->doCallback($isSent, array(), array(), array($bcc[0]), $this->Subject, $body, $this->From);
-        }
-
-        // Only send the DATA command if we have viable recipients
-        if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
-            throw new phpmailerException($this->lang('data_not_accepted'), self::STOP_CRITICAL);
-        }
-        if ($this->SMTPKeepAlive) {
-            $this->smtp->reset();
-        } else {
-            $this->smtp->quit();
-            $this->smtp->close();
-        }
-        if (count($bad_rcpt) > 0) { // Create error message for any bad addresses
-            throw new phpmailerException(
-                $this->lang('recipients_failed') . implode(', ', $bad_rcpt),
-                self::STOP_CONTINUE
-            );
-        }
-        return true;
-    }
-
-    /**
-     * Initiate a connection to an SMTP server.
-     * Returns false if the operation failed.
-     * @param array $options An array of options compatible with stream_context_create()
-     * @uses SMTP
-     * @access public
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function smtpConnect($options = array())
-    {
-        if (is_null($this->smtp)) {
-            $this->smtp = $this->getSMTPInstance();
-        }
-
-        // Already connected?
-        if ($this->smtp->connected()) {
-            return true;
-        }
-
-        $this->smtp->setTimeout($this->Timeout);
-        $this->smtp->setDebugLevel($this->SMTPDebug);
-        $this->smtp->setDebugOutput($this->Debugoutput);
-        $this->smtp->setVerp($this->do_verp);
-        $hosts = explode(';', $this->Host);
-        $lastexception = null;
-
-        foreach ($hosts as $hostentry) {
-            $hostinfo = array();
-            if (!preg_match('/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*):?([0-9]*)$/', trim($hostentry), $hostinfo)) {
-                // Not a valid host entry
-                continue;
-            }
-            // $hostinfo[2]: optional ssl or tls prefix
-            // $hostinfo[3]: the hostname
-            // $hostinfo[4]: optional port number
-            // The host string prefix can temporarily override the current setting for SMTPSecure
-            // If it's not specified, the default value is used
-            $prefix = '';
-            $tls = ($this->SMTPSecure == 'tls');
-            if ($hostinfo[2] == 'ssl' or ($hostinfo[2] == '' and $this->SMTPSecure == 'ssl')) {
-                $prefix = 'ssl://';
-                $tls = false; // Can't have SSL and TLS at once
-            } elseif ($hostinfo[2] == 'tls') {
-                $tls = true;
-                // tls doesn't use a prefix
-            }
-            $host = $hostinfo[3];
-            $port = $this->Port;
-            $tport = (integer)$hostinfo[4];
-            if ($tport > 0 and $tport < 65536) {
-                $port = $tport;
-            }
-            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
-                try {
-                    if ($this->Helo) {
-                        $hello = $this->Helo;
-                    } else {
-                        $hello = $this->serverHostname();
-                    }
-                    $this->smtp->hello($hello);
-
-                    if ($tls) {
-                        if (!$this->smtp->startTLS()) {
-                            throw new phpmailerException($this->lang('connect_host'));
-                        }
-                        // We must resend HELO after tls negotiation
-                        $this->smtp->hello($hello);
-                    }
-                    if ($this->SMTPAuth) {
-                        if (!$this->smtp->authenticate(
-                            $this->Username,
-                            $this->Password,
-                            $this->AuthType,
-                            $this->Realm,
-                            $this->Workstation
-                        )
-                        ) {
-                            throw new phpmailerException($this->lang('authenticate'));
-                        }
-                    }
-                    return true;
-                } catch (phpmailerException $exc) {
-                    $lastexception = $exc;
-                    // We must have connected, but then failed TLS or Auth, so close connection nicely
-                    $this->smtp->quit();
-                }
-            }
-        }
-        // If we get here, all connection attempts have failed, so close connection hard
-        $this->smtp->close();
-        // As we've caught all exceptions, just report whatever the last one was
-        if ($this->exceptions and !is_null($lastexception)) {
-            throw $lastexception;
-        }
-        return false;
-    }
-
-    /**
-     * Close the active SMTP session if one exists.
-     * @return void
-     */
-    public function smtpClose()
-    {
-        if ($this->smtp !== null) {
-            if ($this->smtp->connected()) {
-                $this->smtp->quit();
-                $this->smtp->close();
-            }
-        }
-    }
-
-    /**
-     * Set the language for error messages.
-     * Returns false if it cannot load the language file.
-     * The default language is English.
-     * @param string $langcode ISO 639-1 2-character language code (e.g. French is "fr")
-     * @param string $lang_path Path to the language file directory, with trailing separator (slash)
-     * @return boolean
-     * @access public
-     */
-    public function setLanguage($langcode = 'en', $lang_path = '')
-    {
-        // Define full set of translatable strings in English
-        $PHPMAILER_LANG = array(
-            'authenticate' => 'SMTP Error: Could not authenticate.',
-            'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
-            'data_not_accepted' => 'SMTP Error: data not accepted.',
-            'empty_message' => 'Message body empty',
-            'encoding' => 'Unknown encoding: ',
-            'execute' => 'Could not execute: ',
-            'file_access' => 'Could not access file: ',
-            'file_open' => 'File Error: Could not open file: ',
-            'from_failed' => 'The following From address failed: ',
-            'instantiate' => 'Could not instantiate mail function.',
-            'invalid_address' => 'Invalid address',
-            'mailer_not_supported' => ' mailer is not supported.',
-            'provide_address' => 'You must provide at least one recipient email address.',
-            'recipients_failed' => 'SMTP Error: The following recipients failed: ',
-            'signing' => 'Signing Error: ',
-            'smtp_connect_failed' => 'SMTP connect() failed.',
-            'smtp_error' => 'SMTP server error: ',
-            'variable_set' => 'Cannot set or reset variable: '
-        );
-        if (empty($lang_path)) {
-            // Calculate an absolute path so it can work if CWD is not here
-            $lang_path = dirname(__FILE__). DIRECTORY_SEPARATOR . 'language'. DIRECTORY_SEPARATOR;
-        }
-        $foundlang = true;
-        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
-        if ($langcode != 'en') { // There is no English translation file
-            // Make sure language file path is readable
-            if (!is_readable($lang_file)) {
-                $foundlang = false;
-            } else {
-                // Overwrite language-specific strings.
-                // This way we'll never have missing translations.
-                $foundlang = include $lang_file;
-            }
-        }
-        $this->language = $PHPMAILER_LANG;
-        return (boolean)$foundlang; // Returns false if language not found
-    }
-
-    /**
-     * Get the array of strings for the current language.
-     * @return array
-     */
-    public function getTranslations()
-    {
-        return $this->language;
-    }
-
-    /**
-     * Create recipient headers.
-     * @access public
-     * @param string $type
-     * @param array $addr An array of recipient,
-     * where each recipient is a 2-element indexed array with element 0 containing an address
-     * and element 1 containing a name, like:
-     * array(array('joe@example.com', 'Joe User'), array('zoe@example.com', 'Zoe User'))
-     * @return string
-     */
-    public function addrAppend($type, $addr)
-    {
-        $addresses = array();
-        foreach ($addr as $address) {
-            $addresses[] = $this->addrFormat($address);
-        }
-        return $type . ': ' . implode(', ', $addresses) . $this->LE;
-    }
-
-    /**
-     * Format an address for use in a message header.
-     * @access public
-     * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name
-     *      like array('joe@example.com', 'Joe User')
-     * @return string
-     */
-    public function addrFormat($addr)
-    {
-        if (empty($addr[1])) { // No name provided
-            return $this->secureHeader($addr[0]);
-        } else {
-            return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
-                $addr[0]
-            ) . '>';
-        }
-    }
-
-    /**
-     * Word-wrap message.
-     * For use with mailers that do not automatically perform wrapping
-     * and for quoted-printable encoded messages.
-     * Original written by philippe.
-     * @param string $message The message to wrap
-     * @param integer $length The line length to wrap to
-     * @param boolean $qp_mode Whether to run in Quoted-Printable mode
-     * @access public
-     * @return string
-     */
-    public function wrapText($message, $length, $qp_mode = false)
-    {
-        $soft_break = ($qp_mode) ? sprintf(' =%s', $this->LE) : $this->LE;
-        // If utf-8 encoding is used, we will need to make sure we don't
-        // split multibyte characters when we wrap
-        $is_utf8 = (strtolower($this->CharSet) == 'utf-8');
-        $lelen = strlen($this->LE);
-        $crlflen = strlen(self::CRLF);
-
-        $message = $this->fixEOL($message);
-        if (substr($message, -$lelen) == $this->LE) {
-            $message = substr($message, 0, -$lelen);
-        }
-
-        $line = explode($this->LE, $message); // Magic. We know fixEOL uses $LE
-        $message = '';
-        for ($i = 0; $i < count($line); $i++) {
-            $line_part = explode(' ', $line[$i]);
-            $buf = '';
-            for ($e = 0; $e < count($line_part); $e++) {
-                $word = $line_part[$e];
-                if ($qp_mode and (strlen($word) > $length)) {
-                    $space_left = $length - strlen($buf) - $crlflen;
-                    if ($e != 0) {
-                        if ($space_left > 20) {
-                            $len = $space_left;
-                            if ($is_utf8) {
-                                $len = $this->utf8CharBoundary($word, $len);
-                            } elseif (substr($word, $len - 1, 1) == '=') {
-                                $len--;
-                            } elseif (substr($word, $len - 2, 1) == '=') {
-                                $len -= 2;
-                            }
-                            $part = substr($word, 0, $len);
-                            $word = substr($word, $len);
-                            $buf .= ' ' . $part;
-                            $message .= $buf . sprintf('=%s', self::CRLF);
-                        } else {
-                            $message .= $buf . $soft_break;
-                        }
-                        $buf = '';
-                    }
-                    while (strlen($word) > 0) {
-                        if ($length <= 0) {
-                            break;
-                        }
-                        $len = $length;
-                        if ($is_utf8) {
-                            $len = $this->utf8CharBoundary($word, $len);
-                        } elseif (substr($word, $len - 1, 1) == '=') {
-                            $len--;
-                        } elseif (substr($word, $len - 2, 1) == '=') {
-                            $len -= 2;
-                        }
-                        $part = substr($word, 0, $len);
-                        $word = substr($word, $len);
-
-                        if (strlen($word) > 0) {
-                            $message .= $part . sprintf('=%s', self::CRLF);
-                        } else {
-                            $buf = $part;
-                        }
-                    }
-                } else {
-                    $buf_o = $buf;
-                    $buf .= ($e == 0) ? $word : (' ' . $word);
-
-                    if (strlen($buf) > $length and $buf_o != '') {
-                        $message .= $buf_o . $soft_break;
-                        $buf = $word;
-                    }
-                }
-            }
-            $message .= $buf . self::CRLF;
-        }
-
-        return $message;
-    }
-
-    /**
-     * Find the last character boundary prior to $maxLength in a utf-8
-     * quoted (printable) encoded string.
-     * Original written by Colin Brown.
-     * @access public
-     * @param string $encodedText utf-8 QP text
-     * @param integer $maxLength   find last character boundary prior to this length
-     * @return integer
-     */
-    public function utf8CharBoundary($encodedText, $maxLength)
-    {
-        $foundSplitPos = false;
-        $lookBack = 3;
-        while (!$foundSplitPos) {
-            $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
-            $encodedCharPos = strpos($lastChunk, '=');
-            if (false !== $encodedCharPos) {
-                // Found start of encoded character byte within $lookBack block.
-                // Check the encoded byte value (the 2 chars after the '=')
-                $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
-                $dec = hexdec($hex);
-                if ($dec < 128) { // Single byte character.
-                    // If the encoded char was found at pos 0, it will fit
-                    // otherwise reduce maxLength to start of the encoded char
-                    $maxLength = ($encodedCharPos == 0) ? $maxLength :
-                        $maxLength - ($lookBack - $encodedCharPos);
-                    $foundSplitPos = true;
-                } elseif ($dec >= 192) { // First byte of a multi byte character
-                    // Reduce maxLength to split at start of character
-                    $maxLength = $maxLength - ($lookBack - $encodedCharPos);
-                    $foundSplitPos = true;
-                } elseif ($dec < 192) { // Middle byte of a multi byte character, look further back
-                    $lookBack += 3;
-                }
-            } else {
-                // No encoded character found
-                $foundSplitPos = true;
-            }
-        }
-        return $maxLength;
-    }
-
-    /**
-     * Set the body wrapping.
-     * @access public
-     * @return void
-     */
-    public function setWordWrap()
-    {
-        if ($this->WordWrap < 1) {
-            return;
-        }
-
-        switch ($this->message_type) {
-            case 'alt':
-            case 'alt_inline':
-            case 'alt_attach':
-            case 'alt_inline_attach':
-                $this->AltBody = $this->wrapText($this->AltBody, $this->WordWrap);
-                break;
-            default:
-                $this->Body = $this->wrapText($this->Body, $this->WordWrap);
-                break;
-        }
-    }
-
-    /**
-     * Assemble message headers.
-     * @access public
-     * @return string The assembled headers
-     */
-    public function createHeader()
-    {
-        $result = '';
-
-        // Set the boundaries
-        $uniq_id = md5(uniqid(time()));
-        $this->boundary[1] = 'b1_' . $uniq_id;
-        $this->boundary[2] = 'b2_' . $uniq_id;
-        $this->boundary[3] = 'b3_' . $uniq_id;
-
-        if ($this->MessageDate == '') {
-            $this->MessageDate = self::rfcDate();
-        }
-        $result .= $this->headerLine('Date', $this->MessageDate);
-
-
-        // To be created automatically by mail()
-        if ($this->SingleTo) {
-            if ($this->Mailer != 'mail') {
-                foreach ($this->to as $toaddr) {
-                    $this->SingleToArray[] = $this->addrFormat($toaddr);
-                }
-            }
-        } else {
-            if (count($this->to) > 0) {
-                if ($this->Mailer != 'mail') {
-                    $result .= $this->addrAppend('To', $this->to);
-                }
-            } elseif (count($this->cc) == 0) {
-                $result .= $this->headerLine('To', 'undisclosed-recipients:;');
-            }
-        }
-
-        $result .= $this->addrAppend('From', array(array(trim($this->From), $this->FromName)));
-
-        // sendmail and mail() extract Cc from the header before sending
-        if (count($this->cc) > 0) {
-            $result .= $this->addrAppend('Cc', $this->cc);
-        }
-
-        // sendmail and mail() extract Bcc from the header before sending
-        if ((
-                $this->Mailer == 'sendmail' or $this->Mailer == 'qmail' or $this->Mailer == 'mail'
-            )
-            and count($this->bcc) > 0
-        ) {
-            $result .= $this->addrAppend('Bcc', $this->bcc);
-        }
-
-        if (count($this->ReplyTo) > 0) {
-            $result .= $this->addrAppend('Reply-To', $this->ReplyTo);
-        }
-
-        // mail() sets the subject itself
-        if ($this->Mailer != 'mail') {
-            $result .= $this->headerLine('Subject', $this->encodeHeader($this->secureHeader($this->Subject)));
-        }
-
-        if ($this->MessageID != '') {
-            $this->lastMessageID = $this->MessageID;
-        } else {
-            $this->lastMessageID = sprintf('<%s@%s>', $uniq_id, $this->ServerHostname());
-        }
-        $result .= $this->HeaderLine('Message-ID', $this->lastMessageID);
-        $result .= $this->headerLine('X-Priority', $this->Priority);
-        if ($this->XMailer == '') {
-            $result .= $this->headerLine(
-                'X-Mailer',
-                'PHPMailer ' . $this->Version . ' (https://github.com/PHPMailer/PHPMailer/)'
-            );
-        } else {
-            $myXmailer = trim($this->XMailer);
-            if ($myXmailer) {
-                $result .= $this->headerLine('X-Mailer', $myXmailer);
-            }
-        }
-
-        if ($this->ConfirmReadingTo != '') {
-            $result .= $this->headerLine('Disposition-Notification-To', '<' . trim($this->ConfirmReadingTo) . '>');
-        }
-
-        // Add custom headers
-        for ($index = 0; $index < count($this->CustomHeader); $index++) {
-            $result .= $this->headerLine(
-                trim($this->CustomHeader[$index][0]),
-                $this->encodeHeader(trim($this->CustomHeader[$index][1]))
-            );
-        }
-        if (!$this->sign_key_file) {
-            $result .= $this->headerLine('MIME-Version', '1.0');
-            $result .= $this->getMailMIME();
-        }
-
-        return $result;
-    }
-
-    /**
-     * Get the message MIME type headers.
-     * @access public
-     * @return string
-     */
-    public function getMailMIME()
-    {
-        $result = '';
-        $ismultipart = true;
-        switch ($this->message_type) {
-            case 'inline':
-                $result .= $this->headerLine('Content-Type', 'multipart/related;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
-                break;
-            case 'attach':
-            case 'inline_attach':
-            case 'alt_attach':
-            case 'alt_inline_attach':
-                $result .= $this->headerLine('Content-Type', 'multipart/mixed;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
-                break;
-            case 'alt':
-            case 'alt_inline':
-                $result .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
-                break;
-            default:
-                // Catches case 'plain': and case '':
-                $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet);
-                $ismultipart = false;
-                break;
-        }
-        // RFC1341 part 5 says 7bit is assumed if not specified
-        if ($this->Encoding != '7bit') {
-            // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
-            if ($ismultipart) {
-                if ($this->Encoding == '8bit') {
-                    $result .= $this->headerLine('Content-Transfer-Encoding', '8bit');
-                }
-                // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
-            } else {
-                $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding);
-            }
-        }
-
-        if ($this->Mailer != 'mail') {
-            $result .= $this->LE;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the whole MIME message.
-     * Includes complete headers and body.
-     * Only valid post preSend().
-     * @see PHPMailer::preSend()
-     * @access public
-     * @return string
-     */
-    public function getSentMIMEMessage()
-    {
-        return $this->MIMEHeader . $this->mailHeader . self::CRLF . $this->MIMEBody;
-    }
-
-
-    /**
-     * Assemble the message body.
-     * Returns an empty string on failure.
-     * @access public
-     * @throws phpmailerException
-     * @return string The assembled message body
-     */
-    public function createBody()
-    {
-        $body = '';
-
-        if ($this->sign_key_file) {
-            $body .= $this->getMailMIME() . $this->LE;
-        }
-
-        $this->setWordWrap();
-
-        $bodyEncoding = $this->Encoding;
-        $bodyCharSet = $this->CharSet;
-        if ($bodyEncoding == '8bit' and !$this->has8bitChars($this->Body)) {
-            $bodyEncoding = '7bit';
-            $bodyCharSet = 'us-ascii';
-        }
-        $altBodyEncoding = $this->Encoding;
-        $altBodyCharSet = $this->CharSet;
-        if ($altBodyEncoding == '8bit' and !$this->has8bitChars($this->AltBody)) {
-            $altBodyEncoding = '7bit';
-            $altBodyCharSet = 'us-ascii';
-        }
-        switch ($this->message_type) {
-            case 'inline':
-                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[1]);
-                break;
-            case 'attach':
-                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            case 'inline_attach':
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            case 'alt':
-                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                if (!empty($this->Ical)) {
-                    $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', '');
-                    $body .= $this->encodeString($this->Ical, $this->Encoding);
-                    $body .= $this->LE . $this->LE;
-                }
-                $body .= $this->endBoundary($this->boundary[1]);
-                break;
-            case 'alt_inline':
-                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->endBoundary($this->boundary[1]);
-                break;
-            case 'alt_attach':
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->endBoundary($this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            case 'alt_inline_attach':
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->textLine('--' . $this->boundary[2]);
-                $body .= $this->headerLine('Content-Type', 'multipart/related;');
-                $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"');
-                $body .= $this->LE;
-                $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= $this->LE . $this->LE;
-                $body .= $this->attachAll('inline', $this->boundary[3]);
-                $body .= $this->LE;
-                $body .= $this->endBoundary($this->boundary[2]);
-                $body .= $this->LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            default:
-                // catch case 'plain' and case ''
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                break;
-        }
-
-        if ($this->isError()) {
-            $body = '';
-        } elseif ($this->sign_key_file) {
-            try {
-                if (!defined('PKCS7_TEXT')) {
-                    throw new phpmailerException($this->lang('signing') . ' OpenSSL extension missing.');
-                }
-                // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
-                $file = tempnam(sys_get_temp_dir(), 'mail');
-                if (false === file_put_contents($file, $body)) {
-                    throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
-                }
-                $signed = tempnam(sys_get_temp_dir(), 'signed');
-                if (@openssl_pkcs7_sign(
-                    $file,
-                    $signed,
-                    'file://' . realpath($this->sign_cert_file),
-                    array('file://' . realpath($this->sign_key_file), $this->sign_key_pass),
-                    null
-                )
-                ) {
-                    @unlink($file);
-                    $body = file_get_contents($signed);
-                    @unlink($signed);
-                } else {
-                    @unlink($file);
-                    @unlink($signed);
-                    throw new phpmailerException($this->lang('signing') . openssl_error_string());
-                }
-            } catch (phpmailerException $exc) {
-                $body = '';
-                if ($this->exceptions) {
-                    throw $exc;
-                }
-            }
-        }
-        return $body;
-    }
-
-    /**
-     * Return the start of a message boundary.
-     * @access protected
-     * @param string $boundary
-     * @param string $charSet
-     * @param string $contentType
-     * @param string $encoding
-     * @return string
-     */
-    protected function getBoundary($boundary, $charSet, $contentType, $encoding)
-    {
-        $result = '';
-        if ($charSet == '') {
-            $charSet = $this->CharSet;
-        }
-        if ($contentType == '') {
-            $contentType = $this->ContentType;
-        }
-        if ($encoding == '') {
-            $encoding = $this->Encoding;
-        }
-        $result .= $this->textLine('--' . $boundary);
-        $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet);
-        $result .= $this->LE;
-        // RFC1341 part 5 says 7bit is assumed if not specified
-        if ($encoding != '7bit') {
-            $result .= $this->headerLine('Content-Transfer-Encoding', $encoding);
-        }
-        $result .= $this->LE;
-
-        return $result;
-    }
-
-    /**
-     * Return the end of a message boundary.
-     * @access protected
-     * @param string $boundary
-     * @return string
-     */
-    protected function endBoundary($boundary)
-    {
-        return $this->LE . '--' . $boundary . '--' . $this->LE;
-    }
-
-    /**
-     * Set the message type.
-     * PHPMailer only supports some preset message types,
-     * not arbitrary MIME structures.
-     * @access protected
-     * @return void
-     */
-    protected function setMessageType()
-    {
-        $type = array();
-        if ($this->alternativeExists()) {
-            $type[] = 'alt';
-        }
-        if ($this->inlineImageExists()) {
-            $type[] = 'inline';
-        }
-        if ($this->attachmentExists()) {
-            $type[] = 'attach';
-        }
-        $this->message_type = implode('_', $type);
-        if ($this->message_type == '') {
-            $this->message_type = 'plain';
-        }
-    }
-
-    /**
-     * Format a header line.
-     * @access public
-     * @param string $name
-     * @param string $value
-     * @return string
-     */
-    public function headerLine($name, $value)
-    {
-        return $name . ': ' . $value . $this->LE;
-    }
-
-    /**
-     * Return a formatted mail line.
-     * @access public
-     * @param string $value
-     * @return string
-     */
-    public function textLine($value)
-    {
-        return $value . $this->LE;
-    }
-
-    /**
-     * Add an attachment from a path on the filesystem.
-     * Returns false if the file could not be found or read.
-     * @param string $path Path to the attachment.
-     * @param string $name Overrides the attachment name.
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type File extension (MIME) type.
-     * @param string $disposition Disposition to use
-     * @throws phpmailerException
-     * @return boolean
-     */
-    public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment')
-    {
-        try {
-            if (!@is_file($path)) {
-                throw new phpmailerException($this->lang('file_access') . $path, self::STOP_CONTINUE);
-            }
-
-            // If a MIME type is not specified, try to work it out from the file name
-            if ($type == '') {
-                $type = self::filenameToType($path);
-            }
-
-            $filename = basename($path);
-            if ($name == '') {
-                $name = $filename;
-            }
-
-            $this->attachment[] = array(
-                0 => $path,
-                1 => $filename,
-                2 => $name,
-                3 => $encoding,
-                4 => $type,
-                5 => false, // isStringAttachment
-                6 => $disposition,
-                7 => 0
-            );
-
-        } catch (phpmailerException $exc) {
-            $this->setError($exc->getMessage());
-            $this->edebug($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Return the array of attachments.
-     * @return array
-     */
-    public function getAttachments()
-    {
-        return $this->attachment;
-    }
-
-    /**
-     * Attach all file, string, and binary attachments to the message.
-     * Returns an empty string on failure.
-     * @access protected
-     * @param string $disposition_type
-     * @param string $boundary
-     * @return string
-     */
-    protected function attachAll($disposition_type, $boundary)
-    {
-        // Return text of body
-        $mime = array();
-        $cidUniq = array();
-        $incl = array();
-
-        // Add all attachments
-        foreach ($this->attachment as $attachment) {
-            // Check if it is a valid disposition_filter
-            if ($attachment[6] == $disposition_type) {
-                // Check for string attachment
-                $string = '';
-                $path = '';
-                $bString = $attachment[5];
-                if ($bString) {
-                    $string = $attachment[0];
-                } else {
-                    $path = $attachment[0];
-                }
-
-                $inclhash = md5(serialize($attachment));
-                if (in_array($inclhash, $incl)) {
-                    continue;
-                }
-                $incl[] = $inclhash;
-                $name = $attachment[2];
-                $encoding = $attachment[3];
-                $type = $attachment[4];
-                $disposition = $attachment[6];
-                $cid = $attachment[7];
-                if ($disposition == 'inline' && isset($cidUniq[$cid])) {
-                    continue;
-                }
-                $cidUniq[$cid] = true;
-
-                $mime[] = sprintf('--%s%s', $boundary, $this->LE);
-                $mime[] = sprintf(
-                    'Content-Type: %s; name="%s"%s',
-                    $type,
-                    $this->encodeHeader($this->secureHeader($name)),
-                    $this->LE
-                );
-                // RFC1341 part 5 says 7bit is assumed if not specified
-                if ($encoding != '7bit') {
-                    $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, $this->LE);
-                }
-
-                if ($disposition == 'inline') {
-                    $mime[] = sprintf('Content-ID: <%s>%s', $cid, $this->LE);
-                }
-
-                // If a filename contains any of these chars, it should be quoted,
-                // but not otherwise: RFC2183 & RFC2045 5.1
-                // Fixes a warning in IETF's msglint MIME checker
-                // Allow for bypassing the Content-Disposition header totally
-                if (!(empty($disposition))) {
-                    $encoded_name = $this->encodeHeader($this->secureHeader($name));
-                    if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) {
-                        $mime[] = sprintf(
-                            'Content-Disposition: %s; filename="%s"%s',
-                            $disposition,
-                            $encoded_name,
-                            $this->LE . $this->LE
-                        );
-                    } else {
-                        $mime[] = sprintf(
-                            'Content-Disposition: %s; filename=%s%s',
-                            $disposition,
-                            $encoded_name,
-                            $this->LE . $this->LE
-                        );
-                    }
-                } else {
-                    $mime[] = $this->LE;
-                }
-
-                // Encode as string attachment
-                if ($bString) {
-                    $mime[] = $this->encodeString($string, $encoding);
-                    if ($this->isError()) {
-                        return '';
-                    }
-                    $mime[] = $this->LE . $this->LE;
-                } else {
-                    $mime[] = $this->encodeFile($path, $encoding);
-                    if ($this->isError()) {
-                        return '';
-                    }
-                    $mime[] = $this->LE . $this->LE;
-                }
-            }
-        }
-
-        $mime[] = sprintf('--%s--%s', $boundary, $this->LE);
-
-        return implode('', $mime);
-    }
-
-    /**
-     * Encode a file attachment in requested format.
-     * Returns an empty string on failure.
-     * @param string $path The full path to the file
-     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-     * @throws phpmailerException
-     * @see EncodeFile(encodeFile
-     * @access protected
-     * @return string
-     */
-    protected function encodeFile($path, $encoding = 'base64')
-    {
-        try {
-            if (!is_readable($path)) {
-                throw new phpmailerException($this->lang('file_open') . $path, self::STOP_CONTINUE);
-            }
-            $magic_quotes = get_magic_quotes_runtime();
-            if ($magic_quotes) {
-                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-                    set_magic_quotes_runtime(false);
-                } else {
-                    //Doesn't exist in PHP 5.4, but we don't need to check because
-                    //get_magic_quotes_runtime always returns false in 5.4+
-                    //so it will never get here
-                    ini_set('magic_quotes_runtime', 0);
-                }
-            }
-            $file_buffer = file_get_contents($path);
-            $file_buffer = $this->encodeString($file_buffer, $encoding);
-            if ($magic_quotes) {
-                if (version_compare(PHP_VERSION, '5.3.0', '<')) {
-                    set_magic_quotes_runtime($magic_quotes);
-                } else {
-                    ini_set('magic_quotes_runtime', ($magic_quotes?'1':'0'));
-                }
-            }
-            return $file_buffer;
-        } catch (Exception $exc) {
-            $this->setError($exc->getMessage());
-            return '';
-        }
-    }
-
-    /**
-     * Encode a string in requested format.
-     * Returns an empty string on failure.
-     * @param string $str The text to encode
-     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-     * @access public
-     * @return string
-     */
-    public function encodeString($str, $encoding = 'base64')
-    {
-        $encoded = '';
-        switch (strtolower($encoding)) {
-            case 'base64':
-                $encoded = chunk_split(base64_encode($str), 76, $this->LE);
-                break;
-            case '7bit':
-            case '8bit':
-                $encoded = $this->fixEOL($str);
-                // Make sure it ends with a line break
-                if (substr($encoded, -(strlen($this->LE))) != $this->LE) {
-                    $encoded .= $this->LE;
-                }
-                break;
-            case 'binary':
-                $encoded = $str;
-                break;
-            case 'quoted-printable':
-                $encoded = $this->encodeQP($str);
-                break;
-            default:
-                $this->setError($this->lang('encoding') . $encoding);
-                break;
-        }
-        return $encoded;
-    }
-
-    /**
-     * Encode a header string optimally.
-     * Picks shortest of Q, B, quoted-printable or none.
-     * @access public
-     * @param string $str
-     * @param string $position
-     * @return string
-     */
-    public function encodeHeader($str, $position = 'text')
-    {
-        $matchcount = 0;
-        switch (strtolower($position)) {
-            case 'phrase':
-                if (!preg_match('/[\200-\377]/', $str)) {
-                    // Can't use addslashes as we don't know the value of magic_quotes_sybase
-                    $encoded = addcslashes($str, "\0..\37\177\\\"");
-                    if (($str == $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
-                        return ($encoded);
-                    } else {
-                        return ("\"$encoded\"");
-                    }
-                }
-                $matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
-                break;
-            /** @noinspection PhpMissingBreakStatementInspection */
-            case 'comment':
-                $matchcount = preg_match_all('/[()"]/', $str, $matches);
-                // Intentional fall-through
-            case 'text':
-            default:
-                $matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
-                break;
-        }
-
-        if ($matchcount == 0) { // There are no chars that need encoding
-            return ($str);
-        }
-
-        $maxlen = 75 - 7 - strlen($this->CharSet);
-        // Try to select the encoding which should produce the shortest output
-        if ($matchcount > strlen($str) / 3) {
-            // More than a third of the content will need encoding, so B encoding will be most efficient
-            $encoding = 'B';
-            if (function_exists('mb_strlen') && $this->hasMultiBytes($str)) {
-                // Use a custom function which correctly encodes and wraps long
-                // multibyte strings without breaking lines within a character
-                $encoded = $this->base64EncodeWrapMB($str, "\n");
-            } else {
-                $encoded = base64_encode($str);
-                $maxlen -= $maxlen % 4;
-                $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
-            }
-        } else {
-            $encoding = 'Q';
-            $encoded = $this->encodeQ($str, $position);
-            $encoded = $this->wrapText($encoded, $maxlen, true);
-            $encoded = str_replace('=' . self::CRLF, "\n", trim($encoded));
-        }
-
-        $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
-        $encoded = trim(str_replace("\n", $this->LE, $encoded));
-
-        return $encoded;
-    }
-
-    /**
-     * Check if a string contains multi-byte characters.
-     * @access public
-     * @param string $str multi-byte text to wrap encode
-     * @return boolean
-     */
-    public function hasMultiBytes($str)
-    {
-        if (function_exists('mb_strlen')) {
-            return (strlen($str) > mb_strlen($str, $this->CharSet));
-        } else { // Assume no multibytes (we can't handle without mbstring functions anyway)
-            return false;
-        }
-    }
-
-    /**
-     * Does a string contain any 8-bit chars (in any charset)?
-     * @param string $text
-     * @return boolean
-     */
-    public function has8bitChars($text)
-    {
-        return (boolean)preg_match('/[\x80-\xFF]/', $text);
-    }
-
-    /**
-     * Encode and wrap long multibyte strings for mail headers
-     * without breaking lines within a character.
-     * Adapted from a function by paravoid
-     * @link http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
-     * @access public
-     * @param string $str multi-byte text to wrap encode
-     * @param string $linebreak string to use as linefeed/end-of-line
-     * @return string
-     */
-    public function base64EncodeWrapMB($str, $linebreak = null)
-    {
-        $start = '=?' . $this->CharSet . '?B?';
-        $end = '?=';
-        $encoded = '';
-        if ($linebreak === null) {
-            $linebreak = $this->LE;
-        }
-
-        $mb_length = mb_strlen($str, $this->CharSet);
-        // Each line must have length <= 75, including $start and $end
-        $length = 75 - strlen($start) - strlen($end);
-        // Average multi-byte ratio
-        $ratio = $mb_length / strlen($str);
-        // Base64 has a 4:3 ratio
-        $avgLength = floor($length * $ratio * .75);
-
-        for ($i = 0; $i < $mb_length; $i += $offset) {
-            $lookBack = 0;
-            do {
-                $offset = $avgLength - $lookBack;
-                $chunk = mb_substr($str, $i, $offset, $this->CharSet);
-                $chunk = base64_encode($chunk);
-                $lookBack++;
-            } while (strlen($chunk) > $length);
-            $encoded .= $chunk . $linebreak;
-        }
-
-        // Chomp the last linefeed
-        $encoded = substr($encoded, 0, -strlen($linebreak));
-        return $encoded;
-    }
-
-    /**
-     * Encode a string in quoted-printable format.
-     * According to RFC2045 section 6.7.
-     * @access public
-     * @param string $string The text to encode
-     * @param integer $line_max Number of chars allowed on a line before wrapping
-     * @return string
-     * @link http://www.php.net/manual/en/function.quoted-printable-decode.php#89417 Adapted from this comment
-     */
-    public function encodeQP($string, $line_max = 76)
-    {
-        if (function_exists('quoted_printable_encode')) { // Use native function if it's available (>= PHP5.3)
-            return $this->fixEOL(quoted_printable_encode($string));
-        }
-        // Fall back to a pure PHP implementation
-        $string = str_replace(
-            array('%20', '%0D%0A.', '%0D%0A', '%'),
-            array(' ', "\r\n=2E", "\r\n", '='),
-            rawurlencode($string)
-        );
-        $string = preg_replace('/[^\r\n]{' . ($line_max - 3) . '}[^=\r\n]{2}/', "$0=\r\n", $string);
-        return $this->fixEOL($string);
-    }
-
-    /**
-     * Backward compatibility wrapper for an old QP encoding function that was removed.
-     * @see PHPMailer::encodeQP()
-     * @access public
-     * @param string $string
-     * @param integer $line_max
-     * @param boolean $space_conv
-     * @return string
-     * @deprecated Use encodeQP instead.
-     */
-    public function encodeQPphp(
-        $string,
-        $line_max = 76,
-        /** @noinspection PhpUnusedParameterInspection */ $space_conv = false
-    ) {
-        return $this->encodeQP($string, $line_max);
-    }
-
-    /**
-     * Encode a string using Q encoding.
-     * @link http://tools.ietf.org/html/rfc2047
-     * @param string $str the text to encode
-     * @param string $position Where the text is going to be used, see the RFC for what that means
-     * @access public
-     * @return string
-     */
-    public function encodeQ($str, $position = 'text')
-    {
-        // There should not be any EOL in the string
-        $pattern = '';
-        $encoded = str_replace(array("\r", "\n"), '', $str);
-        switch (strtolower($position)) {
-            case 'phrase':
-                // RFC 2047 section 5.3
-                $pattern = '^A-Za-z0-9!*+\/ -';
-                break;
-            /** @noinspection PhpMissingBreakStatementInspection */
-            case 'comment':
-                // RFC 2047 section 5.2
-                $pattern = '\(\)"';
-                // intentional fall-through
-                // for this reason we build the $pattern without including delimiters and []
-            case 'text':
-            default:
-                // RFC 2047 section 5.1
-                // Replace every high ascii, control, =, ? and _ characters
-                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
-                break;
-        }
-        $matches = array();
-        if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) {
-            // If the string contains an '=', make sure it's the first thing we replace
-            // so as to avoid double-encoding
-            $eqkey = array_search('=', $matches[0]);
-            if (false !== $eqkey) {
-                unset($matches[0][$eqkey]);
-                array_unshift($matches[0], '=');
-            }
-            foreach (array_unique($matches[0]) as $char) {
-                $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
-            }
-        }
-        // Replace every spaces to _ (more readable than =20)
-        return str_replace(' ', '_', $encoded);
-    }
-
-
-    /**
-     * Add a string or binary attachment (non-filesystem).
-     * This method can be used to attach ascii or binary data,
-     * such as a BLOB record from a database.
-     * @param string $string String attachment data.
-     * @param string $filename Name of the attachment.
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type File extension (MIME) type.
-     * @param string $disposition Disposition to use
-     * @return void
-     */
-    public function addStringAttachment(
-        $string,
-        $filename,
-        $encoding = 'base64',
-        $type = '',
-        $disposition = 'attachment'
-    ) {
-        // If a MIME type is not specified, try to work it out from the file name
-        if ($type == '') {
-            $type = self::filenameToType($filename);
-        }
-        // Append to $attachment array
-        $this->attachment[] = array(
-            0 => $string,
-            1 => $filename,
-            2 => basename($filename),
-            3 => $encoding,
-            4 => $type,
-            5 => true, // isStringAttachment
-            6 => $disposition,
-            7 => 0
-        );
-    }
-
-    /**
-     * Add an embedded (inline) attachment from a file.
-     * This can include images, sounds, and just about any other document type.
-     * These differ from 'regular' attachments in that they are intended to be
-     * displayed inline with the message, not just attached for download.
-     * This is used in HTML messages that embed the images
-     * the HTML refers to using the $cid value.
-     * @param string $path Path to the attachment.
-     * @param string $cid Content ID of the attachment; Use this to reference
-     *        the content when using an embedded image in HTML.
-     * @param string $name Overrides the attachment name.
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type File MIME type.
-     * @param string $disposition Disposition to use
-     * @return boolean True on successfully adding an attachment
-     */
-    public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline')
-    {
-        if (!@is_file($path)) {
-            $this->setError($this->lang('file_access') . $path);
-            return false;
-        }
-
-        // If a MIME type is not specified, try to work it out from the file name
-        if ($type == '') {
-            $type = self::filenameToType($path);
-        }
-
-        $filename = basename($path);
-        if ($name == '') {
-            $name = $filename;
-        }
-
-        // Append to $attachment array
-        $this->attachment[] = array(
-            0 => $path,
-            1 => $filename,
-            2 => $name,
-            3 => $encoding,
-            4 => $type,
-            5 => false, // isStringAttachment
-            6 => $disposition,
-            7 => $cid
-        );
-        return true;
-    }
-
-    /**
-     * Add an embedded stringified attachment.
-     * This can include images, sounds, and just about any other document type.
-     * Be sure to set the $type to an image type for images:
-     * JPEG images use 'image/jpeg', GIF uses 'image/gif', PNG uses 'image/png'.
-     * @param string $string The attachment binary data.
-     * @param string $cid Content ID of the attachment; Use this to reference
-     *        the content when using an embedded image in HTML.
-     * @param string $name
-     * @param string $encoding File encoding (see $Encoding).
-     * @param string $type MIME type.
-     * @param string $disposition Disposition to use
-     * @return boolean True on successfully adding an attachment
-     */
-    public function addStringEmbeddedImage(
-        $string,
-        $cid,
-        $name = '',
-        $encoding = 'base64',
-        $type = '',
-        $disposition = 'inline'
-    ) {
-        // If a MIME type is not specified, try to work it out from the name
-        if ($type == '') {
-            $type = self::filenameToType($name);
-        }
-
-        // Append to $attachment array
-        $this->attachment[] = array(
-            0 => $string,
-            1 => $name,
-            2 => $name,
-            3 => $encoding,
-            4 => $type,
-            5 => true, // isStringAttachment
-            6 => $disposition,
-            7 => $cid
-        );
-        return true;
-    }
-
-    /**
-     * Check if an inline attachment is present.
-     * @access public
-     * @return boolean
-     */
-    public function inlineImageExists()
-    {
-        foreach ($this->attachment as $attachment) {
-            if ($attachment[6] == 'inline') {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check if an attachment (non-inline) is present.
-     * @return boolean
-     */
-    public function attachmentExists()
-    {
-        foreach ($this->attachment as $attachment) {
-            if ($attachment[6] == 'attachment') {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check if this message has an alternative body set.
-     * @return boolean
-     */
-    public function alternativeExists()
-    {
-        return !empty($this->AltBody);
-    }
-
-    /**
-     * Clear all To recipients.
-     * @return void
-     */
-    public function clearAddresses()
-    {
-        foreach ($this->to as $to) {
-            unset($this->all_recipients[strtolower($to[0])]);
-        }
-        $this->to = array();
-    }
-
-    /**
-     * Clear all CC recipients.
-     * @return void
-     */
-    public function clearCCs()
-    {
-        foreach ($this->cc as $cc) {
-            unset($this->all_recipients[strtolower($cc[0])]);
-        }
-        $this->cc = array();
-    }
-
-    /**
-     * Clear all BCC recipients.
-     * @return void
-     */
-    public function clearBCCs()
-    {
-        foreach ($this->bcc as $bcc) {
-            unset($this->all_recipients[strtolower($bcc[0])]);
-        }
-        $this->bcc = array();
-    }
-
-    /**
-     * Clear all ReplyTo recipients.
-     * @return void
-     */
-    public function clearReplyTos()
-    {
-        $this->ReplyTo = array();
-    }
-
-    /**
-     * Clear all recipient types.
-     * @return void
-     */
-    public function clearAllRecipients()
-    {
-        $this->to = array();
-        $this->cc = array();
-        $this->bcc = array();
-        $this->all_recipients = array();
-    }
-
-    /**
-     * Clear all filesystem, string, and binary attachments.
-     * @return void
-     */
-    public function clearAttachments()
-    {
-        $this->attachment = array();
-    }
-
-    /**
-     * Clear all custom headers.
-     * @return void
-     */
-    public function clearCustomHeaders()
-    {
-        $this->CustomHeader = array();
-    }
-
-    /**
-     * Add an error message to the error container.
-     * @access protected
-     * @param string $msg
-     * @return void
-     */
-    protected function setError($msg)
-    {
-        $this->error_count++;
-        if ($this->Mailer == 'smtp' and !is_null($this->smtp)) {
-            $lasterror = $this->smtp->getError();
-            if (!empty($lasterror) and array_key_exists('smtp_msg', $lasterror)) {
-                $msg .= '<p>' . $this->lang('smtp_error') . $lasterror['smtp_msg'] . "</p>\n";
-            }
-        }
-        $this->ErrorInfo = $msg;
-    }
-
-    /**
-     * Return an RFC 822 formatted date.
-     * @access public
-     * @return string
-     * @static
-     */
-    public static function rfcDate()
-    {
-        // Set the time zone to whatever the default is to avoid 500 errors
-        // Will default to UTC if it's not set properly in php.ini
-        date_default_timezone_set(@date_default_timezone_get());
-        return date('D, j M Y H:i:s O');
-    }
-
-    /**
-     * Get the server hostname.
-     * Returns 'localhost.localdomain' if unknown.
-     * @access protected
-     * @return string
-     */
-    protected function serverHostname()
-    {
-        $result = 'localhost.localdomain';
-        if (!empty($this->Hostname)) {
-            $result = $this->Hostname;
-        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER) and !empty($_SERVER['SERVER_NAME'])) {
-            $result = $_SERVER['SERVER_NAME'];
-        } elseif (function_exists('gethostname') && gethostname() !== false) {
-            $result = gethostname();
-        } elseif (php_uname('n') !== false) {
-            $result = php_uname('n');
-        }
-        return $result;
-    }
-
-    /**
-     * Get an error message in the current language.
-     * @access protected
-     * @param string $key
-     * @return string
-     */
-    protected function lang($key)
-    {
-        if (count($this->language) < 1) {
-            $this->setLanguage('en'); // set the default language
-        }
-
-        if (isset($this->language[$key])) {
-            return $this->language[$key];
-        } else {
-            return 'Language string failed to load: ' . $key;
-        }
-    }
-
-    /**
-     * Check if an error occurred.
-     * @access public
-     * @return boolean True if an error did occur.
-     */
-    public function isError()
-    {
-        return ($this->error_count > 0);
-    }
-
-    /**
-     * Ensure consistent line endings in a string.
-     * Changes every end of line from CRLF, CR or LF to $this->LE.
-     * @access public
-     * @param string $str String to fixEOL
-     * @return string
-     */
-    public function fixEOL($str)
-    {
-        // Normalise to \n
-        $nstr = str_replace(array("\r\n", "\r"), "\n", $str);
-        // Now convert LE as needed
-        if ($this->LE !== "\n") {
-            $nstr = str_replace("\n", $this->LE, $nstr);
-        }
-        return $nstr;
-    }
-
-    /**
-     * Add a custom header.
-     * $name value can be overloaded to contain
-     * both header name and value (name:value)
-     * @access public
-     * @param string $name Custom header name
-     * @param string $value Header value
-     * @return void
-     */
-    public function addCustomHeader($name, $value = null)
-    {
-        if ($value === null) {
-            // Value passed in as name:value
-            $this->CustomHeader[] = explode(':', $name, 2);
-        } else {
-            $this->CustomHeader[] = array($name, $value);
-        }
-    }
-
-    /**
-     * Create a message from an HTML string.
-     * Automatically makes modifications for inline images and backgrounds
-     * and creates a plain-text version by converting the HTML.
-     * Overwrites any existing values in $this->Body and $this->AltBody
-     * @access public
-     * @param string $message HTML message string
-     * @param string $basedir baseline directory for path
-     * @param boolean $advanced Whether to use the advanced HTML to text converter
-     * @return string $message
-     */
-    public function msgHTML($message, $basedir = '', $advanced = false)
-    {
-        preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images);
-        if (isset($images[2])) {
-            foreach ($images[2] as $imgindex => $url) {
-                // Convert data URIs into embedded images
-                if (preg_match('#^data:(image[^;,]*)(;base64)?,#', $url, $match)) {
-                    $data = substr($url, strpos($url, ','));
-                    if ($match[2]) {
-                        $data = base64_decode($data);
-                    } else {
-                        $data = rawurldecode($data);
-                    }
-                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
-                    if ($this->addStringEmbeddedImage($data, $cid, '', 'base64', $match[1])) {
-                        $message = str_replace($images[0][$imgindex], $images[1][$imgindex] . '="cid:' . $cid . '"', $message);
-                    }
-                } elseif (!preg_match('#^[A-z]+://#', $url)) {
-                    // Do not change urls for absolute images (thanks to corvuscorax)
-                    $filename = basename($url);
-                    $directory = dirname($url);
-                    if ($directory == '.') {
-                        $directory = '';
-                    }
-                    $cid = md5($url) . '@phpmailer.0'; // RFC2392 S 2
-                    if (strlen($basedir) > 1 && substr($basedir, -1) != '/') {
-                        $basedir .= '/';
-                    }
-                    if (strlen($directory) > 1 && substr($directory, -1) != '/') {
-                        $directory .= '/';
-                    }
-                    if ($this->addEmbeddedImage(
-                        $basedir . $directory . $filename,
-                        $cid,
-                        $filename,
-                        'base64',
-                        self::_mime_types((string)self::mb_pathinfo($filename, PATHINFO_EXTENSION))
-                    )
-                    ) {
-                        $message = preg_replace(
-                            '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
-                            $images[1][$imgindex] . '="cid:' . $cid . '"',
-                            $message
-                        );
-                    }
-                }
-            }
-        }
-        $this->isHTML(true);
-        // Convert all message body line breaks to CRLF, makes quoted-printable encoding work much better
-        $this->Body = $this->normalizeBreaks($message);
-        $this->AltBody = $this->normalizeBreaks($this->html2text($message, $advanced));
-        if (empty($this->AltBody)) {
-            $this->AltBody = 'To view this email message, open it in a program that understands HTML!' .
-                self::CRLF . self::CRLF;
-        }
-        return $this->Body;
-    }
-
-    /**
-     * Convert an HTML string into plain text.
-     * @param string $html The HTML text to convert
-     * @param boolean $advanced Should this use the more complex html2text converter or just a simple one?
-     * @return string
-     */
-    public function html2text($html, $advanced = false)
-    {
-        if ($advanced) {
-            require_once(MCR_TOOL_PATH.'smtp/class.html2text.php');
-            $htmlconverter = new html2text($html);
-            return $htmlconverter->get_text();
-        }
-        return html_entity_decode(
-            trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))),
-            ENT_QUOTES,
-            $this->CharSet
-        );
-    }
-
-    /**
-     * Get the MIME type for a file extension.
-     * @param string $ext File extension
-     * @access public
-     * @return string MIME type of file.
-     * @static
-     */
-    public static function _mime_types($ext = '')
-    {
-        $mimes = array(
-            'xl'    => 'application/excel',
-            'js'    => 'application/javascript',
-            'hqx'   => 'application/mac-binhex40',
-            'cpt'   => 'application/mac-compactpro',
-            'bin'   => 'application/macbinary',
-            'doc'   => 'application/msword',
-            'word'  => 'application/msword',
-            'class' => 'application/octet-stream',
-            'dll'   => 'application/octet-stream',
-            'dms'   => 'application/octet-stream',
-            'exe'   => 'application/octet-stream',
-            'lha'   => 'application/octet-stream',
-            'lzh'   => 'application/octet-stream',
-            'psd'   => 'application/octet-stream',
-            'sea'   => 'application/octet-stream',
-            'so'    => 'application/octet-stream',
-            'oda'   => 'application/oda',
-            'pdf'   => 'application/pdf',
-            'ai'    => 'application/postscript',
-            'eps'   => 'application/postscript',
-            'ps'    => 'application/postscript',
-            'smi'   => 'application/smil',
-            'smil'  => 'application/smil',
-            'mif'   => 'application/vnd.mif',
-            'xls'   => 'application/vnd.ms-excel',
-            'ppt'   => 'application/vnd.ms-powerpoint',
-            'wbxml' => 'application/vnd.wap.wbxml',
-            'wmlc'  => 'application/vnd.wap.wmlc',
-            'dcr'   => 'application/x-director',
-            'dir'   => 'application/x-director',
-            'dxr'   => 'application/x-director',
-            'dvi'   => 'application/x-dvi',
-            'gtar'  => 'application/x-gtar',
-            'php3'  => 'application/x-httpd-php',
-            'php4'  => 'application/x-httpd-php',
-            'php'   => 'application/x-httpd-php',
-            'phtml' => 'application/x-httpd-php',
-            'phps'  => 'application/x-httpd-php-source',
-            'swf'   => 'application/x-shockwave-flash',
-            'sit'   => 'application/x-stuffit',
-            'tar'   => 'application/x-tar',
-            'tgz'   => 'application/x-tar',
-            'xht'   => 'application/xhtml+xml',
-            'xhtml' => 'application/xhtml+xml',
-            'zip'   => 'application/zip',
-            'mid'   => 'audio/midi',
-            'midi'  => 'audio/midi',
-            'mp2'   => 'audio/mpeg',
-            'mp3'   => 'audio/mpeg',
-            'mpga'  => 'audio/mpeg',
-            'aif'   => 'audio/x-aiff',
-            'aifc'  => 'audio/x-aiff',
-            'aiff'  => 'audio/x-aiff',
-            'ram'   => 'audio/x-pn-realaudio',
-            'rm'    => 'audio/x-pn-realaudio',
-            'rpm'   => 'audio/x-pn-realaudio-plugin',
-            'ra'    => 'audio/x-realaudio',
-            'wav'   => 'audio/x-wav',
-            'bmp'   => 'image/bmp',
-            'gif'   => 'image/gif',
-            'jpeg'  => 'image/jpeg',
-            'jpe'   => 'image/jpeg',
-            'jpg'   => 'image/jpeg',
-            'png'   => 'image/png',
-            'tiff'  => 'image/tiff',
-            'tif'   => 'image/tiff',
-            'eml'   => 'message/rfc822',
-            'css'   => 'text/css',
-            'html'  => 'text/html',
-            'htm'   => 'text/html',
-            'shtml' => 'text/html',
-            'log'   => 'text/plain',
-            'text'  => 'text/plain',
-            'txt'   => 'text/plain',
-            'rtx'   => 'text/richtext',
-            'rtf'   => 'text/rtf',
-            'vcf'   => 'text/vcard',
-            'vcard' => 'text/vcard',
-            'xml'   => 'text/xml',
-            'xsl'   => 'text/xml',
-            'mpeg'  => 'video/mpeg',
-            'mpe'   => 'video/mpeg',
-            'mpg'   => 'video/mpeg',
-            'mov'   => 'video/quicktime',
-            'qt'    => 'video/quicktime',
-            'rv'    => 'video/vnd.rn-realvideo',
-            'avi'   => 'video/x-msvideo',
-            'movie' => 'video/x-sgi-movie'
-        );
-        return (array_key_exists(strtolower($ext), $mimes) ? $mimes[strtolower($ext)]: 'application/octet-stream');
-    }
-
-    /**
-     * Map a file name to a MIME type.
-     * Defaults to 'application/octet-stream', i.e.. arbitrary binary data.
-     * @param string $filename A file name or full path, does not need to exist as a file
-     * @return string
-     * @static
-     */
-    public static function filenameToType($filename)
-    {
-        // In case the path is a URL, strip any query string before getting extension
-        $qpos = strpos($filename, '?');
-        if (false !== $qpos) {
-            $filename = substr($filename, 0, $qpos);
-        }
-        $pathinfo = self::mb_pathinfo($filename);
-        return self::_mime_types($pathinfo['extension']);
-    }
-
-    /**
-     * Multi-byte-safe pathinfo replacement.
-     * Drop-in replacement for pathinfo(), but multibyte-safe, cross-platform-safe, old-version-safe.
-     * Works similarly to the one in PHP >= 5.2.0
-     * @link http://www.php.net/manual/en/function.pathinfo.php#107461
-     * @param string $path A filename or path, does not need to exist as a file
-     * @param integer|string $options Either a PATHINFO_* constant,
-     *      or a string name to return only the specified piece, allows 'filename' to work on PHP < 5.2
-     * @return string|array
-     * @static
-     */
-    public static function mb_pathinfo($path, $options = null)
-    {
-        $ret = array('dirname' => '', 'basename' => '', 'extension' => '', 'filename' => '');
-        $pathinfo = array();
-        if (preg_match('%^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$%im', $path, $pathinfo)) {
-            if (array_key_exists(1, $pathinfo)) {
-                $ret['dirname'] = $pathinfo[1];
-            }
-            if (array_key_exists(2, $pathinfo)) {
-                $ret['basename'] = $pathinfo[2];
-            }
-            if (array_key_exists(5, $pathinfo)) {
-                $ret['extension'] = $pathinfo[5];
-            }
-            if (array_key_exists(3, $pathinfo)) {
-                $ret['filename'] = $pathinfo[3];
-            }
-        }
-        switch ($options) {
-            case PATHINFO_DIRNAME:
-            case 'dirname':
-                return $ret['dirname'];
-            case PATHINFO_BASENAME:
-            case 'basename':
-                return $ret['basename'];
-            case PATHINFO_EXTENSION:
-            case 'extension':
-                return $ret['extension'];
-            case PATHINFO_FILENAME:
-            case 'filename':
-                return $ret['filename'];
-            default:
-                return $ret;
-        }
-    }
-
-    /**
-     * Set or reset instance properties.
-     *
-     * Usage Example:
-     * $page->set('X-Priority', '3');
-     *
-     * @access public
-     * @param string $name
-     * @param mixed $value
-     * NOTE: will not work with arrays, there are no arrays to set/reset
-     * @throws phpmailerException
-     * @return boolean
-     * @TODO Should this not be using __set() magic function?
-     */
-    public function set($name, $value = '')
-    {
-        try {
-            if (isset($this->$name)) {
-                $this->$name = $value;
-            } else {
-                throw new phpmailerException($this->lang('variable_set') . $name, self::STOP_CRITICAL);
-            }
-        } catch (Exception $exc) {
-            $this->setError($exc->getMessage());
-            if ($exc->getCode() == self::STOP_CRITICAL) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Strip newlines to prevent header injection.
-     * @access public
-     * @param string $str
-     * @return string
-     */
-    public function secureHeader($str)
-    {
-        return trim(str_replace(array("\r", "\n"), '', $str));
-    }
-
-    /**
-     * Normalize line breaks in a string.
-     * Converts UNIX LF, Mac CR and Windows CRLF line breaks into a single line break format.
-     * Defaults to CRLF (for message bodies) and preserves consecutive breaks.
-     * @param string $text
-     * @param string $breaktype What kind of line break to use, defaults to CRLF
-     * @return string
-     * @access public
-     * @static
-     */
-    public static function normalizeBreaks($text, $breaktype = "\r\n")
-    {
-        return preg_replace('/(\r\n|\r|\n)/ms', $breaktype, $text);
-    }
-
-
-    /**
-     * Set the public and private key files and password for S/MIME signing.
-     * @access public
-     * @param string $cert_filename
-     * @param string $key_filename
-     * @param string $key_pass Password for private key
-     */
-    public function sign($cert_filename, $key_filename, $key_pass)
-    {
-        $this->sign_cert_file = $cert_filename;
-        $this->sign_key_file = $key_filename;
-        $this->sign_key_pass = $key_pass;
-    }
-
-    /**
-     * Quoted-Printable-encode a DKIM header.
-     * @access public
-     * @param string $txt
-     * @return string
-     */
-    public function DKIM_QP($txt)
-    {
-        $line = '';
-        for ($i = 0; $i < strlen($txt); $i++) {
-            $ord = ord($txt[$i]);
-            if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord == 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
-                $line .= $txt[$i];
-            } else {
-                $line .= '=' . sprintf('%02X', $ord);
-            }
-        }
-        return $line;
-    }
-
-    /**
-     * Generate a DKIM signature.
-     * @access public
-     * @param string $signHeader
-     * @throws phpmailerException
-     * @return string
-     */
-    public function DKIM_Sign($signHeader)
-    {
-        if (!defined('PKCS7_TEXT')) {
-            if ($this->exceptions) {
-                throw new phpmailerException($this->lang('signing') . ' OpenSSL extension missing.');
-            }
-            return '';
-        }
-        $privKeyStr = file_get_contents($this->DKIM_private);
-        if ($this->DKIM_passphrase != '') {
-            $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
-        } else {
-            $privKey = $privKeyStr;
-        }
-        if (openssl_sign($signHeader, $signature, $privKey)) {
-            return base64_encode($signature);
-        }
-        return '';
-    }
-
-    /**
-     * Generate a DKIM canonicalization header.
-     * @access public
-     * @param string $signHeader Header
-     * @return string
-     */
-    public function DKIM_HeaderC($signHeader)
-    {
-        $signHeader = preg_replace('/\r\n\s+/', ' ', $signHeader);
-        $lines = explode("\r\n", $signHeader);
-        foreach ($lines as $key => $line) {
-            list($heading, $value) = explode(':', $line, 2);
-            $heading = strtolower($heading);
-            $value = preg_replace('/\s+/', ' ', $value); // Compress useless spaces
-            $lines[$key] = $heading . ':' . trim($value); // Don't forget to remove WSP around the value
-        }
-        $signHeader = implode("\r\n", $lines);
-        return $signHeader;
-    }
-
-    /**
-     * Generate a DKIM canonicalization body.
-     * @access public
-     * @param string $body Message Body
-     * @return string
-     */
-    public function DKIM_BodyC($body)
-    {
-        if ($body == '') {
-            return "\r\n";
-        }
-        // stabilize line endings
-        $body = str_replace("\r\n", "\n", $body);
-        $body = str_replace("\n", "\r\n", $body);
-        // END stabilize line endings
-        while (substr($body, strlen($body) - 4, 4) == "\r\n\r\n") {
-            $body = substr($body, 0, strlen($body) - 2);
-        }
-        return $body;
-    }
-
-    /**
-     * Create the DKIM header and body in a new message header.
-     * @access public
-     * @param string $headers_line Header lines
-     * @param string $subject Subject
-     * @param string $body Body
-     * @return string
-     */
-    public function DKIM_Add($headers_line, $subject, $body)
-    {
-        $DKIMsignatureType = 'rsa-sha1'; // Signature & hash algorithms
-        $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
-        $DKIMquery = 'dns/txt'; // Query method
-        $DKIMtime = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
-        $subject_header = "Subject: $subject";
-        $headers = explode($this->LE, $headers_line);
-        $from_header = '';
-        $to_header = '';
-        $current = '';
-        foreach ($headers as $header) {
-            if (strpos($header, 'From:') === 0) {
-                $from_header = $header;
-                $current = 'from_header';
-            } elseif (strpos($header, 'To:') === 0) {
-                $to_header = $header;
-                $current = 'to_header';
-            } else {
-                if ($current && strpos($header, ' =?') === 0) {
-                    $current .= $header;
-                } else {
-                    $current = '';
-                }
-            }
-        }
-        $from = str_replace('|', '=7C', $this->DKIM_QP($from_header));
-        $to = str_replace('|', '=7C', $this->DKIM_QP($to_header));
-        $subject = str_replace(
-            '|',
-            '=7C',
-            $this->DKIM_QP($subject_header)
-        ); // Copied header fields (dkim-quoted-printable)
-        $body = $this->DKIM_BodyC($body);
-        $DKIMlen = strlen($body); // Length of body
-        $DKIMb64 = base64_encode(pack('H*', sha1($body))); // Base64 of packed binary SHA-1 hash of body
-        $ident = ($this->DKIM_identity == '') ? '' : ' i=' . $this->DKIM_identity . ';';
-        $dkimhdrs = 'DKIM-Signature: v=1; a=' .
-            $DKIMsignatureType . '; q=' .
-            $DKIMquery . '; l=' .
-            $DKIMlen . '; s=' .
-            $this->DKIM_selector .
-            ";\r\n" .
-            "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" .
-            "\th=From:To:Subject;\r\n" .
-            "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" .
-            "\tz=$from\r\n" .
-            "\t|$to\r\n" .
-            "\t|$subject;\r\n" .
-            "\tbh=" . $DKIMb64 . ";\r\n" .
-            "\tb=";
-        $toSign = $this->DKIM_HeaderC(
-            $from_header . "\r\n" . $to_header . "\r\n" . $subject_header . "\r\n" . $dkimhdrs
-        );
-        $signed = $this->DKIM_Sign($toSign);
-        return $dkimhdrs . $signed . "\r\n";
-    }
-
-    /**
-     * Allows for public read access to 'to' property.
-     * @access public
-     * @return array
-     */
-    public function getToAddresses()
-    {
-        return $this->to;
-    }
-
-    /**
-     * Allows for public read access to 'cc' property.
-     * @access public
-     * @return array
-     */
-    public function getCcAddresses()
-    {
-        return $this->cc;
-    }
-
-    /**
-     * Allows for public read access to 'bcc' property.
-     * @access public
-     * @return array
-     */
-    public function getBccAddresses()
-    {
-        return $this->bcc;
-    }
-
-    /**
-     * Allows for public read access to 'ReplyTo' property.
-     * @access public
-     * @return array
-     */
-    public function getReplyToAddresses()
-    {
-        return $this->ReplyTo;
-    }
-
-    /**
-     * Allows for public read access to 'all_recipients' property.
-     * @access public
-     * @return array
-     */
-    public function getAllRecipientAddresses()
-    {
-        return $this->all_recipients;
-    }
-
-    /**
-     * Perform a callback.
-     * @param boolean $isSent
-     * @param array $to
-     * @param array $cc
-     * @param array $bcc
-     * @param string $subject
-     * @param string $body
-     * @param string $from
-     */
-    protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from)
-    {
-        if (!empty($this->action_function) && is_callable($this->action_function)) {
-            $params = array($isSent, $to, $cc, $bcc, $subject, $body, $from);
-            call_user_func_array($this->action_function, $params);
-        }
-    }
-}
-
-/**
- * PHPMailer exception handler
- * @package PHPMailer
- */
-class phpmailerException extends Exception
-{
-    /**
-     * Prettify error message output
-     * @return string
-     */
-    public function errorMessage()
-    {
-        $errorMsg = '<strong>' . $this->getMessage() . "</strong><br />\n";
-        return $errorMsg;
-    }
-}
diff --git a/upload/engine/smtp/class.pop3.php b/upload/engine/smtp/class.pop3.php
deleted file mode 100644
index 984885f..0000000
--- a/upload/engine/smtp/class.pop3.php
+++ /dev/null
@@ -1,397 +0,0 @@
-<?php
-/**
- * PHPMailer POP-Before-SMTP Authentication Class.
- * PHP Version 5
- * @package PHPMailer
- * @link https://github.com/PHPMailer/PHPMailer/
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2014 Marcus Bointon
- * @copyright 2010 - 2012 Jim Jagielski
- * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @note This program is distributed in the hope that it will be useful - WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * PHPMailer POP-Before-SMTP Authentication Class.
- * Specifically for PHPMailer to use for RFC1939 POP-before-SMTP authentication.
- * Does not support APOP.
- * @package PHPMailer
- * @author Richard Davey (original author) <rich@corephp.co.uk>
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- */
-class POP3
-{
-    /**
-     * The POP3 PHPMailer Version number.
-     * @type string
-     * @access public
-     */
-    public $Version = '5.2.9';
-
-    /**
-     * Default POP3 port number.
-     * @type integer
-     * @access public
-     */
-    public $POP3_PORT = 110;
-
-    /**
-     * Default timeout in seconds.
-     * @type integer
-     * @access public
-     */
-    public $POP3_TIMEOUT = 30;
-
-    /**
-     * POP3 Carriage Return + Line Feed.
-     * @type string
-     * @access public
-     * @deprecated Use the constant instead
-     */
-    public $CRLF = "\r\n";
-
-    /**
-     * Debug display level.
-     * Options: 0 = no, 1+ = yes
-     * @type integer
-     * @access public
-     */
-    public $do_debug = 0;
-
-    /**
-     * POP3 mail server hostname.
-     * @type string
-     * @access public
-     */
-    public $host;
-
-    /**
-     * POP3 port number.
-     * @type integer
-     * @access public
-     */
-    public $port;
-
-    /**
-     * POP3 Timeout Value in seconds.
-     * @type integer
-     * @access public
-     */
-    public $tval;
-
-    /**
-     * POP3 username
-     * @type string
-     * @access public
-     */
-    public $username;
-
-    /**
-     * POP3 password.
-     * @type string
-     * @access public
-     */
-    public $password;
-
-    /**
-     * Resource handle for the POP3 connection socket.
-     * @type resource
-     * @access private
-     */
-    private $pop_conn;
-
-    /**
-     * Are we connected?
-     * @type boolean
-     * @access private
-     */
-    private $connected = false;
-
-    /**
-     * Error container.
-     * @type array
-     * @access private
-     */
-    private $errors = array();
-
-    /**
-     * Line break constant
-     */
-    const CRLF = "\r\n";
-
-    /**
-     * Simple static wrapper for all-in-one POP before SMTP
-     * @param $host
-     * @param boolean $port
-     * @param boolean $tval
-     * @param string $username
-     * @param string $password
-     * @param integer $debug_level
-     * @return boolean
-     */
-    public static function popBeforeSmtp(
-        $host,
-        $port = false,
-        $tval = false,
-        $username = '',
-        $password = '',
-        $debug_level = 0
-    ) {
-        $pop = new POP3;
-        return $pop->authorise($host, $port, $tval, $username, $password, $debug_level);
-    }
-
-    /**
-     * Authenticate with a POP3 server.
-     * A connect, login, disconnect sequence
-     * appropriate for POP-before SMTP authorisation.
-     * @access public
-     * @param string $host The hostname to connect to
-     * @param integer|boolean $port The port number to connect to
-     * @param integer|boolean $timeout The timeout value
-     * @param string $username
-     * @param string $password
-     * @param integer $debug_level
-     * @return boolean
-     */
-    public function authorise($host, $port = false, $timeout = false, $username = '', $password = '', $debug_level = 0)
-    {
-        $this->host = $host;
-        // If no port value provided, use default
-        if (false === $port) {
-            $this->port = $this->POP3_PORT;
-        } else {
-            $this->port = (integer)$port;
-        }
-        // If no timeout value provided, use default
-        if (false === $timeout) {
-            $this->tval = $this->POP3_TIMEOUT;
-        } else {
-            $this->tval = (integer)$timeout;
-        }
-        $this->do_debug = $debug_level;
-        $this->username = $username;
-        $this->password = $password;
-        //  Reset the error log
-        $this->errors = array();
-        //  connect
-        $result = $this->connect($this->host, $this->port, $this->tval);
-        if ($result) {
-            $login_result = $this->login($this->username, $this->password);
-            if ($login_result) {
-                $this->disconnect();
-                return true;
-            }
-        }
-        // We need to disconnect regardless of whether the login succeeded
-        $this->disconnect();
-        return false;
-    }
-
-    /**
-     * Connect to a POP3 server.
-     * @access public
-     * @param string $host
-     * @param integer|boolean $port
-     * @param integer $tval
-     * @return boolean
-     */
-    public function connect($host, $port = false, $tval = 30)
-    {
-        //  Are we already connected?
-        if ($this->connected) {
-            return true;
-        }
-
-        //On Windows this will raise a PHP Warning error if the hostname doesn't exist.
-        //Rather than suppress it with @fsockopen, capture it cleanly instead
-        set_error_handler(array($this, 'catchWarning'));
-
-        if (false === $port) {
-            $port = $this->POP3_PORT;
-        }
-
-        //  connect to the POP3 server
-        $this->pop_conn = fsockopen(
-            $host, //  POP3 Host
-            $port, //  Port #
-            $errno, //  Error Number
-            $errstr, //  Error Message
-            $tval
-        ); //  Timeout (seconds)
-        //  Restore the error handler
-        restore_error_handler();
-
-        //  Did we connect?
-        if (false === $this->pop_conn) {
-            //  It would appear not...
-            $this->setError(array(
-                'error' => "Failed to connect to server $host on port $port",
-                'errno' => $errno,
-                'errstr' => $errstr
-            ));
-            return false;
-        }
-
-        //  Increase the stream time-out
-        stream_set_timeout($this->pop_conn, $tval, 0);
-
-        //  Get the POP3 server response
-        $pop3_response = $this->getResponse();
-        //  Check for the +OK
-        if ($this->checkResponse($pop3_response)) {
-            //  The connection is established and the POP3 server is talking
-            $this->connected = true;
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Log in to the POP3 server.
-     * Does not support APOP (RFC 2828, 4949).
-     * @access public
-     * @param string $username
-     * @param string $password
-     * @return boolean
-     */
-    public function login($username = '', $password = '')
-    {
-        if (!$this->connected) {
-            $this->setError('Not connected to POP3 server');
-        }
-        if (empty($username)) {
-            $username = $this->username;
-        }
-        if (empty($password)) {
-            $password = $this->password;
-        }
-
-        // Send the Username
-        $this->sendString("USER $username" . self::CRLF);
-        $pop3_response = $this->getResponse();
-        if ($this->checkResponse($pop3_response)) {
-            // Send the Password
-            $this->sendString("PASS $password" . self::CRLF);
-            $pop3_response = $this->getResponse();
-            if ($this->checkResponse($pop3_response)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Disconnect from the POP3 server.
-     * @access public
-     */
-    public function disconnect()
-    {
-        $this->sendString('QUIT');
-        //The QUIT command may cause the daemon to exit, which will kill our connection
-        //So ignore errors here
-        try {
-            @fclose($this->pop_conn);
-        } catch (Exception $e) {
-            //Do nothing
-        };
-    }
-
-    /**
-     * Get a response from the POP3 server.
-     * $size is the maximum number of bytes to retrieve
-     * @param integer $size
-     * @return string
-     * @access private
-     */
-    private function getResponse($size = 128)
-    {
-        $response = fgets($this->pop_conn, $size);
-        if ($this->do_debug >= 1) {
-            echo "Server -> Client: $response";
-        }
-        return $response;
-    }
-
-    /**
-     * Send raw data to the POP3 server.
-     * @param string $string
-     * @return integer
-     * @access private
-     */
-    private function sendString($string)
-    {
-        if ($this->pop_conn) {
-            if ($this->do_debug >= 2) { //Show client messages when debug >= 2
-                echo "Client -> Server: $string";
-            }
-            return fwrite($this->pop_conn, $string, strlen($string));
-        }
-        return 0;
-    }
-
-    /**
-     * Checks the POP3 server response.
-     * Looks for for +OK or -ERR.
-     * @param string $string
-     * @return boolean
-     * @access private
-     */
-    private function checkResponse($string)
-    {
-        if (substr($string, 0, 3) !== '+OK') {
-            $this->setError(array(
-                'error' => "Server reported an error: $string",
-                'errno' => 0,
-                'errstr' => ''
-            ));
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Add an error to the internal error store.
-     * Also display debug output if it's enabled.
-     * @param $error
-     */
-    private function setError($error)
-    {
-        $this->errors[] = $error;
-        if ($this->do_debug >= 1) {
-            echo '<pre>';
-            foreach ($this->errors as $error) {
-                print_r($error);
-            }
-            echo '</pre>';
-        }
-    }
-
-    /**
-     * POP3 connection error handler.
-     * @param integer $errno
-     * @param string $errstr
-     * @param string $errfile
-     * @param integer $errline
-     * @access private
-     */
-    private function catchWarning($errno, $errstr, $errfile, $errline)
-    {
-        $this->setError(array(
-            'error' => "Connecting to the POP3 server raised a PHP warning: ",
-            'errno' => $errno,
-            'errstr' => $errstr,
-            'errfile' => $errfile,
-            'errline' => $errline
-        ));
-    }
-}
diff --git a/upload/engine/smtp/class.smtp.php b/upload/engine/smtp/class.smtp.php
deleted file mode 100644
index d699197..0000000
--- a/upload/engine/smtp/class.smtp.php
+++ /dev/null
@@ -1,1132 +0,0 @@
-<?php
-/**
- * PHPMailer RFC821 SMTP email transport class.
- * PHP Version 5
- * @package PHPMailer
- * @link https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author Brent R. Matzelle (original founder)
- * @copyright 2014 Marcus Bointon
- * @copyright 2010 - 2012 Jim Jagielski
- * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @note This program is distributed in the hope that it will be useful - WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * PHPMailer RFC821 SMTP email transport class.
- * Implements RFC 821 SMTP commands and provides some utility methods for sending mail to an SMTP server.
- * @package PHPMailer
- * @author Chris Ryan
- * @author Marcus Bointon <phpmailer@synchromedia.co.uk>
- */
-class SMTP
-{
-    /**
-     * The PHPMailer SMTP version number.
-     * @type string
-     */
-    const VERSION = '5.2.9';
-
-    /**
-     * SMTP line break constant.
-     * @type string
-     */
-    const CRLF = "\r\n";
-
-    /**
-     * The SMTP port to use if one is not specified.
-     * @type integer
-     */
-    const DEFAULT_SMTP_PORT = 25;
-
-    /**
-     * The maximum line length allowed by RFC 2822 section 2.1.1
-     * @type integer
-     */
-    const MAX_LINE_LENGTH = 998;
-
-    /**
-     * Debug level for no output
-     */
-    const DEBUG_OFF = 0;
-
-    /**
-     * Debug level to show client -> server messages
-     */
-    const DEBUG_CLIENT = 1;
-
-    /**
-     * Debug level to show client -> server and server -> client messages
-     */
-    const DEBUG_SERVER = 2;
-
-    /**
-     * Debug level to show connection status, client -> server and server -> client messages
-     */
-    const DEBUG_CONNECTION = 3;
-
-    /**
-     * Debug level to show all messages
-     */
-    const DEBUG_LOWLEVEL = 4;
-
-    /**
-     * The PHPMailer SMTP Version number.
-     * @type string
-     * @deprecated Use the `VERSION` constant instead
-     * @see SMTP::VERSION
-     */
-    public $Version = '5.2.9';
-
-    /**
-     * SMTP server port number.
-     * @type integer
-     * @deprecated This is only ever used as a default value, so use the `DEFAULT_SMTP_PORT` constant instead
-     * @see SMTP::DEFAULT_SMTP_PORT
-     */
-    public $SMTP_PORT = 25;
-
-    /**
-     * SMTP reply line ending.
-     * @type string
-     * @deprecated Use the `CRLF` constant instead
-     * @see SMTP::CRLF
-     */
-    public $CRLF = "\r\n";
-
-    /**
-     * Debug output level.
-     * Options:
-     * * self::DEBUG_OFF (`0`) No debug output, default
-     * * self::DEBUG_CLIENT (`1`) Client commands
-     * * self::DEBUG_SERVER (`2`) Client commands and server responses
-     * * self::DEBUG_CONNECTION (`3`) As DEBUG_SERVER plus connection status
-     * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages
-     * @type integer
-     */
-    public $do_debug = self::DEBUG_OFF;
-
-    /**
-     * How to handle debug output.
-     * Options:
-     * * `echo` Output plain-text as-is, appropriate for CLI
-     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
-     * * `error_log` Output to error log as configured in php.ini
-     *
-     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
-     * <code>
-     * $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
-     * </code>
-     * @type string|callable
-     */
-    public $Debugoutput = 'echo';
-
-    /**
-     * Whether to use VERP.
-     * @link http://en.wikipedia.org/wiki/Variable_envelope_return_path
-     * @link http://www.postfix.org/VERP_README.html Info on VERP
-     * @type boolean
-     */
-    public $do_verp = false;
-
-    /**
-     * The timeout value for connection, in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
-     * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
-     * @link http://tools.ietf.org/html/rfc2821#section-4.5.3.2
-     * @type integer
-     */
-    public $Timeout = 300;
-
-    /**
-     * How long to wait for commands to complete, in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2
-     * @type integer
-     */
-    public $Timelimit = 300;
-
-    /**
-     * The socket for the server connection.
-     * @type resource
-     */
-    protected $smtp_conn;
-
-    /**
-     * Error message, if any, for the last call.
-     * @type array
-     */
-    protected $error = array();
-
-    /**
-     * The reply the server sent to us for HELO.
-     * If null, no HELO string has yet been received.
-     * @type string|null
-     */
-    protected $helo_rply = null;
-
-    /**
-     * The set of SMTP extensions sent in reply to EHLO command.
-     * Indexes of the array are extension names.
-     * Value at index 'HELO' or 'EHLO' (according to command that was sent)
-     * represents the server name. In case of HELO it is the only element of the array.
-     * Other values can be boolean TRUE or an array containing extension options.
-     * If null, no HELO/EHLO string has yet been received.
-     * @type array|null
-     */
-    protected $server_caps = null;
-
-    /**
-     * The most recent reply received from the server.
-     * @type string
-     */
-    protected $last_reply = '';
-
-    /**
-     * Output debugging info via a user-selected method.
-     * @see SMTP::$Debugoutput
-     * @see SMTP::$do_debug
-     * @param string $str Debug string to output
-     * @param integer $level The debug level of this message; see DEBUG_* constants
-     * @return void
-     */
-    protected function edebug($str, $level = 0)
-    {
-        if ($level > $this->do_debug) {
-            return;
-        }
-        //Avoid clash with built-in function names
-        if (!in_array($this->Debugoutput, array('error_log', 'html', 'echo')) and is_callable($this->Debugoutput)) {
-            call_user_func($this->Debugoutput, $str, $this->do_debug);
-            return;
-        }
-        switch ($this->Debugoutput) {
-            case 'error_log':
-                //Don't output, just log
-                error_log($str);
-                break;
-            case 'html':
-                //Cleans up output a bit for a better looking, HTML-safe output
-                echo htmlentities(
-                    preg_replace('/[\r\n]+/', '', $str),
-                    ENT_QUOTES,
-                    'UTF-8'
-                )
-                . "<br>\n";
-                break;
-            case 'echo':
-            default:
-                //Normalize line breaks
-                $str = preg_replace('/(\r\n|\r|\n)/ms', "\n", $str);
-                echo gmdate('Y-m-d H:i:s') . "\t" . str_replace(
-                    "\n",
-                    "\n                   \t                  ",
-                    trim($str)
-                )."\n";
-        }
-    }
-
-    /**
-     * Connect to an SMTP server.
-     * @param string $host SMTP server IP or host name
-     * @param integer $port The port number to connect to
-     * @param integer $timeout How long to wait for the connection to open
-     * @param array $options An array of options for stream_context_create()
-     * @access public
-     * @return boolean
-     */
-    public function connect($host, $port = null, $timeout = 30, $options = array())
-    {
-        static $streamok;
-        //This is enabled by default since 5.0.0 but some providers disable it
-        //Check this once and cache the result
-        if (is_null($streamok)) {
-            $streamok = function_exists('stream_socket_client');
-        }
-        // Clear errors to avoid confusion
-        $this->error = array();
-        // Make sure we are __not__ connected
-        if ($this->connected()) {
-            // Already connected, generate error
-            $this->error = array('error' => 'Already connected to a server');
-            return false;
-        }
-        if (empty($port)) {
-            $port = self::DEFAULT_SMTP_PORT;
-        }
-        // Connect to the SMTP server
-        $this->edebug(
-            "Connection: opening to $host:$port, t=$timeout, opt=".var_export($options, true),
-            self::DEBUG_CONNECTION
-        );
-        $errno = 0;
-        $errstr = '';
-        if ($streamok) {
-            $socket_context = stream_context_create($options);
-            //Suppress errors; connection failures are handled at a higher level
-            $this->smtp_conn = @stream_socket_client(
-                $host . ":" . $port,
-                $errno,
-                $errstr,
-                $timeout,
-                STREAM_CLIENT_CONNECT,
-                $socket_context
-            );
-        } else {
-            //Fall back to fsockopen which should work in more places, but is missing some features
-            $this->edebug(
-                "Connection: stream_socket_client not available, falling back to fsockopen",
-                self::DEBUG_CONNECTION
-            );
-            $this->smtp_conn = fsockopen(
-                $host,
-                $port,
-                $errno,
-                $errstr,
-                $timeout
-            );
-        }
-        // Verify we connected properly
-        if (!is_resource($this->smtp_conn)) {
-            $this->error = array(
-                'error' => 'Failed to connect to server',
-                'errno' => $errno,
-                'errstr' => $errstr
-            );
-            $this->edebug(
-                'SMTP ERROR: ' . $this->error['error']
-                . ": $errstr ($errno)",
-                self::DEBUG_CLIENT
-            );
-            return false;
-        }
-        $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
-        // SMTP server can take longer to respond, give longer timeout for first read
-        // Windows does not have support for this timeout function
-        if (substr(PHP_OS, 0, 3) != 'WIN') {
-            $max = ini_get('max_execution_time');
-            if ($max != 0 && $timeout > $max) { // Don't bother if unlimited
-                @set_time_limit($timeout);
-            }
-            stream_set_timeout($this->smtp_conn, $timeout, 0);
-        }
-        // Get any announcement
-        $announce = $this->get_lines();
-        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
-        return true;
-    }
-
-    /**
-     * Initiate a TLS (encrypted) session.
-     * @access public
-     * @return boolean
-     */
-    public function startTLS()
-    {
-        if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
-            return false;
-        }
-        // Begin encrypted connection
-        if (!stream_socket_enable_crypto(
-            $this->smtp_conn,
-            true,
-            STREAM_CRYPTO_METHOD_TLS_CLIENT
-        )) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Perform SMTP authentication.
-     * Must be run after hello().
-     * @see hello()
-     * @param string $username    The user name
-     * @param string $password    The password
-     * @param string $authtype    The auth type (PLAIN, LOGIN, NTLM, CRAM-MD5)
-     * @param string $realm       The auth realm for NTLM
-     * @param string $workstation The auth workstation for NTLM
-     * @access public
-     * @return boolean True if successfully authenticated.
-     */
-    public function authenticate(
-        $username,
-        $password,
-        $authtype = null,
-        $realm = '',
-        $workstation = ''
-    ) {
-        if (!$this->server_caps) {
-            $this->error = array('error' => 'Authentication is not allowed before HELO/EHLO');
-            return false;
-        }
-
-        if (array_key_exists('EHLO', $this->server_caps)) {
-        // SMTP extensions are available. Let's try to find a proper authentication method
-
-            if (!array_key_exists('AUTH', $this->server_caps)) {
-                $this->error = array( 'error' => 'Authentication is not allowed at this stage' );
-                // 'at this stage' means that auth may be allowed after the stage changes
-                // e.g. after STARTTLS
-                return false;
-            }
-
-            self::edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
-            self::edebug(
-                'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
-                self::DEBUG_LOWLEVEL
-            );
-
-            if (empty($authtype)) {
-                foreach (array('LOGIN', 'CRAM-MD5', 'NTLM', 'PLAIN') as $method) {
-                    if (in_array($method, $this->server_caps['AUTH'])) {
-                        $authtype = $method;
-                        break;
-                    }
-                }
-                if (empty($authtype)) {
-                    $this->error = array( 'error' => 'No supported authentication methods found' );
-                    return false;
-                }
-                self::edebug('Auth method selected: '.$authtype, self::DEBUG_LOWLEVEL);
-            }
-
-            if (!in_array($authtype, $this->server_caps['AUTH'])) {
-                $this->error = array( 'error' => 'The requested authentication method "'
-                    . $authtype . '" is not supported by the server' );
-                return false;
-            }
-        } elseif (empty($authtype)) {
-            $authtype = 'LOGIN';
-        }
-        switch ($authtype) {
-            case 'PLAIN':
-                // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
-                    return false;
-                }
-                // Send encoded username and password
-                if (!$this->sendCommand(
-                    'User & Password',
-                    base64_encode("\0" . $username . "\0" . $password),
-                    235
-                )
-                ) {
-                    return false;
-                }
-                break;
-            case 'LOGIN':
-                // Start authentication
-                if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
-                    return false;
-                }
-                if (!$this->sendCommand("Username", base64_encode($username), 334)) {
-                    return false;
-                }
-                if (!$this->sendCommand("Password", base64_encode($password), 235)) {
-                    return false;
-                }
-                break;
-            case 'NTLM':
-                /*
-                 * ntlm_sasl_client.php
-                 * Bundled with Permission
-                 *
-                 * How to telnet in windows:
-                 * http://technet.microsoft.com/en-us/library/aa995718%28EXCHG.65%29.aspx
-                 * PROTOCOL Docs http://curl.haxx.se/rfc/ntlm.html#ntlmSmtpAuthentication
-                 */
-                require_once 'extras/ntlm_sasl_client.php';
-                $temp = new stdClass();
-                $ntlm_client = new ntlm_sasl_client_class;
-                //Check that functions are available
-                if (!$ntlm_client->Initialize($temp)) {
-                    $this->error = array('error' => $temp->error);
-                    $this->edebug(
-                        'You need to enable some modules in your php.ini file: '
-                        . $this->error['error'],
-                        self::DEBUG_CLIENT
-                    );
-                    return false;
-                }
-                //msg1
-                $msg1 = $ntlm_client->TypeMsg1($realm, $workstation); //msg1
-
-                if (!$this->sendCommand(
-                    'AUTH NTLM',
-                    'AUTH NTLM ' . base64_encode($msg1),
-                    334
-                )
-                ) {
-                    return false;
-                }
-                //Though 0 based, there is a white space after the 3 digit number
-                //msg2
-                $challenge = substr($this->last_reply, 3);
-                $challenge = base64_decode($challenge);
-                $ntlm_res = $ntlm_client->NTLMResponse(
-                    substr($challenge, 24, 8),
-                    $password
-                );
-                //msg3
-                $msg3 = $ntlm_client->TypeMsg3(
-                    $ntlm_res,
-                    $username,
-                    $realm,
-                    $workstation
-                );
-                // send encoded username
-                return $this->sendCommand('Username', base64_encode($msg3), 235);
-            case 'CRAM-MD5':
-                // Start authentication
-                if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
-                    return false;
-                }
-                // Get the challenge
-                $challenge = base64_decode(substr($this->last_reply, 4));
-
-                // Build the response
-                $response = $username . ' ' . $this->hmac($challenge, $password);
-
-                // send encoded credentials
-                return $this->sendCommand('Username', base64_encode($response), 235);
-            default:
-                $this->error = array( 'error' => 'Authentication method "' . $authtype . '" is not supported' );
-                return false;
-        }
-        return true;
-    }
-
-    /**
-     * Calculate an MD5 HMAC hash.
-     * Works like hash_hmac('md5', $data, $key)
-     * in case that function is not available
-     * @param string $data The data to hash
-     * @param string $key  The key to hash with
-     * @access protected
-     * @return string
-     */
-    protected function hmac($data, $key)
-    {
-        if (function_exists('hash_hmac')) {
-            return hash_hmac('md5', $data, $key);
-        }
-
-        // The following borrowed from
-        // http://php.net/manual/en/function.mhash.php#27225
-
-        // RFC 2104 HMAC implementation for php.
-        // Creates an md5 HMAC.
-        // Eliminates the need to install mhash to compute a HMAC
-        // by Lance Rushing
-
-        $bytelen = 64; // byte length for md5
-        if (strlen($key) > $bytelen) {
-            $key = pack('H*', md5($key));
-        }
-        $key = str_pad($key, $bytelen, chr(0x00));
-        $ipad = str_pad('', $bytelen, chr(0x36));
-        $opad = str_pad('', $bytelen, chr(0x5c));
-        $k_ipad = $key ^ $ipad;
-        $k_opad = $key ^ $opad;
-
-        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
-    }
-
-    /**
-     * Check connection state.
-     * @access public
-     * @return boolean True if connected.
-     */
-    public function connected()
-    {
-        if (is_resource($this->smtp_conn)) {
-            $sock_status = stream_get_meta_data($this->smtp_conn);
-            if ($sock_status['eof']) {
-                // The socket is valid but we are not connected
-                $this->edebug(
-                    'SMTP NOTICE: EOF caught while checking if connected',
-                    self::DEBUG_CLIENT
-                );
-                $this->close();
-                return false;
-            }
-            return true; // everything looks good
-        }
-        return false;
-    }
-
-    /**
-     * Close the socket and clean up the state of the class.
-     * Don't use this function without first trying to use QUIT.
-     * @see quit()
-     * @access public
-     * @return void
-     */
-    public function close()
-    {
-        $this->error = array();
-        $this->server_caps = null;
-        $this->helo_rply = null;
-        if (is_resource($this->smtp_conn)) {
-            // close the connection and cleanup
-            fclose($this->smtp_conn);
-            $this->smtp_conn = null; //Makes for cleaner serialization
-            $this->edebug('Connection: closed', self::DEBUG_CONNECTION);
-        }
-    }
-
-    /**
-     * Send an SMTP DATA command.
-     * Issues a data command and sends the msg_data to the server,
-     * finializing the mail transaction. $msg_data is the message
-     * that is to be send with the headers. Each header needs to be
-     * on a single line followed by a <CRLF> with the message headers
-     * and the message body being separated by and additional <CRLF>.
-     * Implements rfc 821: DATA <CRLF>
-     * @param string $msg_data Message data to send
-     * @access public
-     * @return boolean
-     */
-    public function data($msg_data)
-    {
-        //This will use the standard timelimit
-        if (!$this->sendCommand('DATA', 'DATA', 354)) {
-            return false;
-        }
-
-        /* The server is ready to accept data!
-         * According to rfc821 we should not send more than 1000 characters on a single line (including the CRLF)
-         * so we will break the data up into lines by \r and/or \n then if needed we will break each of those into
-         * smaller lines to fit within the limit.
-         * We will also look for lines that start with a '.' and prepend an additional '.'.
-         * NOTE: this does not count towards line-length limit.
-         */
-
-        // Normalize line breaks before exploding
-        $lines = explode("\n", str_replace(array("\r\n", "\r"), "\n", $msg_data));
-
-        /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
-         * of the first line (':' separated) does not contain a space then it _should_ be a header and we will
-         * process all lines before a blank line as headers.
-         */
-
-        $field = substr($lines[0], 0, strpos($lines[0], ':'));
-        $in_headers = false;
-        if (!empty($field) && strpos($field, ' ') === false) {
-            $in_headers = true;
-        }
-
-        foreach ($lines as $line) {
-            $lines_out = array();
-            if ($in_headers and $line == '') {
-                $in_headers = false;
-            }
-            //We need to break this line up into several smaller lines
-            //This is a small micro-optimisation: isset($str[$len]) is equivalent to (strlen($str) > $len)
-            while (isset($line[self::MAX_LINE_LENGTH])) {
-                //Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on
-                //so as to avoid breaking in the middle of a word
-                $pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' ');
-                if (!$pos) { //Deliberately matches both false and 0
-                    //No nice break found, add a hard break
-                    $pos = self::MAX_LINE_LENGTH - 1;
-                    $lines_out[] = substr($line, 0, $pos);
-                    $line = substr($line, $pos);
-                } else {
-                    //Break at the found point
-                    $lines_out[] = substr($line, 0, $pos);
-                    //Move along by the amount we dealt with
-                    $line = substr($line, $pos + 1);
-                }
-                //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
-                if ($in_headers) {
-                    $line = "\t" . $line;
-                }
-            }
-            $lines_out[] = $line;
-
-            //Send the lines to the server
-            foreach ($lines_out as $line_out) {
-                //RFC2821 section 4.5.2
-                if (!empty($line_out) and $line_out[0] == '.') {
-                    $line_out = '.' . $line_out;
-                }
-                $this->client_send($line_out . self::CRLF);
-            }
-        }
-
-        //Message data has been sent, complete the command
-        //Increase timelimit for end of DATA command
-        $savetimelimit = $this->Timelimit;
-        $this->Timelimit = $this->Timelimit * 2;
-        $result = $this->sendCommand('DATA END', '.', 250);
-        //Restore timelimit
-        $this->Timelimit = $savetimelimit;
-        return $result;
-    }
-
-    /**
-     * Send an SMTP HELO or EHLO command.
-     * Used to identify the sending server to the receiving server.
-     * This makes sure that client and server are in a known state.
-     * Implements RFC 821: HELO <SP> <domain> <CRLF>
-     * and RFC 2821 EHLO.
-     * @param string $host The host name or IP to connect to
-     * @access public
-     * @return boolean
-     */
-    public function hello($host = '')
-    {
-        //Try extended hello first (RFC 2821)
-        return (boolean)($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
-    }
-
-    /**
-     * Send an SMTP HELO or EHLO command.
-     * Low-level implementation used by hello()
-     * @see hello()
-     * @param string $hello The HELO string
-     * @param string $host The hostname to say we are
-     * @access protected
-     * @return boolean
-     */
-    protected function sendHello($hello, $host)
-    {
-        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
-        $this->helo_rply = $this->last_reply;
-        if ($noerror) {
-            $this->parseHelloFields($hello);
-        } else {
-            $this->server_caps = null;
-        }
-        return $noerror;
-    }
-
-    /**
-     * Parse a reply to HELO/EHLO command to discover server extensions.
-     * In case of HELO, the only parameter that can be discovered is a server name.
-     * @access protected
-     * @param string $type - 'HELO' or 'EHLO'
-     */
-    protected function parseHelloFields($type)
-    {
-        $this->server_caps = array();
-        $lines = explode("\n", $this->last_reply);
-        foreach ($lines as $n => $s) {
-            $s = trim(substr($s, 4));
-            if (!$s) {
-                continue;
-            }
-            $fields = explode(' ', $s);
-            if ($fields) {
-                if (!$n) {
-                    $name = $type;
-                    $fields = $fields[0];
-                } else {
-                    $name = array_shift($fields);
-                    if ($name == 'SIZE') {
-                        $fields = ($fields) ? $fields[0] : 0;
-                    }
-                }
-                $this->server_caps[$name] = ($fields ? $fields : true);
-            }
-        }
-    }
-
-    /**
-     * Send an SMTP MAIL command.
-     * Starts a mail transaction from the email address specified in
-     * $from. Returns true if successful or false otherwise. If True
-     * the mail transaction is started and then one or more recipient
-     * commands may be called followed by a data command.
-     * Implements rfc 821: MAIL <SP> FROM:<reverse-path> <CRLF>
-     * @param string $from Source address of this message
-     * @access public
-     * @return boolean
-     */
-    public function mail($from)
-    {
-        $useVerp = ($this->do_verp ? ' XVERP' : '');
-        return $this->sendCommand(
-            'MAIL FROM',
-            'MAIL FROM:<' . $from . '>' . $useVerp,
-            250
-        );
-    }
-
-    /**
-     * Send an SMTP QUIT command.
-     * Closes the socket if there is no error or the $close_on_error argument is true.
-     * Implements from rfc 821: QUIT <CRLF>
-     * @param boolean $close_on_error Should the connection close if an error occurs?
-     * @access public
-     * @return boolean
-     */
-    public function quit($close_on_error = true)
-    {
-        $noerror = $this->sendCommand('QUIT', 'QUIT', 221);
-        $err = $this->error; //Save any error
-        if ($noerror or $close_on_error) {
-            $this->close();
-            $this->error = $err; //Restore any error from the quit command
-        }
-        return $noerror;
-    }
-
-    /**
-     * Send an SMTP RCPT command.
-     * Sets the TO argument to $toaddr.
-     * Returns true if the recipient was accepted false if it was rejected.
-     * Implements from rfc 821: RCPT <SP> TO:<forward-path> <CRLF>
-     * @param string $toaddr The address the message is being sent to
-     * @access public
-     * @return boolean
-     */
-    public function recipient($toaddr)
-    {
-        return $this->sendCommand(
-            'RCPT TO',
-            'RCPT TO:<' . $toaddr . '>',
-            array(250, 251)
-        );
-    }
-
-    /**
-     * Send an SMTP RSET command.
-     * Abort any transaction that is currently in progress.
-     * Implements rfc 821: RSET <CRLF>
-     * @access public
-     * @return boolean True on success.
-     */
-    public function reset()
-    {
-        return $this->sendCommand('RSET', 'RSET', 250);
-    }
-
-    /**
-     * Send a command to an SMTP server and check its return code.
-     * @param string $command       The command name - not sent to the server
-     * @param string $commandstring The actual command to send
-     * @param integer|array $expect     One or more expected integer success codes
-     * @access protected
-     * @return boolean True on success.
-     */
-    protected function sendCommand($command, $commandstring, $expect)
-    {
-        if (!$this->connected()) {
-            $this->error = array(
-                'error' => "Called $command without being connected"
-            );
-            return false;
-        }
-        $this->client_send($commandstring . self::CRLF);
-
-        $this->last_reply = $this->get_lines();
-        // Fetch SMTP code and possible error code explanation
-        $matches = array();
-        if (preg_match("/^([0-9]{3})[ -](?:([0-9]\\.[0-9]\\.[0-9]) )?/", $this->last_reply, $matches)) {
-            $code = $matches[1];
-            $code_ex = (count($matches) > 2 ? $matches[2] : null);
-            // Cut off error code from each response line
-            $detail = preg_replace(
-                "/{$code}[ -]".($code_ex ? str_replace('.', '\\.', $code_ex).' ' : '')."/m",
-                '',
-                $this->last_reply
-            );
-        } else { // Fall back to simple parsing if regex fails
-            $code = substr($this->last_reply, 0, 3);
-            $code_ex = null;
-            $detail = substr($this->last_reply, 4);
-        }
-
-        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
-
-        if (!in_array($code, (array)$expect)) {
-            $this->error = array(
-                'error' => "$command command failed",
-                'smtp_code' => $code,
-                'smtp_code_ex' => $code_ex,
-                'detail' => $detail
-            );
-            $this->edebug(
-                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
-                self::DEBUG_CLIENT
-            );
-            return false;
-        }
-
-        $this->error = array();
-        return true;
-    }
-
-    /**
-     * Send an SMTP SAML command.
-     * Starts a mail transaction from the email address specified in $from.
-     * Returns true if successful or false otherwise. If True
-     * the mail transaction is started and then one or more recipient
-     * commands may be called followed by a data command. This command
-     * will send the message to the users terminal if they are logged
-     * in and send them an email.
-     * Implements rfc 821: SAML <SP> FROM:<reverse-path> <CRLF>
-     * @param string $from The address the message is from
-     * @access public
-     * @return boolean
-     */
-    public function sendAndMail($from)
-    {
-        return $this->sendCommand('SAML', "SAML FROM:$from", 250);
-    }
-
-    /**
-     * Send an SMTP VRFY command.
-     * @param string $name The name to verify
-     * @access public
-     * @return boolean
-     */
-    public function verify($name)
-    {
-        return $this->sendCommand('VRFY', "VRFY $name", array(250, 251));
-    }
-
-    /**
-     * Send an SMTP NOOP command.
-     * Used to keep keep-alives alive, doesn't actually do anything
-     * @access public
-     * @return boolean
-     */
-    public function noop()
-    {
-        return $this->sendCommand('NOOP', 'NOOP', 250);
-    }
-
-    /**
-     * Send an SMTP TURN command.
-     * This is an optional command for SMTP that this class does not support.
-     * This method is here to make the RFC821 Definition complete for this class
-     * and _may_ be implemented in future
-     * Implements from rfc 821: TURN <CRLF>
-     * @access public
-     * @return boolean
-     */
-    public function turn()
-    {
-        $this->error = array(
-            'error' => 'The SMTP TURN command is not implemented'
-        );
-        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
-        return false;
-    }
-
-    /**
-     * Send raw data to the server.
-     * @param string $data The data to send
-     * @access public
-     * @return integer|boolean The number of bytes sent to the server or false on error
-     */
-    public function client_send($data)
-    {
-        $this->edebug("CLIENT -> SERVER: $data", self::DEBUG_CLIENT);
-        return fwrite($this->smtp_conn, $data);
-    }
-
-    /**
-     * Get the latest error.
-     * @access public
-     * @return array
-     */
-    public function getError()
-    {
-        return $this->error;
-    }
-
-    /**
-     * Get SMTP extensions available on the server
-     * @access public
-     * @return array|null
-     */
-    public function getServerExtList()
-    {
-        return $this->server_caps;
-    }
-
-    /**
-     * A multipurpose method
-     * The method works in three ways, dependent on argument value and current state
-     *   1. HELO/EHLO was not sent - returns null and set up $this->error
-     *   2. HELO was sent
-     *     $name = 'HELO': returns server name
-     *     $name = 'EHLO': returns boolean false
-     *     $name = any string: returns null and set up $this->error
-     *   3. EHLO was sent
-     *     $name = 'HELO'|'EHLO': returns server name
-     *     $name = any string: if extension $name exists, returns boolean True
-     *       or its options. Otherwise returns boolean False
-     * In other words, one can use this method to detect 3 conditions:
-     *  - null returned: handshake was not or we don't know about ext (refer to $this->error)
-     *  - false returned: the requested feature exactly not exists
-     *  - positive value returned: the requested feature exists
-     * @param string $name Name of SMTP extension or 'HELO'|'EHLO'
-     * @return mixed
-     */
-    public function getServerExt($name)
-    {
-        if (!$this->server_caps) {
-            $this->error = array('No HELO/EHLO was sent');
-            return null;
-        }
-
-        // the tight logic knot ;)
-        if (!array_key_exists($name, $this->server_caps)) {
-            if ($name == 'HELO') {
-                return $this->server_caps['EHLO'];
-            }
-            if ($name == 'EHLO' || array_key_exists('EHLO', $this->server_caps)) {
-                return false;
-            }
-            $this->error = array('HELO handshake was used. Client knows nothing about server extensions');
-            return null;
-        }
-
-        return $this->server_caps[$name];
-    }
-
-    /**
-     * Get the last reply from the server.
-     * @access public
-     * @return string
-     */
-    public function getLastReply()
-    {
-        return $this->last_reply;
-    }
-
-    /**
-     * Read the SMTP server's response.
-     * Either before eof or socket timeout occurs on the operation.
-     * With SMTP we can tell if we have more lines to read if the
-     * 4th character is '-' symbol. If it is a space then we don't
-     * need to read anything else.
-     * @access protected
-     * @return string
-     */
-    protected function get_lines()
-    {
-        // If the connection is bad, give up straight away
-        if (!is_resource($this->smtp_conn)) {
-            return '';
-        }
-        $data = '';
-        $endtime = 0;
-        stream_set_timeout($this->smtp_conn, $this->Timeout);
-        if ($this->Timelimit > 0) {
-            $endtime = time() + $this->Timelimit;
-        }
-        while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
-            $str = @fgets($this->smtp_conn, 515);
-            $this->edebug("SMTP -> get_lines(): \$data was \"$data\"", self::DEBUG_LOWLEVEL);
-            $this->edebug("SMTP -> get_lines(): \$str is \"$str\"", self::DEBUG_LOWLEVEL);
-            $data .= $str;
-            $this->edebug("SMTP -> get_lines(): \$data is \"$data\"", self::DEBUG_LOWLEVEL);
-            // If 4th character is a space, we are done reading, break the loop, micro-optimisation over strlen
-            if ((isset($str[3]) and $str[3] == ' ')) {
-                break;
-            }
-            // Timed-out? Log and break
-            $info = stream_get_meta_data($this->smtp_conn);
-            if ($info['timed_out']) {
-                $this->edebug(
-                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
-                    self::DEBUG_LOWLEVEL
-                );
-                break;
-            }
-            // Now check if reads took too long
-            if ($endtime and time() > $endtime) {
-                $this->edebug(
-                    'SMTP -> get_lines(): timelimit reached ('.
-                    $this->Timelimit . ' sec)',
-                    self::DEBUG_LOWLEVEL
-                );
-                break;
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Enable or disable VERP address generation.
-     * @param boolean $enabled
-     */
-    public function setVerp($enabled = false)
-    {
-        $this->do_verp = $enabled;
-    }
-
-    /**
-     * Get VERP address generation mode.
-     * @return boolean
-     */
-    public function getVerp()
-    {
-        return $this->do_verp;
-    }
-
-    /**
-     * Set debug output method.
-     * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it.
-     */
-    public function setDebugOutput($method = 'echo')
-    {
-        $this->Debugoutput = $method;
-    }
-
-    /**
-     * Get debug output method.
-     * @return string
-     */
-    public function getDebugOutput()
-    {
-        return $this->Debugoutput;
-    }
-
-    /**
-     * Set debug output level.
-     * @param integer $level
-     */
-    public function setDebugLevel($level = 0)
-    {
-        $this->do_debug = $level;
-    }
-
-    /**
-     * Get debug output level.
-     * @return integer
-     */
-    public function getDebugLevel()
-    {
-        return $this->do_debug;
-    }
-
-    /**
-     * Set SMTP timeout.
-     * @param integer $timeout
-     */
-    public function setTimeout($timeout = 0)
-    {
-        $this->Timeout = $timeout;
-    }
-
-    /**
-     * Get SMTP timeout.
-     * @return integer
-     */
-    public function getTimeout()
-    {
-        return $this->Timeout;
-    }
-}
diff --git a/upload/engine/smtp/language/phpmailer.lang-ch.php b/upload/engine/smtp/language/phpmailer.lang-ch.php
deleted file mode 100644
index 70d7a63..0000000
--- a/upload/engine/smtp/language/phpmailer.lang-ch.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Chinese PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author LiuXin <http://www.80x86.cn/blog/>
- */
-
-$PHPMAILER_LANG['authenticate'] = 'SMTP 错误：身份验证失败。';
-$PHPMAILER_LANG['connect_host'] = 'SMTP 错误: 不能连接SMTP主机。';
-$PHPMAILER_LANG['data_not_accepted'] = 'SMTP 错误: 数据不可接受。';
-//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
-$PHPMAILER_LANG['encoding'] = '未知编码：';
-$PHPMAILER_LANG['execute'] = '不能执行: ';
-$PHPMAILER_LANG['file_access'] = '不能访问文件：';
-$PHPMAILER_LANG['file_open'] = '文件错误：不能打开文件：';
-$PHPMAILER_LANG['from_failed'] = '下面的发送地址邮件发送失败了： ';
-$PHPMAILER_LANG['instantiate'] = '不能实现mail方法。';
-//$PHPMAILER_LANG['invalid_address']        = 'Not sending, email address is invalid: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' 您所选择的发送邮件的方法并不支持。';
-$PHPMAILER_LANG['provide_address'] = '您必须提供至少一个 收信人的email地址。';
-$PHPMAILER_LANG['recipients_failed'] = 'SMTP 错误： 下面的 收件人失败了： ';
-//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
-//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
-//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
-//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
diff --git a/upload/engine/smtp/language/phpmailer.lang-cz.php b/upload/engine/smtp/language/phpmailer.lang-cz.php
deleted file mode 100644
index 89f40f8..0000000
--- a/upload/engine/smtp/language/phpmailer.lang-cz.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Czech PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- */
-
-$PHPMAILER_LANG['authenticate']         = 'Chyba SMTP: Autentizace selhala.';
-$PHPMAILER_LANG['connect_host']         = 'Chyba SMTP: Nelze navázat spojení se SMTP serverem.';
-$PHPMAILER_LANG['data_not_accepted']    = 'Chyba SMTP: Data nebyla přijata.';
-$PHPMAILER_LANG['empty_message']        = 'Prázdné tělo zprávy';
-$PHPMAILER_LANG['encoding']             = 'Neznámé kódování: ';
-$PHPMAILER_LANG['execute']              = 'Nelze provést: ';
-$PHPMAILER_LANG['file_access']          = 'Nelze získat přístup k souboru: ';
-$PHPMAILER_LANG['file_open']            = 'Chyba souboru: Nelze otevřít soubor pro čtení: ';
-$PHPMAILER_LANG['from_failed']          = 'Následující adresa odesílatele je nesprávná: ';
-$PHPMAILER_LANG['instantiate']          = 'Nelze vytvořit instanci emailové funkce.';
-$PHPMAILER_LANG['invalid_address']      = 'Neplatná adresa: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' mailer není podporován.';
-$PHPMAILER_LANG['provide_address']      = 'Musíte zadat alespoň jednu emailovou adresu příjemce.';
-$PHPMAILER_LANG['recipients_failed']    = 'Chyba SMTP: Následující adresy příjemců nejsou správně: ';
-$PHPMAILER_LANG['signing']              = 'Chyba přihlašování: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() selhal.';
-$PHPMAILER_LANG['smtp_error']           = 'Chyba SMTP serveru: ';
-$PHPMAILER_LANG['variable_set']         = 'Nelze nastavit nebo změnit proměnnou: ';
diff --git a/upload/engine/smtp/language/phpmailer.lang-lv.php b/upload/engine/smtp/language/phpmailer.lang-lv.php
deleted file mode 100644
index 8eabb50..0000000
--- a/upload/engine/smtp/language/phpmailer.lang-lv.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Latvian PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Eduards M. <e@npd.lv>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP kļūda: Autorizācija neizdevās.';
-$PHPMAILER_LANG['connect_host']         = 'SMTP Kļūda: Nevar izveidot savienojumu ar SMTP serveri.';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Kļūda: Nepieņem informāciju.';
-$PHPMAILER_LANG['empty_message']        = 'Ziņojuma teksts ir tukšs';
-$PHPMAILER_LANG['encoding']             = 'Neatpazīts kodējums: ';
-$PHPMAILER_LANG['execute']              = 'Neizdevās izpildīt komandu: ';
-$PHPMAILER_LANG['file_access']          = 'Fails nav pieejams: ';
-$PHPMAILER_LANG['file_open']            = 'Faila kļūda: Nevar atvērt failu: ';
-$PHPMAILER_LANG['from_failed']          = 'Nepareiza sūtītāja adrese: ';
-$PHPMAILER_LANG['instantiate']          = 'Nevar palaist sūtīšanas funkciju.';
-$PHPMAILER_LANG['invalid_address']      = 'Nepareiza adrese';
-$PHPMAILER_LANG['mailer_not_supported'] = ' sūtītājs netiek atbalstīts.';
-$PHPMAILER_LANG['provide_address']      = 'Lūdzu, norādiet vismaz vienu adresātu.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP kļūda: neizdevās nosūtīt šādiem saņēmējiem: ';
-$PHPMAILER_LANG['signing']              = 'Autorizācijas kļūda: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP savienojuma kļūda';
-$PHPMAILER_LANG['smtp_error']           = 'SMTP servera kļūda: ';
-$PHPMAILER_LANG['variable_set']         = 'Nevar piešķirt mainīgā vērtību: ';
diff --git a/upload/engine/smtp/language/phpmailer.lang-ru.php b/upload/engine/smtp/language/phpmailer.lang-ru.php
deleted file mode 100644
index 83abda4..0000000
--- a/upload/engine/smtp/language/phpmailer.lang-ru.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Russian PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Alexey Chumakov <alex@chumakov.ru>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'Ошибка SMTP: ошибка авторизации.';
-$PHPMAILER_LANG['connect_host']         = 'Ошибка SMTP: не удается подключиться к серверу SMTP.';
-$PHPMAILER_LANG['data_not_accepted']    = 'Ошибка SMTP: данные не приняты.';
-$PHPMAILER_LANG['encoding']             = 'Неизвестный вид кодировки: ';
-$PHPMAILER_LANG['execute']              = 'Невозможно выполнить команду: ';
-$PHPMAILER_LANG['file_access']          = 'Нет доступа к файлу: ';
-$PHPMAILER_LANG['file_open']            = 'Файловая ошибка: не удается открыть файл: ';
-$PHPMAILER_LANG['from_failed']          = 'Неверный адрес отправителя: ';
-$PHPMAILER_LANG['instantiate']          = 'Невозможно запустить функцию mail.';
-$PHPMAILER_LANG['provide_address']      = 'Пожалуйста, введите хотя бы один адрес e-mail получателя.';
-$PHPMAILER_LANG['mailer_not_supported'] = ' - почтовый сервер не поддерживается.';
-$PHPMAILER_LANG['recipients_failed']    = 'Ошибка SMTP: отправка по следующим адресам получателей не удалась: ';
-$PHPMAILER_LANG['empty_message']        = 'Пустое тело сообщения';
-$PHPMAILER_LANG['invalid_address']        = 'Не отослано, неправильный формат email адреса: ';
-$PHPMAILER_LANG['signing']              = 'Ошибка подписывания: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Ошибка соединения с SMTP-сервером';
-$PHPMAILER_LANG['smtp_error']           = 'Ошибка SMTP-сервера: ';
-$PHPMAILER_LANG['variable_set']         = 'Невозможно установить или переустановить переменную: ';
diff --git a/upload/engine/smtp/language/phpmailer.lang-uk.php b/upload/engine/smtp/language/phpmailer.lang-uk.php
deleted file mode 100644
index c2bb86c..0000000
--- a/upload/engine/smtp/language/phpmailer.lang-uk.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Ukrainian PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Yuriy Rudyy <yrudyy@prs.net.ua>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'Помилка SMTP: помилка авторизації.';
-$PHPMAILER_LANG['connect_host']         = 'Помилка SMTP: не вдається підєднатися до серверу SMTP.';
-$PHPMAILER_LANG['data_not_accepted']    = 'Помилка SMTP: дані не прийняті.';
-$PHPMAILER_LANG['encoding']             = 'Невідомий тип кодування: ';
-$PHPMAILER_LANG['execute']              = 'Неможливо виконати команду: ';
-$PHPMAILER_LANG['file_access']          = 'Немає доступу до файлу: ';
-$PHPMAILER_LANG['file_open']            = 'Помилка файлової системи: не вдається відкрити файл: ';
-$PHPMAILER_LANG['from_failed']          = 'Невірна адреса відправника: ';
-$PHPMAILER_LANG['instantiate']          = 'Неможливо запустити функцію mail.';
-$PHPMAILER_LANG['provide_address']      = 'Будь-ласка, введіть хоча б одну адресу e-mail отримувача.';
-$PHPMAILER_LANG['mailer_not_supported'] = ' - поштовий сервер не підтримується.';
-$PHPMAILER_LANG['recipients_failed']    = 'Помилка SMTP: відправти наступним отрмувачам не вдалася: ';
-$PHPMAILER_LANG['empty_message']        = 'Пусте тіло повідомлення';
-$PHPMAILER_LANG['invalid_address']      = 'Не відправлено, невірний формат email адреси: ';
-$PHPMAILER_LANG['signing']              = 'Помилка підпису: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Помилка зєднання із SMTP-сервером';
-$PHPMAILER_LANG['smtp_error']           = 'Помилка SMTP-сервера: ';
-$PHPMAILER_LANG['variable_set']         = 'Неможливо встановити або перевстановити змінну: ';
diff --git a/upload/engine/user.class.php b/upload/engine/user.class.php
index b33ba55..e045cc1 100644
--- a/upload/engine/user.class.php
+++ b/upload/engine/user.class.php
@@ -15,7 +15,7 @@
 
 	public $is_cloak = false;
 
-	public $skin = '.default';
+	public $skin = 'default';
 
 	public $cloak = '';
 
@@ -27,40 +27,6 @@
 
 	public $gid = -1;
 
-	public function get_default_permissions(){
-		$query = $this->db->query("SELECT `value`, `type`, `default` FROM `mcr_permissions`");
-
-		if(!$query || $this->db->num_rows($query)<=0){ return; }
-
-		$array = array();
-
-		while($ar = $this->db->fetch_assoc($query)){
-
-			switch($ar['type']){
-				case 'integer':
-					$array[$ar['value']] = intval($ar['default']);
-				break;
-
-				case 'float':
-					$array[$ar['value']] = floatval($ar['default']);
-				break;
-
-				case 'string':
-					$array[$ar['value']] = $this->db->safesql($ar['default']);
-				break;
-
-				default:
-					$array[$ar['value']] = ($ar['default']=='true') ? true : false;
-				break;
-			}
-
-		}
-
-		$permissions = json_encode($array);
-
-		return array(json_decode($permissions), json_decode($permissions, true));
-	}
-
 	public function __construct($core){
 		$this->core			= $core;
 		$this->db			= $core->db;
@@ -161,7 +127,7 @@
 		// Is isset cloak
 		$this->is_cloak		= (intval($ar['is_cloak'])==1) ? true : false;
 
-		$this->skin			= ($this->is_skin || $this->is_cloak) ? $this->login : '.default';
+		$this->skin			= ($this->is_skin || $this->is_cloak) ? $this->login : 'default';
 
 		$this->cloak		= ($this->is_cloak) ? $this->login : '';
 
@@ -179,6 +145,57 @@
 
 	}
 
+	public function update_default_permissions(){
+
+		$query = $this->db->query("SELECT `value`, `type`, `default` FROM `mcr_permissions`");
+
+		if(!$query || $this->db->num_rows($query)<=0){ return; }
+
+		$array = array();
+
+		while($ar = $this->db->fetch_assoc($query)){
+
+			switch($ar['type']){
+				case 'integer':
+					$array[$ar['value']] = intval($ar['default']);
+				break;
+
+				case 'float':
+					$array[$ar['value']] = floatval($ar['default']);
+				break;
+
+				case 'string':
+					$array[$ar['value']] = $this->db->safesql($ar['default']);
+				break;
+
+				default:
+					$array[$ar['value']] = ($ar['default']=='true') ? true : false;
+				break;
+			}
+
+		}
+
+		$permissions = json_encode($array);
+
+		@file_put_contents(MCR_CACHE_PATH.'permissions', $permissions);
+
+		return $permissions;
+	}
+
+	public function get_default_permissions(){
+		if(file_exists(MCR_CACHE_PATH.'permissions')){
+			$json = file_get_contents(MCR_CACHE_PATH.'permissions');
+			$array = json_decode($json, true);
+			$object = json_decode($json);
+
+			return array($object, $array);
+		}
+
+		$permissions = @$this->update_default_permissions();
+
+		return array(json_decode($permissions), json_decode($permissions, true));
+	}
+
 	public function set_unauth(){
 		if(isset($_COOKIE['mcr_user'])){ setcookie("mcr_user", "", time()-3600, '/'); }
 
diff --git a/upload/index.php b/upload/index.php
index 0475579..7c2c6dd 100644
--- a/upload/index.php
+++ b/upload/index.php
@@ -8,17 +8,20 @@
 
 $mode = (isset($_GET['mode'])) ? $_GET['mode'] : $core->config->main['s_dpage'];
 
-if($core->config->main['install']){ $core->notify('Внимание!', 'Необходима установка', 4, 'install/'); }
+if($core->config->main['install']){ $core->notify($core->lng['e_attention'], $core->lng['e_install'], 4, 'install/'); }
 
 switch($mode){
-	case 'news':		$content = $core->load_def_mode($mode); break;
-	case 'search':		$content = $core->load_def_mode($mode); break;
-	case 'auth':		$content = $core->load_def_mode($mode); break;
-	case 'register':	$content = $core->load_def_mode($mode); break;
-	case 'profile':		$content = $core->load_def_mode($mode); break;
-	case 'restore':		$content = $core->load_def_mode($mode); break;
-	case 'ajax':		$content = $core->load_def_mode($mode); break;
-	case 'statics':		$content = $core->load_def_mode($mode); break;
+	case 'news':
+	case 'search':
+	case 'auth':
+	case 'register':
+	case 'profile':
+	case 'file':
+	case 'restore':
+	case 'ajax':
+	case 'statics':	
+		$content = $core->load_def_mode($mode);
+	break;
 
 	case '403':
 		$core->title = $core->lng['t_403'];
diff --git a/upload/install/index.php b/upload/install/index.php
index b823d6b..7ac295b 100644
--- a/upload/install/index.php
+++ b/upload/install/index.php
@@ -4,6 +4,10 @@
 
 require_once("../system.php");
 
+require_once(MCR_LANG_DIR."install.php");
+
+$core->lng_m = $lng;
+
 $core->def_header = $core->sp(MCR_ROOT."install/theme/header.html");
 
 $mode = (isset($_GET['mode'])) ? $_GET['mode'] : 'step_1';
@@ -23,21 +27,26 @@
 	break;
 
 	case 'finish':
+		$core->bc = $core->gen_bc(array($lng['mod_name'] => ''));
 		$content = $core->sp(MCR_ROOT."install/theme/finish.html");
+		if(isset($_SESSION['step_1'])){ unset($_SESSION['step_1']); }
+		if(isset($_SESSION['step_2'])){ unset($_SESSION['step_2']); }
+		if(isset($_SESSION['step_3'])){ unset($_SESSION['step_3']); }
+		if(isset($_SESSION['settings'])){ unset($_SESSION['settings']); }
 	break;
 
 	default:
-		$content = $core->notify('Установка!', 'Шаг #1', 4, 'install/?mode=step_1');
+		$content = $core->notify($lng['mod_name'], 'Шаг #1', 4, 'install/?mode=step_1');
 	break;
 }
 
 function load_left_block($core, $mode){
 	$array = array(
-		"step_1" => "Шаг #1",
-		"step_2" => "Шаг #2",
-		"step_3" => "Шаг #3",
-		"settings" => "Настройки",
-		"finish" => "Завершение установки"
+		"step_1" => $core->lng_m['step_1'],
+		"step_2" => $core->lng_m['step_2'],
+		"step_3" => $core->lng_m['step_3'],
+		"settings" => $core->lng_m['settings'],
+		"finish" => $core->lng_m['finish']
 	);
 
 	ob_start();
@@ -53,7 +62,14 @@
 
 	$data['ITEMS'] = ob_get_clean();
 
-	return $core->sp(MCR_ROOT."blocks/1_notify.php").$core->sp(MCR_ROOT."install/theme/left-block.html", $data);
+	include(MCR_SIDE_PATH."1_notify.php");
+
+	require_once(MCR_LANG_DIR.'blocks/notify.php');
+	$core->lng_b = $lng;
+
+	$notify = new block_notify($core);
+
+	return $notify->content().$core->sp(MCR_ROOT."install/theme/left-block.html", $data);
 }
 
 $data_global = array(
diff --git a/upload/install/settings.php b/upload/install/settings.php
index 86d09a4..8961c50 100644
--- a/upload/install/settings.php
+++ b/upload/install/settings.php
@@ -3,7 +3,7 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $lng, $user;
+	private $core, $db, $config, $lng, $lng_m, $user;
 
 	public function __construct($core){
 		$this->core		= $core;
@@ -11,12 +11,13 @@
 		$this->user		= $core->user;
 		$this->config	= $core->config;
 		$this->lng		= $core->lng;
+		$this->lng_m	= $core->lng_m;
 
-		$this->core->title = 'Установка — Настройки';
+		$this->core->title = $this->lng_m['mod_name'].' — '.$this->lng_m['settings'];
 
 		$bc = array(
-			'Установка' => BASE_URL."install/",
-			'Настройки' => BASE_URL."install/?mode=settings"
+			$this->lng_m['mod_name'] => BASE_URL."install/",
+			$this->lng_m['settings'] => BASE_URL."install/?mode=settings"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -26,16 +27,40 @@
 		if(!isset($_SESSION['step_3'])){ $this->core->notify('', '', 4, 'install/?mode=step_3'); }
 		if(isset($_SESSION['settings'])){ $this->core->notify('', '', 4, 'install/?mode=finish'); }
 
+		if(!isset($_SESSION['fs_name'])){
+			$_SESSION['fs_name']		= $this->config->main['s_name'];
+			$_SESSION['fs_about']		= $this->config->main['s_about'];
+			$_SESSION['fs_keywords']	= $this->config->main['s_keywords'];
+			$_SESSION['fs_from']		= $this->config->mail['from'];
+			$_SESSION['fs_from_name']	= $this->config->mail['from_name'];
+			$_SESSION['fs_reply']		= $this->config->mail['reply'];
+			$_SESSION['fs_reply_name']	= $this->config->mail['reply_name'];
+			$_SESSION['fs_smtp']		= '';
+			$_SESSION['fs_smtp_host']	= $this->config->mail['smtp_host'];
+			$_SESSION['fs_smtp_user']	= $this->config->mail['smtp_user'];
+			$_SESSION['fs_smtp_pass']	= $this->config->mail['smtp_pass'];
+		}
+
 		if($_SERVER['REQUEST_METHOD']=='POST'){
 
+			$_SESSION['fs_name']		= $this->db->HSC(@$_POST['s_name']);
+			$_SESSION['fs_about']		= $this->db->HSC(@$_POST['s_about']);
+			$_SESSION['fs_keywords']	= $this->db->HSC(@$_POST['s_keywords']);
+			$_SESSION['fs_from']		= $this->db->HSC(@$_POST['from']);
+			$_SESSION['fs_from_name']	= $this->db->HSC(@$_POST['from_name']);
+			$_SESSION['fs_reply']		= $this->db->HSC(@$_POST['reply']);
+			$_SESSION['fs_reply_name']	= $this->db->HSC(@$_POST['reply_name']);
+			$_SESSION['fs_smtp']		= (intval(@$_POST['smtp'])==1) ? 'selected' : '';
+			$_SESSION['fs_smtp_host']	= $this->db->HSC(@$_POST['smtp_host']);
+			$_SESSION['fs_smtp_user']	= $this->db->HSC(@$_POST['smtp_user']);
+			$_SESSION['fs_smtp_pass']	= $this->db->HSC(@$_POST['smtp_pass']);
+
 			$this->config->main['s_name'] = $this->db->HSC($this->core->safestr(@$_POST['s_name']));
 
 			$this->config->main['s_about'] = $this->db->HSC($this->core->safestr(@$_POST['s_about']));
 
 			$this->config->main['s_keywords'] = $this->db->HSC($this->core->safestr(@$_POST['s_keywords']));
 
-			$this->config->main['s_keywords'] = $this->db->HSC($this->core->safestr(@$_POST['s_keywords']));
-
 			$url = substr($_SERVER['PHP_SELF'], 0, strpos($_SERVER['PHP_SELF'], 'install'));
 
 			$http = (@$_SERVER["HTTPS"] == "on") ? 'https' : 'http';
@@ -50,10 +75,6 @@
 
 			$this->config->main['install'] = false;
 
-			if(!$this->core->savecfg($this->config->main, 'main.php', 'main')){
-				$this->core->notify('Ошибка!', 'Настройки не могут быть сохранены', 2, 'install/?mode=settings');
-			}
-
 			$this->config->mail['from'] = $this->db->HSC($this->core->safestr(@$_POST['from']));
 
 			$this->config->mail['from_name'] = $this->db->HSC($this->core->safestr(@$_POST['from_name']));
@@ -62,7 +83,7 @@
 
 			$this->config->mail['reply_name'] = $this->db->HSC($this->core->safestr(@$_POST['reply_name']));
 
-			$this->config->mail['smtp'] = (intval(@$_POST['from'])===1) ? true : false;
+			$this->config->mail['smtp'] = (intval(@$_POST['smtp'])===1) ? true : false;
 
 			$this->config->mail['smtp_host'] = $this->db->HSC($this->core->safestr(@$_POST['smtp_host']));
 
@@ -70,13 +91,17 @@
 
 			$this->config->mail['smtp_pass'] = $this->db->HSC($this->core->safestr(@$_POST['smtp_pass']));
 
-			if(!$this->core->savecfg($this->config->mail, 'mail.php', 'mail')){
-				$this->core->notify('Ошибка!', 'Настройки не могут быть сохранены', 2, 'install/?mode=settings');
+			if(!$this->config->savecfg($this->config->main, 'main.php', 'main')){
+				$this->core->notify($this->lng['e_msg'], $this->lng_m['e_settings'], 2, 'install/?mode=settings');
+			}
+
+			if(!$this->config->savecfg($this->config->mail, 'mail.php', 'mail')){
+				$this->core->notify($this->lng['e_msg'], $this->lng_m['e_settings'], 2, 'install/?mode=settings');
 			}
 
 			$_SESSION['settings'] = true;
 
-			$this->core->notify('Шаг #3', 'Установка', 4, 'install/?mode=finish');
+			$this->core->notify($this->lng_m['finish'], $this->lng_m['mod_name'], 4, 'install/?mode=finish');
 
 		}
 
diff --git a/upload/install/step_1.php b/upload/install/step_1.php
index 299ab7f..430b553 100644
--- a/upload/install/step_1.php
+++ b/upload/install/step_1.php
@@ -3,7 +3,7 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $lng, $user;
+	private $core, $db, $config, $lng, $lng_m, $user;
 
 	public function __construct($core){
 		$this->core		= $core;
@@ -11,98 +11,101 @@
 		$this->user		= $core->user;
 		$this->config	= $core->config;
 		$this->lng		= $core->lng;
+		$this->lng_m	= $core->lng_m;
 
-		$this->core->title = 'Установка — Шаг #1';
+		$this->core->title = $this->lng_m['mod_name'].' — '.$this->lng_m['step_1'];
 
 		$bc = array(
-			'Установка' => BASE_URL."install/",
-			'Шаг #1' => BASE_URL."install/?mode=step_1"
+			$this->lng_m['mod_name'] => BASE_URL."install/",
+			$this->lng_m['step_1'] => BASE_URL."install/?mode=step_1"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
 	}
 
+	private function check_write_all($folder){
+		if(!is_writable($folder) || !is_readable($folder)){ return false; }
+
+		$scan = scandir($folder);
+
+		$result = true;
+
+		foreach($scan as $key => $value) {
+			if($value=='.' || $value=='..'){ continue; }
+
+			$path = $folder.'/'.$value;
+
+			if(!is_writable($path) || !is_readable($path)){ $result = false; }
+		}
+
+		return $result;
+	}
+
 	public function content(){
 		if(isset($_SESSION['step_1'])){ $this->core->notify('', '', 4, 'install/?mode=step_2'); }
 
 		if($_SERVER['REQUEST_METHOD']=='POST'){
-			if(phpversion()<5.1){ $this->core->notify('Ошибка!', 'Версия PHP не соответствует системным требованиям', 2, 'install/?mode=step_1'); }
+			if(phpversion()<5.1){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_php_version'], 2, 'install/?mode=step_1'); }
 
-			if(@ini_get('register_globals')=='off'){ $this->core->notify('Ошибка!', 'Функция Register Globals не соответствует системным требованиям', 2, 'install/?mode=step_1'); }
+			if(@ini_get('register_globals')=='off'){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_register_globals'], 2, 'install/?mode=step_1'); }
 
-			if(@ini_get('allow_url_fopen')=='0' || @ini_get('allow_url_fopen')=='false'){ $this->core->notify('Ошибка!', 'Функция allow_url_fopen() не соответствует системным требованиям', 2, 'install/?mode=step_1'); }
+			if(@ini_get('allow_url_fopen')=='0' || @ini_get('allow_url_fopen')=='false'){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_fopen'], 2, 'install/?mode=step_1'); }
 
-			if(!function_exists('ImageCreateFromJpeg')){ $this->core->notify('Ошибка!', 'Библиотека GD не найдена', 2, 'install/?mode=step_1'); }
+			if(!function_exists('ImageCreateFromJpeg')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_gd'], 2, 'install/?mode=step_1'); }
 
-			if(!function_exists('mysql_query') && !function_exists('mysqli_query')){ $this->core->notify('Ошибка!', 'MySQL не найдена', 2, 'install/?mode=step_1'); }
+			if(!function_exists('mysql_query') && !function_exists('mysqli_query')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_mysql_not_found'], 2, 'install/?mode=step_1'); }
 
-			if(!function_exists('ob_start')){ $this->core->notify('Ошибка!', 'Функции буферизации данных недоступны', 2, 'install/?mode=step_1'); }
+			if(!function_exists('ob_start')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_buffer'], 2, 'install/?mode=step_1'); }
 
-			if(!is_writable(MCR_ROOT.'configs') || !is_readable(MCR_ROOT.'configs')){ $this->core->notify('Ошибка!', 'Отсутствуют права на чтение или запись папки configs', 2, 'install/?mode=step_1'); }
+			if(!$this->check_write_all(MCR_ROOT.'configs')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_configs'], 2, 'install/?mode=step_1'); }
 
-			if(!is_writable(MCR_ROOT.'configs/db.php') || !is_readable(MCR_ROOT.'configs/db.php')){ $this->core->notify('Ошибка!', 'Отсутствуют права на чтение или запись файла configs/db.php', 2, 'install/?mode=step_1'); }
+			if(!$this->check_write_all(MCR_ROOT.'configs/modules')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_modules'], 2, 'install/?mode=step_1'); }
 
-			if(!is_writable(MCR_ROOT.'configs/functions.php') || !is_readable(MCR_ROOT.'configs/functions.php')){ $this->core->notify('Ошибка!', 'Отсутствуют права на чтение или запись файла configs/functions.php', 2, 'install/?mode=step_1'); }
+			if(!$this->check_write_all(MCR_ROOT.'cache')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_cache'], 2, 'install/?mode=step_1'); }
 
-			if(!is_writable(MCR_ROOT.'configs/mail.php') || !is_readable(MCR_ROOT.'configs/mail.php')){ $this->core->notify('Ошибка!', 'Отсутствуют права на чтение или запись файла configs/mail.php', 2, 'install/?mode=step_1'); }
+			if(!is_writable(MCR_ROOT.'uploads') || !is_readable(MCR_ROOT.'uploads')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_uploads'], 2, 'install/?mode=step_1'); }
 
-			if(!is_writable(MCR_ROOT.'configs/main.php') || !is_readable(MCR_ROOT.'configs/main.php')){ $this->core->notify('Ошибка!', 'Отсутствуют права на чтение или запись файла configs/main.php', 2, 'install/?mode=step_1'); }
+			if(!is_writable(MCR_ROOT.'uploads/cloaks') || !is_readable(MCR_ROOT.'uploads/cloaks')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_cloaks'], 2, 'install/?mode=step_1'); }
 
-			if(!is_writable(MCR_ROOT.'configs/pagin.php') || !is_readable(MCR_ROOT.'configs/pagin.php')){ $this->core->notify('Ошибка!', 'Отсутствуют права на чтение или запись файла configs/pagin.php', 2, 'install/?mode=step_1'); }
+			if(!is_writable(MCR_ROOT.'uploads/panel-icons') || !is_readable(MCR_ROOT.'uploads/panel-icons')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_icons'], 2, 'install/?mode=step_1'); }
 
-			if(!is_writable(MCR_ROOT.'configs/search.php') || !is_readable(MCR_ROOT.'configs/search.php')){ $this->core->notify('Ошибка!', 'Отсутствуют права на чтение или запись файла configs/search.php', 2, 'install/?mode=step_1'); }
+			if(!is_writable(MCR_ROOT.'uploads/skins') || !is_readable(MCR_ROOT.'uploads/skins')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_skins'], 2, 'install/?mode=step_1'); }
 
-			if(!is_writable(MCR_ROOT.'uploads') || !is_readable(MCR_ROOT.'uploads')){ $this->core->notify('Ошибка!', 'Отсутствуют права на чтение или запись папки uploads', 2, 'install/?mode=step_1'); }
+			if(!is_writable(MCR_ROOT.'uploads/skins/interface') || !is_readable(MCR_ROOT.'uploads/skins/interface')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_intf'], 2, 'install/?mode=step_1'); }
 
-			if(!is_writable(MCR_ROOT.'uploads/cloaks') || !is_readable(MCR_ROOT.'uploads/cloaks')){ $this->core->notify('Ошибка!', 'Отсутствуют права на чтение или запись папки uploads/cloaks/', 2, 'install/?mode=step_1'); }
-
-			if(!is_writable(MCR_ROOT.'uploads/panel-icons') || !is_readable(MCR_ROOT.'uploads/panel-icons')){ $this->core->notify('Ошибка!', 'Отсутствуют права на чтение или запись папки uploads/panel-icons/', 2, 'install/?mode=step_1'); }
-
-			if(!is_writable(MCR_ROOT.'uploads/skins') || !is_readable(MCR_ROOT.'uploads/skins')){ $this->core->notify('Ошибка!', 'Отсутствуют права на чтение или запись папки uploads/skins/', 2, 'install/?mode=step_1'); }
-
-			if(!is_writable(MCR_ROOT.'uploads/skins/interface') || !is_readable(MCR_ROOT.'uploads/skins/interface')){ $this->core->notify('Ошибка!', 'Отсутствуют права на чтение или запись папки uploads/skins/interface/', 2, 'install/?mode=step_1'); }
-
-			if(!is_writable(MCR_ROOT.'uploads/smiles') || !is_readable(MCR_ROOT.'uploads/smiles')){ $this->core->notify('Ошибка!', 'Отсутствуют права на чтение или запись папки uploads/smiles/', 2, 'install/?mode=step_1'); }
+			if(!is_writable(MCR_ROOT.'uploads/smiles') || !is_readable(MCR_ROOT.'uploads/smiles')){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_perm_smiles'], 2, 'install/?mode=step_1'); }
 
 			$_SESSION['step_1'] = true;
 
-			$this->core->notify('Шаг #2', 'Настройки базы', 4, 'install/?mode=step_2');
+			$this->core->notify($this->lng_m['step_2'], $this->lng_m['db_settings'], 4, 'install/?mode=step_2');
 
 		}
 
 		$data = array(
 			"PHP" => (phpversion()<5.1) ? '<b class="text-error">'.phpversion().'</b>' : '<b class="text-success">'.phpversion().'</b>',
-			"REG_GLOB" => (@ini_get('register_globals')=='on') ? '<b class="text-error">Вкл.</b>' : '<b class="text-success">Выкл.</b>',
-			"URL_FOPEN" => (@ini_get('allow_url_fopen')=='1' || @ini_get('allow_url_fopen')=='true') ? '<b class="text-success">Вкл.</b>' : '<b class="text-error">Выкл.</b>',
-			"GD" => (function_exists('ImageCreateFromJpeg')) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
-			"MYSQL" => (function_exists("mysql_query") || function_exists("mysqli_query")) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
-			"BUFER" => (function_exists("ob_start")) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
+			"REG_GLOB" => (@ini_get('register_globals')=='on') ? '<b class="text-error">'.$this->lng_m['on'].'</b>' : '<b class="text-success">Выкл.</b>',
+			"URL_FOPEN" => (@ini_get('allow_url_fopen')=='1' || @ini_get('allow_url_fopen')=='true') ? '<b class="text-success">'.$this->lng_m['on'].'</b>' : '<b class="text-error">'.$this->lng_m['off'].'</b>',
+			"GD" => (function_exists('ImageCreateFromJpeg')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
+			"MYSQL" => (function_exists("mysql_query") || function_exists("mysqli_query")) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
+			"BUFER" => (function_exists("ob_start")) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
 
-			"FOLDER_CONFIGS" => (is_writable(MCR_ROOT.'configs') && is_readable(MCR_ROOT.'configs')) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
+			"FOLDER_CONFIGS" => ($this->check_write_all(MCR_ROOT.'configs')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
 
-			"FILE_DB" => (is_writable(MCR_ROOT.'configs/db.php') && is_readable(MCR_ROOT.'configs/db.php')) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
+			"FOLDER_MODULES" => ($this->check_write_all(MCR_ROOT.'configs/modules')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
 
-			"FILE_FUNCTIONS" => (is_writable(MCR_ROOT.'configs/functions.php') && is_readable(MCR_ROOT.'configs/functions.php')) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
+			"FOLDER_CACHE" => ($this->check_write_all(MCR_ROOT.'cache')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
 
-			"FILE_MAIL" => (is_writable(MCR_ROOT.'configs/mail.php') && is_readable(MCR_ROOT.'configs/mail.php')) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
+			"FOLDER_UPLOADS" => (is_writable(MCR_ROOT.'uploads') && is_readable(MCR_ROOT.'uploads')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
 
-			"FILE_MAIN" => (is_writable(MCR_ROOT.'configs/main.php') && is_readable(MCR_ROOT.'configs/main.php')) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
+			"FOLDER_CLOAKS" => (is_writable(MCR_ROOT.'uploads/cloaks') && is_readable(MCR_ROOT.'uploads/cloaks')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
 
-			"FILE_PAGIN" => (is_writable(MCR_ROOT.'configs/pagin.php') && is_readable(MCR_ROOT.'configs/pagin.php')) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
+			"FOLDER_ICONS" => (is_writable(MCR_ROOT.'uploads/panel-icons') && is_readable(MCR_ROOT.'uploads/panel-icons')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
 
-			"FILE_SEARCH" => (is_writable(MCR_ROOT.'configs/search.php') && is_readable(MCR_ROOT.'configs/search.php')) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
+			"FOLDER_SKINS" => (is_writable(MCR_ROOT.'uploads/skins') && is_readable(MCR_ROOT.'uploads/skins')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
 
-			"FOLDER_UPLOADS" => (is_writable(MCR_ROOT.'uploads') && is_readable(MCR_ROOT.'uploads')) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
+			"FOLDER_INTERF" => (is_writable(MCR_ROOT.'uploads/skins/interface') && is_readable(MCR_ROOT.'uploads/skins')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
 
-			"FOLDER_CLOAKS" => (is_writable(MCR_ROOT.'uploads/cloaks') && is_readable(MCR_ROOT.'uploads/cloaks')) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
-
-			"FOLDER_ICONS" => (is_writable(MCR_ROOT.'uploads/panel-icons') && is_readable(MCR_ROOT.'uploads/panel-icons')) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
-
-			"FOLDER_SKINS" => (is_writable(MCR_ROOT.'uploads/skins') && is_readable(MCR_ROOT.'uploads/skins')) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
-
-			"FOLDER_INTERF" => (is_writable(MCR_ROOT.'uploads/skins/interface') && is_readable(MCR_ROOT.'uploads/skins')) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
-
-			"FOLDER_SMILES" => (is_writable(MCR_ROOT.'uploads/smiles') && is_readable(MCR_ROOT.'uploads/smiles')) ? '<b class="text-success">Да</b>' : '<b class="text-error">Нет</b>',
+			"FOLDER_SMILES" => (is_writable(MCR_ROOT.'uploads/smiles') && is_readable(MCR_ROOT.'uploads/smiles')) ? '<b class="text-success">'.$this->lng['yes'].'</b>' : '<b class="text-error">'.$this->lng['no'].'</b>',
 		);
 
 		return $this->core->sp(MCR_ROOT."install/theme/step_1.html", $data);
diff --git a/upload/install/step_2.php b/upload/install/step_2.php
index c1d5cc0..d9a3a56 100644
--- a/upload/install/step_2.php
+++ b/upload/install/step_2.php
@@ -3,7 +3,7 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $lng, $user;
+	private $core, $db, $config, $lng, $lng_m, $user;
 
 	public function __construct($core){
 		$this->core		= $core;
@@ -11,12 +11,13 @@
 		$this->user		= $core->user;
 		$this->config	= $core->config;
 		$this->lng		= $core->lng;
+		$this->lng_m	= $core->lng_m;
 
-		$this->core->title = 'Установка — Шаг #2';
+		$this->core->title = $this->lng_m['mod_name'].' — '.$this->lng_m['step_2'];
 
 		$bc = array(
-			'Установка' => BASE_URL."install/",
-			'Шаг #2' => BASE_URL."install/?mode=step_2"
+			$this->lng_m['mod_name'] => BASE_URL."install/",
+			$this->lng_m['step_2'] => BASE_URL."install/?mode=step_2"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -26,33 +27,46 @@
 		if(!isset($_SESSION['step_1'])){ $this->core->notify('', '', 4, 'install/?mode=step_1'); }
 		if(isset($_SESSION['step_2'])){ $this->core->notify('', '', 4, 'install/?mode=step_3'); }
 
+		if(!isset($_SESSION['f_host'])){
+			$_SESSION['f_host'] = 'localhost';
+			$_SESSION['f_port'] = 3306;
+			$_SESSION['f_base'] = '';
+			$_SESSION['f_backend'] = '';
+			$_SESSION['f_user'] = 'root';
+		}
+
 		if($_SERVER['REQUEST_METHOD']=='POST'){
 
 			$this->config->db['host'] = @$_POST['host'];
+			$_SESSION['f_host'] = $this->db->HSC(@$_POST['host']);
 
 			$this->config->db['port'] = intval(@$_POST['port']);
+			$_SESSION['f_port'] = intval(@$_POST['port']);
 
 			$this->config->db['base'] = @$_POST['base'];
+			$_SESSION['f_base'] = $this->db->HSC(@$_POST['base']);
 
 			$this->config->db['user'] = @$_POST['user'];
+			$_SESSION['f_user'] = $this->db->HSC(@$_POST['user']);
 
 			$this->config->db['pass'] = @$_POST['pass'];
 
 			$this->config->db['backend'] = (@$_POST['type']=='mysqli') ? 'mysqli' : 'mysql';
+			$_SESSION['f_backend'] = (@$_POST['type']=='mysql') ? 'selected' : '';
 
 			$connect = @mysql_connect($this->config->db['host'].':'.$this->config->db['port'], $this->config->db['user'], $this->config->db['pass']);
 
 			if(!@mysql_select_db($this->config->db['base'], $connect)){
-				$this->core->notify('Ошибка!', 'Неверно указаны данные для подключения к базе', 2, 'install/?mode=step_2');
+				$this->core->notify($this->lng['e_msg'], $this->lng_m['e_set_base'], 2, 'install/?mode=step_2');
 			}
 
-			if(!$this->core->savecfg($this->config->db, 'db.php', 'db')){
-				$this->core->notify('Ошибка!', 'Настройки не могут быть сохранены', 2, 'install/?mode=step_2');
+			if(!$this->config->savecfg($this->config->db, 'db.php', 'db')){
+				$this->core->notify($this->lng['e_msg'], $this->lng_m['e_settings'], 2, 'install/?mode=step_2');
 			}
 
 			$_SESSION['step_2'] = true;
 
-			$this->core->notify('Шаг #3', 'Установка', 4, 'install/?mode=step_3');
+			$this->core->notify($this->lng_m['step_3'], $this->lng_m['mod_name'], 4, 'install/?mode=step_3');
 
 		}
 
diff --git a/upload/install/step_3.php b/upload/install/step_3.php
index 54090ad..58d6fe2 100644
--- a/upload/install/step_3.php
+++ b/upload/install/step_3.php
@@ -3,7 +3,7 @@
 if(!defined("MCR")){ exit("Hacking Attempt!"); }
 
 class module{
-	private $core, $db, $config, $lng, $user;
+	private $core, $db, $config, $lng, $lng_m, $user;
 
 	public function __construct($core){
 		$this->core		= $core;
@@ -11,12 +11,13 @@
 		$this->user		= $core->user;
 		$this->config	= $core->config;
 		$this->lng		= $core->lng;
+		$this->lng_m	= $core->lng_m;
 
-		$this->core->title = 'Установка — Шаг #3';
+		$this->core->title = $this->lng_m['mod_name'].' — '.$this->lng_m['step_3'];
 
 		$bc = array(
-			'Установка' => BASE_URL."install/",
-			'Шаг #3' => BASE_URL."install/?mode=step_3"
+			$this->lng_m['mod_name'] => BASE_URL."install/",
+			$this->lng_m['step_3'] => BASE_URL."install/?mode=step_3"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -26,24 +27,36 @@
 		if(!isset($_SESSION['step_2'])){ $this->core->notify('', '', 4, 'install/?mode=step_2'); }
 		if(isset($_SESSION['step_3'])){ $this->core->notify('', '', 4, 'install/?mode=settings'); }
 
+		if(!isset($_SESSION['f_login'])){
+			$_SESSION['f_login']	= 'admin';
+			$_SESSION['f_email']	= '';
+			$_SESSION['f_pass']		= '';
+			$_SESSION['f_repass']	= '';
+		}
+
 		if($_SERVER['REQUEST_METHOD']=='POST'){
 
 			$method = (intval(@$_POST['method'])<0 || intval(@$_POST['method'])>15) ? 0 : intval(@$_POST['method']);
 
+			$_SESSION['f_login']	= $this->db->HSC(@$_POST['login']);
+			$_SESSION['f_email']	= $this->db->HSC(@$_POST['email']);
+			$_SESSION['f_pass']		= $this->db->HSC(@$_POST['password']);
+			$_SESSION['f_repass']	= $this->db->HSC(@$_POST['repassword']);
+
 			if(!preg_match("/^[\w\-]{3,}$/i", @$_POST['login'])){
-				$this->core->notify('Ошибка!', 'Логин может состоять только из символов a-zA-Z0-9_- и быть не менее 3-х символов', 2, 'install/?mode=step_3');
+				$this->core->notify($this->lng['e_msg'], $this->lng_m['e_login_format'], 2, 'install/?mode=step_3');
 			}
 
 			if(mb_strlen(@$_POST['password'], "UTF-8")<6){
-				$this->core->notify('Ошибка!', 'Пароль должен быть не менее 6-ти символов', 2, 'install/?mode=step_3');
+				$this->core->notify($this->lng['e_msg'], $this->lng_m['e_pass_len'], 2, 'install/?mode=step_3');
 			}
 
 			if(@$_POST['password'] !== @$_POST['repassword']){
-				$this->core->notify('Ошибка!', 'Пароли не совпадают', 2, 'install/?mode=step_3');
+				$this->core->notify($this->lng['e_msg'], $this->lng_m['e_pass_match'], 2, 'install/?mode=step_3');
 			}
 
 			if(!filter_var(@$_POST['email'], FILTER_VALIDATE_EMAIL)){
-				$this->core->notify('Ошибка!', 'Неверный формат E-Mail адреса', 2, 'install/?mode=step_3');
+				$this->core->notify($this->lng['e_msg'], $this->lng_m['e_email_format'], 2, 'install/?mode=step_3');
 			}
 
 			$login = $this->db->safesql(@$_POST['login']);
@@ -86,197 +99,41 @@
 
 			}
 
-			$sql1 = $this->db->query("INSERT INTO `mcr_menu_adm`
-										(`gid`, `title`, `text`, `url`, `target`, `access`, `priority`, `icon`)
-									VALUES
-										(1, 'Информация', 'Информация и статистика движка', '/?mode=admin&do=info', '_self', 'sys_adm_m_i_info', 1, 8),
-										(2, 'Новости', 'Управление списком новостей', '/?mode=admin&do=news', '_self', 'sys_adm_m_i_news', 1, 2),
-										(2, 'Категории', 'Управление категориями новостей', '/?mode=admin&do=news_cats', '_self', 'sys_adm_m_i_news_cats', 2, 10),
-										(2, 'Комментарии', 'Управление комментариями новостей', '/?mode=admin&do=comments', '_self', 'sys_adm_m_i_comments', 3, 13),
-										(2, 'Просмотры', 'Управление просмотрами новостей', '/?mode=admin&do=news_views', '_self', 'sys_adm_m_i_news_views', 4, 14),
-										(2, 'Голоса', 'Управление голосами новостей', '/?mode=admin&do=news_votes', '_self', 'sys_adm_m_i_news_votes', 5, 9),
-										(3, 'Пользователи', 'Изменение пользователей', '/?mode=admin&do=users', '_self', 'sys_adm_m_i_users', 1, 5),
-										(3, 'Группы', 'Управление группами пользователей и их привилегиями', '/?mode=admin&do=groups', '_self', 'sys_adm_m_i_groups', 2, 15),
-										(3, 'Привилегии', 'Управление доступными привилегиями', '/?mode=admin&do=permissions', '_self', 'sys_adm_m_i_permissions', 3, 17),
-										(4, 'Меню сайта', 'Управление пунктами основного меню', '/?mode=admin&do=menu', '_self', 'sys_adm_m_i_menu', 1, 7),
-										(4, 'Меню ПУ', 'Управление пунктами меню панели управления', '/?mode=admin&do=menu_adm', '_self', 'sys_adm_m_i_menu_adm', 2, 18),
-										(4, 'Группы меню ПУ', 'Управление группами меню панели управления', '/?mode=admin&do=menu_groups', '_self', 'sys_adm_m_i_menu_groups_adm', 3, 11),
-										(4, 'Иконки', 'Управление иконками пунктов меню панели управления', '/?mode=admin&do=menu_icons', '_self', 'sys_adm_m_i_icons', 4, 19),
-										(1, 'Статические страницы', 'Управление статическими страницами ', '/?mode=admin&do=statics', '_self', 'sys_adm_m_i_statics', 2, 20),
-										(5, 'Настройки сайта', 'Основные настройки сайта', '/?mode=admin&do=settings', '_self', 'sys_adm_m_i_settings', 1, 6),
-										(1, 'Мониторинг серверов', 'Управление серверами мониторинга', '/?mode=admin&do=monitoring', '_self', 'sys_adm_m_i_monitor', 3, 21)");
-
-			if(!$sql1){ $this->core->notify('Ошибка!', 'Произошла ошибка добавления пунктов меню', 2, 'install/?mode=step_3'); }
-
-			$sql2 = $this->db->query("INSERT INTO `mcr_users`
+			$sql1 = $this->db->query("INSERT INTO `mcr_users`
 											(`gid`, `login`, `email`, `password`, `salt`, `ip_create`, `ip_last`, `data`)
 										VALUES
 											('3', '$login', '$email', '$password', '$salt', '$ip', '$ip', '$data')");
 
-			if(!$sql2){ $this->core->notify('Ошибка!', 'Произошла ошибка добавления администратора', 2, 'install/?mode=step_3'); }
-
-			$sql3 = $this->db->query("INSERT INTO `mcr_menu_adm_icons`
-											(`title`, `img`)
-										VALUES
-											('По умолчанию', 'default.png'),
-											('Новости', 'news.png'),
-											('Пазл', 'puzzle.png'),
-											('Пользователь', 'user.png'),
-											('Пользователи', 'users.png'),
-											('Молоток и гаечный ключ', 'settings.png'),
-											('Древо', 'tree.png'),
-											('Диаграмма', 'diagram.png'),
-											('Лайк', 'like.png'),
-											('Документы', 'documents.png'),
-											('Иерархия', 'hierarchy.png'),
-											('Шестеренка', 'wheel.png'),
-											('Комментарии', 'comments.png'),
-											('Глаз', 'eye.png'),
-											('Группа пользователей', 'groups.png'),
-											('График', 'chart.png'),
-											('Замок', 'lock.png'),
-											('Блоки', 'blocks.png'),
-											('Иконка', 'icon.png'),
-											('Два листа', 'pages.png'),
-											('Монитор', 'monitor.png')");
-
-			if(!$sql3){ $this->core->notify('Ошибка!', 'Произошла ошибка добавления иконок', 2, 'install/?mode=step_3'); }
-
-			$sql4 = $this->db->query("INSERT INTO `mcr_menu_adm_groups`
-											(`title`, `text`, `access`, `priority`)
-										VALUES
-											('Разное', 'Описание раздела разное', 'sys_adm_m_g_main', 1),
-											('Управление новостями', 'Всё, что связано с модулем новостей', 'sys_adm_m_g_news', 2),
-											('Управление пользователями', 'Управление пользователями', 'sys_adm_m_g_users', 3),
-											('Управление меню', 'Управление группами и пунктами меню сайта и панели управления', 'sys_adm_m_g_menu', 4),
-											('Настройки', 'Настройки сайта и движка', 'sys_adm_m_g_settings', 6)");
-
-			if(!$sql4){ $this->core->notify('Ошибка!', 'Произошла ошибка добавления групп меню', 2, 'install/?mode=step_3'); }
-
-			$sql5_data = array(
-				"time_create" => time(),
-				"time_last" => time(),
-				"login_create" => $login,
-				"login_last" => $login
-			);
-
-			$sql5_data = $this->db->safesql(json_encode($sql5_data));
-
-			$sql5 = $this->db->query("INSERT INTO `mcr_permissions`
-											(`title`, `description`, `value`, `system`, `type`, `default`, `data`)
-										VALUES
-('Доступ к отладке', 'Дает доступ к системной информации для устранения и выявления неисправностей', 'sys_debug', 1, 'boolean', 'true', '$sql5_data'),
-('Максимальный размер файла', 'Максимально допустимый размер загружаемого файла(КБ)', 'sys_max_file_size', 1, 'float', '1024', '$sql5_data'),
-('Максимальное соотношение', 'Максимальное соотношение скинов и плащей. Подробнее в документации.', 'sys_max_ratio', 1, 'integer', '0', '$sql5_data'),
-('Доступ к мониторингу', 'Доступ к просмотру блока мониторинга серверов', 'sys_monitoring', 1, 'boolean', 'true', '$sql5_data'),
-('Общий доступ', 'Доступ к общедоступным элементам', 'sys_share', 1, 'boolean', 'true', '$sql5_data'),
-('Основной доступ к поиску', 'Если запрещено, то доступ к подмодулям будет так же недоступен, независимо от их настроек.', 'sys_search', 1, 'boolean', 'true', '$sql5_data'),
-('Восстановление пароля', 'Доступ к восстановлению пароля', 'sys_restore', 1, 'boolean', 'true', '$sql5_data'),
-('Доступ к регистрации', 'Позволяет выбранным группам пользователей регистрироваться на сайте', 'sys_register', 1, 'boolean', 'true', '$sql5_data'),
-('Доступ к своему профилю', 'Просмотр собственного профиля и информации о себе', 'sys_profile', 1, 'boolean', 'true', '$sql5_data'),
-('Удаление скина персонажа', 'Доступ к удалению скина персонажа', 'sys_profile_del_skin', 1, 'boolean', 'false', '$sql5_data'),
-('Удаление плаща персонажа', 'Доступ к удалению плаща персонажа', 'sys_profile_del_cloak', 1, 'boolean', 'false', '$sql5_data'),
-('Изменение скина персонажа', 'Доступ к изменению скина персонажа', 'sys_profile_skin', 1, 'boolean', 'false', '$sql5_data'),
-('Изменение плаща персонажа', 'Доступ к изменению плаща персонажа', 'sys_profile_cloak', 1, 'boolean', 'false', '$sql5_data'),
-('Настройки пользователя', 'Доступ к настройкам пользователя', 'sys_profile_settings', 1, 'boolean', 'false', '$sql5_data'),
-('Просмотр списка новостей', 'Доступ к просмотрю списка всех новостей', 'sys_news_list', 1, 'boolean', 'true', '$sql5_data'),
-('Просмотр полных новостей', 'Доступ к просмотру полных новостей', 'sys_news_full', 1, 'boolean', 'true', '$sql5_data'),
-('Просмотр комментариев', 'Доступ к просмотру комментариев', 'sys_comment_list', 1, 'boolean', 'false', '$sql5_data'),
-('Добавление комментариев', 'Доступ к добавлению комментариев', 'sys_comment_add', 1, 'boolean', 'false', '$sql5_data'),
-('Редактирование своих комментариев', 'Доступ к редактированию собственных комментариев', 'sys_comment_edt', 1, 'boolean', 'false', '$sql5_data'),
-('Редактирование всех комментариев', 'Доступ к редактированию комментариев всех пользователей, включая свои независимо от доступа к редактированию своих комментариев', 'sys_comment_edt_all', 1, 'boolean', 'false', '$sql5_data'),
-('Удаление своих комментариев', 'Доступ к удалению собственных комментариев', 'sys_comment_del', 1, 'boolean', 'false', '$sql5_data'),
-('Удаление всех комментариев', 'Доступ к удалению комментариев всех пользователей, включая свои независимо от доступа к удалению своих комментариев', 'sys_comment_del_all', 1, 'boolean', 'false', '$sql5_data'),
-('Авторизация', 'Доступ к авторизации пользователей', 'sys_auth', 1, 'boolean', 'false', '$sql5_data'),
-('Доступ к ПУ', 'Основной доступ к панели управления. Если запрещено, то доступ ко всем элементам ПУ будет закрыт.', 'sys_adm_main', 1, 'boolean', 'false', '$sql5_data'),
-('Управление новостями', 'Управление новостями: добавление, удаление, редактирование', 'sys_adm_news', 1, 'boolean', 'false', '$sql5_data'),
-('Управление категориями', 'Управление категориями новостей: добавление, удаление, редактирование', 'sys_adm_news_cats', 1, 'boolean', 'false', '$sql5_data'),
-('Управление просмотрами новостей', 'Управление просмотрами новостей: удаление', 'sys_adm_news_views', 1, 'boolean', 'false', '$sql5_data'),
-('Управление просмотрами новостей', 'Управление просмотрами новостей: удаление', 'sys_adm_news_votes', 1, 'boolean', 'false', '$sql5_data'),
-('Управление комментариями', 'Управление комментариями: добавление, удаление, редактирование', 'sys_adm_comments', 1, 'boolean', 'false', '$sql5_data'),
-('Управление меню сайта', 'Управление меню сайта: добавление, редактирование, удаление', 'sys_adm_menu', 1, 'boolean', 'false', '$sql5_data'),
-('Управление меню ПУ', 'Управление меню ПУ: добавление, редактирование, удаление', 'sys_adm_menu_adm', 1, 'boolean', 'false', '$sql5_data'),
-('Управление группами меню ПУ', 'Управление группами меню ПУ: добавление, редактирование, удаление', 'sys_adm_menu_groups', 1, 'boolean', 'false', '$sql5_data'),
-('Управление иконками меню ПУ', 'Управление иконками меню ПУ: добавление, редактирование, удаление', 'sys_adm_menu_icons', 1, 'boolean', 'false', '$sql5_data'),
-('Управление пользователями', 'Управление пользователями: добавление, редактирование, удаление, бан, разбан', 'sys_adm_users', 1, 'boolean', 'false', '$sql5_data'),
-('Управление группами пользователей', 'Управление группами пользователей: добавление, редактирование, удаление', 'sys_adm_groups', 1, 'boolean', 'false', '$sql5_data'),
-('Управление привилегиями', 'Управление привилегиями: добавление, редактирование, удаление', 'sys_adm_permissions', 1, 'boolean', 'false', '$sql5_data'),
-('Управление статическими страницами', 'Управление статическими страницами: добавление, редактирование, удаление', 'sys_adm_statics', 1, 'boolean', 'false', '$sql5_data'),
-('Информация о движке', 'Доступ к информации и статистике движка', 'sys_adm_info', 1, 'boolean', 'false', '$sql5_data'),
-('Настройки сайта', 'Доступ к настройкам сайта', 'sys_adm_settings', 1, 'boolean', 'false', '$sql5_data'),
-('Управление мониторингом', 'Управление мониторингом: добавление, редактирование, удаление', 'sys_adm_monitoring', 1, 'boolean', 'false', '$sql5_data'),
-('Управление модулями', 'Доступ к управлению модулями', 'sys_adm_modules', 1, 'boolean', 'false', '$sql5_data'),
-('Поиск по новостям', 'Доступ к поиску по новостям', 'sys_search_news', 1, 'boolean', 'false', '$sql5_data'),
-('Поиск по комментариям', 'Доступ к поиску по комментариям', 'sys_search_comments', 1, 'boolean', 'false', '$sql5_data'),
-('Голосование за новость', 'Доступ к голосованию за новость (Лайки/Дизлайки)', 'sys_news_like', 1, 'boolean', 'false', '$sql5_data'),
-('Группа меню \"Разное\"', 'Доступ к группе меню \"Разное\" в панели управления. Входящие в нее пункты будут так же недоступны.', 'sys_adm_m_g_main', 1, 'boolean', 'false', '$sql5_data'),
-('Группа меню \"Управление новостями\"', 'Доступ к группе меню \"Управление новостями\" в панели управления. Входящие в нее пункты будут так же недоступны.', 'sys_adm_m_g_news', 1, 'boolean', 'false', '$sql5_data'),
-('Группа меню \"Управление пользователями\"', 'Доступ к группе меню \"Управление пользователями\" в панели управления. Входящие в нее пункты будут так же недоступны.', 'sys_adm_m_g_users', 1, 'boolean', 'false', '$sql5_data'),
-('Группа меню \"Управление меню\"', 'Доступ к группе меню \"Управление меню\" в панели управления. Входящие в нее пункты будут так же недоступны.', 'sys_adm_m_g_menu', 1, 'boolean', 'false', '$sql5_data'),
-('Группа меню \"Настройки\"', 'Доступ к группе меню \"Настройки\" в панели управления. Входящие в нее пункты будут так же недоступны.', 'sys_adm_m_g_settings', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Новости\"', 'Доступ к пункту меню \"Новости\" в панели управления.', 'sys_adm_m_i_news', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Категории\"', 'Доступ к пункту меню \"Категории\" в панели управления.', 'sys_adm_m_i_news_cats', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Комментарии\"', 'Доступ к пункту меню \"Комментарии\" в панели управления.', 'sys_adm_m_i_comments', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Просмотры\"', 'Доступ к пункту меню \"Просмотры\" в панели управления.', 'sys_adm_m_i_news_views', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Голоса\"', 'Доступ к пункту меню \"Голоса\" в панели управления.', 'sys_adm_m_i_news_votes', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Пользователи\"', 'Доступ к пункту меню \"Пользователи\" в панели управления.', 'sys_adm_m_i_users', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Группы\"', 'Доступ к пункту меню \"Группы\" в панели управления.', 'sys_adm_m_i_groups', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Привилегии\"', 'Доступ к пункту меню \"Привилегии\" в панели управления.', 'sys_adm_m_i_permissions', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Меню сайта\"', 'Доступ к пункту меню \"Меню сайта\" в панели управления.', 'sys_adm_m_i_menu', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Меню ПУ\"', 'Доступ к пункту меню \"Меню ПУ\" в панели управления.', 'sys_adm_m_i_menu_adm', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Группы меню ПУ\"', 'Доступ к пункту меню \"Группы меню ПУ\" в панели управления.', 'sys_adm_m_i_menu_groups_adm', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Иконки\"', 'Доступ к пункту меню \"Иконки\" в панели управления.', 'sys_adm_m_i_icons', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Статические страницы\"', 'Доступ к пункту меню \"Статические страницы\" в панели управления.', 'sys_adm_m_i_statics', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Настройки сайта\"', 'Доступ к пункту меню \"Настройки сайта\" в панели управления.', 'sys_adm_m_i_settings', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Мониторинг\"', 'Доступ к пункту меню \"Мониторинг\" в панели управления.', 'sys_adm_m_i_monitor', 1, 'boolean', 'false', '$sql5_data'),
-('Пункт меню \"Информация\"', 'Доступ к пункту меню \"Информация\" в панели управления.', 'sys_adm_m_i_info', 1, 'boolean', 'false', '$sql5_data')");
-
-			if(!$sql5){ $this->core->notify('Ошибка!', 'Произошла ошибка выставления стандартных привилегий', 2, 'install/?mode=step_3'); }
+			if(!$sql1){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_add_admin'], 2, 'install/?mode=step_3'); }
 
 			$url = substr($_SERVER['PHP_SELF'], 0, strpos($_SERVER['PHP_SELF'], 'install'));
 
-			$sql6 = $this->db->query("INSERT INTO `mcr_menu`
-										(`title`, `parent`, `url`, `target`, `permissions`)
-									VALUES
-										('Главная', 0, '$url', '_self', 'sys_share')");
-
-			if(!$sql6){ $this->core->notify('Ошибка!', 'Произошла ошибка добавления пунктов меню', 2, 'install/?mode=step_3'); }
-
-			$sql7 = $this->db->query("INSERT INTO `mcr_iconomy`
+			$sql2 = $this->db->query("INSERT INTO `mcr_iconomy`
 										(`login`, `money`, `realmoney`, `bank`)
 									VALUES
 										('$login', 0, 0, 0)");
 
-			if(!$sql7){ $this->core->notify('Ошибка!', 'Произошла ошибка добавления поля экономики', 2, 'install/?mode=step_3'); }
-
-			$sql8 = $this->db->query("INSERT INTO `mcr_groups` (`id`, `title`, `description`, `permissions`) VALUES
-(4, 'Заблокированный', 'Группа заблокированных пользователей', '{\"sys_debug\":true,\"sys_max_file_size\":0,\"sys_max_ratio\":0,\"sys_monitoring\":true,\"sys_share\":true,\"sys_search\":true,\"sys_restore\":false,\"sys_register\":false,\"sys_profile\":true,\"sys_profile_del_skin\":false,\"sys_profile_del_cloak\":false,\"sys_profile_skin\":false,\"sys_profile_cloak\":false,\"sys_profile_settings\":false,\"sys_news_list\":true,\"sys_news_full\":true,\"sys_comment_list\":false,\"sys_comment_add\":false,\"sys_comment_edt\":false,\"sys_comment_edt_all\":false,\"sys_comment_del\":false,\"sys_comment_del_all\":false,\"sys_auth\":false,\"sys_adm_main\":false,\"sys_adm_news\":false,\"sys_adm_news_cats\":false,\"sys_adm_news_views\":false,\"sys_adm_news_votes\":false,\"sys_adm_comments\":false,\"sys_adm_menu\":false,\"sys_adm_menu_adm\":false,\"sys_adm_menu_groups\":false,\"sys_adm_menu_icons\":false,\"sys_adm_users\":false,\"sys_adm_groups\":false,\"sys_adm_permissions\":false,\"sys_adm_statics\":false,\"sys_adm_info\":false,\"sys_adm_settings\":false,\"sys_adm_monitoring\":false,\"sys_adm_modules\":false,\"sys_search_news\":false,\"sys_search_comments\":false,\"sys_news_like\":false,\"sys_adm_m_g_main\":false,\"sys_adm_m_g_news\":false,\"sys_adm_m_g_users\":false,\"sys_adm_m_g_menu\":false,\"sys_adm_m_g_settings\":false,\"sys_adm_m_i_news\":false,\"sys_adm_m_i_news_cats\":false,\"sys_adm_m_i_comments\":false,\"sys_adm_m_i_news_views\":false,\"sys_adm_m_i_news_votes\":false,\"sys_adm_m_i_users\":false,\"sys_adm_m_i_groups\":false,\"sys_adm_m_i_permissions\":false,\"sys_adm_m_i_menu\":false,\"sys_adm_m_i_menu_adm\":false,\"sys_adm_m_i_menu_groups_adm\":false,\"sys_adm_m_i_icons\":false,\"sys_adm_m_i_statics\":false,\"sys_adm_m_i_settings\":false,\"sys_adm_m_i_monitor\":false,\"sys_adm_m_i_info\":false}'),
-(1, 'Непроверенный', 'Группа непроверенных пользователей', '{\"sys_debug\":true,\"sys_max_file_size\":1024,\"sys_max_ratio\":0,\"sys_monitoring\":true,\"sys_share\":true,\"sys_search\":true,\"sys_restore\":false,\"sys_register\":false,\"sys_profile\":true,\"sys_profile_del_skin\":false,\"sys_profile_del_cloak\":false,\"sys_profile_skin\":false,\"sys_profile_cloak\":false,\"sys_profile_settings\":false,\"sys_news_list\":true,\"sys_news_full\":true,\"sys_comment_list\":true,\"sys_comment_add\":false,\"sys_comment_edt\":false,\"sys_comment_edt_all\":false,\"sys_comment_del\":false,\"sys_comment_del_all\":false,\"sys_auth\":true,\"sys_adm_main\":false,\"sys_adm_news\":false,\"sys_adm_news_cats\":false,\"sys_adm_news_views\":false,\"sys_adm_news_votes\":false,\"sys_adm_comments\":false,\"sys_adm_menu\":false,\"sys_adm_menu_adm\":false,\"sys_adm_menu_groups\":false,\"sys_adm_menu_icons\":false,\"sys_adm_users\":false,\"sys_adm_groups\":false,\"sys_adm_permissions\":false,\"sys_adm_statics\":false,\"sys_adm_info\":false,\"sys_adm_settings\":false,\"sys_adm_monitoring\":false,\"sys_adm_modules\":false,\"sys_search_news\":true,\"sys_search_comments\":false,\"sys_news_like\":false,\"sys_adm_m_g_main\":false,\"sys_adm_m_g_news\":false,\"sys_adm_m_g_users\":false,\"sys_adm_m_g_menu\":false,\"sys_adm_m_g_settings\":false,\"sys_adm_m_i_news\":false,\"sys_adm_m_i_news_cats\":false,\"sys_adm_m_i_comments\":false,\"sys_adm_m_i_news_views\":false,\"sys_adm_m_i_news_votes\":false,\"sys_adm_m_i_users\":false,\"sys_adm_m_i_groups\":false,\"sys_adm_m_i_permissions\":false,\"sys_adm_m_i_menu\":false,\"sys_adm_m_i_menu_adm\":false,\"sys_adm_m_i_menu_groups_adm\":false,\"sys_adm_m_i_icons\":false,\"sys_adm_m_i_statics\":false,\"sys_adm_m_i_settings\":false,\"sys_adm_m_i_monitor\":false,\"sys_adm_m_i_info\":false}'),
-(2, 'Пользователь', 'Зарегистрированные и проверенные пользователи', '{\"sys_debug\":true,\"sys_max_file_size\":1024,\"sys_max_ratio\":1,\"sys_monitoring\":true,\"sys_share\":true,\"sys_search\":true,\"sys_restore\":false,\"sys_register\":false,\"sys_profile\":true,\"sys_profile_del_skin\":true,\"sys_profile_del_cloak\":false,\"sys_profile_skin\":true,\"sys_profile_cloak\":false,\"sys_profile_settings\":true,\"sys_news_list\":true,\"sys_news_full\":true,\"sys_comment_list\":true,\"sys_comment_add\":true,\"sys_comment_edt\":true,\"sys_comment_edt_all\":false,\"sys_comment_del\":false,\"sys_comment_del_all\":false,\"sys_auth\":true,\"sys_adm_main\":false,\"sys_adm_news\":false,\"sys_adm_news_cats\":false,\"sys_adm_news_views\":false,\"sys_adm_news_votes\":false,\"sys_adm_comments\":false,\"sys_adm_menu\":false,\"sys_adm_menu_adm\":false,\"sys_adm_menu_groups\":false,\"sys_adm_menu_icons\":false,\"sys_adm_users\":false,\"sys_adm_groups\":false,\"sys_adm_permissions\":false,\"sys_adm_statics\":false,\"sys_adm_info\":false,\"sys_adm_settings\":false,\"sys_adm_monitoring\":false,\"sys_adm_modules\":false,\"sys_search_news\":true,\"sys_search_comments\":true,\"sys_news_like\":true,\"sys_adm_m_g_main\":false,\"sys_adm_m_g_news\":false,\"sys_adm_m_g_users\":false,\"sys_adm_m_g_menu\":false,\"sys_adm_m_g_settings\":false,\"sys_adm_m_i_news\":false,\"sys_adm_m_i_news_cats\":false,\"sys_adm_m_i_comments\":false,\"sys_adm_m_i_news_views\":false,\"sys_adm_m_i_news_votes\":false,\"sys_adm_m_i_users\":false,\"sys_adm_m_i_groups\":false,\"sys_adm_m_i_permissions\":false,\"sys_adm_m_i_menu\":false,\"sys_adm_m_i_menu_adm\":false,\"sys_adm_m_i_menu_groups_adm\":false,\"sys_adm_m_i_icons\":false,\"sys_adm_m_i_statics\":false,\"sys_adm_m_i_settings\":false,\"sys_adm_m_i_monitor\":false,\"sys_adm_m_i_info\":false}'),
-(3, 'Администратор', 'Группа администрации', '{\"sys_debug\":true,\"sys_max_file_size\":4096,\"sys_max_ratio\":32,\"sys_monitoring\":true,\"sys_share\":true,\"sys_search\":true,\"sys_restore\":true,\"sys_register\":true,\"sys_profile\":true,\"sys_profile_del_skin\":true,\"sys_profile_del_cloak\":true,\"sys_profile_skin\":true,\"sys_profile_cloak\":true,\"sys_profile_settings\":true,\"sys_news_list\":true,\"sys_news_full\":true,\"sys_comment_list\":true,\"sys_comment_add\":true,\"sys_comment_edt\":true,\"sys_comment_edt_all\":true,\"sys_comment_del\":true,\"sys_comment_del_all\":true,\"sys_auth\":true,\"sys_adm_main\":true,\"sys_adm_news\":true,\"sys_adm_news_cats\":true,\"sys_adm_news_views\":true,\"sys_adm_news_votes\":true,\"sys_adm_comments\":true,\"sys_adm_menu\":true,\"sys_adm_menu_adm\":true,\"sys_adm_menu_groups\":true,\"sys_adm_menu_icons\":true,\"sys_adm_users\":true,\"sys_adm_groups\":true,\"sys_adm_permissions\":true,\"sys_adm_statics\":true,\"sys_adm_info\":true,\"sys_adm_settings\":true,\"sys_adm_monitoring\":true,\"sys_adm_modules\":true,\"sys_search_news\":true,\"sys_search_comments\":true,\"sys_news_like\":true,\"sys_adm_m_g_main\":true,\"sys_adm_m_g_news\":true,\"sys_adm_m_g_users\":true,\"sys_adm_m_g_menu\":true,\"sys_adm_m_g_settings\":true,\"sys_adm_m_i_news\":true,\"sys_adm_m_i_news_cats\":true,\"sys_adm_m_i_comments\":true,\"sys_adm_m_i_news_views\":true,\"sys_adm_m_i_news_votes\":true,\"sys_adm_m_i_users\":true,\"sys_adm_m_i_groups\":true,\"sys_adm_m_i_permissions\":true,\"sys_adm_m_i_menu\":true,\"sys_adm_m_i_menu_adm\":true,\"sys_adm_m_i_menu_groups_adm\":true,\"sys_adm_m_i_icons\":true,\"sys_adm_m_i_statics\":true,\"sys_adm_m_i_settings\":true,\"sys_adm_m_i_monitor\":true,\"sys_adm_m_i_info\":true}')");
-
-			if(!$sql8){ $this->core->notify('Ошибка!', 'Произошла ошибка добавления групп пользователей', 2, 'install/?mode=step_3'); }
-
+			if(!$sql2){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_add_economy'], 2, 'install/?mode=step_3'); }
+			
 			$sql9 = $this->db->query("UPDATE `mcr_groups` SET id='0' WHERE id='4'");
 
-			if(!$sql9){ $this->core->notify('Ошибка!', 'Произошла ошибка обновления групп пользователей', 2, 'install/?mode=step_3'); }
+			if(!$sql9){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_upd_group'], 2, 'install/?mode=step_3'); }
 
 			$sql10 = $this->db->query("ALTER TABLE `mcr_groups` AUTO_INCREMENT=0");
 
-			if(!$sql10){ $this->core->notify('Ошибка!', 'Произошла ошибка обновления групп пользователей', 2, 'install/?mode=step_3'); }
+			if(!$sql10){ $this->core->notify($this->lng['e_msg'], $this->lng_m['e_upd_group'], 2, 'install/?mode=step_3'); }
 
 			$this->config->main['crypt'] = $method;
 
-			if(!$this->core->savecfg($this->config->main, 'main.php', 'main')){
-				$this->core->notify('Ошибка!', 'Настройки не могут быть сохранены', 2, 'install/?mode=step_3');
+			if(!$this->config->savecfg($this->config->main, 'main.php', 'main')){
+				$this->core->notify($this->lng['e_msg'], $this->lng_m['e_settings'], 2, 'install/?mode=step_3');
 			}
 
-
 			$_SESSION['step_3'] = true;
 
 			file_get_contents("http://api.webmcr.com/?do=install&domain=".$_SERVER['SERVER_NAME']);
 
-			$this->core->notify('Завершение установки', 'Настройки', 4, 'install/?mode=settings');
+			$this->core->notify($this->lng_m['finish'], $this->lng_m['mod_name'], 4, 'install/?mode=settings');
 
 		}
 
diff --git a/upload/install/tables.sql b/upload/install/tables.sql
index 0119aa0..a518b4d 100644
--- a/upload/install/tables.sql
+++ b/upload/install/tables.sql
@@ -6,7 +6,18 @@
   `uid` int(10) NOT NULL,
   `data` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+#line
+CREATE TABLE IF NOT EXISTS `mcr_files` (
+  `id` int(10) NOT NULL AUTO_INCREMENT,
+  `uniq` varchar(64) CHARACTER SET latin1 NOT NULL,
+  `name` varchar(255) CHARACTER SET latin1 NOT NULL,
+  `oldname` varchar(255) NOT NULL,
+  `uid` int(10) NOT NULL,
+  `data` text NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uniq` (`uniq`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 #line
 CREATE TABLE IF NOT EXISTS `mcr_groups` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
@@ -14,7 +25,13 @@
   `description` varchar(255) NOT NULL,
   `permissions` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=4 ;
+#line
+INSERT INTO `mcr_groups` (`id`, `title`, `description`, `permissions`) VALUES
+(0, 'Заблокированный', 'Группа заблокированных пользователей', '{"sys_debug":false,"sys_max_file_size":0,"sys_max_ratio":0,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":false,"sys_profile_del_cloak":false,"sys_profile_skin":false,"sys_profile_cloak":false,"sys_profile_settings":false,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":false,"sys_comment_add":false,"sys_comment_edt":false,"sys_comment_edt_all":false,"sys_comment_del":false,"sys_comment_del_all":false,"sys_auth":false,"sys_adm_main":false,"sys_adm_news":false,"sys_adm_news_cats":false,"sys_adm_news_views":false,"sys_adm_news_votes":false,"sys_adm_comments":false,"sys_adm_menu":false,"sys_adm_menu_adm":false,"sys_adm_menu_groups":false,"sys_adm_menu_icons":false,"sys_adm_users":false,"sys_adm_groups":false,"sys_adm_permissions":false,"sys_adm_statics":false,"sys_adm_info":false,"sys_adm_settings":false,"sys_adm_monitoring":false,"sys_adm_modules":false,"sys_search_news":false,"sys_search_comments":false,"sys_news_like":false,"sys_adm_m_g_main":false,"sys_adm_m_g_news":false,"sys_adm_m_g_users":false,"sys_adm_m_g_menu":false,"sys_adm_m_g_settings":false,"sys_adm_m_i_news":false,"sys_adm_m_i_news_cats":false,"sys_adm_m_i_comments":false,"sys_adm_m_i_news_views":false,"sys_adm_m_i_news_votes":false,"sys_adm_m_i_users":false,"sys_adm_m_i_groups":false,"sys_adm_m_i_permissions":false,"sys_adm_m_i_menu":false,"sys_adm_m_i_menu_adm":false,"sys_adm_m_i_menu_groups_adm":false,"sys_adm_m_i_icons":false,"sys_adm_m_i_statics":false,"sys_adm_m_i_settings":false,"sys_adm_m_i_monitor":false,"sys_adm_m_i_info":false,"sys_adm_m_i_modules":false,"sys_adm_m_i_logs":false,"sys_adm_manager":false,"sys_adm_logs":false,"sys_adm_permissions_add":false,"sys_adm_permissions_edit":false,"sys_adm_permissions_delete":false,"sys_adm_comments_add":false,"sys_adm_comments_edit":false,"sys_adm_comments_delete":false,"sys_adm_groups_add":false,"sys_adm_groups_edit":false,"sys_adm_groups_delete":false,"sys_adm_menu_add":false,"sys_adm_menu_edit":false,"sys_adm_menu_delete":false,"sys_adm_menu_adm_add":false,"sys_adm_menu_adm_edit":false,"sys_adm_menu_adm_delete":false,"sys_adm_menu_groups_add":false,"sys_adm_menu_groups_edit":false,"sys_adm_menu_groups_delete":false,"sys_adm_menu_icons_add":false,"sys_adm_menu_icons_edit":false,"sys_adm_menu_icons_delete":false,"sys_adm_monitoring_add":false,"sys_adm_monitoring_edit":false,"sys_adm_monitoring_delete":false,"sys_adm_news_add":false,"sys_adm_news_edit":false,"sys_adm_news_delete":false,"sys_adm_news_cats_add":false,"sys_adm_news_cats_edit":false,"sys_adm_news_cats_delete":false,"sys_adm_statics_add":false,"sys_adm_statics_edit":false,"sys_adm_statics_delete":false,"sys_adm_users_add":false,"sys_adm_users_edit":false,"sys_adm_users_delete":false,"sys_adm_users_ban":false,"sys_adm_modules_edit":false,"sys_adm_news_views_delete":false,"sys_adm_news_votes_delete":false}'),
+(1, 'Непроверенный', 'Группа непроверенных пользователей', '{"sys_debug":false,"sys_max_file_size":1024,"sys_max_ratio":0,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":false,"sys_profile_del_cloak":false,"sys_profile_skin":false,"sys_profile_cloak":false,"sys_profile_settings":false,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":true,"sys_comment_add":false,"sys_comment_edt":false,"sys_comment_edt_all":false,"sys_comment_del":false,"sys_comment_del_all":false,"sys_auth":true,"sys_adm_main":false,"sys_adm_news":false,"sys_adm_news_cats":false,"sys_adm_news_views":false,"sys_adm_news_votes":false,"sys_adm_comments":false,"sys_adm_menu":false,"sys_adm_menu_adm":false,"sys_adm_menu_groups":false,"sys_adm_menu_icons":false,"sys_adm_users":false,"sys_adm_groups":false,"sys_adm_permissions":false,"sys_adm_statics":false,"sys_adm_info":false,"sys_adm_settings":false,"sys_adm_monitoring":false,"sys_adm_modules":false,"sys_search_news":true,"sys_search_comments":false,"sys_news_like":false,"sys_adm_m_g_main":false,"sys_adm_m_g_news":false,"sys_adm_m_g_users":false,"sys_adm_m_g_menu":false,"sys_adm_m_g_settings":false,"sys_adm_m_i_news":false,"sys_adm_m_i_news_cats":false,"sys_adm_m_i_comments":false,"sys_adm_m_i_news_views":false,"sys_adm_m_i_news_votes":false,"sys_adm_m_i_users":false,"sys_adm_m_i_groups":false,"sys_adm_m_i_permissions":false,"sys_adm_m_i_menu":false,"sys_adm_m_i_menu_adm":false,"sys_adm_m_i_menu_groups_adm":false,"sys_adm_m_i_icons":false,"sys_adm_m_i_statics":false,"sys_adm_m_i_settings":false,"sys_adm_m_i_monitor":false,"sys_adm_m_i_info":false,"sys_adm_m_i_modules":false,"sys_adm_m_i_logs":false,"sys_adm_manager":false,"sys_adm_logs":false,"sys_adm_permissions_add":false,"sys_adm_permissions_edit":false,"sys_adm_permissions_delete":false,"sys_adm_comments_add":false,"sys_adm_comments_edit":false,"sys_adm_comments_delete":false,"sys_adm_groups_add":false,"sys_adm_groups_edit":false,"sys_adm_groups_delete":false,"sys_adm_menu_add":false,"sys_adm_menu_edit":false,"sys_adm_menu_delete":false,"sys_adm_menu_adm_add":false,"sys_adm_menu_adm_edit":false,"sys_adm_menu_adm_delete":false,"sys_adm_menu_groups_add":false,"sys_adm_menu_groups_edit":false,"sys_adm_menu_groups_delete":false,"sys_adm_menu_icons_add":false,"sys_adm_menu_icons_edit":false,"sys_adm_menu_icons_delete":false,"sys_adm_monitoring_add":false,"sys_adm_monitoring_edit":false,"sys_adm_monitoring_delete":false,"sys_adm_news_add":false,"sys_adm_news_edit":false,"sys_adm_news_delete":false,"sys_adm_news_cats_add":false,"sys_adm_news_cats_edit":false,"sys_adm_news_cats_delete":false,"sys_adm_statics_add":false,"sys_adm_statics_edit":false,"sys_adm_statics_delete":false,"sys_adm_users_add":false,"sys_adm_users_edit":false,"sys_adm_users_delete":false,"sys_adm_users_ban":false,"sys_adm_modules_edit":false,"sys_adm_news_views_delete":false,"sys_adm_news_votes_delete":false}'),
+(2, 'Пользователь', 'Зарегистрированные и проверенные пользователи', '{"sys_debug":false,"sys_max_file_size":1024,"sys_max_ratio":1,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":true,"sys_profile_del_cloak":true,"sys_profile_skin":true,"sys_profile_cloak":true,"sys_profile_settings":true,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":true,"sys_comment_add":true,"sys_comment_edt":true,"sys_comment_edt_all":false,"sys_comment_del":false,"sys_comment_del_all":false,"sys_auth":true,"sys_adm_main":false,"sys_adm_news":false,"sys_adm_news_cats":false,"sys_adm_news_views":false,"sys_adm_news_votes":false,"sys_adm_comments":false,"sys_adm_menu":false,"sys_adm_menu_adm":false,"sys_adm_menu_groups":false,"sys_adm_menu_icons":false,"sys_adm_users":false,"sys_adm_groups":false,"sys_adm_permissions":false,"sys_adm_statics":false,"sys_adm_info":false,"sys_adm_settings":false,"sys_adm_monitoring":false,"sys_adm_modules":false,"sys_search_news":true,"sys_search_comments":true,"sys_news_like":true,"sys_adm_m_g_main":false,"sys_adm_m_g_news":false,"sys_adm_m_g_users":false,"sys_adm_m_g_menu":false,"sys_adm_m_g_settings":false,"sys_adm_m_i_news":false,"sys_adm_m_i_news_cats":false,"sys_adm_m_i_comments":false,"sys_adm_m_i_news_views":false,"sys_adm_m_i_news_votes":false,"sys_adm_m_i_users":false,"sys_adm_m_i_groups":false,"sys_adm_m_i_permissions":false,"sys_adm_m_i_menu":false,"sys_adm_m_i_menu_adm":false,"sys_adm_m_i_menu_groups_adm":false,"sys_adm_m_i_icons":false,"sys_adm_m_i_statics":false,"sys_adm_m_i_settings":false,"sys_adm_m_i_monitor":false,"sys_adm_m_i_info":false,"sys_adm_m_i_modules":false,"sys_adm_m_i_logs":false,"sys_adm_manager":false,"sys_adm_logs":false,"sys_adm_permissions_add":false,"sys_adm_permissions_edit":false,"sys_adm_permissions_delete":false,"sys_adm_comments_add":false,"sys_adm_comments_edit":false,"sys_adm_comments_delete":false,"sys_adm_groups_add":false,"sys_adm_groups_edit":false,"sys_adm_groups_delete":false,"sys_adm_menu_add":false,"sys_adm_menu_edit":false,"sys_adm_menu_delete":false,"sys_adm_menu_adm_add":false,"sys_adm_menu_adm_edit":false,"sys_adm_menu_adm_delete":false,"sys_adm_menu_groups_add":false,"sys_adm_menu_groups_edit":false,"sys_adm_menu_groups_delete":false,"sys_adm_menu_icons_add":false,"sys_adm_menu_icons_edit":false,"sys_adm_menu_icons_delete":false,"sys_adm_monitoring_add":false,"sys_adm_monitoring_edit":false,"sys_adm_monitoring_delete":false,"sys_adm_news_add":false,"sys_adm_news_edit":false,"sys_adm_news_delete":false,"sys_adm_news_cats_add":false,"sys_adm_news_cats_edit":false,"sys_adm_news_cats_delete":false,"sys_adm_statics_add":false,"sys_adm_statics_edit":false,"sys_adm_statics_delete":false,"sys_adm_users_add":false,"sys_adm_users_edit":false,"sys_adm_users_delete":false,"sys_adm_users_ban":false,"sys_adm_modules_edit":false,"sys_adm_news_views_delete":false,"sys_adm_news_votes_delete":false}'),
+(3, 'Администратор', 'Группа администрации', '{"sys_debug":true,"sys_max_file_size":4096,"sys_max_ratio":32,"sys_monitoring":true,"sys_share":true,"sys_search":true,"sys_restore":true,"sys_register":true,"sys_profile":true,"sys_profile_del_skin":true,"sys_profile_del_cloak":true,"sys_profile_skin":true,"sys_profile_cloak":true,"sys_profile_settings":true,"sys_news_list":true,"sys_news_full":true,"sys_comment_list":true,"sys_comment_add":true,"sys_comment_edt":true,"sys_comment_edt_all":true,"sys_comment_del":true,"sys_comment_del_all":true,"sys_auth":true,"sys_adm_main":true,"sys_adm_news":true,"sys_adm_news_cats":true,"sys_adm_news_views":true,"sys_adm_news_votes":true,"sys_adm_comments":true,"sys_adm_menu":true,"sys_adm_menu_adm":true,"sys_adm_menu_groups":true,"sys_adm_menu_icons":true,"sys_adm_users":true,"sys_adm_groups":true,"sys_adm_permissions":true,"sys_adm_statics":true,"sys_adm_info":true,"sys_adm_settings":true,"sys_adm_monitoring":true,"sys_adm_modules":true,"sys_search_news":true,"sys_search_comments":true,"sys_news_like":true,"sys_adm_m_g_main":true,"sys_adm_m_g_news":true,"sys_adm_m_g_users":true,"sys_adm_m_g_menu":true,"sys_adm_m_g_settings":true,"sys_adm_m_i_news":true,"sys_adm_m_i_news_cats":true,"sys_adm_m_i_comments":true,"sys_adm_m_i_news_views":true,"sys_adm_m_i_news_votes":true,"sys_adm_m_i_users":true,"sys_adm_m_i_groups":true,"sys_adm_m_i_permissions":true,"sys_adm_m_i_menu":true,"sys_adm_m_i_menu_adm":true,"sys_adm_m_i_menu_groups_adm":true,"sys_adm_m_i_icons":true,"sys_adm_m_i_statics":true,"sys_adm_m_i_settings":true,"sys_adm_m_i_monitor":true,"sys_adm_m_i_info":true,"sys_adm_m_i_modules":true,"sys_adm_m_i_logs":true,"sys_adm_manager":true,"sys_adm_logs":true,"sys_adm_permissions_add":true,"sys_adm_permissions_edit":true,"sys_adm_permissions_delete":true,"sys_adm_comments_add":true,"sys_adm_comments_edit":true,"sys_adm_comments_delete":true,"sys_adm_groups_add":true,"sys_adm_groups_edit":true,"sys_adm_groups_delete":true,"sys_adm_menu_add":true,"sys_adm_menu_edit":true,"sys_adm_menu_delete":true,"sys_adm_menu_adm_add":true,"sys_adm_menu_adm_edit":true,"sys_adm_menu_adm_delete":true,"sys_adm_menu_groups_add":true,"sys_adm_menu_groups_edit":true,"sys_adm_menu_groups_delete":true,"sys_adm_menu_icons_add":true,"sys_adm_menu_icons_edit":true,"sys_adm_menu_icons_delete":true,"sys_adm_monitoring_add":true,"sys_adm_monitoring_edit":true,"sys_adm_monitoring_delete":true,"sys_adm_news_add":true,"sys_adm_news_edit":true,"sys_adm_news_delete":true,"sys_adm_news_cats_add":true,"sys_adm_news_cats_edit":true,"sys_adm_news_cats_delete":true,"sys_adm_statics_add":true,"sys_adm_statics_edit":true,"sys_adm_statics_delete":true,"sys_adm_users_add":true,"sys_adm_users_edit":true,"sys_adm_users_delete":true,"sys_adm_users_ban":true,"sys_adm_modules_edit":true,"sys_adm_news_views_delete":true,"sys_adm_news_votes_delete":true}');
 #line
 CREATE TABLE IF NOT EXISTS `mcr_iconomy` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
@@ -25,6 +42,14 @@
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 #line
+CREATE TABLE IF NOT EXISTS `mcr_logs` (
+  `id` int(10) NOT NULL AUTO_INCREMENT,
+  `uid` int(10) NOT NULL DEFAULT '0',
+  `message` varchar(255) NOT NULL,
+  `date` int(10) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+#line
 CREATE TABLE IF NOT EXISTS `mcr_menu` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
   `title` varchar(32) NOT NULL,
@@ -33,7 +58,11 @@
   `target` varchar(10) CHARACTER SET latin1 NOT NULL DEFAULT '_self',
   `permissions` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ;
+#line
+INSERT INTO `mcr_menu` (`id`, `title`, `parent`, `url`, `target`, `permissions`) VALUES
+(1, 'Главная', 0, '/', '_self', 'sys_share'),
+(2, 'ПУ', 0, '/?mode=admin', '_self', 'sys_adm_main');
 #line
 CREATE TABLE IF NOT EXISTS `mcr_menu_adm` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
@@ -46,7 +75,27 @@
   `priority` int(6) NOT NULL DEFAULT '1',
   `icon` int(10) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=19 ;
+#line
+INSERT INTO `mcr_menu_adm` (`id`, `gid`, `title`, `text`, `url`, `target`, `access`, `priority`, `icon`) VALUES
+(1, 1, 'Информация', 'Информация и статистика движка', '/?mode=admin&do=info', '_self', 'sys_adm_m_i_info', 1, 8),
+(2, 2, 'Новости', 'Управление списком новостей', '/?mode=admin&do=news', '_self', 'sys_adm_m_i_news', 1, 2),
+(3, 2, 'Категории', 'Управление категориями новостей', '/?mode=admin&do=news_cats', '_self', 'sys_adm_m_i_news_cats', 2, 10),
+(4, 2, 'Комментарии', 'Управление комментариями новостей', '/?mode=admin&do=comments', '_self', 'sys_adm_m_i_comments', 3, 13),
+(5, 2, 'Просмотры', 'Управление просмотрами новостей', '/?mode=admin&do=news_views', '_self', 'sys_adm_m_i_news_views', 4, 14),
+(6, 2, 'Голоса', 'Управление голосами новостей', '/?mode=admin&do=news_votes', '_self', 'sys_adm_m_i_news_votes', 5, 9),
+(7, 3, 'Пользователи', 'Изменение пользователей', '/?mode=admin&do=users', '_self', 'sys_adm_m_i_users', 1, 5),
+(8, 3, 'Группы', 'Управление группами пользователей и их привилегиями', '/?mode=admin&do=groups', '_self', 'sys_adm_m_i_groups', 2, 15),
+(9, 3, 'Привилегии', 'Управление доступными привилегиями', '/?mode=admin&do=permissions', '_self', 'sys_adm_m_i_permissions', 3, 17),
+(10, 4, 'Меню сайта', 'Управление пунктами основного меню', '/?mode=admin&do=menu', '_self', 'sys_adm_m_i_menu', 1, 7),
+(11, 4, 'Меню ПУ', 'Управление пунктами меню панели управления', '/?mode=admin&do=menu_adm', '_self', 'sys_adm_m_i_menu_adm', 2, 18),
+(12, 4, 'Группы меню ПУ', 'Управление группами меню панели управления', '/?mode=admin&do=menu_groups', '_self', 'sys_adm_m_i_menu_groups_adm', 3, 11),
+(13, 4, 'Иконки', 'Управление иконками пунктов меню панели управления', '/?mode=admin&do=menu_icons', '_self', 'sys_adm_m_i_icons', 4, 19),
+(14, 1, 'Статические страницы', 'Управление статическими страницами ', '/?mode=admin&do=statics', '_self', 'sys_adm_m_i_statics', 2, 20),
+(15, 5, 'Настройки сайта', 'Основные настройки сайта', '/?mode=admin&do=settings', '_self', 'sys_adm_m_i_settings', 1, 6),
+(16, 1, 'Мониторинг серверов', 'Управление серверами мониторинга', '/?mode=admin&do=monitoring', '_self', 'sys_adm_m_i_monitor', 3, 21),
+(17, 1, 'Модули', 'Управление модулями', '/?mode=admin&do=modules', '_self', 'sys_adm_m_i_modules', 4, 22),
+(18, 1, 'Лог действий', 'Журнал действий пользователей', '/?mode=admin&do=logs', '_self', 'sys_adm_m_i_logs', 5, 23);
 #line
 CREATE TABLE IF NOT EXISTS `mcr_menu_adm_groups` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
@@ -55,14 +104,46 @@
   `access` varchar(64) CHARACTER SET latin1 NOT NULL,
   `priority` int(10) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=6 ;
+#line
+INSERT INTO `mcr_menu_adm_groups` (`id`, `title`, `text`, `access`, `priority`) VALUES
+(1, 'Разное', 'Описание раздела разное', 'sys_adm_m_g_main', 1),
+(2, 'Управление новостями', 'Всё, что связано с модулем новостей', 'sys_adm_m_g_news', 2),
+(3, 'Управление пользователями', 'Управление пользователями', 'sys_adm_m_g_users', 3),
+(4, 'Управление меню', 'Управление группами и пунктами меню сайта и панели управления', 'sys_adm_m_g_menu', 4),
+(5, 'Настройки', 'Настройки сайта и движка', 'sys_adm_m_g_settings', 6);
 #line
 CREATE TABLE IF NOT EXISTS `mcr_menu_adm_icons` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
   `title` varchar(32) NOT NULL,
   `img` varchar(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=24 ;
+#line
+INSERT INTO `mcr_menu_adm_icons` (`id`, `title`, `img`) VALUES
+(1, 'По умолчанию', 'default.png'),
+(2, 'Новости', 'news.png'),
+(3, 'Пазл', 'puzzle.png'),
+(4, 'Пользователь', 'user.png'),
+(5, 'Пользователи', 'users.png'),
+(6, 'Молоток и гаечный ключ', 'settings.png'),
+(7, 'Древо', 'tree.png'),
+(8, 'Диаграмма', 'diagram.png'),
+(9, 'Лайк', 'like.png'),
+(10, 'Документы', 'documents.png'),
+(11, 'Иерархия', 'hierarchy.png'),
+(12, 'Шестеренка', 'wheel.png'),
+(13, 'Комментарии', 'comments.png'),
+(14, 'Глаз', 'eye.png'),
+(15, 'Группа пользователей', 'groups.png'),
+(16, 'График', 'chart.png'),
+(17, 'Замок', 'lock.png'),
+(18, 'Блоки', 'blocks.png'),
+(19, 'Иконка', 'icon.png'),
+(20, 'Два листа', 'pages.png'),
+(21, 'Монитор', 'monitor.png'),
+(22, 'Сеть', 'network.png'),
+(23, 'Открытая книга', 'logs.png');
 #line
 CREATE TABLE IF NOT EXISTS `mcr_monitoring` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
@@ -70,8 +151,20 @@
   `text` varchar(255) NOT NULL,
   `ip` varchar(64) CHARACTER SET latin1 NOT NULL DEFAULT '127.0.0.1',
   `port` int(6) NOT NULL DEFAULT '25565',
+  `status` tinyint(1) NOT NULL DEFAULT '0',
+  `version` varchar(64) NOT NULL,
+  `online` int(10) NOT NULL DEFAULT '0',
+  `slots` int(10) NOT NULL DEFAULT '0',
+  `players` text NOT NULL,
+  `motd` text NOT NULL,
+  `plugins` text NOT NULL,
+  `map` varchar(64) NOT NULL,
+  `last_error` text NOT NULL,
+  `last_update` int(10) NOT NULL DEFAULT '0',
+  `updater` int(10) NOT NULL DEFAULT '60',
+  `type` varchar(32) CHARACTER SET latin1 NOT NULL DEFAULT 'MineToolsAPIPing',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 #line
 CREATE TABLE IF NOT EXISTS `mcr_news` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
@@ -87,7 +180,7 @@
   `uid` int(10) NOT NULL COMMENT 'ID добавившего пользователя',
   `data` text NOT NULL COMMENT 'Сведения о новости',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 #line
 CREATE TABLE IF NOT EXISTS `mcr_news_cats` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
@@ -95,7 +188,10 @@
   `description` varchar(255) NOT NULL,
   `data` text NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
+#line
+INSERT INTO `mcr_news_cats` (`id`, `title`, `description`, `data`) VALUES
+(1, 'Без категории', 'Без категории', '{"time_create":1005553535,"time_last":1005553535,"user":"admin"}');
 #line
 CREATE TABLE IF NOT EXISTS `mcr_news_views` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
@@ -104,7 +200,7 @@
   `ip` varchar(15) CHARACTER SET latin1 NOT NULL,
   `time` int(10) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 #line
 CREATE TABLE IF NOT EXISTS `mcr_news_votes` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
@@ -114,7 +210,7 @@
   `ip` varchar(15) CHARACTER SET latin1 NOT NULL,
   `time` int(10) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 #line
 CREATE TABLE IF NOT EXISTS `mcr_permissions` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
@@ -127,7 +223,118 @@
   `data` text NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `value` (`value`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=114 ;
+#line
+INSERT INTO `mcr_permissions` (`id`, `title`, `description`, `value`, `system`, `type`, `default`, `data`) VALUES
+(1, 'Доступ к отладке', 'Дает доступ к системной информации для устранения и выявления неисправностей', 'sys_debug', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(2, 'Максимальный размер файла', 'Максимально допустимый размер загружаемого файла(КБ)', 'sys_max_file_size', 1, 'float', '1024', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(3, 'Максимальное соотношение', 'Максимальное соотношение скинов и плащей. Подробнее в документации.', 'sys_max_ratio', 1, 'integer', '0', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(4, 'Доступ к мониторингу', 'Доступ к просмотру блока мониторинга серверов', 'sys_monitoring', 1, 'boolean', 'true', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(5, 'Общий доступ', 'Доступ к общедоступным элементам', 'sys_share', 1, 'boolean', 'true', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(6, 'Основной доступ к поиску', 'Если запрещено, то доступ к подмодулям будет так же недоступен, независимо от их настроек.', 'sys_search', 1, 'boolean', 'true', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(7, 'Восстановление пароля', 'Доступ к восстановлению пароля', 'sys_restore', 1, 'boolean', 'true', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(8, 'Доступ к регистрации', 'Позволяет выбранным группам пользователей регистрироваться на сайте', 'sys_register', 1, 'boolean', 'true', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(9, 'Доступ к своему профилю', 'Просмотр собственного профиля и информации о себе', 'sys_profile', 1, 'boolean', 'true', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(10, 'Удаление скина персонажа', 'Доступ к удалению скина персонажа', 'sys_profile_del_skin', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(11, 'Удаление плаща персонажа', 'Доступ к удалению плаща персонажа', 'sys_profile_del_cloak', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(12, 'Изменение скина персонажа', 'Доступ к изменению скина персонажа', 'sys_profile_skin', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(13, 'Изменение плаща персонажа', 'Доступ к изменению плаща персонажа', 'sys_profile_cloak', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(14, 'Настройки пользователя', 'Доступ к настройкам пользователя', 'sys_profile_settings', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(15, 'Просмотр списка новостей', 'Доступ к просмотрю списка всех новостей', 'sys_news_list', 1, 'boolean', 'true', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(16, 'Просмотр полных новостей', 'Доступ к просмотру полных новостей', 'sys_news_full', 1, 'boolean', 'true', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(17, 'Просмотр комментариев', 'Доступ к просмотру комментариев', 'sys_comment_list', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(18, 'Добавление комментариев', 'Доступ к добавлению комментариев', 'sys_comment_add', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(19, 'Редактирование своих комментариев', 'Доступ к редактированию собственных комментариев', 'sys_comment_edt', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(20, 'Редактирование всех комментариев', 'Доступ к редактированию комментариев всех пользователей, включая свои независимо от доступа к редактированию своих комментариев', 'sys_comment_edt_all', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(21, 'Удаление своих комментариев', 'Доступ к удалению собственных комментариев', 'sys_comment_del', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(22, 'Удаление всех комментариев', 'Доступ к удалению комментариев всех пользователей, включая свои независимо от доступа к удалению своих комментариев', 'sys_comment_del_all', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(23, 'Авторизация', 'Доступ к авторизации пользователей', 'sys_auth', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(24, 'Доступ к ПУ', 'Основной доступ к панели управления. Если запрещено, то доступ ко всем элементам ПУ будет закрыт.', 'sys_adm_main', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(25, 'Управление новостями', 'Управление новостями: добавление, удаление, редактирование', 'sys_adm_news', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(26, 'Управление категориями', 'Управление категориями новостей: добавление, удаление, редактирование', 'sys_adm_news_cats', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(27, 'Управление просмотрами новостей', 'Управление просмотрами новостей: удаление', 'sys_adm_news_views', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(28, 'Управление просмотрами новостей', 'Управление просмотрами новостей: удаление', 'sys_adm_news_votes', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(29, 'Управление комментариями', 'Управление комментариями: добавление, удаление, редактирование', 'sys_adm_comments', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(30, 'Управление меню сайта', 'Управление меню сайта: добавление, редактирование, удаление', 'sys_adm_menu', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(31, 'Управление меню ПУ', 'Управление меню ПУ: добавление, редактирование, удаление', 'sys_adm_menu_adm', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(32, 'Управление группами меню ПУ', 'Управление группами меню ПУ: добавление, редактирование, удаление', 'sys_adm_menu_groups', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(33, 'Управление иконками меню ПУ', 'Управление иконками меню ПУ: добавление, редактирование, удаление', 'sys_adm_menu_icons', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(34, 'Управление пользователями', 'Управление пользователями: добавление, редактирование, удаление, бан, разбан', 'sys_adm_users', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(35, 'Управление группами пользователей', 'Управление группами пользователей: добавление, редактирование, удаление', 'sys_adm_groups', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(36, 'Управление привилегиями', 'Управление привилегиями: добавление, редактирование, удаление', 'sys_adm_permissions', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(37, 'Управление статическими страницами', 'Управление статическими страницами: добавление, редактирование, удаление', 'sys_adm_statics', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(38, 'Информация о движке', 'Доступ к информации и статистике движка', 'sys_adm_info', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(39, 'Настройки сайта', 'Доступ к настройкам сайта', 'sys_adm_settings', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(40, 'Управление мониторингом', 'Управление мониторингом: добавление, редактирование, удаление', 'sys_adm_monitoring', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(41, 'Управление модулями', 'Доступ к управлению модулями', 'sys_adm_modules', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(42, 'Поиск по новостям', 'Доступ к поиску по новостям', 'sys_search_news', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(43, 'Поиск по комментариям', 'Доступ к поиску по комментариям', 'sys_search_comments', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(44, 'Голосование за новость', 'Доступ к голосованию за новость (Лайки/Дизлайки)', 'sys_news_like', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(45, 'Группа меню "Разное"', 'Доступ к группе меню "Разное" в панели управления. Входящие в нее пункты будут так же недоступны.', 'sys_adm_m_g_main', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(46, 'Группа меню "Управление новостями"', 'Доступ к группе меню "Управление новостями" в панели управления. Входящие в нее пункты будут так же недоступны.', 'sys_adm_m_g_news', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(47, 'Группа меню "Управление пользователями"', 'Доступ к группе меню "Управление пользователями" в панели управления. Входящие в нее пункты будут так же недоступны.', 'sys_adm_m_g_users', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(48, 'Группа меню "Управление меню"', 'Доступ к группе меню "Управление меню" в панели управления. Входящие в нее пункты будут так же недоступны.', 'sys_adm_m_g_menu', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(49, 'Группа меню "Настройки"', 'Доступ к группе меню "Настройки" в панели управления. Входящие в нее пункты будут так же недоступны.', 'sys_adm_m_g_settings', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(50, 'Пункт меню "Новости"', 'Доступ к пункту меню "Новости" в панели управления.', 'sys_adm_m_i_news', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(51, 'Пункт меню "Категории"', 'Доступ к пункту меню "Категории" в панели управления.', 'sys_adm_m_i_news_cats', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(52, 'Пункт меню "Комментарии"', 'Доступ к пункту меню "Комментарии" в панели управления.', 'sys_adm_m_i_comments', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(53, 'Пункт меню "Просмотры"', 'Доступ к пункту меню "Просмотры" в панели управления.', 'sys_adm_m_i_news_views', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(54, 'Пункт меню "Голоса"', 'Доступ к пункту меню "Голоса" в панели управления.', 'sys_adm_m_i_news_votes', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(55, 'Пункт меню "Пользователи"', 'Доступ к пункту меню "Пользователи" в панели управления.', 'sys_adm_m_i_users', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(56, 'Пункт меню "Группы"', 'Доступ к пункту меню "Группы" в панели управления.', 'sys_adm_m_i_groups', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(57, 'Пункт меню "Привилегии"', 'Доступ к пункту меню "Привилегии" в панели управления.', 'sys_adm_m_i_permissions', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(58, 'Пункт меню "Меню сайта"', 'Доступ к пункту меню "Меню сайта" в панели управления.', 'sys_adm_m_i_menu', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(59, 'Пункт меню "Меню ПУ"', 'Доступ к пункту меню "Меню ПУ" в панели управления.', 'sys_adm_m_i_menu_adm', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(60, 'Пункт меню "Группы меню ПУ"', 'Доступ к пункту меню "Группы меню ПУ" в панели управления.', 'sys_adm_m_i_menu_groups_adm', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(61, 'Пункт меню "Иконки"', 'Доступ к пункту меню "Иконки" в панели управления.', 'sys_adm_m_i_icons', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(62, 'Пункт меню "Статические страницы"', 'Доступ к пункту меню "Статические страницы" в панели управления.', 'sys_adm_m_i_statics', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(63, 'Пункт меню "Настройки сайта"', 'Доступ к пункту меню "Настройки сайта" в панели управления.', 'sys_adm_m_i_settings', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(64, 'Пункт меню "Мониторинг"', 'Доступ к пункту меню "Мониторинг" в панели управления.', 'sys_adm_m_i_monitor', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(65, 'Пункт меню "Информация"', 'Доступ к пункту меню "Информация" в панели управления.', 'sys_adm_m_i_info', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(66, 'Пункт меню "Модули"', 'Доступ к пункту меню "Модули" в панели управления.', 'sys_adm_m_i_modules', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(67, 'Пункт меню "Логи"', 'Доступ к пункту меню "Логи" в панели управления.', 'sys_adm_m_i_logs', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(68, 'Файловый загрузчик', 'Доступ к файловому загрузчику', 'sys_adm_manager', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(69, 'Управление логами', 'Доступ к логам пользователей', 'sys_adm_logs', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(70, 'Добавление привилегий', 'Доступ к добавлению привилегий', 'sys_adm_permissions_add', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(71, 'Редактирование привилегий', 'Доступ к редактированию привилегий', 'sys_adm_permissions_edit', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(72, 'Удаление привилегий', 'Доступ к удалению привилегий', 'sys_adm_permissions_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(73, 'Добавление комментариев в ПУ', 'Доступ к добавлению комментариев в ПУ', 'sys_adm_comments_add', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(74, 'Редактирование комментариев в ПУ', 'Доступ к редактирование комментариев в ПУ', 'sys_adm_comments_edit', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(75, 'Удаление комментариев в ПУ', 'Доступ к удалению комментариев в ПУ', 'sys_adm_comments_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(76, 'Добавление групп пользователей', 'Доступ к добавлению групп пользователей', 'sys_adm_groups_add', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(77, 'Редактирование групп пользователей', 'Доступ к редактированию групп пользователей', 'sys_adm_groups_edit', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(78, 'Удаление групп пользователей', 'Доступ к удалению групп пользователей', 'sys_adm_groups_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(79, 'Добавление пунктов меню', 'Доступ к добавлению пунктов меню', 'sys_adm_menu_add', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(80, 'Редактирование пунктов меню', 'Доступ к редактированию пунктов меню', 'sys_adm_menu_edit', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(81, 'Удаление пунктов меню', 'Доступ к удалению пунктов меню', 'sys_adm_menu_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(82, 'Добавление пунктов меню панели управления', 'Доступ к добавлению пунктов меню панели управления', 'sys_adm_menu_adm_add', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(83, 'Редактирование пунктов меню панели управления', 'Доступ к редактированию пунктов меню панели управления', 'sys_adm_menu_adm_edit', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(84, 'Удаление пунктов меню панели управления', 'Доступ к удалению пунктов меню панели управления', 'sys_adm_menu_adm_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(85, 'Добавление групп меню панели управления', 'Доступ к добавлению групп меню панели управления', 'sys_adm_menu_groups_add', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(86, 'Редактирование групп меню панели управления', 'Доступ к редактированию групп меню панели управления', 'sys_adm_menu_groups_edit', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(87, 'Удаление групп меню панели управления', 'Доступ к удаление групп меню панели управления', 'sys_adm_menu_groups_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(88, 'Добавление иконок', 'Доступ к добавлению иконок', 'sys_adm_menu_icons_add', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(89, 'Редактирование иконок', 'Доступ к редактированию иконок', 'sys_adm_menu_icons_edit', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(90, 'Удаление иконок', 'Доступ к удалению иконок', 'sys_adm_menu_icons_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(91, 'Добавление серверов в мониторинг', 'Доступ к добавлению серверов в мониторинге', 'sys_adm_monitoring_add', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(92, 'Редактирование серверов в мониторинге', 'Доступ к редактированию серверов в мониторинге', 'sys_adm_monitoring_edit', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(93, 'Удаление серверов из мониторинга', 'Доступ к удалению серверов из мониторинга', 'sys_adm_monitoring_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(94, 'Добавление новостей', 'Доступ к добавлению новостей', 'sys_adm_news_add', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(95, 'Редактирование новостей', 'Доступ к редактированию новостей', 'sys_adm_news_edit', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(96, 'Удаление новостей', 'Доступ к удалению новостей', 'sys_adm_news_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(97, 'Добавление категорий новостей', 'Доступ к добавлению категорий новостей', 'sys_adm_news_cats_add', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(98, 'Редактирование категорий новостей', 'Доступ к редактированию категорий новостей', 'sys_adm_news_cats_edit', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(99, 'Удаление категорий новостей', 'Доступ к удалению категорий новостей', 'sys_adm_news_cats_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(100, 'Добавление статических страниц', 'Доступ к добавлению статических страниц', 'sys_adm_statics_add', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(101, 'Редактирование статических страниц', 'Доступ к редактированию статических страниц', 'sys_adm_statics_edit', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(102, 'Удаление статических страниц', 'Доступ к удалению статических страниц', 'sys_adm_statics_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(103, 'Добавление пользователей', 'Доступ к добавлению пользователей', 'sys_adm_users_add', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(104, 'Редактирование пользователей', 'Доступ к редактированию пользователей', 'sys_adm_users_edit', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(105, 'Удаление пользователей', 'Доступ к удалению пользователей', 'sys_adm_users_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(106, 'Бан/разбан пользователей', 'Доступ к банам и разбанам пользователей', 'sys_adm_users_ban', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(107, 'Редактирование модулей', 'Доступ к редактированию модулей', 'sys_adm_modules_edit', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(108, 'Удаление просмотров', 'Доступ к удалению просмотров новостей', 'sys_adm_news_views_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}'),
+(109, 'Удаление голосов', 'Доступ к удалению голосов новостей', 'sys_adm_news_votes_delete', 1, 'boolean', 'false', '{"time_create":1005553535,"time_last":1005553535,"login_create":"admin","login_last":"admin"}');
 #line
 CREATE TABLE IF NOT EXISTS `mcr_statics` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
@@ -140,7 +347,7 @@
   `data` text NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `uniq` (`uniq`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 #line
 CREATE TABLE IF NOT EXISTS `mcr_users` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
diff --git a/upload/install/theme/finish.html b/upload/install/theme/finish.html
index 1d02c52..b40dc5b 100644
--- a/upload/install/theme/finish.html
+++ b/upload/install/theme/finish.html
@@ -1,38 +1,38 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Настройки сайта</div>
+		<div class="block-name"><?php echo $this->lng_m['finish']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
 
 	<div>
-		<h3 class="text-center text-success">Поздравляем!</h3>
+		<h3 class="text-center text-success"><?php echo $this->lng_m['congrats']; ?></h3>
 
-		<p>Вы успешно установили WebMCR</p>
-		<p class="text-error">Обязательно удалите папку <b>install</b> из главного каталога WebMCR</p>
+		<p><?php echo $this->lng_m['fs_msg1']; ?></p>
+		<p class="text-error"><?php echo $this->lng_m['fs_msg2']; ?> <b>install</b> <?php echo $this->lng_m['fs_msg3']; ?></p>
 
-		<p class="text-center"><a href="<?php echo BASE_URL; ?>" class="btn btn-success">На главную сайта</a> <a href="<?php echo BASE_URL; ?>?mode=admin" class="btn btn-success">В панель управления</a></p>
+		<p class="text-center"><a href="<?php echo BASE_URL; ?>" class="btn btn-success"><?php echo $this->lng_m['go_home']; ?></a> <a href="<?php echo BASE_URL; ?>?mode=admin" class="btn btn-success"><?php echo $this->lng_m['go_cp']; ?></a></p>
 
 		<br>
 		<div class="accordion" id="accordion2">
 			<div class="accordion-group">
 				<div class="accordion-heading">
 					<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
-						Полезные ссылки
+						<?php echo $this->lng_m['useful_links']; ?>
 					</a>
 				</div>
 				<div id="collapseOne" class="accordion-body collapse">
 					<div class="accordion-inner">
 						<ul class="unstyled">
-							<li>- <a href="http://webmcr.com/" target="_blank">Официальный сайт</a> <i class="icon-share" rel="tooltip" title="Откроется в новой вкладке"></i></li>
-							<li>- <a href="http://webmcr.loc/?do=wiki" target="_blank">Документация</a> <i class="icon-share" rel="tooltip" title="Откроется в новой вкладке"></i></li>
-							<li>- <a href="http://webmcr.loc/?do=extensions" target="_blank">Дополнения</a> <i class="icon-share" rel="tooltip" title="Откроется в новой вкладке"></i></li>
-							<li>- <a href="https://twitter.com/webmcr_official" target="_blank">Twitter</a> <i class="icon-share" rel="tooltip" title="Откроется в новой вкладке"></i></li>
-							<li>- <a href="https://vk.com/webmcr" target="_blank">Страница VK</a> <i class="icon-share" rel="tooltip" title="Откроется в новой вкладке"></i></li>
-							<li>- <a href="http://qexy.org" target="_blank">Toster (Разработчик новых версий)</a> <i class="icon-share" rel="tooltip" title="Откроется в новой вкладке"></i></li>
-							<li>- <a href="http://catface.ru" target="_blank">NC22 (Автор WebMCR & Разработчик предыдущих версий)</a> <i class="icon-share" rel="tooltip" title="Откроется в новой вкладке"></i></li>
-							<li>- <a href="http://www.rubukkit.org/members/killerprost.5532/" target="_blank">KillerProst (Автор изначального шаблона)</a> <i class="icon-share" rel="tooltip" title="Откроется в новой вкладке"></i></li>
+							<li>- <a href="http://webmcr.com/" target="_blank"><?php echo $this->lng_m['official_site']; ?></a> <i class="icon-share" rel="tooltip" title="<?php echo $this->lng['target_blank']; ?>"></i></li>
+							<li>- <a href="http://wiki.webmcr.com" target="_blank"><?php echo $this->lng_m['documentation']; ?></a> <i class="icon-share" rel="tooltip" title="<?php echo $this->lng['target_blank']; ?>"></i></li>
+							<li>- <a href="http://webmcr.com/?do=extensions" target="_blank"><?php echo $this->lng_m['extensions']; ?></a> <i class="icon-share" rel="tooltip" title="<?php echo $this->lng['target_blank']; ?>"></i></li>
+							<li>- <a href="https://twitter.com/webmcr_official" target="_blank">Twitter</a> <i class="icon-share" rel="tooltip" title="<?php echo $this->lng['target_blank']; ?>"></i></li>
+							<li>- <a href="https://vk.com/webmcr" target="_blank"><?php echo $this->lng_m['vk_page']; ?></a> <i class="icon-share" rel="tooltip" title="<?php echo $this->lng['target_blank']; ?>"></i></li>
+							<li>- <a href="http://qexy.org" target="_blank">Toster (<?php echo $this->lng_m['dev_user']; ?>)</a> <i class="icon-share" rel="tooltip" title="<?php echo $this->lng['target_blank']; ?>"></i></li>
+							<li>- <a href="http://catface.ru" target="_blank">NC22 (<?php echo $this->lng_m['author_user']; ?>)</a> <i class="icon-share" rel="tooltip" title="<?php echo $this->lng['target_blank']; ?>"></i></li>
+							<li>- <a href="http://www.rubukkit.org/members/killerprost.5532/" target="_blank">KillerProst (<?php echo $this->lng_m['theme_user']; ?>)</a> <i class="icon-share" rel="tooltip" title="<?php echo $this->lng['target_blank']; ?>"></i></li>
 						</ul>
 					</div>
 				</div>
@@ -41,7 +41,7 @@
 			<div class="accordion-group">
 				<div class="accordion-heading">
 					<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
-						Пожертвования
+						<?php echo $this->lng_m['donate']; ?>
 					</a>
 				</div>
 				<div id="collapseTwo" class="accordion-body collapse">
@@ -50,9 +50,9 @@
 						<p>[USD] WebMoney: Z382336720676</p>
 						<p>[UAH] WebMoney: U352343863491</p>
 						<p>[EUR] WebMoney: E208570680033</p>
-						<p>WebMCR - это некоммерческий проект с открытым исходным кодом. Вся разработка идет на энтузиазме, а ваши пожертвования, дают нам повод для развития своих идей и продолжения разработки.<br>
-						Мы рады любым суммам.<br>
-						Спасибо.</p>
+						<p><?php echo $this->lng_m['fs_msg4']; ?><br>
+						<?php echo $this->lng_m['fs_msg5']; ?><br>
+						<?php echo $this->lng_m['fs_msg6']; ?></p>
 					</div>
 				</div>
 			</div>
diff --git a/upload/install/theme/global.html b/upload/install/theme/global.html
index 9ebe828..537321e 100644
--- a/upload/install/theme/global.html
+++ b/upload/install/theme/global.html
@@ -5,17 +5,12 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta charset="utf-8">
 	<meta name="description" content="<?php echo $data['CFG']['s_about'] ?>">
-	<meta name="description" content="<?php echo $data['CFG']['s_keywords'] ?>">
+	<meta name="keywords" content="<?php echo $data['CFG']['s_keywords'] ?>">
 	<meta name="author" content="NC22 &amp; Qexy.org">
-	<meta name="style_url" content="<?php echo STYLE_URL; ?>">
+	<meta name='data' content='<?php echo META_JSON_DATA; ?>'>
 	<base href="<?php echo BASE_URL ?>">
 	<?php echo $data['DEF_HEADER']; ?>
 	<?php echo $data['HEADER']; ?>
-	<script type="text/javascript">
-		$(function(){
-			$('form[method="post"]').prepend('<input type="hidden" name="mcr_secure" value="<?php echo MCR_SECURE_KEY; ?>">');
-		});
-	</script>
 </head>
 
 <body>
@@ -70,6 +65,13 @@
 			<!-- Левый контейнер -->
 			<div class="span4 main-content">
 
+				<!-- Ajax оповещения -->
+				<div id="js-notify" class="alert">
+					<a href="#" id="close">&times;</a>
+					<div id="title"></div>
+					<div id="message"></div>
+				</div>
+
 				<?php echo $data['L_BLOCKS']; ?>
 
 			</div>
@@ -87,6 +89,8 @@
 	</div>
 </div>
 
+<div id="js-loader" title="Загрузка..."><img src="<?php echo STYLE_URL; ?>img/loading.gif" alt="Loading..." /></div>
+
 <div class="navbar navbar-fixed-bottom">
 	<div class="navbar-inner">
 		<div class="footer-block">
diff --git a/upload/install/theme/header.html b/upload/install/theme/header.html
index 44edcb9..aecd01d 100644
--- a/upload/install/theme/header.html
+++ b/upload/install/theme/header.html
@@ -1,18 +1,10 @@
+<script src="<?php echo LANG_URL; ?>js/lang.js"></script>
 <link href="<?php echo STYLE_URL; ?>css/bootstrap.min.css" rel="stylesheet" media="screen">
 <link href="<?php echo STYLE_URL; ?>css/bootstrap-responsive.min.css" rel="stylesheet" media="screen">
 <link href="<?php echo STYLE_URL; ?>css/docs.css" rel="stylesheet" media="screen">
 <link href="<?php echo STYLE_URL; ?>css/global.css" rel="stylesheet" media="screen">
 <script src="<?php echo STYLE_URL; ?>js/jquery.min.js?1"></script>
+<script src="<?php echo STYLE_URL; ?>js/cookie.js"></script>
 <script src="<?php echo STYLE_URL; ?>js/bootstrap.min.js?2"></script>
-<script type="text/javascript">
-$(function(){
-	$("[rel='tooltip']").tooltip({container: 'body'});
-	
-	$("#close-notify").click(function(){
-		$(".block-notify").fadeOut("normal", function(){
-			$(this).remove();
-		});
-		return false;
-	});
-});
-</script>
\ No newline at end of file
+<script src="<?php echo STYLE_URL; ?>js/bootstrap.file-input.js"></script>
+<script src="<?php echo STYLE_URL; ?>js/global.js?3"></script>
\ No newline at end of file
diff --git a/upload/install/theme/left-block.html b/upload/install/theme/left-block.html
index 1249760..c3247cb 100644
--- a/upload/install/theme/left-block.html
+++ b/upload/install/theme/left-block.html
@@ -1,12 +1,12 @@
 <div class="form-block">
 
-	<div class="block-header">Информация</div>
+	<div class="block-header"><?php echo $this->lng_m['info']; ?></div>
 
 	<div class="block-line"></div>
 
 	<div class="block-content">
 		<ul class="nav nav-list">
-			<li class="nav-header">Ход установки</li>
+			<li class="nav-header"><?php echo $this->lng_m['install_progress']; ?></li>
 			<?php echo $data['ITEMS']; ?>
 		</ul>
 	</div>
diff --git a/upload/install/theme/settings.html b/upload/install/theme/settings.html
index e378d7f..bfab893 100644
--- a/upload/install/theme/settings.html
+++ b/upload/install/theme/settings.html
@@ -1,98 +1,98 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Настройки сайта</div>
+		<div class="block-name"><?php echo $this->lng_m['site_settings']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
 
 	<div>
 		<form class="form-horizontal" method="POST">
-			<legend>Основные</legend>
+			<legend><?php echo $this->lng_m['general']; ?></legend>
 
 			<div class="control-group">
-				<label class="control-label" for="inputSName">Название сайта</label>
+				<label class="control-label" for="inputSName"><?php echo $this->lng_m['site_settings']; ?></label>
 				<div class="controls">
-					<input type="text" name="s_name" class="span8" value="<?php echo $this->config->main['s_name']; ?>" id="inputSName" placeholder="Название сайта">
+					<input type="text" name="s_name" class="span8" value="<?php echo $_SESSION['fs_name']; ?>" id="inputSName" placeholder="Название сайта">
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputSDesc">Описание сайта</label>
+				<label class="control-label" for="inputSDesc"><?php echo $this->lng_m['site_desc']; ?></label>
 				<div class="controls">
-					<input type="text" name="s_about" class="span8" value="<?php echo $this->config->main['s_about']; ?>" id="inputSDesc" placeholder="Описание сайта">
+					<input type="text" name="s_about" class="span8" value="<?php echo $_SESSION['fs_about']; ?>" id="inputSDesc" placeholder="<?php echo $this->lng_m['site_desc']; ?>">
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputSKeys">Ключевые слова</label>
+				<label class="control-label" for="inputSKeys"><?php echo $this->lng_m['site_keys']; ?></label>
 				<div class="controls">
-					<input type="text" name="s_keywords" class="span8" value="<?php echo $this->config->main['s_keywords']; ?>" id="inputSKeys" placeholder="Ключевые слова">
+					<input type="text" name="s_keywords" class="span8" value="<?php echo $_SESSION['fs_keywords']; ?>" id="inputSKeys" placeholder="<?php echo $this->lng_m['site_keys']; ?>">
 				</div>
 			</div>
 
-			<legend>Почта</legend>
+			<legend><?php echo $this->lng_m['mail']; ?></legend>
 
 			<div class="control-group">
-				<label class="control-label" for="inputFrom">От кого (E-Mail)</label>
+				<label class="control-label" for="inputFrom"><?php echo $this->lng_m['mail_from']; ?></label>
 				<div class="controls">
-					<input type="text" name="from" class="span8" value="<?php echo $this->config->mail['from']; ?>" id="inputFrom" placeholder="С какого почтового ящика было отправлено сообщение">
+					<input type="text" name="from" class="span8" value="<?php echo $_SESSION['fs_from']; ?>" id="inputFrom" placeholder="<?php echo $this->lng_m['mail_from_desc']; ?>">
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputFromName">От кого (Имя)</label>
+				<label class="control-label" for="inputFromName"><?php echo $this->lng_m['mail_from_name']; ?></label>
 				<div class="controls">
-					<input type="text" name="from_name" class="span8" value="<?php echo $this->config->mail['from_name']; ?>" id="inputFromName" placeholder="От чьего имени было отправлено сообщение">
+					<input type="text" name="from_name" class="span8" value="<?php echo $_SESSION['fs_from_name']; ?>" id="inputFromName" placeholder="<?php echo $this->lng_m['mail_from_name_desc']; ?>">
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputReply">E-Mail ответа</label>
+				<label class="control-label" for="inputReply"><?php echo $this->lng_m['mail_reply']; ?></label>
 				<div class="controls">
-					<input type="text" name="reply" class="span8" value="<?php echo $this->config->mail['reply']; ?>" id="inputReply" placeholder="E-Mail ответа">
+					<input type="text" name="reply" class="span8" value="<?php echo $_SESSION['fs_reply']; ?>" id="inputReply" placeholder="<?php echo $this->lng_m['mail_reply']; ?>">
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputReplyName">E-Mail ответа</label>
+				<label class="control-label" for="inputReplyName"><?php echo $this->lng_m['mail_reply_name']; ?></label>
 				<div class="controls">
-					<input type="text" name="reply_name" class="span8" value="<?php echo $this->config->mail['reply_name']; ?>" id="inputReplyName" placeholder="Имя ответа">
+					<input type="text" name="reply_name" class="span8" value="<?php echo $_SESSION['fs_reply_name']; ?>" id="inputReplyName" placeholder="<?php echo $this->lng_m['mail_reply_name']; ?>">
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputSMTP">Использовать SMTP</label>
+				<label class="control-label" for="inputSMTP"><?php echo $this->lng_m['smtp_use']; ?></label>
 				<div class="controls">
 					<select id="inputSMTP" name="smtp">
-						<option value="0">Нет</option>
-						<option value="1">Да</option>
+						<option value="0"><?php echo $this->lng['no']; ?></option>
+						<option value="1" <?php echo $_SESSION['fs_smtp']; ?>><?php echo $this->lng['yes']; ?></option>
 					</select>
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputSTMPHost">Адрес SMTP сервера</label>
+				<label class="control-label" for="inputSTMPHost"><?php echo $this->lng_m['smtp_host']; ?></label>
 				<div class="controls">
-					<input type="text" name="smtp_host" class="span8" value="<?php echo $this->config->mail['smtp_host']; ?>" id="inputSTMPHost" placeholder="Адрес SMTP сервера">
+					<input type="text" name="smtp_host" class="span8" value="<?php echo $_SESSION['fs_smtp_host']; ?>" id="inputSTMPHost" placeholder="<?php echo $this->lng_m['smtp_host']; ?>">
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputSTMPUser">SMTP пользователь</label>
+				<label class="control-label" for="inputSTMPUser"><?php echo $this->lng_m['smtp_user']; ?></label>
 				<div class="controls">
-					<input type="text" name="smtp_user" class="span8" value="<?php echo $this->config->mail['smtp_user']; ?>" id="inputSTMPUser" placeholder="Пользователь SMTP сервера">
+					<input type="text" name="smtp_user" class="span8" value="<?php echo $_SESSION['fs_smtp_user']; ?>" id="inputSTMPUser" placeholder="<?php echo $this->lng_m['smtp_user']; ?>">
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputSTMPPass">SMTP пароль</label>
+				<label class="control-label" for="inputSTMPPass"><?php echo $this->lng_m['smtp_pass']; ?></label>
 				<div class="controls">
-					<input type="text" name="smtp_pass" class="span8" value="<?php echo $this->config->mail['smtp_pass']; ?>" id="inputSTMPPass" placeholder="Пароль пользователя SMTP">
+					<input type="text" name="smtp_pass" class="span8" value="<?php echo $_SESSION['fs_smtp_pass']; ?>" id="inputSTMPPass" placeholder="<?php echo $this->lng_m['smtp_pass']; ?>">
 				</div>
 			</div>
 
-			<p class="text-right"><button type="submit" class="btn">Продолжить</button></p>
+			<p class="text-right"><button type="submit" class="btn"><?php echo $this->lng_m['next']; ?></button></p>
 		</form>
 	</div>
 
diff --git a/upload/install/theme/step_1.html b/upload/install/theme/step_1.html
index 2104c17..31bb2cd 100644
--- a/upload/install/theme/step_1.html
+++ b/upload/install/theme/step_1.html
@@ -1,19 +1,19 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Подготовка к установке</div>
+		<div class="block-name"><?php echo $this->lng_m['install_prepare']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
 
 	<div>
-		<p>Вас приветствует мастер установки системы WebMCR</p>
-		<p>Для продолжения вам необходимо сверить результаты проверки. Если результаты проверки помечены красным, вам необходимо настроить сервер так, чтобы значение соответствовало системным требованиям</p>
+		<p><?php echo $this->lng_m['isn_p_msg1']; ?></p>
+		<p><?php echo $this->lng_m['isn_p_msg2']; ?></p>
 		<table class="table table-condensed">
 			<thead>
 				<tr>
-					<th>Системные требования</th>
-					<th>Результат проверки</th>
+					<th><?php echo $this->lng_m['system_req']; ?></th>
+					<th><?php echo $this->lng_m['result_test']; ?></th>
 				</tr>
 			</thead>
 
@@ -34,17 +34,17 @@
 				</tr>
 
 				<tr>
-					<td>Наличие библиотеки GD</td>
+					<td><?php echo $this->lng_m['gd_exist']; ?></td>
 					<td><?php echo $data['GD']; ?></td>
 				</tr>
 
 				<tr>
-					<td>Поддержка MySQL</td>
+					<td><?php echo $this->lng_m['mysql_support']; ?></td>
 					<td><?php echo $data['MYSQL']; ?></td>
 				</tr>
 
 				<tr>
-					<td>Буферизация вывода</td>
+					<td><?php echo $this->lng_m['buffer_write']; ?></td>
 					<td><?php echo $data['BUFER']; ?></td>
 				</tr>
 			</tbody>
@@ -53,80 +53,60 @@
 		<table class="table table-condensed">
 			<thead>
 				<tr>
-					<th>Доступ к файлам и папкам</th>
-					<th>Результат проверки</th>
+					<th><?php echo $this->lng_m['access_files']; ?></th>
+					<th><?php echo $this->lng_m['result_test']; ?></th>
 				</tr>
 			</thead>
 
 			<tbody>
 				<tr>
-					<td>Чтение и запись | configs/</td>
+					<td><?php echo $this->lng_m['read_write']; ?> | configs/* <i title="Необходимы права на чтение и запись на саму папку и входящие в нее файлы и папки" rel="tooltip" class="icon-question-sign"></i></td>
 					<td><?php echo $data["FOLDER_CONFIGS"]; ?></td>
 				</tr>
 
 				<tr>
-					<td>Чтение и запись | configs/db.php</td>
-					<td><?php echo $data['FILE_DB']; ?></td>
+					<td><?php echo $this->lng_m['read_write']; ?> | configs/modules/* <i title="Необходимы права на чтение и запись на саму папку и входящие в нее файлы и папки" rel="tooltip" class="icon-question-sign"></i></td>
+					<td><?php echo $data["FOLDER_MODULES"]; ?></td>
 				</tr>
 
 				<tr>
-					<td>Чтение и запись | configs/functions.php</td>
-					<td><?php echo $data['FILE_FUNCTIONS']; ?></td>
+					<td><?php echo $this->lng_m['read_write']; ?> | cache/</td>
+					<td><?php echo $data["FOLDER_CACHE"]; ?></td>
 				</tr>
 
 				<tr>
-					<td>Чтение и запись | configs/mail.php</td>
-					<td><?php echo $data['FILE_MAIL']; ?></td>
-				</tr>
-
-				<tr>
-					<td>Чтение и запись | configs/main.php</td>
-					<td><?php echo $data['FILE_MAIN']; ?></td>
-				</tr>
-
-				<tr>
-					<td>Чтение и запись | configs/pagin.php</td>
-					<td><?php echo $data['FILE_PAGIN']; ?></td>
-				</tr>
-
-				<tr>
-					<td>Чтение и запись | configs/search.php</td>
-					<td><?php echo $data['FILE_SEARCH']; ?></td>
-				</tr>
-
-				<tr>
-					<td>Чтение и запись | uploads/</td>
+					<td><?php echo $this->lng_m['read_write']; ?> | uploads/</td>
 					<td><?php echo $data["FOLDER_UPLOADS"]; ?></td>
 				</tr>
 
 				<tr>
-					<td>Чтение и запись | uploads/cloaks/</td>
+					<td><?php echo $this->lng_m['read_write']; ?> | uploads/cloaks/</td>
 					<td><?php echo $data["FOLDER_CLOAKS"]; ?></td>
 				</tr>
 
 				<tr>
-					<td>Чтение и запись | uploads/panel-icons/</td>
+					<td><?php echo $this->lng_m['read_write']; ?> | uploads/panel-icons/</td>
 					<td><?php echo $data["FOLDER_ICONS"]; ?></td>
 				</tr>
 
 				<tr>
-					<td>Чтение и запись | uploads/skins/</td>
+					<td><?php echo $this->lng_m['read_write']; ?> | uploads/skins/</td>
 					<td><?php echo $data["FOLDER_SKINS"]; ?></td>
 				</tr>
 
 				<tr>
-					<td>Чтение и запись | uploads/skins/interface/</td>
+					<td><?php echo $this->lng_m['read_write']; ?> | uploads/skins/interface/</td>
 					<td><?php echo $data["FOLDER_INTERF"]; ?></td>
 				</tr>
 
 				<tr>
-					<td>Чтение и запись | uploads/smiles/</td>
+					<td><?php echo $this->lng_m['read_write']; ?> | uploads/smiles/</td>
 					<td><?php echo $data["FOLDER_SMILES"]; ?></td>
 				</tr>
 			</tbody>
 		</table>
 		<form method="post">
-			<p class="text-right"><button type="submit" class="btn">Продолжить</button></p>
+			<p class="text-right"><button type="submit" class="btn"><?php echo $this->lng_m['next']; ?></button></p>
 		</form>
 	</div>
 
diff --git a/upload/install/theme/step_2.html b/upload/install/theme/step_2.html
index 70fc5ea..5f001ac 100644
--- a/upload/install/theme/step_2.html
+++ b/upload/install/theme/step_2.html
@@ -1,7 +1,7 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Настройки базы</div>
+		<div class="block-name"><?php echo $this->lng_m['db_settings']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
@@ -10,51 +10,51 @@
 		<form class="form-horizontal" method="POST">
 
 			<div class="control-group">
-				<label class="control-label" for="inputType">Тип</label>
+				<label class="control-label" for="inputType"><?php echo $this->lng_m['type']; ?></label>
 				<div class="controls">
 					<select name="type" id="inputType">
-						<option value="mysqli">MySQLi (Рекомендуется)</option>
-						<option value="mysql">MySQL</option>
+						<option value="mysqli">MySQLi (<?php echo $this->lng_m['recommended']; ?>)</option>
+						<option value="mysql" <?php echo $_SESSION['f_backend']; ?>>MySQL</option>
 					</select>
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputHost">Адрес хоста</label>
+				<label class="control-label" for="inputHost"><?php echo $this->lng_m['db_host']; ?></label>
 				<div class="controls">
-					<input type="text" name="host" value="localhost" id="inputHost" placeholder="Хост" required>
+					<input type="text" name="host" id="inputHost" value="<?php echo $_SESSION['f_host']; ?>" placeholder="<?php echo $this->lng_m['db_host']; ?>" required>
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputPort">Порт</label>
+				<label class="control-label" for="inputPort"><?php echo $this->lng_m['db_port']; ?></label>
 				<div class="controls">
-					<input type="text" name="port" value="3306" id="inputPort" placeholder="Порт" required>
+					<input type="text" name="port" id="inputPort" value="<?php echo $_SESSION['f_port']; ?>" placeholder="<?php echo $this->lng_m['db_port']; ?>" required>
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputBase">Имя базы данных</label>
+				<label class="control-label" for="inputBase"><?php echo $this->lng_m['db_name']; ?></label>
 				<div class="controls">
-					<input type="text" name="base" value="" id="inputBase" placeholder="Имя базы данных" required>
+					<input type="text" name="base" id="inputBase" value="<?php echo $_SESSION['f_base']; ?>" placeholder="<?php echo $this->lng_m['db_name']; ?>" required>
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputUser">Имя пользователя</label>
+				<label class="control-label" for="inputUser"><?php echo $this->lng_m['db_user']; ?></label>
 				<div class="controls">
-					<input type="text" name="user" value="root" id="inputUser" placeholder="Имя пользователя баз данных" required>
+					<input type="text" name="user" id="inputUser" value="<?php echo $_SESSION['f_user']; ?>" placeholder="<?php echo $this->lng_m['db_user']; ?>" required>
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputPassword">Пароль пользователя</label>
+				<label class="control-label" for="inputPassword"><?php echo $this->lng_m['db_pass']; ?></label>
 				<div class="controls">
-					<input type="password" name="pass" id="inputPassword" placeholder="Пароль пользователя">
+					<input type="password" name="pass" id="inputPassword" placeholder="<?php echo $this->lng_m['db_pass']; ?>">
 				</div>
 			</div>
 
-			<p class="text-right"><button type="submit" class="btn">Продолжить</button></p>
+			<p class="text-right"><button type="submit" class="btn"><?php echo $this->lng_m['next']; ?></button></p>
 		</form>
 	</div>
 
diff --git a/upload/install/theme/step_3.html b/upload/install/theme/step_3.html
index b5a7ab2..9e51a30 100644
--- a/upload/install/theme/step_3.html
+++ b/upload/install/theme/step_3.html
@@ -1,7 +1,7 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Установка</div>
+		<div class="block-name"><?php echo $this->lng_m['mod_name']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
@@ -10,28 +10,28 @@
 		<form class="form-horizontal" method="POST">
 
 			<div class="control-group">
-				<label class="control-label" for="inputLogin">Логин администратора</label>
+				<label class="control-label" for="inputLogin"><?php echo $this->lng_m['adm_login']; ?></label>
 				<div class="controls">
-					<input type="text" name="login" value="admin" id="inputLogin" placeholder="Логин" required>
+					<input type="text" name="login" value="<?php echo $_SESSION['f_login']; ?>" id="inputLogin" placeholder="<?php echo $this->lng_m['adm_login']; ?>" required>
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputPassword">Пароль администратора</label>
+				<label class="control-label" for="inputPassword"><?php echo $this->lng_m['adm_pass']; ?></label>
 				<div class="controls">
-					<input type="password" name="password" id="inputPassword" placeholder="Пароль администратора" required>
+					<input type="password" name="password" value="<?php echo $_SESSION['f_pass']; ?>" id="inputPassword" placeholder="<?php echo $this->lng_m['adm_pass']; ?>" required>
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputRePassword">Повторите пароль</label>
+				<label class="control-label" for="inputRePassword"><?php echo $this->lng_m['adm_repass']; ?></label>
 				<div class="controls">
-					<input type="password" name="repassword" id="inputRePassword" placeholder="Повторите пароль" required>
+					<input type="password" name="repassword" value="<?php echo $_SESSION['f_repass']; ?>" id="inputRePassword" placeholder="<?php echo $this->lng_m['adm_repass']; ?>" required>
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputType">Метод шифрования паролей</label>
+				<label class="control-label" for="inputType"><?php echo $this->lng_m['encrypt_method']; ?></label>
 				<div class="controls">
 					<select name="method" id="inputType">
 						<option value="0">MD5</option>
@@ -55,13 +55,13 @@
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputEmail">E-Mail</label>
+				<label class="control-label" for="inputEmail"><?php echo $this->lng_m['adm_mail']; ?></label>
 				<div class="controls">
-					<input type="text" name="email" id="inputEmail" placeholder="E-Mail" required>
+					<input type="text" name="email" value="<?php echo $_SESSION['f_email']; ?>" id="inputEmail" placeholder="<?php echo $this->lng_m['adm_mail']; ?>" required>
 				</div>
 			</div>
 
-			<p class="text-right"><button type="submit" class="btn">Продолжить</button></p>
+			<p class="text-right"><button type="submit" class="btn"><?php echo $this->lng_m['next']; ?></button></p>
 		</form>
 	</div>
 
diff --git a/upload/language/ru_RU/admin.php b/upload/language/ru_RU/admin.php
new file mode 100644
index 0000000..4046dfe
--- /dev/null
+++ b/upload/language/ru_RU/admin.php
@@ -0,0 +1,564 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Панель управления',
+	'action' => 'Действие',
+
+	'empty_panel_menu_group' => 'Нет доступного меню',
+	'empty_panel_menu_list' => 'Нет доступных пунктов меню',
+
+	'comments' => 'Комментарии',
+	'com_not_selected' => 'Не выбрано ни одного пункта',
+	'com_del_elements' => 'Удалено элементов: комментариев',
+	'com_without_news' => 'Без новости',
+	'com_add' => 'Добавление',
+	'com_edit' => 'Редактирование',
+	'com_empty' => 'Не заполнено поле "Комментарий"',
+	'com_incorrect' => 'Не верно заполнено поле "Комментарий"',
+	'com_add_success' => 'Комментарий успешно добавлен',
+	'com_add_page_name' => 'Добавление комментария',
+	'com_add_btn' => 'Добавить',
+	'com_edit_success' => 'Комментарий успешно изменен',
+	'com_edit_page_name' => 'Редактирование комментария',
+	'com_edit_btn' => 'Сохранить',
+	'com_not_exist' => 'Нет доступных комментариев',
+	'com_col_comment' => 'Комментарий',
+	'com_col_news' => 'Новость',
+	'com_action' => 'Действие с комментариями',
+	'com_accept' => 'Вы уверены, что хотите удалить выбранные комментарии',
+	'com_text' => 'Текст комментария',
+	'log_del_com' => 'Удаление комментариев',
+	'log_com' => 'в ПУ',
+	'log_add_com' => 'Добавление комментария',
+	'log_edit_com' => 'Редактирование комментария',
+	
+	'groups' => 'Группы пользователей',
+	'grp_not_selected' => 'Не выбрано ни одного пункта',
+	'grp_del_msg1' => 'Удалено элементов: групп -',
+	'grp_del_msg2' => 'пользователей -',
+	'grp_def_val' => 'Значение по умолчанию',
+	'grp_del_success' => 'Группа пользователей успешно добавлена',
+	'grp_add' => 'Добавление',
+	'grp_add_btn' => 'Добавить',
+	'grp_add_page_name' => 'Добавление группы',
+	'grp_edit' => 'Редактирование',
+	'grp_edit_success' => 'Группа пользователей успешно изменена',
+	'grp_edit_page_name' => 'Редактирование группы',
+	'grp_edit_btn' => 'Сохранить',
+	'grp_empty' => 'Нет доступных групп пользователей',
+	'grp_field_name' => 'Название',
+	'grp_field_desc' => 'Описание',
+	'grp_field_act' => 'Действие',
+	'grp_field_perm' => 'Привилегии',
+	'grp_action' => 'Действие с группами',
+	'grp_accept' => 'Удаление групп приведет к удалению всех входящих в них пользователей. Вы уверены, что хотите удалить выбранные элементы?',
+	'log_add_grp' => 'Добавление группы пользователей',
+	'log_del_grp' => 'Удаление групп пользователей',
+	'log_edit_grp' => 'Редактирование группы пользователей',
+	'log_grp' => 'в ПУ',
+
+	'info' => 'Информация',
+	'info_ext' => 'Дополнения',
+	'info_stats' => 'Статистика',
+	'info_and_stats' => 'Информация и статистика',
+	'info_news' => 'Новости',
+	'info_eng_ver' => 'Версия движка',
+	'info_eng_ver_now' => 'Текущая версия',
+	'info_eng_ver_last' => 'Последняя стабильная версия',
+	'info_eng_ver_git' => 'Версия на GitHub',
+	'info_eng_ver_dev' => 'Dev версия',
+	'info_news_stats' => 'Статистика новостей',
+	'info_count_news' => 'Новостей',
+	'info_count_views' => 'Просмотров',
+	'info_count_votes' => 'Голосов',
+	'info_count_cats' => 'Категорий',
+	'info_count_coms' => 'Комментариев',
+	'info_users_stats' => 'Статистика пользователей',
+	'info_count_users' => 'Всего пользователей',
+	'info_count_groups' => 'Всего групп',
+	'info_other' => 'Разное',
+	'info_count_statics' => 'Статических страниц',
+	'info_count_perms' => 'Привилегий',
+	'logs' => 'Лог действий',
+	'logs_views' => 'Просмотров',
+	'logs_user' => 'Пользователь',
+	'logs_date' => 'Дата',
+	'logs_action' => 'Действие',
+	'logs_empty' => 'Нет доступных логов',
+
+	'menu' => 'Меню сайта',
+	'menu_top_lvl' => 'Верхний уровень',
+	'menu_not_selected' => 'Не выбрано ни одного пункта',
+	'menu_del_elements' => 'Удалено элементов: пунктов меню -',
+	'menu_add' => 'Добавление',
+	'menu_edit' => 'Редактирование',
+	'menu_edit_btn' => 'Сохранить',
+	'menu_add_btn' => 'Добавить',
+	'menu_perm_not_exist' => 'Привилегия не существует',
+	'menu_add_success' => 'Пункт меню успешно добавлен',
+	'menu_edit_success' => 'Пункт меню успешно изменен',
+	'menu_add_page_name' => 'Добавление меню',
+	'menu_edit_page_name' => 'Редактирование меню',
+	'menu_field_name' => 'Название',
+	'menu_field_link' => 'Ссылка',
+	'menu_field_pos' => 'Позиция',
+	'menu_field_parent' => 'Родитель',
+	'menu_field_action' => 'Действие',
+	'menu_field_action2' => 'Действие с меню',
+	'menu_field_target' => 'Открытие',
+	'menu_target_self' => 'В текущей вкладке',
+	'menu_target_blank' => 'В новой вкладке',
+	'menu_field_access' => 'Уровень доступа',
+	'menu_accept' => 'Удаление пунктов меню приведет к удалению всех входящих в них пунктов. Вы уверены, что хотите удалить выбранные элементы?',
+	'menu_empty' => 'Нет доступных пунктов меню',
+	'log_add_menu' => 'Добавление пунктов меню сайта',
+	'log_del_menu' => 'Удаление пунктов меню сайта',
+	'log_edit_menu' => 'Редактирование пунктов меню сайта',
+	'log_menu' => 'в ПУ',
+
+	'manucp' => 'Меню ПУ',
+	'mcp_not_selected' => 'Не выбрано ни одного пункта',
+	'mcp_del_elements' => 'Удалено элементов: пунктов меню -',
+	'mcp_add' => 'Добавление',
+	'mcp_edit' => 'Редактирование',
+	'mcp_perm_not_exist' => 'Привилегия не существует',
+	'mcp_add_success' => 'Пункт меню успешно добавлен',
+	'mcp_edit_success' => 'Пункт меню успешно изменен',
+	'mcp_add_page_name' => 'Добавление меню',
+	'mcp_edit_page_name' => 'Редактирование меню',
+	'mcp_edit_btn' => 'Сохранить',
+	'mcp_add_btn' => 'Добавить',
+	'mcp_top_lvl' => 'Верхний уровень',
+	'mcp_field_name' => 'Название',
+	'mcp_field_group' => 'Группа',
+	'mcp_field_link' => 'Ссылка',
+	'mcp_field_desc' => 'Описание',
+	'mcp_field_priority' => 'Приоритет',
+	'mcp_field_icon' => 'Иконка',
+	'mcp_field_action' => 'Действие',
+	'mcp_field_action2' => 'Действие с меню',
+	'mcp_field_target' => 'Открытие',
+	'mcp_target_self' => 'В текущей вкладке',
+	'mcp_target_blank' => 'В новой вкладке',
+	'mcp_field_access' => 'Уровень доступа',
+	'mcp_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
+	'mcp_empty' => 'Нет доступных пунктов меню',
+	'log_add_mcp' => 'Добавление пункта меню панели управления',
+	'log_del_mcp' => 'Удаление пунктов меню панели управления',
+	'log_edit_mcp' => 'Редактирование пункта меню в панели управления',
+	'log_mcp' => 'в ПУ',
+
+	'menugrp' => 'Группы меню ПУ',
+	'mgrp_not_selected' => 'Не выбрано ни одного пункта',
+	'mgrp_del_elements' => 'Удалено элементов: групп меню -',
+	'mgrp_del_elements1' => 'пунктов меню -',
+	'mgrp_add' => 'Добавление',
+	'mgrp_edit' => 'Редактирование',
+	'mgrp_perm_not_exist' => 'Привилегия не существует',
+	'mgrp_add_success' => 'Группа меню успешно добавлена',
+	'mgrp_edit_success' => 'Группа меню успешно изменена',
+	'mgrp_add_page_name' => 'Добавление группы',
+	'mgrp_edit_page_name' => 'Редактирование группы',
+	'mgrp_edit_btn' => 'Сохранить',
+	'mgrp_add_btn' => 'Добавить',
+	'mgrp_field_name' => 'Название',
+	'mgrp_field_desc' => 'Описание',
+	'mgrp_field_priority' => 'Приоритет',
+	'mgrp_field_access' => 'Уровень доступа',
+	'mgrp_field_perm' => 'Привилегии',
+	'mgrp_field_action' => 'Действие',
+	'mgrp_field_action2' => 'Действие с меню',
+	'mgrp_accept' => 'Удаление групп меню приведет к удалению всех входящих в них элементов меню. Вы уверены, что хотите удалить выбранные элементы?',
+	'mgrp_empty' => 'Нет доступных групп меню',
+	'log_add_mgrp' => 'Добавление группы меню панели управления',
+	'log_del_mgrp' => 'Удаление групп меню панели управления',
+	'log_edit_mgrp' => 'Редактирование группы меню панели управления',
+	'log_mgrp' => 'в ПУ',
+
+	'menuicons' => 'Иконки',
+	'mi_not_selected' => 'Не выбрано ни одного пункта',
+	'mi_del_elements' => 'Удалено элементов: иконок -',
+	'mi_del_elements1' => 'пунктов меню -',
+	'mi_add' => 'Добавление',
+	'mi_edit' => 'Редактирование',
+	'mi_perm_not_exist' => 'Привилегия не существует',
+	'mi_add_success' => 'Иконка меню успешно добавлена',
+	'mi_edit_success' => 'Иконка меню успешно изменена',
+	'mi_add_page_name' => 'Добавление иконки',
+	'mi_edit_page_name' => 'Редактирование иконки',
+	'mi_edit_btn' => 'Сохранить',
+	'mi_add_btn' => 'Добавить',
+	'mi_field_name' => 'Название',
+	'mi_field_img' => 'Изображение',
+	'mi_field_action' => 'Действие',
+	'mi_field_action2' => 'Действие с иконками',
+	'mi_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
+	'mi_empty' => 'Нет доступных иконок',
+	'log_add_mi' => 'Добавление группы меню панели управления',
+	'log_del_mi' => 'Удаление иконок',
+	'log_edit_mi' => 'Редактирование иконки',
+	'log_mi' => 'в ПУ',
+
+	'modules' => 'Модули',
+	'mod_cfg_not_found' => 'Конфигурация модуля не найдена',
+	'mod_cfg_incorrect' => 'Конфигурация модуля задана неверно',
+	'mod_cfg_unsave' => 'Конфигурация не сохранена',
+	'mod_edit' => 'Редактирование',
+	'mod_edit_success' => 'Модуль успешно изменен',
+	'mod_edit_page_name' => 'Редактирование модуля',
+	'mod_new_version' => 'Есть новая версия -',
+	'mod_download' => 'Скачать',
+	'mod_not_check' => '(Не удалось проверить версию)',
+	'mod_last_version' => '(У вас установлена последняя версия)',
+	'mod_on' => 'Включен',
+	'mod_off' => 'Выключен',
+	'mod_on1' => 'Включены',
+	'mod_off1' => 'Выключены',
+	'mod_edit_btn' => 'Сохранить',
+	'mod_field_name' => 'Название',
+	'mod_field_status' => 'Статус',
+	'mod_field_author' => 'Автор',
+	'mod_field_site' => 'Сайт',
+	'mod_field_email' => 'E-Mail',
+	'mod_field_ver' => 'Версия',
+	'mod_field_upd' => 'Обновления',
+	'mod_field_url' => 'Источник обновлений',
+	'mod_field_action' => 'Действие',
+	'mod_field_action2' => 'Действие с модулями',
+	'mod_empty' => 'Нет доступных модулей',
+	'log_add_mi' => 'Добавление группы меню панели управления',
+	'log_del_mi' => 'Удаление иконок',
+	'log_edit_mod' => 'Редактирование модуля',
+	'log_mod' => 'в ПУ',
+
+	'monitoring' => 'Мониторинг серверов',
+	'mon_not_selected' => 'Не выбрано ни одного пункта',
+	'mon_del_elements' => 'Удалено элементов: серверов -',
+	'mon_add' => 'Добавление',
+	'mon_edit' => 'Редактирование',
+	'mon_perm_not_exist' => 'Привилегия не существует',
+	'mon_add_success' => 'Сервер успешно добавлен',
+	'mon_edit_success' => 'Сервер успешно изменен',
+	'mon_add_page_name' => 'Добавление сервера',
+	'mon_edit_page_name' => 'Редактирование сервера',
+	'mon_edit_btn' => 'Сохранить',
+	'mon_add_btn' => 'Добавить',
+	'mon_field_name' => 'Название',
+	'mon_field_desc' => 'Описание',
+	'mon_field_ip' => 'IP адрес',
+	'mon_field_port' => 'Порт',
+	'mon_field_addr' => 'Адрес',
+	'mon_field_type' => 'Тип',
+	'mon_field_error' => 'Последняя ошибка',
+	'mon_field_cache' => 'Время кэша (сек.)',
+	'mon_field_action' => 'Действие',
+	'mon_field_action2' => 'Действие с серверами',
+	'mon_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
+	'mon_empty' => 'Нет доступных серверов в мониторинге',
+	'log_add_mon' => 'Добавление сервера в мониторинг',
+	'log_del_mon' => 'Удаление серверов из мониторинга',
+	'log_edit_mon' => 'Редактирование сервера в мониторинг',
+	'log_mon' => 'в ПУ',
+
+	'news' => 'Новости',
+	'news_not_selected' => 'Не выбрано ни одного пункта',
+	'news_del_elements' => 'Удалено элементов: новостей -',
+	'news_del_elements2' => 'просмотров -',
+	'news_del_elements3' => 'голосов -',
+	'news_add' => 'Добавление',
+	'news_edit' => 'Редактирование',
+	'news_add_success' => 'Новость успешно добавлена',
+	'news_edit_success' => 'Новость успешно изменена',
+	'news_add_page_name' => 'Добавление новости',
+	'news_edit_page_name' => 'Редактирование новости',
+	'news_prew_page_name' => 'Предварительный просмотр',
+	'news_edit_btn' => 'Сохранить',
+	'news_add_btn' => 'Добавить',
+	'news_wo_cats' => 'Без категории',
+	'news_e_desc' => 'Не заполнено поле "Полное описание"',
+	'news_e_cat_not_exist' => 'Категория не существует',
+	'news_e_sdesc' => 'Не заполнено поле "Краткое описание"',
+	'news_field_name' => 'Название',
+	'news_field_cat' => 'Категория',
+	'news_field_desc' => 'Полное описание',
+	'news_field_sdesc' => 'Краткое описание',
+	'news_field_vote' => 'Включить голосования',
+	'news_field_com' => 'Включить комметарии',
+	'news_field_attach' => 'Закрепить',
+	'news_preview' => 'Предпросмотр',
+	'news_field_cdate' => 'Дата создания',
+	'news_field_tdate' => 'Время создания',
+	'news_go_home' => 'На главную',
+	'news_field_views' => 'Просмотров',
+	'news_field_action' => 'Действие',
+	'news_field_action2' => 'Действие с новостями',
+	'news_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
+	'news_empty' => 'Нет доступных новостей',
+	'log_add_news' => 'Добавление новости',
+	'log_del_news' => 'Удаление новостей',
+	'log_edit_news' => 'Редактирование новости',
+	'log_news' => 'в ПУ',
+
+	'categories' => 'Категории новостей',
+	'cn_not_selected' => 'Не выбрано ни одного пункта',
+	'cn_del_elements' => 'Удалено элементов: категорий -',
+	'cn_del_elements2' => 'новостей -',
+	'cn_del_elements3' => 'просмотров -',
+	'cn_del_elements4' => 'Выбранные элементы успешно удалены',
+	'cn_del_elements5' => 'голосов -',
+	'cn_add' => 'Добавление',
+	'cn_edit' => 'Редактирование',
+	'cn_add_success' => 'Категория успешно добавлена',
+	'cn_edit_success' => 'Категория успешно изменена',
+	'cn_add_page_name' => 'Добавление категории',
+	'cn_edit_page_name' => 'Редактирование категории',
+	'cn_edit_btn' => 'Сохранить',
+	'cn_add_btn' => 'Добавить',
+	'cn_field_name' => 'Название',
+	'cn_field_desc' => 'Описание',
+	'cn_field_action' => 'Действие',
+	'cn_field_action2' => 'Действие с категориями',
+	'cn_accept' => 'Удаление категорий приведет к удалению всех новостей в выбранных категориях. Вы уверены, что хотите удалить выбранные элементы?',
+	'cn_empty' => 'Нет доступных категорий',
+	'log_add_cn' => 'Добавление категории новостей',
+	'log_del_cn' => 'Удаление категорий новостей',
+	'log_edit_cn' => 'Редактирование категории новостей',
+	'log_cn' => 'в ПУ',
+
+	'views' => 'Просмотры',
+	'nv_not_selected' => 'Не выбрано ни одного пункта',
+	'nv_news_deleted' => 'Новость удалена',
+	'nv_del_elements' => 'Удалено элементов: просмотров -',
+	'nv_field_news' => 'Новость',
+	'nv_field_user' => 'Пользователь',
+	'nv_field_date' => 'Дата',
+	'nv_field_action' => 'Действие',
+	'nv_field_action2' => 'Действие с просмотрами',
+	'nv_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
+	'nv_empty' => 'Нет доступных просмотров',
+	'log_del_nv' => 'Удаление просмотров',
+	'log_nv' => 'в ПУ',
+
+	'votes' => 'Голоса',
+	'nvt_not_selected' => 'Не выбрано ни одного пункта',
+	'nvt_news_deleted' => 'Новость удалена',
+	'nvt_del_elements' => 'Удалено элементов: голосов -',
+	'nvt_field_news' => 'Новость',
+	'nvt_field_user' => 'Пользователь',
+	'nvt_field_value' => 'Значение',
+	'nvt_field_date' => 'Дата',
+	'nvt_field_action' => 'Действие',
+	'nvt_field_action2' => 'Действие с голосами',
+	'nvt_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
+	'nvt_empty' => 'Нет доступных голосов',
+	'log_del_nvt' => 'Удаление голосов',
+	'log_nvt' => 'в ПУ',
+
+	'permissions' => 'Привилегии',
+	'perm_not_selected' => 'Не выбрано ни одного пункта',
+	'perm_del_elements' => 'Удалено элементов: привилегий -',
+	'perm_add' => 'Добавление',
+	'perm_edit' => 'Редактирование',
+	'perm_add_success' => 'Привилегия успешно добавлена',
+	'perm_edit_success' => 'Привилегия успешно изменена',
+	'perm_add_page_name' => 'Добавление привилегии',
+	'perm_edit_page_name' => 'Редактирование привилегии',
+	'perm_edit_btn' => 'Сохранить',
+	'perm_add_btn' => 'Добавить',
+	'perm_change_system' => 'Запрещено менять тип и значение системных привилегий',
+	'perm_def_value' => 'Значение по умолчанию',
+	'perm_boolean' => 'Булевое значение',
+	'perm_integer' => 'Целое число',
+	'perm_float' => 'Число с плавающей точкой',
+	'perm_string' => 'Строка',
+	'perm_system' => 'Системный элемент',
+	'perm_field_name' => 'Название',
+	'perm_field_desc' => 'Описание',
+	'perm_field_value' => 'Значение',
+	'perm_field_type' => 'Тип',
+	'perm_field_default' => 'По умолчанию',
+	'perm_field_action' => 'Действие',
+	'perm_field_action2' => 'Действие с привилегиями',
+	'perm_accept' => 'Удаление привилегий может повлиять на работу некоторых модулей. Вы уверены, что хотите удалить выбранные элементы?',
+	'perm_empty' => 'Нет доступных привилегий',
+	'log_add_perm' => 'Добавление привилегии',
+	'log_del_perm' => 'Удаление привилегий групп',
+	'log_edit_perm' => 'Редактирование привилегии',
+	'log_perm' => 'в ПУ',
+
+	'statics' => 'Статические страницы',
+	'stc_perm_not_exist' => 'ОТСУТСТВУЕТ',
+	'stc_not_selected' => 'Не выбрано ни одного пункта',
+	'stc_del_elements' => 'Удалено элементов: страниц -',
+	'stc_add' => 'Добавление',
+	'stc_edit' => 'Редактирование',
+	'stc_add_success' => 'Статическая страница успешно добавлена',
+	'stc_edit_success' => 'Статическая страница успешно изменена',
+	'stc_add_page_name' => 'Добавление статической страницы',
+	'stc_edit_page_name' => 'Редактирование статической страницы',
+	'stc_edit_btn' => 'Сохранить',
+	'stc_add_btn' => 'Добавить',
+	'stc_e_text_empty' => 'Не заполнено поле "Текст страницы"',
+	'stc_e_text_incorrect' => 'Не верно заполнено поле "Текст страницы"',
+	'stc_field_name' => 'Название',
+	'stc_field_uniq' => 'Идентификатор',
+	'stc_field_access' => 'Уровень доступа',
+	'stc_field_text' => 'Текст страницы',
+	'stc_field_preview' => 'Предпросмотр',
+	'stc_field_perm' => 'Привилегии',
+	'stc_field_action' => 'Действие',
+	'stc_field_action2' => 'Действие со страницами',
+	'stc_accept' => 'Вы уверены, что хотите удалить выбранные элементы?',
+	'stc_empty' => 'Нет доступных статических страниц',
+	'stc_preview' => 'Предварительный просмотр',
+	'stc_go_home' => 'На главную',
+	'log_add_stc' => 'Добавление статической страницы',
+	'log_del_stc' => 'Удаление статических страниц',
+	'log_edit_stc' => 'Редактирование статической страницы',
+	'log_stc' => 'в ПУ',
+
+	'users' => 'Пользователи',
+	'user_ban' => 'забанены',
+	'user_unban' => 'разбанены',
+	'user_not_selected' => 'Не выбрано ни одного пункта',
+	'user_del_elements' => 'Удалено элементов: пользователей -',
+	'user_del_elements2' => 'комментариев -',
+	'user_del_elements3' => 'голосов -',
+	'user_del_elements4' => 'просмотров -',
+	'user_add' => 'Добавление',
+	'user_edit' => 'Редактирование',
+	'user_add_success' => 'Пользователь успешно добавлен',
+	'user_edit_success' => 'Пользователь успешно изменен',
+	'user_add_page_name' => 'Добавление пользователя',
+	'user_edit_page_name' => 'Редактирование пользователя',
+	'user_edit_btn' => 'Сохранить',
+	'user_add_btn' => 'Добавить',
+	'user_success' => 'Выбранные пользователи успешно',
+	'user_not_found' => 'Пользователи не найдены',
+	'user_e_incorrect_fname' => 'Имя может состоять только из букв',
+	'user_e_incorrect_lname' => 'Фамилия может состоять только из букв',
+	'user_e_incorrect_bday' => 'Неверный формат даты рождения',
+	'user_group_not_found' => 'Группа не существует',
+	'user_e_reg_pass_length' => 'Пароль должен быть не менее 6-ти символов',
+	'user_e_skin_name' => 'Не удалось изменить название скина',
+	'user_e_cloak_name' => 'Не удалось изменить название плаща',
+	'user_field_action' => 'Действие',
+	'user_field_action2' => 'Действие с пользователями',
+	'user_accept' => 'Удаление пользователей приведет к удалению всей информации о них. Вы уверены, что хотите удалить выбранные элементы?',
+	'user_accept2' => 'Вы действительно хотите забанить выбранных пользователей на сервере?',
+	'user_accept3' => 'Вы действительно хотите разбанить выбранных пользователей на сервере?',
+	'user_empty' => 'Нет доступных пользователей',
+	'log_add_user' => 'Добавление нового пользователя',
+	'log_del_user' => 'Удаление пользователей',
+	'log_ban_user' => 'Изменение статуса бана пользователей',
+	'log_edit_user' => 'Редактирование пользователя',
+	'log_user' => 'в ПУ',
+
+	'settings' => 'Настройки',
+	'set_theme_incorrect' => 'Шаблон указан некорректно',
+	'set_captcha_incorrect' => 'Капча указана некорректно',
+	'set_e_cfg_save' => 'Не удалось сохранить файл конфигурации',
+	'set_save_success' => 'Настройки успешно сохранены',
+	'set_e_hash' => 'Неверная хэш-сумма полей',
+	'set_main' => 'Основные',
+	'set_pagin' => 'Постраничная навигация',
+	'set_mail' => 'Почта',
+	'set_search' => 'Поиск',
+	'set_func' => 'Функции',
+	'set_base' => 'База',
+	'set_base_host' => 'Адрес сервера',
+	'set_base_host_ph' => 'Адрес сервера баз данных',
+	'set_base_port' => 'Порт',
+	'set_base_port_ph' => 'Порт сервера',
+	'set_base_base' => 'Имя базы',
+	'set_base_base_ph' => 'Имя базы данных',
+	'set_base_user' => 'Пользователь',
+	'set_base_user_ph' => 'Пользователь баз данных',
+	'set_base_pass' => 'Пароль',
+	'set_base_pass_ph' => 'Пароль пользователя баз данных',
+	'set_base_type' => 'Тип',
+	'set_base_type_mysql' => 'MySQL',
+	'set_base_type_mysqli' => 'MySQLi (Рекомендуется)',
+	'set_base_type_pdo' => 'PDO (Не поддерживается)',
+	'set_func_advice' => 'Выводить советы',
+	'set_mail_from' => 'От кого',
+	'set_mail_from_ph' => 'От кого было отправлено сообщение',
+	'set_mail_from_name' => 'Имя отправителя',
+	'set_mail_from_name_ph' => 'Имя отправителя',
+	'set_mail_reply' => 'E-Mail ответа',
+	'set_mail_reply_ph' => 'E-Mail отправителя',
+	'set_mail_reply_name' => 'Имя отправителя ответа',
+	'set_mail_reply_name_ph' => 'Имя отправителя ответа',
+	'set_mail_smtp' => 'Настройки SMTP',
+	'set_mail_smtp_use' => 'Использовать SMTP',
+	'set_mail_smtp_host' => 'SMTP сервер',
+	'set_mail_smtp_host_ph' => 'Адрес SMTP сервера',
+	'set_mail_smtp_user' => 'Имя пользователя',
+	'set_mail_smtp_user_ph' => 'Имя пользователя SMTP сервера',
+	'set_mail_smtp_pass' => 'Пароль',
+	'set_mail_smtp_pass_ph' => 'Пароль пользователя SMTP сервера',
+	'set_main_sitename' => 'Название сайта',
+	'set_main_sitedesc' => 'Описание сайта',
+	'set_main_sitekeys' => 'Ключевые слова',
+	'set_main_start' => 'Начальная страница',
+	'set_main_theme' => 'Шаблон',
+	'set_main_log' => 'Лог ошибок',
+	'set_main_debug' => 'Отладка',
+	'set_main_montype' => 'Тип мониторинга',
+	'set_main_reg' => 'Подтверждение регистрации',
+	'set_main_captcha' => 'Капча',
+	'set_main_key_public' => 'Публичный ключ',
+	'set_main_key_private' => 'Приватный ключ',
+	'set_main_sockets' => 'Через сокеты',
+	'set_main_mtapi' => 'Через API MineTools',
+	'set_pagin_user_sect' => 'Пользовательская часть',
+	'set_pagin_arrows' => 'Кол-во стрелок',
+	'set_pagin_arrows_ph' => 'Кол-во стрелок с каждой стороны',
+	'set_pagin_news' => 'Новости',
+	'set_pagin_news_ph' => 'Кол-во новостей на одну страницу',
+	'set_pagin_comments' => 'Комментарии',
+	'set_pagin_comments_ph' => 'Кол-во комментариев на одну страницу',
+	'set_pagin_search_n' => 'Поиск по новостям',
+	'set_pagin_search_n_ph' => 'Кол-во новостей на одну страницу в поиске',
+	'set_pagin_search_c' => 'Поиск по комментариям',
+	'set_pagin_search_c_ph' => 'Кол-во комментариев на одну страницу в поиске',
+	'set_pagin_cp_sect' => 'Панель управления',
+	'set_pagin_cp_news' => 'Новости',
+	'set_pagin_cp_news_ph' => 'Кол-во новостей в ПУ',
+	'set_pagin_cp_coms' => 'Комментарии',
+	'set_pagin_cp_coms_ph' => 'Кол-во комментариев в ПУ',
+	'set_pagin_cp_cats' => 'Категории новостей',
+	'set_pagin_cp_cats_ph' => 'Кол-во категорий новостей в ПУ',
+	'set_pagin_cp_views' => 'Просмотров новости',
+	'set_pagin_cp_views_ph' => 'Кол-во просмотров новостей в ПУ',
+	'set_pagin_cp_votes' => 'Голосов новости',
+	'set_pagin_cp_votes_ph' => 'Кол-во голосов новостей в ПУ',
+	'set_pagin_cp_menu' => 'Пунктов меню',
+	'set_pagin_cp_menu_ph' => 'Кол-во пунктов меню сайта в ПУ',
+	'set_pagin_cp_menu_cp' => 'Пункты меню ПУ',
+	'set_pagin_cp_menu_cp_ph' => 'Кол-во пункты меню ПУ в ПУ',
+	'set_pagin_cp_mgroups' => 'Группы меню',
+	'set_pagin_cp_mgroups_ph' => 'Кол-во групп меню в ПУ',
+	'set_pagin_cp_icons' => 'Иконки меню',
+	'set_pagin_cp_icons_ph' => 'Кол-во иконок меню в ПУ',
+	'set_pagin_cp_users' => 'Пользователи',
+	'set_pagin_cp_users_ph' => 'Кол-во пользователей в ПУ',
+	'set_pagin_cp_groups' => 'Группы пользователей',
+	'set_pagin_cp_groups_ph' => 'Кол-во групп пользователей в ПУ',
+	'set_pagin_cp_prems' => 'Привилегии',
+	'set_pagin_cp_prems_ph' => 'Кол-во привилегий в ПУ',
+	'set_pagin_cp_stc' => 'Статические страницы',
+	'set_pagin_cp_stc_ph' => 'Кол-во статических страниц в ПУ',
+	'set_pagin_cp_logs' => 'Логи',
+	'set_pagin_cp_logs_ph' => 'Кол-во логов в ПУ',
+	'set_srch_name' => 'Название',
+	'set_srch_lvl' => 'Уровень доступа',
+	'log_set_main_save' => 'Редактирование основных настроек в ПУ',
+	'log_set_pagin_save' => 'Редактирование настроек постраничной навигации в ПУ',
+	'log_set_mail_save' => 'Редактирование настроек почты в ПУ',
+	'log_set_search_save' => 'Редактирование настроек поиска в ПУ',
+	'log_set_func_save' => 'Редактирование настроек функций в ПУ',
+	'log_set_base_save' => 'Редактирование настроек базы в ПУ',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/ajax.php b/upload/language/ru_RU/ajax.php
new file mode 100644
index 0000000..4591c7b
--- /dev/null
+++ b/upload/language/ru_RU/ajax.php
@@ -0,0 +1,87 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Ajax',
+
+	'class_not_found' => 'Объект "submodule" не найден',
+	'method_not_found' => 'Метод "content" не найден',
+
+	'e_method' => 'Метод не поддерживаетя',
+	'ams_mod_not_selected' => 'Не выбрано ни одного модуля',
+	'ok' => 'OK',
+
+	'fm' => 'Файловый менеджер',
+	'fm_file_not_found' => 'Нет доступных файлов',
+	'fm_success_load' => 'Файлы успешно получены',
+	'fm_success_upload' => 'Файлы успешно получены',
+	'fm_success_del' => 'Файл успешно удален',
+	'fm_success_edit' => 'Файл успешно изменен',
+	'fm_not_selected' => 'Не выбрано ни одного файла',
+	'fm_e_size_limit' => 'Превышен лимит по объему',
+	'fm_e_load' => 'Ошибка загрузки файла',
+	'fm_e_temp_file' => 'Отсутствует временный файл',
+	'fm_e_perm' => 'Отсутствуют права на запись',
+	'fm_e_unknow' => 'Неизвестная ошибка',
+	'fm_e_not_loaded' => 'Файл не был загружен на сервер',
+	'fm_e_no_one' => 'Ни один файл не был загружен.',
+	'fm_e_not_found' => 'Файл не найден',
+	'fm_e_not_deleted' => 'Ничего не удалено',
+	'fm_e_uniq' => 'Не заполнено поле идентификатора',
+	'fm_e_uniq_exist' => 'Идентификатор уже занят',
+
+	'mon_empty' => 'Нет доступных серверов',
+	'mon_srv_offline' => 'Сервер оффлайн',
+	'mon_srv_success' => 'Серверы успешно получены',
+
+	'news' => 'Новости',
+	'news_not_found' => 'Новость не найдена',
+
+	'com_perm_add' => 'У вас нет доступа для добалвения комментариев',
+	'com_perm_edit' => 'У вас нет доступа для изменения комментариев',
+	'com_perm_del' => 'У вас нет прав на удаление комментариев',
+	'com_disabled' => 'Комментарии отключены для данной новости',
+	'com_msg_empty' => 'Не заполнено поле "Сообщение"',
+	'com_wait' => 'Для повторного добовления комментария необходимо подождать',
+	'com_wait1' => 'сек.',
+	'com_msg_incorrect' => 'Не верно заполнено поле сообщения',
+	'com_add_success' => 'Комментарий успешно добавлен',
+	'com_edit_success' => 'Комментарий успешно отредактирован',
+	'com_del_success' => 'Выбранный комментарий успешно удален',
+	'com_load_success' => 'Комментарий успешно получен',
+	'com_del_empty' => 'Ничего не удалено',
+	'com_unauth' => 'Вы не авторизованы',
+	'com_vote_perm' => 'У вас нет доступа для голосования',
+	'com_vote_disabled' => 'Голосование для данной новости отключено',
+	'com_vote_success' => 'Голос успешно учтен',
+
+	'att_attach' => 'Закрепление',
+	'att_unattach' => 'Открепление',
+	'att_news' => 'новости',
+	'att_success' => 'Статус закрепления успешно изменен',
+
+	'new_success_del' => 'Новость успешно удалена',
+
+	'reg_e_login_regexp' => 'Логин может состоять только из латинских букв, цифр и знаков -_',
+	'reg_e_email_regexp' => 'Неверный формат E-Mail адреса',
+	'reg_e_exist' => 'Запрещено использовать данный логин и/или E-Mail',
+	'reg_e_pass_length' => 'Пароль должен быть не менее 6-ти символов',
+	'reg_e_pass_match' => 'Пароли не совпадают',
+	'reg_e_rules' => 'Необходимо принять правила сайта',
+	"reg_e_rules" => "Для регистрации необходимо принять правила",
+	"reg_e_success" => "Вы успешно зарегистрировались. Теперь вы можете войти под своим логином и паролем.",
+	"reg_e_success_mail" => "Письмо с подтверждением регистрации отправлено на E-Mail, указанный при регистрации",
+	"reg_e_already" => "Вы уже зарегистрированы",
+	"reg_title" => "[Регистрация]",
+	'reg_ok' => 'ОК',
+	"log_reg" => "Регистрация пользователя",
+
+	'log_new_del' => 'Удаление новости',
+	'log_com_add' => 'Добавление комментария',
+	'log_com_edit' => 'Редактирование комментария',
+	'log_com_del' => 'Удаление комментария',
+	'log_com_vote' => 'Голосование за новость',
+
+	'log_change_ams' => 'Изменение статусов модулей',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/auth.php b/upload/language/ru_RU/auth.php
new file mode 100644
index 0000000..e1b2408
--- /dev/null
+++ b/upload/language/ru_RU/auth.php
@@ -0,0 +1,12 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Авторизация',
+	'e_already' => 'Вы уже авторизованны',
+	'e_wrong_pass' => 'Неверный логин или пароль',
+	'e_success' => 'Вы успешно авторизовались',
+	'e_access' => 'Вам запрещена авторизация',
+	'log_auth' => 'Авторизация пользователя на сайте',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/blocks/banner.php b/upload/language/ru_RU/blocks/banner.php
new file mode 100644
index 0000000..488ec30
--- /dev/null
+++ b/upload/language/ru_RU/blocks/banner.php
@@ -0,0 +1,7 @@
+<?php
+
+$lng = array(
+	'developer' => 'Разработчик',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/blocks/monitor.php b/upload/language/ru_RU/blocks/monitor.php
new file mode 100644
index 0000000..10279d2
--- /dev/null
+++ b/upload/language/ru_RU/blocks/monitor.php
@@ -0,0 +1,9 @@
+<?php
+
+$lng = array(
+	'monitoring' => 'Мониторинг серверов',
+	'empty' => 'Нет доступных серверов',
+	'offline' => 'Оффлайн',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/blocks/notify.php b/upload/language/ru_RU/blocks/notify.php
new file mode 100644
index 0000000..3597de8
--- /dev/null
+++ b/upload/language/ru_RU/blocks/notify.php
@@ -0,0 +1,9 @@
+<?php
+
+$lng = array(
+	'alert' => 'Оповещение',
+
+);
+
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/blocks/profile.php b/upload/language/ru_RU/blocks/profile.php
new file mode 100644
index 0000000..6c80d20
--- /dev/null
+++ b/upload/language/ru_RU/blocks/profile.php
@@ -0,0 +1,20 @@
+<?php
+
+$lng = array(
+	'miniprofile' => 'Мини-профиль',
+	'login' => 'Логин',
+	'password' => 'Пароль',
+	'group' => 'Группа',
+	'balance' => 'Баланс',
+	'settings' => 'Профиль',
+	'logout' => 'Выход',
+	'cur_game' => 'майн.',
+	'cur_real' => 'руб.',
+	'auth' => 'Авторизация',
+	'remember' => 'Запомнить',
+	'enter' => 'Вход',
+	'restore' => 'Восстановление пароля',
+	'register' => 'Регистрация',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/file.php b/upload/language/ru_RU/file.php
new file mode 100644
index 0000000..6fb5538
--- /dev/null
+++ b/upload/language/ru_RU/file.php
@@ -0,0 +1,7 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Файловый загрузчик',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/install.php b/upload/language/ru_RU/install.php
new file mode 100644
index 0000000..0d287f3
--- /dev/null
+++ b/upload/language/ru_RU/install.php
@@ -0,0 +1,99 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Установка',
+	'step_1' => 'Шаг #1',
+	'step_2' => 'Шаг #2',
+	'step_3' => 'Шаг #3',
+	'settings' => 'Настройки',
+	'finish' => 'Завершение установки',
+	'db_settings' => 'Настройки базы',
+	'site_settings' => 'Настройки сайта',
+	'on' => 'Вкл.',
+	'off' => 'Выкл.',
+	'install_prepare' => 'Подготовка к установке',
+	'isn_p_msg1' => 'Вас приветствует мастер установки системы WebMCR',
+	'isn_p_msg2' => 'Для продолжения вам необходимо сверить результаты проверки. Если результаты проверки помечены красным, вам необходимо настроить сервер так, чтобы значение соответствовало системным требованиям',
+	'isn_p_msg3' => '',
+	'read_write' => 'Чтение и запись',
+	'next' => 'Продолжить',
+	'system_req' => 'Системные требования',
+	'result_test' => 'Результат проверки',
+	'gd_exist' => 'Наличие библиотеки GD',
+	'mysql_support' => 'Поддержка MySQL',
+	'buffer_write' => 'Буферизация вывода',
+	'access_files' => 'Доступ к файлам и папкам',
+	'info' => 'Информация',
+	'install_progress' => 'Ход установки',
+	'general' => 'Основные',
+	'site_desc' => 'Описание сайта',
+	'site_keys' => 'Ключевые слова',
+	'mail' => 'Почта',
+	'mail_from' => 'От кого (E-Mail)',
+	'mail_from_desc' => 'С какого почтового ящика было отправлено сообщение',
+	'mail_from_name' => 'От кого (Имя)',
+	'mail_from_name_desc' => 'От чьего имени было отправлено сообщение',
+	'mail_reply' => 'E-Mail ответа',
+	'mail_reply_name' => 'Имя E-Mail ответа',
+	'smtp_use' => 'Использовать SMTP',
+	'smtp_host' => 'Адрес SMTP сервера',
+	'smtp_user' => 'SMTP пользователь',
+	'smtp_pass' => 'SMTP пароль',
+	'type' => 'Тип',
+	'recommended' => 'Рекомендуется',
+	'db_host' => 'Адрес хоста',
+	'db_port' => 'Порт',
+	'db_name' => 'Имя базы данных',
+	'db_user' => 'Имя пользователя',
+	'db_pass' => 'Пароль пользователя',
+	'adm_login' => 'Логин администратора',
+	'adm_pass' => 'Пароль администратора',
+	'adm_repass' => 'Повторите пароль',
+	'adm_mail' => 'E-Mail администратора',
+	'encrypt_method' => 'Метод шифрования паролей',
+	'congrats' => 'Поздравляем!',
+	'fs_msg1' => 'Вы успешно установили WebMCR',
+	'fs_msg2' => 'Обязательно удалите папку',
+	'fs_msg3' => 'из главного каталога WebMCR',
+	'fs_msg4' => 'WebMCR - это некоммерческий проект с открытым исходным кодом. Вся разработка идет на энтузиазме, а ваши пожертвования, дают нам повод для развития своих идей и продолжения разработки.',
+	'fs_msg5' => 'Мы рады любым суммам.',
+	'fs_msg6' => 'Спасибо!',
+	'go_home' => 'На главную сайта',
+	'go_cp' => 'В панель управления',
+	'useful_links' => 'Полезные ссылки',
+	'official_site' => 'Официальный сайт',
+	'documentation' => 'Документация',
+	'extensions' => 'Дополнения',
+	'vk_page' => 'Страница VK',
+	'dev_user' => 'Разработчик новых версий',
+	'author_user' => 'Автор WebMCR & Разработчик предыдущих версий',
+	'theme_user' => 'Автор изначального шаблона',
+	'donate' => 'Пожертвования',
+
+	'e_php_version' => 'Версия PHP не соответствует системным требованиям',
+	'e_register_globals' => 'Функция Register Globals не соответствует системным требованиям',
+	'e_fopen' => 'Функция allow_url_fopen() не соответствует системным требованиям',
+	'e_gd' => 'Библиотека GD не найдена',
+	'e_mysql_not_found' => 'MySQL не найдена',
+	'e_buffer' => 'Функции буферизации данных недоступны',
+	'e_perm_configs' => 'Отсутствуют права на чтение и/или запись папки configs и/или ее содержимого',
+	'e_perm_modules' => 'Отсутствуют права на чтение и/или запись папки configs/modules и/или ее содержимого',
+	'e_perm_cache' => 'Отсутствуют права на чтение или запись папки cache',
+	'e_perm_uploads' => 'Отсутствуют права на чтение или запись папки uploads',
+	'e_perm_cloaks' => 'Отсутствуют права на чтение или запись папки uploads/cloaks/',
+	'e_perm_icons' => 'Отсутствуют права на чтение или запись папки uploads/panel-icons/',
+	'e_perm_skins' => 'Отсутствуют права на чтение или запись папки uploads/skins/',
+	'e_perm_intf' => 'Отсутствуют права на чтение или запись папки uploads/skins/interface/',
+	'e_perm_smiles' => 'Отсутствуют права на чтение или запись папки uploads/smiles/',
+	'e_settings' => 'Настройки не могут быть сохранены',
+	'e_set_base' => 'Неверно указаны данные для подключения к базе',
+	'e_login_format' => 'Логин может состоять только из символов a-zA-Z0-9_- и быть не менее 3-х символов',
+	'e_pass_len' => 'Пароль должен быть не менее 6-ти символов',
+	'e_pass_match' => 'Пароли не совпадают',
+	'e_email_format' => 'Неверный формат E-Mail адреса',
+	'e_add_admin' => 'Произошла ошибка добавления администратора',
+	'e_add_economy' => 'Произошла ошибка добавления поля экономики',
+	'e_upd_group' => 'Произошла ошибка обновления групп пользователей',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/js/global.js b/upload/language/ru_RU/js/global.js
new file mode 100644
index 0000000..7c9c75f
--- /dev/null
+++ b/upload/language/ru_RU/js/global.js
@@ -0,0 +1,49 @@
+var lng = {
+	error: 'Ошибка!',
+	warning: 'Внимание!',
+	save: 'Сохранить',
+
+	e_xmlhr: 'XMLHttpRequest не поддерживается',
+	e_monitor: 'Мониторинг временно недоступен',
+	e_filemanager: 'Произошла непредвиденная ошибка загрузки файлового менеджера. Попробуйте повторить попытку.',
+	e_file_load: 'Произошла непредвиденная ошибка загрузки Файлов. Попробуйте повторить попытку.',
+	e_files_not_loaded: 'Некоторые файлы не были загружены (См. консоль - F12)',
+	e_file_delete: 'Удаление файла временно недоступно.',
+	e_id_not_filled: 'Не заполнено поле идентификатора',
+	e_file_edit: 'Редактирование файла временно недоступно.',
+
+	offline: 'Оффлайн',
+	b: 'б',
+	kb: 'Кб',
+	mb: 'Мб',
+	gb: 'Гб',
+	change: 'Изменить',
+	count_downloads: 'Кол-во скачиваний',
+	added: 'Добавил(а)',
+	date: 'Дата',
+	delete: 'Удалить',
+	not_selected: 'Не выбрано ни одного пункта',
+	only_one: 'Для изменения необходимо выбрать только один элемент',
+	drop_files_here: 'Выберите файлы или перенесите их сюда',
+
+	jan: 'Январь',
+	feb: 'Февраль',
+	mar: 'Март',
+	apr: 'Апрель',
+	may: 'Май',
+	jun: 'Июнь',
+	jul: 'Июль',
+	aug: 'Август',
+	sep: 'Сентябрь',
+	oct: 'Октябрь',
+	nov: 'Ноябрь',
+	dec: 'Декабрь',
+
+	sun: 'Вск',
+	mon: 'Пн',
+	tue: 'Вт',
+	wed: 'Ср',
+	thu: 'Чт',
+	fri: 'Пт',
+	sat: 'Сб'
+};
\ No newline at end of file
diff --git a/upload/language/ru_RU/js/modules/info-extensions.js b/upload/language/ru_RU/js/modules/info-extensions.js
new file mode 100644
index 0000000..58fb751
--- /dev/null
+++ b/upload/language/ru_RU/js/modules/info-extensions.js
@@ -0,0 +1,6 @@
+var lng_ie = {
+	buy: 'Купить',
+	download: 'Скачать',
+	readmore: 'Подробнее',
+	e_connection: 'Отсутствует интернет-соединение'
+};
\ No newline at end of file
diff --git a/upload/language/ru_RU/js/modules/info-main.js b/upload/language/ru_RU/js/modules/info-main.js
new file mode 100644
index 0000000..e791d4d
--- /dev/null
+++ b/upload/language/ru_RU/js/modules/info-main.js
@@ -0,0 +1,3 @@
+var lng_im = {
+	e_connection: 'Отсутствует интернет-соединение'
+};
\ No newline at end of file
diff --git a/upload/language/ru_RU/js/modules/modules.js b/upload/language/ru_RU/js/modules/modules.js
new file mode 100644
index 0000000..1821e7e
--- /dev/null
+++ b/upload/language/ru_RU/js/modules/modules.js
@@ -0,0 +1,4 @@
+var lng_mod = {
+	e_change_status: 'Произошла непредвиденная ошибка изменения статуса модуля. Попробуйте повторить попытку.',
+	not_selected: 'Не выбрано ни одного модуля'
+};
\ No newline at end of file
diff --git a/upload/language/ru_RU/js/modules/news-admin.js b/upload/language/ru_RU/js/modules/news-admin.js
new file mode 100644
index 0000000..c7ed55b
--- /dev/null
+++ b/upload/language/ru_RU/js/modules/news-admin.js
@@ -0,0 +1,5 @@
+var lng_na = {
+	e_attach: 'Произошла непредвиденная ошибка закрепления новости. Попробуйте повторить попытку.',
+	e_delete: 'Произошла непредвиденная ошибка удаления новости. Попробуйте повторить попытку.',
+	del_confirm: 'Вы уверены, что хотите удалить выбранную новость?'
+};
\ No newline at end of file
diff --git a/upload/language/ru_RU/js/modules/news-full.js b/upload/language/ru_RU/js/modules/news-full.js
new file mode 100644
index 0000000..cda3460
--- /dev/null
+++ b/upload/language/ru_RU/js/modules/news-full.js
@@ -0,0 +1,9 @@
+var lng_nf = {
+	e_add_comment: 'Произошла непредвиденная ошибка добавления комментария. Попробуйте повторить попытку.',
+	e_delete_comment: 'Произошла непредвиденная ошибка удаления комментария. Попробуйте повторить попытку.',
+	e_get_comment: 'Произошла непредвиденная ошибка получения комментария. Попробуйте повторить попытку.',
+	e_edit_comment: 'Произошла непредвиденная ошибка редактирования комментария. Попробуйте повторить попытку.',
+	e_save_comment: 'Произошла непредвиденная ошибка сохранения комментария. Попробуйте повторить попытку.',
+	e_vote: 'Произошла непредвиденная ошибка голосования. Попробуйте повторить попытку.',
+	del_confirm_comment: 'Вы уверены, что хотите удалить выбранный комментарий?'
+};
\ No newline at end of file
diff --git a/upload/language/ru_RU/js/modules/news-list.js b/upload/language/ru_RU/js/modules/news-list.js
new file mode 100644
index 0000000..8115da1
--- /dev/null
+++ b/upload/language/ru_RU/js/modules/news-list.js
@@ -0,0 +1,3 @@
+var lng_nl = {
+	e_vote: 'Произошла непредвиденная ошибка голосования. Попробуйте повторить попытку.'
+};
\ No newline at end of file
diff --git a/upload/language/ru_RU/js/modules/permissions.js b/upload/language/ru_RU/js/modules/permissions.js
new file mode 100644
index 0000000..f0b39dd
--- /dev/null
+++ b/upload/language/ru_RU/js/modules/permissions.js
@@ -0,0 +1,3 @@
+var lng_per = {
+	default_val: 'Значение по умолчанию'
+};
\ No newline at end of file
diff --git a/upload/language/ru_RU/js/modules/register.js b/upload/language/ru_RU/js/modules/register.js
new file mode 100644
index 0000000..ae3be47
--- /dev/null
+++ b/upload/language/ru_RU/js/modules/register.js
@@ -0,0 +1,5 @@
+var lng_reg = {
+	required_fields: 'Необходимо принять правила сайта',
+	e_check: 'Проверка не пройдена',
+	e_check_form: 'Произошла ошибка проверки формы. Попробуйте обновить страницу и повторить попытку'
+};
\ No newline at end of file
diff --git a/upload/language/ru_RU/logout.php b/upload/language/ru_RU/logout.php
new file mode 100644
index 0000000..0bcf01d
--- /dev/null
+++ b/upload/language/ru_RU/logout.php
@@ -0,0 +1,10 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Авторизация',
+	"e_not_auth" => "Вы не авторизованы",
+	"e_success" => "Вы успешно покинули свой аккаунт",
+	'log_logout' => 'Выход пользователя с сайта',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/main.php b/upload/language/ru_RU/main.php
deleted file mode 100644
index c627603..0000000
--- a/upload/language/ru_RU/main.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-if(!defined("MCR")){ exit("Hacking Attempt!"); }
-
-$lng = array(
-	// Ошибки
-	"e_msg" => "Ошибка!",
-	"e_sql_connect" => "Ошибка соединения с базой",
-	"e_sql_charset" => "Ошибка установки кодировки баз дынных",
-	"e_sql_critical" => "Критическая ошибка баз данных. Обратитесь к администрации.",
-	"e_critical" => "Обратитесь к администрации",
-	"e_warn" => "Обнаружена ошибка!",
-	"e_attention" => "Внимание!",
-	"e_success" => "Поздравляем!",
-	"e_403" => "Доступ запрещен",
-	"e_captcha" => "Неверно введена каптча",
-	"e_hack" => "Hacking Attempt!",
-	
-	"e_reg_login_regexp" => "Логин может состоять только из латинских букв, цифр и знаков -_",
-	"e_reg_login_exist" => "Запрещено использовать данный логин",
-	"e_reg_email_regexp" => "Неверный формат E-Mail адреса",
-	"e_reg_email_exist" => "Запрещено использовать данный E-Mail",
-	"e_reg_already" => "Вы уже зарегистрированы",
-	"e_reg_rules" => "Для регистрации необходимо принять правила",
-	"e_reg_pass_length" => "Пароль должен быть не менее 6-ти символов",
-	"e_reg_pass_match" => "Пароли не совпадают",
-	"e_reg_success" => "Вы успешно зарегистрировались. Теперь вы можете войти под своим логином и паролем.",
-	"e_reg_success_mail" => "Письмо с подтверждением регистрации отправлено на E-Mail, указанный при регистрации",
-	"e_reg_accept" => "Вы успешно подтвердили регистрацию",
-	"e_reg_perm" => "Регистрация отключена для вашей группы пользователей",
-
-	"e_auth_already" => "Вы уже авторизованны",
-	"e_auth_wrong_pass" => "Неверный логин или пароль",
-	"e_auth_success" => "Вы успешно авторизовались",
-
-	"e_unauth_not" => "Вы не авторизованы",
-	"e_unauth_yes" => "Вы успешно покинули свой аккаунт",
-
-	"e_valid_fname" => "Имя может состоять только из букв",
-	"e_valid_lname" => "Фамилия может состоять только из букв",
-	"e_valid_bday" => "Неверный формат даты рождения",
-	"e_valid_oldpass" => "Неверно введен старый пароль",
-	"e_valid_repass" => "Пароли не совпадают",
-
-	"e_rest_eamil" => "Не заполнено поле E-Mail",
-	"e_rest_success" => "Инструкция по восстановлению пароля отправлена на указанный E-Mail",
-	"e_rest_limit" => "Привышен максимально допустимый лимит на восстановление пароля",
-	"e_rest_email" => "Пользователь с указанным E-Mail адресом не найден",
-	"e_rest_success2" => "Ваш пароль успешно изменен. Теперь вы можете войти",
-	"e_rest_perm" => "Восстановление пароля ограничено администрацией",
-
-	"e_load_cloak_folder" => "Отсутствуют права на запись папки uploads/cloaks",
-	"e_load_skin_folder" => "Отсутствуют права на запись папки uploads/skins",
-	"e_load_intf" => "Отсутствуют права на запись папки uploads/interface",
-	"e_load_size" => "Привышен максимально допустимый размер файла",
-	"e_load_cloak" => "Ошибка загрузки плаща!",
-	"e_load_skin" => "Ошибка загрузки скина!",
-	"e_load_temp" => "Отсутствует временная папка",
-	"e_load_perm" => "Отсутствуют права на запись",
-	"e_load_undefined" => "Неизвестная ошибка",
-	"e_load_tempfile" => "Отсутствует временный файл",
-	"e_load_png" => "Разрешено загружать только png",
-	"e_load_format" => "Вам недоступен данный формат",
-	"e_load_save" => "Ошибка сохранения скина/плаща",
-
-	"e_mode_found" => "Страница не найдена",
-	"e_mode_class" => "Объект module не найден",
-	"e_mode_method" => "Метод content в классе module не найден",
-
-	"e_advice_found" => "Советов нет",
-
-	"e_search_perm" => "Поиск ограничен администрацией",
-
-	// "e_" => "",
-
-	// Названия страниц
-	"t_main" => "Главная",
-	"t_403" => "Доступ запрещен",
-	"t_404" => "Страница не найдена",
-	"t_reg" => "Регистрация",
-	"t_restore" => "Восстановление пароля",
-	"t_profile" => "Профиль",
-	"t_admin" => "Панель управления",
-	"t_static" => "Статические страницы",
-	"t_search" => "Поиск",
-	// "t_" => "",
-
-	// Названия переменных по умолчанию
-	"u_group_def" => "Гость",
-	"u_group_desc_def" => "Группа неавторизованных пользователей",
-	// "u_" => "",
-
-	// Названия блоков
-	"b_alert" => "Оповещение",
-	"b_m-p" => "Мини-профиль",
-	"b_auth" => "Авторизация",
-	"b_reg" => "Регистрация",
-	"b_404" => "Страница не найдена",
-	"b_403" => "Доступ запрещен",
-	"b_restore" => "Восстановление пароля",
-	// "b_" => "",
-
-	// Блок мини-профиля
-	"m-p_login" => "Логин",
-	"m-p_group" => "Группа",
-	"m-p_balance" => "Баланс",
-	"m-p_settings" => "Профиль",
-	"m-p_logout" => "Выход",
-	// "m-p_" => "",
-
-	// Блок авторизации
-	"ath_remember" => "Запомнить",
-	"ath_auth" => "Вход",
-	"ath_reg" => "Регистрация",
-	// "ath_" => "",
-
-	// Блок регистрации
-	"reg_login" => "Логин",
-	"reg_email" => "E-Mail",
-	"reg_pass" => "Пароль",
-	"reg_repass" => "Повторите пароль",
-	"reg_accept" => "Я принимаю данные правила и обязуюсь их соблюдать",
-	"reg_btn" => "Зарегистрироваться",
-	// "reg_" => "",
-
-	"btn_restore" => "Восстановить",
-	"btn_edit" => "Изменить",
-
-	"int_newpass" => "Новый пароль",
-
-	// Placeholder'ы форм
-	"ph_login" => "Логин",
-	"ph_password" => "Пароль",
-	"ph_email" => "E-Mail",
-	"ph_repassword" => "Повторите пароль",
-	"ph_search" => "Поиск",
-	// "ph_" => "",
-
-	// ToolTip'ы (title)
-	"tlp_restore_pass" => "Восстановление пароля",
-	//"tlp_" => "",
-
-	// Разное
-	"sch_news" => "По новостям",
-	"sch_comm" => "по комментариям",
-	"load_client" => "СКАЧАТЬ КЛИЕНТ",
-	"copy_pre" => "Полное или частичное копирование сайта",
-	"copy_app" => "запрещено.",
-	"gender" => "Пол",
-	"gender_m" => "Мужской",
-	"gender_w" => "Женский",
-	//"" => "",
-
-	"rest_title" => "[Восстановление пароля]",
-	"reg_title" => "[Регистрация]",
-);
-
-?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/news.php b/upload/language/ru_RU/news.php
new file mode 100644
index 0000000..3eea366
--- /dev/null
+++ b/upload/language/ru_RU/news.php
@@ -0,0 +1,31 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Новости',
+	'attach' => 'Закрепить',
+	'unattach' => 'Открепить',
+	'attached' => 'Закреплено',
+	'access_denied' => 'У вас нет доступа для просмотра новостей',
+	'access_denied_com' => 'У вас нет доступа, чтобы просматривать комментарии',
+	'not_found' => 'Не найдено',
+	'no_news_avail' => 'Нет доступных новостей',
+	'date_create' => 'Дата создания',
+	'time_create' => 'Время создания',
+	'views' => 'Просмотров',
+	'readmore' => 'Читать далее...',
+	'category' => 'Категория',
+	'go_home' => 'На главную',
+	'comments' => 'Комментариев',
+	'comments1' => 'Комментарии',
+	'edit' => 'Редактировать',
+	'delete' => 'Удалить',
+	'no_com_avail' => 'Нет доступных комментариев',
+	'send_by_user' => 'Отправлено пользователем',
+	'add_comment' => 'Добавление комментария',
+	'message' => 'Сообщение',
+	'add' => 'Добавить',
+	'disabled_by_admin' => 'Комментарии в данной новости были отключены администрацией',
+	'quote' => 'Цитировать',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/profile.php b/upload/language/ru_RU/profile.php
new file mode 100644
index 0000000..7755af6
--- /dev/null
+++ b/upload/language/ru_RU/profile.php
@@ -0,0 +1,47 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Профиль',
+	'skin_not_set' => 'Скин не установлен',
+	'log_delete' => 'Удаление скина в профиле',
+	'skin_success_del' => 'Ваш скин успешно удален',
+	'cloak_not_set' => 'Плащ не установлен',
+	'log_delete_cl' => 'Удаление плаща в профиле',
+	'cloak_success_del' => 'Ваш плащ успешно удален',
+	'log_edit_sk' => 'Изменение скина в профиле',
+	'skin_success_edit' => 'Ваш скин успешно изменен',
+	'log_edit_cl' => 'Изменение плаща в профиле',
+	'cloak_success_edit' => 'Ваш плащ успешно изменен',
+	'log_settings' => 'Изменение настроек пользователя',
+	'set_success_save' => 'Настройки успешно сохранены',
+	"e_valid_fname" => "Имя может состоять только из букв",
+	"e_valid_lname" => "Фамилия может состоять только из букв",
+	"e_valid_bday" => "Неверный формат даты рождения",
+	"e_valid_oldpass" => "Неверно введен старый пароль",
+	"e_valid_repass" => "Пароли не совпадают",
+	'auth_required' => 'Для доступа к профилю необходима авторизация',
+	'access_by_admin' => 'Доступ к профилю ограничен администрацией',
+	'skin_access_by_admin' => 'Удаление скина ограничено администрацией',
+	'cloak_access_by_admin' => 'Удаление плаща ограничено администрацией',
+	'skin_edit_by_admin' => 'Изменение скина ограничено администрацией',
+	'cloak_edit_by_admin' => 'Изменение плаща ограничено администрацией',
+	'set_save_by_admin' => 'Настройки профиля ограничены администрацией',
+	'f_info' => 'Информация',
+	'f_skin' => 'Образ',
+	'f_settings' => 'Настройки',
+	'f_name' => 'Имя',
+	'f_lname' => 'Фамилия',
+	'f_gender' => 'Пол',
+	'f_bday' => 'Дата рождения',
+	'f_gmoney' => 'Игровой баланс',
+	'f_rmoney' => 'Реальный баланс',
+	'delete_skin' => 'Удалить скин',
+	'delete_cloak' => 'Удалить плащ',
+	'drop_skin_here' => 'Перенесите сюда новый скин персонажа',
+	'drop_cloak_here' => 'Перенесите сюда новый плащ персонажа',
+	'f_oldpass' => 'Старый пароль',
+	'f_repass' => 'Повторите пароль',
+	'btn_save' => 'Сохранить',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/register.php b/upload/language/ru_RU/register.php
new file mode 100644
index 0000000..9fa3eb1
--- /dev/null
+++ b/upload/language/ru_RU/register.php
@@ -0,0 +1,18 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Регистрация',
+	"e_already" => "Вы уже зарегистрированы",
+	"e_accept" => "Вы успешно подтвердили регистрацию",
+	"e_perm" => "Регистрация отключена для вашей группы пользователей",
+	"repass" => "Повторите пароль",
+	"accept" => "Я принимаю данные правила и обязуюсь их соблюдать",
+	"btn" => "Зарегистрироваться",
+	"msg1" => "Здравствуйте.",
+	"msg2" => "Была совершена попытка регистрации на сайте",
+	"msg3" => "Для подтверждения регистрации, перейдите по ссылке ниже",
+	"msg4" => "Если это были не вы, то проигнорируйте данное сообщение.",
+	"msg5" => "С уважением, администрация сайта",
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/restore.php b/upload/language/ru_RU/restore.php
new file mode 100644
index 0000000..2cd0356
--- /dev/null
+++ b/upload/language/ru_RU/restore.php
@@ -0,0 +1,23 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Восстановление пароля',
+	"invalid_email" => "Не заполнено поле E-Mail",
+	"e_success" => "Инструкция по восстановлению пароля отправлена на указанный E-Mail",
+	"e_limit" => "Привышен максимально допустимый лимит на восстановление пароля",
+	"email_not_found" => "Пользователь с указанным E-Mail адресом не найден",
+	"e_success2" => "Ваш пароль успешно изменен. Теперь вы можете войти",
+	"e_perm" => "Восстановление пароля ограничено администрацией",
+	"email_title" => "[Восстановление пароля]",
+	"e_pass_length" => "Пароль должен быть не менее 6-ти символов",
+	"newpass" => "Новый пароль",
+	"btn_edit" => "Изменить",
+	"btn_restore" => "Восстановить",
+	"msg1" => "Здравствуйте.",
+	"msg2" => "Была совершена попытка восстановления пароля для сайта",
+	"msg3" => "Для продолжения, перейдите по ссылке ниже и введите новый пароль",
+	"msg4" => "Если это были не вы, то проигнорируйте данное сообщение.",
+	"msg5" => "С уважением, администрация сайта",
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/search.php b/upload/language/ru_RU/search.php
new file mode 100644
index 0000000..547867e
--- /dev/null
+++ b/upload/language/ru_RU/search.php
@@ -0,0 +1,20 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Поиск',
+	'search_results' => 'Результаты поиска',
+	'ph_search' => 'Введите запрос',
+	'empty_result' => 'Ничего не найдено',
+	'by_news' => 'По новостям',
+	'by_comments' => 'По комментариям',
+	'search_perm' => 'Поиск ограничен администрацией',
+	'access_denied' => 'Поиск по новостям ограничен администрацией',
+	'access_denied_com' => 'Поиск по комментариям ограничен администрацией',
+	'empty_query' => 'Не заданы критерии поиска',
+	'msg_res1' => 'По запросу',
+	'msg_res2' => 'найдено результатов',
+	'added' => 'Добавлено',
+	'user' => 'пользователем',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/smtp/phpmailer.lang-ru.php b/upload/language/ru_RU/smtp/phpmailer.lang-ru.php
new file mode 100644
index 0000000..83abda4
--- /dev/null
+++ b/upload/language/ru_RU/smtp/phpmailer.lang-ru.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Russian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Alexey Chumakov <alex@chumakov.ru>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Ошибка SMTP: ошибка авторизации.';
+$PHPMAILER_LANG['connect_host']         = 'Ошибка SMTP: не удается подключиться к серверу SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Ошибка SMTP: данные не приняты.';
+$PHPMAILER_LANG['encoding']             = 'Неизвестный вид кодировки: ';
+$PHPMAILER_LANG['execute']              = 'Невозможно выполнить команду: ';
+$PHPMAILER_LANG['file_access']          = 'Нет доступа к файлу: ';
+$PHPMAILER_LANG['file_open']            = 'Файловая ошибка: не удается открыть файл: ';
+$PHPMAILER_LANG['from_failed']          = 'Неверный адрес отправителя: ';
+$PHPMAILER_LANG['instantiate']          = 'Невозможно запустить функцию mail.';
+$PHPMAILER_LANG['provide_address']      = 'Пожалуйста, введите хотя бы один адрес e-mail получателя.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' - почтовый сервер не поддерживается.';
+$PHPMAILER_LANG['recipients_failed']    = 'Ошибка SMTP: отправка по следующим адресам получателей не удалась: ';
+$PHPMAILER_LANG['empty_message']        = 'Пустое тело сообщения';
+$PHPMAILER_LANG['invalid_address']        = 'Не отослано, неправильный формат email адреса: ';
+$PHPMAILER_LANG['signing']              = 'Ошибка подписывания: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Ошибка соединения с SMTP-сервером';
+$PHPMAILER_LANG['smtp_error']           = 'Ошибка SMTP-сервера: ';
+$PHPMAILER_LANG['variable_set']         = 'Невозможно установить или переустановить переменную: ';
diff --git a/upload/language/ru_RU/statics.php b/upload/language/ru_RU/statics.php
new file mode 100644
index 0000000..662aa2d
--- /dev/null
+++ b/upload/language/ru_RU/statics.php
@@ -0,0 +1,10 @@
+<?php
+
+$lng = array(
+	'mod_name' => 'Статические страницы',
+	'date_create' => 'Дата создание',
+	'time_create' => 'Время создания',
+	'go_home' => 'На главную',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/language/ru_RU/system.php b/upload/language/ru_RU/system.php
new file mode 100644
index 0000000..0f545af
--- /dev/null
+++ b/upload/language/ru_RU/system.php
@@ -0,0 +1,146 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+$lng = array(
+	// Ошибки
+	"e_msg" => "Ошибка!",
+	"e_sql_connect" => "Ошибка соединения с базой",
+	"e_sql_charset" => "Ошибка установки кодировки баз дынных",
+	"e_sql_critical" => "Критическая ошибка баз данных. Обратитесь к администрации.",
+	"e_critical" => "Обратитесь к администрации",
+	"e_warn" => "Обнаружена ошибка!",
+	"e_attention" => "Внимание!",
+	"e_success" => "Поздравляем!",
+	"e_403" => "Доступ запрещен",
+	"e_404" => "Страница не найдена",
+	"e_captcha" => "Неверно введена каптча",
+	"e_hack" => "Hacking Attempt!",
+	"e_install" => "Необходима установка",
+	"e_module" => "Модуль недоступен",
+	"403" => "403",
+	"404" => "404",
+	"e_mode_found" => "Страница не найдена",
+	"e_mode_class" => "Объект module не найден",
+	"e_mode_method" => "Метод content в классе module не найден",
+	"e_advice_found" => "Советов нет",
+
+	"target_blank" => "Ссылка откроется в новой вкладке",
+
+	// debug
+	'deb_name' => 'Отладка',
+	'deb_php_ver' => 'Версия PHP',
+	'deb_php_err' => 'Ошибки PHP',
+	'deb_plt' => 'Время загрузки страницы',
+	'deb_num_q' => 'Запросов к базе',
+	'deb_db_err' => 'Ошибки базы',
+	'deb_memory' => 'Использовано памяти',
+	'deb_script' => 'Адрес скрипта',
+	'deb_protocol' => 'Протокол',
+	'deb_method' => 'Метод',
+	'deb_os' => 'Операционная система',
+	'deb_kb' => 'кб',
+	'deb_sec' => 'сек.',
+
+	// engine/skin.class.php
+	"skin_e_folder_perm" => "Отсутствуют права на запись папки uploads/skins",
+	"skin_e_intf_perm" => "Отсутствуют права на запись папки uploads/interface",
+	"skin_e_size" => "Привышен максимально допустимый размер файла",
+	"skin_e" => "Ошибка загрузки скина!",
+	"skin_e_undefined" => "Неизвестная ошибка",
+	"skin_e_temp" => "Отсутствует временная папка",
+	"skin_e_perm" => "Отсутствуют права на запись",
+	"skin_e_tempfile" => "Отсутствует временный файл",
+	"skin_e_png" => "Разрешено загружать только png",
+	"skin_e_format" => "Вам недоступен данный формат",
+	"skin_e_save" => "Ошибка сохранения скина",
+
+	// engine/cloak.class.php
+	"cloak_e_folder_perm" => "Отсутствуют права на запись папки uploads/cloaks",
+	"cloak_e_intf_perm" => "Отсутствуют права на запись папки uploads/interface",
+	"cloak_e_size" => "Привышен максимально допустимый размер файла",
+	"cloak_e" => "Ошибка загрузки скина!",
+	"cloak_e_undefined" => "Неизвестная ошибка",
+	"cloak_e_temp" => "Отсутствует временная папка",
+	"cloak_e_perm" => "Отсутствуют права на запись",
+	"cloak_e_tempfile" => "Отсутствует временный файл",
+	"cloak_e_png" => "Разрешено загружать только png",
+	"cloak_e_format" => "Вам недоступен данный формат",
+	"cloak_e_save" => "Ошибка сохранения плаща",
+
+	// engine/user.class.php
+	"u_group_def" => "Гость",
+	"u_group_desc_def" => "Группа неавторизованных пользователей",
+	// "u_" => "",
+
+	// Названия страниц
+	"t_main" => "Главная",
+	"t_403" => "Доступ запрещен",
+	"t_404" => "Страница не найдена",
+	// "t_" => "",
+
+	// Названия блоков
+	"b_404" => "Страница не найдена",
+	"b_403" => "Доступ запрещен",
+	// "b_" => "",
+
+	// Пользовательские поля
+	"login" => "Логин",
+	"ip" => "IP",
+	"email" => "E-Mail",
+	"pass" => "Пароль",
+	"group" => "Группа",
+	"firstname" => "Имя",
+	"lastname" => "Фамилия",
+	"date_reg" => "Дата регистрации",
+	"last_activity" => "Последнее действие",
+	"gender" => "Пол",
+	"gender_m" => "Мужской",
+	"gender_w" => "Женский",
+	"birthday" => "Дата рождения",
+	"money" => "Игровой баланс",
+	"realmoney" => "Реальный баланс",
+
+	// Placeholder формы поиска
+	"ph_search" => "Введите запрос",
+
+	// Разное
+	"load_client" => "СКАЧАТЬ КЛИЕНТ",
+	"copy_pre" => "Полное или частичное копирование сайта",
+	"copy_app" => "запрещено.",
+	//"" => "",
+
+	'yes' => 'Да',
+	'no' => 'Нет',
+	'save' => 'Сохранить',
+	'add' => 'Добавить',
+	'filemanager' => 'Файловый менеджер',
+	'filemanager_ph' => 'Выберите файлы или перенесите их сюда',
+
+	'bb_c_remove' => 'Удалить все теги',
+	'bb_c_strong' => 'Жирный',
+	'bb_c_italic' => 'Курсив',
+	'bb_c_strike' => 'Зачеркнутый',
+	'bb_c_underl' => 'Подчеркнутый',
+	'bb_c_left' => 'Выравнивание по левому краю',
+	'bb_c_center' => 'Выравнивание по центру',
+	'bb_c_right' => 'Выравнивание по правому краю',
+	'bb_c_font_size' => 'Размер шрифта [1-7]',
+	'bb_c_font' => 'Шрифт [Arial|Arial Black|Comic Sans MS|Courier New|Georgia|Impact|Tahoma|Times New Roman|Trebuchet MS|Verdana]',
+	'bb_c_color' => 'Цвет текста',
+	'bb_c_bgcolor' => 'Цвет фона',
+	'bb_c_reverse' => 'Текст в обратном порядке',
+	'bb_c_link' => 'Ссылка [URL]',
+	'bb_c_email' => 'E-Mail',
+	'bb_c_list' => 'Список [markers|numbers]',
+	'bb_c_line' => 'Горизонтальная линия',
+	'bb_c_code' => 'Код [php|html|css|javascript]',
+	'bb_c_quote' => 'Цитата [Логин | 00.00.00 - 00:00:00]',
+	'bb_c_spoiler' => 'Спойлер [Название]',
+	'bb_c_offtop' => 'Оффтоп',
+	'bb_c_img' => 'Изображение',
+	'bb_c_video' => 'Видео [youtube|vine|vk|vimeo|coub|twitch]',
+	'bb_c_smiles' => 'Смайлики',
+);
+
+?>
\ No newline at end of file
diff --git a/upload/modules/admin.php b/upload/modules/admin.php
index eef2b18..b362617 100644
--- a/upload/modules/admin.php
+++ b/upload/modules/admin.php
@@ -4,128 +4,42 @@
 
 class module{
 	private $core, $db, $config, $user, $lng;
+	public $cfg = array();
 
 	public function __construct($core){
 		$this->core = $core;
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
-
-		$this->core->title = $this->lng['t_admin'];
+		$this->lng	= $core->lng_m;
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
 	}
 
 	public function content(){
-		if(!$this->core->is_access('sys_adm_main')){ $this->core->notify('403', $this->lng['e_403']); }
+		if(!$this->core->is_access('sys_adm_main')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
-		$do = (isset($_GET['do'])) ? $_GET['do'] : 'main';
+		$do = (isset($_GET['do'])) ? $_GET['do'] : 'panel_menu';
 
-		switch($do){
-			case 'news':
-				if(!$this->core->is_access('sys_adm_news')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/news.class.php');
-			break;
+		if(!preg_match("/^[\w\.\-]+$/i", $do)){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
-			case 'news_cats':
-				if(!$this->core->is_access('sys_adm_news_cats')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/news_cats.class.php');
-			break;
+		if(!file_exists(MCR_MODE_PATH.'admin/'.$do.'.class.php')){
+			$this->core->notify($this->core->lng['404'], $this->core->lng['e_404']);
+		}
 
-			case 'news_views':
-				if(!$this->core->is_access('sys_adm_news_views')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/news_views.class.php');
-			break;
+		require_once(MCR_MODE_PATH.'admin/'.$do.'.class.php');
 
-			case 'news_votes':
-				if(!$this->core->is_access('sys_adm_news_votes')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/news_votes.class.php');
-			break;
-
-			case 'comments':
-				if(!$this->core->is_access('sys_adm_comments')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/comments.class.php');
-			break;
-
-			case 'menu':
-				if(!$this->core->is_access('sys_adm_menu')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/menu.class.php');
-			break;
-
-			case 'menu_adm':
-				if(!$this->core->is_access('sys_adm_menu_adm')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/menu_adm.class.php');
-			break;
-
-			case 'menu_groups':
-				if(!$this->core->is_access('sys_adm_menu_groups')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/menu_groups.class.php');
-			break;
-			
-			case 'menu_icons':
-				if(!$this->core->is_access('sys_adm_menu_icons')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/menu_icons.class.php');
-			break;
-			
-			case 'users':
-				if(!$this->core->is_access('sys_adm_users')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/users.class.php');
-			break;
-			
-			case 'groups':
-				if(!$this->core->is_access('sys_adm_groups')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/groups.class.php');
-			break;
-			
-			case 'permissions':
-				if(!$this->core->is_access('sys_adm_permissions')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/permissions.class.php');
-			break;
-			
-			case 'statics':
-				if(!$this->core->is_access('sys_adm_statics')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/statics.class.php');
-			break;
-			
-			case 'info':
-				if(!$this->core->is_access('sys_adm_info')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/info.class.php');
-			break;
-			
-			case 'settings':
-				if(!$this->core->is_access('sys_adm_settings')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/settings.class.php');
-			break;
-			
-			case 'monitoring':
-				if(!$this->core->is_access('sys_adm_monitoring')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/monitoring.class.php');
-			break;
-			
-			case 'modules':
-				if(!$this->core->is_access('sys_adm_modules')){ $this->core->notify('403', $this->lng['e_403']); }
-				require_once(MCR_MODE_PATH.'admin/modules.class.php');
-			break;
-
-			default:
-				require_once(MCR_MODE_PATH.'admin/panel_menu.class.php');
-			break;
+		if(!class_exists('submodule')){
+			$this->core->notify($this->core->lng['404'], $this->core->lng['e_404']);
 		}
 		
 		$submodule = new submodule($this->core);
-		
-		$content = $submodule->content();
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $submodule->content();
 	}
 }
 
diff --git a/upload/modules/admin/comments.class.php b/upload/modules/admin/comments.class.php
index e6a1d1d..c61b620 100644
--- a/upload/modules/admin/comments.class.php
+++ b/upload/modules/admin/comments.class.php
@@ -10,13 +10,13 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->lng	= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Комментарии';
+		if(!$this->core->is_access('sys_adm_comments')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Комментарии' => BASE_URL."?mode=admin&do=comments"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['comments'] => BASE_URL."?mode=admin&do=comments"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -34,12 +34,9 @@
 									ORDER BY `c`.id DESC
 									LIMIT $start, $end");
 
-		ob_start();
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/comments/com-none.html"); }
 
-		if(!$query || $this->db->num_rows($query)<=0){
-			echo $this->core->sp(MCR_THEME_MOD."admin/comments/com-none.html");
-			return ob_get_clean();
-		}
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
@@ -53,7 +50,7 @@
 				"ID" => intval($ar['id']),
 				"NID" => intval($ar['nid']),
 				"NEW" => $new,
-				"TEXT" => $this->db->HSC($text)
+				"TEXT" => $text
 			);
 		
 			echo $this->core->sp(MCR_THEME_MOD."admin/comments/com-id.html", $page_data);
@@ -75,19 +72,18 @@
 			"COMMENTS" => $this->comment_array()
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/comments/com-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/comments/com-list.html", $data);
 	}
 
 	private function delete(){
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=comments'); }
+
+		if(!$this->core->is_access('sys_adm_comments_delete')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=comments'); }
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=comments'); }
 			
 		$list = @$_POST['id'];
 
-		if(empty($list)){ $this->core->notify($this->lng["e_msg"], "Не выбрано ни одного пункта", 2, '?mode=admin&do=comments'); }
+		if(empty($list)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['com_not_selected'], 2, '?mode=admin&do=comments'); }
 
 		$list = $this->core->filter_int_array($list);
 
@@ -95,13 +91,17 @@
 
 		$list = $this->db->safesql(implode(", ", $list));
 
-		$delete1 = $this->db->query("DELETE FROM `mcr_comments` WHERE id IN ($list)");
-
-		if(!$delete1){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=comments'); }
+		if(!$this->db->remove_fast("mcr_comments", "id IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=comments'); }
 
 		$count1 = $this->db->affected_rows();
 
-		$this->core->notify($this->lng["e_success"], "Удалено элементов: комментариев - $count1", 3, '?mode=admin&do=comments');
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_del_com']." $list ".$this->lng['log_com'], $this->user->id);
+
+		$this->core->notify($this->core->lng["e_success"], $this->lng['com_del_elements']." - $count1", 3, '?mode=admin&do=comments');
 
 	}
 
@@ -109,20 +109,19 @@
 		$selected = intval($selected);
 		$query = $this->db->query("SELECT id, title FROM `mcr_news` ORDER BY title ASC");
 
-		ob_start();
-
 		if(!$query || $this->db->num_rows($query)<=0){
 
 			$data = array(
 				"ID" => 1,
-				"TITLE" => 'Без новости',
+				"TITLE" => $this->lng['com_without_news'],
 				"SELECTED" => 'selected disabled'
 			);
 
-			echo $this->core->sp(MCR_THEME_MOD."admin/comments/nid-list-id.html", $data);
-			return ob_get_clean();
+			return $this->core->sp(MCR_THEME_MOD."admin/comments/nid-list-id.html", $data);
 		}
 
+		ob_start();
+
 		while($ar = $this->db->fetch_assoc($query)){
 			$data = array(
 				"ID" => intval($ar['id']),
@@ -138,12 +137,12 @@
 
 	private function add(){
 
-		$this->core->title .= ' — Добавление';
+		if(!$this->core->is_access('sys_adm_comments_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=comments'); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Комментарии' => BASE_URL."?mode=admin&do=comments",
-			'Добавление' => BASE_URL."?mode=admin&do=comments&op=add",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['comments'] => BASE_URL."?mode=admin&do=comments",
+			$this->lng['com_add'] => BASE_URL."?mode=admin&do=comments&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -159,7 +158,7 @@
 
 			$text_bb_trim = trim($text_bb);
 
-			if(empty($text_bb_trim)){ $this->core->notify($this->lng["e_msg"], "Не заполнено поле \"Комментарий\"", 2, '?mode=admin&do=comments&op=add'); }
+			if(empty($text_bb_trim)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['com_empty'], 2, '?mode=admin&do=comments&op=add'); }
 
 			$text_bb				= $this->db->HSC($text_bb);
 
@@ -171,7 +170,7 @@
 
 			$text_html_strip		= trim(strip_tags($text_html, "<img>"));
 
-			if(empty($text_html_strip)){ $this->core->notify($this->lng["e_msg"], "Не верно заполнено поле \"Комментарий\"", 2, '?mode=admin&do=comments&op=add'); }
+			if(empty($text_html_strip)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['com_incorrect'], 2, '?mode=admin&do=comments&op=add'); }
 			// Обработка описания -
 
 			$new_data = array(
@@ -186,46 +185,50 @@
 										VALUES
 											('$nid', '$text_bb', '$text_html', '{$this->user->id}', '$new_data')");
 
-			if(!$insert){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=comments&op=add'); }
+			if(!$insert){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=comments&op=add'); }
+
+			$id = $this->db->insert_id();
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_add_com']." #$id ".$this->lng['log_com'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Комментарий успешно добавлен", 3, '?mode=admin&do=comments');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['com_add_success'], 3, '?mode=admin&do=comments');
 		}
 
 		$data = array(
-			"PAGE" => "Добавление комментария",
+			"PAGE" => $this->lng['com_add_page_name'],
 			"NEWS" => $this->news(),
 			"TEXT" => "",
 			"BB_PANEL" => $bb->bb_panel('bb-comment'),
-			"BUTTON" => "Добавить"
+			"BUTTON" => $this->lng['com_add_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/comments/com-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/comments/com-add.html", $data);
 	}
 
 	private function edit(){
 
+		if(!$this->core->is_access('sys_adm_comments_edit')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=comments'); }
+
 		$id = intval($_GET['id']);
 
 		$query = $this->db->query("SELECT nid, text_bb, `data`
 									FROM `mcr_comments`
 									WHERE id='$id'");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=comments'); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=comments'); }
 
 		$ar = $this->db->fetch_assoc($query);
 
 		$data = json_decode($ar['data']);
 
-		$this->core->title .= ' — Редактирование';
-
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Комментарии' => BASE_URL."?mode=admin&do=comments",
-			'Редактирование' => BASE_URL."?mode=admin&do=comments&op=edit&id=$id"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['comments'] => BASE_URL."?mode=admin&do=comments",
+			$this->lng['com_edit'] => BASE_URL."?mode=admin&do=comments&op=edit&id=$id"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -241,7 +244,7 @@
 
 			$text_bb_trim = trim($text_bb);
 
-			if(empty($text_bb_trim)){ $this->core->notify($this->lng["e_msg"], "Не заполнено поле \"Комментарий\"", 2, '?mode=admin&do=comments&op=add'); }
+			if(empty($text_bb_trim)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['com_empty'], 2, '?mode=admin&do=comments&op=add'); }
 
 			$text_bb				= $this->db->HSC($text_bb);
 
@@ -253,7 +256,7 @@
 
 			$text_html_strip		= trim(strip_tags($text_html, "<img>"));
 
-			if(empty($text_html_strip)){ $this->core->notify($this->lng["e_msg"], "Не верно заполнено поле \"Комментарий\"", 2, '?mode=admin&do=comments&op=add'); }
+			if(empty($text_html_strip)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['com_incorrect'], 2, '?mode=admin&do=comments&op=add'); }
 			// Обработка описания -
 
 			$new_data = array(
@@ -267,24 +270,26 @@
 										SET nid='$nid', text_bb='$text_bb', text_html='$safe_text_html', `data`='$new_data'
 										WHERE id='$id'");
 
-			if(!$update){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=comments&op=edit&id='.$id); }
+			if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=comments&op=edit&id='.$id); }
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_edit_com']." #$id ".$this->lng['log_com'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Комментарий успешно изменен", 3, '?mode=admin&do=comments');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['com_edit_success'], 3, '?mode=admin&do=comments');
 		}
 
 		$data = array(
-			"PAGE" => "Редактирование комментария",
+			"PAGE" => $this->lng['com_edit_page_name'],
 			"NEWS" => $this->news($ar['nid']),
 			"TEXT" => $this->db->HSC($ar['text_bb']),
 			"BB_PANEL" => $bb->bb_panel('bb-comment'),
-			"BUTTON" => "Сохранить"
+			"BUTTON" => $this->lng['com_edit_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/comments/com-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/comments/com-add.html", $data);
 	}
 
 	public function content(){
@@ -299,11 +304,7 @@
 			default:		$content = $this->comment_list(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/admin/groups.class.php b/upload/modules/admin/groups.class.php
index df03468..76ec588 100644
--- a/upload/modules/admin/groups.class.php
+++ b/upload/modules/admin/groups.class.php
@@ -6,17 +6,17 @@
 	private $core, $db, $config, $user, $lng;
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->config	= $core->config;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Группы пользователей';
+		if(!$this->core->is_access('sys_adm_groups')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Группы пользователей' => BASE_URL."?mode=admin&do=groups"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['groups'] => BASE_URL."?mode=admin&do=groups"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -32,12 +32,9 @@
 									ORDER BY id DESC
 									LIMIT $start, $end");
 
-		ob_start();
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/groups/group-none.html"); }
 
-		if(!$query || $this->db->num_rows($query)<=0){
-			echo $this->core->sp(MCR_THEME_MOD."admin/groups/group-none.html");
-			return ob_get_clean();
-		}
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
@@ -66,19 +63,17 @@
 			"GROUPS" => $this->group_array()
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/groups/group-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/groups/group-list.html", $data);
 	}
 
 	private function delete(){
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=groups'); }
+		if(!$this->core->is_access('sys_adm_groups_delete')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=groups'); }
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=groups'); }
 			
 		$list = @$_POST['id'];
 
-		if(empty($list)){ $this->core->notify($this->lng["e_msg"], "Не выбрано ни одного пункта", 2, '?mode=admin&do=groups'); }
+		if(empty($list)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['grp_not_selected'], 2, '?mode=admin&do=groups'); }
 
 		$list = $this->core->filter_int_array($list);
 
@@ -86,19 +81,21 @@
 
 		$list = $this->db->safesql(implode(", ", $list));
 
-		$delete = $this->db->query("DELETE FROM `mcr_groups` WHERE id IN ($list)");
-
-		if(!$delete){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=groups'); }
+		if(!$this->db->remove_fast("mcr_groups", "id IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=groups'); }
 
 		$count = $this->db->affected_rows();
 
-		$delete1 = $this->db->query("DELETE FROM `mcr_users` WHERE gid IN ($list)");
-
-		if(!$delete1){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=groups'); }
+		if(!$this->db->remove_fast("mcr_users", "gid IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=groups'); }
 
 		$count1 = $this->db->affected_rows();
 
-		$this->core->notify($this->lng["e_success"], "Удалено элементов: групп - $count, пользователей - $count1", 3, '?mode=admin&do=groups');
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_del_grp']." $list ".$this->lng['log_grp'], $this->user->id);
+
+		$this->core->notify($this->core->lng["e_success"], $this->lng['grp_del_msg1']." $count, ".$this->lng['grp_del_msg2']." $count1", 3, '?mode=admin&do=groups');
 
 	}
 
@@ -106,17 +103,17 @@
 		switch($type){
 			case 'integer':
 				$value = intval($value);
-				$input = '<input type="text" class="span8" name="'.$name.'" value="'.$value.'" id="inputDefault" placeholder="Значение по умолчанию">';
+				$input = '<input type="text" class="span8" name="'.$name.'" value="'.$value.'" id="inputDefault" placeholder="'.$this->lng['grp_def_val'].'">';
 			break;
 
 			case 'float':
 				$value = floatval($value);
-				$input = '<input type="text" class="span8" name="'.$name.'" value="'.$value.'" id="inputDefault" placeholder="Значение по умолчанию">';
+				$input = '<input type="text" class="span8" name="'.$name.'" value="'.$value.'" id="inputDefault" placeholder="'.$this->lng['grp_def_val'].'">';
 			break;
 
 			case 'string':
 				$value = $this->db->HSC($value);
-				$input = '<input type="text" class="span8" name="'.$name.'" value="'.$value.'" id="inputDefault" placeholder="Значение по умолчанию">';
+				$input = '<input type="text" class="span8" name="'.$name.'" value="'.$value.'" id="inputDefault" placeholder="'.$this->lng['grp_def_val'].'">';
 			break;
 
 			default:
@@ -141,7 +138,7 @@
 			$data["TITLE"] = $this->db->HSC($ar['title']);
 			$data["VALUE"] = $this->db->HSC($ar['value']);
 
-			$data['DEFAULT'] = $this->get_default_value($ar['value'], $json[$ar['value']], $ar['type']);
+			$data['DEFAULT'] = @$this->get_default_value($ar['value'], $json[$ar['value']], $ar['type']);
 
 			echo $this->core->sp(MCR_THEME_MOD."admin/groups/perm-id.html", $data);
 		}
@@ -164,13 +161,12 @@
 	}
 
 	private function add(){
-
-		$this->core->title .= ' — Добавление';
+		if(!$this->core->is_access('sys_adm_groups_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=groups'); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Группы пользователей' => BASE_URL."?mode=admin&do=groups",
-			'Добавление' => BASE_URL."?mode=admin&do=groups&op=add",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['groups'] => BASE_URL."?mode=admin&do=groups",
+			$this->lng['grp_add'] => BASE_URL."?mode=admin&do=groups&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -191,27 +187,32 @@
 										VALUES
 											('$title', '$text', '$new_permissions')");
 
-			if(!$insert){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=groups'); }
+			if(!$insert){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=groups'); }
+
+			$id = $this->db->insert_id();
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_add_grp']." #$id ".$this->lng['log_grp'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Группа пользователей успешно добавлена", 3, '?mode=admin&do=groups');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['grp_del_success'], 3, '?mode=admin&do=groups');
 		}
 
 		$data = array(
-			"PAGE" => "Добавление группы",
+			"PAGE" => $this->lng['grp_add_page_name'],
 			"TITLE" => '',
 			"TEXT" => '',
 			"PERMISSIONS" => $this->perm_list(),
-			"BUTTON" => "Добавить"
+			"BUTTON" => $this->lng['grp_add_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/groups/group-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/groups/group-add.html", $data);
 	}
 
 	private function edit(){
+		if(!$this->core->is_access('sys_adm_groups_edit')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=groups'); }
 
 		$id = intval($_GET['id']);
 
@@ -219,16 +220,14 @@
 									FROM `mcr_groups`
 									WHERE id='$id'");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=groups'); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=groups'); }
 
 		$ar = $this->db->fetch_assoc($query);
 
-		$this->core->title .= ' — Редактирование';
-
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Группы пользователей' => BASE_URL."?mode=admin&do=groups",
-			'Редактирование' => BASE_URL."?mode=admin&do=groups&op=edit&id=$id",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['groups'] => BASE_URL."?mode=admin&do=groups",
+			$this->lng['grp_edit'] => BASE_URL."?mode=admin&do=groups&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -248,24 +247,26 @@
 										SET title='$title', description='$text', `permissions`='$new_permissions'
 										WHERE id='$id'");
 
-			if(!$update){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=groups&op=edit&id='.$id); }
+			if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=groups&op=edit&id='.$id); }
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_edit_grp']." #$id ".$this->lng['log_grp'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Группа пользователей успешно изменена", 3, '?mode=admin&do=groups&op=edit&id='.$id);
+			$this->core->notify($this->core->lng["e_success"], $this->lng['grp_edit_success'], 3, '?mode=admin&do=groups&op=edit&id='.$id);
 		}
 
 		$data = array(
-			"PAGE"			=> "Редактирование группы",
+			"PAGE"			=> $this->lng['grp_edit_page_name'],
 			"TITLE"			=> $this->db->HSC($ar['title']),
 			"TEXT"			=> $this->db->HSC($ar['description']),
 			"PERMISSIONS"	=> $this->perm_list($ar['permissions']),
-			"BUTTON"		=> "Сохранить"
+			"BUTTON"		=> $this->lng['grp_edit_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/groups/group-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/groups/group-add.html", $data);
 	}
 
 	public function content(){
@@ -280,11 +281,7 @@
 			default:		$content = $this->group_list(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/admin/info.class.php b/upload/modules/admin/info.class.php
index f494405..fbb5843 100644
--- a/upload/modules/admin/info.class.php
+++ b/upload/modules/admin/info.class.php
@@ -10,13 +10,13 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->lng	= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Информация';
+		if(!$this->core->is_access('sys_adm_info')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Информация' => BASE_URL."?mode=admin&do=statics"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['info'] => BASE_URL."?mode=admin&do=statics"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -24,6 +24,7 @@
 
 	private function main(){
 
+		$this->core->header .= '<script src="'.LANG_URL.'js/modules/info-main.js"></script>';
 		$this->core->header .= '<script src="'.STYLE_URL.'js/admin/info-main.js"></script>';
 
 		return $this->core->sp(MCR_THEME_MOD."admin/info/main.html");
@@ -92,15 +93,11 @@
 			"USERS_STATS"			=> $this->users_stats()
 		);
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_MOD."admin/info/stats.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/info/stats.html", $data);
 	}
 
 	private function extensions(){
-
+		$this->core->header .= '<script src="'.LANG_URL.'js/modules/info-extensions.js"></script>';
 		$this->core->header .= '<script src="'.STYLE_URL.'js/admin/info-extensions.js"></script>';
 
 		return $this->core->sp(MCR_THEME_MOD."admin/info/extensions.html");
@@ -117,11 +114,7 @@
 			default:			$content = $this->main(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/admin/logs.class.php b/upload/modules/admin/logs.class.php
new file mode 100644
index 0000000..007b6a7
--- /dev/null
+++ b/upload/modules/admin/logs.class.php
@@ -0,0 +1,76 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $config, $user, $lng;
+
+	public function __construct($core){
+		$this->core = $core;
+		$this->db	= $core->db;
+		$this->config = $core->config;
+		$this->user	= $core->user;
+		$this->lng	= $core->lng_m;
+
+		if(!$this->core->is_access('sys_adm_logs')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
+
+		$bc = array(
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['logs'] => BASE_URL."?mode=admin&do=logs"
+		);
+
+		$this->core->bc = $this->core->gen_bc($bc);
+	}
+
+	private function logs_array(){
+
+		$start		= $this->core->pagination($this->config->pagin['adm_logs'], 0, 0); // Set start pagination
+		$end		= $this->config->pagin['adm_logs']; // Set end pagination
+
+		$query = $this->db->query("SELECT `l`.id, `l`.uid, `l`.`message`, `l`.`date`, `u`.login
+									FROM `mcr_logs` AS `l`
+									LEFT JOIN `mcr_users` AS `u`
+										ON `u`.id=`l`.uid
+									ORDER BY `l`.id DESC
+									LIMIT $start, $end");
+
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/logs/log-none.html"); }
+
+		ob_start();
+
+		while($ar = $this->db->fetch_assoc($query)){
+			$page_data = array(
+				"ID" => intval($ar['id']),
+				"UID" => intval($ar['uid']),
+				"MESSAGE" => $this->db->HSC($ar['message']),
+				"DATE" => date("d.m.Y в H:i:s", $ar['date']),
+				"LOGIN" => (!is_null($ar['login'])) ? $this->db->HSC($ar['login']) : 'Пользователь удален',
+			);
+		
+			echo $this->core->sp(MCR_THEME_MOD."admin/logs/log-id.html", $page_data);
+		}
+
+		return ob_get_clean();
+	}
+
+	private function logs_list(){
+
+		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_logs`");
+
+		$ar = @$this->db->fetch_array($query);
+
+		$data = array(
+			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_logs'], "?mode=admin&do=logs&pid=", $ar[0]),
+			"LOGS" => $this->logs_array()
+		);
+
+		return $this->core->sp(MCR_THEME_MOD."admin/logs/log-list.html", $data);
+	}
+
+	public function content(){
+
+		return $this->logs_list();
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/admin/menu.class.php b/upload/modules/admin/menu.class.php
index 6a42339..ce40f09 100644
--- a/upload/modules/admin/menu.class.php
+++ b/upload/modules/admin/menu.class.php
@@ -10,13 +10,13 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->lng	= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Меню сайта';
+		if(!$this->core->is_access('sys_adm_menu')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Меню сайта' => BASE_URL."?mode=admin&do=menu"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['menu'] => BASE_URL."?mode=admin&do=menu"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -34,16 +34,13 @@
 									ORDER BY `m`.id ASC
 									LIMIT $start, $end");
 
-		ob_start();
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/menu/menu-none.html"); }
 
-		if(!$query || $this->db->num_rows($query)<=0){
-			echo $this->core->sp(MCR_THEME_MOD."admin/menu/menu-none.html");
-			return ob_get_clean();
-		}
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
-			$parent = (intval($ar['parent'])===0) ? "Верхний уровень" : $this->db->HSC($ar['ptitle']);
+			$parent = (intval($ar['parent'])===0) ? $this->lng['menu_top_lvl'] : $this->db->HSC($ar['ptitle']);
 
 			$page_data = array(
 				"ID" => intval($ar['id']),
@@ -73,19 +70,17 @@
 			"MENU" => $this->menu_array()
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/menu/menu-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/menu/menu-list.html", $data);
 	}
 
 	private function delete(){
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=menu'); }
+		if(!$this->core->is_access('sys_adm_menu_delete')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu'); }
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=menu'); }
 			
 		$list = @$_POST['id'];
 
-		if(empty($list)){ $this->core->notify($this->lng["e_msg"], "Не выбрано ни одного пункта", 2, '?mode=admin&do=menu'); }
+		if(empty($list)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['menu_not_selected'], 2, '?mode=admin&do=menu'); }
 
 		$list = $this->core->filter_int_array($list);
 
@@ -93,24 +88,27 @@
 
 		$list = $this->db->safesql(implode(", ", $list));
 
-		$delete = $this->db->query("DELETE FROM `mcr_menu` WHERE id IN ($list) AND `parent` IN ($list)");
-
-		if(!$delete){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu'); }
+		if(!$this->db->remove_fast("mcr_menu", "id IN ($list) AND `parent` IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu'); }
 
 		$count = $this->db->affected_rows();
 
-		$this->core->notify($this->lng["e_success"], "Удалено элементов: пунктов меню - $count", 3, '?mode=admin&do=menu');
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_del_menu']." $list ".$this->lng['log_menu'], $this->user->id);
+
+		$this->core->notify($this->core->lng["e_success"], $this->lng['menu_del_elements']." $count", 3, '?mode=admin&do=menu');
 
 	}
 
 	private function add(){
-
-		$this->core->title .= ' — Добавление';
+		if(!$this->core->is_access('sys_adm_menu_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu'); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Меню сайта' => BASE_URL."?mode=admin&do=menu",
-			'Добавление' => BASE_URL."?mode=admin&do=menu&op=add",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['menu'] => BASE_URL."?mode=admin&do=menu",
+			$this->lng['menu_add'] => BASE_URL."?mode=admin&do=menu&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -122,36 +120,41 @@
 			$target			= (@$_POST['target']=="_blank") ? "_blank" : "_self";
 			$permissions	= $this->db->safesql(@$_POST['permissions']);
 
-			if(!$this->core->validate_perm($permissions)){ $this->core->notify($this->lng["e_msg"], "Привилегия не существует", 2, '?mode=admin&do=menu'); }
+			if(!$this->core->validate_perm($permissions)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['menu_perm_not_exist'], 2, '?mode=admin&do=menu'); }
 
 			$insert = $this->db->query("INSERT INTO `mcr_menu`
 											(title, `parent`, `url`, `target`, `permissions`)
 										VALUES
 											('$title', '$parent', '$url', '$target', '$permissions')");
 
-			if(!$insert){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu'); }
+			if(!$insert){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu'); }
+
+			$id = $this->db->insert_id();
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_add_menu']." #$id ".$this->lng['log_menu'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Пункт меню успешно добавлен", 3, '?mode=admin&do=menu');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['menu_add_success'], 3, '?mode=admin&do=menu');
 		}
 
 		$data = array(
-			"PAGE" => "Добавление меню",
+			"PAGE" => $this->lng['menu_add_page_name'],
 			"TITLE" => '',
 			"URL" => '',
 			"PERMISSIONS" => $this->core->perm_list(),
 			"PARENTS" => $this->parents(),
 			"TARGET" => '',
-			"BUTTON" => "Добавить"
+			"BUTTON" => $this->lng['menu_add_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/menu/menu-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/menu/menu-add.html", $data);
 	}
 
 	private function edit(){
+		if(!$this->core->is_access('sys_adm_menu_edit')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu'); }
 
 		$id = intval($_GET['id']);
 
@@ -159,16 +162,14 @@
 									FROM `mcr_menu`
 									WHERE id='$id'");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu'); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu'); }
 
 		$ar = $this->db->fetch_assoc($query);
 
-		$this->core->title .= ' — Редактирование';
-
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Меню сайта' => BASE_URL."?mode=admin&do=menu",
-			'Редактирование' => BASE_URL."?mode=admin&do=menu&op=edit&id=$id",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['menu'] => BASE_URL."?mode=admin&do=menu",
+			$this->lng['menu_edit'] => BASE_URL."?mode=admin&do=menu&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -180,33 +181,35 @@
 			$target			= (@$_POST['target']=="_blank") ? "_blank" : "_self";
 			$permissions	= $this->db->safesql(@$_POST['permissions']);
 
-			if(!$this->core->validate_perm($permissions)){ $this->core->notify($this->lng["e_msg"], "Привилегия не существует", 2, '?mode=admin&do=menu'); }
+			if(!$this->core->validate_perm($permissions)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['menu_perm_not_exist'], 2, '?mode=admin&do=menu'); }
 
 
 			$update = $this->db->query("UPDATE `mcr_menu`
 										SET title='$title', `parent`='$parent', `url`='$url', `target`='$target', `permissions`='$permissions'
 										WHERE id='$id'");
 
-			if(!$update){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu&op=edit&id='.$id); }
+			if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu&op=edit&id='.$id); }
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_edit_menu']." #$id ".$this->lng['log_menu'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Пункт меню успешно изменен", 3, '?mode=admin&do=menu&op=edit&id='.$id);
+			$this->core->notify($this->core->lng["e_success"], $this->lng['menu_edit_success'], 3, '?mode=admin&do=menu&op=edit&id='.$id);
 		}
 
 		$data = array(
-			"PAGE" => "Редактирование меню",
+			"PAGE" => $this->lng['menu_edit_page_name'],
 			"TITLE" => $this->db->HSC($ar['title']),
 			"URL" => $this->db->HSC($ar['url']),
 			"PERMISSIONS" => $this->core->perm_list($ar['permissions']),
 			"PARENTS" => $this->parents($ar['parent'], $id),
 			"TARGET" => ($ar['target']=='_blank') ? 'selected' : '',
-			"BUTTON" => "Сохранить"
+			"BUTTON" => $this->lng['menu_edit_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/menu/menu-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/menu/menu-add.html", $data);
 	}
 
 	private function parents($select=0, $not=false){
@@ -224,7 +227,7 @@
 
 		$selected = ($select===0) ? 'selected' : '';
 		
-		echo '<option value="0" '.$selected.'>Верхний уровень</option>';
+		echo '<option value="0" '.$selected.'>'.$this->lng['menu_top_lvl'].'</option>';
 
 		if(!$query || $this->db->num_rows($query)<=0){ return ob_get_clean(); }
 
@@ -252,11 +255,7 @@
 			default:		$content = $this->menu_list(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/admin/menu_adm.class.php b/upload/modules/admin/menu_adm.class.php
index db682c0..c6fd2e9 100644
--- a/upload/modules/admin/menu_adm.class.php
+++ b/upload/modules/admin/menu_adm.class.php
@@ -10,13 +10,13 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->lng	= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Меню ПУ';
+		if(!$this->core->is_access('sys_adm_menu_adm')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Меню ПУ' => BASE_URL."?mode=admin&do=menu_adm"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['manucp'] => BASE_URL."?mode=admin&do=menu_adm"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -34,12 +34,9 @@
 									ORDER BY `m`.`priority` ASC
 									LIMIT $start, $end");
 
-		ob_start();
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/menu_adm/menu-none.html"); }
 
-		if(!$query || $this->db->num_rows($query)<=0){
-			echo $this->core->sp(MCR_THEME_MOD."admin/menu_adm/menu-none.html");
-			return ob_get_clean();
-		}
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
@@ -62,28 +59,24 @@
 
 		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_menu_adm`");
 
-		if(!$query){ exit("SQL Error"); }
-
-		$ar = $this->db->fetch_array($query);
+		$ar = @$this->db->fetch_array($query);
 
 		$data = array(
 			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_menu_adm'], "?mode=admin&do=menu_adm&pid=", $ar[0]),
 			"MENU" => $this->menu_array()
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/menu_adm/menu-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/menu_adm/menu-list.html", $data);
 	}
 
 	private function delete(){
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=menu_adm'); }
+		if(!$this->core->is_access('sys_adm_menu_adm_delete')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu_adm'); }
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=menu_adm'); }
 			
 		$list = @$_POST['id'];
 
-		if(empty($list)){ $this->core->notify($this->lng["e_msg"], "Не выбрано ни одного пункта", 2, '?mode=admin&do=menu_adm'); }
+		if(empty($list)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['mcp_not_selected'], 2, '?mode=admin&do=menu_adm'); }
 
 		$list = $this->core->filter_int_array($list);
 
@@ -91,13 +84,17 @@
 
 		$list = $this->db->safesql(implode(", ", $list));
 
-		$delete = $this->db->query("DELETE FROM `mcr_menu_adm` WHERE id IN ($list)");
-
-		if(!$delete){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu_adm'); }
+		if(!$this->db->remove_fast("mcr_menu_adm", "id IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu_adm'); }
 
 		$count = $this->db->affected_rows();
 
-		$this->core->notify($this->lng["e_success"], "Удалено элементов: пунктов меню - $count", 3, '?mode=admin&do=menu_adm');
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_del_mcp']." $list ".$this->lng['log_mcp'], $this->user->id);
+
+		$this->core->notify($this->core->lng["e_success"], $this->lng['mcp_del_elements']." $count", 3, '?mode=admin&do=menu_adm');
 
 	}
 
@@ -166,13 +163,12 @@
 	}
 
 	private function add(){
-
-		$this->core->title .= ' — Добавление';
+		if(!$this->core->is_access('sys_adm_menu_adm_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu_adm'); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Меню ПУ' => BASE_URL."?mode=admin&do=menu_adm",
-			'Добавление' => BASE_URL."?mode=admin&do=menu_adm&op=add",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['manucp'] => BASE_URL."?mode=admin&do=menu_adm",
+			$this->lng['mcp_add'] => BASE_URL."?mode=admin&do=menu_adm&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -187,24 +183,32 @@
 			$priority		= intval(@$_POST['priority']);
 			$icon			= intval(@$_POST['icon']);
 
-			if(!$this->core->validate_perm($permissions)){ $this->core->notify($this->lng["e_msg"], "Привилегия не существует", 2, '?mode=admin&do=menu_adm'); }
+			if(!$this->core->validate_perm($permissions)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['mcp_perm_not_exist'], 2, '?mode=admin&do=menu_adm'); }
 
 			// Check exist fields in base
-			if(!$this->validate_element($gid, 'mcr_menu_adm_groups')){ $this->core->notify($this->lng["e_msg"], $this->lng["e_hack"], 2, '?mode=admin&do=menu_adm'); }
-			if(!$this->validate_element($icon, 'mcr_menu_adm_icons')){ $this->core->notify($this->lng["e_msg"], $this->lng["e_hack"], 2, '?mode=admin&do=menu_adm'); }
+			if(!$this->validate_element($gid, 'mcr_menu_adm_groups')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_hack"], 2, '?mode=admin&do=menu_adm'); }
+			if(!$this->validate_element($icon, 'mcr_menu_adm_icons')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_hack"], 2, '?mode=admin&do=menu_adm'); }
 
 			$insert = $this->db->query("INSERT INTO `mcr_menu_adm`
 											(title, gid, `text`, `url`, `target`, `access`, `priority`, icon)
 										VALUES
 											('$title', '$gid', '$text', '$url', '$target', '$permissions', '$priority', '$icon')");
 
-			if(!$insert){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu_adm'); }
+			if(!$insert){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu_adm'); }
+
+			$id = $this->db->insert_id();
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_add_mcp']." #$id ".$this->lng['log_mcp'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Пункт меню успешно добавлен", 3, '?mode=admin&do=menu_adm');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['mcp_add_success'], 3, '?mode=admin&do=menu_adm');
 		}
 
 		$data = array(
-			"PAGE" => "Добавление меню",
+			"PAGE" => $this->lng['mcp_add_page_name'],
 			"TITLE" => '',
 			"TEXT" => '',
 			"URL" => '',
@@ -213,17 +217,14 @@
 			"ICONS" => $this->icons(),
 			"TARGET" => '',
 			"PRIORITY" => 1,
-			"BUTTON" => "Добавить"
+			"BUTTON" => $this->lng['mcp_add_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/menu_adm/menu-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/menu_adm/menu-add.html", $data);
 	}
 
 	private function edit(){
+		if(!$this->core->is_access('sys_adm_menu_adm_edit')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu_adm'); }
 
 		$id = intval($_GET['id']);
 
@@ -231,16 +232,14 @@
 									FROM `mcr_menu_adm`
 									WHERE id='$id'");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu_adm'); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu_adm'); }
 
 		$ar = $this->db->fetch_assoc($query);
 
-		$this->core->title .= ' — Редактирование';
-
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Меню ПУ' => BASE_URL."?mode=admin&do=menu_adm",
-			'Редактирование' => BASE_URL."?mode=admin&do=menu_adm&op=edit&id=$id",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['manucp'] => BASE_URL."?mode=admin&do=menu_adm",
+			$this->lng['mcp_edit'] => BASE_URL."?mode=admin&do=menu_adm&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -255,24 +254,30 @@
 			$priority		= intval(@$_POST['priority']);
 			$icon			= intval(@$_POST['icon']);
 
-			if(!$this->core->validate_perm($permissions)){ $this->core->notify($this->lng["e_msg"], "Привилегия не существует", 2, '?mode=admin&do=menu_adm'); }
+			if(!$this->core->validate_perm($permissions)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['mcp_perm_not_exist'], 2, '?mode=admin&do=menu_adm'); }
 
 			// Check exist fields in base
-			if(!$this->validate_element($gid, 'mcr_menu_adm_groups')){ $this->core->notify($this->lng["e_msg"], $this->lng["e_hack"], 2, '?mode=admin&do=menu_adm'); }
-			if(!$this->validate_element($icon, 'mcr_menu_adm_icons')){ $this->core->notify($this->lng["e_msg"], $this->lng["e_hack"], 2, '?mode=admin&do=menu_adm'); }
+			if(!$this->validate_element($gid, 'mcr_menu_adm_groups')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_hack"], 2, '?mode=admin&do=menu_adm'); }
+			if(!$this->validate_element($icon, 'mcr_menu_adm_icons')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_hack"], 2, '?mode=admin&do=menu_adm'); }
 
 			$update = $this->db->query("UPDATE `mcr_menu_adm`
 										SET title='$title', gid='$gid', `text`='$text', `url`='$url', `target`='$target',
 											`access`='$permissions', `priority`='$priority', icon='$icon'
 										WHERE id='$id'");
 
-			if(!$update){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu_adm&op=edit&id='.$id); }
+			if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu_adm&op=edit&id='.$id); }
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_edit_mcp']." #$id ".$this->lng['log_mcp'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Пункт меню успешно изменен", 3, '?mode=admin&do=menu_adm&op=edit&id='.$id);
+			$this->core->notify($this->core->lng["e_success"], $this->lng['mcp_edit_success'], 3, '?mode=admin&do=menu_adm&op=edit&id='.$id);
 		}
 
 		$data = array(
-			"PAGE" => "Редактирование меню",
+			"PAGE" => $this->lng['mcp_edit_page_name'],
 			"TITLE" => $this->db->HSC($ar['title']),
 			"TEXT" => $this->db->HSC($ar['text']),
 			"URL" => $this->db->HSC($ar['url']),
@@ -281,14 +286,10 @@
 			"ICONS" => $this->icons($ar['icon']),
 			"TARGET" => ($ar['target']=='_blank') ? 'selected' : '',
 			"PRIORITY" => intval($ar['priority']),
-			"BUTTON" => "Сохранить"
+			"BUTTON" => $this->lng['mcp_edit_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/menu_adm/menu-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/menu_adm/menu-add.html", $data);
 	}
 
 	private function parents($select=0, $not=false){
@@ -306,7 +307,7 @@
 
 		$selected = ($select===0) ? 'selected' : '';
 		
-		echo '<option value="0" '.$selected.'>Верхний уровень</option>';
+		echo '<option value="0" '.$selected.'>'.$this->lng['mcp_top_lvl'].'</option>';
 
 		if(!$query || $this->db->num_rows($query)<=0){ return ob_get_clean(); }
 
@@ -334,11 +335,7 @@
 			default:		$content = $this->menu_list(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/admin/menu_groups.class.php b/upload/modules/admin/menu_groups.class.php
index e66e7f6..e8836f8 100644
--- a/upload/modules/admin/menu_groups.class.php
+++ b/upload/modules/admin/menu_groups.class.php
@@ -10,13 +10,13 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->lng	= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Группы меню ПУ';
+		if(!$this->core->is_access('sys_adm_menu_groups')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Группы меню ПУ' => BASE_URL."?mode=admin&do=menu_groups"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['menugrp'] => BASE_URL."?mode=admin&do=menu_groups"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -34,12 +34,9 @@
 									ORDER BY `g`.`priority` ASC
 									LIMIT $start, $end");
 
-		ob_start();
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/menu_groups/group-none.html"); }
 
-		if(!$query || $this->db->num_rows($query)<=0){
-			echo $this->core->sp(MCR_THEME_MOD."admin/menu_groups/group-none.html");
-			return ob_get_clean();
-		}
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
@@ -70,19 +67,17 @@
 			"GROUPS" => $this->group_array()
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/menu_groups/group-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/menu_groups/group-list.html", $data);
 	}
 
 	private function delete(){
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=menu_groups'); }
+		if(!$this->core->is_access('sys_adm_menu_groups_delete')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu_groups'); }
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=menu_groups'); }
 			
 		$list = @$_POST['id'];
 
-		if(empty($list)){ $this->core->notify($this->lng["e_msg"], "Не выбрано ни одного пункта", 2, '?mode=admin&do=menu_groups'); }
+		if(empty($list)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['mgrp_not_selected'], 2, '?mode=admin&do=menu_groups'); }
 
 		$list = $this->core->filter_int_array($list);
 
@@ -90,30 +85,31 @@
 
 		$list = $this->db->safesql(implode(", ", $list));
 
-		$delete = $this->db->query("DELETE FROM `mcr_menu_adm_groups` WHERE id IN ($list)");
-
-		if(!$delete){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu_groups'); }
+		if(!$this->db->remove_fast("mcr_menu_adm_groups", "id IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu_groups'); }
 
 		$count = $this->db->affected_rows();
 
-		$delete1 = $this->db->query("DELETE FROM `mcr_menu_adm` WHERE gid IN ($list)");
-
-		if(!$delete1){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu_groups'); }
+		if(!$this->db->remove_fast("mcr_menu_adm", "gid IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu_groups'); }
 
 		$count1 = $this->db->affected_rows();
 
-		$this->core->notify($this->lng["e_success"], "Удалено элементов: групп меню - $count, пунктов меню - $count1", 3, '?mode=admin&do=menu_groups');
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_del_mgrp']." $list ".$this->lng['log_mgrp'], $this->user->id);
+
+		$this->core->notify($this->core->lng["e_success"], $this->lng['mgrp_del_elements']." $count, ".$this->lng['mgrp_del_elements1']." $count1", 3, '?mode=admin&do=menu_groups');
 
 	}
 
 	private function add(){
-
-		$this->core->title .= ' — Добавление';
+		if(!$this->core->is_access('sys_adm_menu_groups_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu_groups'); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Группы меню ПУ' => BASE_URL."?mode=admin&do=menu_groups",
-			'Добавление' => BASE_URL."?mode=admin&do=menu_groups&op=add",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['menugrp'] => BASE_URL."?mode=admin&do=menu_groups",
+			$this->lng['mgrp_add'] => BASE_URL."?mode=admin&do=menu_groups&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -124,35 +120,40 @@
 			$permissions	= $this->db->safesql(@$_POST['permissions']);
 			$priority		= intval(@$_POST['priority']);
 
-			if(!$this->core->validate_perm($permissions)){ $this->core->notify($this->lng["e_msg"], "Привилегия не существует", 2, '?mode=admin&do=menu'); }
+			if(!$this->core->validate_perm($permissions)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['mgrp_perm_not_exist'], 2, '?mode=admin&do=menu'); }
 
 			$insert = $this->db->query("INSERT INTO `mcr_menu_adm_groups`
 											(title, `text`, `access`, `priority`)
 										VALUES
 											('$title', '$text', '$permissions', '$priority')");
 
-			if(!$insert){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu_groups'); }
+			if(!$insert){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu_groups'); }
+
+			$id = $this->db->insert_id();
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_add_mgrp']." #$id ".$this->lng['log_mgrp'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Группа меню успешно добавлена", 3, '?mode=admin&do=menu_groups');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['mgrp_add_success'], 3, '?mode=admin&do=menu_groups');
 		}
 
 		$data = array(
-			"PAGE" => "Добавление меню",
+			"PAGE" => $this->lng['mgrp_add_page_name'],
 			"TITLE" => '',
 			"TEXT" => '',
 			"PERMISSIONS" => $this->core->perm_list(),
 			"PRIORITY" => 1,
-			"BUTTON" => "Добавить"
+			"BUTTON" => $this->lng['mgrp_add_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/menu_groups/group-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/menu_groups/group-add.html", $data);
 	}
 
 	private function edit(){
+		if(!$this->core->is_access('sys_adm_menu_groups_edit')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu_groups'); }
 
 		$id = intval($_GET['id']);
 
@@ -160,16 +161,14 @@
 									FROM `mcr_menu_adm_groups`
 									WHERE id='$id'");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu_groups'); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu_groups'); }
 
 		$ar = $this->db->fetch_assoc($query);
 
-		$this->core->title .= ' — Редактирование';
-
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Группы меню ПУ' => BASE_URL."?mode=admin&do=menu_groups",
-			'Редактирование' => BASE_URL."?mode=admin&do=menu_groups&op=edit&id=$id",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['menugrp'] => BASE_URL."?mode=admin&do=menu_groups",
+			$this->lng['mgrp_edit'] => BASE_URL."?mode=admin&do=menu_groups&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -180,31 +179,33 @@
 			$permissions	= $this->db->safesql(@$_POST['permissions']);
 			$priority		= intval(@$_POST['priority']);
 
-			if(!$this->core->validate_perm($permissions)){ $this->core->notify($this->lng["e_msg"], "Привилегия не существует", 2, '?mode=admin&do=menu'); }
+			if(!$this->core->validate_perm($permissions)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['mgrp_perm_not_exist'], 2, '?mode=admin&do=menu'); }
 
 			$update = $this->db->query("UPDATE `mcr_menu_adm_groups`
 										SET title='$title', `text`='$text', `access`='$permissions', `priority`='$priority'
 										WHERE id='$id'");
 
-			if(!$update){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu_groups&op=edit&id='.$id); }
+			if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu_groups&op=edit&id='.$id); }
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_edit_mgrp']." #$id ".$this->lng['log_mgrp'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Группа меню успешно изменена", 3, '?mode=admin&do=menu_groups&op=edit&id='.$id);
+			$this->core->notify($this->core->lng["e_success"], $this->lng['mgrp_edit_success'], 3, '?mode=admin&do=menu_groups&op=edit&id='.$id);
 		}
 
 		$data = array(
-			"PAGE"			=> "Редактирование группы",
+			"PAGE"			=> $this->lng['mgrp_edit_page_name'],
 			"TITLE"			=> $this->db->HSC($ar['title']),
 			"TEXT"			=> $this->db->HSC($ar['text']),
 			"PERMISSIONS"	=> $this->core->perm_list($ar['access']),
 			"PRIORITY"		=> intval($ar['priority']),
-			"BUTTON"		=> "Сохранить"
+			"BUTTON"		=> $this->lng['mgrp_edit_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/menu_groups/group-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/menu_groups/group-add.html", $data);
 	}
 
 	public function content(){
@@ -219,11 +220,7 @@
 			default:		$content = $this->group_list(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/admin/menu_icons.class.php b/upload/modules/admin/menu_icons.class.php
index 198707e..f4c29fe 100644
--- a/upload/modules/admin/menu_icons.class.php
+++ b/upload/modules/admin/menu_icons.class.php
@@ -10,13 +10,13 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->lng	= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Иконки меню ПУ';
+		if(!$this->core->is_access('sys_adm_menu_icons')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Иконки меню ПУ' => BASE_URL."?mode=admin&do=menu_icons"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['menuicons'] => BASE_URL."?mode=admin&do=menu_icons"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -32,12 +32,9 @@
 									ORDER BY id DESC
 									LIMIT $start, $end");
 
-		ob_start();
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/menu_icons/icon-none.html"); }
 
-		if(!$query || $this->db->num_rows($query)<=0){
-			echo $this->core->sp(MCR_THEME_MOD."admin/menu_icons/icon-none.html");
-			return ob_get_clean();
-		}
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
@@ -66,19 +63,17 @@
 			"ICONS" => $this->icon_array()
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/menu_icons/icon-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/menu_icons/icon-list.html", $data);
 	}
 
 	private function delete(){
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=menu_icons'); }
+		if(!$this->core->is_access('sys_adm_menu_icons_delete')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu_icons'); }
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=menu_icons'); }
 			
 		$list = @$_POST['id'];
 
-		if(empty($list)){ $this->core->notify($this->lng["e_msg"], "Не выбрано ни одного пункта", 2, '?mode=admin&do=menu_icons'); }
+		if(empty($list)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['mi_not_selected'], 2, '?mode=admin&do=menu_icons'); }
 
 		$list = $this->core->filter_int_array($list);
 
@@ -86,24 +81,27 @@
 
 		$list = $this->db->safesql(implode(", ", $list));
 
-		$delete = $this->db->query("DELETE FROM `mcr_menu_adm_icons` WHERE id IN ($list)");
-
-		if(!$delete){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu_icons'); }
+		if(!$this->db->remove_fast("mcr_menu_adm_icons", "id IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu_icons'); }
 
 		$count = $this->db->affected_rows();
 
-		$this->core->notify($this->lng["e_success"], "Удалено элементов: иконок - $count", 3, '?mode=admin&do=menu_icons');
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_del_mi']." $list ".$this->lng['log_mi'], $this->user->id);
+
+		$this->core->notify($this->core->lng["e_success"], $this->lng['mi_del_elements']." $count", 3, '?mode=admin&do=menu_icons');
 
 	}
 
 	private function add(){
-
-		$this->core->title .= ' — Добавление';
+		if(!$this->core->is_access('sys_adm_menu_icons_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu_icons'); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Иконки меню ПУ' => BASE_URL."?mode=admin&do=menu_icons",
-			'Добавление' => BASE_URL."?mode=admin&do=menu_icons&op=add",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['menuicons'] => BASE_URL."?mode=admin&do=menu_icons",
+			$this->lng['mi_add'] => BASE_URL."?mode=admin&do=menu_icons&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -118,26 +116,31 @@
 										VALUES
 											('$title', '$img')");
 
-			if(!$insert){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu_icons'); }
+			if(!$insert){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu_icons'); }
+
+			$id = $this->db->insert_id();
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['mi_add_page_name']." #$id ".$this->lng['log_mi'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Иконка меню успешно добавлена", 3, '?mode=admin&do=menu_icons');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['mi_add_success'], 3, '?mode=admin&do=menu_icons');
 		}
 
 		$data = array(
-			"PAGE" => "Добавление иконки",
+			"PAGE" => $this->lng['mi_add_page_name'],
 			"TITLE" => '',
 			"IMG" => 'default.png',
-			"BUTTON" => "Добавить"
+			"BUTTON" => $this->lng['mi_add_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/menu_icons/icon-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/menu_icons/icon-add.html", $data);
 	}
 
 	private function edit(){
+		if(!$this->core->is_access('sys_adm_menu_icons_edit')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=menu_icons'); }
 
 		$id = intval($_GET['id']);
 
@@ -145,16 +148,14 @@
 									FROM `mcr_menu_adm_icons`
 									WHERE id='$id'");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu_icons'); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu_icons'); }
 
 		$ar = $this->db->fetch_assoc($query);
 
-		$this->core->title .= ' — Редактирование';
-
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Иконки меню ПУ' => BASE_URL."?mode=admin&do=menu_icons",
-			'Редактирование' => BASE_URL."?mode=admin&do=menu_icons&op=edit&id=$id",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['menuicons'] => BASE_URL."?mode=admin&do=menu_icons",
+			$this->lng['mi_edit'] => BASE_URL."?mode=admin&do=menu_icons&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -168,23 +169,25 @@
 										SET title='$title', img='$img'
 										WHERE id='$id'");
 
-			if(!$update){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=menu_icons&op=edit&id='.$id); }
+			if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=menu_icons&op=edit&id='.$id); }
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_edit_mi']." #$id ".$this->lng['log_mi'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Иконка меню успешно изменена", 3, '?mode=admin&do=menu_icons&op=edit&id='.$id);
+			$this->core->notify($this->core->lng["e_success"], $this->lng['mi_edit_success'], 3, '?mode=admin&do=menu_icons&op=edit&id='.$id);
 		}
 
 		$data = array(
-			"PAGE"			=> "Редактирование иконки",
+			"PAGE"			=> $this->lng['mi_edit_page_name'],
 			"TITLE"			=> $this->db->HSC($ar['title']),
 			"IMG"			=> $this->db->HSC($ar['img']),
-			"BUTTON"		=> "Сохранить"
+			"BUTTON"		=> $this->lng['mi_edit_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/menu_icons/icon-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/menu_icons/icon-add.html", $data);
 	}
 
 	public function content(){
@@ -199,11 +202,7 @@
 			default:		$content = $this->icon_list(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/admin/modules.class.php b/upload/modules/admin/modules.class.php
new file mode 100644
index 0000000..245346f
--- /dev/null
+++ b/upload/modules/admin/modules.class.php
@@ -0,0 +1,167 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $config, $user, $lng;
+
+	public function __construct($core){
+		$this->core = $core;
+		$this->db	= $core->db;
+		$this->config = $core->config;
+		$this->user	= $core->user;
+		$this->lng	= $core->lng_m;
+
+		if(!$this->core->is_access('sys_adm_modules')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
+
+		$bc = array(
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['modules'] => BASE_URL."?mode=admin&do=modules"
+		);
+
+		$this->core->bc = $this->core->gen_bc($bc);
+
+		$this->core->header .= '<script src="'.LANG_URL.'js/modules/modules.js"></script>';
+		$this->core->header .= '<script src="'.STYLE_URL.'js/modules/admin/modules.js"></script>';
+	}
+
+	private function module_array(){
+
+		$list = $this->filter_folder(scandir(MCR_MODE_PATH));
+
+		if(!is_array($list) || count($list)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/modules/module-none.html"); }
+
+		ob_start();
+
+		foreach($list as $id => $name){
+
+			include(MCR_CONF_PATH.'modules/'.$name.'.php');
+
+			$page_data = array(
+				"STATUS"	=> (@$cfg['MOD_ENABLE']) ? 'icon_status_on' : 'icon_status_off',
+				"NAME"		=> $this->db->HSC($name),
+				"TITLE"		=> $this->db->HSC(@$cfg['MOD_TITLE']),
+				"AUTHOR"	=> $this->db->HSC(@$cfg['MOD_AUTHOR']),
+				"VERSION"	=> $this->db->HSC(@$cfg['MOD_VERSION']),
+			);
+		
+			echo $this->core->sp(MCR_THEME_MOD."admin/modules/module-id.html", $page_data);
+		}
+
+		return ob_get_clean();
+	}
+
+	private function filter_folder($array){
+
+		$filtered = array();
+
+		foreach($array as $key => $value){
+			if($value=='..' || $value=='.'){ continue; }
+			if(is_dir(MCR_MODE_PATH.$value)){ continue; }
+			if(!file_exists(MCR_CONF_PATH.'modules/'.$value)){ continue; }
+
+			$expl = explode('.', $value);
+
+			if(count($expl)!=2 || !isset($expl[1]) || $expl[1]!='php'){ continue; }
+
+			$filtered[] = $expl[0];
+		}
+
+		return $filtered;
+	}
+
+	private function module_list(){
+
+		$data = array(
+			"MODULES" => $this->module_array()
+		);
+
+		return $this->core->sp(MCR_THEME_MOD."admin/modules/module-list.html", $data);
+	}
+
+	private function check_update($cfg){
+		if(empty($cfg['MOD_URL_UPDATE'])){ return $this->lng['mod_not_check']; }
+
+		$json = file_get_contents($url);
+
+		if(!$json){ return $this->lng['mod_not_check']; }
+
+		if(!isset($json['version'])){ return $this->lng['mod_not_check']; }
+		if(!isset($json['url'])){ return $this->lng['mod_not_check']; }
+
+		if($cfg['MOD_VERSION']==$json['version']){ return $this->lng['mod_last_version']; }
+
+		return '(<a href="'.$this->db->HSC($json['url']).'" target="_blank" title="'.$this->lng['mod_download'].'">'.$this->lng['mod_new_version'].' '.$this->db->HSC($json['version']).'</a>)';
+	}
+
+	private function edit(){
+		if(!$this->core->is_access('sys_adm_modules_edit')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=modules'); }
+
+		$name = @$_GET['id'];
+
+		if(!file_exists(MCR_CONF_PATH.'modules/'.$name.'.php')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['mod_cfg_not_found'], 2, '?mode=admin&do=modules'); }
+
+		require(MCR_CONF_PATH.'modules/'.$name.'.php');
+
+		if(!$this->core->check_cfg($cfg)){
+			$this->core->notify($this->core->lng["e_msg"], $this->lng['mod_cfg_incorrect'], 2, '?mode=admin&do=modules');
+		}
+
+		$bc = array(
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['modules'] => BASE_URL."?mode=admin&do=modules",
+			$this->lng['mod_edit'] => BASE_URL."?mode=admin&do=modules&op=edit&id=$name"
+		);
+
+		$this->core->bc = $this->core->gen_bc($bc);
+
+		if($_SERVER['REQUEST_METHOD']=='POST'){
+			$cfg['MOD_ENABLE'] = (intval(@$_POST['status'])==1) ? true : false;
+			$cfg['MOD_CHECK_UPDATE'] = (intval(@$_POST['updates'])==1) ? true : false;
+			$cfg['MOD_URL_UPDATE'] = $this->core->safestr(@$_POST['update_url']);
+
+			if(!$this->config->savecfg($cfg, 'modules/'.$name.'.php', 'cfg')){
+				$this->core->notify($this->core->lng["e_msg"], $this->lng['mod_cfg_unsave'], 3, '?mode=admin&do=modules');
+			}
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_edit_mod']." #$name ".$this->lng['log_mod'], $this->user->id);
+			
+			$this->core->notify($this->core->lng["e_success"], $this->lng['mod_edit_success'], 3, '?mode=admin&do=modules');
+		}
+
+		$update_result = $this->check_update($cfg);
+
+		$data = array(
+			"PAGE"			=> $this->lng['mod_edit_page_name'],
+			"STATUS"		=> ($cfg['MOD_ENABLE']) ? 'selected' : '',
+			"TITLE"			=> $this->db->HSC($cfg['MOD_TITLE']),
+			"DESC"			=> $this->db->HSC($cfg['MOD_DESC']),
+			"AUTHOR"		=> $this->db->HSC($cfg['MOD_AUTHOR']),
+			"SITE"			=> $this->db->HSC($cfg['MOD_SITE']),
+			"EMAIL"			=> $this->db->HSC($cfg['MOD_EMAIL']),
+			"VERSION"		=> $this->db->HSC($cfg['MOD_VERSION']),
+			"UPDATE_URL"	=> $this->db->HSC($cfg['MOD_URL_UPDATE']),
+			"UPDATE_CHECK"	=> ($cfg['MOD_CHECK_UPDATE']) ? 'selected' : '',
+			"UPDATE_RESULT"	=> $update_result,
+			"BUTTON"		=> $this->lng['mod_edit_btn']
+		);
+
+		return $this->core->sp(MCR_THEME_MOD."admin/modules/module-add.html", $data);
+	}
+
+	public function content(){
+
+		$op = (isset($_GET['op'])) ? $_GET['op'] : 'list';
+
+		switch($op){
+			case 'edit':	$content = $this->edit(); break;
+
+			default:		$content = $this->module_list(); break;
+		}
+
+		return $content;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/admin/monitoring.class.php b/upload/modules/admin/monitoring.class.php
index fb76023..aabec0e 100644
--- a/upload/modules/admin/monitoring.class.php
+++ b/upload/modules/admin/monitoring.class.php
@@ -10,13 +10,13 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->lng	= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Мониторинг серверов';
+		if(!$this->core->is_access('sys_adm_monitoring')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Мониторинг серверов' => BASE_URL."?mode=admin&do=monitoring"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['monitoring'] => BASE_URL."?mode=admin&do=monitoring"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -32,12 +32,9 @@
 									ORDER BY id DESC
 									LIMIT $start, $end");
 
-		ob_start();
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/monitoring/monitor-none.html"); }
 
-		if(!$query || $this->db->num_rows($query)<=0){
-			echo $this->core->sp(MCR_THEME_MOD."admin/monitoring/monitor-none.html");
-			return ob_get_clean();
-		}
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
@@ -67,19 +64,17 @@
 			"SERVERS" => $this->monitor_array()
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/monitoring/monitor-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/monitoring/monitor-list.html", $data);
 	}
 
 	private function delete(){
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=monitoring'); }
+		if(!$this->core->is_access('sys_adm_monitoring_delete')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=monitoring'); }
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=monitoring'); }
 			
 		$list = @$_POST['id'];
 
-		if(empty($list)){ $this->core->notify($this->lng["e_msg"], "Не выбрано ни одного пункта", 2, '?mode=admin&do=monitoring'); }
+		if(empty($list)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['mon_not_selected'], 2, '?mode=admin&do=monitoring'); }
 
 		$list = $this->core->filter_int_array($list);
 
@@ -87,110 +82,152 @@
 
 		$list = $this->db->safesql(implode(", ", $list));
 
-		$delete = $this->db->query("DELETE FROM `mcr_monitoring` WHERE id IN ($list)");
-
-		if(!$delete){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=monitoring'); }
+		if(!$this->db->remove_fast("mcr_monitoring", "id IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=monitoring'); }
 
 		$count = $this->db->affected_rows();
 
-		$this->core->notify($this->lng["e_success"], "Удалено элементов: серверов - $count", 3, '?mode=admin&do=monitoring');
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_del_mon']." $list ".$this->lng['log_mon'], $this->user->id);
+
+		$this->core->notify($this->core->lng["e_success"], $this->lng['mon_del_elements']." $count", 3, '?mode=admin&do=monitoring');
 
 	}
 
 	private function add(){
-
-		$this->core->title .= ' — Добавление';
+		if(!$this->core->is_access('sys_adm_monitoring_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=monitoring'); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Мониторинг серверов' => BASE_URL."?mode=admin&do=monitoring",
-			'Добавление' => BASE_URL."?mode=admin&do=monitoring&op=add",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['monitoring'] => BASE_URL."?mode=admin&do=monitoring",
+			$this->lng['mon_add'] => BASE_URL."?mode=admin&do=monitoring&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
 
 		if($_SERVER['REQUEST_METHOD']=='POST'){
-			$title = $this->db->safesql(@$_POST['title']);
-			$text = $this->db->safesql(@$_POST['text']);
-			$ip = $this->db->safesql(@$_POST['ip']);
-			$port = intval(@$_POST['port']);
+			$title		= $this->db->safesql(@$_POST['title']);
+			$text		= $this->db->safesql(@$_POST['text']);
+			$ip			= $this->db->safesql(@$_POST['ip']);
+			$port		= intval(@$_POST['port']);
+			$updater	= intval(@$_POST['cache']);
+			$type		= $this->db->safesql(@$_POST['type']);
+
+			if(!file_exists(MCR_MON_PATH.$type.'.php')){ $type = 'MineToolsAPIPing'; }
 
 			$insert = $this->db->query("INSERT INTO `mcr_monitoring`
-											(title, `text`, ip, `port`)
+											(title, `text`, ip, `port`, `type`, updater)
 										VALUES
-											('$title', '$text', '$ip', '$port')");
-			if(!$insert){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=monitoring'); }
+											('$title', '$text', '$ip', '$port', '$type', '$updater')");
+			if(!$insert){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=monitoring'); }
+
+			$id = $this->db->insert_id();
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_add_mon']." #$id ".$this->lng['log_mon'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Сервер успешно добавлен", 3, '?mode=admin&do=monitoring');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['mon_add_success'], 3, '?mode=admin&do=monitoring');
 		}
 
 		$data = array(
-			"PAGE" => "Добавление сервера",
-			"TITLE" => "",
-			"TEXT" => "",
-			"IP" => "localhost",
-			"PORT" => "25565",
-			"BUTTON" => "Добавить"
+			"PAGE"		=> $this->lng['mon_add_page_name'],
+			"TITLE"		=> "",
+			"TEXT"		=> "",
+			"IP"		=> "localhost",
+			"PORT"		=> "25565",
+			"TYPES"		=> $this->types(),
+			"CACHE"		=> intval($ar['updater']),
+			"ERROR"		=> "",
+			"BUTTON"	=> $this->lng['mon_add_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/monitoring/monitor-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/monitoring/monitor-add.html", $data);
 	}
 
 	private function edit(){
+		if(!$this->core->is_access('sys_adm_monitoring_edit')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=monitoring'); }
 
 		$id = intval($_GET['id']);
 
-		$query = $this->db->query("SELECT title, `text`, ip, `port`
+		$query = $this->db->query("SELECT title, `text`, ip, `port`, last_error, updater, last_error, `type`
 									FROM `mcr_monitoring`
 									WHERE id='$id'");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=monitoring'); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=monitoring'); }
 
 		$ar = $this->db->fetch_assoc($query);
 
-		$this->core->title .= ' — Редактирование';
-
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Мониторинг серверов' => BASE_URL."?mode=admin&do=monitoring",
-			'Редактирование' => BASE_URL."?mode=admin&do=monitoring&op=edit&id=$id",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['monitoring'] => BASE_URL."?mode=admin&do=monitoring",
+			$this->lng['mon_edit'] => BASE_URL."?mode=admin&do=monitoring&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
 
 		if($_SERVER['REQUEST_METHOD']=='POST'){
-			$title = $this->db->safesql(@$_POST['title']);
-			$text = $this->db->safesql(@$_POST['text']);
-			$ip = $this->db->safesql(@$_POST['ip']);
-			$port = intval(@$_POST['port']);
+			$title		= $this->db->safesql(@$_POST['title']);
+			$text		= $this->db->safesql(@$_POST['text']);
+			$ip			= $this->db->safesql(@$_POST['ip']);
+			$port		= intval(@$_POST['port']);
+			$updater	= intval(@$_POST['cache']);
+			$type		= $this->db->safesql(@$_POST['type']);
+
+			if(!file_exists(MCR_MON_PATH.$type.'.php')){ $type = 'MineToolsAPIPing'; }
 
 
 			$update = $this->db->query("UPDATE `mcr_monitoring`
-										SET title='$title', `text`='$text', ip='$ip', `port`='$port'
+										SET title='$title', `text`='$text', ip='$ip', `port`='$port', `type`='$type', updater='$updater'
 										WHERE id='$id'");
 
-			if(!$update){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=monitoring&op=edit&id='.$id); }
+			if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=monitoring&op=edit&id='.$id); }
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_edit_mon']." #$id ".$this->lng['log_mon'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Сервер успешно изменен", 3, '?mode=admin&do=monitoring&op=edit&id='.$id);
+			$this->core->notify($this->core->lng["e_success"], $this->lng['mon_edit_success'], 3, '?mode=admin&do=monitoring&op=edit&id='.$id);
 		}
 
 		$data = array(
-			"PAGE" => "Редактирование сервера",
-			"TITLE" => $this->db->HSC($ar['title']),
-			"TEXT" => $this->db->HSC($ar['text']),
-			"IP" => $this->db->HSC($ar['ip']),
-			"PORT" => intval($ar['port']),
-			"BUTTON" => "Сохранить"
+			"PAGE"		=> $this->lng['mon_edit_page_name'],
+			"TITLE"		=> $this->db->HSC($ar['title']),
+			"TEXT"		=> $this->db->HSC($ar['text']),
+			"IP"		=> $this->db->HSC($ar['ip']),
+			"PORT"		=> intval($ar['port']),
+			"CACHE"		=> intval($ar['updater']),
+			"TYPES"		=> $this->types($ar['type']),
+			"ERROR"		=> $this->db->HSC($ar['last_error']),
+			"BUTTON"	=> $this->lng['mon_edit_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/monitoring/monitor-add.html", $data);
+		return $this->core->sp(MCR_THEME_MOD."admin/monitoring/monitor-add.html", $data);
+	}
 
+	private function types($selected=''){
+		$list = scandir(MCR_MON_PATH);
+
+		if(empty($list)){ return false; }
+
+		ob_start();
+
+		foreach($list as $key => $file){
+			$name = substr($file, 0, -4);
+
+			if($file=='.' || $file=='..' || substr($file, -4)!='.php'){ continue; }
+
+			$select = ($selected==$name) ? 'selected' : '';
+
+			echo '<option value="'.$name.'" '.$select.'>'.$name.'</option>';
+		}
+		
 		return ob_get_clean();
 	}
 
@@ -206,11 +243,7 @@
 			default:		$content = $this->monitor_list(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/admin/news.class.php b/upload/modules/admin/news.class.php
index c9f3dd9..2339260 100644
--- a/upload/modules/admin/news.class.php
+++ b/upload/modules/admin/news.class.php
@@ -10,13 +10,13 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->lng	= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Новости';
+		if(!$this->core->is_access('sys_adm_news')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Новости' => BASE_URL."?mode=admin&do=news"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['news'] => BASE_URL."?mode=admin&do=news"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -34,12 +34,11 @@
 									ORDER BY `n`.id DESC
 									LIMIT $start, $end");
 
-		ob_start();
+		
 
-		if(!$query || $this->db->num_rows($query)<=0){
-			echo $this->core->sp(MCR_THEME_MOD."admin/news/new-none.html");
-			return ob_get_clean();
-		}
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/news/new-none.html"); }
+
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
@@ -60,28 +59,24 @@
 
 		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_news`");
 
-		if(!$query){ exit("SQL Error"); }
-
-		$ar = $this->db->fetch_array($query);
+		$ar = @$this->db->fetch_array($query);
 
 		$data = array(
 			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_news'], "?mode=admin&do=news&pid=", $ar[0]),
 			"NEWS" => $this->news_array()
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/news/new-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/news/new-list.html", $data);
 	}
 
 	private function delete(){
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=news'); }
+		if(!$this->core->is_access('sys_adm_news_delete')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=news'); }
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=news'); }
 			
 		$list = @$_POST['id'];
 
-		if(empty($list)){ $this->core->notify($this->lng["e_msg"], "Не выбрано ни одного пункта", 2, '?mode=admin&do=news'); }
+		if(empty($list)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['news_not_selected'], 2, '?mode=admin&do=news'); }
 
 		$list = $this->core->filter_int_array($list);
 
@@ -89,25 +84,25 @@
 
 		$list = $this->db->safesql(implode(", ", $list));
 
-		$delete1 = $this->db->query("DELETE FROM `mcr_news` WHERE id IN ($list)");
-
-		if(!$delete1){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=news'); }
+		if(!$this->db->remove_fast("mcr_news", "id IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news'); }
 
 		$count1 = $this->db->affected_rows();
 
-		$delete2 = $this->db->query("DELETE FROM `mcr_news_views` WHERE nid IN ($list)");
-
-		if(!$delete2){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=news'); }
+		if(!$this->db->remove_fast("mcr_news_views", "nid IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news'); }
 
 		$count2 = $this->db->affected_rows();
 
-		$delete3 = $this->db->query("DELETE FROM `mcr_news_votes` WHERE nid IN ($list)");
-
-		if(!$delete3){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=news'); }
+		if(!$this->db->remove_fast("mcr_news_votes", "nid IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news'); }
 
 		$count3 = $this->db->affected_rows();
 
-		$this->core->notify($this->lng["e_success"], "Удалено элементов: новостей - $count1, просмотров - $count2, голосов - $count3", 3, '?mode=admin&do=news');
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_del_news']." $list ".$this->lng['log_news'], $this->user->id);
+
+		$this->core->notify($this->core->lng["e_success"], $this->lng['news_del_elements']." $count1, ".$this->lng['news_del_elements2']." $count2, ".$this->lng['news_del_elements3']." $count3", 3, '?mode=admin&do=news');
 
 	}
 
@@ -115,25 +110,24 @@
 		$selected = intval($selected);
 		$query = $this->db->query("SELECT id, title FROM `mcr_news_cats` ORDER BY title ASC");
 
-		ob_start();
-
 		if(!$query || $this->db->num_rows($query)<=0){
 
 			$data = array(
 				"ID" => 1,
-				"TITLE" => 'Без категории',
-				"SELECTED" => 'selected disabled'
+				"TITLE" => $this->lng['news_wo_cats'],
+				"SELECTED" => 'selected disabled',
 			);
 
-			echo $this->core->sp(MCR_THEME_MOD."admin/news/cid-list-id.html", $data);
-			return ob_get_clean();
+			return $this->core->sp(MCR_THEME_MOD."admin/news/cid-list-id.html", $data);
 		}
 
+		ob_start();
+
 		while($ar = $this->db->fetch_assoc($query)){
 			$data = array(
 				"ID" => intval($ar['id']),
 				"TITLE" => $this->db->HSC($ar['title']),
-				"SELECTED" => ($selected==intval($ar['id'])) ? 'selected' : ''
+				"SELECTED" => ($selected==intval($ar['id'])) ? 'selected' : '',
 			);
 
 			echo $this->core->sp(MCR_THEME_MOD."admin/news/cid-list-id.html", $data);
@@ -142,24 +136,47 @@
 		return ob_get_clean();
 	}
 
-	private function add(){
+	private function get_preview($title='', $text='', $category='', $cid=0, $vote=0){
+		$data = array(
+			"TITLE" => $this->db->HSC($title),
+			"TEXT" => $text,
+			"CATEGORY" => $this->db->HSC($category),
+			"CID" => intval($cid),
+			"LIKES" => ($vote!==1) ? '' : $this->core->sp(MCR_THEME_MOD."admin/news/new-preview-likes.html", $data),
+		);
 
-		$this->core->title .= ' — Добавление';
+		return $this->core->sp(MCR_THEME_MOD."admin/news/new-preview.html", $data);
+	}
+
+	private function add(){
+		if(!$this->core->is_access('sys_adm_news_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=news'); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Новости' => BASE_URL."?mode=admin&do=news",
-			'Добавление' => BASE_URL."?mode=admin&do=news&op=add",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['news'] => BASE_URL."?mode=admin&do=news",
+			$this->lng['news_add'] => BASE_URL."?mode=admin&do=news&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
 
 		$bb = $this->core->load_bb_class(); // Загрузка класса BB-кодов
 
+		$categories		= $this->categories();
+		$title			= '';
+		$text			= '';
+		$text_short		= '';
+		$votes			= '';
+		$discuses		= '';
+		$attached		= '';
+		$preview		= '';
+
 		if($_SERVER['REQUEST_METHOD']=='POST'){
 			$title = $this->db->safesql(@$_POST['title']);
 
 			$cid = intval(@$_POST['cid']);
+			
+			$check_cid = $this->db->query("SELECT title FROM `mcr_news_cats` WHERE id='$cid'");
+			if(!$check_cid || $this->db->num_rows($check_cid)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->lng['news_e_cat_not_exist'], 2, '?mode=admin&do=news&op=edit&id='.$id); }
 
 			$vote	= (intval(@$_POST['vote'])===1) ? 1 : 0;
 			$discus	= (intval(@$_POST['discus'])===1) ? 1 : 0;
@@ -172,88 +189,109 @@
 			$text_bb_trim = trim($text_bb);
 			$text_bb_short_trim = trim($text_bb_short);
 
-			if(empty($text_bb_trim)){ $this->core->notify($this->lng["e_msg"], "Не заполнено поле \"Полное описание\"", 2, '?mode=admin&do=news&op=add'); }
-			if(empty($text_bb_short_trim)){ $this->core->notify($this->lng["e_msg"], "Не заполнено поле \"Краткое описание\"", 2, '?mode=admin&do=news&op=add'); }
+			if(empty($text_bb_trim)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['news_e_desc'], 2, '?mode=admin&do=news&op=add'); }
+			if(empty($text_bb_short_trim)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['news_e_sdesc'], 2, '?mode=admin&do=news&op=add'); }
 
-			$text_bb				= $this->db->HSC($text_bb);
-			$text_bb_short			= $this->db->HSC($text_bb_short);
-
-			$text_html				= $bb->decode($text_bb);
-			$text_html_short		= $bb->decode($text_bb_short);
+			$text_html				= $bb->parse($text_bb);
+			$text_html_short		= $bb->parse($text_bb_short);
 
 			$safe_text_html			= $this->db->safesql($text_html);
 			$safe_text_html_short	= $this->db->safesql($text_html_short);
 
-			$text_bb				= $this->db->safesql($text_bb);
-			$text_bb_short			= $this->db->safesql($text_bb_short);
+			$safe_text_bb			= $this->db->safesql($text_bb);
+			$safe_text_bb_short		= $this->db->safesql($text_bb_short);
 
 			$text_html_strip		= trim(strip_tags($text_html, "<img>"));
 			$text_html_short_strip	= trim(strip_tags($text_html_short, "<img>"));
 
-			if(empty($text_html_strip)){ $this->core->notify($this->lng["e_msg"], "Не верно заполнено поле \"Полное описание\"", 2, '?mode=admin&do=news&op=add'); }
-			if(empty($text_html_short_strip)){ $this->core->notify($this->lng["e_msg"], "Не верно заполнено поле \"Краткое описание\"", 2, '?mode=admin&do=news&op=add'); }
+			if(empty($text_html_strip)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['news_e_desc'], 2, '?mode=admin&do=news&op=add'); }
+			if(empty($text_html_short_strip)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['news_e_sdesc'], 2, '?mode=admin&do=news&op=add'); }
 			// Обработка описания -
 
-			$new_data = array(
-				"time_create" => time(),
-				"time_last" => time(),
-				"uid_create" => $this->user->id,
-				"uid_last" => $this->user->id
-			);
+			if(isset($_POST['preview'])){
+				$cid_ar			= $this->db->fetch_assoc($check_cid);
+				$preview		= $this->get_preview($title, $text_html, $cid_ar['title'], $cid, $vote);
+				$text			= $text_bb;
+				$text_short		= $text_bb_short;
+				$categories		= $this->categories($cid);
+				$votes			= ($vote===1) ? 'checked' : '';
+				$discuses		= ($discus===1) ? 'checked' : '';
+				$attached		= ($attach===1) ? 'checked' : '';
+			}else{
+				$new_data = array(
+					"time_create" => time(),
+					"time_last" => time(),
+					"uid_create" => $this->user->id,
+					"uid_last" => $this->user->id
+				);
 
-			$new_data = $this->db->safesql(json_encode($new_data));
+				$new_data = $this->db->safesql(json_encode($new_data));
 
-			$insert = $this->db->query("INSERT INTO `mcr_news`
-											(cid, title, text_bb, text_html, text_bb_short, text_html_short, vote, discus, attach, uid, `data`)
-										VALUES
-											('$cid', '$title', '$text_bb', '$safe_text_html', '$text_bb_short', '$safe_text_html_short', '$vote', '$discus', '$attach', '{$this->user->id}', '$new_data')");
+				$insert = $this->db->query("INSERT INTO `mcr_news`
+												(cid, title, text_bb, text_html, text_bb_short, text_html_short, vote, discus, attach, uid, `data`)
+											VALUES
+												('$cid', '$title', '$safe_text_bb', '$safe_text_html', '$safe_text_bb_short', '$safe_text_html_short', '$vote', '$discus', '$attach', '{$this->user->id}', '$new_data')");
 
-			if(!$insert){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=news&op=add'); }
-			
-			$this->core->notify($this->lng["e_success"], "Новость успешно добавлена", 3, '?mode=admin&do=news');
+				if(!$insert){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news&op=add'); }
+
+				$id = $this->db->insert_id();
+
+				// Последнее обновление пользователя
+				$this->db->update_user($this->user);
+
+				// Лог действия
+				$this->db->actlog($this->lng['log_add_news']." #$id ".$this->lng['log_news'], $this->user->id);
+				
+				$this->core->notify($this->core->lng["e_success"], $this->lng['news_add_success'], 3, '?mode=admin&do=news');
+			}
 		}
 
-		$data = array(
-			"PAGE" => "Добавление новости",
-			"CATEGORIES" => $this->categories(),
+		$result = array(
+			"PAGE" => $this->lng['news_add_page_name'],
+			"CATEGORIES" => $categories,
+			"TITLE" => $this->db->HSC($title),
+			"TEXT_SHORT" => $text_short,
+			"TEXT" => $text,
+			"VOTE" => $votes,
+			"DISCUS" => $discuses,
+			"ATTACH" => $attached,
 			"BB_PANEL_SHORT" => $bb->bb_panel('bb-short'),
 			"BB_PANEL_FULL" => $bb->bb_panel('bb-full'),
-			"TITLE" => "",
-			"TEXT_SHORT" => "",
-			"TEXT" => "",
-			"VOTE" => "checked",
-			"DISCUS" => "checked",
-			"ATTACH" => "",
-			"BUTTON" => "Добавить"
+			"BUTTON" => $this->lng['news_add_btn'],
+			"PREVIEW" => $preview,
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/news/new-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/news/new-add.html", $result);
 	}
 
 	private function edit(){
+		if(!$this->core->is_access('sys_adm_news_edit')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=news'); }
 
 		$id = intval($_GET['id']);
+		$preview = '';
 
 		$query = $this->db->query("SELECT cid, title, text_bb, text_bb_short, vote, discus, attach, `data`
 									FROM `mcr_news`
 									WHERE id='$id'");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=news'); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news'); }
 
 		$ar = $this->db->fetch_assoc($query);
 
+		$categories		= $this->categories($ar['cid']);
+		$title			= $this->db->HSC($ar['title']);
+		$text			= $this->db->HSC($ar['text_bb']);
+		$text_short		= $this->db->HSC($ar['text_bb_short']);
+		$votes			= (intval($ar['vote'])===1) ? 'checked' : '';
+		$discuses		= (intval($ar['discus'])===1) ? 'checked' : '';
+		$attached		= (intval($ar['attach'])===1) ? 'checked' : '';
+
 		$data = json_decode($ar['data']);
 
-		$this->core->title .= ' — Редактирование';
-
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Новости' => BASE_URL."?mode=admin&do=news",
-			'Редактирование' => BASE_URL."?mode=admin&do=news&op=edit&id=$id"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['news'] => BASE_URL."?mode=admin&do=news",
+			$this->lng['news_edit'] => BASE_URL."?mode=admin&do=news&op=edit&id=$id"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -264,6 +302,9 @@
 			$title = $this->db->safesql(@$_POST['title']);
 
 			$cid = intval(@$_POST['cid']);
+			
+			$check_cid = $this->db->query("SELECT title FROM `mcr_news_cats` WHERE id='$cid'");
+			if(!$check_cid || $this->db->num_rows($check_cid)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->lng['news_e_cat_not_exist'], 2, '?mode=admin&do=news&op=edit&id='.$id); }
 
 			$vote	= (intval(@$_POST['vote'])===1) ? 1 : 0;
 			$discus	= (intval(@$_POST['discus'])===1) ? 1 : 0;
@@ -276,67 +317,79 @@
 			$text_bb_trim = trim($text_bb);
 			$text_bb_short_trim = trim($text_bb_short);
 
-			if(empty($text_bb_trim)){ $this->core->notify($this->lng["e_msg"], "Не заполнено поле \"Полное описание\"", 2, '?mode=admin&do=news&op=edit&id='.$id); }
-			if(empty($text_bb_short_trim)){ $this->core->notify($this->lng["e_msg"], "Не заполнено поле \"Краткое описание\"", 2, '?mode=admin&do=news&op=edit&id='.$id); }
+			if(empty($text_bb_trim)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['news_e_desc'], 2, '?mode=admin&do=news&op=edit&id='.$id); }
+			if(empty($text_bb_short_trim)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['news_e_sdesc'], 2, '?mode=admin&do=news&op=edit&id='.$id); }
 
-			$text_bb				= $this->db->HSC($text_bb);
-			$text_bb_short			= $this->db->HSC($text_bb_short);
-
-			$text_html				= $bb->decode($text_bb);
-			$text_html_short		= $bb->decode($text_bb_short);
+			$text_html				= $bb->parse($text_bb);
+			$text_html_short		= $bb->parse($text_bb_short);
 
 			$safe_text_html			= $this->db->safesql($text_html);
 			$safe_text_html_short	= $this->db->safesql($text_html_short);
 
-			$text_bb				= $this->db->safesql($text_bb);
-			$text_bb_short			= $this->db->safesql($text_bb_short);
+			$safe_text_bb			= $this->db->safesql($text_bb);
+			$safe_text_bb_short		= $this->db->safesql($text_bb_short);
 
 			$text_html_strip		= trim(strip_tags($text_html, "<img>"));
 			$text_html_short_strip	= trim(strip_tags($text_html_short, "<img>"));
 
-			if(empty($text_html_strip)){ $this->core->notify($this->lng["e_msg"], "Не верно заполнено поле \"Полное описание\"", 2, '?mode=admin&do=news&op=edit&id='.$id); }
-			if(empty($text_html_short_strip)){ $this->core->notify($this->lng["e_msg"], "Не верно заполнено поле \"Краткое описание\"", 2, '?mode=admin&do=news&op=edit&id='.$id); }
+			if(empty($text_html_strip)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['news_e_desc'], 2, '?mode=admin&do=news&op=edit&id='.$id); }
+			if(empty($text_html_short_strip)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['news_e_sdesc'], 2, '?mode=admin&do=news&op=edit&id='.$id); }
 			// Обработка описания -
 
-			$new_data = array(
-				"time_create" => $data->time_create,
-				"time_last" => time(),
-				"uid_create" => $data->uid_create,
-				"uid_last" => $this->user->id
-			);
+			if(isset($_POST['preview'])){
+				$cid_ar			= $this->db->fetch_assoc($check_cid);
+				$preview		= $this->get_preview($title, $text_html, $cid_ar['title'], $cid, $vote);
+				$title			= $this->db->HSC($title);
+				$text			= $text_bb;
+				$text_short		= $text_bb_short;
+				$categories		= $this->categories($cid);
+				$votes			= ($vote===1) ? 'checked' : '';
+				$discuses		= ($discus===1) ? 'checked' : '';
+				$attached		= ($attach===1) ? 'checked' : '';
+			}else{
+				$new_data = array(
+					"time_create" => $data->time_create,
+					"time_last" => time(),
+					"uid_create" => $data->uid_create,
+					"uid_last" => $this->user->id
+				);
 
-			$new_data = $this->db->safesql(json_encode($new_data));
+				$new_data = $this->db->safesql(json_encode($new_data));
 
-			$update = $this->db->query("UPDATE `mcr_news`
-										SET cid='$cid', title='$title', text_bb='$text_bb', text_html='$safe_text_html',
-											text_bb_short='$text_bb_short', text_html_short='$safe_text_html_short',
-											vote='$vote', discus='$discus', attach='$attach', `data`='$new_data'
-										WHERE id='$id'");
+				$update = $this->db->query("UPDATE `mcr_news`
+											SET cid='$cid', title='$title', text_bb='$safe_text_bb', text_html='$safe_text_html',
+												text_bb_short='$safe_text_bb_short', text_html_short='$safe_text_html_short',
+												vote='$vote', discus='$discus', attach='$attach', `data`='$new_data'
+											WHERE id='$id'");
 
-			if(!$update){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=news&op=edit&id='.$id); }
-			
-			$this->core->notify($this->lng["e_success"], "Новость успешно изменена", 3, '?mode=admin&do=news');
+				if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news&op=edit&id='.$id); }
+
+				// Последнее обновление пользователя
+				$this->db->update_user($this->user);
+
+				// Лог действия
+				$this->db->actlog($this->lng['log_edit_news']." #$id ".$this->lng['log_news'], $this->user->id);
+				
+				$this->core->notify($this->core->lng["e_success"], $this->lng['news_edit_success'], 3, '?mode=admin&do=news');
+			}
 		}
 
-		$data = array(
-			"PAGE" => "Редактирование новости",
-			"CATEGORIES" => $this->categories($ar['cid']),
-			"TITLE" => $this->db->HSC($ar['title']),
-			"TEXT_SHORT" => $this->db->HSC($ar['text_bb_short']),
-			"TEXT" => $this->db->HSC($ar['text_bb']),
-			"VOTE" => (intval($ar['vote'])===1) ? 'checked' : '',
-			"DISCUS" => (intval($ar['discus'])===1) ? 'checked' : '',
-			"ATTACH" => (intval($ar['attach'])===1) ? 'checked' : '',
+		$result = array(
+			"PAGE" => $this->lng['news_edit_page_name'],
+			"CATEGORIES" => $categories,
+			"TITLE" => $title,
+			"TEXT_SHORT" => $text_short,
+			"TEXT" => $text,
+			"VOTE" => $votes,
+			"DISCUS" => $discuses,
+			"ATTACH" => $attached,
 			"BB_PANEL_SHORT" => $bb->bb_panel('bb-short'),
 			"BB_PANEL_FULL" => $bb->bb_panel('bb-full'),
-			"BUTTON" => "Сохранить"
+			"BUTTON" => $this->lng['news_edit_btn'],
+			"PREVIEW" => $preview,
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/news/new-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/news/new-add.html", $result);
 	}
 
 	public function content(){
@@ -351,11 +404,7 @@
 			default:		$content = $this->news_list(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/admin/news_cats.class.php b/upload/modules/admin/news_cats.class.php
index 141c162..4aabe37 100644
--- a/upload/modules/admin/news_cats.class.php
+++ b/upload/modules/admin/news_cats.class.php
@@ -10,13 +10,13 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->lng	= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Категории новостей';
+		if(!$this->core->is_access('sys_adm_news_cats')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']);; }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Категории новостей' => BASE_URL."?mode=admin&do=news_cats"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['categories'] => BASE_URL."?mode=admin&do=news_cats"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -32,12 +32,11 @@
 									ORDER BY id DESC
 									LIMIT $start, $end");
 
-		ob_start();
+		
 
-		if(!$query || $this->db->num_rows($query)<=0){
-			echo $this->core->sp(MCR_THEME_MOD."admin/news_cats/cat-none.html");
-			return ob_get_clean();
-		}
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/news_cats/cat-none.html"); }
+
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
@@ -66,19 +65,17 @@
 			"CATEGORIES" => $this->cats_array()
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/news_cats/cat-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/news_cats/cat-list.html", $data);
 	}
 
 	private function delete(){
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=news_cats'); }
+		if(!$this->core->is_access('sys_adm_news_cats_delete')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=news_cats'); }
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=news_cats'); }
 			
 		$list = @$_POST['id'];
 
-		if(empty($list)){ $this->core->notify($this->lng["e_msg"], "Не выбрано ни одного пункта", 2, '?mode=admin&do=news_cats'); }
+		if(empty($list)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['cn_not_selected'], 2, '?mode=admin&do=news_cats'); }
 
 		$list = $this->core->filter_int_array($list);
 
@@ -86,16 +83,14 @@
 
 		$list = $this->db->safesql(implode(", ", $list));
 
-		$delete = $this->db->query("DELETE FROM `mcr_news_cats` WHERE id IN ($list)");
-
-		if(!$delete){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats'); }
+		if(!$this->db->remove_fast("mcr_news_cats", "id IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats'); }
 
 		$count = $this->db->affected_rows();
 
 		$query = $this->db->query("SELECT id FROM `mcr_news` WHERE id IN ($list)");
 
 		if(!$query || $this->db->num_rows($query)<=0){
-			$this->core->notify($this->lng["e_success"], "Выбранные элементы успешно удалены ($count)", 3, '?mode=admin&do=news_cats');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['cn_del_elements4']." ($count)", 3, '?mode=admin&do=news_cats');
 		}
 
 		$elem = array();
@@ -104,36 +99,35 @@
 
 		$elements = implode(", ", $elem);
 
-		$delete2 = $this->db->query("DELETE FROM `mcr_news` WHERE id IN ($elements)");
-
-		if(!$delete2){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats'); }
+		if(!$this->db->remove_fast("mcr_news", "id IN ($elements)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats'); }
 
 		$count2 = $this->db->affected_rows();
 
-		$delete3 = $this->db->query("DELETE FROM `mcr_news_views` WHERE nid IN ($elements)");
-
-		if(!$delete3){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats'); }
+		if(!$this->db->remove_fast("mcr_news_views", "nid IN ($elements)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats'); }
 
 		$count3 = $this->db->affected_rows();
 
-		$delete4 = $this->db->query("DELETE FROM `mcr_news_votes` WHERE nid IN ($elements)");
-
-		if(!$delete4){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats'); }
+		if(!$this->db->remove_fast("mcr_news_votes", "nid IN ($elements)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats'); }
 
 		$count4 = $this->db->affected_rows();
 
-		$this->core->notify($this->lng["e_success"], "Удалено элементов: категорий - $count, новостей - $count2, просмотров - $count3, голосов - $count4", 3, '?mode=admin&do=news_cats');
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_del_cn']." $list ".$this->lng['log_cn'], $this->user->id);
+
+		$this->core->notify($this->core->lng["e_success"], $this->lng['cn_del_elements']." $count, ".$this->lng['cn_del_elements2']." $count2, ".$this->lng['cn_del_elements3']." $count3, ".$this->lng['cn_del_elements5']." $count4", 3, '?mode=admin&do=news_cats');
 
 	}
 
 	private function add(){
-
-		$this->core->title .= ' — Добавление';
+		if(!$this->core->is_access('sys_adm_news_cats_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=news_cats'); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Категории новостей' => BASE_URL."?mode=admin&do=news_cats",
-			'Добавление' => BASE_URL."?mode=admin&do=news_cats&op=add",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['categories'] => BASE_URL."?mode=admin&do=news_cats",
+			$this->lng['cn_add'] => BASE_URL."?mode=admin&do=news_cats&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -154,26 +148,31 @@
 											(title, description, `data`)
 										VALUES
 											('$title', '$text', '$new_data')");
-			if(!$insert){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats'); }
+			if(!$insert){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats'); }
+
+			$id = $this->db->insert_id();
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_add_cn']." #$id ".$this->lng['log_cn'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Категория успешно добавлена", 3, '?mode=admin&do=news_cats');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['cn_add_success'], 3, '?mode=admin&do=news_cats');
 		}
 
 		$data = array(
-			"PAGE" => "Добавление категории",
+			"PAGE" => $this->lng['cn_add_page_name'],
 			"TITLE" => "",
 			"TEXT" => "",
-			"BUTTON" => "Добавить"
+			"BUTTON" => $this->lng['cn_add_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/news_cats/cat-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/news_cats/cat-add.html", $data);
 	}
 
 	private function edit(){
+		if(!$this->core->is_access('sys_adm_news_cats_edit')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=news_cats'); }
 
 		$id = intval($_GET['id']);
 
@@ -181,16 +180,14 @@
 									FROM `mcr_news_cats`
 									WHERE id='$id'");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats'); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats'); }
 
 		$ar = $this->db->fetch_assoc($query);
 
-		$this->core->title .= ' — Редактирование';
-
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Категории новостей' => BASE_URL."?mode=admin&do=news_cats",
-			'Редактирование' => BASE_URL."?mode=admin&do=news_cats&op=edit&id=$id",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['categories'] => BASE_URL."?mode=admin&do=news_cats",
+			$this->lng['cn_edit'] => BASE_URL."?mode=admin&do=news_cats&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -213,23 +210,25 @@
 										SET title='$title', description='$text', `data`='$new_data'
 										WHERE id='$id'");
 
-			if(!$update){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats&op=edit&id='.$id); }
+			if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news_cats&op=edit&id='.$id); }
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_edit_cn']." #$id ".$this->lng['log_cn'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Категория успешно изменена", 3, '?mode=admin&do=news_cats&op=edit&id='.$id);
+			$this->core->notify($this->core->lng["e_success"], $this->lng['cn_edit_success'], 3, '?mode=admin&do=news_cats&op=edit&id='.$id);
 		}
 
 		$data = array(
-			"PAGE" => "Редактирование категории",
+			"PAGE" => $this->lng['cn_edit_page_name'],
 			"TITLE" => $this->db->HSC($ar['title']),
 			"TEXT" => $this->db->HSC($ar['description']),
-			"BUTTON" => "Сохранить"
+			"BUTTON" => $this->lng['cn_edit_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/news_cats/cat-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/news_cats/cat-add.html", $data);
 	}
 
 	public function content(){
@@ -244,11 +243,7 @@
 			default:		$content = $this->cats_list(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/admin/news_views.class.php b/upload/modules/admin/news_views.class.php
index 1fc5f27..c1100c7 100644
--- a/upload/modules/admin/news_views.class.php
+++ b/upload/modules/admin/news_views.class.php
@@ -10,13 +10,13 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->lng	= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Просмотры';
+		if(!$this->core->is_access('sys_adm_news_views')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Просмотры' => BASE_URL."?mode=admin&do=news_views"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['views'] => BASE_URL."?mode=admin&do=news_views"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -36,18 +36,15 @@
 									ORDER BY `v`.id DESC
 									LIMIT $start, $end");
 
-		ob_start();
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/news_views/view-none.html"); }
 
-		if(!$query || $this->db->num_rows($query)<=0){
-			echo $this->core->sp(MCR_THEME_MOD."admin/news_views/view-none.html");
-			return ob_get_clean();
-		}
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
-			if(empty($ar['title'])){
+			if(is_null($ar['title'])){
 				$status_class = 'error';
-				$new = 'Новость удалена';
+				$new = $this->lng['nv_news_deleted'];
 			}else{
 				$status_class = '';
 				$new = $this->db->HSC($ar['title']);
@@ -73,28 +70,24 @@
 
 		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_news_views`");
 
-		if(!$query){ exit("SQL Error"); }
-
-		$ar = $this->db->fetch_array($query);
+		$ar = @$this->db->fetch_array($query);
 
 		$data = array(
 			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_news_views'], "?mode=admin&do=news_views&pid=", $ar[0]),
 			"VIEWS" => $this->views_array()
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/news_views/view-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/news_views/view-list.html", $data);
 	}
 
 	private function delete(){
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=news_views'); }
+		if(!$this->core->is_access('sys_adm_news_views_delete')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=news_views'); }
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=news_views'); }
 			
 		$list = @$_POST['id'];
 
-		if(empty($list)){ $this->core->notify($this->lng["e_msg"], "Не выбрано ни одного пункта", 2, '?mode=admin&do=news_views'); }
+		if(empty($list)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['nv_not_selected'], 2, '?mode=admin&do=news_views'); }
 
 		$list = $this->core->filter_int_array($list);
 
@@ -102,13 +95,17 @@
 
 		$list = $this->db->safesql(implode(", ", $list));
 
-		$delete1 = $this->db->query("DELETE FROM `mcr_news_views` WHERE id IN ($list)");
-
-		if(!$delete1){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=news_views'); }
+		if(!$this->db->remove_fast("mcr_news_views", "id IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news_views'); }
 
 		$count1 = $this->db->affected_rows();
 
-		$this->core->notify($this->lng["e_success"], "Удалено элементов: просмотров - $count1", 3, '?mode=admin&do=news_views');
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_del_nv']." $list ".$this->lng['log_nv'], $this->user->id);
+
+		$this->core->notify($this->core->lng["e_success"], $this->lng['nv_del_elements']." $count1", 3, '?mode=admin&do=news_views');
 
 	}
 
@@ -122,11 +119,7 @@
 			default:		$content = $this->views_list(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/admin/news_votes.class.php b/upload/modules/admin/news_votes.class.php
index d596f17..05fbd04 100644
--- a/upload/modules/admin/news_votes.class.php
+++ b/upload/modules/admin/news_votes.class.php
@@ -10,13 +10,13 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->lng	= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Голоса';
+		if(!$this->core->is_access('sys_adm_news_votes')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Голоса' => BASE_URL."?mode=admin&do=news_votes"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['votes'] => BASE_URL."?mode=admin&do=news_votes"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -36,18 +36,17 @@
 									ORDER BY `v`.id DESC
 									LIMIT $start, $end");
 
-		ob_start();
+		
 
-		if(!$query || $this->db->num_rows($query)<=0){
-			echo $this->core->sp(MCR_THEME_MOD."admin/news_votes/vote-none.html");
-			return ob_get_clean();
-		}
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/news_votes/vote-none.html"); }
+
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
 			if(empty($ar['title'])){
 				$status_class = 'error';
-				$new = 'Новость удалена';
+				$new = $this->lng['nvt_news_deleted'];
 			}else{
 				$status_class = '';
 				$new = $this->db->HSC($ar['title']);
@@ -76,28 +75,24 @@
 
 		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_news_votes`");
 
-		if(!$query){ exit("SQL Error"); }
-
-		$ar = $this->db->fetch_array($query);
+		$ar = @$this->db->fetch_array($query);
 
 		$data = array(
 			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_news_votes'], "?mode=admin&do=news_votes&pid=", $ar[0]),
 			"VOTES" => $this->votes_array()
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/news_votes/vote-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/news_votes/vote-list.html", $data);
 	}
 
 	private function delete(){
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=news_votes'); }
+		if(!$this->core->is_access('sys_adm_news_votes_delete')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=news_votes'); }
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=news_votes'); }
 			
 		$list = @$_POST['id'];
 
-		if(empty($list)){ $this->core->notify($this->lng["e_msg"], "Не выбрано ни одного пункта", 2, '?mode=admin&do=news_votes'); }
+		if(empty($list)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['nvt_not_selected'], 2, '?mode=admin&do=news_votes'); }
 
 		$list = $this->core->filter_int_array($list);
 
@@ -105,13 +100,17 @@
 
 		$list = $this->db->safesql(implode(", ", $list));
 
-		$delete1 = $this->db->query("DELETE FROM `mcr_news_votes` WHERE id IN ($list)");
-
-		if(!$delete1){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=news_votes'); }
+		if(!$this->db->remove_fast("mcr_news_votes", "id IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=news_votes'); }
 
 		$count1 = $this->db->affected_rows();
 
-		$this->core->notify($this->lng["e_success"], "Удалено элементов: голосов - $count1", 3, '?mode=admin&do=news_votes');
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_del_nvt']." $list ".$this->lng['log_nvt'], $this->user->id);
+
+		$this->core->notify($this->core->lng["e_success"], $this->lng['nvt_del_elements']." $count1", 3, '?mode=admin&do=news_votes');
 
 	}
 
@@ -125,11 +124,7 @@
 			default:		$content = $this->votes_list(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/admin/panel_menu.class.php b/upload/modules/admin/panel_menu.class.php
index aa1510f..bc06971 100644
--- a/upload/modules/admin/panel_menu.class.php
+++ b/upload/modules/admin/panel_menu.class.php
@@ -10,13 +10,10 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
-
-		$this->core->title = $this->lng['t_admin'];
+		$this->lng	= $core->lng_m;
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Главная' => BASE_URL."?mode=admin&do=main"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -89,11 +86,7 @@
 			"ITEMS" => $this->item_array($items),
 		);
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_MOD."admin/panel_menu/menu-items/item-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/panel_menu/menu-items/item-list.html", $data);
 	}
 
 	private function group_array(){
@@ -104,12 +97,11 @@
 									FROM `mcr_menu_adm_groups`
 									ORDER BY `priority` ASC");
 
-		ob_start();
-		if(!$query || $this->db->num_rows($query)<=0){
-			echo $this->core->sp(MCR_THEME_MOD."admin/panel_menu/menu-groups/group-none.html");
-			return ob_get_clean();
-		}
+		
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/panel_menu/menu-groups/group-none.html"); }
 
+		ob_start();
+		
 		while($ar = $this->db->fetch_assoc($query)){
 			$id = intval($ar['id']);
 
@@ -117,16 +109,16 @@
 
 			$list = (isset($items[$id])) ? $items[$id] : array();
 
-			$sid = 'ajx_spl_adm_grp_'.$id;
+			//$sid = 'ajx_spl_adm_grp_'.$id;
 
-			$status = (isset($_SESSION[$sid]) && $_SESSION[$sid]==='true') ? "closed" : "opened";
+			//$status = (isset($_SESSION[$sid]) && $_SESSION[$sid]) ? "closed" : "opened";
 
 			$data = array(
 				"ID"		=> $id,
 				"TITLE"		=> $this->db->HSC($ar['title']),
 				"TEXT"		=> $this->db->HSC($ar['text']),
 				"ITEMS"		=> $this->item_list($list),
-				"STATUS"	=> $status
+				//"STATUS"	=> $status,
 			);
 
 			echo $this->core->sp(MCR_THEME_MOD."admin/panel_menu/menu-groups/group-id.html", $data);
@@ -143,20 +135,12 @@
 			"GROUPS" => $this->group_array()
 		);
 
-		ob_start();
-
-			echo $this->core->sp(MCR_THEME_MOD."admin/panel_menu/menu-groups/group-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/panel_menu/menu-groups/group-list.html", $data);
 	}
 
 	public function content(){
 
-		ob_start();
-
-		echo $this->group_list();
-
-		return ob_get_clean();
+		return $this->group_list();
 	}
 }
 
diff --git a/upload/modules/admin/permissions.class.php b/upload/modules/admin/permissions.class.php
index f3dfa4a..8680b5c 100644
--- a/upload/modules/admin/permissions.class.php
+++ b/upload/modules/admin/permissions.class.php
@@ -10,13 +10,13 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->lng	= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Привилегии';
+		if(!$this->core->is_access('sys_adm_permissions')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Привилегии' => BASE_URL."?mode=admin&do=permissions"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['permissions'] => BASE_URL."?mode=admin&do=permissions"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -32,12 +32,11 @@
 									ORDER BY `value` ASC
 									LIMIT $start, $end");
 
-		ob_start();
+		
 
-		if(!$query || $this->db->num_rows($query)<=0){
-			echo $this->core->sp(MCR_THEME_MOD."admin/permissions/perm-none.html");
-			return ob_get_clean();
-		}
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/permissions/perm-none.html"); }
+
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
@@ -71,19 +70,17 @@
 			"PERMISSIONS" => $this->permissions_array()
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/permissions/perm-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/permissions/perm-list.html", $data);
 	}
 
 	private function delete(){
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=permissions'); }
+		if(!$this->core->is_access('sys_adm_permissions_delete')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=permissions'); }
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=permissions'); }
 			
 		$list = @$_POST['id'];
 
-		if(empty($list)){ $this->core->notify($this->lng["e_msg"], "Не выбрано ни одного пункта", 2, '?mode=admin&do=permissions'); }
+		if(empty($list)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['perm_not_selected'], 2, '?mode=admin&do=permissions'); }
 
 		$list = $this->core->filter_int_array($list);
 
@@ -91,13 +88,19 @@
 
 		$list = $this->db->safesql(implode(", ", $list));
 
-		$delete = $this->db->query("DELETE FROM `mcr_permissions` WHERE id IN ($list) AND `system`='0'");
-
-		if(!$delete){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=permissions'); }
+		if(!$this->db->remove_fast("mcr_permissions", "id IN ($list) AND `system`='0'")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=permissions'); }
 
 		$count = $this->db->affected_rows();
 
-		$this->core->notify($this->lng["e_success"], "Удалено элементов: привилегий - $count", 3, '?mode=admin&do=permissions');
+		@$this->user->update_default_permissions();
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_del_perm']." $list ".$this->lng['log_perm'], $this->user->id);
+
+		$this->core->notify($this->core->lng["e_success"], $this->lng['perm_del_elements']." $count", 3, '?mode=admin&do=permissions');
 
 	}
 
@@ -134,7 +137,7 @@
 
 		$query = $this->db->query("SELECT id, `permissions` FROM `mcr_groups`");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"]); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"]); }
 
 		$array = array();
 
@@ -160,13 +163,16 @@
 			if(!$update){ $return = false; }
 		}
 
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
 		return $return;
 	}
 
 	private function get_permissions(){
 		$query = $this->db->query("SELECT `value`, `type`, `default` FROM `mcr_permissions`");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"]); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"]); }
 		
 		$array = array();
 
@@ -185,13 +191,12 @@
 	}
 
 	private function add(){
-
-		$this->core->title .= ' — Добавление';
+		if(!$this->core->is_access('sys_adm_permissions_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=permissions'); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Привилегии' => BASE_URL."?mode=admin&do=permissions",
-			'Добавление' => BASE_URL."?mode=admin&do=permissions&op=add",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['permissions'] => BASE_URL."?mode=admin&do=permissions",
+			$this->lng['perm_add'] => BASE_URL."?mode=admin&do=permissions&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -220,31 +225,35 @@
 										VALUES
 											('$title', '$text', '$value', '$default', '$type', '$new_data')");
 
-			if(!$insert){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=permissions'); }
-			
-			if(!$this->update_groups()){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"].' #2', 2, '?mode=admin&do=permissions'); }
+			if(!$insert){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=permissions'); }
 
-			$this->core->notify($this->lng["e_success"], "Привилегия успешно добавлена", 3, '?mode=admin&do=permissions');
+			$id = $this->db->insert_id();
+			
+			if(!$this->update_groups()){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"].' #2', 2, '?mode=admin&do=permissions'); }
+
+			@$this->user->update_default_permissions();
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_add_perm']." #$id ".$this->lng['log_perm'], $this->user->id);
+
+			$this->core->notify($this->core->lng["e_success"], $this->lng['perm_add_success'], 3, '?mode=admin&do=permissions');
 		}
 
 		$data = array(
-			"PAGE" => "Добавление привилегий",
+			"PAGE" => $this->lng['perm_add_page_name'],
 			"TITLE" => '',
 			"TEXT" => '',
 			"VALUE" => '',
 			"DEFAULT" => $this->get_default_value(),
 			"TYPES" => $this->get_types(),
-			"BUTTON" => "Добавить"
+			"BUTTON" => $this->lng['perm_add_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/permissions/perm-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/permissions/perm-add.html", $data);
 	}
 
 	private function edit(){
+		if(!$this->core->is_access('sys_adm_permissions_edit')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=permissions'); }
 
 		$id = intval($_GET['id']);
 
@@ -252,16 +261,14 @@
 									FROM `mcr_permissions`
 									WHERE id='$id'");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=permissions'); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=permissions'); }
 
 		$ar = $this->db->fetch_assoc($query);
 
-		$this->core->title .= ' — Редактирование';
-
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Привилегии' => BASE_URL."?mode=admin&do=permissions",
-			'Редактирование' => BASE_URL."?mode=admin&do=permissions&op=edit&id=$id",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['permissions'] => BASE_URL."?mode=admin&do=permissions",
+			$this->lng['perm_edit'] => BASE_URL."?mode=admin&do=permissions&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -278,7 +285,7 @@
 			$type			= $filter_type['type'];
 
 			if(intval($ar['system'])===1 && ($type!=$ar['type'] || $value!=$ar['value'])){
-				$this->core->notify($this->lng["e_msg"], "Запрещено менять тип и значение системных привилегий", 2, '?mode=admin&do=permissions&op=edit&id='.$id);
+				$this->core->notify($this->core->lng["e_msg"], $this->lng['perm_change_system'], 2, '?mode=admin&do=permissions&op=edit&id='.$id);
 			}
 
 			$new_data		= array(
@@ -295,28 +302,29 @@
 											`default`='$default', `type`='$type', `data`='$new_data'
 										WHERE id='$id'");
 
-			if(!$update){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=permissions&op=edit&id='.$id); }
+			if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=permissions&op=edit&id='.$id); }
 			
-			if(!$this->update_groups()){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"].' #2', 2, '?mode=admin&do=permissions&op=edit&id='.$id); }
+			if(!$this->update_groups()){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"].' #2', 2, '?mode=admin&do=permissions&op=edit&id='.$id); }
 
-			$this->core->notify($this->lng["e_success"], "Привилегия успешно изменена", 3, '?mode=admin&do=permissions&op=edit&id='.$id);
+			@$this->user->update_default_permissions();
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_edit_perm']." #$id ".$this->lng['log_perm'], $this->user->id);
+
+			$this->core->notify($this->core->lng["e_success"], $this->lng['perm_edit_success'], 3, '?mode=admin&do=permissions&op=edit&id='.$id);
 		}
 
 		$data = array(
-			"PAGE"			=> "Редактирование привилегии",
+			"PAGE"			=> $this->lng['perm_edit_page_name'],
 			"TITLE"			=> $this->db->HSC($ar['title']),
 			"TEXT"			=> $this->db->HSC($ar['description']),
 			"VALUE"			=> $this->db->HSC($ar['value']),
 			"DEFAULT"		=> $this->get_default_value($ar['default'], $ar['type']),
 			"TYPES"			=> $this->get_types($ar['type']),
-			"BUTTON"		=> "Сохранить"
+			"BUTTON"		=> $this->lng['perm_edit_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/permissions/perm-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/permissions/perm-add.html", $data);
 	}
 
 	private function filter_type($type='boolean', $default='false'){
@@ -347,17 +355,17 @@
 		switch($type){
 			case 'integer':
 				$value = intval($value);
-				$input = '<input type="text" class="span8" name="default" value="'.$value.'" id="inputDefault" placeholder="Значение по умолчанию">';
+				$input = '<input type="text" class="span8" name="default" value="'.$value.'" id="inputDefault" placeholder="'.$this->lng['perm_def_value'].'">';
 			break;
 
 			case 'float':
 				$value = floatval($value);
-				$input = '<input type="text" class="span8" name="default" value="'.$value.'" id="inputDefault" placeholder="Значение по умолчанию">';
+				$input = '<input type="text" class="span8" name="default" value="'.$value.'" id="inputDefault" placeholder="'.$this->lng['perm_def_value'].'">';
 			break;
 
 			case 'string':
 				$value = $this->db->HSC($value);
-				$input = '<input type="text" class="span8" name="default" value="'.$value.'" id="inputDefault" placeholder="Значение по умолчанию">';
+				$input = '<input type="text" class="span8" name="default" value="'.$value.'" id="inputDefault" placeholder="'.$this->lng['perm_def_value'].'">';
 			break;
 
 			default:
@@ -371,10 +379,10 @@
 
 	private function get_types($selected='boolean', $check=false){
 		$array = array(
-			"boolean" => "Булевое значение",
-			"integer" => "Целое число",
-			"float" => "Число с плавающей точкой",
-			"string" => "Строка",
+			"boolean" => $this->lng['perm_boolean'],
+			"integer" => $this->lng['perm_integer'],
+			"float" => $this->lng['perm_float'],
+			"string" => $this->lng['perm_string'],
 		);
 
 		if($check){ return (isset($array[$selected])) ? true : false; }
@@ -394,6 +402,7 @@
 
 		$op = (isset($_GET['op'])) ? $_GET['op'] : 'list';
 
+		$this->core->header .= '<script src="'.LANG_URL.'js/modules/permissions.js"></script>';
 		$this->core->header .= '<script src="'.STYLE_URL.'js/admin/permissions.js"></script>';
 
 		switch($op){
@@ -404,11 +413,7 @@
 			default:		$content = $this->permissions_list(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/admin/settings.class.php b/upload/modules/admin/settings.class.php
index ec61e55..c841516 100644
--- a/upload/modules/admin/settings.class.php
+++ b/upload/modules/admin/settings.class.php
@@ -10,13 +10,13 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->lng	= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Настройки';
+		if(!$this->core->is_access('sys_adm_settings')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Настройки' => BASE_URL."?mode=admin&do=settings"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['settings'] => BASE_URL."?mode=admin&do=settings"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -117,7 +117,7 @@
 			$cfg['s_dpage']		= $this->core->safestr(@$_POST['s_dpage']);
 
 			$s_theme = $this->core->safestr(@$_POST['s_theme']);
-			if(!$this->is_theme_exist($s_theme)){ $this->core->notify($this->lng["e_msg"], "Шаблон указан некорректно", 2, '?mode=admin&do=settings'); }
+			if(!$this->is_theme_exist($s_theme)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_theme_incorrect'], 2, '?mode=admin&do=settings'); }
 			$cfg['s_theme'] = $s_theme;
 
 			$cfg['log']			= (intval(@$_POST['log']) === 1) ? true : false;
@@ -126,7 +126,7 @@
 
 			$captcha = intval(@$_POST['captcha']);
 
-			if(!$this->is_captcha_exist($captcha)){ $this->core->notify($this->lng["e_msg"], "Капча указана некорректно", 2, '?mode=admin&do=settings'); }
+			if(!$this->is_captcha_exist($captcha)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_captcha_incorrect'], 2, '?mode=admin&do=settings'); }
 			$cfg['captcha']		= $captcha;
 
 			$cfg['rc_public']	= $this->core->safestr(@$_POST['rc_public']);
@@ -137,11 +137,15 @@
 
 			$cfg['kc_private']	= $this->core->safestr(@$_POST['kc_private']);
 
-			$cfg['mon_type']	= (intval(@$_POST['mon_type']) === 1) ? 1 : 0;
+			if(!$this->config->savecfg($cfg)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings'); }
 
-			if(!$this->core->savecfg($cfg)){ $this->core->notify($this->lng["e_msg"], "Не удалось сохранить файл конфигурации", 2, '?mode=admin&do=settings'); }
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_set_main_save'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Настройки успешно сохранены", 3, '?mode=admin&do=settings');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['set_save_success'], 3, '?mode=admin&do=settings');
 		}
 
 		$data = array(
@@ -150,15 +154,10 @@
 			"LOG"			=> ($cfg['log']) ? 'selected' : '',
 			"DEBUG"			=> ($cfg['debug']) ? 'selected' : '',
 			"REG_ACCEPT"	=> ($cfg['reg_accept']) ? 'selected' : '',
-			"MON_TYPE"		=> ($cfg['mon_type']==1) ? 'selected' : '',
 			"CAPTHA"		=> $this->captcha($cfg['captcha']),
 		);
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_MOD."admin/settings/main.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/settings/main.html", $data);
 	}
 
 	private function to_int_keys($array=array()){
@@ -189,24 +188,26 @@
 			$post_keys = array_keys($post);
 			rsort($post_keys);
 
-			if($cfg_keys!==$post_keys){ $this->core->notify($this->lng["e_msg"], "Неверная хэш-сумма полей", 2, '?mode=admin&do=settings&op=pagin'); }
+			if($cfg_keys!==$post_keys){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_hash'], 2, '?mode=admin&do=settings&op=pagin'); }
 
 			$cfg = $this->to_int_keys($post);
 
-			if(!$this->core->savecfg($cfg, 'pagin.php', 'pagin')){ $this->core->notify($this->lng["e_msg"], "Не удалось сохранить файл конфигурации", 2, '?mode=admin&do=settings&op=pagin'); }
+			if(!$this->config->savecfg($cfg, 'pagin.php', 'pagin')){ $this->core->notify($this->core->lng["e_msg"], "Не удалось сохранить файл конфигурации", 2, '?mode=admin&do=settings&op=pagin'); }
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_set_pagin_save'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Настройки успешно сохранены", 3, '?mode=admin&do=settings&op=pagin');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['set_save_success'], 3, '?mode=admin&do=settings&op=pagin');
 		}
 
 		$data = array(
-			"CFG"			=> $cfg
+			"CFG" => $cfg
 		);
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_MOD."admin/settings/pagin.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/settings/pagin.html", $data);
 	}
 
 	private function _mail(){
@@ -231,9 +232,15 @@
 
 			$cfg['smtp_pass']		= $this->core->safestr(@$_POST['smtp_pass']);
 
-			if(!$this->core->savecfg($cfg, 'mail.php', 'mail')){ $this->core->notify($this->lng["e_msg"], "Не удалось сохранить файл конфигурации", 2, '?mode=admin&do=settings&op=mail'); }
+			if(!$this->config->savecfg($cfg, 'mail.php', 'mail')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings&op=mail'); }
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_set_mail_save'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Настройки успешно сохранены", 3, '?mode=admin&do=settings&op=mail');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['set_save_success'], 3, '?mode=admin&do=settings&op=mail');
 		}
 
 		$data = array(
@@ -241,11 +248,7 @@
 			"CFG"			=> $cfg,
 		);
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_MOD."admin/settings/mail.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/settings/mail.html", $data);
 	}
 
 	private function search_items($cfg){
@@ -272,9 +275,9 @@
 
 		if($_SERVER['REQUEST_METHOD']=='POST'){
 
-			if(!isset($_POST['key']) || !isset($cfg[$_POST['key']])){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=settings&op=search'); }
+			if(!isset($_POST['key']) || !isset($cfg[$_POST['key']])){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=settings&op=search'); }
 
-			if(!$this->core->validate_perm(@$_POST['permissions'])){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=settings&op=search'); }
+			if(!$this->core->validate_perm(@$_POST['permissions'])){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=settings&op=search'); }
 
 			$key = $_POST['key'];
 
@@ -283,20 +286,22 @@
 				"permissions" => $this->core->safestr(@$_POST['permissions']),
 			);
 
-			if(!$this->core->savecfg($cfg, 'search.php', 'search')){ $this->core->notify($this->lng["e_msg"], "Не удалось сохранить файл конфигурации", 2, '?mode=admin&do=settings&op=search'); }
+			if(!$this->config->savecfg($cfg, 'search.php', 'search')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings&op=search'); }
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_set_search_save'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Настройки успешно сохранены", 3, '?mode=admin&do=settings&op=search');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['set_save_success'], 3, '?mode=admin&do=settings&op=search');
 		}
 
 		$data = array(
 			"ITEMS"			=> $this->search_items($cfg),
 		);
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_MOD."admin/settings/search.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/settings/search.html", $data);
 	}
 
 	private function functions(){
@@ -309,9 +314,15 @@
 
 			$cfg['breadcrumbs'] = (intval(@$_POST['breadcrumbs'])===1) ? true : false;
 
-			if(!$this->core->savecfg($cfg, 'functions.php', 'func')){ $this->core->notify($this->lng["e_msg"], "Не удалось сохранить файл конфигурации", 2, '?mode=admin&do=settings&op=functions'); }
+			if(!$this->config->savecfg($cfg, 'functions.php', 'func')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings&op=functions'); }
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_set_func_save'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Настройки успешно сохранены", 3, '?mode=admin&do=settings&op=functions');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['set_save_success'], 3, '?mode=admin&do=settings&op=functions');
 		}
 
 		$data = array(
@@ -319,11 +330,7 @@
 			"BREADCRUMBS" => ($cfg['breadcrumbs']) ? 'selected' : '',
 		);
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_MOD."admin/settings/functions.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/settings/functions.html", $data);
 	}
 
 	private function base(){
@@ -344,9 +351,15 @@
 			
 			$db['port'] = intval(@$_POST['port']);
 
-			if(!$this->core->savecfg($db, 'db.php', 'db')){ $this->core->notify($this->lng["e_msg"], "Не удалось сохранить файл конфигурации", 2, '?mode=admin&do=settings&op=base'); }
+			if(!$this->config->savecfg($db, 'db.php', 'db')){ $this->core->notify($this->core->lng["e_msg"], $this->lng['set_e_cfg_save'], 2, '?mode=admin&do=settings&op=base'); }
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_set_base_save'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Настройки успешно сохранены", 3, '?mode=admin&do=settings&op=base');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['set_save_success'], 3, '?mode=admin&do=settings&op=base');
 		}
 
 		$data = array(
@@ -360,11 +373,7 @@
 			"PORT" => intval($db['port']),
 		);
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_MOD."admin/settings/base.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/settings/base.html", $data);
 	}
 
 	public function content(){
@@ -381,11 +390,7 @@
 			default:		$content = $this->main(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/admin/statics.class.php b/upload/modules/admin/statics.class.php
index 0243f27..045b86b 100644
--- a/upload/modules/admin/statics.class.php
+++ b/upload/modules/admin/statics.class.php
@@ -10,13 +10,13 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->lng	= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Статические страницы';
+		if(!$this->core->is_access('sys_adm_statics')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Статические страницы' => BASE_URL."?mode=admin&do=statics"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['statics'] => BASE_URL."?mode=admin&do=statics"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -35,16 +35,15 @@
 									ORDER BY `s`.id DESC
 									LIMIT $start, $end");
 
-		ob_start();
+		
 
-		if(!$query || $this->db->num_rows($query)<=0){
-			echo $this->core->sp(MCR_THEME_MOD."admin/statics/static-none.html");
-			return ob_get_clean();
-		}
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/statics/static-none.html"); }
+
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
-			$perm = (empty($ar['perm'])) ? "ОТСУТСТВУЕТ" : $this->db->HSC($ar['perm']);
+			$perm = (is_null($ar['perm'])) ? $this->lng['stc_perm_not_exist'] : $this->db->HSC($ar['perm']);
 
 			$page_data = array(
 				"ID" => intval($ar['id']),
@@ -64,28 +63,24 @@
 
 		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_statics`");
 
-		if(!$query){ exit("SQL Error"); }
-
-		$ar = $this->db->fetch_array($query);
+		$ar = @$this->db->fetch_array($query);
 
 		$data = array(
 			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_statics'], "?mode=admin&do=statics&pid=", $ar[0]),
 			"STATICS" => $this->static_array()
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/statics/static-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/statics/static-list.html", $data);
 	}
 
 	private function delete(){
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=statics'); }
+		if(!$this->core->is_access('sys_adm_statics_delete')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=statics'); }
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=statics'); }
 			
 		$list = @$_POST['id'];
 
-		if(empty($list)){ $this->core->notify($this->lng["e_msg"], "Не выбрано ни одного пункта", 2, '?mode=admin&do=statics'); }
+		if(empty($list)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['stc_not_selected'], 2, '?mode=admin&do=statics'); }
 
 		$list = $this->core->filter_int_array($list);
 
@@ -93,30 +88,39 @@
 
 		$list = $this->db->safesql(implode(", ", $list));
 
-		$delete1 = $this->db->query("DELETE FROM `mcr_statics` WHERE id IN ($list)");
-
-		if(!$delete1){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=statics'); }
+		if(!$this->db->remove_fast("mcr_statics", "id IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=statics'); }
 
 		$count1 = $this->db->affected_rows();
 
-		$this->core->notify($this->lng["e_success"], "Удалено элементов: страниц - $count1", 3, '?mode=admin&do=statics');
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_del_stc']." $list ".$this->lng['log_stc'], $this->user->id);
+
+		$this->core->notify($this->core->lng["e_success"], $this->lng['stc_del_elements']." $count1", 3, '?mode=admin&do=statics');
 
 	}
 
 	private function add(){
-
-		$this->core->title .= ' — Добавление';
+		if(!$this->core->is_access('sys_adm_statics_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=statics'); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Статические страницы' => BASE_URL."?mode=admin&do=statics",
-			'Добавление' => BASE_URL."?mode=admin&do=statics&op=add",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['statics'] => BASE_URL."?mode=admin&do=statics",
+			$this->lng['stc_add'] => BASE_URL."?mode=admin&do=statics&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
 		
 		$bb = $this->core->load_bb_class(); // Загрузка класса BB-кодов
 
+		$preview		= '';
+		$title			= '';
+		$uniq			= '';
+		$text			= '';
+		$permissions	= $this->core->perm_list();
+
 		if($_SERVER['REQUEST_METHOD']=='POST'){
 			$title = $this->db->safesql(@$_POST['title']);
 
@@ -129,57 +133,78 @@
 
 			$text_bb_trim = trim($text_bb);
 
-			if(empty($text_bb_trim)){ $this->core->notify($this->lng["e_msg"], "Не заполнено поле \"Текст страницы\"", 2, '?mode=admin&do=statics&op=add'); }
+			if(empty($text_bb_trim)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['stc_e_text_empty'], 2, '?mode=admin&do=statics&op=add'); }
 
-			$text_bb				= $this->db->HSC($text_bb);
-
-			$text_html				= $bb->decode($text_bb);
+			$text_html				= $bb->parse($text_bb);
 
 			$safe_text_html			= $this->db->safesql($text_html); // in base
-			$text_bb				= $this->db->safesql($text_bb); // in base
+			$safe_text_bb			= $this->db->safesql($text_bb); // in base
 
 			$text_html_strip		= trim(strip_tags($text_html, "<img>"));
 
-			if(empty($text_html_strip)){ $this->core->notify($this->lng["e_msg"], "Не верно заполнено поле \"Текст страницы\"", 2, '?mode=admin&do=statics&op=add'); }
+			if(empty($text_html_strip)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['stc_e_text_incorrect'], 2, '?mode=admin&do=statics&op=add'); }
 			// Обработка описания -
 
-			$new_data = array(
-				"time_create" => time(),
-				"time_last" => time(),
-				"login_create" => $this->user->login,
-				"login_last" => $this->user->login
-			);
+			if(isset($_POST['preview'])){
+				$preview		= $this->get_preview($title, $text_html);
+				$title			= $this->db->HSC($title);
+				$uniq			= $this->db->HSC($uniq);
+				$text			= $this->db->HSC($text_bb);
+				$permissions	= $this->core->perm_list($permissions);
+			}else{
+				$new_data = array(
+					"time_create" => time(),
+					"time_last" => time(),
+					"login_create" => $this->user->login,
+					"login_last" => $this->user->login
+				);
 
-			$new_data = $this->db->safesql(json_encode($new_data));
+				$new_data = $this->db->safesql(json_encode($new_data));
 
-			$insert = $this->db->query("INSERT INTO `mcr_statics`
-											(`uniq`, title, text_bb, text_html, uid, `permissions`, `data`)
-										VALUES
-											('$uniq', '$title', '$text_bb', '$safe_text_html', '{$this->user->id}', '$permissions', '$new_data')");
+				$insert = $this->db->query("INSERT INTO `mcr_statics`
+												(`uniq`, title, text_bb, text_html, uid, `permissions`, `data`)
+											VALUES
+												('$uniq', '$title', '$safe_text_bb', '$safe_text_html', '{$this->user->id}', '$permissions', '$new_data')");
 
-			if(!$insert){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=statics&op=add'); }
-			
-			$this->core->notify($this->lng["e_success"], "Статическая страница успешно добавлена", 3, '?mode=admin&do=statics');
+				if(!$insert){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=statics&op=add'); }
+
+				$id = $this->db->insert_id();
+
+				// Последнее обновление пользователя
+				$this->db->update_user($this->user);
+
+				// Лог действия
+				$this->db->actlog($this->lng['log_add_stc']." #$id ".$this->lng['log_stc'], $this->user->id);
+				
+				$this->core->notify($this->core->lng["e_success"], $this->lng['stc_add_success'], 3, '?mode=admin&do=statics');
+			}
 		}
 
 		$data = array(
-			"PAGE" => "Добавление статической страницы",
-			"TITLE" => "",
-			"UNIQ" => "",
-			"TEXT" => "",
-			"PERMISSIONS" => $this->core->perm_list(),
+			"PAGE" => $this->lng['stc_add_page_name'],
+			"TITLE" => $title,
+			"UNIQ" => $uniq,
+			"TEXT" => $text,
+			"PERMISSIONS" => $permissions,
 			"BB_PANEL" => $bb->bb_panel('stc-field'),
-			"BUTTON" => "Добавить"
+			"BUTTON" => $this->core->lng['add'],
+			"PREVIEW" => $preview,
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/statics/static-add.html", $data);
+		return $this->core->sp(MCR_THEME_MOD."admin/statics/static-add.html", $data);
+	}
 
-		return ob_get_clean();
+	private function get_preview($title='', $text=''){
+		$data = array(
+			"TITLE" => $this->db->HSC($title),
+			"TEXT" => $text
+		);
+
+		return $this->core->sp(MCR_THEME_MOD."admin/statics/static-preview.html", $data);
 	}
 
 	private function edit(){
+		if(!$this->core->is_access('sys_adm_statics_edit')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=statics'); }
 
 		$id = intval($_GET['id']);
 
@@ -187,18 +212,22 @@
 									FROM `mcr_statics`
 									WHERE id='$id'");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=statics'); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=statics'); }
 
 		$ar = $this->db->fetch_assoc($query);
 
+		$preview		= '';
+		$title			= $this->db->HSC($ar['title']);
+		$uniq			= $this->db->HSC($ar['uniq']);
+		$text			= $this->db->HSC($ar['text_bb']);
+		$permissions	= $this->core->perm_list($ar['permissions']);
+
 		$data = json_decode($ar['data']);
 
-		$this->core->title .= ' — Редактирование';
-
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Статические страницы' => BASE_URL."?mode=admin&do=statics",
-			'Редактирование' => BASE_URL."?mode=admin&do=statics&op=edit&id=$id"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['statics'] => BASE_URL."?mode=admin&do=statics",
+			$this->lng['stc_edit'] => BASE_URL."?mode=admin&do=statics&op=edit&id=$id"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -217,54 +246,63 @@
 
 			$text_bb_trim = trim($text_bb);
 
-			if(empty($text_bb_trim)){ $this->core->notify($this->lng["e_msg"], "Не заполнено поле \"Текст страницы\"", 2, '?mode=admin&do=statics&op=add'); }
+			if(empty($text_bb_trim)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['stc_e_text_empty'], 2, '?mode=admin&do=statics&op=add'); }
 
-			$text_bb				= $this->db->HSC($text_bb);
-
-			$text_html				= $bb->decode($text_bb);
+			$text_html				= $bb->parse($text_bb);
 
 			$safe_text_html			= $this->db->safesql($text_html); // in base
-			$text_bb				= $this->db->safesql($text_bb); // in base
+			$safe_text_bb			= $this->db->safesql($text_bb); // in base
 
 			$text_html_strip		= trim(strip_tags($text_html, "<img>"));
 
-			if(empty($text_html_strip)){ $this->core->notify($this->lng["e_msg"], "Не верно заполнено поле \"Текст страницы\"", 2, '?mode=admin&do=statics&op=add'); }
+			if(empty($text_html_strip)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['stc_e_text_incorrect'], 2, '?mode=admin&do=statics&op=add'); }
 			// Обработка описания -
 
-			$new_data = array(
-				"time_create" => $data->time_create,
-				"time_last" => time(),
-				"login_create" => $data->login_create,
-				"login_last" => $this->user->login
-			);
+			if(isset($_POST['preview'])){
+				$preview		= $this->get_preview($title, $text_html);
+				$title			= $this->db->HSC($title);
+				$uniq			= $this->db->HSC($uniq);
+				$text			= $this->db->HSC($text_bb);
+				$permissions	= $this->core->perm_list($permissions);
+			}else{
+				$new_data = array(
+					"time_create" => $data->time_create,
+					"time_last" => time(),
+					"login_create" => $data->login_create,
+					"login_last" => $this->user->login
+				);
 
-			$new_data = $this->db->safesql(json_encode($new_data));
+				$new_data = $this->db->safesql(json_encode($new_data));
 
-			$update = $this->db->query("UPDATE `mcr_statics`
-										SET `uniq`='$uniq', title='$title', text_bb='$text_bb', text_html='$safe_text_html',
-											`permissions`='$permissions', `data`='$new_data'
-										WHERE id='$id'");
+				$update = $this->db->query("UPDATE `mcr_statics`
+											SET `uniq`='$uniq', title='$title', text_bb='$safe_text_bb', text_html='$safe_text_html',
+												`permissions`='$permissions', `data`='$new_data'
+											WHERE id='$id'");
 
-			if(!$update){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=statics&op=edit&id='.$id); }
-			
-			$this->core->notify($this->lng["e_success"], "Статическая страница успешно изменена", 3, '?mode=admin&do=statics');
+				if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=statics&op=edit&id='.$id); }
+
+				// Последнее обновление пользователя
+				$this->db->update_user($this->user);
+
+				// Лог действия
+				$this->db->actlog($this->lng['log_edit_stc']." #$id ".$this->lng['log_stc'], $this->user->id);
+				
+				$this->core->notify($this->core->lng["e_success"], $this->lng['stc_edit_success'], 3, '?mode=admin&do=statics');
+			}
 		}
 
 		$data = array(
-			"PAGE" => "Редактирование статической страницы",
-			"TITLE" => $this->db->HSC($ar['title']),
-			"UNIQ" => $this->db->HSC($ar['uniq']),
-			"TEXT" => $this->db->HSC($ar['text_bb']),
-			"PERMISSIONS" => $this->core->perm_list($ar['permissions']),
+			"PAGE" => $this->lng['stc_edit_page_name'],
+			"TITLE" => $title,
+			"UNIQ" => $uniq,
+			"TEXT" => $text,
+			"PERMISSIONS" => $permissions,
 			"BB_PANEL" => $bb->bb_panel('stc-field'),
-			"BUTTON" => "Сохранить"
+			"BUTTON" => $this->core->lng['save'],
+			"PREVIEW" => $preview,
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/statics/static-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/statics/static-add.html", $data);
 	}
 
 	public function content(){
@@ -279,11 +317,7 @@
 			default:		$content = $this->static_list(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/admin/users.class.php b/upload/modules/admin/users.class.php
index 940db0e..753e502 100644
--- a/upload/modules/admin/users.class.php
+++ b/upload/modules/admin/users.class.php
@@ -10,13 +10,13 @@
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->lng	= $core->lng_m;
 
-		$this->core->title = $this->lng['t_admin'].' — Пользователи';
+		if(!$this->core->is_access('sys_adm_users')){ $this->core->notify($this->core->lng['403'], $this->core->lng['e_403']); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Пользователи' => BASE_URL."?mode=admin&do=users"
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['users'] => BASE_URL."?mode=admin&do=users"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -27,19 +27,16 @@
 		$start		= $this->core->pagination($this->config->pagin['adm_users'], 0, 0); // Set start pagination
 		$end		= $this->config->pagin['adm_users']; // Set end pagination
 
-		$query = $this->db->query("SELECT `u`.id, `u`.gid, `u`.login, `u`.email, `g`.title AS `group`
+		$query = $this->db->query("SELECT `u`.id, `u`.gid, `u`.login, `u`.email, `g`.title AS `group`, `u`.ip_create, `u`.ip_last
 									FROM `mcr_users` AS `u`
 									LEFT JOIN `mcr_groups` AS `g`
 										ON `g`.id=`u`.gid
 									ORDER BY `u`.login ASC
 									LIMIT $start, $end");
 
-		ob_start();
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."admin/users/user-none.html"); }
 
-		if(!$query || $this->db->num_rows($query)<=0){
-			echo $this->core->sp(MCR_THEME_MOD."admin/users/user-none.html");
-			return ob_get_clean();
-		}
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
@@ -48,7 +45,9 @@
 				"GID" => intval($ar['gid']),
 				"LOGIN" => $this->db->HSC($ar['login']),
 				"EMAIL" => $this->db->HSC($ar['email']),
-				"GROUP" => $this->db->HSC($ar['group'])
+				"GROUP" => $this->db->HSC($ar['group']),
+				"IP_LAST" => $this->db->HSC($ar['ip_last']),
+				"IP_CREATE" => $this->db->HSC($ar['ip_create']),
 			);
 		
 			echo $this->core->sp(MCR_THEME_MOD."admin/users/user-id.html", $page_data);
@@ -61,38 +60,52 @@
 
 		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_users`");
 
-		if(!$query){ exit("SQL Error"); }
-
-		$ar = $this->db->fetch_array($query);
+		$ar = @$this->db->fetch_array($query);
 
 		$data = array(
 			"PAGINATION" => $this->core->pagination($this->config->pagin['adm_users'], "?mode=admin&do=users&pid=", $ar[0]),
 			"USERS" => $this->user_array()
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/users/user-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/users/user-list.html", $data);
 	}
 
 	private function ban($list, $ban=1){
+		if(!$this->core->is_access('sys_adm_users_ban')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=users'); }
+
 		$update = $this->db->query("UPDATE `mcr_users` SET ban_server='$ban' WHERE id IN ($list)");
 
-		if(!$update){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
+		if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
 
-		$message = ($ban==1) ? "забанены" : "разбанены";
+		$message = ($ban==1) ? $this->lng['user_ban'] : $this->lng['user_unban'];
 
-		$this->core->notify($this->lng["e_success"], "Выбранные пользователи успешно $message", 3, '?mode=admin&do=users');
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_ban_user']." $list ".$this->lng['log_user'], $this->user->id);
+
+		$this->core->notify($this->core->lng["e_success"], $this->lng['user_success']." ".$message, 3, '?mode=admin&do=users');
+	}
+
+	private function get_logins($list){
+		$query = $this->db->query("SELECT `login` FROM `mcr_users` WHERE id IN ($list)");
+
+		if(!$query || $this->db->num_rows($query)<=0){ return false; }
+
+		$logins = array();
+
+		while($ar = $this->db->fetch_assoc($query)){ $logins[] = $ar['login']; }
+
+		return $logins;
 	}
 
 	private function delete(){
-		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=users'); }
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=users'); }
 			
 		$list = @$_POST['id'];
 
-		if(empty($list)){ $this->core->notify($this->lng["e_msg"], "Не выбрано ни одного пункта", 2, '?mode=admin&do=users'); }
+		if(empty($list)){ $this->core->notify($this->core->lng["e_msg"], $this->lng['user_not_selected'], 2, '?mode=admin&do=users'); }
 
 		$list = $this->core->filter_int_array($list);
 
@@ -100,39 +113,50 @@
 
 		$list = $this->db->safesql(implode(", ", $list));
 
+		$logins = $this->get_logins($list);
+
+		if($logins===false){$this->core->notify($this->core->lng["e_msg"], $this->lng['user_not_found'], 2, '?mode=admin&do=users');  }
+
 		if(isset($_POST['ban'])){
 			$this->ban($list);
 		}elseif(isset($_POST['unban'])){
 			$this->ban($list, 0);
 		}
 
-		if(!isset($_POST['delete'])){ $this->core->notify($this->lng["e_msg"], $this->lng['e_hack'], 2, '?mode=admin&do=users'); }
+		if(!$this->core->is_access('sys_adm_users_delete')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=users'); }
 
-		$delete = $this->db->query("DELETE FROM `mcr_users` WHERE id IN ($list)");
+		if(!isset($_POST['delete'])){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_hack'], 2, '?mode=admin&do=users'); }
 
-		if(!$delete){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
+		if(!$this->db->remove_fast("mcr_users", "id IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
 
 		$count = $this->db->affected_rows();
 
-		$delete1 = $this->db->query("DELETE FROM `mcr_news_votes` WHERE uid IN ($list)");
-
-		if(!$delete1){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
+		if(!$this->db->remove_fast("mcr_news_votes", "uid IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
 
 		$count1 = $this->db->affected_rows();
 
-		$delete2 = $this->db->query("DELETE FROM `mcr_news_views` WHERE uid IN ($list)");
-
-		if(!$delete2){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
+		if(!$this->db->remove_fast("mcr_news_views", "uid IN ($list)")){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
 
 		$count2 = $this->db->affected_rows();
 
-		$delete3 = $this->db->query("DELETE FROM `mcr_comments` WHERE uid IN ($list)");
-
-		if(!$delete3){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
+		if(!$this->db->remove_fast("mcr_comments", "uid IN ($list)")){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
 
 		$count3 = $this->db->affected_rows();
 
-		$this->core->notify($this->lng["e_success"], "Удалено элементов: пользователей - $count, комментариев - $count3, голосов - $count1, просмотров - $count2", 3, '?mode=admin&do=users');
+		foreach($logins as $key => $value){
+			if(file_exists(MCR_SKIN_PATH.$value.'.png')){ @unlink(MCR_SKIN_PATH.$value.'.png'); }
+			if(file_exists(MCR_SKIN_PATH.'interface/'.$value.'.png')){ @unlink(MCR_SKIN_PATH.'interface/'.$value.'.png'); }
+			if(file_exists(MCR_SKIN_PATH.'interface/'.$value.'_mini.png')){ @unlink(MCR_SKIN_PATH.'interface/'.$value.'_mini.png'); }
+			if(file_exists(MCR_CLOAK_PATH.$value.'.png')){ @unlink(MCR_CLOAK_PATH.$value.'.png'); }
+		}
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_del_user']." $list ".$this->lng['log_user'], $this->user->id);
+
+		$this->core->notify($this->core->lng["e_success"], $this->lng['user_del_elements']." $count, ".$this->lng['user_del_elements2']." $count3, ".$this->lng['user_del_elements3']." $count1, ".$this->lng['user_del_elements4']." $count2", 3, '?mode=admin&do=users');
 
 	}
 
@@ -148,13 +172,12 @@
 	}
 
 	private function add(){
-
-		$this->core->title .= ' — Добавление';
+		if(!$this->core->is_access('sys_adm_users_add')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=users'); }
 
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Пользователи' => BASE_URL."?mode=admin&do=users",
-			'Добавление' => BASE_URL."?mode=admin&do=users&op=add",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['users'] => BASE_URL."?mode=admin&do=users",
+			$this->lng['user_add'] => BASE_URL."?mode=admin&do=users&op=add",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -166,7 +189,7 @@
 			$password	= $this->core->gen_password($_POST['password'], $salt);
 			$password	= $this->db->safesql($password);
 
-			if(mb_strlen($_POST['password'], "UTF-8")<6){ $this->core->notify($this->lng['e_msg'], $this->lng['e_reg_pass_length'], 2, '?mode=admin&do=users&op=add'); }
+			if(mb_strlen($_POST['password'], "UTF-8")<6){ $this->core->notify($this->core->lng['e_msg'], $this->lng['user_e_reg_pass_length'], 2, '?mode=admin&do=users&op=add'); }
 
 			$email			= $this->db->safesql(@$_POST['email']);
 
@@ -178,13 +201,13 @@
 
 			$gender = (intval(@$_POST['gender'])==1) ? 1 : 0;
 
-			if(!preg_match("/^[a-zа-яА-ЯёЁ]+$/iu", $firstname)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_valid_fname'], 2, '?mode=admin&do=users&op=add'); }
-			if(!preg_match("/^[a-zа-яА-ЯёЁ]+$/iu", $lastname)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_valid_lname'], 2, '?mode=admin&do=users&op=add'); }
-			if(!preg_match("/^(\d{2}-\d{2}-\d{4})?$/", $birthday)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_valid_bday'], 2, '?mode=admin&do=users&op=add'); }
+			if(!empty($firstname) && !preg_match("/^[a-zA-Zа-яА-ЯёЁ]+$/iu", $firstname)){ $this->core->notify($this->core->lng['e_msg'], $this->lng['user_e_incorrect_fname'], 2, '?mode=admin&do=users&op=add'); }
+			if(!empty($lastname) && !preg_match("/^[a-zA-Zа-яА-ЯёЁ]+$/iu", $lastname)){ $this->core->notify($this->core->lng['e_msg'], $this->lng['user_e_incorrect_lname'], 2, '?mode=admin&do=users&op=add'); }
+			if(!empty($birthday) && !preg_match("/^(\d{2}-\d{2}-\d{4})?$/", $birthday)){ $this->core->notify($this->core->lng['e_msg'], $this->lng['user_e_incorrect_bday'], 2, '?mode=admin&do=users&op=add'); }
 
 			$birthday = intval(strtotime($birthday));
 
-			if(!$this->exist_group($gid)){ $this->core->notify($this->lng['e_msg'], "Группа не существует", 1, '?mode=admin&do=users&op=add'); }
+			if(!$this->exist_group($gid)){ $this->core->notify($this->core->lng['e_msg'], $this->lng['user_group_not_found'], 1, '?mode=admin&do=users&op=add'); }
 
 			$money = floatval(@$_POST['money']);
 			$realmoney = floatval(@$_POST['realmoney']);
@@ -205,20 +228,28 @@
 										VALUES
 											('$gid', '$login', '$email', '$password', '$salt', '{$this->user->ip}', '{$this->user->ip}', '$new_data')");
 
-			if(!$insert){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
+			if(!$insert){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
+
+			$id = $this->db->insert_id();
 			
 			$insert1 = $this->db->query("INSERT INTO `mcr_iconomy`
 											(login, `money`, `realmoney`)
 										VALUES
 											('$login', '$money', '$realmoney')");
 
-			if(!$insert1){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
+			if(!$insert1){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_add_user']." #$id ".$this->lng['log_user'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Пункт меню успешно добавлен", 3, '?mode=admin&do=users');
+			$this->core->notify($this->core->lng["e_success"], $this->lng['user_add_success'], 3, '?mode=admin&do=users');
 		}
 
 		$data = array(
-			"PAGE" => "Добавление пользователя",
+			"PAGE" => $this->lng['user_add_page_name'],
 			"LOGIN" => '',
 			"EMAIL" => '',
 			"FIRSTNAME" => '',
@@ -228,17 +259,14 @@
 			"GROUPS" => $this->groups(),
 			"MONEY" => 0,
 			"REALMONEY" => 0,
-			"BUTTON" => "Добавить"
+			"BUTTON" => $this->lng['user_add_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/users/user-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/users/user-add.html", $data);
 	}
 
 	private function edit(){
+		if(!$this->core->is_access('sys_adm_users_edit')){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng['e_403'], 2, '?mode=admin&do=users'); }
 
 		$id = intval($_GET['id']);
 
@@ -249,18 +277,16 @@
 										ON `i`.login=`u`.login
 									WHERE `u`.id='$id'");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users'); }
 
 		$ar = $this->db->fetch_assoc($query);
 
 		$data = json_decode($ar['data']);
 
-		$this->core->title .= ' — Редактирование';
-
 		$bc = array(
-			$this->lng['t_admin'] => BASE_URL."?mode=admin",
-			'Пользователи' => BASE_URL."?mode=admin&do=users",
-			'Редактирование' => BASE_URL."?mode=admin&do=users&op=edit&id=$id",
+			$this->lng['mod_name'] => BASE_URL."?mode=admin",
+			$this->lng['users'] => BASE_URL."?mode=admin&do=users",
+			$this->lng['user_edit'] => BASE_URL."?mode=admin&do=users&op=edit&id=$id",
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -275,7 +301,7 @@
 				$salt		= $this->db->safesql($this->core->random());
 				$salt		= "'$salt'";
 				
-				if(mb_strlen($_POST['password'], "UTF-8")<6){ $this->core->notify($this->lng['e_msg'], $this->lng['e_reg_pass_length'], 2, '?mode=admin&do=users&op=edit&id='.$id); }
+				if(mb_strlen($_POST['password'], "UTF-8")<6){ $this->core->notify($this->core->lng['e_msg'], $this->lng['user_e_reg_pass_length'], 2, '?mode=admin&do=users&op=edit&id='.$id); }
 				
 				$password	= $this->core->gen_password($_POST['password'], $salt);
 				$password	= $this->db->safesql($password);
@@ -292,13 +318,13 @@
 
 			$gender = (intval(@$_POST['gender'])==1) ? 1 : 0;
 
-			if(!preg_match("/^[a-zа-яА-ЯёЁ]+$/i", $firstname)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_valid_fname'], 2, '?mode=admin&do=users&op=edit&id='.$id); }
-			if(!preg_match("/^[a-zа-яА-ЯёЁ]+$/i", $lastname)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_valid_lname'], 2, '?mode=admin&do=users&op=edit&id='.$id); }
-			if(!preg_match("/^(\d{2}-\d{2}-\d{4})?$/", $birthday)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_valid_bday'], 2, '?mode=admin&do=users&op=edit&id='.$id); }
+			if(!empty($firstname) && !preg_match("/^[a-zA-Zа-яА-ЯёЁ]+$/i", $firstname)){ $this->core->notify($this->core->lng['e_msg'], $this->lng['user_e_incorrect_fname'], 2, '?mode=admin&do=users&op=edit&id='.$id); }
+			if(!empty($lastname) && !preg_match("/^[a-zA-Zа-яА-ЯёЁ]+$/i", $lastname)){ $this->core->notify($this->core->lng['e_msg'], $this->lng['user_e_incorrect_lname'], 2, '?mode=admin&do=users&op=edit&id='.$id); }
+			if(!empty($birthday) && !preg_match("/^(\d{2}-\d{2}-\d{4})?$/", $birthday)){ $this->core->notify($this->core->lng['e_msg'], $this->lng['user_e_incorrect_bday'], 2, '?mode=admin&do=users&op=edit&id='.$id); }
 
 			$birthday = intval(strtotime($birthday));
 
-			if(!$this->exist_group($gid)){ $this->core->notify($this->lng['e_msg'], "Группа не существует", 1, '?mode=admin&do=users&op=edit&id='.$id); }
+			if(!$this->exist_group($gid)){ $this->core->notify($this->core->lng['e_msg'], $this->lng['user_group_not_found'], 1, '?mode=admin&do=users&op=edit&id='.$id); }
 
 			$money = floatval(@$_POST['money']);
 			$realmoney = floatval(@$_POST['realmoney']);
@@ -319,24 +345,42 @@
 											password=$password, `salt`=$salt, `data`='$new_data'
 										WHERE id='$id'");
 
-			if(!$update){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=users&op=edit&id='.$id); }
+			if(!$update){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users&op=edit&id='.$id); }
 			
 			$old_login = $this->db->safesql($ar['login']);
 
+			if(file_exists(MCR_SKIN_PATH.$old_login.'.png')){
+				if(!rename(MCR_SKIN_PATH.$old_login.'.png', MCR_SKIN_PATH.$login.'.png')){
+					$this->core->notify($this->lng["e_msg"], $this->lng['user_e_skin_name'], 2, '?mode=admin&do=users&op=edit&id='.$id);
+				}
+			}
+
+			if(file_exists(MCR_CLOAK_PATH.$old_login.'.png')){
+				if(!rename(MCR_CLOAK_PATH.$old_login.'.png', MCR_CLOAK_PATH.$login.'.png')){
+					$this->core->notify($this->core->lng["e_msg"], $this->lng['user_e_cloak_name'], 2, '?mode=admin&do=users&op=edit&id='.$id);
+				}
+			}
+
 			$update2 = $this->db->query("UPDATE `mcr_iconomy`
 										SET login='$login', `money`='$money', `realmoney`='$realmoney'
 										WHERE login='$old_login'");
 
-			if(!$update2){ $this->core->notify($this->lng["e_msg"], $this->lng["e_sql_critical"], 2, '?mode=admin&do=users&op=edit&id='.$id); }
+			if(!$update2){ $this->core->notify($this->core->lng["e_msg"], $this->core->lng["e_sql_critical"], 2, '?mode=admin&do=users&op=edit&id='.$id); }
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+
+			// Лог действия
+			$this->db->actlog($this->lng['log_edit_user']." #$id ".$this->lng['log_user'], $this->user->id);
 			
-			$this->core->notify($this->lng["e_success"], "Информация о пользователе успешно изменена", 3, '?mode=admin&do=users&op=edit&id='.$id);
+			$this->core->notify($this->core->lng["e_success"], $this->lng['user_edit_success'], 3, '?mode=admin&do=users&op=edit&id='.$id);
 		}
 
 		$birthday = date("d-m-Y", $data->birthday);
 		$gender = (intval($data->gender)==1) ? "selected" : "";
 
 		$data = array(
-			"PAGE" => "Редактирование пользователя",
+			"PAGE" => $this->lng['user_edit_page_name'],
 			"LOGIN" => $this->db->HSC($ar['login']),
 			"EMAIL" => $this->db->HSC($ar['email']),
 			"FIRSTNAME" => $this->db->HSC($data->firstname),
@@ -346,14 +390,10 @@
 			"GROUPS" => $this->groups($ar['gid']),
 			"MONEY" => floatval($ar['money']),
 			"REALMONEY" => floatval($ar['realmoney']),
-			"BUTTON" => "Сохранить"
+			"BUTTON" => $this->lng['user_edit_btn']
 		);
 
-		ob_start();
-		
-		echo $this->core->sp(MCR_THEME_MOD."admin/users/user-add.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."admin/users/user-add.html", $data);
 	}
 
 	private function groups($select=1){
@@ -364,9 +404,9 @@
 									FROM `mcr_groups`
 									ORDER BY title ASC");
 
-		ob_start();
+		if(!$query || $this->db->num_rows($query)<=0){ return; }
 
-		if(!$query || $this->db->num_rows($query)<=0){ return ob_get_clean(); }
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 			$id = intval($ar['id']);
@@ -393,11 +433,7 @@
 			default:		$content = $this->user_list(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/ajax.php b/upload/modules/ajax.php
index b9899a9..785bb74 100644
--- a/upload/modules/ajax.php
+++ b/upload/modules/ajax.php
@@ -4,185 +4,33 @@
 
 class module{
 	private $core, $db, $user, $config, $lng;
+	public $cfg = array();
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
 		$this->user		= $core->user;
 		$this->config	= $core->config;
-		$this->lng		= $core->lng;
-	}
-
-	private function check_login(){
-		if(!isset($_POST['value'])){ exit("Hacking Attempt!"); }
-
-		if(!preg_match("/^[\w\-]{3,}$/i", $_POST['value'])){ exit($this->lng['e_reg_login_regexp']); }
-
-		$login = $this->db->safesql($_POST['value']);
-
-		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_users` WHERE login='$login'");
-
-		if(!$query){ exit($this->lng['e_sql_critical']); }
-
-		$ar = $this->db->fetch_array($query);
-
-		if($ar[0]>0){ exit($this->lng['e_reg_login_exist']); }
-
-		$array = array(
-			"_status" => "success"
-		);
-
-		echo json_encode($array);
-
-		exit;
-	}
-
-	private function check_email(){
-		if(!isset($_POST['value'])){ exit("Hacking Attempt!"); }
-
-		if(!filter_var($_POST['value'], FILTER_VALIDATE_EMAIL)){ exit($this->lng['e_reg_email_regexp']); }
-
-		$email = $this->db->safesql($_POST['value']);
-
-		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_users` WHERE email='$email'");
-
-		if(!$query){ exit($this->lng['e_sql_critical']); }
-
-		$ar = $this->db->fetch_array($query);
-
-		if($ar[0]>0){ exit($this->lng['e_reg_email_exist']); }
-
-		$array = array(
-			"_status" => "success"
-		);
-
-		echo json_encode($array);
-
-		exit;
-	}
-
-	private function get_session(){
-		if(!isset($_GET['name'])){ exit("undefined"); }
-
-		$name = "ajx_".$_GET['name'];
-
-		if(!isset($_SESSION[$name])){ exit("undefined"); }
-
-		exit($_SESSION[$name]."");
-	}
-
-	private function set_session(){
-		if(!isset($_GET['name']) || !isset($_GET['value'])){ exit; }
-
-		$name = "ajx_".$_GET['name'];
-		$value = $_GET['value'];
-
-		$_SESSION[$name] = $value;
-		exit;
-	}
-
-	private function remove_session(){
-		if(!isset($_GET['name'])){ exit("undefined"); }
-
-		$name = "ajx_".$_GET['name'];
-
-		if(!isset($_SESSION[$name])){ exit("undefined"); }
-
-		unset($_SESSION[$name]);
-	}
-
-	private function session(){
-		$op = (isset($_GET['op'])) ? $_GET['op'] : false;
-
-		switch($op){
-			case "get": $this->get_session(); break;
-
-			case "set": $this->set_session(); break;
-
-			case "remove": $this->remove_session(); break;
-		}
-
-		exit("403");
-	}
-
-	private function monitor(){
-		if(!$this->core->is_access("sys_monitoring")){ $this->core->js_notify('Access Denied'); }
-
-		$query = $this->db->query("SELECT id, title, `text`, ip, `port` FROM `mcr_monitoring`");
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->js_notify('Нет доступных серверов'); }
-		
-		$array = array();
-
-		require_once(MCR_TOOL_PATH.'monitoring.class.php');
-
-		$m = new monitoring($this->config->main['mon_type']);
-
-		while($ar = $this->db->fetch_assoc($query)){
-			$address = $this->db->HSC($ar['ip']);
-			$port = intval($ar['port']);
-
-			$m->connect($address, $port);
-
-			$json = json_decode($m->data);
-
-			if($json->status=='online'){
-				$status = 'progress-info';
-				$stats = $json->players.' / '.$json->slots;
-
-				$progress = ($json->players<=0) ? 0 : ceil(100 / ($json->slots / $json->players));
-				
-			}else{
-				$status = 'progress-danger';
-				$stats = 'Сервер оффлайн';
-				$progress = 100;
-			}
-
-			$data = array(
-				"ID" => intval($ar['id']),
-				"TITLE" => $this->db->HSC($ar['title']),
-				"TEXT" => $this->db->HSC($ar['text']),
-				"STATUS" => $status,
-				"STATS" => $stats,
-			);
-
-			$array[] = array(
-				"id" => intval($ar['id']),
-				//"ip" => $address,
-				//"port" => $port,
-				"progress" => $progress,
-				"form" => $this->core->sp(MCR_THEME_BLOCK."monitor/monitor-id.html", $data),
-			);
-
-		}
-
-		$this->core->js_notify('Серверы успешно получены', true, $array);
+		$this->lng		= $core->lng_m;
 	}
 
 	public function content(){
-
-		if($_SERVER['REQUEST_METHOD']=='POST'){
 		
-			$do = (isset($_POST['do'])) ? $_POST['do'] : false;
+		$ajax = (isset($_GET['do'])) ? $_GET['do'] : '';
 
-			switch($do){
-				case 'check_login': $this->check_login(); break;
-				case 'check_email': $this->check_email(); break;
-
-				default: exit("403"); break;
-			}
-
-		}else{
-
-			$do = (isset($_GET['do'])) ? $_GET['do'] : false;
-
-			switch($do){
-				case 'session': $this->session(); break;
-				case 'monitor': $this->monitor(); break;
-
-				default: exit("403"); break;
-			}
-
+		if(!preg_match("/^[\w\.]+$/i", $ajax) || !file_exists(MCR_MODE_PATH.'ajax/'.$ajax.'.php')){
+			$this->core->js_notify('Hacking Attempt!');
 		}
+
+		require_once(MCR_MODE_PATH.'ajax/'.$ajax.'.php');
+
+		if(!class_exists("submodule")){ $this->core->js_notify($this->lng['class_not_found']); }
+
+		$submodule = new submodule($this->core);
+		
+		if(!method_exists($submodule, "content")){ $this->core->js_notify($this->lng['method_not_found']); }
+
+		return $submodule->content();
 	}
 
 }
diff --git a/upload/modules/ajax/admin_modules_status.php b/upload/modules/ajax/admin_modules_status.php
new file mode 100644
index 0000000..43c5788
--- /dev/null
+++ b/upload/modules/ajax/admin_modules_status.php
@@ -0,0 +1,66 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $config, $user, $lng;
+
+	public function __construct($core){
+		$this->core = $core;
+		$this->db	= $core->db;
+		$this->config = $core->config;
+		$this->user	= $core->user;
+		$this->lng	= $core->lng_m;
+	}
+
+	private function change_status($act){
+
+		$ids = @$_POST['ids'];
+
+		$status = ($act=='enable') ? true : false;
+
+		if(empty($ids)){ $this->core->js_notify($this->lng['ams_mod_not_selected']); }
+
+		$ids = explode(',', $ids);
+
+		foreach($ids as $key => $mod){
+			if(!file_exists(MCR_CONF_PATH.'modules/'.$mod.'.php')){ continue; }
+			include(MCR_CONF_PATH.'modules/'.$mod.'.php');
+
+			if(!isset($cfg['MOD_ENABLE'])){ continue; }
+
+			$cfg['MOD_ENABLE'] = $status;
+
+			if(!$this->config->savecfg($cfg, 'modules/'.$mod.'.php', 'cfg')){ continue; }
+		}
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_change_ams'], $this->user->id);
+
+		$this->core->js_notify($this->lng['ok'], $this->lng['ok'], true);
+	}
+
+	public function content(){
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->lng['e_hack']); }
+
+		$act = @$_POST['act'];
+
+		switch($act){
+			case 'enable':
+			case 'disable':
+				$this->change_status($act);
+			break;
+
+			default: $this->core->js_notify($this->lng['e_hack']); break;
+		}
+
+		$this->core->js_notify($this->lng['e_hack']);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/filemanager.php b/upload/modules/ajax/filemanager.php
new file mode 100644
index 0000000..882d88a
--- /dev/null
+++ b/upload/modules/ajax/filemanager.php
@@ -0,0 +1,222 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $user, $config, $lng;
+
+	public function __construct($core){
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->user		= $core->user;
+		$this->config	= $core->config;
+		$this->lng		= $core->lng_m;
+
+		if(!$this->core->is_access('sys_adm_manager')){ $this->core->js_notify($this->core->lng['e_403']); }
+	}
+
+	private function get_files(){
+		$limit = 10;
+		$page = intval(@$_POST['page']);
+		if($page<=0){ $this->core->js_notify($this->lng['fm_file_not_found']); }
+		$page = $page*$limit-$limit;
+
+		$query = $this->db->query("SELECT `f`.id, `f`.`uniq`, `f`.`name`, `f`.`oldname`, `f`.`data`, `f`.uid, `u`.login
+								FROM `mcr_files` AS `f`
+								LEFT JOIN `mcr_users` AS `u`
+									ON `u`.id=`f`.uid
+								ORDER BY `f`.id DESC
+								LIMIT $page, $limit");
+
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->js_notify($this->lng['fm_file_not_found']); }
+
+		$list = array();
+
+		while($ar = $this->db->fetch_assoc($query)){
+			$uniq = $this->db->HSC($ar['uniq']);
+
+			$data = json_decode($ar['data'], true);
+
+			$oldname = $ar['oldname'];
+
+			if(mb_strlen($oldname, "UTF-8")>22){
+				$oldname = mb_substr($ar['oldname'], 0, 10, "UTF-8").'...';
+				$oldname .= mb_substr($ar['oldname'], -9, mb_strlen($ar['oldname'], "UTF-8"), "UTF-8");
+			}
+
+			$list[] = array(
+				'link'		=> BASE_URL.'?mode=file&uniq='.$uniq,
+				'uid'		=> intval($ar['uid']),
+				'login'		=> $this->db->HSC($ar['login']),
+				'oldname'	=> $this->db->HSC($oldname),
+				'date'		=> date('d.m.Y в H:i', $data['date_upload']),
+				'size'		=> floatval($data['size']),
+				'uniq'		=> $uniq,
+				'downloads'	=> intval($data['downloads']),
+			);
+		}
+
+		$this->core->js_notify($this->lng['fm_success_load'], $this->core->lng['e_success'], true, $list);
+	}
+
+	private function upload(){
+		$files = @$_FILES;
+
+		if(empty($files)){ $this->core->js_notify($this->lng['fm_not_selected']); }
+
+		$line = '';
+
+		$result = $errors = array();
+
+		foreach($files as $key => $file){
+			if($file['size'] > 51200000){ continue; }
+
+			switch($file['error']){
+				case 0: break;
+				case 1:
+				case 2: $errors[] = $this->lng['fm_e_size_limit']; break;
+				case 3:
+				case 4: $errors[] = $this->lng['fm_e_load']; break;
+				case 6: $errors[] = $this->lng['fm_e_temp_file']; break;
+				case 7: $errors[] = $this->lng['fm_e_perm']; break;
+				default: $errors[] = $this->lng['fm_e_unknow']; break;
+			}
+
+			if($file['error']!=0){ continue; }
+
+			if(!file_exists($file['tmp_name'])){ $errors[] = $this->lng['fm_e_temp_file']; }
+
+
+			$oldname = $file['name'];
+			$ext = '.'.substr(strrchr($oldname, '.'), 1);
+
+
+			$uniq = $this->core->random(12);
+			$name = md5($this->core->random(12, false)).$ext;
+
+			$safe_uniq = $this->db->safesql($uniq);
+			$safe_name = $this->db->safesql($name);
+			$safe_oldname = $this->db->safesql($oldname);
+			$data = array(
+				"date_upload" => time(),
+				"size" => intval($file['size']),
+				"downloads" => 0,
+			);
+
+			$safe_data = $this->db->safesql(json_encode($data));
+
+			$line .= "('$safe_uniq', '$safe_name', '$safe_oldname', '{$this->user->id}', '$safe_data'),";
+
+			if(!move_uploaded_file($file['tmp_name'], MCR_UPL_PATH.'files/'.$name)){ $errors[] = $this->lng['fm_e_not_loaded']; }
+
+			if(mb_strlen($oldname, "UTF-8")>22){
+				$oldname = mb_substr($file['name'], 0, 10, "UTF-8").'...';
+				$oldname .= mb_substr($file['name'], -9, mb_strlen($file['name'], "UTF-8"), "UTF-8");
+			}
+
+			$result[] = array(
+				'link'		=> BASE_URL.'?mode=file&uniq='.$this->db->HSC($uniq),
+				'uid'		=> intval($this->user->id),
+				'login'		=> $this->db->HSC($this->user->login),
+				'date'		=> date('d.m.Y в H:i', time()),
+				'size'		=> intval($file['size']),
+				'uniq'		=> $this->db->HSC($uniq),
+				'oldname'	=> $this->db->HSC($oldname),
+				'downloads'	=> 0,
+			);
+		}
+
+		if(empty($line)){ $this->core->js_notify($this->lng['fm_e_no_one']); }
+
+		$line = mb_substr($line, 0, -1, "UTF-8");
+
+		$insert = $this->db->query("INSERT INTO `mcr_files`
+										(`uniq`, `name`, `oldname`, `uid`, `data`)
+									VALUES
+										$line");
+
+		if(!$insert){ $this->core->js_notify($this->core->lng["e_sql_critical"]); }
+
+		$array = array(
+			"data" => $result,
+			"errors" => $errors
+		);
+
+		$this->core->js_notify($this->lng['fm_success_upload'], $this->core->lng['e_success'], true, $array);
+	}
+
+	private function remove(){
+		$uniq = $this->db->safesql(@$_POST['id']);
+
+		$query = $this->db->query("SELECT id, `name` FROM `mcr_files` WHERE `uniq`='$uniq'");
+
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->js_notify($this->lng['fm_e_not_found']); }
+
+		$ar = $this->db->fetch_assoc($query);
+
+		$id = intval($ar['id']);
+		$name = $ar['name'];
+
+		if(!$this->db->remove_fast("mcr_files", "id='$id'")){ $this->core->js_notify($this->lng["e_sql_critical"]); }
+
+		if($this->db->affected_rows()<=0){ $this->core->js_notify($this->lng['fm_e_not_deleted']); }
+
+		if(file_exists(MCR_UPL_PATH.'files/'.$name)){ unlink(MCR_UPL_PATH.'files/'.$name); }
+
+		$this->core->js_notify($this->lng['fm_success_del'], $this->core->lng['e_success'], true);
+	}
+
+	private function edit(){
+		$uniq = $this->db->safesql(@$_POST['id']);
+		$value = $this->db->safesql(trim(@$_POST['val']));
+
+		if(empty($value)){ $this->core->js_notify($this->lng['fm_e_uniq']); }
+
+		$query = $this->db->query("SELECT id FROM `mcr_files` WHERE `uniq`='$uniq'");
+
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->js_notify($this->lng['fm_e_not_found']); }
+
+		$ar = $this->db->fetch_assoc($query);
+
+		$id = intval($ar['id']);
+
+		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_files` WHERE `uniq`='$value' AND id!='$id'");
+
+		if(!$query){ $this->core->js_notify($this->core->lng["e_sql_critical"]); }
+
+		$ar = $this->db->fetch_array($query);
+
+		if($ar[0]>0){ $this->core->js_notify($this->lng['fm_e_uniq_exist']); }
+
+		$update = $this->db->query("UPDATE `mcr_files` SET `uniq`='$value' WHERE id='$id'");
+
+		if(!$update){ $this->core->js_notify($this->core->lng["e_sql_critical"]); }
+
+		//http://test16.ru/?mode=file&uniq=Y90HqwIeaYh0
+
+		$data = array(
+			'link' => BASE_URL.'?mode=file&uniq='.$this->db->HSC(@$_POST['val']),
+			'uniq' => $this->db->HSC(@$_POST['val']),
+		);
+
+		$this->core->js_notify($this->lng['fm_success_edit'], $this->core->lng['e_success'], true, $data);
+	}
+
+	public function content(){
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->lng['e_method']); }
+
+		$op = (isset($_GET['op'])) ? $_GET['op'] : 'main';
+
+		switch($op){
+			case 'upload': $this->upload(); break;
+			case 'remove': $this->remove(); break;
+			case 'edit': $this->edit(); break;
+
+			default: $this->get_files(); break;
+		}
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/monitoring.php b/upload/modules/ajax/monitoring.php
new file mode 100644
index 0000000..6631080
--- /dev/null
+++ b/upload/modules/ajax/monitoring.php
@@ -0,0 +1,90 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $user, $config, $lng;
+
+	public function __construct($core){
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->user		= $core->user;
+		$this->config	= $core->config;
+		$this->lng		= $core->lng_m;
+
+		if(!$this->core->is_access('sys_monitoring')){ $this->core->js_notify($this->core->lng['e_403']); }
+	}
+
+	public function content(){
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->lng['e_method']); }
+
+		$time = time();
+
+		$query = $this->db->query("SELECT id, ip, `port`, last_update, updater, `type` FROM `mcr_monitoring`");
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->js_notify($this->lng['mon_empty'], '', true); }
+		
+		$array = $data = array();
+
+		while($r = $this->db->fetch_assoc($query)){
+			if((intval($r['last_update'])+intval($r['updater']))>$time){ continue; }
+
+			$array[] = array(
+				'id' => intval($r['id']),
+				'ip' => $r['ip'],
+				'port' => intval($r['port']),
+				'type' => $r['type'],
+			);
+		}
+
+		if(empty($array)){ $this->core->js_notify($this->lng['mon_empty'], '', true); }
+
+		require_once(MCR_TOOL_PATH.'monitoring.class.php');
+
+		$m = new monitoring();
+
+		foreach($array as $key => $ar){
+
+			if(isset($m->loaded[$ar['type']])){
+				$mon = $m->loaded[$ar['type']];
+			}else{
+				$mon = $m->loading($ar['type']);
+			}
+
+			$mon->connect($ar['ip'], $ar['port']);
+
+			$id = intval($ar['id']);
+
+			$version	= $this->db->safesql($mon->version);
+			$players	= $this->db->safesql($mon->players);
+			$motd		= $this->db->safesql($mon->motd);
+			$plugins	= $this->db->safesql($mon->plugins);
+			$map		= $this->db->safesql($mon->map);
+			$error		= $this->db->safesql($mon->error);
+
+			$update = $this->db->query("UPDATE `mcr_monitoring`
+										SET `status`='{$mon->status}', `version`='$version', online='{$mon->online}',
+											slots='{$mon->slots}', players='$players', motd='$motd', map='$map',
+											plugins='$plugins', last_error='$error', last_update='$time'
+										WHERE id='$id'");
+
+			if(!$update){ continue; }
+
+			$data[] = array(
+				'id' => $id,
+				'online' => $mon->online,
+				'slots' => $mon->slots,
+				'progress' => ($mon->online<=0) ? 0 : ceil(100 / ($mon->slots / $mon->online)),
+				'status' => $mon->status
+			);
+
+			if($mon->status!=1){ $data['progress'] = 100; }
+
+		}
+
+		$this->core->js_notify($this->lng['mon_srv_success'], $this->core->lng['e_success'], true, $data);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/news.php b/upload/modules/ajax/news.php
new file mode 100644
index 0000000..6f8b5cd
--- /dev/null
+++ b/upload/modules/ajax/news.php
@@ -0,0 +1,349 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $config, $user, $lng;
+
+	public function __construct($core){
+		$this->core = $core;
+		$this->db	= $core->db;
+		$this->config = $core->config;
+		$this->user	= $core->user;
+		$this->lng	= $core->lng_m;
+	}
+
+	private function is_discus($nid=1){
+		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_news` WHERE id='$nid' AND discus='1'");
+
+		if(!$query){ return false; }
+
+		$ar = $this->db->fetch_array($query);
+
+		if($ar[0]<=0){ return false; }
+		
+		return true;
+	}
+
+	private function add_comment(){
+
+		if(!$this->core->is_access('sys_comment_add')){ $this->core->js_notify($this->lng['com_perm_add']); }
+
+		$nid = @$_POST['id'];
+		$nid = intval($nid);
+
+		if(!$this->is_discus($nid)){ $this->core->js_notify($this->lng['com_disabled']); }
+
+		$message = @$_POST['message'];
+
+		$message_trim = trim($message);
+
+		if(empty($message_trim)){ $this->core->js_notify($this->lng['com_msg_empty']); }
+
+		if(isset($_SESSION['add_comment'])){
+			if(intval($_SESSION['add_comment'])>time()){
+				$expire = intval($_SESSION['add_comment'])-time();
+				$this->core->js_notify($this->lng['com_wait']." $expire ".$this->lng['com_wait1']);
+			}else{
+				$_SESSION['add_comment'] = time()+30;
+			}
+		}else{
+			$_SESSION['add_comment'] = time()+30;
+		}
+
+		$bb = $this->core->load_bb_class(); // Object
+
+		$text_html		= $bb->parse($message);
+		$safe_text_html	= $this->db->safesql($text_html);
+
+		$text_bb		= $this->db->safesql($message);
+
+		$message_strip = trim(strip_tags($text_html, "<img>"));
+
+		if(empty($message_strip)){ $this->core->js_notify($this->lng['com_msg_incorrect']); }
+
+		$newdata = array(
+			"time_create" => time(),
+			"time_last" => time()
+		);
+
+		$safedata = $this->db->safesql(json_encode($newdata));
+
+		$insert = $this->db->query("INSERT INTO `mcr_comments`
+										(nid, text_html, text_bb, uid, `data`)
+									VALUES
+										('$nid', '$safe_text_html', '$text_bb', '{$this->user->id}', '$safedata')");
+
+		if(!$insert){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		$id = $this->db->insert_id();
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_com_add']." #$id", $this->user->id);
+
+		$act_del = $act_edt = $act_get = '';
+
+		if($this->core->is_access('sys_comment_del') || $this->core->is_access('sys_comment_del_all')){
+			$act_del = $this->core->sp(MCR_THEME_MOD."news/comments/comment-act-del.html", array("ID" => $id));
+		}
+
+		if($this->core->is_access('sys_comment_edt') || $this->core->is_access('sys_comment_edt_all')){
+			$act_edt = $this->core->sp(MCR_THEME_MOD."news/comments/comment-act-edt.html", array("ID" => $id));
+		}
+
+		if($this->user->is_auth){
+			$act_get = $this->core->sp(MCR_THEME_MOD."news/comments/comment-act-get.html", array("ID" => $id));
+		}
+
+		$com_data	= array(
+			"ID"				=> $id,
+			"NID"				=> $nid,
+			"TEXT"				=> $text_html,
+			"UID"				=> $this->user->id,
+			"DATA"				=> $newdata,
+			"LOGIN"				=> $this->db->HSC($this->user->login),
+			"ACTION_DELETE"		=> $act_del,
+			"ACTION_EDIT"		=> $act_edt,
+			"ACTION_QUOTE"		=> $act_get
+		);
+
+		$content = $this->core->sp(MCR_THEME_MOD."news/comments/comment-id.html", $com_data);
+
+		$this->core->js_notify($this->lng['com_add_success'], $this->core->lng['e_success'], true, $content);
+	}
+
+	private function edt_comment(){
+
+		if(!$this->core->is_access('sys_comment_edt') && !$this->core->is_access('sys_comment_edt_all')){ $this->core->js_notify($this->lng['com_perm_edit']); }
+
+		$id = intval(@$_POST['id']);
+
+		$nid = intval(@$_POST['nid']);
+
+		if(!$this->is_discus($nid)){ $this->core->js_notify($this->lng['com_disabled']); }
+
+		$sql_query = "SELECT `data` FROM `mcr_comments` WHERE uid='{$this->user->id}' AND id='$id' AND nid='$nid'";
+
+		if($this->core->is_access('sys_comment_edt_all')){
+			$sql_query = "SELECT `data` FROM `mcr_comments` WHERE id='$id' AND nid='$nid'";
+		}
+
+		$query = $this->db->query($sql_query);
+
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->js_notify($this->core->lng['e_hack']); }
+
+		$ar = $this->db->fetch_assoc($query);
+
+		$data = json_decode($ar['data']);
+
+		$message = @$_POST['message'];
+
+		$message_trim = trim($message);
+
+		if(empty($message_trim)){ $this->core->js_notify($this->lng['com_msg_empty']); }
+
+		$bb = $this->core->load_bb_class(); // Object
+
+		$text_html		= $bb->parse($message);
+		$safe_text_html	= $this->db->safesql($text_html);
+
+		$text_bb		= $this->db->safesql($message);
+
+		$message_strip = trim(strip_tags($text_html, "<img><hr>"));
+
+		if(empty($message_strip)){ $this->core->js_notify($this->lng['com_msg_incorrect']); }
+
+		$newdata = array(
+			"time_create" => $data->time_create,
+			"time_last" => time()
+		);
+
+		$safedata = $this->db->safesql(json_encode($newdata));
+
+		$sql_update = "UPDATE `mcr_comments`
+						SET 
+							text_html='$safe_text_html',
+							text_bb='$text_bb',
+							`data`='$safedata'
+						WHERE id='$id' AND nid='$nid' AND uid='{$this->user->id}'";
+
+		if($this->core->is_access('sys_comment_edt_all')){
+
+			$sql_update = "UPDATE `mcr_comments`
+							SET 
+								text_html='$safe_text_html',
+								text_bb='$text_bb',
+								`data`='$safedata'
+							WHERE id='$id' AND nid='$nid'";
+
+		}
+
+		$update = $this->db->query($sql_update);
+
+		if(!$update){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_com_edit']." #$id", $this->user->id);
+
+		$this->core->js_notify($this->lng['com_edit_success'], $this->core->lng['e_success'], true, $text_html);
+	}
+
+	private function del_comment(){
+
+		if(!$this->core->is_access('sys_comment_del') && !$this->core->is_access('sys_comment_del_all')){ $this->core->js_notify($this->lng['com_perm_del']); }
+
+		$id = @$_POST['id'];
+		$id = intval($id);
+
+		$nid = @$_POST['nid'];
+		$nid = intval($nid);
+
+		$newdata = array(
+			"time_create" => time(),
+			"time_last" => time()
+		);
+
+		$cond = "id='$id' AND nid='$nid' AND uid='{$this->user->id}'";
+
+		if($this->core->is_access('sys_comment_del_all')){
+			$cond = "id='$id' AND nid='$nid'";
+		}
+
+		if(!$this->db->remove_fast("mcr_comments", $cond)){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		if($this->db->affected_rows()<=0){ 
+			$this->core->js_notify($this->lng['com_del_empty']);
+		}
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_com_del']." #$id", $this->user->id);
+
+		$this->core->js_notify($this->lng['com_del_success'], $this->core->lng['e_success'], true);
+	}
+
+	private function get_comment(){
+
+		if(!$this->user->is_auth){ $this->core->js_notify($this->lng['com_unauth']); }
+
+		$id = intval(@$_POST['id']);
+
+		$nid = intval(@$_POST['nid']);
+
+		$query = $this->db->query("SELECT text_bb FROM `mcr_comments` WHERE nid='$nid' AND id='$id'");
+
+		if(!$query){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		if($this->db->num_rows($query)<=0){ $this->core->js_notify($this->core->lng['e_hack']); }
+
+		$ar = $this->db->fetch_assoc($query);
+
+		$this->core->js_notify($this->lng['com_load_success'], $this->core->lng['e_success'], true, $ar['text_bb']);
+	}
+
+	private function like(){
+
+		if(!$this->core->is_access('sys_news_like')){ $this->core->js_notify($this->lng['com_vote_perm']); }
+
+		$nid = intval(@$_POST['nid']);
+
+		$value = intval(@$_POST['value']);
+
+		if($value<0 || $value>1){ $this->core->js_notify($this->core->lng['e_hack']); }
+
+		$query = $this->db->query("SELECT `n`.`vote`, COUNT(DISTINCT `l`.id) AS `likes`, COUNT(DISTINCT `d`.id) AS `dislikes`, `m`.`value`
+									FROM `mcr_news` AS `n`
+									LEFT JOIN `mcr_news_votes` AS `l`
+										ON `l`.nid=`n`.id AND `l`.`value`='1'
+									LEFT JOIN `mcr_news_votes` AS `d`
+										ON `d`.nid=`n`.id AND `d`.`value`='0'
+									LEFT JOIN `mcr_news_votes` AS `m`
+										ON `m`.nid=`n`.id AND (`m`.uid='{$this->user->id}' OR `m`.ip='{$this->user->ip}')
+									WHERE `n`.id='$nid'");
+
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->js_notify($this->core->lng['e_hack']); }
+
+		$ar = $this->db->fetch_assoc($query);
+
+		if(intval($ar['vote'])<=0){ $this->core->js_notify($this->lng['com_vote_disabled']); }
+
+		$likes = intval($ar['likes']);
+		$dislikes = intval($ar['dislikes']);
+
+		$uid = (!$this->user->is_auth) ? -1 : $this->user->id;
+		$time = time();
+
+		$old_value = $ar['value'];
+
+		if(is_null($old_value)){
+			$insert = $this->db->query("INSERT INTO `mcr_news_votes`
+											(nid, uid, `value`, ip, `time`)
+										VALUES
+											('$nid', '$uid', '$value', '{$this->user->ip}', '$time')");
+
+			if(!$insert){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+			$likes = ($value===1) ? $likes+1 : $likes;
+			$dislikes = ($value===0) ? $dislikes+1 : $dislikes;
+		}else{
+			$update = $this->db->query("UPDATE `mcr_news_votes`
+										SET uid='$uid', `value`='$value', `time`='$time'
+										WHERE nid='$nid' AND (uid='{$this->user->id}' OR ip='{$this->user->ip}')
+										LIMIT 1");
+
+			if(!$update){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+			if($value===1){
+				$likes = (intval($old_value)===1) ? $likes : $likes+1;
+				$dislikes = (intval($old_value)===1) ? $dislikes : $dislikes-1;
+			}else{
+				$likes = (intval($old_value)===0) ? $likes : $likes-1;
+				$dislikes = (intval($old_value)===0) ? $dislikes : $dislikes+1;
+			}
+		}
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_com_vote']." #$nid", $this->user->id);
+
+		$data = array(
+			'likes' => $likes,
+			'dislikes' => $dislikes
+		);
+
+		$this->core->js_notify($this->lng['com_vote_success'], $this->core->lng['e_success'], true, $data);
+	}
+
+	public function content(){
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->core->lng['e_hack']); }
+		if(!isset($_POST['act']) || empty($_POST['act'])){ $this->core->js_notify($this->core->lng['e_hack']); }
+
+		$act = $_POST['act'];
+
+		switch($act){
+			case 'add_comment': $this->add_comment(); break;
+			case 'del_comment': $this->del_comment(); break;
+			case 'get_comment': $this->get_comment(); break;
+			case 'edt_comment': $this->edt_comment(); break;
+			case 'like': $this->like(); break;
+
+			default: $this->core->js_notify($this->core->lng['e_hack']); break;
+		}
+
+		exit;
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/news_attach.php b/upload/modules/ajax/news_attach.php
new file mode 100644
index 0000000..7b2a2e1
--- /dev/null
+++ b/upload/modules/ajax/news_attach.php
@@ -0,0 +1,49 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $config, $user, $lng;
+
+	public function __construct($core){
+		$this->core = $core;
+		$this->db	= $core->db;
+		$this->config = $core->config;
+		$this->user	= $core->user;
+		$this->lng	= $core->lng_m;
+	}
+
+	public function content(){
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->core->lng['e_hack']); }
+
+		if(!$this->core->is_access('sys_adm_news')){ $this->core->js_notify($this->core->lng['e_403']); }
+
+		$id = intval(@$_POST['id']);
+
+		$query = $this->db->query("SELECT `attach` FROM `mcr_news` WHERE id='$id'");
+
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->js_notify($this->lng['news_not_found']); }
+
+		$ar = $this->db->fetch_assoc($query);
+
+		$attach = (intval($ar['attach'])==1) ? 0 : 1;
+
+		$update = $this->db->query("UPDATE `mcr_news` SET `attach`='$attach' WHERE id='$id'");
+
+		if(!$update){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		$msg = ($attach===1) ? $this->lng['att_attach'] : $this->lng['att_unattach'];
+
+		// Лог действия
+		$this->db->actlog("$msg ".$this->lng['att_news']." #$id", $this->user->id);
+
+		$this->core->js_notify($this->lng['att_success'], $this->core->lng['e_success'], true);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/news_delete.php b/upload/modules/ajax/news_delete.php
new file mode 100644
index 0000000..f37fa02
--- /dev/null
+++ b/upload/modules/ajax/news_delete.php
@@ -0,0 +1,44 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $config, $user, $lng;
+
+	public function __construct($core){
+		$this->core = $core;
+		$this->db	= $core->db;
+		$this->config = $core->config;
+		$this->user	= $core->user;
+		$this->lng	= $core->lng_m;
+	}
+
+	public function content(){
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->core->lng['e_hack']); }
+
+		if(!$this->core->is_access('sys_adm_news')){ $this->core->js_notify($this->core->lng['e_403']); }
+
+		$id = intval(@$_POST['id']);
+
+		$delete = $this->db->query("DELETE FROM `mcr_news` WHERE id='$id'");
+		if(!$delete){ $this->core->js_notify($this->core->lng['e_sql_critical'].' #'.__LINE__); }
+
+		$delete = $this->db->query("DELETE FROM `mcr_news_views` WHERE nid='$id'");
+		if(!$delete){ $this->core->js_notify($this->core->lng['e_sql_critical'].' #'.__LINE__); }
+
+		$delete = $this->db->query("DELETE FROM `mcr_news_votes` WHERE id='$id'");
+		if(!$delete){ $this->core->js_notify($this->core->lng['e_sql_critical'].' #'.__LINE__); }
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_new_del']." #$id", $this->user->id);
+
+		$this->core->js_notify($this->lng['new_success_del'], $this->core->lng['e_success'], true);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/ajax/register.php b/upload/modules/ajax/register.php
new file mode 100644
index 0000000..fbd393e
--- /dev/null
+++ b/upload/modules/ajax/register.php
@@ -0,0 +1,108 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class submodule{
+	private $core, $db, $config, $user, $lng;
+
+	public function __construct($core){
+		$this->core = $core;
+		$this->db	= $core->db;
+		$this->config = $core->config;
+		$this->user	= $core->user;
+		$this->lng	= $core->lng_m;
+	}
+
+	public function content(){
+
+		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->js_notify($this->core->lng['e_hack']); }
+		
+		if($this->user->is_auth){ $this->core->js_notify($this->lng['reg_e_already']); }
+
+		$login = $this->db->safesql(@$_POST['login']);
+		$email = $this->db->safesql(@$_POST['email']);
+		$password = @$_POST['password'];
+
+		if(intval($_POST['rules'])!==1){ $this->core->js_notify($this->lng['reg_e_rules']); }
+
+		if(!preg_match("/^[\w\-]{3,}$/i", $login)){ $this->core->js_notify($this->lng['reg_e_login_regexp']); }
+		if(!filter_var($email, FILTER_VALIDATE_EMAIL)){ $this->core->js_notify($this->lng['reg_e_email_regexp']); }
+
+		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_users` WHERE login='$login' OR email='$email'");
+
+		if(!$query){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		$ar = $this->db->fetch_array($query);
+
+		if($ar[0]>0){ $this->core->js_notify($this->lng['reg_e_exist']); }
+
+		if(mb_strlen($password, "UTF-8")<6){ $this->core->js_notify($this->lng['reg_e_pass_length']); }
+
+		if($password !== @$_POST['repassword']){ $this->core->js_notify($this->lng['reg_e_pass_match']); }
+
+		if(!$this->core->captcha_check()){ $this->core->js_notify($this->core->lng['e_captcha']); }
+
+		$tmp = $this->db->safesql($this->core->random(16));
+
+		$salt = $this->db->safesql($this->core->random());
+
+		$password = $this->core->gen_password($password, $salt);
+		$password = $this->db->safesql($password);
+
+		$ip = $this->user->ip;
+
+		$gender = (intval($_POST['gender'])===1) ? 1 : 0; 
+
+		$newdata = array(
+			"time_create" => time(),
+			"time_last" => time(),
+			"firstname" => '',
+			"lastname" => '',
+			"gender" => $gender,
+			"birthday" => 0
+		);
+
+		$newdata = $this->db->safesql(json_encode($newdata));
+
+		$gid = ($this->config->main['reg_accept']) ? 1 : 2;
+
+		$notify_message = $this->core->lng['e_success'];
+
+		$insert = $this->db->query("INSERT INTO `mcr_users`
+										(gid, login, email, password, `salt`, `tmp`, ip_create, ip_last, `data`)
+									VALUES
+										('$gid', '$login', '$email', '$password', '$salt', '$tmp', '$ip', '$ip', '$newdata')");
+
+		if(!$insert){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+			
+		$id = $this->db->insert_id();
+
+		$insert1 = $this->db->query("INSERT INTO `mcr_iconomy`
+										(login)
+									VALUES
+										('$login')");
+		if(!$insert1){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_reg'], $id);
+
+		if($this->config->main['reg_accept']){
+			$data_mail = array(
+				"LINK" => $this->config->main['s_root_full'].BASE_URL.'?mode=register&op=accept&key='.$id.'_'.md5($salt),
+				"SITENAME" => $this->config->main['s_name'],
+				"SITEURL" => $this->config->main['s_root_full'].BASE_URL
+			);
+
+			$message = $this->core->sp(MCR_THEME_PATH."modules/register/body.mail.html", $data_mail);
+				
+			if(!$this->core->send_mail($email, $this->lng['reg_title'], $message)){ $this->core->js_notify($this->core->lng['e_sql_critical']); }
+
+			$this->core->js_notify($this->lng['reg_e_success_mail'], $this->core->lng['e_success'], true);
+		}
+
+		$this->core->js_notify($this->lng['reg_e_success'], $this->core->lng['e_success'], true);
+	}
+
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/auth.php b/upload/modules/auth.php
index 7801991..0bd934f 100644
--- a/upload/modules/auth.php
+++ b/upload/modules/auth.php
@@ -4,19 +4,20 @@
 
 class module{
 	private $core, $db, $user, $config, $lng;
+	public $cfg = array();
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
 		$this->user		= $core->user;
 		$this->config	= $core->config;
-		$this->lng		= $core->lng;
+		$this->lng		= $core->lng_m;
 	}
 
 	public function content(){
 		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify('Hacking Attempt!'); }
 		
-		if($this->user->is_auth){ $this->core->notify('', $this->lng["e_auth_already"], 1); }
+		if($this->user->is_auth){ $this->core->notify('', $this->lng["e_already"], 1); }
 
 		$login = $this->db->safesql($_POST['login']);
 		$remember = (isset($_POST['remember']) && intval($_POST['remember'])==1) ? true : false;
@@ -29,7 +30,7 @@
 									WHERE `u`.login='$login'
 									LIMIT 1");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng["e_msg"], $this->lng['e_auth_wrong_pass']); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng["e_msg"], $this->lng['e_wrong_pass']); }
 
 		$ar = $this->db->fetch_assoc($query);
 
@@ -37,7 +38,7 @@
 
 		$password = $this->core->gen_password($_POST['password'], $ar['salt']);
 
-		if($ar['password']!==$password){ $this->core->notify($this->lng["e_msg"], $this->lng['e_auth_wrong_pass']); }
+		if($ar['password']!==$password){ $this->core->notify($this->core->lng["e_msg"], $this->lng['e_wrong_pass']); }
 
 		$permissions = json_decode($ar['permissions'], true);
 
@@ -61,9 +62,9 @@
 									WHERE login='$login' AND password='$password'
 									LIMIT 1");
 
-		if(!$update){ $this->core->notify($this->lng['e_attention'], $this->lng['e_sql_critical']); }
+		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical']); }
 
-		if(!@$permissions['sys_auth']){ $this->core->notify("403", "Вам запрещена авторизация", 2, '?mode=403'); }
+		if(!@$permissions['sys_auth']){ $this->core->notify($this->core->lng['403'], $this->lng['e_access'], 2, '?mode=403'); }
 
 		$new_hash = $uid.$new_tmp.$new_ip.md5($this->config->main['mcr_secury']);
 
@@ -73,7 +74,10 @@
 
 		setcookie("mcr_user", $new_hash, $safetime, '/');
 
-		$this->core->notify($this->lng['e_success'], $this->lng['e_auth_success'], 3);
+		// Лог действия
+		$this->db->actlog($this->lng['log_auth'], $this->user->id);
+
+		$this->core->notify($this->core->lng['e_success'], $this->lng['e_success'], 3);
 	}
 
 }
diff --git a/upload/modules/file.php b/upload/modules/file.php
new file mode 100644
index 0000000..24bc4e9
--- /dev/null
+++ b/upload/modules/file.php
@@ -0,0 +1,65 @@
+<?php
+
+if(!defined("MCR")){ exit("Hacking Attempt!"); }
+
+class module{
+	private $core, $db, $config, $user, $lng;
+	public $cfg = array();
+
+	public function __construct($core){
+		$this->core = $core;
+		$this->db	= $core->db;
+		$this->config = $core->config;
+		$this->user	= $core->user;
+		$this->lng	= $core->lng_m;
+
+		$bc = array(
+			$this->lng['mod_name'] => BASE_URL."?mode=file"
+		);
+
+		$this->core->bc = $this->core->gen_bc($bc);
+	}
+
+	public function content(){
+
+		//$this->core->notify("Доступ запрещен!", "Для доступа к профилю необходима авторизация", 1, "?mode=403");
+
+		$uniq = $this->db->safesql(@$_GET['uniq']);
+
+		$query = $this->db->query("SELECT id, `name`, `data` FROM `mcr_files` WHERE `uniq`='$uniq'");
+
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng['404'], $this->core->lng['t_404'], 1, "?mode=404"); }
+
+		$ar = $this->db->fetch_assoc($query);
+
+		$id = intval($ar['id']);
+		$name = $ar['name'];
+		$data = json_decode($ar['data'], true);
+
+		if(!file_exists(MCR_UPL_PATH.'files/'.$name)){ $this->core->notify($this->core->lng['404'], $this->core->lng['t_404'], 1, "?mode=404"); }
+
+		$ext = '.'.substr(strrchr($name, '.'), 1);
+
+		header('Content-Type: application/octet-stream');
+		header('Cache-Control:no-cache, must-revalidate');
+		header('Expires:0');
+		header('Pragma:no-cache');
+		header('Content-Length:' . filesize(MCR_UPL_PATH.'files/'.$name));
+		header('Content-Disposition: attachment; filename="'.$uniq.$ext.'"');
+		header('Content-Transfer-Encoding:binary');
+
+		readfile(MCR_UPL_PATH.'files/'.$name);
+
+		$data['downloads']++;
+
+		$data = $this->db->safesql(json_encode($data));
+
+		$update = $this->db->query("UPDATE `mcr_files` SET `data`='$data' WHERE id='$id'");
+
+		if(!$update){ $this->core->notify($this->core->lng['e_msg'], $this->core->lng['e_sql_critical'], 1, "?mode=403"); }
+
+		exit;
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/upload/modules/logout.php b/upload/modules/logout.php
index bfec6bf..5c35da7 100644
--- a/upload/modules/logout.php
+++ b/upload/modules/logout.php
@@ -4,18 +4,19 @@
 
 class module{
 	private $core, $db, $user, $lng;
+	public $cfg = array();
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
 		$this->user		= $core->user;
-		$this->lng		= $core->lng;
+		$this->lng		= $core->lng_m;
 	}
 
 	public function content(){
 		if($_SERVER['REQUEST_METHOD']!='POST'){ $this->core->notify('Hacking Attempt!'); }
 
-		if(!$this->user->is_auth){ $this->core->notify('403', $this->lng['e_unauth_not'], 1, '?mode=403'); }
+		if(!$this->user->is_auth){ $this->core->notify($this->core->lng['403'], $this->lng['e_not_auth'], 1, '?mode=403'); }
 
 		$new_data = array(
 			"time_create" => intval($this->user->data->time_create),
@@ -26,16 +27,22 @@
 			"birthday" => $this->user->data->birthday
 		);
 
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
+
+		// Лог действия
+		$this->db->actlog($this->lng['log_logout'], $this->user->id);
+
 		$new_data = $this->db->safesql(json_encode($new_data));
 		$new_tmp = $this->db->safesql($this->core->random(16));
 
 		$update = $this->db->query("UPDATE `mcr_users` SET `tmp`='$new_tmp', `data`='$new_data' WHERE id='{$this->user->id}' LIMIT 1");
 
-		if(!$update){ $this->core->notify($this->lng['e_attention'], $this->lng['e_sql_critical']); }
+		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical']); }
 
 		setcookie("mcr_user", "", time()-3600, '/');
 
-		$this->core->notify('', $this->lng['e_unauth_yes'], 1);
+		$this->core->notify('', $this->lng['e_success'], 1);
 	}
 
 }
diff --git a/upload/modules/news.php b/upload/modules/news.php
index 9e6f86a..787dcdd 100644
--- a/upload/modules/news.php
+++ b/upload/modules/news.php
@@ -4,19 +4,19 @@
 
 class module{
 	private $core, $db, $config, $user, $lng;
+	public $cfg = array();
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->config	= $core->config;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		$bc = array(
-			"Новости" => BASE_URL."?mode=news"
+			$this->lng['mod_name'] => BASE_URL."?mode=news"
 		);
 
-		$this->core->title = "Новости";
 		$this->core->bc = $this->core->gen_bc($bc);
 	}
 
@@ -42,6 +42,17 @@
 
 	}
 
+	private function get_admin($id, $attach){
+		if(!$this->core->is_access('sys_adm_news')){ return; }
+
+		$data = array(
+			'ID' => $id,
+			'ATTACH' => ($attach==1) ? $this->lng['unattach'] : $this->lng['attach']
+		);
+
+		return $this->core->sp(MCR_THEME_MOD."news/new-admin.html", $data);
+	}
+
 	private function news_array($cid=false){
 
 		$start		= $this->core->pagination($this->config->pagin['news'], 0, 0); // Set start pagination
@@ -75,9 +86,11 @@
 		if(!$query || $this->db->num_rows($query)<=0){ echo $this->core->sp(MCR_THEME_MOD."news/new-none.html"); return ob_get_clean(); }
 
 		while($ar = $this->db->fetch_assoc($query)){
+			$id = intval($ar['id']);
+			$attach = intval($ar['attach']);
 
 			$new_data	= array(
-				"ID"		=> intval($ar['id']),
+				"ID"		=> $id,
 				"CID"		=> intval($ar['cid']),
 				"TITLE"		=> $this->db->HSC($ar['title']),
 				"CATEGORY"	=> $this->db->HSC($ar['category']),
@@ -86,20 +99,21 @@
 				"COMMENTS"	=> $this->get_comments($ar['discus'], $ar['comments']),
 				"VIEWS"		=> intval($ar['views']),
 				"DATA"		=> json_decode($ar['data'], true),
-				"LIKES"		=> $this->get_likes($ar['vote'], $ar['id'], $ar['likes'], $ar['dislikes'])
+				"LIKES"		=> $this->get_likes($ar['vote'], $id, $ar['likes'], $ar['dislikes']),
+				"ADMIN"		=> $this->get_admin($id, $attach),
 			);
 
-			$attached = (intval($ar['attach'])==1) ? '-attached' : '';
+			$attached = ($attach==1) ? '-attached' : '';
 
 			echo $this->core->sp(MCR_THEME_MOD."news/new-id".$attached.".html", $new_data);
 		}
 
 		if($cid!==false){
 			$bc = array(
-				"Новости" => BASE_URL."?mode=news",
+				$this->lng['mod_name'] => BASE_URL."?mode=news",
 				$new_data['CATEGORY'] => BASE_URL."?mode=news&cid=$cid"
 			);
-			$this->core->title = "Новости — ".$new_data["CATEGORY"];
+
 			$this->core->bc = $this->core->gen_bc($bc);
 		}
 
@@ -108,7 +122,7 @@
 
 	private function news_list($cid=false){
 
-		if(!$this->core->is_access('sys_news_list')){ $this->core->notify("403", "У вас нет доступа для просмотра списка новостей", 2, "?mode=403"); }
+		if(!$this->core->is_access('sys_news_list')){ $this->core->notify($this->core->lng['403'], $this->lng['access_denied'], 2, "?mode=403"); }
 
 		$sql	= "SELECT COUNT(*) FROM `mcr_news`";
 		$page	= "?mode=news&pid=";
@@ -130,20 +144,14 @@
 			"NEWS" => $this->news_array($cid)
 		);
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_MOD."news/new-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."news/new-list.html", $data);
 
 	}
 
 	private function comments_array($nid=1){
 
 		if(!$this->core->is_access('sys_comment_list')){
-			ob_start();
-			echo $this->core->sp(MCR_THEME_MOD."news/comments/comment-access.html");
-			return ob_get_clean();
+			return $this->core->sp(MCR_THEME_MOD."news/comments/comment-access.html");
 		}
 
 		$start		= $this->core->pagination($this->config->pagin['comments'], 0, 0); // Set start pagination
@@ -156,10 +164,11 @@
 									WHERE `c`.nid='$nid'
 									ORDER BY `c`.id DESC
 									LIMIT $start, $end");
+
+		if(!$query || $this->db->num_rows($query)<=0){ return $this->core->sp(MCR_THEME_MOD."news/comments/comment-none.html"); }
+
 		ob_start();
-
-		if(!$query || $this->db->num_rows($query)<=0){ echo $this->core->sp(MCR_THEME_MOD."news/comments/comment-none.html"); return ob_get_clean(); }
-
+		
 		while($ar = $this->db->fetch_assoc($query)){
 			//$vote		= intval($ar['vote']);
 			//$data		= json_decode($ar['data'], true);
@@ -207,11 +216,7 @@
 
 		$data['BB_PANEL'] = $bb->bb_panel('bb-comments');
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_MOD."news/comments/comment-form.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."news/comments/comment-form.html", $data);
 	}
 
 	private function comments_list($nid=1){
@@ -234,11 +239,7 @@
 			"COMMENTS_FORM"	=> $this->get_comment_form()
 		);
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_MOD."news/comments/comment-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."news/comments/comment-list.html", $data);
 	}
 
 	private function update_views($nid){
@@ -246,7 +247,7 @@
 									FROM `mcr_news_views`
 									WHERE nid='$nid' AND (uid='{$this->user->id}' OR ip='{$this->user->ip}')");
 
-		if(!$query){ $this->core->notify($this->lng['e_sql_critical']); }
+		if(!$query){ $this->core->notify($this->core->lng['e_sql_critical']); }
 
 		$ar = $this->db->fetch_array($query);
 
@@ -260,7 +261,10 @@
 									(nid, uid, ip, `time`)
 									VALUES
 									('$nid', '$uid', '{$this->user->ip}', '$time')");
-		if(!$insert){ $this->core->notify($this->lng['e_sql_critical']); }
+		if(!$insert){ $this->core->notify($this->core->lng['e_sql_critical']); }
+
+		// Последнее обновление пользователя
+		$this->db->update_user($this->user);
 		
 		$_SESSION['views-new-'.$nid] = true;
 
@@ -269,7 +273,7 @@
 
 	private function news_full(){
 		
-		if(!$this->core->is_access('sys_news_full')){ $this->core->notify("403", "У вас нет доступа для просмотра новостей", 2, "?mode=403"); }
+		if(!$this->core->is_access('sys_news_full')){ $this->core->notify($this->core->lng['403'], $this->lng['access_denied'], 2, "?mode=403"); }
 
 		$id = intval($_GET['id']);
 
@@ -285,13 +289,13 @@
 									LEFT JOIN `mcr_news_votes` AS `d`
 										ON `d`.nid=`n`.id AND `d`.`value`='0'
 									WHERE `n`.id='$id'");
-		ob_start();
+		
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify("404", $this->lng['t_404']); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng['404'], $this->core->lng['t_404']); }
 
 		$ar = $this->db->fetch_assoc($query);
 
-		if(is_null($ar['id'])){ $this->core->notify("404", $this->lng['t_404']); }
+		if(is_null($ar['id'])){ $this->core->notify($this->core->lng['404'], $this->core->lng['t_404']); }
 
 		if(!isset($_SESSION['views-new-'.$id])){
 			$this->update_views($id);
@@ -299,8 +303,10 @@
 
 		$comments = (intval($ar['discus']) === 1) ? $this->comments_list($id) : $this->core->sp(MCR_THEME_MOD."news/comments/comment-closed.html");;
 
+		$attach = intval($ar['attach']);
+
 		$new_data = array(
-			"ID"			=> intval($ar['id']),
+			"ID"			=> $id,
 			"CID"			=> intval($ar['cid']),
 			"TITLE"			=> $this->db->HSC($ar['title']),
 			"TEXT"			=> $ar['text_html'],
@@ -309,53 +315,45 @@
 			"CATEGORY"		=> $this->db->HSC($ar['category']),
 			"VIEWS"			=> intval($ar['views']),
 			"COMMENTS"		=> $comments,
-			"LIKES"			=> $this->get_likes($ar['vote'], $id, $ar['likes'], $ar['dislikes'])
+			"LIKES"			=> $this->get_likes($ar['vote'], $id, $ar['likes'], $ar['dislikes']),
+			"ADMIN"			=> $this->get_admin($id, $attach),
 		);
 
 		$bc = array(
-			"Новости" => BASE_URL."?mode=news",
+			$this->lng['mod_name'] => BASE_URL."?mode=news",
 			$new_data["CATEGORY"] => BASE_URL."?mode=news&cid=".$new_data["CID"],
 			$new_data["TITLE"] => ""
 		);
-
-		$this->core->title = "Новости — ".$new_data["CATEGORY"]." — ".$new_data['TITLE'];
+		
 		$this->core->bc = $this->core->gen_bc($bc);
 
-		echo $this->core->sp(MCR_THEME_MOD."news/new-full.html", $new_data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."news/new-full.html", $new_data);
 	}
 
 	public function content(){
 
 		if(isset($_GET['id'])){
-			$this->core->header = $this->core->sp(MCR_THEME_MOD."news/header-full.html");
+			$this->core->header .= $this->core->sp(MCR_THEME_MOD."news/header-full.html");
 
 			$content = $this->news_full();
 
 		}elseif(isset($_GET['cid'])){
-			$this->core->header = $this->core->sp(MCR_THEME_MOD."news/header-list.html");
+			$this->core->header .= $this->core->sp(MCR_THEME_MOD."news/header-list.html");
 
 			$content = $this->news_list($_GET['cid']);
 
-		}elseif(isset($_GET['ajax'])){
-
-			require_once(MCR_MODE_PATH.'news/ajax.class.php');
-			$ajax = new submodule($this->core);
-			$content = $ajax->content();
-
 		}else{
-			$this->core->header = $this->core->sp(MCR_THEME_MOD."news/header-list.html");
+			$this->core->header .= $this->core->sp(MCR_THEME_MOD."news/header-list.html");
 
 			$content = $this->news_list();
 
 		}
 
-		ob_start();
+		if($this->core->is_access('sys_adm_news')){
+			$this->core->header .= $this->core->sp(MCR_THEME_MOD."news/header-admin.html");
+		}
 
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 }
 
diff --git a/upload/modules/news/ajax.class.php b/upload/modules/news/ajax.class.php
deleted file mode 100644
index a592da3..0000000
--- a/upload/modules/news/ajax.class.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-
-if(!defined("MCR")){ exit("Hacking Attempt!"); }
-
-class submodule{
-	private $core, $db, $config, $user, $lng;
-
-	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng;
-	}
-
-	private function is_discus($nid=1){
-		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_news` WHERE id='$nid' AND discus='1'");
-
-		if(!$query){ return false; }
-
-		$ar = $this->db->fetch_array($query);
-
-		if($ar[0]<=0){ return false; }
-		
-		return true;
-	}
-
-	private function notify($message='', $status='error'){
-		$return = array(
-			"_status" => $status,
-			"_content" => $message
-		);
-
-		echo json_encode($return);
-
-		exit;
-	}
-
-	private function add_comment(){
-
-		if(!$this->core->is_access('sys_comment_add')){ $this->notify("У вас нет доступа для добалвения комментариев"); }
-
-		$nid = @$_POST['id'];
-		$nid = intval($nid);
-
-		if(!$this->is_discus($nid)){ $this->notify("Комментарии отключены для данной новости"); }
-
-		$message = @$_POST['message'];
-
-		$message_trim = trim($message);
-
-		if(empty($message_trim)){ $this->notify("Не заполнено поле \"Сообщение\""); }
-
-		if(isset($_SESSION['add_comment'])){
-			if(intval($_SESSION['add_comment'])>time()){
-				$expire = intval($_SESSION['add_comment'])-time();
-				$this->notify("Для повторного добовления комментария необходимо подождать $expire сек.", 'error');
-			}else{
-				$_SESSION['add_comment'] = time()+30;
-			}
-		}else{
-			$_SESSION['add_comment'] = time()+30;
-		}
-
-		$bb = $this->core->load_bb_class(); // Object
-
-		$text_bb		= $this->db->HSC($message);
-		$text_html		= $bb->decode($text_bb);
-		$safe_text_html	= $this->db->safesql($text_html);
-
-		$text_bb		= $this->db->safesql($text_bb);
-
-		$message_strip = trim(strip_tags($text_html, "<img>"));
-
-		if(empty($message_strip)){ $this->notify("Не верно заполнено поле сообщения"); }
-
-		$newdata = array(
-			"time_create" => time(),
-			"time_last" => time()
-		);
-
-		$safedata = $this->db->safesql(json_encode($newdata));
-
-		$insert = $this->db->query("INSERT INTO `mcr_comments`
-										(nid, text_html, text_bb, uid, `data`)
-									VALUES
-										('$nid', '$safe_text_html', '$text_bb', '{$this->user->id}', '$safedata')");
-
-		if(!$insert){ $this->notify($this->lng['e_sql_critical']); }
-
-		$id = $this->db->insert_id();
-
-		$act_del = $act_edt = $act_get = '';
-
-		if($this->core->is_access('sys_comment_del') || $this->core->is_access('sys_comment_del_all')){
-			$act_del = $this->core->sp(MCR_THEME_MOD."news/comments/comment-act-del.html", array("ID" => $id));
-		}
-
-		if($this->core->is_access('sys_comment_edt') || $this->core->is_access('sys_comment_edt_all')){
-			$act_edt = $this->core->sp(MCR_THEME_MOD."news/comments/comment-act-edt.html", array("ID" => $id));
-		}
-
-		if($this->user->is_auth){
-			$act_get = $this->core->sp(MCR_THEME_MOD."news/comments/comment-act-get.html", array("ID" => $id));
-		}
-
-		$com_data	= array(
-			"ID"				=> $id,
-			"NID"				=> $nid,
-			"TEXT"				=> $text_html,
-			"UID"				=> $this->user->id,
-			"DATA"				=> $newdata,
-			"LOGIN"				=> $this->db->HSC($this->user->login),
-			"ACTION_DELETE"		=> $act_del,
-			"ACTION_EDIT"		=> $act_edt,
-			"ACTION_QUOTE"		=> $act_get
-		);
-
-		$content = $this->core->sp(MCR_THEME_MOD."news/comments/comment-id.html", $com_data);
-
-		$this->notify($content, 'success');
-
-		exit;
-	}
-
-	private function del_comment(){
-
-		if(!$this->core->is_access('sys_comment_del') && !$this->core->is_access('sys_comment_del_all')){ $this->notify("У вас нет прав на удаление комментариев"); }
-
-		$id = @$_POST['id'];
-		$id = intval($id);
-
-		$nid = @$_POST['nid'];
-		$nid = intval($nid);
-
-		$newdata = array(
-			"time_create" => time(),
-			"time_last" => time()
-		);
-
-		$sql = "DELETE FROM `mcr_comments` WHERE id='$id' AND nid='$nid' AND uid='{$this->user->id}'";
-
-		if($this->core->is_access('sys_comment_del_all')){
-			$sql = "DELETE FROM `mcr_comments` WHERE id='$id' AND nid='$nid'";
-		}
-
-		$delete = $this->db->query($sql);
-
-		if(!$delete){ $this->notify($this->lng['e_sql_critical']); }
-
-		if($this->db->affected_rows()<=0){ 
-			$this->notify("Ничего не удалено");
-		}
-
-		$this->notify("Выбранный комментарий успешно удален", 'success');
-
-		exit;
-	}
-
-	private function get_comment(){
-
-		if(!$this->user->is_auth){ $this->notify("У вас нет прав на цитирование"); }
-
-		$id = @$_POST['id'];
-		$id = intval($id);
-
-		$nid = @$_POST['nid'];
-		$nid = intval($nid);
-
-		$query = $this->db->query("SELECT text_bb FROM `mcr_comments` WHERE nid='$nid' AND id='$id'");
-
-		if(!$query){ $this->notify($this->lng['e_sql_critical']); }
-
-		if($this->db->num_rows($query)<=0){ $this->notify($this->lng['e_hack']); }
-
-		$ar = $this->db->fetch_assoc($query);
-
-		$text_bb = $this->db->HSC($ar['text_bb']);
-
-		$this->notify($text_bb, 'success');
-
-		exit;
-	}
-
-	private function edt_comment(){
-
-		if(!$this->core->is_access('sys_comment_edt') && !$this->core->is_access('sys_comment_edt_all')){ $this->notify("У вас нет доступа для изменения комментариев"); }
-
-		$id = @$_POST['id'];
-		$id = intval($id);
-
-		$nid = @$_POST['nid'];
-		$nid = intval($nid);
-
-		if(!$this->is_discus($nid)){ $this->notify("Комментарии отключены для данной новости"); }
-
-		$sql_query = "SELECT `data` FROM `mcr_comments` WHERE uid='{$this->user->id}' AND id='$id' AND nid='$nid'";
-
-		if($this->core->is_access('sys_comment_edt_all')){
-			$sql_query = "SELECT `data` FROM `mcr_comments` WHERE id='$id' AND nid='$nid'";
-		}
-
-		$query = $this->db->query($sql_query);
-
-		if(!$query || $this->db->num_rows($query)<=0){ $this->notify($this->lng['e_hack']); }
-
-		$ar = $this->db->fetch_assoc($query);
-
-		$data = json_decode($ar['data']);
-
-		$message = @$_POST['message'];
-
-		$message_trim = trim($message);
-
-		if(empty($message_trim)){ $this->notify("Не заполнено поле \"Сообщение\""); }
-
-		$bb = $this->core->load_bb_class(); // Object
-
-		$text_bb		= $this->db->HSC($message);
-		$text_html		= $bb->decode($text_bb);
-		$safe_text_html	= $this->db->safesql($text_html);
-
-		$text_bb		= $this->db->safesql($text_bb);
-
-		$message_strip = trim(strip_tags($text_html, "<img>"));
-
-		if(empty($message_strip)){ $this->notify("Не верно заполнено поле сообщения"); }
-
-		$newdata = array(
-			"time_create" => $data->time_create,
-			"time_last" => time()
-		);
-
-		$safedata = $this->db->safesql(json_encode($newdata));
-
-		$sql_update = "UPDATE `mcr_comments`
-						SET 
-							text_html='$safe_text_html',
-							text_bb='$text_bb',
-							`data`='$safedata'
-						WHERE id='$id' AND nid='$nid' AND uid='{$this->user->id}'";
-
-		if($this->core->is_access('sys_comment_edt_all')){
-
-			$sql_update = "UPDATE `mcr_comments`
-							SET 
-								text_html='$safe_text_html',
-								text_bb='$text_bb',
-								`data`='$safedata'
-							WHERE id='$id' AND nid='$nid'";
-
-		}
-
-		$update = $this->db->query($sql_update);
-
-		if(!$update){ $this->notify($this->lng['e_sql_critical']); }
-
-		$this->notify($text_html, 'success');
-
-		exit;
-	}
-
-	private function like(){
-
-		if(!$this->core->is_access('sys_news_like')){ $this->notify("У вас нет доступа для голосования"); }
-
-		$nid = @$_POST['nid'];
-		$nid = intval($nid);
-
-		$value = @$_POST['value'];
-		$value = intval($value);
-
-		if($value<0 || $value>1){ $this->notify($this->lng['e_hack']); }
-
-		$query = $this->db->query("SELECT `n`.`vote`, COUNT(DISTINCT `l`.id) AS `likes`, COUNT(DISTINCT `d`.id) AS `dislikes`, `m`.`value`
-									FROM `mcr_news` AS `n`
-									LEFT JOIN `mcr_news_votes` AS `l`
-										ON `l`.nid=`n`.id AND `l`.`value`='1'
-									LEFT JOIN `mcr_news_votes` AS `d`
-										ON `d`.nid=`n`.id AND `d`.`value`='0'
-									LEFT JOIN `mcr_news_votes` AS `m`
-										ON `m`.nid=`n`.id AND (`m`.uid='{$this->user->id}' OR `m`.ip='{$this->user->ip}')
-									WHERE `n`.id='$nid'");
-
-		if(!$query || $this->db->num_rows($query)<=0){ $this->notify($this->lng['e_hack']); }
-
-		$ar = $this->db->fetch_assoc($query);
-
-		if(intval($ar['vote'])<=0){ $this->notify("Голосование для данной новости отключено"); }
-
-		$likes = intval($ar['likes']);
-		$dislikes = intval($ar['dislikes']);
-
-		$uid = (!$this->user->is_auth) ? -1 : $this->user->id;
-		$time = time();
-
-		$old_value = $ar['value'];
-
-		if(is_null($old_value)){
-			$insert = $this->db->query("INSERT INTO `mcr_news_votes`
-											(nid, uid, `value`, ip, `time`)
-										VALUES
-											('$nid', '$uid', '$value', '{$this->user->ip}', '$time')");
-
-			if(!$insert){ $this->notify($this->lng['e_sql_critical']); }
-
-			$likes = ($value===1) ? $likes+1 : $likes;
-			$dislikes = ($value===0) ? $dislikes+1 : $dislikes;
-		}else{
-			$update = $this->db->query("UPDATE `mcr_news_votes`
-										SET uid='$uid', `value`='$value', `time`='$time'
-										WHERE nid='$nid' AND (uid='{$this->user->id}' OR ip='{$this->user->ip}')
-										LIMIT 1");
-
-			if(!$update){ $this->notify($this->lng['e_sql_critical']); }
-
-			if($value===1){
-				$likes = (intval($old_value)===1) ? $likes : $likes+1;
-				$dislikes = (intval($old_value)===1) ? $dislikes : $dislikes-1;
-			}else{
-				$likes = (intval($old_value)===0) ? $likes : $likes-1;
-				$dislikes = (intval($old_value)===0) ? $dislikes : $dislikes+1;
-			}
-		}
-
-		$content = $dislikes.'_'.$likes;
-
-		$this->notify($content, 'success');
-
-		exit;
-	}
-
-	public function content(){
-
-		if($_SERVER['REQUEST_METHOD']!='POST'){ exit($this->lang['e_hack']); }
-		if(!isset($_POST['act']) || empty($_POST['act'])){ exit($this->lang['e_hack']); }
-
-		$act = $_POST['act'];
-
-		switch($act){
-			case 'add_comment': $this->add_comment(); break;
-			case 'del_comment': $this->del_comment(); break;
-			case 'get_comment': $this->get_comment(); break;
-			case 'edt_comment': $this->edt_comment(); break;
-			case 'like': $this->like(); break;
-
-			default: exit($this->lang['e_hack']); break;
-		}
-
-		exit;
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/upload/modules/profile.php b/upload/modules/profile.php
index 5dc4ba4..91a4b2c 100644
--- a/upload/modules/profile.php
+++ b/upload/modules/profile.php
@@ -4,25 +4,24 @@
 
 class module{
 	private $core, $db, $config, $user, $lng;
+	public $cfg = array();
 
 	public function __construct($core){
 		$this->core = $core;
 		$this->db	= $core->db;
 		$this->config = $core->config;
 		$this->user	= $core->user;
-		$this->lng	= $core->lng;
-
-		$this->core->title = $this->lng['t_profile'];
+		$this->lng	= $core->lng_m;
 
 		$bc = array(
-			$this->lng['t_profile'] => BASE_URL."?mode=profile"
+			$this->lng['mod_name'] => BASE_URL."?mode=profile"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
 	}
 
 	private function delete_skin(){
-		if(!$this->user->is_skin){ $this->core->notify("", "Скин не установлен", 1, '?mode=profile'); }
+		if(!$this->user->is_skin){ $this->core->notify("", $this->lng['skin_not_set'], 1, '?mode=profile'); }
 
 			unlink(MCR_SKIN_PATH.$this->user->skin.'.png');
 			unlink(MCR_SKIN_PATH.'interface/'.$this->user->skin.'.png');
@@ -40,15 +39,18 @@
 		}
 		
 		$update = $this->db->query("UPDATE `mcr_users` SET is_skin='0' WHERE id='{$this->user->id}'");
-		if(!$update){ $this->core->notify($this->lng['e_attention'], $this->lng['e_sql_critical']); }
+		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical']); }
 
-		$this->core->notify($this->lng['e_success'], "Ваш скин успешно удален", 3, '?mode=profile');
+		// Лог действия
+		$this->db->actlog($this->lng['log_delete'], $this->user->id);
+
+		$this->core->notify($this->core->lng['e_success'], $this->lng['skin_success_del'], 3, '?mode=profile');
 
 	}
 
 	private function delete_cloak(){
 
-		if(!$this->user->is_cloak){ $this->core->notify("", "Плащ не установлен", 1, '?mode=profile'); }
+		if(!$this->user->is_cloak){ $this->core->notify("", $this->lng['cloak_not_set'], 1, '?mode=profile'); }
 
 		unlink(MCR_CLOAK_PATH.$this->user->login.'.png');
 
@@ -69,9 +71,12 @@
 		}
 		
 		$update = $this->db->query("UPDATE `mcr_users` SET is_cloak='0' WHERE id='{$this->user->id}'");
-		if(!$update){ $this->core->notify($this->lng['e_attention'], $this->lng['e_sql_critical']); }
+		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical']); }
 
-		$this->core->notify($this->lng['e_success'], "Ваш плащ успешно удален", 3, '?mode=profile');
+		// Лог действия
+		$this->db->actlog($this->lng['log_delete_cl'], $this->user->id);
+
+		$this->core->notify($this->core->lng['e_success'], $this->lng['cloak_success_del'], 3, '?mode=profile');
 
 	}
 
@@ -92,9 +97,12 @@
 
 		$update = $this->db->query("UPDATE `mcr_users` SET is_skin='1' WHERE id='{$this->user->id}'");
 
-		if(!$update){ $this->core->notify($this->lng['e_attention'], $this->lng['e_sql_critical']); }
+		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical']); }
 
-		$this->core->notify($this->lng['e_success'], "Ваш скин успешно изменен", 3, '?mode=profile');
+		// Лог действия
+		$this->db->actlog($this->lng['log_edit_sk'], $this->user->id);
+
+		$this->core->notify($this->core->lng['e_success'], $this->lng['skin_success_edit'], 3, '?mode=profile');
 	}
 
 	private function upload_cloak(){
@@ -103,16 +111,19 @@
 
 		$update = $this->db->query("UPDATE `mcr_users` SET is_cloak='1' WHERE id='{$this->user->id}'");
 
-		if(!$update){ $this->core->notify($this->lng['e_attention'], $this->lng['e_sql_critical']); }
+		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical']); }
 
-		$this->core->notify($this->lng['e_success'], "Ваш плащ успешно изменен", 3, '?mode=profile');
+		// Лог действия
+		$this->db->actlog($this->lng['log_edit_cl'], $this->user->id);
+
+		$this->core->notify($this->core->lng['e_success'], $this->lng['cloak_success_edit'], 3, '?mode=profile');
 	}
 
 	private function settings(){
 
-		if(!empty($_POST['firstname']) && !preg_match("/^[a-zа-яА-ЯёЁ]+$/iu", $_POST['firstname'])){ $this->core->notify($this->lng['e_msg'], $this->lng['e_valid_fname'], 2, '?mode=profile'); }
-		if(!empty($_POST['lastname']) && !preg_match("/^[a-zа-яА-ЯёЁ]+$/iu", $_POST['lastname'])){ $this->core->notify($this->lng['e_msg'], $this->lng['e_valid_lname'], 2, '?mode=profile'); }
-		if(!empty($_POST['birthday']) && !preg_match("/^(\d{2}-\d{2}-\d{4})?$/", $_POST['birthday'])){ $this->core->notify($this->lng['e_msg'], $this->lng['e_valid_bday'], 2, '?mode=profile'); }
+		if(!empty($_POST['firstname']) && !preg_match("/^[a-zа-яА-ЯёЁ]+$/iu", $_POST['firstname'])){ $this->core->notify($this->core->lng['e_msg'], $this->lng['e_valid_fname'], 2, '?mode=profile'); }
+		if(!empty($_POST['lastname']) && !preg_match("/^[a-zа-яА-ЯёЁ]+$/iu", $_POST['lastname'])){ $this->core->notify($this->core->lng['e_msg'], $this->lng['e_valid_lname'], 2, '?mode=profile'); }
+		if(!empty($_POST['birthday']) && !preg_match("/^(\d{2}-\d{2}-\d{4})?$/", $_POST['birthday'])){ $this->core->notify($this->core->lng['e_msg'], $this->lng['e_valid_bday'], 2, '?mode=profile'); }
 
 		$firstname = @$_POST['firstname'];
 		$lastname = @$_POST['lastname'];
@@ -126,9 +137,9 @@
 			$old_pass = @$_POST['oldpass'];
 			$old_pass = $this->core->gen_password($old_pass, $this->user->salt);
 
-			if($old_pass !== $this->user->password){ $this->core->notify($this->lng['e_msg'], $this->lng['e_valid_oldpass'], 2, '?mode=profile'); }
+			if($old_pass !== $this->user->password){ $this->core->notify($this->core->lng['e_msg'], $this->lng['e_valid_oldpass'], 2, '?mode=profile'); }
 
-			if($_POST['newpass'] !== @$_POST['repass']){ $this->core->notify($this->lng['e_msg'], $this->lng['e_valid_repass'], 2, '?mode=profile'); }
+			if($_POST['newpass'] !== @$_POST['repass']){ $this->core->notify($this->core->lng['e_msg'], $this->lng['e_valid_repass'], 2, '?mode=profile'); }
 			
 			$newsalt = $this->db->safesql($this->core->random());
 			$newpass = $this->db->safesql($this->core->gen_password($_POST['newpass'], $salt));
@@ -149,44 +160,48 @@
 									SET `password`='$newpass', `salt`='$newsalt', ip_last='{$this->user->ip}', `data`='$newdata'
 									WHERE id='{$this->user->id}'");
 
-		if(!$update){ $this->core->notify($this->lng['e_attention'], $this->lng['e_sql_critical'], 2, '?mode=profile'); }
+		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical'], 2, '?mode=profile'); }
 
-		$this->core->notify($this->lng['e_success'], "Настройки успешно сохранены", 3, '?mode=profile');
+		// Лог действия
+		$this->db->actlog($this->lng['log_settings'], $this->user->id);
+
+		$this->core->notify($this->core->lng['e_success'], $this->lng['set_success_save'], 3, '?mode=profile');
 	}
 
 	public function content(){
 
-		if(!$this->user->is_auth){ $this->core->notify("Доступ запрещен!", "Для доступа к профилю необходима авторизация", 1, "?mode=403"); }
+		if(!$this->user->is_auth){ $this->core->notify($this->core->lng['e_403'], $this->lng['auth_required'], 1, "?mode=403"); }
 
-		if(!$this->core->is_access('sys_profile')){ $this->core->notify("Доступ запрещен!", "Доступ к профилю ограничен администрацией", 1, "?mode=403"); }
+		if(!$this->core->is_access('sys_profile')){ $this->core->notify($this->core->lng['e_403'], $this->lng['access_by_admin'], 1, "?mode=403"); }
 
 		$this->core->header = $this->core->sp(MCR_THEME_MOD."profile/header.html");
-		ob_start();
 
 		if($_SERVER['REQUEST_METHOD']=='POST'){
+
+			// Последнее обновление пользователя
+			$this->db->update_user($this->user);
+			
 			if(isset($_POST['del-skin'])){
-				if(!$this->core->is_access('sys_profile_del_skin')){ $this->core->notify("Доступ запрещен!", "Удаление скина ограничено администрацией", 1, "?mode=403"); }
+				if(!$this->core->is_access('sys_profile_del_skin')){ $this->core->notify($this->core->lng['e_403'], $this->lng['skin_access_by_admin'], 1, "?mode=403"); }
 				$this->delete_skin();
 			}elseif(isset($_POST['del-cloak'])){
-				if(!$this->core->is_access('sys_profile_del_cloak')){ $this->core->notify("Доступ запрещен!", "Удаление плаща ограничено администрацией", 1, "?mode=403"); }
+				if(!$this->core->is_access('sys_profile_del_cloak')){ $this->core->notify($this->core->lng['e_403'], $this->lng['cloak_access_by_admin'], 1, "?mode=403"); }
 				$this->delete_cloak();
 			}elseif(isset($_FILES['skin'])){
-				if(!$this->core->is_access('sys_profile_skin')){ $this->core->notify("Доступ запрещен!", "Изменение скина ограничено администрацией", 1, "?mode=403"); }
+				if(!$this->core->is_access('sys_profile_skin')){ $this->core->notify($this->core->lng['e_403'], $this->lng['skin_edit_by_admin'], 1, "?mode=403"); }
 				$this->upload_skin();
 			}elseif(isset($_FILES['cloak'])){
-				if(!$this->core->is_access('sys_profile_cloak')){ $this->core->notify("Доступ запрещен!", "Изменение плаща ограничено администрацией", 1, "?mode=403"); }
+				if(!$this->core->is_access('sys_profile_cloak')){ $this->core->notify($this->core->lng['e_403'], $this->lng['cloak_edit_by_admin'], 1, "?mode=403"); }
 				$this->upload_cloak();
 			}elseif(isset($_POST['settings'])){
-				if(!$this->core->is_access('sys_profile_settings')){ $this->core->notify("Доступ запрещен!", "Настройки профиля ограничены администрацией", 1, "?mode=403"); }
+				if(!$this->core->is_access('sys_profile_settings')){ $this->core->notify($this->core->lng['e_403'], $this->lng['set_save_by_admin'], 1, "?mode=403"); }
 				$this->settings();
 			}else{
 				$this->core->notify('', '', 3, '?mode=profile');
 			}
 		}
 
-		echo $this->core->sp(MCR_THEME_MOD."profile/profile.html");
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."profile/profile.html");
 	}
 }
 
diff --git a/upload/modules/register.php b/upload/modules/register.php
index 27a8658..64a1a6a 100644
--- a/upload/modules/register.php
+++ b/upload/modules/register.php
@@ -4,136 +4,40 @@
 
 class module{
 	private $core, $db, $config, $lng, $user;
+	public $cfg = array();
 
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
 		$this->user		= $core->user;
 		$this->config	= $core->config;
-		$this->lng		= $core->lng;
+		$this->lng		= $core->lng_m;
 
 		$bc = array(
-			$this->lng['t_reg'] => BASE_URL."?mode=register"
+			$this->lng['mod_name'] => BASE_URL."?mode=register"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
 	}
 
-	private function check_exist($value='', $email=false){
-
-		$selector = (!$email) ? "login='$value'" : "email='$value'";
-
-		$query = $this->db->query("SELECT COUNT(*) FROM `mcr_users` WHERE $selector");
-
-		if(!$query){ return true; }
-
-		$ar = $this->db->fetch_array($query);
-
-		if($ar[0]>0){ return true; }
-
-		return false;
-	}
-
 	private function regmain(){
 		
-		if(!$this->core->is_access('sys_register')){ $this->core->notify($this->lng['e_msg'], $this->lng['e_reg_perm'], 1, "?mode=403"); }
+		if(!$this->core->is_access('sys_register')){ $this->core->notify($this->core->lng['e_msg'], $this->lng['e_perm'], 1, "?mode=403"); }
 		
-		if($this->user->is_auth){ $this->core->notify($this->lng['e_msg'], $this->lng['e_reg_already'], 2, '?mode=403'); }
+		if($this->user->is_auth){ $this->core->notify($this->core->lng['e_msg'], $this->lng['e_already'], 2, '?mode=403'); }
 
-		if($_SERVER['REQUEST_METHOD']=='POST'){
-			if(!$this->core->captcha_check()){ $this->core->notify('', $this->lng['e_captcha'], 2, '?mode=403'); }
-			if(intval($_POST['accept'])!==1){ $this->core->notify($this->lng['e_msg'], $this->lng['e_reg_rules'], 1, '?mode=register'); }
-
-			if(!preg_match("/^[\w\-]{3,}$/i", $_POST['login'])){ $this->core->notify($this->lng['e_msg'], $this->lng['e_reg_login_regexp'], 1, '?mode=register'); }
-			
-			$login = $this->db->safesql($_POST['login']);
-
-			if($this->check_exist($login)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_reg_login_exist'], 1, '?mode=register'); }
-
-			if(!filter_var($_POST['email'], FILTER_VALIDATE_EMAIL)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_reg_email_regexp'], 1, '?mode=register'); }
-
-			$email = $this->db->safesql($_POST['email']);
-
-			if($this->check_exist($email, true)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_reg_email_exist'], 1, '?mode=register'); }
-
-			if(mb_strlen($_POST['password'], "UTF-8")<6){ $this->core->notify($this->lng['e_msg'], $this->lng['e_reg_pass_length'], 1, '?mode=register'); }
-
-			$password = $_POST['password'];
-
-			if($password !== $_POST['repassword']){ $this->core->notify($this->lng['e_msg'], $this->lng['e_reg_pass_match'], 1, '?mode=register'); }
-
-			$tmp = $this->db->safesql($this->core->random(16));
-
-			$salt = $this->db->safesql($this->core->random());
-
-			$password = $this->core->gen_password($password, $salt);
-			$password = $this->db->safesql($password);
-
-			$ip = $this->user->ip;
-
-			$gender = (intval($_POST['gender'])===1) ? 1 : 0; 
-
-			$newdata = array(
-				"time_create" => time(),
-				"time_last" => time(),
-				"firstname" => '',
-				"lastname" => '',
-				"gender" => $gender,
-				"birthday" => 0
-			);
-
-			$newdata = $this->db->safesql(json_encode($newdata));
-
-			$gid = ($this->config->main['reg_accept']) ? 1 : 2;
-
-			$notify_message = $this->lng['e_reg_success'];
-
-			$insert = $this->db->query("INSERT INTO `mcr_users`
-										(gid, login, email, password, `salt`, `tmp`, ip_create, ip_last, `data`)
-										VALUES
-										('$gid', '$login', '$email', '$password', '$salt', '$tmp', '$ip', '$ip', '$newdata')");
-			if(!$insert){ $this->core->notify($this->lng['e_msg'], $this->lng['e_sql_critical'], 1, '?mode=register'); }
-
-			$insert1 = $this->db->query("INSERT INTO `mcr_iconomy`
-										(login)
-										VALUES
-										('$login')");
-			if(!$insert1){ $this->core->notify($this->lng['e_msg'], $this->lng['e_sql_critical'], 1, '?mode=register'); }
-
-			if($this->config->main['reg_accept']){
-				$id = $this->db->insert_id();
-				$data_mail = array(
-					"LINK" => $this->config->main['s_root_full'].BASE_URL.'?mode=register&op=accept&key='.$id.'_'.md5($salt),
-					"SITENAME" => $this->config->main['s_name'],
-					"SITEURL" => $this->config->main['s_root_full'].BASE_URL
-				);
-
-				$message = $this->core->sp(MCR_THEME_PATH."modules/register/body.mail.html", $data_mail);
-				
-				if(!$this->core->send_mail($email, $this->lng['reg_title'], $message)){ $this->core->notify($this->lng['e_msg'], "Обратитесь к администрации", 1, "?mode=register"); }
-
-				$notify_message = $this->lng['e_reg_success_mail'];
-			}
-
-			$this->core->notify($this->lng['e_success'], $notify_message, 3);
-		}
-
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_PATH."modules/register/main.html");
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_PATH."modules/register/main.html");
 
 	}
 
 	private function accept(){
-		if(!isset($_GET['key'])){ $this->core->notify($this->lng['e_msg'], $this->lng['e_403'], 2, '?mode=403'); }
+		if(!isset($_GET['key'])){ $this->core->notify($this->core->lng['e_msg'], $this->core->lng['e_403'], 2, '?mode=403'); }
 
 		$key_string = $_GET['key'];
 
 		$array = explode("_", $key_string);
 
-		if(count($array)!==2){ $this->core->notify($this->lng['e_msg'], $this->lng['e_403'], 2, '?mode=403'); }
+		if(count($array)!==2){ $this->core->notify($this->core->lng['e_msg'], $this->core->lng['e_403'], 2, '?mode=403'); }
 
 		$uid = intval($array[0]);
 
@@ -141,11 +45,11 @@
 
 		$query = $this->db->query("SELECT `salt`, `data` FROM `mcr_users` WHERE id='$uid' AND gid='1'");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng['e_attention'], $this->lng['e_sql_critical'], 1, "?mode=register"); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical'], 1, "?mode=register"); }
 
 		$ar = $this->db->fetch_assoc($query);
 
-		if($key!==md5($ar['salt'])){ $this->core->notify($this->lng['e_msg'], $this->lng['e_403'], 2, '?mode=403'); }
+		if($key!==md5($ar['salt'])){ $this->core->notify($this->core->lng['e_msg'], $this->core->lng['e_403'], 2, '?mode=403'); }
 
 		$data = json_decode($ar['data']);
 
@@ -164,17 +68,18 @@
 									SET gid='2', ip_last='{$this->user->ip}', `data`='$newdata'
 									WHERE id='$uid' AND gid='1'");
 
-		if(!$update){ $this->core->notify($this->lng['e_attention'], $this->lng['e_sql_critical'], 1, "?mode=register"); }
+		if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical'], 1, "?mode=register"); }
 
-		$this->core->notify($this->lng['e_success'], $this->lng['e_reg_accept'], 3);
+		// Лог действия
+		$this->db->actlog("Подтверждение регистрации", $uid);
+
+		$this->core->notify($this->core->lng['e_success'], $this->lng['e_accept'], 3);
 	}
 
 	public function content(){
 
 		$this->core->header = $this->core->sp(MCR_THEME_MOD."register/header.html");
 
-		$this->core->title = $this->lng['t_reg'];
-
 		$op = (isset($_GET['op'])) ? $_GET['op'] : false;
 
 		switch($op){
@@ -184,11 +89,7 @@
 			default: $content = $this->regmain(); break;
 		}
 
-		ob_start();
-
-		echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 
 }
diff --git a/upload/modules/restore.php b/upload/modules/restore.php
index d576974..f1c65db 100644
--- a/upload/modules/restore.php
+++ b/upload/modules/restore.php
@@ -8,12 +8,12 @@
 	public function __construct($core){
 		$this->core		= $core;
 		$this->db		= $core->db;
-		$this->user		= $core->user;
 		$this->config	= $core->config;
-		$this->lng		= $core->lng;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		$bc = array(
-			$this->lng['t_restore'] => BASE_URL."?mode=restore"
+			$this->lng['mod_name'] => BASE_URL."?mode=restore"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -40,15 +40,15 @@
 
 			$_SESSION['m_send_id'] = (isset($_SESSION['m_send_id'])) ? $_SESSION['m_send_id']+1 : 1;
 
-			if($_SESSION['m_send_id']>5){ $this->core->notify($this->lng['e_msg'], $this->lng['e_rest_limit'], 1, "?mode=restore"); }
+			if($_SESSION['m_send_id']>5){ $this->core->notify($this->core->lng['e_msg'], $this->lng['e_limit'], 1, "?mode=restore"); }
 
 			$email = $this->db->safesql(@$_POST['email']);
 
-			if(empty($email)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_rest_eamil'], 1, "?mode=restore"); }
+			if(empty($email)){ $this->core->notify($this->core->lng['e_msg'], $this->lng['invalid_email'], 1, "?mode=restore"); }
 
 			$query = $this->db->query("SELECT `id`, `tmp` FROM `mcr_users` WHERE email='$email'");
 
-			if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng['e_msg'], $this->lng['e_rest_email'], 1, "?mode=restore"); }
+			if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng['e_msg'], $this->lng['email_not_found'], 1, "?mode=restore"); }
 
 			$ar = $this->db->fetch_assoc($query);
 
@@ -63,26 +63,25 @@
 
 			$message = $this->core->sp(MCR_THEME_PATH."modules/restore/body.mail.html", $data);
 
-			if(!$this->core->send_mail($email, $this->lng['rest_title'], $message)){ $this->core->notify($this->lng['e_msg'], $this->lng['e_critical'], 1, "?mode=restore"); }
+			if(!$this->core->send_mail($email, $this->lng['email_title'], $message)){ $this->core->notify($this->core->lng['e_msg'], $this->core->lng['e_critical'], 1, "?mode=restore"); }
 
-			$this->core->notify('', $this->lng['e_rest_success'], 3);
+			// Лог действия
+			$this->db->actlog("Отправка запроса на сброс пароля", $id);
+
+			$this->core->notify('', $this->lng['e_success'], 3);
 		}
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_PATH."modules/restore/main.html");
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_PATH."modules/restore/main.html");
 	}
 
 	private function accept(){
-		if(!isset($_GET['key'])){ $this->core->notify($this->lng['e_msg'], $this->lng['e_403'], 2, '?mode=403'); }
+		if(!isset($_GET['key'])){ $this->core->notify($this->core->lng['e_msg'], $this->core->lng['e_403'], 2, '?mode=403'); }
 
 		$key_string = $_GET['key'];
 
 		$array = explode("_", $key_string);
 
-		if(count($array)!==2){ $this->core->notify($this->lng['e_msg'], $this->lng['e_403'], 2, '?mode=403'); }
+		if(count($array)!==2){ $this->core->notify($this->core->lng['e_msg'], $this->core->lng['e_403'], 2, '?mode=403'); }
 
 		$uid = intval($array[0]);
 
@@ -90,16 +89,16 @@
 
 		$query = $this->db->query("SELECT `tmp`, `data` FROM `mcr_users` WHERE id='$uid'");
 
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->lng['e_attention'], $this->lng['e_sql_critical'], 1, "?mode=restore"); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical'], 1, "?mode=restore"); }
 
 		$ar = $this->db->fetch_assoc($query);
 
-		if($key!==md5($ar['tmp'])){ $this->core->notify($this->lng['e_msg'], $this->lng['e_403'], 2, '?mode=403'); }
+		if($key!==md5($ar['tmp'])){ $this->core->notify($this->core->lng['e_msg'], $this->core->lng['e_403'], 2, '?mode=403'); }
 
 		if($_SERVER['REQUEST_METHOD']=='POST'){
 			$newpass = @$_POST['newpass'];
 
-			if(mb_strlen($newpass, "UTF-8")<6){ $this->core->notify($this->lng['e_msg'], $this->lng['e_reg_pass_length'], 2, '?mode=restore&op=accept&key='.$key_string); }
+			if(mb_strlen($newpass, "UTF-8")<6){ $this->core->notify($this->core->lng['e_msg'], $this->lng['e_pass_length'], 2, '?mode=restore&op=accept&key='.$key_string); }
 
 			$tmp = $this->db->safesql($this->core->random(16));
 
@@ -124,25 +123,22 @@
 										SET password='$password', `salt`='$salt', `tmp`='$tmp', ip_last='{$this->user->ip}', `data`='$newdata'
 										WHERE id='$uid'");
 
-			if(!$update){ $this->core->notify($this->lng['e_attention'], $this->lng['e_sql_critical'], 1, "?mode=restore"); }
+			if(!$update){ $this->core->notify($this->core->lng['e_attention'], $this->core->lng['e_sql_critical'], 1, "?mode=restore"); }
 
-			$this->core->notify($this->lng['e_success'], $this->lng['e_rest_success2'], 3);
+			// Лог действия
+			$this->db->actlog("Сброс пароля", $uid);
+
+			$this->core->notify($this->core->lng['e_success'], $this->lng['e_success2'], 3);
 		}
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_PATH."modules/restore/newpass.html");
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_PATH."modules/restore/newpass.html");
 	}
 
 	public function content(){
 		
-		if($this->user->is_auth){ $this->core->notify($this->lng['e_msg'], $this->lng['e_403'], 2, '?mode=403'); }
+		if($this->user->is_auth){ $this->core->notify($this->core->lng['e_msg'], $this->core->lng['e_403'], 2, '?mode=403'); }
 		
-		if(!$this->core->is_access('sys_restore')){ $this->core->notify($this->lng['e_msg'], $this->lng['e_rest_perm'], 1, "?mode=403"); }
-
-		$this->core->title = $this->lng['t_restore'];
+		if(!$this->core->is_access('sys_restore')){ $this->core->notify($this->core->lng['e_msg'], $this->lng['e_perm'], 1, "?mode=403"); }
 
 		$op = (isset($_GET['op'])) ? $_GET['op'] : false;
 
@@ -152,11 +148,7 @@
 			default: $content = $this->send(); break;
 		}
 
-		ob_start();
-
-			echo $content;
-
-		return ob_get_clean();
+		return $content;
 	}
 
 }
diff --git a/upload/modules/search.php b/upload/modules/search.php
index 9bb028b..f3217fb 100644
--- a/upload/modules/search.php
+++ b/upload/modules/search.php
@@ -4,25 +4,25 @@
 
 class module{
 	private $core, $db, $config, $user, $lng;
+	public $cfg = array();
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng;
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->config	= $core->config;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		$bc = array(
-			$this->lng['t_search'] => BASE_URL."?mode=search"
+			$this->lng['mod_name'] => BASE_URL."?mode=search"
 		);
-
-		$this->core->title = $this->lng['t_search'];
+		
 		$this->core->bc = $this->core->gen_bc($bc);
 	}
 
 	public function content(){
 		
-		if(!$this->core->is_access('sys_search')){ $this->core->notify($this->lng['e_403'], $this->lng['e_search_perm'], 1, "?mode=403"); }
+		if(!$this->core->is_access('sys_search')){ $this->core->notify($this->core->lng['403'], $this->lng['search_perm'], 1, "?mode=403"); }
 
 		if(!isset($_GET['type']) || !file_exists(MCR_MODE_PATH.'search/'.$_GET['type'].'.php')){ $this->core->notify(); }
 
@@ -32,11 +32,7 @@
 
 		$data['CONTENT'] = $submodule->results();
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_MOD."search/main.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."search/main.html", $data);
 	}
 }
 
diff --git a/upload/modules/search/comments.php b/upload/modules/search/comments.php
index a2dd0b0..4155103 100644
--- a/upload/modules/search/comments.php
+++ b/upload/modules/search/comments.php
@@ -10,14 +10,13 @@
 		$this->db		= $core->db;
 		$this->config	= $core->config;
 		$this->user		= $core->user;
-		$this->lng		= $core->lng;
+		$this->lng		= $core->lng_m;
 
 		$bc = array(
-			"Поиск" => BASE_URL."?mode=search",
-			"По комментариям" => BASE_URL."?mode=search&type=comments"
+			$this->lng['mod_name'] => BASE_URL."?mode=search",
+			$this->lng['by_comments'] => BASE_URL."?mode=search&type=comments"
 		);
-
-		$this->core->title = "Поиск — По комментариям";
+		
 		$this->core->bc = $this->core->gen_bc($bc);
 	}
 
@@ -37,9 +36,9 @@
 									WHERE `c`.text_bb LIKE '%$value%'
 									LIMIT $start, $end");
 
-		ob_start();
+		if(!$query || $this->db->num_rows($query)<=0){ /*echo $this->core->sp(MCR_THEME_MOD."search/comments/comment-none.html");*/ return; }
 
-		if(!$query || $this->db->num_rows($query)<=0){ /*echo $this->core->sp(MCR_THEME_MOD."search/comments/comment-none.html");*/ return ob_get_clean(); }
+		ob_start();
 
 		while($ar = $this->db->fetch_assoc($query)){
 
@@ -73,13 +72,13 @@
 
 	public function results(){
 		
-		if(!$this->core->is_access('sys_search_comments')){ $this->core->notify("Доступ запрещен!", "Поиск по комментариям ограничен администрацией", 1, "?mode=403"); }
+		if(!$this->core->is_access('sys_search_comments')){ $this->core->notify($this->core->lng['403'], $this->lng['access_denied_com'], 1, "?mode=403"); }
 
 		$value = (isset($_GET['value'])) ? $_GET['value'] : '';
 
 		$value = trim(urldecode($value));
 
-		if(empty($value)){ $this->core->notify("404", "Не заданы критерии поиска", 2, "?mode=403"); }
+		if(empty($value)){ $this->core->notify($this->core->lng['404'], $this->lng['empty_query'], 2, "?mode=403"); }
 
 		$safe_value = $this->db->safesql($value);
 		$html_value = $this->db->HSC($value);
@@ -101,11 +100,7 @@
 			"QUERY_COUNT" => intval($ar[0])
 		);
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_MOD."search/comments/comment-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."search/comments/comment-list.html", $data);
 	}
 }
 
diff --git a/upload/modules/search/news.php b/upload/modules/search/news.php
index 52009b9..f63b551 100644
--- a/upload/modules/search/news.php
+++ b/upload/modules/search/news.php
@@ -10,14 +10,13 @@
 		$this->db		= $core->db;
 		$this->config	= $core->config;
 		$this->user		= $core->user;
-		$this->lng		= $core->lng;
+		$this->lng		= $core->lng_m;
 
 		$bc = array(
-			"Поиск" => BASE_URL."?mode=search",
-			"По новостям" => BASE_URL."?mode=search&type=news"
+			$this->lng['mod_name'] => BASE_URL."?mode=search",
+			$this->lng['by_news'] => BASE_URL."?mode=search&type=news"
 		);
-
-		$this->core->title = "Поиск — По новостям";
+		
 		$this->core->bc = $this->core->gen_bc($bc);
 	}
 
@@ -35,10 +34,10 @@
 									WHERE `n`.title LIKE '%$value%' OR `n`.text_bb LIKE '%$value%'
 									LIMIT $start, $end");
 
+		if(!$query || $this->db->num_rows($query)<=0){ /*echo $this->core->sp(MCR_THEME_MOD."search/news/news-none.html");*/ return; }
+
 		ob_start();
-
-		if(!$query || $this->db->num_rows($query)<=0){ /*echo $this->core->sp(MCR_THEME_MOD."search/news/news-none.html");*/ return ob_get_clean(); }
-
+		
 		while($ar = $this->db->fetch_assoc($query)){
 
 			$title = $this->db->HSC($ar['title']);
@@ -71,13 +70,13 @@
 
 	public function results(){
 		
-		if(!$this->core->is_access('sys_search_news')){ $this->core->notify("Доступ запрещен!", "Поиск по новостям ограничен администрацией", 1, "?mode=403"); }
+		if(!$this->core->is_access('sys_search_news')){ $this->core->notify($this->core->lng['403'], $this->core->lng['t_403'], 1, "?mode=403"); }
 
 		$value = (isset($_GET['value'])) ? $_GET['value'] : '';
 
 		$value = trim(urldecode($value));
 
-		if(empty($value)){ $this->core->notify("404", "Не заданы критерии поиска", 2, "?mode=403"); }
+		if(empty($value)){ $this->core->notify($this->core->lng['404'], $this->lng['empty_query'], 2, "?mode=403"); }
 
 		$safe_value = $this->db->safesql($value);
 		$html_value = $this->db->HSC($value);
@@ -86,7 +85,7 @@
 
 		$query = $this->db->query($sql);
 
-		if(!$query){ $this->core->notify($this->lng['e_msg'], $this->lng['e_sql_critical'], 2); }
+		if(!$query){ $this->core->notify($this->core->lng['e_msg'], $this->core->lng['e_sql_critical'], 2); }
 
 		$ar = $this->db->fetch_array($query);
 
@@ -99,11 +98,7 @@
 			"QUERY_COUNT" => intval($ar[0])
 		);
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_MOD."search/news/news-list.html", $data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."search/news/news-list.html", $data);
 	}
 }
 
diff --git a/upload/modules/statics.php b/upload/modules/statics.php
index e37d32c..a990260 100644
--- a/upload/modules/statics.php
+++ b/upload/modules/statics.php
@@ -4,18 +4,17 @@
 
 class module{
 	private $core, $db, $config, $user, $lng;
+	public $cfg = array();
 
 	public function __construct($core){
-		$this->core = $core;
-		$this->db	= $core->db;
-		$this->config = $core->config;
-		$this->user	= $core->user;
-		$this->lng	= $core->lng;
-
-		$this->core->title = $this->lng['t_static'];
+		$this->core		= $core;
+		$this->db		= $core->db;
+		$this->config	= $core->config;
+		$this->user		= $core->user;
+		$this->lng		= $core->lng_m;
 
 		$bc = array(
-			$this->lng['t_static'] => BASE_URL."?mode=statics"
+			$this->lng['mod_name'] => BASE_URL."?mode=statics"
 		);
 
 		$this->core->bc = $this->core->gen_bc($bc);
@@ -23,7 +22,7 @@
 
 	public function content(){
 
-		if(!isset($_GET['id']) || empty($_GET['id'])){ $this->core->notify('403', $this->lng['e_403']); }
+		if(!isset($_GET['id']) || empty($_GET['id'])){ $this->core->notify($this->core->lng['403'], $this->lng['e_403']); }
 
 		$uniq = $this->db->safesql(@$_GET['id']);
 
@@ -33,17 +32,15 @@
 									LEFT JOIN `mcr_users` AS `u`
 										ON `u`.id=`s`.uid
 									WHERE `s`.`uniq`='$uniq'");
-		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify('403', $this->lng['e_403']); }
+		if(!$query || $this->db->num_rows($query)<=0){ $this->core->notify($this->core->lng['403'], $this->lng['e_403']); }
 
 		$ar = $this->db->fetch_assoc($query);
 
-		if(!$this->core->is_access($ar['permissions'])){ $this->core->notify('403', $this->lng['e_403']); }
+		if(!$this->core->is_access($ar['permissions'])){ $this->core->notify($this->core->lng['403'], $this->lng['e_403']); }
 
 		$uniq = $this->db->HSC($uniq);
 		$title = $this->db->HSC($ar['title']);
 
-		$this->core->title .= " — $title";
-
 		$bc = array(
 			$this->lng['t_static'] => BASE_URL."?mode=statics&id=$uniq",
 			$title => BASE_URL."?mode=statics&id=$uniq"
@@ -60,11 +57,7 @@
 
 		);
 
-		ob_start();
-
-		echo $this->core->sp(MCR_THEME_MOD."statics/static-id.html", $page_data);
-
-		return ob_get_clean();
+		return $this->core->sp(MCR_THEME_MOD."statics/static-id.html", $page_data);
 	}
 }
 
diff --git a/upload/system.php b/upload/system.php
index 63ee52e..d12f95e 100644
--- a/upload/system.php
+++ b/upload/system.php
@@ -7,16 +7,20 @@
 
 // System constants
 define('PROGNAME', 'WebMCR Reloaded'. MCR);
-define('VERSION', 'Alpha 0.15');
+define('VERSION', 'WebMCR Beta 1.0');
 define('FEEDBACK', '<a href="http://webmcr.com" target="_blank">'.PROGNAME.'</a> &copy; 2013-'.date("Y").' Qexy'); 
 define('MCR_ROOT', dirname(__FILE__).'/');
 define('MCR_MODE_PATH', MCR_ROOT.'modules/');
 define('MCR_TOOL_PATH', MCR_ROOT.'engine/');
+define('MCR_LIBS_PATH', MCR_TOOL_PATH.'libs/');
+define('MCR_MON_PATH', MCR_TOOL_PATH.'monitoring/');
 define('MCR_SIDE_PATH', MCR_ROOT.'blocks/');
 define('MCR_LANG_PATH', MCR_ROOT.'language/');
+define('MCR_CONF_PATH', MCR_ROOT.'configs/');
 define('MCR_UPL_PATH', MCR_ROOT.'uploads/');
 define('MCR_SKIN_PATH', MCR_UPL_PATH.'skins/');
 define('MCR_CLOAK_PATH', MCR_UPL_PATH.'cloaks/');
+define('MCR_CACHE_PATH', MCR_ROOT.'cache/');
 
 session_save_path(MCR_UPL_PATH.'tmp');
 if(!session_start()){ session_start(); }
@@ -35,17 +39,16 @@
 $warn_type = ($core->config->main['debug']) ? E_ALL : 0;
 error_reporting($warn_type);
 
-$base_url = ($core->config->main['install']) ? $core->base_url() : $core->config->main['s_root'];
+$meta_json_data = array(
+	'secure' => MCR_SECURE_KEY,
+	'lang' => MCR_LANG,
+	'base_url' => BASE_URL,
+	'theme_url' => STYLE_URL,
+	'upload_url' => UPLOAD_URL,
+	'server_time' => time(),
+);
 
-// System constants
-define('MCR_LANG', $core->config->main['s_lang']);
-define('MCR_THEME_PATH', MCR_ROOT.'themes/'.$core->config->main['s_theme'].'/');
-define('MCR_THEME_MOD', MCR_THEME_PATH.'modules/');
-define('MCR_THEME_BLOCK', MCR_THEME_PATH.'blocks/');
-define('BASE_URL', $base_url);
-define('ADMIN_URL', BASE_URL.'?mode=admin');
-define('STYLE_URL', BASE_URL.'themes/'.$core->config->main['s_theme'].'/');
-define('UPLOAD_URL', BASE_URL.'uploads/');
+define('META_JSON_DATA', json_encode($meta_json_data));
 
 // Csrf security validation
 $core->csrf_check();
diff --git a/upload/themes/default/blocks/banner/main.html b/upload/themes/default/blocks/banner/main.html
new file mode 100644
index 0000000..4871ed5
--- /dev/null
+++ b/upload/themes/default/blocks/banner/main.html
@@ -0,0 +1,11 @@
+<div class="form-block">
+
+	<div class="block-header"><?php echo $this->lng_b['developer']; ?></div>
+
+	<div class="block-line"></div>
+
+	<div class="block-content">
+		<center><a href="https://vk.com/qexyorg" target="_blank"><img src="<?php echo STYLE_URL; ?>img/qexy.png" style="max-width: 160px;"></a></center>
+	</div>
+
+</div>
\ No newline at end of file
diff --git a/upload/themes/default/blocks/monitor/main.html b/upload/themes/default/blocks/monitor/main.html
index 9a795cf..4596ae9 100644
--- a/upload/themes/default/blocks/monitor/main.html
+++ b/upload/themes/default/blocks/monitor/main.html
@@ -1,11 +1,11 @@
 <div class="form-block">
 
-	<div class="block-header">Мониторинг</div>
+	<div class="block-header"><?php echo $this->lng_b['monitoring']; ?></div>
 
 	<div class="block-line"></div>
 
 	<div class="block-content">
-		<div class="js-monitor">Загрузка...</div>
+		<?php echo $data['CONTENT']; ?>
 	</div>
 
 </div>
\ No newline at end of file
diff --git a/upload/themes/default/blocks/monitor/monitor-id.html b/upload/themes/default/blocks/monitor/monitor-id.html
index ac32016..2aef76a 100644
--- a/upload/themes/default/blocks/monitor/monitor-id.html
+++ b/upload/themes/default/blocks/monitor/monitor-id.html
@@ -1,4 +1,4 @@
 <div class="monitor-id" id="<?php echo $data['ID']; ?>">
 	<div class="title"><?php echo $data['TITLE']; ?> <i class="icon-info-sign" data-placement="right" rel="tooltip" title="<?php echo $data['TEXT']; ?>"></i></div>
-	<div class="progress <?php echo $data['STATUS'] ?> progress-striped active"><div class="bar"></div><div class="stats"><?php echo $data['STATS']; ?></div></div>
+	<div class="progress <?php echo $data['STATUS'] ?> progress-striped active"><div class="bar" style="width: <?php echo $data['PROGRESS']; ?>%;"></div><div class="stats"><?php echo $data['STATS']; ?></div></div>
 </div>
\ No newline at end of file
diff --git a/upload/themes/default/blocks/notify/alert.html b/upload/themes/default/blocks/notify/alert.html
index 41f9c14..1f37764 100644
--- a/upload/themes/default/blocks/notify/alert.html
+++ b/upload/themes/default/blocks/notify/alert.html
@@ -1,6 +1,6 @@
 <div class="form-block block-notify">
 
-	<div class="block-header"><?php echo $this->lng['b_alert']; ?> <a href="#" id="close-notify">&times;</a></div>
+	<div class="block-header"><?php echo $this->lng_b['alert']; ?> <a href="#" id="close-notify">&times;</a></div>
 
 	<div class="block-line"></div>
 
diff --git a/upload/themes/default/blocks/profile/auth.html b/upload/themes/default/blocks/profile/auth.html
index cb49165..58b0110 100644
--- a/upload/themes/default/blocks/profile/auth.html
+++ b/upload/themes/default/blocks/profile/auth.html
@@ -1,6 +1,6 @@
 <div class="form-block">
 
-	<div class="block-header"><?php echo $this->lng['b_m-p']; ?></div>
+	<div class="block-header"><?php echo $this->lng_b['miniprofile']; ?></div>
 
 	<div class="block-line"></div>
 
@@ -8,11 +8,11 @@
 		<form class="block-profile" method="post" action="<?php echo BASE_URL; ?>?mode=logout">
 			<div class="avatar"><img src="<?php echo BASE_URL; ?>uploads/skins/interface/<?php echo $this->user->skin; ?>_mini.png?<?php echo mt_rand(1000,9999); ?>" class="img-polaroid"></div>
 			<ul class="info">
-				<li><i class="icon-user"></i> <b><?php echo $this->lng['m-p_login']; ?>:</b> <?php echo $this->user->login; ?></li>
-				<li><i class="icon-list-alt"></i> <b><?php echo $this->lng['m-p_group']; ?>:</b> <?php echo $this->user->group; ?></li>
-				<li><i class="icon-shopping-cart"></i> <b><?php echo $this->lng['m-p_balance']; ?>:</b> <?php echo $this->user->money; ?> майн.</li>
-				<li><a href="<?php echo BASE_URL; ?>?mode=profile" class="btn btn-block btn-small"><?php echo $this->lng['m-p_settings']; ?></a></li>
-				<li><button type="submit" name="logout" value="1" class="btn btn-block btn-small"><?php echo $this->lng['m-p_logout']; ?></button></li>
+				<li><i class="icon-user"></i> <b><?php echo $this->lng_b['login']; ?>:</b> <?php echo $this->user->login; ?></li>
+				<li><i class="icon-list-alt"></i> <b><?php echo $this->lng_b['group']; ?>:</b> <?php echo $this->user->group; ?></li>
+				<li><i class="icon-shopping-cart"></i> <b><?php echo $this->lng_b['balance']; ?>:</b> <?php echo $this->user->money; ?> <?php echo $this->lng_b['cur_game']; ?></li>
+				<li><a href="<?php echo BASE_URL; ?>?mode=profile" class="btn btn-block btn-small"><?php echo $this->lng_b['settings']; ?></a></li>
+				<li><button type="submit" name="logout" value="1" class="btn btn-block btn-small"><?php echo $this->lng_b['logout']; ?></button></li>
 			</ul>
 		</form>
 	</div>
diff --git a/upload/themes/default/blocks/profile/unauth.html b/upload/themes/default/blocks/profile/unauth.html
index a178c84..4dcad10 100644
--- a/upload/themes/default/blocks/profile/unauth.html
+++ b/upload/themes/default/blocks/profile/unauth.html
@@ -1,6 +1,6 @@
 <div class="form-block">
 
-	<div class="block-header"><?php echo $this->lng['b_auth']; ?></div>
+	<div class="block-header"><?php echo $this->lng_b['auth']; ?></div>
 
 	<div class="block-line"></div>
 
@@ -8,21 +8,21 @@
 		<form method="post" class="block-auth" action="<?php echo BASE_URL; ?>?mode=auth">
 			<div class="input-prepend">
 				<span class="add-on"><i class="icon-user"></i></span>
-				<input type="text" name="login" autofocus placeholder="<?php echo $this->lng['ph_login']; ?>">
+				<input type="text" name="login" autofocus placeholder="<?php echo $this->lng_b['login']; ?>">
 			</div>
 
 			<div class="input-prepend">
 				<span class="add-on"><i class="icon-lock"></i></span>
-				<input type="password" name="password" placeholder="<?php echo $this->lng['ph_password']; ?>">
+				<input type="password" name="password" placeholder="<?php echo $this->lng_b['password']; ?>">
 			</div>
 
 
 			<label class="checkbox">
-				<input type="checkbox" name="remember" value="1"> <?php echo $this->lng['ath_remember']; ?>
+				<input type="checkbox" name="remember" value="1"> <?php echo $this->lng_b['remember']; ?>
 			</label>
 
 			<div class="buttons">
-				<input type="submit" class="btn" name="submit" value="<?php echo $this->lng['ath_auth']; ?>"> <a class="btn" rel="tooltip" title="<?php echo $this->lng['tlp_restore_pass']; ?>" href="<?php echo BASE_URL; ?>?mode=restore"><i class="icon-question-sign"></i></a> <a href="<?php echo BASE_URL; ?>?mode=register" class="btn"><?php echo $this->lng['ath_reg']; ?></a>
+				<input type="submit" class="btn" name="submit" value="<?php echo $this->lng_b['enter']; ?>"> <a class="btn" rel="tooltip" title="<?php echo $this->lng_b['restore']; ?>" href="<?php echo BASE_URL; ?>?mode=restore"><i class="icon-question-sign"></i></a> <a href="<?php echo BASE_URL; ?>?mode=register" class="btn"><?php echo $this->lng_b['register']; ?></a>
 			</div>
 		</form>
 	</div>
diff --git a/upload/themes/default/blocks/top/main.html b/upload/themes/default/blocks/top/main.html
deleted file mode 100644
index 7f3f67a..0000000
--- a/upload/themes/default/blocks/top/main.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="form-block">
-
-	<div class="block-header">Топ серверов</div>
-
-	<div class="block-line"></div>
-
-	<div class="block-content">
-		<center><a href="http://mcvote.ru/" target="_blank"><img src="<?php echo STYLE_URL; ?>img/mcvote.jpg"></a></center>
-	</div>
-
-</div>
\ No newline at end of file
diff --git a/upload/themes/default/css/global.css b/upload/themes/default/css/global.css
index a7f2e5a..67b52c1 100644
--- a/upload/themes/default/css/global.css
+++ b/upload/themes/default/css/global.css
@@ -30,6 +30,43 @@
 .mcr-debug .action { position: absolute; left: 420px; bottom: 50%; margin-bottom: -10px; display: inline-block; background: #fcf8e3; border: 1px dotted #deb877; padding: 3px 5px; border-left: 0px; border-radius: 0px 4px 4px 0px; }
 /* Debug - */
 
+#js-loader {
+	position: fixed;
+	bottom: 50px;
+	right: 10px;
+	display: none;
+	background-color: rgba(0,0,0,0.7);
+	padding: 10px;
+	border-radius: 6px 6px 0px 6px;
+}
+
+#js-loader > img {
+	display: block;
+}
+
+#js-notify {
+	display: none;
+	margin: 0px;
+	margin-top: 10px;
+	padding: 10px;
+	word-wrap: break-word;
+}
+
+#js-notify > #close {
+	float: right;
+	line-height: 10px;
+	text-decoration: none;
+}
+
+#js-notify > #title {
+	display: block;
+	font-weight: bold;
+}
+
+#js-notify > #message {
+	clear: both;
+}
+
 .container > .container-fluid > .row-fluid > .span8 { margin-top: 10px; }
 .container > .container-fluid > .row-fluid > .span8 > .breadcrumb { border: 1px solid #e5e5e5; font-family: Hattori-Hanzo; font-size: 13px; margin-bottom: 0px; }
 
@@ -75,12 +112,157 @@
 .pagination { text-align: center; margin-bottom: 0px; }
 
 .form-block .block-header .btn-group { margin-right: 10px; }
-.form-block .block-name { display: inline-block; vertical-align: middle; font-size: 14px; }
+ 
 .form-block .block-name i { margin-right: 5px; }
+.form-block > .block-header > .block-name,
+.form-block > .block-header > .block-right {
+	display: inline-block;
+	vertical-align: middle;
+	font-size: 14px;
+	width: 50%;
+}
+
+.form-block > .block-header > .block-right {
+	text-align: right;
+}
+
+.form-block > .block-header > .block-right .btn-group {
+	text-align: left;
+}
 
 button:focus,
 input[type="submit"]:focus { outline: none !important; }
 
+.bb-panel {
+	background-color: #fff;
+	border: 1px solid #ccc;
+	border-radius: 4px;
+	padding: 3px;
+	margin-bottom: 10px;
+	padding-bottom: 0px;
+}
+
+.bb-panel > ul {
+	display: inline-table;
+	border: 1px solid #ccc;
+	table-layout: fixed;
+	margin-right: 3px;
+	padding: 3px;
+	margin-bottom: 3px;
+}
+
+.bb-panel > ul > li {
+	display: table-cell;
+	text-align: center;
+	vertical-align: middle;
+}
+
+.bb-panel > ul > li > a {
+	display: block;
+	height: 18px;
+	width: 18px;
+	background-color: #fff;
+	line-height: 18px;
+	vertical-align: middle;
+	text-decoration: none;
+	box-sizing: border-box;
+	color: #333;
+}
+
+.bb-panel > .bb-right {
+	float: right;
+}
+
+.bb-panel > ul > li > a:hover {
+	-webkit-box-shadow: inset 0px 0px 0px 1px #333;
+	-moz-box-shadow: inset 0px 0px 0px 1px #333;
+	box-shadow: inset 0px 0px 0px 1px #333;
+}
+
+.file-manager .file-input-wrapper {
+	display: block;
+	width: 100%;
+	box-sizing: border-box;
+	border: 1px dashed #ccc;
+	background: transparent;
+	padding: 20px;
+}
+
+.file-manager .file-input-wrapper .file-inputs {
+	display: block;
+	width: 100%;
+	height: 100%;
+}
+
+.file-manager .file-input-wrapper:hover {
+	background-color: rgba(0,0,0,0.03);
+}
+
+.file-manager > .lastfiles > .file-line > div {
+	display: inline-block;
+	vertical-align: middle;
+	word-wrap: break-word;
+}
+
+.file-manager > .lastfiles > .file-line {
+	margin-top: 10px;
+	padding: 5px;
+	background-color: #eee;
+}
+
+.file-manager > .lastfiles > .file-line > .line-uniq {
+	width: 35%;
+}
+
+.file-manager > .lastfiles > .file-line > .line-oldname {
+	width: 35%;
+}
+
+.file-manager > .lastfiles > .file-line > .line-size {
+	width: 10%;
+}
+
+.file-manager > .lastfiles > .file-line > .line-downloads {
+	width: 10%;
+}
+
+.file-manager > .lastfiles > .file-line > .line-info,
+.file-manager > .lastfiles > .file-line > .line-act {
+	width: 5%;
+	text-align: right;
+}
+
+.file-manager > .lastfiles > .file-line .file-edit-input {
+	display: inline-block;
+	margin: 0px;
+	vertical-align: middle;
+	width: auto;
+	margin-right: 5px;
+}
+
+.file-manager > .lastfiles > .file-line .file-edit {
+	margin-left: 5px;
+}
+
+@media (max-width: 600px){
+	.file-manager > .lastfiles > .file-line > .line-oldname {
+		display: none;
+	}
+
+	.file-manager > .lastfiles > .file-line > .line-info,
+	.file-manager > .lastfiles > .file-line > .line-act {
+		width: 10%;
+	}
+
+	.file-manager > .lastfiles > .file-line > .line-uniq {
+		width: 45%;
+	}
+
+	.file-manager > .lastfiles > .file-line > .line-size {
+		width: 20%;
+	}
+}
+
 .form-block .block-content .block-auth .input-prepend { width: 100%; text-align: center; }
 .form-block .block-content .block-auth .input-prepend input[type="text"],
 .form-block .block-content .block-auth .input-prepend input[type="password"] { width: 60%; }
@@ -165,7 +347,8 @@
 
 .form-block.new-id .block-like,
 .form-block.new-full .block-like {
-	float: right;
+	display: inline-block;
+	vertical-align: middle;
 }
 .form-block.new-id .block-like a,
 .form-block.new-full .block-like a { opacity: 0.6; }
@@ -241,7 +424,6 @@
 @media (min-width: 1200px){
 	.uploader-forms .skin-uploader,
 	.uploader-forms .cloak-uploader { width: 44%; }
-
 }
 
 @media (max-width: 1200px){
@@ -251,6 +433,16 @@
 	.mcr-debug .action { left: 420px; bottom: 50%; }
 	.mcr-debug.open a { margin-left: -100px; }
 
+	.bb-panel > ul {
+		display: block;
+		padding: 3px;
+		margin-bottom: 3px;
+	}
+
+	.bb-panel > ul > li {
+		display: inline-block;
+	}
+
 }
 
 @media (min-width: 768px) and (max-width: 979px){
@@ -271,6 +463,14 @@
 	.mcr-debug .action { left: 420px; bottom: 50%; }
 	.mcr-debug.open a { margin-left: -160px; }
 
+	.g-recaptcha,
+	#div_for_keycaptcha {
+		transform:scale(0.67);
+		-webkit-transform:scale(0.67);
+		transform-origin:0 0;
+		-webkit-transform-origin:0 0;
+	}
+
 }
 
 @media (max-width: 767px){
@@ -314,22 +514,50 @@
 	.mcr-debug h4 { font-size: 16px; }
 	.mcr-debug .action { left: 100%; bottom: 50%; }
 	.mcr-debug.open a { margin-left: 0px; }
+	table {
+		transform:scale(0.88);
+		-webkit-transform:scale(0.88);
+		transform-origin:0 0;
+		-webkit-transform-origin:0 0;
+	}
 }
 
 @media (max-width: 380px){
 	.mcr-debug h4 { font-size: 14px; }
 	.mcr-debug { font-size: 8px; line-height: 12px; width: 85%; max-width: 85%; bottom: 0px; left: -91%; font-size: 8px; }
+	table {
+		transform:scale(0.7);
+		-webkit-transform:scale(0.7);
+		transform-origin:0 0;
+		-webkit-transform-origin:0 0;
+	}
 }
 
 @media (max-width: 300px){
 	.mcr-debug h4 { font-size: 12px; }
 	.mcr-debug { font-size: 6px; line-height: 10px; width: 85%; max-width: 85%; bottom: 0px; left: -93%; font-size: 8px; }
+	table {
+		transform:scale(0.6);
+		-webkit-transform:scale(0.6);
+		transform-origin:0 0;
+		-webkit-transform-origin:0 0;
+	}
+}
+
+@media (max-width: 260px){
+	table {
+		transform:scale(0.49);
+		-webkit-transform:scale(0.49);
+		transform-origin:0 0;
+		-webkit-transform-origin:0 0;
+	}
 }
 
 .admin-menu-groups .navbar { margin-bottom: 10px; }
-.admin-menu-groups .spl-body { margin-bottom: 10px; }
+.spl-body { display: block; margin-bottom: 10px; }
+.spl-body.closed { display: none; }
 
-.admin-menu-groups .navbar .spl-btn.opened:before,
+.admin-menu-groups .navbar .spl-btn:before,
 .admin-menu-groups .navbar .spl-btn.closed:before { content: ""; display: inline-block; width: 12px; height: 8px; background: url("../img/spl-arrows.png") no-repeat; vertical-align: middle; margin-right: 5px; }
 .admin-menu-groups .navbar .spl-btn.closed:before { background-position: 0px -8px; }
 .admin-menu-groups ul li { text-align: center; display: inline-block; width: 100px; word-wrap: break-word; vertical-align: top; margin-bottom: 5px; }
@@ -388,10 +616,10 @@
 .adm-info-main .thumbnails .thumbnail .ajx-l { margin-top: 0px; }
 
 .adm-info-main .thumbnails .thumbnail .icon-ok { margin-top: 0px; }
-.js-monitor > .monitor-id > .progress { position: relative; }
-.js-monitor > .monitor-id > .progress > .stats { position: absolute; width: 100%; text-align: center; font-size: 12px; }
+.monitor-id > .progress { position: relative; }
+.monitor-id > .progress > .stats { position: absolute; width: 100%; text-align: center; font-size: 12px; }
 
-.js-monitor > .monitor-id > .progress .bar {
+.monitor-id > .progress .bar {
 	position: relative;
 }
 
@@ -407,4 +635,146 @@
 
 .adm-info-modules .thumbnails .title {
 	margin: 8px 0px;
+}
+
+.qxbb-code {
+	display: block;
+	line-height: 24px;
+	background-color: #fafafa;
+	border: 1px solid #eee;
+	border-radius: 4px;
+	color: #a00;
+	padding: 10px;
+	line-height: 16px;
+	margin: 10px;
+	position: relative;
+	word-wrap: break-word;
+	font-size: 12px;
+	font-family: verdana;
+}
+
+.qxbb-code:after {
+	display: block;
+	position: absolute;
+	top: -10px;
+	right: 10px;
+	background-color: #fff3f3;
+	border: 1px solid #f3c7c7;
+	content: "Код";
+	padding: 3px 7px;
+	line-height: 10px;
+	border-radius: 4px;
+	color: #b97676;
+}
+
+.qxbb-quote {
+	position: relative;
+	display: block;
+	background-color: #fafafa;
+	border-radius: 4px;
+	border: 1px solid #ccc;
+	font-size: 12px;
+	font-family: verdana;
+	color: #555;
+	margin: 10px;
+	padding: 10px;
+	word-wrap: break-word;
+	box-sizing: border-box;
+}
+
+.qxbb-quote:after {
+	display: block;
+	position: absolute;
+	top: -10px;
+	right: 10px;
+	background-color: #f7f7f7;
+	border: 1px solid #e2e2e2;
+	content: "Цитата";
+	padding: 3px 7px;
+	line-height: 10px;
+	border-radius: 4px;
+	color: #b1b1b1;
+}
+
+.qxbb-quote > .qxbb-quote-info {
+	position: absolute; 
+	top: -10px;
+	left: 10px;
+	background-color: #f7f7f7;
+	border: 1px solid #e2e2e2;
+	padding: 3px 7px;
+	line-height: 10px;
+	border-radius: 4px;
+	color: #b1b1b1;
+}
+
+.qxbb-code > .qxbb-code-info {
+	position: absolute; 
+	top: -10px;
+	left: 10px;
+	background-color: #fff3f3;
+	border: 1px solid #f3c7c7;
+	padding: 3px 7px;
+	line-height: 10px;
+	border-radius: 4px;
+	color: #b97676;
+}
+
+.qxbb-left { text-align: left; }
+.qxbb-center { text-align: center; }
+.qxbb-right { text-align: right; }
+
+.spl-block > .spl-btn {
+	margin: 10px;
+	cursor: pointer;
+	outline: none;
+	padding: 5px 10px;
+	background-color: #fffbed;
+	border: 1px solid #ebdfb4;
+	color: #a5914b;
+	border-radius: 4px;
+}
+
+.spl-block > .spl-body {
+	display: none;
+	margin: 0px 10px 10px 10px;
+	background-color: #fffbed;
+	border: 1px dashed #ebdfb4;
+	padding: 10px;
+	border-radius: 4px;
+	font-size: 12px;
+	box-sizing: border-box;
+	color: #a5914b;
+}
+
+.qxbb-offtop {
+	color: #c8c8c8;
+	margin: 0px 3px;
+}
+
+.qxbb-offtop:before {
+	content: "×";
+	margin: 0px 3px;
+}
+
+.qxbb-line {
+	border: 0px;
+	margin: 20px 10px;
+	display: block;
+	height: 1px;
+	background-color: #a4a4a4;
+	border-bottom: 1px solid #c1c1c1;
+}
+
+.icon_status_on,
+.icon_status_off {
+	display: inline-block;
+	vertical-align: middle;
+	width: 12px;
+	height: 12px;
+	background: url('../img/status.png') no-repeat top left;
+}
+
+.icon_status_off {
+	background-position: top right;
 }
\ No newline at end of file
diff --git a/upload/themes/default/debug.html b/upload/themes/default/debug.html
index c92759a..11a54f0 100644
--- a/upload/themes/default/debug.html
+++ b/upload/themes/default/debug.html
@@ -1,14 +1,14 @@
 <div class="mcr-debug">
 	<a class="action" href="#">></a>
-	<h4>Отладка</h4>
-	<div class="php-version">Версия PHP: <span><?php echo phpversion(); ?></span></div>
-	<div class="php-error">Ошибки PHP: <span><?php var_dump($data['PHP_ERROR']); ?></span></div>
-	<div class="plt">Время загрузки страницы: <span><?php echo $data['PLT']; ?> сек.</span></div>
-	<div class="queries">Запросов к базе: <span><?php echo $data['QUERIES']; ?></span></div>
-	<div class="base-error">Ошибки базы: <span><?php echo $data['BASE_ERROR']; ?></span></div>
-	<div class="memory">Использовано памяти: <span><?php echo $data['MEMORY_USAGE']; ?> / <?php echo $data['MEMORY_PEAK']; ?> кб</span></div>
-	<div>Адрес скрипта: <span><?php echo $_SERVER['PHP_SELF']; ?></span></div>
-	<div>Протокол: <span><?php echo $_SERVER['SERVER_PROTOCOL']; ?></span></div>
-	<div>Метод: <span><?php echo $_SERVER['REQUEST_METHOD']; ?></span></div>
-	<div>OS: <span><?php echo php_uname(); ?></span></div>
+	<h4><?php echo $this->lng['deb_name']; ?></h4>
+	<div class="php-version"><?php echo $this->lng['deb_php_ver']; ?>: <span><?php echo phpversion(); ?></span></div>
+	<div class="php-error"><?php echo $this->lng['deb_php_err']; ?>: <span><?php var_dump($data['PHP_ERROR']); ?></span></div>
+	<div class="plt"><?php echo $this->lng['deb_plt']; ?>: <span><?php echo $data['PLT']; ?> <?php echo $this->lng['deb_sec']; ?></span></div>
+	<div class="queries"><?php echo $this->lng['deb_num_q']; ?>: <span><?php echo $data['QUERIES']; ?></span></div>
+	<div class="base-error"><?php echo $this->lng['deb_db_err']; ?>: <span><?php echo $data['BASE_ERROR']; ?></span></div>
+	<div class="memory"><?php echo $this->lng['deb_memory']; ?>: <span><?php echo $data['MEMORY_USAGE']; ?> / <?php echo $data['MEMORY_PEAK']; ?> <?php echo $this->lng['deb_kb']; ?></span></div>
+	<div><?php echo $this->lng['deb_script']; ?>: <span><?php echo $_SERVER['PHP_SELF']; ?></span></div>
+	<div><?php echo $this->lng['deb_protocol']; ?>: <span><?php echo $_SERVER['SERVER_PROTOCOL']; ?></span></div>
+	<div><?php echo $this->lng['deb_method']; ?>: <span><?php echo $_SERVER['REQUEST_METHOD']; ?></span></div>
+	<div><?php echo $this->lng['deb_os']; ?>: <span><?php echo php_uname(); ?></span></div>
 </div>
\ No newline at end of file
diff --git a/upload/themes/default/default_sp/bb-panel.html b/upload/themes/default/default_sp/bb-panel.html
index 8ed99ee..626febc 100644
--- a/upload/themes/default/default_sp/bb-panel.html
+++ b/upload/themes/default/default_sp/bb-panel.html
@@ -1,35 +1,68 @@
 <div class="bb-panel" id="<?php echo $data['PANEL_ID']; ?>">
-	<div class="btn-toolbar">
-		<div class="btn-group">
-			<!-- Font edition -->
-			<a href="#" rel="tooltip" class="btn bb" title="Жирный" data-left="b"><b>B</b></a>
-			<a href="#" rel="tooltip" class="btn bb" title="Курсив" data-left="i"><i>i</i></a>
-			<a href="#" rel="tooltip" class="btn bb" title="Зачеркнутый" data-left="s"><s>S</s></a>
-			<a href="#" rel="tooltip" class="btn bb" title="Подчеркнутый" data-left="u"><u>u</u></a>
 
-			<!-- Position elements -->
-			<a href="#" rel="tooltip" class="btn bb" title="Выравнивание по левому краю" data-left="left"><i class="icon-align-left"></i></a>
-			<a href="#" rel="tooltip" class="btn bb" title="Выравнивание по центру" data-left="center"><i class="icon-align-center"></i></a>
-			<a href="#" rel="tooltip" class="btn bb" title="Выравнивание по правому краю" data-left="right"><i class="icon-align-right"></i></a>
+	<ul class="bb-right">
+		<li><a href="#" rel="tooltip" class="bb-clear" title="<?php echo $this->lng['bb_c_remove']; ?>"><i class="icon-fire"></i></a></li>
+	</ul><!--
 
+	--><ul>
+		<li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_strong']; ?>" data-left="[b]" data-right="[/b]"><b>B</b></a></li><!--
 
-			<a href="#" rel="tooltip" class="btn bb" title="Код" data-left="code"><i class="icon-qrcode"></i></a>
+		--><li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_italic']; ?>" data-left="[i]" data-right="[/i]"><i>i</i></a></li><!--
 
-			<a href="#" rel="tooltip" class="btn bb" title="Ссылка" data-left="url=&quot;&quot;" data-right="url"><i class="icon-globe"></i></a>
+		--><li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_strike']; ?>" data-left="[s]" data-right="[/s]"><s>S</s></a></li><!--
 
-			<a href="#" rel="tooltip" class="btn bb" title="Размер шрифта" data-left="size=&quot;&quot;" data-right="size"><i class="icon-text-height"></i></a>
+		--><li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_underl']; ?>" data-left="[u]" data-right="[/u]"><u>u</u></a></li>
+	</ul><!--
 
-			<a href="#" rel="tooltip" class="btn bb" title="Изображение" data-left="img"><i class="icon-picture"></i></a>
+	--><ul>
+		<li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_left']; ?>" data-left="[left]" data-right="[/left]"><i class="icon-align-left"></i></a></li><!--
 
-			<a href="#" rel="tooltip" class="btn bb" title="Цвет текста" data-left="color=&quot;&quot;" data-right="color"><i class="icon-tint"></i></a>
+		--><li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_center']; ?>" data-left="[center]" data-right="[/center]"><i class="icon-align-center"></i></a></li><!--
 
-			<a href="#" rel="tooltip" class="btn bb"  title="Цитата" data-left="quote"><i class="icon-comment"></i></a>
+		--><li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_right']; ?>" data-left="[right]" data-right="[/right]"><i class="icon-align-right"></i></a></li>
+	</ul><!--
+	
+	--><ul>
+		<li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_font_size']; ?>" data-left="[size=&quot;&quot;]" data-right="[/size]"><i class="icon-text-height"></i></a></li><!--
 
-			<a href="#" rel="tooltip" class="btn spl-btn" data-click="spl1" title="Смайлики"><i class="icon-eye-open"></i></a>
-		</div>
-	</div>
+		--><li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_font']; ?>" data-left="[font=&quot;Arial&quot;]" data-right="[/font]"><i class="icon-font"></i></a></li><!--
 
-	<div class="spl-body closed" id="spl1">
+		--><li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_color']; ?>" data-left="[color=&quot;#ff0000&quot;]" data-right="[/color]"><i class="icon-tint"></i></a></li><!--
+
+		--><li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_bgcolor']; ?>" data-left="[background=&quot;&quot;]" data-right="[/background]"><i class="icon-adjust"></i></a></li><!--
+
+		--><li><a href="#" rel="tooltip" class="bb"  title="<?php echo $this->lng['bb_c_reverse']; ?>" data-left="[reverse]" data-right="[/reverse]"><i class="icon-repeat"></i></a></li>
+	</ul><!--
+
+	--><ul>
+		<li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_link']; ?>" data-left="[url=&quot;&quot;]" data-right="[/url]"><i class="icon-globe"></i></a></li><!--
+
+		--><li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_email']; ?>" data-left="[email]" data-right="[/email]"><i class="icon-envelope"></i></a></li>
+	</ul><!--
+
+	--><ul>
+		<li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_list']; ?>" data-left="[list=&quot;markers&quot;]" data-right="[/list]"><i class="icon-list"></i></a></li><!--
+		
+		--><li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_line']; ?>" data-left="[line]" data-right="[/line]"><i class="icon-minus"></i></a></li>
+	</ul><!--
+
+	--><ul>
+		<li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_code']; ?>" data-left="[code]" data-right="[/code]"><i class="icon-qrcode"></i></a></li><!--
+	
+		--><li><a href="#" rel="tooltip" class="bb"  title="<?php echo $this->lng['bb_c_quote']; ?>" data-left="[quote]" data-right="[/quote]"><i class="icon-comment"></i></a></li><!--
+
+		--><li><a href="#" rel="tooltip" class="bb"  title="<?php echo $this->lng['bb_c_spoiler']; ?>" data-left="[spoiler]" data-right="[/spoiler]"><i class="icon-asterisk"></i></a></li><!--
+
+		--><li><a href="#" rel="tooltip" class="bb"  title="<?php echo $this->lng['bb_c_offtop']; ?>" data-left="[offtop]" data-right="[/offtop]"><i class="icon-trash"></i></a></li><!--
+
+		--><li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_img']; ?>" data-left="[img]" data-right="[/img]"><i class="icon-picture"></i></a></li><!--
+
+		--><li><a href="#" rel="tooltip" class="bb" title="<?php echo $this->lng['bb_c_video']; ?>" data-left="[video=&quot;&quot;]" data-right="[/video]"><i class="icon-film"></i></a></li><!--
+
+		--><li><a href="#" rel="tooltip" class="spl-btn closed" data-for="spl-<?php echo $data['PANEL_ID']; ?>" title="<?php echo $this->lng['bb_c_smiles']; ?>"><i class="icon-eye-open"></i></a></li>
+	</ul>
+
+	<div class="spl-body closed" id="spl-<?php echo $data['PANEL_ID']; ?>">
 		<?php echo $data['SMILES']; ?>
 	</div>
 </div>
\ No newline at end of file
diff --git a/upload/themes/default/default_sp/file_manager.html b/upload/themes/default/default_sp/file_manager.html
new file mode 100644
index 0000000..f7e675a
--- /dev/null
+++ b/upload/themes/default/default_sp/file_manager.html
@@ -0,0 +1,7 @@
+<div class="form-block">
+	<div class="block-header"><?php echo $this->lng['filemanager']; ?></div>
+	<div class="file-manager">
+		<input type="file" name="files" class="file-inputs" multiple data-filename-placement="inside" title="<?php echo $this->lng['filemanager_ph']; ?>">
+		<div class="lastfiles"></div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/upload/themes/default/default_sp/mod_disable.html b/upload/themes/default/default_sp/mod_disable.html
new file mode 100644
index 0000000..ec263da
--- /dev/null
+++ b/upload/themes/default/default_sp/mod_disable.html
@@ -0,0 +1,9 @@
+<div class="form-block">
+	<div class="block-header"><?php echo $this->lng['b_403']; ?></div>
+	<div class="block-line"></div>
+
+	<div class="mcr-403">
+		<h3><?php echo $this->lng['e_warn']; ?></h3>
+		<p><?php echo $this->lng['e_module']; ?></p>
+	</div>
+</div>
\ No newline at end of file
diff --git a/upload/themes/default/default_sp/smile-id.html b/upload/themes/default/default_sp/smile-id.html
index 9149068..0b9e00a 100644
--- a/upload/themes/default/default_sp/smile-id.html
+++ b/upload/themes/default/default_sp/smile-id.html
@@ -1 +1 @@
- <a href="#" rel="tooltip" class="bb woborder"  title="<?php echo $data['NAME']; ?>" data-left="<?php echo $data['NAME']; ?>" data-right=""><img src="<?php echo BASE_URL; ?>uploads/smiles/<?php echo $data['IMG']; ?>" alt="<?php echo $data['NAME']; ?>"></a>
\ No newline at end of file
+ <a href="#" rel="tooltip" class="bb"  title="<?php echo $data['NAME']; ?>" data-left="<?php echo $data['NAME']; ?>"><img src="<?php echo BASE_URL; ?>uploads/smiles/<?php echo $data['IMG']; ?>" alt="<?php echo $data['NAME']; ?>"></a>
\ No newline at end of file
diff --git a/upload/themes/default/global.html b/upload/themes/default/global.html
index 9ebe828..06b9a4a 100644
--- a/upload/themes/default/global.html
+++ b/upload/themes/default/global.html
@@ -5,21 +5,16 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 	<meta charset="utf-8">
 	<meta name="description" content="<?php echo $data['CFG']['s_about'] ?>">
-	<meta name="description" content="<?php echo $data['CFG']['s_keywords'] ?>">
+	<meta name="keywords" content="<?php echo $data['CFG']['s_keywords'] ?>">
 	<meta name="author" content="NC22 &amp; Qexy.org">
-	<meta name="style_url" content="<?php echo STYLE_URL; ?>">
+	<meta name='data' content='<?php echo META_JSON_DATA; ?>'>
 	<base href="<?php echo BASE_URL ?>">
 	<?php echo $data['DEF_HEADER']; ?>
 	<?php echo $data['HEADER']; ?>
-	<script type="text/javascript">
-		$(function(){
-			$('form[method="post"]').prepend('<input type="hidden" name="mcr_secure" value="<?php echo MCR_SECURE_KEY; ?>">');
-		});
-	</script>
 </head>
 
 <body>
-<!-- <?php echo $this->config->main['rc_public']; ?> -->
+
 <div class="navbar navbar-fixed-top">
 	<div class="navbar-inner">
 		<div class="container">
@@ -70,6 +65,13 @@
 			<!-- Левый контейнер -->
 			<div class="span4 main-content">
 
+				<!-- Ajax оповещения -->
+				<div id="js-notify" class="alert">
+					<a href="#" id="close">&times;</a>
+					<div id="title">Название</div>
+					<div id="message">Сообщение</div>
+				</div>
+
 				<?php echo $data['L_BLOCKS']; ?>
 
 			</div>
@@ -87,6 +89,8 @@
 	</div>
 </div>
 
+<div id="js-loader" title="Загрузка..."><img src="<?php echo STYLE_URL; ?>img/loading.gif" alt="Loading..." /></div>
+
 <div class="navbar navbar-fixed-bottom">
 	<div class="navbar-inner">
 		<div class="footer-block">
diff --git a/upload/themes/default/header.html b/upload/themes/default/header.html
index 9bd2f5b..6106456 100644
--- a/upload/themes/default/header.html
+++ b/upload/themes/default/header.html
@@ -1,8 +1,11 @@
+<script src="<?php echo LANG_URL; ?>js/global.js"></script>
 <link href="<?php echo STYLE_URL; ?>css/bootstrap.min.css" rel="stylesheet" media="screen">
 <link href="<?php echo STYLE_URL; ?>css/bootstrap-responsive.min.css" rel="stylesheet" media="screen">
 <link href="<?php echo STYLE_URL; ?>css/docs.css" rel="stylesheet" media="screen">
 <link href="<?php echo STYLE_URL; ?>css/global.css" rel="stylesheet" media="screen">
-<script src="<?php echo STYLE_URL; ?>js/jquery.min.js?1"></script>
-<script src="<?php echo STYLE_URL; ?>js/jquery.easing.js?2"></script>
-<script src="<?php echo STYLE_URL; ?>js/bootstrap.min.js?3"></script>
-<script src="<?php echo STYLE_URL; ?>js/global.js?4"></script>
\ No newline at end of file
+<script src="<?php echo STYLE_URL; ?>js/jquery.min.js"></script>
+<script src="<?php echo STYLE_URL; ?>js/cookie.js"></script>
+<script src="<?php echo STYLE_URL; ?>js/jquery.easing.js"></script>
+<script src="<?php echo STYLE_URL; ?>js/bootstrap.min.js"></script>
+<script src="<?php echo STYLE_URL; ?>js/bootstrap.file-input.js"></script>
+<script src="<?php echo STYLE_URL; ?>js/global.js"></script>
diff --git a/upload/themes/default/img/mcvote.jpg b/upload/themes/default/img/mcvote.jpg
deleted file mode 100644
index e450888..0000000
--- a/upload/themes/default/img/mcvote.jpg
+++ /dev/null
Binary files differ
diff --git a/upload/themes/default/img/qexy.png b/upload/themes/default/img/qexy.png
new file mode 100644
index 0000000..83c7ed6
--- /dev/null
+++ b/upload/themes/default/img/qexy.png
Binary files differ
diff --git a/upload/themes/default/img/status.png b/upload/themes/default/img/status.png
new file mode 100644
index 0000000..881fa58
--- /dev/null
+++ b/upload/themes/default/img/status.png
Binary files differ
diff --git a/upload/themes/default/js/admin/info-extensions.js b/upload/themes/default/js/admin/info-extensions.js
index 2437259..3cb303f 100644
--- a/upload/themes/default/js/admin/info-extensions.js
+++ b/upload/themes/default/js/admin/info-extensions.js
@@ -14,12 +14,12 @@
 
 					var ar = json.data[i];
 
-					var btn_name = (ar.pay.status) ? 'Купить ('+ar.pay.price+' р.)' : 'Скачать';
+					var btn_name = (ar.pay.status) ? lng_ie.buy+' ('+ar.pay.price+' р.)' : lng_ie.download;
 
 					$(".adm-info-modules .thumbnails").append('<li class="span4"><div class="thumbnail"><img data-src="holder.js/150x100" src="'
 						+ ar.img + '" alt="img"><div class="title">'
 						+ ar.title + '</div><div class="read-more"><a href="'
-						+ ar.url.full + '" class="btn btn-block" target="_blank">Подробнее</a></div><div class="get-link"><a href="'
+						+ ar.url.full + '" class="btn btn-block" target="_blank">'+lng_ie.readmore+'</a></div><div class="get-link"><a href="'
 						+ ar.url.get + '" class="btn btn-block btn-info" target="_blank">'+btn_name+'</a></div></div></li>');
 				}
 			}else{
@@ -31,7 +31,7 @@
 
 $(function(){
 
-	if(!navigator.onLine){ notify("Ошибка!", "Отсутствует интернет-соединение", 1); return; }
+	if(!navigator.onLine){ notify(lng.error, lng_ie.e_connection, 1); return; }
 
 	$(".adm-info-modules .thumbnails").html("∞");
 
diff --git a/upload/themes/default/js/admin/info-main.js b/upload/themes/default/js/admin/info-main.js
index ad318c3..8fe7cdf 100644
--- a/upload/themes/default/js/admin/info-main.js
+++ b/upload/themes/default/js/admin/info-main.js
@@ -2,7 +2,7 @@
 
 	$.ajax({
 		url: "http://api.webmcr.com/?do=versions&limit=1",
-		beforeSend: function(){ $("#api-engine-version").html($.mcr.loader); },
+		beforeSend: function(){ $("#api-engine-version").html(mcr.loader); },
 		dataType: "json",
 		success: function(json){
 			data = json.data[0];
@@ -18,9 +18,12 @@
 function load_last_news(){
 
 	$.ajax({
-		url: "http://api.webmcr.loc/?do=news&limit=1",
-		beforeSend: function(){ $("#api-engine-news").html($.mcr.loader); },
+		url: "http://api.webmcr.com/?do=news&limit=1",
+		beforeSend: function(){ $("#api-engine-news").html(mcr.loader); },
 		dataType: "json",
+		error: function(data){
+			console.log(data);
+		},
 		success: function(json){
 			data = json.data[0];
 			if(json.type=='success'){
@@ -53,7 +56,7 @@
 
 $(function(){
 
-	if(!navigator.onLine){ notify("Ошибка!", "Отсутствует интернет-соединение", 1); return; }
+	if(!navigator.onLine){ notify(lng.error, lng_im.e_connection, 1); return; }
 
 	$("#api-engine-news, #api-engine-version, #git-engine-version, #git-dev-version").html("∞");
 
diff --git a/upload/themes/default/js/admin/permissions.js b/upload/themes/default/js/admin/permissions.js
index 3df7574..1f552d8 100644
--- a/upload/themes/default/js/admin/permissions.js
+++ b/upload/themes/default/js/admin/permissions.js
@@ -7,15 +7,15 @@
 			break;
 
 			case 'integer':
-				$('#perm-default').html('<input type="text" class="span8" name="default" value="1" id="inputDefault" placeholder="Значение по умолчанию">');
+				$('#perm-default').html('<input type="text" class="span8" name="default" value="1" id="inputDefault" placeholder="'+lng_per.default_val+'">');
 			break;
 
 			case 'float':
-				$('#perm-default').html('<input type="text" class="span8" name="default" value="1.5" id="inputDefault" placeholder="Значение по умолчанию">');
+				$('#perm-default').html('<input type="text" class="span8" name="default" value="1.5" id="inputDefault" placeholder="'+lng_per.default_val+'">');
 			break;
 
 			case 'string':
-				$('#perm-default').html('<input type="text" class="span8" name="default" value="string" id="inputDefault" placeholder="Значение по умолчанию">');
+				$('#perm-default').html('<input type="text" class="span8" name="default" value="string" id="inputDefault" placeholder="'+lng_per.default_val+'">');
 			break;
 
 			default: return false; break;
diff --git a/upload/themes/default/js/bootstrap.file-input.js b/upload/themes/default/js/bootstrap.file-input.js
index 332db9a..22ff6a7 100644
--- a/upload/themes/default/js/bootstrap.file-input.js
+++ b/upload/themes/default/js/bootstrap.file-input.js
@@ -45,44 +45,6 @@
   // This is important because the in order to give the illusion that this is a button in FF we actually need to move the button from the file input under the cursor. Ugh.
   .promise().done( function(){
 
-    // As the cursor moves over our new Bootstrap button we need to adjust the position of the invisible file input Browse button to be under the cursor.
-    // This gives us the pointer cursor that FF denies us
-    $('.file-input-wrapper').mousemove(function(cursor) {
-
-      var input, wrapper,
-        wrapperX, wrapperY,
-        inputWidth, inputHeight,
-        cursorX, cursorY;
-
-      // This wrapper element (the button surround this file input)
-      wrapper = $(this);
-      // The invisible file input element
-      input = wrapper.find("input");
-      // The left-most position of the wrapper
-      wrapperX = wrapper.offset().left;
-      // The top-most position of the wrapper
-      wrapperY = wrapper.offset().top;
-      // The with of the browsers input field
-      inputWidth= input.width();
-      // The height of the browsers input field
-      inputHeight= input.height();
-      //The position of the cursor in the wrapper
-      cursorX = cursor.pageX;
-      cursorY = cursor.pageY;
-
-      //The positions we are to move the invisible file input
-      // The 20 at the end is an arbitrary number of pixels that we can shift the input such that cursor is not pointing at the end of the Browse button but somewhere nearer the middle
-      moveInputX = cursorX - wrapperX - inputWidth + 20;
-      // Slides the invisible input Browse button to be positioned middle under the cursor
-      moveInputY = cursorY- wrapperY - (inputHeight/2);
-
-      // Apply the positioning styles to actually move the invisible file input
-      input.css({
-        left:moveInputX,
-        top:moveInputY
-      });
-    });
-
     $('body').on('change', '.file-input-wrapper input[type=file]', function(){
 
       var fileName;
@@ -91,7 +53,19 @@
       // Remove any previous file names
       $(this).parent().next('.file-input-name').remove();
       if (!!$(this).prop('files') && $(this).prop('files').length > 1) {
-        fileName = $(this)[0].files.length+' files';
+        switch($(this)[0].files.length % 10){
+          case 1: files_name = 'Файл'; break;
+          case 2:
+          case 3:
+          case 4:
+            files_name = 'Файла';
+          break;
+          default: files_name = 'Файлов'; break;
+        }
+        if($(this)[0].files.length>10 && $(this)[0].files.length < 20){
+          files_name = 'Файлов';
+        }
+        fileName = $(this)[0].files.length+' '+files_name;
       }
       else {
         fileName = fileName.substring(fileName.lastIndexOf('\\') + 1, fileName.length);
diff --git a/upload/themes/default/js/cookie.js b/upload/themes/default/js/cookie.js
new file mode 100644
index 0000000..a66b00d
--- /dev/null
+++ b/upload/themes/default/js/cookie.js
@@ -0,0 +1,139 @@
+/*!
+ * JavaScript Cookie v2.0.4
+ * https://github.com/js-cookie/js-cookie
+ *
+ * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
+ * Released under the MIT license
+ */
+(function (factory) {
+	if (typeof define === 'function' && define.amd) {
+		define(factory);
+	} else if (typeof exports === 'object') {
+		module.exports = factory();
+	} else {
+		var _OldCookies = window.Cookies;
+		var api = window.Cookies = factory();
+		api.noConflict = function () {
+			window.Cookies = _OldCookies;
+			return api;
+		};
+	}
+}(function () {
+	function extend () {
+		var i = 0;
+		var result = {};
+		for (; i < arguments.length; i++) {
+			var attributes = arguments[ i ];
+			for (var key in attributes) {
+				result[key] = attributes[key];
+			}
+		}
+		return result;
+	}
+
+	function init (converter) {
+		function api (key, value, attributes) {
+			var result;
+
+			// Write
+
+			if (arguments.length > 1) {
+				attributes = extend({
+					path: '/'
+				}, api.defaults, attributes);
+
+				if (typeof attributes.expires === 'number') {
+					var expires = new Date();
+					expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5);
+					attributes.expires = expires;
+				}
+
+				try {
+					result = JSON.stringify(value);
+					if (/^[\{\[]/.test(result)) {
+						value = result;
+					}
+				} catch (e) {}
+
+				value = encodeURIComponent(String(value));
+				value = value.replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
+
+				key = encodeURIComponent(String(key));
+				key = key.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent);
+				key = key.replace(/[\(\)]/g, escape);
+
+				return (document.cookie = [
+					key, '=', value,
+					attributes.expires && '; expires=' + attributes.expires.toUTCString(), // use expires attribute, max-age is not supported by IE
+					attributes.path    && '; path=' + attributes.path,
+					attributes.domain  && '; domain=' + attributes.domain,
+					attributes.secure ? '; secure' : ''
+				].join(''));
+			}
+
+			// Read
+
+			if (!key) {
+				result = {};
+			}
+
+			// To prevent the for loop in the first place assign an empty array
+			// in case there are no cookies at all. Also prevents odd result when
+			// calling "get()"
+			var cookies = document.cookie ? document.cookie.split('; ') : [];
+			var rdecode = /(%[0-9A-Z]{2})+/g;
+			var i = 0;
+
+			for (; i < cookies.length; i++) {
+				var parts = cookies[i].split('=');
+				var name = parts[0].replace(rdecode, decodeURIComponent);
+				var cookie = parts.slice(1).join('=');
+
+				if (cookie.charAt(0) === '"') {
+					cookie = cookie.slice(1, -1);
+				}
+
+				try {
+					cookie = converter && converter(cookie, name) || cookie.replace(rdecode, decodeURIComponent);
+
+					if (this.json) {
+						try {
+							cookie = JSON.parse(cookie);
+						} catch (e) {}
+					}
+
+					if (key === name) {
+						result = cookie;
+						break;
+					}
+
+					if (!key) {
+						result[name] = cookie;
+					}
+				} catch (e) {}
+			}
+
+			return result;
+		}
+
+		api.get = api.set = api;
+		api.getJSON = function () {
+			return api.apply({
+				json: true
+			}, [].slice.call(arguments));
+		};
+		api.defaults = {};
+
+		api.remove = function (key, attributes) {
+			api(key, '', extend(attributes, {
+				expires: -1
+			}));
+		};
+
+		api.withConverter = init;
+
+		return api;
+	}
+
+	return init();
+}));
diff --git a/upload/themes/default/js/global.js b/upload/themes/default/js/global.js
index 86c00b3..996ed16 100644
--- a/upload/themes/default/js/global.js
+++ b/upload/themes/default/js/global.js
@@ -1,190 +1,279 @@
-function is_json(str){
-	try{
-		JSON.parse(str);
-	}catch(e){
-		return false;
-	}
-	return true;
-}
+var mcr = {
+	debug: true, // Включение/отключение логирования ошибок в консоль [true|false]
 
-function getParameterByName(name) {
-	name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-	var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-		results = regex.exec(location.search);
-	return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
-}
+	// Получение информации, загружаемой с сервера
+	meta_data: JSON.parse($('meta[name="data"]').attr('content')),
 
-var base_url = $("base").attr("href");
-var style_url = $('meta[name="style_url"]').attr("content");
+	// Функция показа/скрытия информации о загрузке
+	loading: function(status){
+		if(status===false){
+			$('#js-loader').fadeOut(300);
+		}else{
+			$('#js-loader').fadeIn(300);
+		}
+	},
 
-function notify_closer(){
+	/*
+	 * Оповещение - показывает блок оповещения с различной информацией и автоматически выключает показ информации о загрузке (предыдущую функцию)
+	 *
+	 * @param title - Название блока
+	 *
+	 * @param message - Сообщение оповещения
+	 *
+	 * @param type - Тип оповещения 2-Ошибка(красный блок)|3-Успех(зеленый блок)|4-информация(синий блок)|остальное-примечание(оранжевый блок)
+	 *
+	 * @param result - Возвращаемый результат [true|false]
+	 */
+	notify: function(title, message, type, result){
 
-	if($('.close-alert').length >= 1){
-		$('body .close-alert').parent().fadeOut("normal", function(){
-			$(this).remove();
+		var that = this;
+
+		type = (type===undefined) ? 0 : parseInt(type);
+
+		switch(type){
+			case 2: type = 'alert-error'; break;
+			case 3: type = 'alert-success'; break;
+			case 4: type = 'alert-info'; break;
+
+			default: type = ''; break;
+		}
+
+		$('#js-notify').removeClass('alert-error alert-success alert-info').addClass(type);
+
+		$('#js-notify > #title').html(title);
+		$('#js-notify > #message').html(message);
+
+		$('#js-notify').fadeIn(300);
+
+		that.loading(false);
+
+		$('html, body').animate({ scrollTop: $('#js-notify').offset().top-50}, 'fast');
+
+		setTimeout(function(){ that.notify_close(); }, 2500);
+
+		return (result===true) ? true : false;
+	},
+
+	// Скрывает оповещение и очищает его содержимое
+	notify_close: function(){
+		$('#js-notify').fadeOut(500, function(){
+			$('#js-notify > #title, #js-notify > #message').empty();
+		});
+	},
+
+	// Логгер ошибок в консоль
+	logger: function(data){
+		if(this.debug){ console.log(data); }
+	},
+
+	// Получение параметра из URL по ключу
+	getUrlParam: function(name){
+		name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
+		var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
+			results = regex.exec(location.search);
+		return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
+	},
+
+	/*
+	 * Результирующий запрос - запрос, возвращающий результат.
+	 *
+	 * @param method - метод отправки запроса [GET|POST]
+	 *
+	 * @param url - Адрес на который будет отправляться запрос
+	 *
+	 * @param params - Параметры запроса [key1=param&key2=param2...]
+	 *
+	 */
+	send_ret_req: function(method, url, params){
+		var req = null;
+		try { req = new ActiveXObject("Msxml2.XMLHTTP"); } catch (e) {
+			try { req = new ActiveXObject("Microsoft.XMLHTTP"); } catch (e) {
+				try { req = new XMLHttpRequest(); } catch(e) {}
+			}
+		}
+		if(req == null){ throw new Error(lng.e_xmlhr); }
+
+		req.open(method, url, false);
+		req.send(params);
+
+		return req.responseText;
+	},
+
+	// Получение информации о откртых и закрытых спойлерах
+	spl_items: Cookies.getJSON('spl_items'),
+
+	// Инстализация мониторинга
+	init_monitoring: function(){
+
+		if($('.monitor-id').length<=0){ return; }
+
+		var that = this;
+
+		that.loading();
+
+		var formdata = new FormData();
+		
+		formdata.append('mcr_secure', mcr.meta_data.secure);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=monitoring",
+			dataType: "json",
+			type: 'POST',
+			contentType: false,
+			processData: false,
+			data: formdata,
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng.e_monitor);
+			},
+
+			success: function(data){
+
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				if(data._data.length<=0){ return mcr.loading(false); }
+
+				$.each(data._data, function(key, ar){
+					$('.monitor-id#'+ar.id+' .bar').css('width', ar.progress+'%');
+					$('.monitor-id#'+ar.id+' .progress').removeClass('progress-info').removeClass('progress-danger');
+
+					if(ar.status==1){
+						$('.monitor-id#'+ar.id+' .progress').addClass('progress-info');
+						$('.monitor-id#'+ar.id+' .stats').text(ar.online+' / '+ar.slots);
+					}else{
+						$('.monitor-id#'+ar.id+' .progress').addClass('progress-danger');
+						$('.monitor-id#'+ar.id+' .stats').text(lng.offline);
+					}
+				});
+				
+				mcr.loading(false);
+			}
+		});
+	},
+
+	init_filemanager: function(pge){
+		var that = this;
+
+		var loadpage = (pge===undefined) ? 1 : pge;
+
+		that.loading();
+
+		var formdata = new FormData();
+		
+		formdata.append('mcr_secure', mcr.meta_data.secure);
+		formdata.append('page', loadpage);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=filemanager",
+			dataType: "json",
+			type: 'POST',
+			contentType: false,
+			processData: false,
+			data: formdata,
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng.e_filemanager);
+			},
+
+			success: function(data){
+
+				if(!data._type){ that.loading(false); return; }
+
+				$('.file-manager > .lastfiles').empty();
+
+				$.each(data._data, function(key, ar){
+
+					if(ar.size < 1024){
+						var size = ar.size+' '+lng.b;
+					}else if(ar.size < 1048576){
+						var size = (ar.size / 1024).toFixed(2);
+						size = size+' '+lng.kb;
+					}else if(ar.size < 1073741824){
+						var size = (ar.size / 1024 / 1024).toFixed(2);
+						size = size+' '+lng.mb;
+					}else{
+						var size = (ar.size / 1024 / 1024 / 1024).toFixed(2);
+						size = size+' '+lng.gb;
+					}
+
+					$('.file-manager > .lastfiles').append('<div class="file-line" id="'+ar.uniq+'">'+
+							'<div class="line-uniq"><a href="'+ar.link+'">'+ar.uniq+'</a> <a href="#" rel="tooltip" title="'+lng.change+'" class="file-edit icon-edit"></a></div>'+
+							'<div class="line-oldname">'+ar.oldname+'</div>'+
+							'<div class="line-size">'+size+'</div>'+
+							'<div class="line-downloads"><i class="icon-download" rel="tooltip" title="'+lng.count_downloads+'"></i> '+ar.downloads+'</div>'+
+							'<div class="line-info"><i class="icon-info-sign" rel="tooltip" title="'+lng.added+': '+ar.login+' | '+lng.date+': '+ar.date+'"></i></div>'+
+							'<div class="line-act"><a href="#" rel="tooltip" title="'+lng.delete+'" class="file-remove icon-remove"></a></div>'+
+						'</div>');
+
+					that.loading(false);
+				});
+
+				$('.file-manager > .lastfiles').append('<div class="pagination" id="'+loadpage+'"><ul>'+
+						'<li><a href="#" class="ajax-pagin-left"><</a></li>'+
+						'<li><a href="#" class="ajax-pagin-right">></a></li>'+
+					'</ul></div>');
+			},
+
+			complete:function(){
+
+				if(pge!==undefined){
+					$('html, body').stop().animate({
+						scrollTop: $('.file-manager').offset().top
+					}, 0);
+				}
+			}
 		});
 	}
-}
-
-function notify(title, message, type){
-	type = parseInt(type);
-	switch(type){
-		case 2: type = 'alert-error'; break;
-		case 3: type = 'alert-success'; break;
-		case 4: type = 'alert-info'; break;
-
-		default: type = ''; break;
-	}
-
-	$('html, body').animate({scrollTop:0}, 'normal');
-
-	$(".main-content").prepend('<div class="alert '+type+' ajx"><a href="#" class="close-alert">&times;</a><b>'+title+'</b> '+message+'</div>');
-
-	setTimeout("notify_closer()", 2500);
-
-	return false;
-}
-
-function send_ret_req(method, url, params){
-	var req = null;
-	try { req = new ActiveXObject("Msxml2.XMLHTTP"); } catch (e) {
-		try { req = new ActiveXObject("Microsoft.XMLHTTP"); } catch (e) {
-			try { req = new XMLHttpRequest(); } catch(e) {}
-		}
-	}
-	if (req == null) throw new Error('XMLHttpRequest not supported');
-
-	req.open(method, url, false);
-	req.send(params);
-
-	return req.responseText;
-}
-
-$.mcr_session = {
-	url: base_url+"?mode=ajax&do=session",
-
-	get: function(name){
-		var params = "&name="+name.toString();
-		return send_ret_req("GET", this.url+"&op=get"+params, null);
-	},
-
-	set: function(name, value){
-		var params = "&name="+name.toString()+"&value="+value.toString();
-		return send_ret_req("GET", this.url+"&op=set"+params, null);
-	},
-
-	remove: function(name){
-		var params = "&name="+name.toString();
-		return send_ret_req("GET", this.url+"&op=remove"+params, null);
-	},
 };
 
-$.mcr = {
-	is_json: function(str){
-		try{
-			JSON.parse(str);
-		}catch(e){
-			return false;
-		}
-		return true;
-	},
-
-	loader: '<img src="'+style_url+'img/loading.gif" alt="loading..." />',
-};
-
-function init_monitoring(){
-
-	//if(!navigator.onLine){ notify("Ошибка!", "Мониторинг недоступен. Отсутствует интернет-соединение", 1); return false; }
-
-	$.ajax({
-		url: base_url+"?mode=ajax",
-		dataType: "json",
-		type: 'GET',
-		async: true,
-		data: "do=monitor",
-		error: function(data){
-			notify("Ошибка!", "Мониторинг временно недоступен.", 1);
-		},
-		success: function(data){
-			if(!data._status){ $('.js-monitor').text(data._message); return; }
-
-			$('.js-monitor').empty();
-
-			if(data._data.length==0){ $('.js-monitor').text('Мониторинг недоступен'); }
-
-			$.each(data._data, function(i, val){
-				$('.js-monitor').append(val.form);
-
-				var element = $('.js-monitor .monitor-id#'+val.id+' .bar');
-				element.css({'left': '-'+val.progress+'%', 'width': val.progress+'%'});
-
-				setTimeout(function(){
-					element.animate({left:'0%'}, 2000, 'easeInOutQuart');
-				}, 500*i);
-			});
-		}
-	});
-}
-
+// Функции, вызываемые при загрузке
 $(function(){
+	$('input[type="file"].file-inputs').bootstrapFileInput();
 
-	$('body').tooltip({selector: '[rel="tooltip"]'});
+	// Загрузка мониторинга
+	mcr.init_monitoring();
 
-	$('.spl-body.closed').hide();
+	// Загрузка файлового менеджера(если доступен)
+	if($('.file-manager').length > 0){ mcr.init_filemanager(); }
 
-	// +++ Monitoring loading
-	init_monitoring();
-	// --- Monitoring loading
-	
-	$('.spl-btn').on("click", function(){
-		var element = $(this).attr("data-click");
-		$(".spl-body#"+element).toggleClass("opened").toggleClass("closed").slideToggle("fast");
-		$('.spl-btn[data-click="'+element+'"]').toggleClass("opened").toggleClass("closed");
+	// Добавление элемента защиты в html код страницы
+	$('form[method="post"]').prepend('<input type="hidden" name="mcr_secure" value="'+mcr.meta_data.secure+'">');
 
-		if($(this).hasClass("session")){
-			var session = $.mcr_session.get(element);
+	// Включение обработчика tooltip'ов от bootstrap
+	$('body').tooltip({selector: '[rel=tooltip]'});
+	//$('[rel=tooltip]').tooltip({container: 'body'}); // If jump elements
 
-			if(session!='true'){
-				$.mcr_session.set(element, true);
-			}else if(session=='true'){
-				$.mcr_session.set(element, false);
-			}
-		}
+	// Обработчик закрытия блока оповещений
+	$('body').on('click', '#js-notify > #close', function(){
+
+		mcr.notify_close();
 
 		return false;
 	});
 
-
+	$("body").on('click', '#close-notify', function(){
+		$(".block-notify").fadeOut("normal", function(){
+			$(this).remove();
+		});
+		return false;
+	});
 	
-	$('.check-all').on("click", function(){
+	$("body").on("click", ".check-all", function(){
 		var element = $(this).attr("data-for");
-
-		var obj = $("."+element);
-
-		var length = obj.length;
-
-		var inc;
-
-		for(inc=0; inc < length; inc++){
-
-			if($(this)[0].checked==true){
-				obj[inc].checked=true;
-			}else{
-				obj[inc].checked=false;
-			}
-		}
+		var val = false;
+		if($(this)[0].checked){ val = true; }
+		$("."+element).prop('checked', val);
 
 	});
 
-	$('.remove').click(function(){
+	$('body').on('click', '.remove', function(){
 
 		if($(this).attr("data-checkbox")!='false'){
 			var element = $(this).attr("data-for");
 			var length = $('.'+element+':checked').length;
 
 			if(length<=0){
-				notify("Ошибка!", "Не выбрано ни одного пункта для удаления", 1);
-				return false;
+				return mcr.notify(lng.error, lng.not_selected);
 			}
 
 		}
@@ -195,53 +284,65 @@
 		return true;
 	});
 
-	$('body').on("click", '.close-alert', function(){
-		$(this).parent().fadeOut("normal", function(){
-			$(this).remove();
-		});
-		return false;
-	})
-
 	$(".mcr-debug .action").on("click", function(){
 		$(".mcr-debug").toggleClass("open");
 		return false;
 	});
 
-	$(".bb-panel .bb").on("click", function(){
+	// Обработчик клика по ББ-кодам
+	$("body").on("click", ".bb-panel .bb", function(){
 
-		var panel_id = $(this).parent().closest(".bb-panel").attr("id");
+		// Получает идентификатор панели ББ-кодов и поля ввода
+		var panel_id = $(this).closest(".bb-panel").attr("id");
 
-		var pid = ".bb-panel#"+panel_id;
-
+		// Получаем поле ввода
 		var panel_obj = $('textarea[data-for="'+panel_id+'"]')[0];
 
-		var leftcode = $(this).attr("data-left");
-		var rightcode = ($(this).attr("data-right")==undefined) ? leftcode : $(this).attr("data-right");
+		// Фокусируем поле ввода
+		panel_obj.focus();
 
-		if(!$(this).hasClass("woborder")){
-			leftcode = '['+leftcode+']';
-			rightcode = (rightcode=='') ? '' : '[/'+rightcode+']';
-		}else{
-			rightcode = (rightcode=='') ? '' : rightcode;
-		}
+		// Получаем позиции курсора
+		var pos1 = panel_obj.selectionStart, pos2 = panel_obj.selectionEnd;
 
-		if(document.selection){
+		// Получаем теги элементов
+		var leftcode = ($(this).attr("data-left")==undefined) ? '' : $(this).attr("data-left");
+		var rightcode = ($(this).attr("data-right")==undefined) ? '' : $(this).attr("data-right");
 
-			var s = document.selection.createRange();
-			if(s.text){
-				s.text = leftcode + s.text + rightcode;
+		var val = panel_obj.value;
+
+		// Вставка ББ-кода в содержимое поля ввода на места выделения
+		panel_obj.value = val.substr(0,pos1) + leftcode + val.substr(pos1,pos2-pos1) + rightcode + val.substr(pos2,val.length);
+
+		// Устанавливаем позиции курсора после вставки ББ-кода
+		panel_obj.setSelectionRange(pos1+leftcode.length,pos2+leftcode.length);
+
+		return false;
+	});
+
+	// Обработчик клика по очистке формы от ББ-Кодов
+	$('body').on('click', '.bb-panel .bb-clear', function(){
+
+		var panel = $(this).closest('.bb-panel');
+
+		var panel_id = panel.attr('id'), elements = panel.find('.bb');
+
+		var panel_obj = $('textarea[data-for="'+panel_id+'"]');
+
+		var new_val = panel_obj.val();
+
+		elements.each(function(){
+
+			var left = $(this).attr('data-left'), right = $(this).attr('data-right'), reg = new RegExp('\\[(\\w+)(="")?\\]', 'ig');
+			var find = reg.exec(left);
+
+			if(find!==null){
+
+				var repl = new RegExp('\\[(\\/)?'+find[1]+'(="([\\w\\s\\-\\.\\:\\;\\+\\|\\,]+)?")?\\]', 'ig');
+				new_val = new_val.replace(repl, '');
 			}
+		});
 
-		}else{ // Opera, FireFox, Chrome
-
-			var start = (panel_obj.selectionStart==undefined) ? 0 : panel_obj.selectionStart;
-
-			var end = (panel_obj.selectionEnd==undefined) ? 0 : panel_obj.selectionEnd;
-
-			s = panel_obj.value.substr(start,end-start);
-
-			panel_obj.value = panel_obj.value.substr(0, start) + leftcode + s + rightcode + panel_obj.value.substr(end);
-		}
+		panel_obj[0].value = new_val;
 
 		return false;
 	});
@@ -262,25 +363,13 @@
 
 	});
 
-	$("#close-notify").click(function(){
-		$(".block-notify").fadeOut("normal", function(){
-			$(this).remove();
-		});
-		return false;
-	});
-
-	$(".edit").click(function(){
+	$("body").on("click", ".edit", function(){
 		
 		var element = $(this).attr("data-for");
-		var length = $('.'+element+':checked').length;
-		var link = $(this).attr("data-link");
+		var length = $('.'+element+':checked').length, link = $(this).attr("data-link");
 
-		if(length<=0){
-			notify("Ошибка!", "Не выбрано ни одного пункта для удаления", 1);
-			return false;
-		}else if(length>1){
-			notify("Ошибка!", "Для редактирования необходимо выбрать только один пункт из списка", 1);
-			return false;
+		if(length!=1){
+			return mcr.notify(lng.error, lng.only_one);
 		}
 
 		var id = $('.'+element+':checked').val();
@@ -289,4 +378,226 @@
 		
 		return false;
 	});
+
+	// Обработка всех групп меню в цикле
+	$('.spl-body').each(function(){
+		// ID группы
+		var id = $(this).attr('id');
+
+		// Проверка на существование записи о группе в куках
+		if(mcr.spl_items===undefined || mcr.spl_items[id]===undefined){ return; }
+
+		// Изменение класса группы при условии
+		if(mcr.spl_items[id]===true){
+			$(this).toggleClass('closed');
+			$('.spl-btn[data-for="'+id+'"]').toggleClass('closed');
+		}
+	});
+	
+	// Действие при клике на кнопку спойлера
+	$('body').on('click', '.spl-btn', function(){
+
+		var that = $(this);
+
+		if(that.attr('data-block')!==undefined){
+
+			that.closest(that.attr('data-block')).find('.spl-body').slideToggle("fast", function(){
+				that.toggleClass('closed');
+				$(this).toggleClass('closed');
+			});
+
+			return false;
+		}
+
+		var element = $(this).attr("data-for");
+
+		if(mcr.spl_items===undefined){ mcr.spl_items = {}; }
+
+		// Изменение класса при нажатии и выставление печенек
+		$(".spl-body#"+element).slideToggle("fast", function(){
+			that.toggleClass('closed');
+			$(this).toggleClass('closed');
+
+			mcr.spl_items[element] = (!mcr.spl_items[element]) ? true : false;
+			
+			Cookies.set('spl_items', mcr.spl_items, { expires: 365 });
+		});
+
+		return false;
+	});
+
+	// Класс для ссылок с отменой редиректа
+	$("body").on("click", ".false", function(){ return false; });
+
+	$('body').on('input change', '.file-manager input[name="files"]', function(){
+
+		mcr.loading();
+
+		var formdata = new FormData();
+
+		$.each($(this)[0].files, function(key, value){
+			if(value.size > 51200000){ return; }
+			formdata.append('files'+key, value);
+		});
+		
+		formdata.append('mcr_secure', mcr.meta_data.secure);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=filemanager&op=upload",
+			dataType: "json",
+			type: 'POST',
+			contentType: false,
+			processData: false,
+			data: formdata,
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng.e_file_load);
+			},
+
+			success: function(data){
+
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				if(data._data.errors.length > 0){ mcr.notify(lng.warning, lng.e_files_not_loaded); mcr.logger(data._data.errors); }
+
+				$.each(data._data.data, function(key, ar){
+
+					if(ar.size < 1024){
+						var size = ar.size+' б';
+					}else if(ar.size < 1048576){
+						var size = ar.size+' Кб';
+					}else if(ar.size < 1073741824){
+						var size = ar.size+' Мб';
+					}else{
+						var size = ar.size+' Гб';
+					}
+
+					$('.file-manager > .lastfiles').prepend('<div class="file-line" id="'+ar.uniq+'">'+
+							'<div class="line-uniq"><a href="'+ar.link+'">'+ar.uniq+'</a> <a href="#" rel="tooltip" title="'+lng.change+'" class="file-edit icon-edit"></a></div>'+
+							'<div class="line-oldname">'+ar.oldname+'</div>'+
+							'<div class="line-size">'+size+'</div>'+
+							'<div class="line-downloads"><i class="icon-download" rel="tooltip" title="'+lng.count_downloads+'"></i> '+ar.downloads+'</div>'+
+							'<div class="line-info"><i class="icon-info-sign" rel="tooltip" title="'+lng.added+': '+ar.login+' | '+lng.date+': '+ar.date+'"></i></div>'+
+							'<div class="line-act"><a href="#" rel="tooltip" title="'+lng.delete+'" class="file-remove icon-remove"></a></div>'+
+						'</div>');
+
+					$('.file-manager .file-input-wrapper input[type="file"].file-inputs').attr('title', lng.drop_files_here);
+					$('.file-manager .file-input-wrapper > span').text(lng.drop_files_here);
+					$('.file-manager .file-input-wrapper input[type="file"].file-inputs').removeAttr('style');
+
+					mcr.loading(false);
+				});
+			}
+		});
+
+		return false;
+	});
+
+	$('body').on('click', '.file-manager .file-remove', function(){
+
+		mcr.loading();
+
+		var that = $(this);
+
+		var id_line = that.closest('.file-line').attr('id');
+
+		var formdata = new FormData();
+
+		formdata.append('mcr_secure', mcr.meta_data.secure);
+		formdata.append('id', id_line);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=filemanager&op=remove",
+			dataType: "json",
+			type: 'POST',
+			contentType: false,
+			processData: false,
+			data: formdata,
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng.e_file_delete);
+			},
+			success: function(data){
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				that.closest('.file-line').fadeOut('normal', function(){
+					$(this).remove();
+					mcr.loading(false);
+				});
+			}
+		});
+
+		return false;
+	});
+
+	$('body').on('click', '.file-manager .file-edit', function(){
+
+		mcr.loading();
+
+		var that = $(this);
+
+		var text = that.prev('a').text();
+
+		if(!that.hasClass('edit-active')){
+			if(that.hasClass('icon-edit')){ that.removeClass('icon-edit'); }
+			that.addClass('icon-ok edit-active');
+			that.prev('a').remove();
+			$('<input class="file-edit-input" type="text" value="'+text+'">').insertBefore(that);
+			mcr.loading(false);
+			return false;
+		}
+
+		var id_line = that.closest('.file-line').attr('id');
+		var new_val = that.prev('.file-edit-input').val();
+
+		if(new_val.length <= 0){ return mcr.notify(lng.error, lng.e_id_not_filled); }
+
+		var formdata = new FormData();
+
+		formdata.append('mcr_secure', mcr.meta_data.secure);
+		formdata.append('id', id_line);
+		formdata.append('val', new_val);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=filemanager&op=edit",
+			dataType: "json",
+			type: 'POST',
+			contentType: false,
+			processData: false,
+			data: formdata,
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng.e_file_edit);
+			},
+			success: function(data){
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				if(that.hasClass('icon-ok')){ that.removeClass('icon-ok'); }
+				if(that.hasClass('edit-active')){ that.removeClass('edit-active'); }
+				that.addClass('icon-edit');
+
+				that.prev('.file-edit-input').remove();
+
+				$('<a href="'+data._data.link+'">'+data._data.uniq+'</a>').insertBefore(that);
+
+				that.closest('.file-line').attr('id', data._data.uniq);
+
+				mcr.loading(false);
+			}
+		});
+
+		return false;
+	});
+
+	$('body').on('click', '.pagination .ajax-pagin-left, .pagination .ajax-pagin-right', function(){
+		var that = $(this);
+
+		var page = $(this).closest('.pagination').attr('id');
+
+		page = ($(this).hasClass('ajax-pagin-left')) ? parseInt(page)-1 : parseInt(page)+1;
+
+		mcr.init_filemanager(page);
+
+		return false;
+	});
 });
\ No newline at end of file
diff --git a/upload/themes/default/js/global.js.back b/upload/themes/default/js/global.js.back
deleted file mode 100644
index de16631..0000000
--- a/upload/themes/default/js/global.js.back
+++ /dev/null
@@ -1,368 +0,0 @@
-function is_json(str){
-	try{
-		JSON.parse(str);
-	}catch(e){
-		return false;
-	}
-	return true;
-}
-
-function getParameterByName(name) {
-	name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-	var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-		results = regex.exec(location.search);
-	return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
-}
-
-var base_url = $("base").attr("href");
-var style_url = $('meta[name="style_url"]').attr("content");
-
-function notify_closer(){
-
-	if($('.close-alert').length >= 1){
-		$('body .close-alert').parent().fadeOut("normal", function(){
-			$(this).remove();
-		});
-	}
-}
-
-function notify(title, message, type){
-	type = parseInt(type);
-	switch(type){
-		case 2: type = 'alert-error'; break;
-		case 3: type = 'alert-success'; break;
-		case 4: type = 'alert-info'; break;
-
-		default: type = ''; break;
-	}
-
-	$('html, body').animate({scrollTop:0}, 'normal');
-
-	$(".main-content").prepend('<div class="alert '+type+' ajx"><a href="#" class="close-alert">&times;</a><b>'+title+'</b> '+message+'</div>');
-
-	setTimeout("notify_closer()", 2500);
-
-	return true;
-}
-
-function send_ret_req(method, url, params){
-	var req = null;
-	try { req = new ActiveXObject("Msxml2.XMLHTTP"); } catch (e) {
-		try { req = new ActiveXObject("Microsoft.XMLHTTP"); } catch (e) {
-			try { req = new XMLHttpRequest(); } catch(e) {}
-		}
-	}
-	if (req == null) throw new Error('XMLHttpRequest not supported');
-
-	req.open(method, url, false);
-	req.send(params);
-
-	return req.responseText;
-}
-
-$.mcr_session = {
-	url: base_url+"?mode=ajax&do=session",
-
-	get: function(name){
-		var params = "&name="+name.toString();
-		return send_ret_req("GET", this.url+"&op=get"+params, null);
-	},
-
-	set: function(name, value){
-		var params = "&name="+name.toString()+"&value="+value.toString();
-		return send_ret_req("GET", this.url+"&op=set"+params, null);
-	},
-
-	remove: function(name){
-		var params = "&name="+name.toString();
-		return send_ret_req("GET", this.url+"&op=remove"+params, null);
-	},
-};
-
-$.mcr = {
-	mon_delay: 2000,
-
-	remote_url: function(url, method, accept){
-		var req = null;
-		try{
-			req = new ActiveXObject("Msxml2.XMLHTTP");
-		}catch(e){
-			try{
-				req = new ActiveXObject("Microsoft.XMLHTTP");
-			}catch(e){
-				try{
-					req = new XMLHttpRequest();
-				}catch(e){}
-			}
-		}
-
-		if (req == null) throw new Error('XMLHttpRequest not supported');
-
-		var type = (accept===undefined) ? "text/plain" : accept;
-
-		req.open(method, url, false);
-		req.setRequestHeader("Accept",type);
-		req.send(null);
-
-		return req.responseText;
-	},
-
-	load_monitoring: function(){
-		var data = $.mcr.remote_url(base_url+"?mode=ajax&do=monitor", 'GET');
-
-		if(!is_json(data)){
-			notify("Ошибка!", "Мониторинг временно недоступен", 1);
-			return false;
-		}
-
-		$('.js-monitor').empty();
-
-		$('.js-monitor').fadeIn('slow', function(){
-
-			var jd	= JSON.parse(data);
-
-			if(!jd._status){ $(this).html(jd._message); return false; }
-
-			var jdd = jd._data;
-
-			var i = 0;
-
-			var count_players = 0;
-
-			while(i<jdd.length){
-
-				//console.log(jdd);
-
-				var ar = jdd[i];
-
-				i++;
-				
-				var m_data = $.mcr.remote_url("http://api.minetools.eu/query/" + ar.ip + "/" + ar.port, "GET");
-
-				if(!is_json(m_data)){ continue; }
-
-				var md = JSON.parse(m_data);
-				
-				$('.js-monitor').append(ar.form);
-
-				if(md.error !== undefined){
-					$('.js-monitor > .monitor-id#'+ar.id+' > .progress').addClass('progress-danger');
-					$('.js-monitor > .monitor-id#'+ar.id+' > .progress > .bar').animate({width: "100%"}, 1000);
-					$('.js-monitor > .monitor-id#'+ar.id+' > .progress > .stats').html("Оффлайн");
-				}else{
-					var persent = md.Players / (md.MaxPlayers / 100);
-					persent = parseInt(persent);
-					$('.js-monitor > .monitor-id#'+ar.id+' > .progress').addClass('progress-success');
-					$('.js-monitor > .monitor-id#'+ar.id+' > .progress > .bar').animate({width: persent+"%"}, 1000);
-					$('.js-monitor > .monitor-id#'+ar.id+' > .progress > .stats').html(md.Players+" / "+md.MaxPlayers);
-					count_players = count_players+md.Players;
-				}
-
-			}
-
-			$('.js-monitor').append("Всего игроков: "+count_players);
-			
-			$("[rel='tooltip']").tooltip({container: 'body'});
-
-			//$(this).append(jdd.form);
-
-			return true;
-		});
-	},
-
-	get_release_git: function(stable){
-
-		var url = (stable===undefined || stable===true) ? "https://api.github.com/repos/qexyorg/WebMCR/releases" : "https://api.github.com/repos/qexyorg/WebMCR/tags";
-
-		var data = this.remote_url(url, "GET", "application/json");
-
-		if(!is_json(data)){
-			notify("Ошибка!", "Произошла ошибка получения информации", 1);
-			return "∞";
-		}
-
-		jsondata	= JSON.parse(data);
-
-		if($.isEmptyObject(jsondata)){ return "∞"; }
-
-		return '<a href="'+jsondata[0]['html_url']+'" target="_blank">'+jsondata[0]['tag_name']+'</a>';
-	},
-
-	get_version: function(){
-		var data = this.remote_url("https://api.webmcr.com/?do=latest_version", "GET", "application/json");
-
-		if(!is_json(data)){
-			notify("Ошибка!", "Произошла ошибка получения информации", 1);
-			return "∞";
-		}
-
-		var jsondata	= JSON.parse(data);
-		var message		= jsondata.message;
-		//var type		= jsondata.type; // unused variable
-
-		return message;
-	},
-};
-
-$(function(){
-
-	$("[rel='tooltip']").tooltip({container: 'body'});
-
-	$('.spl-body.closed').hide();
-
-	setTimeout($.mcr.load_monitoring, $.mcr.mon_delay);
-	
-	$('.spl-btn').on("click", function(){
-		var element = $(this).attr("data-click");
-		$(".spl-body#"+element).toggleClass("opened").toggleClass("closed").slideToggle("fast");
-		$('.spl-btn[data-click="'+element+'"]').toggleClass("opened").toggleClass("closed");
-
-		if($(this).hasClass("session")){
-			var session = $.mcr_session.get(element);
-
-			if(session!='true'){
-				$.mcr_session.set(element, true);
-			}else if(session=='true'){
-				$.mcr_session.set(element, false);
-			}
-		}
-
-		return false;
-	});
-
-
-	
-	$('.check-all').on("click", function(){
-		var element = $(this).attr("data-for");
-
-		var obj = $("."+element);
-
-		var length = obj.length;
-
-		var inc;
-
-		for(inc=0; inc < length; inc++){
-
-			if($(this)[0].checked==true){
-				obj[inc].checked=true;
-			}else{
-				obj[inc].checked=false;
-			}
-		}
-
-	});
-
-	$('.remove').click(function(){
-
-		if($(this).attr("data-checkbox")!='false'){
-			var element = $(this).attr("data-for");
-			var length = $('.'+element+':checked').length;
-
-			if(length<=0){
-				notify("Ошибка!", "Не выбрано ни одного пункта для удаления", 1);
-				return false;
-			}
-
-		}
-		
-		var text = $(this).attr("data-text");
-		if(!confirm(text)){ return false; }
-
-		return true;
-	});
-
-	$('body').on("click", '.close-alert', function(){
-		$(this).parent().fadeOut("normal", function(){
-			$(this).remove();
-		});
-		return false;
-	})
-
-	$(".mcr-debug .action").on("click", function(){
-		$(".mcr-debug").toggleClass("open");
-		return false;
-	});
-
-	$(".bb-panel .bb").on("click", function(){
-
-		var panel_id = $(this).parent().closest(".bb-panel").attr("id");
-
-		var pid = ".bb-panel#"+panel_id;
-
-		var panel_obj = $('textarea[data-for="'+panel_id+'"]')[0];
-
-		var leftcode = $(this).attr("data-left");
-		var rightcode = ($(this).attr("data-right")==undefined) ? leftcode : $(this).attr("data-right");
-
-		if(!$(this).hasClass("woborder")){
-			leftcode = '['+leftcode+']';
-			rightcode = (rightcode=='') ? '' : '[/'+rightcode+']';
-		}else{
-			rightcode = (rightcode=='') ? '' : rightcode;
-		}
-
-		if(document.selection){
-
-			var s = document.selection.createRange();
-			if(s.text){
-				s.text = leftcode + s.text + rightcode;
-			}
-
-		}else{ // Opera, FireFox, Chrome
-
-			var start = (panel_obj.selectionStart==undefined) ? 0 : panel_obj.selectionStart;
-
-			var end = (panel_obj.selectionEnd==undefined) ? 0 : panel_obj.selectionEnd;
-
-			s = panel_obj.value.substr(start,end-start);
-
-			panel_obj.value = panel_obj.value.substr(0, start) + leftcode + s + rightcode + panel_obj.value.substr(end);
-		}
-
-		return false;
-	});
-
-	$("#search-selector a").click(function(){
-
-		var search_val = $("#search-hidden").val();
-
-		$("#search-selector a#"+search_val).parent().removeClass("active");
-
-		var id = this.id;
-
-		$("#search-hidden").val(id);
-
-		$(this).parent().addClass("active");
-
-		return false;
-
-	});
-
-	$("#close-notify").click(function(){
-		$(".block-notify").fadeOut("normal", function(){
-			$(this).remove();
-		});
-		return false;
-	});
-
-	$(".edit").click(function(){
-		
-		var element = $(this).attr("data-for");
-		var length = $('.'+element+':checked').length;
-		var link = $(this).attr("data-link");
-
-		if(length<=0){
-			notify("Ошибка!", "Не выбрано ни одного пункта для удаления", 1);
-			return false;
-		}else if(length>1){
-			notify("Ошибка!", "Для редактирования необходимо выбрать только один пункт из списка", 1);
-			return false;
-		}
-
-		var id = $('.'+element+':checked').val();
-
-		window.location.href = link+id;
-		
-		return false;
-	});
-});
\ No newline at end of file
diff --git a/upload/themes/default/js/jquery.datetimepicker.js b/upload/themes/default/js/jquery.datetimepicker.js
index 3991718..d269114 100644
--- a/upload/themes/default/js/jquery.datetimepicker.js
+++ b/upload/themes/default/js/jquery.datetimepicker.js
@@ -18,10 +18,10 @@
 			},
 			ru: { // Russian
 				months: [
-					'Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь', 'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь'
+					lng.jan, lng.feb, lng.mar, lng.apr, lng.may, lng.jun, lng.jul, lng.aug, lng.sep, lng.oct, lng.nov, lng.dec
 				],
 				dayOfWeek: [
-					"Вск", "Пн", "Вт", "Ср", "Чт", "Пт", "Сб"
+					lng.sun, lng.mon, lng.tue, lng.wed, lng.thu, lng.fri, lng.sat
 				]
 			},
 			uk: { // Ukrainian
diff --git a/upload/themes/default/js/modules/admin/modules.js b/upload/themes/default/js/modules/admin/modules.js
new file mode 100644
index 0000000..9f43660
--- /dev/null
+++ b/upload/themes/default/js/modules/admin/modules.js
@@ -0,0 +1,40 @@
+$(function(){
+
+	$('body').on('click', '.panel-modules #disable, .panel-modules #enable', function(){
+
+		var status = $(this).attr('id');
+		var list = $('input.'+$(this).attr('data-for')+':checked');
+		var items = '';
+
+		var new_status = (status=='enable') ? 'icon_status_on' : 'icon_status_off';
+
+		if(list.length<=0){ return mcr.notify(lng.error, lng_mod.not_selected); }
+
+		list.each(function(){
+			items += $(this).val()+',';
+		});
+
+		items = items.substr(0, items.length-1);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=admin_modules_status",
+			dataType: "json",
+			type: 'POST',
+			data: {act:status, ids:items, mcr_secure:mcr.meta_data.secure},
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng_mod.e_change_status);
+			},
+			success: function(data){
+
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				list.each(function(){
+					$(this).closest('tr').find('td.status i').attr('class', new_status);
+				});
+			}
+		});
+
+		return false;
+	});
+});
\ No newline at end of file
diff --git a/upload/themes/default/js/modules/news/news-admin.js b/upload/themes/default/js/modules/news/news-admin.js
new file mode 100644
index 0000000..d17eaea
--- /dev/null
+++ b/upload/themes/default/js/modules/news/news-admin.js
@@ -0,0 +1,70 @@
+$(function(){
+
+	$("body").on("click", ".news-attach", function(){
+		
+		mcr.loading();
+
+		var id = $(this).attr('data-id');
+
+		var formdata = new FormData();
+		
+		formdata.append('id', id);
+		formdata.append('mcr_secure', mcr.meta_data.secure);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=news_attach",
+			dataType: "json",
+			type: 'POST',
+			contentType: false,
+			processData: false,
+			data: formdata,
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng_na.e_attach);
+			},
+			success: function(data){
+
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				location.reload();
+			}
+		});
+
+		return false;
+	});
+
+	$("body").on("click", ".news-delete", function(){
+		
+		mcr.loading();
+
+		if(!confirm(lng_na.del_confirm)){ return false; }
+
+		var id = $(this).attr('data-id');
+
+		var formdata = new FormData();
+		
+		formdata.append('id', id);
+		formdata.append('mcr_secure', mcr.meta_data.secure);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=news_delete",
+			dataType: "json",
+			type: 'POST',
+			contentType: false,
+			processData: false,
+			data: formdata,
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng_na.e_delete);
+			},
+			success: function(data){
+
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				location.reload();
+			}
+		});
+
+		return false;
+	});
+});
\ No newline at end of file
diff --git a/upload/themes/default/js/modules/news/news-full.js b/upload/themes/default/js/modules/news/news-full.js
new file mode 100644
index 0000000..ea2899d
--- /dev/null
+++ b/upload/themes/default/js/modules/news/news-full.js
@@ -0,0 +1,254 @@
+$(function(){
+	
+	$("body").on("click", "#add_comment", function(){
+
+		mcr.loading();
+
+		var message = $('textarea[name="message"]')[0], nid = parseInt(mcr.getUrlParam('id'));
+
+		var formdata = new FormData();
+		
+		formdata.append('id', nid);
+		formdata.append('act', 'add_comment');
+		formdata.append('message', message.value);
+		formdata.append('mcr_secure', mcr.meta_data.secure);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=news",
+			dataType: "json",
+			type: 'POST',
+			contentType: false,
+			processData: false,
+			data: formdata,
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng_nf.e_add_comment);
+			},
+
+			success: function(data){
+
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				if($(".comment-id").hasClass("none")){ $(".comment-id.none").remove(); }
+
+				$(".comment-list-content").hide().prepend(data._data).fadeIn(400, function(){
+					message.value = '';
+					var com_count = parseInt($("#comment-count").text())+1;
+					$("#comment-count").text(com_count);
+
+					mcr.notify(data._title, data._message, 3);
+				});
+			}
+		});
+
+		return false;
+	});
+
+	$("body").on("click", ".del_comment", function(){
+
+		if(!confirm(lng_nf.del_confirm_comment)){ return false; }
+		
+		mcr.loading();
+
+		var nid = parseInt(mcr.getUrlParam('id')), id = parseInt($(this).attr("data-id"));
+
+		var formdata = new FormData();
+		
+		formdata.append('id', id);
+		formdata.append('act', 'del_comment');
+		formdata.append('nid', nid);
+		formdata.append('mcr_secure', mcr.meta_data.secure);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=news",
+			dataType: "json",
+			type: 'POST',
+			contentType: false,
+			processData: false,
+			data: formdata,
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng_nf.e_delete_comment);
+			},
+			success: function(data){
+
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				$(".comment-id#"+id).fadeOut(400, function(){
+
+					$(this).remove();
+
+					var com_count = parseInt($("#comment-count").text())-1;
+					$("#comment-count").text(com_count);
+
+					mcr.notify(data._title, data._message, 3);
+				});
+			}
+		});
+
+		return false;
+	});
+
+	$("body").on("click", ".get_comment", function(){
+
+		mcr.loading();
+
+		var nid = parseInt(mcr.getUrlParam('id')), id = parseInt($(this).attr("data-id"));
+
+		var formdata = new FormData();
+		
+		formdata.append('id', id);
+		formdata.append('act', 'get_comment');
+		formdata.append('nid', nid);
+		formdata.append('mcr_secure', mcr.meta_data.secure);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=news",
+			dataType: "json",
+			type: 'POST',
+			contentType: false,
+			processData: false,
+			data: formdata,
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng_nf.e_get_comment);
+			},
+			success: function(data){
+
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				$('textarea[name="message"]')[0].value += '[quote]'+data._data+'[/quote]';
+
+				mcr.loading(false);
+			}
+		});
+
+		return false;
+
+	});
+
+	$("body").on("click", ".edt_comment", function(){
+
+		mcr.loading();
+
+		var nid = parseInt(mcr.getUrlParam('id')), id = parseInt($(this).attr("data-id"));
+
+		var formdata = new FormData();
+		
+		formdata.append('id', id);
+		formdata.append('act', 'get_comment');
+		formdata.append('nid', nid);
+		formdata.append('mcr_secure', mcr.meta_data.secure);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=news",
+			dataType: "json",
+			type: 'POST',
+			contentType: false,
+			processData: false,
+			data: formdata,
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng_nf.e_edit_comment);
+			},
+			success: function(data){
+
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				$(".comment-id#"+id+" .comment-id-content").html('<textarea class="edit-from" id="edit-from-'+id+'">'+data._data+'</textarea><a href="#" class="btn btn-primary edt-save" id="'+id+'">'+lng.save+'</a>');
+				
+				mcr.loading(false);
+			}
+		});
+
+		return false;
+
+	});
+
+	$("body").on("click", ".edt-save", function(){
+
+		mcr.loading();
+
+		var id = $(this).attr("id");
+
+		var message = $('#edit-from-'+id)[0], nid = parseInt(mcr.getUrlParam('id'));
+
+		var formdata = new FormData();
+		
+		formdata.append('id', id);
+		formdata.append('act', 'edt_comment');
+		formdata.append('nid', nid);
+		formdata.append('message', message.value);
+		formdata.append('mcr_secure', mcr.meta_data.secure);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=news",
+			dataType: "json",
+			type: 'POST',
+			contentType: false,
+			processData: false,
+			data: formdata,
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng_nf.e_save_comment);
+			},
+			success: function(data){
+
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				$("#edit-from-"+id).next().remove();
+				$("#edit-from-"+id).remove();
+
+				$(".comment-id#"+id+" .comment-id-content").hide().prepend(data._data).fadeIn(400, function(){
+					$(this).html(data._data);
+					mcr.notify(data._title, data._message, 3);
+				});
+			}
+		});
+
+		return false;
+	});
+
+	$("body").on("click", ".like, .dislike", function(){
+
+		mcr.loading();
+
+		var nid = $(this)[0].id, value = ($(this).hasClass("like")) ? 1 : 0;
+
+		var formdata = new FormData();
+
+		formdata.append('act', 'like');
+		formdata.append('nid', nid);
+		formdata.append('value', value);
+		formdata.append('mcr_secure', mcr.meta_data.secure);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=news",
+			dataType: "json",
+			type: 'POST',
+			contentType: false,
+			processData: false,
+			data: formdata,
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng_nf.e_vote);
+			},
+			success: function(data){
+
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				$(".block-like#"+nid+" .likes").hide().fadeIn(400, function(){
+					$(this).text(data._data.likes);
+				});
+
+				$(".block-like#"+nid+" .dislikes").hide().fadeIn(400, function(){
+					$(this).text(data._data.dislikes);
+				});
+
+				mcr.notify(data._title, data._message, 3);
+			}
+		});
+
+		return false;
+	});
+});
\ No newline at end of file
diff --git a/upload/themes/default/js/modules/news/news-list.js b/upload/themes/default/js/modules/news/news-list.js
new file mode 100644
index 0000000..5083647
--- /dev/null
+++ b/upload/themes/default/js/modules/news/news-list.js
@@ -0,0 +1,44 @@
+$(function(){
+	$("body").on("click", ".like, .dislike", function(){
+
+		mcr.loading();
+
+		var nid = $(this)[0].id, value = ($(this).hasClass("like")) ? 1 : 0;
+
+		var formdata = new FormData();
+		
+		formdata.append('mcr_secure', mcr.meta_data.secure);
+		formdata.append('act', 'like');
+		formdata.append('value', value);
+		formdata.append('nid', nid);
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=news",
+			dataType: "json",
+			type: 'POST',
+			contentType: false,
+			processData: false,
+			data: formdata,
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng_nl.e_vote);
+			},
+			success: function(data){
+
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				$(".block-like#"+nid+" .likes").hide().fadeIn(400, function(){
+					$(this).text(data._data.likes);
+				});
+
+				$(".block-like#"+nid+" .dislikes").hide().fadeIn(400, function(){
+					$(this).text(data._data.dislikes);
+				});
+
+				mcr.notify(data._title, data._message, 3);
+			}
+		});
+
+		return false;
+	});
+});
\ No newline at end of file
diff --git a/upload/themes/default/js/modules/profile/main.js b/upload/themes/default/js/modules/profile/main.js
new file mode 100644
index 0000000..f2be30c
--- /dev/null
+++ b/upload/themes/default/js/modules/profile/main.js
@@ -0,0 +1,6 @@
+$(function(){
+
+	$(".skin-uploader, .cloak-uploader").on("input change", function(){
+		$(this).submit();
+	});
+});
\ No newline at end of file
diff --git a/upload/themes/default/js/modules/register/main.js b/upload/themes/default/js/modules/register/main.js
new file mode 100644
index 0000000..a0c84af
--- /dev/null
+++ b/upload/themes/default/js/modules/register/main.js
@@ -0,0 +1,62 @@
+$(function(){
+
+	$('body').on('click', '.mcr-register #postbut', function(){
+		mcr.loading();
+
+		if($('.mcr-register input[name="accept"]:checked').length!=1){ return mcr.notify(lng.error, lng_reg.required_fields); }
+
+		var login = $('.mcr-register #inputLogin').val();
+		var email = $('.mcr-register #inputEmail').val();
+		var password = $('.mcr-register #inputPassword').val();
+		var repassword = $('.mcr-register #inputRePassword').val();
+		var rules = $('.mcr-register input[name="accept"]:checked').val();
+		var gender = $('.mcr-register #inputGender').val();
+
+		var formData = new FormData();
+
+		formData.append('mcr_secure', mcr.meta_data.secure);
+		formData.append('login', login);
+		formData.append('email', email);
+		formData.append('password', password);
+		formData.append('repassword', repassword);
+		formData.append('rules', rules);
+		formData.append('gender', gender);
+
+		if($('#capcode').length>0){
+			formData.append('capcode', $('#capcode').val());
+		}else if($('#g-recaptcha-response').length>0){
+			formData.append('g-recaptcha-response', $('#g-recaptcha-response').val());
+		}else{
+			return mcr.notify(lng.error, lng_reg.e_check);
+		}
+
+		$.ajax({
+			url: "index.php?mode=ajax&do=register",
+			dataType: "json",
+			type: "POST",
+			async: true,
+			cache: false,
+			contentType: false,
+			processData: false,
+			data: formData,
+
+			error: function(data){
+				mcr.logger(data);
+				mcr.notify(lng.error, lng_reg.e_check_form);
+			},
+
+			success: function(data){
+
+				if(!data._type){ return mcr.notify(data._title, data._message); }
+
+				setTimeout(function(){
+					location.search="";
+				}, 4000);
+
+				return mcr.notify(data._title, data._message);
+			},
+		});
+
+		return false;
+	});
+});
\ No newline at end of file
diff --git a/upload/themes/default/js/news-full.js b/upload/themes/default/js/news-full.js
deleted file mode 100644
index 90a4c04..0000000
--- a/upload/themes/default/js/news-full.js
+++ /dev/null
@@ -1,286 +0,0 @@
-$(function(){
-	
-	$("body").on("click", "#add_comment", function(){
-
-		var message = $('textarea[name="message"]')[0];
-		var secure = $('.comment-form-content form input[name="mcr_secure"]').val();
-		var nid = parseInt(getParameterByName('id'));
-
-		$.ajax({
-			url: base_url+"?mode=news&ajax=true",
-			beforeSend: function(){
-				$("#add_comment").after('<img class="ajx-l" src="'+style_url+'img/loading.gif" alt="loading..." />');
-			},
-			dataType: "html",
-			type: 'POST',
-			data: "id="+nid+"&act=add_comment&message="+message.value+"&mcr_secure="+secure,
-			success: function(data){
-
-				$("#add_comment").next(".ajx-l").remove();
-
-				if(!is_json(data)){
-					notify("Ошибка", "Произошла непредвиденная ошибка. Попробуйте повторить попытку.", 1);
-					return false;
-				}
-
-				var jsondata	= JSON.parse(data);
-
-				var status = jsondata._status;
-				var content = jsondata._content;
-
-				if(status=='success'){
-					if($(".comment-id").hasClass("none")){ $(".comment-id.none").remove(); }
-
-					$(".comment-list-content").hide().prepend(content).fadeIn(400, function(){
-						message.value = '';
-						var com_count = parseInt($("#comment-count").text())+1;
-						$("#comment-count").text(com_count);
-
-						notify("Поздравляем!", "Комментарий успешно добавлен.", 3);
-					});
-					
-				}else{
-					notify("", content, 2);
-				}
-			}
-		});
-
-		return false;
-	});
-
-	$("body").on("click", ".del_comment", function(){
-
-		var secure = $('.comment-form-content form input[name="mcr_secure"]').val();
-		var nid = parseInt(getParameterByName('id'));
-		var id = parseInt($(this).attr("data-id"));
-
-		$.ajax({
-			url: base_url+"?mode=news&ajax=true",
-			beforeSend: function(){
-				$('.del_comment[data-id="'+id+'"]').after('<img class="ajx-l" src="'+style_url+'img/loading.gif" alt="loading..." />');
-			},
-			dataType: "html",
-			type: 'POST',
-			data: "act=del_comment&id="+id+"&nid="+nid+"&mcr_secure="+secure,
-			success: function(data){
-
-				$('.del_comment[data-id="'+id+'"]').next(".ajx-l").remove();
-
-				if(!is_json(data)){
-					notify("Ошибка!", "Произошла непредвиденная ошибка. Попробуйте повторить попытку.", 1);
-					return false;
-				}
-
-				var jsondata	= JSON.parse(data);
-
-				var status = jsondata._status;
-				var content = jsondata._content;
-
-				if(status=='success'){
-
-					$(".comment-id#"+id).fadeOut(400, function(){
-
-						$(".comment-id#"+id).remove();
-
-						var com_count = parseInt($("#comment-count").text())-1;
-						$("#comment-count").text(com_count);
-
-						notify("Поздравляем!", content, 3);
-					});
-					
-				}else{
-					notify("", content, 2);
-				}
-			}
-		});
-
-		return false;
-	});
-
-	$("body").on("click", ".get_comment", function(){
-
-		var secure = $('.comment-form-content form input[name="mcr_secure"]').val();
-		var nid = parseInt(getParameterByName('id'));
-		var id = parseInt($(this).attr("data-id"));
-
-		$.ajax({
-			url: base_url+"?mode=news&ajax=true",
-			beforeSend: function(){
-				$('.get_comment[data-id="'+id+'"]').after('<img class="ajx-l" src="'+style_url+'img/loading.gif" alt="loading..." />');
-			},
-			dataType: "html",
-			type: 'POST',
-			data: "act=get_comment&id="+id+"&nid="+nid+"&mcr_secure="+secure,
-			success: function(data){
-
-				$('.get_comment[data-id="'+id+'"]').next(".ajx-l").remove();
-
-				if(!is_json(data)){
-					notify("Ошибка!", "Произошла непредвиденная ошибка. Попробуйте повторить попытку.", 1);
-					return false;
-				}
-
-				var jsondata	= JSON.parse(data);
-
-				var status = jsondata._status;
-				var content = jsondata._content;
-
-				if(status=='success'){
-
-					$('textarea[name="message"]')[0].value += '[quote]'+content+'[/quote]';
-					
-				}else{
-					notify("Ошибка!", content, 1);
-				}
-			}
-		});
-
-		return false;
-
-	});
-
-	$("body").on("click", ".edt_comment", function(){
-
-		var secure = $('.comment-form-content form input[name="mcr_secure"]').val();
-		var nid = parseInt(getParameterByName('id'));
-		var id = parseInt($(this).attr("data-id"));
-
-		$.ajax({
-			url: base_url+"?mode=news&ajax=true",
-			beforeSend: function(){
-				$('.edt_comment[data-id="'+id+'"]').after('<img class="ajx-l" src="'+style_url+'img/loading.gif" alt="loading..." />');
-			},
-			dataType: "html",
-			type: 'POST',
-			data: "act=get_comment&id="+id+"&nid="+nid+"&mcr_secure="+secure,
-			success: function(data){
-
-				$('.edt_comment[data-id="'+id+'"]').next(".ajx-l").remove();
-
-				if(!is_json(data)){
-					notify("Ошибка!", "Произошла непредвиденная ошибка. Попробуйте повторить попытку.", 1);
-					return false;
-				}
-
-				var jsondata	= JSON.parse(data);
-
-				var status = jsondata._status;
-				var content = jsondata._content;
-
-				if(status=='success'){
-
-					$(".comment-id#"+id+" .comment-id-content").html('<textarea class="edit-from" id="edit-from-'+id+'">'+content+'</textarea><a href="#" class="btn btn-primary edt-save" id="'+id+'">Сохранить</a>');
-					
-				}else{
-					notify("Ошибка!", content, 1);
-				}
-			}
-		});
-
-		return false;
-
-	});
-
-	$("body").on("click", ".edt-save", function(){
-
-		var id = $(this).attr("id");
-
-		var message = $('#edit-from-'+id)[0];
-		var secure = $('.comment-form-content form input[name="mcr_secure"]').val();
-		var nid = parseInt(getParameterByName('id'));
-
-		$.ajax({
-			url: base_url+"?mode=news&ajax=true",
-			beforeSend: function(){
-				$(".edt-save").after('<img class="ajx-l" src="'+style_url+'img/loading.gif" alt="loading..." />');
-			},
-			dataType: "html",
-			type: 'POST',
-			data: "&act=edt_comment&nid="+nid+"&id="+id+"&message="+message.value+"&mcr_secure="+secure,
-			success: function(data){
-
-				$(".edt-save").next(".ajx-l").remove();
-
-				if(!is_json(data)){
-					notify("Ошибка!", "Произошла непредвиденная ошибка. Попробуйте повторить попытку.", 1);
-					return false;
-				}
-
-				var jsondata	= JSON.parse(data);
-
-				var status = jsondata._status;
-				var content = jsondata._content;
-
-				if(status=='success'){
-
-					$("#edit-from-"+id).next().remove();
-					$("#edit-from-"+id).remove();
-
-					$(".comment-id#"+id+" .comment-id-content").hide().prepend(content).fadeIn(400, function(){
-						$(this).html(content);
-						notify("Поздравляем!", "Комментарий успешно изменен!", 3);
-					});
-					
-				}else{
-					notify("Ошибка!", content, 1);
-				}
-			}
-		});
-
-		return false;
-	});
-
-	$("body").on("click", ".like, .dislike", function(){
-
-		var nid = $(this)[0].id; // new id
-
-		var value = ($(this).hasClass("like")) ? 1 : 0;
-
-		var secure = $('form input[name="mcr_secure"]').val();
-
-		$.ajax({
-			url: base_url+"?mode=news&ajax=true",
-			beforeSend: function(){
-				$(".block-like#"+nid).after('<img class="ajx-l" src="'+style_url+'img/loading.gif" alt="loading..." />');
-			},
-			dataType: "html",
-			type: 'POST',
-			data: "&act=like&value="+value+"&nid="+nid+"&mcr_secure="+secure,
-			success: function(data){
-
-				$(".block-like#"+nid).next(".ajx-l").remove();
-
-				if(!is_json(data)){
-					notify("Ошибка!", "Произошла непредвиденная ошибка. Попробуйте повторить попытку.", 1);
-					return false;
-				}
-
-				var jsondata	= JSON.parse(data);
-
-				var status = jsondata._status;
-				var content = jsondata._content;
-
-				if(status=='success'){
-					content = content.split('_');
-					var dislikes = content[0];
-					var likes = content[1];
-
-					$(".block-like#"+nid+" .likes").hide().fadeIn(400, function(){
-						$(this).text(likes);
-					});
-
-					$(".block-like#"+nid+" .dislikes").hide().fadeIn(400, function(){
-						$(this).text(dislikes);
-					});
-
-					notify("", "Ваш голос успешно принят", 3);
-					
-				}else{
-					notify("Ошибка!", content, 1);
-				}
-			}
-		});
-
-		return false;
-	});
-});
\ No newline at end of file
diff --git a/upload/themes/default/js/news-list.js b/upload/themes/default/js/news-list.js
deleted file mode 100644
index 0bc26bf..0000000
--- a/upload/themes/default/js/news-list.js
+++ /dev/null
@@ -1,55 +0,0 @@
-$(function(){
-	$("body").on("click", ".like, .dislike", function(){
-
-		var nid = $(this)[0].id; // new id
-
-		var value = ($(this).hasClass("like")) ? 1 : 0;
-
-		var secure = $('form input[name="mcr_secure"]').val();
-
-		$.ajax({
-			url: base_url+"?mode=news&ajax=true",
-			beforeSend: function(){
-				$(".block-like#"+nid).after('<img class="ajx-l" src="'+style_url+'img/loading.gif" alt="loading..." />');
-			},
-			dataType: "html",
-			type: 'POST',
-			data: "&act=like&value="+value+"&nid="+nid+"&mcr_secure="+secure,
-			success: function(data){
-
-				$(".block-like#"+nid).next(".ajx-l").remove();
-
-				if(!is_json(data)){
-					notify("Ошибка!", "Произошла непредвиденная ошибка. Попробуйте повторить попытку.", 1);
-					return false;
-				}
-
-				var jsondata	= JSON.parse(data);
-
-				var status = jsondata._status;
-				var content = jsondata._content;
-
-				if(status=='success'){
-					content = content.split('_');
-					var dislikes = content[0];
-					var likes = content[1];
-
-					$(".block-like#"+nid+" .likes").hide().fadeIn(400, function(){
-						$(this).text(likes);
-					});
-
-					$(".block-like#"+nid+" .dislikes").hide().fadeIn(400, function(){
-						$(this).text(dislikes);
-					});
-
-					notify("", "Ваш голос успешно принят", 3);
-					
-				}else{
-					notify("Ошибка!", content, 1);
-				}
-			}
-		});
-
-		return false;
-	});
-});
\ No newline at end of file
diff --git a/upload/themes/default/js/profile.js b/upload/themes/default/js/profile.js
deleted file mode 100644
index ccce54d..0000000
--- a/upload/themes/default/js/profile.js
+++ /dev/null
@@ -1,7 +0,0 @@
-$(function(){
-	$('.file-inputs').bootstrapFileInput();
-
-	$(".skin-uploader, .cloak-uploader").on("change", function(){
-		$(this).submit();
-	});
-});
\ No newline at end of file
diff --git a/upload/themes/default/js/register.js b/upload/themes/default/js/register.js
deleted file mode 100644
index 899f355..0000000
--- a/upload/themes/default/js/register.js
+++ /dev/null
@@ -1,61 +0,0 @@
-$(function(){
-
-	$(".mcr-register #inputLogin, .mcr-register #inputEmail, .mcr-register #inputPassword, .mcr-register #inputRePassword").on("change", function(){
-		var value = $(this).val();
-		var secure = $('.mcr-register input[name="mcr_secure"]').val();
-		var selector = $(this).attr("id");
-		var do_post = '';
-
-		switch(selector){
-			case 'inputLogin': do_post = 'check_login'; break;
-			case 'inputEmail': do_post = 'check_email'; break;
-			case 'inputPassword': do_post = 'check_pass'; break;
-			case 'inputRePassword': do_post = 'check_repass'; break;
-
-			default: notify("", "Hacking Attempt!", 2); return false; break;
-		}
-
-		if($(this).next().hasClass("ajx-l")){
-			$(this).next(".ajx-l").remove();	
-		}
-
-		if(do_post=='check_pass'){
-			if(value.length<6){
-				$(".mcr-register input#"+selector).after('<i class="ajx-l icon-remove" rel="tooltip" title="Пароль должен быть не менее 6-ти символов"></i>');
-			}else{
-				$(".mcr-register input#"+selector).after('<i class="ajx-l icon-ok"></i>');
-			}
-
-			return false;
-		}else if(do_post=='check_repass'){
-			if(value!=$('.mcr-register #inputPassword').val()){
-				$(".mcr-register input#"+selector).after('<i class="ajx-l icon-remove" rel="tooltip" title="Пароли не совпадают"></i>');
-			}else{
-				$(".mcr-register input#"+selector).after('<i class="ajx-l icon-ok"></i>');
-			}
-
-			return false;
-		}
-
-		$.ajax({
-			url: base_url+"?mode=ajax",
-			beforeSend: function(){
-				$(".mcr-register input#"+selector).after('<img class="ajx-l" src="'+style_url+'img/loading.gif" alt="loading..." />');
-			},
-			dataType: "json",
-			type: 'POST',
-			data: "mcr_secure="+secure+"&do="+do_post+"&value="+value,
-			error: function(data){
-				$(".mcr-register input#"+selector).next(".ajx-l").remove();
-				
-				$(".mcr-register input#"+selector).after('<i class="ajx-l icon-remove"></i>');
-			},
-
-			success: function(data){
-				$(".mcr-register input#"+selector).next(".ajx-l").remove();
-
-				if(data._status=='success'){ $(".mcr-register input#"+selector).after('<i class="ajx-l icon-ok"></i>'); }
-			}
-		});
-	});
-});
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/comments/com-add.html b/upload/themes/default/modules/admin/comments/com-add.html
index 8ab43cd..bbde14d 100644
--- a/upload/themes/default/modules/admin/comments/com-add.html
+++ b/upload/themes/default/modules/admin/comments/com-add.html
@@ -9,17 +9,17 @@
 	<form class="form-horizontal" method="post">
 
 		<div class="control-group">
-			<label class="control-label" for="inputCategory">Новость</label>
+			<label class="control-label" for="inputCategory"><?php echo $this->lng_m['com_col_news']; ?></label>
 			<div class="controls">
-				<select name="nid" id="inputCategory"><?php echo $data['NEWS']; ?></select>
+				<select name="nid" class="span10" id="inputCategory"><?php echo $data['NEWS']; ?></select>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputText">Комментарий</label>
+			<label class="control-label" for="inputText"><?php echo $this->lng_m['com_col_comment']; ?></label>
 			<div class="controls">
 				<?php echo $data['BB_PANEL']; ?>
-				<textarea id="inputText" placeholder="Текст комментария" data-for="bb-comment" class="input-block-level" name="text" rows="6"><?php echo $data['TEXT']; ?></textarea>
+				<textarea id="inputText" placeholder="<?php echo $this->lng_m['com_text']; ?>" data-for="bb-comment" class="input-block-level" name="text" rows="6"><?php echo $data['TEXT']; ?></textarea>
 			</div>
 		</div>
 
diff --git a/upload/themes/default/modules/admin/comments/com-list.html b/upload/themes/default/modules/admin/comments/com-list.html
index cef6436..291042a 100644
--- a/upload/themes/default/modules/admin/comments/com-list.html
+++ b/upload/themes/default/modules/admin/comments/com-list.html
@@ -2,7 +2,7 @@
 	<div class="form-block">
 
 		<div class="block-header">
-			<div class="block-name">Новости</div>
+			<div class="block-name"><?php echo $this->lng_m['comments']; ?></div>
 		</div>
 
 		<div class="block-line"></div>
@@ -11,9 +11,9 @@
 			<thead>
 				<tr>
 					<th>#</th>
-					<th>Комментарий</th>
-					<th>Новость</th>
-					<th class="action">Действие <input type="checkbox" class="check-all" data-for="check-input"></th>
+					<th><?php echo $this->lng_m['com_col_comment']; ?></th>
+					<th><?php echo $this->lng_m['com_col_news']; ?></th>
+					<th class="action"><?php echo $this->lng_m['action']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
 				</tr>
 			</thead>
 
@@ -26,11 +26,11 @@
 	<div class="form-block actions">
 		<?php echo $data['PAGINATION']; ?>
 		<div class="right-act">
-			Действие с категориями: 
+			<?php echo $this->lng_m['com_action']; ?>: 
 			<div class="btn-group">
 				<a class="btn" href="<?php echo ADMIN_URL; ?>&do=comments&op=add"><i class="icon-plus"></i></a>
 				<a class="btn edit" data-for="check-input" data-link="<?php echo ADMIN_URL; ?>&do=comments&op=edit&id=" href="#"><i class="icon-pencil"></i></a>
-				<button class="btn remove" data-for="check-input" data-text="Вы уверены, что хотите удалить выбранные элементы?" type="submit" name="delete"><i class="icon-remove"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['com_accept']; ?>?" type="submit" name="delete"><i class="icon-remove"></i></button>
 			</div>
 		</div>
 		
diff --git a/upload/themes/default/modules/admin/comments/com-none.html b/upload/themes/default/modules/admin/comments/com-none.html
index 0f181f5..496fbb4 100644
--- a/upload/themes/default/modules/admin/comments/com-none.html
+++ b/upload/themes/default/modules/admin/comments/com-none.html
@@ -1,3 +1,3 @@
 <tr>
-	<td colspan="4"><center>Нет доступных комментариев</center></td>
+	<td colspan="4"><center><?php echo $this->lng_m['com_not_exist']; ?></center></td>
 </tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/groups/group-add.html b/upload/themes/default/modules/admin/groups/group-add.html
index dd91b2c..1693cf4 100644
--- a/upload/themes/default/modules/admin/groups/group-add.html
+++ b/upload/themes/default/modules/admin/groups/group-add.html
@@ -8,19 +8,19 @@
 
 	<form class="form-horizontal" method="post">
 		<div class="control-group">
-			<label class="control-label" for="inputTitle">Название</label>
+			<label class="control-label" for="inputTitle"><?php echo $this->lng_m['grp_field_name']; ?></label>
 			<div class="controls">
-				<input type="text" class="span8" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="Название" required>
+				<input type="text" class="span8" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="<?php echo $this->lng_m['grp_field_name']; ?>" required>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="textareaText">Описание</label>
+			<label class="control-label" for="textareaText"><?php echo $this->lng_m['grp_field_desc']; ?></label>
 			<div class="controls">
-				<textarea name="text" class="span8" placeholder="Описание" rows="8" maxlength="255" id="textareaText"><?php echo $data['TEXT']; ?></textarea>
+				<textarea name="text" class="span8" placeholder="<?php echo $this->lng_m['grp_field_desc']; ?>" rows="8" maxlength="255" id="textareaText"><?php echo $data['TEXT']; ?></textarea>
 			</div>
 		</div>
-		<legend>Привилегии</legend>
+		<legend><?php echo $this->lng_m['grp_field_perm']; ?></legend>
 		<?php echo $data['PERMISSIONS']; ?>
 
 		<div class="control-group">
diff --git a/upload/themes/default/modules/admin/groups/group-list.html b/upload/themes/default/modules/admin/groups/group-list.html
index fcefb85..f153dfb 100644
--- a/upload/themes/default/modules/admin/groups/group-list.html
+++ b/upload/themes/default/modules/admin/groups/group-list.html
@@ -2,7 +2,7 @@
 	<div class="form-block">
 
 		<div class="block-header">
-			<div class="block-name">Группы пользователей</div>
+			<div class="block-name"><?php echo $this->lng_m['mod_name']; ?></div>
 		</div>
 
 		<div class="block-line"></div>
@@ -11,9 +11,9 @@
 			<thead>
 				<tr>
 					<th>#</th>
-					<th>Название</th>
-					<th>Описание</th>
-					<th class="action">Действие <input type="checkbox" class="check-all" data-for="check-input"></th>
+					<th><?php echo $this->lng_m['grp_field_name']; ?></th>
+					<th><?php echo $this->lng_m['grp_field_desc']; ?></th>
+					<th class="action"><?php echo $this->lng_m['grp_field_act']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
 				</tr>
 			</thead>
 
@@ -26,11 +26,11 @@
 	<div class="form-block actions">
 		<?php echo $data['PAGINATION']; ?>
 		<div class="right-act">
-			Действие с группами:
+			<?php echo $this->lng_m['grp_action']; ?>:
 			<div class="btn-group">
 				<a class="btn" href="<?php echo ADMIN_URL; ?>&do=groups&op=add"><i class="icon-plus"></i></a>
 				<a class="btn edit" data-for="check-input" data-link="<?php echo ADMIN_URL; ?>&do=groups&op=edit&id=" href="#"><i class="icon-pencil"></i></a>
-				<button class="btn remove" data-for="check-input" data-text="Удаление групп приведет к удалению всех входящих в них пользователей. Вы уверены, что хотите удалить выбранные элементы?" type="submit" name="delete"><i class="icon-remove"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['grp_accept']; ?>" type="submit" name="delete"><i class="icon-remove"></i></button>
 			</div>
 		</div>
 		
diff --git a/upload/themes/default/modules/admin/groups/group-none.html b/upload/themes/default/modules/admin/groups/group-none.html
index 8dac533..21ff763 100644
--- a/upload/themes/default/modules/admin/groups/group-none.html
+++ b/upload/themes/default/modules/admin/groups/group-none.html
@@ -1,3 +1,3 @@
 <tr>
-	<td colspan="4"><center>Нет доступных групп пользователей</center></td>
+	<td colspan="4"><center><?php echo $this->lng_m['grp_empty']; ?></center></td>
 </tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/info/extensions.html b/upload/themes/default/modules/admin/info/extensions.html
index 07ea4b2..0cd88bf 100644
--- a/upload/themes/default/modules/admin/info/extensions.html
+++ b/upload/themes/default/modules/admin/info/extensions.html
@@ -1,7 +1,7 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Дополнения</div>
+		<div class="block-name"><?php echo $this->lng_m['info_ext']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
@@ -9,9 +9,9 @@
 	<div class="adm-info-modules">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=main">Информация</a></li>
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=extensions">Дополнения</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=stats">Статистика</a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=main"><?php echo $this->lng_m['info']; ?></a></li>
+			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=extensions"><?php echo $this->lng_m['info_ext']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=stats"><?php echo $this->lng_m['info_stats']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
diff --git a/upload/themes/default/modules/admin/info/main.html b/upload/themes/default/modules/admin/info/main.html
index 511a153..a26812d 100644
--- a/upload/themes/default/modules/admin/info/main.html
+++ b/upload/themes/default/modules/admin/info/main.html
@@ -1,7 +1,7 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Информация и статистика</div>
+		<div class="block-name"><?php echo $this->lng_m['info_and_stats']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
@@ -9,9 +9,9 @@
 	<div class="adm-info-main">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=main">Информация</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=extensions">Дополнения</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=stats">Статистика</a></li>
+			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=main"><?php echo $this->lng_m['info']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=extensions"><?php echo $this->lng_m['info_ext']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=stats"><?php echo $this->lng_m['info_stats']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
@@ -20,18 +20,18 @@
 				<ul class="thumbnails">
 					<li class="span6">
 						<div class="thumbnail">
-							<h3>Новости</h3>
+							<h3><?php echo $this->lng_m['info_news']; ?></h3>
 							<p><span id="api-engine-news"></span></p>
 						</div>
 					</li>
 					
 					<li class="span6">
 						<div class="thumbnail">
-							<h3>Версия движка</h3>
-							<p><b>Текущая версия</b>: <span id="engine-version"><?php echo VERSION; ?></span></p>
-							<p><b>Последняя стабильная версия</b>: <span id="api-engine-version"></span></p>
-							<p><b>Версия на GitHub</b>: <span id="git-engine-version"></span></p>
-							<p><b>Dev версия</b>: <span id="git-dev-version"></span></p>
+							<h3><?php echo $this->lng_m['info_eng_ver']; ?></h3>
+							<p><b><?php echo $this->lng_m['info_eng_ver_now']; ?></b>: <span id="engine-version"><?php echo VERSION; ?></span></p>
+							<p><b><?php echo $this->lng_m['info_eng_ver_last']; ?></b>: <span id="api-engine-version"></span></p>
+							<p><b><?php echo $this->lng_m['info_eng_ver_git']; ?></b>: <span id="git-engine-version"></span></p>
+							<p><b><?php echo $this->lng_m['info_eng_ver_dev']; ?></b>: <span id="git-dev-version"></span></p>
 						</div>
 					</li>
 				</ul>
diff --git a/upload/themes/default/modules/admin/info/stats.html b/upload/themes/default/modules/admin/info/stats.html
index ba5920e..b855689 100644
--- a/upload/themes/default/modules/admin/info/stats.html
+++ b/upload/themes/default/modules/admin/info/stats.html
@@ -1,7 +1,7 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Информация и статистика</div>
+		<div class="block-name"><?php echo $this->lng_m['info_and_stats']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
@@ -9,9 +9,9 @@
 	<div class="adm-info-stats">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=main">Информация</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=extensions">Дополнения</a></li>
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=stats">Статистика</a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=main"><?php echo $this->lng_m['info']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=extensions"><?php echo $this->lng_m['info_ext']; ?></a></li>
+			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=info&op=stats"><?php echo $this->lng_m['info_stats']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
@@ -20,31 +20,31 @@
 				<ul class="thumbnails">
 					<li class="span6">
 						<div class="thumbnail">
-							<h3>Статистика новостей</h3>
+							<h3><?php echo $this->lng_m['info_news_stats']; ?></h3>
 							<p>
 								<table class="table table-hover">
 									<tr>
-										<td>Новостей</td>
+										<td><?php echo $this->lng_m['info_count_news']; ?></td>
 										<td class="text-right"><?php echo $data['COUNT_NEWS']; ?></td>
 									</tr>
 
 									<tr>
-										<td>Просмотров</td>
+										<td><?php echo $this->lng_m['info_count_views']; ?><</td>
 										<td class="text-right"><?php echo $data['COUNT_VIEWS']; ?></td>
 									</tr>
 
 									<tr>
-										<td>Голосов</td>
+										<td><?php echo $this->lng_m['info_count_votes']; ?><</td>
 										<td class="text-right"><?php echo $data['COUNT_VOTES']; ?></td>
 									</tr>
 
 									<tr>
-										<td>Категорий</td>
+										<td><?php echo $this->lng_m['info_count_cats']; ?><</td>
 										<td class="text-right"><?php echo $data['COUNT_CATEGORIES']; ?></td>
 									</tr>
 
 									<tr>
-										<td>Комментариев</td>
+										<td><?php echo $this->lng_m['info_count_coms']; ?><</td>
 										<td class="text-right"><?php echo $data['COUNT_COMMENTS']; ?></td>
 									</tr>
 								</table>
@@ -54,18 +54,18 @@
 					
 					<li class="span6">
 						<div class="thumbnail">
-							<h3>Статистика пользователей</h3>
+							<h3><?php echo $this->lng_m['info_users_stats']; ?></h3>
 							<p>
 								<table class="table table-hover">
 									<?php echo $data['USERS_STATS']; ?>
 									<tfoot>
 										<tr>
-											<td><b>Всего пользователей</b></td>
+											<td><b><?php echo $this->lng_m['info_count_users']; ?></b></td>
 											<td class="text-right"><?php echo $data['COUNT_USERS']; ?></td>
 										</tr>
 
 										<tr>
-											<td><b>Всего групп</b></td>
+											<td><b><?php echo $this->lng_m['info_count_groups']; ?></b></td>
 											<td class="text-right"><?php echo $data['COUNT_GROUPS']; ?></td>
 										</tr>
 									</tfoot>
@@ -76,16 +76,16 @@
 
 					<li class="span12">
 						<div class="thumbnail">
-							<h3>Разное</h3>
+							<h3><?php echo $this->lng_m['info_other']; ?></h3>
 							<p>
 								<table class="table table-hover">
 									<tr>
-										<td>Статических страниц</td>
+										<td><?php echo $this->lng_m['info_count_statics']; ?></td>
 										<td class="text-right"><?php echo $data['COUNT_STATICS']; ?></td>
 									</tr>
 
 									<tr>
-										<td>Привилегий</td>
+										<td><?php echo $this->lng_m['info_count_perms']; ?></td>
 										<td class="text-right"><?php echo $data['COUNT_PERMISSIONS']; ?></td>
 									</tr>
 								</table>
diff --git a/upload/themes/default/modules/admin/logs/log-id.html b/upload/themes/default/modules/admin/logs/log-id.html
new file mode 100644
index 0000000..4c85c80
--- /dev/null
+++ b/upload/themes/default/modules/admin/logs/log-id.html
@@ -0,0 +1,6 @@
+<tr>
+	<td><?php echo $data['ID']; ?></td>
+	<td><a href="#"><?php echo $data['LOGIN']; ?></a></td>
+	<td><?php echo $data['MESSAGE']; ?></td>
+	<td><?php echo $data['DATE']; ?></td>
+</tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/logs/log-list.html b/upload/themes/default/modules/admin/logs/log-list.html
new file mode 100644
index 0000000..1a278e1
--- /dev/null
+++ b/upload/themes/default/modules/admin/logs/log-list.html
@@ -0,0 +1,32 @@
+<form method="post" class="panel-logs" action="<?php echo ADMIN_URL; ?>&do=logs&op=delete">
+	<div class="form-block">
+
+		<div class="block-header">
+			<div class="block-name"><?php echo $this->lng_m['logs_views']; ?></div>
+		</div>
+
+		<div class="block-line"></div>
+
+		<table class="table table-striped table table-hover">
+			<thead>
+				<tr>
+					<th>#</th>
+					<th><?php echo $this->lng_m['logs_user']; ?></th>
+					<th><?php echo $this->lng_m['logs_action']; ?></th>
+					<th><?php echo $this->lng_m['logs_date']; ?></th>
+				</tr>
+			</thead>
+
+			<tbody>
+				<?php echo $data['LOGS']; ?>
+			</tbody>
+		</table>
+	</div>
+
+	<div class="form-block actions">
+		<?php echo $data['PAGINATION']; ?>
+		<div class="right-act">
+		</div>
+		
+	</div>
+</form>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/logs/log-none.html b/upload/themes/default/modules/admin/logs/log-none.html
new file mode 100644
index 0000000..2d7718d
--- /dev/null
+++ b/upload/themes/default/modules/admin/logs/log-none.html
@@ -0,0 +1,3 @@
+<tr>
+	<td colspan="4"><center><?php echo $this->lng_m['logs_empty']; ?></center></td>
+</tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/menu/menu-add.html b/upload/themes/default/modules/admin/menu/menu-add.html
index fa5d633..7774aa6 100644
--- a/upload/themes/default/modules/admin/menu/menu-add.html
+++ b/upload/themes/default/modules/admin/menu/menu-add.html
@@ -8,42 +8,42 @@
 
 	<form class="form-horizontal" method="post">
 		<div class="control-group">
-			<label class="control-label" for="inputTitle">Название</label>
+			<label class="control-label" for="inputTitle"><?php echo $this->lng_m['menu_field_name']; ?></label>
 			<div class="controls">
-				<input type="text" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="Название">
+				<input type="text" class="span10" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="<?php echo $this->lng_m['menu_field_name']; ?>">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputUrl">Ссылка</label>
+			<label class="control-label" for="inputUrl"><?php echo $this->lng_m['menu_field_link']; ?></label>
 			<div class="controls">
-				<input type="text" name="url" value="<?php echo $data['URL']; ?>" id="inputUrl" placeholder="URL">
+				<input type="text" class="span10" name="url" value="<?php echo $data['URL']; ?>" id="inputUrl" placeholder="<?php echo $this->lng_m['menu_field_link']; ?>">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="selectParent">Позиция</label>
+			<label class="control-label" for="selectParent"><?php echo $this->lng_m['menu_field_pos']; ?></label>
 			<div class="controls">
-				<select size="6" name="parent" id="selectParent">
+				<select size="6" class="span10" name="parent" id="selectParent">
 					<?php echo $data['PARENTS']; ?>
 				</select>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="selectTarget">Открытие</label>
+			<label class="control-label" for="selectTarget"><?php echo $this->lng_m['menu_field_target']; ?></label>
 			<div class="controls">
-				<select id="selectTarget" name="target">
-					<option value="_self">В текущей вкладке</option>
-					<option value="_blank" <?php echo $data['TARGET']; ?>>В новой вкладке</option>
+				<select id="selectTarget" class="span10" name="target">
+					<option value="_self"><?php echo $this->lng_m['menu_target_self']; ?></option>
+					<option value="_blank" <?php echo $data['TARGET']; ?>><?php echo $this->lng_m['menu_target_blank']; ?></option>
 				</select>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="selectPerm">Уровень доступа</label>
+			<label class="control-label" for="selectPerm"><?php echo $this->lng_m['menu_field_access']; ?></label>
 			<div class="controls">
-				<select size="6" name="permissions" id="selectPerm">
+				<select size="6" class="span10" name="permissions" id="selectPerm">
 					<?php echo $data['PERMISSIONS']; ?>
 				</select>
 			</div>
diff --git a/upload/themes/default/modules/admin/menu/menu-list.html b/upload/themes/default/modules/admin/menu/menu-list.html
index 5f50e6c..73c62f5 100644
--- a/upload/themes/default/modules/admin/menu/menu-list.html
+++ b/upload/themes/default/modules/admin/menu/menu-list.html
@@ -2,7 +2,7 @@
 	<div class="form-block">
 
 		<div class="block-header">
-			<div class="block-name">Меню</div>
+			<div class="block-name"><?php echo $this->lng_m['menu']; ?></div>
 		</div>
 
 		<div class="block-line"></div>
@@ -11,9 +11,9 @@
 			<thead>
 				<tr>
 					<th>#</th>
-					<th>Название</th>
-					<th>Родитель</th>
-					<th class="action">Действие <input type="checkbox" class="check-all" data-for="check-input"></th>
+					<th><?php echo $this->lng_m['menu_field_name']; ?></th>
+					<th><?php echo $this->lng_m['menu_field_parent']; ?></th>
+					<th class="action"><?php echo $this->lng_m['menu_field_action']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
 				</tr>
 			</thead>
 
@@ -26,11 +26,11 @@
 	<div class="form-block actions">
 		<?php echo $data['PAGINATION']; ?>
 		<div class="right-act">
-			Действие с меню: 
+			<?php echo $this->lng_m['menu_field_action2']; ?>: 
 			<div class="btn-group">
 				<a class="btn" href="<?php echo ADMIN_URL; ?>&do=menu&op=add"><i class="icon-plus"></i></a>
 				<a class="btn edit" data-for="check-input" data-link="<?php echo ADMIN_URL; ?>&do=menu&op=edit&id=" href="#"><i class="icon-pencil"></i></a>
-				<button class="btn remove" data-for="check-input" data-text="Удаление пунктов меню приведет к удалению всех входящих в них пунктов. Вы уверены, что хотите удалить выбранные элементы?" type="submit" name="delete"><i class="icon-remove"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['menu_accept']; ?>" type="submit" name="delete"><i class="icon-remove"></i></button>
 			</div>
 		</div>
 		
diff --git a/upload/themes/default/modules/admin/menu/menu-none.html b/upload/themes/default/modules/admin/menu/menu-none.html
index a97e8e2..2e2012a 100644
--- a/upload/themes/default/modules/admin/menu/menu-none.html
+++ b/upload/themes/default/modules/admin/menu/menu-none.html
@@ -1,3 +1,3 @@
 <tr>
-	<td colspan="4"><center>Нет доступных пунктов меню</center></td>
+	<td colspan="4"><center><?php echo $this->lng_m['menu_empty']; ?></center></td>
 </tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/menu_adm/icon-id.html b/upload/themes/default/modules/admin/menu_adm/icon-id.html
index e1e161e..51729e1 100644
--- a/upload/themes/default/modules/admin/menu_adm/icon-id.html
+++ b/upload/themes/default/modules/admin/menu_adm/icon-id.html
@@ -1,4 +1,4 @@
-<div class="menu-icon" title="<?php echo $data['TITLE']; ?>">
+<label class="menu-icon" title="<?php echo $data['TITLE']; ?>">
 	<div class="icon-img" style="background-image: url(<?php echo UPLOAD_URL; ?>panel-icons/<?php echo $data['IMG']; ?>);"></div>
 	<div class="icon-input"><input type="radio" name="icon" value="<?php echo $data['ID']; ?>" <?php echo $data['CHECKED']; ?>></div>
-</div>
\ No newline at end of file
+</label>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/menu_adm/menu-add.html b/upload/themes/default/modules/admin/menu_adm/menu-add.html
index 72acce3..9baa440 100644
--- a/upload/themes/default/modules/admin/menu_adm/menu-add.html
+++ b/upload/themes/default/modules/admin/menu_adm/menu-add.html
@@ -8,63 +8,63 @@
 
 	<form class="form-horizontal" method="post">
 		<div class="control-group">
-			<label class="control-label" for="inputTitle">Название</label>
+			<label class="control-label" for="inputTitle"><?php echo $this->lng_m['mcp_field_name']; ?></label>
 			<div class="controls">
-				<input type="text" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="Название" required>
+				<input type="text" class="span10" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="<?php echo $this->lng_m['mcp_field_name']; ?>" required>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="selectGid">Группа</label>
+			<label class="control-label" for="selectGid"><?php echo $this->lng_m['mcp_field_group']; ?></label>
 			<div class="controls">
-				<select name="gid" id="selectGid">
+				<select name="gid" class="span10" id="selectGid">
 					<?php echo $data['GROUPS']; ?>
 				</select>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="textareaText">Описание</label>
+			<label class="control-label" for="textareaText"><?php echo $this->lng_m['mcp_field_desc']; ?></label>
 			<div class="controls">
-				<textarea name="text" placeholder="Описание" rows="8" maxlength="255" id="textareaText"><?php echo $data['TEXT']; ?></textarea>
+				<textarea name="text" class="span10" placeholder="<?php echo $this->lng_m['mcp_field_desc']; ?>" rows="8" maxlength="255" id="textareaText"><?php echo $data['TEXT']; ?></textarea>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputUrl">Ссылка</label>
+			<label class="control-label" for="inputUrl"><?php echo $this->lng_m['mcp_field_link']; ?></label>
 			<div class="controls">
-				<input type="text" name="url" value="<?php echo $data['URL']; ?>" id="inputUrl" placeholder="URL" required>
+				<input type="text" class="span10" name="url" value="<?php echo $data['URL']; ?>" id="inputUrl" placeholder="<?php echo $this->lng_m['mcp_field_link']; ?>" required>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="selectTarget">Открытие</label>
+			<label class="control-label" for="selectTarget"><?php echo $this->lng_m['mcp_field_target']; ?></label>
 			<div class="controls">
-				<select id="selectTarget" name="target">
-					<option value="_self">В текущей вкладке</option>
-					<option value="_blank" <?php echo $data['TARGET']; ?>>В новой вкладке</option>
+				<select id="selectTarget" class="span10" name="target">
+					<option value="_self"><?php echo $this->lng_m['mcp_target_self']; ?></option>
+					<option value="_blank" <?php echo $data['TARGET']; ?>><?php echo $this->lng_m['mcp_target_blank']; ?></option>
 				</select>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="selectPerm">Уровень доступа</label>
+			<label class="control-label" for="selectPerm"><?php echo $this->lng_m['mcp_field_access']; ?></label>
 			<div class="controls">
-				<select size="6" name="permissions" id="selectPerm">
+				<select size="6" class="span10" name="permissions" id="selectPerm">
 					<?php echo $data['PERMISSIONS']; ?>
 				</select>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputPriority">Приоритет</label>
+			<label class="control-label" for="inputPriority"><?php echo $this->lng_m['mcp_field_priority']; ?></label>
 			<div class="controls">
-				<input type="text" name="priority" value="<?php echo $data['PRIORITY']; ?>" pattern="^\d+$" id="inputPriority" placeholder="Приоритет позиции меню (По умолчанию 1)">
+				<input type="text" class="span10" name="priority" value="<?php echo $data['PRIORITY']; ?>" pattern="^\d+$" id="inputPriority" placeholder="<?php echo $this->lng_m['mcp_field_priority']; ?>">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="selectIcon">Иконка</label>
+			<label class="control-label" for="selectIcon"><?php echo $this->lng_m['mcp_field_icon']; ?></label>
 			<div class="controls">
 				<?php echo $data['ICONS']; ?>
 			</div>
diff --git a/upload/themes/default/modules/admin/menu_adm/menu-list.html b/upload/themes/default/modules/admin/menu_adm/menu-list.html
index bebf70d..b89fa1b 100644
--- a/upload/themes/default/modules/admin/menu_adm/menu-list.html
+++ b/upload/themes/default/modules/admin/menu_adm/menu-list.html
@@ -2,7 +2,7 @@
 	<div class="form-block">
 
 		<div class="block-header">
-			<div class="block-name">Меню</div>
+			<div class="block-name"><?php echo $this->lng_m['manucp']; ?></div>
 		</div>
 
 		<div class="block-line"></div>
@@ -11,9 +11,9 @@
 			<thead>
 				<tr>
 					<th>#</th>
-					<th>Название</th>
-					<th>Группа</th>
-					<th class="action">Действие <input type="checkbox" class="check-all" data-for="check-input"></th>
+					<th><?php echo $this->lng_m['mcp_field_name']; ?></th>
+					<th><?php echo $this->lng_m['mcp_field_group']; ?></th>
+					<th class="action"><?php echo $this->lng_m['mcp_field_action']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
 				</tr>
 			</thead>
 
@@ -26,11 +26,11 @@
 	<div class="form-block actions">
 		<?php echo $data['PAGINATION']; ?>
 		<div class="right-act">
-			Действие с меню: 
+			<?php echo $this->lng_m['mcp_field_action2']; ?>: 
 			<div class="btn-group">
 				<a class="btn" href="<?php echo ADMIN_URL; ?>&do=menu_adm&op=add"><i class="icon-plus"></i></a>
 				<a class="btn edit" data-for="check-input" data-link="<?php echo ADMIN_URL; ?>&do=menu_adm&op=edit&id=" href="#"><i class="icon-pencil"></i></a>
-				<button class="btn remove" data-for="check-input" data-text="Вы уверены, что хотите удалить выбранные элементы?" type="submit" name="delete"><i class="icon-remove"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['mcp_accept']; ?>" type="submit" name="delete"><i class="icon-remove"></i></button>
 			</div>
 		</div>
 		
diff --git a/upload/themes/default/modules/admin/menu_adm/menu-none.html b/upload/themes/default/modules/admin/menu_adm/menu-none.html
index a97e8e2..47c483b 100644
--- a/upload/themes/default/modules/admin/menu_adm/menu-none.html
+++ b/upload/themes/default/modules/admin/menu_adm/menu-none.html
@@ -1,3 +1,3 @@
 <tr>
-	<td colspan="4"><center>Нет доступных пунктов меню</center></td>
+	<td colspan="4"><center><?php echo $this->lng_m['mcp_empty']; ?></center></td>
 </tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/menu_groups/group-add.html b/upload/themes/default/modules/admin/menu_groups/group-add.html
index 89aeb68..208f79e 100644
--- a/upload/themes/default/modules/admin/menu_groups/group-add.html
+++ b/upload/themes/default/modules/admin/menu_groups/group-add.html
@@ -8,32 +8,32 @@
 
 	<form class="form-horizontal" method="post">
 		<div class="control-group">
-			<label class="control-label" for="inputTitle">Название</label>
+			<label class="control-label" for="inputTitle"><?php echo $this->lng_m['mgrp_field_name']; ?></label>
 			<div class="controls">
-				<input type="text" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="Название" required>
+				<input type="text" class="span10" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="<?php echo $this->lng_m['mgrp_field_name']; ?>" required>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="textareaText">Описание</label>
+			<label class="control-label" for="textareaText"><?php echo $this->lng_m['mgrp_field_desc']; ?></label>
 			<div class="controls">
-				<textarea name="text" placeholder="Описание" rows="8" maxlength="255" id="textareaText"><?php echo $data['TEXT']; ?></textarea>
+				<textarea name="text" class="span10" placeholder="<?php echo $this->lng_m['mgrp_field_desc']; ?>" rows="8" maxlength="255" id="textareaText"><?php echo $data['TEXT']; ?></textarea>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="selectPerm">Уровень доступа</label>
+			<label class="control-label" for="selectPerm"><?php echo $this->lng_m['mgrp_field_access']; ?></label>
 			<div class="controls">
-				<select size="6" name="permissions" id="selectPerm">
+				<select size="6" class="span10" name="permissions" id="selectPerm">
 					<?php echo $data['PERMISSIONS']; ?>
 				</select>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputPriority">Приоритет</label>
+			<label class="control-label" for="inputPriority"><?php echo $this->lng_m['mgrp_field_priority']; ?></label>
 			<div class="controls">
-				<input type="text" name="priority" value="<?php echo $data['PRIORITY']; ?>" pattern="^\d+$" id="inputPriority" placeholder="Приоритет позиции меню (По умолчанию 1)">
+				<input type="text" class="span10" name="priority" value="<?php echo $data['PRIORITY']; ?>" pattern="^\d+$" id="inputPriority" placeholder="<?php echo $this->lng_m['mgrp_field_priority']; ?>">
 			</div>
 		</div>
 
diff --git a/upload/themes/default/modules/admin/menu_groups/group-list.html b/upload/themes/default/modules/admin/menu_groups/group-list.html
index cca54f2..de454df 100644
--- a/upload/themes/default/modules/admin/menu_groups/group-list.html
+++ b/upload/themes/default/modules/admin/menu_groups/group-list.html
@@ -2,7 +2,7 @@
 	<div class="form-block">
 
 		<div class="block-header">
-			<div class="block-name">Группы меню ПУ</div>
+			<div class="block-name"><?php echo $this->lng_m['menugrp']; ?></div>
 		</div>
 
 		<div class="block-line"></div>
@@ -11,9 +11,9 @@
 			<thead>
 				<tr>
 					<th>#</th>
-					<th>Название</th>
-					<th>Привилегии</th>
-					<th class="action">Действие <input type="checkbox" class="check-all" data-for="check-input"></th>
+					<th><?php echo $this->lng_m['mgrp_field_name']; ?></th>
+					<th><?php echo $this->lng_m['mgrp_field_perm']; ?></th>
+					<th class="action"><?php echo $this->lng_m['mgrp_field_action']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
 				</tr>
 			</thead>
 
@@ -26,11 +26,11 @@
 	<div class="form-block actions">
 		<?php echo $data['PAGINATION']; ?>
 		<div class="right-act">
-			Действие с группами: 
+			<?php echo $this->lng_m['mgrp_field_action2']; ?>: 
 			<div class="btn-group">
 				<a class="btn" href="<?php echo ADMIN_URL; ?>&do=menu_groups&op=add"><i class="icon-plus"></i></a>
 				<a class="btn edit" data-for="check-input" data-link="<?php echo ADMIN_URL; ?>&do=menu_groups&op=edit&id=" href="#"><i class="icon-pencil"></i></a>
-				<button class="btn remove" data-for="check-input" data-text="Удаление групп меню приведет к удалению всех входящих в них элементов меню. Вы уверены, что хотите удалить выбранные элементы?" type="submit" name="delete"><i class="icon-remove"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['mgrp_accept']; ?>" type="submit" name="delete"><i class="icon-remove"></i></button>
 			</div>
 		</div>
 		
diff --git a/upload/themes/default/modules/admin/menu_groups/group-none.html b/upload/themes/default/modules/admin/menu_groups/group-none.html
index f7d6806..835ada4 100644
--- a/upload/themes/default/modules/admin/menu_groups/group-none.html
+++ b/upload/themes/default/modules/admin/menu_groups/group-none.html
@@ -1,3 +1,3 @@
 <tr>
-	<td colspan="4"><center>Нет доступных групп меню</center></td>
+	<td colspan="4"><center><?php echo $this->lng_m['mgrp_empty']; ?></center></td>
 </tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/menu_icons/icon-add.html b/upload/themes/default/modules/admin/menu_icons/icon-add.html
index 74a1280..a8d7023 100644
--- a/upload/themes/default/modules/admin/menu_icons/icon-add.html
+++ b/upload/themes/default/modules/admin/menu_icons/icon-add.html
@@ -8,16 +8,16 @@
 
 	<form class="form-horizontal" method="post">
 		<div class="control-group">
-			<label class="control-label" for="inputTitle">Название</label>
+			<label class="control-label" for="inputTitle"><?php echo $this->lng_m['mi_field_name']; ?></label>
 			<div class="controls">
-				<input type="text" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="Название" required>
+				<input type="text" class="span10" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="<?php echo $this->lng_m['mi_field_name']; ?>" required>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputImg">Изображение</label>
+			<label class="control-label" for="inputImg"><?php echo $this->lng_m['mi_field_img']; ?></label>
 			<div class="controls">
-				<input type="text" name="img" value="<?php echo $data['IMG']; ?>" id="inputImg" placeholder="Изображение (По умолчанию default.png)">
+				<input type="text" class="span10" name="img" value="<?php echo $data['IMG']; ?>" id="inputImg" placeholder="<?php echo $this->lng_m['mi_field_img']; ?>">
 			</div>
 		</div>
 
diff --git a/upload/themes/default/modules/admin/menu_icons/icon-list.html b/upload/themes/default/modules/admin/menu_icons/icon-list.html
index 28fd0cf..0645ed0 100644
--- a/upload/themes/default/modules/admin/menu_icons/icon-list.html
+++ b/upload/themes/default/modules/admin/menu_icons/icon-list.html
@@ -2,7 +2,7 @@
 	<div class="form-block">
 
 		<div class="block-header">
-			<div class="block-name">Иконки меню ПУ</div>
+			<div class="block-name"><?php echo $this->lng_m['menuicons']; ?></div>
 		</div>
 
 		<div class="block-line"></div>
@@ -11,9 +11,9 @@
 			<thead>
 				<tr>
 					<th>#</th>
-					<th>Название</th>
-					<th>Изображение</th>
-					<th class="action">Действие <input type="checkbox" class="check-all" data-for="check-input"></th>
+					<th><?php echo $this->lng_m['mi_field_name']; ?></th>
+					<th><?php echo $this->lng_m['mi_field_img']; ?></th>
+					<th class="action"><?php echo $this->lng_m['mi_field_action']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
 				</tr>
 			</thead>
 
@@ -26,11 +26,11 @@
 	<div class="form-block actions">
 		<?php echo $data['PAGINATION']; ?>
 		<div class="right-act">
-			Действие с иконками: 
+			<?php echo $this->lng_m['mi_field_action2']; ?>: 
 			<div class="btn-group">
 				<a class="btn" href="<?php echo ADMIN_URL; ?>&do=menu_icons&op=add"><i class="icon-plus"></i></a>
 				<a class="btn edit" data-for="check-input" data-link="<?php echo ADMIN_URL; ?>&do=menu_icons&op=edit&id=" href="#"><i class="icon-pencil"></i></a>
-				<button class="btn remove" data-for="check-input" data-text="Вы уверены, что хотите удалить выбранные элементы?" type="submit" name="delete"><i class="icon-remove"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['mi_accept']; ?>" type="submit" name="delete"><i class="icon-remove"></i></button>
 			</div>
 		</div>
 		
diff --git a/upload/themes/default/modules/admin/menu_icons/icon-none.html b/upload/themes/default/modules/admin/menu_icons/icon-none.html
index d5e0057..6bc3454 100644
--- a/upload/themes/default/modules/admin/menu_icons/icon-none.html
+++ b/upload/themes/default/modules/admin/menu_icons/icon-none.html
@@ -1,3 +1,3 @@
 <tr>
-	<td colspan="4"><center>Нет доступных иконок</center></td>
+	<td colspan="4"><center><?php echo $this->lng_m['mi_empty']; ?></center></td>
 </tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/modules/module-add.html b/upload/themes/default/modules/admin/modules/module-add.html
new file mode 100644
index 0000000..440e5fe
--- /dev/null
+++ b/upload/themes/default/modules/admin/modules/module-add.html
@@ -0,0 +1,64 @@
+<div class="form-block">
+
+	<div class="block-header">
+		<div class="block-name"><?php echo $data['PAGE']; ?></div>
+	</div>
+
+	<div class="block-line"></div>
+
+	<form class="form-horizontal" method="post">
+		<h3><?php echo $data['TITLE']; ?></h3>
+		<small>- <?php echo $data['DESC']; ?></small>
+		<hr>
+		<address>
+			<dl class="dl-horizontal">
+
+				<dt><?php echo $this->lng_m['mod_field_author']; ?>:</dt>
+				<dd><?php echo $data['AUTHOR']; ?></dd>
+
+				<dt><?php echo $this->lng_m['mod_field_site']; ?>:</dt>
+				<dd><a href="<?php echo $data['SITE']; ?>" target="_blank"><?php echo $data['SITE']; ?></a></dd>
+
+				<dt><?php echo $this->lng_m['mod_field_email']; ?>:</dt>
+				<dd><a href="mailto:<?php echo $data['EMAIL']; ?>"><?php echo $data['EMAIL']; ?></a></dd>
+
+				<dt><?php echo $this->lng_m['mod_field_ver']; ?>:</dt>
+				<dd><?php echo $data['VERSION']; ?> <?php echo $data['UPDATE_RESULT']; ?></dd>
+			</dl>
+		</address>
+
+		<div class="control-group">
+			<label class="control-label" for="inputStatus"><?php echo $this->lng_m['mod_field_status']; ?></label>
+			<div class="controls">
+				<select name="status" id="inputStatus">
+					<option value="0"><?php echo $this->lng_m['mod_off']; ?></option>
+					<option value="1" <?php echo $data['STATUS']; ?>><?php echo $this->lng_m['mod_on']; ?></option>
+				</select>
+			</div>
+		</div>
+
+		<div class="control-group">
+			<label class="control-label" for="inputUpdate"><?php echo $this->lng_m['mod_field_upd']; ?></label>
+			<div class="controls">
+				<select name="updates" id="inputUpdate">
+					<option value="0"><?php echo $this->lng_m['mod_off1']; ?></option>
+					<option value="1" <?php echo $data['UPDATE_CHECK']; ?>><?php echo $this->lng_m['mod_on1']; ?></option>
+				</select>
+			</div>
+		</div>
+
+		<div class="control-group">
+			<label class="control-label" for="inputUrl"><?php echo $this->lng_m['mod_field_url']; ?></label>
+			<div class="controls">
+				<input type="text" id="inputUrl" name="update_url" value="<?php echo $data['UPDATE_URL']; ?>">
+			</div>
+		</div>
+
+		<div class="control-group">
+			<div class="controls">
+				<button type="submit" class="btn" name="submit"><?php echo $data['BUTTON']; ?></button>
+			</div>
+		</div>
+	</form>
+		
+</div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/modules/module-id.html b/upload/themes/default/modules/admin/modules/module-id.html
new file mode 100644
index 0000000..8bb657d
--- /dev/null
+++ b/upload/themes/default/modules/admin/modules/module-id.html
@@ -0,0 +1,7 @@
+<tr>
+	<td class="status"><i class="<?php echo $data['STATUS']; ?>"></i></td>
+	<td><a href="<?php echo BASE_URL; ?>?mode=<?php echo $data['NAME']; ?>" target="_blank"><i class="icon-share-alt"></i></a> <?php echo $data['TITLE']; ?></td>
+	<td><?php echo $data['AUTHOR']; ?></td>
+	<td><?php echo $data['VERSION']; ?></td>
+	<td class="action"><input type="checkbox"  name="id[]" class="check-input" value="<?php echo $data['NAME']; ?>"></td>
+</tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/modules/module-list.html b/upload/themes/default/modules/admin/modules/module-list.html
new file mode 100644
index 0000000..3219579
--- /dev/null
+++ b/upload/themes/default/modules/admin/modules/module-list.html
@@ -0,0 +1,38 @@
+<form method="post" class="panel-modules" action="<?php echo ADMIN_URL; ?>&do=modules&op=delete">
+	<div class="form-block">
+
+		<div class="block-header">
+			<div class="block-name"><?php echo $this->lng_m['modules']; ?></div>
+		</div>
+
+		<div class="block-line"></div>
+
+		<table class="table table-striped">
+			<thead>
+				<tr>
+					<th><?php echo $this->lng_m['mod_field_status']; ?></th>
+					<th><?php echo $this->lng_m['mod_field_name']; ?></th>
+					<th><?php echo $this->lng_m['mod_field_author']; ?></th>
+					<th><?php echo $this->lng_m['mod_field_ver']; ?></th>
+					<th class="action"><?php echo $this->lng_m['mod_field_action']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
+				</tr>
+			</thead>
+
+			<tbody>
+				<?php echo $data['MODULES']; ?>
+			</tbody>
+		</table>
+	</div>
+
+	<div class="form-block actions">
+		<div class="right-act">
+			<?php echo $this->lng_m['mod_field_action2']; ?>: 
+			<div class="btn-group">
+				<a class="btn edit" data-for="check-input" data-link="<?php echo ADMIN_URL; ?>&do=modules&op=edit&id=" href="#"><i class="icon-pencil"></i></a>
+				<button class="btn" id="enable" data-for="check-input"><i class="icon-play"></i></button>
+				<button class="btn" id="disable" data-for="check-input"><i class="icon-pause"></i></button>
+			</div>
+		</div>
+		
+	</div>
+</form>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/modules/module-none.html b/upload/themes/default/modules/admin/modules/module-none.html
new file mode 100644
index 0000000..6c41a3e
--- /dev/null
+++ b/upload/themes/default/modules/admin/modules/module-none.html
@@ -0,0 +1,3 @@
+<tr>
+	<td colspan="4"><center><?php echo $this->lng_m['mod_empty']; ?></center></td>
+</tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/monitoring/monitor-add.html b/upload/themes/default/modules/admin/monitoring/monitor-add.html
index 3320a59..f717bbc 100644
--- a/upload/themes/default/modules/admin/monitoring/monitor-add.html
+++ b/upload/themes/default/modules/admin/monitoring/monitor-add.html
@@ -8,30 +8,51 @@
 
 	<form class="form-horizontal" method="post">
 		<div class="control-group">
-			<label class="control-label" for="inputTitle">Название</label>
+			<label class="control-label" for="inputTitle"><?php echo $this->lng_m['mon_field_name']; ?></label>
 			<div class="controls">
-				<input type="text" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="Название">
+				<input type="text" class="span10" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="<?php echo $this->lng_m['mon_field_name']; ?>">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputText">Описание</label>
+			<label class="control-label" for="inputText"><?php echo $this->lng_m['mon_field_desc']; ?></label>
 			<div class="controls">
-				<textarea id="inputText" placeholder="Описание" name="text" maxlength="255" rows="5"><?php echo $data['TEXT']; ?></textarea>
+				<textarea id="inputText" class="span10" placeholder="<?php echo $this->lng_m['mon_field_desc']; ?>" name="text" maxlength="255" rows="5"><?php echo $data['TEXT']; ?></textarea>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputTitle">IP адрес</label>
+			<label class="control-label" for="inputTitle"><?php echo $this->lng_m['mon_field_ip']; ?></label>
 			<div class="controls">
-				<input type="text" name="ip" value="<?php echo $data['IP']; ?>" id="inputTitle" placeholder="IP адрес сервера">
+				<input type="text" class="span10" name="ip" value="<?php echo $data['IP']; ?>" id="inputTitle" placeholder="<?php echo $this->lng_m['mon_field_ip']; ?>">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputTitle">Порт</label>
+			<label class="control-label" for="inputTitle"><?php echo $this->lng_m['mon_field_port']; ?></label>
 			<div class="controls">
-				<input type="text" name="port" value="<?php echo $data['PORT']; ?>" id="inputTitle" placeholder="Порт">
+				<input type="text" class="span10" name="port" value="<?php echo $data['PORT']; ?>" id="inputTitle" placeholder="<?php echo $this->lng_m['mon_field_port']; ?>">
+			</div>
+		</div>
+
+		<div class="control-group">
+			<label class="control-label" for="inputType"><?php echo $this->lng_m['mon_field_type']; ?></label>
+			<div class="controls">
+				<select id="inputType" class="span10" name="type"><?php echo $data['TYPES']; ?></select>
+			</div>
+		</div>
+
+		<div class="control-group">
+			<label class="control-label" for="inputCache"><?php echo $this->lng_m['mon_field_cache']; ?></label>
+			<div class="controls">
+				<input type="text" class="span10" name="cache" value="<?php echo $data['CACHE']; ?>" id="inputCache" placeholder="<?php echo $this->lng_m['mon_field_cache']; ?>">
+			</div>
+		</div>
+
+		<div class="control-group">
+			<label class="control-label" for="inputError"><?php echo $this->lng_m['mon_field_error']; ?></label>
+			<div class="controls">
+				<input type="text" class="span10" value="<?php echo $data['ERROR']; ?>" id="inputError" disabled placeholder="<?php echo $this->lng_m['mon_field_error']; ?>">
 			</div>
 		</div>
 
diff --git a/upload/themes/default/modules/admin/monitoring/monitor-list.html b/upload/themes/default/modules/admin/monitoring/monitor-list.html
index a087d99..5295d0f 100644
--- a/upload/themes/default/modules/admin/monitoring/monitor-list.html
+++ b/upload/themes/default/modules/admin/monitoring/monitor-list.html
@@ -2,7 +2,7 @@
 	<div class="form-block">
 
 		<div class="block-header">
-			<div class="block-name">Серверы мониторинга</div>
+			<div class="block-name"><?php echo $this->lng_m['monitoring']; ?></div>
 		</div>
 
 		<div class="block-line"></div>
@@ -11,9 +11,9 @@
 			<thead>
 				<tr>
 					<th>#</th>
-					<th>Название</th>
-					<th>Адрес</th>
-					<th class="action">Действие <input type="checkbox" class="check-all" data-for="check-input"></th>
+					<th><?php echo $this->lng_m['mon_field_name']; ?></th>
+					<th><?php echo $this->lng_m['mon_field_addr']; ?></th>
+					<th class="action"><?php echo $this->lng_m['mon_field_action']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
 				</tr>
 			</thead>
 
@@ -26,11 +26,11 @@
 	<div class="form-block actions">
 		<?php echo $data['PAGINATION']; ?>
 		<div class="right-act">
-			Действие с серверами: 
+			<?php echo $this->lng_m['mon_field_action2']; ?>: 
 			<div class="btn-group">
 				<a class="btn" href="<?php echo ADMIN_URL; ?>&do=monitoring&op=add"><i class="icon-plus"></i></a>
 				<a class="btn edit" data-for="check-input" data-link="<?php echo ADMIN_URL; ?>&do=monitoring&op=edit&id=" href="#"><i class="icon-pencil"></i></a>
-				<button class="btn remove" data-for="check-input" data-text="Вы уверены, что хотите удалить выбранные элементы?" type="submit" name="delete"><i class="icon-remove"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['mon_accept']; ?>" type="submit" name="delete"><i class="icon-remove"></i></button>
 			</div>
 		</div>
 		
diff --git a/upload/themes/default/modules/admin/monitoring/monitor-none.html b/upload/themes/default/modules/admin/monitoring/monitor-none.html
index 5ec06c0..bde964d 100644
--- a/upload/themes/default/modules/admin/monitoring/monitor-none.html
+++ b/upload/themes/default/modules/admin/monitoring/monitor-none.html
@@ -1,3 +1,3 @@
 <tr>
-	<td colspan="4"><center>Нет доступных серверов в мониторинге</center></td>
+	<td colspan="4"><center><?php echo $this->lng_m['mon_empty']; ?></center></td>
 </tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/news/new-add.html b/upload/themes/default/modules/admin/news/new-add.html
index 09ca0c4..23f98d1 100644
--- a/upload/themes/default/modules/admin/news/new-add.html
+++ b/upload/themes/default/modules/admin/news/new-add.html
@@ -1,3 +1,5 @@
+<?php echo $data['PREVIEW']; ?>
+
 <div class="form-block">
 
 	<div class="block-header">
@@ -8,39 +10,39 @@
 
 	<form class="form-horizontal" method="post">
 		<div class="control-group">
-			<label class="control-label" for="inputTitle">Название</label>
+			<label class="control-label" for="inputTitle"><?php echo $this->lng_m['news_field_name']; ?></label>
 			<div class="controls">
-				<input type="text" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="Название">
+				<input type="text" class="span10" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="<?php echo $this->lng_m['news_field_name']; ?>">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputCategory">Категория</label>
+			<label class="control-label" for="inputCategory"><?php echo $this->lng_m['news_field_cat']; ?></label>
 			<div class="controls">
-				<select name="cid" id="inputCategory"><?php echo $data['CATEGORIES']; ?></select>
+				<select name="cid" class="span10" id="inputCategory"><?php echo $data['CATEGORIES']; ?></select>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputShortText">Краткое описание</label>
+			<label class="control-label" for="inputShortText"><?php echo $this->lng_m['news_field_sdesc']; ?></label>
 			<div class="controls">
 				<?php echo $data['BB_PANEL_SHORT']; ?>
-				<textarea id="inputShortText" class="input-block-level" data-for="bb-short" placeholder="Краткое описание" name="text_short" rows="4"><?php echo $data['TEXT_SHORT']; ?></textarea>
+				<textarea id="inputShortText" class="input-block-level" data-for="bb-short" placeholder="<?php echo $this->lng_m['news_field_sdesc']; ?>" name="text_short" rows="4"><?php echo $data['TEXT_SHORT']; ?></textarea>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputText">Полное описание</label>
+			<label class="control-label" for="inputText"><?php echo $this->lng_m['news_field_desc']; ?></label>
 			<div class="controls">
 				<?php echo $data['BB_PANEL_FULL']; ?>
-				<textarea id="inputText" class="input-block-level" data-for="bb-full" placeholder="Полное описание" name="text" rows="8"><?php echo $data['TEXT']; ?></textarea>
+				<textarea id="inputText" class="input-block-level" data-for="bb-full" placeholder="<?php echo $this->lng_m['news_field_desc']; ?>" name="text" rows="8"><?php echo $data['TEXT']; ?></textarea>
 			</div>
 		</div>
 
 		<div class="control-group">
 			<div class="controls">
 				<label class="checkbox">
-					<input type="checkbox" name="vote" value="1" <?php echo $data['VOTE']; ?>> Включить голосования
+					<input type="checkbox" name="vote" value="1" <?php echo $data['VOTE']; ?>> <?php echo $this->lng_m['news_field_vote']; ?>
 				</label>
 			</div>
 		</div>
@@ -48,7 +50,7 @@
 		<div class="control-group">
 			<div class="controls">
 				<label class="checkbox">
-					<input type="checkbox" name="discus" value="1" <?php echo $data['DISCUS']; ?>> Включить комметарии
+					<input type="checkbox" name="discus" value="1" <?php echo $data['DISCUS']; ?>> <?php echo $this->lng_m['news_field_com']; ?>
 				</label>
 			</div>
 		</div>
@@ -56,7 +58,7 @@
 		<div class="control-group">
 			<div class="controls">
 				<label class="checkbox">
-					<input type="checkbox" name="attach" value="1" <?php echo $data['ATTACH']; ?>> Закрепить
+					<input type="checkbox" name="attach" value="1" <?php echo $data['ATTACH']; ?>> <?php echo $this->lng_m['news_field_attach']; ?>
 				</label>
 			</div>
 		</div>
@@ -64,8 +66,11 @@
 		<div class="control-group">
 			<div class="controls">
 				<button type="submit" class="btn" name="submit"><?php echo $data['BUTTON']; ?></button>
+				<button type="submit" class="btn" name="preview"><?php echo $this->lng_m['news_preview']; ?></button>
 			</div>
 		</div>
 	</form>
 		
-</div>
\ No newline at end of file
+</div>
+
+<?php echo $this->file_manager(); ?>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/news/new-list.html b/upload/themes/default/modules/admin/news/new-list.html
index 42b9b05..fb9e2df 100644
--- a/upload/themes/default/modules/admin/news/new-list.html
+++ b/upload/themes/default/modules/admin/news/new-list.html
@@ -2,7 +2,7 @@
 	<div class="form-block">
 
 		<div class="block-header">
-			<div class="block-name">Новости</div>
+			<div class="block-name"><?php echo $this->lng_m['news']; ?></div>
 		</div>
 
 		<div class="block-line"></div>
@@ -11,9 +11,9 @@
 			<thead>
 				<tr>
 					<th>#</th>
-					<th>Название</th>
-					<th>Категория</th>
-					<th class="action">Действие <input type="checkbox" class="check-all" data-for="check-input"></th>
+					<th><?php echo $this->lng_m['news_field_name']; ?></th>
+					<th><?php echo $this->lng_m['news_field_cat']; ?></th>
+					<th class="action"><?php echo $this->lng_m['news_field_action']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
 				</tr>
 			</thead>
 
@@ -26,11 +26,11 @@
 	<div class="form-block actions">
 		<?php echo $data['PAGINATION']; ?>
 		<div class="right-act">
-			Действие с категориями: 
+			<?php echo $this->lng_m['news_field_action2']; ?>: 
 			<div class="btn-group">
 				<a class="btn" href="<?php echo ADMIN_URL; ?>&do=news&op=add"><i class="icon-plus"></i></a>
 				<a class="btn edit" data-for="check-input" data-link="<?php echo ADMIN_URL; ?>&do=news&op=edit&id=" href="#"><i class="icon-pencil"></i></a>
-				<button class="btn remove" data-for="check-input" data-text="Вы уверены, что хотите удалить выбранные элементы?" type="submit" name="delete"><i class="icon-remove"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['news_accept']; ?>" type="submit" name="delete"><i class="icon-remove"></i></button>
 			</div>
 		</div>
 		
diff --git a/upload/themes/default/modules/admin/news/new-none.html b/upload/themes/default/modules/admin/news/new-none.html
index 5a0e5ea..6fa7448 100644
--- a/upload/themes/default/modules/admin/news/new-none.html
+++ b/upload/themes/default/modules/admin/news/new-none.html
@@ -1,3 +1,3 @@
 <tr>
-	<td colspan="4"><center>Нет доступных новостей</center></td>
+	<td colspan="4"><center><?php echo $this->lng_m['news_empty']; ?></center></td>
 </tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/news/new-preview-likes.html b/upload/themes/default/modules/admin/news/new-preview-likes.html
new file mode 100644
index 0000000..24a6977
--- /dev/null
+++ b/upload/themes/default/modules/admin/news/new-preview-likes.html
@@ -0,0 +1,11 @@
+<div class="block-like" id="-1">
+
+	<a href="#" class="icon-thumbs-up like false" id="-1"></a>
+
+	<span class="likes">0</span>
+
+	<a href="#" class="icon-thumbs-down dislike false" id="-1"></a>
+
+	<span class="dislikes">0</span>
+					
+</div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/news/new-preview.html b/upload/themes/default/modules/admin/news/new-preview.html
new file mode 100644
index 0000000..b3e6e27
--- /dev/null
+++ b/upload/themes/default/modules/admin/news/new-preview.html
@@ -0,0 +1,27 @@
+<div class="form-block new-full">
+
+	<div class="block-header">
+		<div class="block-name"><?php echo $data['TITLE']; ?> (<?php echo $this->lng_m['news_prew_page_name']; ?>)</div><!--
+		
+		--><div class="block-right">
+			<?php echo $data['LIKES']; ?>
+		</div>
+	</div>
+
+	<div class="block-line"></div>
+
+	<div class="new-full-content">
+		<?php echo $data['TEXT']; ?>
+	</div>
+
+	<div class="block-line"></div>
+
+	<div class="block-footer">
+		<div class="date" rel="tooltip" title="<?php echo $this->lng_m['news_field_cdate']; ?>"><?php echo date("d.m.Y", time()); ?></div>
+		<div class="time" rel="tooltip" title="<?php echo $this->lng_m['news_field_tdate']; ?>"><?php echo date("H:i", time()); ?></div>
+		<div class="category"><a target="_blank" href="<?php echo BASE_URL; ?>?mode=news&amp;cid=<?php echo $data['CID']; ?>" rel="tooltip" title="Категория"><?php echo $data['CATEGORY']; ?></a></div>
+		<div class="readmore"><a target="_blank" href="<?php echo BASE_URL; ?>"><?php echo $this->lng_m['news_go_home']; ?></a></div>
+		<div class="views" rel="tooltip" title="<?php echo $this->lng_m['news_field_views']; ?>"><i class="icon-eye-open"></i>0</div>
+	</div>
+		
+</div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/news_cats/cat-add.html b/upload/themes/default/modules/admin/news_cats/cat-add.html
index 2ad3541..b2f3fe8 100644
--- a/upload/themes/default/modules/admin/news_cats/cat-add.html
+++ b/upload/themes/default/modules/admin/news_cats/cat-add.html
@@ -8,15 +8,15 @@
 
 	<form class="form-horizontal" method="post">
 		<div class="control-group">
-			<label class="control-label" for="inputTitle">Название</label>
+			<label class="control-label" for="inputTitle"><?php echo $this->lng_m['cn_field_name']; ?></label>
 			<div class="controls">
-				<input type="text" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="Название">
+				<input type="text" class="span10" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="<?php echo $this->lng_m['cn_field_name']; ?>">
 			</div>
 		</div>
 		<div class="control-group">
-			<label class="control-label" for="inputText">Описание</label>
+			<label class="control-label" for="inputText"><?php echo $this->lng_m['cn_field_desc']; ?></label>
 			<div class="controls">
-				<textarea id="inputText" placeholder="Описание" name="text" maxlength="255" rows="5"><?php echo $data['TEXT']; ?></textarea>
+				<textarea id="inputText" class="span10" placeholder="<?php echo $this->lng_m['cn_field_desc']; ?>" name="text" maxlength="255" rows="5"><?php echo $data['TEXT']; ?></textarea>
 			</div>
 		</div>
 		<div class="control-group">
diff --git a/upload/themes/default/modules/admin/news_cats/cat-list.html b/upload/themes/default/modules/admin/news_cats/cat-list.html
index a58d101..637c4b0 100644
--- a/upload/themes/default/modules/admin/news_cats/cat-list.html
+++ b/upload/themes/default/modules/admin/news_cats/cat-list.html
@@ -2,7 +2,7 @@
 	<div class="form-block">
 
 		<div class="block-header">
-			<div class="block-name">Категории</div>
+			<div class="block-name"><?php echo $this->lng_m['categories']; ?></div>
 		</div>
 
 		<div class="block-line"></div>
@@ -11,8 +11,8 @@
 			<thead>
 				<tr>
 					<th>#</th>
-					<th>Название</th>
-					<th class="action">Действие <input type="checkbox" class="check-all" data-for="check-input"></th>
+					<th><?php echo $this->lng_m['cn_field_action']; ?></th>
+					<th class="action"><?php echo $this->lng_m['cn_field_name']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
 				</tr>
 			</thead>
 
@@ -25,11 +25,11 @@
 	<div class="form-block actions">
 		<?php echo $data['PAGINATION']; ?>
 		<div class="right-act">
-			Действие с категориями: 
+			<?php echo $this->lng_m['cn_field_action2']; ?>: 
 			<div class="btn-group">
 				<a class="btn" href="<?php echo ADMIN_URL; ?>&do=news_cats&op=add"><i class="icon-plus"></i></a>
 				<a class="btn edit" data-for="check-input" data-link="<?php echo ADMIN_URL; ?>&do=news_cats&op=edit&id=" href="#"><i class="icon-pencil"></i></a>
-				<button class="btn remove" data-for="check-input" data-text="Удаление категорий приведет к удалению всех новостей в выбранных категориях. Вы уверены, что хотите удалить выбранные элементы?" type="submit" name="delete"><i class="icon-remove"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['cn_accept']; ?>" type="submit" name="delete"><i class="icon-remove"></i></button>
 			</div>
 		</div>
 		
diff --git a/upload/themes/default/modules/admin/news_cats/cat-none.html b/upload/themes/default/modules/admin/news_cats/cat-none.html
index 7fad113..5cce9a9 100644
--- a/upload/themes/default/modules/admin/news_cats/cat-none.html
+++ b/upload/themes/default/modules/admin/news_cats/cat-none.html
@@ -1,3 +1,3 @@
 <tr>
-	<td colspan="3"><center>Нет доступных категорий</center></td>
+	<td colspan="3"><center><?php echo $this->lng_m['cn_empty']; ?></center></td>
 </tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/news_views/view-list.html b/upload/themes/default/modules/admin/news_views/view-list.html
index 915cd93..fbe87da 100644
--- a/upload/themes/default/modules/admin/news_views/view-list.html
+++ b/upload/themes/default/modules/admin/news_views/view-list.html
@@ -2,7 +2,7 @@
 	<div class="form-block">
 
 		<div class="block-header">
-			<div class="block-name">Просмотры</div>
+			<div class="block-name"><?php echo $this->lng_m['views']; ?></div>
 		</div>
 
 		<div class="block-line"></div>
@@ -11,10 +11,10 @@
 			<thead>
 				<tr>
 					<th>#</th>
-					<th>Новость</th>
-					<th>Пользователь</th>
-					<th>Дата</th>
-					<th class="action">Действие <input type="checkbox" class="check-all" data-for="check-input"></th>
+					<th><?php echo $this->lng_m['nv_field_news']; ?></th>
+					<th><?php echo $this->lng_m['nv_field_user']; ?></th>
+					<th><?php echo $this->lng_m['nv_field_date']; ?></th>
+					<th class="action"><?php echo $this->lng_m['nv_field_action']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
 				</tr>
 			</thead>
 
@@ -27,9 +27,9 @@
 	<div class="form-block actions">
 		<?php echo $data['PAGINATION']; ?>
 		<div class="right-act">
-			Действие с просмотрами: 
+			<?php echo $this->lng_m['nv_field_action2']; ?>: 
 			<div class="btn-group">
-				<button class="btn remove" data-for="check-input" data-text="Вы уверены, что хотите удалить выбранные элементы?" type="submit" name="delete"><i class="icon-remove"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['nv_accept']; ?>" type="submit" name="delete"><i class="icon-remove"></i></button>
 			</div>
 		</div>
 		
diff --git a/upload/themes/default/modules/admin/news_views/view-none.html b/upload/themes/default/modules/admin/news_views/view-none.html
index ece8966..f0e6b6e 100644
--- a/upload/themes/default/modules/admin/news_views/view-none.html
+++ b/upload/themes/default/modules/admin/news_views/view-none.html
@@ -1,3 +1,3 @@
 <tr>
-	<td colspan="5"><center>Нет доступных просмотров</center></td>
+	<td colspan="5"><center><?php echo $this->lng_m['nv_empty']; ?></center></td>
 </tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/news_votes/vote-list.html b/upload/themes/default/modules/admin/news_votes/vote-list.html
index edab78b..7c0cc51 100644
--- a/upload/themes/default/modules/admin/news_votes/vote-list.html
+++ b/upload/themes/default/modules/admin/news_votes/vote-list.html
@@ -2,7 +2,7 @@
 	<div class="form-block">
 
 		<div class="block-header">
-			<div class="block-name">Просмотры</div>
+			<div class="block-name"><?php echo $this->lng_m['votes']; ?></div>
 		</div>
 
 		<div class="block-line"></div>
@@ -11,11 +11,11 @@
 			<thead>
 				<tr>
 					<th>#</th>
-					<th>Новость</th>
-					<th>Значение</th>
-					<th>Пользователь</th>
-					<th>Дата</th>
-					<th class="action">Действие <input type="checkbox" class="check-all" data-for="check-input"></th>
+					<th><?php echo $this->lng_m['nvt_field_news']; ?></th>
+					<th><?php echo $this->lng_m['nvt_field_value']; ?></th>
+					<th><?php echo $this->lng_m['nvt_field_user']; ?></th>
+					<th><?php echo $this->lng_m['nvt_field_date']; ?></th>
+					<th class="action"><?php echo $this->lng_m['nvt_field_action']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
 				</tr>
 			</thead>
 
@@ -28,9 +28,9 @@
 	<div class="form-block actions">
 		<?php echo $data['PAGINATION']; ?>
 		<div class="right-act">
-			Действие с просмотрами: 
+			<?php echo $this->lng_m['nvt_field_action2']; ?>: 
 			<div class="btn-group">
-				<button class="btn remove" data-for="check-input" data-text="Вы уверены, что хотите удалить выбранные элементы?" type="submit" name="delete"><i class="icon-remove"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['nvt_accept']; ?>" type="submit" name="delete"><i class="icon-remove"></i></button>
 			</div>
 		</div>
 		
diff --git a/upload/themes/default/modules/admin/news_votes/vote-none.html b/upload/themes/default/modules/admin/news_votes/vote-none.html
index 49249e9..c39db8b 100644
--- a/upload/themes/default/modules/admin/news_votes/vote-none.html
+++ b/upload/themes/default/modules/admin/news_votes/vote-none.html
@@ -1,3 +1,3 @@
 <tr>
-	<td colspan="6"><center>Нет доступных голосов</center></td>
+	<td colspan="6"><center><?php echo $this->lng_m['nvt_empty']; ?></center></td>
 </tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/panel_menu/menu-groups/group-id.html b/upload/themes/default/modules/admin/panel_menu/menu-groups/group-id.html
index dac6aef..ba8f268 100644
--- a/upload/themes/default/modules/admin/panel_menu/menu-groups/group-id.html
+++ b/upload/themes/default/modules/admin/panel_menu/menu-groups/group-id.html
@@ -1,9 +1,9 @@
-	<div class="navbar navbar-inverse" id="spl_adm_grp_<?php echo $data['ID']; ?>">
+	<div class="navbar navbar-inverse spl_grp_block">
 		<div class="navbar-inner">
-			<a class="brand spl-btn <?php echo $data['STATUS']; ?> session" data-click="spl_adm_grp_<?php echo $data['ID']; ?>" title="<?php echo $data['TEXT'];; ?>" href="#"><?php echo $data['TITLE']; ?></a>
+			<a class="brand spl-btn" data-for="spl_adm_grp_<?php echo $data['ID']; ?>" title="<?php echo $data['TEXT'];; ?>" href="#"><?php echo $data['TITLE']; ?></a>
 		</div>
 	</div>
 
-	<ul class="spl-body <?php echo $data['STATUS']; ?>" id="spl_adm_grp_<?php echo $data['ID']; ?>">
+	<ul class="spl-body" id="spl_adm_grp_<?php echo $data['ID']; ?>">
 		<?php echo $data['ITEMS']; ?>
 	</ul>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/panel_menu/menu-groups/group-list.html b/upload/themes/default/modules/admin/panel_menu/menu-groups/group-list.html
index c2db05a..b78d503 100644
--- a/upload/themes/default/modules/admin/panel_menu/menu-groups/group-list.html
+++ b/upload/themes/default/modules/admin/panel_menu/menu-groups/group-list.html
@@ -1,7 +1,7 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Панель управления</div>
+		<div class="block-name"><?php echo $this->lng_m['mod_name']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
diff --git a/upload/themes/default/modules/admin/panel_menu/menu-groups/group-none.html b/upload/themes/default/modules/admin/panel_menu/menu-groups/group-none.html
index e6c96b0..99205b3 100644
--- a/upload/themes/default/modules/admin/panel_menu/menu-groups/group-none.html
+++ b/upload/themes/default/modules/admin/panel_menu/menu-groups/group-none.html
@@ -1,11 +1,11 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Панель управления</div>
+		<div class="block-name"><?php echo $this->lng_m['mod_name']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
 
-	<center>Нет доступного меню</center>
+	<center><?php echo $this->lng_m['empty_panel_menu_group']; ?></center>
 
 </div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/panel_menu/menu-items/item-none.html b/upload/themes/default/modules/admin/panel_menu/menu-items/item-none.html
index 92d1910..1bd9a2c 100644
--- a/upload/themes/default/modules/admin/panel_menu/menu-items/item-none.html
+++ b/upload/themes/default/modules/admin/panel_menu/menu-items/item-none.html
@@ -1 +1 @@
-<center>Нет доступных пунктов меню</center>
\ No newline at end of file
+<center><?php echo $this->lng_m['empty_panel_menu_list']; ?></center>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/permissions/perm-add.html b/upload/themes/default/modules/admin/permissions/perm-add.html
index 3c86535..080c4d6 100644
--- a/upload/themes/default/modules/admin/permissions/perm-add.html
+++ b/upload/themes/default/modules/admin/permissions/perm-add.html
@@ -9,37 +9,37 @@
 	<form class="form-horizontal" method="post">
 
 		<div class="control-group">
-			<label class="control-label" for="inputTitle">Название</label>
+			<label class="control-label" for="inputTitle"><?php echo $this->lng_m['perm_field_name']; ?></label>
 			<div class="controls">
-				<input type="text" class="span8" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="Название" required>
+				<input type="text" class="span10" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="<?php echo $this->lng_m['perm_field_name']; ?>" required>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="textareaText">Описание</label>
+			<label class="control-label" for="textareaText"><?php echo $this->lng_m['perm_field_desc']; ?></label>
 			<div class="controls">
-				<textarea name="text" class="span8" placeholder="Описание" rows="8" maxlength="255" id="textareaText"><?php echo $data['TEXT']; ?></textarea>
+				<textarea name="text" class="span10" placeholder="<?php echo $this->lng_m['perm_field_desc']; ?>" rows="8" maxlength="255" id="textareaText"><?php echo $data['TEXT']; ?></textarea>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputPerm">Значение</label>
+			<label class="control-label" for="inputPerm"><?php echo $this->lng_m['perm_field_value']; ?></label>
 			<div class="controls">
-				<input type="text" class="span8" name="value" value="<?php echo $data['VALUE']; ?>" id="inputPerm" placeholder="Уникальное значение">
+				<input type="text" class="span10" name="value" value="<?php echo $data['VALUE']; ?>" id="inputPerm" placeholder="<?php echo $this->lng_m['perm_field_value']; ?>">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputPerm">Тип</label>
+			<label class="control-label" for="inputPerm"><?php echo $this->lng_m['perm_field_type']; ?></label>
 			<div class="controls">
-				<select name="type" class="span8" id="perm-type">
+				<select name="type" class="span10" id="perm-type">
 					<?php echo $data['TYPES']; ?>
 				</select>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputDefault">По умолчанию</label>
+			<label class="control-label" for="inputDefault"><?php echo $this->lng_m['perm_field_default']; ?></label>
 			<div class="controls" id="perm-default">
 				<?php echo $data['DEFAULT']; ?>
 			</div>
diff --git a/upload/themes/default/modules/admin/permissions/perm-list.html b/upload/themes/default/modules/admin/permissions/perm-list.html
index a588ca5..02c8133 100644
--- a/upload/themes/default/modules/admin/permissions/perm-list.html
+++ b/upload/themes/default/modules/admin/permissions/perm-list.html
@@ -2,7 +2,7 @@
 	<div class="form-block">
 
 		<div class="block-header">
-			<div class="block-name">Привилегии</div>
+			<div class="block-name"><?php echo $this->lng_m['mod_name']; ?></div>
 		</div>
 
 		<div class="block-line"></div>
@@ -11,9 +11,9 @@
 			<thead>
 				<tr>
 					<th>#</th>
-					<th>Название</th>
-					<th>Значение</th>
-					<th class="action">Действие <input type="checkbox" class="check-all" data-for="check-input"></th>
+					<th><?php echo $this->lng_m['perm_field_name']; ?></th>
+					<th><?php echo $this->lng_m['perm_field_value']; ?></th>
+					<th class="action"><?php echo $this->lng_m['perm_field_action']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
 				</tr>
 			</thead>
 
@@ -26,11 +26,11 @@
 	<div class="form-block actions">
 		<?php echo $data['PAGINATION']; ?>
 		<div class="right-act">
-			Действие с привилегиями: 
+			<?php echo $this->lng_m['perm_field_action2']; ?>: 
 			<div class="btn-group">
 				<a class="btn" href="<?php echo ADMIN_URL; ?>&do=permissions&op=add"><i class="icon-plus"></i></a>
 				<a class="btn edit" data-for="check-input" data-link="<?php echo ADMIN_URL; ?>&do=permissions&op=edit&id=" href="#"><i class="icon-pencil"></i></a>
-				<button class="btn remove" data-for="check-input" data-text="Удаление привилегий может повлиять на работу некоторых модулей. Вы уверены, что хотите удалить выбранные элементы?" type="submit" name="delete"><i class="icon-remove"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['perm_accept']; ?>" type="submit" name="delete"><i class="icon-remove"></i></button>
 			</div>
 		</div>
 		
diff --git a/upload/themes/default/modules/admin/permissions/perm-none.html b/upload/themes/default/modules/admin/permissions/perm-none.html
index af7235b..885ecce 100644
--- a/upload/themes/default/modules/admin/permissions/perm-none.html
+++ b/upload/themes/default/modules/admin/permissions/perm-none.html
@@ -1,3 +1,3 @@
 <tr>
-	<td colspan="4"><center>Нет доступных привилегий</center></td>
+	<td colspan="4"><center><?php echo $this->lng_m['perm_empty']; ?></center></td>
 </tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/permissions/perm-system.html b/upload/themes/default/modules/admin/permissions/perm-system.html
index 345ec7f..f3bf9c0 100644
--- a/upload/themes/default/modules/admin/permissions/perm-system.html
+++ b/upload/themes/default/modules/admin/permissions/perm-system.html
@@ -1 +1 @@
-<i class="icon-warning-sign" rel="tooltip" title="Системный элемент"></i>
\ No newline at end of file
+<i class="icon-warning-sign" rel="tooltip" title="<?php echo $this->lng_m['perm_system']; ?>"></i>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/settings/base.html b/upload/themes/default/modules/admin/settings/base.html
index a6024b4..5e1fe75 100644
--- a/upload/themes/default/modules/admin/settings/base.html
+++ b/upload/themes/default/modules/admin/settings/base.html
@@ -1,7 +1,7 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Настройки сайта</div>
+		<div class="block-name"><?php echo $this->lng_m['settings']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
@@ -9,12 +9,12 @@
 	<div class="adm-settings">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main">Основные</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin">Постраничная навигация</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail">Почта</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search">Поиск</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions">Функции</a></li>
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base">База</a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
+			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
@@ -23,54 +23,54 @@
 				<form class="form-horizontal" method="post">
 
 					<div class="control-group">
-						<label class="control-label" for="input_host">Адрес сервера</label>
+						<label class="control-label" for="input_host"><?php echo $this->lng_m['set_base_host']; ?></label>
 						<div class="controls">
-							<input type="text" name="host" id="input_host" value="<?php echo $data['HOST']; ?>" placeholder="Адрес сервера баз данных">
+							<input type="text" class="span10" name="host" id="input_host" value="<?php echo $data['HOST']; ?>" placeholder="<?php echo $this->lng_m['set_base_host_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_port">Порт</label>
+						<label class="control-label" for="input_port"><?php echo $this->lng_m['set_base_port']; ?></label>
 						<div class="controls">
-							<input type="text" name="port" id="input_port" value="<?php echo $data['PORT']; ?>" placeholder="Порт сервера">
+							<input type="text" class="span10" name="port" id="input_port" value="<?php echo $data['PORT']; ?>" placeholder="<?php echo $this->lng_m['set_base_port_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_name">Имя базы</label>
+						<label class="control-label" for="input_name"><?php echo $this->lng_m['set_base_base']; ?></label>
 						<div class="controls">
-							<input type="text" name="name" value="<?php echo $data['BASE']; ?>" id="input_name" placeholder="Имя базы данных">
+							<input type="text" class="span10" name="name" value="<?php echo $data['BASE']; ?>" id="input_name" placeholder="<?php echo $this->lng_m['set_base_base_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_user">Пользователь</label>
+						<label class="control-label" for="input_user"><?php echo $this->lng_m['set_base_user']; ?></label>
 						<div class="controls">
-							<input type="text" name="user" value="<?php echo $data['USER']; ?>" id="input_user" placeholder="Пользователь баз данных">
+							<input type="text" class="span10" name="user" value="<?php echo $data['USER']; ?>" id="input_user" placeholder="<?php echo $this->lng_m['set_base_user_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_pass">Имя базы</label>
+						<label class="control-label" for="input_pass"><?php echo $this->lng_m['set_base_pass']; ?></label>
 						<div class="controls">
-							<input type="password" name="pass" value="<?php echo $data['PASS']; ?>" id="input_pass" placeholder="Пароль пользователя баз данных">
+							<input type="password" class="span10" name="pass" value="<?php echo $data['PASS']; ?>" id="input_pass" placeholder="<?php echo $this->lng_m['set_base_pass_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_backend">Тип</label>
+						<label class="control-label" for="input_backend"><?php echo $this->lng_m['set_base_type']; ?></label>
 						<div class="controls">
-							<select name="backend" id="input_backend">
-								<option value="mysql">MySQL</option>
-								<option value="mysqli" <?php echo $data['MYSQLI']; ?>>MySQLi (Рекомендуется)</option>
-								<option value="pdo" <?php echo $data['PDO']; ?> disabled>PDO (Не поддерживается)</option>
+							<select name="backend" class="span10" id="input_backend">
+								<option value="mysql"><?php echo $this->lng_m['set_base_type_mysql']; ?></option>
+								<option value="mysqli" <?php echo $data['MYSQLI']; ?>><?php echo $this->lng_m['set_base_type_mysqli']; ?></option>
+								<option value="pdo" <?php echo $data['PDO']; ?> disabled><?php echo $this->lng_m['set_base_type_pdo']; ?></option>
 							</select>
 						</div>
 					</div>
 
 					<div class="control-group">
 						<div class="controls">
-							<button type="submit" name="submit" class="btn">Сохранить</button>
+							<button type="submit" name="submit" class="btn"><?php echo $this->lng['save']; ?></button>
 						</div>
 					</div>
 
diff --git a/upload/themes/default/modules/admin/settings/functions.html b/upload/themes/default/modules/admin/settings/functions.html
index 30c5e3a..d14466f 100644
--- a/upload/themes/default/modules/admin/settings/functions.html
+++ b/upload/themes/default/modules/admin/settings/functions.html
@@ -1,7 +1,7 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Настройки сайта</div>
+		<div class="block-name"><?php echo $this->lng_m['set_func']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
@@ -9,12 +9,12 @@
 	<div class="adm-settings">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main">Основные</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin">Постраничная навигация</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail">Почта</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search">Поиск</a></li>
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions">Функции</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base">База</a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
+			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
@@ -23,11 +23,11 @@
 				<form class="form-horizontal" method="post">
 
 					<div class="control-group">
-						<label class="control-label" for="input_advice">Выводить советы</label>
+						<label class="control-label" for="input_advice"><?php echo $this->lng_m['set_func_advice']; ?></label>
 						<div class="controls">
-							<select name="advice" id="input_advice">
-								<option value="0">Нет</option>
-								<option value="1" <?php echo $data['ADVICE']; ?>>Да</option>
+							<select name="advice" class="span10" id="input_advice">
+								<option value="0"><?php echo $this->lng['no']; ?></option>
+								<option value="1" <?php echo $data['ADVICE']; ?>><?php echo $this->lng['yes']; ?></option>
 							</select>
 						</div>
 					</div>
@@ -35,16 +35,16 @@
 					<div class="control-group">
 						<label class="control-label" for="input_breadcrumbs">Выводить хлебные крошки</label>
 						<div class="controls">
-							<select name="breadcrumbs" id="input_breadcrumbs">
-								<option value="0">Нет</option>
-								<option value="1" <?php echo $data['BREADCRUMBS']; ?>>Да</option>
+							<select name="breadcrumbs" class="span10" id="input_breadcrumbs">
+								<option value="0">php echo $this->lng['no']; ?></option>
+								<option value="1" <?php echo $data['BREADCRUMBS']; ?>><?php echo $this->lng['yes']; ?></option>
 							</select>
 						</div>
 					</div>
 
 					<div class="control-group">
 						<div class="controls">
-							<button type="submit" name="submit" class="btn">Сохранить</button>
+							<button type="submit" name="submit" class="btn"><?php echo $this->lng['save']; ?></button>
 						</div>
 					</div>
 
diff --git a/upload/themes/default/modules/admin/settings/mail.html b/upload/themes/default/modules/admin/settings/mail.html
index a77b2a0..7b5a12b 100644
--- a/upload/themes/default/modules/admin/settings/mail.html
+++ b/upload/themes/default/modules/admin/settings/mail.html
@@ -1,7 +1,7 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Настройки сайта</div>
+		<div class="block-name"><?php echo $this->lng_m['set_mail']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
@@ -9,12 +9,12 @@
 	<div class="adm-settings">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main">Основные</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin">Постраничная навигация</a></li>
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail">Почта</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search">Поиск</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions">Функции</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base">База</a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
+			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
@@ -23,69 +23,69 @@
 				<form class="form-horizontal" method="post">
 
 					<div class="control-group">
-						<label class="control-label" for="input_from">От кого</label>
+						<label class="control-label" for="input_from"><?php echo $this->lng_m['set_mail_from']; ?></label>
 						<div class="controls">
-							<input type="text" name="from" id="input_from" value="<?php echo $data['CFG']['from']; ?>" placeholder="От кого было отправлено сообщение">
+							<input type="text" name="from" class="span10" id="input_from" value="<?php echo $data['CFG']['from']; ?>" placeholder="<?php echo $this->lng_m['set_mail_from_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_from_name">Имя отправителя</label>
+						<label class="control-label" for="input_from_name"><?php echo $this->lng_m['set_mail_from_name']; ?></label>
 						<div class="controls">
-							<input type="text" name="from_name" value="<?php echo $data['CFG']['from_name']; ?>" id="input_from_name" placeholder="Имя отправителя">
+							<input type="text" name="from_name" class="span10" value="<?php echo $data['CFG']['from_name']; ?>" id="input_from_name" placeholder="<?php echo $this->lng_m['set_mail_from_name_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_reply">E-Mail ответа</label>
+						<label class="control-label" for="input_reply"><?php echo $this->lng_m['set_mail_reply']; ?></label>
 						<div class="controls">
-							<input type="text" name="reply" value="<?php echo $data['CFG']['reply']; ?>" id="input_reply" placeholder="E-Mail отправителя">
+							<input type="text" name="reply" class="span10" value="<?php echo $data['CFG']['reply']; ?>" id="input_reply" placeholder="<?php echo $this->lng_m['set_mail_reply_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_reply_name">Имя отправителя ответа</label>
+						<label class="control-label" for="input_reply_name"><?php echo $this->lng_m['set_mail_reply_name']; ?></label>
 						<div class="controls">
-							<input type="text" name="reply_name" value="<?php echo $data['CFG']['reply_name']; ?>" id="input_reply_name" placeholder="Имя отправителя ответа">
+							<input type="text" name="reply_name" class="span10" value="<?php echo $data['CFG']['reply_name']; ?>" id="input_reply_name" placeholder="<?php echo $this->lng_m['set_mail_reply_name_ph']; ?>">
 						</div>
 					</div>
 
-					<legend>Настройки SMTP</legend>
+					<legend><?php echo $this->lng_m['set_mail_smtp']; ?></legend>
 
 					<div class="control-group">
-						<label class="control-label" for="input_smtp">Использовать SMTP</label>
+						<label class="control-label" for="input_smtp"><?php echo $this->lng_m['set_mail_smtp_use']; ?></label>
 						<div class="controls">
-							<select name="smtp" id="input_smtp">
-								<option value="0">Нет</option>
-								<option value="1" <?php echo $data['SMTP']; ?>>Да</option>
+							<select name="smtp" id="input_smtp" class="span10">
+								<option value="0"><?php echo $this->lng['no']; ?></option>
+								<option value="1" <?php echo $data['SMTP']; ?>><?php echo $this->lng['yes']; ?></option>
 							</select>
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_smtp_host">SMTP сервер</label>
+						<label class="control-label" for="input_smtp_host"><?php echo $this->lng_m['set_mail_smtp_host']; ?></label>
 						<div class="controls">
-							<input type="text" name="smtp_host" value="<?php echo $data['CFG']['smtp_host']; ?>" id="input_smtp_host" placeholder="Имя отправителя ответа">
+							<input type="text" class="span10" name="smtp_host" value="<?php echo $data['CFG']['smtp_host']; ?>" id="input_smtp_host" placeholder="<?php echo $this->lng_m['set_mail_smtp_host_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_smtp_user">Имя пользователя</label>
+						<label class="control-label" for="input_smtp_user"><?php echo $this->lng_m['set_mail_smtp_user']; ?></label>
 						<div class="controls">
-							<input type="text" name="smtp_user" value="<?php echo $data['CFG']['smtp_user']; ?>" id="input_smtp_user" placeholder="Имя пользователя">
+							<input type="text" class="span10" name="smtp_user" value="<?php echo $data['CFG']['smtp_user']; ?>" id="input_smtp_user" placeholder="<?php echo $this->lng_m['set_mail_smtp_user_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_smtp_pass">Пароль</label>
+						<label class="control-label" for="input_smtp_pass"><?php echo $this->lng_m['set_mail_smtp_pass']; ?></label>
 						<div class="controls">
-							<input type="password" name="smtp_pass" value="<?php echo $data['CFG']['smtp_pass']; ?>" id="input_smtp_pass" placeholder="Пароль">
+							<input type="password" class="span10" name="smtp_pass" value="<?php echo $data['CFG']['smtp_pass']; ?>" id="input_smtp_pass" placeholder="<?php echo $this->lng_m['set_mail_smtp_pass_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
 						<div class="controls">
-							<button type="submit" name="submit" class="btn">Сохранить</button>
+							<button type="submit" name="submit" class="btn"><?php echo $this->lng['save']; ?></button>
 						</div>
 					</div>
 
diff --git a/upload/themes/default/modules/admin/settings/main.html b/upload/themes/default/modules/admin/settings/main.html
index 45a301a..de1302f 100644
--- a/upload/themes/default/modules/admin/settings/main.html
+++ b/upload/themes/default/modules/admin/settings/main.html
@@ -1,7 +1,7 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Настройки сайта</div>
+		<div class="block-name"><?php echo $this->lng_m['set_main']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
@@ -9,12 +9,12 @@
 	<div class="adm-settings">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main">Основные</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin">Постраничная навигация</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail">Почта</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search">Поиск</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions">Функции</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base">База</a></li>
+			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
@@ -23,86 +23,76 @@
 				<form class="form-horizontal" method="post">
 
 					<div class="control-group">
-						<label class="control-label" for="input_s_name">Название сайта</label>
+						<label class="control-label" for="input_s_name"><?php echo $this->lng_m['set_main_sitename']; ?></label>
 						<div class="controls">
-							<input type="text" name="s_name" id="input_s_name" value="<?php echo $data['CFG']['s_name']; ?>" placeholder="Название сайта">
+							<input type="text" class="span10" name="s_name" id="input_s_name" value="<?php echo $data['CFG']['s_name']; ?>" placeholder="<?php echo $this->lng_m['set_main_sitename']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_s_about">Описание сайта</label>
+						<label class="control-label" for="input_s_about"><?php echo $this->lng_m['set_main_sitedesc']; ?></label>
 						<div class="controls">
-							<input type="text" name="s_about" value="<?php echo $data['CFG']['s_about']; ?>" id="input_s_about" placeholder="Описание сайта">
+							<input type="text" class="span10" name="s_about" value="<?php echo $data['CFG']['s_about']; ?>" id="input_s_about" placeholder="<?php echo $this->lng_m['set_main_sitedesc']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_s_keywords">Ключевые слова</label>
+						<label class="control-label" for="input_s_keywords"><?php echo $this->lng_m['set_main_sitekeys']; ?></label>
 						<div class="controls">
-							<input type="text" name="s_keywords" value="<?php echo $data['CFG']['s_keywords']; ?>" id="input_s_keywords" placeholder="Ключевые слова">
+							<input type="text" class="span10" name="s_keywords" value="<?php echo $data['CFG']['s_keywords']; ?>" id="input_s_keywords" placeholder="<?php echo $this->lng_m['set_main_sitekeys']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_s_dpage">Начальная страница</label>
+						<label class="control-label" for="input_s_dpage"><?php echo $this->lng_m['set_main_start']; ?></label>
 						<div class="controls">
-							<input type="text" name="s_dpage" value="<?php echo $data['CFG']['s_dpage']; ?>" id="input_s_dpage" placeholder="Начальная страница">
+							<input type="text" class="span10" name="s_dpage" value="<?php echo $data['CFG']['s_dpage']; ?>" id="input_s_dpage" placeholder="<?php echo $this->lng_m['set_main_start']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_s_theme">Шаблон</label>
+						<label class="control-label" for="input_s_theme"><?php echo $this->lng_m['set_main_theme']; ?></label>
 						<div class="controls">
-							<select name="s_theme" id="input_s_theme">
+							<select name="s_theme" class="span10" id="input_s_theme">
 								<?php echo $data['THEMES']; ?>
 							</select>
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_log">Лог ошибок</label>
+						<label class="control-label" for="input_log"><?php echo $this->lng_m['set_main_log']; ?></label>
 						<div class="controls">
-							<select name="log" id="input_log">
-								<option value="0">Отключен</option>
-								<option value="1" <?php echo $data['LOG']; ?>>Включен</option>
+							<select name="log" class="span10" id="input_log">
+								<option value="0"><?php echo $this->lng['no']; ?></option>
+								<option value="1" <?php echo $data['LOG']; ?>><?php echo $this->lng['yes']; ?></option>
 							</select>
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_debug">Отладка</label>
+						<label class="control-label" for="input_debug"><?php echo $this->lng_m['set_main_debug']; ?></label>
 						<div class="controls">
-							<select name="debug" id="input_debug">
-								<option value="0">Отключена</option>
-								<option value="1" <?php echo $data['DEBUG']; ?>>Включена</option>
+							<select name="debug" class="span10" id="input_debug">
+								<option value="0"><?php echo $this->lng['no']; ?></option>
+								<option value="1" <?php echo $data['DEBUG']; ?>><?php echo $this->lng['yes']; ?></option>
 							</select>
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_mon_type">Тип мониторинга</label>
+						<label class="control-label" for="input_reg_accept"><?php echo $this->lng_m['set_main_reg']; ?></label>
 						<div class="controls">
-							<select name="mon_type" id="input_mon_type">
-								<option value="0">Через сокеты</option>
-								<option value="1" <?php echo $data['MON_TYPE']; ?>>Через API MineTools</option>
+							<select name="reg_accept" class="span10" id="input_reg_accept">
+								<option value="0"><?php echo $this->lng['no']; ?></option>
+								<option value="1" <?php echo $data['REG_ACCEPT']; ?>><?php echo $this->lng['yes']; ?></option>
 							</select>
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_reg_accept">Подтверждение регистрации</label>
+						<label class="control-label" for="input_captch"><?php echo $this->lng_m['set_main_captcha']; ?></label>
 						<div class="controls">
-							<select name="reg_accept" id="input_reg_accept">
-								<option value="0">Отключено</option>
-								<option value="1" <?php echo $data['REG_ACCEPT']; ?>>Включено</option>
-							</select>
-						</div>
-					</div>
-
-					<div class="control-group">
-						<label class="control-label" for="input_captch">Капча</label>
-						<div class="controls">
-							<select name="captcha" id="input_captch">
+							<select name="captcha" class="span10" id="input_captch">
 								<?php echo $data['CAPTHA']; ?>
 							</select>
 						</div>
@@ -111,38 +101,38 @@
 					<legend>ReCaptcha</legend>
 
 					<div class="control-group">
-						<label class="control-label" for="input_rc_public">Публичный ключ</label>
+						<label class="control-label" for="input_rc_public"><?php echo $this->lng_m['set_main_key_public']; ?></label>
 						<div class="controls">
-							<input type="text" name="rc_public" value="<?php echo $data['CFG']['rc_public']; ?>" id="input_rc_public" placeholder="Публичный ключ">
+							<input type="text" class="span10" name="rc_public" value="<?php echo $data['CFG']['rc_public']; ?>" id="input_rc_public" placeholder="<?php echo $this->lng_m['set_main_key_public']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_rc_private">Приватный ключ</label>
+						<label class="control-label" for="input_rc_private"><?php echo $this->lng_m['set_main_key_private']; ?></label>
 						<div class="controls">
-							<input type="text" name="rc_private" value="<?php echo $data['CFG']['rc_private']; ?>" id="input_rc_private" placeholder="Приватный ключ">
+							<input type="text" class="span10" name="rc_private" value="<?php echo $data['CFG']['rc_private']; ?>" id="input_rc_private" placeholder="<?php echo $this->lng_m['set_main_key_private']; ?>">
 						</div>
 					</div>
 
 					<legend>KeyCaptcha</legend>
 
 					<div class="control-group">
-						<label class="control-label" for="input_kc_public">Публичный ключ</label>
+						<label class="control-label" for="input_kc_public"><?php echo $this->lng_m['set_main_key_public']; ?></label>
 						<div class="controls">
-							<input type="text" name="kc_public" value="<?php echo $data['CFG']['kc_public']; ?>" id="input_kc_public" placeholder="Публичный ключ">
+							<input type="text" class="span10" name="kc_public" value="<?php echo $data['CFG']['kc_public']; ?>" id="input_kc_public" placeholder="<?php echo $this->lng_m['set_main_key_public']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_kc_private">Приватный ключ</label>
+						<label class="control-label" for="input_kc_private"><?php echo $this->lng_m['set_main_key_private']; ?></label>
 						<div class="controls">
-							<input type="text" name="kc_private" value="<?php echo $data['CFG']['kc_private']; ?>" id="input_kc_private" placeholder="Приватный ключ">
+							<input type="text" class="span10" name="kc_private" value="<?php echo $data['CFG']['kc_private']; ?>" id="input_kc_private" placeholder="<?php echo $this->lng_m['set_main_key_private']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
 						<div class="controls">
-							<button type="submit" name="submit" class="btn">Сохранить</button>
+							<button type="submit" name="submit" class="btn"><?php echo $this->lng['save']; ?></button>
 						</div>
 					</div>
 
diff --git a/upload/themes/default/modules/admin/settings/pagin.html b/upload/themes/default/modules/admin/settings/pagin.html
index a40767c..e1da03a 100644
--- a/upload/themes/default/modules/admin/settings/pagin.html
+++ b/upload/themes/default/modules/admin/settings/pagin.html
@@ -1,7 +1,7 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Настройки сайта</div>
+		<div class="block-name"><?php echo $this->lng_m['set_pagin']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
@@ -9,12 +9,12 @@
 	<div class="adm-settings">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main">Основные</a></li>
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin">Постраничная навигация</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail">Почта</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search">Поиск</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions">Функции</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base">База</a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
+			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
@@ -22,139 +22,146 @@
 
 				<form class="form-horizontal" method="post">
 
-					<legend>Пользовательская часть</legend>
+					<legend><?php echo $this->lng_m['set_pagin_user_sect']; ?></legend>
 
 					<div class="control-group">
-						<label class="control-label" for="input_arrows">Кол-во стрелок</label>
+						<label class="control-label" for="input_arrows"><?php echo $this->lng_m['set_pagin_arrows']; ?></label>
 						<div class="controls">
-							<input type="text" name="arrows" id="input_arrows" value="<?php echo $data['CFG']['arrows']; ?>" placeholder="Кол-во стрелок с каждой стороны">
+							<input type="text" class="span10" name="arrows" id="input_arrows" value="<?php echo $data['CFG']['arrows']; ?>" placeholder="<?php echo $this->lng_m['set_pagin_arrows_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_news">Новости</label>
+						<label class="control-label" for="input_news"><?php echo $this->lng_m['set_pagin_news']; ?></label>
 						<div class="controls">
-							<input type="text" name="news" value="<?php echo $data['CFG']['news']; ?>" id="input_news" placeholder="Кол-во новостей на одну страницу">
+							<input type="text" class="span10" name="news" value="<?php echo $data['CFG']['news']; ?>" id="input_news" placeholder="<?php echo $this->lng_m['set_pagin_news_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_comments">Комментарии</label>
+						<label class="control-label" for="input_comments"><?php echo $this->lng_m['set_pagin_comments']; ?></label>
 						<div class="controls">
-							<input type="text" name="comments" value="<?php echo $data['CFG']['comments']; ?>" id="input_comments" placeholder="Кол-во комментариев на одну страницу">
+							<input type="text" class="span10" name="comments" value="<?php echo $data['CFG']['comments']; ?>" id="input_comments" placeholder="<?php echo $this->lng_m['set_pagin_comments_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_search_news">Поиск по новостям</label>
+						<label class="control-label" for="input_search_news"><?php echo $this->lng_m['set_pagin_search_n']; ?></label>
 						<div class="controls">
-							<input type="text" name="search_news" value="<?php echo $data['CFG']['search_news']; ?>" id="input_search_news" placeholder="Кол-во новостей на одну страницу в поиске">
+							<input type="text" class="span10" name="search_news" value="<?php echo $data['CFG']['search_news']; ?>" id="input_search_news" placeholder="<?php echo $this->lng_m['set_pagin_search_n_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_search_comments">Поиск по комментариям</label>
+						<label class="control-label" for="input_search_comments"><?php echo $this->lng_m['set_pagin_search_c']; ?></label>
 						<div class="controls">
-							<input type="text" name="search_comments" value="<?php echo $data['CFG']['search_comments']; ?>" id="input_search_comments" placeholder="Кол-во комментариев на одну страницу в поиске">
+							<input type="text" class="span10" name="search_comments" value="<?php echo $data['CFG']['search_comments']; ?>" id="input_search_comments" placeholder="<?php echo $this->lng_m['set_pagin_search_c_ph']; ?>">
 						</div>
 					</div>
 
-					<legend>Панель управления</legend>
+					<legend><?php echo $this->lng_m['set_pagin_cp_sect']; ?></legend>
 
 					<div class="control-group">
-						<label class="control-label" for="input_adm_news">Новости</label>
+						<label class="control-label" for="input_adm_news"><?php echo $this->lng_m['set_pagin_cp_news']; ?></label>
 						<div class="controls">
-							<input type="text" name="adm_news" id="input_adm_news" value="<?php echo $data['CFG']['adm_news']; ?>" placeholder="Кол-во новостей в ПУ">
+							<input type="text" class="span10" name="adm_news" id="input_adm_news" value="<?php echo $data['CFG']['adm_news']; ?>" placeholder="<?php echo $this->lng_m['set_pagin_cp_news_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_adm_comments">Комментарии</label>
+						<label class="control-label" for="input_adm_comments"><?php echo $this->lng_m['set_pagin_cp_coms']; ?></label>
 						<div class="controls">
-							<input type="text" name="adm_comments" id="input_adm_comments" value="<?php echo $data['CFG']['adm_comments']; ?>" placeholder="Кол-во комментариев в ПУ">
+							<input type="text" class="span10" name="adm_comments" id="input_adm_comments" value="<?php echo $data['CFG']['adm_comments']; ?>" placeholder="<?php echo $this->lng_m['set_pagin_cp_coms_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_adm_news_cats">Категории новостей</label>
+						<label class="control-label" for="input_adm_news_cats"><?php echo $this->lng_m['set_pagin_cp_cats']; ?></label>
 						<div class="controls">
-							<input type="text" name="adm_news_cats" id="input_adm_news_cats" value="<?php echo $data['CFG']['adm_news_cats']; ?>" placeholder="Кол-во категорий новостей в ПУ">
+							<input type="text" class="span10" name="adm_news_cats" id="input_adm_news_cats" value="<?php echo $data['CFG']['adm_news_cats']; ?>" placeholder="<?php echo $this->lng_m['set_pagin_cp_cats_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_adm_news_views">Просмотров новости</label>
+						<label class="control-label" for="input_adm_news_views"><?php echo $this->lng_m['set_pagin_cp_views']; ?></label>
 						<div class="controls">
-							<input type="text" name="adm_news_views" id="input_adm_news_views" value="<?php echo $data['CFG']['adm_news_views']; ?>" placeholder="Кол-во просмотров новостей в ПУ">
+							<input type="text" class="span10" name="adm_news_views" id="input_adm_news_views" value="<?php echo $data['CFG']['adm_news_views']; ?>" placeholder="<?php echo $this->lng_m['set_pagin_cp_views_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_adm_news_votes">Голосов новости</label>
+						<label class="control-label" for="input_adm_news_votes"><?php echo $this->lng_m['set_pagin_cp_votes']; ?></label>
 						<div class="controls">
-							<input type="text" name="adm_news_votes" id="input_adm_news_votes" value="<?php echo $data['CFG']['adm_news_votes']; ?>" placeholder="Кол-во голосов новостей в ПУ">
+							<input type="text" class="span10" name="adm_news_votes" id="input_adm_news_votes" value="<?php echo $data['CFG']['adm_news_votes']; ?>" placeholder="<?php echo $this->lng_m['set_pagin_cp_votes_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_adm_menu">Пунктов меню</label>
+						<label class="control-label" for="input_adm_menu"><?php echo $this->lng_m['set_pagin_cp_menu']; ?></label>
 						<div class="controls">
-							<input type="text" name="adm_menu" id="input_adm_menu" value="<?php echo $data['CFG']['adm_menu']; ?>" placeholder="Кол-во пунктов меню сайта в ПУ">
+							<input type="text" class="span10" name="adm_menu" id="input_adm_menu" value="<?php echo $data['CFG']['adm_menu']; ?>" placeholder="<?php echo $this->lng_m['set_pagin_cp_menu_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_adm_menu_adm">Пункты меню ПУ</label>
+						<label class="control-label" for="input_adm_menu_adm"><?php echo $this->lng_m['set_pagin_cp_menu_cp']; ?></label>
 						<div class="controls">
-							<input type="text" name="adm_menu_adm" id="input_adm_menu_adm" value="<?php echo $data['CFG']['adm_menu_adm']; ?>" placeholder="Кол-во пункты меню ПУ в ПУ">
+							<input type="text" class="span10" name="adm_menu_adm" id="input_adm_menu_adm" value="<?php echo $data['CFG']['adm_menu_adm']; ?>" placeholder="<?php echo $this->lng_m['set_pagin_cp_menu_cp_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_adm_menu_groups">Группы меню</label>
+						<label class="control-label" for="input_adm_menu_groups"><?php echo $this->lng_m['set_pagin_cp_mgroups']; ?></label>
 						<div class="controls">
-							<input type="text" name="adm_menu_groups" id="input_adm_menu_groups" value="<?php echo $data['CFG']['adm_menu_groups']; ?>" placeholder="Кол-во групп меню в ПУ">
+							<input type="text" class="span10" name="adm_menu_groups" id="input_adm_menu_groups" value="<?php echo $data['CFG']['adm_menu_groups']; ?>" placeholder="<?php echo $this->lng_m['set_pagin_cp_mgroups_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_adm_menu_icons">Иконки меню</label>
+						<label class="control-label" for="input_adm_menu_icons"><?php echo $this->lng_m['set_pagin_cp_icons']; ?></label>
 						<div class="controls">
-							<input type="text" name="adm_menu_icons" id="input_adm_menu_icons" value="<?php echo $data['CFG']['adm_menu_icons']; ?>" placeholder="Кол-во иконок меню в ПУ">
+							<input type="text" class="span10" name="adm_menu_icons" id="input_adm_menu_icons" value="<?php echo $data['CFG']['adm_menu_icons']; ?>" placeholder="<?php echo $this->lng_m['set_pagin_cp_icons_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_adm_users">Пользователи</label>
+						<label class="control-label" for="input_adm_users"><?php echo $this->lng_m['set_pagin_cp_users']; ?></label>
 						<div class="controls">
-							<input type="text" name="adm_users" id="input_adm_users" value="<?php echo $data['CFG']['adm_users']; ?>" placeholder="Кол-во пользователей в ПУ">
+							<input type="text" class="span10" name="adm_users" id="input_adm_users" value="<?php echo $data['CFG']['adm_users']; ?>" placeholder="<?php echo $this->lng_m['set_pagin_cp_users_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_adm_groups">Группы пользователей</label>
+						<label class="control-label" for="input_adm_groups"><?php echo $this->lng_m['set_pagin_cp_groups']; ?></label>
 						<div class="controls">
-							<input type="text" name="adm_groups" id="input_adm_groups" value="<?php echo $data['CFG']['adm_groups']; ?>" placeholder="Кол-во групп пользователей в ПУ">
+							<input type="text" class="span10" name="adm_groups" id="input_adm_groups" value="<?php echo $data['CFG']['adm_groups']; ?>" placeholder="<?php echo $this->lng_m['set_pagin_cp_groups_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_adm_permissions">Привилегии</label>
+						<label class="control-label" for="input_adm_permissions"><?php echo $this->lng_m['set_pagin_cp_prems']; ?></label>
 						<div class="controls">
-							<input type="text" name="adm_permissions" id="input_adm_permissions" value="<?php echo $data['CFG']['adm_permissions']; ?>" placeholder="Кол-во привилегий в ПУ">
+							<input type="text" class="span10" name="adm_permissions" id="input_adm_permissions" value="<?php echo $data['CFG']['adm_permissions']; ?>" placeholder="<?php echo $this->lng_m['set_pagin_cp_prems_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
-						<label class="control-label" for="input_adm_statics">Статические страницы</label>
+						<label class="control-label" for="input_adm_statics"><?php echo $this->lng_m['set_pagin_cp_stc']; ?></label>
 						<div class="controls">
-							<input type="text" name="adm_statics" id="input_adm_statics" value="<?php echo $data['CFG']['adm_statics']; ?>" placeholder="Кол-во статических страниц в ПУ">
+							<input type="text" class="span10" name="adm_statics" id="input_adm_statics" value="<?php echo $data['CFG']['adm_statics']; ?>" placeholder="<?php echo $this->lng_m['set_pagin_cp_stc_ph']; ?>">
+						</div>
+					</div>
+
+					<div class="control-group">
+						<label class="control-label" for="input_adm_logs"><?php echo $this->lng_m['set_pagin_cp_logs']; ?></label>
+						<div class="controls">
+							<input type="text" class="span10" name="adm_logs" id="input_adm_logs" value="<?php echo $data['CFG']['adm_logs']; ?>" placeholder="<?php echo $this->lng_m['set_pagin_cp_logs_ph']; ?>">
 						</div>
 					</div>
 
 					<div class="control-group">
 						<div class="controls">
-							<button type="submit" name="submit" class="btn">Сохранить</button>
+							<button type="submit" name="submit" class="btn"><?php echo $this->lng['save']; ?></button>
 						</div>
 					</div>
 
diff --git a/upload/themes/default/modules/admin/settings/search-id.html b/upload/themes/default/modules/admin/settings/search-id.html
index e5da5a8..de14078 100644
--- a/upload/themes/default/modules/admin/settings/search-id.html
+++ b/upload/themes/default/modules/admin/settings/search-id.html
@@ -3,16 +3,16 @@
 	<input type="hidden" name="key" value="<?php echo $data['KEY']; ?>">
 
 	<div class="control-group">
-		<label class="control-label" for="input_title">Название</label>
+		<label class="control-label" for="input_title"><?php echo $this->lng_m['set_srch_name']; ?></label>
 		<div class="controls">
-			<input type="text" name="title" value="<?php echo $data['TITLE']; ?>" id="input_title" placeholder="Название">
+			<input type="text" class="span10" name="title" value="<?php echo $data['TITLE']; ?>" id="input_title" placeholder="<?php echo $this->lng_m['set_srch_name']; ?>">
 		</div>
 	</div>
 
 	<div class="control-group">
-		<label class="control-label" for="input_permissions">Уровень доступа</label>
+		<label class="control-label" for="input_permissions"><?php echo $this->lng_m['set_srch_lvl']; ?></label>
 		<div class="controls">
-			<select name="permissions" size="5" id="input_permissions">
+			<select name="permissions" class="span10" size="5" id="input_permissions">
 				<?php echo $data['PERMISSIONS']; ?>
 			</select>
 		</div>
@@ -20,7 +20,7 @@
 
 	<div class="control-group">
 		<div class="controls">
-			<button type="submit" name="submit" class="btn">Сохранить</button>
+			<button type="submit" name="submit" class="btn"><?php echo $this->lng['save']; ?></button>
 		</div>
 	</div>
 </form>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/settings/search.html b/upload/themes/default/modules/admin/settings/search.html
index edc4e58..e8ebde5 100644
--- a/upload/themes/default/modules/admin/settings/search.html
+++ b/upload/themes/default/modules/admin/settings/search.html
@@ -1,7 +1,7 @@
 <div class="form-block">
 
 	<div class="block-header">
-		<div class="block-name">Настройки сайта</div>
+		<div class="block-name"><?php echo $this->lng_m['set_search']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
@@ -9,12 +9,12 @@
 	<div class="adm-settings">
 		<form method="post"></form>
 		<ul class="nav nav-tabs" id="myTab">
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main">Основные</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin">Постраничная навигация</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail">Почта</a></li>
-			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search">Поиск</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions">Функции</a></li>
-			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base">База</a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=main"><?php echo $this->lng_m['set_main']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=pagin"><?php echo $this->lng_m['set_pagin']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=mail"><?php echo $this->lng_m['set_mail']; ?></a></li>
+			<li class="active"><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=search"><?php echo $this->lng_m['set_search']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=functions"><?php echo $this->lng_m['set_func']; ?></a></li>
+			<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=settings&op=base"><?php echo $this->lng_m['set_base']; ?></a></li>
 		</ul>
 		 
 		<div class="tab-content">
diff --git a/upload/themes/default/modules/admin/statics/static-add.html b/upload/themes/default/modules/admin/statics/static-add.html
index e6d8495..a7ea4e4 100644
--- a/upload/themes/default/modules/admin/statics/static-add.html
+++ b/upload/themes/default/modules/admin/statics/static-add.html
@@ -1,3 +1,5 @@
+<?php echo $data['PREVIEW']; ?>
+
 <div class="form-block">
 
 	<div class="block-header">
@@ -8,21 +10,21 @@
 
 	<form class="form-horizontal" method="post">
 		<div class="control-group">
-			<label class="control-label" for="inputTitle">Название</label>
+			<label class="control-label" for="inputTitle"><?php echo $this->lng_m['stc_field_name']; ?></label>
 			<div class="controls">
-				<input type="text" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="Название">
+				<input type="text" name="title" value="<?php echo $data['TITLE']; ?>" id="inputTitle" placeholder="<?php echo $this->lng_m['stc_field_name']; ?>">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputUniq">Идентификатор</label>
+			<label class="control-label" for="inputUniq"><?php echo $this->lng_m['stc_field_uniq']; ?></label>
 			<div class="controls">
-				<input type="text" name="uniq" value="<?php echo $data['UNIQ']; ?>" id="inputUniq" placeholder="Уникальный идентификатор">
+				<input type="text" name="uniq" value="<?php echo $data['UNIQ']; ?>" id="inputUniq" placeholder="<?php echo $this->lng_m['stc_field_uniq']; ?>">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="selectPerm">Уровень доступа</label>
+			<label class="control-label" for="selectPerm"><?php echo $this->lng_m['stc_field_access']; ?></label>
 			<div class="controls">
 				<select size="6" name="permissions" id="selectPerm">
 					<?php echo $data['PERMISSIONS']; ?>
@@ -31,16 +33,17 @@
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputText">Текст страницы</label>
+			<label class="control-label" for="inputText"><?php echo $this->lng_m['stc_field_text']; ?></label>
 			<div class="controls">
 				<?php echo $data['BB_PANEL']; ?>
-				<textarea class="input-block-level" id="inputText" data-for="stc-field" placeholder="Текст страницы" name="text" rows="8"><?php echo $data['TEXT']; ?></textarea>
+				<textarea class="input-block-level" id="inputText" data-for="stc-field" placeholder="<?php echo $this->lng_m['stc_field_text']; ?>" name="text" rows="8"><?php echo $data['TEXT']; ?></textarea>
 			</div>
 		</div>
 
 		<div class="control-group">
 			<div class="controls">
 				<button type="submit" class="btn" name="submit"><?php echo $data['BUTTON']; ?></button>
+				<button type="submit" class="btn" name="preview"><?php echo $this->lng_m['stc_field_preview']; ?></button>
 			</div>
 		</div>
 	</form>
diff --git a/upload/themes/default/modules/admin/statics/static-list.html b/upload/themes/default/modules/admin/statics/static-list.html
index e531f05..20319df 100644
--- a/upload/themes/default/modules/admin/statics/static-list.html
+++ b/upload/themes/default/modules/admin/statics/static-list.html
@@ -2,7 +2,7 @@
 	<div class="form-block">
 
 		<div class="block-header">
-			<div class="block-name">Статические страницы</div>
+			<div class="block-name"><?php echo $this->lng_m['statics']; ?></div>
 		</div>
 
 		<div class="block-line"></div>
@@ -11,9 +11,9 @@
 			<thead>
 				<tr>
 					<th>#</th>
-					<th>Название</th>
-					<th>Привилегии</th>
-					<th class="action">Действие <input type="checkbox" class="check-all" data-for="check-input"></th>
+					<th><?php echo $this->lng_m['stc_field_name']; ?></th>
+					<th><?php echo $this->lng_m['stc_field_perm']; ?></th>
+					<th class="action"><?php echo $this->lng_m['stc_field_action']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
 				</tr>
 			</thead>
 
@@ -26,11 +26,11 @@
 	<div class="form-block actions">
 		<?php echo $data['PAGINATION']; ?>
 		<div class="right-act">
-			Действие со страницами: 
+			<?php echo $this->lng_m['stc_field_action2']; ?>: 
 			<div class="btn-group">
 				<a class="btn" href="<?php echo ADMIN_URL; ?>&do=statics&op=add"><i class="icon-plus"></i></a>
 				<a class="btn edit" data-for="check-input" data-link="<?php echo ADMIN_URL; ?>&do=statics&op=edit&id=" href="#"><i class="icon-pencil"></i></a>
-				<button class="btn remove" data-for="check-input" data-text="Вы уверены, что хотите удалить выбранные элементы?" type="submit" name="delete"><i class="icon-remove"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['stc_accept']; ?>" type="submit" name="delete"><i class="icon-remove"></i></button>
 			</div>
 		</div>
 		
diff --git a/upload/themes/default/modules/admin/statics/static-none.html b/upload/themes/default/modules/admin/statics/static-none.html
index b569bec..3b7cbf6 100644
--- a/upload/themes/default/modules/admin/statics/static-none.html
+++ b/upload/themes/default/modules/admin/statics/static-none.html
@@ -1,3 +1,3 @@
 <tr>
-	<td colspan="4"><center>Нет доступных статических страниц</center></td>
+	<td colspan="4"><center><?php echo $this->lng_m['stc_empty']; ?></center></td>
 </tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/statics/static-preview.html b/upload/themes/default/modules/admin/statics/static-preview.html
new file mode 100644
index 0000000..db5311f
--- /dev/null
+++ b/upload/themes/default/modules/admin/statics/static-preview.html
@@ -0,0 +1,21 @@
+<div class="form-block static-page">
+
+	<div class="block-header">
+		<div class="block-name"><?php echo $data['TITLE']; ?> (<?php echo $this->lng_m['stc_preview']; ?>)</div>
+	</div>
+
+	<div class="block-line"></div>
+
+	<div class="static-content">
+		<?php echo $data['TEXT']; ?>
+	</div>
+
+	<div class="block-line"></div>
+
+	<div class="block-footer">
+		<div class="date" rel="tooltip" title="Дата создания"><?php echo date("d.m.Y", time()); ?></div>
+		<div class="time" rel="tooltip" title="Время создания"><?php echo date("H:i", time()); ?></div>
+		<div class="readmore"><a target="_blank" href="<?php echo BASE_URL; ?>"><?php echo $this->lng_m['stc_go_home']; ?></a></div>
+	</div>
+
+</div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/users/user-add.html b/upload/themes/default/modules/admin/users/user-add.html
index a6bdf73..6b5544c 100644
--- a/upload/themes/default/modules/admin/users/user-add.html
+++ b/upload/themes/default/modules/admin/users/user-add.html
@@ -8,28 +8,28 @@
 
 	<form class="form-horizontal" method="post">
 		<div class="control-group">
-			<label class="control-label" for="inputLogin">Логин</label>
+			<label class="control-label" for="inputLogin"><?php echo $this->lng['login']; ?></label>
 			<div class="controls">
-				<input type="text" name="login" value="<?php echo $data['LOGIN']; ?>" id="inputLogin" placeholder="Логин">
+				<input type="text" name="login" value="<?php echo $data['LOGIN']; ?>" id="inputLogin" placeholder="<?php echo $this->lng['login']; ?>">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputPassword">Password</label>
+			<label class="control-label" for="inputPassword"><?php echo $this->lng['pass']; ?></label>
 			<div class="controls">
-				<input type="text" name="password" id="inputPassword" placeholder="Пароль">
+				<input type="text" name="password" id="inputPassword" placeholder="<?php echo $this->lng['pass']; ?>">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputEmail">E-Mail</label>
+			<label class="control-label" for="inputEmail"><?php echo $this->lng['email']; ?></label>
 			<div class="controls">
-				<input type="text" name="email" value="<?php echo $data['EMAIL']; ?>" id="inputEmail" placeholder="E-Mail">
+				<input type="text" name="email" value="<?php echo $data['EMAIL']; ?>" id="inputEmail" placeholder="<?php echo $this->lng['email']; ?>">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="selectGid">Группа</label>
+			<label class="control-label" for="selectGid"><?php echo $this->lng['group']; ?></label>
 			<div class="controls">
 				<select name="gid" id="selectGid">
 					<?php echo $data['GROUPS']; ?>
@@ -38,47 +38,47 @@
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputFName">Имя</label>
+			<label class="control-label" for="inputFName"><?php echo $this->lng['firstname']; ?></label>
 			<div class="controls">
-				<input type="text" name="firstname" pattern="^[а-яА-ЯёЁa-zA-Z]+$" value="<?php echo $data['FIRSTNAME']; ?>" id="inputFName" placeholder="Имя">
+				<input type="text" name="firstname" pattern="^[а-яА-ЯёЁa-zA-Z]+$" value="<?php echo $data['FIRSTNAME']; ?>" id="inputFName" placeholder="<?php echo $this->lng['firstname']; ?>">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputLName">Фамилия</label>
+			<label class="control-label" for="inputLName"><?php echo $this->lng['lastname']; ?></label>
 			<div class="controls">
-				<input type="text" name="lastname" pattern="^[а-яА-ЯёЁa-zA-Z]+$" value="<?php echo $data['LASTNAME']; ?>" id="inputLName" placeholder="Фамилия">
+				<input type="text" name="lastname" pattern="^[а-яА-ЯёЁa-zA-Z]+$" value="<?php echo $data['LASTNAME']; ?>" id="inputLName" placeholder="<?php echo $this->lng['lastname']; ?>">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="selectGender">Пол</label>
+			<label class="control-label" for="selectGender"><?php echo $this->lng['gender']; ?></label>
 			<div class="controls">
 				<select name="gender" id="selectGender">
-					<option value="0">Мужской</option>
-					<option value="1" <?php echo $data['GENDER']; ?>>Женский</option>
+					<option value="0"><?php echo $this->lng['gender_m']; ?></option>
+					<option value="1" <?php echo $data['GENDER']; ?>><?php echo $this->lng['gender_w']; ?></option>
 				</select>
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputBirthday">Дата рождения</label>
+			<label class="control-label" for="inputBirthday"><?php echo $this->lng['birthday']; ?></label>
 			<div class="controls">
 				<input type="text" name="birthday" maxlength="10" pattern="^\d{2}.\d{2}.\d{4}$" value="<?php echo $data['BIRTHDAY']; ?>" id="inputBirthday" placeholder="Дата рождения">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputMoney">Игровой баланс</label>
+			<label class="control-label" for="inputMoney"><?php echo $this->lng['money']; ?></label>
 			<div class="controls">
-				<input type="text" name="money" value="<?php echo $data['MONEY']; ?>" id="inputMoney" placeholder="Игровой баланс">
+				<input type="text" name="money" value="<?php echo $data['MONEY']; ?>" id="inputMoney" placeholder="<?php echo $this->lng['money']; ?>">
 			</div>
 		</div>
 
 		<div class="control-group">
-			<label class="control-label" for="inputRMoney">Реальный баланс</label>
+			<label class="control-label" for="inputRMoney"><?php echo $this->lng['realmoney']; ?></label>
 			<div class="controls">
-				<input type="text" name="realmoney" value="<?php echo $data['REALMONEY']; ?>" id="inputRMoney" placeholder="Реальный баланс">
+				<input type="text" name="realmoney" value="<?php echo $data['REALMONEY']; ?>" id="inputRMoney" placeholder="<?php echo $this->lng['realmoney']; ?>">
 			</div>
 		</div>
 
diff --git a/upload/themes/default/modules/admin/users/user-id.html b/upload/themes/default/modules/admin/users/user-id.html
index aa34790..efc0d73 100644
--- a/upload/themes/default/modules/admin/users/user-id.html
+++ b/upload/themes/default/modules/admin/users/user-id.html
@@ -3,5 +3,6 @@
 	<td><?php echo $data['LOGIN']; ?></td>
 	<td><?php echo $data['GROUP']; ?></td>
 	<td><?php echo $data['EMAIL']; ?></td>
+	<td><?php echo $data['IP_LAST']; ?></td>
 	<td class="action"><input type="checkbox"  name="id[]" class="check-input" value="<?php echo $data['ID']; ?>"></td>
 </tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/admin/users/user-list.html b/upload/themes/default/modules/admin/users/user-list.html
index 325620f..3b011d4 100644
--- a/upload/themes/default/modules/admin/users/user-list.html
+++ b/upload/themes/default/modules/admin/users/user-list.html
@@ -2,7 +2,7 @@
 	<div class="form-block">
 
 		<div class="block-header">
-			<div class="block-name">Пользователи</div>
+			<div class="block-name"><?php echo $this->lng_m['users']; ?></div>
 		</div>
 
 		<div class="block-line"></div>
@@ -11,10 +11,11 @@
 			<thead>
 				<tr>
 					<th>#</th>
-					<th>Логин</th>
-					<th>Группа</th>
-					<th>E-Mail</th>
-					<th class="action">Действие <input type="checkbox" class="check-all" data-for="check-input"></th>
+					<th><?php echo $this->lng['login']; ?></th>
+					<th><?php echo $this->lng['group']; ?></th>
+					<th><?php echo $this->lng['email']; ?></th>
+					<th><?php echo $this->lng['ip']; ?></th>
+					<th class="action"><?php echo $this->lng_m['user_field_action']; ?> <input type="checkbox" class="check-all" data-for="check-input"></th>
 				</tr>
 			</thead>
 
@@ -27,13 +28,13 @@
 	<div class="form-block actions">
 		<?php echo $data['PAGINATION']; ?>
 		<div class="right-act">
-			Действие с пользователями: 
+			<?php echo $this->lng_m['user_field_action2']; ?>: 
 			<div class="btn-group">
 				<a class="btn" href="<?php echo ADMIN_URL; ?>&do=users&op=add"><i class="icon-plus"></i></a>
 				<a class="btn edit" data-for="check-input" data-link="<?php echo ADMIN_URL; ?>&do=users&op=edit&id=" href="#"><i class="icon-pencil"></i></a>
-				<button class="btn remove" data-for="check-input" data-text="Удаление пользователей приведет к удалению всей информации о них. Вы уверены, что хотите удалить выбранные элементы?" type="submit" name="delete"><i class="icon-remove"></i></button>
-				<button class="btn remove" data-for="check-input" data-text="Вы действительно хотите забанить выбранных пользователей на сервере?" type="submit" name="ban"><i class="icon-ban-circle"></i></button>
-				<button class="btn remove" data-for="check-input" data-text="Вы действительно хотите разбанить выбранных пользователей на сервере?" type="submit" name="unban"><i class="icon-ok-circle"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['user_accept']; ?>" type="submit" name="delete"><i class="icon-remove"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['user_accept2']; ?>" type="submit" name="ban"><i class="icon-ban-circle"></i></button>
+				<button class="btn remove" data-for="check-input" data-text="<?php echo $this->lng_m['user_accept3']; ?>" type="submit" name="unban"><i class="icon-ok-circle"></i></button>
 			</div>
 		</div>
 		
diff --git a/upload/themes/default/modules/admin/users/user-none.html b/upload/themes/default/modules/admin/users/user-none.html
index fb29ab7..5fccf21 100644
--- a/upload/themes/default/modules/admin/users/user-none.html
+++ b/upload/themes/default/modules/admin/users/user-none.html
@@ -1,3 +1,3 @@
 <tr>
-	<td colspan="5"><center>Нет доступных пользователей</center></td>
+	<td colspan="6"><center><?php echo $this->lng_m['user_empty']; ?></center></td>
 </tr>
\ No newline at end of file
diff --git a/upload/themes/default/modules/news/comments/comment-access.html b/upload/themes/default/modules/news/comments/comment-access.html
index b60e5e0..bbc31e5 100644
--- a/upload/themes/default/modules/news/comments/comment-access.html
+++ b/upload/themes/default/modules/news/comments/comment-access.html
@@ -1,7 +1,7 @@
 <div class="form-block comment-id">
 
 	<div class="comment-id-content">
-		У вас нет доступа, чтобы просматривать комментарии
+		<?php echo $this->lng_m['access_denied_com']; ?>
 	</div>
 
 </div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/news/comments/comment-act-del.html b/upload/themes/default/modules/news/comments/comment-act-del.html
index 2c7c43e..2c84f0c 100644
--- a/upload/themes/default/modules/news/comments/comment-act-del.html
+++ b/upload/themes/default/modules/news/comments/comment-act-del.html
@@ -1 +1 @@
-<div class="del-btn"><a href="#" rel="tooltip" title="Удалить" class="del_comment" data-id="<?php echo $data['ID']; ?>"><i class="icon-remove"></i></a></div>
\ No newline at end of file
+<div class="del-btn"><a href="#" rel="tooltip" title="<?php echo $this->lng_m['delete']; ?>" class="del_comment" data-id="<?php echo $data['ID']; ?>"><i class="icon-remove"></i></a></div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/news/comments/comment-act-edt.html b/upload/themes/default/modules/news/comments/comment-act-edt.html
index af8ab97..635df63 100644
--- a/upload/themes/default/modules/news/comments/comment-act-edt.html
+++ b/upload/themes/default/modules/news/comments/comment-act-edt.html
@@ -1 +1 @@
-<div class="edt-btn"><a href="#" data-toggle="modal" class="edt_comment" rel="tooltip" title="Редактировать" data-id="<?php echo $data['ID']; ?>"><i class="icon-pencil"></i></a></div>
\ No newline at end of file
+<div class="edt-btn"><a href="#" data-toggle="modal" class="edt_comment" rel="tooltip" title="<?php echo $this->lng_m['edit']; ?>" data-id="<?php echo $data['ID']; ?>"><i class="icon-pencil"></i></a></div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/news/comments/comment-act-get.html b/upload/themes/default/modules/news/comments/comment-act-get.html
index dd91623..12751e8 100644
--- a/upload/themes/default/modules/news/comments/comment-act-get.html
+++ b/upload/themes/default/modules/news/comments/comment-act-get.html
@@ -1 +1 @@
-<div class="get-btn"><a href="#" rel="tooltip" title="Цитировать" class="get_comment" data-id="<?php echo $data['ID']; ?>"><i class="icon-comment"></i></a></div>
\ No newline at end of file
+<div class="get-btn"><a href="#" rel="tooltip" title="<?php echo $this->lng_m['quote']; ?>" class="get_comment" data-id="<?php echo $data['ID']; ?>"><i class="icon-comment"></i></a></div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/news/comments/comment-closed.html b/upload/themes/default/modules/news/comments/comment-closed.html
index 2ef22c7..43bac97 100644
--- a/upload/themes/default/modules/news/comments/comment-closed.html
+++ b/upload/themes/default/modules/news/comments/comment-closed.html
@@ -1,7 +1,7 @@
 <div class="form-block comment-id">
 
 	<div class="comment-id-content">
-		Комментарии в данной новости были отключены администрацией
+		<?php echo $this->lng_m['disabled_by_admin']; ?>
 	</div>
 
 </div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/news/comments/comment-form.html b/upload/themes/default/modules/news/comments/comment-form.html
index 6ac4edd..d44ac11 100644
--- a/upload/themes/default/modules/news/comments/comment-form.html
+++ b/upload/themes/default/modules/news/comments/comment-form.html
@@ -1,7 +1,7 @@
 <div class="form-block comment-form">
 
 	<div class="block-header">
-		Добавление комментария
+		<?php echo $this->lng_m['add_comment']; ?>
 	</div>
 
 	<div class="block-line"></div>
@@ -10,10 +10,10 @@
 		<form method="post">
 			<?php echo $data['BB_PANEL']; ?>
 
-			<textarea name="message" data-for="bb-comments" placeholder="Сообщение" required></textarea>
+			<textarea name="message" data-for="bb-comments" placeholder="<?php echo $this->lng_m['message']; ?>" required></textarea>
 
 			<div class="submit-btn">
-				<button type="submit" class="btn btn-primary" name="comment" id="add_comment" value="add">Добавить</button>
+				<button type="submit" class="btn btn-primary" name="comment" id="add_comment" value="add"><?php echo $this->lng_m['add']; ?></button>
 			</div>
 		</form>
 	</div>
diff --git a/upload/themes/default/modules/news/comments/comment-id.html b/upload/themes/default/modules/news/comments/comment-id.html
index 157f777..1dc2c50 100644
--- a/upload/themes/default/modules/news/comments/comment-id.html
+++ b/upload/themes/default/modules/news/comments/comment-id.html
@@ -7,9 +7,9 @@
 	<div class="block-line"></div>
 
 	<div class="block-footer">
-		<div class="date" rel="tooltip" title="Дата создания"><?php echo date("d.m.Y", $data['DATA']['time_create']); ?></div>
-		<div class="time" rel="tooltip" title="Время создания"><?php echo date("H:i", $data['DATA']['time_create']); ?></div>
-		<div class="login"><a href="#" rel="tooltip" title="Отправлено пользователем"><?php echo $data['LOGIN']; ?></a></div>
+		<div class="date" rel="tooltip" title="<?php echo $this->lng_m['date_create']; ?>"><?php echo date("d.m.Y", $data['DATA']['time_create']); ?></div>
+		<div class="time" rel="tooltip" title="<?php echo $this->lng_m['time_create']; ?>"><?php echo date("H:i", $data['DATA']['time_create']); ?></div>
+		<div class="login"><a href="#" rel="tooltip" title="<?php echo $this->lng_m['send_by_user']; ?>"><?php echo $data['LOGIN']; ?></a></div>
 		<?php echo $data['ACTION_DELETE']; ?>
 		<?php echo $data['ACTION_EDIT']; ?>
 		<?php echo $data['ACTION_QUOTE']; ?>
diff --git a/upload/themes/default/modules/news/comments/comment-list.html b/upload/themes/default/modules/news/comments/comment-list.html
index a912d1b..c318f8e 100644
--- a/upload/themes/default/modules/news/comments/comment-list.html
+++ b/upload/themes/default/modules/news/comments/comment-list.html
@@ -1,7 +1,7 @@
 <div class="form-block comment-list">
 
 	<div class="block-header">
-		<div class="block-name">Комментарии (<span id="comment-count"><?php echo $data['COUNT']; ?></span>)</div>
+		<div class="block-name"><?php echo $this->lng_m['comments1']; ?> (<span id="comment-count"><?php echo $data['COUNT']; ?></span>)</div>
 	</div>
 
 	<div class="block-line"></div>
diff --git a/upload/themes/default/modules/news/comments/comment-none.html b/upload/themes/default/modules/news/comments/comment-none.html
index bd69f25..b016a67 100644
--- a/upload/themes/default/modules/news/comments/comment-none.html
+++ b/upload/themes/default/modules/news/comments/comment-none.html
@@ -1,7 +1,7 @@
 <div class="form-block comment-id none">
 
 	<div class="comment-id-content">
-		Нет доступных комментариев
+		<?php echo $this->lng_m['no_com_avail']; ?>
 	</div>
 
 </div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/news/header-admin.html b/upload/themes/default/modules/news/header-admin.html
new file mode 100644
index 0000000..2bcac56
--- /dev/null
+++ b/upload/themes/default/modules/news/header-admin.html
@@ -0,0 +1,2 @@
+<script src="<?php echo LANG_URL; ?>js/modules/news-admin.js"></script>
+<script src="<?php echo STYLE_URL; ?>js/modules/news/news-admin.js"></script>
\ No newline at end of file
diff --git a/upload/themes/default/modules/news/header-full.html b/upload/themes/default/modules/news/header-full.html
index 3c5ded2..edd8bc0 100644
--- a/upload/themes/default/modules/news/header-full.html
+++ b/upload/themes/default/modules/news/header-full.html
@@ -1 +1,2 @@
-<script src="<?php echo STYLE_URL; ?>js/news-full.js"></script>
\ No newline at end of file
+<script src="<?php echo LANG_URL; ?>js/modules/news-full.js"></script>
+<script src="<?php echo STYLE_URL; ?>js/modules/news/news-full.js"></script>
\ No newline at end of file
diff --git a/upload/themes/default/modules/news/header-list.html b/upload/themes/default/modules/news/header-list.html
index eafd1c3..630197c 100644
--- a/upload/themes/default/modules/news/header-list.html
+++ b/upload/themes/default/modules/news/header-list.html
@@ -1 +1,2 @@
-<script src="<?php echo STYLE_URL; ?>js/news-list.js"></script>
\ No newline at end of file
+<script src="<?php echo LANG_URL; ?>js/modules/news-list.js"></script>
+<script src="<?php echo STYLE_URL; ?>js/modules/news/news-list.js"></script>
\ No newline at end of file
diff --git a/upload/themes/default/modules/news/new-admin.html b/upload/themes/default/modules/news/new-admin.html
index 1cc049c..c4c686b 100644
--- a/upload/themes/default/modules/news/new-admin.html
+++ b/upload/themes/default/modules/news/new-admin.html
@@ -3,9 +3,9 @@
 	<a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
 
 	<ul class="dropdown-menu">
-		<li><a href="#">Закрепить</a></li>
-		<li><a href="#">Редактировать</a></li>
-		<li><a href="#">Удалить</a></li>
+		<li><a href="#" class="news-attach" data-id="<?php echo $data['ID']; ?>"><?php echo $data['ATTACH']; ?></a></li>
+		<li><a href="<?php echo BASE_URL; ?>?mode=admin&do=news&op=edit&id=<?php echo $data['ID']; ?>"><?php echo $this->lng_m['edit']; ?></a></li>
+		<li><a href="#" class="news-delete" data-id="<?php echo $data['ID']; ?>"><?php echo $this->lng_m['delete']; ?></a></li>
 	
 	</ul>
 </div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/news/new-comments.html b/upload/themes/default/modules/news/new-comments.html
index 218a85c..c3b8296 100644
--- a/upload/themes/default/modules/news/new-comments.html
+++ b/upload/themes/default/modules/news/new-comments.html
@@ -1 +1 @@
-<div class="comments" rel="tooltip" title="Комментариев"><i class="icon-comment"></i><?php echo $data['COMMENTS']; ?></div>
\ No newline at end of file
+<div class="comments" rel="tooltip" title="<?php echo $this->lng_m['comments']; ?>"><i class="icon-comment"></i><?php echo $data['COMMENTS']; ?></div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/news/new-full.html b/upload/themes/default/modules/news/new-full.html
index 6c7bba4..daaa783 100644
--- a/upload/themes/default/modules/news/new-full.html
+++ b/upload/themes/default/modules/news/new-full.html
@@ -2,9 +2,11 @@
 
 	<div class="block-header">
 		
-		<div class="block-name"><?php echo $data['TITLE']; ?></div>
-
-		<?php echo $data['LIKES']; ?>
+		<div class="block-name"><?php echo $data['TITLE']; ?></div><!--
+		--><div class="block-right">
+			<?php echo $data['ADMIN']; ?>
+			<?php echo $data['LIKES']; ?>
+		</div>
 	</div>
 
 	<div class="block-line"></div>
@@ -16,11 +18,11 @@
 	<div class="block-line"></div>
 
 	<div class="block-footer">
-		<div class="date" rel="tooltip" title="Дата создания"><?php echo date("d.m.Y", $data['DATA']['time_create']); ?></div>
-		<div class="time" rel="tooltip" title="Время создания"><?php echo date("H:i", $data['DATA']['time_create']); ?></div>
-		<div class="category"><a href="<?php echo BASE_URL; ?>?mode=news&amp;cid=<?php echo $data['CID']; ?>" rel="tooltip" title="Категория"><?php echo $data['CATEGORY']; ?></a></div>
-		<div class="readmore"><a href="<?php echo BASE_URL; ?>">На главную</a></div>
-		<div class="views" rel="tooltip" title="Просмотров"><i class="icon-eye-open"></i><?php echo $data['VIEWS']; ?></div>
+		<div class="date" rel="tooltip" title="<?php echo $this->lng_m['date_create']; ?>"><?php echo date("d.m.Y", $data['DATA']['time_create']); ?></div>
+		<div class="time" rel="tooltip" title="<?php echo $this->lng_m['time_create']; ?>"><?php echo date("H:i", $data['DATA']['time_create']); ?></div>
+		<div class="category"><a href="<?php echo BASE_URL; ?>?mode=news&amp;cid=<?php echo $data['CID']; ?>" rel="tooltip" title="<?php echo $this->lng_m['category']; ?>"><?php echo $data['CATEGORY']; ?></a></div>
+		<div class="readmore"><a href="<?php echo BASE_URL; ?>"><?php echo $this->lng_m['go_home']; ?></a></div>
+		<div class="views" rel="tooltip" title="<?php echo $this->lng_m['views']; ?>"><i class="icon-eye-open"></i><?php echo $data['VIEWS']; ?></div>
 	</div>
 
 </div>
diff --git a/upload/themes/default/modules/news/new-id-attached.html b/upload/themes/default/modules/news/new-id-attached.html
index b7092a2..61e03ac 100644
--- a/upload/themes/default/modules/news/new-id-attached.html
+++ b/upload/themes/default/modules/news/new-id-attached.html
@@ -2,8 +2,11 @@
 
 	<div class="block-header">
 		
-		<div class="block-name"><i rel="tooltip" title="Закреплено" class="icon-tag"></i><a href="<?php echo BASE_URL; ?>?mode=news&amp;id=<?php echo $data['ID']; ?>"><?php echo $data['TITLE']; ?></a></div>
-		<?php echo $data['LIKES']; ?>
+		<div class="block-name"><i rel="tooltip" title="<?php echo $this->lng_m['attached']; ?>" class="icon-tag"></i><a href="<?php echo BASE_URL; ?>?mode=news&amp;id=<?php echo $data['ID']; ?>"><?php echo $data['TITLE']; ?></a></div><!--
+		--><div class="block-right">
+			<?php echo $data['ADMIN']; ?>
+			<?php echo $data['LIKES']; ?>
+		</div>
 	</div>
 
 	<div class="block-line"></div>
@@ -15,11 +18,11 @@
 	<div class="block-line"></div>
 
 	<div class="block-footer">
-		<div class="date" rel="tooltip" title="Дата создания"><?php echo date("d.m.Y", $data['DATA']['time_create']); ?></div>
-		<div class="time" rel="tooltip" title="Время создания"><?php echo date("H:i", $data['DATA']['time_create']); ?></div>
-		<div class="category"><a href="<?php echo BASE_URL; ?>?mode=news&amp;cid=<?php echo $data['CID']; ?>" rel="tooltip" title="Категория"><?php echo $data['CATEGORY']; ?></a></div>
-		<div class="readmore"><a href="<?php echo BASE_URL; ?>?mode=news&amp;id=<?php echo $data['ID']; ?>">Читать далее...</a></div>
+		<div class="date" rel="tooltip" title="<?php echo $this->lng_m['date_create']; ?>"><?php echo date("d.m.Y", $data['DATA']['time_create']); ?></div>
+		<div class="time" rel="tooltip" title="<?php echo $this->lng_m['time_create']; ?>"><?php echo date("H:i", $data['DATA']['time_create']); ?></div>
+		<div class="category"><a href="<?php echo BASE_URL; ?>?mode=news&amp;cid=<?php echo $data['CID']; ?>" rel="tooltip" title="<?php echo $this->lng_m['category']; ?>"><?php echo $data['CATEGORY']; ?></a></div>
+		<div class="readmore"><a href="<?php echo BASE_URL; ?>?mode=news&amp;id=<?php echo $data['ID']; ?>"><?php echo $this->lng_m['readmore']; ?></a></div>
 		<?php echo $data['COMMENTS']; ?>
-		<div class="views" rel="tooltip" title="Просмотров"><i class="icon-eye-open"></i><?php echo $data['VIEWS']; ?></div>
+		<div class="views" rel="tooltip" title="<?php echo $this->lng_m['views']; ?>"><i class="icon-eye-open"></i><?php echo $data['VIEWS']; ?></div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/news/new-id.html b/upload/themes/default/modules/news/new-id.html
index 789e65b..7fb15b4 100644
--- a/upload/themes/default/modules/news/new-id.html
+++ b/upload/themes/default/modules/news/new-id.html
@@ -2,8 +2,11 @@
 
 	<div class="block-header">
 		
-		<div class="block-name"><a href="<?php echo BASE_URL; ?>?mode=news&amp;id=<?php echo $data['ID']; ?>"><?php echo $data['TITLE']; ?></a></div>
-		<?php echo $data['LIKES']; ?>
+		<div class="block-name"><a href="<?php echo BASE_URL; ?>?mode=news&amp;id=<?php echo $data['ID']; ?>"><?php echo $data['TITLE']; ?></a></div><!--
+		--><div class="block-right">
+			<?php echo $data['ADMIN']; ?>
+			<?php echo $data['LIKES']; ?>
+		</div>
 	</div>
 
 	<div class="block-line"></div>
@@ -15,11 +18,11 @@
 	<div class="block-line"></div>
 
 	<div class="block-footer">
-		<div class="date" rel="tooltip" title="Дата создания"><?php echo date("d.m.Y", $data['DATA']['time_create']); ?></div>
-		<div class="time" rel="tooltip" title="Время создания"><?php echo date("H:i", $data['DATA']['time_create']); ?></div>
-		<div class="category"><a href="<?php echo BASE_URL; ?>?mode=news&amp;cid=<?php echo $data['CID']; ?>" rel="tooltip" title="Категория"><?php echo $data['CATEGORY']; ?></a></div>
-		<div class="readmore"><a href="<?php echo BASE_URL; ?>?mode=news&amp;id=<?php echo $data['ID']; ?>">Читать далее...</a></div>
+		<div class="date" rel="tooltip" title="<?php echo $this->lng_m['date_create']; ?>"><?php echo date("d.m.Y", $data['DATA']['time_create']); ?></div>
+		<div class="time" rel="tooltip" title="<?php echo $this->lng_m['time_create']; ?>"><?php echo date("H:i", $data['DATA']['time_create']); ?></div>
+		<div class="category"><a href="<?php echo BASE_URL; ?>?mode=news&amp;cid=<?php echo $data['CID']; ?>" rel="tooltip" title="<?php echo $this->lng_m['category']; ?>"><?php echo $data['CATEGORY']; ?></a></div>
+		<div class="readmore"><a href="<?php echo BASE_URL; ?>?mode=news&amp;id=<?php echo $data['ID']; ?>"><?php echo $this->lng_m['readmore']; ?></a></div>
 		<?php echo $data['COMMENTS']; ?>
-		<div class="views" rel="tooltip" title="Просмотров"><i class="icon-eye-open"></i><?php echo $data['VIEWS']; ?></div>
+		<div class="views" rel="tooltip" title="<?php echo $this->lng_m['views']; ?>"><i class="icon-eye-open"></i><?php echo $data['VIEWS']; ?></div>
 	</div>
 </div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/news/new-none.html b/upload/themes/default/modules/news/new-none.html
index 9e1434a..e2d3197 100644
--- a/upload/themes/default/modules/news/new-none.html
+++ b/upload/themes/default/modules/news/new-none.html
@@ -1,6 +1,6 @@
 <div class="form-block">
-	<div class="block-header">Не найдено</div>
+	<div class="block-header"><?php echo $this->lng_m['not_found']; ?></div>
 	<div class="block-line"></div>
 
-	<div class="new-none">Нет доступных новостей</div>
+	<div class="new-none"><?php echo $this->lng_m['no_news_avail']; ?></div>
 </div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/profile/header.html b/upload/themes/default/modules/profile/header.html
index 5c062f6..9790f47 100644
--- a/upload/themes/default/modules/profile/header.html
+++ b/upload/themes/default/modules/profile/header.html
@@ -1,4 +1,3 @@
 <link href="<?php echo STYLE_URL; ?>css/jquery.datetimepicker.css" rel="stylesheet" media="screen">
 <script src="<?php echo STYLE_URL; ?>js/jquery.datetimepicker.js"></script>
-<script src="<?php echo STYLE_URL; ?>js/bootstrap.file-input.js"></script>
-<script src="<?php echo STYLE_URL; ?>js/profile.js"></script>
\ No newline at end of file
+<script src="<?php echo STYLE_URL; ?>js/modules/profile/main.js"></script>
\ No newline at end of file
diff --git a/upload/themes/default/modules/profile/profile.html b/upload/themes/default/modules/profile/profile.html
index 1196ebf..b7ec492 100644
--- a/upload/themes/default/modules/profile/profile.html
+++ b/upload/themes/default/modules/profile/profile.html
@@ -1,7 +1,7 @@
 <div class="form-block profile">
 
 	<div class="block-header">
-		<div class="block-name"><?php echo $this->lng['t_profile']; ?></div>
+		<div class="block-name"><?php echo $this->lng_m['mod_name']; ?></div>
 	</div>
 
 	<div class="block-line"></div>
@@ -11,9 +11,9 @@
 			<div class="navbar-inner">
 				<b class="brand" href="#"><?php echo $this->user->login; ?></b>
 				<ul class="nav">
-					 <li class="active"><a href="#tab1" data-toggle="tab">Информация</a></li>
-					 <li><a href="#tab2" data-toggle="tab">Образ</a></li>
-					 <li><a href="#tab3" data-toggle="tab">Настройки</a></li>
+					 <li class="active"><a href="#tab1" data-toggle="tab"><?php echo $this->lng_m['f_info']; ?></a></li>
+					 <li><a href="#tab2" data-toggle="tab"><?php echo $this->lng_m['f_skin']; ?></a></li>
+					 <li><a href="#tab3" data-toggle="tab"><?php echo $this->lng_m['f_settings']; ?></a></li>
 				</ul>
 			</div>
 		</div>
@@ -24,19 +24,18 @@
 				<div class="tab-pane active" id="tab1">
 
 					<div class="profile-info">
-						<div class="info-line"><b>Логин:</b> <span><?php echo $this->user->login; ?></span></div>
-						<div class="info-line"><b>E-Mail:</b> <span><?php echo $this->user->email; ?></span></div>
-						<div class="info-line"><b>Группа:</b> <span><?php echo $this->user->group; ?></span></div>
-						<div class="info-line"><b>Дата регистрации:</b> <span><?php echo date("d.m.Y в H:i", $this->user->data->time_create); ?></span></div>
-						<div class="info-line"><b>Последнее действие:</b> <span><?php echo date("d.m.Y в H:i", $this->user->data->time_last); ?></span></div>
+						<div class="info-line"><b><?php echo $this->lng['login']; ?>:</b> <span><?php echo $this->user->login; ?></span></div>
+						<div class="info-line"><b><?php echo $this->lng['email']; ?>:</b> <span><?php echo $this->user->email; ?></span></div>
+						<div class="info-line"><b><?php echo $this->lng['group']; ?>:</b> <span><?php echo $this->user->group; ?></span></div>
+						<div class="info-line"><b><?php echo $this->lng['date_reg']; ?>:</b> <span><?php echo date("d.m.Y в H:i", $this->user->data->time_create); ?></span></div>
+						<div class="info-line"><b><?php echo $this->lng['last_activity']; ?>:</b> <span><?php echo date("d.m.Y в H:i", $this->user->data->time_last); ?></span></div>
 
-						<div class="info-line"><b>Имя:</b> <span><?php echo $this->user->data->firstname; ?></span></div>
-						<div class="info-line"><b>Фамилия:</b> <span><?php echo $this->user->data->lastname; ?></span></div>
-						<div class="info-line"><b>Пол:</b> <span><?php echo $this->user->gender; ?></span></div>
-						<div class="info-line"><b>Дата рождения:</b> <span><?php echo date("d.m.Y", $this->user->data->birthday); ?></span></div>
-						<div class="info-line"><b>Игровой баланс:</b> <span><?php echo $this->user->money; ?> майн.</span></div>
-						<div class="info-line"><b>Реальный баланс:</b> <span><?php echo $this->user->realmoney; ?> руб.</span></div>
-						<!--<div class="info-line"><b>Игровой баланс:</b> <span><?php echo $this->user->money; ?></span></div>-->
+						<div class="info-line"><b><?php echo $this->lng_m['f_name']; ?>:</b> <span><?php echo $this->user->data->firstname; ?></span></div>
+						<div class="info-line"><b><?php echo $this->lng_m['f_lname']; ?>:</b> <span><?php echo $this->user->data->lastname; ?></span></div>
+						<div class="info-line"><b><?php echo $this->lng_m['f_gender']; ?>:</b> <span><?php echo $this->user->gender; ?></span></div>
+						<div class="info-line"><b><?php echo $this->lng_m['f_bday']; ?>:</b> <span><?php echo date("d.m.Y", $this->user->data->birthday); ?></span></div>
+						<div class="info-line"><b><?php echo $this->lng_m['f_gmoney']; ?>:</b> <span><?php echo $this->user->money; ?> майн.</span></div>
+						<div class="info-line"><b><?php echo $this->lng_m['f_rmoney']; ?>:</b> <span><?php echo $this->user->realmoney; ?> руб.</span></div>
 					</div>
 					
 				</div>
@@ -49,13 +48,13 @@
 
 					<div class="uploader-forms">
 						<form class="skin-uploader" enctype="multipart/form-data" method="POST">
-							<input type="file" name="skin" class="file-inputs" title="Перенесите сюда новый скин персонажа">
-							<button class="btn" name="del-skin" value="1">Удалить скин</button>
+							<input type="file" name="skin" class="file-inputs" title="<?php echo $this->lng_m['drop_skin_here']; ?>">
+							<button class="btn" name="del-skin" value="1"><?php echo $this->lng_m['delete_skin']; ?></button>
 						</form>
 
 						<form class="cloak-uploader" enctype="multipart/form-data" method="POST">
-							<input type="file" name="cloak" class="file-inputs" title="Перенесите сюда новый плащ персонажа">
-							<button class="btn" name="del-cloak" value="1">Удалить плащ</button>
+							<input type="file" name="cloak" class="file-inputs" title="<?php echo $this->lng_m['drop_cloak_here']; ?>">
+							<button class="btn" name="del-cloak" value="1"><?php echo $this->lng_m['delete_cloak']; ?></button>
 						</form>
 					</div>
 				
@@ -64,50 +63,50 @@
 				<div class="tab-pane" id="tab3">
 					<form class="form-horizontal settings" method="post">
 						<div class="control-group">
-							<label class="control-label" for="inputFName">Имя</label>
+							<label class="control-label" for="inputFName"><?php echo $this->lng_m['f_name']; ?></label>
 							<div class="controls">
-								<input type="text" name="firstname" id="inputFName" value="<?php echo $this->user->data->firstname; ?>" maxlength="24" placeholder="Имя" pattern="^[а-яА-ЯёЁa-zA-Z]+$">
+								<input type="text" name="firstname" id="inputFName" value="<?php echo $this->user->data->firstname; ?>" maxlength="24" placeholder="<?php echo $this->lng_m['f_name']; ?>" pattern="^[а-яА-ЯёЁa-zA-Z]+$">
 							</div>
 						</div>
 
 						<div class="control-group">
-							<label class="control-label" for="inputLName">Фамилия</label>
+							<label class="control-label" for="inputLName"><?php echo $this->lng_m['f_lname']; ?></label>
 							<div class="controls">
-								<input type="text" name="lastname" id="inputLName" value="<?php echo $this->user->data->lastname; ?>" maxlength="24" pattern="^[а-яА-ЯёЁa-zA-Z]+$" placeholder="Фамилия">
+								<input type="text" name="lastname" id="inputLName" value="<?php echo $this->user->data->lastname; ?>" maxlength="24" pattern="^[а-яА-ЯёЁa-zA-Z]+$" placeholder="<?php echo $this->lng_m['f_lname']; ?>">
 							</div>
 						</div>
 
 						<div class="control-group">
-							<label class="control-label" for="inputLBirthday">Дата рождения</label>
+							<label class="control-label" for="inputLBirthday"><?php echo $this->lng_m['f_bday']; ?></label>
 							<div class="controls">
-								<input type="text" name="birthday" id="inputBirthday" maxlength="10" pattern="^\d{2}.\d{2}.\d{4}$" placeholder="Дата рождения">
+								<input type="text" name="birthday" id="inputBirthday" maxlength="10" pattern="^\d{2}.\d{2}.\d{4}$" placeholder="<?php echo $this->lng_m['f_bday']; ?>">
 							</div>
 						</div>
 
 						<div class="control-group">
-							<label class="control-label" for="inputOldpass">Старый пароль</label>
+							<label class="control-label" for="inputOldpass"><?php echo $this->lng_m['f_oldpass']; ?></label>
 							<div class="controls">
-								<input type="password" name="oldpass" id="inputOldpass" placeholder="Старый пароль">
+								<input type="password" name="oldpass" id="inputOldpass" placeholder="<?php echo $this->lng_m['f_oldpass']; ?>">
 							</div>
 						</div>
 
 						<div class="control-group">
-							<label class="control-label" for="inputNewpass"><?php echo $this->lng['int_newpass']; ?></label>
+							<label class="control-label" for="inputNewpass"><?php echo $this->lng['pass']; ?></label>
 							<div class="controls">
-								<input type="password" name="newpass" id="inputNewpass" placeholder="<?php echo $this->lng['int_newpass']; ?>">
+								<input type="password" name="newpass" id="inputNewpass" placeholder="<?php echo $this->lng['pass']; ?>">
 							</div>
 						</div>
 
 						<div class="control-group">
-							<label class="control-label" for="inputRepass">Повторите пароль</label>
+							<label class="control-label" for="inputRepass"><?php echo $this->lng_m['f_repass']; ?></label>
 							<div class="controls">
-								<input type="password" name="repass" id="inputRepass" placeholder="Повторите пароль">
+								<input type="password" name="repass" id="inputRepass" placeholder="<?php echo $this->lng_m['f_repass']; ?>">
 							</div>
 						</div>
 
 						<div class="control-group">
 							<div class="controls">
-								<button type="submit" name="settings" class="btn">Сохранить</button>
+								<button type="submit" name="settings" class="btn"><?php echo $this->lng_m['btn_save']; ?></button>
 							</div>
 						</div>
 					</form>
diff --git a/upload/themes/default/modules/register/body.mail.html b/upload/themes/default/modules/register/body.mail.html
index 400338d..4eb2dc7 100644
--- a/upload/themes/default/modules/register/body.mail.html
+++ b/upload/themes/default/modules/register/body.mail.html
@@ -1,9 +1,9 @@
-<p>Здравствуйте.</p>
+<p><?php echo $this->lng_m['msg1']; ?></p>
 <br>
-<p>Была совершена попытка регистрации на сайте "<b><?php echo $data['SITENAME']; ?></b>" (<a href="<?php echo $data['SITEURL']; ?>" target="_blank" title="Ссылка откроется в новой вкладке"><?php echo $data['SITEURL']; ?></a>)</p>
-<p>Для подтверждения регистрации, перейдите по ссылке ниже</p>
-<p><a href="<?php echo $data['LINK']; ?>" target="_blank" title="Ссылка откроется в новой вкладке"><?php echo $data['LINK']; ?></a></p>
+<p><?php echo $this->lng_m['msg2']; ?> "<b><?php echo $data['SITENAME']; ?></b>" (<a href="<?php echo $data['SITEURL']; ?>" target="_blank" title="<?php echo $this->lng['target_blank']; ?>"><?php echo $data['SITEURL']; ?></a>)</p>
+<p><?php echo $this->lng_m['msg3']; ?></p>
+<p><a href="<?php echo $data['LINK']; ?>" target="_blank" title="<?php echo $this->lng['target_blank']; ?>"><?php echo $data['LINK']; ?></a></p>
 <br>
-<p>Если это были не вы, то проигнорируйте данное сообщение.</p>
+<p><?php echo $this->lng_m['msg4']; ?></p>
 <br><br>
-<p>С уважением, администрация сайта "<b><?php echo $data['SITENAME']; ?></b>" (<a href="<?php echo $data['SITEURL']; ?>" target="_blank" title="Ссылка откроется в новой вкладке"><?php echo $data['SITEURL']; ?></a>)</p>
\ No newline at end of file
+<p><?php echo $this->lng_m['msg5']; ?> "<b><?php echo $data['SITENAME']; ?></b>" (<a href="<?php echo $data['SITEURL']; ?>" target="_blank" title="<?php echo $this->lng['target_blank']; ?>"><?php echo $data['SITEURL']; ?></a>)</p>
\ No newline at end of file
diff --git a/upload/themes/default/modules/register/header.html b/upload/themes/default/modules/register/header.html
index eb06b36..ee15a10 100644
--- a/upload/themes/default/modules/register/header.html
+++ b/upload/themes/default/modules/register/header.html
@@ -1,2 +1,3 @@
 <script src='https://www.google.com/recaptcha/api.js'></script>
-<script src="<?php echo STYLE_URL; ?>js/register.js"></script>
\ No newline at end of file
+<script src="<?php echo LANG_URL; ?>js/modules/register.js"></script>
+<script src="<?php echo STYLE_URL; ?>js/modules/register/main.js"></script>
\ No newline at end of file
diff --git a/upload/themes/default/modules/register/main.html b/upload/themes/default/modules/register/main.html
index 7450938..eedfce7 100644
--- a/upload/themes/default/modules/register/main.html
+++ b/upload/themes/default/modules/register/main.html
@@ -1,35 +1,35 @@
 <div class="form-block">
-	<div class="block-header"><?php echo $this->lng['b_reg']; ?></div>
+	<div class="block-header"><?php echo $this->lng_m['mod_name']; ?></div>
 	<div class="block-line"></div>
 
 	<div class="mcr-register">
 		<form class="form-horizontal" method="post">
 
 			<div class="control-group">
-				<label class="control-label" for="inputLogin"><?php echo $this->lng['reg_login']; ?></label>
+				<label class="control-label" for="inputLogin"><?php echo $this->lng['login']; ?></label>
 				<div class="controls">
-					<input type="text" name="login" class="span9" id="inputLogin" pattern="^[a-zA-Z0-9-_]{3,}$" maxlength="32" placeholder="<?php echo $this->lng['ph_login']; ?>" required>
+					<input type="text" name="login" class="span9" id="inputLogin" pattern="^[a-zA-Z0-9-_]{3,}$" maxlength="32" placeholder="<?php echo $this->lng['login']; ?>" required>
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputEmail"><?php echo $this->lng['reg_email']; ?></label>
+				<label class="control-label" for="inputEmail"><?php echo $this->lng['email']; ?></label>
 				<div class="controls">
-					<input type="email" name="email" class="span9" id="inputEmail" placeholder="<?php echo $this->lng['ph_email']; ?>" required>
+					<input type="email" name="email" class="span9" id="inputEmail" placeholder="<?php echo $this->lng['email']; ?>" required>
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputPassword"><?php echo $this->lng['reg_pass']; ?></label>
+				<label class="control-label" for="inputPassword"><?php echo $this->lng['pass']; ?></label>
 				<div class="controls">
-					<input type="password" name="password" class="span9" id="inputPassword" pattern="^[^']{6,}$" placeholder="<?php echo $this->lng['ph_password']; ?>" required>
+					<input type="password" name="password" class="span9" id="inputPassword" pattern="^[^']{6,}$" placeholder="<?php echo $this->lng['pass']; ?>" required>
 				</div>
 			</div>
 
 			<div class="control-group">
-				<label class="control-label" for="inputRePassword"><?php echo $this->lng['reg_repass']; ?></label>
+				<label class="control-label" for="inputRePassword"><?php echo $this->lng_m['repass']; ?></label>
 				<div class="controls">
-					<input type="password" name="repassword" class="span9" id="inputRePassword" pattern="^[^']{6,}$" placeholder="<?php echo $this->lng['ph_repassword']; ?>" required>
+					<input type="password" name="repassword" class="span9" id="inputRePassword" pattern="^[^']{6,}$" placeholder="<?php echo $this->lng_m['repass']; ?>" required>
 				</div>
 			</div>
 
@@ -54,9 +54,9 @@
 			<div class="control-group">
 				<div class="controls">
 					<label class="checkbox">
-						<input type="checkbox" name="accept" value="1" required> <?php echo $this->lng['reg_accept']; ?>
+						<input type="checkbox" name="accept" value="1" required> <?php echo $this->lng_m['accept']; ?>
 					</label>
-					<button type="submit" id="postbut" name="submit" class="btn"><?php echo $this->lng['reg_btn']; ?></button>
+					<button type="submit" id="postbut" name="submit" class="btn"><?php echo $this->lng_m['btn']; ?></button>
 				</div>
 			</div>
 		</form>
diff --git a/upload/themes/default/modules/restore/body.mail.html b/upload/themes/default/modules/restore/body.mail.html
index ae82292..a1cffb3 100644
--- a/upload/themes/default/modules/restore/body.mail.html
+++ b/upload/themes/default/modules/restore/body.mail.html
@@ -1,9 +1,9 @@
-<p>Здравствуйте.</p>
+<p><?php echo $this->lng_m['msg1']; ?></p>
 <br>
-<p>Была совершена попытка восстановления пароля для сайта "<b><?php echo $data['SITENAME']; ?></b>" (<a href="<?php echo $data['SITEURL']; ?>" target="_blank" title="Ссылка откроется в новой вкладке"><?php echo $data['SITEURL']; ?></a>)</p>
-<p>Для продолжения, перейдите по ссылке ниже и введите новый пароль</p>
-<p><a href="<?php echo $data['LINK']; ?>" target="_blank" title="Ссылка откроется в новой вкладке"><?php echo $data['LINK']; ?></a></p>
+<p><?php echo $this->lng_m['msg2']; ?> "<b><?php echo $data['SITENAME']; ?></b>" (<a href="<?php echo $data['SITEURL']; ?>" target="_blank" title="<?php echo $this->lng['target_blank']; ?>"><?php echo $data['SITEURL']; ?></a>)</p>
+<p><?php echo $this->lng_m['msg3']; ?></p>
+<p><a href="<?php echo $data['LINK']; ?>" target="_blank" title="<?php echo $this->lng['target_blank']; ?>"><?php echo $data['LINK']; ?></a></p>
 <br>
-<p>Если это были не вы, то проигнорируйте данное сообщение.</p>
+<p><?php echo $this->lng_m['msg4']; ?></p>
 <br><br>
-<p>С уважением, администрация сайта "<b><?php echo $data['SITENAME']; ?></b>" (<a href="<?php echo $data['SITEURL']; ?>" target="_blank" title="Ссылка откроется в новой вкладке"><?php echo $data['SITEURL']; ?></a>)</p>
\ No newline at end of file
+<p><?php echo $this->lng_m['msg4']; ?> "<b><?php echo $data['SITENAME']; ?></b>" (<a href="<?php echo $data['SITEURL']; ?>" target="_blank" title="<?php echo $this->lng['target_blank']; ?>"><?php echo $data['SITEURL']; ?></a>)</p>
\ No newline at end of file
diff --git a/upload/themes/default/modules/restore/main.html b/upload/themes/default/modules/restore/main.html
index 4487362..a178f88 100644
--- a/upload/themes/default/modules/restore/main.html
+++ b/upload/themes/default/modules/restore/main.html
@@ -1,20 +1,20 @@
 <div class="form-block">
-	<div class="block-header"><?php echo $this->lng['b_restore']; ?></div>
+	<div class="block-header"><?php echo $this->lng_m['mod_name']; ?></div>
 	<div class="block-line"></div>
 
 	<div class="mcr-restore">
 		<form class="form-horizontal" method="post">
 
 			<div class="control-group">
-				<label class="control-label" for="inputEmail"><?php echo $this->lng['reg_email']; ?></label>
+				<label class="control-label" for="inputEmail"><?php echo $this->lng['email']; ?></label>
 				<div class="controls">
-					<input type="text" name="email" class="span7" id="inputEmail" placeholder="<?php echo $this->lng['reg_email']; ?>" required>
+					<input type="text" name="email" class="span7" id="inputEmail" placeholder="<?php echo $this->lng['email']; ?>" required>
 				</div>
 			</div>
 
 			<div class="control-group">
 				<div class="controls">
-					<button type="submit" name="submit" class="btn"><?php echo $this->lng['btn_restore']; ?></button>
+					<button type="submit" name="submit" class="btn"><?php echo $this->lng_m['btn_restore']; ?></button>
 				</div>
 			</div>
 		</form>
diff --git a/upload/themes/default/modules/restore/newpass.html b/upload/themes/default/modules/restore/newpass.html
index 919aebd..ecaccd7 100644
--- a/upload/themes/default/modules/restore/newpass.html
+++ b/upload/themes/default/modules/restore/newpass.html
@@ -1,20 +1,20 @@
 <div class="form-block">
-	<div class="block-header"><?php echo $this->lng['b_restore']; ?></div>
+	<div class="block-header"><?php echo $this->lng_m['mod_name']; ?></div>
 	<div class="block-line"></div>
 
 	<div class="mcr-restore">
 		<form class="form-horizontal" method="post">
 
 			<div class="control-group">
-				<label class="control-label" for="inputPass"><?php echo $this->lng['int_newpass']; ?></label>
+				<label class="control-label" for="inputPass"><?php echo $this->lng_m['newpass']; ?></label>
 				<div class="controls">
-					<input type="text" name="newpass" class="span7" id="inputPass" placeholder="<?php echo $this->lng['int_newpass']; ?>" required>
+					<input type="text" name="newpass" class="span7" id="inputPass" placeholder="<?php echo $this->lng_m['newpass']; ?>" required>
 				</div>
 			</div>
 
 			<div class="control-group">
 				<div class="controls">
-					<button type="submit" name="submit" class="btn"><?php echo $this->lng['btn_edit']; ?></button>
+					<button type="submit" name="submit" class="btn"><?php echo $this->lng_m['btn_edit']; ?></button>
 				</div>
 			</div>
 		</form>
diff --git a/upload/themes/default/modules/search/comments/comment-id.html b/upload/themes/default/modules/search/comments/comment-id.html
index 435abba..550de8a 100644
--- a/upload/themes/default/modules/search/comments/comment-id.html
+++ b/upload/themes/default/modules/search/comments/comment-id.html
@@ -3,5 +3,5 @@
 		<a href="<?php echo BASE_URL; ?>?mode=news&id=<?php echo $data['NID']; ?>"><?php echo $data['TITLE']; ?></a>
 	</div>
 	<?php echo $data['TEXT']; ?>
-	<div class="subinfo">Добавлено: <?php echo $data['TIME_CREATE']; ?> пользователем <a href="#"><?php echo $data['LOGIN']; ?></a></div>
+	<div class="subinfo"><?php echo $this->lng_m['added']; ?>: <?php echo $data['TIME_CREATE']; ?> <?php echo $this->lng_m['user']; ?> <a href="#"><?php echo $data['LOGIN']; ?></a></div>
 </div>
\ No newline at end of file
diff --git a/upload/themes/default/modules/search/comments/comment-list.html b/upload/themes/default/modules/search/comments/comment-list.html
index b92545d..c3fb246 100644
--- a/upload/themes/default/modules/search/comments/comment-list.html
+++ b/upload/themes/default/modules/search/comments/comment-list.html
@@ -1,5 +1,5 @@
 <div class="search-block">
-	<div class="search-query">По запросу "<?php echo $data['QUERY']; ?>" найдено результатов: <?php echo $data['QUERY_COUNT']; ?></div>
+	<div class="search-query"><?php echo $this->lng_m['msg_res1']; ?> "<?php echo $data['QUERY']; ?>" <?php echo $this->lng_m['msg_res2']; ?>: <?php echo $data['QUERY_COUNT']; ?></div>
 	<?php echo $data['RESULT']; ?>
 </div>
 
diff --git a/upload/themes/default/modules/search/comments/comment-none.html b/upload/themes/default/modules/search/comments/comment-none.html
index 82cd399..39d72b8 100644
--- a/upload/themes/default/modules/search/comments/comment-none.html
+++ b/upload/themes/default/modules/search/comments/comment-none.html
@@ -1 +1 @@
-Ничего не найдено, отвечаю
\ No newline at end of file
+<?php echo $this->lng_m['empty_result']; ?>
\ No newline at end of file
diff --git a/upload/themes/default/modules/search/main.html b/upload/themes/default/modules/search/main.html
index a9e887f..7d0c2da 100644
--- a/upload/themes/default/modules/search/main.html
+++ b/upload/themes/default/modules/search/main.html
@@ -1,5 +1,5 @@
 <div class="form-block">
-	<div class="block-header">Результаты поиска</div>
+	<div class="block-header"><?php echo $this->lng_m['search_results']; ?></div>
 	<div class="block-line"></div>
 
 	<div class="mcr-search">
diff --git a/upload/themes/default/modules/search/news/news-list.html b/upload/themes/default/modules/search/news/news-list.html
index b92545d..c3fb246 100644
--- a/upload/themes/default/modules/search/news/news-list.html
+++ b/upload/themes/default/modules/search/news/news-list.html
@@ -1,5 +1,5 @@
 <div class="search-block">
-	<div class="search-query">По запросу "<?php echo $data['QUERY']; ?>" найдено результатов: <?php echo $data['QUERY_COUNT']; ?></div>
+	<div class="search-query"><?php echo $this->lng_m['msg_res1']; ?> "<?php echo $data['QUERY']; ?>" <?php echo $this->lng_m['msg_res2']; ?>: <?php echo $data['QUERY_COUNT']; ?></div>
 	<?php echo $data['RESULT']; ?>
 </div>
 
diff --git a/upload/themes/default/modules/search/news/news-none.html b/upload/themes/default/modules/search/news/news-none.html
index 82cd399..ee6d000 100644
--- a/upload/themes/default/modules/search/news/news-none.html
+++ b/upload/themes/default/modules/search/news/news-none.html
@@ -1 +1 @@
-Ничего не найдено, отвечаю
\ No newline at end of file
+<?php echo $this->lng['empty_result']; ?>
\ No newline at end of file
diff --git a/upload/themes/default/modules/statics/static-id.html b/upload/themes/default/modules/statics/static-id.html
index b53f273..0b038c6 100644
--- a/upload/themes/default/modules/statics/static-id.html
+++ b/upload/themes/default/modules/statics/static-id.html
@@ -13,9 +13,9 @@
 	<div class="block-line"></div>
 
 	<div class="block-footer">
-		<div class="date" rel="tooltip" title="Дата создания"><?php echo date("d.m.Y", $data['DATA']['time_create']); ?></div>
-		<div class="time" rel="tooltip" title="Время создания"><?php echo date("H:i", $data['DATA']['time_create']); ?></div>
-		<div class="readmore"><a href="<?php echo BASE_URL; ?>">На главную</a></div>
+		<div class="date" rel="tooltip" title="<?php echo $this->lng['date_create']; ?>"><?php echo date("d.m.Y", $data['DATA']['time_create']); ?></div>
+		<div class="time" rel="tooltip" title="<?php echo $this->lng['time_create']; ?>"><?php echo date("H:i", $data['DATA']['time_create']); ?></div>
+		<div class="readmore"><a href="<?php echo BASE_URL; ?>"><?php echo $this->lng['go_home']; ?></a></div>
 	</div>
 
 </div>
\ No newline at end of file
diff --git a/upload/uploads/cloaks/admin.png b/upload/uploads/cloaks/admin.png
deleted file mode 100644
index 874d773..0000000
--- a/upload/uploads/cloaks/admin.png
+++ /dev/null
Binary files differ
diff --git a/upload/uploads/panel-icons/logs.png b/upload/uploads/panel-icons/logs.png
new file mode 100644
index 0000000..4625427
--- /dev/null
+++ b/upload/uploads/panel-icons/logs.png
Binary files differ
diff --git a/upload/uploads/panel-icons/network.png b/upload/uploads/panel-icons/network.png
new file mode 100644
index 0000000..15441ee
--- /dev/null
+++ b/upload/uploads/panel-icons/network.png
Binary files differ
diff --git a/upload/uploads/skins/.default.png b/upload/uploads/skins/.default.png
deleted file mode 100644
index d02b718..0000000
--- a/upload/uploads/skins/.default.png
+++ /dev/null
Binary files differ
diff --git a/upload/uploads/skins/.default_female.png b/upload/uploads/skins/.default_female.png
deleted file mode 100644
index 1104044..0000000
--- a/upload/uploads/skins/.default_female.png
+++ /dev/null
Binary files differ
diff --git a/upload/uploads/skins/default.png b/upload/uploads/skins/default.png
new file mode 100644
index 0000000..d02b718
--- /dev/null
+++ b/upload/uploads/skins/default.png
Binary files differ
diff --git a/upload/uploads/skins/default_female.png b/upload/uploads/skins/default_female.png
new file mode 100644
index 0000000..1104044
--- /dev/null
+++ b/upload/uploads/skins/default_female.png
Binary files differ
diff --git a/upload/uploads/skins/interface/.default.png b/upload/uploads/skins/interface/.default.png
deleted file mode 100644
index 53c20e8..0000000
--- a/upload/uploads/skins/interface/.default.png
+++ /dev/null
Binary files differ
diff --git a/upload/uploads/skins/interface/.default_female.png b/upload/uploads/skins/interface/.default_female.png
deleted file mode 100644
index 33e18d6..0000000
--- a/upload/uploads/skins/interface/.default_female.png
+++ /dev/null
Binary files differ
diff --git a/upload/uploads/skins/interface/.default_mini.png b/upload/uploads/skins/interface/.default_mini.png
deleted file mode 100644
index a42ea26..0000000
--- a/upload/uploads/skins/interface/.default_mini.png
+++ /dev/null
Binary files differ
diff --git a/upload/uploads/skins/interface/.default_mini_female.png b/upload/uploads/skins/interface/.default_mini_female.png
deleted file mode 100644
index 84c3f75..0000000
--- a/upload/uploads/skins/interface/.default_mini_female.png
+++ /dev/null
Binary files differ
diff --git a/upload/uploads/skins/interface/admin.png b/upload/uploads/skins/interface/admin.png
deleted file mode 100644
index 169c861..0000000
--- a/upload/uploads/skins/interface/admin.png
+++ /dev/null
Binary files differ
diff --git a/upload/uploads/skins/interface/admin_mini.png b/upload/uploads/skins/interface/admin_mini.png
deleted file mode 100644
index a42ea26..0000000
--- a/upload/uploads/skins/interface/admin_mini.png
+++ /dev/null
Binary files differ
diff --git a/upload/uploads/skins/interface/default.png b/upload/uploads/skins/interface/default.png
new file mode 100644
index 0000000..53c20e8
--- /dev/null
+++ b/upload/uploads/skins/interface/default.png
Binary files differ
diff --git a/upload/uploads/skins/interface/default_female.png b/upload/uploads/skins/interface/default_female.png
new file mode 100644
index 0000000..33e18d6
--- /dev/null
+++ b/upload/uploads/skins/interface/default_female.png
Binary files differ
diff --git a/upload/uploads/skins/interface/default_mini.png b/upload/uploads/skins/interface/default_mini.png
new file mode 100644
index 0000000..a42ea26
--- /dev/null
+++ b/upload/uploads/skins/interface/default_mini.png
Binary files differ
diff --git a/upload/uploads/skins/interface/default_mini_female.png b/upload/uploads/skins/interface/default_mini_female.png
new file mode 100644
index 0000000..84c3f75
--- /dev/null
+++ b/upload/uploads/skins/interface/default_mini_female.png
Binary files differ