mxbb-commits Mailing List for MX-Publisher (Page 16)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/mxbb/mx_weather/db
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17169/db

Log Message:
Directory /cvsroot/mxbb/mx_weather/db added to the repository

Update of /cvsroot/mxbb/core/includes/sessions/phpbb3
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25451

Modified Files:
	session.php 
Log Message:
fix@ removed extra line that breaks login

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** session.php	5 Jun 2013 14:05:59 -0000	1.49
--- session.php	6 Jun 2013 14:42:52 -0000	1.50
***************
*** 237,241 ****
  		$this->referer				= (!empty($_SERVER['HTTP_REFERER'])) ? htmlspecialchars((string) $_SERVER['HTTP_REFERER']) : '';		
  		$this->forwarded_for		= (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) ? (string) $_SERVER['HTTP_X_FORWARDED_FOR'] : '';
- 
  		$this->host					= (!empty($_SERVER['HTTP_HOST'])) ? (string) $_SERVER['HTTP_HOST'] : 'localhost';
  		$this->page					= $this->extract_current_page($phpbb_root_path);
--- 237,240 ----
***************
*** 244,248 ****
  		if ($board_config['forwarded_for_check'])
  		{
! 			$this->forwarded_for = preg_replace('#[ ]{2,}#', ' ', str_replace(array(',', ' '), ' ', $this->forwarded_for));

  			// Whoa these look impressive!
--- 243,247 ----
  		if ($board_config['forwarded_for_check'])
  		{
! 			$this->forwarded_for = preg_replace('#, +#', ', ', $this->forwarded_for);

  			// Whoa these look impressive!
***************
*** 253,257 ****

  			// split the list of IPs
! 			$ips = explode(' ', $this->forwarded_for);
  			foreach ($ips as $ip)
  			{
--- 252,256 ----

  			// split the list of IPs
! 			$ips = explode(', ', $this->forwarded_for);
  			foreach ($ips as $ip)
  			{
***************
*** 754,758 ****
  			'session_admin'			=> ($set_admin) ? 1 : 0,
  			'session_viewonline'	=> ($viewonline) ? 1 : 0,
- 			'session_lang'			=> (string) $this->lang_name,			
  		);

--- 753,756 ----
***************
*** 1351,1354 ****
--- 1349,1401 ----
  		}
  	}
+ 	
+ 	/**
+ 	* Check if the request originated from the same page.
+ 	* @param bool $check_script_path If true, the path will be checked as well
+ 	*/
+ 	function validate_referer($check_script_path = false)
+ 	{
+ 		global $board_config;
+ 
+ 		// no referer - nothing to validate, user's fault for turning it off (we only check on POST; so meta can't be the reason)
+ 		if (empty($this->referer) || empty($this->host))
+ 		{
+ 			return true;
+ 		}
+ 
+ 		$host = htmlspecialchars($this->host);
+ 		$ref = substr($this->referer, strpos($this->referer, '://') + 3);
+ 
+ 		if (!(stripos($ref, $host) === 0) && (!$board_config['force_server_vars'] || !(stripos($ref, $board_config['server_name']) === 0)))
+ 		{
+ 			return false;
+ 		}
+ 		else if ($check_script_path && rtrim($this->page['root_script_path'], '/') !== '')
+ 		{
+ 			$ref = substr($ref, strlen($host));
+ 			$server_port = (!empty($_SERVER['SERVER_PORT'])) ? (int) $_SERVER['SERVER_PORT'] : (int) getenv('SERVER_PORT');
+ 
+ 			if ($server_port !== 80 && $server_port !== 443 && stripos($ref, ":$server_port") === 0)
+ 			{
+ 				$ref = substr($ref, strlen(":$server_port"));
+ 			}
+ 
+ 			if (!(stripos(rtrim($ref, '/'), rtrim($this->page['root_script_path'], '/')) === 0))
+ 			{
+ 				return false;
+ 			}
+ 		}
+ 
+ 		return true;
+ 	}
+ 
+ 	function unset_admin()
+ 	{
+ 		global $db;
+ 		$sql = 'UPDATE ' . SESSIONS_TABLE . '
+ 			SET session_admin = 0
+ 			WHERE session_id = \'' . $db->sql_escape($this->session_id) . '\'';
+ 		$db->sql_query($sql);
+ 	}	

  	/** *******************************************************************************************************
***************
*** 1367,1372 ****

  		$session_lang = '';
! 		
! 		//Added here for reference and future implementation of a lang block in mx_coreblocks were board_config can be taken from portal_config
  		if ($board_config['lang_select_enable'] || $board_config['lang_click_enable'])
  		{
--- 1414,1420 ----

  		$session_lang = '';
! 		/*
! 		* Added here for reference and future implementation of a lang block in mx_coreblocks were board_config can be taken from portal_config 
! 		*
  		if ($board_config['lang_select_enable'] || $board_config['lang_click_enable'])
  		{
***************
*** 1421,1425 ****
  			}
  		}		
! 
  		$lang_set = !$lang_set ? (defined('IN_ADMIN') ? 'acp/common' : 'common') : $lang_set;

--- 1469,1473 ----
  			}
  		}		
! 		*/
  		$lang_set = !$lang_set ? (defined('IN_ADMIN') ? 'acp/common' : 'common') : $lang_set;

***************
*** 1514,1524 ****
  		if (("$include_result".include $this->lang_path . "common.$phpEx") === false)
  		{
  			if ((@include $phpbb_root_path . $this->lang_path . "common.$phpEx") === false)
  			{
! 				die('Language file ' . $this->lang_path . "common.$phpEx" . ' couldn\'t be opened.'); //this will fix the path for anonymouse users
  			}
  		}
  		// We include common language file here to not load it every time a custom language file is included
  		$this->add_lang($lang_set);
  		unset($lang_set);
  	}
--- 1562,1577 ----
  		if (("$include_result".include $this->lang_path . "common.$phpEx") === false)
  		{
+ 			//this will fix the path for anonymouse users
  			if ((@include $phpbb_root_path . $this->lang_path . "common.$phpEx") === false)
  			{
! 				die('Language file ' . $this->lang_path . "common.$phpEx" . ' couldn\'t be opened.');
  			}
  		}
+ 
+ 		//
  		// We include common language file here to not load it every time a custom language file is included
+ 		//
  		$this->add_lang($lang_set);
+ 
  		unset($lang_set);
  	}
***************
*** 2037,2071 ****
  				$language_filename = $this->lang_path . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx;
  			}
- 			
- 			if (!file_exists($language_filename))
- 			{
- 				global $config;
- 
- 				if ($this->lang_name == 'en')
- 				{
- 					// The user's selected language is missing the file, the board default's language is missing the file, and the file doesn't exist in /en.
- 					$language_filename = str_replace($this->lang_path . 'en', $this->lang_path . $this->data['user_lang'], $language_filename);
- 					$include_result = (defined('DEBUG_EXTRA')) ?  trigger_error('Language file ' . $language_filename . ' couldn\'t be opened.', E_USER_ERROR) : ""; // Do not suppress error if in DEBUG_EXTRA mode		
- 				}
- 				else if ($this->lang_name == basename($config['default_lang']))
- 				{
- 					// Fall back to the English Language
- 					$this->lang_name = 'en';
- 					$this->set_lang($lang, $help, $lang_file, $use_db, $use_help);
- 				}
- 				else if ($this->lang_name == $this->data['user_lang'])
- 				{
- 					// Fall back to the board default language
- 					$this->lang_name = basename($config['default_lang']);
- 					$this->set_lang($lang, $help, $lang_file, $use_db, $use_help);
- 				}

! 				// Reset the lang name
! 				$this->lang_name = (file_exists($this->lang_path . $this->data['user_lang'] . "/common.$phpEx")) ? $this->data['user_lang'] : basename($config['default_lang']);
! 				return;
! 			}			
! 			$include_result = (defined('DEBUG_EXTRA')) ?  "@" : ""; //Fix for mxp;  Do not suppress error if in DEBUG_EXTRA mode
! 			if (("$include_result".include $language_filename) === false)
  			{
  				if ((@include $phpbb_root_path . $language_filename) === false)
  				{
--- 2090,2098 ----
  				$language_filename = $this->lang_path . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx;
  			}

! 			//fix for mxp
! 			if ((@include $language_filename) === false)
  			{
+ 				//this will fix the path for anonymouse users
  				if ((@include $phpbb_root_path . $language_filename) === false)
  				{

Update of /cvsroot/mxbb/core/templates/_core/images/page_icons
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28990/templates/_core/images/page_icons

Modified Files:
	icon_computer.gif 
Log Message:
updates for phpBB3 backend and subsilver2 style

Index: icon_computer.gif
===================================================================
RCS file: /cvsroot/mxbb/core/templates/_core/images/page_icons/icon_computer.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsmCV9hd and /tmp/cvszFU9O3 differ

Update of /cvsroot/mxbb/core/includes/sessions/phpbb3
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28990/includes/sessions/phpbb3

Modified Files:
	constants.php session.php 
Log Message:
updates for phpBB3 backend and subsilver2 style

Index: constants.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/constants.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** constants.php	23 Apr 2010 19:39:53 -0000	1.6
--- constants.php	5 Jun 2013 14:05:59 -0000	1.7
***************
*** 235,237 ****
--- 235,241 ----
  // Additional tables

+ // Additional constants
+ @define('INHERIT_LANG_NONE', 0);
+ @define('INHERIT_LANG_EN', 1);
+ @define('INHERIT_LANG_DEFAULT', 2);
  ?>
\ No newline at end of file

Index: session.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/session.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** session.php	18 Apr 2013 01:56:40 -0000	1.48
--- session.php	5 Jun 2013 14:05:59 -0000	1.49
***************
*** 235,239 ****
--- 235,241 ----
  		$this->update_session_page	= $update_session_page;
  		$this->browser				= (!empty($_SERVER['HTTP_USER_AGENT'])) ? htmlspecialchars((string) $_SERVER['HTTP_USER_AGENT']) : '';
+ 		$this->referer				= (!empty($_SERVER['HTTP_REFERER'])) ? htmlspecialchars((string) $_SERVER['HTTP_REFERER']) : '';		
  		$this->forwarded_for		= (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) ? (string) $_SERVER['HTTP_X_FORWARDED_FOR'] : '';
+ 
  		$this->host					= (!empty($_SERVER['HTTP_HOST'])) ? (string) $_SERVER['HTTP_HOST'] : 'localhost';
  		$this->page					= $this->extract_current_page($phpbb_root_path);
***************
*** 242,255 ****
  		if ($board_config['forwarded_for_check'])
  		{
! 			$this->forwarded_for = preg_replace('#, +#', ', ', $this->forwarded_for);

  			// Whoa these look impressive!
  			// The code to generate the following two regular expressions which match valid IPv4/IPv6 addresses
  			// can be found in the develop directory
! 			$ipv4 = '#^(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$#';
! 			$ipv6 = '#^(?:(?:(?:[\dA-F]{1,4}:){6}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:::(?:[\dA-F]{1,4}:){5}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:):(?:[\dA-F]{1,4}:){4}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,2}:(?:[\dA-F]{1,4}:){3}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,3}:(?:[\dA-F]{1,4}:){2}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,4}:(?:[\dA-F]{1,4}:)(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,5}:(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,6}:[\dA-F]{1,4})|(?:(?:[\dA-F]{1,4}:){1,7}:))$#i';
! 
  			// split the list of IPs
! 			$ips = explode(', ', $this->forwarded_for);
  			foreach ($ips as $ip)
  			{
--- 244,257 ----
  		if ($board_config['forwarded_for_check'])
  		{
! 			$this->forwarded_for = preg_replace('#[ ]{2,}#', ' ', str_replace(array(',', ' '), ' ', $this->forwarded_for));

  			// Whoa these look impressive!
  			// The code to generate the following two regular expressions which match valid IPv4/IPv6 addresses
  			// can be found in the develop directory
! 			$ipv4 = phpBB3::get_preg_expression('ipv4'); //'#^(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$#';
! 			$ipv6 = phpBB3::get_preg_expression('ipv6'); //'#^(?:(?:(?:[\dA-F]{1,4}:){6}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:::(?:[\dA-F]{1,4}:){5}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:):(?:[\dA-F]{1,4}:){4}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,2}:(?:[\dA-F]{1,4}:){3}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,3}:(?:[\dA-F]{1,4}:){2}(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,4}:(?:[\dA-F]{1,4}:)(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,5}:(?:[\dA-F]{1,4}:[\dA-F]{1,4}|(?:(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.){3}(?:\d{1,2}|1\d\d|2[0-4]\d|25[0-5])))|(?:(?:[\dA-F]{1,4}:){1,6}:[\dA-F]{1,4})|(?:(?:[\dA-F]{1,4}:){1,7}:))$#i';
! 			
  			// split the list of IPs
! 			$ips = explode(' ', $this->forwarded_for);
  			foreach ($ips as $ip)
  			{
***************
*** 263,267 ****
  			}
  		}
! 
  		// Add forum to the page for tracking online users - also adding a "x" to the end to properly identify the number
  		$this->page['page'] .= (isset($_REQUEST['f'])) ? ((strpos($this->page['page'], '?') !== false) ? '&' : '?') . '_f_=' . (int) $_REQUEST['f'] . 'x' : '';
--- 265,273 ----
  			}
  		}
! 		else
! 		{
! 			$this->forwarded_for = '';
! 		}
! 		
  		// Add forum to the page for tracking online users - also adding a "x" to the end to properly identify the number
  		$this->page['page'] .= (isset($_REQUEST['f'])) ? ((strpos($this->page['page'], '?') !== false) ? '&' : '?') . '_f_=' . (int) $_REQUEST['f'] . 'x' : '';
***************
*** 295,298 ****
--- 301,336 ----
  		// it's pretty clear that in the majority of cases you'll at least be left with a proxy/cache ip.
  		$this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars($_SERVER['REMOTE_ADDR']) : '';
+ 		$this->ip = preg_replace('#[ ]{2,}#', ' ', str_replace(array(',', ' '), ' ', $this->ip));
+ 
+ 		// split the list of IPs
+ 		$ips = explode(' ', $this->ip);
+ 
+ 		// Default IP if REMOTE_ADDR is invalid
+ 		$this->ip = '127.0.0.1';
+ 
+ 		foreach ($ips as $ip)
+ 		{
+ 			// check IPv4 first, the IPv6 is hopefully only going to be used very seldomly
+ 			if (!empty($ip) && !preg_match(phpBB3::get_preg_expression('ipv4'), $ip) && !preg_match(phpBB3::get_preg_expression('ipv6'), $ip))
+ 			{
+ 				// Just break
+ 				break;
+ 			}
+ 
+ 			// Quick check for IPv4-mapped address in IPv6
+ 			if (stripos($ip, '::ffff:') === 0)
+ 			{
+ 				$ipv4 = substr($ip, 7);
+ 
+ 				if (preg_match(phpBB3::get_preg_expression('ipv4'), $ipv4))
+ 				{
+ 					$ip = $ipv4;
+ 				}
+ 			}
+ 
+ 			// Use the last in chain
+ 			$this->ip = $ip;
+ 		}
+ 		
  		$this->load = false;

***************
*** 346,350 ****
--- 384,399 ----
  				$s_forwarded_for = ($board_config['forwarded_for_check']) ? substr($this->data['session_forwarded_for'], 0, 254) : '';
  				$u_forwarded_for = ($board_config['forwarded_for_check']) ? substr($this->forwarded_for, 0, 254) : '';
+ 				
+ 				// referer checks
+ 				// The @ before $config['referer_validation'] suppresses notices present while running the updater
+ 				$check_referer_path = (@$board_config['referer_validation'] == REFERER_VALIDATE_PATH);
+ 				$referer_valid = true;

+ 				// we assume HEAD and TRACE to be foul play and thus only whitelist GET
+ 				if (@$board_config['referer_validation'] && isset($_SERVER['REQUEST_METHOD']) && strtolower($_SERVER['REQUEST_METHOD']) !== 'get')
+ 				{
+ 					$referer_valid = $this->validate_referer($check_referer_path);
+ 				}
+ 				
  				if ($u_ip === $s_ip && $s_browser === $u_browser && $s_forwarded_for === $u_forwarded_for)
  				{
***************
*** 398,406 ****
  							{
  								$sql_ary['session_page'] = substr($this->page['page'], 0, 199);
  							}

  							$sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
  								WHERE session_id = '" . $db->sql_escape($this->session_id) . "'";
! 							$db->sql_query($sql);
  						}

--- 447,476 ----
  							{
  								$sql_ary['session_page'] = substr($this->page['page'], 0, 199);
+ 								$sql_ary['session_forum_id'] = $this->page['forum']; //Added for phpBB 3.0.2 by Ory								
  							}

+ 							$db->sql_return_on_error(true);
+ 
  							$sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
  								WHERE session_id = '" . $db->sql_escape($this->session_id) . "'";
! 							$result = $db->sql_query($sql);
! 
! 							$db->sql_return_on_error(false);
! 
! 							// If the database is not yet updated, there will be an error due to the session_forum_id
! 							// @todo REMOVE for 3.0.2
! 							if ($result === false)
! 							{
! 								unset($sql_ary['session_forum_id']);
! 
! 								$sql = 'UPDATE ' . SESSIONS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . "
! 									WHERE session_id = '" . $db->sql_escape($this->session_id) . "'";
! 								$db->sql_query($sql);
! 							}
! 
! 							if ($this->data['user_id'] != ANONYMOUS && !empty($board_config['new_member_post_limit']) && $this->data['user_new'] && $board_config['new_member_post_limit'] <= $this->data['user_posts'])
! 							{
! 								$this->leave_newly_registered();
! 							}
  						}

***************
*** 417,421 ****
  					if (defined('DEBUG_EXTRA') && $this->data['user_id'] != ANONYMOUS)
  					{
! 						mx_add_log('critical', 'LOG_IP_BROWSER_FORWARDED_CHECK', $u_ip, $s_ip, $u_browser, $s_browser, htmlspecialchars($u_forwarded_for), htmlspecialchars($s_forwarded_for));
  					}
  				}
--- 487,498 ----
  					if (defined('DEBUG_EXTRA') && $this->data['user_id'] != ANONYMOUS)
  					{
! 						if ($referer_valid)
! 						{
! 							mx_add_log('critical', 'LOG_IP_BROWSER_FORWARDED_CHECK', $u_ip, $s_ip, $u_browser, $s_browser, htmlspecialchars($u_forwarded_for), htmlspecialchars($s_forwarded_for));
! 						}
! 						else
! 						{
! 							mx_add_log('critical', 'LOG_REFERER_INVALID', $this->referer);
! 						}
  					}
  				}
***************
*** 677,680 ****
--- 754,758 ----
  			'session_admin'			=> ($set_admin) ? 1 : 0,
  			'session_viewonline'	=> ($viewonline) ? 1 : 0,
+ 			'session_lang'			=> (string) $this->lang_name,			
  		);

***************
*** 785,789 ****
  			$method($this->data, $new_session);
  		}
! 
  		if ($this->data['user_id'] != ANONYMOUS)
  		{
--- 863,867 ----
  			$method($this->data, $new_session);
  		}
! 		//else
  		if ($this->data['user_id'] != ANONYMOUS)
  		{
***************
*** 1287,1290 ****
--- 1365,1424 ----
  		global $mx_request_vars, $portal_config; //added for mxp
  		global $lang; //added for mxp
+ 		
+ 		$session_lang = '';
+ 		
+ 		//Added here for reference and future implementation of a lang block in mx_coreblocks were board_config can be taken from portal_config
+ 		if ($board_config['lang_select_enable'] || $board_config['lang_click_enable'])
+ 		{
+ 			$session_lang_save = phpBB3::request_var('session_lang_save', false);
+ 			if (isset($session_lang_save) && $session_lang_save && $this->data['session_lang'])
+ 			{
+ 				$sql = 'UPDATE ' . USERS_TABLE . "
+ 					SET user_lang = '" . $this->data['session_lang'] . "'
+ 					WHERE user_id = " . $this->data['user_id'];
+ 				$db->sql_query($sql);
+ 			}
+ 
+ 			$session_lang_reset = phpBB3::request_var('session_lang_reset', false);
+ 			if (isset($session_lang_reset) && $session_lang_reset)
+ 			{
+ 				$session_lang = '';
+ 			}
+ 			else
+ 			{
+ 				$session_lang = phpBB3::request_var('session_lang', '');
+ 			}
+ 
+ 			if ((isset($session_lang) && $session_lang) || $session_lang_reset)
+ 			{
+ 				$sql = 'UPDATE ' . SESSIONS_TABLE . "
+ 					SET session_lang = '" . $session_lang . "'
+ 					WHERE session_id = '" . $this->session_id . "'";
+ 				$db->sql_query($sql);
+ 			}
+ 			elseif (isset($this->data['session_lang']) && $this->data['session_lang'])
+ 			{
+ 				$session_lang = $this->data['session_lang'];
+ 			}
+ 		}
+ 
+ 		if (($board_config['lang_select_enable'] || $board_config['lang_click_enable']) && isset($session_lang) && $session_lang)
+ 		{
+ 			$this->data['user_lang'] = $session_lang;
+ 			$this->lang_name = (file_exists($this->lang_path . $this->data['user_lang'] . "/common.$phpEx")) ? $this->data['user_lang'] : basename($this->encode_lang($this->lang['default_lang']));
+ 
+ 			if ($this->data['user_id'] != ANONYMOUS)
+ 			{
+ 				$this->date_format = $this->data['user_dateformat'];
+ 				$this->timezone = $this->data['user_timezone'] * 3600;
+ 				$this->dst = $this->data['user_dst'] * 3600;
+ 			}
+ 			else
+ 			{
+ 				$this->date_format = $board_config['default_dateformat'];
+ 				$this->timezone = $board_config['board_timezone'] * 3600;
+ 				$this->dst = $board_config['board_dst'] * 3600;
+ 			}
+ 		}		

  		$lang_set = !$lang_set ? (defined('IN_ADMIN') ? 'acp/common' : 'common') : $lang_set;
***************
*** 1306,1326 ****
  			$this->timezone = $board_config['board_timezone'] * 3600;
  			$this->dst = $board_config['board_dst'] * 3600;
! 		}

! 		if ((@include $this->lang_path . "common.$phpEx") === false)
  		{
- 			//this will fix the path for anonymouse users
  			if ((@include $phpbb_root_path . $this->lang_path . "common.$phpEx") === false)
  			{
! 				die('Language file ' . $this->lang_path . "common.$phpEx" . ' couldn\'t be opened.');
  			}
  		}
- 
- 		//
  		// We include common language file here to not load it every time a custom language file is included
- 		//
  		$this->add_lang($lang_set);
- 
  		unset($lang_set);
  	}
--- 1440,1524 ----
  			$this->timezone = $board_config['board_timezone'] * 3600;
  			$this->dst = $board_config['board_dst'] * 3600;
! 			
! 			/**
! 			* If a guest user is surfing, we try to guess his/her language first by obtaining the browser language
! 			* If re-enabled we need to make sure only those languages installed are checked
! 			* Commented out so we do not loose the code.
! 			* language checking added 2008-08-15 by Martin Truckenbrodt
! 			**/
! 			if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
! 			{
! 				$lang_iso_xx_yy = array();
! 				$lang_iso_xx = array();
! 				$accept_lang_xx_yy = array();
! 				$accept_lang_xx = array();

+ 				$sql = 'SELECT lang_iso FROM ' . LANG_TABLE;
+ 				$result = $db->sql_query($sql, 3600);

! 				while ($row = $db->sql_fetchrow($result))
! 				{
! 					if (file_exists($phpbb_root_path . 'language/' . $row['lang_iso'] . "/common.$phpEx"))
! 					{
! 						$lang_iso_xx_yy[] = $row['lang_iso'];
! 						if (strlen($row['lang_iso']) > 4)
! 						{
! 							$lang_iso_xx[$row['lang_iso']] = substr($row['lang_iso'], 0, 2);
! 						}
! 					}
! 				}
! 				$accept_lang_ary = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
! 
! 				foreach ($accept_lang_ary as $accept_lang)
! 				{
! 					// Set correct format ... guess full xx_yy form
! 					$accept_lang_xx_yy = basename(substr($accept_lang, 0, 2) . '_' . strtolower(substr($accept_lang, 3, 2)));
! 					// Set correct format ... guess only xx form
! 					$accept_lang_xx = basename(substr($accept_lang, 0, 2));
! 
! 					// browser xx-YY == board xx_yy and
! 					// browser xx == board xx
! 					if (in_array($accept_lang_xx_yy, $lang_iso_xx_yy))
! 					{
! 						$this->lang_name = $board_config['default_lang'] = $accept_lang_xx_yy;
! 						break;
! 					}
! 					// browser xx-YY => xx == board xx
! 					else if (in_array($accept_lang_xx, $lang_iso_xx_yy))
! 					{
! 						$this->lang_name = $board_config['default_lang'] = $accept_lang_xx;
! 						break;
! 					}
! 					// browser xx == board xx_yy => xx
! 					else if (in_array($accept_lang_xx, $lang_iso_xx) && $lang_iso_xx != '')
! 					{
! 						$this->lang_name = $board_config['default_lang'] = array_search($accept_lang_xx, $lang_iso_xx);
! 						break;
! 					}
! 					// board default language
! 					else
! 					{
! 						$this->lang_name = (file_exists($phpbb_root_path . 'language/' . $this->encode_lang($this->lang['default_lang']) . "/common.$phpEx")) ? $this->encode_lang($this->lang['default_lang']) : 'en';
! 					}
! 				}
! 				$this->data['user_lang'] = $this->lang_name;
! 			}
! 			/*			
! 			*/			
! 		}
! 		
! 		/* We include common language file here to not load it every time a custom language file is included
! 		$lang = &$this->lang;
! 		*/
! 		$include_result = (defined('DEBUG_EXTRA')) ?  "" : "@"; // Do not suppress error if in DEBUG_EXTRA mode
! 		if (("$include_result".include $this->lang_path . "common.$phpEx") === false)
  		{
  			if ((@include $phpbb_root_path . $this->lang_path . "common.$phpEx") === false)
  			{
! 				die('Language file ' . $this->lang_path . "common.$phpEx" . ' couldn\'t be opened.'); //this will fix the path for anonymouse users
  			}
  		}
  		// We include common language file here to not load it every time a custom language file is included
  		$this->add_lang($lang_set);
  		unset($lang_set);
  	}
***************
*** 1839,1847 ****
  				$language_filename = $this->lang_path . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx;
  			}

! 			//fix for mxp
! 			if ((@include $language_filename) === false)
  			{
- 				//this will fix the path for anonymouse users
  				if ((@include $phpbb_root_path . $language_filename) === false)
  				{
--- 2037,2071 ----
  				$language_filename = $this->lang_path . (($use_help) ? 'help_' : '') . $lang_file . '.' . $phpEx;
  			}
+ 			
+ 			if (!file_exists($language_filename))
+ 			{
+ 				global $config;

! 				if ($this->lang_name == 'en')
! 				{
! 					// The user's selected language is missing the file, the board default's language is missing the file, and the file doesn't exist in /en.
! 					$language_filename = str_replace($this->lang_path . 'en', $this->lang_path . $this->data['user_lang'], $language_filename);
! 					$include_result = (defined('DEBUG_EXTRA')) ?  trigger_error('Language file ' . $language_filename . ' couldn\'t be opened.', E_USER_ERROR) : ""; // Do not suppress error if in DEBUG_EXTRA mode		
! 				}
! 				else if ($this->lang_name == basename($config['default_lang']))
! 				{
! 					// Fall back to the English Language
! 					$this->lang_name = 'en';
! 					$this->set_lang($lang, $help, $lang_file, $use_db, $use_help);
! 				}
! 				else if ($this->lang_name == $this->data['user_lang'])
! 				{
! 					// Fall back to the board default language
! 					$this->lang_name = basename($config['default_lang']);
! 					$this->set_lang($lang, $help, $lang_file, $use_db, $use_help);
! 				}
! 
! 				// Reset the lang name
! 				$this->lang_name = (file_exists($this->lang_path . $this->data['user_lang'] . "/common.$phpEx")) ? $this->data['user_lang'] : basename($config['default_lang']);
! 				return;
! 			}			
! 			$include_result = (defined('DEBUG_EXTRA')) ?  "@" : ""; //Fix for mxp;  Do not suppress error if in DEBUG_EXTRA mode
! 			if (("$include_result".include $language_filename) === false)
  			{
  				if ((@include $phpbb_root_path . $language_filename) === false)
  				{

Update of /cvsroot/mxbb/core
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28990

Modified Files:
	common.php 
Log Message:
updates for phpBB3 backend and subsilver2 style

Index: common.php
===================================================================
RCS file: /cvsroot/mxbb/core/common.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** common.php	27 Jul 2011 19:44:58 -0000	1.115
--- common.php	5 Jun 2013 14:05:57 -0000	1.116
***************
*** 127,131 ****
  else
  {
! 	set_magic_quotes_runtime(0);

  	// Be paranoid with passed vars
--- 127,131 ----
  else
  {
! 	@set_magic_quotes_runtime(0);

  	// Be paranoid with passed vars

Update of /cvsroot/mxbb/core/templates/subsilver2/images/page_icons
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28990/templates/subsilver2/images/page_icons

Added Files:
	icon_about.gif icon_angel.gif icon_announcement.gif 
	icon_bible.gif icon_blog.gif icon_book.gif icon_calendar.gif 
	icon_calendar2.gif icon_cart.gif icon_cd.gif 
	icon_cellphone.gif icon_chat.gif icon_chatbox.gif 
	icon_circel.gif icon_clock.gif icon_computer.gif 
	icon_develope.gif icon_dj.gif icon_dl.gif icon_dl2.gif 
	icon_doc.gif icon_docs.gif icon_docs2.gif icon_download.gif 
	icon_drink.gif icon_edit.gif icon_explorer.gif icon_faq.gif 
	icon_find.gif icon_fm.gif icon_forbidden.gif icon_forum.gif 
	icon_forum3.gif icon_gallery.gif icon_gallery2.gif 
	icon_game.gif icon_game2.gif icon_game3.gif icon_games.gif 
	icon_groups.gif icon_guestbook.gif icon_help.gif icon_home.gif 
	icon_home2.gif icon_home3.gif icon_house.gif icon_icon.gif 
	icon_info.gif icon_jpg.gif icon_links.gif icon_list.gif 
	icon_list2.gif icon_lock.gif icon_login.gif 
	icon_loudspeaker.gif icon_mail.gif icon_mail2.gif 
	icon_mail4.gif icon_mark.gif icon_members.gif icon_misc.gif 
	icon_movie.gif icon_movie2.gif icon_movie3.gif icon_movie4.gif 
	icon_mp3.gif icon_musik.gif icon_mydoc.gif icon_news.gif 
	icon_paper.gif icon_paper_album.gif icon_paper_doc.gif 
	icon_paper_help.gif icon_paper_notify.gif icon_pdf.gif 
	icon_phone.gif icon_plus.gif icon_post.gif icon_print.gif 
	icon_profile.gif icon_profile2.gif icon_profile_boy.gif 
	icon_profile_headset.gif icon_profile_music.gif 
	icon_promote.gif icon_prospects.gif icon_protections.gif 
	icon_radio.gif icon_rate.gif icon_register.gif 
	icon_restore.gif icon_save.gif icon_saveall.gif icon_scate.gif 
	icon_search.gif icon_select.gif icon_select2.gif 
	icon_settings.gif icon_smilie.gif icon_smilie2.gif 
	icon_smilie3.gif icon_sponsors.gif icon_statistics.gif 
	icon_stats.gif icon_stats2.gif icon_stop.gif icon_theme.gif 
	icon_theme2.gif icon_transfer.gif icon_trash.gif icon_tv.gif 
	icon_url.gif icon_weather.gif icon_weblinks.gif icon_zip.gif 
	icon_zipdisc.gif nav_about_us.gif nav_announcement.gif 
	nav_bible.gif nav_calendar.gif nav_chatbox.gif 
	nav_develope.gif nav_download.gif nav_ekklesia.gif 
	nav_email.gif nav_email2.gif nav_explorer.gif nav_forum.gif 
	nav_guestbook.gif nav_help.gif nav_home.gif nav_info.gif 
	nav_login.gif nav_members.gif nav_musik.gif nav_mydoc.gif 
	nav_news.gif nav_profile.gif nav_promote.gif nav_radio.gif 
	nav_rate.gif nav_register.gif nav_search.gif nav_settings.gif 
	nav_sponsors.gif nav_statistics.gif nav_theme.gif 
	nav_theme2.gif nav_weblinks.gif plus.gif spacer.gif 
	thumb_globe.gif thumb_news.gif 
Log Message:
updates for phpBB3 backend and subsilver2 style

--- NEW FILE: icon_tv.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_weblinks.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_chatbox.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_search.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_forbidden.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_members.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_scate.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_info.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_smilie.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_profile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_transfer.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_explorer.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_links.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_profile_headset.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_home.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: spacer.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_mark.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_movie3.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_theme2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_sponsors.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_trash.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_weblinks.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_calendar2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_bible.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_forum.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_statistics.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_mail2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_find.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_zip.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_chat.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_register.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_blog.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_stats.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_profile_boy.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_about_us.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_promote.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_icon.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_url.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_musik.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_select.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_download.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_theme.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_search.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_paper_help.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_email.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_radio.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_login.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_pdf.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_save.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_info.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_help.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_cd.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_members.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_lock.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_mp3.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_guestbook.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_stats2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_radio.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_sponsors.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_doc.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_smilie3.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_angel.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_groups.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_about.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_loudspeaker.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_edit.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_settings.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_rate.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_smilie2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_forum3.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_protections.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_develope.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_cellphone.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_drink.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_book.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_docs2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_register.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_games.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_restore.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_ekklesia.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_zipdisc.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_movie.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_announcement.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: plus.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_profile2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_prospects.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_house.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_jpg.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_announcement.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_saveall.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_theme2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_home2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_weather.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_settings.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_faq.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_misc.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_theme.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_plus.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_mydoc.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: thumb_globe.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_gallery2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_docs.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: thumb_news.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_mail4.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_list.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_calendar.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_promote.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_rate.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_game.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_login.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_movie4.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_home3.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_movie2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_develope.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_paper_album.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_paper_notify.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_print.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_profile_music.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_paper.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_dl.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_download.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_game2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_mail.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_guestbook.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_fm.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_home.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_computer.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_help.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_email2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_game3.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_news.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_dl2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_cart.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_circel.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_calendar.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_phone.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_profile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_post.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_explorer.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_stop.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_musik.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_gallery.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_chatbox.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_paper_doc.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_select2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_statistics.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_dj.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_forum.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_bible.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_list2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_news.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_clock.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_mydoc.gif ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/mxbb/core/templates/subsilver2/images/menu_icons
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28990/templates/subsilver2/images/menu_icons

Added Files:
	icon_about_us.gif icon_about_us_hot.gif icon_bg.gif 
	icon_bg_hot.gif icon_blank.gif icon_blank_hot.gif 
	icon_blog.gif icon_blog_hot.gif icon_book.gif 
	icon_book_hot.gif icon_calendar.gif icon_calendar_hot.gif 
	icon_cart.gif icon_cart_hot.gif icon_cd.gif icon_cd_hot.gif 
	icon_cellphone.gif icon_cellphone_hot.gif icon_chat.gif 
	icon_chat_hot.gif icon_chatbox2.gif icon_chatbox2_hot.gif 
	icon_clock.gif icon_clock_hot.gif icon_computer.gif 
	icon_computer_hot.gif icon_contact.gif icon_contact_hot.gif 
	icon_cut.gif icon_cut_hot.gif icon_day.gif icon_day_hot.gif 
	icon_delete.gif icon_delete_hot.gif icon_dev.gif 
	icon_dev_hot.gif icon_dl.gif icon_dl_hot.gif icon_doc.gif 
	icon_doc_hot.gif icon_docmic.gif icon_docmic_hot.gif 
	icon_docs.gif icon_docs_hot.gif icon_dot.gif icon_dot_hot.gif 
	icon_education.gif icon_education_hot.gif icon_ekklesia.gif 
	icon_ekklesia_hot.gif icon_exit.gif icon_exit_hot.gif 
	icon_faq.gif icon_faq_hot.gif icon_feed.gif icon_flag.gif 
	icon_flag_hot.gif icon_fm.gif icon_fm_hot.gif icon_folder.gif 
	icon_folder_hot.gif icon_food.gif icon_food_hot.gif 
	icon_forbidden.gif icon_forbidden_hot.gif icon_forum.gif 
	icon_forum_hot.gif icon_gallery.gif icon_gallery_hot.gif 
	icon_game.gif icon_game_hot.gif icon_groups.gif 
	icon_groups_hot.gif icon_guestbook.gif icon_guestbook_hot.gif 
	icon_happy.gif icon_happy_hot.gif icon_help.gif icon_help2.gif 
	icon_help2_hot.gif icon_help_hot.gif icon_home.gif 
	icon_home_hot.gif icon_house.gif icon_house_hot.gif 
	icon_info.gif icon_info_hot.gif icon_ipod.gif 
	icon_ipod_hot.gif icon_key.gif icon_key_hot.gif icon_left.gif 
	icon_left_hot.gif icon_link.gif icon_link_hot.gif 
	icon_links.gif icon_links_hot.gif icon_list.gif 
	icon_list_hot.gif icon_livefm.gif icon_livefm_hot.gif 
	icon_lock.gif icon_lock_hot.gif icon_login.gif 
	icon_login_hot.gif icon_mail.gif icon_mail_hot.gif 
	icon_map.gif icon_map_hot.gif icon_members.gif 
	icon_members_hot.gif icon_message.gif icon_message_hot.gif 
	icon_minus.gif icon_minus_hot.gif icon_movie.gif 
	icon_movie_hot.gif icon_mp3.gif icon_mp3_hot.gif 
	icon_music.gif icon_music_hot.gif icon_notify.gif 
	icon_notify_hot.gif icon_pay.gif icon_pay_hot.gif 
	icon_phone.gif icon_phone_hot.gif icon_plus.gif 
	icon_plus_hot.gif icon_post.gif icon_post_hot.gif 
	icon_posts.gif icon_posts_hot.gif icon_print.gif 
	icon_print_hot.gif icon_profile.gif icon_profile_hot.gif 
	icon_promote.gif icon_promote_hot.gif icon_radio.gif 
	icon_radio_hot.gif icon_register.gif icon_register_hot.gif 
	icon_reply.gif icon_reply_hot.gif icon_right.gif 
	icon_right_hot.gif icon_sad.gif icon_sad_hot.gif icon_save.gif 
	icon_save_hot.gif icon_search.gif icon_search_hot.gif 
	icon_select.gif icon_select_hot.gif icon_smilie.gif 
	icon_smilie_hot.gif icon_sponsors.gif icon_sponsors_hot.gif 
	icon_star.gif icon_star_hot.gif icon_stats.gif 
	icon_stats_hot.gif icon_theme.gif icon_theme_hot.gif 
	icon_trash.gif icon_trash_hot.gif icon_tv.gif icon_tv_hot.gif 
	icon_unlock.gif icon_unlock_hot.gif icon_upload.gif 
	icon_upload_hot.gif icon_url.gif icon_url_hot.gif 
	icon_user.gif icon_user_hot.gif icon_wallpapers.gif 
	icon_wallpapers_hot.gif icon_weather.gif icon_weather_hot.gif 
	icon_zoom_in.gif icon_zoom_in_hot.gif icon_zoom_out.gif 
	icon_zoom_out_hot.gif icons_stats.gif icons_stats_hot.gif 
	movie.gif new.gif smilie.gif spacer.gif under_konst.gif 
	update.gif 
Log Message:
updates for phpBB3 backend and subsilver2 style

--- NEW FILE: icon_info_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_wallpapers.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_music.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_mail_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_folder.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_tv.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_livefm_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_save_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icons_stats_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_select.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_message_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_docs.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_ipod_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_dl_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_clock_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_trash_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_info.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_wallpapers_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_help.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_fm_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_phone_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_profile.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: new.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_docmic.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_star.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_bg_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_links.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icons_stats.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: update.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_home.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_ekklesia.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: spacer.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_happy.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_search_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_ekklesia_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_home_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_sponsors.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_trash.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_unlock.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_delete_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_book_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_docs_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_list.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_day_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_bg.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_unlock_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_zoom_in.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_movie_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_reply.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_cd_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_chat.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_education.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_chat_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_forum.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_stats.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_house.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_url.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_promote.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_cellphone_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_sponsors_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_search.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_theme.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_blog.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_zoom_in_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_minus_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_radio.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_login.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_cart_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_save.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_contact_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_forbidden.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_cd.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_members.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_select_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_lock.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_cut_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_mp3.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_chatbox2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_guestbook.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_theme_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: movie.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_blank_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_happy_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_sad_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_login_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_house_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_groups.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_doc_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_ipod.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_movie.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_cut.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_members_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_user_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_cellphone.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: under_konst.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_game_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_food_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_book.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_register.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_about_us_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_radio_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_pay_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_docmic_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_tv_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_upload_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_computer_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_blog_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_education_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_sad.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_plus_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_smilie.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_doc.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_stats_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_links_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_weather.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_link.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_groups_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_user.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_minus.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_contact.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_dev.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_help2.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_faq_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_pay.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_chatbox2_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_folder_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_link_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_map.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_feed.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_plus.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_gallery_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_map_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_delete.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_promote_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_dev_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_exit.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_help_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_upload.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_profile_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_day.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_calendar.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_flag.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_list_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_forbidden_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_print_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_message.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_about_us.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_lock_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_register_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_faq.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_print.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_food.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_url_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_star_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_dl.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_posts_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_zoom_out.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_mail.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_right.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_zoom_out_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_fm.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_computer.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_right_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_forum_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_flag_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_calendar_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_dot_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_livefm.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_cart.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_blank.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_exit_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_reply_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_help2_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_key.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_phone.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_post.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_weather_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_guestbook_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_post_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_notify.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_music_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_smilie_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_gallery.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_mp3_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_notify_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_game.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_left.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_key_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_posts.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: smilie.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_left_hot.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_clock.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_dot.gif ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/mxbb/core/templates/subsilver2/images/admin_icons
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28990/templates/subsilver2/images/admin_icons

Added Files:
	2105.gif contract.gif expand.gif icon_block.gif icon_dot.gif 
	icon_edit.gif icon_function.gif icon_module.gif icon_page.gif 
	icon_page_column.gif icon_parameter.gif icon_parameter_20.gif 
	icon_search.gif nav_menu.gif script.gif 
Log Message:
updates for phpBB3 backend and subsilver2 style

--- NEW FILE: icon_page_column.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_function.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_parameter_20.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_block.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_edit.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: expand.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: nav_menu.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: 2105.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_module.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: script.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_search.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: contract.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_parameter.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_page.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_dot.gif ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/mxbb/core/templates/subsilver2/images/admin_icons
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28896/admin_icons

Log Message:
Directory /cvsroot/mxbb/core/templates/subsilver2/images/admin_icons added to the repository

Update of /cvsroot/mxbb/core/templates/subsilver2/images
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28885/images

Log Message:
Directory /cvsroot/mxbb/core/templates/subsilver2/images added to the repository

Update of /cvsroot/mxbb/core/templates/prosilver/images/menu_icons
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3189

Modified Files:
	icon_calendar.gif 
Log Message:

Index: icon_calendar.gif
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/images/menu_icons/icon_calendar.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsyaLYbL and /tmp/cvs4wRmrd differ

Update of /cvsroot/mxbb/core/templates/_core/images/menu_icons
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1483/menu_icons

Added Files:
	icon_weather.gif icon_weather_hot.gif 
Log Message:
navigation menu upgrade to v3

--- NEW FILE: icon_weather.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon_weather_hot.gif ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/mxbb/core/templates/_core/images/page_icons
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1483/page_icons

Added Files:
	icon_weather.gif 
Log Message:
navigation menu upgrade to v3

--- NEW FILE: icon_weather.gif ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/mxbb/core/templates/prosilver/images/menu_icons
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1458/menu_icons

Modified Files:
	icon_calendar.gif icon_fm.gif icon_theme.gif icon_user.gif 
Added Files:
	icon_weather.gif 
Log Message:
navigation menu upgrade to v3

Index: icon_calendar.gif
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/images/menu_icons/icon_calendar.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsak0xlL and /tmp/cvsmPhFqi differ

Index: icon_user.gif
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/images/menu_icons/icon_user.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsfUCd3L and /tmp/cvsnjyG9i differ

Index: icon_theme.gif
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/images/menu_icons/icon_theme.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsd2WTwO and /tmp/cvshWdHEl differ

Index: icon_fm.gif
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/images/menu_icons/icon_fm.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsKoUYIN and /tmp/cvsPGytSk differ

--- NEW FILE: icon_weather.gif ---
(This appears to be a binary file; contents omitted.)

Update of /cvsroot/mxbb/core/modules/mx_navmenu
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9932

Modified Files:
	mx_menu_nav.php mx_site_nav.php 
Log Message:
navigation menu upgrade to v3

Index: mx_menu_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** mx_menu_nav.php	29 Dec 2011 05:51:52 -0000	1.37
--- mx_menu_nav.php	2 Jun 2013 12:56:34 -0000	1.38
***************
*** 30,34 ****
  // Setup config parameters
  //
! $config_name = array('menu_custom_tpl', 'menu_display_mode');

  for( $i = 0; $i < count($config_name); $i++ )
--- 30,34 ----
  // Setup config parameters
  //
! $config_name = array('menu_display_style', 'menu_display_mode', 'menu_page_sync', 'menu_page_parent', 'menu_custom_tpl');

  for( $i = 0; $i < count($config_name); $i++ )
***************
*** 41,46 ****
--- 41,55 ----
  // Define some parameters
  //
+ /*
+ $menu_display_style = 'Overall_navigation';
+ $menu_display_mode == 'Horizontal';
+ $menu_page_sync = true;
+ */
  $menu_custom_tpl = $mx_menu_config['menu_custom_tpl'];
+ $menu_display_style = $mx_menu_config['menu_display_style'];
  $menu_display_mode = $mx_menu_config['menu_display_mode'];
+ $menu_page_sync = ( $mx_menu_config['menu_page_sync'] != 'No' );
+ 
+ $page_parent = !empty($mx_menu_config['menu_page_parent']) ? $mx_menu_config['menu_page_parent'] : 0;

  //
***************
*** 49,52 ****
--- 58,62 ----
  //
  $nav_def_key = 'MX_NAV_MENU_' . $block_id;
+ 
  if ( defined($nav_def_key) )
  {
***************
*** 65,71 ****
  if (!empty($menu_custom_tpl) && !in_array($menu_custom_tpl, array('Classic','Advanced','Simple_CSS_menu','Advanced_CSS_menu','Overall_navigation')))
  {
! 	$template_tmp = $menu_custom_tpl;
  	$template_tmp_path = str_replace(strrchr($template_tmp, '/'), '', $template_tmp) . '/';
! 	$kick_js = file_exists($mx_root_path . $module_root_path . 'templates/' .$mx_user->template_names[$module_root_path] . $template_tmp_path) ? ($menu_display_mode == 'Horizontal' ? 'horizontal' : 'vertical') : '';
  	if (!empty($kick_js))
  	{
--- 75,81 ----
  if (!empty($menu_custom_tpl) && !in_array($menu_custom_tpl, array('Classic','Advanced','Simple_CSS_menu','Advanced_CSS_menu','Overall_navigation')))
  {
! 	$template_tmp = array('body' => $menu_custom_tpl);
  	$template_tmp_path = str_replace(strrchr($template_tmp, '/'), '', $template_tmp) . '/';
! 	$kick_js = @file_exists($mx_root_path . $module_root_path . 'templates/' .$mx_user->template_names[$module_root_path] . $template_tmp_path) ? ($menu_display_mode == 'Horizontal' ? 'horizontal' : 'vertical') : '';
  	if (!empty($kick_js))
  	{
***************
*** 75,96 ****
  else
  {
! 	switch( $menu_display_mode )
  	{
! 		case 'Horizontal':
! 			$template_tmp = "mx_menu_horizontal.$tplEx";
  			break;
! 		case 'Vertical':
! 			$template_tmp = "mx_menu_vertical.$tplEx";
  			break;
! 		case 'Overall_navigation':
! 			$template_tmp = "mx_menu_overall_navigation.$tplEx";
  			break;
  		default:
! 			$template_tmp = "mx_menu_vertical.$tplEx";
  			break;
  	}
  }

! $template->set_filenames(array('body' => $template_tmp));

  //
--- 85,131 ----
  else
  {
! 	switch( $menu_display_style )
  	{
! 		case 'Classic':
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl');
  			break;
! 		case 'Advanced':
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_hor.tpl') : array('body' => 'mx_menu_advanced_ver.tpl');
! 			$kick_js = $menu_display_mode == 'Horizontal' ? 'adv_hor.js' : 'adv_ver.js';
! 			$mx_page->add_footer_text( 'includes/js/' . $kick_js, true );
  			break;
! 		case 'Simple_CSS_menu':
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_CSS_hor.tpl') : array('body' => 'mx_menu_simple_CSS_ver.tpl');
! 			$kick_js = $menu_display_mode == 'Horizontal' ? 'simple_CSS_hor.js' : 'simple_CSS_ver.js';
! 			$mx_page->add_footer_text( 'includes/js/' . $kick_js, true );
! 			break;
! 		case 'Advanced_CSS_menu':
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_CSS_hor.tpl') : array('body' => 'mx_menu_advanced_CSS_ver.tpl');
! 			$kick_js = $menu_display_mode == 'Horizontal' ? 'adv_CSS_hor.js' : 'adv_CSS_ver.js';
! 			$mx_page->add_footer_text( 'includes/js/' . $kick_js, true );
  			break;
+ 		case 'Simple_x':
+ 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_x_hor.tpl') : array('body' => 'mx_menu_simple_x_ver.tpl');
+ 			break;			
+ 		case 'Overall_navigation':
+ 			$template_tmp = array('body' => 'mx_menu_overall_standard.tpl');
+ 			break;			
  		default:
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl');
  			break;
  	}
+ 	
+ 	switch( $menu_display_mode )
+ 	{
+ 		case 'Overall_navigation':
+ 			$template_tmp = array('body' => "mx_menu_overall_standard.$tplEx");
+ 			break;
+ 		default:
+ 			$template_tmp = $template_tmp;
+ 			break;
+ 	}	
  }

! $template->set_filenames($template_tmp);

  //
***************
*** 117,121 ****
  	//
  	// Check if this Category contains any authorized menus, or any at all
- 	//
  	$menuIsCat = false;
  	foreach($catData as $key => $menuData)
--- 152,155 ----
***************
*** 164,175 ****
  		continue;
  	}
! 
  	$cat_title = $catData[0]['cat_title'];
- 	global $mx_bbcode;
- 
  	$cat = ( !empty($lang[$cat_title]) ? $lang[$cat_title] : $cat_title );
! 	$bbcode_uid = $catData[0]['bbcode_uid'];
! 	$cat = $mx_bbcode->decode($cat, $bbcode_uid, false);
! 
  	$cat_desc = '';
  	$cat_desc = $catData[0]['cat_desc'];
--- 198,215 ----
  		continue;
  	}
! 	// Define the global bbcode bitfield, will be used to load bbcodes
! 	$bbcode_uid = $catData[0]['bbcode_uid'];
! 	$bbcode_bitfield = 'cA==';	
! 	//$bbcode_bitfield = $bbcode_bitfield | base64_decode($catData[0]['bbcode_bitfield']);	
! 	// Instantiate BBCode if need be
! 	if ($bbcode_bitfield !== '')
! 	{
! 		$mx_bbcode = new mx_bbcode(base64_encode($bbcode_bitfield));
! 	}
! 	//$depth = 0;
  	$cat_title = $catData[0]['cat_title'];
  	$cat = ( !empty($lang[$cat_title]) ? $lang[$cat_title] : $cat_title );
! 	$cat = $mx_bbcode->decode($cat, $bbcode_uid, false, $bbcode_bitfield);
! 	
  	$cat_desc = '';
  	$cat_desc = $catData[0]['cat_desc'];
***************
*** 239,243 ****
  	//
  	// Loop through each menu in this category
- 	//
  	$first_menu = true;
  	foreach($catData as $key => $menuData)
--- 279,282 ----
***************
*** 353,356 ****
--- 392,396 ----
  	}
  }
+ //generate_site_menu($page_parent);

  $cat_width = $num_of_cats > 0 ? ceil(100 / $num_of_cats) . '%' : '100%';

Index: mx_site_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_site_nav.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** mx_site_nav.php	2 Jun 2013 09:40:19 -0000	1.11
--- mx_site_nav.php	2 Jun 2013 12:56:34 -0000	1.12
***************
*** 46,52 ****
  $menu_page_sync = true;
  */
- //
- // Define some parameters
- //
  $menu_custom_tpl = $mx_menu_config['menu_custom_tpl'];
  $menu_display_style = $mx_menu_config['menu_display_style'];
--- 46,49 ----
***************
*** 74,77 ****
--- 71,75 ----
  //
  $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);
+ $virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, '');

  if (!empty($menu_custom_tpl))
***************
*** 121,125 ****
  	{
  		case 'Overall_navigation':
! 			$template_tmp = array('body' => 'mx_menu_overall_standard.tpl');
  			break;
  		default:
--- 119,123 ----
  	{
  		case 'Overall_navigation':
! 			$template_tmp = array('body' => "mx_menu_overall_standard.$tplEx");
  			break;
  		default:
***************
*** 147,150 ****
--- 145,149 ----
  	'U_PHPBB_ROOT_PATH' 	=> PHPBB_URL,
  	'TEMPLATE_ROOT_PATH'	=> TEMPLATE_ROOT_PATH,
+ 	

  	//

Update of /cvsroot/mxbb/core/includes/sessions/phpbb3
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9912

Modified Files:
	bbcode.php 
Log Message:
navigation menu upgrade to v3

Index: bbcode.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/bbcode.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** bbcode.php	26 Apr 2013 14:14:17 -0000	1.13
--- bbcode.php	2 Jun 2013 12:56:25 -0000	1.14
***************
*** 1678,1682 ****
  	{
  		global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page;
! 		
  		if (!$mytext)
  		{
--- 1678,1682 ----
  	{
  		global $mx_root_path, $phpbb_root_path, $phpEx, $mx_page;
! 	
  		if (!$mytext)
  		{
***************
*** 1690,1700 ****
  		$bbcode_bitfield = ($bbcode_bitfield && (strlen($bbcode_bitfield) < 2)) ? false : $bbcode_bitfield;

! 		if ($bbcode_uid)
  		{
  			$mytext = $this->bbencode_second_pass($mytext, $bbcode_uid, $bbcode_bitfield);
  		}

! 		$mytext = str_replace(array("\n", "\r"), array('<br />', "\n"), $mytext);		
! 		$mytext = bbcode_nl2br($mytext);

  		//$mytext = smiley_text($mytext, !($flags & OPTION_FLAG_SMILIES));		
--- 1690,1700 ----
  		$bbcode_bitfield = ($bbcode_bitfield && (strlen($bbcode_bitfield) < 2)) ? false : $bbcode_bitfield;

! 		if (!empty($bbcode_uid))
  		{
  			$mytext = $this->bbencode_second_pass($mytext, $bbcode_uid, $bbcode_bitfield);
  		}

! 		$mytext = str_replace(array("\n", "\r"), array('<br />', "\n"), $mytext);			
! 		$mytext = $this->bbcode_nl2br($mytext);

  		//$mytext = smiley_text($mytext, !($flags & OPTION_FLAG_SMILIES));		
***************
*** 1707,1713 ****
  			$mytext = $this->smilies_pass($mytext);
  		}
! 		
  		//$mytext = str_replace("\n", "\n<br />\n", $mytext);
! 		
  		if ($mytext != '')
  		{
--- 1707,1713 ----
  			$mytext = $this->smilies_pass($mytext);
  		}
! 	
  		//$mytext = str_replace("\n", "\n<br />\n", $mytext);
! 	
  		if ($mytext != '')
  		{

Update of /cvsroot/mxbb/core/modules/mx_navmenu
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31140

Modified Files:
	mx_site_nav.php mx_site_nav2.php 
Log Message:
navigation menu upgrade to v3

Index: mx_site_nav2.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_site_nav2.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_site_nav2.php	21 Oct 2012 00:04:11 -0000	1.1
--- mx_site_nav2.php	2 Jun 2013 09:40:19 -0000	1.2
***************
*** 4,8 ****
  * @package MX-Publisher Module - mx_navmenu
  * @version $Id$
! * @copyright (c) 2002-2006 [Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  * @link http://www.mx-publisher.com
--- 4,8 ----
  * @package MX-Publisher Module - mx_navmenu
  * @version $Id$
! * @copyright (c) 2002-2008 [Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  * @link http://www.mx-publisher.com
***************
*** 30,34 ****
  // Setup config parameters
  //
! $config_name = array('menu_display_style', 'menu_display_mode', 'menu_page_sync', 'menu_page_parent', 'menu_custom_tpl');

  for( $i = 0; $i < count($config_name); $i++ )
--- 30,34 ----
  // Setup config parameters
  //
! $config_name = array('menu_custom_tpl', 'menu_display_mode', 'menu_page_parent');

  for( $i = 0; $i < count($config_name); $i++ )
***************
*** 41,57 ****
  // Define some parameters
  //
- /*
- $menu_display_style = 'Overall_navigation';
- $menu_display_mode == 'Horizontal';
- $menu_page_sync = true;
- */
- //
- // Define some parameters
- //
  $menu_custom_tpl = $mx_menu_config['menu_custom_tpl'];
- $menu_display_style = $mx_menu_config['menu_display_style'];
  $menu_display_mode = $mx_menu_config['menu_display_mode'];
- $menu_page_sync = ( $mx_menu_config['menu_page_sync'] != 'No' );
- 
  $page_parent = !empty($mx_menu_config['menu_page_parent']) ? $mx_menu_config['menu_page_parent'] : 0;

--- 41,46 ----
***************
*** 61,65 ****
  //
  $nav_def_key = 'MX_SITE_MENU_' . $block_id;
- 
  if ( defined($nav_def_key) )
  {
--- 50,53 ----
***************
*** 74,117 ****
  //
  $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);

! if (!empty($menu_custom_tpl))
  {
! 	$template_tmp = array('body' => $menu_custom_tpl);
  }
  else
  {
! 	switch( $menu_display_style )
  	{
! 		case 'Classic':
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl');
! 			break;
! 		case 'Advanced':
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_hor.tpl') : array('body' => 'mx_menu_advanced_ver.tpl');
! 			$kick_js = $menu_display_mode == 'Horizontal' ? 'adv_hor.js' : 'adv_ver.js';
! 			$mx_page->add_footer_text( 'includes/js/' . $kick_js, true );
! 			break;
! 		case 'Simple_CSS_menu':
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_CSS_hor.tpl') : array('body' => 'mx_menu_simple_CSS_ver.tpl');
! 			$kick_js = $menu_display_mode == 'Horizontal' ? 'simple_CSS_hor.js' : 'simple_CSS_ver.js';
! 			$mx_page->add_footer_text( 'includes/js/' . $kick_js, true );
! 			break;
! 		case 'Advanced_CSS_menu':
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_CSS_hor.tpl') : array('body' => 'mx_menu_advanced_CSS_ver.tpl');
! 			$kick_js = $menu_display_mode == 'Horizontal' ? 'adv_CSS_hor.js' : 'adv_CSS_ver.js';
! 			$mx_page->add_footer_text( 'includes/js/' . $kick_js, true );
  			break;
! 		case 'Simple_x':
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_x_hor.tpl') : array('body' => 'mx_menu_simple_x_ver.tpl');
  			break;
  		case 'Overall_navigation':
! 			$template_tmp = array('body' => 'mx_menu_overall_standard.tpl');
  			break;
  		default:
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl');
  			break;
  	}
  }

! $template->set_filenames($template_tmp);

  generate_site_menu($page_parent);
--- 62,91 ----
  //
  $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);
+ $virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, '');

! if (!empty($menu_custom_tpl) && !in_array($menu_custom_tpl, array('Classic','Advanced','Simple_CSS_menu','Advanced_CSS_menu','Overall_navigation')))
  {
! 	$template_tmp = $menu_custom_tpl;
  }
  else
  {
! 	switch( $menu_display_mode )
  	{
! 		case 'Horizontal':
! 			$template_tmp = 'mx_menu_horizontal.tpl';
  			break;
! 		case 'Vertical':
! 			$template_tmp = 'mx_menu_vertical.tpl';
  			break;
  		case 'Overall_navigation':
! 			$template_tmp = 'mx_menu_overall_navigation.tpl';
  			break;
  		default:
! 			$template_tmp = 'mx_menu_vertical.tpl';
  			break;
  	}
  }

! $template->set_filenames(array('body' => $template_tmp));

  generate_site_menu($page_parent);
***************
*** 132,137 ****
  	'TEMPLATE_ROOT_PATH'	=> TEMPLATE_ROOT_PATH,

  	//
! 	// mygosmenu
  	//
  	'MX_ROOT_PATH'			=> $mx_root_path,
--- 106,117 ----
  	'TEMPLATE_ROOT_PATH'	=> TEMPLATE_ROOT_PATH,

+ 	//phpBB
+ 	'U_SEARCH' 				=> mx_append_sid(PHPBB_URL .'search.'.$phpEx),
+ 	'U_SEARCH_UNANSWERED'	=> mx_append_sid(PHPBB_URL . 'search.'.$phpEx.'?search_id=unanswered'),
+ 	'U_SEARCH_SELF'			=> mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=egosearch'),
+ 	'U_SEARCH_NEW'			=> mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=newposts'),
+ 
  	//
! 	// css
  	//
  	'MX_ROOT_PATH'			=> $mx_root_path,

Index: mx_site_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_site_nav.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mx_site_nav.php	29 Dec 2011 05:51:52 -0000	1.10
--- mx_site_nav.php	2 Jun 2013 09:40:19 -0000	1.11
***************
*** 4,8 ****
  * @package MX-Publisher Module - mx_navmenu
  * @version $Id$
! * @copyright (c) 2002-2008 [Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  * @link http://www.mx-publisher.com
--- 4,8 ----
  * @package MX-Publisher Module - mx_navmenu
  * @version $Id$
! * @copyright (c) 2002-2006 [Jon Ohlsson] MX-Publisher Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
  * @link http://www.mx-publisher.com
***************
*** 30,34 ****
  // Setup config parameters
  //
! $config_name = array('menu_custom_tpl', 'menu_display_mode', 'menu_page_parent');

  for( $i = 0; $i < count($config_name); $i++ )
--- 30,34 ----
  // Setup config parameters
  //
! $config_name = array('menu_display_style', 'menu_display_mode', 'menu_page_sync', 'menu_page_parent', 'menu_custom_tpl');

  for( $i = 0; $i < count($config_name); $i++ )
***************
*** 41,46 ****
--- 41,57 ----
  // Define some parameters
  //
+ /*
+ $menu_display_style = 'Overall_navigation';
+ $menu_display_mode == 'Horizontal';
+ $menu_page_sync = true;
+ */
+ //
+ // Define some parameters
+ //
  $menu_custom_tpl = $mx_menu_config['menu_custom_tpl'];
+ $menu_display_style = $mx_menu_config['menu_display_style'];
  $menu_display_mode = $mx_menu_config['menu_display_mode'];
+ $menu_page_sync = ( $mx_menu_config['menu_page_sync'] != 'No' );
+ 
  $page_parent = !empty($mx_menu_config['menu_page_parent']) ? $mx_menu_config['menu_page_parent'] : 0;

***************
*** 50,53 ****
--- 61,65 ----
  //
  $nav_def_key = 'MX_SITE_MENU_' . $block_id;
+ 
  if ( defined($nav_def_key) )
  {
***************
*** 62,91 ****
  //
  $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);
- $virtual_id = $mx_request_vars->request('virtual', MX_TYPE_INT, '');

! if (!empty($menu_custom_tpl) && !in_array($menu_custom_tpl, array('Classic','Advanced','Simple_CSS_menu','Advanced_CSS_menu','Overall_navigation')))
  {
! 	$template_tmp = $menu_custom_tpl;
  }
  else
  {
! 	switch( $menu_display_mode )
  	{
! 		case 'Horizontal':
! 			$template_tmp = 'mx_menu_horizontal.tpl';
  			break;
! 		case 'Vertical':
! 			$template_tmp = 'mx_menu_vertical.tpl';
  			break;
! 		case 'Overall_navigation':
! 			$template_tmp = 'mx_menu_overall_navigation.tpl';
  			break;
  		default:
! 			$template_tmp = 'mx_menu_vertical.tpl';
  			break;
  	}
  }

! $template->set_filenames(array('body' => $template_tmp));

  generate_site_menu($page_parent);
--- 74,133 ----
  //
  $page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);

! if (!empty($menu_custom_tpl))
  {
! 	$template_tmp = array('body' => $menu_custom_tpl);
! 	$template_tmp_path = str_replace(strrchr($template_tmp, '/'), '', $template_tmp) . '/';
! 	$kick_js = @file_exists($mx_root_path . $module_root_path . 'templates/' .$mx_user->template_names[$module_root_path] . $template_tmp_path) ? ($menu_display_mode == 'Horizontal' ? 'horizontal' : 'vertical') : '';
! 	if (!empty($kick_js))
! 	{
! 		$mx_page->add_footer_text( 'templates/' . $mx_user->template_names[$module_root_path] . $template_tmp_path . $kick_js . '.js', true );
! 	}
  }
  else
  {
! 	switch( $menu_display_style )
  	{
! 		case 'Classic':
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl');
  			break;
! 		case 'Advanced':
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_hor.tpl') : array('body' => 'mx_menu_advanced_ver.tpl');
! 			$kick_js = $menu_display_mode == 'Horizontal' ? 'adv_hor.js' : 'adv_ver.js';
! 			$mx_page->add_footer_text( 'includes/js/' . $kick_js, true );
  			break;
! 		case 'Simple_CSS_menu':
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_CSS_hor.tpl') : array('body' => 'mx_menu_simple_CSS_ver.tpl');
! 			$kick_js = $menu_display_mode == 'Horizontal' ? 'simple_CSS_hor.js' : 'simple_CSS_ver.js';
! 			$mx_page->add_footer_text( 'includes/js/' . $kick_js, true );
! 			break;
! 		case 'Advanced_CSS_menu':
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_advanced_CSS_hor.tpl') : array('body' => 'mx_menu_advanced_CSS_ver.tpl');
! 			$kick_js = $menu_display_mode == 'Horizontal' ? 'adv_CSS_hor.js' : 'adv_CSS_ver.js';
! 			$mx_page->add_footer_text( 'includes/js/' . $kick_js, true );
  			break;
+ 		case 'Simple_x':
+ 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_simple_x_hor.tpl') : array('body' => 'mx_menu_simple_x_ver.tpl');
+ 			break;			
+ 		case 'Overall_navigation':
+ 			$template_tmp = array('body' => 'mx_menu_overall_standard.tpl');
+ 			break;			
  		default:
! 			$template_tmp = $menu_display_mode == 'Horizontal' ? array('body' => 'mx_menu_classic_hor.tpl') : array('body' => 'mx_menu_classic_ver.tpl');
  			break;
  	}
+ 	
+ 	switch( $menu_display_mode )
+ 	{
+ 		case 'Overall_navigation':
+ 			$template_tmp = array('body' => 'mx_menu_overall_standard.tpl');
+ 			break;
+ 		default:
+ 			$template_tmp = $template_tmp;
+ 			break;
+ 	}	
  }

! $template->set_filenames($template_tmp);

  generate_site_menu($page_parent);
***************
*** 106,117 ****
  	'TEMPLATE_ROOT_PATH'	=> TEMPLATE_ROOT_PATH,

- 	//phpBB
- 	'U_SEARCH' 				=> mx_append_sid(PHPBB_URL .'search.'.$phpEx),
- 	'U_SEARCH_UNANSWERED'	=> mx_append_sid(PHPBB_URL . 'search.'.$phpEx.'?search_id=unanswered'),
- 	'U_SEARCH_SELF'			=> mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=egosearch'),
- 	'U_SEARCH_NEW'			=> mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=newposts'),
- 
  	//
! 	// css
  	//
  	'MX_ROOT_PATH'			=> $mx_root_path,
--- 148,153 ----
  	'TEMPLATE_ROOT_PATH'	=> TEMPLATE_ROOT_PATH,

  	//
! 	// mygosmenu
  	//
  	'MX_ROOT_PATH'			=> $mx_root_path,

Update of /cvsroot/mxbb/core/modules/mx_navmenu/language/lang_romanian
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31074/lang_romanian

Log Message:
Directory /cvsroot/mxbb/core/modules/mx_navmenu/language/lang_romanian added to the repository

Update of /cvsroot/mxbb/core/modules/mx_coreblocks
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20567

Modified Files:
	mx_includex.php 
Log Message:
includeX x:pic and template update

Index: mx_includex.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_includex.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** mx_includex.php	4 Oct 2008 07:04:38 -0000	1.15
--- mx_includex.php	2 Jun 2013 05:08:10 -0000	1.16
***************
*** 80,83 ****
--- 80,84 ----

  	case 'x_pic':			// Pic
+ 		$file_contents = '<img src="'.$x_1.'" alt="x_pic" width="'.$x_2.'" height="'.$x_3.'" border="0" />';	
  		$template->assign_block_vars('pic_mode', array(
  			'FILE_CONTENTS' => $file_contents

Update of /cvsroot/mxbb/mx_meteo/language
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21855/language

Added Files:
	index.htm 
Log Message:
1st try mx_meteo

--- NEW FILE: index.htm ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#FFFFFF" text="#000000">

</body>
</html>

Update of /cvsroot/mxbb/mx_meteo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21855

Added Files:
	db_install.php db_upgrade.php index.php install.txt meteo.pak 
	meteo.php 
Log Message:
1st try mx_meteo

--- NEW FILE: meteo.php ---
<?php
/** 
*
* @name meteo.php
* @package MX-Publisher Core
* @version $Id: meteo.php,v 1.1 2013/05/31 17:29:53 orynider Exp $
* @copyright (c) 2007-2012 MX-Publisher Project Team
* @copyright (c), 2013 FlorinCB aka OryNider (ory...@rd...)
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

//
// ERROR HANDLING
//
//error_reporting( E_ALL );

if( !defined('IN_PORTAL') || !is_object($mx_block))
{
	die("Hacking attempt");
}

/**
// Includes
*/
require($module_root_path . 'includes/constants.' . $phpEx);

//
// Read Block Settings
//
$title = $mx_block->block_info['block_title']; //PORTAL_METEO_SETTINGS
$block_id = (isset($block_id) ? $block_id : $mx_block->block_info['block_id']);
$block_size = (isset($column) ? $mx_page->columns[$column]['column_size'] : 176);
// Read configuration definition
$marginWidth = (($mx_block->get_parameters('marginWidth') == 'TRUE') ? 1 : 0); //0 
$marginHeight = (($mx_block->get_parameters('marginHeight') == 'TRUE') ? 1 : 0); //0 
$frameBorder = (($mx_block->get_parameters('frameBorder') == 'TRUE') ? 1 : 0); //0  
$scrolling = $mx_block->get_parameters('scrolling'); //no/yes
$wmode_transparency = $mx_block->get_parameters('wmode_transparency'); //allowTransparency   
$current_iframe = $mx_block->get_parameters('current_iframe'); //1-20 /4
$width_iframe = $mx_block->get_parameters('width_iframe');  //120 - 250 
$gid = $mx_block->get_parameters('gid'); //get yours: from http://www.freemeteo.com/
//Client ID Examples: 
//878063_20130531_083049
//772968_20130531_070639
//946506_20130531_141204
$current_iframe = (@is_numeric($current_iframe) ? $current_iframe : 4);
/*
* Start session management
*/

/*
* Begin block script here
*/
// Set the filename of the template you want to use for this file.
$template->set_filenames(array(
    'meteo_body' => 'freemeteo.tpl')
);	
$template->assign_vars(array(
		'TITLE'		=> $title,
		'BLOCK_TITLE'		=> $lang['Weather_by'].' <em>Freemeteo.com</em>',
		'GID'				=> $gid,
		'CIFRM'				=> $current_iframe,		
		'MARGINWIDTH'		=> $marginWidth, 
		'MARGINHEIGHT'		=> $marginHeight,
		'FRAMEBORDER'		=> $frameBorder,
		'SCROLLING'			=> $scrolling,
		'WMODE_TRASPARENCY'	=> $wmode_transparency, 
		'BLOCK_SIZE'		=> $block_size,
		'WIDTH'				=> $width_iframe)		
);

$template->pparse('meteo_body');
?>
--- NEW FILE: index.php ---
<?php
/***************************************************************************
 *                             mx_weather.php
 *                            -------------------
 *   begin                : April, 2002
 *   copyright            : (C) 2002 MX-System
 *   email                : su...@mx...
 *
 ***************************************************************************/

define('IN_PORTAL', 1);
$mx_root_path = "../../";

include($mx_root_path . 'extension.inc');
include($mx_root_path . 'common.'.$phpEx);

//
// Start session management
//
$userdata = session_pagestart($user_ip, PAGE_WEATHER);
mx_init_userprefs($userdata);
//
// End session management
//

$module_root_path = './';

// **********************************************************************
//  Read language definition
// **********************************************************************

if ( !file_exists($module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx ) )
{
  include( $module_root_path . 'language/lang_english/lang_main.'.$phpEx );
}
else
{
  include(  $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx );
}  

// **********************************************************************
//  Read module config
// **********************************************************************

include($module_root_path . 'functions.'.$phpEx);

$weather_config = read_weather_config();

// **********************************************************************
//  Set Parameter
// **********************************************************************

if( isset($HTTP_GET_VARS['accid']) || isset($HTTP_POST_VARS['accid']) )
{
  $weather_region_sel = ($HTTP_GET_VARS['accid']) ? $HTTP_GET_VARS['accid'] : $HTTP_POST_VARS['accid'];
}

if (!$accid) 
{
  $accid = $weather_config['weather_city_default'] ; # Your default city location code "YUL"; 
}

$tp=$HTTP_GET_VARS['tmp'];

if (!$tp) 
{
 	$tp = $weather_config['weather_unit_default']; # Your Default temperature unit (C for Celsius, F for Fahrenheit)
}

WeatherIndex($tp, $accid, $module_root_path);

if ($tp == "C") 
{
  $temperature = CelNumber( $v_Temp, $tp);
} 
else 
{
  $temperature = $v_Temp;
}

$image_path = "http://image.weather.com/web/common/wxicons/52/" ;  // $module_root_path . "images/";
$image = $image_path . $v_CIcon . ".gif";

//
// End session management
//

$page_title = ( !empty( $lang['Weather'] ) ? $lang['Weather'] : 'Weather' );
include($mx_root_path . 'includes/page_header.'.$phpEx);

$block_size     = '100%';

$template->set_filenames(array(
	"body_weather" => 'mx_weather_view.tpl')
);

$day1 = date( 'l' , ToDate( $v_Fore[5] ) );
$day2 = date( 'l' , ToDate( $v_Fore[6] ) );
$day3 = date( 'l' , ToDate( $v_Fore[7] ) );
$day4 = date( 'l' , ToDate( $v_Fore[8] ) );
$day5 = date( 'l' , ToDate( $v_Fore[9] ) );

$image_day1 = $image_path . $v_Fore[10].".gif";
$image_day2 = $image_path . $v_Fore[11].".gif";
$image_day3 = $image_path . $v_Fore[12].".gif";
$image_day4 = $image_path . $v_Fore[13].".gif";
$image_day5 = $image_path . $v_Fore[14].".gif";

$v_Baro_nice  = PreNumber ($v_Baro , $tp);
$v_WindS_nice = VelNumber ($v_WindS, $tp);
$v_Real_nice  = CelNumber2($v_Real , $tp);
$v_Vis_nice   = LenNumber ($v_Vis  , $tp);

//
$checked_on = 'checked';
$checked_off = '';  

$template->assign_vars(array(
  'L_TITLE'      => ( !empty( $lang['Weather'] ) ? $lang['Weather'] : 'Weather' ) , 
  'L_INFO'       => $v_City . ", " . $v_Region,
  'L_DAY1'       => $lang['datetime'][$day1],
  'L_DAY2'       => $lang['datetime'][$day2],
  'L_DAY3'       => $lang['datetime'][$day3],
  'L_DAY4'       => $lang['datetime'][$day4],
  'L_DAY5'       => $lang['datetime'][$day5],
  'L_CHANGE_NOW' => $lang['Change'],
  'IMG_DAY1'     => $image_day1,
  'IMG_DAY2'     => $image_day2,
  'IMG_DAY3'     => $image_day3,
  'IMG_DAY4'     => $image_day4,
  'IMG_DAY5'     => $image_day5,
  'IMG_CURRENT_COND'  => $module_root_path . "images/" . 'current_cond.gif' ,
  'IMG_FORECAST'      => $module_root_path . "images/" . 'forecast.gif' ,
  'TEMP_MAX_DAY1'     => CelNumber($v_Fore[20],$tp),
  'TEMP_MAX_DAY2'     => CelNumber($v_Fore[21],$tp),
  'TEMP_MAX_DAY3'     => CelNumber($v_Fore[22],$tp),
  'TEMP_MAX_DAY4'     => CelNumber($v_Fore[23],$tp),
  'TEMP_MAX_DAY5'     => CelNumber($v_Fore[24],$tp),
  'TEMP_MIN_DAY1'     => CelNumber($v_Fore[40],$tp),
  'TEMP_MIN_DAY2'     => CelNumber($v_Fore[41],$tp),
  'TEMP_MIN_DAY3'     => CelNumber($v_Fore[42],$tp),
  'TEMP_MIN_DAY4'     => CelNumber($v_Fore[43],$tp),
  'TEMP_MIN_DAY5'     => CelNumber($v_Fore[44],$tp),
	'WINDD'             => $v_WindD,
	'WINDS'             => $v_WindS_nice,
	'BARO'              => $v_Baro_nice,
	'HUMID'             => $v_Humid .'%',
  'UV'                => $v_UV,
  'REAL'              => $v_Real_nice,
  'VIS'               => $v_Vis_nice,
  'ACCID'             => $accid,
  'U_URL'        => "index.php",
  'TEMPERATURE'  => $temperature,
  'GRAD'         => "&deg;". $tp ,
  'IMG'          => $image,
  'L_COPYRIGHT'  => "This Weather is provided by MSNBC",
 	'S_ACTION'     => append_sid("index.$phpEx"),
//  'WEATHER_CITY_SELECT'  => weather_city_select( $accid, 'accid' ),

  'CHECKED_TP_C' => ( $tp == "C" ) ? $checked_on : $checked_off,
  'CHECKED_TP_F' => ( $tp == "F" ) ? $checked_on : $checked_off,

  'ONCLICK_C'      => ( $tp == "F" ) ?  "onClick=javascript:location.href='" . append_sid( "./index.php?ta=y&tmp=C&accid=" . $accid ) . "';"  : '',
  'ONCLICK_F'      => ( $tp == "C" ) ?  "onClick=javascript:location.href='" . append_sid( "./index.php?ta=y&tmp=F&accid=" . $accid ) . "';"  : '' 

));

$template->pparse("body_weather");

$template->destroy();

include($mx_root_path . 'includes/page_tail.'.$phpEx);

?>

--- NEW FILE: db_upgrade.php ---
<?php
/**
*
* @package MX-Publisher Module - mx_meteo
* @version $Id: db_upgrade.php,v 1.1 2013/05/31 17:29:53 orynider Exp $
* @copyright (c) 2002-2006 [Jon Ohlsson] MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/
define( 'IN_PORTAL', true );
if ( !defined( 'IN_ADMIN' ) )
{
	$mx_root_path = './../../';
	$phpEx = substr(strrchr(__FILE__, '.'), 1);
	include( $mx_root_path . 'common.' . $phpEx );
	// Start session management
	$mx_user->init($user_ip, PAGE_INDEX);

	if ( !$userdata['session_logged_in'] )
	{
		die( "Hacking attempt(1)" );
	}

	if ( $userdata['user_level'] != ADMIN )
	{
		die( "Hacking attempt(2)" );
	}
	// End session management
}
$mx_module_version = '3.0.0';
$mx_module_copy = 'Original Mx-Publisher <i>Meteo</i> module by <a href="http://mxpcms.sourceforge.net" target="_blank">OryNider</a>';
$message = "<b>This is a fresh install!</b><br/><br/>";
$sql = array();
$sql[] = "UPDATE " . $mx_table_prefix . "module" . "
			    SET module_version  = '" . $mx_module_version . "',
			      module_copy  = '" . $mx_module_copy . "'
			    WHERE module_id = '" . $mx_module_id . "'";
$message .= mx_do_install_upgrade( $sql );
echo "<br /><br />";
echo "<table  width=\"90%\" align=\"center\" cellpadding=\"4\" cellspacing=\"1\" border=\"0\" class=\"forumline\">";
echo "<tr><th class=\"thHead\" align=\"center\">Module Installation/Upgrading/Uninstalling Information - module specific db tables</th></tr>";
echo "<tr><td class=\"row1\"  align=\"left\"><span class=\"gen\">" . $message . "</span></td></tr>";
echo "</table><br />";
?>
--- NEW FILE: install.txt ---
[RELEASE] Meteo Forecast Module 1.0 
- for Mx CMS v. 3.0 (or later) 

Description 
The Download module is an addon module for the Mx CMS for Weather by Freemeteo.com. 

Installation Instructions 
To install the Weather module, follow these instructions. If you encounter any problems during install, visit the module support forum. 

1) Copy and upload new files 
Unzip the distributed files into your portal directory and upload 

2) Import definition file 
In the Administration Panel -> Module Administration, import Module Pack "modules/mx_meteo/meteo.pak" 

4) Add your block to the cms page 

5) Get a GID from http://freemeteo.com/default.asp?pid=183&la=1

6) And Set your Local variables by editing the block configuration panel.
--- NEW FILE: db_install.php ---
<?php
/**
*
* @package MX-Publisher Module - mx_meteo
* @version $Id: db_install.php,v 1.1 2013/05/31 17:29:53 orynider Exp $
* @copyright (c) 2002-2006 [Jon Ohlsson] MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/
define( 'IN_PORTAL', true );
if ( !defined( 'IN_ADMIN' ) )
{
	$mx_root_path = './../../';
	$phpEx = substr(strrchr(__FILE__, '.'), 1);
	include( $mx_root_path . 'common.' . $phpEx );
	// Start session management
	$mx_user->init($user_ip, PAGE_INDEX);

	if ( !$userdata['session_logged_in'] )
	{
		die( "Hacking attempt(1)" );
	}

	if ( $userdata['user_level'] != ADMIN )
	{
		die( "Hacking attempt(2)" );
	}
	// End session management
}
$mx_module_version = '3.0.0';
$mx_module_copy = 'Original Mx-Publisher <i>Meteo</i> module by <a href="http://mxpcms.sourceforge.net" target="_blank">OryNider</a>';
$message = "<b>This is a fresh install!</b><br/><br/>";
$sql = array();
$sql[] = "UPDATE " . $mx_table_prefix . "module" . "
			    SET module_version  = '" . $mx_module_version . "',
			      module_copy  = '" . $mx_module_copy . "'
			    WHERE module_id = '" . $mx_module_id . "'";
$message .= mx_do_install_upgrade( $sql );
echo "<br /><br />";
echo "<table  width=\"90%\" align=\"center\" cellpadding=\"4\" cellspacing=\"1\" border=\"0\" class=\"forumline\">";
echo "<tr><th class=\"thHead\" align=\"center\">Module Installation/Upgrading/Uninstalling Information - module specific db tables</th></tr>";
echo "<tr><td class=\"row1\"  align=\"left\"><span class=\"gen\">" . $message . "</span></td></tr>";
echo "</table><br />";
?>
--- NEW FILE: meteo.pak ---
module=+:119=+:Meteo=+:modules/mx_meteo/=+:Meteo Module=+:1
New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
function=+:119=+:161=+:Free Meteo=+:Free Meteo=+:meteo.php=+:
parameter=+:161=+:162=+:wmode_transparent=+:Radio_single_select=+:allowTransparency=+:a:2:{i:0;s:17:"allowTransparency";i:1;s:16:"denyTransparency";}=+:1=+:90
parameter=+:161=+:163=+:gid=+:Text=+:878063_20130531_083049=+:=+:1=+:0
parameter=+:161=+:164=+:current_iframe=+:Number=+:4=+:=+:0=+:0
parameter=+:161=+:165=+:scrolling=+:Radio_single_select=+:no=+:a:2:{i:0;s:3:"yes";i:1;s:2:"no";}=+:0=+:1
parameter=+:161=+:166=+:marginWidth=+:Boolean=+:FALSE=+:a:2:{i:0;s:4:"TRUE";i:1;s:5:"FALSE";}=+:0=+:0
parameter=+:161=+:167=+:marginHeight=+:Boolean=+:FALSE=+:a:2:{i:0;s:4:"TRUE";i:1;s:5:"FALSE";}=+:0=+:0
parameter=+:161=+:168=+:frameBorder=+:Boolean=+:FALSE=+:a:2:{i:0;s:4:"TRUE";i:1;s:5:"FALSE";}=+:0=+:0
parameter=+:161=+:169=+:width_iframe=+:Number=+:160=+:=+:0=+:0
parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
block=+:=+:Free Meteo=+:Free Meteo block=+:161=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
function=+:0=+:0=+:0=+:endoflist=+:0=+:0

Update of /cvsroot/mxbb/mx_meteo/templates/_core
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21723/_core

Log Message:
Directory /cvsroot/mxbb/mx_meteo/templates/_core added to the repository

Update of /cvsroot/mxbb/mx_meteo/language/lang_english
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21709/lang_english

Log Message:
Directory /cvsroot/mxbb/mx_meteo/language/lang_english added to the repository

Update of /cvsroot/mxbb/mx_meteo/language
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21666/language

Log Message:
Directory /cvsroot/mxbb/mx_meteo/language added to the repository

Update of /cvsroot/mxbb/mx_smartor/album_mod/language/lang_romanian
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv27660/album_mod/language/lang_romanian

Modified Files:
	lang_main.php 
Log Message:
lang file typo

Index: lang_main.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/language/lang_romanian/lang_main.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** lang_main.php	29 Apr 2013 05:05:08 -0000	1.2
--- lang_main.php	30 May 2013 10:04:09 -0000	1.3
***************
*** 245,249 ****
  $lang['All_Show_All_Pictures_Of_user'] = 'AratÄ toate pozele';
  $lang['All_Show_All_Comments_Of_user'] = 'AratÄ toate comentariile';
! $lang['All_Show_All_Ratings_Of_user'] = 'AratÄ toate pozele evaluate;

--- 245,249 ----
  $lang['All_Show_All_Pictures_Of_user'] = 'AratÄ toate pozele';
  $lang['All_Show_All_Comments_Of_user'] = 'AratÄ toate comentariile';
! $lang['All_Show_All_Ratings_Of_user'] = 'AratÄ toate pozele evaluate';

2005	Jan	Feb	Mar (95)	Apr (270)	May (111)	Jun	Jul	Aug (64)	Sep (130)	Oct (319)	Nov (17)	Dec (191)
2006	Jan (53)	Feb	Mar	Apr	May (6)	Jun (387)	Jul (102)	Aug (247)	Sep (120)	Oct (1)	Nov (8)	Dec (21)
2007	Jan (38)	Feb (36)	Mar	Apr (32)	May (135)	Jun (523)	Jul (192)	Aug (103)	Sep (533)	Oct (77)	Nov (23)	Dec (203)
2008	Jan (312)	Feb (1193)	Mar (404)	Apr (67)	May (62)	Jun (497)	Jul (297)	Aug (110)	Sep (335)	Oct (256)	Nov (50)	Dec (118)
2009	Jan (67)	Feb (10)	Mar (1)	Apr (1)	May	Jun (10)	Jul (61)	Aug	Sep (16)	Oct (45)	Nov (12)	Dec (14)
2010	Jan (30)	Feb	Mar	Apr (4)	May	Jun	Jul (7)	Aug (7)	Sep (5)	Oct (5)	Nov	Dec
2011	Jan (7)	Feb (3)	Mar (89)	Apr (11)	May (5)	Jun	Jul (8)	Aug (1)	Sep (2)	Oct	Nov (2)	Dec (89)
2012	Jan (7)	Feb (1)	Mar (1)	Apr	May	Jun	Jul	Aug (4)	Sep (3)	Oct (42)	Nov (1)	Dec
2013	Jan	Feb	Mar (19)	Apr (90)	May (38)	Jun (235)	Jul (38)	Aug (10)	Sep	Oct (29)	Nov	Dec
2014	Jan	Feb	Mar	Apr (6)	May (52)	Jun	Jul (7)	Aug	Sep (17)	Oct	Nov	Dec

mxbb-commits Mailing List for MX-Publisher (Page 16)

mxbb-commits — Internal Mailing List for CVS Commit Messages