Visman 9 роки тому
батько
коміт
aa75c98d25
81 змінених файлів з 1173 додано та 1011 видалено
  1. 3 3
      addons/security_for_login.php
  2. 3 3
      addons/security_for_post.php
  3. 3 3
      addons/security_for_register.php
  4. 1 1
      admin_censoring.php
  5. 2 2
      admin_forums.php
  6. 26 26
      db_update.php
  7. 4 4
      delete.php
  8. 7 7
      edit.php
  9. 12 6
      header.php
  10. 2 2
      img/members/.htaccess
  11. BIN
      img/user_agent/browser/vivaldi.png
  12. BIN
      img/user_agent/system/blackberry.png
  13. 2 2
      include/common.php
  14. 3 3
      include/dblayer/sqlite.php
  15. 1 1
      include/fancybox.php
  16. 11 9
      include/functions.php
  17. 4 3
      include/parser.php
  18. 8 0
      include/pms_new/pmsnheader.php
  19. 7 7
      include/poll.php
  20. 1 1
      include/search_idx.php
  21. 2 2
      include/upload.php
  22. 6 3
      include/user_agent.php
  23. 8 6
      index.php
  24. 42 42
      install.php
  25. 0 1
      js/media.min.js
  26. 1 1
      lang/English/admin_plugin_pms_new.php
  27. 1 1
      lang/English/help.php
  28. 1 1
      lang/English/mail_templates/new_reply.tpl
  29. 1 1
      lang/English/mail_templates/new_reply_full.tpl
  30. 1 1
      lang/English/mail_templates/new_topic.tpl
  31. 1 1
      lang/English/mail_templates/new_topic_full.tpl
  32. 1 1
      lang/Russian/admin_plugin_pms_new.php
  33. 1 1
      lang/Russian/help.php
  34. 1 1
      lang/Russian/login.php
  35. 2 2
      lang/Russian/mail_templates/new_reply.tpl
  36. 2 2
      lang/Russian/mail_templates/new_reply_full.tpl
  37. 1 1
      lang/Russian/mail_templates/new_topic.tpl
  38. 1 1
      lang/Russian/mail_templates/new_topic_full.tpl
  39. 2 2
      lang/Russian/mail_templates/welcome.tpl
  40. 1 1
      login.php
  41. 1 1
      misc.php
  42. 4 4
      moderate.php
  43. 4 4
      plugins/AP_Fancybox.php
  44. 1 1
      plugins/AP_PMS_New.php
  45. 4 4
      plugins/AP_Poll.php
  46. 1 1
      plugins/AP_Security.php
  47. 1 1
      plugins/AP_Timelimit.php
  48. 8 8
      plugins/AP_Upload.php
  49. 10 10
      post.php
  50. 17 7
      profile.php
  51. 1 1
      re.php
  52. 3 1
      search.php
  53. 15 8
      style/Air.css
  54. 7 0
      style/Air/reminder.css
  55. 107 107
      style/Cobalt.css
  56. 7 0
      style/Cobalt/reminder.css
  57. 15 8
      style/Earth.css
  58. 7 0
      style/Earth/reminder.css
  59. 15 8
      style/Fire.css
  60. 7 0
      style/Fire/reminder.css
  61. 19 12
      style/GrayOrange.css
  62. BIN
      style/GrayOrange/img/email.png
  63. BIN
      style/GrayOrange/img/flasher.gif
  64. 7 0
      style/GrayOrange/reminder.css
  65. 106 106
      style/Lithium.css
  66. 7 0
      style/Lithium/reminder.css
  67. 107 107
      style/Mercury.css
  68. 7 0
      style/Mercury/reminder.css
  69. 106 106
      style/Oxygen.css
  70. 8 0
      style/Oxygen/reminder.css
  71. 107 107
      style/Radium.css
  72. 7 0
      style/Radium/reminder.css
  73. 106 106
      style/Sulfur.css
  74. 7 0
      style/Sulfur/reminder.css
  75. 107 107
      style/Technetium.css
  76. 7 0
      style/Technetium/reminder.css
  77. 8 0
      style/imports/reminder.css
  78. 5 5
      style/imports/upfiles.css
  79. 17 15
      upfiles.php
  80. 1 1
      viewforum.php
  81. 23 10
      viewtopic.php

+ 3 - 3
addons/security_for_login.php

@@ -41,7 +41,7 @@ class addon_security_for_login extends flux_addon
 		if (empty($pun_config['o_sec_of_login']) || $pun_config['o_sec_of_login'] != $this->version)
 		if (empty($pun_config['o_sec_of_login']) || $pun_config['o_sec_of_login'] != $this->version)
 		{
 		{
 			$db->drop_table('sec_of_login') or error('Unable to drop sec_of_login table', __FILE__, __LINE__, $db->error());
 			$db->drop_table('sec_of_login') or error('Unable to drop sec_of_login table', __FILE__, __LINE__, $db->error());
-			$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o_sec_of_login%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
+			$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o\_sec\_of\_login%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
 
 
 			$schema = array
 			$schema = array
 			(
 			(
@@ -100,7 +100,7 @@ class addon_security_for_login extends flux_addon
 		if ($db->num_rows($result) == $this->att_max)
 		if ($db->num_rows($result) == $this->att_max)
 		{
 		{
 			if (!defined('FORUM_SEC_FUNCTIONS_LOADED'))
 			if (!defined('FORUM_SEC_FUNCTIONS_LOADED'))
-		    include PUN_ROOT.'include/security.php';
+				include PUN_ROOT.'include/security.php';
 
 
 			$form_captcha = security_show_captcha(4);
 			$form_captcha = security_show_captcha(4);
 		}
 		}
@@ -116,7 +116,7 @@ class addon_security_for_login extends flux_addon
 		global $db, $errors;
 		global $db, $errors;
 		
 		
 		if (!defined('FORUM_SEC_FUNCTIONS_LOADED'))
 		if (!defined('FORUM_SEC_FUNCTIONS_LOADED'))
-	    include PUN_ROOT.'include/security.php';
+			include PUN_ROOT.'include/security.php';
 
 
 		$now = time();
 		$now = time();
 
 

+ 3 - 3
addons/security_for_post.php

@@ -41,7 +41,7 @@ class addon_security_for_post extends flux_addon
 		if (empty($pun_config['o_sec_of_post']) || $pun_config['o_sec_of_post'] != $this->version)
 		if (empty($pun_config['o_sec_of_post']) || $pun_config['o_sec_of_post'] != $this->version)
 		{
 		{
 			$db->drop_table('sec_of_post') or error('Unable to drop sec_of_post table', __FILE__, __LINE__, $db->error());
 			$db->drop_table('sec_of_post') or error('Unable to drop sec_of_post table', __FILE__, __LINE__, $db->error());
-			$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o_sec_of_post%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
+			$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o\_sec\_of\_post%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
 
 
 			$schema = array
 			$schema = array
 			(
 			(
@@ -94,7 +94,7 @@ class addon_security_for_post extends flux_addon
 		$this->hook_post_before_header();
 		$this->hook_post_before_header();
 
 
 		if (!defined('FORUM_SEC_FUNCTIONS_LOADED'))
 		if (!defined('FORUM_SEC_FUNCTIONS_LOADED'))
-	    include PUN_ROOT.'include/security.php';
+			include PUN_ROOT.'include/security.php';
 
 
 		$now = time();
 		$now = time();
 		$ip = get_remote_address();
 		$ip = get_remote_address();
@@ -117,7 +117,7 @@ class addon_security_for_post extends flux_addon
 		global $db, $pun_config, $errors;
 		global $db, $pun_config, $errors;
 		
 		
 		if (!defined('FORUM_SEC_FUNCTIONS_LOADED'))
 		if (!defined('FORUM_SEC_FUNCTIONS_LOADED'))
-	    include PUN_ROOT.'include/security.php';
+			include PUN_ROOT.'include/security.php';
 
 
 		$now = time();
 		$now = time();
 
 

+ 3 - 3
addons/security_for_register.php

@@ -41,7 +41,7 @@ class addon_security_for_register extends flux_addon
 		if (empty($pun_config['o_sec_of_register']) || $pun_config['o_sec_of_register'] != $this->version)
 		if (empty($pun_config['o_sec_of_register']) || $pun_config['o_sec_of_register'] != $this->version)
 		{
 		{
 			$db->drop_table('sec_of_register') or error('Unable to drop sec_of_register table', __FILE__, __LINE__, $db->error());
 			$db->drop_table('sec_of_register') or error('Unable to drop sec_of_register table', __FILE__, __LINE__, $db->error());
-			$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o_sec_of_register%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
+			$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o\_sec\_of\_register%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
 
 
 			$schema = array
 			$schema = array
 			(
 			(
@@ -92,7 +92,7 @@ class addon_security_for_register extends flux_addon
 		global $db, $pun_config;
 		global $db, $pun_config;
 
 
 		if (!defined('FORUM_SEC_FUNCTIONS_LOADED'))
 		if (!defined('FORUM_SEC_FUNCTIONS_LOADED'))
-	    include PUN_ROOT.'include/security.php';
+			include PUN_ROOT.'include/security.php';
 
 
 		$now = time();
 		$now = time();
 		$ip = get_remote_address();
 		$ip = get_remote_address();
@@ -115,7 +115,7 @@ class addon_security_for_register extends flux_addon
 		global $db, $errors;
 		global $db, $errors;
 		
 		
 		if (!defined('FORUM_SEC_FUNCTIONS_LOADED'))
 		if (!defined('FORUM_SEC_FUNCTIONS_LOADED'))
-	    include PUN_ROOT.'include/security.php';
+			include PUN_ROOT.'include/security.php';
 
 
 		$now = time();
 		$now = time();
 
 

+ 1 - 1
admin_censoring.php

@@ -89,7 +89,7 @@ else if (isset($_POST['remove']))
 
 
 	generate_censoring_cache();
 	generate_censoring_cache();
 
 
-	redirect('admin_censoring.php',  $lang_admin_censoring['Word removed redirect']);
+	redirect('admin_censoring.php', $lang_admin_censoring['Word removed redirect']);
 }
 }
 
 
 $page_title = array(pun_htmlspecialchars($pun_config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Censoring']);
 $page_title = array(pun_htmlspecialchars($pun_config['o_board_title']), $lang_admin_common['Admin'], $lang_admin_common['Censoring']);

+ 2 - 2
admin_forums.php

@@ -169,7 +169,7 @@ else if (isset($_GET['edit_forum']))
 		// MOD subforums - Visman
 		// MOD subforums - Visman
 		$parent_forum_id = $i = intval($_POST['parent_forum']);
 		$parent_forum_id = $i = intval($_POST['parent_forum']);
 		while (isset($sf_array_desc[$i][0]))
 		while (isset($sf_array_desc[$i][0]))
-		  $i = $sf_array_desc[$i][0];
+			$i = $sf_array_desc[$i][0];
 
 
 		if ($i > 0 && (!isset($sf_array_tree[0][$i]) || $sf_array_tree[0][$i]['cid'] != $cat_id))
 		if ($i > 0 && (!isset($sf_array_tree[0][$i]) || $sf_array_tree[0][$i]['cid'] != $cat_id))
 			message($lang_common['Bad request'], false, '404 Not Found');
 			message($lang_common['Bad request'], false, '404 Not Found');
@@ -261,7 +261,7 @@ else if (isset($_GET['edit_forum']))
 		<h2><span><?php echo $lang_admin_forums['Edit forum head'] ?></span></h2>
 		<h2><span><?php echo $lang_admin_forums['Edit forum head'] ?></span></h2>
 		<div class="box">
 		<div class="box">
 			<form id="edit_forum" method="post" action="admin_forums.php?edit_forum=<?php echo $forum_id ?>">
 			<form id="edit_forum" method="post" action="admin_forums.php?edit_forum=<?php echo $forum_id ?>">
-			  <input type="hidden" name="csrf_hash" value="<?php echo csrf_hash() ?>" />
+				<input type="hidden" name="csrf_hash" value="<?php echo csrf_hash() ?>" />
 				<p class="submittop"><input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" tabindex="6" /></p>
 				<p class="submittop"><input type="submit" name="save" value="<?php echo $lang_admin_common['Save changes'] ?>" tabindex="6" /></p>
 				<div class="inform">
 				<div class="inform">
 					<fieldset>
 					<fieldset>

+ 26 - 26
db_update.php

@@ -7,9 +7,9 @@
  */
  */
 
 
 // The FluxBB version this script updates to
 // The FluxBB version this script updates to
-define('UPDATE_TO', '1.5.9');
+define('UPDATE_TO', '1.5.10');
 
 
-define('UPDATE_TO_VER_REVISION', 74);	// номер сборки - Visman
+define('UPDATE_TO_VER_REVISION', 75);	// номер сборки - Visman
 
 
 define('UPDATE_TO_DB_REVISION', 21);
 define('UPDATE_TO_DB_REVISION', 21);
 define('UPDATE_TO_SI_REVISION', 2.1);
 define('UPDATE_TO_SI_REVISION', 2.1);
@@ -24,7 +24,7 @@ define('PUN_SEARCH_MAX_WORD', 20);
 // The MySQL connection character set that was used for FluxBB 1.2 - in 99% of cases this should be detected automatically,
 // The MySQL connection character set that was used for FluxBB 1.2 - in 99% of cases this should be detected automatically,
 // but can be overridden using the below constant if required.
 // but can be overridden using the below constant if required.
 //define('FORUM_DEFAULT_CHARSET', 'latin1');
 //define('FORUM_DEFAULT_CHARSET', 'latin1');
-define('FORUM_DEFAULT_CHARSET', 'cp1251');  // For RUSSIAN - Visman
+define('FORUM_DEFAULT_CHARSET', 'cp1251'); // For RUSSIAN - Visman
 
 
 
 
 // The number of items to process per page view (lower this if the update script times out during UTF-8 conversion)
 // The number of items to process per page view (lower this if the update script times out during UTF-8 conversion)
@@ -685,7 +685,7 @@ if (isset($_POST['req_db_pass']))
 else if (isset($_GET['uid']))
 else if (isset($_GET['uid']))
 {
 {
 	$uid = pun_trim($_GET['uid']);
 	$uid = pun_trim($_GET['uid']);
-	if (!$lock || $lock != $uid) // The lock doesn't exist or doesn't match the given UID
+	if (!$lock || $lock !== $uid) // The lock doesn't exist or doesn't match the given UID
 		$lock_error = true;
 		$lock_error = true;
 }
 }
 else
 else
@@ -972,7 +972,7 @@ if (!array_key_exists('o_cur_ver_revision', $pun_config) || $pun_config['o_cur_v
 			$i = 0;
 			$i = 0;
 			foreach ($smilies as $text => $img)
 			foreach ($smilies as $text => $img)
 			{
 			{
-				$db->query('INSERT INTO '.$db->prefix.'smilies (image, text, disp_position)  VALUES(\''.$img.'\', \''.$db->escape($text).'\', '.$i.')') or error('Unable to add smiley', __FILE__, __LINE__, $db->error());
+				$db->query('INSERT INTO '.$db->prefix.'smilies (image, text, disp_position) VALUES(\''.$img.'\', \''.$db->escape($text).'\', '.$i.')') or error('Unable to add smiley', __FILE__, __LINE__, $db->error());
 				$i++;
 				$i++;
 			}
 			}
 		}
 		}
@@ -1053,28 +1053,28 @@ if (!array_key_exists('o_cur_ver_revision', $pun_config) || $pun_config['o_cur_v
 	$schema = array(
 	$schema = array(
 			'FIELDS'			=> array(
 			'FIELDS'			=> array(
 					'tid'				=> array(
 					'tid'				=> array(
-							'datatype'			=> 'INT(10) UNSIGNED',
-							'allow_null'    	=> false,
+							'datatype'		=> 'INT(10) UNSIGNED',
+							'allow_null'	=> false,
 							'default'			=> '0'
 							'default'			=> '0'
 					),
 					),
 					'question'			=> array(
 					'question'			=> array(
-							'datatype'			=> 'TINYINT(4)',
-							'allow_null'    	=> false,
+							'datatype'		=> 'TINYINT(4)',
+							'allow_null'	=> false,
 							'default'			=> '0'
 							'default'			=> '0'
 					),
 					),
 					'field'			=> array(
 					'field'			=> array(
-							'datatype'			=> 'TINYINT(4)',
-							'allow_null'    	=> false,
+							'datatype'		=> 'TINYINT(4)',
+							'allow_null'	=> false,
 							'default'			=> '0'
 							'default'			=> '0'
 					),
 					),
 					'choice'			=> array(
 					'choice'			=> array(
-							'datatype'			=> 'VARCHAR(255)',
-							'allow_null'    	=> false,
+							'datatype'		=> 'VARCHAR(255)',
+							'allow_null'	=> false,
 							'default'			=> '\'\''
 							'default'			=> '\'\''
 					),
 					),
 					'votes'				=> array(
 					'votes'				=> array(
-							'datatype'			=> 'INT(10) UNSIGNED',
-							'allow_null'    	=> false,
+							'datatype'		=> 'INT(10) UNSIGNED',
+							'allow_null'	=> false,
 							'default'			=> '0'
 							'default'			=> '0'
 					)
 					)
 			),
 			),
@@ -1087,7 +1087,7 @@ if (!array_key_exists('o_cur_ver_revision', $pun_config) || $pun_config['o_cur_v
 			'FIELDS'			=> array(
 			'FIELDS'			=> array(
 					'tid'				=> array(
 					'tid'				=> array(
 							'datatype'			=> 'INT(10) UNSIGNED',
 							'datatype'			=> 'INT(10) UNSIGNED',
-							'allow_null'    	=> false
+							'allow_null'		=> false
 					),
 					),
 					'uid'			=> array(
 					'uid'			=> array(
 							'datatype'			=> 'INT(10) UNSIGNED',
 							'datatype'			=> 'INT(10) UNSIGNED',
@@ -1095,7 +1095,7 @@ if (!array_key_exists('o_cur_ver_revision', $pun_config) || $pun_config['o_cur_v
 					),
 					),
 					'rez'			=> array(
 					'rez'			=> array(
 							'datatype'			=> 'TEXT',
 							'datatype'			=> 'TEXT',
-							'allow_null'    	=> true
+							'allow_null'		=> true
 					)
 					)
 			),
 			),
 			'PRIMARY KEY'		=> array('tid', 'uid')
 			'PRIMARY KEY'		=> array('tid', 'uid')
@@ -1130,7 +1130,7 @@ if (!array_key_exists('o_cur_ver_revision', $pun_config) || $pun_config['o_cur_v
 } // rev.42
 } // rev.42
 if (!array_key_exists('o_cur_ver_revision', $pun_config) || $pun_config['o_cur_ver_revision'] < 47)
 if (!array_key_exists('o_cur_ver_revision', $pun_config) || $pun_config['o_cur_ver_revision'] < 47)
 {
 {
-	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o_uploadile_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());
+	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o\_uploadile\_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());
 
 
 	if (!array_key_exists('o_crypto_enable', $pun_config))
 	if (!array_key_exists('o_crypto_enable', $pun_config))
 		$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES (\'o_crypto_enable\', \'1\')') or error('Unable to insert config value \'o_crypto_enable\'', __FILE__, __LINE__, $db->error());
 		$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES (\'o_crypto_enable\', \'1\')') or error('Unable to insert config value \'o_crypto_enable\'', __FILE__, __LINE__, $db->error());
@@ -1179,12 +1179,12 @@ if (!array_key_exists('o_cur_ver_revision', $pun_config) || $pun_config['o_cur_v
 		error('Unable to read config file include/config.php.', __FILE__, __LINE__);
 		error('Unable to read config file include/config.php.', __FILE__, __LINE__);
 
 
 	$conf_define = array(
 	$conf_define = array(
-	  'PUN_DEBUG' => array('1', true, ''),
-	  'PUN_SHOW_QUERIES' => array('1', false, ''),
-	  'PUN_MAX_POSTSIZE' => array('65535', true, ''),
-	  'FORUM_EOL' => array('"\r\n"', false, 'possible values can be PHP_EOL, "\r\n", "\n" or "\r"'),
-	  'FORUM_UA_OFF' => array('1', false, ''),
-	  'FORUM_AJAX_JQUERY' => array('\'//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js\'', true, ''),
+		'PUN_DEBUG' => array('1', true, ''),
+		'PUN_SHOW_QUERIES' => array('1', false, ''),
+		'PUN_MAX_POSTSIZE' => array('65535', true, ''),
+		'FORUM_EOL' => array('"\r\n"', false, 'possible values can be PHP_EOL, "\r\n", "\n" or "\r"'),
+		'FORUM_UA_OFF' => array('1', false, ''),
+		'FORUM_AJAX_JQUERY' => array('\'//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js\'', true, ''),
 	);
 	);
 
 
 	$conf_add = array();
 	$conf_add = array();
@@ -1202,7 +1202,7 @@ if (!array_key_exists('o_cur_ver_revision', $pun_config) || $pun_config['o_cur_v
 		if (!$fn)
 		if (!$fn)
 			error('Unable to write config file include/config.php.', __FILE__, __LINE__);
 			error('Unable to write config file include/config.php.', __FILE__, __LINE__);
 
 
-    if (fwrite($fn, pun_trim($conf_contents, " \n\r")."\n\n".implode("\n", $conf_add)."\n") === false)
+		if (fwrite($fn, pun_trim($conf_contents, " \n\r")."\n\n".implode("\n", $conf_add)."\n") === false)
 			error('Unable to write config file include/config.php.', __FILE__, __LINE__);
 			error('Unable to write config file include/config.php.', __FILE__, __LINE__);
 
 
 		fclose($fn);
 		fclose($fn);
@@ -1215,7 +1215,7 @@ if (!array_key_exists('o_cur_ver_revision', $pun_config) || $pun_config['o_cur_v
 } // rev.65
 } // rev.65
 if (!array_key_exists('o_cur_ver_revision', $pun_config) || $pun_config['o_cur_ver_revision'] < 68)
 if (!array_key_exists('o_cur_ver_revision', $pun_config) || $pun_config['o_cur_ver_revision'] < 68)
 {
 {
-	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o_blocking_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());
+	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o\_blocking\_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());
 
 
 	if ($db->table_exists('blocking'))
 	if ($db->table_exists('blocking'))
 		$db->drop_table('blocking') or error('Unable to drop blocking table', __FILE__, __LINE__, $db->error());
 		$db->drop_table('blocking') or error('Unable to drop blocking table', __FILE__, __LINE__, $db->error());

+ 4 - 4
delete.php

@@ -83,11 +83,11 @@ if (isset($_POST['delete']))
 		if ($cur_post['no_sum_mess'] == 0 && $cur_post['poster_id'] > 1)
 		if ($cur_post['no_sum_mess'] == 0 && $cur_post['poster_id'] > 1)
 			$db->query('UPDATE '.$db->prefix.'users SET num_posts=num_posts-1 WHERE id='.$cur_post['poster_id']) or error('Unable to update user', __FILE__, __LINE__, $db->error());
 			$db->query('UPDATE '.$db->prefix.'users SET num_posts=num_posts-1 WHERE id='.$cur_post['poster_id']) or error('Unable to update user', __FILE__, __LINE__, $db->error());
 
 
-    // Redirect towards the previous post
-    $result = $db->query('SELECT id FROM '.$db->prefix.'posts WHERE topic_id='.$cur_post['tid'].' AND id < '.$id.' ORDER BY id DESC LIMIT 1') or error('Unable to fetch post info', __FILE__, __LINE__, $db->error());
-    $post_id = $db->result($result);
+		// Redirect towards the previous post
+		$result = $db->query('SELECT id FROM '.$db->prefix.'posts WHERE topic_id='.$cur_post['tid'].' AND id < '.$id.' ORDER BY id DESC LIMIT 1') or error('Unable to fetch post info', __FILE__, __LINE__, $db->error());
+		$post_id = $db->result($result);
 
 
-    redirect('viewtopic.php?pid='.$post_id.'#p'.$post_id, $lang_delete['Post del redirect']);
+		redirect('viewtopic.php?pid='.$post_id.'#p'.$post_id, $lang_delete['Post del redirect']);
 	}
 	}
 }
 }
 
 

+ 7 - 7
edit.php

@@ -316,7 +316,7 @@ else if (isset($_POST['preview']))
 $checkboxes = array();
 $checkboxes = array();
 if ($can_edit_subject && $is_admmod)
 if ($can_edit_subject && $is_admmod)
 {
 {
-	if (isset($_POST['stick_topic']) || $cur_post['sticky'] == '1')
+	if (isset($_POST['stick_topic']) || !isset($_POST['form_sent']) && $cur_post['sticky'] == '1')
 		$checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.$lang_common['Stick topic'].'<br /></label>';
 		$checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.$lang_common['Stick topic'].'<br /></label>';
 	else
 	else
 		$checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" tabindex="'.($cur_index++).'" />'.$lang_common['Stick topic'].'<br /></label>';
 		$checkboxes[] = '<label><input type="checkbox" name="stick_topic" value="1" tabindex="'.($cur_index++).'" />'.$lang_common['Stick topic'].'<br /></label>';
@@ -324,7 +324,7 @@ if ($can_edit_subject && $is_admmod)
 
 
 if ($pun_config['o_smilies'] == '1')
 if ($pun_config['o_smilies'] == '1')
 {
 {
-	if (isset($_POST['hide_smilies']) || $cur_post['hide_smilies'] == '1')
+	if (isset($_POST['hide_smilies']) || !isset($_POST['form_sent']) && $cur_post['hide_smilies'] == '1')
 		$checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.$lang_post['Hide smilies'].'<br /></label>';
 		$checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" checked="checked" tabindex="'.($cur_index++).'" />'.$lang_post['Hide smilies'].'<br /></label>';
 	else
 	else
 		$checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'" />'.$lang_post['Hide smilies'].'<br /></label>';
 		$checkboxes[] = '<label><input type="checkbox" name="hide_smilies" value="1" tabindex="'.($cur_index++).'" />'.$lang_post['Hide smilies'].'<br /></label>';
@@ -332,14 +332,14 @@ if ($pun_config['o_smilies'] == '1')
 
 
 if ($is_admmod)
 if ($is_admmod)
 {
 {
-	if ((isset($_POST['form_sent']) && isset($_POST['silent'])) || !isset($_POST['form_sent']))
+	if (isset($_POST['silent']) || !isset($_POST['form_sent']))
 		$checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" checked="checked" />'.$lang_post['Silent edit'].'<br /></label>';
 		$checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" checked="checked" />'.$lang_post['Silent edit'].'<br /></label>';
 	else
 	else
 		$checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" />'.$lang_post['Silent edit'].'<br /></label>';
 		$checkboxes[] = '<label><input type="checkbox" name="silent" value="1" tabindex="'.($cur_index++).'" />'.$lang_post['Silent edit'].'<br /></label>';
 	// StickFP - Visman
 	// StickFP - Visman
 	if ($can_edit_subject)
 	if ($can_edit_subject)
 	{
 	{
-		if ((isset($_POST['form_sent']) && isset($_POST['stickfp'])) || (!isset($_POST['form_sent']) && $cur_post['stick_fp'] != 0))
+		if (isset($_POST['stickfp']) || !isset($_POST['form_sent']) && $cur_post['stick_fp'] == '1')
 			$checkboxes[] = '<label><input type="checkbox" name="stickfp" value="1" tabindex="'.($cur_index++).'" checked="checked" />'.$lang_post['Stick first post'].'<br /></label>';
 			$checkboxes[] = '<label><input type="checkbox" name="stickfp" value="1" tabindex="'.($cur_index++).'" checked="checked" />'.$lang_post['Stick first post'].'<br /></label>';
 		else
 		else
 			$checkboxes[] = '<label><input type="checkbox" name="stickfp" value="1" tabindex="'.($cur_index++).'" />'.$lang_post['Stick first post'].'<br /></label>';
 			$checkboxes[] = '<label><input type="checkbox" name="stickfp" value="1" tabindex="'.($cur_index++).'" />'.$lang_post['Stick first post'].'<br /></label>';
@@ -349,10 +349,10 @@ if ($is_admmod)
 // мод ограничения времени редактирвания - Visman
 // мод ограничения времени редактирвания - Visman
 if ($pun_user['g_id'] == PUN_ADMIN)
 if ($pun_user['g_id'] == PUN_ADMIN)
 {
 {
-	if ((isset($_POST['form_sent']) && !isset($_POST['editpost'])) || (!isset($_POST['form_sent']) && $cur_post['edit_post'] != 1))
-		$checkboxes[] = '<label><input type="checkbox" name="editpost" value="1" tabindex="'.($cur_index++).'" />'.$lang_post['EditPost edit'].'<br /></label>';
-	else
+	if (isset($_POST['editpost']) || !isset($_POST['form_sent']) && $cur_post['edit_post'] == '1')
 		$checkboxes[] = '<label><input type="checkbox" name="editpost" value="1" tabindex="'.($cur_index++).'" checked="checked" />'.$lang_post['EditPost edit'].'<br /></label>';
 		$checkboxes[] = '<label><input type="checkbox" name="editpost" value="1" tabindex="'.($cur_index++).'" checked="checked" />'.$lang_post['EditPost edit'].'<br /></label>';
+	else
+		$checkboxes[] = '<label><input type="checkbox" name="editpost" value="1" tabindex="'.($cur_index++).'" />'.$lang_post['EditPost edit'].'<br /></label>';
 }
 }
 
 
 if (!empty($checkboxes))
 if (!empty($checkboxes))

+ 12 - 6
header.php

@@ -19,9 +19,15 @@ header('Pragma: no-cache'); // For HTTP/1.0 compatibility
 // Send the Content-type header in case the web server is setup to send something else
 // Send the Content-type header in case the web server is setup to send something else
 header('Content-type: text/html; charset=utf-8');
 header('Content-type: text/html; charset=utf-8');
 
 
-// Prevent site from being embedded in a frame
-$frame_options = defined('FORUM_FRAME_OPTIONS') ? FORUM_FRAME_OPTIONS : 'deny';
-header('X-Frame-Options: '.$frame_options);
+// Prevent site from being embedded in a frame unless FORUM_FRAME_OPTIONS is set
+// to a valid X-Frame-Options header value or false
+if (defined('FORUM_FRAME_OPTIONS'))
+{
+	if (preg_match('/^(?:allow-from|deny|sameorigin)/i', FORUM_FRAME_OPTIONS))
+		header('X-Frame-Options: '.FORUM_FRAME_OPTIONS);
+}
+else
+	header('X-Frame-Options: deny');
 
 
 // Load the template
 // Load the template
 if (defined('PUN_ADMIN_CONSOLE'))
 if (defined('PUN_ADMIN_CONSOLE'))
@@ -172,7 +178,7 @@ if (isset($focus_element))
 
 
 
 
 // START SUBST - <pun_page>
 // START SUBST - <pun_page>
-$tpl_main = str_replace('<pun_page>', htmlspecialchars(basename($_SERVER['PHP_SELF'], '.php')), $tpl_main);
+$tpl_main = str_replace('<pun_page>', htmlspecialchars(basename($_SERVER['SCRIPT_NAME'], '.php')), $tpl_main);
 // END SUBST - <pun_page>
 // END SUBST - <pun_page>
 
 
 
 
@@ -211,7 +217,7 @@ else
 	$links[] = '<li id="navprofile"'.((PUN_ACTIVE_PAGE == 'profile') ? ' class="isactive"' : '').'><a href="profile.php?id='.$pun_user['id'].'">'.$lang_common['Profile'].'</a></li>';
 	$links[] = '<li id="navprofile"'.((PUN_ACTIVE_PAGE == 'profile') ? ' class="isactive"' : '').'><a href="profile.php?id='.$pun_user['id'].'">'.$lang_common['Profile'].'</a></li>';
 // New PMS
 // New PMS
 	if ($pun_config['o_pms_enabled'] == '1' && ($pun_user['g_pm'] == 1 || $pun_user['messages_new'] > 0))
 	if ($pun_config['o_pms_enabled'] == '1' && ($pun_user['g_pm'] == 1 || $pun_user['messages_new'] > 0))
-		$links[] = '<li id="navpmsnew"'.(((PUN_ACTIVE_PAGE == 'pms_new') || ($pun_user['messages_new'] > 0)) ? ' class="isactive"' : '').'><a href="pmsnew.php">'.$lang_common['PM'].(($pun_user['messages_new'] > 0) ? ' ('.$pun_user['messages_new'].((empty($pun_config['o_pms_flasher']) || PUN_ACTIVE_PAGE == 'pms_new') ? '' : '&#160;<img style="border: 0 none; vertical-align: middle;" src="img/flasher.gif" alt="flasher" />' ).')' : '').'</a></li>';
+		$links[] = '<li id="navpmsnew"'.((PUN_ACTIVE_PAGE == 'pms_new' || $pun_user['messages_new'] > 0) ? ' class="isactive"' : '').'><a href="pmsnew.php">'.$lang_common['PM'].(($pun_user['messages_new'] > 0) ? ' (<span'.((empty($pun_config['o_pms_flasher']) || PUN_ACTIVE_PAGE == 'pms_new') ? '' : ' class="remflasher"' ).'>'.$pun_user['messages_new'].'</span>)' : '').'</a></li>';
 // New PMS
 // New PMS
 
 
 	if ($pun_user['is_admmod'])
 	if ($pun_user['is_admmod'])
@@ -233,7 +239,7 @@ if ($pun_user['g_read_board'] == '1' && $pun_config['o_additional_navlinks'] !=
 }
 }
 
 
 $tpl_temp = '<div id="brdmenu" class="inbox">'."\n\t\t\t".'<ul>'."\n\t\t\t\t".implode("\n\t\t\t\t", $links)."\n\t\t\t".'</ul>'."\n\t\t".'</div>';
 $tpl_temp = '<div id="brdmenu" class="inbox">'."\n\t\t\t".'<ul>'."\n\t\t\t\t".implode("\n\t\t\t\t", $links)."\n\t\t\t".'</ul>'."\n\t\t".'</div>';
-$tpl_temp = str_replace('<div id="brdmenu" class="inbox">'."\n\t\t\t".'<ul>', '<div id="brdmenu" class="inbox">'."\n\t\t\t".'<input type="checkbox" id="brdmenu-checkbox" style="display: none;" />'."\n\t\t\t".'<ul>'.'<label for="brdmenu-checkbox" id="brdmenu-button" data-open="&#9776;" data-close="&#10006;" onclick></label>'."\n\t\t\t\t", $tpl_temp);  // Visman - Responsive Menu, only html+css
+$tpl_temp = str_replace('<div id="brdmenu" class="inbox">'."\n\t\t\t".'<ul>', '<div id="brdmenu" class="inbox">'."\n\t\t\t".'<input type="checkbox" id="brdmenu-checkbox" style="display: none;" />'."\n\t\t\t".'<ul>'.'<label for="brdmenu-checkbox" id="brdmenu-button" data-open="&#9776;" data-close="&#10006;" onclick></label>'."\n\t\t\t\t", $tpl_temp); // Visman - Responsive Menu, only html+css
 $tpl_main = str_replace('<pun_navlinks>', $tpl_temp, $tpl_main);
 $tpl_main = str_replace('<pun_navlinks>', $tpl_temp, $tpl_main);
 // END SUBST - <pun_navlinks>
 // END SUBST - <pun_navlinks>
 
 

+ 2 - 2
img/members/.htaccess

@@ -2,8 +2,8 @@ Options -Indexes -ExecCGI
 
 
 php_flag engine 0
 php_flag engine 0
 
 
-RemoveHandler .phtml .php .php3 .php4 .php5 .php6 .phps .cgi .exe .pl .asp .aspx .shtml .shtm .fcgi .fpl .jsp .htm .html .wml
-AddType text/plain .phtml .php .php3 .php4 .php5 .php6 .phps .cgi .exe .pl .asp .aspx .shtml .shtm .fcgi .fpl .jsp .htm .html .wml
+RemoveHandler .phtml .php .php3 .php4 .php5 .php6 .php7 .phps .cgi .exe .pl .asp .aspx .shtml .shtm .fcgi .fpl .jsp .htm .html .wml
+AddType text/plain .phtml .php .php3 .php4 .php5 .php6 .php7 .phps .cgi .exe .pl .asp .aspx .shtml .shtm .fcgi .fpl .jsp .htm .html .wml
 
 
 <IfModule mod_rewrite.c>
 <IfModule mod_rewrite.c>
 
 

BIN
img/user_agent/browser/vivaldi.png


BIN
img/user_agent/system/blackberry.png


+ 2 - 2
include/common.php

@@ -10,9 +10,9 @@ if (!defined('PUN_ROOT'))
 	exit('The constant PUN_ROOT must be defined and point to a valid FluxBB installation root directory.');
 	exit('The constant PUN_ROOT must be defined and point to a valid FluxBB installation root directory.');
 
 
 // Define the version and database revision that this code was written for
 // Define the version and database revision that this code was written for
-define('FORUM_VERSION', '1.5.9');
+define('FORUM_VERSION', '1.5.10');
 
 
-define('FORUM_VER_REVISION', 74);	// номер сборки - Visman
+define('FORUM_VER_REVISION', 75);	// номер сборки - Visman
 
 
 $page_js = array();
 $page_js = array();
 
 

+ 3 - 3
include/dblayer/sqlite.php

@@ -456,9 +456,9 @@ class DBLayer
 
 
 		if (!$allow_null)
 		if (!$allow_null)
 			$query .= ' NOT NULL';
 			$query .= ' NOT NULL';
-		
-		if ($default_value === '')
-			$default_value = '\'\'';
+
+		if (is_string($default_value))
+			$default_value = '\''.$this->escape($default_value).'\'';
 
 
 		if (!is_null($default_value))
 		if (!is_null($default_value))
 			$query .= ' DEFAULT '.$default_value;
 			$query .= ' DEFAULT '.$default_value;

+ 1 - 1
include/fancybox.php

@@ -19,7 +19,7 @@ if (isset($pun_config['o_fbox_files']) && !isset($http_status) && (!$pun_user['i
 
 
 		if (!isset($page_js))
 		if (!isset($page_js))
 		{
 		{
-			$page_head['jquery'] = '<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>';
+			$page_head['jquery'] = '<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>';
 			$page_head['fancybox'] = '<script type="text/javascript" src="js/fancybox.js"></script>';
 			$page_head['fancybox'] = '<script type="text/javascript" src="js/fancybox.js"></script>';
 		}
 		}
 		else // For FluxBB by Visman
 		else // For FluxBB by Visman

+ 11 - 9
include/functions.php

@@ -330,7 +330,7 @@ function set_default_user()
 	$pun_user['is_guest'] = true;
 	$pun_user['is_guest'] = true;
 	$pun_user['is_admmod'] = false;
 	$pun_user['is_admmod'] = false;
 	$pun_user['is_bot'] = (strpos($remote_addr, '[Bot]') !== false); // MOD определения ботов - Visman
 	$pun_user['is_bot'] = (strpos($remote_addr, '[Bot]') !== false); // MOD определения ботов - Visman
-	$pun_user['ident'] = $remote_addr;                             // Кто в этой теме - Visman
+	$pun_user['ident'] = $remote_addr; // Кто в этой теме - Visman
 
 
 	if (!empty($_COOKIE[$cookie_name.'_glang'])) // быстрое переключение языка - Visman
 	if (!empty($_COOKIE[$cookie_name.'_glang'])) // быстрое переключение языка - Visman
 	{
 	{
@@ -955,12 +955,12 @@ function get_title($user)
 			$ban_list[] = utf8_strtolower($cur_ban['username']);
 			$ban_list[] = utf8_strtolower($cur_ban['username']);
 	}
 	}
 
 
-	// If the user has a custom title
-	if ($user['title'] != '')
-		$user_title = pun_htmlspecialchars($user['title']);
 	// If the user is banned
 	// If the user is banned
-	else if (in_array(utf8_strtolower($user['username']), $ban_list))
+	if (in_array(utf8_strtolower($user['username']), $ban_list))
 		$user_title = $lang_common['Banned'];
 		$user_title = $lang_common['Banned'];
+	// If the user has a custom title
+	else if ($user['title'] != '')
+		$user_title = pun_htmlspecialchars($user['title']);
 	// If the user group has a default user title
 	// If the user group has a default user title
 	else if ($user['g_user_title'] != '')
 	else if ($user['g_user_title'] != '')
 		$user_title = pun_htmlspecialchars($user['g_user_title']);
 		$user_title = pun_htmlspecialchars($user['g_user_title']);
@@ -1148,7 +1148,7 @@ function random_key($len, $readable = false, $hash = false)
 
 
 		return $result;
 		return $result;
 	}
 	}
-  	
+
 	return $key;
 	return $key;
 }
 }
 
 
@@ -1253,8 +1253,8 @@ function random_pass($len)
 function pun_hash($str)
 function pun_hash($str)
 {
 {
 	global $salt1;
 	global $salt1;
-  
-	return sha1($str.$salt1);  // соль на пароль - Visman
+
+	return sha1($str.$salt1); // соль на пароль - Visman
 }
 }
 
 
 
 
@@ -1265,7 +1265,7 @@ function pun_hash($str)
 function pun_hash_equals($a, $b)
 function pun_hash_equals($a, $b)
 {
 {
 	if (function_exists('hash_equals'))
 	if (function_exists('hash_equals'))
-		return hash_equals($a, $b);
+		return hash_equals((string) $a, (string) $b);
 
 
 	$a_length = strlen($a);
 	$a_length = strlen($a);
 
 
@@ -1744,6 +1744,8 @@ H2 {MARGIN: 0; COLOR: #FFFFFF; BACKGROUND-COLOR: #B84623; FONT-SIZE: 1.1em; PADD
 
 
 	if (defined('PUN_DEBUG') && !is_null($file) && !is_null($line))
 	if (defined('PUN_DEBUG') && !is_null($file) && !is_null($line))
 	{
 	{
+		$file = str_replace(realpath(PUN_ROOT), '', $file);
+
 		echo "\t\t".'<strong>File:</strong> '.$file.'<br />'."\n\t\t".'<strong>Line:</strong> '.$line.'<br /><br />'."\n\t\t".'<strong>FluxBB reported</strong>: '.$message."\n";
 		echo "\t\t".'<strong>File:</strong> '.$file.'<br />'."\n\t\t".'<strong>Line:</strong> '.$line.'<br /><br />'."\n\t\t".'<strong>FluxBB reported</strong>: '.$message."\n";
 
 
 		if ($db_error)
 		if ($db_error)

+ 4 - 3
include/parser.php

@@ -765,8 +765,9 @@ function handle_time_tag($after_time)
 {
 {
 	global $lang_common;
 	global $lang_common;
 
 
-	if ($after_time == 0) return '';
-    
+	if ($after_time == 0)
+		return '';
+
 	$content = array();
 	$content = array();
 	$merged_sec = $after_time % 60;
 	$merged_sec = $after_time % 60;
 	$merged_min = ($after_time/60) % 60;
 	$merged_min = ($after_time/60) % 60;
@@ -799,7 +800,7 @@ function do_bbcode($text, $is_signature = false)
 		$text = preg_replace('%\s*\[\/quote\]%S', '</p></div></blockquote></div><p>', $text);
 		$text = preg_replace('%\s*\[\/quote\]%S', '</p></div></blockquote></div><p>', $text);
 	}
 	}
 
 
-  // Обрабатываем спойлер - Visman
+	// Обрабатываем спойлер - Visman
 	if (strpos($text, '[spoiler') !== false)
 	if (strpos($text, '[spoiler') !== false)
 	{
 	{
 		$text = str_replace('[spoiler]', "</p><div class=\"quotebox\" style=\"padding: 0px;\"><div onclick=\"var e,d,c=this.parentNode,a=c.getElementsByTagName('div')[1],b=this.getElementsByTagName('span')[0];if(a.style.display!=''){while(c.parentNode&&(!d||!e||d==e)){e=d;d=(window.getComputedStyle?getComputedStyle(c, null):c.currentStyle)['backgroundColor'];if(d=='transparent'||d=='rgba(0, 0, 0, 0)')d=e;c=c.parentNode;}a.style.display='';a.style.backgroundColor=d;b.innerHTML='&#9650;';}else{a.style.display='none';b.innerHTML='&#9660;';}\" style=\"font-weight: bold; cursor: pointer; font-size: 0.9em;\"><span style=\"padding: 0 5px;\">&#9660;</span>".$lang_common['Hidden text']."</div><div style=\"padding: 6px; margin: 0; display: none;\"><p>", $text);
 		$text = str_replace('[spoiler]', "</p><div class=\"quotebox\" style=\"padding: 0px;\"><div onclick=\"var e,d,c=this.parentNode,a=c.getElementsByTagName('div')[1],b=this.getElementsByTagName('span')[0];if(a.style.display!=''){while(c.parentNode&&(!d||!e||d==e)){e=d;d=(window.getComputedStyle?getComputedStyle(c, null):c.currentStyle)['backgroundColor'];if(d=='transparent'||d=='rgba(0, 0, 0, 0)')d=e;c=c.parentNode;}a.style.display='';a.style.backgroundColor=d;b.innerHTML='&#9650;';}else{a.style.display='none';b.innerHTML='&#9660;';}\" style=\"font-weight: bold; cursor: pointer; font-size: 0.9em;\"><span style=\"padding: 0 5px;\">&#9660;</span>".$lang_common['Hidden text']."</div><div style=\"padding: 6px; margin: 0; display: none;\"><p>", $text);

+ 8 - 0
include/pms_new/pmsnheader.php

@@ -55,6 +55,14 @@ if (!$pun_user['is_guest'])
 
 
 		$db->query('UPDATE '.$db->prefix.'users SET messages_flag=0 WHERE id='.$pun_user['id']) or error('Unable to update user', __FILE__, __LINE__, $db->error());
 		$db->query('UPDATE '.$db->prefix.'users SET messages_flag=0 WHERE id='.$pun_user['id']) or error('Unable to update user', __FILE__, __LINE__, $db->error());
 	}
 	}
+	else if (!empty($pun_config['o_pms_flasher']) && $pun_config['o_pms_enabled'] == '1' && $pun_user['messages_new'] > 0)
+	{
+		$te_flag = true;
+	}
+	else if (PUN_ACTIVE_PAGE == 'admin' && !empty($plugin) && $plugin == 'AP_PMS_New.php')
+	{
+		$te_flag = true;
+	}
 
 
 	if ($te_flag)
 	if ($te_flag)
 	{
 	{

+ 7 - 7
include/poll.php

@@ -79,8 +79,8 @@ function poll_info($tid, $uid = NULL)
 	{
 	{
 		$result = $db->query('SELECT question, field, choice, votes FROM '.$db->prefix.'poll WHERE tid='.$tid.' ORDER BY question, field') or error('Unable to fetch poll info', __FILE__, __LINE__, $db->error());
 		$result = $db->query('SELECT question, field, choice, votes FROM '.$db->prefix.'poll WHERE tid='.$tid.' ORDER BY question, field') or error('Unable to fetch poll info', __FILE__, __LINE__, $db->error());
 
 
-	  $kol = 0;
-	  $questions = $type = $choices = $votes = array();
+		$kol = 0;
+		$questions = $type = $choices = $votes = array();
 		while ($cur = $db->fetch_assoc($result))
 		while ($cur = $db->fetch_assoc($result))
 		{
 		{
 			$kol = $cur['question'];
 			$kol = $cur['question'];
@@ -201,7 +201,7 @@ function poll_form($tid)
 			$choices = $info['choices'];
 			$choices = $info['choices'];
 			$type = $info['type'];
 			$type = $info['type'];
 		}
 		}
-  }
+	}
 
 
 	$questions = array_map('pun_trim', $questions);
 	$questions = array_map('pun_trim', $questions);
 	$type = array_map('intval', $type);
 	$type = array_map('intval', $type);
@@ -222,7 +222,7 @@ function poll_form($tid)
 		{
 		{
 
 
 ?>
 ?>
-						<div class="rbox"><label><input disabled="disabled" type="checkbox" name="poll_result"  value="1" <?php if ($resu) echo 'checked="checked"'?> /> <?php printf($lang_poll['Form result'], $term) ?></label></div>
+						<div class="rbox"><label><input disabled="disabled" type="checkbox" name="poll_result" value="1" <?php if ($resu) echo 'checked="checked"'?> /> <?php printf($lang_poll['Form result'], $term) ?></label></div>
 <?php
 <?php
 
 
 		}
 		}
@@ -288,7 +288,7 @@ function poll_form($tid)
 	{
 	{
 
 
 ?>
 ?>
-						<div class="rbox"><label><input type="checkbox" name="poll_result"  value="1" <?php if ($resu) echo 'checked="checked"'?> tabindex="<?php echo $cur_index++ ?>" /> <?php printf($lang_poll['Form result'], $term) ?></label></div>
+						<div class="rbox"><label><input type="checkbox" name="poll_result" value="1" <?php if ($resu) echo 'checked="checked"'?> tabindex="<?php echo $cur_index++ ?>" /> <?php printf($lang_poll['Form result'], $term) ?></label></div>
 <?php
 <?php
 
 
 	}
 	}
@@ -491,7 +491,7 @@ function poll_save($tid)
 		{
 		{
 			foreach($ch as $i => $c)
 			foreach($ch as $i => $c)
 			{
 			{
-				$db->query('DELETE FROM '.$db->prefix.'poll  WHERE tid='.$tid.' AND question='.$k.' AND field='.$i) or error('Unable to delete poll choice', __FILE__, __LINE__, $db->error());
+				$db->query('DELETE FROM '.$db->prefix.'poll WHERE tid='.$tid.' AND question='.$k.' AND field='.$i) or error('Unable to delete poll choice', __FILE__, __LINE__, $db->error());
 			}
 			}
 		}
 		}
 		poll_cache_delete($tid);
 		poll_cache_delete($tid);
@@ -556,7 +556,7 @@ function poll_display_post($tid, $uid)
 		{
 		{
 			$question = (isset($questions[$k]) && $fk) ? $questions[$k] : '';
 			$question = (isset($questions[$k]) && $fk) ? $questions[$k] : '';
 			if ($question == '')
 			if ($question == '')
-	   		$fk = false;
+		 		$fk = false;
 			else
 			else
 			{
 			{
 				$q[$k] = $question;
 				$q[$k] = $question;

+ 1 - 1
include/search_idx.php

@@ -86,7 +86,7 @@ function split_words_clear_link($url)
 
 
 	if (isset($arr['query']))
 	if (isset($arr['query']))
 	{
 	{
-	  parse_str($arr['query'], $qarr);
+		parse_str($arr['query'], $qarr);
 		$text.= split_words_clear_link_minor($qarr);
 		$text.= split_words_clear_link_minor($qarr);
 	}
 	}
 
 

+ 2 - 2
include/upload.php

@@ -19,7 +19,7 @@ $gd  = extension_loaded('gd');
 $gd2 = ($gd && function_exists('imagecreatetruecolor'));
 $gd2 = ($gd && function_exists('imagecreatetruecolor'));
 
 
 $extimage = array('gif', 'jpeg', 'jpg', 'jpe', 'png', 'bmp', 'tiff', 'tif', 'swf', 'psd', 'iff', 'wbmp', 'wbm', 'xbm');
 $extimage = array('gif', 'jpeg', 'jpg', 'jpe', 'png', 'bmp', 'tiff', 'tif', 'swf', 'psd', 'iff', 'wbmp', 'wbm', 'xbm');
-$extforno = array('phtml','php','php3','php4','php5','php6','phps','cgi','exe','pl','asp','aspx','shtml','shtm','fcgi','fpl','jsp','htm','html','wml','htaccess');
+$extforno = array('phtml','php','php3','php4','php5','php6','php7','phps','cgi','exe','pl','asp','aspx','shtml','shtm','fcgi','fpl','jsp','htm','html','wml','htaccess');
 
 
 $extimage2 = array(
 $extimage2 = array(
 	1 => array('gif'),
 	1 => array('gif'),
@@ -303,7 +303,7 @@ function img_resize ($file, $dir, $name, $type, $width = 0, $height = 0, $qualit
 	if (!file_exists(PUN_ROOT.$dir.$name.'.'.$type)) return false;
 	if (!file_exists(PUN_ROOT.$dir.$name.'.'.$type)) return false;
 	@chmod(PUN_ROOT.$dir.$name.'.'.$type, 0644);
 	@chmod(PUN_ROOT.$dir.$name.'.'.$type, 0644);
 
 
-  return array($name, $type);
+	return array($name, $type);
 }
 }
 
 
 function isXSSattack ($file)
 function isXSSattack ($file)

+ 6 - 3
include/user_agent.php

@@ -1,7 +1,7 @@
 <?php
 <?php
 
 
 /**
 /**
- * Copyright (C) 2014-2015 Visman (mio.visman@yandex.ru)
+ * Copyright (C) 2014-2016 Visman (mio.visman@yandex.ru)
  * Copyright (C) 2012 Daris (daris91@gmail.com)
  * Copyright (C) 2012 Daris (daris91@gmail.com)
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  */
@@ -30,7 +30,7 @@ function get_useragent_names($usrag)
 	$usrag = strtolower($usrag);
 	$usrag = strtolower($usrag);
 	
 	
 	// Browser detection
 	// Browser detection
-	$browsers = array('Opera', 'Avant', 'Maxthon', 'Edge', 'MSIE', 'OPR', 'YaBrowser', 'Chromium', 'Chrome', 'Arora', 'Epiphany', 'Galeon', 'iCab', 'Konqueror', 'Safari', 'Flock', 'Iceweasel', 'SeaMonkey', 'Netscape', 'K-Meleon', 'Firefox', 'Camino', 'Trident');
+	$browsers = array('Opera', 'Avant', 'Maxthon', 'Edge', 'MSIE', 'OPR', 'YaBrowser', 'Chromium', 'Vivaldi', 'Chrome', 'Arora', 'Epiphany', 'Galeon', 'iCab', 'Konqueror', 'Safari', 'Flock', 'Iceweasel', 'SeaMonkey', 'Netscape', 'K-Meleon', 'Firefox', 'Camino', 'Trident');
 
 
 	$browser = ua_search_for_item($browsers, $usrag);
 	$browser = ua_search_for_item($browsers, $usrag);
 
 
@@ -58,7 +58,7 @@ function get_useragent_names($usrag)
 		$browser = 'Opera';
 		$browser = 'Opera';
 
 
 	// System detection
 	// System detection
-	$systems = array('Windows', 'Linux', 'Mac', 'Amiga', 'BeOS', 'FreeBSD', 'HP-UX', 'NetBSD', 'OS/2', 'SunOS', 'Symbian', 'Unix', 'J2ME/MIDP');
+	$systems = array('Windows', 'Linux', 'Mac', 'Android', 'Amiga', 'BeOS', 'FreeBSD', 'HP-UX', 'NetBSD', 'OS/2', 'SunOS', 'Symbian', 'Unix', 'J2ME/MIDP', 'BlackBerry', 'BB10');
 	
 	
 	$system = ua_search_for_item($systems, $usrag);
 	$system = ua_search_for_item($systems, $usrag);
 	
 	
@@ -106,6 +106,9 @@ function get_useragent_names($usrag)
 	elseif ($system == 'Mac')
 	elseif ($system == 'Mac')
 		$system = 'Macintosh';
 		$system = 'Macintosh';
 
 
+	elseif ($system == 'BB10')
+		$system = 'BlackBerry';
+
 	if (empty($browser_img))
 	if (empty($browser_img))
 		$browser_img = $browser;
 		$browser_img = $browser;
 
 

+ 8 - 6
index.php

@@ -116,19 +116,21 @@ if ($pun_config['o_users_online'] == '1')
 	{
 	{
 		if (strpos($online_name, '[Bot]') !== false)
 		if (strpos($online_name, '[Bot]') !== false)
 		{
 		{
-		   ++$num_bots;
-		   $arr_o_name = explode('[Bot]', $online_name);
-		   if (empty($bots[$arr_o_name[1]])) $bots[$arr_o_name[1]] = 1;
-		   else ++$bots[$arr_o_name[1]];
+			++$num_bots;
+			$arr_o_name = explode('[Bot]', $online_name);
+			if (empty($bots[$arr_o_name[1]]))
+				$bots[$arr_o_name[1]] = 1;
+			else
+				++$bots[$arr_o_name[1]];
 		}
 		}
 	}
 	}
 	foreach ($bots as $online_name => $online_id)
 	foreach ($bots as $online_name => $online_id)
 	{
 	{
-		   $users[] = "\n\t\t\t\t".'<dd>[Bot] '.pun_htmlspecialchars($online_name.($online_id > 1 ? ' ('.$online_id.')' : ''));
+		$users[] = "\n\t\t\t\t".'<dd>[Bot] '.pun_htmlspecialchars($online_name.($online_id > 1 ? ' ('.$online_id.')' : ''));
 	}
 	}
 	echo "\t\t\t\t".'<dd><span>'.sprintf($lang_index['Users online'], '<strong>'.forum_number_format($num_users).'</strong>').', '.sprintf($lang_index['Guests online'], '<strong>'.forum_number_format($num_guests).'</strong>').'</span></dd>'."\n";
 	echo "\t\t\t\t".'<dd><span>'.sprintf($lang_index['Users online'], '<strong>'.forum_number_format($num_users).'</strong>').', '.sprintf($lang_index['Guests online'], '<strong>'.forum_number_format($num_guests).'</strong>').'</span></dd>'."\n";
 
 
-  // max users - Visman
+	// max users - Visman
 	echo "\t\t\t\t".'<dd><span>'. $lang_index['Most online1'].' ('.$pun_config['st_max_users'].') '.$lang_index['Most online2'].' '.format_time($pun_config['st_max_users_time']).'</span></dd>'."\n\t\t\t".'</dl>'."\n";
 	echo "\t\t\t\t".'<dd><span>'. $lang_index['Most online1'].' ('.$pun_config['st_max_users'].') '.$lang_index['Most online2'].' '.format_time($pun_config['st_max_users_time']).'</span></dd>'."\n\t\t\t".'</dl>'."\n";
 
 
 	if ($num_users + $num_bots > 0)
 	if ($num_users + $num_bots > 0)

+ 42 - 42
install.php

@@ -7,9 +7,9 @@
  */
  */
 
 
 // The FluxBB version this script installs
 // The FluxBB version this script installs
-define('FORUM_VERSION', '1.5.9');
+define('FORUM_VERSION', '1.5.10');
 
 
-define('FORUM_VER_REVISION', 74);	// номер сборки - Visman
+define('FORUM_VER_REVISION', 75);	// номер сборки - Visman
 
 
 define('FORUM_DB_REVISION', 21);
 define('FORUM_DB_REVISION', 21);
 define('FORUM_SI_REVISION', 2.1);
 define('FORUM_SI_REVISION', 2.1);
@@ -112,7 +112,7 @@ function generate_config_file()
 {
 {
 	global $db_type, $db_host, $db_name, $db_username, $db_password, $db_prefix, $cookie_name, $cookie_seed, $salt1;
 	global $db_type, $db_host, $db_name, $db_username, $db_password, $db_prefix, $cookie_name, $cookie_seed, $salt1;
 
 
-	return '<?php'."\n\n".'$db_type = \''.$db_type."';\n".'$db_host = \''.$db_host."';\n".'$db_name = \''.addslashes($db_name)."';\n".'$db_username = \''.addslashes($db_username)."';\n".'$db_password = \''.addslashes($db_password)."';\n".'$db_prefix = \''.addslashes($db_prefix)."';\n".'$p_connect = false;'."\n\n".'$cookie_name = '."'".$cookie_name."';\n".'$cookie_domain = '."'';\n".'$cookie_path = '."'/';\n".'$cookie_secure = 0;'."\n".'$cookie_seed = \''.random_key(16, false, true)."';\n\n".'$salt1 = \''.$salt1."';\n\ndefine('PUN', 1);\n"."\ndefine('PUN_DEBUG', 1);\n//define('PUN_SHOW_QUERIES', 1);\ndefine('PUN_MAX_POSTSIZE', 65535);\n".'//define(\'FORUM_EOL\', "\r\n"); // possible values can be PHP_EOL, "\r\n", "\n" or "\r"'."\n//define('FORUM_UA_OFF', 1);\ndefine('FORUM_AJAX_JQUERY', '//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js');\n";
+	return '<?php'."\n\n".'$db_type = \''.$db_type."';\n".'$db_host = \''.$db_host."';\n".'$db_name = \''.addslashes($db_name)."';\n".'$db_username = \''.addslashes($db_username)."';\n".'$db_password = \''.addslashes($db_password)."';\n".'$db_prefix = \''.addslashes($db_prefix)."';\n".'$p_connect = false;'."\n\n".'$cookie_name = '."'".$cookie_name."';\n".'$cookie_domain = '."'';\n".'$cookie_path = '."'/';\n".'$cookie_secure = 0;'."\n".'$cookie_seed = \''.random_key(16, false, true)."';\n\n".'$salt1 = \''.$salt1."';\n\ndefine('PUN', 1);\n"."\ndefine('PUN_DEBUG', 1);\n//define('PUN_SHOW_QUERIES', 1);\ndefine('PUN_MAX_POSTSIZE', 65535);\n".'//define(\'FORUM_EOL\', "\r\n"); // possible values can be PHP_EOL, "\r\n", "\n" or "\r"'."\n//define('FORUM_UA_OFF', 1);\ndefine('FORUM_AJAX_JQUERY', '//ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js');\n";
 }
 }
 
 
 
 
@@ -129,7 +129,7 @@ if (isset($_POST['generate_config']))
 	$db_prefix = $_POST['db_prefix'];
 	$db_prefix = $_POST['db_prefix'];
 	$cookie_name = $_POST['cookie_name'];
 	$cookie_name = $_POST['cookie_name'];
 	$cookie_seed = $_POST['cookie_seed'];
 	$cookie_seed = $_POST['cookie_seed'];
-	$salt1 = $_POST['req_salt'];  // cоль для паролей - Visman
+	$salt1 = $_POST['req_salt']; // cоль для паролей - Visman
 
 
 	echo generate_config_file();
 	echo generate_config_file();
 	exit;
 	exit;
@@ -170,7 +170,7 @@ else
 	$base_url = pun_trim($_POST['req_base_url']);
 	$base_url = pun_trim($_POST['req_base_url']);
 	$default_lang = pun_trim($_POST['req_default_lang']);
 	$default_lang = pun_trim($_POST['req_default_lang']);
 	$default_style = pun_trim($_POST['req_default_style']);
 	$default_style = pun_trim($_POST['req_default_style']);
-	$salt1 = pun_trim($_POST['req_salt']);  // cоль для паролей - Visman
+	$salt1 = pun_trim($_POST['req_salt']); // cоль для паролей - Visman
 	$alerts = array();
 	$alerts = array();
 
 
 	// Make sure base_url doesn't end with a slash
 	// Make sure base_url doesn't end with a slash
@@ -583,9 +583,9 @@ else
 	// Check if InnoDB is available
 	// Check if InnoDB is available
 	if ($db_type == 'mysql_innodb' || $db_type == 'mysqli_innodb')
 	if ($db_type == 'mysql_innodb' || $db_type == 'mysqli_innodb')
 	{
 	{
-		$result = $db->query('SHOW VARIABLES LIKE \'have_innodb\'');
-		list (, $result) = $db->fetch_row($result);
-		if ((strtoupper($result) != 'YES'))
+		$result = $db->query('SELECT SUPPORT FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE=\'InnoDB\'');
+		$result = $db->result($result);
+		if (!in_array($result, array('YES', 'DEFAULT')))
 			error($lang_install['InnoDB off']);
 			error($lang_install['InnoDB off']);
 	}
 	}
 
 
@@ -782,7 +782,7 @@ else
 				'datatype'		=> 'VARCHAR(200)',
 				'datatype'		=> 'VARCHAR(200)',
 				'allow_null'	=> true
 				'allow_null'	=> true
 			),
 			),
-			'last_topic'	=> array(               // last topic on index - Visman
+			'last_topic'	=> array( // last topic on index - Visman
 				'datatype'		=> 'VARCHAR(255)',
 				'datatype'		=> 'VARCHAR(255)',
 				'allow_null'	=> true
 				'allow_null'	=> true
 			),
 			),
@@ -801,12 +801,12 @@ else
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=>	'0'
 				'default'		=>	'0'
 			),
 			),
-			'no_sum_mess'		=> array(             // no sum - Visman
+			'no_sum_mess'		=> array( // no sum - Visman
 				'datatype'		=> 'TINYINT(1)',
 				'datatype'		=> 'TINYINT(1)',
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=> '0'
 				'default'		=> '0'
 			),
 			),
-			'parent_forum_id' => array(           // subforums - Visman
+			'parent_forum_id' => array( // subforums - Visman
 				'datatype'		=> 'INT(10) UNSIGNED',
 				'datatype'		=> 'INT(10) UNSIGNED',
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=>	'0'
 				'default'		=>	'0'
@@ -953,12 +953,12 @@ else
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=> '60'
 				'default'		=> '60'
 			),
 			),
-			'g_deledit_interval' => array(   // мод ограничения времени - Visman
+			'g_deledit_interval' => array( // мод ограничения времени - Visman
 				'datatype'		=> 'INT(10)',
 				'datatype'		=> 'INT(10)',
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=> '0'
 				'default'		=> '0'
 			),
 			),
-			'g_pm' => array(                 // New PMS - Visman
+			'g_pm' => array( // New PMS - Visman
 				'datatype'		=> 'TINYINT(1)',
 				'datatype'		=> 'TINYINT(1)',
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=> '1'
 				'default'		=> '1'
@@ -1065,7 +1065,7 @@ else
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=> '0'
 				'default'		=> '0'
 			),
 			),
-			'edit_post'	=> array(                    // мод ограничения времени - Visman
+			'edit_post'	=> array( // мод ограничения времени - Visman
 				'datatype'		=> 'TINYINT(1)',
 				'datatype'		=> 'TINYINT(1)',
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=> '0'
 				'default'		=> '0'
@@ -1083,8 +1083,8 @@ else
 				'datatype'		=> 'VARCHAR(200)',
 				'datatype'		=> 'VARCHAR(200)',
 				'allow_null'	=> true
 				'allow_null'	=> true
 			),
 			),
-			'user_agent'		=> array(
-				'datatype'		=> 'VARCHAR(255)',      // MOD user agent - Visman
+			'user_agent'		=> array( // MOD user agent - Visman
+				'datatype'		=> 'VARCHAR(255)',
 				'allow_null'	=> true
 				'allow_null'	=> true
 			),
 			),
 			'topic_id'		=> array(
 			'topic_id'		=> array(
@@ -1338,7 +1338,7 @@ else
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=> '0'
 				'default'		=> '0'
 			),
 			),
-			'stick_fp'		=> array(                     // StickFP - Visman
+			'stick_fp'		=> array( // StickFP - Visman
 				'datatype'		=> 'TINYINT(1)',
 				'datatype'		=> 'TINYINT(1)',
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=> '0'
 				'default'		=> '0'
@@ -1352,7 +1352,7 @@ else
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=> '0'
 				'default'		=> '0'
 			),
 			),
-			'poll_type'		=> array(                     // POLL - Visman
+			'poll_type'		=> array( // POLL - Visman
 				'datatype'		=> 'TINYINT(4)',
 				'datatype'		=> 'TINYINT(4)',
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=> '0'
 				'default'		=> '0'
@@ -1737,7 +1737,7 @@ else
 				'datatype'		=> 'VARCHAR(8)',
 				'datatype'		=> 'VARCHAR(8)',
 				'allow_null'	=> true
 				'allow_null'	=> true
 			),
 			),
-			'messages_enable'		=> array(                 // New PMS - Visman
+			'messages_enable'		=> array( // New PMS - Visman
 				'datatype'		=> 'TINYINT(1)',
 				'datatype'		=> 'TINYINT(1)',
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=> '1'
 				'default'		=> '1'
@@ -1766,7 +1766,7 @@ else
 				'datatype'		=> 'INT(10) UNSIGNED',
 				'datatype'		=> 'INT(10) UNSIGNED',
 				'allow_null'	=> true
 				'allow_null'	=> true
 			),
 			),
-			'warning_flag'		=> array(                    // MOD warnings - Visman
+			'warning_flag'		=> array( // MOD warnings - Visman
 				'datatype'		=> 'TINYINT(1)',
 				'datatype'		=> 'TINYINT(1)',
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=> '0'
 				'default'		=> '0'
@@ -1776,7 +1776,7 @@ else
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=> '0'
 				'default'		=> '0'
 			),
 			),
-			'gender'			=> array(                       // поле для пола - Visman
+			'gender'			=> array( // поле для пола - Visman
 				'datatype'		=> 'TINYINT(4) UNSIGNED',
 				'datatype'		=> 'TINYINT(4) UNSIGNED',
 				'allow_null'	=> false,
 				'allow_null'	=> false,
 				'default'		=> '0'
 				'default'		=> '0'
@@ -1847,7 +1847,7 @@ else
 	$i = 0;
 	$i = 0;
 	foreach ($smilies as $text => $img)
 	foreach ($smilies as $text => $img)
 	{
 	{
-		$db->query('INSERT INTO '.$db->prefix.'smilies (image, text, disp_position)  VALUES(\''.$img.'\', \''.$db->escape($text).'\', '.$i.')') or error('Unable to add smiley', __FILE__, __LINE__, $db->error());
+		$db->query('INSERT INTO '.$db->prefix.'smilies (image, text, disp_position) VALUES(\''.$img.'\', \''.$db->escape($text).'\', '.$i.')') or error('Unable to add smiley', __FILE__, __LINE__, $db->error());
 		$i++;
 		$i++;
 	}
 	}
 	// Create "smilies" table - Visman
 	// Create "smilies" table - Visman
@@ -1888,28 +1888,28 @@ else
 	$schema = array(
 	$schema = array(
 			'FIELDS'			=> array(
 			'FIELDS'			=> array(
 					'tid'				=> array(
 					'tid'				=> array(
-							'datatype'			=> 'INT(10) UNSIGNED',
-							'allow_null'    	=> false,
+							'datatype'		=> 'INT(10) UNSIGNED',
+							'allow_null'	=> false,
 							'default'			=> '0'
 							'default'			=> '0'
 					),
 					),
 					'question'			=> array(
 					'question'			=> array(
-							'datatype'			=> 'TINYINT(4)',
-							'allow_null'    	=> false,
+							'datatype'		=> 'TINYINT(4)',
+							'allow_null'	=> false,
 							'default'			=> '0'
 							'default'			=> '0'
 					),
 					),
 					'field'			=> array(
 					'field'			=> array(
-							'datatype'			=> 'TINYINT(4)',
-							'allow_null'    	=> false,
+							'datatype'		=> 'TINYINT(4)',
+							'allow_null'	=> false,
 							'default'			=> '0'
 							'default'			=> '0'
 					),
 					),
 					'choice'			=> array(
 					'choice'			=> array(
-							'datatype'			=> 'VARCHAR(255)',
-							'allow_null'    	=> false,
+							'datatype'		=> 'VARCHAR(255)',
+							'allow_null'	=> false,
 							'default'			=> '\'\''
 							'default'			=> '\'\''
 					),
 					),
 					'votes'				=> array(
 					'votes'				=> array(
-							'datatype'			=> 'INT(10) UNSIGNED',
-							'allow_null'    	=> false,
+							'datatype'		=> 'INT(10) UNSIGNED',
+							'allow_null'	=> false,
 							'default'			=> '0'
 							'default'			=> '0'
 					)
 					)
 
 
@@ -1921,16 +1921,16 @@ else
 	$schema = array(
 	$schema = array(
 			'FIELDS'			=> array(
 			'FIELDS'			=> array(
 					'tid'				=> array(
 					'tid'				=> array(
-							'datatype'			=> 'INT(10) UNSIGNED',
-							'allow_null'    	=> false
+							'datatype'		=> 'INT(10) UNSIGNED',
+							'allow_null'	=> false
 					),
 					),
 					'uid'			=> array(
 					'uid'			=> array(
-							'datatype'			=> 'INT(10) UNSIGNED',
-							'allow_null'		=> false
+							'datatype'		=> 'INT(10) UNSIGNED',
+							'allow_null'	=> false
 					),
 					),
 					'rez'			=> array(
 					'rez'			=> array(
-							'datatype'			=> 'TEXT',
-							'allow_null'    	=> true
+							'datatype'		=> 'TEXT',
+							'allow_null'	=> true
 					)
 					)
 			),
 			),
 			'PRIMARY KEY'		=> array('tid', 'uid')
 			'PRIMARY KEY'		=> array('tid', 'uid')
@@ -1966,7 +1966,7 @@ else
 	// Insert config data
 	// Insert config data
 	$pun_config = array(
 	$pun_config = array(
 		'o_cur_version'				=> FORUM_VERSION,
 		'o_cur_version'				=> FORUM_VERSION,
-		'o_cur_ver_revision'	=> FORUM_VER_REVISION,     // номер сборки - Visman
+		'o_cur_ver_revision'	=> FORUM_VER_REVISION, // номер сборки - Visman
 		'o_database_revision'		=> FORUM_DB_REVISION,
 		'o_database_revision'		=> FORUM_DB_REVISION,
 		'o_searchindex_revision'	=> FORUM_SI_REVISION,
 		'o_searchindex_revision'	=> FORUM_SI_REVISION,
 		'o_parser_revision'			=> FORUM_PARSER_REVISION,
 		'o_parser_revision'			=> FORUM_PARSER_REVISION,
@@ -2061,9 +2061,9 @@ else
 		'o_crypto_enable'			=> 1,	// случайные имена полей форм - Visman
 		'o_crypto_enable'			=> 1,	// случайные имена полей форм - Visman
 		'o_crypto_pas'				=> random_pass(25),
 		'o_crypto_pas'				=> random_pass(25),
 		'o_crypto_salt'				=> random_pass(13),
 		'o_crypto_salt'				=> random_pass(13),
-		'o_enable_acaptcha'   => 1, // математическая каптча
-		'st_max_users'        => 1,	// статистика по максимуму юзеров - Visman
-		'st_max_users_time'   => time(),
+		'o_enable_acaptcha'		=> 1, // математическая каптча
+		'st_max_users'				=> 1,	// статистика по максимуму юзеров - Visman
+		'st_max_users_time'		=> time(),
 	);
 	);
 
 
 	foreach ($pun_config as $conf_name => $conf_value)
 	foreach ($pun_config as $conf_name => $conf_value)

Різницю між файлами не показано, бо вона завелика
+ 0 - 1
js/media.min.js


+ 1 - 1
lang/English/admin_plugin_pms_new.php

@@ -16,6 +16,6 @@ $lang_apmsn = array(
 'Legend3' => 'Additional options',
 'Legend3' => 'Additional options',
 'Q1' => 'Enable PMS.',
 'Q1' => 'Enable PMS.',
 'Q3' => 'Minimum number of posts a user must have made to send private messages.',
 'Q3' => 'Minimum number of posts a user must have made to send private messages.',
-'Q2' => 'For notification of new private messages, use <img style="border: 0 none; vertical-align: middle;" src="img/flasher.gif" alt="flasher" /> instead of popup window.',
+'Q2' => 'For notification of new private messages, use <span class="remflasher">&#160;</span> instead of popup window.',
 
 
 );
 );

+ 1 - 1
lang/English/help.php

@@ -8,7 +8,7 @@ $lang_help = array(
 
 
 'BBCode'				=>	'BBCode',
 'BBCode'				=>	'BBCode',
 'BBCode info 1'			=>	'BBCode is a collection of formatting tags that are used to change the look of text in this forum. BBCode is based on the same principal as, and is very similar to, HTML. Below is a list of all the available BBCodes and instructions on how to use them.',
 'BBCode info 1'			=>	'BBCode is a collection of formatting tags that are used to change the look of text in this forum. BBCode is based on the same principal as, and is very similar to, HTML. Below is a list of all the available BBCodes and instructions on how to use them.',
-'BBCode info 2'			=>	'Administrators have the ability to enable or disable BBCode. You can tell if BBCode is enabled or disabled out in the left margin whenever you post a message or edit your signature.',
+'BBCode info 2'			=>	'Administrators have the ability to enable or disable BBCode. You can tell if BBCode is enabled or disabled whenever you post a message or edit your signature.',
 
 
 'Text style'			=>	'Text style',
 'Text style'			=>	'Text style',
 'Text style info'		=>	'The following tags change the appearance of text:',
 'Text style info'		=>	'The following tags change the appearance of text:',

+ 1 - 1
lang/English/mail_templates/new_reply.tpl

@@ -4,7 +4,7 @@ Subject: Reply to topic: '<topic_subject>'
 
 
 The post is located at <post_url>
 The post is located at <post_url>
 
 
-You can unsubscribe by going to <unsubscribe_url>
+You can unsubscribe by going to <unsubscribe_url> and clicking the Unsubscribe link at the bottom of the page.
 
 
 --
 --
 <board_mailer> Mailer
 <board_mailer> Mailer

+ 1 - 1
lang/English/mail_templates/new_reply_full.tpl

@@ -11,7 +11,7 @@ The message reads as follows:
 
 
 -----------------------------------------------------------------------
 -----------------------------------------------------------------------
 
 
-You can unsubscribe by going to <unsubscribe_url>
+You can unsubscribe by going to <unsubscribe_url> and clicking the Unsubscribe link at the bottom of the page.
 
 
 --
 --
 <board_mailer> Mailer
 <board_mailer> Mailer

+ 1 - 1
lang/English/mail_templates/new_topic.tpl

@@ -4,7 +4,7 @@ Subject: New topic in forum: '<forum_name>'
 
 
 The topic is located at <topic_url>
 The topic is located at <topic_url>
 
 
-You can unsubscribe by going to <unsubscribe_url>
+You can unsubscribe by going to <unsubscribe_url> and clicking the Unsubscribe link at the bottom of the page.
 
 
 --
 --
 <board_mailer> Mailer
 <board_mailer> Mailer

+ 1 - 1
lang/English/mail_templates/new_topic_full.tpl

@@ -11,7 +11,7 @@ The message reads as follows:
 
 
 -----------------------------------------------------------------------
 -----------------------------------------------------------------------
 
 
-You can unsubscribe by going to <unsubscribe_url>
+You can unsubscribe by going to <unsubscribe_url> and clicking the Unsubscribe link at the bottom of the page.
 
 
 --
 --
 <board_mailer> Mailer
 <board_mailer> Mailer

+ 1 - 1
lang/Russian/admin_plugin_pms_new.php

@@ -16,6 +16,6 @@ $lang_apmsn = array(
 'Legend3' => 'Дополнительные настройки',
 'Legend3' => 'Дополнительные настройки',
 'Q1' => 'Использовать систему личных сообщений на форуме.',
 'Q1' => 'Использовать систему личных сообщений на форуме.',
 'Q3' => 'Количество сообщений, которое должен иметь юзер для возможности отправки ЛС.',
 'Q3' => 'Количество сообщений, которое должен иметь юзер для возможности отправки ЛС.',
-'Q2' => 'Вместо окна предупреждающего о новых ЛС использовать <img style="border: 0 none; vertical-align: middle;" src="img/flasher.gif" alt="flasher" />',
+'Q2' => 'Вместо окна предупреждающего о новых ЛС использовать <span class="remflasher">&#160;</span>',
 
 
 );
 );

+ 1 - 1
lang/Russian/help.php

@@ -8,7 +8,7 @@ $lang_help = array(
 
 
 'BBCode' => 'BB-коды',
 'BBCode' => 'BB-коды',
 'BBCode info 1' => 'BB-коды — это набор тегов форматирования, которые влияют на оформление текста на данном форуме. BB-коды работают по тому же принципу и внешне очень похожи на HTML. Ниже представлен список доступных BB-кодов и пояснения по их применению.',
 'BBCode info 1' => 'BB-коды — это набор тегов форматирования, которые влияют на оформление текста на данном форуме. BB-коды работают по тому же принципу и внешне очень похожи на HTML. Ниже представлен список доступных BB-кодов и пояснения по их применению.',
-'BBCode info 2' => 'Администратор может включать и отключать BB-коды. Когда BB-коды доступны, рядом с полем ввода текста появляется ссылка на раздел справки по BB-кодам.',
+'BBCode info 2' => 'Администратор может включать и отключать BB-коды. Рядом с полем ввода текста отображается состояние вкл./выкл. BB-кодов.',
 
 
 'Text style' => 'Стиль текста',
 'Text style' => 'Стиль текста',
 'Text style info' => 'Эти теги управляют отображением текста:',
 'Text style info' => 'Эти теги управляют отображением текста:',

+ 1 - 1
lang/Russian/login.php

@@ -5,7 +5,7 @@ $lang_login = array(
 
 
 // Miscellaneous
 // Miscellaneous
 'Login errors' => 'Ошибки входа на форум',
 'Login errors' => 'Ошибки входа на форум',
-'Login errors info' => 'Следующие ошибки нужно исправить, чтобы войти на форум:',
+'Login errors info' => 'Следующие ошибки необходимо исправить, чтобы войти на форум:',
 'Wrong user/pass' => 'Неверное имя и/или пароль. Имя и пароль чувствительны к регистру!',
 'Wrong user/pass' => 'Неверное имя и/или пароль. Имя и пароль чувствительны к регистру!',
 'Forgotten pass' => 'Забыли пароль?',
 'Forgotten pass' => 'Забыли пароль?',
 'Login redirect' => 'Успешный вход. Переадресация &hellip;',
 'Login redirect' => 'Успешный вход. Переадресация &hellip;',

+ 2 - 2
lang/Russian/mail_templates/new_reply.tpl

@@ -4,8 +4,8 @@ Subject: Ответ в теме: '<topic_subject>'
 
 
 Адрес сообщения <post_url>
 Адрес сообщения <post_url>
 
 
-Вы можете снять подписку с темы по этой ссылке: <unsubscribe_url>
+Вы можете снять подписку с темы перейдя по этой ссылке <unsubscribe_url> и нажав 'Отказаться от подписки' внизу страницы.
 
 
 --
 --
 Отправитель <board_mailer>
 Отправитель <board_mailer>
-(Не отвечайте на это сообщение)
+(Не отвечайте на это сообщение)

+ 2 - 2
lang/Russian/mail_templates/new_reply_full.tpl

@@ -11,8 +11,8 @@ Subject: Ответ в теме: '<topic_subject>'
 
 
 -----------------------------------------------------------------------
 -----------------------------------------------------------------------
 
 
-Вы можете снять подписку с темы по этой ссылке: <unsubscribe_url>
+Вы можете снять подписку с темы перейдя по этой ссылке <unsubscribe_url> и нажав 'Отказаться от подписки' внизу страницы.
 
 
 --
 --
 Отправитель <board_mailer>
 Отправитель <board_mailer>
-(Не отвечайте на это сообщение)
+(Не отвечайте на это сообщение)

+ 1 - 1
lang/Russian/mail_templates/new_topic.tpl

@@ -4,7 +4,7 @@ Subject: Новая тема в разделе: '<forum_name>'
 
 
 Адрес новой темы <topic_url>
 Адрес новой темы <topic_url>
 
 
-Вы можете снять подписку с раздела по этой ссылке: <unsubscribe_url>
+Вы можете снять подписку с раздела перейдя по этой ссылке <unsubscribe_url> и нажав 'Отказаться от подписки' внизу страницы.
 
 
 --
 --
 Отправитель <board_mailer>
 Отправитель <board_mailer>

+ 1 - 1
lang/Russian/mail_templates/new_topic_full.tpl

@@ -11,7 +11,7 @@ Subject: Новая тема в разделе: '<forum_name>'
 
 
 -----------------------------------------------------------------------
 -----------------------------------------------------------------------
 
 
-Вы можете снять подписку с раздела по этой ссылке: <unsubscribe_url>
+Вы можете снять подписку с раздела перейдя по этой ссылке <unsubscribe_url> и нажав 'Отказаться от подписки' внизу страницы.
 
 
 --
 --
 Отправитель <board_mailer>
 Отправитель <board_mailer>

+ 2 - 2
lang/Russian/mail_templates/welcome.tpl

@@ -5,8 +5,8 @@ Subject: Добро пожаловать на <board_title>!
 Пользователь: <username>
 Пользователь: <username>
 Пароль: <password>
 Пароль: <password>
 
 
-Зарегистрируйтесь по адресу <login_url> чтобы активировать аккаунт.
+Залогиньтесь на странице <login_url> чтобы активировать аккаунт.
 
 
 --
 --
 Отправитель <board_mailer>
 Отправитель <board_mailer>
-(Не отвечайте на это сообщение)
+(Не отвечайте на это сообщение)

+ 1 - 1
login.php

@@ -95,7 +95,7 @@ if (isset($_POST['form_sent']) && $action == 'in')
 			if ($cur_user['g_id'] == PUN_ADMIN || $cur_user['g_moderator'] == '1')
 			if ($cur_user['g_id'] == PUN_ADMIN || $cur_user['g_moderator'] == '1')
 				$db->query('UPDATE '.$db->prefix.'users SET registration_ip=\''.$db->escape(get_remote_address()).'\' WHERE id='.$cur_user['id']) or error('Unable to update user IP', __FILE__, __LINE__, $db->error());
 				$db->query('UPDATE '.$db->prefix.'users SET registration_ip=\''.$db->escape(get_remote_address()).'\' WHERE id='.$cur_user['id']) or error('Unable to update user IP', __FILE__, __LINE__, $db->error());
 		}
 		}
-    
+
 		// Remove this users guest entry from the online list
 		// Remove this users guest entry from the online list
 		$db->query('DELETE FROM '.$db->prefix.'online WHERE ident=\''.$db->escape(get_remote_address()).'\'') or error('Unable to delete from online list', __FILE__, __LINE__, $db->error());
 		$db->query('DELETE FROM '.$db->prefix.'online WHERE ident=\''.$db->escape(get_remote_address()).'\'') or error('Unable to delete from online list', __FILE__, __LINE__, $db->error());
 
 

+ 1 - 1
misc.php

@@ -403,7 +403,7 @@ else if ($action == 'unsubscribe')
 	if ($pun_user['is_guest'])
 	if ($pun_user['is_guest'])
 		message($lang_common['No permission'], false, '403 Forbidden');
 		message($lang_common['No permission'], false, '403 Forbidden');
 
 
-	confirm_referrer('misc.php', false, false);
+	confirm_referrer('misc.php');
 
 
 	$topic_id = isset($_GET['tid']) ? intval($_GET['tid']) : 0;
 	$topic_id = isset($_GET['tid']) ? intval($_GET['tid']) : 0;
 	$forum_id = isset($_GET['fid']) ? intval($_GET['fid']) : 0;
 	$forum_id = isset($_GET['fid']) ? intval($_GET['fid']) : 0;

+ 4 - 4
moderate.php

@@ -36,7 +36,7 @@ if (isset($_GET['get_host']))
 	// Load the misc.php language file
 	// Load the misc.php language file
 	require PUN_ROOT.'lang/'.$pun_user['language'].'/misc.php';
 	require PUN_ROOT.'lang/'.$pun_user['language'].'/misc.php';
 
 
-	message(sprintf($lang_misc['Host info 1'], $ip).'<br />'.sprintf($lang_misc['Host info 2'], @gethostbyaddr($ip)).'<br /><br /><a href="admin_users.php?show_users='.$ip.'">'.$lang_misc['Show more users'].'</a>');
+	message(sprintf($lang_misc['Host info 1'], $ip).'<br />'.sprintf($lang_misc['Host info 2'], pun_htmlspecialchars(@gethostbyaddr($ip))).'<br /><br /><a href="admin_users.php?show_users='.$ip.'">'.$lang_misc['Show more users'].'</a>');
 }
 }
 
 
 
 
@@ -323,7 +323,7 @@ if (isset($_GET['tid']))
 
 
 				// перемещаем
 				// перемещаем
 				$add_text = '[color=#808080][i] '.$lang_misc['Post from topic'].' "'.$cur_topic['subject'].'"[/i]. '.$pun_user['username'].'[/color][hr]';
 				$add_text = '[color=#808080][i] '.$lang_misc['Post from topic'].' "'.$cur_topic['subject'].'"[/i]. '.$pun_user['username'].'[/color][hr]';
-				$db->query('UPDATE '.$db->prefix.'posts  SET topic_id='.$move_to_topic.', message=CONCAT(\''.$db->escape($add_text).'\', message) WHERE topic_id='.$tid.' AND id IN('.$posts.')') or error('Unable to update posts/topic', __FILE__, __LINE__, $db->error());
+				$db->query('UPDATE '.$db->prefix.'posts SET topic_id='.$move_to_topic.', message=CONCAT(\''.$db->escape($add_text).'\', message) WHERE topic_id='.$tid.' AND id IN('.$posts.')') or error('Unable to update posts/topic', __FILE__, __LINE__, $db->error());
 
 
 				// обновим темы
 				// обновим темы
 				$num_posts_deleted = substr_count($posts, ',') + 1;
 				$num_posts_deleted = substr_count($posts, ',') + 1;
@@ -406,7 +406,7 @@ if (isset($_GET['tid']))
 		$cur_category = 0;
 		$cur_category = 0;
 		while ($cur_forum = $db->fetch_assoc($result))
 		while ($cur_forum = $db->fetch_assoc($result))
 		{
 		{
-			if ($cur_forum['cid'] != $cur_category)    // A new category since last iteration?
+			if ($cur_forum['cid'] != $cur_category) // A new category since last iteration?
 			{
 			{
 				if ($cur_category)
 				if ($cur_category)
 					echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
 					echo "\t\t\t\t\t\t\t".'</optgroup>'."\n";
@@ -447,7 +447,7 @@ if (isset($_GET['tid']))
 
 
 	if (isset($_GET['action']) && $_GET['action'] == 'all')
 	if (isset($_GET['action']) && $_GET['action'] == 'all')
 		$pun_user['disp_posts'] = $cur_topic['num_replies'] + 1;
 		$pun_user['disp_posts'] = $cur_topic['num_replies'] + 1;
-        
+
 	// Determine the post offset (based on $_GET['p'])
 	// Determine the post offset (based on $_GET['p'])
 	$num_pages = ceil(($cur_topic['num_replies'] + 1) / $pun_user['disp_posts']);
 	$num_pages = ceil(($cur_topic['num_replies'] + 1) / $pun_user['disp_posts']);
 
 

+ 4 - 4
plugins/AP_Fancybox.php

@@ -115,7 +115,7 @@ function DeleteModInFiles ()
 // Установка плагина/мода
 // Установка плагина/мода
 if (isset($_POST['installation']))
 if (isset($_POST['installation']))
 {
 {
-	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o_fbox_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
+	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o\_fbox\_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_fbox_guest\', \'0\')') or error('Unable to insert into table config.', __FILE__, __LINE__, $db->error());
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_fbox_guest\', \'0\')') or error('Unable to insert into table config.', __FILE__, __LINE__, $db->error());
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_fbox_files\', \''.$db->escape(PLUGIN_FILES).'\')') or error('Unable to insert into table config.', __FILE__, __LINE__, $db->error());
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_fbox_files\', \''.$db->escape(PLUGIN_FILES).'\')') or error('Unable to insert into table config.', __FILE__, __LINE__, $db->error());
 
 
@@ -145,7 +145,7 @@ else if (isset($_POST['update']))
 			$fls[] = $file;
 			$fls[] = $file;
 	}
 	}
 
 
-	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o_fbox_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
+	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o\_fbox\_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_fbox_guest\', \''.$gst.'\')') or error('Unable to insert into table config.', __FILE__, __LINE__, $db->error());
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_fbox_guest\', \''.$gst.'\')') or error('Unable to insert into table config.', __FILE__, __LINE__, $db->error());
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_fbox_files\', \''.$db->escape(implode(',', $fls)).'\')') or error('Unable to insert into table config.', __FILE__, __LINE__, $db->error());
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_fbox_files\', \''.$db->escape(implode(',', $fls)).'\')') or error('Unable to insert into table config.', __FILE__, __LINE__, $db->error());
 
 
@@ -160,7 +160,7 @@ else if (isset($_POST['update']))
 // Удаление мода
 // Удаление мода
 else if (isset($_POST['delete']))
 else if (isset($_POST['delete']))
 {
 {
-	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o_fbox_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
+	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o\_fbox\_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
 
 
 	if (!defined('FORUM_CACHE_FUNCTIONS_LOADED'))
 	if (!defined('FORUM_CACHE_FUNCTIONS_LOADED'))
 		require PUN_ROOT.'include/cache.php';
 		require PUN_ROOT.'include/cache.php';
@@ -181,7 +181,7 @@ if ($file_content === false)
 $f_inst = (strpos($file_content, $fd_str) !== false);
 $f_inst = (strpos($file_content, $fd_str) !== false);
 if ($f_inst && !isset($pun_config['o_fbox_files'])) // непредвиденная ситуация при обновлении
 if ($f_inst && !isset($pun_config['o_fbox_files'])) // непредвиденная ситуация при обновлении
 {
 {
-	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o_fbox_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
+	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o\_fbox\_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_fbox_guest\', \'0\')') or error('Unable to insert into table config.', __FILE__, __LINE__, $db->error());
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_fbox_guest\', \'0\')') or error('Unable to insert into table config.', __FILE__, __LINE__, $db->error());
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_fbox_files\', \''.$db->escape(PLUGIN_FILES).'\')') or error('Unable to insert into table config.', __FILE__, __LINE__, $db->error());
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_fbox_files\', \''.$db->escape(PLUGIN_FILES).'\')') or error('Unable to insert into table config.', __FILE__, __LINE__, $db->error());
 
 

+ 1 - 1
plugins/AP_PMS_New.php

@@ -11,7 +11,7 @@ if (!defined('PUN'))
 
 
 // Tell admin_loader.php that this is indeed a plugin and that it is loaded
 // Tell admin_loader.php that this is indeed a plugin and that it is loaded
 define('PUN_PLUGIN_LOADED', 1);
 define('PUN_PLUGIN_LOADED', 1);
-define('PLUGIN_VERSION', '1.8.0');
+define('PLUGIN_VERSION', '1.8.1');
 define('PLUGIN_URL', pun_htmlspecialchars('admin_loader.php?plugin='.$plugin));
 define('PLUGIN_URL', pun_htmlspecialchars('admin_loader.php?plugin='.$plugin));
 
 
 // Load language file
 // Load language file

+ 4 - 4
plugins/AP_Poll.php

@@ -101,22 +101,22 @@ if ($pun_config['o_poll_enabled'] == '1')
 							<table class="aligntop">
 							<table class="aligntop">
 								<tr>
 								<tr>
 									<td>
 									<td>
-										<span><input type="text" name="poll_max_ques" value="<?php echo pun_htmlspecialchars($pun_config['o_poll_max_ques']) ?>"  tabindex="<?php echo ($tabindex++) ?>" size="4" maxlength="2" />&#160;&#160;<?php echo $lang_admin_plugin_poll['Q2'] ?></span>
+										<span><input type="text" name="poll_max_ques" value="<?php echo pun_htmlspecialchars($pun_config['o_poll_max_ques']) ?>" tabindex="<?php echo ($tabindex++) ?>" size="4" maxlength="2" />&#160;&#160;<?php echo $lang_admin_plugin_poll['Q2'] ?></span>
 									</td>
 									</td>
 								</tr>
 								</tr>
 								<tr>
 								<tr>
 									<td>
 									<td>
-										<span><input type="text" name="poll_max_field" value="<?php echo pun_htmlspecialchars($pun_config['o_poll_max_field']) ?>"  tabindex="<?php echo ($tabindex++) ?>" size="4" maxlength="2" />&#160;&#160;<?php echo $lang_admin_plugin_poll['Q3'] ?></span>
+										<span><input type="text" name="poll_max_field" value="<?php echo pun_htmlspecialchars($pun_config['o_poll_max_field']) ?>" tabindex="<?php echo ($tabindex++) ?>" size="4" maxlength="2" />&#160;&#160;<?php echo $lang_admin_plugin_poll['Q3'] ?></span>
 									</td>
 									</td>
 								</tr>
 								</tr>
 								<tr>
 								<tr>
 									<td>
 									<td>
-										<span><input type="text" name="poll_time" value="<?php echo pun_htmlspecialchars($pun_config['o_poll_time']) ?>"  tabindex="<?php echo ($tabindex++) ?>" size="8" maxlength="8" />&#160;&#160;<?php echo $lang_admin_plugin_poll['Q4'] ?></span>
+										<span><input type="text" name="poll_time" value="<?php echo pun_htmlspecialchars($pun_config['o_poll_time']) ?>" tabindex="<?php echo ($tabindex++) ?>" size="8" maxlength="8" />&#160;&#160;<?php echo $lang_admin_plugin_poll['Q4'] ?></span>
 									</td>
 									</td>
 								</tr>
 								</tr>
 								<tr>
 								<tr>
 									<td>
 									<td>
-										<span><input type="text" name="poll_term" value="<?php echo pun_htmlspecialchars($pun_config['o_poll_term']) ?>"  tabindex="<?php echo ($tabindex++) ?>" size="4" maxlength="2" />&#160;&#160;<?php echo $lang_admin_plugin_poll['Q5'] ?></span>
+										<span><input type="text" name="poll_term" value="<?php echo pun_htmlspecialchars($pun_config['o_poll_term']) ?>" tabindex="<?php echo ($tabindex++) ?>" size="4" maxlength="2" />&#160;&#160;<?php echo $lang_admin_plugin_poll['Q5'] ?></span>
 									</td>
 									</td>
 								</tr>
 								</tr>
 								<tr>
 								<tr>

+ 1 - 1
plugins/AP_Security.php

@@ -104,7 +104,7 @@ else
 								<tr>
 								<tr>
 									<td>
 									<td>
 										<span><?php echo $lang_admin_plugin_security['Board red help'] ?></span>
 										<span><?php echo $lang_admin_plugin_security['Board red help'] ?></span>
-										<input type="text" name="board_redirect" size="50" maxlength="255" value="<?php echo pun_htmlspecialchars($pun_config['o_board_redirect']) ?>"  tabindex="<?php echo ($tabindex++) ?>"/>
+										<input type="text" name="board_redirect" size="50" maxlength="255" value="<?php echo pun_htmlspecialchars($pun_config['o_board_redirect']) ?>" tabindex="<?php echo ($tabindex++) ?>"/>
 									</td>
 									</td>
 								</tr>
 								</tr>
 								<tr>
 								<tr>

+ 1 - 1
plugins/AP_Timelimit.php

@@ -80,7 +80,7 @@ else
 ?>
 ?>
 								<tr>
 								<tr>
 									<th class="tcl" scope="col"><?php echo pun_htmlspecialchars($cur_group['g_title']) ?></th>
 									<th class="tcl" scope="col"><?php echo pun_htmlspecialchars($cur_group['g_title']) ?></th>
-									<td><input type="text" name="g_order[<?php echo $cur_group['g_id'] ?>]" value="<?php echo $cur_group['g_deledit_interval'] ?>"  tabindex="<?php echo ($tabindex++) ?>" size="10" maxlength="10" /></td>
+									<td><input type="text" name="g_order[<?php echo $cur_group['g_id'] ?>]" value="<?php echo $cur_group['g_deledit_interval'] ?>" tabindex="<?php echo ($tabindex++) ?>" size="10" maxlength="10" /></td>
 								</tr>
 								</tr>
 <?php
 <?php
 
 

+ 8 - 8
plugins/AP_Upload.php

@@ -2,7 +2,7 @@
 
 
 /**
 /**
  * Copyright (C) 2011-2015 Visman (mio.visman@yandex.ru)
  * Copyright (C) 2011-2015 Visman (mio.visman@yandex.ru)
- * Copyright (C) 2007  BN (bnmaster@la-bnbox.info)
+ * Copyright (C) 2007 BN (bnmaster@la-bnbox.info)
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher
  */
  */
 
 
@@ -37,9 +37,9 @@ if (isset($_POST['installation']))
 	$db->add_field('groups', 'g_up_max', 'INT(10)', false, 0) or error(sprintf($lang_up['Error DB'], 'groups'), __FILE__, __LINE__, $db->error());
 	$db->add_field('groups', 'g_up_max', 'INT(10)', false, 0) or error(sprintf($lang_up['Error DB'], 'groups'), __FILE__, __LINE__, $db->error());
 	$db->add_field('groups', 'g_up_limit', 'INT(10)', false, 0) or error(sprintf($lang_up['Error DB'], 'groups'), __FILE__, __LINE__, $db->error());
 	$db->add_field('groups', 'g_up_limit', 'INT(10)', false, 0) or error(sprintf($lang_up['Error DB'], 'groups'), __FILE__, __LINE__, $db->error());
 
 
-	$db->query('UPDATE '.$db->prefix.'groups SET g_up_ext=\''.$db->escape(PLUGIN_EXTS).'\', g_up_limit=1073741824, g_up_max='.min(return_bytes(ini_get('upload_max_filesize')), return_bytes(ini_get('post_max_size'))).'  WHERE g_id='.PUN_ADMIN) or error('Unable to update user group list', __FILE__, __LINE__, $db->error());
+	$db->query('UPDATE '.$db->prefix.'groups SET g_up_ext=\''.$db->escape(PLUGIN_EXTS).'\', g_up_limit=1073741824, g_up_max='.min(return_bytes(ini_get('upload_max_filesize')), return_bytes(ini_get('post_max_size'))).' WHERE g_id='.PUN_ADMIN) or error('Unable to update user group list', __FILE__, __LINE__, $db->error());
 
 
-	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o_uploadile_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
+	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o\_uploadile\_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_uploadile_other\', \''.$db->escape(serialize($sconf)).'\')') or error($lang_up['Error DB ins-up'], __FILE__, __LINE__, $db->error());
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_uploadile_other\', \''.$db->escape(serialize($sconf)).'\')') or error($lang_up['Error DB ins-up'], __FILE__, __LINE__, $db->error());
 
 
 	if (!defined('FORUM_CACHE_FUNCTIONS_LOADED'))
 	if (!defined('FORUM_CACHE_FUNCTIONS_LOADED'))
@@ -91,7 +91,7 @@ else if (isset($_POST['update']))
 				$g_max = min($g_max, return_bytes(ini_get('upload_max_filesize')), return_bytes(ini_get('post_max_size')));
 				$g_max = min($g_max, return_bytes(ini_get('upload_max_filesize')), return_bytes(ini_get('post_max_size')));
 			}
 			}
 
 
-			$db->query('UPDATE '.$db->prefix.'groups SET g_up_ext=\''.$db->escape($g_ext).'\', g_up_limit='.$g_lim.', g_up_max='.$g_max.'  WHERE g_id='.$cur_group['g_id']) or error('Unable to update user group list', __FILE__, __LINE__, $db->error());
+			$db->query('UPDATE '.$db->prefix.'groups SET g_up_ext=\''.$db->escape($g_ext).'\', g_up_limit='.$g_lim.', g_up_max='.$g_max.' WHERE g_id='.$cur_group['g_id']) or error('Unable to update user group list', __FILE__, __LINE__, $db->error());
 		}
 		}
 
 
 	if (isset($_POST['thumb']))
 	if (isset($_POST['thumb']))
@@ -110,7 +110,7 @@ else if (isset($_POST['update']))
 	if (isset($_POST['pic_h']) && $_POST['pic_h'] >= 100)
 	if (isset($_POST['pic_h']) && $_POST['pic_h'] >= 100)
 		$sconf['pic_h'] = intval($_POST['pic_h']);
 		$sconf['pic_h'] = intval($_POST['pic_h']);
 
 
-	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o_uploadile_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
+	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o\_uploadile\_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_uploadile_other\', \''.$db->escape(serialize($sconf)).'\')') or error($lang_up['Error DB ins-up'], __FILE__, __LINE__, $db->error());
 	$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES(\'o_uploadile_other\', \''.$db->escape(serialize($sconf)).'\')') or error($lang_up['Error DB ins-up'], __FILE__, __LINE__, $db->error());
 
 
 	if (!defined('FORUM_CACHE_FUNCTIONS_LOADED'))
 	if (!defined('FORUM_CACHE_FUNCTIONS_LOADED'))
@@ -129,7 +129,7 @@ else if (isset($_POST['restore']))
 	$db->drop_field('groups', 'g_up_max') or error('Unable to drop g_up_max field', __FILE__, __LINE__, $db->error());
 	$db->drop_field('groups', 'g_up_max') or error('Unable to drop g_up_max field', __FILE__, __LINE__, $db->error());
 	$db->drop_field('groups', 'g_up_limit') or error('Unable to drop g_up_limit field', __FILE__, __LINE__, $db->error());
 	$db->drop_field('groups', 'g_up_limit') or error('Unable to drop g_up_limit field', __FILE__, __LINE__, $db->error());
 
 
-	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o_uploadile_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
+	$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name LIKE \'o\_uploadile\_%\'') or error('Unable to remove config entries', __FILE__, __LINE__, $db->error());;
 
 
 	if (!defined('FORUM_CACHE_FUNCTIONS_LOADED'))
 	if (!defined('FORUM_CACHE_FUNCTIONS_LOADED'))
 		require PUN_ROOT.'include/cache.php';
 		require PUN_ROOT.'include/cache.php';
@@ -341,8 +341,8 @@ else
 								<tr>
 								<tr>
 									<td class="tcl"><?php echo pun_htmlspecialchars($cur_group['g_title']) ?></td>
 									<td class="tcl"><?php echo pun_htmlspecialchars($cur_group['g_title']) ?></td>
 									<td class="tc2"><input type="text" name="g_up_ext[<?php echo $cur_group['g_id'] ?>]" value="<?php echo pun_htmlspecialchars($cur_group['g_up_ext']) ?>" tabindex="<?php echo $tabindex++ ?>" size="40" maxlength="255" /></td>
 									<td class="tc2"><input type="text" name="g_up_ext[<?php echo $cur_group['g_id'] ?>]" value="<?php echo pun_htmlspecialchars($cur_group['g_up_ext']) ?>" tabindex="<?php echo $tabindex++ ?>" size="40" maxlength="255" /></td>
-									<td class="tcr"><input type="text" name="g_up_max[<?php echo $cur_group['g_id'] ?>]" value="<?php echo $cur_group['g_up_max'] ?>"  tabindex="<?php echo $tabindex++ ?>" size="10" maxlength="10" <?php echo ($cur_group['g_id'] == PUN_ADMIN ? 'disabled="disabled" ' : '')?>/></td>
-									<td class="tcr"><input type="text" name="g_up_limit[<?php echo $cur_group['g_id'] ?>]" value="<?php echo $cur_group['g_up_limit'] ?>"  tabindex="<?php echo $tabindex++ ?>" size="10" maxlength="10" <?php echo ($cur_group['g_id'] == PUN_ADMIN ? 'disabled="disabled" ' : '')?>/></td>
+									<td class="tcr"><input type="text" name="g_up_max[<?php echo $cur_group['g_id'] ?>]" value="<?php echo $cur_group['g_up_max'] ?>" tabindex="<?php echo $tabindex++ ?>" size="10" maxlength="10" <?php echo ($cur_group['g_id'] == PUN_ADMIN ? 'disabled="disabled" ' : '')?>/></td>
+									<td class="tcr"><input type="text" name="g_up_limit[<?php echo $cur_group['g_id'] ?>]" value="<?php echo $cur_group['g_up_limit'] ?>" tabindex="<?php echo $tabindex++ ?>" size="10" maxlength="10" <?php echo ($cur_group['g_id'] == PUN_ADMIN ? 'disabled="disabled" ' : '')?>/></td>
 								</tr>
 								</tr>
 <?php
 <?php
 
 

+ 10 - 10
post.php

@@ -210,7 +210,7 @@ if (isset($_POST['form_sent']))
 				else
 				else
 				{
 				{
 					$message = $cur_posting['message'] . "\n\n" . $message;
 					$message = $cur_posting['message'] . "\n\n" . $message;
-					$db->query('UPDATE '.$db->prefix.'posts SET message=\''.$db->escape($message).'\' WHERE  id='.$cur_posting['post_id']) or error('Unable to merge post', __FILE__, __LINE__, $db->error());
+					$db->query('UPDATE '.$db->prefix.'posts SET message=\''.$db->escape($message).'\' WHERE id='.$cur_posting['post_id']) or error('Unable to merge post', __FILE__, __LINE__, $db->error());
 					$new_pid = $cur_posting['post_id'];
 					$new_pid = $cur_posting['post_id'];
 				}
 				}
 // END Merge Post
 // END Merge Post
@@ -290,7 +290,7 @@ if (isset($_POST['form_sent']))
 								$mail_message = str_replace('<topic_subject>', $cur_posting['subject'], $mail_message);
 								$mail_message = str_replace('<topic_subject>', $cur_posting['subject'], $mail_message);
 								$mail_message = str_replace('<replier>', $username, $mail_message);
 								$mail_message = str_replace('<replier>', $username, $mail_message);
 								$mail_message = str_replace('<post_url>', get_base_url().'/viewtopic.php?pid='.$new_pid.'#p'.$new_pid, $mail_message);
 								$mail_message = str_replace('<post_url>', get_base_url().'/viewtopic.php?pid='.$new_pid.'#p'.$new_pid, $mail_message);
-								$mail_message = str_replace('<unsubscribe_url>', get_base_url().'/misc.php?action=unsubscribe&tid='.$tid.'&csrf_hash=<csrf_hash>', $mail_message);
+								$mail_message = str_replace('<unsubscribe_url>', get_base_url().'/viewtopic.php?id='.$tid.'#unsubscribe', $mail_message);
 								$mail_message = str_replace('<board_mailer>', $pun_config['o_board_title'], $mail_message);
 								$mail_message = str_replace('<board_mailer>', $pun_config['o_board_title'], $mail_message);
 
 
 								$mail_subject_full = str_replace('<topic_subject>', $cur_posting['subject'], $mail_subject_full);
 								$mail_subject_full = str_replace('<topic_subject>', $cur_posting['subject'], $mail_subject_full);
@@ -298,7 +298,7 @@ if (isset($_POST['form_sent']))
 								$mail_message_full = str_replace('<replier>', $username, $mail_message_full);
 								$mail_message_full = str_replace('<replier>', $username, $mail_message_full);
 								$mail_message_full = str_replace('<message>', $cleaned_message, $mail_message_full);
 								$mail_message_full = str_replace('<message>', $cleaned_message, $mail_message_full);
 								$mail_message_full = str_replace('<post_url>', get_base_url().'/viewtopic.php?pid='.$new_pid.'#p'.$new_pid, $mail_message_full);
 								$mail_message_full = str_replace('<post_url>', get_base_url().'/viewtopic.php?pid='.$new_pid.'#p'.$new_pid, $mail_message_full);
-								$mail_message_full = str_replace('<unsubscribe_url>', get_base_url().'/misc.php?action=unsubscribe&tid='.$tid.'&csrf_hash=<csrf_hash>', $mail_message_full);
+								$mail_message_full = str_replace('<unsubscribe_url>', get_base_url().'/viewtopic.php?id='.$tid.'#unsubscribe', $mail_message_full);
 								$mail_message_full = str_replace('<board_mailer>', $pun_config['o_board_title'], $mail_message_full);
 								$mail_message_full = str_replace('<board_mailer>', $pun_config['o_board_title'], $mail_message_full);
 
 
 								$notification_emails[$cur_subscriber['language']][0] = $mail_subject;
 								$notification_emails[$cur_subscriber['language']][0] = $mail_subject;
@@ -316,9 +316,9 @@ if (isset($_POST['form_sent']))
 						if (isset($notification_emails[$cur_subscriber['language']]))
 						if (isset($notification_emails[$cur_subscriber['language']]))
 						{
 						{
 							if ($cur_subscriber['notify_with_post'] == '0')
 							if ($cur_subscriber['notify_with_post'] == '0')
-								pun_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][0], str_replace('<csrf_hash>', csrf_hash('misc.php', false, $cur_subscriber), $notification_emails[$cur_subscriber['language']][1]));
+								pun_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][0], $notification_emails[$cur_subscriber['language']][1]);
 							else
 							else
-								pun_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][2], str_replace('<csrf_hash>', csrf_hash('misc.php', false, $cur_subscriber), $notification_emails[$cur_subscriber['language']][3]));
+								pun_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][2], $notification_emails[$cur_subscriber['language']][3]);
 						}
 						}
 					}
 					}
 				}
 				}
@@ -405,7 +405,7 @@ if (isset($_POST['form_sent']))
 								$mail_message = str_replace('<forum_name>', $cur_posting['forum_name'], $mail_message);
 								$mail_message = str_replace('<forum_name>', $cur_posting['forum_name'], $mail_message);
 								$mail_message = str_replace('<poster>', $username, $mail_message);
 								$mail_message = str_replace('<poster>', $username, $mail_message);
 								$mail_message = str_replace('<topic_url>', get_base_url().'/viewtopic.php?id='.$new_tid, $mail_message);
 								$mail_message = str_replace('<topic_url>', get_base_url().'/viewtopic.php?id='.$new_tid, $mail_message);
-								$mail_message = str_replace('<unsubscribe_url>', get_base_url().'/misc.php?action=unsubscribe&fid='.$cur_posting['id'].'&csrf_hash=<csrf_hash>', $mail_message);
+								$mail_message = str_replace('<unsubscribe_url>', get_base_url().'/viewforum.php?id='.$cur_posting['id'].'#unsubscribe', $mail_message);
 								$mail_message = str_replace('<board_mailer>', $pun_config['o_board_title'], $mail_message);
 								$mail_message = str_replace('<board_mailer>', $pun_config['o_board_title'], $mail_message);
 
 
 								$mail_subject_full = str_replace('<forum_name>', $cur_posting['forum_name'], $mail_subject_full);
 								$mail_subject_full = str_replace('<forum_name>', $cur_posting['forum_name'], $mail_subject_full);
@@ -414,7 +414,7 @@ if (isset($_POST['form_sent']))
 								$mail_message_full = str_replace('<poster>', $username, $mail_message_full);
 								$mail_message_full = str_replace('<poster>', $username, $mail_message_full);
 								$mail_message_full = str_replace('<message>', $cleaned_message, $mail_message_full);
 								$mail_message_full = str_replace('<message>', $cleaned_message, $mail_message_full);
 								$mail_message_full = str_replace('<topic_url>', get_base_url().'/viewtopic.php?id='.$new_tid, $mail_message_full);
 								$mail_message_full = str_replace('<topic_url>', get_base_url().'/viewtopic.php?id='.$new_tid, $mail_message_full);
-								$mail_message_full = str_replace('<unsubscribe_url>', get_base_url().'/misc.php?action=unsubscribe&fid='.$cur_posting['id'].'&csrf_hash=<csrf_hash>', $mail_message_full);
+								$mail_message_full = str_replace('<unsubscribe_url>', get_base_url().'/viewforum.php?id='.$cur_posting['id'].'#unsubscribe', $mail_message_full);
 								$mail_message_full = str_replace('<board_mailer>', $pun_config['o_board_title'], $mail_message_full);
 								$mail_message_full = str_replace('<board_mailer>', $pun_config['o_board_title'], $mail_message_full);
 
 
 								$notification_emails[$cur_subscriber['language']][0] = $mail_subject;
 								$notification_emails[$cur_subscriber['language']][0] = $mail_subject;
@@ -432,9 +432,9 @@ if (isset($_POST['form_sent']))
 						if (isset($notification_emails[$cur_subscriber['language']]))
 						if (isset($notification_emails[$cur_subscriber['language']]))
 						{
 						{
 							if ($cur_subscriber['notify_with_post'] == '0')
 							if ($cur_subscriber['notify_with_post'] == '0')
-								pun_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][0], str_replace('<csrf_hash>', csrf_hash('misc.php', false, $cur_subscriber), $notification_emails[$cur_subscriber['language']][1]));
+								pun_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][0], $notification_emails[$cur_subscriber['language']][1]);
 							else
 							else
-								pun_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][2], str_replace('<csrf_hash>', csrf_hash('misc.php', false, $cur_subscriber), $notification_emails[$cur_subscriber['language']][3]));
+								pun_mail($cur_subscriber['email'], $notification_emails[$cur_subscriber['language']][2], $notification_emails[$cur_subscriber['language']][3]);
 						}
 						}
 					}
 					}
 				}
 				}
@@ -608,7 +608,7 @@ require PUN_ROOT.'header.php';
 		<ul class="crumbs">
 		<ul class="crumbs">
 			<li><a href="index.php"><?php echo $lang_common['Index'] ?></a></li>
 			<li><a href="index.php"><?php echo $lang_common['Index'] ?></a></li>
 			<li><span>»&#160;</span><a href="viewforum.php?id=<?php echo $cur_posting['id'] ?>"><?php echo pun_htmlspecialchars($cur_posting['forum_name']) ?></a></li>
 			<li><span>»&#160;</span><a href="viewforum.php?id=<?php echo $cur_posting['id'] ?>"><?php echo pun_htmlspecialchars($cur_posting['forum_name']) ?></a></li>
-<?php if (isset($_POST['req_subject'])): ?>      <li><span>»&#160;</span><?php echo pun_htmlspecialchars($_POST['req_subject']) ?></li>
+<?php if (isset($_POST['req_subject'])): ?>			<li><span>»&#160;</span><?php echo pun_htmlspecialchars($_POST['req_subject']) ?></li>
 <?php endif; ?>
 <?php endif; ?>
 <?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="viewtopic.php?id=<?php echo $tid ?>"><?php echo pun_htmlspecialchars($cur_posting['subject']) ?></a></li>
 <?php if (isset($cur_posting['subject'])): ?>			<li><span>»&#160;</span><a href="viewtopic.php?id=<?php echo $tid ?>"><?php echo pun_htmlspecialchars($cur_posting['subject']) ?></a></li>
 <?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>
 <?php endif; ?>			<li><span>»&#160;</span><strong><?php echo $action ?></strong></li>

+ 17 - 7
profile.php

@@ -831,7 +831,7 @@ else if (isset($_POST['form_sent']))
 		{
 		{
 			$form = array(
 			$form = array(
 				'realname'		=> isset($_POST['form']['realname']) ? pun_trim($_POST['form']['realname']) : '',
 				'realname'		=> isset($_POST['form']['realname']) ? pun_trim($_POST['form']['realname']) : '',
-				'gender'		=> isset($_POST['form']['gender']) ? pun_trim($_POST['form']['gender']) : '',              // мод пола - Visman
+				'gender'		=> isset($_POST['form']['gender']) ? pun_trim($_POST['form']['gender']) : '', // мод пола - Visman
 				'url'			=> isset($_POST['form']['url']) ? pun_trim($_POST['form']['url']) : '',
 				'url'			=> isset($_POST['form']['url']) ? pun_trim($_POST['form']['url']) : '',
 				'location'		=> isset($_POST['form']['location']) ? pun_trim($_POST['form']['location']) : '',
 				'location'		=> isset($_POST['form']['location']) ? pun_trim($_POST['form']['location']) : '',
 			);
 			);
@@ -933,11 +933,6 @@ else if (isset($_POST['form_sent']))
 			$form = array(
 			$form = array(
 				'disp_topics'		=> pun_trim($_POST['form']['disp_topics']),
 				'disp_topics'		=> pun_trim($_POST['form']['disp_topics']),
 				'disp_posts'		=> pun_trim($_POST['form']['disp_posts']),
 				'disp_posts'		=> pun_trim($_POST['form']['disp_posts']),
-				'show_smilies'		=> isset($_POST['form']['show_smilies']) ? '1' : '0',
-				'show_img'			=> isset($_POST['form']['show_img']) ? '1' : '0',
-				'show_img_sig'		=> isset($_POST['form']['show_img_sig']) ? '1' : '0',
-				'show_avatars'		=> isset($_POST['form']['show_avatars']) ? '1' : '0',
-				'show_sig'			=> isset($_POST['form']['show_sig']) ? '1' : '0',
 			);
 			);
 
 
 			if ($form['disp_topics'] != '')
 			if ($form['disp_topics'] != '')
@@ -958,6 +953,21 @@ else if (isset($_POST['form_sent']))
 					$form['disp_posts'] = 75;
 					$form['disp_posts'] = 75;
 			}
 			}
 
 
+			if ($pun_config['o_smilies'] == '1' || $pun_config['o_smilies_sig'] == '1')
+				$form['show_smilies'] = isset($_POST['form']['show_smilies']) ? '1' : '0';
+
+			if ($pun_config['p_message_bbcode'] == '1' && $pun_config['p_message_img_tag'] == '1')
+				$form['show_img'] = isset($_POST['form']['show_img']) ? '1' : '0';
+
+			if ($pun_config['o_signatures'] == '1' && $pun_config['p_sig_bbcode'] == '1' && $pun_config['p_sig_img_tag'] == '1')
+				$form['show_img_sig'] = isset($_POST['form']['show_img_sig']) ? '1' : '0';
+
+			if ($pun_config['o_avatars'] == '1')
+				$form['show_avatars'] = isset($_POST['form']['show_avatars']) ? '1' : '0';
+
+			if ($pun_config['o_signatures'] == '1')
+				$form['show_sig'] = isset($_POST['form']['show_sig']) ? '1' : '0';
+
 			// Make sure we got a valid style string
 			// Make sure we got a valid style string
 			if (isset($_POST['form']['style']))
 			if (isset($_POST['form']['style']))
 			{
 			{
@@ -1106,7 +1116,7 @@ if ($pun_user['id'] != $id &&																	// If we aren't the user (i.e. edi
 		$user_personal[] = '<dd>'.pun_htmlspecialchars(($pun_config['o_censoring'] == '1') ? censor_words($user['realname']) : $user['realname']).'</dd>';
 		$user_personal[] = '<dd>'.pun_htmlspecialchars(($pun_config['o_censoring'] == '1') ? censor_words($user['realname']) : $user['realname']).'</dd>';
 	}
 	}
 	
 	
-  // мод пола - Visman
+	// мод пола - Visman
 	if ($user['gender'] > 0)
 	if ($user['gender'] > 0)
 	{
 	{
 		$user_personal[] = '<dt>'.$lang_genders_integration['Gender'].'</dt>';
 		$user_personal[] = '<dt>'.$lang_genders_integration['Gender'].'</dt>';

+ 1 - 1
re.php

@@ -23,7 +23,7 @@ else
 
 
 $url = str_replace('&amp;', '&', preg_replace(array('%(https?|ftp)___%i', '%([\r\n])|(\%0[ad])|(;\s*data\s*:)%i'), array('$1://', ''), $_GET['u']));
 $url = str_replace('&amp;', '&', preg_replace(array('%(https?|ftp)___%i', '%([\r\n])|(\%0[ad])|(;\s*data\s*:)%i'), array('$1://', ''), $_GET['u']));
 
 
-$page_js['c']['re']  = 'function fluxrdr() {if(history.length<2){window.close()}else{history.go(-1)}return false}';
+$page_js['c']['re'] = 'function fluxrdr() {if(history.length<2){window.close()}else{history.go(-1)}return false}';
 
 
 $page_title = array(pun_htmlspecialchars($pun_config['o_board_title']), $lang_re['Redirect']);
 $page_title = array(pun_htmlspecialchars($pun_config['o_board_title']), $lang_re['Redirect']);
 define('PUN_ACTIVE_PAGE', 'redirect');
 define('PUN_ACTIVE_PAGE', 'redirect');

+ 3 - 1
search.php

@@ -21,6 +21,8 @@ if ($pun_user['g_read_board'] == '0')
 	message($lang_common['No view'], false, '403 Forbidden');
 	message($lang_common['No view'], false, '403 Forbidden');
 else if ($pun_user['g_search'] == '0')
 else if ($pun_user['g_search'] == '0')
 	message($lang_search['No search permission'], false, '403 Forbidden');
 	message($lang_search['No search permission'], false, '403 Forbidden');
+else if ($pun_user['is_bot'] && (isset($_GET['search_id']) || !isset($_GET['action']) || $_GET['action'] == 'search')) // Visman - запрет поиска ботам
+	message($lang_search['No search permission'], false, '403 Forbidden');
 
 
 require PUN_ROOT.'include/search_idx.php';
 require PUN_ROOT.'include/search_idx.php';
 
 
@@ -514,7 +516,7 @@ if (isset($_GET['action']) || isset($_GET['search_id']))
 				$sort_by_sql = 't.forum_id';
 				$sort_by_sql = 't.forum_id';
 				break;
 				break;
 
 
-			case 9:                        // MOD warnings - Visman
+			case 9: // MOD warnings - Visman
 				$sort_by_sql = 'w.posted';
 				$sort_by_sql = 'w.posted';
 				break;
 				break;
 
 

+ 15 - 8
style/Air.css

@@ -55,7 +55,7 @@ html, body, .pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
 }
 }
 
 
 .pun h1 {
 .pun h1 {
-	font:2.154em/1em "Trebuchet MS", Arial, Helvetica, sans-serif;
+	font: 2.154em/1em "Trebuchet MS", Arial, Helvetica, sans-serif;
 	padding: 7px 0;
 	padding: 7px 0;
 }
 }
 
 
@@ -630,11 +630,11 @@ html, body, .pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
 
 
 #debug .tcr {
 #debug .tcr {
 	width: 90%;
 	width: 90%;
-	white-space: normal
+	white-space: normal;
 }
 }
 
 
 #punindex .tcr .byuser {
 #punindex .tcr .byuser {
-	display: block
+	display: block;
 }
 }
 
 
 #punindex td.tc2, #punindex td.tc3, #punindex td.tcr, .pun #vf td.tc2, .pun #vf td.tc3,
 #punindex td.tc2, #punindex td.tc3, #punindex td.tcr, .pun #vf td.tc2, .pun #vf td.tc3,
@@ -719,7 +719,7 @@ MAIN POSTS
 #punsearch .blockpost h2 span span {
 #punsearch .blockpost h2 span span {
 	white-space: nowrap;
 	white-space: nowrap;
 	display: inline-block;
 	display: inline-block;
-	font: 1.077em "Trebuchet MS", Arial, Helvetica, sans-serif
+	font: 1.077em "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 }
 
 
 #punsearch .blockpost .icon {
 #punsearch .blockpost .icon {
@@ -770,6 +770,13 @@ MAIN POSTS
 	left: 0;
 	left: 0;
 	overflow: hidden;
 	overflow: hidden;
 	width: 206px;
 	width: 206px;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+#punviewtopic .blockpost dt:hover, #punmoderate .blockpost dt:hover {
+	width: auto;
+	background-color: #ebf1f5;
 }
 }
 
 
 .pun .blockpost dt strong {
 .pun .blockpost dt strong {
@@ -809,7 +816,7 @@ MAIN POSTS
 }
 }
 
 
 .pun .postmsg {
 .pun .postmsg {
-	width:100%;
+	width: 100%;
 	overflow: hidden;
 	overflow: hidden;
 	word-wrap: break-word;
 	word-wrap: break-word;
 }
 }
@@ -856,7 +863,7 @@ MAIN POSTS
 }
 }
 
 
 .pun .postsignature hr {
 .pun .postsignature hr {
-	border:none;
+	border: none;
 	height: 1px;
 	height: 1px;
 	margin-left: 0px;
 	margin-left: 0px;
 	text-align: left;
 	text-align: left;
@@ -983,7 +990,7 @@ MAIN POSTS
 .pun .codebox pre.vscroll {
 .pun .codebox pre.vscroll {
 	height: 32em;
 	height: 32em;
 	overflow: auto;
 	overflow: auto;
-	overflow-y: auto
+	overflow-y: auto;
 }
 }
 
 
 .pun .postmsg img, #punhelp samp img {
 .pun .postmsg img, #punhelp samp img {
@@ -1338,7 +1345,7 @@ PROFILES (+ ADMIN MENU)
 	text-decoration: none;
 	text-decoration: none;
 }
 }
 
 
-* html .pun .blockmenu a:link,  * html .pun .blockmenu a:visited {
+* html .pun .blockmenu a:link, * html .pun .blockmenu a:visited {
 	height: 1%;
 	height: 1%;
 }
 }
 
 

+ 7 - 0
style/Air/reminder.css

@@ -66,3 +66,10 @@
 	color: #333333;
 	color: #333333;
 }
 }
 
 
+#brdmenu ul span.remflasher, #adminconsole fieldset td span.remflasher {
+	background: url(../../img/flasher.gif) right 65% no-repeat;
+	display: inline-block;
+	line-height: normal;
+	margin-left: 1px;
+	padding-right: 18px;
+}

+ 107 - 107
style/Cobalt.css

@@ -14,7 +14,7 @@
 }
 }
 
 
 .pun ul, .pun ol {
 .pun ul, .pun ol {
-	list-style: none
+	list-style: none;
 }
 }
 
 
 
 
@@ -26,11 +26,11 @@
 	width: 0;
 	width: 0;
 	line-height: 0;
 	line-height: 0;
 	font-size: 0;
 	font-size: 0;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 .pun .clearer, .pun .clearb {
 .pun .clearer, .pun .clearb {
-	clear: both
+	clear: both;
 }
 }
 
 
 .pun .nosize {
 .pun .nosize {
@@ -41,11 +41,11 @@
 }
 }
 
 
 * html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
 * html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
-	height: 1px
+	height: 1px;
 }
 }
 
 
 .pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
 .pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
-	min-height: 1px
+	min-height: 1px;
 }
 }
 
 
 .clearl {
 .clearl {
@@ -85,7 +85,7 @@
 
 
 .pun pre, .pun code {
 .pun pre, .pun code {
 	font-size: 1.182em;
 	font-size: 1.182em;
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace
+	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace;
 }
 }
 
 
 .pun pre code {
 .pun pre code {
@@ -125,70 +125,70 @@
 }
 }
 
 
 .pun span.warntext, .pun p.warntext {
 .pun span.warntext, .pun p.warntext {
-	font-weight: bold
+	font-weight: bold;
 }
 }
 
 
 /* User Content (Announcements, Rules, Posts)
 /* User Content (Announcements, Rules, Posts)
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .usercontent p, .pun .postmsg p {
 .pun .usercontent p, .pun .postmsg p {
-	padding: 0.75em 0
+	padding: 0.75em 0;
 }
 }
 
 
 .pun .usercontent ul, .pun .postmsg ul {
 .pun .usercontent ul, .pun .postmsg ul {
 	padding: 0.75em 1em 0.75em 2.5em;
 	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: disc
+	list-style: disc;
 }
 }
 
 
 .pun .usercontent ol, .pun .postmsg ol {
 .pun .usercontent ol, .pun .postmsg ol {
 	padding: 0.75em 1em 0.75em 2.5em;
 	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: decimal
+	list-style: decimal;
 }
 }
 
 
 .pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
 .pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha
+	list-style: lower-alpha;
 }
 }
 
 
 .pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
 .pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
-	padding: 0.25em 1em 0.75em 2.5em
+	padding: 0.25em 1em 0.75em 2.5em;
 }
 }
 
 
 .pun .usercontent li p, .pun .postmsg li p {
 .pun .usercontent li p, .pun .postmsg li p {
-	padding: 0
+	padding: 0;
 }
 }
 
 
 .pun .usercontent h1 {
 .pun .usercontent h1 {
 	font-size: 1.4em;
 	font-size: 1.4em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h2 {
 .pun .usercontent h2 {
 	font-size: 1.2em;
 	font-size: 1.2em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h3 {
 .pun .usercontent h3 {
 	font-size: 1.1em;
 	font-size: 1.1em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
 .pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
 	font-size: 1em;
 	font-size: 1em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .quotebox cite {
 .pun .quotebox cite {
 	font-weight: bold;
 	font-weight: bold;
 	font-style: normal;
 	font-style: normal;
-	padding: 0.75em 0.75em 0 0.75em
+	padding: 0.75em 0.75em 0 0.75em;
 }
 }
 
 
 .pun span.bbu {
 .pun span.bbu {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 .pun span.bbs, .pun del {
 .pun span.bbs, .pun del {
@@ -215,7 +215,7 @@
 
 
 html, body {
 html, body {
 	margin: 0;
 	margin: 0;
-	padding: 0
+	padding: 0;
 }
 }
 
 
 .pun {
 .pun {
@@ -238,7 +238,7 @@ html, body {
 }
 }
 
 
 #brdtitle p {
 #brdtitle p {
-	padding-top: 0px
+	padding-top: 0px;
 }
 }
 
 
 #announce, #brdstats {
 #announce, #brdstats {
@@ -246,11 +246,11 @@ html, body {
 }
 }
 
 
 .pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
 .pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
-	margin-bottom: 12px
+	margin-bottom: 12px;
 }
 }
 
 
 #punindex .blocktable, .pun .blockpost {
 #punindex .blocktable, .pun .blockpost {
-	margin-bottom: 6px
+	margin-bottom: 6px;
 }
 }
 
 
 #postreview .blockpost {
 #postreview .blockpost {
@@ -258,15 +258,15 @@ html, body {
 }
 }
 
 
 .pun .block2col .blockform, .pun .block2col .block {
 .pun .block2col .blockform, .pun .block2col .block {
-	margin-bottom: 0px
+	margin-bottom: 0px;
 }
 }
 
 
 .pun .linkst, .pun .linksb {
 .pun .linkst, .pun .linksb {
-	margin-top: -12px
+	margin-top: -12px;
 }
 }
 
 
 .pun .postlinksb {
 .pun .postlinksb {
-	margin-top: -6px
+	margin-top: -6px;
 }
 }
 
 
 
 
@@ -286,7 +286,7 @@ html, body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .block .inbox, .pun .blockmenu .inbox {
 .pun .block .inbox, .pun .blockmenu .inbox {
-	padding: 3px 6px
+	padding: 3px 6px;
 }
 }
 
 
 /*****************************************************************
 /*****************************************************************
@@ -308,11 +308,11 @@ html, body {
 }
 }
 
 
 #brdmenu a:link, #brdmenu a:visited {
 #brdmenu a:link, #brdmenu a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 #brdmenu a:hover, #brdmenu a:active {
 #brdmenu a:hover, #brdmenu a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 #brdwelcome .conl {
 #brdwelcome .conl {
@@ -328,11 +328,11 @@ html, body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .linkst {
 .pun .linkst {
-	padding: 8px 6px 3px 6px
+	padding: 8px 6px 3px 6px;
 }
 }
 
 
 .pun .linksb, .pun .postlinksb {
 .pun .linksb, .pun .postlinksb {
-	padding: 3px 6px 8px 6px
+	padding: 3px 6px 8px 6px;
 }
 }
 
 
 .pun .crumbs {
 .pun .crumbs {
@@ -372,7 +372,7 @@ html, body {
 }
 }
 
 
 .pun .postlink a:link, .pun .postlink a:visited {
 .pun .postlink a:link, .pun .postlink a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .postlink a:hover, .pun .postlink a:active {
 .pun .postlink a:hover, .pun .postlink a:active {
@@ -403,7 +403,7 @@ html, body {
 
 
 #brdfooter #modcontrols dd {
 #brdfooter #modcontrols dd {
 	display: inline;
 	display: inline;
-	margin:0 6px;
+	margin: 0 6px;
 }
 }
 
 
 
 
@@ -484,7 +484,7 @@ html, body {
 }
 }
 
 
 .pun .tcl p {
 .pun .tcl p {
-	padding: 5px 0 0 0
+	padding: 5px 0 0 0;
 }
 }
 
 
 #punsearch #vf .tc2 {
 #punsearch #vf .tc2 {
@@ -494,7 +494,7 @@ html, body {
 }
 }
 
 
 #users1 .tcr {
 #users1 .tcr {
-	width: 25%
+	width: 25%;
 }
 }
 
 
 #users1 .tc2 {
 #users1 .tc2 {
@@ -504,16 +504,16 @@ html, body {
 }
 }
 
 
 #debug .tcl {
 #debug .tcl {
-	width: 10%
+	width: 10%;
 }
 }
 
 
 #debug .tcr {
 #debug .tcr {
 	width: 90%;
 	width: 90%;
-	white-space: normal
+	white-space: normal;
 }
 }
 
 
 #punindex .tcr .byuser {
 #punindex .tcr .byuser {
-	display: block
+	display: block;
 }
 }
 
 
 .pun .blocktable .tclcon {
 .pun .blocktable .tclcon {
@@ -560,7 +560,7 @@ html, body {
 *****************************************************************/
 *****************************************************************/
 
 
 .pun .blockform form, .pun .fakeform {
 .pun .blockform form, .pun .fakeform {
-	PADDING: 20px 20px 15px 20px
+	PADDING: 20px 20px 15px 20px;
 }
 }
 
 
 .pun .forminfo {
 .pun .forminfo {
@@ -575,32 +575,32 @@ html, body {
 }
 }
 
 
 .pun .inform {
 .pun .inform {
-	padding-bottom: 12px
+	padding-bottom: 12px;
 }
 }
 
 
 .pun fieldset {
 .pun fieldset {
 	padding: 0px 12px 0px 12px;
 	padding: 0px 12px 0px 12px;
 	border-style: solid;
 	border-style: solid;
-	border-width: 1px
+	border-width: 1px;
 }
 }
 
 
 .pun legend {
 .pun legend {
-	padding: 0px 6px
+	padding: 0px 6px;
 }
 }
 
 
 .pun .infldset {
 .pun .infldset {
-	padding: 9px 0px 12px 0
+	padding: 9px 0px 12px 0;
 }
 }
 
 
 .pun label {
 .pun label {
 	display: block;
 	display: block;
-	padding: 3px 0
+	padding: 3px 0;
 }
 }
 
 
 .pun label.conl {
 .pun label.conl {
 	float: left;
 	float: left;
 	overflow: visible;
 	overflow: visible;
-	margin-right: 10px
+	margin-right: 10px;
 }
 }
 
 
 .pun fieldset .rbox br {
 .pun fieldset .rbox br {
@@ -622,21 +622,21 @@ html, body {
 }
 }
 
 
 .pun .txtarea {
 .pun .txtarea {
-	width: 75%
+	width: 75%;
 }
 }
 
 
 .pun .txtarea textarea, .pun input.longinput {
 .pun .txtarea textarea, .pun input.longinput {
-	width: 100%
+	width: 100%;
 }
 }
 
 
 .pun .bblinks {
 .pun .bblinks {
 	padding-bottom: 10px;
 	padding-bottom: 10px;
-	padding-left: 4px
+	padding-left: 4px;
 }
 }
 
 
 .pun .bblinks li {
 .pun .bblinks li {
 	display: inline;
 	display: inline;
-	padding-right: 20px
+	padding-right: 20px;
 }
 }
 
 
 .pun .blockform .buttons {
 .pun .blockform .buttons {
@@ -696,16 +696,16 @@ html, body {
 *****************************************************************/
 *****************************************************************/
 
 
 .pun .block2col {
 .pun .block2col {
-	padding-bottom: 1px
+	padding-bottom: 1px;
 }
 }
 
 
 .pun .block2col .blockform, .pun .block2col .block {
 .pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 14em
+	margin-left: 14em;
 }
 }
 
 
 .pun .blockmenu {
 .pun .blockmenu {
-	float:left;
-	width: 13em
+	float: left;
+	width: 13em;
 }
 }
 
 
 .pun .blockmenu li {
 .pun .blockmenu li {
@@ -714,17 +714,17 @@ html, body {
 }
 }
 
 
 .pun .blockmenu a:link, .pun .blockmenu a:visited {
 .pun .blockmenu a:link, .pun .blockmenu a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .blockmenu a:hover, .pun .blockmenu a:active {
 .pun .blockmenu a:hover, .pun .blockmenu a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 #viewprofile dl {
 #viewprofile dl {
 	float: left;
 	float: left;
 	width: 100%;
 	width: 100%;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 #viewprofile dd {
 #viewprofile dd {
@@ -740,7 +740,7 @@ html, body {
 
 
 #profileavatar img {
 #profileavatar img {
 	float: right;
 	float: right;
-	margin-left: 1em
+	margin-left: 1em;
 }
 }
 
 
 #adintro ul {
 #adintro ul {
@@ -775,7 +775,7 @@ html, body {
 }
 }
 
 
 .pun .postleft, .pun .postfootleft {
 .pun .postleft, .pun .postfootleft {
-	float:left;
+	float: left;
 	width: 18em;
 	width: 18em;
 	position: relative;
 	position: relative;
 	overflow: hidden;
 	overflow: hidden;
@@ -798,7 +798,7 @@ html, body {
 }
 }
 
 
 .pun .postleft .usercontacts, .pun .postleft .icon {
 .pun .postleft .usercontacts, .pun .postleft .icon {
-	margin-top: 6px
+	margin-top: 6px;
 }
 }
 
 
 .pun .postleft .postavatar, .pun .postleft .usertitle {
 .pun .postleft .postavatar, .pun .postleft .usertitle {
@@ -821,11 +821,11 @@ html, body {
 
 
 .pun .postright, .pun .postfootright {
 .pun .postright, .pun .postfootright {
 	border-left-width: 18em;
 	border-left-width: 18em;
-	border-left-style: solid
+	border-left-style: solid;
 }
 }
 
 
 #postpreview .postright {
 #postpreview .postright {
-	border-left: 0
+	border-left: 0;
 }
 }
 
 
 .pun .postright {
 .pun .postright {
@@ -833,11 +833,11 @@ html, body {
 }
 }
 
 
 .pun .postfootright, .pun .multidelete {
 .pun .postfootright, .pun .multidelete {
-	text-align: right
+	text-align: right;
 }
 }
 
 
 .pun .postmsg {
 .pun .postmsg {
-	width:98%;
+	width: 98%;
 	overflow: hidden;
 	overflow: hidden;
 	padding-bottom: 6px;
 	padding-bottom: 6px;
 	word-wrap: break-word;
 	word-wrap: break-word;
@@ -861,11 +861,11 @@ html, body {
 }
 }
 
 
 .pun .postfootright a:link, .pun .postfootright a:visited {
 .pun .postfootright a:link, .pun .postfootright a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .postfootright a:hover, .pun .postfootright a:active {
 .pun .postfootright a:hover, .pun .postfootright a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 .pun .codebox {
 .pun .codebox {
@@ -889,13 +889,13 @@ html, body {
 
 
 .pun .quotebox blockquote {
 .pun .quotebox blockquote {
 	width: 100%;
 	width: 100%;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 .pun .codebox pre {
 .pun .codebox pre {
 	overflow: auto;
 	overflow: auto;
 	width: 100%;
 	width: 100%;
-	overflow-y:hidden
+	overflow-y: hidden;
 }
 }
 
 
 * html .pun .codebox pre {
 * html .pun .codebox pre {
@@ -903,7 +903,7 @@ html, body {
 }
 }
 
 
 *+html .pun .codebox pre {
 *+html .pun .codebox pre {
-	padding-bottom: 10px
+	padding-bottom: 10px;
 }
 }
 
 
 .pun .codebox pre code {
 .pun .codebox pre code {
@@ -914,7 +914,7 @@ html, body {
 .pun .codebox pre.vscroll {
 .pun .codebox pre.vscroll {
 	height: 32em;
 	height: 32em;
 	overflow: auto;
 	overflow: auto;
-	overflow-y: auto
+	overflow-y: auto;
 }
 }
 
 
 .pun .postmsg img {
 .pun .postmsg img {
@@ -926,7 +926,7 @@ html, body {
 	width: 200px;
 	width: 200px;
 	text-align: left;
 	text-align: left;
 	height: 1px;
 	height: 1px;
-	border:none
+	border: none;
 }
 }
 
 
 .pun .postmsg .postimg img {
 .pun .postmsg .postimg img {
@@ -959,11 +959,11 @@ html, body {
 /****************************************************************/
 /****************************************************************/
 
 
 #punhelp h2 {
 #punhelp h2 {
-	margin-top: 12px
+	margin-top: 12px;
 }
 }
 
 
 #punhelp div.box {
 #punhelp div.box {
-	padding: 10px
+	padding: 10px;
 }
 }
 
 
 #debugtime {
 #debugtime {
@@ -972,11 +972,11 @@ html, body {
 }
 }
 
 
 #brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
 #brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
-	line-height: 1.4em
+	line-height: 1.4em;
 }
 }
 
 
 #announce div.inbox div {
 #announce div.inbox div {
-	padding: 3px 0
+	padding: 3px 0;
 }
 }
 
 
 /*****************************************************************
 /*****************************************************************
@@ -988,47 +988,47 @@ COLOUR SCHEME
 
 
 body {
 body {
 	background: #2a2a2a;
 	background: #2a2a2a;
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun {
 .pun {
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun .box, #adminconsole fieldset th {
 .pun .box, #adminconsole fieldset th {
-	background-color: #383838
+	background-color: #383838;
 }
 }
 
 
 .pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
 .pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
 #brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
 #brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
-	background-color: #424242
+	background-color: #424242;
 }
 }
 
 
 .pun h2, #brdmenu {
 .pun h2, #brdmenu {
 	background-color: #565656;
 	background-color: #565656;
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun th {
 .pun th {
-	background-color: #484848
+	background-color: #484848;
 }
 }
 
 
 .pun legend {
 .pun legend {
-	color: #60a0dc
+	color: #60a0dc;
 }
 }
 
 
 .pun .blockmenu li.isactive a, #posterror li strong {
 .pun .blockmenu li.isactive a, #posterror li strong {
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun .usercontent * {
 .pun .usercontent * {
 	background: transparent;
 	background: transparent;
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun textarea, .pun input, .pun select {
 .pun textarea, .pun input, .pun select {
 	background-color: #2a2a2a;
 	background-color: #2a2a2a;
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun .multiselect, .pun .checklist {
 .pun .multiselect, .pun .checklist {
@@ -1043,23 +1043,23 @@ body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
 .pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
-	background-color: #383838
+	background-color: #383838;
 }
 }
 
 
 .pun .postright, .pun .postfootright {
 .pun .postright, .pun .postfootright {
-	border-left-color: #424242
+	border-left-color: #424242;
 }
 }
 
 
 .pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
 .pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
-	background-color: #424242
+	background-color: #424242;
 }
 }
 
 
 .pun .blockpost h2 {
 .pun .blockpost h2 {
-	background-color: #565656
+	background-color: #565656;
 }
 }
 
 
 .pun .blockpost h2 span.conr {
 .pun .blockpost h2 span.conr {
-	color: #a19e96
+	color: #a19e96;
 }
 }
 
 
 .pun .postmsg ins, #punhelp samp ins {
 .pun .postmsg ins, #punhelp samp ins {
@@ -1068,46 +1068,46 @@ body {
 
 
 .pun hr {
 .pun hr {
 	background-color: #606060;
 	background-color: #606060;
-	color: #606060
+	color: #606060;
 }
 }
 
 
 /* Borders
 /* Borders
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .box {
 .pun .box {
-	border-color:#565656
+	border-color: #565656;
 }
 }
 
 
 .pun td, #brdfooter #modcontrols {
 .pun td, #brdfooter #modcontrols {
-	border-color: #565656
+	border-color: #565656;
 }
 }
 
 
 .pun th {
 .pun th {
-	border-color: #484848
+	border-color: #484848;
 }
 }
 
 
 .pun fieldset {
 .pun fieldset {
-	border-color: #606060
+	border-color: #606060;
 }
 }
 
 
 #adminconsole td, #adminconsole th {
 #adminconsole td, #adminconsole th {
-	border-color: #383838
+	border-color: #383838;
 }
 }
 
 
 .pun .quotebox, .pun .codebox, .pun .forminfo,
 .pun .quotebox, .pun .codebox, .pun .forminfo,
 .pun .blockpost label, .pun .deletemsg {
 .pun .blockpost label, .pun .deletemsg {
-	border-color: #606060
+	border-color: #606060;
 }
 }
 
 
 /* Links
 /* Links
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun a:link, .pun a:visited {
 .pun a:link, .pun a:visited {
-	color: #60a0dc
+	color: #60a0dc;
 }
 }
 
 
 .pun a:hover, .pun a:active, .pun a:focus {
 .pun a:hover, .pun a:active, .pun a:focus {
-	color: #80d6ff
+	color: #80d6ff;
 }
 }
 
 
 .pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
 .pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
@@ -1120,45 +1120,45 @@ body {
 
 
 .pun h2 a:link, .pun h2 a:visited,
 .pun h2 a:link, .pun h2 a:visited,
 #brdmenu a:link, #brdmenu a:visited {
 #brdmenu a:link, #brdmenu a:visited {
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun h2 a:hover, .pun h2 a:active,
 .pun h2 a:hover, .pun h2 a:active,
 #brdmenu a:hover, #brdmenu a:active {
 #brdmenu a:hover, #brdmenu a:active {
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun .postreport a:link, .pun .postreport a:visited,
 .pun .postreport a:link, .pun .postreport a:visited,
 .pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
 .pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
-	color: #888
+	color: #888;
 }
 }
 
 
 .pun .postreport a:hover, .pun .postreport a:active,
 .pun .postreport a:hover, .pun .postreport a:active,
 .pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
 .pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
-	color: #aaa
+	color: #aaa;
 }
 }
 
 
 .pun .maintenancelink a:link, .pun .maintenancelink a:visited {
 .pun .maintenancelink a:link, .pun .maintenancelink a:visited {
-	color: #ff4000
+	color: #ff4000;
 }
 }
 
 
 .pun .maintenancelink a:hover, .pun .maintenancelink a:active {
 .pun .maintenancelink a:hover, .pun .maintenancelink a:active {
-	color: #ff5010
+	color: #ff5010;
 }
 }
 
 
 /* Status Indicators
 /* Status Indicators
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .icon {
 .pun .icon {
-	border-color: #484848 #404040 #3c3c3c #444444
+	border-color: #484848 #404040 #3c3c3c #444444;
 }
 }
 
 
 .pun .iredirect .icon {
 .pun .iredirect .icon {
-	border-color: #383838 #383838 #383838 #383838
+	border-color: #383838 #383838 #383838 #383838;
 }
 }
 
 
 .pun .inew .icon {
 .pun .inew .icon {
-	border-color: #5496d8 #4b85c0 #4377ac #4f8dcb
+	border-color: #5496d8 #4b85c0 #4377ac #4f8dcb;
 }
 }
 
 
 /* ---------- BBCODE TOOLBAR ------------- */
 /* ---------- BBCODE TOOLBAR ------------- */

+ 7 - 0
style/Cobalt/reminder.css

@@ -65,3 +65,10 @@
 	color: #D4D4D4;
 	color: #D4D4D4;
 }
 }
 
 
+#brdmenu ul span.remflasher, #adminconsole fieldset td span.remflasher {
+	background: url(../../img/flasher.gif) right 65% no-repeat;
+	display: inline-block;
+	line-height: normal;
+	margin-left: 1px;
+	padding-right: 18px;
+}

+ 15 - 8
style/Earth.css

@@ -55,7 +55,7 @@ html, body, .pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
 }
 }
 
 
 .pun h1 {
 .pun h1 {
-	font:2.154em/1em "Trebuchet MS", Arial, Helvetica, sans-serif;
+	font: 2.154em/1em "Trebuchet MS", Arial, Helvetica, sans-serif;
 	padding: 7px 0;
 	padding: 7px 0;
 }
 }
 
 
@@ -629,11 +629,11 @@ html, body, .pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
 
 
 #debug .tcr {
 #debug .tcr {
 	width: 90%;
 	width: 90%;
-	white-space: normal
+	white-space: normal;
 }
 }
 
 
 #punindex .tcr .byuser {
 #punindex .tcr .byuser {
-	display: block
+	display: block;
 }
 }
 
 
 #punindex td.tc2, #punindex td.tc3, #punindex td.tcr, .pun #vf td.tc2, .pun #vf td.tc3,
 #punindex td.tc2, #punindex td.tc3, #punindex td.tcr, .pun #vf td.tc2, .pun #vf td.tc3,
@@ -718,7 +718,7 @@ MAIN POSTS
 #punsearch .blockpost h2 span span {
 #punsearch .blockpost h2 span span {
 	white-space: nowrap;
 	white-space: nowrap;
 	display: inline-block;
 	display: inline-block;
-	font: 1.077em "Trebuchet MS", Arial, Helvetica, sans-serif
+	font: 1.077em "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 }
 
 
 #punsearch .blockpost .icon {
 #punsearch .blockpost .icon {
@@ -769,6 +769,13 @@ MAIN POSTS
 	left: 0;
 	left: 0;
 	overflow: hidden;
 	overflow: hidden;
 	width: 206px;
 	width: 206px;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+#punviewtopic .blockpost dt:hover, #punmoderate .blockpost dt:hover {
+	width: auto;
+	background-color: #eaecda;
 }
 }
 
 
 .pun .blockpost dt strong {
 .pun .blockpost dt strong {
@@ -808,7 +815,7 @@ MAIN POSTS
 }
 }
 
 
 .pun .postmsg {
 .pun .postmsg {
-	width:100%;
+	width: 100%;
 	overflow: hidden;
 	overflow: hidden;
 	word-wrap: break-word;
 	word-wrap: break-word;
 }
 }
@@ -855,7 +862,7 @@ MAIN POSTS
 }
 }
 
 
 .pun .postsignature hr {
 .pun .postsignature hr {
-	border:none;
+	border: none;
 	height: 1px;
 	height: 1px;
 	margin-left: 0px;
 	margin-left: 0px;
 	text-align: left;
 	text-align: left;
@@ -982,7 +989,7 @@ MAIN POSTS
 .pun .codebox pre.vscroll {
 .pun .codebox pre.vscroll {
 	height: 32em;
 	height: 32em;
 	overflow: auto;
 	overflow: auto;
-	overflow-y: auto
+	overflow-y: auto;
 }
 }
 
 
 .pun .postmsg img, #punhelp samp img {
 .pun .postmsg img, #punhelp samp img {
@@ -1337,7 +1344,7 @@ PROFILES (+ ADMIN MENU)
 	text-decoration: none;
 	text-decoration: none;
 }
 }
 
 
-* html .pun .blockmenu a:link,  * html .pun .blockmenu a:visited {
+* html .pun .blockmenu a:link, * html .pun .blockmenu a:visited {
 	height: 1%;
 	height: 1%;
 }
 }
 
 

+ 7 - 0
style/Earth/reminder.css

@@ -66,3 +66,10 @@
 	color: #333333;
 	color: #333333;
 }
 }
 
 
+#brdmenu ul span.remflasher, #adminconsole fieldset td span.remflasher {
+	background: url(../../img/flasher.gif) right 65% no-repeat;
+	display: inline-block;
+	line-height: normal;
+	margin-left: 1px;
+	padding-right: 18px;
+}

+ 15 - 8
style/Fire.css

@@ -55,7 +55,7 @@ html, body, .pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
 }
 }
 
 
 .pun h1 {
 .pun h1 {
-	font:2.154em/1em "Trebuchet MS", Arial, Helvetica, sans-serif;
+	font: 2.154em/1em "Trebuchet MS", Arial, Helvetica, sans-serif;
 	padding: 7px 0;
 	padding: 7px 0;
 }
 }
 
 
@@ -629,11 +629,11 @@ html, body, .pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
 
 
 #debug .tcr {
 #debug .tcr {
 	width: 90%;
 	width: 90%;
-	white-space: normal
+	white-space: normal;
 }
 }
 
 
 #punindex .tcr .byuser {
 #punindex .tcr .byuser {
-	display: block
+	display: block;
 }
 }
 
 
 #punindex td.tc2, #punindex td.tc3, #punindex td.tcr, .pun #vf td.tc2, .pun #vf td.tc3,
 #punindex td.tc2, #punindex td.tc3, #punindex td.tcr, .pun #vf td.tc2, .pun #vf td.tc3,
@@ -718,7 +718,7 @@ MAIN POSTS
 #punsearch .blockpost h2 span span {
 #punsearch .blockpost h2 span span {
 	white-space: nowrap;
 	white-space: nowrap;
 	display: inline-block;
 	display: inline-block;
-	font: 1.077em "Trebuchet MS", Arial, Helvetica, sans-serif
+	font: 1.077em "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 }
 
 
 #punsearch .blockpost .icon {
 #punsearch .blockpost .icon {
@@ -769,6 +769,13 @@ MAIN POSTS
 	left: 0;
 	left: 0;
 	overflow: hidden;
 	overflow: hidden;
 	width: 206px;
 	width: 206px;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+#punviewtopic .blockpost dt:hover, #punmoderate .blockpost dt:hover {
+	width: auto;
+	background-color: #ecebe7;
 }
 }
 
 
 .pun .blockpost dt strong {
 .pun .blockpost dt strong {
@@ -808,7 +815,7 @@ MAIN POSTS
 }
 }
 
 
 .pun .postmsg {
 .pun .postmsg {
-	width:100%;
+	width: 100%;
 	overflow: hidden;
 	overflow: hidden;
 	word-wrap: break-word;
 	word-wrap: break-word;
 }
 }
@@ -855,7 +862,7 @@ MAIN POSTS
 }
 }
 
 
 .pun .postsignature hr {
 .pun .postsignature hr {
-	border:none;
+	border: none;
 	height: 1px;
 	height: 1px;
 	margin-left: 0px;
 	margin-left: 0px;
 	text-align: left;
 	text-align: left;
@@ -982,7 +989,7 @@ MAIN POSTS
 .pun .codebox pre.vscroll {
 .pun .codebox pre.vscroll {
 	height: 32em;
 	height: 32em;
 	overflow: auto;
 	overflow: auto;
-	overflow-y: auto
+	overflow-y: auto;
 }
 }
 
 
 .pun .postmsg img, #punhelp samp img {
 .pun .postmsg img, #punhelp samp img {
@@ -1337,7 +1344,7 @@ PROFILES (+ ADMIN MENU)
 	text-decoration: none;
 	text-decoration: none;
 }
 }
 
 
-* html .pun .blockmenu a:link,  * html .pun .blockmenu a:visited {
+* html .pun .blockmenu a:link, * html .pun .blockmenu a:visited {
 	height: 1%;
 	height: 1%;
 }
 }
 
 

+ 7 - 0
style/Fire/reminder.css

@@ -66,3 +66,10 @@
 	color: #333333;
 	color: #333333;
 }
 }
 
 
+#brdmenu ul span.remflasher, #adminconsole fieldset td span.remflasher {
+	background: url(../../img/flasher.gif) right 65% no-repeat;
+	display: inline-block;
+	line-height: normal;
+	margin-left: 1px;
+	padding-right: 18px;
+}

+ 19 - 12
style/GrayOrange.css

@@ -55,7 +55,7 @@ html, body, .pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
 }
 }
 
 
 .pun h1 {
 .pun h1 {
-	font:2.154em/1em "Trebuchet MS", Arial, Helvetica, sans-serif;
+	font: 2.154em/1em "Trebuchet MS", Arial, Helvetica, sans-serif;
 	padding: 7px 0;
 	padding: 7px 0;
 }
 }
 
 
@@ -286,11 +286,11 @@ html, body, .pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
 }
 }
 
 
 #brdwelcome .conl {
 #brdwelcome .conl {
-  float: left;
+	float: left;
 }
 }
 
 
 #brdwelcome .conr {
 #brdwelcome .conr {
-  float: right;
+	float: right;
 }
 }
 
 
 #brdwelcome li span {
 #brdwelcome li span {
@@ -630,11 +630,11 @@ html, body, .pun table, .pun div, .pun form, .pun p, .pun h1, .pun h2, .pun h3,
 
 
 #debug .tcr {
 #debug .tcr {
 	width: 90%;
 	width: 90%;
-	white-space: normal
+	white-space: normal;
 }
 }
 
 
 #punindex .tcr .byuser {
 #punindex .tcr .byuser {
-	display: block
+	display: block;
 }
 }
 
 
 #punindex td.tc2, #punindex td.tc3, #punindex td.tcr, .pun #vf td.tc2, .pun #vf td.tc3,
 #punindex td.tc2, #punindex td.tc3, #punindex td.tcr, .pun #vf td.tc2, .pun #vf td.tc3,
@@ -719,7 +719,7 @@ MAIN POSTS
 #punsearch .blockpost h2 span span {
 #punsearch .blockpost h2 span span {
 	white-space: nowrap;
 	white-space: nowrap;
 	display: inline-block;
 	display: inline-block;
-	font: 1.077em "Trebuchet MS", Arial, Helvetica, sans-serif
+	font: 1.077em "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 }
 
 
 #punsearch .blockpost .icon {
 #punsearch .blockpost .icon {
@@ -770,6 +770,13 @@ MAIN POSTS
 	left: 0;
 	left: 0;
 	overflow: hidden;
 	overflow: hidden;
 	width: 206px;
 	width: 206px;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+#punviewtopic .blockpost dt:hover, #punmoderate .blockpost dt:hover {
+	width: auto;
+	background-color: #424242;
 }
 }
 
 
 .pun .blockpost dt strong {
 .pun .blockpost dt strong {
@@ -809,7 +816,7 @@ MAIN POSTS
 }
 }
 
 
 .pun .postmsg {
 .pun .postmsg {
-	width:100%;
+	width: 100%;
 	overflow: hidden;
 	overflow: hidden;
 	word-wrap: break-word;
 	word-wrap: break-word;
 }
 }
@@ -856,7 +863,7 @@ MAIN POSTS
 }
 }
 
 
 .pun .postsignature hr {
 .pun .postsignature hr {
-	border:none;
+	border: none;
 	height: 1px;
 	height: 1px;
 	margin-left: 0px;
 	margin-left: 0px;
 	text-align: left;
 	text-align: left;
@@ -983,7 +990,7 @@ MAIN POSTS
 .pun .codebox pre.vscroll {
 .pun .codebox pre.vscroll {
 	height: 32em;
 	height: 32em;
 	overflow: auto;
 	overflow: auto;
-	overflow-y: auto
+	overflow-y: auto;
 }
 }
 
 
 .pun .postmsg img, #punhelp samp img {
 .pun .postmsg img, #punhelp samp img {
@@ -1338,7 +1345,7 @@ PROFILES (+ ADMIN MENU)
 	text-decoration: none;
 	text-decoration: none;
 }
 }
 
 
-* html .pun .blockmenu a:link,  * html .pun .blockmenu a:visited {
+* html .pun .blockmenu a:link, * html .pun .blockmenu a:visited {
 	height: 1%;
 	height: 1%;
 }
 }
 
 
@@ -1602,7 +1609,7 @@ html, body, .pun {
 	padding: 0px 3px 3px 3px;
 	padding: 0px 3px 3px 3px;
 	border-width: 1px;
 	border-width: 1px;
 	border-style: solid;
 	border-style: solid;
-	border-color: #666666
+	border-color: #666666;
 }*/
 }*/
 
 
 .pun fieldset p {
 .pun fieldset p {
@@ -1642,7 +1649,7 @@ html, body, .pun {
 
 
 .pun textarea, .pun input, .pun select {
 .pun textarea, .pun input, .pun select {
 	background-color: #2a2a2a;
 	background-color: #2a2a2a;
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun .multiselect {
 .pun .multiselect {

BIN
style/GrayOrange/img/email.png


BIN
style/GrayOrange/img/flasher.gif


+ 7 - 0
style/GrayOrange/reminder.css

@@ -66,3 +66,10 @@
 	color: #D4D4D4;
 	color: #D4D4D4;
 }
 }
 
 
+#brdmenu ul span.remflasher, #adminconsole fieldset td span.remflasher {
+	background: url(img/flasher.gif) right 65% no-repeat;
+	display: inline-block;
+	line-height: normal;
+	margin-left: 1px;
+	padding-right: 18px;
+}

+ 106 - 106
style/Lithium.css

@@ -14,7 +14,7 @@
 }
 }
 
 
 .pun ul, .pun ol {
 .pun ul, .pun ol {
-	list-style: none
+	list-style: none;
 }
 }
 
 
 
 
@@ -26,11 +26,11 @@
 	width: 0;
 	width: 0;
 	line-height: 0;
 	line-height: 0;
 	font-size: 0;
 	font-size: 0;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 .pun .clearer, .pun .clearb {
 .pun .clearer, .pun .clearb {
-	clear: both
+	clear: both;
 }
 }
 
 
 .pun .nosize {
 .pun .nosize {
@@ -41,11 +41,11 @@
 }
 }
 
 
 * html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
 * html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
-	height: 1px
+	height: 1px;
 }
 }
 
 
 .pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
 .pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
-	min-height: 1px
+	min-height: 1px;
 }
 }
 
 
 .clearl {
 .clearl {
@@ -85,7 +85,7 @@
 
 
 .pun pre, .pun code {
 .pun pre, .pun code {
 	font-size: 1.182em;
 	font-size: 1.182em;
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace
+	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace;
 }
 }
 
 
 .pun pre code {
 .pun pre code {
@@ -125,70 +125,70 @@
 }
 }
 
 
 .pun span.warntext, .pun p.warntext {
 .pun span.warntext, .pun p.warntext {
-	font-weight: bold
+	font-weight: bold;
 }
 }
 
 
 /* User Content (Announcements, Rules, Posts)
 /* User Content (Announcements, Rules, Posts)
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .usercontent p, .pun .postmsg p {
 .pun .usercontent p, .pun .postmsg p {
-	padding: 0.75em 0
+	padding: 0.75em 0;
 }
 }
 
 
 .pun .usercontent ul, .pun .postmsg ul {
 .pun .usercontent ul, .pun .postmsg ul {
 	padding: 0.75em 1em 0.75em 2.5em;
 	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: disc
+	list-style: disc;
 }
 }
 
 
 .pun .usercontent ol, .pun .postmsg ol {
 .pun .usercontent ol, .pun .postmsg ol {
 	padding: 0.75em 1em 0.75em 2.5em;
 	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: decimal
+	list-style: decimal;
 }
 }
 
 
 .pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
 .pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha
+	list-style: lower-alpha;
 }
 }
 
 
 .pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
 .pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
-	padding: 0.25em 1em 0.75em 2.5em
+	padding: 0.25em 1em 0.75em 2.5em;
 }
 }
 
 
 .pun .usercontent li p, .pun .postmsg li p {
 .pun .usercontent li p, .pun .postmsg li p {
-	padding: 0
+	padding: 0;
 }
 }
 
 
 .pun .usercontent h1 {
 .pun .usercontent h1 {
 	font-size: 1.4em;
 	font-size: 1.4em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h2 {
 .pun .usercontent h2 {
 	font-size: 1.2em;
 	font-size: 1.2em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h3 {
 .pun .usercontent h3 {
 	font-size: 1.1em;
 	font-size: 1.1em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
 .pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
 	font-size: 1em;
 	font-size: 1em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .quotebox cite {
 .pun .quotebox cite {
 	font-weight: bold;
 	font-weight: bold;
 	font-style: normal;
 	font-style: normal;
-	padding: 0.75em 0.75em 0 0.75em
+	padding: 0.75em 0.75em 0 0.75em;
 }
 }
 
 
 .pun span.bbu {
 .pun span.bbu {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 .pun span.bbs, .pun del {
 .pun span.bbs, .pun del {
@@ -215,7 +215,7 @@
 
 
 html, body {
 html, body {
 	margin: 0;
 	margin: 0;
-	padding: 0
+	padding: 0;
 }
 }
 
 
 .pun {
 .pun {
@@ -238,7 +238,7 @@ html, body {
 }
 }
 
 
 #brdtitle p {
 #brdtitle p {
-	padding-top: 0px
+	padding-top: 0px;
 }
 }
 
 
 #announce, #brdstats {
 #announce, #brdstats {
@@ -246,11 +246,11 @@ html, body {
 }
 }
 
 
 .pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
 .pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
-	margin-bottom: 12px
+	margin-bottom: 12px;
 }
 }
 
 
 #punindex .blocktable, .pun .blockpost {
 #punindex .blocktable, .pun .blockpost {
-	margin-bottom: 6px
+	margin-bottom: 6px;
 }
 }
 
 
 #postreview .blockpost {
 #postreview .blockpost {
@@ -258,15 +258,15 @@ html, body {
 }
 }
 
 
 .pun .block2col .blockform, .pun .block2col .block {
 .pun .block2col .blockform, .pun .block2col .block {
-	margin-bottom: 0px
+	margin-bottom: 0px;
 }
 }
 
 
 .pun .linkst, .pun .linksb {
 .pun .linkst, .pun .linksb {
-	margin-top: -12px
+	margin-top: -12px;
 }
 }
 
 
 .pun .postlinksb {
 .pun .postlinksb {
-	margin-top: -6px
+	margin-top: -6px;
 }
 }
 
 
 
 
@@ -286,7 +286,7 @@ html, body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .block .inbox, .pun .blockmenu .inbox {
 .pun .block .inbox, .pun .blockmenu .inbox {
-	padding: 3px 6px
+	padding: 3px 6px;
 }
 }
 
 
 /*****************************************************************
 /*****************************************************************
@@ -308,11 +308,11 @@ html, body {
 }
 }
 
 
 #brdmenu a:link, #brdmenu a:visited {
 #brdmenu a:link, #brdmenu a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 #brdmenu a:hover, #brdmenu a:active {
 #brdmenu a:hover, #brdmenu a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 #brdwelcome .conl {
 #brdwelcome .conl {
@@ -328,11 +328,11 @@ html, body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .linkst {
 .pun .linkst {
-	padding: 8px 6px 3px 6px
+	padding: 8px 6px 3px 6px;
 }
 }
 
 
 .pun .linksb, .pun .postlinksb {
 .pun .linksb, .pun .postlinksb {
-	padding: 3px 6px 8px 6px
+	padding: 3px 6px 8px 6px;
 }
 }
 
 
 .pun .crumbs {
 .pun .crumbs {
@@ -372,7 +372,7 @@ html, body {
 }
 }
 
 
 .pun .postlink a:link, .pun .postlink a:visited {
 .pun .postlink a:link, .pun .postlink a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .postlink a:hover, .pun .postlink a:active {
 .pun .postlink a:hover, .pun .postlink a:active {
@@ -403,7 +403,7 @@ html, body {
 
 
 #brdfooter #modcontrols dd {
 #brdfooter #modcontrols dd {
 	display: inline;
 	display: inline;
-	margin:0 6px;
+	margin: 0 6px;
 }
 }
 
 
 
 
@@ -484,7 +484,7 @@ html, body {
 }
 }
 
 
 .pun .tcl p {
 .pun .tcl p {
-	padding: 5px 0 0 0
+	padding: 5px 0 0 0;
 }
 }
 
 
 #punsearch #vf .tc2 {
 #punsearch #vf .tc2 {
@@ -494,7 +494,7 @@ html, body {
 }
 }
 
 
 #users1 .tcr {
 #users1 .tcr {
-	width: 25%
+	width: 25%;
 }
 }
 
 
 #users1 .tc2 {
 #users1 .tc2 {
@@ -504,16 +504,16 @@ html, body {
 }
 }
 
 
 #debug .tcl {
 #debug .tcl {
-	width: 10%
+	width: 10%;
 }
 }
 
 
 #debug .tcr {
 #debug .tcr {
 	width: 90%;
 	width: 90%;
-	white-space: normal
+	white-space: normal;
 }
 }
 
 
 #punindex .tcr .byuser {
 #punindex .tcr .byuser {
-	display: block
+	display: block;
 }
 }
 
 
 .pun .blocktable .tclcon {
 .pun .blocktable .tclcon {
@@ -560,7 +560,7 @@ html, body {
 *****************************************************************/
 *****************************************************************/
 
 
 .pun .blockform form, .pun .fakeform {
 .pun .blockform form, .pun .fakeform {
-	PADDING: 20px 20px 15px 20px
+	PADDING: 20px 20px 15px 20px;
 }
 }
 
 
 .pun .forminfo {
 .pun .forminfo {
@@ -575,32 +575,32 @@ html, body {
 }
 }
 
 
 .pun .inform {
 .pun .inform {
-	padding-bottom: 12px
+	padding-bottom: 12px;
 }
 }
 
 
 .pun fieldset {
 .pun fieldset {
 	padding: 0px 12px 0px 12px;
 	padding: 0px 12px 0px 12px;
 	border-style: solid;
 	border-style: solid;
-	border-width: 1px
+	border-width: 1px;
 }
 }
 
 
 .pun legend {
 .pun legend {
-	padding: 0px 6px
+	padding: 0px 6px;
 }
 }
 
 
 .pun .infldset {
 .pun .infldset {
-	padding: 9px 0px 12px 0
+	padding: 9px 0px 12px 0;
 }
 }
 
 
 .pun label {
 .pun label {
 	display: block;
 	display: block;
-	padding: 3px 0
+	padding: 3px 0;
 }
 }
 
 
 .pun label.conl {
 .pun label.conl {
 	float: left;
 	float: left;
 	overflow: visible;
 	overflow: visible;
-	margin-right: 10px
+	margin-right: 10px;
 }
 }
 
 
 .pun fieldset .rbox br {
 .pun fieldset .rbox br {
@@ -622,21 +622,21 @@ html, body {
 }
 }
 
 
 .pun .txtarea {
 .pun .txtarea {
-	width: 75%
+	width: 75%;
 }
 }
 
 
 .pun .txtarea textarea, .pun input.longinput {
 .pun .txtarea textarea, .pun input.longinput {
-	width: 100%
+	width: 100%;
 }
 }
 
 
 .pun .bblinks {
 .pun .bblinks {
 	padding-bottom: 10px;
 	padding-bottom: 10px;
-	padding-left: 4px
+	padding-left: 4px;
 }
 }
 
 
 .pun .bblinks li {
 .pun .bblinks li {
 	display: inline;
 	display: inline;
-	padding-right: 20px
+	padding-right: 20px;
 }
 }
 
 
 .pun .blockform .buttons {
 .pun .blockform .buttons {
@@ -696,16 +696,16 @@ html, body {
 *****************************************************************/
 *****************************************************************/
 
 
 .pun .block2col {
 .pun .block2col {
-	padding-bottom: 1px
+	padding-bottom: 1px;
 }
 }
 
 
 .pun .block2col .blockform, .pun .block2col .block {
 .pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 14em
+	margin-left: 14em;
 }
 }
 
 
 .pun .blockmenu {
 .pun .blockmenu {
-	float:left;
-	width: 13em
+	float: left;
+	width: 13em;
 }
 }
 
 
 .pun .blockmenu li {
 .pun .blockmenu li {
@@ -714,17 +714,17 @@ html, body {
 }
 }
 
 
 .pun .blockmenu a:link, .pun .blockmenu a:visited {
 .pun .blockmenu a:link, .pun .blockmenu a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .blockmenu a:hover, .pun .blockmenu a:active {
 .pun .blockmenu a:hover, .pun .blockmenu a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 #viewprofile dl {
 #viewprofile dl {
 	float: left;
 	float: left;
 	width: 100%;
 	width: 100%;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 #viewprofile dd {
 #viewprofile dd {
@@ -740,7 +740,7 @@ html, body {
 
 
 #profileavatar img {
 #profileavatar img {
 	float: right;
 	float: right;
-	margin-left: 1em
+	margin-left: 1em;
 }
 }
 
 
 #adintro ul {
 #adintro ul {
@@ -775,7 +775,7 @@ html, body {
 }
 }
 
 
 .pun .postleft, .pun .postfootleft {
 .pun .postleft, .pun .postfootleft {
-	float:left;
+	float: left;
 	width: 18em;
 	width: 18em;
 	position: relative;
 	position: relative;
 	overflow: hidden;
 	overflow: hidden;
@@ -798,7 +798,7 @@ html, body {
 }
 }
 
 
 .pun .postleft .usercontacts, .pun .postleft .icon {
 .pun .postleft .usercontacts, .pun .postleft .icon {
-	margin-top: 6px
+	margin-top: 6px;
 }
 }
 
 
 .pun .postleft .postavatar, .pun .postleft .usertitle {
 .pun .postleft .postavatar, .pun .postleft .usertitle {
@@ -821,11 +821,11 @@ html, body {
 
 
 .pun .postright, .pun .postfootright {
 .pun .postright, .pun .postfootright {
 	border-left-width: 18em;
 	border-left-width: 18em;
-	border-left-style: solid
+	border-left-style: solid;
 }
 }
 
 
 #postpreview .postright {
 #postpreview .postright {
-	border-left: 0
+	border-left: 0;
 }
 }
 
 
 .pun .postright {
 .pun .postright {
@@ -833,11 +833,11 @@ html, body {
 }
 }
 
 
 .pun .postfootright, .pun .multidelete {
 .pun .postfootright, .pun .multidelete {
-	text-align: right
+	text-align: right;
 }
 }
 
 
 .pun .postmsg {
 .pun .postmsg {
-	width:98%;
+	width: 98%;
 	overflow: hidden;
 	overflow: hidden;
 	padding-bottom: 6px;
 	padding-bottom: 6px;
 	word-wrap: break-word;
 	word-wrap: break-word;
@@ -861,11 +861,11 @@ html, body {
 }
 }
 
 
 .pun .postfootright a:link, .pun .postfootright a:visited {
 .pun .postfootright a:link, .pun .postfootright a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .postfootright a:hover, .pun .postfootright a:active {
 .pun .postfootright a:hover, .pun .postfootright a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 .pun .codebox {
 .pun .codebox {
@@ -889,13 +889,13 @@ html, body {
 
 
 .pun .quotebox blockquote {
 .pun .quotebox blockquote {
 	width: 100%;
 	width: 100%;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 .pun .codebox pre {
 .pun .codebox pre {
 	overflow: auto;
 	overflow: auto;
 	width: 100%;
 	width: 100%;
-	overflow-y:hidden
+	overflow-y: hidden;
 }
 }
 
 
 * html .pun .codebox pre {
 * html .pun .codebox pre {
@@ -903,7 +903,7 @@ html, body {
 }
 }
 
 
 *+html .pun .codebox pre {
 *+html .pun .codebox pre {
-	padding-bottom: 10px
+	padding-bottom: 10px;
 }
 }
 
 
 .pun .codebox pre code {
 .pun .codebox pre code {
@@ -914,7 +914,7 @@ html, body {
 .pun .codebox pre.vscroll {
 .pun .codebox pre.vscroll {
 	height: 32em;
 	height: 32em;
 	overflow: auto;
 	overflow: auto;
-	overflow-y: auto
+	overflow-y: auto;
 }
 }
 
 
 .pun .postmsg img {
 .pun .postmsg img {
@@ -926,7 +926,7 @@ html, body {
 	width: 200px;
 	width: 200px;
 	text-align: left;
 	text-align: left;
 	height: 1px;
 	height: 1px;
-	border:none
+	border: none;
 }
 }
 
 
 .pun .postmsg .postimg img {
 .pun .postmsg .postimg img {
@@ -959,11 +959,11 @@ html, body {
 /****************************************************************/
 /****************************************************************/
 
 
 #punhelp h2 {
 #punhelp h2 {
-	margin-top: 12px
+	margin-top: 12px;
 }
 }
 
 
 #punhelp div.box {
 #punhelp div.box {
-	padding: 10px
+	padding: 10px;
 }
 }
 
 
 #debugtime {
 #debugtime {
@@ -972,11 +972,11 @@ html, body {
 }
 }
 
 
 #brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
 #brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
-	line-height: 1.4em
+	line-height: 1.4em;
 }
 }
 
 
 #announce div.inbox div {
 #announce div.inbox div {
-	padding: 3px 0
+	padding: 3px 0;
 }
 }
 
 
 /*****************************************************************
 /*****************************************************************
@@ -988,42 +988,42 @@ COLOUR SCHEME
 
 
 body {
 body {
 	background: #fff;
 	background: #fff;
-	color: #333
+	color: #333;
 }
 }
 
 
 .pun {
 .pun {
-	color: #333
+	color: #333;
 }
 }
 
 
 .pun .box, #adminconsole fieldset th {
 .pun .box, #adminconsole fieldset th {
-	background-color: #f1f1f1
+	background-color: #f1f1f1;
 }
 }
 
 
 .pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
 .pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
 #brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
 #brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
-	background-color: #dedfdf
+	background-color: #dedfdf;
 }
 }
 
 
 .pun h2, #brdmenu {
 .pun h2, #brdmenu {
 	background-color: #6c8a3f;
 	background-color: #6c8a3f;
-	color: #fff
+	color: #fff;
 }
 }
 
 
 .pun th {
 .pun th {
-	background-color: #d1d1d1
+	background-color: #d1d1d1;
 }
 }
 
 
 .pun legend {
 .pun legend {
-	color: #6c8a3f
+	color: #6c8a3f;
 }
 }
 
 
 .pun .blockmenu li.isactive a, #posterror li strong {
 .pun .blockmenu li.isactive a, #posterror li strong {
-	color: #333
+	color: #333;
 }
 }
 
 
 .pun .usercontent * {
 .pun .usercontent * {
 	background: transparent;
 	background: transparent;
-	color: #333
+	color: #333;
 }
 }
 
 
 .pun .multiselect, .pun .checklist {
 .pun .multiselect, .pun .checklist {
@@ -1038,15 +1038,15 @@ body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
 .pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
-	background-color: #dedfdf
+	background-color: #dedfdf;
 }
 }
 
 
 .pun .postright, .pun .postfootright {
 .pun .postright, .pun .postfootright {
-	border-left-color: #f1f1f1
+	border-left-color: #f1f1f1;
 }
 }
 
 
 .pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
 .pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
-	background-color: #f1f1f1
+	background-color: #f1f1f1;
 }
 }
 
 
 #punhelp .codebox, #punhelp .quotebox {
 #punhelp .codebox, #punhelp .quotebox {
@@ -1054,11 +1054,11 @@ body {
 }
 }
 
 
 .pun .blockpost h2 {
 .pun .blockpost h2 {
-	background-color: #7ea34b
+	background-color: #7ea34b;
 }
 }
 
 
 .pun .blockpost h2 span.conr {
 .pun .blockpost h2 span.conr {
-	color: #b7d094
+	color: #b7d094;
 }
 }
 
 
 .pun .postmsg ins, #punhelp samp ins {
 .pun .postmsg ins, #punhelp samp ins {
@@ -1067,46 +1067,46 @@ body {
 
 
 .pun hr {
 .pun hr {
 	background-color: #333;
 	background-color: #333;
-	color: #333
+	color: #333;
 }
 }
 
 
 /* Borders
 /* Borders
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .box {
 .pun .box {
-	border-color: #6c8a3f
+	border-color: #6c8a3f;
 }
 }
 
 
 .pun td, #brdfooter #modcontrols {
 .pun td, #brdfooter #modcontrols {
-	border-color: #cedeb9
+	border-color: #cedeb9;
 }
 }
 
 
 .pun th {
 .pun th {
-	border-color: #d1d1d1
+	border-color: #d1d1d1;
 }
 }
 
 
 .pun fieldset {
 .pun fieldset {
-	border-color: #aca899
+	border-color: #aca899;
 }
 }
 
 
 #adminconsole td, #adminconsole th {
 #adminconsole td, #adminconsole th {
-	border-color: #f1f1f1
+	border-color: #f1f1f1;
 }
 }
 
 
 .pun .quotebox, .pun .codebox, .pun .forminfo,
 .pun .quotebox, .pun .codebox, .pun .forminfo,
 .pun .blockpost label, .pun .deletemsg {
 .pun .blockpost label, .pun .deletemsg {
-	border-color: #aca899 #fff #fff #aca899
+	border-color: #aca899 #fff #fff #aca899;
 }
 }
 
 
 /* Links
 /* Links
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun a:link, .pun a:visited {
 .pun a:link, .pun a:visited {
-	color: #638137
+	color: #638137;
 }
 }
 
 
 .pun a:hover, .pun a:active, .pun a:focus {
 .pun a:hover, .pun a:active, .pun a:focus {
-	color: #8eb653
+	color: #8eb653;
 }
 }
 
 
 .pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
 .pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
@@ -1119,45 +1119,45 @@ body {
 
 
 .pun h2 a:link, .pun h2 a:visited,
 .pun h2 a:link, .pun h2 a:visited,
 #brdmenu a:link, #brdmenu a:visited {
 #brdmenu a:link, #brdmenu a:visited {
-	color: #fff
+	color: #fff;
 }
 }
 
 
 .pun h2 a:hover, .pun h2 a:active,
 .pun h2 a:hover, .pun h2 a:active,
 #brdmenu a:hover, #brdmenu a:active {
 #brdmenu a:hover, #brdmenu a:active {
-	color: #fff
+	color: #fff;
 }
 }
 
 
 .pun .postreport a:link, .pun .postreport a:visited,
 .pun .postreport a:link, .pun .postreport a:visited,
 .pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
 .pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
-	color: #888
+	color: #888;
 }
 }
 
 
 .pun .postreport a:hover, .pun .postreport a:active,
 .pun .postreport a:hover, .pun .postreport a:active,
 .pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
 .pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
-	color: #aaa
+	color: #aaa;
 }
 }
 
 
 .pun .maintenancelink a:link, .pun .maintenancelink a:visited {
 .pun .maintenancelink a:link, .pun .maintenancelink a:visited {
-	color: #b42000
+	color: #b42000;
 }
 }
 
 
 .pun .maintenancelink a:hover, .pun .maintenancelink a:active {
 .pun .maintenancelink a:hover, .pun .maintenancelink a:active {
-	color: #b42000
+	color: #b42000;
 }
 }
 
 
 /* Status Indicators
 /* Status Indicators
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .icon {
 .pun .icon {
-	border-color: #e6e6e6 #dedede #dadada #e2e2e2
+	border-color: #e6e6e6 #dedede #dadada #e2e2e2;
 }
 }
 
 
 .pun .iredirect .icon {
 .pun .iredirect .icon {
-	border-color: #f1f1f1 #f1f1f1 #f1f1f1 #f1f1f1
+	border-color: #f1f1f1 #f1f1f1 #f1f1f1 #f1f1f1;
 }
 }
 
 
 .pun .inew .icon {
 .pun .inew .icon {
-	border-color: #8bb453 #7a9e48 #709142 #799c47
+	border-color: #8bb453 #7a9e48 #709142 #799c47;
 }
 }
 
 
 /* ---------- BBCODE TOOLBAR ------------- */
 /* ---------- BBCODE TOOLBAR ------------- */

+ 7 - 0
style/Lithium/reminder.css

@@ -65,3 +65,10 @@
 	color: #333333;
 	color: #333333;
 }
 }
 
 
+#brdmenu ul span.remflasher, #adminconsole fieldset td span.remflasher {
+	background: url(../../img/flasher.gif) right 65% no-repeat;
+	display: inline-block;
+	line-height: normal;
+	margin-left: 1px;
+	padding-right: 18px;
+}

+ 107 - 107
style/Mercury.css

@@ -14,7 +14,7 @@
 }
 }
 
 
 .pun ul, .pun ol {
 .pun ul, .pun ol {
-	list-style: none
+	list-style: none;
 }
 }
 
 
 
 
@@ -26,11 +26,11 @@
 	width: 0;
 	width: 0;
 	line-height: 0;
 	line-height: 0;
 	font-size: 0;
 	font-size: 0;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 .pun .clearer, .pun .clearb {
 .pun .clearer, .pun .clearb {
-	clear: both
+	clear: both;
 }
 }
 
 
 .pun .nosize {
 .pun .nosize {
@@ -41,11 +41,11 @@
 }
 }
 
 
 * html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
 * html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
-	height: 1px
+	height: 1px;
 }
 }
 
 
 .pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
 .pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
-	min-height: 1px
+	min-height: 1px;
 }
 }
 
 
 .clearl {
 .clearl {
@@ -85,7 +85,7 @@
 
 
 .pun pre, .pun code {
 .pun pre, .pun code {
 	font-size: 1.182em;
 	font-size: 1.182em;
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace
+	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace;
 }
 }
 
 
 .pun pre code {
 .pun pre code {
@@ -125,70 +125,70 @@
 }
 }
 
 
 .pun span.warntext, .pun p.warntext {
 .pun span.warntext, .pun p.warntext {
-	font-weight: bold
+	font-weight: bold;
 }
 }
 
 
 /* User Content (Announcements, Rules, Posts)
 /* User Content (Announcements, Rules, Posts)
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .usercontent p, .pun .postmsg p {
 .pun .usercontent p, .pun .postmsg p {
-	padding: 0.75em 0
+	padding: 0.75em 0;
 }
 }
 
 
 .pun .usercontent ul, .pun .postmsg ul {
 .pun .usercontent ul, .pun .postmsg ul {
 	padding: 0.75em 1em 0.75em 2.5em;
 	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: disc
+	list-style: disc;
 }
 }
 
 
 .pun .usercontent ol, .pun .postmsg ol {
 .pun .usercontent ol, .pun .postmsg ol {
 	padding: 0.75em 1em 0.75em 2.5em;
 	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: decimal
+	list-style: decimal;
 }
 }
 
 
 .pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
 .pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha
+	list-style: lower-alpha;
 }
 }
 
 
 .pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
 .pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
-	padding: 0.25em 1em 0.75em 2.5em
+	padding: 0.25em 1em 0.75em 2.5em;
 }
 }
 
 
 .pun .usercontent li p, .pun .postmsg li p {
 .pun .usercontent li p, .pun .postmsg li p {
-	padding: 0
+	padding: 0;
 }
 }
 
 
 .pun .usercontent h1 {
 .pun .usercontent h1 {
 	font-size: 1.4em;
 	font-size: 1.4em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h2 {
 .pun .usercontent h2 {
 	font-size: 1.2em;
 	font-size: 1.2em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h3 {
 .pun .usercontent h3 {
 	font-size: 1.1em;
 	font-size: 1.1em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
 .pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
 	font-size: 1em;
 	font-size: 1em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .quotebox cite {
 .pun .quotebox cite {
 	font-weight: bold;
 	font-weight: bold;
 	font-style: normal;
 	font-style: normal;
-	padding: 0.75em 0.75em 0 0.75em
+	padding: 0.75em 0.75em 0 0.75em;
 }
 }
 
 
 .pun span.bbu {
 .pun span.bbu {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 .pun span.bbs, .pun del {
 .pun span.bbs, .pun del {
@@ -215,7 +215,7 @@
 
 
 html, body {
 html, body {
 	margin: 0;
 	margin: 0;
-	padding: 0
+	padding: 0;
 }
 }
 
 
 .pun {
 .pun {
@@ -238,7 +238,7 @@ html, body {
 }
 }
 
 
 #brdtitle p {
 #brdtitle p {
-	padding-top: 0px
+	padding-top: 0px;
 }
 }
 
 
 #announce, #brdstats {
 #announce, #brdstats {
@@ -246,11 +246,11 @@ html, body {
 }
 }
 
 
 .pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
 .pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
-	margin-bottom: 12px
+	margin-bottom: 12px;
 }
 }
 
 
 #punindex .blocktable, .pun .blockpost {
 #punindex .blocktable, .pun .blockpost {
-	margin-bottom: 6px
+	margin-bottom: 6px;
 }
 }
 
 
 #postreview .blockpost {
 #postreview .blockpost {
@@ -258,15 +258,15 @@ html, body {
 }
 }
 
 
 .pun .block2col .blockform, .pun .block2col .block {
 .pun .block2col .blockform, .pun .block2col .block {
-	margin-bottom: 0px
+	margin-bottom: 0px;
 }
 }
 
 
 .pun .linkst, .pun .linksb {
 .pun .linkst, .pun .linksb {
-	margin-top: -12px
+	margin-top: -12px;
 }
 }
 
 
 .pun .postlinksb {
 .pun .postlinksb {
-	margin-top: -6px
+	margin-top: -6px;
 }
 }
 
 
 
 
@@ -286,7 +286,7 @@ html, body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .block .inbox, .pun .blockmenu .inbox {
 .pun .block .inbox, .pun .blockmenu .inbox {
-	padding: 3px 6px
+	padding: 3px 6px;
 }
 }
 
 
 /*****************************************************************
 /*****************************************************************
@@ -308,11 +308,11 @@ html, body {
 }
 }
 
 
 #brdmenu a:link, #brdmenu a:visited {
 #brdmenu a:link, #brdmenu a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 #brdmenu a:hover, #brdmenu a:active {
 #brdmenu a:hover, #brdmenu a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 #brdwelcome .conl {
 #brdwelcome .conl {
@@ -328,11 +328,11 @@ html, body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .linkst {
 .pun .linkst {
-	padding: 8px 6px 3px 6px
+	padding: 8px 6px 3px 6px;
 }
 }
 
 
 .pun .linksb, .pun .postlinksb {
 .pun .linksb, .pun .postlinksb {
-	padding: 3px 6px 8px 6px
+	padding: 3px 6px 8px 6px;
 }
 }
 
 
 .pun .crumbs {
 .pun .crumbs {
@@ -372,7 +372,7 @@ html, body {
 }
 }
 
 
 .pun .postlink a:link, .pun .postlink a:visited {
 .pun .postlink a:link, .pun .postlink a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .postlink a:hover, .pun .postlink a:active {
 .pun .postlink a:hover, .pun .postlink a:active {
@@ -403,7 +403,7 @@ html, body {
 
 
 #brdfooter #modcontrols dd {
 #brdfooter #modcontrols dd {
 	display: inline;
 	display: inline;
-	margin:0 6px;
+	margin: 0 6px;
 }
 }
 
 
 
 
@@ -484,7 +484,7 @@ html, body {
 }
 }
 
 
 .pun .tcl p {
 .pun .tcl p {
-	padding: 5px 0 0 0
+	padding: 5px 0 0 0;
 }
 }
 
 
 #punsearch #vf .tc2 {
 #punsearch #vf .tc2 {
@@ -494,7 +494,7 @@ html, body {
 }
 }
 
 
 #users1 .tcr {
 #users1 .tcr {
-	width: 25%
+	width: 25%;
 }
 }
 
 
 #users1 .tc2 {
 #users1 .tc2 {
@@ -504,16 +504,16 @@ html, body {
 }
 }
 
 
 #debug .tcl {
 #debug .tcl {
-	width: 10%
+	width: 10%;
 }
 }
 
 
 #debug .tcr {
 #debug .tcr {
 	width: 90%;
 	width: 90%;
-	white-space: normal
+	white-space: normal;
 }
 }
 
 
 #punindex .tcr .byuser {
 #punindex .tcr .byuser {
-	display: block
+	display: block;
 }
 }
 
 
 .pun .blocktable .tclcon {
 .pun .blocktable .tclcon {
@@ -560,7 +560,7 @@ html, body {
 *****************************************************************/
 *****************************************************************/
 
 
 .pun .blockform form, .pun .fakeform {
 .pun .blockform form, .pun .fakeform {
-	PADDING: 20px 20px 15px 20px
+	PADDING: 20px 20px 15px 20px;
 }
 }
 
 
 .pun .forminfo {
 .pun .forminfo {
@@ -575,32 +575,32 @@ html, body {
 }
 }
 
 
 .pun .inform {
 .pun .inform {
-	padding-bottom: 12px
+	padding-bottom: 12px;
 }
 }
 
 
 .pun fieldset {
 .pun fieldset {
 	padding: 0px 12px 0px 12px;
 	padding: 0px 12px 0px 12px;
 	border-style: solid;
 	border-style: solid;
-	border-width: 1px
+	border-width: 1px;
 }
 }
 
 
 .pun legend {
 .pun legend {
-	padding: 0px 6px
+	padding: 0px 6px;
 }
 }
 
 
 .pun .infldset {
 .pun .infldset {
-	padding: 9px 0px 12px 0
+	padding: 9px 0px 12px 0;
 }
 }
 
 
 .pun label {
 .pun label {
 	display: block;
 	display: block;
-	padding: 3px 0
+	padding: 3px 0;
 }
 }
 
 
 .pun label.conl {
 .pun label.conl {
 	float: left;
 	float: left;
 	overflow: visible;
 	overflow: visible;
-	margin-right: 10px
+	margin-right: 10px;
 }
 }
 
 
 .pun fieldset .rbox br {
 .pun fieldset .rbox br {
@@ -622,21 +622,21 @@ html, body {
 }
 }
 
 
 .pun .txtarea {
 .pun .txtarea {
-	width: 75%
+	width: 75%;
 }
 }
 
 
 .pun .txtarea textarea, .pun input.longinput {
 .pun .txtarea textarea, .pun input.longinput {
-	width: 100%
+	width: 100%;
 }
 }
 
 
 .pun .bblinks {
 .pun .bblinks {
 	padding-bottom: 10px;
 	padding-bottom: 10px;
-	padding-left: 4px
+	padding-left: 4px;
 }
 }
 
 
 .pun .bblinks li {
 .pun .bblinks li {
 	display: inline;
 	display: inline;
-	padding-right: 20px
+	padding-right: 20px;
 }
 }
 
 
 .pun .blockform .buttons {
 .pun .blockform .buttons {
@@ -696,16 +696,16 @@ html, body {
 *****************************************************************/
 *****************************************************************/
 
 
 .pun .block2col {
 .pun .block2col {
-	padding-bottom: 1px
+	padding-bottom: 1px;
 }
 }
 
 
 .pun .block2col .blockform, .pun .block2col .block {
 .pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 14em
+	margin-left: 14em;
 }
 }
 
 
 .pun .blockmenu {
 .pun .blockmenu {
-	float:left;
-	width: 13em
+	float: left;
+	width: 13em;
 }
 }
 
 
 .pun .blockmenu li {
 .pun .blockmenu li {
@@ -714,17 +714,17 @@ html, body {
 }
 }
 
 
 .pun .blockmenu a:link, .pun .blockmenu a:visited {
 .pun .blockmenu a:link, .pun .blockmenu a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .blockmenu a:hover, .pun .blockmenu a:active {
 .pun .blockmenu a:hover, .pun .blockmenu a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 #viewprofile dl {
 #viewprofile dl {
 	float: left;
 	float: left;
 	width: 100%;
 	width: 100%;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 #viewprofile dd {
 #viewprofile dd {
@@ -740,7 +740,7 @@ html, body {
 
 
 #profileavatar img {
 #profileavatar img {
 	float: right;
 	float: right;
-	margin-left: 1em
+	margin-left: 1em;
 }
 }
 
 
 #adintro ul {
 #adintro ul {
@@ -775,7 +775,7 @@ html, body {
 }
 }
 
 
 .pun .postleft, .pun .postfootleft {
 .pun .postleft, .pun .postfootleft {
-	float:left;
+	float: left;
 	width: 18em;
 	width: 18em;
 	position: relative;
 	position: relative;
 	overflow: hidden;
 	overflow: hidden;
@@ -798,7 +798,7 @@ html, body {
 }
 }
 
 
 .pun .postleft .usercontacts, .pun .postleft .icon {
 .pun .postleft .usercontacts, .pun .postleft .icon {
-	margin-top: 6px
+	margin-top: 6px;
 }
 }
 
 
 .pun .postleft .postavatar, .pun .postleft .usertitle {
 .pun .postleft .postavatar, .pun .postleft .usertitle {
@@ -821,11 +821,11 @@ html, body {
 
 
 .pun .postright, .pun .postfootright {
 .pun .postright, .pun .postfootright {
 	border-left-width: 18em;
 	border-left-width: 18em;
-	border-left-style: solid
+	border-left-style: solid;
 }
 }
 
 
 #postpreview .postright {
 #postpreview .postright {
-	border-left: 0
+	border-left: 0;
 }
 }
 
 
 .pun .postright {
 .pun .postright {
@@ -833,11 +833,11 @@ html, body {
 }
 }
 
 
 .pun .postfootright, .pun .multidelete {
 .pun .postfootright, .pun .multidelete {
-	text-align: right
+	text-align: right;
 }
 }
 
 
 .pun .postmsg {
 .pun .postmsg {
-	width:98%;
+	width: 98%;
 	overflow: hidden;
 	overflow: hidden;
 	padding-bottom: 6px;
 	padding-bottom: 6px;
 	word-wrap: break-word;
 	word-wrap: break-word;
@@ -861,11 +861,11 @@ html, body {
 }
 }
 
 
 .pun .postfootright a:link, .pun .postfootright a:visited {
 .pun .postfootright a:link, .pun .postfootright a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .postfootright a:hover, .pun .postfootright a:active {
 .pun .postfootright a:hover, .pun .postfootright a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 .pun .codebox {
 .pun .codebox {
@@ -889,13 +889,13 @@ html, body {
 
 
 .pun .quotebox blockquote {
 .pun .quotebox blockquote {
 	width: 100%;
 	width: 100%;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 .pun .codebox pre {
 .pun .codebox pre {
 	overflow: auto;
 	overflow: auto;
 	width: 100%;
 	width: 100%;
-	overflow-y:hidden
+	overflow-y: hidden;
 }
 }
 
 
 * html .pun .codebox pre {
 * html .pun .codebox pre {
@@ -903,7 +903,7 @@ html, body {
 }
 }
 
 
 *+html .pun .codebox pre {
 *+html .pun .codebox pre {
-	padding-bottom: 10px
+	padding-bottom: 10px;
 }
 }
 
 
 .pun .codebox pre code {
 .pun .codebox pre code {
@@ -914,7 +914,7 @@ html, body {
 .pun .codebox pre.vscroll {
 .pun .codebox pre.vscroll {
 	height: 32em;
 	height: 32em;
 	overflow: auto;
 	overflow: auto;
-	overflow-y: auto
+	overflow-y: auto;
 }
 }
 
 
 .pun .postmsg img {
 .pun .postmsg img {
@@ -926,7 +926,7 @@ html, body {
 	width: 200px;
 	width: 200px;
 	text-align: left;
 	text-align: left;
 	height: 1px;
 	height: 1px;
-	border:none
+	border: none;
 }
 }
 
 
 .pun .postmsg .postimg img {
 .pun .postmsg .postimg img {
@@ -959,11 +959,11 @@ html, body {
 /****************************************************************/
 /****************************************************************/
 
 
 #punhelp h2 {
 #punhelp h2 {
-	margin-top: 12px
+	margin-top: 12px;
 }
 }
 
 
 #punhelp div.box {
 #punhelp div.box {
-	padding: 10px
+	padding: 10px;
 }
 }
 
 
 #debugtime {
 #debugtime {
@@ -972,11 +972,11 @@ html, body {
 }
 }
 
 
 #brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
 #brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
-	line-height: 1.4em
+	line-height: 1.4em;
 }
 }
 
 
 #announce div.inbox div {
 #announce div.inbox div {
-	padding: 3px 0
+	padding: 3px 0;
 }
 }
 
 
 /*****************************************************************
 /*****************************************************************
@@ -988,47 +988,47 @@ COLOUR SCHEME
 
 
 body {
 body {
 	background: #2a2a2a;
 	background: #2a2a2a;
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun {
 .pun {
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun .box, #adminconsole fieldset th {
 .pun .box, #adminconsole fieldset th {
-	background-color: #383838
+	background-color: #383838;
 }
 }
 
 
 .pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
 .pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
 #brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
 #brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
-	background-color: #424242
+	background-color: #424242;
 }
 }
 
 
 .pun h2, #brdmenu {
 .pun h2, #brdmenu {
 	background-color: #565656;
 	background-color: #565656;
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun th {
 .pun th {
-	background-color: #484848
+	background-color: #484848;
 }
 }
 
 
 .pun legend {
 .pun legend {
-	color: #f6b620
+	color: #f6b620;
 }
 }
 
 
 .pun .blockmenu li.isactive a, #posterror li strong {
 .pun .blockmenu li.isactive a, #posterror li strong {
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun .usercontent * {
 .pun .usercontent * {
 	background: transparent;
 	background: transparent;
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun textarea, .pun input, .pun select {
 .pun textarea, .pun input, .pun select {
 	background-color: #2a2a2a;
 	background-color: #2a2a2a;
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun .multiselect, .pun .checklist {
 .pun .multiselect, .pun .checklist {
@@ -1043,23 +1043,23 @@ body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
 .pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
-	background-color: #383838
+	background-color: #383838;
 }
 }
 
 
 .pun .postright, .pun .postfootright {
 .pun .postright, .pun .postfootright {
-	border-left-color: #424242
+	border-left-color: #424242;
 }
 }
 
 
 .pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
 .pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
-	background-color: #424242
+	background-color: #424242;
 }
 }
 
 
 .pun .blockpost h2 {
 .pun .blockpost h2 {
-	background-color: #565656
+	background-color: #565656;
 }
 }
 
 
 .pun .blockpost h2 span.conr {
 .pun .blockpost h2 span.conr {
-	color: #a19e96
+	color: #a19e96;
 }
 }
 
 
 .pun .postmsg ins, #punhelp samp ins {
 .pun .postmsg ins, #punhelp samp ins {
@@ -1068,46 +1068,46 @@ body {
 
 
 .pun hr {
 .pun hr {
 	background-color: #606060;
 	background-color: #606060;
-	color: #606060
+	color: #606060;
 }
 }
 
 
 /* Borders
 /* Borders
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .box {
 .pun .box {
-	border-color:#565656
+	border-color: #565656;
 }
 }
 
 
 .pun td, #brdfooter #modcontrols {
 .pun td, #brdfooter #modcontrols {
-	border-color: #565656
+	border-color: #565656;
 }
 }
 
 
 .pun th {
 .pun th {
-	border-color: #484848
+	border-color: #484848;
 }
 }
 
 
 .pun fieldset {
 .pun fieldset {
-	border-color: #565656
+	border-color: #565656;
 }
 }
 
 
 #adminconsole td, #adminconsole th {
 #adminconsole td, #adminconsole th {
-	border-color: #383838
+	border-color: #383838;
 }
 }
 
 
 .pun .quotebox, .pun .codebox, .pun .forminfo,
 .pun .quotebox, .pun .codebox, .pun .forminfo,
 .pun .blockpost label, .pun .deletemsg {
 .pun .blockpost label, .pun .deletemsg {
-	border-color: #565656
+	border-color: #565656;
 }
 }
 
 
 /* Links
 /* Links
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun a:link, .pun a:visited {
 .pun a:link, .pun a:visited {
-	color: #f6b620
+	color: #f6b620;
 }
 }
 
 
 .pun a:hover, .pun a:active, .pun a:focus {
 .pun a:hover, .pun a:active, .pun a:focus {
-	color: #ffee40
+	color: #ffee40;
 }
 }
 
 
 .pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
 .pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
@@ -1120,45 +1120,45 @@ body {
 
 
 .pun h2 a:link, .pun h2 a:visited,
 .pun h2 a:link, .pun h2 a:visited,
 #brdmenu a:link, #brdmenu a:visited {
 #brdmenu a:link, #brdmenu a:visited {
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun h2 a:hover, .pun h2 a:active,
 .pun h2 a:hover, .pun h2 a:active,
 #brdmenu a:hover, #brdmenu a:active {
 #brdmenu a:hover, #brdmenu a:active {
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun .postreport a:link, .pun .postreport a:visited,
 .pun .postreport a:link, .pun .postreport a:visited,
 .pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
 .pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
-	color: #888
+	color: #888;
 }
 }
 
 
 .pun .postreport a:hover, .pun .postreport a:active,
 .pun .postreport a:hover, .pun .postreport a:active,
 .pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
 .pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
-	color: #aaa
+	color: #aaa;
 }
 }
 
 
 .pun .maintenancelink a:link, .pun .maintenancelink a:visited {
 .pun .maintenancelink a:link, .pun .maintenancelink a:visited {
-	color: #ff4000
+	color: #ff4000;
 }
 }
 
 
 .pun .maintenancelink a:hover, .pun .maintenancelink a:active {
 .pun .maintenancelink a:hover, .pun .maintenancelink a:active {
-	color: #ff5010
+	color: #ff5010;
 }
 }
 
 
 /* Status Indicators
 /* Status Indicators
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .icon {
 .pun .icon {
-	border-color: #484848 #404040 #3c3c3c #444444
+	border-color: #484848 #404040 #3c3c3c #444444;
 }
 }
 
 
 .pun .iredirect .icon {
 .pun .iredirect .icon {
-	border-color: #383838 #383838 #383838 #383838
+	border-color: #383838 #383838 #383838 #383838;
 }
 }
 
 
 .pun .inew .icon {
 .pun .inew .icon {
-	border-color: #f6b620 #ecae1f #d09a1b #e1a61d
+	border-color: #f6b620 #ecae1f #d09a1b #e1a61d;
 }
 }
 
 
 /* ---------- BBCODE TOOLBAR ------------- */
 /* ---------- BBCODE TOOLBAR ------------- */

+ 7 - 0
style/Mercury/reminder.css

@@ -65,3 +65,10 @@
 	color: #D4D4D4;
 	color: #D4D4D4;
 }
 }
 
 
+#brdmenu ul span.remflasher, #adminconsole fieldset td span.remflasher {
+	background: url(../../img/flasher.gif) right 65% no-repeat;
+	display: inline-block;
+	line-height: normal;
+	margin-left: 1px;
+	padding-right: 18px;
+}

+ 106 - 106
style/Oxygen.css

@@ -14,7 +14,7 @@
 }
 }
 
 
 .pun ul, .pun ol {
 .pun ul, .pun ol {
-	list-style: none
+	list-style: none;
 }
 }
 
 
 
 
@@ -26,11 +26,11 @@
 	width: 0;
 	width: 0;
 	line-height: 0;
 	line-height: 0;
 	font-size: 0;
 	font-size: 0;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 .pun .clearer, .pun .clearb {
 .pun .clearer, .pun .clearb {
-	clear: both
+	clear: both;
 }
 }
 
 
 .pun .nosize {
 .pun .nosize {
@@ -41,11 +41,11 @@
 }
 }
 
 
 * html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
 * html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
-	height: 1px
+	height: 1px;
 }
 }
 
 
 .pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
 .pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
-	min-height: 1px
+	min-height: 1px;
 }
 }
 
 
 .clearl {
 .clearl {
@@ -85,7 +85,7 @@
 
 
 .pun pre, .pun code {
 .pun pre, .pun code {
 	font-size: 1.182em;
 	font-size: 1.182em;
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace
+	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace;
 }
 }
 
 
 .pun pre code {
 .pun pre code {
@@ -125,7 +125,7 @@
 }
 }
 
 
 .pun span.warntext, .pun p.warntext {
 .pun span.warntext, .pun p.warntext {
-	font-weight: bold
+	font-weight: bold;
 }
 }
 
 
 
 
@@ -133,63 +133,63 @@
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .usercontent p, .pun .postmsg p {
 .pun .usercontent p, .pun .postmsg p {
-	padding: 0.75em 0
+	padding: 0.75em 0;
 }
 }
 
 
 .pun .usercontent ul, .pun .postmsg ul {
 .pun .usercontent ul, .pun .postmsg ul {
 	padding: 0.75em 1em 0.75em 2.5em;
 	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: disc
+	list-style: disc;
 }
 }
 
 
 .pun .usercontent ol, .pun .postmsg ol {
 .pun .usercontent ol, .pun .postmsg ol {
 	padding: 0.75em 1em 0.75em 2.5em;
 	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: decimal
+	list-style: decimal;
 }
 }
 
 
 .pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
 .pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha
+	list-style: lower-alpha;
 }
 }
 
 
 .pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
 .pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
-	padding: 0.25em 1em 0.75em 2.5em
+	padding: 0.25em 1em 0.75em 2.5em;
 }
 }
 
 
 .pun .usercontent li p, .pun .postmsg li p {
 .pun .usercontent li p, .pun .postmsg li p {
-	padding: 0
+	padding: 0;
 }
 }
 
 
 .pun .usercontent h1 {
 .pun .usercontent h1 {
 	font-size: 1.4em;
 	font-size: 1.4em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h2 {
 .pun .usercontent h2 {
 	font-size: 1.2em;
 	font-size: 1.2em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h3 {
 .pun .usercontent h3 {
 	font-size: 1.1em;
 	font-size: 1.1em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
 .pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
 	font-size: 1em;
 	font-size: 1em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .quotebox cite {
 .pun .quotebox cite {
 	font-weight: bold;
 	font-weight: bold;
 	font-style: normal;
 	font-style: normal;
-	padding: 0.75em 0.75em 0 0.75em
+	padding: 0.75em 0.75em 0 0.75em;
 }
 }
 
 
 .pun span.bbu {
 .pun span.bbu {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 .pun span.bbs, .pun del {
 .pun span.bbs, .pun del {
@@ -216,7 +216,7 @@
 
 
 html, body {
 html, body {
 	margin: 0;
 	margin: 0;
-	padding: 0
+	padding: 0;
 }
 }
 
 
 .pun {
 .pun {
@@ -239,7 +239,7 @@ html, body {
 }
 }
 
 
 #brdtitle p {
 #brdtitle p {
-	padding-top: 0px
+	padding-top: 0px;
 }
 }
 
 
 #announce, #brdstats {
 #announce, #brdstats {
@@ -247,11 +247,11 @@ html, body {
 }
 }
 
 
 .pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
 .pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
-	margin-bottom: 12px
+	margin-bottom: 12px;
 }
 }
 
 
 #punindex .blocktable, .pun .blockpost {
 #punindex .blocktable, .pun .blockpost {
-	margin-bottom: 6px
+	margin-bottom: 6px;
 }
 }
 
 
 #postreview .blockpost {
 #postreview .blockpost {
@@ -259,15 +259,15 @@ html, body {
 }
 }
 
 
 .pun .block2col .blockform, .pun .block2col .block {
 .pun .block2col .blockform, .pun .block2col .block {
-	margin-bottom: 0px
+	margin-bottom: 0px;
 }
 }
 
 
 .pun .linkst, .pun .linksb {
 .pun .linkst, .pun .linksb {
-	margin-top: -12px
+	margin-top: -12px;
 }
 }
 
 
 .pun .postlinksb {
 .pun .postlinksb {
-	margin-top: -6px
+	margin-top: -6px;
 }
 }
 
 
 
 
@@ -287,7 +287,7 @@ html, body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .block .inbox, .pun .blockmenu .inbox {
 .pun .block .inbox, .pun .blockmenu .inbox {
-	padding: 3px 6px
+	padding: 3px 6px;
 }
 }
 
 
 /*****************************************************************
 /*****************************************************************
@@ -309,11 +309,11 @@ html, body {
 }
 }
 
 
 #brdmenu a:link, #brdmenu a:visited {
 #brdmenu a:link, #brdmenu a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 #brdmenu a:hover, #brdmenu a:active {
 #brdmenu a:hover, #brdmenu a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 #brdwelcome .conl {
 #brdwelcome .conl {
@@ -329,11 +329,11 @@ html, body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .linkst {
 .pun .linkst {
-	padding: 8px 6px 3px 6px
+	padding: 8px 6px 3px 6px;
 }
 }
 
 
 .pun .linksb, .pun .postlinksb {
 .pun .linksb, .pun .postlinksb {
-	padding: 3px 6px 8px 6px
+	padding: 3px 6px 8px 6px;
 }
 }
 
 
 .pun .crumbs {
 .pun .crumbs {
@@ -373,7 +373,7 @@ html, body {
 }
 }
 
 
 .pun .postlink a:link, .pun .postlink a:visited {
 .pun .postlink a:link, .pun .postlink a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .postlink a:hover, .pun .postlink a:active {
 .pun .postlink a:hover, .pun .postlink a:active {
@@ -404,7 +404,7 @@ html, body {
 
 
 #brdfooter #modcontrols dd {
 #brdfooter #modcontrols dd {
 	display: inline;
 	display: inline;
-	margin:0 6px;
+	margin: 0 6px;
 }
 }
 
 
 
 
@@ -485,7 +485,7 @@ html, body {
 }
 }
 
 
 .pun .tcl p {
 .pun .tcl p {
-	padding: 5px 0 0 0
+	padding: 5px 0 0 0;
 }
 }
 
 
 #punsearch #vf .tc2 {
 #punsearch #vf .tc2 {
@@ -495,7 +495,7 @@ html, body {
 }
 }
 
 
 #users1 .tcr {
 #users1 .tcr {
-	width: 25%
+	width: 25%;
 }
 }
 
 
 #users1 .tc2 {
 #users1 .tc2 {
@@ -505,16 +505,16 @@ html, body {
 }
 }
 
 
 #debug .tcl {
 #debug .tcl {
-	width: 10%
+	width: 10%;
 }
 }
 
 
 #debug .tcr {
 #debug .tcr {
 	width: 90%;
 	width: 90%;
-	white-space: normal
+	white-space: normal;
 }
 }
 
 
 #punindex .tcr .byuser {
 #punindex .tcr .byuser {
-	display: block
+	display: block;
 }
 }
 
 
 .pun .blocktable .tclcon {
 .pun .blocktable .tclcon {
@@ -561,7 +561,7 @@ html, body {
 *****************************************************************/
 *****************************************************************/
 
 
 .pun .blockform form, .pun .fakeform {
 .pun .blockform form, .pun .fakeform {
-	PADDING: 20px 20px 15px 20px
+	PADDING: 20px 20px 15px 20px;
 }
 }
 
 
 .pun .forminfo {
 .pun .forminfo {
@@ -576,32 +576,32 @@ html, body {
 }
 }
 
 
 .pun .inform {
 .pun .inform {
-	padding-bottom: 12px
+	padding-bottom: 12px;
 }
 }
 
 
 .pun fieldset {
 .pun fieldset {
 	padding: 0px 12px 0px 12px;
 	padding: 0px 12px 0px 12px;
 	border-style: solid;
 	border-style: solid;
-	border-width: 1px
+	border-width: 1px;
 }
 }
 
 
 .pun legend {
 .pun legend {
-	padding: 0px 6px
+	padding: 0px 6px;
 }
 }
 
 
 .pun .infldset {
 .pun .infldset {
-	padding: 9px 0px 12px 0
+	padding: 9px 0px 12px 0;
 }
 }
 
 
 .pun label {
 .pun label {
 	display: block;
 	display: block;
-	padding: 3px 0
+	padding: 3px 0;
 }
 }
 
 
 .pun label.conl {
 .pun label.conl {
 	float: left;
 	float: left;
 	overflow: visible;
 	overflow: visible;
-	margin-right: 10px
+	margin-right: 10px;
 }
 }
 
 
 .pun fieldset .rbox br {
 .pun fieldset .rbox br {
@@ -623,21 +623,21 @@ html, body {
 }
 }
 
 
 .pun .txtarea {
 .pun .txtarea {
-	width: 75%
+	width: 75%;
 }
 }
 
 
 .pun .txtarea textarea, .pun input.longinput {
 .pun .txtarea textarea, .pun input.longinput {
-	width: 100%
+	width: 100%;
 }
 }
 
 
 .pun .bblinks {
 .pun .bblinks {
 	padding-bottom: 10px;
 	padding-bottom: 10px;
-	padding-left: 4px
+	padding-left: 4px;
 }
 }
 
 
 .pun .bblinks li {
 .pun .bblinks li {
 	display: inline;
 	display: inline;
-	padding-right: 20px
+	padding-right: 20px;
 }
 }
 
 
 .pun .blockform .buttons {
 .pun .blockform .buttons {
@@ -697,16 +697,16 @@ html, body {
 *****************************************************************/
 *****************************************************************/
 
 
 .pun .block2col {
 .pun .block2col {
-	padding-bottom: 1px
+	padding-bottom: 1px;
 }
 }
 
 
 .pun .block2col .blockform, .pun .block2col .block {
 .pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 14em
+	margin-left: 14em;
 }
 }
 
 
 .pun .blockmenu {
 .pun .blockmenu {
-	float:left;
-	width: 13em
+	float: left;
+	width: 13em;
 }
 }
 
 
 .pun .blockmenu li {
 .pun .blockmenu li {
@@ -715,17 +715,17 @@ html, body {
 }
 }
 
 
 .pun .blockmenu a:link, .pun .blockmenu a:visited {
 .pun .blockmenu a:link, .pun .blockmenu a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .blockmenu a:hover, .pun .blockmenu a:active {
 .pun .blockmenu a:hover, .pun .blockmenu a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 #viewprofile dl {
 #viewprofile dl {
 	float: left;
 	float: left;
 	width: 100%;
 	width: 100%;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 #viewprofile dd {
 #viewprofile dd {
@@ -741,7 +741,7 @@ html, body {
 
 
 #profileavatar img {
 #profileavatar img {
 	float: right;
 	float: right;
-	margin-left: 1em
+	margin-left: 1em;
 }
 }
 
 
 #adintro ul {
 #adintro ul {
@@ -776,7 +776,7 @@ html, body {
 }
 }
 
 
 .pun .postleft, .pun .postfootleft {
 .pun .postleft, .pun .postfootleft {
-	float:left;
+	float: left;
 	width: 18em;
 	width: 18em;
 	position: relative;
 	position: relative;
 	overflow: hidden;
 	overflow: hidden;
@@ -799,7 +799,7 @@ html, body {
 }
 }
 
 
 .pun .postleft .usercontacts, .pun .postleft .icon {
 .pun .postleft .usercontacts, .pun .postleft .icon {
-	margin-top: 6px
+	margin-top: 6px;
 }
 }
 
 
 .pun .postleft .postavatar, .pun .postleft .usertitle {
 .pun .postleft .postavatar, .pun .postleft .usertitle {
@@ -822,11 +822,11 @@ html, body {
 
 
 .pun .postright, .pun .postfootright {
 .pun .postright, .pun .postfootright {
 	border-left-width: 18em;
 	border-left-width: 18em;
-	border-left-style: solid
+	border-left-style: solid;
 }
 }
 
 
 #postpreview .postright {
 #postpreview .postright {
-	border-left: 0
+	border-left: 0;
 }
 }
 
 
 .pun .postright {
 .pun .postright {
@@ -834,11 +834,11 @@ html, body {
 }
 }
 
 
 .pun .postfootright, .pun .multidelete {
 .pun .postfootright, .pun .multidelete {
-	text-align: right
+	text-align: right;
 }
 }
 
 
 .pun .postmsg {
 .pun .postmsg {
-	width:98%;
+	width: 98%;
 	overflow: hidden;
 	overflow: hidden;
 	padding-bottom: 6px;
 	padding-bottom: 6px;
 	word-wrap: break-word;
 	word-wrap: break-word;
@@ -862,11 +862,11 @@ html, body {
 }
 }
 
 
 .pun .postfootright a:link, .pun .postfootright a:visited {
 .pun .postfootright a:link, .pun .postfootright a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .postfootright a:hover, .pun .postfootright a:active {
 .pun .postfootright a:hover, .pun .postfootright a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 .pun .codebox {
 .pun .codebox {
@@ -890,13 +890,13 @@ html, body {
 
 
 .pun .quotebox blockquote {
 .pun .quotebox blockquote {
 	width: 100%;
 	width: 100%;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 .pun .codebox pre {
 .pun .codebox pre {
 	overflow: auto;
 	overflow: auto;
 	width: 100%;
 	width: 100%;
-	overflow-y:hidden
+	overflow-y: hidden;
 }
 }
 
 
 * html .pun .codebox pre {
 * html .pun .codebox pre {
@@ -904,7 +904,7 @@ html, body {
 }
 }
 
 
 *+html .pun .codebox pre {
 *+html .pun .codebox pre {
-	padding-bottom: 10px
+	padding-bottom: 10px;
 }
 }
 
 
 .pun .codebox pre code {
 .pun .codebox pre code {
@@ -915,7 +915,7 @@ html, body {
 .pun .codebox pre.vscroll {
 .pun .codebox pre.vscroll {
 	height: 32em;
 	height: 32em;
 	overflow: auto;
 	overflow: auto;
-	overflow-y: auto
+	overflow-y: auto;
 }
 }
 
 
 .pun .postmsg img {
 .pun .postmsg img {
@@ -927,7 +927,7 @@ html, body {
 	width: 200px;
 	width: 200px;
 	text-align: left;
 	text-align: left;
 	height: 1px;
 	height: 1px;
-	border:none
+	border: none;
 }
 }
 
 
 .pun .postmsg .postimg img {
 .pun .postmsg .postimg img {
@@ -960,11 +960,11 @@ html, body {
 /****************************************************************/
 /****************************************************************/
 
 
 #punhelp h2 {
 #punhelp h2 {
-	margin-top: 12px
+	margin-top: 12px;
 }
 }
 
 
 #punhelp div.box {
 #punhelp div.box {
-	padding: 10px
+	padding: 10px;
 }
 }
 
 
 #debugtime {
 #debugtime {
@@ -973,11 +973,11 @@ html, body {
 }
 }
 
 
 #brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
 #brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
-	line-height: 1.4em
+	line-height: 1.4em;
 }
 }
 
 
 #announce div.inbox div {
 #announce div.inbox div {
-	padding: 3px 0
+	padding: 3px 0;
 }
 }
 
 
 /*****************************************************************
 /*****************************************************************
@@ -989,42 +989,42 @@ COLOUR SCHEME
 
 
 body {
 body {
 	background: #fff;
 	background: #fff;
-	color: #333
+	color: #333;
 }
 }
 
 
 .pun {
 .pun {
-	color: #333
+	color: #333;
 }
 }
 
 
 .pun .box, #adminconsole fieldset th {
 .pun .box, #adminconsole fieldset th {
-	background-color: #f1f1f1
+	background-color: #f1f1f1;
 }
 }
 
 
 .pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
 .pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
 #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd, #brdfooter #modcontrols {
 #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd, #brdfooter #modcontrols {
-	background-color: #dedfdf
+	background-color: #dedfdf;
 }
 }
 
 
 .pun h2, #brdmenu {
 .pun h2, #brdmenu {
 	background-color: #0066b9;
 	background-color: #0066b9;
-	color: #fff
+	color: #fff;
 }
 }
 
 
 .pun th {
 .pun th {
-	background-color: #d1d1d1
+	background-color: #d1d1d1;
 }
 }
 
 
 .pun legend {
 .pun legend {
-	color: #005cb1
+	color: #005cb1;
 }
 }
 
 
 .pun .blockmenu li.isactive a, #posterror li strong {
 .pun .blockmenu li.isactive a, #posterror li strong {
-	color: #333
+	color: #333;
 }
 }
 
 
 .pun .usercontent * {
 .pun .usercontent * {
 	background: transparent;
 	background: transparent;
-	color: #333
+	color: #333;
 }
 }
 
 
 .pun .multiselect, .pun .checklist {
 .pun .multiselect, .pun .checklist {
@@ -1039,15 +1039,15 @@ body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
 .pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
-	background-color: #dedfdf
+	background-color: #dedfdf;
 }
 }
 
 
 .pun .postright, .pun .postfootright {
 .pun .postright, .pun .postfootright {
-	border-left-color: #f1f1f1
+	border-left-color: #f1f1f1;
 }
 }
 
 
 .pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
 .pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
-	background-color: #f1f1f1
+	background-color: #f1f1f1;
 }
 }
 
 
 #punhelp .codebox, #punhelp .quotebox {
 #punhelp .codebox, #punhelp .quotebox {
@@ -1055,11 +1055,11 @@ body {
 }
 }
 
 
 .pun .blockpost h2 {
 .pun .blockpost h2 {
-	background-color: #006fc9
+	background-color: #006fc9;
 }
 }
 
 
 .pun .blockpost h2 span.conr {
 .pun .blockpost h2 span.conr {
-	color: #aabdcd
+	color: #aabdcd;
 }
 }
 
 
 .pun .postmsg ins, #punhelp samp ins {
 .pun .postmsg ins, #punhelp samp ins {
@@ -1068,46 +1068,46 @@ body {
 
 
 .pun hr {
 .pun hr {
 	background-color: #333;
 	background-color: #333;
-	color: #333
+	color: #333;
 }
 }
 
 
 /* Borders
 /* Borders
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .box {
 .pun .box {
-	border-color: #0066b9
+	border-color: #0066b9;
 }
 }
 
 
 .pun td, #brdfooter #modcontrols {
 .pun td, #brdfooter #modcontrols {
-	border-color: #bbcede
+	border-color: #bbcede;
 }
 }
 
 
 .pun th {
 .pun th {
-	border-color: #d1d1d1
+	border-color: #d1d1d1;
 }
 }
 
 
 .pun fieldset {
 .pun fieldset {
-	border-color: #aca899
+	border-color: #aca899;
 }
 }
 
 
 #adminconsole td, #adminconsole th {
 #adminconsole td, #adminconsole th {
-	border-color: #f1f1f1
+	border-color: #f1f1f1;
 }
 }
 
 
 .pun .quotebox, .pun .codebox, .pun .forminfo,
 .pun .quotebox, .pun .codebox, .pun .forminfo,
 .pun .blockpost label, .pun .deletemsg {
 .pun .blockpost label, .pun .deletemsg {
-	border-color: #aca899 #fff #fff #aca899
+	border-color: #aca899 #fff #fff #aca899;
 }
 }
 
 
 /* Links
 /* Links
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun a:link, .pun a:visited {
 .pun a:link, .pun a:visited {
-	color: #005cb1
+	color: #005cb1;
 }
 }
 
 
 .pun a:hover, .pun a:active, .pun a:focus {
 .pun a:hover, .pun a:active, .pun a:focus {
-	color: #b42000
+	color: #b42000;
 }
 }
 
 
 .pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
 .pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
@@ -1120,45 +1120,45 @@ body {
 
 
 .pun h2 a:link, .pun h2 a:visited,
 .pun h2 a:link, .pun h2 a:visited,
 #brdmenu a:link, #brdmenu a:visited {
 #brdmenu a:link, #brdmenu a:visited {
-	color: #fff
+	color: #fff;
 }
 }
 
 
 .pun h2 a:hover, .pun h2 a:active,
 .pun h2 a:hover, .pun h2 a:active,
 #brdmenu a:hover, #brdmenu a:active {
 #brdmenu a:hover, #brdmenu a:active {
-	color: #fff
+	color: #fff;
 }
 }
 
 
 .pun .postreport a:link, .pun .postreport a:visited,
 .pun .postreport a:link, .pun .postreport a:visited,
 .pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
 .pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
-	color: #888
+	color: #888;
 }
 }
 
 
 .pun .postreport a:hover, .pun .postreport a:active,
 .pun .postreport a:hover, .pun .postreport a:active,
 .pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
 .pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
-	color: #aaa
+	color: #aaa;
 }
 }
 
 
 .pun .maintenancelink a:link, .pun .maintenancelink a:visited {
 .pun .maintenancelink a:link, .pun .maintenancelink a:visited {
-	color: #b42000
+	color: #b42000;
 }
 }
 
 
 .pun .maintenancelink a:hover, .pun .maintenancelink a:active {
 .pun .maintenancelink a:hover, .pun .maintenancelink a:active {
-	color: #b42000
+	color: #b42000;
 }
 }
 
 
 /* Status Indicators
 /* Status Indicators
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .icon {
 .pun .icon {
-	border-color: #e6e6e6 #dedede #dadada #e2e2e2
+	border-color: #e6e6e6 #dedede #dadada #e2e2e2;
 }
 }
 
 
 .pun .iredirect .icon {
 .pun .iredirect .icon {
-	border-color: #f1f1f1 #f1f1f1 #f1f1f1 #f1f1f1
+	border-color: #f1f1f1 #f1f1f1 #f1f1f1 #f1f1f1;
 }
 }
 
 
 .pun .inew .icon {
 .pun .inew .icon {
-	border-color: #0080d7 #0065c0 #0058b3 #0072ca
+	border-color: #0080d7 #0065c0 #0058b3 #0072ca;
 }
 }
 
 
 /* ---------- BBCODE TOOLBAR ------------- */
 /* ---------- BBCODE TOOLBAR ------------- */

+ 8 - 0
style/Oxygen/reminder.css

@@ -64,3 +64,11 @@
 	background-color: #F1F1F1;
 	background-color: #F1F1F1;
 	color: #333333;
 	color: #333333;
 }
 }
+
+#brdmenu ul span.remflasher, #adminconsole fieldset td span.remflasher {
+	background: url(../../img/flasher.gif) right 65% no-repeat;
+	display: inline-block;
+	line-height: normal;
+	margin-left: 1px;
+	padding-right: 18px;
+}

+ 107 - 107
style/Radium.css

@@ -14,7 +14,7 @@
 }
 }
 
 
 .pun ul, .pun ol {
 .pun ul, .pun ol {
-	list-style: none
+	list-style: none;
 }
 }
 
 
 
 
@@ -26,11 +26,11 @@
 	width: 0;
 	width: 0;
 	line-height: 0;
 	line-height: 0;
 	font-size: 0;
 	font-size: 0;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 .pun .clearer, .pun .clearb {
 .pun .clearer, .pun .clearb {
-	clear: both
+	clear: both;
 }
 }
 
 
 .pun .nosize {
 .pun .nosize {
@@ -41,11 +41,11 @@
 }
 }
 
 
 * html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
 * html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
-	height: 1px
+	height: 1px;
 }
 }
 
 
 .pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
 .pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
-	min-height: 1px
+	min-height: 1px;
 }
 }
 
 
 .clearl {
 .clearl {
@@ -85,7 +85,7 @@
 
 
 .pun pre, .pun code {
 .pun pre, .pun code {
 	font-size: 1.182em;
 	font-size: 1.182em;
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace
+	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace;
 }
 }
 
 
 .pun pre code {
 .pun pre code {
@@ -125,70 +125,70 @@
 }
 }
 
 
 .pun span.warntext, .pun p.warntext {
 .pun span.warntext, .pun p.warntext {
-	font-weight: bold
+	font-weight: bold;
 }
 }
 
 
 /* User Content (Announcements, Rules, Posts)
 /* User Content (Announcements, Rules, Posts)
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .usercontent p, .pun .postmsg p {
 .pun .usercontent p, .pun .postmsg p {
-	padding: 0.75em 0
+	padding: 0.75em 0;
 }
 }
 
 
 .pun .usercontent ul, .pun .postmsg ul {
 .pun .usercontent ul, .pun .postmsg ul {
 	padding: 0.75em 1em 0.75em 2.5em;
 	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: disc
+	list-style: disc;
 }
 }
 
 
 .pun .usercontent ol, .pun .postmsg ol {
 .pun .usercontent ol, .pun .postmsg ol {
 	padding: 0.75em 1em 0.75em 2.5em;
 	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: decimal
+	list-style: decimal;
 }
 }
 
 
 .pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
 .pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha
+	list-style: lower-alpha;
 }
 }
 
 
 .pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
 .pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
-	padding: 0.25em 1em 0.75em 2.5em
+	padding: 0.25em 1em 0.75em 2.5em;
 }
 }
 
 
 .pun .usercontent li p, .pun .postmsg li p {
 .pun .usercontent li p, .pun .postmsg li p {
-	padding: 0
+	padding: 0;
 }
 }
 
 
 .pun .usercontent h1 {
 .pun .usercontent h1 {
 	font-size: 1.4em;
 	font-size: 1.4em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h2 {
 .pun .usercontent h2 {
 	font-size: 1.2em;
 	font-size: 1.2em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h3 {
 .pun .usercontent h3 {
 	font-size: 1.1em;
 	font-size: 1.1em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
 .pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
 	font-size: 1em;
 	font-size: 1em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .quotebox cite {
 .pun .quotebox cite {
 	font-weight: bold;
 	font-weight: bold;
 	font-style: normal;
 	font-style: normal;
-	padding: 0.75em 0.75em 0 0.75em
+	padding: 0.75em 0.75em 0 0.75em;
 }
 }
 
 
 .pun span.bbu {
 .pun span.bbu {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 .pun span.bbs, .pun del {
 .pun span.bbs, .pun del {
@@ -215,7 +215,7 @@
 
 
 html, body {
 html, body {
 	margin: 0;
 	margin: 0;
-	padding: 0
+	padding: 0;
 }
 }
 
 
 .pun {
 .pun {
@@ -238,7 +238,7 @@ html, body {
 }
 }
 
 
 #brdtitle p {
 #brdtitle p {
-	padding-top: 0px
+	padding-top: 0px;
 }
 }
 
 
 #announce, #brdstats {
 #announce, #brdstats {
@@ -246,11 +246,11 @@ html, body {
 }
 }
 
 
 .pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
 .pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
-	margin-bottom: 12px
+	margin-bottom: 12px;
 }
 }
 
 
 #punindex .blocktable, .pun .blockpost {
 #punindex .blocktable, .pun .blockpost {
-	margin-bottom: 6px
+	margin-bottom: 6px;
 }
 }
 
 
 #postreview .blockpost {
 #postreview .blockpost {
@@ -258,15 +258,15 @@ html, body {
 }
 }
 
 
 .pun .block2col .blockform, .pun .block2col .block {
 .pun .block2col .blockform, .pun .block2col .block {
-	margin-bottom: 0px
+	margin-bottom: 0px;
 }
 }
 
 
 .pun .linkst, .pun .linksb {
 .pun .linkst, .pun .linksb {
-	margin-top: -12px
+	margin-top: -12px;
 }
 }
 
 
 .pun .postlinksb {
 .pun .postlinksb {
-	margin-top: -6px
+	margin-top: -6px;
 }
 }
 
 
 
 
@@ -286,7 +286,7 @@ html, body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .block .inbox, .pun .blockmenu .inbox {
 .pun .block .inbox, .pun .blockmenu .inbox {
-	padding: 3px 6px
+	padding: 3px 6px;
 }
 }
 
 
 /*****************************************************************
 /*****************************************************************
@@ -308,11 +308,11 @@ html, body {
 }
 }
 
 
 #brdmenu a:link, #brdmenu a:visited {
 #brdmenu a:link, #brdmenu a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 #brdmenu a:hover, #brdmenu a:active {
 #brdmenu a:hover, #brdmenu a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 #brdwelcome .conl {
 #brdwelcome .conl {
@@ -328,11 +328,11 @@ html, body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .linkst {
 .pun .linkst {
-	padding: 8px 6px 3px 6px
+	padding: 8px 6px 3px 6px;
 }
 }
 
 
 .pun .linksb, .pun .postlinksb {
 .pun .linksb, .pun .postlinksb {
-	padding: 3px 6px 8px 6px
+	padding: 3px 6px 8px 6px;
 }
 }
 
 
 .pun .crumbs {
 .pun .crumbs {
@@ -372,7 +372,7 @@ html, body {
 }
 }
 
 
 .pun .postlink a:link, .pun .postlink a:visited {
 .pun .postlink a:link, .pun .postlink a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .postlink a:hover, .pun .postlink a:active {
 .pun .postlink a:hover, .pun .postlink a:active {
@@ -403,7 +403,7 @@ html, body {
 
 
 #brdfooter #modcontrols dd {
 #brdfooter #modcontrols dd {
 	display: inline;
 	display: inline;
-	margin:0 6px;
+	margin: 0 6px;
 }
 }
 
 
 
 
@@ -484,7 +484,7 @@ html, body {
 }
 }
 
 
 .pun .tcl p {
 .pun .tcl p {
-	padding: 5px 0 0 0
+	padding: 5px 0 0 0;
 }
 }
 
 
 #punsearch #vf .tc2 {
 #punsearch #vf .tc2 {
@@ -494,7 +494,7 @@ html, body {
 }
 }
 
 
 #users1 .tcr {
 #users1 .tcr {
-	width: 25%
+	width: 25%;
 }
 }
 
 
 #users1 .tc2 {
 #users1 .tc2 {
@@ -504,16 +504,16 @@ html, body {
 }
 }
 
 
 #debug .tcl {
 #debug .tcl {
-	width: 10%
+	width: 10%;
 }
 }
 
 
 #debug .tcr {
 #debug .tcr {
 	width: 90%;
 	width: 90%;
-	white-space: normal
+	white-space: normal;
 }
 }
 
 
 #punindex .tcr .byuser {
 #punindex .tcr .byuser {
-	display: block
+	display: block;
 }
 }
 
 
 .pun .blocktable .tclcon {
 .pun .blocktable .tclcon {
@@ -560,7 +560,7 @@ html, body {
 *****************************************************************/
 *****************************************************************/
 
 
 .pun .blockform form, .pun .fakeform {
 .pun .blockform form, .pun .fakeform {
-	PADDING: 20px 20px 15px 20px
+	PADDING: 20px 20px 15px 20px;
 }
 }
 
 
 .pun .forminfo {
 .pun .forminfo {
@@ -575,32 +575,32 @@ html, body {
 }
 }
 
 
 .pun .inform {
 .pun .inform {
-	padding-bottom: 12px
+	padding-bottom: 12px;
 }
 }
 
 
 .pun fieldset {
 .pun fieldset {
 	padding: 0px 12px 0px 12px;
 	padding: 0px 12px 0px 12px;
 	border-style: solid;
 	border-style: solid;
-	border-width: 1px
+	border-width: 1px;
 }
 }
 
 
 .pun legend {
 .pun legend {
-	padding: 0px 6px
+	padding: 0px 6px;
 }
 }
 
 
 .pun .infldset {
 .pun .infldset {
-	padding: 9px 0px 12px 0
+	padding: 9px 0px 12px 0;
 }
 }
 
 
 .pun label {
 .pun label {
 	display: block;
 	display: block;
-	padding: 3px 0
+	padding: 3px 0;
 }
 }
 
 
 .pun label.conl {
 .pun label.conl {
 	float: left;
 	float: left;
 	overflow: visible;
 	overflow: visible;
-	margin-right: 10px
+	margin-right: 10px;
 }
 }
 
 
 .pun fieldset .rbox br {
 .pun fieldset .rbox br {
@@ -622,21 +622,21 @@ html, body {
 }
 }
 
 
 .pun .txtarea {
 .pun .txtarea {
-	width: 75%
+	width: 75%;
 }
 }
 
 
 .pun .txtarea textarea, .pun input.longinput {
 .pun .txtarea textarea, .pun input.longinput {
-	width: 100%
+	width: 100%;
 }
 }
 
 
 .pun .bblinks {
 .pun .bblinks {
 	padding-bottom: 10px;
 	padding-bottom: 10px;
-	padding-left: 4px
+	padding-left: 4px;
 }
 }
 
 
 .pun .bblinks li {
 .pun .bblinks li {
 	display: inline;
 	display: inline;
-	padding-right: 20px
+	padding-right: 20px;
 }
 }
 
 
 .pun .blockform .buttons {
 .pun .blockform .buttons {
@@ -696,16 +696,16 @@ html, body {
 *****************************************************************/
 *****************************************************************/
 
 
 .pun .block2col {
 .pun .block2col {
-	padding-bottom: 1px
+	padding-bottom: 1px;
 }
 }
 
 
 .pun .block2col .blockform, .pun .block2col .block {
 .pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 14em
+	margin-left: 14em;
 }
 }
 
 
 .pun .blockmenu {
 .pun .blockmenu {
-	float:left;
-	width: 13em
+	float: left;
+	width: 13em;
 }
 }
 
 
 .pun .blockmenu li {
 .pun .blockmenu li {
@@ -714,17 +714,17 @@ html, body {
 }
 }
 
 
 .pun .blockmenu a:link, .pun .blockmenu a:visited {
 .pun .blockmenu a:link, .pun .blockmenu a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .blockmenu a:hover, .pun .blockmenu a:active {
 .pun .blockmenu a:hover, .pun .blockmenu a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 #viewprofile dl {
 #viewprofile dl {
 	float: left;
 	float: left;
 	width: 100%;
 	width: 100%;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 #viewprofile dd {
 #viewprofile dd {
@@ -740,7 +740,7 @@ html, body {
 
 
 #profileavatar img {
 #profileavatar img {
 	float: right;
 	float: right;
-	margin-left: 1em
+	margin-left: 1em;
 }
 }
 
 
 #adintro ul {
 #adintro ul {
@@ -775,7 +775,7 @@ html, body {
 }
 }
 
 
 .pun .postleft, .pun .postfootleft {
 .pun .postleft, .pun .postfootleft {
-	float:left;
+	float: left;
 	width: 18em;
 	width: 18em;
 	position: relative;
 	position: relative;
 	overflow: hidden;
 	overflow: hidden;
@@ -798,7 +798,7 @@ html, body {
 }
 }
 
 
 .pun .postleft .usercontacts, .pun .postleft .icon {
 .pun .postleft .usercontacts, .pun .postleft .icon {
-	margin-top: 6px
+	margin-top: 6px;
 }
 }
 
 
 .pun .postleft .postavatar, .pun .postleft .usertitle {
 .pun .postleft .postavatar, .pun .postleft .usertitle {
@@ -821,11 +821,11 @@ html, body {
 
 
 .pun .postright, .pun .postfootright {
 .pun .postright, .pun .postfootright {
 	border-left-width: 18em;
 	border-left-width: 18em;
-	border-left-style: solid
+	border-left-style: solid;
 }
 }
 
 
 #postpreview .postright {
 #postpreview .postright {
-	border-left: 0
+	border-left: 0;
 }
 }
 
 
 .pun .postright {
 .pun .postright {
@@ -833,11 +833,11 @@ html, body {
 }
 }
 
 
 .pun .postfootright, .pun .multidelete {
 .pun .postfootright, .pun .multidelete {
-	text-align: right
+	text-align: right;
 }
 }
 
 
 .pun .postmsg {
 .pun .postmsg {
-	width:98%;
+	width: 98%;
 	overflow: hidden;
 	overflow: hidden;
 	padding-bottom: 6px;
 	padding-bottom: 6px;
 	word-wrap: break-word;
 	word-wrap: break-word;
@@ -861,11 +861,11 @@ html, body {
 }
 }
 
 
 .pun .postfootright a:link, .pun .postfootright a:visited {
 .pun .postfootright a:link, .pun .postfootright a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .postfootright a:hover, .pun .postfootright a:active {
 .pun .postfootright a:hover, .pun .postfootright a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 .pun .codebox {
 .pun .codebox {
@@ -889,13 +889,13 @@ html, body {
 
 
 .pun .quotebox blockquote {
 .pun .quotebox blockquote {
 	width: 100%;
 	width: 100%;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 .pun .codebox pre {
 .pun .codebox pre {
 	overflow: auto;
 	overflow: auto;
 	width: 100%;
 	width: 100%;
-	overflow-y:hidden
+	overflow-y: hidden;
 }
 }
 
 
 * html .pun .codebox pre {
 * html .pun .codebox pre {
@@ -903,7 +903,7 @@ html, body {
 }
 }
 
 
 *+html .pun .codebox pre {
 *+html .pun .codebox pre {
-	padding-bottom: 10px
+	padding-bottom: 10px;
 }
 }
 
 
 .pun .codebox pre code {
 .pun .codebox pre code {
@@ -914,7 +914,7 @@ html, body {
 .pun .codebox pre.vscroll {
 .pun .codebox pre.vscroll {
 	height: 32em;
 	height: 32em;
 	overflow: auto;
 	overflow: auto;
-	overflow-y: auto
+	overflow-y: auto;
 }
 }
 
 
 .pun .postmsg img {
 .pun .postmsg img {
@@ -926,7 +926,7 @@ html, body {
 	width: 200px;
 	width: 200px;
 	text-align: left;
 	text-align: left;
 	height: 1px;
 	height: 1px;
-	border:none
+	border: none;
 }
 }
 
 
 .pun .postmsg .postimg img {
 .pun .postmsg .postimg img {
@@ -959,11 +959,11 @@ html, body {
 /****************************************************************/
 /****************************************************************/
 
 
 #punhelp h2 {
 #punhelp h2 {
-	margin-top: 12px
+	margin-top: 12px;
 }
 }
 
 
 #punhelp div.box {
 #punhelp div.box {
-	padding: 10px
+	padding: 10px;
 }
 }
 
 
 #debugtime {
 #debugtime {
@@ -972,11 +972,11 @@ html, body {
 }
 }
 
 
 #brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
 #brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
-	line-height: 1.4em
+	line-height: 1.4em;
 }
 }
 
 
 #announce div.inbox div {
 #announce div.inbox div {
-	padding: 3px 0
+	padding: 3px 0;
 }
 }
 
 
 /*****************************************************************
 /*****************************************************************
@@ -988,47 +988,47 @@ COLOUR SCHEME
 
 
 body {
 body {
 	background: #2a2a2a;
 	background: #2a2a2a;
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun {
 .pun {
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun .box, #adminconsole fieldset th {
 .pun .box, #adminconsole fieldset th {
-	background-color: #383838
+	background-color: #383838;
 }
 }
 
 
 .pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
 .pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
 #brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
 #brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
-	background-color: #424242
+	background-color: #424242;
 }
 }
 
 
 .pun h2, #brdmenu {
 .pun h2, #brdmenu {
 	background-color: #565656;
 	background-color: #565656;
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun th {
 .pun th {
-	background-color: #484848
+	background-color: #484848;
 }
 }
 
 
 .pun legend {
 .pun legend {
-	color: #60c860
+	color: #60c860;
 }
 }
 
 
 .pun .blockmenu li.isactive a, #posterror li strong {
 .pun .blockmenu li.isactive a, #posterror li strong {
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun .usercontent * {
 .pun .usercontent * {
 	background: transparent;
 	background: transparent;
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun textarea, .pun input, .pun select {
 .pun textarea, .pun input, .pun select {
 	background-color: #2a2a2a;
 	background-color: #2a2a2a;
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun .multiselect, .pun .checklist {
 .pun .multiselect, .pun .checklist {
@@ -1043,23 +1043,23 @@ body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
 .pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
-	background-color: #383838
+	background-color: #383838;
 }
 }
 
 
 .pun .postright, .pun .postfootright {
 .pun .postright, .pun .postfootright {
-	border-left-color: #424242
+	border-left-color: #424242;
 }
 }
 
 
 .pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
 .pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
-	background-color: #424242
+	background-color: #424242;
 }
 }
 
 
 .pun .blockpost h2 {
 .pun .blockpost h2 {
-	background-color: #565656
+	background-color: #565656;
 }
 }
 
 
 .pun .blockpost h2 span.conr {
 .pun .blockpost h2 span.conr {
-	color: #a19e96
+	color: #a19e96;
 }
 }
 
 
 .pun .postmsg ins, #punhelp samp ins {
 .pun .postmsg ins, #punhelp samp ins {
@@ -1068,46 +1068,46 @@ body {
 
 
 .pun hr {
 .pun hr {
 	background-color: #606060;
 	background-color: #606060;
-	color: #606060
+	color: #606060;
 }
 }
 
 
 /* Borders
 /* Borders
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .box {
 .pun .box {
-	border-color:#565656
+	border-color: #565656;
 }
 }
 
 
 .pun td, #brdfooter #modcontrols {
 .pun td, #brdfooter #modcontrols {
-	border-color: #565656
+	border-color: #565656;
 }
 }
 
 
 .pun th {
 .pun th {
-	border-color: #484848
+	border-color: #484848;
 }
 }
 
 
 .pun fieldset {
 .pun fieldset {
-	border-color: #606060
+	border-color: #606060;
 }
 }
 
 
 #adminconsole td, #adminconsole th {
 #adminconsole td, #adminconsole th {
-	border-color: #383838
+	border-color: #383838;
 }
 }
 
 
 .pun .quotebox, .pun .codebox, .pun .forminfo,
 .pun .quotebox, .pun .codebox, .pun .forminfo,
 .pun .blockpost label, .pun .deletemsg {
 .pun .blockpost label, .pun .deletemsg {
-	border-color: #606060
+	border-color: #606060;
 }
 }
 
 
 /* Links
 /* Links
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun a:link, .pun a:visited {
 .pun a:link, .pun a:visited {
-	color: #60c860
+	color: #60c860;
 }
 }
 
 
 .pun a:hover, .pun a:active, .pun a:focus {
 .pun a:hover, .pun a:active, .pun a:focus {
-	color: #80ee80
+	color: #80ee80;
 }
 }
 
 
 .pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
 .pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
@@ -1120,45 +1120,45 @@ body {
 
 
 .pun h2 a:link, .pun h2 a:visited,
 .pun h2 a:link, .pun h2 a:visited,
 #brdmenu a:link, #brdmenu a:visited {
 #brdmenu a:link, #brdmenu a:visited {
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun h2 a:hover, .pun h2 a:active,
 .pun h2 a:hover, .pun h2 a:active,
 #brdmenu a:hover, #brdmenu a:active {
 #brdmenu a:hover, #brdmenu a:active {
-	color: #d4d4d4
+	color: #d4d4d4;
 }
 }
 
 
 .pun .postreport a:link, .pun .postreport a:visited,
 .pun .postreport a:link, .pun .postreport a:visited,
 .pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
 .pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
-	color: #888
+	color: #888;
 }
 }
 
 
 .pun .postreport a:hover, .pun .postreport a:active,
 .pun .postreport a:hover, .pun .postreport a:active,
 .pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
 .pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
-	color: #aaa
+	color: #aaa;
 }
 }
 
 
 .pun .maintenancelink a:link, .pun .maintenancelink a:visited {
 .pun .maintenancelink a:link, .pun .maintenancelink a:visited {
-	color: #ff4000
+	color: #ff4000;
 }
 }
 
 
 .pun .maintenancelink a:hover, .pun .maintenancelink a:active {
 .pun .maintenancelink a:hover, .pun .maintenancelink a:active {
-	color: #ff5010
+	color: #ff5010;
 }
 }
 
 
 /* Status Indicators
 /* Status Indicators
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .icon {
 .pun .icon {
-	border-color: #484848 #404040 #3c3c3c #444444
+	border-color: #484848 #404040 #3c3c3c #444444;
 }
 }
 
 
 .pun .iredirect .icon {
 .pun .iredirect .icon {
-	border-color: #383838 #383838 #383838 #383838
+	border-color: #383838 #383838 #383838 #383838;
 }
 }
 
 
 .pun .inew .icon {
 .pun .inew .icon {
-	border-color: #60c860 #54af54 #499849 #59b657
+	border-color: #60c860 #54af54 #499849 #59b657;
 }
 }
 
 
 /* ---------- BBCODE TOOLBAR ------------- */
 /* ---------- BBCODE TOOLBAR ------------- */

+ 7 - 0
style/Radium/reminder.css

@@ -65,3 +65,10 @@
 	color: #D4D4D4;
 	color: #D4D4D4;
 }
 }
 
 
+#brdmenu ul span.remflasher, #adminconsole fieldset td span.remflasher {
+	background: url(../../img/flasher.gif) right 65% no-repeat;
+	display: inline-block;
+	line-height: normal;
+	margin-left: 1px;
+	padding-right: 18px;
+}

+ 106 - 106
style/Sulfur.css

@@ -14,7 +14,7 @@
 }
 }
 
 
 .pun ul, .pun ol {
 .pun ul, .pun ol {
-	list-style: none
+	list-style: none;
 }
 }
 
 
 
 
@@ -26,11 +26,11 @@
 	width: 0;
 	width: 0;
 	line-height: 0;
 	line-height: 0;
 	font-size: 0;
 	font-size: 0;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 .pun .clearer, .pun .clearb {
 .pun .clearer, .pun .clearb {
-	clear: both
+	clear: both;
 }
 }
 
 
 .pun .nosize {
 .pun .nosize {
@@ -41,11 +41,11 @@
 }
 }
 
 
 * html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
 * html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
-	height: 1px
+	height: 1px;
 }
 }
 
 
 .pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
 .pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
-	min-height: 1px
+	min-height: 1px;
 }
 }
 
 
 .clearl {
 .clearl {
@@ -85,7 +85,7 @@
 
 
 .pun pre, .pun code {
 .pun pre, .pun code {
 	font-size: 1.182em;
 	font-size: 1.182em;
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace
+	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace;
 }
 }
 
 
 .pun pre code {
 .pun pre code {
@@ -125,70 +125,70 @@
 }
 }
 
 
 .pun span.warntext, .pun p.warntext {
 .pun span.warntext, .pun p.warntext {
-	font-weight: bold
+	font-weight: bold;
 }
 }
 
 
 /* User Content (Announcements, Rules, Posts)
 /* User Content (Announcements, Rules, Posts)
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .usercontent p, .pun .postmsg p {
 .pun .usercontent p, .pun .postmsg p {
-	padding: 0.75em 0
+	padding: 0.75em 0;
 }
 }
 
 
 .pun .usercontent ul, .pun .postmsg ul {
 .pun .usercontent ul, .pun .postmsg ul {
 	padding: 0.75em 1em 0.75em 2.5em;
 	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: disc
+	list-style: disc;
 }
 }
 
 
 .pun .usercontent ol, .pun .postmsg ol {
 .pun .usercontent ol, .pun .postmsg ol {
 	padding: 0.75em 1em 0.75em 2.5em;
 	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: decimal
+	list-style: decimal;
 }
 }
 
 
 .pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
 .pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha
+	list-style: lower-alpha;
 }
 }
 
 
 .pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
 .pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
-	padding: 0.25em 1em 0.75em 2.5em
+	padding: 0.25em 1em 0.75em 2.5em;
 }
 }
 
 
 .pun .usercontent li p, .pun .postmsg li p {
 .pun .usercontent li p, .pun .postmsg li p {
-	padding: 0
+	padding: 0;
 }
 }
 
 
 .pun .usercontent h1 {
 .pun .usercontent h1 {
 	font-size: 1.4em;
 	font-size: 1.4em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h2 {
 .pun .usercontent h2 {
 	font-size: 1.2em;
 	font-size: 1.2em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h3 {
 .pun .usercontent h3 {
 	font-size: 1.1em;
 	font-size: 1.1em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
 .pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
 	font-size: 1em;
 	font-size: 1em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .quotebox cite {
 .pun .quotebox cite {
 	font-weight: bold;
 	font-weight: bold;
 	font-style: normal;
 	font-style: normal;
-	padding: 0.75em 0.75em 0 0.75em
+	padding: 0.75em 0.75em 0 0.75em;
 }
 }
 
 
 .pun span.bbu {
 .pun span.bbu {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 .pun span.bbs, .pun del {
 .pun span.bbs, .pun del {
@@ -215,7 +215,7 @@
 
 
 html, body {
 html, body {
 	margin: 0;
 	margin: 0;
-	padding: 0
+	padding: 0;
 }
 }
 
 
 .pun {
 .pun {
@@ -238,7 +238,7 @@ html, body {
 }
 }
 
 
 #brdtitle p {
 #brdtitle p {
-	padding-top: 0px
+	padding-top: 0px;
 }
 }
 
 
 #announce, #brdstats {
 #announce, #brdstats {
@@ -246,11 +246,11 @@ html, body {
 }
 }
 
 
 .pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
 .pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
-	margin-bottom: 12px
+	margin-bottom: 12px;
 }
 }
 
 
 #punindex .blocktable, .pun .blockpost {
 #punindex .blocktable, .pun .blockpost {
-	margin-bottom: 6px
+	margin-bottom: 6px;
 }
 }
 
 
 #postreview .blockpost {
 #postreview .blockpost {
@@ -258,15 +258,15 @@ html, body {
 }
 }
 
 
 .pun .block2col .blockform, .pun .block2col .block {
 .pun .block2col .blockform, .pun .block2col .block {
-	margin-bottom: 0px
+	margin-bottom: 0px;
 }
 }
 
 
 .pun .linkst, .pun .linksb {
 .pun .linkst, .pun .linksb {
-	margin-top: -12px
+	margin-top: -12px;
 }
 }
 
 
 .pun .postlinksb {
 .pun .postlinksb {
-	margin-top: -6px
+	margin-top: -6px;
 }
 }
 
 
 
 
@@ -286,7 +286,7 @@ html, body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .block .inbox, .pun .blockmenu .inbox {
 .pun .block .inbox, .pun .blockmenu .inbox {
-	padding: 3px 6px
+	padding: 3px 6px;
 }
 }
 
 
 /*****************************************************************
 /*****************************************************************
@@ -308,11 +308,11 @@ html, body {
 }
 }
 
 
 #brdmenu a:link, #brdmenu a:visited {
 #brdmenu a:link, #brdmenu a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 #brdmenu a:hover, #brdmenu a:active {
 #brdmenu a:hover, #brdmenu a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 #brdwelcome .conl {
 #brdwelcome .conl {
@@ -328,11 +328,11 @@ html, body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .linkst {
 .pun .linkst {
-	padding: 8px 6px 3px 6px
+	padding: 8px 6px 3px 6px;
 }
 }
 
 
 .pun .linksb, .pun .postlinksb {
 .pun .linksb, .pun .postlinksb {
-	padding: 3px 6px 8px 6px
+	padding: 3px 6px 8px 6px;
 }
 }
 
 
 .pun .crumbs {
 .pun .crumbs {
@@ -372,7 +372,7 @@ html, body {
 }
 }
 
 
 .pun .postlink a:link, .pun .postlink a:visited {
 .pun .postlink a:link, .pun .postlink a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .postlink a:hover, .pun .postlink a:active {
 .pun .postlink a:hover, .pun .postlink a:active {
@@ -403,7 +403,7 @@ html, body {
 
 
 #brdfooter #modcontrols dd {
 #brdfooter #modcontrols dd {
 	display: inline;
 	display: inline;
-	margin:0 6px;
+	margin: 0 6px;
 }
 }
 
 
 
 
@@ -484,7 +484,7 @@ html, body {
 }
 }
 
 
 .pun .tcl p {
 .pun .tcl p {
-	padding: 5px 0 0 0
+	padding: 5px 0 0 0;
 }
 }
 
 
 #punsearch #vf .tc2 {
 #punsearch #vf .tc2 {
@@ -494,7 +494,7 @@ html, body {
 }
 }
 
 
 #users1 .tcr {
 #users1 .tcr {
-	width: 25%
+	width: 25%;
 }
 }
 
 
 #users1 .tc2 {
 #users1 .tc2 {
@@ -504,16 +504,16 @@ html, body {
 }
 }
 
 
 #debug .tcl {
 #debug .tcl {
-	width: 10%
+	width: 10%;
 }
 }
 
 
 #debug .tcr {
 #debug .tcr {
 	width: 90%;
 	width: 90%;
-	white-space: normal
+	white-space: normal;
 }
 }
 
 
 #punindex .tcr .byuser {
 #punindex .tcr .byuser {
-	display: block
+	display: block;
 }
 }
 
 
 .pun .blocktable .tclcon {
 .pun .blocktable .tclcon {
@@ -560,7 +560,7 @@ html, body {
 *****************************************************************/
 *****************************************************************/
 
 
 .pun .blockform form, .pun .fakeform {
 .pun .blockform form, .pun .fakeform {
-	PADDING: 20px 20px 15px 20px
+	PADDING: 20px 20px 15px 20px;
 }
 }
 
 
 .pun .forminfo {
 .pun .forminfo {
@@ -575,32 +575,32 @@ html, body {
 }
 }
 
 
 .pun .inform {
 .pun .inform {
-	padding-bottom: 12px
+	padding-bottom: 12px;
 }
 }
 
 
 .pun fieldset {
 .pun fieldset {
 	padding: 0px 12px 0px 12px;
 	padding: 0px 12px 0px 12px;
 	border-style: solid;
 	border-style: solid;
-	border-width: 1px
+	border-width: 1px;
 }
 }
 
 
 .pun legend {
 .pun legend {
-	padding: 0px 6px
+	padding: 0px 6px;
 }
 }
 
 
 .pun .infldset {
 .pun .infldset {
-	padding: 9px 0px 12px 0
+	padding: 9px 0px 12px 0;
 }
 }
 
 
 .pun label {
 .pun label {
 	display: block;
 	display: block;
-	padding: 3px 0
+	padding: 3px 0;
 }
 }
 
 
 .pun label.conl {
 .pun label.conl {
 	float: left;
 	float: left;
 	overflow: visible;
 	overflow: visible;
-	margin-right: 10px
+	margin-right: 10px;
 }
 }
 
 
 .pun fieldset .rbox br {
 .pun fieldset .rbox br {
@@ -622,21 +622,21 @@ html, body {
 }
 }
 
 
 .pun .txtarea {
 .pun .txtarea {
-	width: 75%
+	width: 75%;
 }
 }
 
 
 .pun .txtarea textarea, .pun input.longinput {
 .pun .txtarea textarea, .pun input.longinput {
-	width: 100%
+	width: 100%;
 }
 }
 
 
 .pun .bblinks {
 .pun .bblinks {
 	padding-bottom: 10px;
 	padding-bottom: 10px;
-	padding-left: 4px
+	padding-left: 4px;
 }
 }
 
 
 .pun .bblinks li {
 .pun .bblinks li {
 	display: inline;
 	display: inline;
-	padding-right: 20px
+	padding-right: 20px;
 }
 }
 
 
 .pun .blockform .buttons {
 .pun .blockform .buttons {
@@ -696,16 +696,16 @@ html, body {
 *****************************************************************/
 *****************************************************************/
 
 
 .pun .block2col {
 .pun .block2col {
-	padding-bottom: 1px
+	padding-bottom: 1px;
 }
 }
 
 
 .pun .block2col .blockform, .pun .block2col .block {
 .pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 14em
+	margin-left: 14em;
 }
 }
 
 
 .pun .blockmenu {
 .pun .blockmenu {
-	float:left;
-	width: 13em
+	float: left;
+	width: 13em;
 }
 }
 
 
 .pun .blockmenu li {
 .pun .blockmenu li {
@@ -714,17 +714,17 @@ html, body {
 }
 }
 
 
 .pun .blockmenu a:link, .pun .blockmenu a:visited {
 .pun .blockmenu a:link, .pun .blockmenu a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .blockmenu a:hover, .pun .blockmenu a:active {
 .pun .blockmenu a:hover, .pun .blockmenu a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 #viewprofile dl {
 #viewprofile dl {
 	float: left;
 	float: left;
 	width: 100%;
 	width: 100%;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 #viewprofile dd {
 #viewprofile dd {
@@ -740,7 +740,7 @@ html, body {
 
 
 #profileavatar img {
 #profileavatar img {
 	float: right;
 	float: right;
-	margin-left: 1em
+	margin-left: 1em;
 }
 }
 
 
 #adintro ul {
 #adintro ul {
@@ -775,7 +775,7 @@ html, body {
 }
 }
 
 
 .pun .postleft, .pun .postfootleft {
 .pun .postleft, .pun .postfootleft {
-	float:left;
+	float: left;
 	width: 18em;
 	width: 18em;
 	position: relative;
 	position: relative;
 	overflow: hidden;
 	overflow: hidden;
@@ -798,7 +798,7 @@ html, body {
 }
 }
 
 
 .pun .postleft .usercontacts, .pun .postleft .icon {
 .pun .postleft .usercontacts, .pun .postleft .icon {
-	margin-top: 6px
+	margin-top: 6px;
 }
 }
 
 
 .pun .postleft .postavatar, .pun .postleft .usertitle {
 .pun .postleft .postavatar, .pun .postleft .usertitle {
@@ -821,11 +821,11 @@ html, body {
 
 
 .pun .postright, .pun .postfootright {
 .pun .postright, .pun .postfootright {
 	border-left-width: 18em;
 	border-left-width: 18em;
-	border-left-style: solid
+	border-left-style: solid;
 }
 }
 
 
 #postpreview .postright {
 #postpreview .postright {
-	border-left: 0
+	border-left: 0;
 }
 }
 
 
 .pun .postright {
 .pun .postright {
@@ -833,11 +833,11 @@ html, body {
 }
 }
 
 
 .pun .postfootright, .pun .multidelete {
 .pun .postfootright, .pun .multidelete {
-	text-align: right
+	text-align: right;
 }
 }
 
 
 .pun .postmsg {
 .pun .postmsg {
-	width:98%;
+	width: 98%;
 	overflow: hidden;
 	overflow: hidden;
 	padding-bottom: 6px;
 	padding-bottom: 6px;
 	word-wrap: break-word;
 	word-wrap: break-word;
@@ -861,11 +861,11 @@ html, body {
 }
 }
 
 
 .pun .postfootright a:link, .pun .postfootright a:visited {
 .pun .postfootright a:link, .pun .postfootright a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .postfootright a:hover, .pun .postfootright a:active {
 .pun .postfootright a:hover, .pun .postfootright a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 .pun .codebox {
 .pun .codebox {
@@ -889,13 +889,13 @@ html, body {
 
 
 .pun .quotebox blockquote {
 .pun .quotebox blockquote {
 	width: 100%;
 	width: 100%;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 .pun .codebox pre {
 .pun .codebox pre {
 	overflow: auto;
 	overflow: auto;
 	width: 100%;
 	width: 100%;
-	overflow-y:hidden
+	overflow-y: hidden;
 }
 }
 
 
 * html .pun .codebox pre {
 * html .pun .codebox pre {
@@ -903,7 +903,7 @@ html, body {
 }
 }
 
 
 *+html .pun .codebox pre {
 *+html .pun .codebox pre {
-	padding-bottom: 10px
+	padding-bottom: 10px;
 }
 }
 
 
 .pun .codebox pre code {
 .pun .codebox pre code {
@@ -914,7 +914,7 @@ html, body {
 .pun .codebox pre.vscroll {
 .pun .codebox pre.vscroll {
 	height: 32em;
 	height: 32em;
 	overflow: auto;
 	overflow: auto;
-	overflow-y: auto
+	overflow-y: auto;
 }
 }
 
 
 .pun .postmsg img {
 .pun .postmsg img {
@@ -926,7 +926,7 @@ html, body {
 	width: 200px;
 	width: 200px;
 	text-align: left;
 	text-align: left;
 	height: 1px;
 	height: 1px;
-	border:none
+	border: none;
 }
 }
 
 
 .pun .postmsg .postimg img {
 .pun .postmsg .postimg img {
@@ -959,11 +959,11 @@ html, body {
 /****************************************************************/
 /****************************************************************/
 
 
 #punhelp h2 {
 #punhelp h2 {
-	margin-top: 12px
+	margin-top: 12px;
 }
 }
 
 
 #punhelp div.box {
 #punhelp div.box {
-	padding: 10px
+	padding: 10px;
 }
 }
 
 
 #debugtime {
 #debugtime {
@@ -972,11 +972,11 @@ html, body {
 }
 }
 
 
 #brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
 #brdwelcome, #brdfooter dl a, div.blockmenu li, div.rbox input {
-	line-height: 1.4em
+	line-height: 1.4em;
 }
 }
 
 
 #announce div.inbox div {
 #announce div.inbox div {
-	padding: 3px 0
+	padding: 3px 0;
 }
 }
 
 
 /*****************************************************************
 /*****************************************************************
@@ -988,42 +988,42 @@ COLOUR SCHEME
 
 
 body {
 body {
 	background: #fff;
 	background: #fff;
-	color: #333
+	color: #333;
 }
 }
 
 
 .pun {
 .pun {
-	color: #333
+	color: #333;
 }
 }
 
 
 .pun .box, #adminconsole fieldset th {
 .pun .box, #adminconsole fieldset th {
-	background-color: #f1f1f1
+	background-color: #f1f1f1;
 }
 }
 
 
 .pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
 .pun td.tc2, .pun td.tc3, .pun td.tcmod, #postpreview, #viewprofile dd, .pun .forminfo,
 #brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
 #brdfooter #modcontrols, #adminconsole fieldset td, .pun .blockmenu .box, #adstats dd {
-	background-color: #dedfdf
+	background-color: #dedfdf;
 }
 }
 
 
 .pun h2, #brdmenu {
 .pun h2, #brdmenu {
 	background-color: #b84623;
 	background-color: #b84623;
-	color: #fff
+	color: #fff;
 }
 }
 
 
 .pun th {
 .pun th {
-	background-color: #d1d1d1
+	background-color: #d1d1d1;
 }
 }
 
 
 .pun legend {
 .pun legend {
-	color: #822100
+	color: #822100;
 }
 }
 
 
 .pun .blockmenu li.isactive a, #posterror li strong {
 .pun .blockmenu li.isactive a, #posterror li strong {
-	color: #333
+	color: #333;
 }
 }
 
 
 .pun .usercontent * {
 .pun .usercontent * {
 	background: transparent;
 	background: transparent;
-	color: #333
+	color: #333;
 }
 }
 
 
 .pun .multiselect, .pun .checklist {
 .pun .multiselect, .pun .checklist {
@@ -1038,15 +1038,15 @@ body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
 .pun .blockpost .box, .pun .postright, .pun .postfootright, .pun .deletemsg {
-	background-color: #dedfdf
+	background-color: #dedfdf;
 }
 }
 
 
 .pun .postright, .pun .postfootright {
 .pun .postright, .pun .postfootright {
-	border-left-color: #f1f1f1
+	border-left-color: #f1f1f1;
 }
 }
 
 
 .pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
 .pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
-	background-color: #f1f1f1
+	background-color: #f1f1f1;
 }
 }
 
 
 #punhelp .codebox, #punhelp .quotebox {
 #punhelp .codebox, #punhelp .quotebox {
@@ -1054,11 +1054,11 @@ body {
 }
 }
 
 
 .pun .blockpost h2 {
 .pun .blockpost h2 {
-	background-color: #d25028
+	background-color: #d25028;
 }
 }
 
 
 .pun .blockpost h2 span.conr {
 .pun .blockpost h2 span.conr {
-	color: #fccfc1
+	color: #fccfc1;
 }
 }
 
 
 .pun .postmsg ins, #punhelp samp ins {
 .pun .postmsg ins, #punhelp samp ins {
@@ -1067,46 +1067,46 @@ body {
 
 
 .pun hr {
 .pun hr {
 	background-color: #333;
 	background-color: #333;
-	color: #333
+	color: #333;
 }
 }
 
 
 /* Borders
 /* Borders
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .box {
 .pun .box {
-	border-color: #b84623
+	border-color: #b84623;
 }
 }
 
 
 .pun td, #brdfooter #modcontrols {
 .pun td, #brdfooter #modcontrols {
-	border-color: #e1c3c3
+	border-color: #e1c3c3;
 }
 }
 
 
 .pun th {
 .pun th {
-	border-color: #d1d1d1
+	border-color: #d1d1d1;
 }
 }
 
 
 .pun fieldset {
 .pun fieldset {
-	border-color: #aca899
+	border-color: #aca899;
 }
 }
 
 
 #adminconsole td, #adminconsole th {
 #adminconsole td, #adminconsole th {
-	border-color: #f1f1f1
+	border-color: #f1f1f1;
 }
 }
 
 
 .pun .quotebox, .pun .codebox, .pun .forminfo,
 .pun .quotebox, .pun .codebox, .pun .forminfo,
 .pun .blockpost label, .pun .deletemsg {
 .pun .blockpost label, .pun .deletemsg {
-	border-color: #aca899 #fff #fff #aca899
+	border-color: #aca899 #fff #fff #aca899;
 }
 }
 
 
 /* Links
 /* Links
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun a:link, .pun a:visited {
 .pun a:link, .pun a:visited {
-	color: #822100
+	color: #822100;
 }
 }
 
 
 .pun a:hover, .pun a:active, .pun a:focus {
 .pun a:hover, .pun a:active, .pun a:focus {
-	color: #ca3300
+	color: #ca3300;
 }
 }
 
 
 .pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
 .pun .postmsg .postimg a:link img, .pun .postmsg .postimg a:visited img {
@@ -1119,45 +1119,45 @@ body {
 
 
 .pun h2 a:link, .pun h2 a:visited,
 .pun h2 a:link, .pun h2 a:visited,
 #brdmenu a:link, #brdmenu a:visited {
 #brdmenu a:link, #brdmenu a:visited {
-	color: #fff
+	color: #fff;
 }
 }
 
 
 .pun h2 a:hover, .pun h2 a:active,
 .pun h2 a:hover, .pun h2 a:active,
 #brdmenu a:hover, #brdmenu a:active {
 #brdmenu a:hover, #brdmenu a:active {
-	color: #fff
+	color: #fff;
 }
 }
 
 
 .pun .postreport a:link, .pun .postreport a:visited,
 .pun .postreport a:link, .pun .postreport a:visited,
 .pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
 .pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
-	color: #888
+	color: #888;
 }
 }
 
 
 .pun .postreport a:hover, .pun .postreport a:active,
 .pun .postreport a:hover, .pun .postreport a:active,
 .pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
 .pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
-	color: #aaa
+	color: #aaa;
 }
 }
 
 
 .pun .maintenancelink a:link, .pun .maintenancelink a:visited {
 .pun .maintenancelink a:link, .pun .maintenancelink a:visited {
-	color: #b42000
+	color: #b42000;
 }
 }
 
 
 .pun .maintenancelink a:hover, .pun .maintenancelink a:active {
 .pun .maintenancelink a:hover, .pun .maintenancelink a:active {
-	color: #b42000
+	color: #b42000;
 }
 }
 
 
 /* Status Indicators
 /* Status Indicators
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .icon {
 .pun .icon {
-	border-color: #e6e6e6 #dedede #dadada #e2e2e2
+	border-color: #e6e6e6 #dedede #dadada #e2e2e2;
 }
 }
 
 
 .pun .iredirect .icon {
 .pun .iredirect .icon {
-	border-color: #f1f1f1 #f1f1f1 #f1f1f1 #f1f1f1
+	border-color: #f1f1f1 #f1f1f1 #f1f1f1 #f1f1f1;
 }
 }
 
 
 .pun .inew .icon {
 .pun .inew .icon {
-	border-color: #c23000 #af2c00 #992600 #ac2b00
+	border-color: #c23000 #af2c00 #992600 #ac2b00;
 }
 }
 
 
 /* ---------- BBCODE TOOLBAR ------------- */
 /* ---------- BBCODE TOOLBAR ------------- */

+ 7 - 0
style/Sulfur/reminder.css

@@ -65,3 +65,10 @@
 	color: #333333;
 	color: #333333;
 }
 }
 
 
+#brdmenu ul span.remflasher, #adminconsole fieldset td span.remflasher {
+	background: url(../../img/flasher.gif) right 65% no-repeat;
+	display: inline-block;
+	line-height: normal;
+	margin-left: 1px;
+	padding-right: 18px;
+}

+ 107 - 107
style/Technetium.css

@@ -18,7 +18,7 @@ Technitium theme CSS
 }
 }
 
 
 .pun ul, .pun ol {
 .pun ul, .pun ol {
-	list-style: none
+	list-style: none;
 }
 }
 
 
 
 
@@ -34,11 +34,11 @@ body {
 	width: 0;
 	width: 0;
 	line-height: 0;
 	line-height: 0;
 	font-size: 0;
 	font-size: 0;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 .pun .clearer, .pun .clearb {
 .pun .clearer, .pun .clearb {
-	clear: both
+	clear: both;
 }
 }
 
 
 .pun .nosize {
 .pun .nosize {
@@ -49,11 +49,11 @@ body {
 }
 }
 
 
 * html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
 * html .inbox, * html .inform, * html .pun, * html .tclcon, * html .codebox {
-	height: 1px
+	height: 1px;
 }
 }
 
 
 .pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
 .pun, .pun .inbox, .pun .inform, .pun .tclcon, .pun .codebox {
-	min-height: 1px
+	min-height: 1px;
 }
 }
 
 
 .clearl {
 .clearl {
@@ -81,7 +81,7 @@ body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun {
 .pun {
-	font: 10pt Georgia, Times, "Times New Roman", serif
+	font: 10pt Georgia, Times, "Times New Roman", serif;
 }
 }
 
 
 .pun table, .pun td, .pun th, .pun input, .pun select, .pun optgroup, .pun textarea, .pun samp, .pun legend {
 .pun table, .pun td, .pun th, .pun input, .pun select, .pun optgroup, .pun textarea, .pun samp, .pun legend {
@@ -91,7 +91,7 @@ body {
 
 
 .pun pre, .pun code {
 .pun pre, .pun code {
 	font-size: 1.182em;
 	font-size: 1.182em;
-	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace
+	font-family: consolas, monaco, "bitstream vera sans mono", "courier new", courier, monospace;
 }
 }
 
 
 .pun pre code {
 .pun pre code {
@@ -146,7 +146,7 @@ body {
 }
 }
 
 
 .pun span.warntext, .pun p.warntext {
 .pun span.warntext, .pun p.warntext {
-	font-weight: bold
+	font-weight: bold;
 }
 }
 
 
 .pun .postleft dl dt {
 .pun .postleft dl dt {
@@ -163,58 +163,58 @@ body {
 
 
 .pun .usercontent ul, .pun .postmsg ul {
 .pun .usercontent ul, .pun .postmsg ul {
 	padding: 0.75em 1em 0.75em 2.5em;
 	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: disc
+	list-style: disc;
 }
 }
 
 
 .pun .usercontent ol, .pun .postmsg ol {
 .pun .usercontent ol, .pun .postmsg ol {
 	padding: 0.75em 1em 0.75em 2.5em;
 	padding: 0.75em 1em 0.75em 2.5em;
-	list-style: decimal
+	list-style: decimal;
 }
 }
 
 
 .pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
 .pun .usercontent ol.alpha, .pun .postmsg ol.alpha {
-	list-style: lower-alpha
+	list-style: lower-alpha;
 }
 }
 
 
 .pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
 .pun .usercontent li ol, .pun .usercontent li ul, .pun .postmsg li ol, .pun .postmsg li ul {
-	padding: 0.25em 1em 0.75em 2.5em
+	padding: 0.25em 1em 0.75em 2.5em;
 }
 }
 
 
 .pun .usercontent li p, .pun .postmsg li p {
 .pun .usercontent li p, .pun .postmsg li p {
-	padding: 0
+	padding: 0;
 }
 }
 
 
 .pun .usercontent h1 {
 .pun .usercontent h1 {
 	font-size: 1.4em;
 	font-size: 1.4em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h2 {
 .pun .usercontent h2 {
 	font-size: 1.2em;
 	font-size: 1.2em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h3 {
 .pun .usercontent h3 {
 	font-size: 1.1em;
 	font-size: 1.1em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
 .pun .usercontent h4, .pun .usercontent h5, .pun .usercontent h6 {
 	font-size: 1em;
 	font-size: 1em;
 	font-weight: bold;
 	font-weight: bold;
-	padding: 0.75em 0 0 0
+	padding: 0.75em 0 0 0;
 }
 }
 
 
 .pun .quotebox cite {
 .pun .quotebox cite {
 	font-weight: bold;
 	font-weight: bold;
 	font-style: normal;
 	font-style: normal;
-	padding: 0.75em 0.75em 0 0.75em
+	padding: 0.75em 0.75em 0 0.75em;
 }
 }
 
 
 .pun span.bbu {
 .pun span.bbu {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 .pun span.bbs, .pun del {
 .pun span.bbs, .pun del {
@@ -262,11 +262,11 @@ body {
 }
 }
 
 
 .pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
 .pun .blocktable, .pun .block, .pun .blockform, .pun .block2col, #postreview {
-	margin-bottom: 12px
+	margin-bottom: 12px;
 }
 }
 
 
 #punindex .blocktable, .pun .blockpost {
 #punindex .blocktable, .pun .blockpost {
-	margin-bottom: 6px
+	margin-bottom: 6px;
 }
 }
 
 
 #postreview .box {
 #postreview .box {
@@ -274,15 +274,15 @@ body {
 }
 }
 
 
 .pun .block2col .blockform, .pun .block2col .block {
 .pun .block2col .blockform, .pun .block2col .block {
-	margin-bottom: 0px
+	margin-bottom: 0px;
 }
 }
 
 
 .pun .linkst, .pun .linksb {
 .pun .linkst, .pun .linksb {
-	margin-top: -12px
+	margin-top: -12px;
 }
 }
 
 
 .pun .postlinksb {
 .pun .postlinksb {
-	margin-top: -6px
+	margin-top: -6px;
 }
 }
 
 
 
 
@@ -306,7 +306,7 @@ body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .block .inbox, .pun .blockmenu .inbox {
 .pun .block .inbox, .pun .blockmenu .inbox {
-	padding: 3px 6px
+	padding: 3px 6px;
 }
 }
 
 
 /*****************************************************************
 /*****************************************************************
@@ -323,7 +323,7 @@ body {
 }
 }
 
 
 #brdmenu {
 #brdmenu {
-	font-size:1.2em;
+	font-size: 1.2em;
 }
 }
 
 
 #brddesc {
 #brddesc {
@@ -356,13 +356,13 @@ body {
 }
 }
 
 
 #brdwelcome li {
 #brdwelcome li {
-	float:left;
-	margin-right:8px;
-	white-space:nowrap;
+	float: left;
+	margin-right: 8px;
+	white-space: nowrap;
 }
 }
 
 
 #brdwelcome .conl li strong:after {
 #brdwelcome .conl li strong:after {
-	content: '.'
+	content: '.';
 }
 }
 
 
 #brdwelcome .conr {
 #brdwelcome .conr {
@@ -379,11 +379,11 @@ body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .linkst {
 .pun .linkst {
-	padding: 8px 6px 3px 6px
+	padding: 8px 6px 3px 6px;
 }
 }
 
 
 .pun .linksb, .pun .postlinksb {
 .pun .linksb, .pun .postlinksb {
-	padding: 3px 6px 8px 6px
+	padding: 3px 6px 8px 6px;
 }
 }
 
 
 .pun .crumbs {
 .pun .crumbs {
@@ -469,8 +469,8 @@ body {
 }
 }
 
 
 #brdfooter #feedlinks span {
 #brdfooter #feedlinks span {
-	background:url("Technetium/feed.png") no-repeat scroll left center transparent;
-	padding-left:18px;
+	background: url("Technetium/feed.png") no-repeat scroll left center transparent;
+	padding-left: 18px;
 	display: inline;
 	display: inline;
 }
 }
 
 
@@ -540,11 +540,11 @@ body {
 }
 }
 
 
 .pun .tcl span.newtext, .pun .tcl span.pagestext {
 .pun .tcl span.newtext, .pun .tcl span.pagestext {
-	white-space: nowrap
+	white-space: nowrap;
 }
 }
 
 
 .pun .tcl p {
 .pun .tcl p {
-	padding: 5px 0 0 0
+	padding: 5px 0 0 0;
 }
 }
 
 
 #punsearch #vf .tc2 {
 #punsearch #vf .tc2 {
@@ -554,7 +554,7 @@ body {
 }
 }
 
 
 #users1 .tcr {
 #users1 .tcr {
-	width: 25%
+	width: 25%;
 }
 }
 
 
 #users1 .tc2 {
 #users1 .tc2 {
@@ -564,16 +564,16 @@ body {
 }
 }
 
 
 #debug .tcl {
 #debug .tcl {
-	width: 10%
+	width: 10%;
 }
 }
 
 
 #debug .tcr {
 #debug .tcr {
 	width: 90%;
 	width: 90%;
-	white-space: normal
+	white-space: normal;
 }
 }
 
 
 #punindex .tcr .byuser {
 #punindex .tcr .byuser {
-	display: block
+	display: block;
 }
 }
 
 
 .pun .blocktable .tclcon {
 .pun .blocktable .tclcon {
@@ -697,13 +697,13 @@ body {
 
 
 .pun label {
 .pun label {
 	display: block;
 	display: block;
-	padding: 3px 0
+	padding: 3px 0;
 }
 }
 
 
 .pun label.conl {
 .pun label.conl {
 	float: left;
 	float: left;
 	overflow: visible;
 	overflow: visible;
-	margin-right: 10px
+	margin-right: 10px;
 }
 }
 
 
 .pun select {
 .pun select {
@@ -733,21 +733,21 @@ body {
 }
 }
 
 
 .pun .txtarea {
 .pun .txtarea {
-	width: 90%
+	width: 90%;
 }
 }
 
 
 .pun .txtarea textarea, .pun input.longinput {
 .pun .txtarea textarea, .pun input.longinput {
-	width: 100%
+	width: 100%;
 }
 }
 
 
 .pun .bblinks {
 .pun .bblinks {
 	padding-bottom: 10px;
 	padding-bottom: 10px;
-	padding-left: 4px
+	padding-left: 4px;
 }
 }
 
 
 .pun .bblinks li {
 .pun .bblinks li {
 	display: inline;
 	display: inline;
-	padding-right: 20px
+	padding-right: 20px;
 }
 }
 
 
 .pun .blockform .buttons {
 .pun .blockform .buttons {
@@ -799,16 +799,16 @@ body {
 *****************************************************************/
 *****************************************************************/
 
 
 .pun .block2col {
 .pun .block2col {
-	padding-bottom: 1px
+	padding-bottom: 1px;
 }
 }
 
 
 .pun .block2col .blockform, .pun .block2col .block {
 .pun .block2col .blockform, .pun .block2col .block {
-	margin-left: 14em
+	margin-left: 14em;
 }
 }
 
 
 .pun .blockmenu {
 .pun .blockmenu {
-	float:left;
-	width: 13em
+	float: left;
+	width: 13em;
 }
 }
 
 
 .pun .blockmenu li {
 .pun .blockmenu li {
@@ -817,17 +817,17 @@ body {
 }
 }
 
 
 .pun .blockmenu a:link, .pun .blockmenu a:visited {
 .pun .blockmenu a:link, .pun .blockmenu a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .blockmenu a:hover, .pun .blockmenu a:active {
 .pun .blockmenu a:hover, .pun .blockmenu a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 #viewprofile dl {
 #viewprofile dl {
 	float: left;
 	float: left;
 	width: 100%;
 	width: 100%;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 #viewprofile dd {
 #viewprofile dd {
@@ -843,7 +843,7 @@ body {
 
 
 #profileavatar img {
 #profileavatar img {
 	float: right;
 	float: right;
-	margin-left: 1em
+	margin-left: 1em;
 }
 }
 
 
 /*****************************************************************
 /*****************************************************************
@@ -872,7 +872,7 @@ body {
 }
 }
 
 
 .pun .postleft, .pun .postfootleft {
 .pun .postleft, .pun .postfootleft {
-	float:left;
+	float: left;
 	width: 18em;
 	width: 18em;
 	overflow: hidden;
 	overflow: hidden;
 	position: relative;
 	position: relative;
@@ -896,7 +896,7 @@ body {
 }
 }
 
 
 .pun .postleft .usercontacts, .pun .postleft .icon {
 .pun .postleft .usercontacts, .pun .postleft .icon {
-	margin-top: 6px
+	margin-top: 6px;
 }
 }
 
 
 .pun .postleft .postavatar, .pun .postleft .usertitle {
 .pun .postleft .postavatar, .pun .postleft .usertitle {
@@ -919,11 +919,11 @@ body {
 
 
 .pun .postright, .pun .postfootright {
 .pun .postright, .pun .postfootright {
 	border-left-width: 18em;
 	border-left-width: 18em;
-	border-left-style: solid
+	border-left-style: solid;
 }
 }
 
 
 #postpreview .postright {
 #postpreview .postright {
-	border-left: 0
+	border-left: 0;
 }
 }
 
 
 .pun .postright {
 .pun .postright {
@@ -931,11 +931,11 @@ body {
 }
 }
 
 
 .pun .postfootright, .pun .multidelete {
 .pun .postfootright, .pun .multidelete {
-	text-align: right
+	text-align: right;
 }
 }
 
 
 .pun .postmsg {
 .pun .postmsg {
-	width:98%;
+	width: 98%;
 	overflow: hidden;
 	overflow: hidden;
 	padding-bottom: 6px;
 	padding-bottom: 6px;
 	word-wrap: break-word;
 	word-wrap: break-word;
@@ -959,11 +959,11 @@ body {
 }
 }
 
 
 .pun .postfootright a:link, .pun .postfootright a:visited {
 .pun .postfootright a:link, .pun .postfootright a:visited {
-	text-decoration: none
+	text-decoration: none;
 }
 }
 
 
 .pun .postfootright a:hover, .pun .postfootright a:active {
 .pun .postfootright a:hover, .pun .postfootright a:active {
-	text-decoration: underline
+	text-decoration: underline;
 }
 }
 
 
 
 
@@ -982,13 +982,13 @@ body {
 
 
 .pun .quotebox blockquote {
 .pun .quotebox blockquote {
 	width: 100%;
 	width: 100%;
-	overflow: hidden
+	overflow: hidden;
 }
 }
 
 
 .pun .codebox pre {
 .pun .codebox pre {
 	overflow: auto;
 	overflow: auto;
 	width: 100%;
 	width: 100%;
-	overflow-y:hidden
+	overflow-y: hidden;
 }
 }
 
 
 * html .pun .codebox pre {
 * html .pun .codebox pre {
@@ -996,7 +996,7 @@ body {
 }
 }
 
 
 *+html .pun .codebox pre {
 *+html .pun .codebox pre {
-	padding-bottom: 10px
+	padding-bottom: 10px;
 }
 }
 
 
 .pun .codebox pre code {
 .pun .codebox pre code {
@@ -1007,7 +1007,7 @@ body {
 .pun .codebox pre.vscroll {
 .pun .codebox pre.vscroll {
 	height: 32em;
 	height: 32em;
 	overflow: auto;
 	overflow: auto;
-	overflow-y: auto
+	overflow-y: auto;
 }
 }
 
 
 .pun .postmsg .postimg img, .pun .postmsg a .postimg img {
 .pun .postmsg .postimg img, .pun .postmsg a .postimg img {
@@ -1024,7 +1024,7 @@ body {
 	width: 200px;
 	width: 200px;
 	text-align: left;
 	text-align: left;
 	height: 1px;
 	height: 1px;
-	border:none
+	border: none;
 }
 }
 
 
 .pun .blockpost label {
 .pun .blockpost label {
@@ -1047,11 +1047,11 @@ body {
 /****************************************************************/
 /****************************************************************/
 
 
 #punhelp h2 {
 #punhelp h2 {
-	margin-top: 12px
+	margin-top: 12px;
 }
 }
 
 
 #punhelp div.box {
 #punhelp div.box {
-	padding: 10px
+	padding: 10px;
 }
 }
 
 
 /*****************************************************************
 /*****************************************************************
@@ -1063,11 +1063,11 @@ COLOUR SCHEME
 
 
 body {
 body {
 	background: #fff url("Technetium/bg.png") repeat-x top;
 	background: #fff url("Technetium/bg.png") repeat-x top;
-	color: #122434
+	color: #122434;
 }
 }
 
 
 .pun {
 .pun {
-	color: #122434
+	color: #122434;
 }
 }
 
 
 .pun .box, #adminconsole fieldset th {
 .pun .box, #adminconsole fieldset th {
@@ -1093,7 +1093,7 @@ body {
 	background-position: top;
 	background-position: top;
 }
 }
 
 
-.pun h2  {
+.pun h2 {
 	background-color: #C5D8EB;
 	background-color: #C5D8EB;
 	background-image: url("Technetium/inv-shade.png");
 	background-image: url("Technetium/inv-shade.png");
 	background-repeat: repeat-x;
 	background-repeat: repeat-x;
@@ -1101,7 +1101,7 @@ body {
 	text-shadow: #FFF 1px -1px 0.7em;
 	text-shadow: #FFF 1px -1px 0.7em;
 }
 }
 
 
-.pun #announce h2  {
+.pun #announce h2 {
 	display: none;
 	display: none;
 }
 }
 
 
@@ -1127,7 +1127,7 @@ body {
 }
 }
 
 
 .pun .iclosed td {
 .pun .iclosed td {
-	background-color: #ECEEF0
+	background-color: #ECEEF0;
 }
 }
 
 
 .pun .iclosed.isticky td {
 .pun .iclosed.isticky td {
@@ -1135,28 +1135,28 @@ body {
 }
 }
 
 
 .pun legend {
 .pun legend {
-	color: #122434
+	color: #122434;
 }
 }
 
 
 .pun .blockmenu li.isactive a, #posterror li strong {
 .pun .blockmenu li.isactive a, #posterror li strong {
-	color: #333
+	color: #333;
 }
 }
 
 
 .pun .usercontent * {
 .pun .usercontent * {
 	background: transparent;
 	background: transparent;
-	color: #333
+	color: #333;
 }
 }
 
 
 #adminmenu .box {
 #adminmenu .box {
 	background: #FBFCFD;
 	background: #FBFCFD;
 }
 }
 
 
-.pun .postlink a:link, .pun .postlink a:visited, .pun .postlink a:active  {
-	background-color:#F0F5FA;
-	background-image:url(Technetium/inv-shade.png);
-	background-repeat:repeat-x;
+.pun .postlink a:link, .pun .postlink a:visited, .pun .postlink a:active {
+	background-color: #F0F5FA;
+	background-image: url(Technetium/inv-shade.png);
+	background-repeat: repeat-x;
 	border: 1px solid;
 	border: 1px solid;
-	color:#2B3037;
+	color: #2B3037;
 	text-shadow: #FFF 1px -1px 0.4em;
 	text-shadow: #FFF 1px -1px 0.4em;
 	padding: 0.3em;
 	padding: 0.3em;
 	border-radius: 0.4em;
 	border-radius: 0.4em;
@@ -1169,11 +1169,11 @@ body {
 }
 }
 
 
 #brdheader .box {
 #brdheader .box {
-	background-color:#F0F5FA;
-	background-image:url(Technetium/light-shade.png);
-	background-repeat:repeat-x;
+	background-color: #F0F5FA;
+	background-image: url(Technetium/light-shade.png);
+	background-repeat: repeat-x;
 	background-position: top;
 	background-position: top;
-	color:#122434;
+	color: #122434;
 	border-radius: 0.4em;
 	border-radius: 0.4em;
 }
 }
 
 
@@ -1213,11 +1213,11 @@ body {
 }
 }
 
 
 .pun .postright, .pun .postfootright {
 .pun .postright, .pun .postfootright {
-	border-left-color: #F0F5FA
+	border-left-color: #F0F5FA;
 }
 }
 
 
 .pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
 .pun .postleft, .pun .postfootleft, .pun .blockpost label, .pun .codebox, .pun .quotebox {
-	background-color: #F0F5FA
+	background-color: #F0F5FA;
 }
 }
 
 
 #punhelp .codebox, #punhelp .quotebox {
 #punhelp .codebox, #punhelp .quotebox {
@@ -1229,12 +1229,12 @@ body {
 }
 }
 
 
 .pun .blockpost h2 span.conr {
 .pun .blockpost h2 span.conr {
-	color: #aabdcd
+	color: #aabdcd;
 }
 }
 
 
 .pun hr {
 .pun hr {
 	background-color: #333;
 	background-color: #333;
-	color: #333
+	color: #333;
 }
 }
 
 
 .pun .quotebox {
 .pun .quotebox {
@@ -1265,8 +1265,8 @@ body {
 }
 }
 
 
 #adminconsole td, #adminconsole th {
 #adminconsole td, #adminconsole th {
-	border-style:solid;
-	border-width:1px 0px !important;
+	border-style: solid;
+	border-width: 1px 0px !important;
 }
 }
 
 
 #adminconsole th {
 #adminconsole th {
@@ -1286,7 +1286,7 @@ body {
 }
 }
 
 
 .pun .postlink a:link, .pun .postlink a:visited {
 .pun .postlink a:link, .pun .postlink a:visited {
-	border-color: #C0D6E9
+	border-color: #C0D6E9;
 }
 }
 
 
 
 
@@ -1299,7 +1299,7 @@ body {
 }
 }
 
 
 .pun a:hover, .pun a:active, .pun a:focus {
 .pun a:hover, .pun a:active, .pun a:focus {
-	color: #9E1D00
+	color: #9E1D00;
 }
 }
 
 
 #brdmenu li a:active, #brdmenu li a:link, #brdmenu li a:visited {
 #brdmenu li a:active, #brdmenu li a:link, #brdmenu li a:visited {
@@ -1317,7 +1317,7 @@ body {
 
 
 .pun .postreport a:link, .pun .postreport a:visited,
 .pun .postreport a:link, .pun .postreport a:visited,
 .pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
 .pun .iclosed td.tcl a:link, .pun .iclosed td.tcl a:visited {
-	color: #888
+	color: #888;
 }
 }
 
 
 .pun .isticky.iclosed td.tcl a:link, .pun .isticky.iclosed td.tcl a:visited {
 .pun .isticky.iclosed td.tcl a:link, .pun .isticky.iclosed td.tcl a:visited {
@@ -1331,15 +1331,15 @@ body {
 
 
 .pun .postreport a:hover, .pun .postreport a:active,
 .pun .postreport a:hover, .pun .postreport a:active,
 .pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
 .pun .iclosed td.tcl a:hover, .pun .iclosed td.tcl a:active {
-	color: #aaa
+	color: #aaa;
 }
 }
 
 
 .pun .maintenancelink a:link, .pun .maintenancelink a:visited {
 .pun .maintenancelink a:link, .pun .maintenancelink a:visited {
-	color: #b42000
+	color: #b42000;
 }
 }
 
 
 .pun .maintenancelink a:hover, .pun .maintenancelink a:active {
 .pun .maintenancelink a:hover, .pun .maintenancelink a:active {
-	color: #b42000
+	color: #b42000;
 }
 }
 
 
 
 
@@ -1347,35 +1347,35 @@ body {
 ----------------------------------------------------------------*/
 ----------------------------------------------------------------*/
 
 
 .pun .icon {
 .pun .icon {
-	background-image:url(Technetium/icon-nonew.png);
+	background-image: url(Technetium/icon-nonew.png);
 }
 }
 
 
 .pun .iredirect .icon {
 .pun .iredirect .icon {
-	background-image:url(Technetium/icon-moved.png);
+	background-image: url(Technetium/icon-moved.png);
 }
 }
 
 
 .pun .inew .icon{
 .pun .inew .icon{
-	background-image:url(Technetium/icon-new.png);
+	background-image: url(Technetium/icon-new.png);
 }
 }
 
 
-.pun .iclosed .icon  {
-	background-image:url(Technetium/icon-closed.png);
+.pun .iclosed .icon {
+	background-image: url(Technetium/icon-closed.png);
 }
 }
 
 
 .pun .isticky .icon {
 .pun .isticky .icon {
-	background-image:url(Technetium/icon-nonew-sticky.png);
+	background-image: url(Technetium/icon-nonew-sticky.png);
 }
 }
 
 
 .pun .isticky.inew .icon {
 .pun .isticky.inew .icon {
-	background-image:url(Technetium/icon-new-sticky.png);
+	background-image: url(Technetium/icon-new-sticky.png);
 }
 }
 
 
 .pun .iclosed.isticky .icon {
 .pun .iclosed.isticky .icon {
-	background-image:url(Technetium/icon-closed-sticky.png);
+	background-image: url(Technetium/icon-closed-sticky.png);
 }
 }
 
 
 .pun .imoved .icon {
 .pun .imoved .icon {
-	background-image:url(Technetium/icon-moved.png);
+	background-image: url(Technetium/icon-moved.png);
 }
 }
 
 
 /* ---------- BBCODE TOOLBAR ------------- */
 /* ---------- BBCODE TOOLBAR ------------- */

+ 7 - 0
style/Technetium/reminder.css

@@ -66,3 +66,10 @@
 	color: #122434;
 	color: #122434;
 }
 }
 
 
+#brdmenu ul span.remflasher, #adminconsole fieldset td span.remflasher {
+	background: url(../../img/flasher.gif) right 65% no-repeat;
+	display: inline-block;
+	line-height: normal;
+	margin-left: 1px;
+	padding-right: 18px;
+}

+ 8 - 0
style/imports/reminder.css

@@ -46,3 +46,11 @@
 	padding: 2px;
 	padding: 2px;
 	overflow: hidden;
 	overflow: hidden;
 }
 }
+
+#brdmenu ul span.remflasher, #adminconsole fieldset td span.remflasher {
+	background: url(../../img/flasher.gif) right 65% no-repeat;
+	display: inline-block;
+	line-height: normal;
+	margin-left: 1px;
+	padding-right: 18px;
+}

+ 5 - 5
style/imports/upfiles.css

@@ -30,8 +30,8 @@ ul#upf-list {
 }
 }
 
 
 .upf-file img {
 .upf-file img {
-  height: 100%;
-  border: none;
+	height: 100%;
+	border: none;
 }
 }
 
 
 #upf-list .upf-name {
 #upf-list .upf-name {
@@ -120,9 +120,9 @@ ul#upf-list {
 }
 }
 
 
 #upf-table .upf-c3 img {
 #upf-table .upf-c3 img {
-  border: none;
+	border: none;
 }
 }
 
 
 #upf-block #upf-table td {
 #upf-block #upf-table td {
-    vertical-align: middle;
-}
+	vertical-align: middle;
+}

+ 17 - 15
upfiles.php

@@ -76,7 +76,7 @@ if (isset($_GET['delete']))
 	if (is_dir(PUN_ROOT.$dir))
 	if (is_dir(PUN_ROOT.$dir))
 	{
 	{
 		$file = parse_file(pun_trim($_GET['delete']));
 		$file = parse_file(pun_trim($_GET['delete']));
-		$ext = strtolower(substr(strrchr($file,  "." ), 1)); // берем расширение файла
+		$ext = strtolower(substr(strrchr($file, '.'), 1)); // берем расширение файла
 		if ($file[0] != '.' && $ext != '' && !in_array($ext, $extforno) && is_file(PUN_ROOT.$dir.$file))
 		if ($file[0] != '.' && $ext != '' && !in_array($ext, $extforno) && is_file(PUN_ROOT.$dir.$file))
 		{
 		{
 			if (unlink(PUN_ROOT.$dir.$file))
 			if (unlink(PUN_ROOT.$dir.$file))
@@ -104,8 +104,10 @@ if (isset($_GET['delete']))
 
 
 		header('Content-type: text/html; charset=utf-8');
 		header('Content-type: text/html; charset=utf-8');
 		
 		
-	  if ($error) exit('not ok');
-	  exit('ok');
+		if ($error)
+			exit('not ok');
+
+		exit('ok');
 	}
 	}
 	
 	
 	$s = $lang_up['Redirect delete'];
 	$s = $lang_up['Redirect delete'];
@@ -312,7 +314,7 @@ if (is_dir(PUN_ROOT.$dir))
 		if (is_file(PUN_ROOT.$dir.$file))
 		if (is_file(PUN_ROOT.$dir.$file))
 		{
 		{
 			$ext = strtolower(substr(strrchr($file, '.'), 1));
 			$ext = strtolower(substr(strrchr($file, '.'), 1));
-			if (!in_array($ext, $extforno) && $file[0] != '#'  && substr($file, 0, 5) != 'mini_')
+			if (!in_array($ext, $extforno) && $file[0] != '#' && substr($file, 0, 5) != 'mini_')
 			{
 			{
 				$time = filemtime(PUN_ROOT.$dir.$file).$file;
 				$time = filemtime(PUN_ROOT.$dir.$file).$file;
 				$filesvar[$time] = $dir.$file;
 				$filesvar[$time] = $dir.$file;
@@ -451,7 +453,7 @@ FluxBB.upfile = (function (doc, win) {
 	function get_us(li) {
 	function get_us(li) {
 		url = '';
 		url = '';
 		src = '';
 		src = '';
-	  var div = li.getElementsByTagName("div")[1];
+		var div = li.getElementsByTagName("div")[1];
 		if (!!div) {
 		if (!!div) {
 			var a = div.getElementsByTagName("a")[0];
 			var a = div.getElementsByTagName("a")[0];
 			if (!!a) {
 			if (!!a) {
@@ -519,10 +521,10 @@ FluxBB.upfile = (function (doc, win) {
 		{
 		{
 			ref.className = "";
 			ref.className = "";
 			
 			
-		  if (req.status == 200 && req.responseText == "ok") {
+			if (req.status == 200 && req.responseText == "ok") {
 				ref.parentNode.parentNode.parentNode.removeChild(ref.parentNode.parentNode);
 				ref.parentNode.parentNode.parentNode.removeChild(ref.parentNode.parentNode);
 				if (get("upf-list").getElementsByTagName("li").length == 0) {
 				if (get("upf-list").getElementsByTagName("li").length == 0) {
-				  win.location.reload(true);
+					win.location.reload(true);
 				}
 				}
 			}
 			}
 		}
 		}
@@ -531,11 +533,11 @@ FluxBB.upfile = (function (doc, win) {
 	return {
 	return {
 
 
 		del : function (ref) {
 		del : function (ref) {
-		  if (ref.className) return !1;
+			if (ref.className) return !1;
 			ref.className = "upf-loading";
 			ref.className = "upf-loading";
 			
 			
-		  var req = cr_req();
-		  if (req) {
+			var req = cr_req();
+			if (req) {
 				req.onreadystatechange=function(){orsc(req, ref);};
 				req.onreadystatechange=function(){orsc(req, ref);};
 				req.open("GET", ref.href + "&ajx=1", true);
 				req.open("GET", ref.href + "&ajx=1", true);
 				req.send();
 				req.send();
@@ -551,20 +553,20 @@ FluxBB.upfile = (function (doc, win) {
 			get_us(ref.parentNode.parentNode);
 			get_us(ref.parentNode.parentNode);
 
 
 			if (f && is_img(src) && src != url) {
 			if (f && is_img(src) && src != url) {
-			  insr("", "[url=" + url + "][img]" + src + "[/img][/url]", "");
+				insr("", "[url=" + url + "][img]" + src + "[/img][/url]", "");
 			} else if (is_img(url)) {
 			} else if (is_img(url)) {
-			  insr("", "[img]" + url + "[/img]", "");
+				insr("", "[img]" + url + "[/img]", "");
 			} else {
 			} else {
 				if (f = url.match(/.*\/img\/members\/\d+\/(.+)$/)) f = f[1];
 				if (f = url.match(/.*\/img\/members\/\d+\/(.+)$/)) f = f[1];
 				else f = "<?php echo $lang_up['texte'] ?>";
 				else f = "<?php echo $lang_up['texte'] ?>";
 
 
-			  insr("[url=" + url + "]", "[/url]", f);
+				insr("[url=" + url + "]", "[/url]", f);
 			}
 			}
 			return !1;
 			return !1;
 		},
 		},
 
 
 		run : function () {
 		run : function () {
-		  if (!win.opener) return;
+			if (!win.opener) return;
 			var li = get("upf-list").getElementsByTagName("li");
 			var li = get("upf-list").getElementsByTagName("li");
 			for (var i in li) {
 			for (var i in li) {
 				if (!!li[i].getElementsByTagName) set_button(li[i]);
 				if (!!li[i].getElementsByTagName) set_button(li[i]);
@@ -572,7 +574,7 @@ FluxBB.upfile = (function (doc, win) {
 		},
 		},
 
 
 		init : function () {
 		init : function () {
-		  if (!doc.addEventListener) {
+			if (!doc.addEventListener) {
 				/in/.test(doc.readyState) ? setTimeout(FluxBB.upfile.init, 100) : FluxBB.upfile.run();
 				/in/.test(doc.readyState) ? setTimeout(FluxBB.upfile.init, 100) : FluxBB.upfile.run();
 			} else doc.addEventListener("DOMContentLoaded", FluxBB.upfile.run(), false);
 			} else doc.addEventListener("DOMContentLoaded", FluxBB.upfile.run(), false);
 		}
 		}

+ 1 - 1
viewforum.php

@@ -106,7 +106,7 @@ if (!$pun_user['is_guest'])
 	if ($pun_config['o_forum_subscriptions'] == '1')
 	if ($pun_config['o_forum_subscriptions'] == '1')
 	{
 	{
 		if ($cur_forum['is_subscribed'])
 		if ($cur_forum['is_subscribed'])
-			$forum_actions[] = '<span>'.$lang_forum['Is subscribed'].' - </span><a href="misc.php?action=unsubscribe&amp;fid='.$id.'&amp;csrf_hash='.csrf_hash('misc.php', false).'">'.$lang_forum['Unsubscribe'].'</a>';
+			$forum_actions[] = '<span>'.$lang_forum['Is subscribed'].' - </span><a id="unsubscribe" href="misc.php?action=unsubscribe&amp;fid='.$id.'&amp;csrf_hash='.csrf_hash('misc.php').'">'.$lang_forum['Unsubscribe'].'</a>';
 		else
 		else
 			$forum_actions[] = '<a href="misc.php?action=subscribe&amp;fid='.$id.'&amp;csrf_hash='.csrf_hash('misc.php').'">'.$lang_forum['Subscribe'].'</a>';
 			$forum_actions[] = '<a href="misc.php?action=subscribe&amp;fid='.$id.'&amp;csrf_hash='.csrf_hash('misc.php').'">'.$lang_forum['Subscribe'].'</a>';
 	}
 	}

+ 23 - 10
viewtopic.php

@@ -107,13 +107,24 @@ if (isset($_GET['search_hl']))
 		{
 		{
 			$string_shl = implode('|', $temp['array_shl']);
 			$string_shl = implode('|', $temp['array_shl']);
 
 
-		  $url_shl = '&amp;search_hl='.$search_hl;
+			$url_shl = '&amp;search_hl='.$search_hl;
 		}
 		}
 
 
 		unset($temp);
 		unset($temp);
 	}
 	}
-	else
-		message($lang_common['Bad request'], false, '404 Not Found'); // запрос устарел или от другого юзера
+	else // запрос устарел или от другого юзера
+	{
+		if ($id > 0)
+		{
+			$p = isset($_GET['p']) && $_GET['p'] > 1 ? '&p='.intval($_GET['p']) : '';
+
+			header('Location: viewtopic.php?id='.$id.$p.($pid > 0 ? '#p'.$pid : ''), true, 301);
+		}
+		else
+			header('Location: viewtopic.php?pid='.$pid.'#p'.$pid, true, 301);
+
+		exit;
+	}
 }
 }
 // search HL - Visman
 // search HL - Visman
 
 
@@ -247,7 +258,7 @@ if (!$pun_user['is_guest'] && $pun_config['o_topic_subscriptions'] == '1')
 {
 {
 	if ($cur_topic['is_subscribed'])
 	if ($cur_topic['is_subscribed'])
 		// I apologize for the variable naming here. It's a mix of subscription and action I guess :-)
 		// I apologize for the variable naming here. It's a mix of subscription and action I guess :-)
-		$subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.$lang_topic['Is subscribed'].' - </span><a href="misc.php?action=unsubscribe&amp;tid='.$id.'&amp;csrf_hash='.csrf_hash('misc.php', false).'">'.$lang_topic['Unsubscribe'].'</a></p>'."\n";
+		$subscraction = "\t\t".'<p class="subscribelink clearb"><span>'.$lang_topic['Is subscribed'].' - </span><a id="unsubscribe" href="misc.php?action=unsubscribe&amp;tid='.$id.'&amp;csrf_hash='.csrf_hash('misc.php').'">'.$lang_topic['Unsubscribe'].'</a></p>'."\n";
 	else
 	else
 		$subscraction = "\t\t".'<p class="subscribelink clearb"><a href="misc.php?action=subscribe&amp;tid='.$id.'&amp;csrf_hash='.csrf_hash('misc.php').'">'.$lang_topic['Subscribe'].'</a></p>'."\n";
 		$subscraction = "\t\t".'<p class="subscribelink clearb"><a href="misc.php?action=subscribe&amp;tid='.$id.'&amp;csrf_hash='.csrf_hash('misc.php').'">'.$lang_topic['Subscribe'].'</a></p>'."\n";
 }
 }
@@ -612,15 +623,17 @@ if (defined('WITT_ENABLE'))
 	{
 	{
 		if (strpos($online_name, '[Bot]') !== false)
 		if (strpos($online_name, '[Bot]') !== false)
 		{
 		{
-		   ++$num_bots;
-		   $arr_o_name = explode('[Bot]', $online_name);
-		   if (empty($bots[$arr_o_name[1]])) $bots[$arr_o_name[1]] = 1;
-		   else ++$bots[$arr_o_name[1]];
+			++$num_bots;
+			$arr_o_name = explode('[Bot]', $online_name);
+			if (empty($bots[$arr_o_name[1]]))
+				$bots[$arr_o_name[1]] = 1;
+			else
+				++$bots[$arr_o_name[1]];
 		}
 		}
 	}
 	}
 	foreach ($bots as $online_name => $online_id)
 	foreach ($bots as $online_name => $online_id)
 	{
 	{
-		   $users[] = "\n\t\t\t\t".'<dd>[Bot] '.pun_htmlspecialchars($online_name.($online_id > 1 ? ' ('.$online_id.')' : ''));
+		$users[] = "\n\t\t\t\t".'<dd>[Bot] '.pun_htmlspecialchars($online_name.($online_id > 1 ? ' ('.$online_id.')' : ''));
 	}
 	}
 	echo "\t\t\t\t".'<dd><span>'.sprintf($lang_topic['Users online'], '<strong>'.forum_number_format($num_users).'</strong>').', '.sprintf($lang_topic['Guests online'], '<strong>'.forum_number_format($num_guests).'</strong>').'</span></dd>'."\n\t\t\t".'</dl>'."\n";;
 	echo "\t\t\t\t".'<dd><span>'.sprintf($lang_topic['Users online'], '<strong>'.forum_number_format($num_users).'</strong>').', '.sprintf($lang_topic['Guests online'], '<strong>'.forum_number_format($num_guests).'</strong>').'</span></dd>'."\n\t\t\t".'</dl>'."\n";;
 
 
@@ -676,7 +689,7 @@ else
 
 
 ?>
 ?>
 
 
-						<textarea name="req_message" rows="7" cols="75"  tabindex="<?php echo $cur_index++ ?>"></textarea></label>
+						<textarea name="req_message" rows="7" cols="75" tabindex="<?php echo $cur_index++ ?>"></textarea></label>
 						<ul class="bblinks">
 						<ul class="bblinks">
 							<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo ($pun_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
 							<li><span><a href="help.php#bbcode" onclick="window.open(this.href); return false;"><?php echo $lang_common['BBCode'] ?></a> <?php echo ($pun_config['p_message_bbcode'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
 							<li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo ($pun_config['p_message_bbcode'] == '1' && $pun_user['g_post_links'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>
 							<li><span><a href="help.php#url" onclick="window.open(this.href); return false;"><?php echo $lang_common['url tag'] ?></a> <?php echo ($pun_config['p_message_bbcode'] == '1' && $pun_user['g_post_links'] == '1') ? $lang_common['on'] : $lang_common['off']; ?></span></li>

Деякі файли не було показано, через те що забагато файлів було змінено