Update Version 0.0.14

2015-04-03 22:34:08 +02:00
parent 03a6714556
commit 306c02bca5
15 changed files with 87 additions and 114 deletions
--- a/acp/acp_mchat_module.php
+++ b/acp/acp_mchat_module.php
@@ -55,7 +55,7 @@ class acp_mchat_module

 	public function main($id, $mode)
 	{
-		global $config, $db, $cache, $request, $template, $user, $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix;
+		global $config, $db, $cache, $request, $template, $user, $phpbb_root_path, $phpbb_admin_path, $phpEx, $table_prefix, $phpbb_log;
 		global $phpbb_container;

 		$this->functions_mchat = $phpbb_container->get('dmzx.mchat.functions_mchat');
@@ -175,7 +175,7 @@ class acp_mchat_module
 				$config->set('mchat_message_top', $request->variable('mchat_message_top', 0));

 				// and an entry into the log table
-				add_log('admin', 'LOG_MCHAT_CONFIG_UPDATE');
+				$phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_MCHAT_CONFIG_UPDATE');

 				// purge the cache
 				$this->cache->destroy('_mchat_config');
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
 	"type": "phpbb-extension",
 	"description": "mChat Extension for phpbb 3.1.x",
 	"homepage": "http://www.dmzx-web.net",
-	"version": "0.0.13",
+	"version": "0.0.14",
 	"time": "2015-03-10",
 	"keywords": ["phpbb", "extension", "mchat"],
 	"license": "GPL-2.0",
--- a/config/services.yml
+++ b/config/services.yml
@@ -12,6 +12,7 @@ services:
            - @config
            - @controller.helper
            - @template
+            - @log
            - @user
            - @auth
            - @dbal.conn
@@ -26,6 +27,7 @@ services:
            - @template
            - @user
            - @auth
+            - @log
            - @dbal.conn
            - @cache
            - %core.table_prefix%
--- a/core/functions_mchat.php
+++ b/core/functions_mchat.php
@@ -51,14 +51,14 @@ class functions_mchat
 	 * @param \phpbb\cache\service				$cache
 	 * @param									$table_prefix
 	 */
-	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db, \phpbb\cache\service $cache, $table_prefix)
+	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\auth\auth $auth, \phpbb\log\log_interface $log, \phpbb\db\driver\driver_interface $db, \phpbb\cache\service $cache, $table_prefix)
 	{
 		$this->template = $template;
 		$this->user = $user;
 		$this->auth = $auth;
 		$this->db = $db;
 		$this->cache = $cache;
-
+		$this->phpbb_log = $log;
 		$this->table_prefix = $table_prefix;
 	}

@@ -293,7 +293,8 @@ class functions_mchat
 			WHERE message_id < ' . (int) $delete_id;
 			$this->db->sql_query($sql);

-			add_log('admin', 'LOG_MCHAT_TABLE_PRUNED');
+			$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_MCHAT_TABLE_PRUNED');
+
 		}
 		// free up some memory...variable(s) are no longer needed.
 		unset($mchat_total_messages);
--- a/core/render_helper.php
+++ b/core/render_helper.php
@@ -58,7 +58,7 @@ class render_helper
 	 * @param									$phpEx
 	 * @param									$table_prefix
 	 */
-	public function __construct(\dmzx\mchat\core\functions_mchat $functions_mchat, \phpbb\config\config $config, \phpbb\controller\helper $helper, \phpbb\template\template $template, \phpbb\user $user, \phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db, \phpbb\cache\service $cache, \phpbb\request\request $request, $phpbb_root_path, $phpEx, $table_prefix)
+	public function __construct(\dmzx\mchat\core\functions_mchat $functions_mchat, \phpbb\config\config $config, \phpbb\controller\helper $helper, \phpbb\template\template $template, \phpbb\log\log_interface $log, \phpbb\user $user, \phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db, \phpbb\cache\service $cache, \phpbb\request\request $request, $phpbb_root_path, $phpEx, $table_prefix)
 	{
 		$this->functions_mchat = $functions_mchat;
 		$this->config = $config;
@@ -71,6 +71,7 @@ class render_helper
 		$this->request = $request;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->phpEx = $phpEx;
+		$this->phpbb_log = $log;
 		$this->table_prefix = $table_prefix;
 	}

@@ -91,12 +92,7 @@ class render_helper
 		//chat enabled
 		if (!$this->config['mchat_enable'])
 		{
-			// Return for: $this->helper->error(error_text, error_type);
-			return array(
-				'error'			=> true,
-				'error_type'	=> E_USER_NOTICE,
-				'error_text'	=> $this->user->lang['MCHAT_ENABLE'],
-			);
+		   trigger_error($user->lang['MCHAT_ENABLE'], E_USER_NOTICE);
 		}

 		//  avatars
@@ -129,7 +125,7 @@ class render_helper

 		// needed variables
 		// Request options.
-		$mchat_mode	= request_var('mode', '');
+		$mchat_mode	= $this->request->variable('mode', '');
 		$mchat_read_mode = $mchat_archive_mode = $mchat_custom_page = $mchat_no_message = false;
 		// set redirect if on index or custom page
 		$on_page = $include_on_index ? 'index' : 'mchat';
@@ -181,12 +177,7 @@ class render_helper
 				else
 				{
 					// Show no rules
-					// Return for: \$this->helper->error(error_text, error_type);
-					return array(
-						'error'			=> true,
-						'error_type'	=> E_USER_NOTICE,
-						'error_text'	=> 'NO_MCHAT_RULES',
-					);
+					trigger_error('MCHAT_NO_RULES', E_USER_NOTICE);
 				}

 				break;
@@ -202,7 +193,7 @@ class render_helper
 						include($this->phpbb_root_path . 'includes/functions_user.' . $this->phpEx);
 					}

-					$this->user_ip = request_var('ip', '');
+					$this->user_ip = $this->request->variable('ip', '');

 					$this->template->assign_var('WHOIS', user_ipwhois($this->user_ip));

@@ -216,12 +207,7 @@ class render_helper
 				else
 				{
 					// Show not authorized
-					// Return for: \$this->helper->error(error_text, error_type);
-					return array(
-						'error'			=> true,
-						'error_type'	=> E_USER_NOTICE,
-						'error_text'	=> 'NO_AUTH_OPERATION',
-					);
+					trigger_error('NO_AUTH_OPERATION', E_USER_NOTICE);
 				}
 				break;
 			// Clean function...
@@ -238,16 +224,11 @@ class render_helper
 					else if (!$mchat_founder)
 					{
 						// Show not authorized
-						// Return for: \$this->helper->error(error_text, error_type);
-						return array(
-							'error'			=> true,
-							'error_type'	=> E_USER_NOTICE,
-							'error_text'	=> 'NO_AUTH_OPERATION',
-						);
+						trigger_error('NO_AUTH_OPERATION', E_USER_NOTICE);
 					}
 				}

-				$mchat_redirect = request_var('redirect', '');
+				$mchat_redirect = $this->request->variable('redirect', '');
 				$mchat_redirect = ($mchat_redirect == 'index') ? append_sid("{$this->phpbb_root_path}index.{$this->phpEx}") : $this->helper->route('dmzx_mchat_controller', array('#mChat'));

 				if(confirm_box(true))
@@ -257,19 +238,14 @@ class render_helper
 					$this->db->sql_query($sql);

 					meta_refresh(3, $mchat_redirect);
-					// Return for: \$this->helper->error(error_text, error_type);
-				//	return array(
-				//		'error'			=> true,
-				//		'error_type'	=> E_USER_NOTICE,
-				//		'error_text'	=> $this->user->lang['MCHAT_CLEANED'].'<br /><br />'.sprintf($this->user->lang['RETURN_PAGE'], '<a href="'.$mchat_redirect.'">', '</a>'),
-				//	);
+					trigger_error($this->user->lang['MCHAT_CLEANED']. '<br /><br />' . sprintf($this->user->lang['RETURN_PAGE'], '<a href="' . $mchat_redirect . '">', '</a>'));
 				}
 				else
 				{
 					// Display confirm box
 					confirm_box(false, $this->user->lang['MCHAT_DELALLMESS']);
 				}
-				add_log('admin', 'LOG_MCHAT_TABLE_PRUNED');
+				$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_MCHAT_TABLE_PRUNED');
 				redirect($mchat_redirect);
 				break;

@@ -282,12 +258,7 @@ class render_helper
 					$mchat_redirect = append_sid("{$this->phpbb_root_path}index.{$this->phpEx}");
 					// Redirect to previous page
 					meta_refresh(3, $mchat_redirect);
-					// Return for: \$this->helper->error(error_text, error_type);
-					return array(
-						'error'			=> true,
-						'error_type'	=> E_USER_NOTICE,
-						'error_text'	=> $this->user->lang['MCHAT_NOACCESS_ARCHIVE'].'<br /><br />'.sprintf($this->user->lang['RETURN_PAGE'], '<a href="' . $mchat_redirect . '">', '</a>'),
-					);
+					trigger_error($this->user->lang['MCHAT_NOACCESS_ARCHIVE']. '<br /><br />' . sprintf($this->user->lang['RETURN_PAGE'], '<a href="' . $mchat_redirect . '">', '</a>'));
 				}

 				if ($this->config['mchat_enable'] && $mchat_read_archive && $mchat_view)
@@ -304,7 +275,7 @@ class render_helper
 					}

 					// Reguest...
-					$mchat_archive_start = request_var('start', 0);
+					$mchat_archive_start = $this->request->variable('start', 0);
 					$sql_where = $this->user->data['user_mchat_topics'] ? '' : 'WHERE m.forum_id = 0';
 					// Message row
 					$sql = 'SELECT m.*, u.username, u.user_colour, u.user_avatar, u.user_avatar_type, u.user_avatar_width, u.user_avatar_height, u.user_allow_pm
@@ -408,7 +379,7 @@ class render_helper
 					$this->functions_mchat->mchat_sessions($mchat_session_time, true);
 				}
 				// Request
-				$mchat_message_last_id = request_var('message_last_id', 0);
+				$mchat_message_last_id = $this->request->variable('message_last_id', 0);
 				$sql_and = $this->user->data['user_mchat_topics'] ? '' : 'AND m.forum_id = 0';
 				$sql = 'SELECT m.*, u.username, u.user_colour, u.user_avatar, u.user_avatar_type, u.user_avatar_width, u.user_avatar_height, u.user_allow_pm
 					FROM ' . $this->table_prefix . \dmzx\mchat\core\functions_mchat::MCHAT_TABLE . ' m, ' . USERS_TABLE . ' u
@@ -540,7 +511,7 @@ class render_helper
 				}

 				// Reguest...
-				$message = utf8_ucfirst(utf8_normalize_nfc(request_var('message', '', true)));
+				$message = utf8_ucfirst(utf8_normalize_nfc($this->request->variable('message', '', true)));

 				// must have something other than bbcode in the message
 				if (empty($mchatregex))
@@ -656,7 +627,7 @@ class render_helper
 			// Edit function...
 			case 'edit':

-				$message_id = request_var('message_id', 0);
+				$message_id = $this->request->variable('message_id', 0);

 				// If mChat disabled and not edit
 				if (!$this->config['mchat_enable'] || !$message_id)
@@ -682,7 +653,7 @@ class render_helper
 					throw new \phpbb\exception\http_exception(403, 'MCHAT_ERROR_FORBIDDEN');
 				}
 				// Reguest...
-				$message = request_var('message', '', true);
+				$message = $this->request->variable('message', '', true);

 				// must have something other than bbcode in the message
 				if (empty($mchatregex))
@@ -800,8 +771,9 @@ class render_helper
 					unset($old_cfg['max_post_smilies']);
 				}
 				//adds a log
-				$message_author = get_username_string('no_profile', $row['user_id'], $row['username'], $row['user_colour'], $this->user->lang['GUEST']);
-				add_log('admin', 'LOG_EDITED_MCHAT', $message_author);
+			//	$message_author = get_username_string('no_profile', $row['user_id'], $row['username'], $row['user_colour'], $this->user->lang['GUEST']);
+			//	add_log('admin', 'LOG_EDITED_MCHAT', $message_author);
+				$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_EDITED_MCHAT', false, array($row['username']));
 				// insert user into the mChat sessions table
 				$this->functions_mchat->mchat_sessions($mchat_session_time, true);
 				// If read mode request set true
@@ -812,7 +784,7 @@ class render_helper
 			// Delete function...
 			case 'delete':

-				$message_id = request_var('message_id', 0);
+				$message_id = $this->request->variable('message_id', 0);
 				// If mChat disabled
 				if (!$this->config['mchat_enable'] || !$message_id)
 				{
@@ -843,8 +815,9 @@ class render_helper
 					WHERE message_id = ' . (int) $message_id;
 				$this->db->sql_query($sql);
 				//adds a log
-				$message_author = get_username_string('no_profile', $row['user_id'], $row['username'], $row['user_colour'], $this->user->lang['GUEST']);
-				add_log('admin', 'LOG_DELETED_MCHAT', $message_author);
+			//	$message_author = get_username_string('no_profile', $row['user_id'], $row['username'], $row['user_colour'], $this->user->lang['GUEST']);
+			//	add_log('admin', 'LOG_DELETED_MCHAT', $message_author);
+				$this->phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_DELETED_MCHAT', false, array($row['username']));
 				// insert user into the mChat sessions table
 				$this->functions_mchat->mchat_sessions($mchat_session_time, true);

@@ -878,23 +851,13 @@ class render_helper
 						$mchat_redirect = append_sid("{$this->phpbb_root_path}index.{$this->phpEx}");
 						// Redirect to previous page
 						meta_refresh(3, $mchat_redirect);
-						// Return for: \$this->helper->error(error_text, error_type);
-						return array(
-							'error'			=> true,
-							'error_type'	=> E_USER_NOTICE,
-							'error_text'	=> $this->user->lang['MCHAT_NO_CUSTOM_PAGE'].'<br /><br />'.sprintf($this->user->lang['RETURN_PAGE'], '<a href="' . $mchat_redirect . '">', '</a>'),
-						);
+						trigger_error($this->user->lang['MCHAT_NO_CUSTOM_PAGE']. '<br /><br />' . sprintf($this->user->lang['RETURN_PAGE'], '<a href="' . $mchat_redirect . '">', '</a>'));
 					}

 					// user has permissions to view the custom chat?
 					if (!$mchat_view && $mchat_custom_page)
 					{
-						// Return for: \$this->helper->error(error_text, error_type);
-						return array(
-							'error'			=> true,
-							'error_type'	=> E_USER_NOTICE,
-							'error_text'	=> $this->user->lang['NOT_AUTHORISED'],
-						);
+					  trigger_error($user->lang['NOT_AUTHORISED'], E_USER_NOTICE);
 					}

 					// if whois true
--- a/language/de/common.php
+++ b/language/de/common.php
@@ -70,6 +70,7 @@ $lang = array_merge($lang, array(
 	'MCHAT_MINUTES'				=> 'Minuten ',
 	'MCHAT_MESS_LONG'			=> 'Deine Nachricht ist zu lang.\nBitte kürze deine Nachricht auf %s Zeichen',
 	'MCHAT_NO_CUSTOM_PAGE'		=> 'Die separate Seite für mChat ist derzeit nicht aktiviert!',
+	'MCHAT_NO_RULES'			=> 'The mChat rules page is not activated at this time!',
 	'MCHAT_NOACCESS'			=> 'Du hast keine Berechtigung im mChat zu schreiben',
 	'MCHAT_NOACCESS_ARCHIVE'	=> 'Du hast keine Berechtigung das Archiv zu sehen',
 	'MCHAT_NOJAVASCRIPT'		=> 'Dein Browser unterstützt kein Javascript oder Javascript ist deaktiviert',
--- a/language/en/common.php
+++ b/language/en/common.php
@@ -70,6 +70,7 @@ $lang = array_merge($lang, array(
 	'MCHAT_MINUTES'				=> 'minutes ',
 	'MCHAT_MESS_LONG'			=> 'Your message is too long.\nPlease limit it to %s characters',
 	'MCHAT_NO_CUSTOM_PAGE'		=> 'The mChat custom page is not activated at this time!',
+	'MCHAT_NO_RULES'			=> 'The mChat rules page is not activated at this time!',
 	'MCHAT_NOACCESS'			=> 'You don’t have permission to post in the mChat',
 	'MCHAT_NOACCESS_ARCHIVE'	=> 'You don’t have permission to view the archive',
 	'MCHAT_NOJAVASCRIPT'		=> 'Your browser does not support JavaScript or JavaScript is disabled',
--- a/language/es/common.php
+++ b/language/es/common.php
@@ -71,6 +71,7 @@ $lang = array_merge($lang, array(
 	'MCHAT_MESS_LONG'			=> 'Su mensaje es demasiado largo.\nPor favor, el limite está en %s caracteres',
 	'MCHAT_NO_CUSTOM_PAGE'		=> '¡La página personalizada de mChat no está activada en este momento!',
 	'MCHAT_NOACCESS'			=> 'No tiene permisos para enviar mensajes al mChat',
+	'MCHAT_NO_RULES'			=> 'The mChat rules page is not activated at this time!',
 	'MCHAT_NOACCESS_ARCHIVE'	=> 'No tiene permisos para ver el archivo',
 	'MCHAT_NOJAVASCRIPT'		=> 'Su navegador no soporta JavaScript o JavaScript esta desactivado',
 	'MCHAT_NOMESSAGE'			=> 'No hay mensajes',
--- a/language/fr/common.php
+++ b/language/fr/common.php
@@ -70,6 +70,7 @@ $lang = array_merge($lang, array(
 	'MCHAT_MINUTES'				=> 'minutes ',
 	'MCHAT_MESS_LONG'			=> 'Votre message est trop long.\nLimité à %s caractères',
 	'MCHAT_NO_CUSTOM_PAGE'		=> 'La page personnalisée du mChat n’est pas activée en ce moment!',
+	'MCHAT_NO_RULES'			=> 'The mChat rules page is not activated at this time!',
 	'MCHAT_NOACCESS'			=> 'Vous n’avez pas les permissions pour poster dans le mini-chat.',
 	'MCHAT_NOACCESS_ARCHIVE'	=> 'Vous n’avez pas les permissions pour voir les archives.',
 	'MCHAT_NOJAVASCRIPT'		=> 'Votre navigateur ne supporte pas JavaScript ou JavaScript est désactivé.',
--- a/language/it/common.php
+++ b/language/it/common.php
@@ -70,6 +70,7 @@ $lang = array_merge($lang, array(
 	'MCHAT_MINUTES'				=> 'minuti ',
 	'MCHAT_MESS_LONG'			=> 'Il tuo messaggio è troppo lungo.\n Perfavore limita a %s caratteri',
 	'MCHAT_NO_CUSTOM_PAGE'		=> 'La pagina mChat personalizzata non si attiva in questo momento!',
+	'MCHAT_NO_RULES'			=> 'The mChat rules page is not activated at this time!',
 	'MCHAT_NOACCESS'			=> 'Non hai il permesso di postare in mChat',
 	'MCHAT_NOACCESS_ARCHIVE'	=> 'Non hai il permesso di visualizzare questo archivio',
 	'MCHAT_NOJAVASCRIPT'		=> 'Il tuo browser non supporta JavaScript oppure JavaScript è disabilitato',
--- a/language/nl/common.php
+++ b/language/nl/common.php
@@ -70,6 +70,7 @@ $lang = array_merge($lang, array(
 	'MCHAT_MINUTES'				=> 'minuten ',
 	'MCHAT_MESS_LONG'			=> 'Jou bericht is te lang.Beperk dit a.u.b. tot %s karakters',
 	'MCHAT_NO_CUSTOM_PAGE'		=> 'De gebruikte mChat pagina is niet actief op dit moment!',
+	'MCHAT_NO_RULES'			=> 'The mChat rules page is not activated at this time!',
 	'MCHAT_NOACCESS'			=> 'Je hebt geen permissie om een bericht in mChat te plaatsen',
 	'MCHAT_NOACCESS_ARCHIVE'	=> 'Je hebt geen permissie om het archief te bekijken',
 	'MCHAT_NOJAVASCRIPT'		=> 'Je browser ondersteunt geen JavaScript of JavaScript is uitgeschakeld',
--- a/language/pl/common.php
+++ b/language/pl/common.php
@@ -70,6 +70,7 @@ $lang = array_merge($lang, array(
 	'MCHAT_MINUTES'				=> 'minut ',
 	'MCHAT_MESS_LONG'			=> 'Twoja wiadomość jest za długa.\Proszę ogranicz ją do %s znaków',
 	'MCHAT_NO_CUSTOM_PAGE'		=> 'mChat w osobnym oknie jest aktualnie niedostępny!',
+	'MCHAT_NO_RULES'			=> 'The mChat rules page is not activated at this time!',
 	'MCHAT_NOACCESS'			=> 'Nie masz uprawnień do postowania na mChat',
 	'MCHAT_NOACCESS_ARCHIVE'	=> 'Nie masz uprawnień do przeglądania archiwum',
 	'MCHAT_NOJAVASCRIPT'		=> 'Twoja przeglądarka nie wspiera JavaScript albo JavaScript jest wyłączona',
--- a/migrations/mchat_schema.php
+++ b/migrations/mchat_schema.php
@@ -25,7 +25,7 @@ class mchat_schema extends \phpbb\db\migration\migration
 			array('config.add', array('mchat_new_posts_quote', false)),
 			array('config.add', array('mchat_message_top', true)),
 			array('config.add', array('mchat_stats_index', false)),
-			array('config.add', array('mchat_version','0.0.13')),
+			array('config.add', array('mchat_version','0.0.14')),

 			array('permission.add', array('u_mchat_use')),
 			array('permission.add', array('u_mchat_view')),
--- a/styles/prosilver/template/mchat_avatars.html
+++ b/styles/prosilver/template/mchat_avatars.html
@@ -4,7 +4,7 @@
 						</div>
 						<div>
 							<span style="float:left;"><!-- IF not MCHAT_ARCHIVE_MODE and MCHAT_ADD_MESSAGE --><!-- IF MCHAT_ALLOW_BBCODES --><!-- IF mchatrow.MCHAT_USERNAME_COLOR --><a class="mChatScriptLink" href="#" onclick="insert_text('&#64;&nbsp;[b][color={mchatrow.MCHAT_USERNAME_COLOR}]{mchatrow.MCHAT_USERNAME}[/color][/b], ', false);return false;" title="{L_MCHAT_RESPOND}"><span style="color: {mchatrow.MCHAT_USERNAME_COLOR}"><strong>&#64;</strong></span></a><!-- ELSE --> <a href="#" class="mChatScriptLink" onclick="insert_text('&#64;&nbsp;[b]{mchatrow.MCHAT_USERNAME}[/b], ', false);return false;" title="{L_MCHAT_RESPOND}"><strong>&#64;</strong></a><!-- ENDIF --><!-- ELSE --> <a href="#" class="mChatScriptLink" onclick="insert_text('&#64;&nbsp;{mchatrow.MCHAT_USERNAME}, ', false);return false;" title="{L_MCHAT_RESPOND}">&#64;</a><!-- ENDIF -->&nbsp;<!-- ENDIF -->{mchatrow.MCHAT_USERNAME_FULL} - {mchatrow.MCHAT_TIME}</span>
-							<span style="float:right;"><!-- IF mchatrow.U_USER_ID and mchatrow.BOT_USER_ID and MCHAT_ALLOW_PM --><a href="{mchatrow.U_USER_ID}" title="{L_MCHAT_SEND_PM}" return false;"><img src="{BOARD_URL}ext/dmzx/mchat/styles/prosilver/theme/images/message.gif" alt="{L_MCHAT_SEND_PM}" title="{L_MCHAT_SEND_PM}" class="mChatImage" /></a>&nbsp;<!-- ENDIF --><!-- IF mchatrow.U_USER_IDS and MCHAT_ALLOW_LIKE --><a href="#" onclick="insert_like('{mchatrow.MCHAT_USERNAME}','{mchatrow.MCHAT_MESSAGE_EDIT}'); return false;"><img src="{BOARD_URL}ext/dmzx/mchat/styles/prosilver/theme/images/like.png" alt="{L_REPLY_WITH_LIKE}" title="{L_REPLY_WITH_LIKE}" class="mChatImage" /></a><!-- ENDIF --> &nbsp;<!-- IF mchatrow.U_USER_IDS and MCHAT_ALLOW_QUOTE --><a href="#" onclick="insert_quote('{mchatrow.MCHAT_USERNAME}','{mchatrow.MCHAT_MESSAGE_EDIT}'); return false;"><img src="{BOARD_URL}ext/dmzx/mchat/styles/prosilver/theme/images/quota.png" alt="{L_REPLY_WITH_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="mChatImage" /></a><!-- ENDIF -->&nbsp;<!-- IF MCHAT_ALLOW_IP --><a href="{mchatrow.MCHAT_U_WHOIS}" onclick="popup(this.href, 750, 500); return false;"><img src="{BOARD_URL}ext/dmzx/mchat/styles/prosilver/theme/images/ip.gif" alt="{L_MCHAT_IP} {mchatrow.MCHAT_USER_IP}" title="{L_MCHAT_IP} {mchatrow.MCHAT_USER_IP}" class="mChatImage" /></a><!-- ENDIF --><!-- IF mchatrow.MCHAT_ALLOW_BAN --> <a href="{mchatrow.MCHAT_U_BAN}"><img src="{BOARD_URL}ext/dmzx/mchat/styles/prosilver/theme/images/ban.gif" alt="{L_MCHAT_PERMISSIONS}" title="{L_MCHAT_PERMISSIONS}" class="mChatImage" /></a><!-- ENDIF --><!-- IF mchatrow.MCHAT_ALLOW_EDIT --> <a href="#" onclick="mChat.edit('{mchatrow.MCHAT_MESSAGE_ID}');return false;"><img src="{BOARD_URL}ext/dmzx/mchat/styles/prosilver/theme/images/edit.gif" alt="{L_MCHAT_EDIT}" title="{L_MCHAT_EDIT}" class="mChatImage" /></a><!-- ENDIF --><input type="hidden" id="edit{mchatrow.MCHAT_MESSAGE_ID}" value="{mchatrow.MCHAT_MESSAGE_EDIT}" /><!-- IF mchatrow.MCHAT_ALLOW_DEL --> <a href="#" onclick="mChat.del('{mchatrow.MCHAT_MESSAGE_ID}');return false;"><img src="{BOARD_URL}ext/dmzx/mchat/styles/prosilver/theme/images/del.gif" alt="{L_MCHAT_DELITE}" title="{L_MCHAT_DELITE}" class="mChatImage" /></a><!-- ENDIF --></span><br /><div class="avatarMessage mChatMessage">{mchatrow.MCHAT_MESSAGE}</div>
+							<span style="float:right;"><!-- IF mchatrow.U_USER_ID and mchatrow.BOT_USER_ID and MCHAT_ALLOW_PM and not MCHAT_ARCHIVE_MODE --><a href="{mchatrow.U_USER_ID}" title="{L_MCHAT_SEND_PM}" return false;"><img src="{BOARD_URL}ext/dmzx/mchat/styles/prosilver/theme/images/message.gif" alt="{L_MCHAT_SEND_PM}" title="{L_MCHAT_SEND_PM}" class="mChatImage" /></a>&nbsp;<!-- ENDIF --><!-- IF mchatrow.U_USER_IDS and MCHAT_ALLOW_LIKE and not MCHAT_ARCHIVE_MODE --><a href="#" onclick="insert_like('{mchatrow.MCHAT_USERNAME}','{mchatrow.MCHAT_MESSAGE_EDIT}'); return false;"><img src="{BOARD_URL}ext/dmzx/mchat/styles/prosilver/theme/images/like.png" alt="{L_REPLY_WITH_LIKE}" title="{L_REPLY_WITH_LIKE}" class="mChatImage" /></a><!-- ENDIF --> &nbsp;<!-- IF mchatrow.U_USER_IDS and MCHAT_ALLOW_QUOTE and not MCHAT_ARCHIVE_MODE --><a href="#" onclick="insert_quote('{mchatrow.MCHAT_USERNAME}','{mchatrow.MCHAT_MESSAGE_EDIT}'); return false;"><img src="{BOARD_URL}ext/dmzx/mchat/styles/prosilver/theme/images/quota.png" alt="{L_REPLY_WITH_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="mChatImage" /></a><!-- ENDIF -->&nbsp;<!-- IF MCHAT_ALLOW_IP --><a href="{mchatrow.MCHAT_U_WHOIS}" onclick="popup(this.href, 750, 500); return false;"><img src="{BOARD_URL}ext/dmzx/mchat/styles/prosilver/theme/images/ip.gif" alt="{L_MCHAT_IP} {mchatrow.MCHAT_USER_IP}" title="{L_MCHAT_IP} {mchatrow.MCHAT_USER_IP}" class="mChatImage" /></a><!-- ENDIF --><!-- IF mchatrow.MCHAT_ALLOW_BAN --> <a href="{mchatrow.MCHAT_U_BAN}"><img src="{BOARD_URL}ext/dmzx/mchat/styles/prosilver/theme/images/ban.gif" alt="{L_MCHAT_PERMISSIONS}" title="{L_MCHAT_PERMISSIONS}" class="mChatImage" /></a><!-- ENDIF --><!-- IF mchatrow.MCHAT_ALLOW_EDIT --> <a href="#" onclick="mChat.edit('{mchatrow.MCHAT_MESSAGE_ID}');return false;"><img src="{BOARD_URL}ext/dmzx/mchat/styles/prosilver/theme/images/edit.gif" alt="{L_MCHAT_EDIT}" title="{L_MCHAT_EDIT}" class="mChatImage" /></a><!-- ENDIF --><input type="hidden" id="edit{mchatrow.MCHAT_MESSAGE_ID}" value="{mchatrow.MCHAT_MESSAGE_EDIT}" /><!-- IF mchatrow.MCHAT_ALLOW_DEL --> <a href="#" onclick="mChat.del('{mchatrow.MCHAT_MESSAGE_ID}');return false;"><img src="{BOARD_URL}ext/dmzx/mchat/styles/prosilver/theme/images/del.gif" alt="{L_MCHAT_DELITE}" title="{L_MCHAT_DELITE}" class="mChatImage" /></a><!-- ENDIF --></span><br /><div class="avatarMessage mChatMessage">{mchatrow.MCHAT_MESSAGE}</div>
 						</div>
 					</div>
 					<!-- END mchatrow -->