mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] core/modules/mx_phpbb3blocks db_install.php, 1.1, 1.2 db_upgrade.php, 1.1, 1.2

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25653

Modified Files:
	db_install.php db_upgrade.php 
Log Message:
Admin templates by Culprit and some fixes to admin files by me.

[mxbb-commits] core/admin index.php, 1.33, 1.34 page_footer_admin.php, 1.16, 1.17

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24668/admin

Modified Files:
	index.php page_footer_admin.php 
Log Message:
Admin templates by Culprit and some fixes to admin files by me.

Index: page_footer_admin.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/page_footer_admin.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** page_footer_admin.php	5 May 2007 20:12:56 -0000	1.16
--- page_footer_admin.php	20 Dec 2007 13:10:05 -0000	1.17
***************
*** 28,35 ****
  $stime = ( $endtime[1] + $endtime[0] ) - $mx_starttime;
  
  $execution_stats = '<div align="center"><span class="copyright">' . sprintf($lang['Execution_Stats'], $db->num_queries, round($stime, 4)) . '</span></div>';
  
  $template->assign_vars(array(
! 	'PHPBB_VERSION' 		=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '2' . $board_config['version'] : '',
  	'MX_VERSION' 			=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '',
  	'TRANSLATION_INFO' 		=> (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''),
--- 28,50 ----
  $stime = ( $endtime[1] + $endtime[0] ) - $mx_starttime;
  
+ switch (PORTAL_BACKEND)
+ {
+ 	case 'internal':
+ 
+ 	case 'phpbb2':
+ 
+ 		$current_phpbb_version = '2' . $board_config['version'];
+ 		break;
+ 
+ 	case 'phpbb3':
+ 
+ 		$current_phpbb_version = $board_config['version'];
+ 		break;
+ }
+ 
  $execution_stats = '<div align="center"><span class="copyright">' . sprintf($lang['Execution_Stats'], $db->num_queries, round($stime, 4)) . '</span></div>';
  
  $template->assign_vars(array(
! 	'PHPBB_VERSION' 		=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? $current_phpbb_version : '',
  	'MX_VERSION' 			=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '',
  	'TRANSLATION_INFO' 		=> (isset($lang['TRANSLATION_INFO'])) ? $lang['TRANSLATION_INFO'] : ((isset($lang['TRANSLATION'])) ? $lang['TRANSLATION'] : ''),

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** index.php	9 Sep 2007 16:48:16 -0000	1.33
--- index.php	20 Dec 2007 13:10:04 -0000	1.34
***************
*** 887,892 ****
  
  	/* Begin phpBB version check code block */
! 	$current_phpbb_version = explode('.', '2' . $board_config['version']);
! 	$minor_phpbb_revision = (int) $current_phpbb_version[2];
  
  	$errno = 0;
--- 887,906 ----
  
  	/* Begin phpBB version check code block */
! 	switch (PORTAL_BACKEND)
! 	{
! 		case 'internal':
! 
! 		case 'phpbb2':
! 
! 			$current_phpbb_version = explode('.', '2' . $board_config['version']);
! 			$minor_phpbb_revision = (int) $current_phpbb_version[2];
! 			break;
! 
! 		case 'phpbb3':
! 
! 			$current_phpbb_version = explode('.', '' . $board_config['version']);
! 			$minor_phpbb_revision = (int) $current_phpbb_version[3];
! 			break;
! 	}
  
  	$errno = 0;
***************
*** 895,932 ****
  	if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr, 10))
  	{
! 		@fputs($fsock, "GET /updatecheck/20x.txt HTTP/1.1\r\n");
! 		@fputs($fsock, "HOST: www.phpbb.com\r\n");
! 		@fputs($fsock, "Connection: close\r\n\r\n");
! 
! 		$get_info = false;
! 		while (!@feof($fsock))
  		{
! 			if ($get_info)
! 			{
! 				$phpbb_version_info .= @fread($fsock, 1024);
! 			}
! 			else
! 			{
! 				if (@fgets($fsock, 1024) == "\r\n")
  				{
! 					$get_info = true;
  				}
! 			}
! 		}
! 		@fclose($fsock);
  
! 		$phpbb_version_info = explode("\n", $phpbb_version_info);
! 		$latest_phpbb_head_revision = (int) $phpbb_version_info[0];
! 		$latest_phpbb_minor_revision = (int) $phpbb_version_info[2];
! 		$latest_phpbb_version = (int) $phpbb_version_info[0] . '.' . (int) $phpbb_version_info[1] . '.' . (int) $phpbb_version_info[2];
  
! 		if ($latest_phpbb_head_revision == 2 && $minor_phpbb_revision == $latest_phpbb_minor_revision)
! 		{
! 			$phpbb_version_info = '<p style="color:green">' . $lang['Version_up_to_date'] . '</p>';
! 		}
! 		else
! 		{
! 			$phpbb_version_info = '<p style="color:red">' . $lang['Version_not_up_to_date'];
! 			$phpbb_version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_phpbb_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>';
  		}
  	}
--- 909,980 ----
  	if ($fsock = @fsockopen('www.phpbb.com', 80, $errno, $errstr, 10))
  	{
! 		switch (PORTAL_BACKEND)
  		{
! 			case 'internal':
! 
! 			case 'phpbb2':
! 
! 				@fputs($fsock, "GET /updatecheck/20x.txt HTTP/1.1\r\n");
! 				@fputs($fsock, "HOST: www.phpbb.com\r\n");
! 				@fputs($fsock, "Connection: close\r\n\r\n");
! 
! 				$get_info = false;
! 				while (!@feof($fsock))
  				{
! 					if ($get_info)
! 					{
! 						$phpbb_version_info .= @fread($fsock, 1024);
! 					}
! 					else
! 					{
! 						if (@fgets($fsock, 1024) == "\r\n")
! 						{
! 							$get_info = true;
! 						}
! 					}
  				}
! 				@fclose($fsock);
! 				$phpbb_version_info = explode("\n", $phpbb_version_info);
! 				$latest_phpbb_head_revision = (int) $phpbb_version_info[0];
! 				$latest_phpbb_minor_revision = (int) $phpbb_version_info[2];
! 				$latest_phpbb_version = (int) $phpbb_version_info[0] . '.' . (int) $phpbb_version_info[1] . '.' . (int) $phpbb_version_info[2];
  
! 				if ($latest_phpbb_head_revision == 2 && $minor_phpbb_revision == $latest_phpbb_minor_revision)
! 				{
! 					$phpbb_version_info = '<p style="color:green">' . $lang['Version_up_to_date'] . '</p>';
! 				}
! 				else
! 				{
! 					$phpbb_version_info = '<p style="color:red">' . $lang['Version_not_up_to_date'];
! 					$phpbb_version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_phpbb_version) . sprintf($lang['Current_version_info'], '2' . $board_config['version']) . '</p>';
! 				}
! 				break;
  
! 			case 'phpbb3':
! 
! 				$phpbb_version_info = mx_get_remote_file('www.phpbb.com', '/updatecheck', ((defined('PHPBB_QA')) ? '30x_qa.txt' : '30x.txt'), $errstr, $errno);
! 				if ($info === false)
! 				{
! 					trigger_error($errstr, E_USER_WARNING);
! 				}
! 
! 				$phpbb_version_info = explode("\n", $phpbb_version_info);
! 
! 				$announcement_url = trim($info[1]);
! 				//$update_link = append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=update');
! 				$latest_phpbb_head_revision = trim($phpbb_version_info[0]);
! 				$latest_phpbb_minor_revision = trim($phpbb_version_info[2]);
! 				$latest_phpbb_version = trim($phpbb_version_info[0]) . '.' . trim($phpbb_version_info[1]) . '.' . trim($phpbb_version_info[2]);
! 
! 				if ($latest_phpbb_head_revision == 3 && $minor_phpbb_revision == $latest_phpbb_minor_revision)
! 				{
! 					$phpbb_version_info = '<p style="color:green">' . $lang['Version_up_to_date'] . '</p>';
! 				}
! 				else
! 				{
! 					$phpbb_version_info = '<p style="color:red">' . $lang['Version_not_up_to_date'];
! 					$phpbb_version_info .= '<br />' . sprintf($lang['Latest_version_info'], $latest_phpbb_version) . sprintf($lang['Current_version_info'], $board_config['version']) . '</p>';
! 				}				
! 				break;
  		}
  	}
***************
*** 982,986 ****
  		$latest_mxbb_version = (int) $mxbb_version_info[0] . '.' . (int) $mxbb_version_info[1] . '.' . (int) $mxbb_version_info[2];
  
! 		if ($minor_mxbb_revision == $latest_mxbb_minor_revision)
  		{
  			$mxbb_version_info = '<p style="color:green">' . $lang['mxBB_Version_up_to_date'] . '</p>';
--- 1030,1034 ----
  		$latest_mxbb_version = (int) $mxbb_version_info[0] . '.' . (int) $mxbb_version_info[1] . '.' . (int) $mxbb_version_info[2];
  
! 		if ($latest_mxbb_head_revision == 3 && $minor_mxbb_revision == $latest_mxbb_minor_revision)
  		{
  			$mxbb_version_info = '<p style="color:green">' . $lang['mxBB_Version_up_to_date'] . '</p>';

[mxbb-commits] core common.php,1.70,1.71

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24668

Modified Files:
	common.php 
Log Message:
Admin templates by Culprit and some fixes to admin files by me.

[mxbb-commits] core/includes mx_functions_admincp.php, 1.40, 1.41 page_tail.php, 1.33, 1.34

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24668/includes

Modified Files:
	mx_functions_admincp.php page_tail.php 
Log Message:
Admin templates by Culprit and some fixes to admin files by me.

Index: mx_functions_admincp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** mx_functions_admincp.php	19 Nov 2007 16:39:56 -0000	1.40
--- mx_functions_admincp.php	20 Dec 2007 13:10:05 -0000	1.41
***************
*** 3827,3829 ****
--- 3827,3883 ----
  	return $select;
  }
+ /**
+ * Retrieve contents from remotely stored file
+ */
+ function mx_get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port = 80, $timeout = 10)
+ {
+ 	global $user;
+ 
+ 	if ($fsock = @fsockopen($host, $port, $errno, $errstr, $timeout))
+ 	{
+ 		@fputs($fsock, "GET $directory/$filename HTTP/1.1\r\n");
+ 		@fputs($fsock, "HOST: $host\r\n");
+ 		@fputs($fsock, "Connection: close\r\n\r\n");
+ 	
+ 		$file_info = '';
+ 		$get_info = false;
+ 
+ 		while (!@feof($fsock))
+ 		{
+ 			if ($get_info)
+ 			{
+ 				$file_info .= @fread($fsock, 1024);
+ 			}
+ 			else
+ 			{
+ 				$line = @fgets($fsock, 1024);
+ 				if ($line == "\r\n")
+ 				{
+ 					$get_info = true;
+ 				}
+ 				else if (stripos($line, '404 not found') !== false)
+ 				{
+ 					$errstr = $user->lang['FILE_NOT_FOUND'] . ': ' . $filename;
+ 					return false;
+ 				}
+ 			}
+ 		}
+ 		@fclose($fsock);
+ 	}
+ 	else
+ 	{
+ 		if ($errstr)
+ 		{
+ 			$errstr = utf8_convert_message($errstr);
+ 			return false;
+ 		}
+ 		else
+ 		{
+ 			$errstr = $user->lang['FSOCK_DISABLED'];
+ 			return false;
+ 		}
+ 	}
+ 	
+ 	return $file_info;
+ }
  ?>

Index: page_tail.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_tail.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** page_tail.php	14 Dec 2007 03:41:56 -0000	1.33
--- page_tail.php	20 Dec 2007 13:10:12 -0000	1.34
***************
*** 91,94 ****
--- 91,109 ----
  }
  
+ switch (PORTAL_BACKEND)
+ {
+ 	case 'internal':
+ 
+ 	case 'phpbb2':
+ 
+ 		$current_phpbb_version = '2' . $board_config['version'];
+ 		break;
+ 
+ 	case 'phpbb3':
+ 
+ 		$current_phpbb_version = $board_config['version'];
+ 		break;
+ }
+ 
  $template->assign_vars(array(
  	'U_PORTAL_ROOT_PATH' 		=> PORTAL_URL,
***************
*** 99,103 ****
  	'POWERED_BY' 				=> $lang['Powered_by'],
  	'MX_VERSION' 				=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '',
! 	'PHPBB_VERSION' 			=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '' . $board_config['version'] : '',
  	'ADMIN_LINK' 				=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '<a href="' . $u_acp . '?sid=' . $userdata['session_id'] . '">' . $l_acp . '</a><br />' : '',
  	'L_ACP' 					=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? $l_acp : '',
--- 114,118 ----
  	'POWERED_BY' 				=> $lang['Powered_by'],
  	'MX_VERSION' 				=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : '',
! 	'PHPBB_VERSION' 			=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? $current_phpbb_version : '',
  	'ADMIN_LINK' 				=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? '<a href="' . $u_acp . '?sid=' . $userdata['session_id'] . '">' . $l_acp . '</a><br />' : '',
  	'L_ACP' 					=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? $l_acp : '',

[mxbb-commits] mx_phpbb/includes forum_hack.php,1.24,1.24.2.1

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_phpbb/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1356/includes

Modified Files:
      Tag: core28x
	forum_hack.php 
Log Message:
-Adeed compatibility with cash mod;
-Added a shared cash mod file in the 'contrib' folder with phpbb_root_path added;

Index: forum_hack.php
===================================================================
RCS file: /cvsroot/mxbb/mx_phpbb/includes/forum_hack.php,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -d -r1.24 -r1.24.2.1
*** forum_hack.php	22 Jul 2007 22:31:04 -0000	1.24
--- forum_hack.php	20 Dec 2007 10:57:57 -0000	1.24.2.1
***************
*** 23,29 ****
--- 23,51 ----
  include_once($phpbb_root_path . 'includes/functions_selects.' . $phpEx);
  include_once($phpbb_root_path . 'includes/functions_post.' . $phpEx);
+ 
+ //Check for mx_smartor fap version
+ if (file_exists($mx_root_path . 'modules/mx_smartor/album_mod/album_bbconstants.' . $phpEx)) 
+ { 
+ 	include_once($mx_root_path . 'modules/mx_smartor/album_mod/album_bbconstants.' . $phpEx);
+ }
+ 
  include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
  include_once($phpbb_root_path . 'includes/auth.' . $phpEx);
  
+ //Check for cash mod
+ if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) 
+ {
+ 	define('IN_CASHMOD', true);
+ 	
+ 	if ( !file_exists(@phpbb_realpath($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_cash.'.$phpEx)) )
+ 	{
+ 		include_once($phpbb_root_path . 'language/lang_english/lang_cash.' . $phpEx);
+ 	}
+ 	else
+ 	{
+ 		include_once($phpbb_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_cash.' . $phpEx);
+ 	}		
+ }
+ 
  // --------------------------------------------------------------------------------
  // Class: mx_forum
***************
*** 322,325 ****
--- 344,348 ----
  			'search' => $this->phpbb_config['search'],
  			'viewonline' => $this->phpbb_config['viewonline'],
+ 			'cash' => $this->phpbb_config['other'],
  			'other' => $this->phpbb_config['other'],
  		);
***************
*** 346,350 ****
  				'viewforum' => 0,
  				'viewonline' => 0,
! 				'viewtopic' => 0
  				);
  		}
--- 369,374 ----
  				'viewforum' => 0,
  				'viewonline' => 0,
! 				'viewtopic' => 0,
! 				'cash' => 0
  				);
  		}
***************
*** 618,623 ****
  		{
  			case 'index':
! 				//global $s_last_visit; // declared here: includes/page_header.php
! 				$s_last_visit = ( $userdata['session_logged_in'] ) ? create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']) : '';
  				$script_vars = array(
  					'LAST_VISIT_DATE' => sprintf( $lang['You_last_visit'], $s_last_visit ),
--- 642,646 ----
  		{
  			case 'index':
! 				global $s_last_visit; // declared here: includes/page_header.php
  				$script_vars = array(
  					'LAST_VISIT_DATE' => sprintf( $lang['You_last_visit'], $s_last_visit ),
***************
*** 1287,1290 ****
--- 1310,1382 ----
  		global $server_url; // used globally by usercp_register.php
  
+ 		//Check for cash mod
+ 		if (defined('IN_CASHMOD')) 
+ 		{
+ 			global $cash, $cm_groups; // allways used globally by cash mod
+ 
+ 			switch ( $phpbb_file )
+ 			{
+ 				case 'memberlist':
+ 					define('CM_MEMBERLIST', true);
+ 					global $cm_memberlist;
+ 					break;
+ 				case 'posting':
+ 					define('CM_POSTING', true);
+ 					global $cm_posting;
+ 					break;
+ 				case 'viewtopic':
+ 					define('CM_VIEWTOPIC', true);
+ 					global $cm_viewtopic;
+ 					break;
+ 				case 'viewprofile':
+ 					define('CM_VIEWPROFILE', true);
+ 					global $cm_viewprofile;
+ 					break;
+ 			}
+ 			$cashcode=file_get_contents($phpbb_root_path . 'includes/functions_cash.'.$phpEx);
+ 
+ 			//
+ 			// Remove php tags
+ 			//
+ 			$cashcode = str_replace('<?php','',$cashcode);
+ 			$cashcode = str_replace('?>','',$cashcode);
+ 			
+ 			//
+ 			// Commment out the main includes
+ 			//
+ 			$cashcode = preg_replace('#^(.?include).*(extension).*(\r\n?|\n)#m','// mxBB: Removed include extension.inc' . "\n", $cashcode);
+ 			$cashcode = preg_replace('#^(.?include).*(common).*(\r\n?|\n)#m','// mxBB: Removed include common.php' . "\n", $cashcode);
+ 
+ 			//
+ 			// Remove some includes already included by mxBB
+ 			//
+ 			$cashcode = preg_replace ("/include(.*)bbcode/", "//", $cashcode);
+ 			$cashcode = preg_replace ("/include(.*)functions_post/", "//", $cashcode);
+ 
+ 			// 
+ 			// NOTE: This regex will only work if "global" is stated on a new line...
+ 			//
+ 			//$cashcode = preg_replace('#^(.?).*(global)(.*?)($)(.*?)(\r\n?|\n)#m', '// mxBB rewrite of global, to instance $this in this function' . "\n " . 'global $phpbb_root_path, \\3', $cashcode);
+ 
+ 			//
+ 			// Rewrite the $template
+ 			//
+ 			$cashcode = preg_replace ("/$template = (.*)\;/", "$template = '" . $template . "';", $cashcode);
+ 
+ 
+ 			//
+ 			// Rewrite the phpbb_root_path
+ 			//
+ 			$cashcode = preg_replace ("/phpbb_root_path = (.*)\;/", "phpbb_root_path = '" . $phpbb_root_path . "';", $cashcode);
+ 
+ 			
+ 			//
+ 			// Add the phpbb_root_path to the append_sid function - if not already there
+ 			//
+ 			//
+ 			$template = new mx_Template( $phpbb_root_path . 'templates/'. $theme['template_name'] );		
+ 			eval($cashcode);
+ 		}			
+ 
  		$code=file_get_contents($phpbb_root_path . $phpbb_file . ".$phpEx");
  
***************
*** 1367,1370 ****
--- 1459,1463 ----
  				$code = str_replace('$is_auth_ary[$forum_data[$i][\'forum_id\']][\'auth_view\']', '$is_auth_ary[$forum_data[$i][\'forum_id\']][\'auth_view\'] && $mx_forum->phpbb2_auth_cat($forum_data[$i][\'forum_id\'])', $code); // For phpBB 2.0.21 and later
  				$code = str_replace('$is_auth_ary[$forum_id][\'auth_view\']', '$is_auth_ary[$forum_id][\'auth_view\'] && $mx_forum->phpbb2_auth_cat($forum_data[$i][\'forum_id\'])', $code); // For phpBB 2.0.21 and later
+ 
  				// Hack for XS/Simple SubForum
  				$code = str_replace('$images = unserialize($item[\'FORUM_FOLDERS\'])', '$mx_forum->images = unserialize($item[\'FORUM_FOLDERS\'])', $code);
***************
*** 1385,1389 ****
  				$code = str_replace('$temp_url = "modcp.', '$temp_url = "' . $phpbb_root_path . 'modcp.', $code);
  				$code = str_replace('$temp_url = "posting.', '$temp_url = "' . $phpbb_root_path . 'posting.', $code);
! 
  				//
  				// Avatars and ranks
--- 1478,1482 ----
  				$code = str_replace('$temp_url = "modcp.', '$temp_url = "' . $phpbb_root_path . 'modcp.', $code);
  				$code = str_replace('$temp_url = "posting.', '$temp_url = "' . $phpbb_root_path . 'posting.', $code);
! 				
  				//
  				// Avatars and ranks
***************
*** 1419,1441 ****
  			case 'includes/usercp_avatar':
  				//
! 				// Avatars and ranks
  				//
! 				$code = str_replace('\'./\' . $board_config[\'avatar_gallery_path\']', '$board_config[\'avatar_gallery_path\']', $code);
! 				$code = str_replace('\'./\' . $board_config[\'avatar_path\']', '$board_config[\'avatar_path\']', $code);
  
! 				$code = str_replace('$board_config[\'avatar_gallery_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_gallery_path\']', $code);
! 				$code = str_replace('$board_config[\'avatar_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_path\']', $code);
  				break;
  
! 	         case 'includes/usercp_viewprofile':
! 	            //
! 	            // Avatars and ranks
! 	            //
! 	            $code = str_replace('\'./\' . $board_config[\'avatar_gallery_path\']', '$board_config[\'avatar_gallery_path\']', $code);
! 	            $code = str_replace('\'./\' . $board_config[\'avatar_path\']', '$board_config[\'avatar_path\']', $code);
! 
! 	            $code = str_replace('$board_config[\'avatar_gallery_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_gallery_path\']', $code);
! 	            $code = str_replace('$board_config[\'avatar_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_path\']', $code);
! 	            break;
  		}
  
--- 1512,1543 ----
  			case 'includes/usercp_avatar':
  				//
!                 // Avatars and ranks
  				//
!                 $code = str_replace( '\'./\' . $board_config[\'avatar_gallery_path\']', '$board_config[\'avatar_gallery_path\']', $code );
!                 $code = str_replace( '\'./\' . $board_config[\'avatar_path\']', '$board_config[\'avatar_path\']', $code );
!  
! 				$code = str_replace( '$board_config[\'avatar_gallery_path\']', '\'' . $phpbb_root_path . '\' . $board_config[\'avatar_gallery_path\']', $code );
!                 $code = str_replace( '$board_config[\'avatar_path\']', '\'' . $phpbb_root_path . '\' . $board_config[\'avatar_path\']', $code );
  
!                 $code = str_replace( 'if (!is_uploaded_file($avatar_filename))', 'if (!file_exists($avatar_filename))', $code);
!                 $code = str_replace( '$move_file($avatar_filename, \'' . $phpbb_root_path .'\' . $board_config[\'avatar_path\'] . "/$new_filename");','$move_file($avatar_filename, \'' . $phpbb_root_path .'\' . $board_config[\'avatar_path\'] . "/$new_filename");
! 				@unlink( $avatar_filename);', $code);
  				break;
+ 				
+ 			case 'includes/usercp_viewprofile': 
+ 				// 
+ 				// Avatars and ranks 
+ 				// 
+ 				$code = str_replace('\'./\' . $board_config[\'avatar_gallery_path\']', '$board_config[\'avatar_gallery_path\']', $code); 
+ 				$code = str_replace('\'./\' . $board_config[\'avatar_path\']', '$board_config[\'avatar_path\']', $code); 
  
! 				$code = str_replace('$board_config[\'avatar_gallery_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_gallery_path\']', $code); 
! 				$code = str_replace('$board_config[\'avatar_path\']', '\''.$phpbb_root_path.'\' . $board_config[\'avatar_path\']', $code); 
! 				break;
! 				
! 			case 'cash':
! 			
! 				$code = str_replace('exit;', 'return;', $code);
! 				break;
  		}
  
***************
*** 1497,1500 ****
--- 1599,1612 ----
  	if ($mx_forum->phpbb_config['enable_module'])
  	{
+     if ( isset( $HTTP_POST_FILES ) && !empty( $HTTP_POST_FILES ) ) 
+     { 
+         $up_files_keys = array_keys( $HTTP_POST_FILES ); 
+         foreach( $up_files_keys as $up_file ) 
+         { 
+             @rename( $HTTP_POST_FILES[$up_file]['tmp_name'], $HTTP_POST_FILES[$up_file]['tmp_name'] . '.mxbb' ); 
+             $HTTP_POST_FILES[$up_file]['tmp_name'] .= '.mxbb'; 
+             $_FILES[$up_file]['tmp_name'] .= '.mxbb'; 
+         } 
+     }
  		$http_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://';
  		$http_server = preg_replace( '#^\/?(.*?)\/?$#', '\1', trim( $board_config['server_name'] ) );

[mxbb-commits] mx_phpbb/contrib classes_cash.php,NONE,1.1.2.1

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_phpbb/contrib
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1356/contrib

Added Files:
      Tag: core28x
	classes_cash.php 
Log Message:
-Adeed compatibility with cash mod;
-Added a shared cash mod file in the 'contrib' folder with phpbb_root_path added;

--- NEW FILE: classes_cash.php ---
<?php
/***************************************************************************
 *                          classes_cash.php
 *                            -------------------
 *   begin                : Tuesday, Oct 07, 2003
 *   copyright            : (C) 2003 Xore
 *   email                : mo...@xo...
 *
 *   $Id: classes_cash.php,v 1.1.2.1 2007/12/20 10:57:57 orynider Exp $
 *
 *
 ***************************************************************************/

/***************************************************************************
 *
 *   This program is free software; you can redistribute it and/or modify
 *   it under the terms of the GNU General Public License as published by
 *   the Free Software Foundation; either version 2 of the License, or
 *   (at your option) any later version.
 *
 ***************************************************************************/

if ( !defined('IN_PHPBB') )
{
	die("Hacking attempt");
}

if ( defined('CASH_CLASSES_INCLUDE') )
{
	return;
}

define('CASH_CLASSES_INCLUDE',TRUE);


//
//=============[ Template extended functionality ]=========================
//

class Template_plus extends Template
{
	var $classname = "Template";
	var $_tpldata = array();
	var $files = array();
	var $root = "";
	var $compiled_code = array();
	var $uncompiled_code = array();
	function set(&$template)
	{
		$this->classname = &$template->classname;
		$this->_tpldata = &$template->_tpldata;
		$this->files = &$template->files;
		$this->root = &$template->root;
		$this->compiled_code = &$template->compiled_code;
		$this->uncompiled_code = &$template->uncompiled_code;
	}

	/**
	 * Inserts the uncompiled code for $handle as the
	 * value of $varname in the block-level. This can be used
	 * to effectively include a template in the middle of another
	 * template.
	 * Note that all desired assignments to the variables in $handle should be done
	 * BEFORE calling this function.
	 */
	function assign_block_var_from_handle($varname, $handle)
	{
		if (!$this->loadfile($handle))
		{
			die("Template->assign_var_from_handle(): Couldn't load template file for handle $handle");
		}

		// Compile it, with the "no echo statements" option on.
		$_str = "";
		$code = $this->compile($this->uncompiled_code[$handle], true, '_str');

		// evaluate the variable assignment.
		eval($code);
		// assign the value of the generated variable to the given varname.
		if (strstr($varname, '.'))
		{
			$lastposition = strrpos($varname,'.');
			$blockname = substr($varname,0,$lastposition);
			$varname = substr($varname,$lastposition+1);
			$this->reassign_block_vars($blockname,array($varname => $_str));
		}
		else
		{
			$this->assign_var($varname, $_str);
		}

		return true;
	}


	/**
	 * Block-level variable re-assignment. Prevents new block iteration with the given
	 * variable assignments. Note that once you've iterated to a new block via assign_block_vars,
	 * you won't be able to come back to an old block.
	 */
	function reassign_block_vars($blockname, $vararray)
	{
		if (strstr($blockname, '.'))
		{
			// Nested block.
			$blocks = explode('.', $blockname);
			$blockcount = sizeof($blocks);
			$str = '$this->_tpldata';
			for ($i = 0; $i < $blockcount; $i++)
			{
				$str .= '[\'' . $blocks[$i] . '.\']';
				eval('$lastiteration = sizeof(' . $str . ') - 1;');
				$str .= '[' . $lastiteration . ']';
			}
			// Now we add the block that we're actually assigning to.
			reset ($vararray);
			while (list($key,$val) = each($vararray))
			{
				$current_string = $str . '[$key] = $val';
				// Now we evaluate this assignment we've built up.
				eval($current_string);
			}
		}
		else
		{
			// Top-level block.
			// Add a new iteration to this block with the variable assignments
			// we were given.
			$lastiteration = sizeof($this->_tpldata[$blockname . '.']) - 1;
			reset ($vararray);
			while (list($key,$val) = each($vararray))
			{
				$this->_tpldata[$blockname . '.'][$lastiteration][$key] = $val;
			}
		}

		return true;
	}


	/**
	 * Block-level variable clearing. Removes a block of data so it can be re-written
	 * fresh (for iterative file handled arrays, when different data is needed)
	 */
	function clear_block_var($blockname)
	{
		if (strstr($blockname, '.'))
		{
			// i don't know how the heck this would be used, if ever.
			// i can't think of a situation where it would be useful personally
			// but, who knows... Only the top-level block makes sense to me
			// Nested block.
			$blocks = explode('.', $blockname);
			$blockcount = sizeof($blocks) - 1;
			$str = '$this->_tpldata';
			for ($i = 0; $i < $blockcount; $i++)
			{
				$str .= '[\'' . $blocks[$i] . '.\']';
				eval('$lastiteration = sizeof(' . $str . ') - 1;');
				$str .= '[' . $lastiteration . ']';
			}
			// Now we add the block that we're actually assigning to.
			// We're adding a new iteration to this block with the given
			// variable assignments.
			$str .= '[\'' . $blocks[$blockcount] . '.\'] = array();';

			// Now we evaluate this assignment we've built up.
			eval($str);
		}
		else
		{
			// Top-level block.
			// Add a new iteration to this block with the variable assignments
			// we were given.
			$this->_tpldata[$blockname . '.'] = array();
		}

		return true;
	}

}

//
//=============[ Events handler ]=========================
//

if ( defined('CM_EVENT') )
{
	class cash_events
	{
		var $events;
		function cash_events()
		{
			global $db;
			$this->events = array();
			$sql = "SELECT *
					FROM " . CASH_EVENTS_TABLE;
			if ( !$result = $db->sql_query($sql) )
			{
				message_die(CRITICAL_ERROR, "Could not query events information", "", __LINE__, __FILE__, $sql);
			}
			while ( $row = $db->sql_fetchrow($result) )
			{
				$this->events[$row['event_name']] = $row['event_data'];
			}
		}
		function get_event_data($string)
		{
			global $board_config;
			if ( $board_config['cash_disable'])
			{
				return array();
			}
			if ( isset($this->events[$string]) )
			{
				return cash_event_unpack($this->events[$string]);
			}
			else
			{
				return array();
			}
		}
	}
	$cm_events = new cash_events();
}

//
//=============[ Memberlist handler ]=========================
//

if ( defined('CM_MEMBERLIST') )
{
	class cash_memberlist
	{
		function droplists(&$mode_types_text,&$mode_types)
		{
			global $board_config, $cash;
			if ( $board_config['cash_disable'])
			{
				return;
			}
			while ( $c_cur = &$cash->currency_next($cm_i,CURRENCY_ENABLED | CURRENCY_VIEWMEMBERLIST) )
			{
				$mode_types_text[] = $c_cur->name(true);
				$mode_types[] = 'cash_' . $c_cur->id();
			}
		}
		function modecheck($mode)
		{
			global $board_config, $cash;
			if ( $board_config['cash_disable'])
			{
				return 'cash_mod';
			}
			while ( $c_cur = &$cash->currency_next($cm_i,CURRENCY_ENABLED | CURRENCY_VIEWMEMBERLIST) )
			{
				if ( $mode == 'cash_' . $c_cur->id() )
				{
					return $mode;
				}
			}
			return 'cash_mod';
		}
		function getfield($mode)
		{
			global $cash;
			$id = substr($mode,5);
			$c_cur = &$cash->currency($id);
			return $c_cur->db();
		}
		function generate_columns(&$template,&$sql,$num_columns = 8)
		{
			global $board_config, $cash;
			if ( $board_config['cash_disable'] )
			{
				$template->assign_var('NUM_COLUMNS',$num_columns);
				return;
			}
			// whee! now that we have the $template, we can do whatever we want with it! yay!
			$cash_field = "";
			$count = $cash->currency_count(CURRENCY_ENABLED | CURRENCY_VIEWMEMBERLIST);
			$template->assign_var('NUM_COLUMNS',$count + $num_columns);
			while ( $c_cur = &$cash->currency_next($cm_i,CURRENCY_ENABLED | CURRENCY_VIEWMEMBERLIST) )
			{
				$template->assign_block_vars('cashrow',array('NAME' => $c_cur->name()));
				$cash_field .= $c_cur->db() . ', ';
			}
			if ( strstr($sql,'*') )
			{
				return;
			}
			$insertpoint = strpos($sql,'user_id');
			$sql = substr($sql,0,$insertpoint) . $cash_field . substr($sql,$insertpoint);
		}
		function listing(&$template,&$row)
		{
			global $board_config, $cash;
			if ( $board_config['cash_disable'])
			{
				return;
			}
			while ( $c_cur = &$cash->currency_next($cm_i,CURRENCY_ENABLED | CURRENCY_VIEWMEMBERLIST) )
			{
				$template->assign_block_vars('memberrow.cashrow', array('CASH_DISPLAY' => $c_cur->display($row[$c_cur->db()])));
			}
		}
	}
	$cm_memberlist = new cash_memberlist();
}

//
//=============[ Viewtopic handler ]=========================
//

if ( defined('CM_VIEWTOPIC') )
{
	class cash_viewtopic
	{
		var $template;
		function generate_columns(&$template,$forum_id,&$sql)
		{
			global $board_config, $cash;
			if ( $board_config['cash_disable'])
			{
				return '';
			}
			$this->template = new Template_plus();
			$this->template->set($template);
			$this->template->set_filenames(array(
				'cm_viewtopic' => 'cash_viewtopic.tpl')
			);
			
			if ( strstr($sql,'u.*') )
			{
				return;
			}
			$cash_field = "";
			while ( $c_cur = &$cash->currency_next($cm_i,CURRENCY_ENABLED | CURRENCY_VIEWTOPIC,$forum_id) )
			{
				$cash_field .= 'u.' . $c_cur->db() . ', ';
			}
			$insertpoint = strpos($sql,'u.user_id');
			$sql = substr($sql,0,$insertpoint) . $cash_field . substr($sql,$insertpoint);
		}
		function post_vars(&$postdata,&$userdata,$forum_id)
		{
			$template = &$this->template;
			global $board_config, $lang, $phpEx, $cash, $phpbb_root_path;
			if ( $board_config['cash_disable'])
			{
				return;
			}
			$mask = false;
			if ( $userdata['user_level'] != ADMIN )
			{
				$mask = CURRENCY_ENABLED;
				if ( $postdata['user_id'] != $userdata['user_id'] )
				{
					$mask &= CURRENCY_VIEWTOPIC;
				}
			}
			else
			{
				$forum_id = false;
			}

			while ( $c_cur = &$cash->currency_next($cm_i,$mask,$forum_id) )
			{
				$template->assign_block_vars('cashrow', array(	'CASH_DISPLAY' => $c_cur->display($postdata[$c_cur->db()])));
			}
			if ( ($cash->currency_count(CURRENCY_ENABLED | CURRENCY_EXCHANGEABLE) >= 2) && $userdata['session_logged_in'] )
			{
				$template->assign_block_vars('cashlinks',array(	'U_LINK' => append_sid($phpbb_root_path."cash.$phpEx"),
																'L_NAME' => $lang['Exchange']));
			}
			if ( $cash->currency_count(CURRENCY_ENABLED | CURRENCY_DONATE,$forum_id) && ($userdata['user_id'] != $postdata['user_id']) && $userdata['session_logged_in'] )
			{
				$template->assign_block_vars('cashlinks',array(	'U_LINK' => append_sid($phpbb_root_path.'cash.'.$phpEx.'?mode=donate&amp;ref=viewtopic&'.POST_USERS_URL.'='.$postdata['user_id'].'&amp;'.POST_POST_URL.'='.$postdata['post_id']),
																'L_NAME' => $lang['Donate']));
			}
			if ( $cash->currency_count() && (($userdata['user_level'] == ADMIN) || (($userdata['user_level'] == MOD) && $cash->currency_count(CURRENCY_ENABLED | CURRENCY_MODEDIT | CURRENCY_VIEWTOPIC, $forum_id))) )
			{
				$template->assign_block_vars('cashlinks',array(	'U_LINK' => append_sid($phpbb_root_path.'cash.'.$phpEx.'?mode=modedit&amp;ref=viewtopic&'.POST_USERS_URL.'='.$postdata['user_id'].'&amp;'.POST_POST_URL.'='.$postdata['post_id']),
																'L_NAME' => sprintf($lang['Mod_usercash'],$postdata['username'])));
			}
			$template->assign_block_var_from_handle('postrow.CASH', 'cm_viewtopic');
			$template->clear_block_var('cashrow');
			$template->clear_block_var('cashlinks');
		}
	}
	$cm_viewtopic = new cash_viewtopic();
}

//
//=============[ Viewprofile handler ]=========================
//

if ( defined('CM_VIEWPROFILE') )
{
	class cash_viewprofile
	{
		function post_vars(&$old_template,&$profiledata,&$userdata)
		{
			global $board_config, $lang, $phpEx, $cash, $phpbb_root_path;
			if ( $board_config['cash_disable'])
			{
				return;
			}
			$template = new Template_plus();
			$template->set($old_template);
			$mask = false;
			if ( $userdata['user_level'] != ADMIN )
			{
				$mask = CURRENCY_ENABLED;
				if ( $profiledata['user_id'] != $userdata['user_id'] )
				{
					$mask &= CURRENCY_VIEWPROFILE;
				}
			}
			$template->set_filenames(array(
				'cm_viewprofile' => 'cash_viewprofile.tpl')
			);
			while ( $c_cur = &$cash->currency_next($cm_i,$mask) )
			{
				$template->assign_block_vars('cashrow', array(	'CASH_NAME' => $c_cur->name(),
																'CASH_AMOUNT' => $profiledata[$c_cur->db()]));
			}
			if ( $userdata['session_logged_in'] && (($cash->currency_count(CURRENCY_ENABLED | CURRENCY_EXCHANGEABLE) >= 2) || ($cash->currency_count(CURRENCY_ENABLED | CURRENCY_DONATE) && ($userdata['user_id'] != $profiledata['user_id'])) || ($cash->currency_count() && (($userdata['user_level'] == ADMIN) || (($userdata['user_level'] == MOD) && $cash->currency_count(CURRENCY_ENABLED | CURRENCY_MODEDIT))))) )
			{
				$template->assign_block_vars('switch_cashlinkson',array());
				if ( $cash->currency_count(CURRENCY_ENABLED | CURRENCY_EXCHANGEABLE) >= 2 )
				{
					$template->assign_block_vars('switch_cashlinkson.cashlinks',array(	'U_LINK' => append_sid($phpbb_root_path."cash.$phpEx"),
																						'L_NAME' => $lang['Exchange']));
				}
				if ( $cash->currency_count(CURRENCY_ENABLED | CURRENCY_DONATE) && ($userdata['user_id'] != $profiledata['user_id']) )
				{
					$template->assign_block_vars('switch_cashlinkson.cashlinks',array(	'U_LINK' => append_sid($phpbb_root_path.'cash.'.$phpEx.'?mode=donate&amp;ref=viewprofile&amp;'.POST_USERS_URL.'='.$profiledata['user_id']),
																						'L_NAME' => $lang['Donate']));
				}
				if ( $cash->currency_count() && (($userdata['user_level'] == ADMIN) || (($userdata['user_level'] == MOD) && $cash->currency_count(CURRENCY_ENABLED | CURRENCY_MODEDIT))) )
				{
					$template->assign_block_vars('switch_cashlinkson.cashlinks',array(	'U_LINK' => append_sid($phpbb_root_path.'cash.'.$phpEx.'?mode=modedit&amp;ref=viewprofile&amp;'.POST_USERS_URL.'='.$profiledata['user_id']),
																						'L_NAME' => sprintf($lang['Mod_usercash'],$profiledata['username'])));
				}
			}
			$template->assign_block_var_from_handle('CASH', 'cm_viewprofile');
		}
	}
	$cm_viewprofile = new cash_viewprofile();
}

//
//=============[ Posting handler ]=========================
//

if ( defined('CM_POSTING') )
{
	class cash_posting
	{
		function update_post($mode, &$post_data, $forum_id, $topic_id, $post_id, $topic_type, $bbcode_uid, $post_username, &$post_message)
		{
			global $board_config, $userdata;
			if ( $board_config['cash_disable'] || (($mode != 'newtopic') && ($mode != 'reply') && ($mode != 'editpost')) )
			{
				return '';
			}
			$first_post = $post_data['first_post'];
			$poster_id = $userdata['user_id'];
			$old_message = '';
			$new_bbcode = $bbcode_uid;
			$old_bbcode = '';
			if ( $mode == 'editpost' )
			{
				$poster_id = $post_data['poster_id'];
				$old_message = &$post_data['post_text'];
				$old_bbcode = $post_data['bbcode_uid'];
			}
			if ( $mode == 'reply' )
			{
				$topic_starter = $post_data['topic_poster'];
			}
			else
			{
				$topic_starter = false;
			}
			return $this->cash_update($mode, $poster_id, $first_post, $old_message, $post_message, $forum_id, $topic_id, $post_id, $new_bbcode, $topic_starter, $old_bbcode);
		}
		function update_delete($mode, &$post_data, $forum_id, $topic_id, $post_id)
		{
			global $board_config;
			if ( $board_config['cash_disable'] || ($mode != 'delete') )
			{
				return;
			}
			$first_post = $post_data['first_post'];
			$poster_id = $post_data['poster_id'];
			$new_message = '';
			$new_bbcode = '';
			$old_bbcode = $post_data['bbcode_uid'];
			$topic_starter = ANONYMOUS;
			$this->cash_update($mode, $poster_id, $first_post, $post_data['post_text'], $new_message, $forum_id, $topic_id, $post_id, $new_bbcode, $topic_starter, $old_bbcode);
		}
		function cash_update($mode, $poster_id, $first_post, &$old_message, &$new_message, $forum_id, $topic_id, $post_id, $new_bbcode, $topic_starter, $old_bbcode)
		{
			global $board_config, $lang, $db, $phpbb_root_path, $phpEx, $userdata, $cash;

			if ( ($mode == 'reply') && ($poster_id != $topic_starter) && ($topic_userdata = get_userdata($topic_starter)) )
			{
				$topic_creator = new cash_user($topic_starter,$topic_userdata);
				$topic_creator->give_bonus($topic_id);
			}
			if ( $poster_id == ANONYMOUS )
			{
				return;
			}
			if ( $userdata['user_id'] == $poster_id )
			{
				$posting_user = new cash_user($userdata['user_id'], $userdata);
			}
			else
			{
				$posting_user = new cash_user($poster_id);
			}
			$all_active = true;
			$forumcount = array();
			$forumlist = array();
			if ( (($mode == 'newtopic') || ($mode == 'reply')) && (intval($board_config['cash_disable_spam_num']) > 0) )
			{
				$all_active = false;
				$interval = time() - (3600 * intval($board_config['cash_disable_spam_time']));
				$sum = 0;
				$sql = "SELECT forum_id, count(post_id) as postcount
					FROM " . POSTS_TABLE . "
					WHERE poster_id = $poster_id
						AND post_time > $interval
					GROUP BY forum_id";
				if ( !($result = $db->sql_query($sql)) )
				{
					message_die(GENERAL_ERROR, 'Error retrieving post data', '', __LINE__, __FILE__, $sql);
				}
				while ( $row = $db->sql_fetchrow($result) )
				{
					$forumlist[] = $row['forum_id'];
					$forumcount[$row['forum_id']] = $row['postcount'];
					$sum += $row['postcount'];
				}
				if ( $sum < $board_config['cash_disable_spam_num'] )
				{
					$all_active = true;
				}
			}
			$new_len = array(strlen($new_message),cash_quotematch($new_message,$new_bbcode));
			$old_len = array(strlen($old_message),cash_quotematch($old_message,$old_bbcode));
			$sql_clause = array();
			$message_clause = array();
			$reply_bonus = array();
			$all_spam = !$all_active;
			while ( $c_cur = &$cash->currency_next($cm_i,CURRENCY_ENABLED,$forum_id) )
			{
				$this_enabled = $all_active;
				if ( !$all_active )
				{
					$sum = 0;
					for ( $i = 0; $i < count($forumlist); $i++ )
					{
						if ( $c_cur->forum_active($forumlist[$i]) )
						{
							$sum += $forumcount[$forumlist[$i]];
						}
					}
					if ( $sum < $board_config['cash_disable_spam_num'] )
					{
						$this_enabled = true;
						$all_spam = false;
					}
				}
				if ( $this_enabled )
				{
					$base = ( $first_post ) ? $posting_user->get_setting($c_cur->id(),'cash_perpost') : $posting_user->get_setting($c_cur->id(),'cash_perreply');
					$perchar = $posting_user->get_setting($c_cur->id(),'cash_perchar',PERCHAR_DEC_BONUS);
					$max = $posting_user->get_setting($c_cur->id(),'cash_maxearn');
					$quotes = ( $c_cur->mask(CURRENCY_INCLUDEQUOTES) ) ? 0 : 1;

					$total_added = ( $mode != 'delete' ) ? min($max,$base + ($perchar * $new_len[$quotes])) : 0;
					$total_removed = ( ($mode != 'newtopic') && ($mode != 'reply') ) ? min($max,$base + ($perchar * $old_len[$quotes])) : 0;
					$total_change = $total_added - $total_removed;
					if ( $total_change != 0 )
					{
						$change_sign = ($total_change > 0);
						$change_amount = ( ( $change_sign ) ? $total_change : (-$total_change) );
						$change_sign = ( ( $change_sign ) ? " + " : " - " );
						$sql_clause[] = $c_cur->db() . " = " . $c_cur->db() . $change_sign . $change_amount;
						$message_clause[] = $c_cur->display($change_amount);
					}
				}
			}
			if ( $all_spam )
			{
				return $board_config['cash_disable_spam_message'];
			}
			if ( count($sql_clause) > 0 )
			{
				$sql = "UPDATE " . USERS_TABLE . " 
					SET " . implode(', ',$sql_clause) . "
					WHERE user_id = " . $poster_id;
				if ( !$db->sql_query($sql) )
				{
					message_die(GENERAL_ERROR, 'Error in updating cash', '', __LINE__, __FILE__, $sql);
				}
			}
			return ( ($userdata['user_id'] == $poster_id) && ($board_config['cash_display_after_posts'] == 1) ) ? sprintf($board_config['cash_post_message'],implode(', ',$message_clause)) : '';
		}
	}
	$cm_posting = new cash_posting();
}

//
//=============[ END Page-Specific Classes ]=========================
//

?>

[mxbb-commits] mx_phpbb/contrib - New directory

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_phpbb/contrib
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1280/contrib

Log Message:
Directory /cvsroot/mxbb/mx_phpbb/contrib added to the repository
--> Using per-directory sticky tag `core28x'

[mxbb-commits] core/modules/mx_phpbb2blocks db_install.php, 1.3, 1.4 db_upgrade.php, 1.4, 1.5

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_phpbb2blocks
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22896/mx_phpbb2blocks

Modified Files:
	db_install.php db_upgrade.php 
Log Message:


Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/db_install.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** db_install.php	5 May 2007 20:13:39 -0000	1.3
--- db_install.php	18 Dec 2007 07:30:01 -0000	1.4
***************
*** 33,37 ****
  
  $mx_module_version = 'mxBB Core Module';
! $mx_module_copy = 'Original mxBB <i>Last Posts</i> module by <a href="http://www.mxbb.net" target="_blank"> The mxBB Development Team</a>';
  
  $message = "<b>This is a fresh install!</b><br/><br/>";
--- 33,37 ----
  
  $mx_module_version = 'mxBB Core Module';
! $mx_module_copy = 'Original mxBB <i>phpBB2Blocks</i> module by <a href="http://www.mxbb.net" target="_blank"> The mxBB Development Team</a>';
  
  $message = "<b>This is a fresh install!</b><br/><br/>";

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/db_upgrade.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** db_upgrade.php	21 Jul 2007 23:08:19 -0000	1.4
--- db_upgrade.php	18 Dec 2007 07:30:01 -0000	1.5
***************
*** 33,37 ****
  
  $mx_module_version = 'mxBB Core Module';
! $mx_module_copy = 'Original mxBB <i>Last Posts</i> module by <a href="http://www.mxbb.net" target="_blank"> The mxBB Development Team</a>';
  
  $message = "<b>Upgrading!</b><br/><br/>";
--- 33,37 ----
  
  $mx_module_version = 'mxBB Core Module';
! $mx_module_copy = 'Original mxBB <i>phpBB2Blocks</i> module by <a href="http://www.mxbb.net" target="_blank"> The mxBB Development Team</a>';
  
  $message = "<b>Upgrading!</b><br/><br/>";

[mxbb-commits] core/modules/mx_phpbb3blocks db_install.php, NONE, 1.1 db_upgrade.php, NONE, 1.1

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22896/mx_phpbb3blocks

Added Files:
	db_install.php db_upgrade.php 
Log Message:


--- NEW FILE: db_install.php ---
<?php
/**
*
* @package mxBB Portal Module - mx_phpbb3blocks
* @version $Id: db_install.php,v 1.1 2007/12/18 07:30:02 orynider Exp $
* @copyright (c) 2002-2006 mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://www.mxbb.net
*
*/

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 = 'mxBB Core Module';
$mx_module_copy = 'Original mxBB <i>phpBB3Blocks</i> module by <a href="http://www.mxbb.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: db_upgrade.php ---
<?php
/**
*
* @package mxBB Portal Module - mx_phpbb3blocks
* @version $Id: db_upgrade.php,v 1.1 2007/12/18 07:30:03 orynider Exp $
* @copyright (c) 2002-2006 mxBB Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://www.mxbb.net
*
*/

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 = 'mxBB Core Module';
$mx_module_copy = 'Original mxBB <i>phpBB3Blocks</i> module by <a href="http://www.mxbb.net" target="_blank"> OryNider</a>';

$message = "<b>Upgrading!</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 );
$message .= "<b>...Now upgraded to v. $mx_module_version :-)</b><br/><br/>";

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 />";

?>

[mxbb-commits] mx_pafiledb/pafiledb/includes functions_pafiledb.php, 1.50, 1.51

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31943

Modified Files:
	functions_pafiledb.php 
Log Message:
valid images screenshots extensions are not fobiten but allowed :P

Index: functions_pafiledb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_pafiledb.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** functions_pafiledb.php	23 Sep 2007 17:49:36 -0000	1.50
--- functions_pafiledb.php	18 Dec 2007 01:01:24 -0000	1.51
***************
*** 1774,1783 ****
  		}
  
! 		$forbidden_ss_extensions = array('jpg', 'gif', 'png');
! 		$ss_file_extension = $pafiledb_functions->get_extension( $ss_name );
  
! 		if ( in_array( $ss_file_extension, $forbidden_ss_extensions ) )
  		{
! 			$this->error[] = 'You are not allowed to upload this type of screenshot image';
  		}
  
--- 1774,1787 ----
  		}
  
! 		$allowed_ss_extensions = array('jpg', 'gif', 'png');
  
! 		if ( !empty( $ss_name ) )
  		{
! 			$ss_file_extension = $pafiledb_functions->get_extension( $ss_name );
! 
! 			if ( !in_array( $ss_file_extension, $allowed_ss_extensions ) )
! 			{
! 				$this->error[] = 'You are not allowed to upload this type of screenshot image';
! 			}
  		}
  

[mxbb-commits] core/includes mx_functions_style.php, 1.27, 1.28 page_header.php, 1.47, 1.48

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7454

Modified Files:
	mx_functions_style.php page_header.php 
Log Message:
some contants defined for prosilver template.

Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** page_header.php	19 Nov 2007 16:39:56 -0000	1.47
--- page_header.php	17 Dec 2007 07:02:08 -0000	1.48
***************
*** 440,443 ****
--- 440,444 ----
  	'S_CONTENT_DIR_LEFT' => $lang['LEFT'],
  	'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'],
+ 	'S_USER_LANG' => $mx_user->lang['default_lang'],
  	'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone),
  	'S_LOGIN_ACTION' => mx_append_sid(PORTAL_URL . 'login.'.$phpEx),

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** mx_functions_style.php	17 Dec 2007 01:02:46 -0000	1.27
--- mx_functions_style.php	17 Dec 2007 07:02:08 -0000	1.28
***************
*** 540,544 ****
  			if ( !empty($this->data['user_lang']))
  			{
- 			
  				switch (PORTAL_BACKEND)
  				{
--- 540,543 ----

[mxbb-commits] core/modules/mx_textblocks/templates/prosilver/admin index.htm, NONE, 1.1 mx_module_parameters.html, NONE, 1.1

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_textblocks/templates/prosilver/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7088

Added Files:
	index.htm mx_module_parameters.html 
Log Message:


--- NEW FILE: mx_module_parameters.html ---
				<!-- BEGIN switch_bbcodes -->
				<script language="JavaScript" type="text/javascript">
				<!--
				// bbCode control by
				// subBlue design
				// www.subBlue.com

				// Startup variables
				var imageTag = false;
				var theSelection = false;

				// Check for Browser & Platform for PC & IE specific bits
				// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
				var clientPC = navigator.userAgent.toLowerCase(); // Get client info
				var clientVer = parseInt(navigator.appVersion); // Get browser version

				var is_ie = ((clientPC.indexOf("msie") != -1) && (clientPC.indexOf("opera") == -1));
				var is_nav = ((clientPC.indexOf('mozilla')!=-1) && (clientPC.indexOf('spoofer')==-1)
				                && (clientPC.indexOf('compatible') == -1) && (clientPC.indexOf('opera')==-1)
				                && (clientPC.indexOf('webtv')==-1) && (clientPC.indexOf('hotjava')==-1));
				var is_moz = 0;

				var is_win = ((clientPC.indexOf("win")!=-1) || (clientPC.indexOf("16bit") != -1));
				var is_mac = (clientPC.indexOf("mac")!=-1);

				// Helpline messages
				b_help = "{L_BBCODE_B_HELP}";
				i_help = "{L_BBCODE_I_HELP}";
				u_help = "{L_BBCODE_U_HELP}";
				q_help = "{L_BBCODE_Q_HELP}";
				c_help = "{L_BBCODE_C_HELP}";
				l_help = "{L_BBCODE_L_HELP}";
				o_help = "{L_BBCODE_O_HELP}";
				p_help = "{L_BBCODE_P_HELP}";
				w_help = "{L_BBCODE_W_HELP}";
				a_help = "{L_BBCODE_A_HELP}";
				s_help = "{L_BBCODE_S_HELP}";
				f_help = "{L_BBCODE_F_HELP}";

				// Define the bbCode tags
				bbcode = new Array();
				bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]');
				imageTag = false;

				// Shows the help messages in the helpline window
				function helpline(help) {
					document.post.helpbox.value = eval(help + "_help");
				}


				// Replacement for arrayname.length property
				function getarraysize(thearray) {
					for (i = 0; i < thearray.length; i++) {
						if ((thearray[i] == "undefined") || (thearray[i] == "") || (thearray[i] == null))
							return i;
						}
					return thearray.length;
				}

				// Replacement for arrayname.push(value) not implemented in IE until version 5.5
				// Appends element to the array
				function arraypush(thearray,value) {
					thearray[ getarraysize(thearray) ] = value;
				}

				// Replacement for arrayname.pop() not implemented in IE until version 5.5
				// Removes and returns the last element of an array
				function arraypop(thearray) {
					thearraysize = getarraysize(thearray);
					retval = thearray[thearraysize - 1];
					delete thearray[thearraysize - 1];
					return retval;
				}


				function checkForm() {

					formErrors = false;

					if (document.post.{SELECT_NAME}.value.length < 2) {
						formErrors = "{L_EMPTY_MESSAGE}";
					}

					if (formErrors) {
						alert(formErrors);
						return false;
					} else {
						bbstyle(-1);
						//formObj.preview.disabled = true;
						//formObj.submit.disabled = true;
						return true;
					}
				}

				function emoticon(text) {
					var txtarea = document.post.{SELECT_NAME};
					text = ' ' + text + ' ';
					if (txtarea.createTextRange && txtarea.caretPos) {
						var caretPos = txtarea.caretPos;
						caretPos.text = caretPos.text.charAt(caretPos.text.length - 1) == ' ' ? caretPos.text + text + ' ' : caretPos.text + text;
						txtarea.focus();
					} else {
						txtarea.value  += text;
						txtarea.focus();
					}
				}

				function bbfontstyle(bbopen, bbclose) {
					var txtarea = document.post.{SELECT_NAME};

					if ((clientVer >= 4) && is_ie && is_win) {
						theSelection = document.selection.createRange().text;
						if (!theSelection) {
							txtarea.value += bbopen + bbclose;
							txtarea.focus();
							return;
						}
						document.selection.createRange().text = bbopen + theSelection + bbclose;
						txtarea.focus();
						return;
					}
					else if (txtarea.selectionEnd && (txtarea.selectionEnd - txtarea.selectionStart > 0))
					{
						mozWrap(txtarea, bbopen, bbclose);
						return;
					}
					else
					{
						txtarea.value += bbopen + bbclose;
						txtarea.focus();
					}
					storeCaret(txtarea);
				}


				function bbstyle(bbnumber) {
					var txtarea = document.post.{SELECT_NAME};

					txtarea.focus();
					donotinsert = false;
					theSelection = false;
					bblast = 0;

					if (bbnumber == -1) { // Close all open tags & default button names
						while (bbcode[0]) {
							butnumber = arraypop(bbcode) - 1;
							txtarea.value += bbtags[butnumber + 1];
							buttext = eval('document.post.addbbcode' + butnumber + '.value');
							eval('document.post.addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
						}
						imageTag = false; // All tags are closed including image tags :D
						txtarea.focus();
						return;
					}

					if ((clientVer >= 4) && is_ie && is_win)
					{
						theSelection = document.selection.createRange().text; // Get text selection
						if (theSelection) {
							// Add tags around selection
							document.selection.createRange().text = bbtags[bbnumber] + theSelection + bbtags[bbnumber+1];
							txtarea.focus();
							theSelection = '';
							return;
						}
					}
					else if (txtarea.selectionEnd && (txtarea.selectionEnd - txtarea.selectionStart > 0))
					{
						mozWrap(txtarea, bbtags[bbnumber], bbtags[bbnumber+1]);
						return;
					}

					// Find last occurance of an open tag the same as the one just clicked
					for (i = 0; i < bbcode.length; i++) {
						if (bbcode[i] == bbnumber+1) {
							bblast = i;
							donotinsert = true;
						}
					}

					if (donotinsert) {		// Close all open tags up to the one just clicked & default button names
						while (bbcode[bblast]) {
								butnumber = arraypop(bbcode) - 1;
								txtarea.value += bbtags[butnumber + 1];
								buttext = eval('document.post.addbbcode' + butnumber + '.value');
								eval('document.post.addbbcode' + butnumber + '.value ="' + buttext.substr(0,(buttext.length - 1)) + '"');
								imageTag = false;
							}
							txtarea.focus();
							return;
					} else { // Open tags

						if (imageTag && (bbnumber != 14)) {		// Close image tag before adding another
							txtarea.value += bbtags[15];
							lastValue = arraypop(bbcode) - 1;	// Remove the close image tag from the list
							document.post.addbbcode14.value = "Img";	// Return button back to normal state
							imageTag = false;
						}

						// Open tag
						txtarea.value += bbtags[bbnumber];
						if ((bbnumber == 14) && (imageTag == false)) imageTag = 1; // Check to stop additional tags after an unclosed image tag
						arraypush(bbcode,bbnumber+1);
						eval('document.post.addbbcode'+bbnumber+'.value += "*"');
						txtarea.focus();
						return;
					}
					storeCaret(txtarea);
				}

				// From http://www.massless.org/mozedit/
				function mozWrap(txtarea, open, close)
				{
					var selLength = txtarea.textLength;
					var selStart = txtarea.selectionStart;
					var selEnd = txtarea.selectionEnd;
					if (selEnd == 1 || selEnd == 2)
						selEnd = selLength;

					var s1 = (txtarea.value).substring(0,selStart);
					var s2 = (txtarea.value).substring(selStart, selEnd)
					var s3 = (txtarea.value).substring(selEnd, selLength);
					txtarea.value = s1 + open + s2 + close + s3;
					return;
				}

				// Insert at Claret position. Code from
				// http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
				function storeCaret(textEl) {
					if (textEl.createTextRange) textEl.caretPos = document.selection.createRange().duplicate();
				}

				//-->
				</script>
				<!-- END switch_bbcodes -->

				<!-- BEGIN tinyMCE -->
				<script language="javascript" type="text/javascript" src="{tinyMCE.PATH}modules/mx_shared/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
				<script language="javascript" type="text/javascript">
				   tinyMCE.init({
				      	mode : "textareas",
				      	theme : "advanced",
						language : "{tinyMCE.LANG}",
                        docs_language : "{tinyMCE.LANG}",
				      	plugins : "table,advhr,advimage,advlink,emotions,insertdatetime,preview,zoom,flash,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable",
						theme_advanced_buttons1_add_before : "newdocument,separator",
						theme_advanced_buttons1_add : "fontselect,fontsizeselect",
						theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,separator,forecolor,backcolor",
						theme_advanced_buttons2_add_before: "cut,copy,paste,pastetext,pasteword,separator,search,replace,separator",
						theme_advanced_buttons3_add_before : "tablecontrols,separator",
						theme_advanced_buttons3_add : "emotions,flash,advhr,separator,print,separator,ltr,rtl,separator,fullscreen",
						theme_advanced_toolbar_location : "top",
						theme_advanced_toolbar_align : "left",
						theme_advanced_path_location : "bottom",
				      	content_css : "{tinyMCE.TEMPLATE}",
				      	relative_urls : false,
				      	extended_valid_elements : "td[*],div[*],form[*],input[*]"
				   });
				</script>
				<!-- END tinyMCE -->

				<!-- Module Block Parameter -->
				<!-- BEGIN preview -->
				<p></p>
				<div class="panel bg1" id="preview">
					<div class="inner"><span class="corners-top"><span></span></span>
					<div class="postbody">
						<h2>{L_PREVIEW}</h2>
						<div class="content">{TEXT}</div>
					</div>
					<span class="corners-bottom"><span></span></span></div>
				</div>
				<p></p>
				<!-- END preview -->

<!-- BEGIN switch_bbcodes -->
<fieldset class="fields1">
<!-- END switch_bbcodes -->			
<div id="smiley-box">
	<!-- BEGIN switch_smilies -->
	<h3>{L_EMOTICONS}</h3>
	<!-- END switch_smilies -->
	<!-- BEGIN smilies_row -->
	<!-- BEGIN smilies_col -->
	<a href="javascript:emoticon('{smilies_row.smilies_col.SMILEY_CODE}')"><img src="{smilies_row.smilies_col.SMILEY_IMG}" alt="{smilies_row.smilies_col.SMILEY_DESC}" title="{smilies_row.smilies_col.SMILEY_DESC}" /></a>
	<!-- END smilies_col -->
	<!-- END smilies_row -->
	<br />
	<!-- BEGIN switch_smilies_extra -->
	<a href="{U_MORE_SMILIES}" onclick="window.open('{U_MORE_SMILIES}', '_phpbbsmilies', 'HEIGHT=300,resizable=yes,scrollbars=yes,WIDTH=250');return false;" target="_phpbbsmilies" class="nav">{L_MORE_SMILIES}</a>
	<!-- END switch_smilies_extra -->
	<hr />
	{BBCODE_STATUS}<br />
	{HTML_STATUS}<br />
	{SMILIES_STATUS}
</div>
	<div id="message-box">
  		<!-- BEGIN textblock -->
		<h3>{textblock.PARAMETER_TITLE}</h3>
		{textblock.PARAMETER_TYPE}<br />
		{textblock.PARAMETER_TYPE_EXPLAIN}
		<div id="format-buttons">
			<input type="button" class="button2" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px" onclick="bbstyle(0)" onMouseOver="helpline('b')" title="{L_BBCODE_B_HELP}" />
			<input type="button" class="button2" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px" onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}" />
			<input type="button" class="button2" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px" onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}" />
			<input type="button" class="button2" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}" />
			<input type="button" class="button2" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}" />
			<input type="button" class="button2" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}" />
			<input type="button" class="button2" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}" />
			<input type="button" class="button2" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}" />
			<input type="button" class="button2" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}" />
			&nbsp;{L_FONT_SIZE}:
			<select name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_FONT_SIZE}">
				<option value="7">{L_FONT_TINY}</option>
				<option value="9">{L_FONT_SMALL}</option>
				<option value="12" selected="selected">{L_FONT_NORMAL}</option>
				<option value="18">{L_FONT_LARGE}</option>
				<option value="24">{L_FONT_HUGE}</option>
			</select>
		</div>
		<br />
		<textarea name="{SELECT_NAME}" rows="20" cols="35" wrap="virtual" style="width:550px" tabindex="3" class="post" {TEXTAREA_BBCODES_XTRA}>{textblock.TEXT}</textarea>
		<!-- END textblock -->
</div>
</fieldset>
	<div>
		<div class="inner">
		<fieldset class="submit-buttons">
		<input type="submit" tabindex="5" name="preview" class="button2" value="{L_PREVIEW}" />
		</fieldset>
		</div>
	</div>
--- 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>

[mxbb-commits] core/modules/mx_navmenu/templates/prosilver/admin index.htm, NONE, 1.1 mx_module_parameters.html, NONE, 1.1

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/prosilver/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7074

Added Files:
	index.htm mx_module_parameters.html 
Log Message:


--- NEW FILE: mx_module_parameters.html ---
<script type="text/javascript">
function getCookie(name)
{
	var cookies = document.cookie;
	var start = cookies.indexOf(name + '=');
	if( start < 0 ) return null;
	var len = start + name.length + 1;
	var end = cookies.indexOf(';', len);
	if( end < 0 ) end = cookies.length;
	return unescape(cookies.substring(len, end));
}
function setCookie(name, value, expires, path, domain, secure)
{
	document.cookie = name + '=' + escape (value) +
		((expires) ? '; expires=' + ( (expires == 'never') ? 'Thu, 31-Dec-2099 23:59:59 GMT' : expires.toGMTString() ) : '') +
		((path)    ? '; path='    + path    : '') +
		((domain)  ? '; domain='  + domain  : '') +
		((secure)  ? '; secure' : '');
}
function delCookie(name, path, domain)
{
	if( getCookie(name) )
	{
		document.cookie = name + '=;expires=Thu, 01-Jan-1970 00:00:01 GMT' +
			((path)    ? '; path='    + path    : '') +
			((domain)  ? '; domain='  + domain  : '');
	}
}

function handleError() {
 	return true;
} 

window.onerror = handleError;

function menuCat(id, mode, visible, page_nav, block_nav, function_nav)
{
	this.cat_id = id;
	this.block_nav = block_nav;
	this.page_nav = page_nav;
	this.function_nav = function_nav;
	this.menu_mode = mode;
	this.status = visible != '' ? visible : 'none';
}
var menuCats = new Array();

function getObj(obj)
{
	return ( document.getElementById ? document.getElementById(obj) : ( document.all ? document.all[obj] : null ) );
}
function displayObj(obj, status)
{
	var x = getObj(obj);
	if( x && x.style ) x.style.display = status;
}

var queueInterval = 0;		// milliseconds between queued steps.
var execInterval = 0;
var queuedSteps;
var currentStep;

function queueStep(o, s)
{
	this.obj = o;
	this.status = s;
}
function execQueue()
{
	if( currentStep < queuedSteps.length )
	{
		var obj = queuedSteps[currentStep].obj;
		var status = queuedSteps[currentStep].status;
		displayObj(obj, status);
		if( menuCats[obj] ) menuCats[obj].status = status;
		currentStep++;
		setTimeout("execQueue();", execInterval);
	}
	else
	{
		execInterval = queueInterval;
	}
}
function onMenuCatClick(cat_id, type, init)
{
	var currentCat, currentStatus;
	var imageSCR = type+'image_'+cat_id;
	var strSubmitContent = '';
	
	parentCatMode = 'adminCat_';
	parentCatEditMode = 'adminCatEdit_';
	parentCatDeleteMode = 'adminCatDelete_';
	
	parentMenuEditMode = 'adminMenuEdit_';
	parentMenuDeleteMode = 'adminMenuDelete_';
	
	parentCat = parentCatMode + cat_id;
	parentCatEdit = parentCatEditMode + cat_id;
	parentCatDelete = parentCatDeleteMode + cat_id;
	
	parentMenuEdit = parentMenuEditMode + cat_id;
	parentMenuDelete = parentMenuDeleteMode + cat_id;
	
	currentCat = type + cat_id;
	
	currentStatus = menuCats[currentCat].status;

	queuedSteps = new Array();
	cookieArray = new Array();
	
	currentStep = 0;

	for( var forCat in menuCats )
	{
		if( (init == 'true' && (menuCats[forCat].status == 'block') && menuCats[forCat].menu_mode == parentCat) || 
			(init != 'true' && 
				( 	(currentCat == parentCat && menuCats[forCat].status == 'block') ||
					(currentCat == parentCatEdit && menuCats[forCat].menu_mode != parentCat && menuCats[forCat].status == 'block') ||
					(currentCat == parentCatDelete && menuCats[forCat].menu_mode != parentCat && menuCats[forCat].status == 'block') ||
				
					(currentCat == parentMenuEdit && menuCats[forCat].menu_mode != parentCatMode && menuCats[forCat].status == 'block') ||
					(currentCat == parentMenuDelete && menuCats[forCat].menu_mode != parentCatMode && menuCats[forCat].status == 'block')
					
					 

			 	)))
		{
			queuedSteps[currentStep++] = new queueStep(forCat, 'none');
			menuCats[forCat].status = 'none';
			
			forCatimage = menuCats[forCat].menu_mode+'image_'+menuCats[forCat].cat_id;
			if( document.images && document.images[forCatimage] )
			{
				document.images[forCatimage].src = '{IMG_URL_EXPAND}';
			}
		}
	}

	if( currentStatus == 'none' )
	{
		if (menuCats[parentCat] && menuCats[currentCat].menu_mode != parentMenuEditMode && menuCats[currentCat].menu_mode != parentMenuDeleteMode)
		{
			if (menuCats[parentCat].status == 'none')
			{
				queuedSteps[currentStep++] = new queueStep(parentCat, 'block');
				menuCats[parentCat].status = 'block';
				
				forCatimage = menuCats[parentCat].menu_mode+'image_'+menuCats[parentCat].cat_id;
				if( document.images && document.images[forCatimage] )
				{
					document.images[forCatimage].src = '{IMG_URL_CONTRACT}';
				}			
			}
		}
				
		queuedSteps[currentStep++] = new queueStep(currentCat, 'block');
		menuCats[currentCat].status = 'block';
		
		if (currentCat == parentCat)
		{		
			var	expdate = new Date();		// 72 Hours from now
			expdate.setTime(expdate.getTime() + (72 * 60 * 60 * 1000));
			setCookie('{COOKIE_NAME}_'+type+'xxx_id', cat_id, expdate,
					('{COOKIE_PATH}'   == '') ? null : '{COOKIE_PATH}',
					('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}',
					('{COOKIE_SECURE}' == '0') ? false : true);
		}
				
		if( document.images && document.images[imageSCR] )
		{
			document.images[imageSCR].src = '{IMG_URL_CONTRACT}';
		}

		
		// Update Form Selects - on the fly
		if (parentCatEditMode == type)
		{
			EditForm = 'form_' + parentCatEditMode + cat_id;
			duplicateForm(document.fromForm.pages, document.forms[EditForm].cat_url_sel, menuCats[currentCat].page_nav);	
		}
		
		if (parentMenuEditMode == type)
		{
			EditForm = 'form_' + parentMenuEditMode + cat_id;
			duplicateForm(document.fromForm.blocks, document.forms[EditForm].block_nav, menuCats[currentCat].block_nav);	
			duplicateForm(document.fromForm.pages, document.forms[EditForm].page_nav, menuCats[currentCat].page_nav);	
			duplicateForm(document.fromForm.functions, document.forms[EditForm].function_id, menuCats[currentCat].function_nav);	
		}
	}
	else
	{
		delCookie('{COOKIE_NAME}_'+type+'xxx_id',
				('{COOKIE_PATH}'   == '') ? null : '{COOKIE_PATH}',
				('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}');
	}
	
	for( var forCat in menuCats )
	{	
		if ( menuCats[forCat].status == 'block' )
		{
			strSubmitContent += forCat + ',';
		}
	}	

	// Remove trailing separator
	strSubmitContent = strSubmitContent.substr(0, strSubmitContent.length - 1);	

	setCookie('{COOKIE_NAME}_admincp_menustates', strSubmitContent, expdate,
			('{COOKIE_PATH}'   == '') ? null : '{COOKIE_PATH}',
			('{COOKIE_DOMAIN}' == '') ? null : '{COOKIE_DOMAIN}',
			('{COOKIE_SECURE}' == '0') ? false : true);	
					
	currentStep = 0;
	setTimeout("execQueue();", execInterval);
}

function deleteOption(object,index) {
    object.options[index] = null;
}

function addOption(object,text,value, selectedValue) {
    var defaultSelected = false;
    var selected = false;
    
    if (value == selectedValue)
    {
    	defaultSelected = true;
    	selected = true;
    }
    
    var optionName = new Option(text, value, defaultSelected, selected)
    object.options[object.length] = optionName;
}

function copySelected(fromObject,toObject) {
    for (var i=0, l=fromObject.options.length;i<l;i++) {
        if (fromObject.options[i].selected)
            addOption(toObject,fromObject.options[i].text,fromObject.options[i].value);
    }
    for (var i=fromObject.options.length-1;i>-1;i--) {
        if (fromObject.options[i].selected)
            deleteOption(fromObject,i);
    }
}

function copyAll(fromObject,toObject) {
    for (var i=0, l=fromObject.options.length;i<l;i++) {
        addOption(toObject,fromObject.options[i].text,fromObject.options[i].value);
    }
    
    for (var i=fromObject.options.length-1;i>-1;i--) {
        deleteOption(fromObject,i);
    }
}

function duplicateForm(fromObject,toObject, selectedValue) 
{
	toObject.options.length = null;
	
    for (var i=0; i<fromObject.options.length;i++) {
        addOption(toObject,fromObject.options[i].text,fromObject.options[i].value, selectedValue);
        
        // For some reason i have to reselect, to make it work in IE (Haplo is confused here...)
        if (fromObject.options[i].value == selectedValue)
        {
        	toObject.selectedIndex = i;
        }
    }
}

// -->
</script>

<div style="display:none;">
<form name="fromForm">
	{S_GEN_BLOCK_LIST}
	{S_GEN_FUNCTION_LIST}
	{S_GEN_PAGE_LIST}
</form>
</div>

<div class="inner" style="text-transform:none;">
	<table cellspacing="1" class="blockcp">
		<col class="row1" /><col class="row2" />
		<thead>
			<tr>
				<th>{L_MENU_TITLE}</th>
				<th>&nbsp;</th>
			</tr>
		</thead>
		<tbody>
			<tr>
			<td colspan="2">{RESULT_MESSAGE}</td>
			</tr>
		</tbody>					
	<!-- BEGIN catrow -->
		<tr>
			<!-- BEGIN is_new -->
			<td><img name="adminCatEdit_image_{catrow.CAT_ID}" src="{catrow.IMG_URL_EDIT}" border="0" align="absmiddle" style="display:none">
			<div style="float:left;padding-right:6px;">
				<img src="{MX_ROOT_PATH}/templates/prosilver/images/admin_icons/icon_list.gif" alt="{L_LIST}" title="{L_LIST}" align="middle" />
			</div>
			<div>
				<b style="cursor:pointer" onclick="onMenuCatClick('{catrow.CAT_ID}','adminCatEdit_');">{catrow.CAT_TITLE}</b><br/>
				<span style="font-weight:normal">{catrow.CAT_DESC}</span>
			</div>
			</td>
			<!-- END is_new -->
			<!-- BEGIN is_cat -->
			<td><img name="adminCat_image_{catrow.CAT_ID}" src="{catrow.IMG_URL}" border="0" align="absmiddle" style="display:none">
			<div style="float:left;padding-right:6px;">
				<img src="{MX_ROOT_PATH}/templates/prosilver/images/admin_icons/icon_list.gif" alt="{L_CREATE}" title="{L_CREATE}" align="middle" />
			</div>
			<div>
				<b style="cursor:pointer" onclick="onMenuCatClick('{catrow.CAT_ID}','adminCat_');">{catrow.CAT_TITLE}</b><br/>
				<span style="font-weight:normal">{catrow.CAT_DESC}</span>
			</div>
			</td>
			<!-- END is_cat -->
			<td style="text-align:right;padding-right:6px;">
				<!-- BEGIN is_cat -->
				<img name="adminCatEdit_image_{catrow.CAT_ID}" src="{catrow.IMG_URL_EDIT}" border="0" align="absmiddle" style="display:none">
				<img name="adminCatDelete_image_{catrow.CAT_ID}" src="{catrow.IMG_URL_DELETE}" border="0" align="absmiddle" style="display:none">

				<span onclick="onMenuCatClick('{catrow.CAT_ID}','adminCatEdit_');" style="cursor:pointer"><img src="{IMG_ICON_EDIT_BLOCK}" alt="{L_EDIT}" title="{L_EDIT}" /></span>
				<a href="{catrow.U_CAT_MOVE_UP}" alt="{L_MOVE_UP}" title="{L_MOVE_UP}"><img src="{MX_ROOT_PATH}/templates/prosilver/images/admin_icons/icon_up.gif" alt="{L_MOVE_UP}" title="{L_MOVE_UP}" /></a>
				<a href="{catrow.U_CAT_MOVE_DOWN}" alt="{L_MOVE_DOWN}" title="{L_MOVE_DOWN}"><img src="{MX_ROOT_PATH}/templates/prosilver/images/admin_icons/icon_down.gif" alt="{L_MOVE_DOWN}" title="{L_MOVE_DOWN}" /></a>
				<span onClick="javascript:onMenuCatClick('{catrow.CAT_ID}','adminCatDelete_');" style="cursor:pointer"><img src="{MX_ROOT_PATH}/templates/prosilver/images/admin_icons/icon_delete.gif" alt="{L_DELETE}" title="{L_DELETE}" /></span>
				<!-- END is_cat -->
			</td>
		</tr>	
		<tr id="adminCat_{catrow.CAT_ID}" style="display:{catrow.VISIBLE};">
			<td colspan="2">
				<!-- Cat Delete -->
				<div id="adminCatDelete_{catrow.CAT_ID}" style="display:{catrow.VISIBLE_DELETE};">
					<form action="{S_ACTION}" method="post">
					<fieldset>
						<legend>{catrow.L_TITLE_DELETE}</legend>
						<dl>
							<dt>{catrow.L_MENU_NAME}</dt>
							<dd>{catrow.NAME}</dd>
						</dl>
						<dl>
							<dt><label for="move_contents_{catrow.CAT_ID}"><input type="checkbox" name="move_contents" id="move_contents_{catrow.CAT_ID}" value="1" />{catrow.L_MOVE_CONTENTS}</label></dt>
							<dd>{catrow.S_SELECT_TO}</dd>
						</dl>
						<dl>
							<dt>
							<dd>{catrow.S_HIDDEN_DELETE_FIELDS}
							<input type="submit" name="submit" value="{catrow.S_SUBMIT_DELETE}" class="button1" />
							</dd>
						</dl>
					</fieldset>
					</form>
				</div>
				<!-- Cat Delete -->
				<!-- Cat Edit -->
				<div id="adminCatEdit_{catrow.CAT_ID}" style="display:{catrow.VISIBLE_EDIT};">
					<form name="form_adminCatEdit_{catrow.CAT_ID}" action="{S_ACTION}" method="post" >
						<fieldset>
							<legend>{catrow.L_TITLE_EDIT}</legend>
							<dl>
								<dt>{catrow.L_CAT_TITLE}</dt>
								<dd><input type="text" size="25" name="cat_title" value="{catrow.E_CAT_TITLE}" /></dd>
							</dl>
							<dl>
								<dt>{catrow.L_CAT_DESC}</dt>
								<dd><textarea name="cat_desc" rows="15" cols="35" wrap="virtual" style="width:450px" tabindex="3" class="post">{catrow.E_CAT_DESC}</textarea></dd>
							</dl>
							<dl>
								<dt>{catrow.L_CAT_SHOW_CAT}</dt>
								<dd>{catrow.S_CAT_SHOW_CAT}</dd>
							</dl>
							<dl>
								<dt>{catrow.L_CAT_MENU_PAGE}</dt>
								<dd><select name="cat_url_sel" ><option value="0">0</option></select></dd>
							</dl>
							<dl>
								<dt>{catrow.L_CAT_LINK_TARGET}</dt>
								<dd>{catrow.S_CAT_LINK_TARGET_LIST}</dd>
							</dl>
							<dl>
								<dt></dt>
								<dd>{catrow.S_HIDDEN_FIELDS}
								<input type="submit" name="submit" value="{catrow.S_SUBMIT}" class="button1" /></dd>
							</dl>
						</fieldset>
					</form>
				</div>
				<!-- Cat Edit -->
				<!-- Cat MenuRow -->
				<div id="adminCat_{catrow.CAT_ID}" style="display:{catrow.VISIBLE};">
					<fieldset class="menurows">
						<legend>{L_CATMENU_EDIT} Category rows</legend>
					<!-- BEGIN menurow -->
					<div class="row" style="display:block;width:98%;">
						<div style="float:left;margin-right: 5px;">
							<img name="adminMenuEdit_image_{catrow.menurow.MENU_ID}" src="{catrow.menurow.IMG_URL_EDIT}" border="0" align="absmiddle" style="display:none">
							<img src="{IMG_ICON_EDIT_BLOCK}" alt="{L_EDIT}" title="{L_EDIT}" />
							<img src="{IMG_ICON_BLOCK}" border="0" align="absmiddle">
						</div>
						<div style="float:right">
							<!-- BEGIN is_menu -->
							<img name="adminMenuDelete_image_{catrow.menurow.MENU_ID}" src="{catrow.menurow.IMG_URL_DELETE}" border="0" align="absmiddle" style="display:none">
							
							<a href="{catrow.menurow.U_MENU_MOVE_UP}"><img src="{MX_ROOT_PATH}/templates/prosilver/images/admin_icons/icon_up.gif" alt="{L_MOVE_UP}" title="{L_MOVE_UP}" /></a>
							<a href="{catrow.menurow.U_MENU_MOVE_DOWN}"><img src="{MX_ROOT_PATH}/templates/prosilver/images/admin_icons/icon_down.gif" alt="{L_MOVE_DOWN}" title="{L_MOVE_DOWN}" /></a>
							<span><img src="{MX_ROOT_PATH}/templates/prosilver/images/admin_icons/icon_delete.gif" alt="{L_MOVE_DELETE}" title="{L_MOVE_DELETE}" /></span>
							<!-- END is_menu -->
						</div>
						<div>
							{catrow.menurow.MENU_TITLE}<br />
							<span class="explain">{catrow.menurow.MENU_DESC}</span>
						</div>
					</div>
					
					<!-- END menurow -->
					</fieldset>
				</div>
				<!-- Cat MenuRow -->
			</td>
		</tr>
	<!-- END catrow -->
	</table>
</div>

<table width="100%" cellpadding="4" cellspacing="1" border="0" align="center">
	<!-- BEGIN catrow -->
 	<tr>
 		<td class="row1">
			<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center" class="forumline">
				<tr>
					<td colspan="4" class="row1">
						<div i d="adminCat_{catrow.CAT_ID}" style="display:{catrow.VISIBLE};" class="genmed">
						<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center">
							<tr>
								<td bgcolor="#006699" width="10"></td>
								<td>							
									<table width="100%" cellpadding="0" cellspacing="0" border="0" align="center">
										<!-- BEGIN menurow -->
										<tr>
											<td class="row1" colspan="5">
												<table width="100%" cellpadding="0" cellspacing="0" border="0"  align="center">
													<tr>
														<td class="row2" width="5">&nbsp;</td>
														<td>
															<table width="100%" cellpadding="4" cellspacing="0" border="0"  align="center">		
																															
																<tr> 
																	<td width="65%" class="{catrow.menurow.ROW_CLASS}" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{catrow.menurow.MENU_ID}','adminMenuEdit_');">
																	<img name="adminMenuEdit_image_{catrow.menurow.MENU_ID}" src="{catrow.menurow.IMG_URL_EDIT}" border="0" align="absmiddle">&nbsp;<img src="{IMG_ICON_BLOCK}" border="0" align="absmiddle">
																		<span class="gensmall">{catrow.menurow.MENU_TITLE}</span><br /><span class="gensmall">{catrow.menurow.MENU_DESC}</span>
																	</td>
																	<td width="15%" class="{catrow.menurow.ROW_CLASS}" align="center" valign="middle" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{catrow.menurow.MENU_ID}','adminMenuDelete_');" >
																		<!-- BEGIN is_menu -->
																		<img name="adminMenuDelete_image_{catrow.menurow.MENU_ID}" src="{catrow.menurow.IMG_URL_DELETE}" border="0" align="absmiddle">
																		<span class="gensmall">{L_DELETE}</span>
																		<!-- END is_menu -->
																	</td>
																	<td width="20%" class="{catrow.menurow.ROW_CLASS}" align="center" valign="middle">
																		<!-- BEGIN is_menu -->
																		<span class="gensmall"><a href="{catrow.menurow.U_MENU_MOVE_UP}">{L_MOVE_UP}</a> <a href="{catrow.menurow.U_MENU_MOVE_DOWN}">{L_MOVE_DOWN}</a></span>
																		<!-- END is_menu -->
																	</td>
																</tr>
		
																<!-- Menu Delete -->
																<tr>
																<td colspan="3" class="row1">
																<div id="adminMenuDelete_{catrow.menurow.MENU_ID}" style="display:{catrow.menurow.VISIBLE_DELETE};" class="genmed">					
																  <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center">
																	<tr> 
																	  <td class="row2" colspan="2" align="center" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{catrow.menurow.MENU_ID}','adminMenuDelete_');"><img src="{IMG_URL_CONTRACT}" border="0" align="absmiddle">&nbsp;<span class="topictitle">{catrow.menurow.L_TITLE_DELETE}</span></td>
																	</tr>
																	<tr> 
																	  <td width="50%" align="center" colspan="2">
																	  	{catrow.menurow.MESSAGE_DELETE}
																	  </td>
																	</tr>
																  </table>
																</div>
																</td>
																</tr>
																<!-- Menu Delete -->																	
																		
																<!-- Menu Edit -->
																<tr>
																<td class="row1" colspan="3">
																<div id="adminMenuEdit_{catrow.menurow.MENU_ID}" style="display:{catrow.menurow.VISIBLE_EDIT};" class="genmed">
																<form name="form_adminMenuEdit_{catrow.menurow.MENU_ID}" action="{S_ACTION}" method="post">
																  <table width="100%" cellpadding="1" cellspacing="2" border="0" align="center">
																	<tr> 
																	  <td class="row2" colspan="2" align="center" style="cursor:pointer;cursor:hand;" onclick="onMenuCatClick('{catrow.menurow.MENU_ID}','adminMenuEdit_');"><img src="{IMG_URL_CONTRACT}" border="0" align="absmiddle">&nbsp;<span class="topictitle">{catrow.menurow.L_TITLE_EDIT}</span></td>
																	</tr>

																	<tr> 
																	  <td class="row1">{catrow.menurow.L_MENU_TITLE}</td>
																	  <td class="row2"><input type="text" size="45" name="menuname" value="{catrow.menurow.E_MENU_TITLE}" class="post" /></td>
																	</tr>
																	<tr> 
																	  <td class="row1">{catrow.menurow.L_MENU_DESC}</td>
																	  <td class="row2"><textarea rows="5" cols="45" wrap="virtual" name="message" class="post">{catrow.menurow.E_MENU_DESC}</textarea></td>
																	</tr>																	
																	<tr> 
																	  <td class="row1">{catrow.menurow.L_MENU_LINK_TARGET}</td>
																	  <td class="row2">{catrow.menurow.S_LINK_TARGET_LIST}</td>
																	</tr>
																	<tr> 
																	  <td class="row1" colspan="2">{catrow.menurow.L_MENU_ACTION_TITLE}</td>
																	</tr>
																	<tr> 
																	  <td class="row1">{catrow.menurow.L_MENU_PAGE}</td>
																	  <td class="row2"><select name="page_nav" ><option value="0">0</option></select></td>
																	</tr>
																	<tr> 
																	  <td class="row1">{catrow.menurow.L_MENU_LINKS}</td>
																	  <td class="row2"><input type="text" size="65" name="menulinks" value="{catrow.menurow.E_MENU_LINKS}" class="post" /></td>
																	</tr>
																	<tr> 
																	  <td class="row1">{catrow.menurow.L_MENU_BLOCK}</td>
																	  <td class="row2"><select name="block_nav" ><option value="0">0</option></select></td>
																	</tr>
																	<tr> 
																	  <td class="row1" colspan="2">{catrow.menurow.L_MENU_ACTION_ADV}</td>
																	</tr>
																	<tr> 
																	  <td class="row1">{catrow.menurow.L_MENU_FUNCTION}</td>
																	  <td class="row2"><select name="function_id" ><option value="0">0</option></select></td>
																	</tr>
																	<tr> 
																	  <td class="row1" colspan="2">{catrow.menurow.L_MENU_PERMISSIONS_TITLE}</td>
																	</tr>
																	<tr> 
																	  <td class="row1">{catrow.menurow.L_AUTH_TITLE}</td>
																  	<td class="row2"> 
																      <table cellspacing="1" cellpadding="4" border="0" class="portalline">
																    	<tr> 
																    	  <!-- BEGIN module_auth_titles -->
																    	  <th class="thTop">{catrow.menurow.module_auth_titles.CELL_TITLE}</th>
																    	  <!-- END module_auth_titles -->
																    	</tr>
																		<!-- BEGIN module_auth_data -->
																    	<tr>
																    	  <td class="row1" align="center">{catrow.menurow.module_auth_data.S_AUTH_LEVELS_SELECT}</td>
																    	</tr>
																		<tr>
																			<th class="thTop">{catrow.menurow.module_auth_data.L_AUTH_GROUP_LEVELS_SELECT}</th>
																		</tr>
																    	<tr>
																    	  <td class="row1" align="center">{catrow.menurow.module_auth_data.S_AUTH_GROUP_LEVELS_SELECT}</td>
																    	</tr>
																   	    <!-- END module_auth_data -->
																      </table>
																  	</td>
																	</tr>
																	<tr> 
																	  <td class="row1" valign="top">{catrow.menurow.L_MENU_ICON}</td>
																	  <td class="row2">{catrow.menurow.S_POSTICONS}</td>
																	</tr>	
																	<tr> 
																	  	<td class="row2" colspan="2" align="center">{catrow.menurow.S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{catrow.menurow.S_SUBMIT}" class="liteoption" /></td>
																	</tr>
																  </table>
																</form>
																</div>
																</td>
																</tr>			
																<!-- Menu Edit -->		
																
															</table>
														</td>
													</tr>
												</table>
											</td>
										</tr>
										<!-- END menurow -->
									</table>
								</td>	
							</tr>		
						</table>
						</div>
					</td>
				</tr>
			</table>
		</td>
	</tr>		
		

	<!-- END catrow -->
</table>

<script type="text/javascript">
<!-- BEGIN catrow -->
menuCats['adminCat_{catrow.CAT_ID}'] = new menuCat('{catrow.CAT_ID}', 'adminCat_', '{catrow.VISIBLE}', '', '', '');
menuCats['adminCatEdit_{catrow.CAT_ID}'] = new menuCat('{catrow.CAT_ID}', 'adminCatEdit_', '{catrow.VISIBLE_EDIT}', '{catrow.PAGE_NAV}', '', '');
menuCats['adminCatDelete_{catrow.CAT_ID}'] = new menuCat('{catrow.CAT_ID}', 'adminCatDelete_', '{catrow.VISIBLE_DELETE}', '', '', '');

if ('{catrow.VISIBLE_EDIT}' == 'block')
{
	duplicateForm(document.fromForm.pages, document.forms['form_adminCatEdit_' + '{catrow.CAT_ID}'].cat_url_sel, '{catrow.PAGE_NAV}');
}	

	<!-- BEGIN menurow -->
	menuCats['adminMenuEdit_{catrow.menurow.MENU_ID}'] = new menuCat('{catrow.menurow.MENU_ID}', 'adminMenuEdit_', '{catrow.menurow.VISIBLE_EDIT}', '{catrow.menurow.PAGE_NAV}', '{catrow.menurow.BLOCK_NAV}', '{catrow.menurow.FUNCTION_NAV}');
	menuCats['adminMenuDelete_{catrow.menurow.MENU_ID}'] = new menuCat('{catrow.menurow.MENU_ID}', 'adminMenuDelete_', '{catrow.menurow.VISIBLE_DELETE}', '', '', '');

	if ('{catrow.menurow.VISIBLE_EDIT}' == 'block')
	{
		duplicateForm(document.fromForm.blocks, document.forms['form_adminMenuEdit_' + '{catrow.menurow.MENU_ID}'].block_nav, '{catrow.menurow.BLOCK_NAV}');
		duplicateForm(document.fromForm.pages, document.forms['form_adminMenuEdit_' + '{catrow.menurow.MENU_ID}'].page_nav, '{catrow.menurow.PAGE_NAV}');
		//duplicateForm(document.fromForm.functions, document.forms['form_adminMenuEdit_' + '{catrow.menurow.MENU_ID}'].function_nav, '{catrow.menurow.FUNCTION_NAV}');
	}	
	
	<!-- END menurow -->
<!-- END catrow -->		  		
// -->
</script>	

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

[mxbb-commits] core/templates/prosilver/admin admin_mx_portal.html, NONE, 1.1 mx_blockcp_admin_body.html, 1.1, 1.2

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/templates/prosilver/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7058

Modified Files:
	mx_blockcp_admin_body.html 
Added Files:
	admin_mx_portal.html 
Log Message:


Index: mx_blockcp_admin_body.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/admin/mx_blockcp_admin_body.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_blockcp_admin_body.html	16 Dec 2007 01:56:48 -0000	1.1
--- mx_blockcp_admin_body.html	17 Dec 2007 06:57:03 -0000	1.2
***************
*** 260,270 ****
  
  {RESULT_MESSAGE}
- <!-- BEGIN mx_blockcp -->
  	<p></p>
  	<span class="corners-bottom"><span></span></span></div>
  </div>
  <!-- END mx_blockcp -->
! 
! <div id="adminBlockCP_require_refresh" style="display:block;" class="genmed">
  <div id="tabs">
  	<ul>
--- 260,270 ----
  
  {RESULT_MESSAGE}
  	<p></p>
+ <!-- BEGIN mx_blockcp -->
  	<span class="corners-bottom"><span></span></span></div>
  </div>
  <!-- END mx_blockcp -->
! <br clear="all" />
! <div id="adminBlockCP_require_refresh" style="display:block;">
  <div id="tabs">
  	<ul>

--- NEW FILE: admin_mx_portal.html ---
<h1>{L_CONFIGURATION_TITLE}</h1>

<p>{L_CONFIGURATION_EXPLAIN}</p>

<form action="{S_CONFIG_ACTION}" method="post">
<fieldset>
	<legend>{L_GENERAL_SETTINGS}</legend>
	</dl>
	<dl>
		<dt>{L_PORTAL_NAME}</dt>
		<dd><input type="text" maxlength="150" size="50" name="portal_name" value="{PORTAL_NAME}" /></dd>
	</dl>
	<dl>
		<dt>{L_PORTAL_URL}</dt>
		<dd><input type="text" maxlength="150" size="50" name="portal_url" value="{PORTAL_URL}" /></dd>
	</dl>
	<dl>
		<dt>{L_PORTAL_PHPBB_URL}</dt>
		<dd><input type="text" maxlength="150" size="50" name="portal_phpbb_url" value="{PORTAL_PHPBB_URL}" /></dd>
	</dl>
	<dl>
		<dt>{L_MX_USE_CACHE}<br /><span class="gensmall">{L_MX_USE_CACHE_EXPLAIN}</span></dd>
		<dd><input type="radio" name="mx_use_cache" value="1" {S_MX_USE_CACHE_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="mx_use_cache" value="0" {S_MX_USE_CACHE_NO} /> {L_NO}</dd>
	</dl>
	<dl>
		<dt>{L_MX_MOD_REWRITE}<br /><span class="gensmall">{L_MX_MOD_REWRITE_EXPLAIN}</span></dd>
		<dd><input type="radio" name="mod_rewrite" value="1" {S_MX_MOD_REWRITE_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="mod_rewrite" value="0" {S_MX_MOD_REWRITE_NO} /> {L_NO}</dd>
	</dl>
</fieldset>
<fieldset>
		<legend>{L_STYLE_SETTINGS}?</legend>
	<dl>
		<dt>{L_DEFAULT_ADMIN_STYLE}</dt>
		<dd>{ADMIN_STYLE_SELECT}</dd>
	</dl>
	<dl>
		<dt>{L_DEFAULT_STYLE}</dt>
		<dd>{STYLE_SELECT}</dd>
	</dl>
	<dl>
		<dt>{L_OVERRIDE_STYLE}<br /><span class="gensmall">{L_OVERRIDE_STYLE_EXPLAIN}</span></dd>
		<dd><input type="radio" name="mx_override_user_style" value="1" {OVERRIDE_STYLE_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="mx_override_user_style" value="0" {OVERRIDE_STYLE_NO} /> {L_NO}</dd>
	</dl>
	<dl>
		<dt>{L_OVERALL_HEADER}</dt>
		<dd><input type="text" maxlength="150" size="50" name="overall_header" value="{OVERALL_HEADER}" /></dd>
	</dl>
	<dl>
		<dt>{L_OVERALL_FOOTER}</dt>
		<dd><input type="text" maxlength="150" size="50" name="overall_footer" value="{OVERALL_FOOTER}" /></dd>
	</dl>
	<dl>
		<dt>{L_MAIN_LAYOUT}</dt>
		<dd><input type="text" maxlength="150" size="50" name="main_layout" value="{MAIN_LAYOUT}" /></dd>
	</dl>
	<dl>
		<dt>{L_NAVIGATION_BLOCK}</dt>
		<dd>{NAVIGATION_BLOCK}</dt>
	</dl>
	<dl>
		<dt>{L_TOP_PHPBB_LINKS}</dt>
		<dd><input type="radio" name="top_phpbb_links" value="1" {S_TOP_PHPBB_LINKS_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="top_phpbb_links" value="0" {S_TOP_PHPBB_LINKS_NO} /> {L_NO}</dd>
	</dl>
	<dl>
		<dd>{S_HIDDEN_FIELDS}
		<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />&nbsp;&nbsp;
		<input type="reset" value="{L_RESET}" class="button2" /></dd>
	</dl>
</fieldset>
<fieldset>
	<legend>{L_GENERAL_CONFIG_INFO}</legend>
	<dl>
		<dt>{L_PHPBB_RELATIVE_PATH}</dt>
		<dd>{PHPBB_RELATIVE_PATH}</dd>
	</dl>
	<dl>
		<dt>{L_PORTAL_VERSION}</dt>
		<dd>{PORTAL_VERSION}</dd>
	</dl>
</fieldset>
<fieldset>
	  <legend>{L_PHPBB_INFO}</legend>
	<dl>
		<dt>{L_PHPBB_VERSION}</dt>
		<dd>{PHPBB_VERSION}</dd>
	</dl>
	<dl>
		<dt>{L_PHPBB_SERVER_NAME}</dt>
		<dd>{PHPBB_SERVER_NAME}</dt>
	</dl>
	<dl>
		<dt>{L_PHPBB_SCRIPT_PATH}</dt>
		<dd>{PHPBB_SCRIPT_PATH}</dt>
	</dl>
</fieldset>
</form>
<br clear="all" />

[mxbb-commits] core/templates/prosilver prosilver.css,1.5,1.6

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/templates/prosilver
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7026/prosilver

Modified Files:
	prosilver.css 
Log Message:


Index: prosilver.css
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/prosilver.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** prosilver.css	17 Dec 2007 06:36:43 -0000	1.5
--- prosilver.css	17 Dec 2007 06:56:50 -0000	1.6
***************
*** 29,32 ****
--- 29,152 ----
  	background-position: 100% 0;
  } 
+ 
+ table.blockcp {
+ 	width: 100%;
+ 	border: 1px solid #CCCFD3;
+ 	background-color: #FFFFFF;
+ 	padding: 1px;
+ }
+ 
+ table.blockcp th {
+ 	padding: 3px 4px;
+ 	color: #FFFFFF;
+ 	background: #70AED3 url("images/gradient2b.gif") bottom left repeat-x;
+ 	border-top: 1px solid #6DACD2;
+ 	border-bottom: 1px solid #327AA5;
+ 	text-align: left;
+ 	text-transform: uppercase;
+ }
+ table.blockcp .row1 { background-color: #F9F9F9; }
+ table.blockcp .row2 { background-color: #DCEBFE; }
+ 
+ table.blockcp .explain { font-style:italic;font-weight:normal;}
+ 
+ table.blockcp fieldset {
+ 	margin: 15px 10px 15px 10px;
+ 	padding: 10px;
+ 	border-top: 1px solid #D7D7D7;
+ 	border-right: 1px solid #CCCCCC;
+ 	border-bottom: 1px solid #CCCCCC;
+ 	border-left: 1px solid #D7D7D7;
+ 	background-color: #FFFFFF;
+ 	position: relative;
+ }
+ table.blockcp fieldset.menurows {
+ 	padding:1px;
+ }
+ 
+ table.blockcp .row {
+ 	padding: 3px 5px 3px 5px;
+ }
+ table.blockcp .row:hover {
+ 	background-color: #F6F4D0;
+ }
+ 
+ table.blockcp legend {
+ 	padding: 1px 0;
+ 	font-family: Tahoma,arial,Verdana,Sans-serif;
+ 	font-size: 1.0em;
+ 	font-weight: bold;
+ 	color: #115098;
+ 	margin-top: -.4em;
+ 	position: relative;
+ 	text-transform: none;
+ 	line-height: 1.2em;
+ 	top: 0;
+ 	vertical-align: middle;
+ }
+ 
+ /* Hide from macIE \*/
+ table.blockcp legend { top: -1.2em; }
+ /* end */
+ 
+ table.blockcp fieldset dl:hover dt label {
+ 	color: #000000;
+ }
+ 
+ table.blockcp fieldset.fields2 dl:hover dt label {
+ 	color: inherit;
+ }
+ 
+ /* Quick-login on index page */
+ table.blockcp fieldset.quick-login input {
+ 	background-color: #F2F3F3;
+ }
+ 
+ table.blockcp fieldset dl {
+ 	margin-bottom: 10px;
+ 	
+ 	font-size: 0.85em;
+ 	
+ }
+ 
+ table.blockcp fieldset dt {
+ 	width: 45%;
+ 	text-align: left;
+ 	border: none;
+ 	border-right: 1px solid #CCCCCC;
+ 	padding-top: 3px;
+ 	padding-right: 5px;
+ 	margin-right:5px;
+ 	font-weight: normal;
+ 	text-transform: none;
+ 	text-align: right;
+ }
+ table.blockcp dt .explain { font-style: italic;}
+ 
+ table.blockcp dd { color: #666666; margin-left:5px; padding-left:5px;}
+ table.blockcp dd + dd { padding-top: 5px;}
+ table.blockcp dt span { padding: 0 5px 0 0;}
+ 
+ table.blockcp dd input {
+ 	font-size: 1.00em;
+ 	max-width: 100%;
+ }
+ 
+ table.blockcp dd select {
+ 	font-size: 100%;
+ 	width: auto;
+ 	max-width: 100%;
+ }
+ 
+ table.blockcp dd textarea {
+ 	font-size: 0.90em;
+ 	width: 90%;
+ }
+ 
+ table.blockcp dd select {
+ 	width: auto;
+ 	font-size: 1.00em;
+ }
+ 
  .textbody {
  	padding: 0;

[mxbb-commits] core/templates/_core login_body.tpl,1.1,1.2

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/templates/_core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7026/_core

Modified Files:
	login_body.tpl 
Log Message:


Index: login_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/core/templates/_core/login_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** login_body.tpl	9 Sep 2007 16:50:45 -0000	1.1
--- login_body.tpl	17 Dec 2007 06:56:50 -0000	1.2
***************
*** 32,36 ****
  					  <!-- END switch_allow_autologin -->
  					  <tr align="center">
! 						<td colspan="2">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="mainoption" value="{L_LOGIN}" /></td>
  					  </tr>
  					  <tr align="center">
--- 32,39 ----
  					  <!-- END switch_allow_autologin -->
  					  <tr align="center">
! 						<td colspan="2">
! 							{S_HIDDEN_FIELDS}
! 							<input type="submit" name="login" class="mainoption" value="{L_LOGIN}" />
! 						</td>
  					  </tr>
  					  <tr align="center">

[mxbb-commits] core/modules/mx_users/admin admin_users.php, 1.3, 1.4

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_users/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7007

Modified Files:
	admin_users.php 
Log Message:

[mxbb-commits] core/modules/mx_coreblocks mx_online.php,1.21,1.22

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_coreblocks
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6983

Modified Files:
	mx_online.php 
Log Message:

[mxbb-commits] core/modules/mx_textblocks/templates/prosilver/admin - New directory

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_textblocks/templates/prosilver/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6925/admin

Log Message:
Directory /cvsroot/mxbb/core/modules/mx_textblocks/templates/prosilver/admin added to the repository

[mxbb-commits] core/modules/mx_navmenu/templates/prosilver/admin - New directory

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_navmenu/templates/prosilver/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6890/admin

Log Message:
Directory /cvsroot/mxbb/core/modules/mx_navmenu/templates/prosilver/admin added to the repository

[mxbb-commits] core/templates/prosilver editor.js, NONE, 1.1 forum_fn.js, NONE, 1.1 styleswitcher.js, NONE, 1.1 overall_header.html, 1.4, 1.5 overall_header_navigation.html, 1.6, 1.7 overall_header_navigation_phpbb.html, 1.5, 1.6 prosilver.css, 1.4, 1.5

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/templates/prosilver
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5757

Modified Files:
	overall_header.html overall_header_navigation.html 
	overall_header_navigation_phpbb.html prosilver.css 
Added Files:
	editor.js forum_fn.js styleswitcher.js 
Log Message:
more fixes for prosilver

Index: overall_header_navigation.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_header_navigation.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** overall_header_navigation.html	17 Dec 2007 04:26:18 -0000	1.6
--- overall_header_navigation.html	17 Dec 2007 06:36:43 -0000	1.7
***************
*** 1,4 ****
--- 1,5 ----
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+ <html>
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
***************
*** 57,61 ****
--- 58,64 ----
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
+ <!-- This force template reloading in ie7 like CTRL+F5 does and is not very nice
  <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
+ -->
  <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
  

--- NEW FILE: forum_fn.js ---
/**
* phpBB3 forum functions
*/

/**
* Window popup
*/
function popup(url, width, height, name)
{
	if (!name)
	{
		name = '_popup';
	}

	window.open(url.replace(/&amp;/g, '&'), name, 'height=' + height + ',resizable=yes,scrollbars=yes, width=' + width);
	return false;
}

/**
* Jump to page
*/
function jumpto()
{
	var page = prompt(jump_page, on_page);

	if (page !== null && !isNaN(page) && page > 0)
	{
		document.location.href = base_url.replace(/&amp;/g, '&') + '&start=' + ((page - 1) * per_page);
	}
}

/**
* Mark/unmark checklist
* id = ID of parent container, name = name prefix, state = state [true/false]
*/
function marklist(id, name, state)
{
	var parent = document.getElementById(id);
	if (!parent)
	{
		eval('parent = document.' + id);
	}

	if (!parent)
	{
		return;
	}

	var rb = parent.getElementsByTagName('input');
	
	for (var r = 0; r < rb.length; r++)
	{	
		if (rb[r].name.substr(0, name.length) == name)
		{
			rb[r].checked = state;
		}
	}
}

/**
* Resize viewable area for attached image or topic review panel (possibly others to come)
* e = element
*/
function viewableArea(e, itself)
{
	if (!e) return;
	if (!itself)
	{
		e = e.parentNode;
	}
	
	if (!e.vaHeight)
	{
		// Store viewable area height before changing style to auto
		e.vaHeight = e.offsetHeight;
		e.vaMaxHeight = e.style.maxHeight;
		e.style.height = 'auto';
		e.style.maxHeight = 'none';
		e.style.overflow = 'visible';
	}
	else
	{
		// Restore viewable area height to the default
		e.style.height = e.vaHeight + 'px';
		e.style.overflow = 'auto';
		e.style.maxHeight = e.vaMaxHeight;
		e.vaHeight = false;
	}
}

/**
* Set display of page element
* s[-1,0,1] = hide,toggle display,show
*/
function dE(n, s)
{
	var e = document.getElementById(n);

	if (!s)
	{
		s = (e.style.display == '' || e.style.display == 'block') ? -1 : 1;
	}
	e.style.display = (s == 1) ? 'block' : 'none';
}

/**
* Alternate display of subPanels
*/
function subPanels(p)
{
	var i, e, t;

	if (typeof(p) == 'string')
	{
		show_panel = p;
	}

	for (i = 0; i < panels.length; i++)
	{
		e = document.getElementById(panels[i]);
		t = document.getElementById(panels[i] + '-tab');

		if (e)
		{
			if (panels[i] == show_panel)
			{
				e.style.display = 'block';
				if (t)
				{
					t.className = 'activetab';
				}
			}
			else
			{
				e.style.display = 'none';
				if (t)
				{
					t.className = '';
				}
			}
		}
	}
}

/**
* Call print preview
*/
function printPage()
{
	if (is_ie)
	{
		printPreview();
	}
	else
	{
		window.print();
	}
}

/**
* Show/hide groups of blocks
* c = CSS style name
* e = checkbox element
* t = toggle dispay state (used to show 'grip-show' image in the profile block when hiding the profiles) 
*/
function displayBlocks(c, e, t)
{
	var s = (e.checked == true) ?  1 : -1;

	if (t)
	{
		s *= -1;
	}

	var divs = document.getElementsByTagName("DIV");

	for (var d = 0; d < divs.length; d++)
	{
		if (divs[d].className.indexOf(c) == 0)
		{
			divs[d].style.display = (s == 1) ? 'none' : 'block';
		}
	}
}

function selectCode(a)
{
	// Get ID of code block
	var e = a.parentNode.parentNode.getElementsByTagName('CODE')[0];

	// Not IE
	if (window.getSelection)
	{
		var s = window.getSelection();
		// Safari
		if (s.setBaseAndExtent)
		{
			s.setBaseAndExtent(e, 0, e, e.innerText.length - 1);
		}
		// Firefox and Opera
		else
		{
			var r = document.createRange();
			r.selectNodeContents(e);
			s.removeAllRanges();
			s.addRange(r);
		}
	}
	// Some older browsers
	else if (document.getSelection)
	{
		var s = document.getSelection();
		var r = document.createRange();
		r.selectNodeContents(e);
		s.removeAllRanges();
		s.addRange(r);
	}
	// IE
	else if (document.selection)
	{
		var r = document.body.createTextRange();
		r.moveToElementText(e);
		r.select();
	}
}

/**
* Play quicktime file by determining it's width/height
* from the displayed rectangle area
*/
function play_qt_file(obj)
{
	var rectangle = obj.GetRectangle();

	if (rectangle)
	{
		rectangle = rectangle.split(',');
		var x1 = parseInt(rectangle[0]);
		var x2 = parseInt(rectangle[2]);
		var y1 = parseInt(rectangle[1]);
		var y2 = parseInt(rectangle[3]);

		var width = (x1 < 0) ? (x1 * -1) + x2 : x2 - x1;
		var height = (y1 < 0) ? (y1 * -1) + y2 : y2 - y1;
	}
	else
	{
		var width = 200;
		var height = 0;
	}

	obj.width = width;
	obj.height = height + 16;

	obj.SetControllerVisible(true);
	obj.Play();
}

--- NEW FILE: styleswitcher.js ---

function fontsizeup()
{
	var active = getActiveStyleSheet();

	switch (active)
	{
		case 'A--':
			setActiveStyleSheet('A-');
		break;

		case 'A-':
			setActiveStyleSheet('A');
		break;

		case 'A':
			setActiveStyleSheet('A+');
		break;

		case 'A+':
			setActiveStyleSheet('A++');
		break;

		case 'A++':
			setActiveStyleSheet('A');
		break;

		default:
			setActiveStyleSheet('A');
		break;
	}
}

function fontsizedown()
{
	active = getActiveStyleSheet();

	switch (active)
	{
		case 'A++' : 
			setActiveStyleSheet('A+');
		break;

		case 'A+' : 
			setActiveStyleSheet('A');
		break;

		case 'A' : 
			setActiveStyleSheet('A-');
		break;

		case 'A-' : 
			setActiveStyleSheet('A--');
		break;

		case 'A--' : 
		break;

		default :
			setActiveStyleSheet('A--');
		break;
	}
}

function setActiveStyleSheet(title)
{
	var i, a, main;

	for (i = 0; (a = document.getElementsByTagName('link')[i]); i++)
	{
		if (a.getAttribute('rel').indexOf('style') != -1 && a.getAttribute('title'))
		{
			a.disabled = true;
			if (a.getAttribute('title') == title)
			{
				a.disabled = false;
			}
		}
	}
}

function getActiveStyleSheet()
{
	var i, a;

	for (i = 0; (a = document.getElementsByTagName('link')[i]); i++)
	{
		if (a.getAttribute('rel').indexOf('style') != -1 && a.getAttribute('title') && !a.disabled)
		{
			return a.getAttribute('title');
		}
	}

	return null;
}

function getPreferredStyleSheet()
{
	return ('A-');
}

function createCookie(name, value, days)
{
	if (days)
	{
		var date = new Date();
		date.setTime(date.getTime() + (days*24*60*60*1000));
		var expires = '; expires=' + date.toGMTString();
	}
	else
	{
		expires = '';
	}

	document.cookie = name + '=' + value + expires + '; path=/';
}

function readCookie(name)
{
	var nameEQ = name + '=';
	var ca = document.cookie.split(';');

	for (var i = 0; i < ca.length; i++)
	{
		var c = ca[i];

		while (c.charAt(0) == ' ')
		{
			c = c.substring(1, c.length);
		}

		if (c.indexOf(nameEQ) == 0)
		{
			return c.substring(nameEQ.length, c.length);
		}
	}

	return null;
}

function load_cookie()
{
	var cookie = readCookie('style_cookie');
	var title = cookie ? cookie : getPreferredStyleSheet();
	setActiveStyleSheet(title);
}

function unload_cookie()
{
	var title = getActiveStyleSheet();
	createCookie('style_cookie', title, 365);
}

onload_functions.push('load_cookie()');
onunload_functions.push('unload_cookie()');

/*
var cookie = readCookie("style");
var title = cookie ? cookie : getPreferredStyleSheet();
setActiveStyleSheet(title);
*/

Index: prosilver.css
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/prosilver.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** prosilver.css	17 Dec 2007 04:26:18 -0000	1.4
--- prosilver.css	17 Dec 2007 06:36:43 -0000	1.5
***************
*** 28,30 ****
  	background-repeat: no-repeat;
  	background-position: 100% 0;
! } 
\ No newline at end of file
--- 28,64 ----
  	background-repeat: no-repeat;
  	background-position: 100% 0;
! } 
! .textbody {
! 	padding: 0;
! 	line-height: 1.48em;
! 	color: #333333;
! 	clear: both;
! }
! 
! .textbody .ignore {
! 	font-size: 1.1em;
! }
! 
! .textbody .content {
! 	font-size: 1.2em;
! }
! .textbody h3.first {
! 	/* The first post on the page uses this */
! 	font-size: 1.5em;
! }
! 
! .textbody h3 {
! 	/* Postbody requires a different h3 format - so change it here */
! 	font-size: 1.4em;
! 	padding: 2px 0 0 0;
! 	margin: 0 0 0.3em 0 !important;
! 	text-transform: none;
! 	border: none;
! 	font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
! 	line-height: 125%;
! }
! 
! .textbody h3 img {
! 	/* Also see tweaks.css */
! 	vertical-align: bottom;
! }
\ No newline at end of file

--- NEW FILE: editor.js ---
/**
* bbCode control by subBlue design [ www.subBlue.com ]
* Includes unixsafe colour palette selector by SHS`
*/

// Startup variables
var imageTag = false;
var theSelection = false;

// Check for Browser & Platform for PC & IE specific bits
// More details from: http://www.mozilla.org/docs/web-developer/sniffer/browser_type.html
var clientPC = navigator.userAgent.toLowerCase(); // Get client info
var clientVer = parseInt(navigator.appVersion); // Get browser version

var is_ie = ((clientPC.indexOf('msie') != -1) && (clientPC.indexOf('opera') == -1));
var is_win = ((clientPC.indexOf('win') != -1) || (clientPC.indexOf('16bit') != -1));

var baseHeight;
onload_functions.push('initInsertions()');

/**
* Shows the help messages in the helpline window
*/
function helpline(help)
{
	document.forms[form_name].helpbox.value = help_line[help];
}

/**
* Fix a bug involving the TextRange object. From
* http://www.frostjedi.com/terra/scripts/demo/caretBug.html
*/ 
function initInsertions() 
{
	var doc;

	if (document.forms[form_name])
	{
		doc = document;
	}
	else 
	{
		doc = opener.document;
	}

	var textarea = doc.forms[form_name].elements[text_name];

	if (is_ie && typeof(baseHeight) != 'number')
	{
		textarea.focus();
		baseHeight = doc.selection.createRange().duplicate().boundingHeight;

		if (!document.forms[form_name])
		{
			document.body.focus();
		}
	}
}

/**
* bbstyle
*/
function bbstyle(bbnumber)
{	
	if (bbnumber != -1)
	{
		bbfontstyle(bbtags[bbnumber], bbtags[bbnumber+1]);
	} 
	else 
	{
		insert_text('[*]');
		document.forms[form_name].elements[text_name].focus();
	}
}

/**
* Apply bbcodes
*/
function bbfontstyle(bbopen, bbclose)
{
	theSelection = false;

	var textarea = document.forms[form_name].elements[text_name];

	textarea.focus();

	if ((clientVer >= 4) && is_ie && is_win)
	{
		// Get text selection
		theSelection = document.selection.createRange().text;

		if (theSelection)
		{
			// Add tags around selection
			document.selection.createRange().text = bbopen + theSelection + bbclose;
			document.forms[form_name].elements[text_name].focus();
			theSelection = '';
			return;
		}
	}
	else if (document.forms[form_name].elements[text_name].selectionEnd && (document.forms[form_name].elements[text_name].selectionEnd - document.forms[form_name].elements[text_name].selectionStart > 0))
	{
		mozWrap(document.forms[form_name].elements[text_name], bbopen, bbclose);
		document.forms[form_name].elements[text_name].focus();
		theSelection = '';
		return;
	}
	
	//The new position for the cursor after adding the bbcode
	var caret_pos = getCaretPosition(textarea).start;
	var new_pos = caret_pos + bbopen.length;		

	// Open tag
	insert_text(bbopen + bbclose);

	// Center the cursor when we don't have a selection
	// Gecko and proper browsers
	if (!isNaN(textarea.selectionStart))
	{
		textarea.selectionStart = new_pos;
		textarea.selectionEnd = new_pos;
	}	
	// IE
	else if (document.selection)
	{
		var range = textarea.createTextRange(); 
		range.move("character", new_pos); 
		range.select();
		storeCaret(textarea);
	}

	textarea.focus();
	return;
}

/**
* Insert text at position
*/
function insert_text(text, spaces, popup)
{
	var textarea;
	
	if (!popup) 
	{
		textarea = document.forms[form_name].elements[text_name];
	} 
	else 
	{
		textarea = opener.document.forms[form_name].elements[text_name];
	}
	if (spaces) 
	{
		text = ' ' + text + ' ';
	}
	
	if (!isNaN(textarea.selectionStart))
	{
		var sel_start = textarea.selectionStart;
		var sel_end = textarea.selectionEnd;

		mozWrap(textarea, text, '')
		textarea.selectionStart = sel_start + text.length;
		textarea.selectionEnd = sel_end + text.length;
	}
	else if (textarea.createTextRange && textarea.caretPos)
	{
		if (baseHeight != textarea.caretPos.boundingHeight) 
		{
			textarea.focus();
			storeCaret(textarea);
		}

		var caret_pos = textarea.caretPos;
		caret_pos.text = caret_pos.text.charAt(caret_pos.text.length - 1) == ' ' ? caret_pos.text + text + ' ' : caret_pos.text + text;
	}
	else
	{
		textarea.value = textarea.value + text;
	}
	if (!popup) 
	{
		textarea.focus();
	}
}

/**
* Add inline attachment at position
*/
function attach_inline(index, filename)
{
	insert_text('[attachment=' + index + ']' + filename + '[/attachment]');
	document.forms[form_name].elements[text_name].focus();
}

/**
* Add quote text to message
*/
function addquote(post_id, username)
{
	var message_name = 'message_' + post_id;
	var theSelection = '';
	var divarea = false;

	if (document.all)
	{
		divarea = document.all[message_name];
	}
	else
	{
		divarea = document.getElementById(message_name);
	}

	// Get text selection - not only the post content :(
	if (window.getSelection)
	{
		theSelection = window.getSelection().toString();
	}
	else if (document.getSelection)
	{
		theSelection = document.getSelection();
	}
	else if (document.selection)
	{
		theSelection = document.selection.createRange().text;
	}

	if (theSelection == '' || typeof theSelection == 'undefined' || theSelection == null)
	{
		if (divarea.innerHTML)
		{
			theSelection = divarea.innerHTML.replace(/<br>/ig, '\n');
			theSelection = theSelection.replace(/<br\/>/ig, '\n');
			theSelection = theSelection.replace(/&lt\;/ig, '<');
			theSelection = theSelection.replace(/&gt\;/ig, '>');
			theSelection = theSelection.replace(/&amp\;/ig, '&');
			theSelection = theSelection.replace(/&nbsp\;/ig, ' ');
		}
		else if (document.all)
		{
			theSelection = divarea.innerText;
		}
		else if (divarea.textContent)
		{
			theSelection = divarea.textContent;
		}
		else if (divarea.firstChild.nodeValue)
		{
			theSelection = divarea.firstChild.nodeValue;
		}
	}

	if (theSelection)
	{
		insert_text('[quote="' + username + '"]' + theSelection + '[/quote]');
	}

	return;
}

/**
* From http://www.massless.org/mozedit/
*/
function mozWrap(txtarea, open, close)
{
	var selLength = txtarea.textLength;
	var selStart = txtarea.selectionStart;
	var selEnd = txtarea.selectionEnd;
	var scrollTop = txtarea.scrollTop;

	if (selEnd == 1 || selEnd == 2) 
	{
		selEnd = selLength;
	}

	var s1 = (txtarea.value).substring(0,selStart);
	var s2 = (txtarea.value).substring(selStart, selEnd)
	var s3 = (txtarea.value).substring(selEnd, selLength);

	txtarea.value = s1 + open + s2 + close + s3;
	txtarea.selectionStart = selEnd + open.length + close.length;
	txtarea.selectionEnd = txtarea.selectionStart;
	txtarea.focus();
	txtarea.scrollTop = scrollTop;

	return;
}

/**
* Insert at Caret position. Code from
* http://www.faqts.com/knowledge_base/view.phtml/aid/1052/fid/130
*/
function storeCaret(textEl)
{
	if (textEl.createTextRange)
	{
		textEl.caretPos = document.selection.createRange().duplicate();
	}
}

/**
* Color pallette
*/
function colorPalette(dir, width, height)
{
	var r = 0, g = 0, b = 0;
	var numberList = new Array(6);
	var color = '';

	numberList[0] = '00';
	numberList[1] = '40';
	numberList[2] = '80';
	numberList[3] = 'BF';
	numberList[4] = 'FF';

	document.writeln('<table cellspacing="1" cellpadding="0" border="0">');

	for (r = 0; r < 5; r++)
	{
		if (dir == 'h')
		{
			document.writeln('<tr>');
		}

		for (g = 0; g < 5; g++)
		{
			if (dir == 'v')
			{
				document.writeln('<tr>');
			}
			
			for (b = 0; b < 5; b++)
			{
				color = String(numberList[r]) + String(numberList[g]) + String(numberList[b]);
				document.write('<td bgcolor="#' + color + '" style="width: ' + width + 'px; height: ' + height + 'px;">');
				document.write('<a href="#" onclick="bbfontstyle(\'[color=#' + color + ']\', \'[/color]\'); return false;"><img src="images/spacer.gif" width="' + width + '" height="' + height + '" alt="#' + color + '" title="#' + color + '" /></a>');
				document.writeln('</td>');
			}

			if (dir == 'v')
			{
				document.writeln('</tr>');
			}
		}

		if (dir == 'h')
		{
			document.writeln('</tr>');
		}
	}
	document.writeln('</table>');
}


/**
* Caret Position object
*/
function caretPosition()
{
	var start = null;
	var end = null;
}


/**
* Get the caret position in an textarea
*/
function getCaretPosition(txtarea)
{
	var caretPos = new caretPosition();
	
	// simple Gecko/Opera way
	if(txtarea.selectionStart || txtarea.selectionStart == 0)
	{
		caretPos.start = txtarea.selectionStart;
		caretPos.end = txtarea.selectionEnd;
	}
	// dirty and slow IE way
	else if(document.selection)
	{
	
		// get current selection
		var range = document.selection.createRange();

		// a new selection of the whole textarea
		var range_all = document.body.createTextRange();
		range_all.moveToElementText(txtarea);
		
		// calculate selection start point by moving beginning of range_all to beginning of range
		var sel_start;
		for (sel_start = 0; range_all.compareEndPoints('StartToStart', range) < 0; sel_start++)
		{		
			range_all.moveStart('character', 1);
		}
	
		txtarea.sel_start = sel_start;
	
		// we ignore the end value for IE, this is already dirty enough and we don't need it
		caretPos.start = txtarea.sel_start;
		caretPos.end = txtarea.sel_start;			
	}

	return caretPos;
}
Index: overall_header_navigation_phpbb.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_header_navigation_phpbb.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** overall_header_navigation_phpbb.html	17 Dec 2007 04:26:18 -0000	1.5
--- overall_header_navigation_phpbb.html	17 Dec 2007 06:36:43 -0000	1.6
***************
*** 1,4 ****
--- 1,5 ----
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+ <html>
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
***************
*** 57,61 ****
--- 58,64 ----
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
+ <!-- This force template reloading in ie7 like CTRL+F5 does and is not very nice
  <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
+ -->
  <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
  

Index: overall_header.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_header.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** overall_header.html	17 Dec 2007 04:26:18 -0000	1.4
--- overall_header.html	17 Dec 2007 06:36:43 -0000	1.5
***************
*** 1,4 ****
--- 1,5 ----
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+ <html>
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
***************
*** 57,61 ****
--- 58,64 ----
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
+ <!-- This force template reloading in ie7 like CTRL+F5 does and is not very nice
  <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
+ -->
  <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
  

[mxbb-commits] core/modules/mx_textblocks/templates/prosilver mx_textblock_bbcode.html, 1.2, 1.3 mx_textblock_html.html, 1.2, 1.3

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_textblocks/templates/prosilver
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5736

Modified Files:
	mx_textblock_bbcode.html mx_textblock_html.html 
Log Message:
more fixes for prosilver

Index: mx_textblock_html.html
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/templates/prosilver/mx_textblock_html.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mx_textblock_html.html	14 Dec 2007 04:13:58 -0000	1.2
--- mx_textblock_html.html	17 Dec 2007 06:36:30 -0000	1.3
***************
*** 1,7 ****
! <div class="forabg block" style="width:{BLOCK_SIZE}">
! 	<div class="inner bg1 panel" id="message">
! 		<dl>
! 		<dt>{U_TEXT}</dt>
! 		</dl>
  	</div>
  	<span class="corners-bottom"><span></span></span>
--- 1,10 ----
! <div class="clear"></div>
! <div class="forabg block">
! 	<div id="p1" class="post bg2 online">
! 		<div class="inner"><span class="corners-top"><span></span></span>
! 			<dl class="textbody">
! 				<dt class="content" id="message">{U_TEXT}</dt>
! 			</dl>
! 		</div>
  	</div>
  	<span class="corners-bottom"><span></span></span>

Index: mx_textblock_bbcode.html
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_textblocks/templates/prosilver/mx_textblock_bbcode.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mx_textblock_bbcode.html	14 Dec 2007 04:13:58 -0000	1.2
--- mx_textblock_bbcode.html	17 Dec 2007 06:36:30 -0000	1.3
***************
*** 1,7 ****
! <div class="forabg block" style="width:{BLOCK_SIZE}">
! 	<div class="inner bg1 panel" id="message">
! 		<dl>
! 		<dt>{U_TEXT}</dt>
! 		</dl>
  	</div>
  	<span class="corners-bottom"><span></span></span>
--- 1,10 ----
! <div class="clear"></div>
! <div class="forabg block">
! 	<div id="p1" class="post bg2 online">
! 		<div class="inner"><span class="corners-top"><span></span></span>
! 			<dl class="textbody">
! 				<dt class="content" id="message">{U_TEXT}</dt>
! 			</dl>
! 		</div>
  	</div>
  	<span class="corners-bottom"><span></span></span>

[mxbb-commits] core/templates/prosilver overall_header.html, 1.3, 1.4 overall_header_navigation.html, 1.5, 1.6 overall_header_navigation_phpbb.html, 1.4, 1.5 prosilver.css, 1.3, 1.4

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/templates/prosilver
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5743

Modified Files:
	overall_header.html overall_header_navigation.html 
	overall_header_navigation_phpbb.html prosilver.css 
Log Message:
This will fix prosilver for FF but still buggy on ie7.

Index: overall_header_navigation_phpbb.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_header_navigation_phpbb.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** overall_header_navigation_phpbb.html	16 Dec 2007 22:47:42 -0000	1.4
--- overall_header_navigation_phpbb.html	17 Dec 2007 04:26:18 -0000	1.5
***************
*** 1,25 ****
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
! <html dir="{S_CONTENT_DIRECTION}">
  <head>
! <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}">
! <meta http-equiv="Content-Style-Type" content="text/css">
  <!-- BEGIN switch_set_base -->
! <base href="{U_PORTAL_ROOT_PATH}" >
  <!-- END switch_set_base -->
  {META}
  {NAV_LINKS}
  <title>{SITENAME} :: {PAGE_TITLE}</title>
- <!-- First load standard template *.css definition, located in the the phpbb template folder -->
- <!-- BEGIN switch_phpbb_stylesheet--><link rel="stylesheet" href="{U_PHPBB_ROOT_PATH}styles/prosilver/theme/stylesheet.css" type="text/css" ><!-- END switch_phpbb_stylesheet-->
- <!-- Then load mxBB template *.css definition for mx, located in the the portal template folder -->
- <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" type="text/css" >
- <!-- Optionally, redefine some defintions for gecko browsers -->
- <!-- BEGIN switch_gecko --><link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" ><!-- END switch_gecko -->
  
! 
! {MX_ADDITIONAL_CSS}
! {MX_ICON_CSS}
! 
! <script type="text/javascript" src="{U_PHPBB_ROOT_PATH}templates/prosilver/forum_fn.js"></script>
  
  <!-- BEGIN switch_enable_pm_popup -->
--- 1,15 ----
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
  <head>
! <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
! <meta http-equiv="Content-Style-Type" content="text/css" />
  <!-- BEGIN switch_set_base -->
! <base href="{U_PORTAL_ROOT_PATH}" />
  <!-- END switch_set_base -->
  {META}
  {NAV_LINKS}
  <title>{SITENAME} :: {PAGE_TITLE}</title>
  
! <!-- BEGIN switch_phpbb_stylesheet--><link rel="stylesheet" href="{U_PHPBB_ROOT_PATH}styles/prosilver/theme/stylesheet.css" type="text/css" ><!-- END switch_phpbb_stylesheet-->
  
  <!-- BEGIN switch_enable_pm_popup -->
***************
*** 67,70 ****
--- 57,80 ----
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" rel="stylesheet" type="text/css" media="screen, projection" />
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/normal.css" rel="stylesheet" type="text/css" title="A" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
+ 
+ <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+ 	<link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
+ <!-- ENDIF -->
+ 
+ <!-- Optionally, redefine some defintions for gecko browsers -->
+ <!-- BEGIN switch_gecko --><link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" ><!-- END switch_gecko -->
+ 
+ {MX_ADDITIONAL_CSS}
+ {MX_ICON_CSS}
+ 
  </head>
  <body id="mxbb" class="section-index {S_CONTENT_DIRECTION}">

Index: prosilver.css
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/prosilver.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** prosilver.css	16 Dec 2007 21:35:15 -0000	1.3
--- prosilver.css	17 Dec 2007 04:26:18 -0000	1.4
***************
*** 19,27 ****
  @import url("theme/colours.css");
  
- 
- body {
- 	text-align: center; /* center in IE */
- }
- 
  .block {
  	background-position: 0px -20px;
--- 19,22 ----

Index: overall_header.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_header.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** overall_header.html	16 Dec 2007 20:48:16 -0000	1.3
--- overall_header.html	17 Dec 2007 04:26:18 -0000	1.4
***************
*** 1,24 ****
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
! <html dir="{S_CONTENT_DIRECTION}">
  <head>
! <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}">
! <meta http-equiv="Content-Style-Type" content="text/css">
  <!-- BEGIN switch_set_base -->
! <base href="{U_PORTAL_ROOT_PATH}" >
  <!-- END switch_set_base -->
  {META}
  {NAV_LINKS}
  <title>{SITENAME} :: {PAGE_TITLE}</title>
- <!-- First load standard template *.css definition, located in the the phpbb template folder -->
- <!-- BEGIN switch_phpbb_stylesheet--><link rel="stylesheet" href="{U_PHPBB_ROOT_PATH}styles/prosilver/theme/stylesheet.css" type="text/css" ><!-- END switch_phpbb_stylesheet-->
- <!-- Then load mxBB template *.css definition for mx, located in the the portal template folder -->
- <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" type="text/css" >
- <!-- Optionally, redefine some defintions for gecko browsers -->
- <!-- BEGIN switch_gecko --><link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" ><!-- END switch_gecko -->
  
! {MX_ADDITIONAL_CSS}
! {MX_ICON_CSS}
! 
! <script type="text/javascript" src="{U_PHPBB_ROOT_PATH}templates/prosilver/forum_fn.js"></script>
  
  <!-- BEGIN switch_enable_pm_popup -->
--- 1,15 ----
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
  <head>
! <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
! <meta http-equiv="Content-Style-Type" content="text/css" />
  <!-- BEGIN switch_set_base -->
! <base href="{U_PORTAL_ROOT_PATH}" />
  <!-- END switch_set_base -->
  {META}
  {NAV_LINKS}
  <title>{SITENAME} :: {PAGE_TITLE}</title>
  
! <!-- BEGIN switch_phpbb_stylesheet--><link rel="stylesheet" href="{U_PHPBB_ROOT_PATH}styles/prosilver/theme/stylesheet.css" type="text/css" ><!-- END switch_phpbb_stylesheet-->
  
  <!-- BEGIN switch_enable_pm_popup -->
***************
*** 66,78 ****
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
  </head>
  <body id="mxbb" class="section-index {S_CONTENT_DIRECTION}">
  <div id="wrap">
! 	<a id="top" name="top"></a>
  	<div id="page-header">
  		<div class="headerbar">
  			<div class="inner"><span class="corners-top"><span></span></span>
  			<div id="site-description">
! 				<a href="{U_INDEX}" title="{L_INDEX}" id="logo"><img src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}images/logo.gif" width="139" height="52" alt="" title="" /></a>
  				<h1>{SITENAME}</h1>
  				<p>{SITE_DESCRIPTION}</p>
--- 57,91 ----
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" rel="stylesheet" type="text/css" media="screen, projection" />
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/normal.css" rel="stylesheet" type="text/css" title="A" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
+ 
+ <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+ 	<link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
+ <!-- ENDIF -->
+ 
+ <!-- Optionally, redefine some defintions for gecko browsers -->
+ <!-- BEGIN switch_gecko --><link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" ><!-- END switch_gecko -->
+ 
+ {MX_ADDITIONAL_CSS}
+ {MX_ICON_CSS}
+ 
  </head>
  <body id="mxbb" class="section-index {S_CONTENT_DIRECTION}">
+ 
  <div id="wrap">
! 
! <a name="top" id="top"></a>
  	<div id="page-header">
  		<div class="headerbar">
  			<div class="inner"><span class="corners-top"><span></span></span>
  			<div id="site-description">
! 				<a href="{U_INDEX}" title="{L_INDEX}" id="logo"><img src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}images/logo.gif" border="0" alt="{L_INDEX}" vspace="1"/></a>
  				<h1>{SITENAME}</h1>
  				<p>{SITE_DESCRIPTION}</p>
***************
*** 82,89 ****
  				<form action="{U_SEARCH}" method="get" id="search">
  				<fieldset>
! 					<input name="search_keywords" id="keywords" type="text" maxlength="128" title="" class="inputbox search" value="{L_SEARCH}..." onclick="if(this.value=='{L_SEARCH}...')this.value='';" onblur="if(this.value=='')this.value='{L_SEARCH}...';" /> 
  					<input class="button2" value="{L_SEARCH}" type="submit" /><br />
  					{S_HIDDEN_FIELDS}
! 					</fieldset>
  				</form>
  			</div>
--- 95,102 ----
  				<form action="{U_SEARCH}" method="get" id="search">
  				<fieldset>
! 					<input name="search_keywords" id="keywords" type="text" maxlength="128" title="" class="inputbox search" value="{L_SEARCH}..." onclick="if(this.value=='{L_SEARCH}...')this.value='';" onblur="if(this.value=='')this.value='{L_SEARCH}...';" />
  					<input class="button2" value="{L_SEARCH}" type="submit" /><br />
  					{S_HIDDEN_FIELDS}
! 				</fieldset>
  				</form>
  			</div>
***************
*** 93,126 ****
  					<div class="inner"><span class="corners-top"><span></span></span>
  								<ul class="linklist navlinks">
- 									<li><a href="{U_INDEX}" class="mainmenu"><img src="{NAV_IMAGES_HOME}" class="mx_icon" border="0" alt="" hspace="1" align="middle" /></a><span class="mainmenu"><a href="{U_INDEX}" class="mainmenu">{L_HOME}</a></span>
- 								</li>
- 								<li class="linklist">
- 									<a href="{U_INDEX_FORUM}" class="mainmenu"><img src="{NAV_IMAGES_FORUM}" class="mx_icon" border="0" alt="" hspace="1" align="middle" /></a><span class="mainmenu"><a href="{U_INDEX_FORUM}" class="mainmenu">{L_FORUM}</a></span>
- 								</li>
- 								<li class="linklist">
- 									<!-- BEGIN switch_user_logged_in -->
- 									<a href="{U_PROFILE}" class="mainmenu"><img src="{NAV_IMAGES_PROFILE}" class="mx_icon" border="0" alt="" hspace="1" align="middle" /></a><span class="mainmenu"><a href="{U_PROFILE}" class="mainmenu">{L_PROFILE}</a></span>
- 									<!-- END switch_user_logged_in -->
- 								</li>
- 								<li class="linklist">
- 									<a href="{U_FAQ}" class="mainmenu"><img src="{NAV_IMAGES_FAQ}" class="mx_icon" border="0" alt="" hspace="1" align="middle" /></a><span class="mainmenu"><a href="{U_FAQ}" class="mainmenu">{L_FAQ}</a></span>
- 								<li>
- 								<!--
- 								<li class="linklist">
- 									<a href="{U_SEARCH}" class="mainmenu"><img src="{NAV_IMAGES_SEARCH}" class="mx_icon" border="0" alt="" hspace="1" align="middle" /></a><span class="mainmenu"><a href="{U_SEARCH}" class="mainmenu">{L_SEARCH}</a></span>
- 								</li>
- 								-->
- 								<li class="linklist">
- 									<a href="{U_MEMBERLIST}" class="mainmenu"><img src="{NAV_IMAGES_MEMBERS}" class="mx_icon" border="0" alt="" hspace="1" align="middle" /></a><span class="mainmenu"><a href="{U_MEMBERLIST}" class="mainmenu">{L_MEMBERLIST}</a></span>
- 								</li>
- 								<li class="linklist">
- 									<a href="{U_GROUP_CP}" class="mainmenu"><img src="{NAV_IMAGES_GROUPS}" class="mx_icon" border="0" alt="" hspace="1" align="middle" /></a><span class="mainmenu"><a href="{U_GROUP_CP}" class="mainmenu">{L_USERGROUPS}</a></span>
- 								</li>
- 								<!-- BEGIN switch_user_logged_in -->
- 								<li class="linklist">
- 									<a href="{U_PRIVATEMSGS}" class="mainmenu"><img src="{NAV_IMAGES_PRIVMSG}" class="mx_icon" border="0" alt="" hspace="1" align="middle" /></a><span class="mainmenu"><a href="{U_PRIVATEMSGS}" class="mainmenu">{L_PRIVATEMSGS}</a></span>
- 									<!-- END switch_user_logged_in -->
- 								</li>
- 								<!-- END switch_user_logged_in -->
  								<!-- BEGIN switch_user_logged_out -->
  								<li class="linklist">
--- 106,109 ----
***************
*** 134,149 ****
  								<span class="corners-bottom"><span></span></span>
  							</div>
! 						</div>
! 				<!-- BEGIN switch_view -->
! 				<ul>
! 					<li><span class="gensmall">{CURRENT_TIME}</span></li>
! 				</ul>
! 				<ul>
! 					<li><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a></span></li>
! 				</ul>
! 				<!-- END switch_view -->
  			<!-- BEGIN phpbb_stats -->
! 				<ul>
! 					<li align="left" valign="top" ><span class="gensmall">
  						<!-- BEGIN switch_user_logged_in -->
  						{LAST_VISIT_DATE}<br />
--- 117,128 ----
  								<span class="corners-bottom"><span></span></span>
  							</div>
! 					</div>
! 			<!-- BEGIN switch_view -->
! 				<p class="{S_CONTENT_FLOW_END}<!-- BEGIN switch_user_logged_in --> rightside<!-- END switch_user_logged_in -->"><!-- BEGIN switch_user_logged_in -->{LAST_VISIT_DATE}<!-- END switch_user_logged_in --></p>
! 				<p>{CURRENT_TIME}</p>
! 			<!-- END switch_view -->
  			<!-- BEGIN phpbb_stats -->
! 				<ul class="linklist">
! 					<li class="leftside"><span class="gensmall">
  						<!-- BEGIN switch_user_logged_in -->
  						{LAST_VISIT_DATE}<br />
***************
*** 151,155 ****
  						{CURRENT_TIME}<br /></span>
  					</li>
! 					<li align="right" valign="top" >
  						<!-- BEGIN switch_user_logged_in -->
  						<a href="{U_SEARCH_NEW}" class="gensmall">{L_SEARCH_NEW}</a><br /><a href="{U_SEARCH_SELF}" class="gensmall">{L_SEARCH_SELF}</a><br />
--- 130,134 ----
  						{CURRENT_TIME}<br /></span>
  					</li>
! 					<li class="rightside">
  						<!-- BEGIN switch_user_logged_in -->
  						<a href="{U_SEARCH_NEW}" class="gensmall">{L_SEARCH_NEW}</a><br /><a href="{U_SEARCH_SELF}" class="gensmall">{L_SEARCH_SELF}</a><br />
***************
*** 157,164 ****
  						<a href="{U_SEARCH_UNANSWERED}" class="gensmall">{L_SEARCH_UNANSWERED}</a>
  					</li>
  				</ul>
  			<!-- END phpbb_stats -->
  	</div>
  	<a name="start_here"></a>
! 	<div id="page-body">
! 
--- 136,143 ----
  						<a href="{U_SEARCH_UNANSWERED}" class="gensmall">{L_SEARCH_UNANSWERED}</a>
  					</li>
+ 					<!--<li class="rightside"><a href="{U_MARK_FORUMS}" accesskey="m">{L_MARK_FORUMS_READ}</a></li> -->
  				</ul>
  			<!-- END phpbb_stats -->
  	</div>
  	<a name="start_here"></a>
! 	<div id="page-body">
\ No newline at end of file

Index: overall_header_navigation.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_header_navigation.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** overall_header_navigation.html	16 Dec 2007 22:47:42 -0000	1.5
--- overall_header_navigation.html	17 Dec 2007 04:26:18 -0000	1.6
***************
*** 1,24 ****
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
! <html dir="{S_CONTENT_DIRECTION}">
  <head>
! <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}">
! <meta http-equiv="Content-Style-Type" content="text/css">
  <!-- BEGIN switch_set_base -->
! <base href="{U_PORTAL_ROOT_PATH}" >
  <!-- END switch_set_base -->
  {META}
  {NAV_LINKS}
  <title>{SITENAME} :: {PAGE_TITLE}</title>
- <!-- First load standard template *.css definition, located in the the phpbb template folder -->
- <!-- BEGIN switch_phpbb_stylesheet--><link rel="stylesheet" href="{U_PHPBB_ROOT_PATH}styles/prosilver/theme/stylesheet.css" type="text/css" ><!-- END switch_phpbb_stylesheet-->
- <!-- Then load mxBB template *.css definition for mx, located in the the portal template folder -->
- <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" type="text/css" >
- <!-- Optionally, redefine some defintions for gecko browsers -->
- <!-- BEGIN switch_gecko --><link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" ><!-- END switch_gecko -->
  
! {MX_ADDITIONAL_CSS}
! {MX_ICON_CSS}
! 
! <script type="text/javascript" src="{U_PHPBB_ROOT_PATH}templates/prosilver/forum_fn.js"></script>
  
  <!-- BEGIN switch_enable_pm_popup -->
--- 1,15 ----
! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
  <head>
! <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
! <meta http-equiv="Content-Style-Type" content="text/css" />
  <!-- BEGIN switch_set_base -->
! <base href="{U_PORTAL_ROOT_PATH}" />
  <!-- END switch_set_base -->
  {META}
  {NAV_LINKS}
  <title>{SITENAME} :: {PAGE_TITLE}</title>
  
! <!-- BEGIN switch_phpbb_stylesheet--><link rel="stylesheet" href="{U_PHPBB_ROOT_PATH}styles/prosilver/theme/stylesheet.css" type="text/css" ><!-- END switch_phpbb_stylesheet-->
  
  <!-- BEGIN switch_enable_pm_popup -->
***************
*** 66,69 ****
--- 57,80 ----
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" rel="stylesheet" type="text/css" media="screen, projection" />
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/normal.css" rel="stylesheet" type="text/css" title="A" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
+ 
+ <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+ 	<link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
+ <!-- ENDIF -->
+ 
+ <!-- Optionally, redefine some defintions for gecko browsers -->
+ <!-- BEGIN switch_gecko --><link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" ><!-- END switch_gecko -->
+ 
+ {MX_ADDITIONAL_CSS}
+ {MX_ICON_CSS}
+ 
  </head>
  <body id="mxbb" class="section-index {S_CONTENT_DIRECTION}">

[mxbb-commits] core/templates/prosilver/images logo.gif,1.1,1.2

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/templates/prosilver/images
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv32088

Modified Files:
	logo.gif 
Log Message:
more clean logo

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

[mxbb-commits] core/includes mx_functions_style.php,1.26,1.27

[OryNider <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16682

Modified Files:
	mx_functions_style.php 
Log Message:


Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** mx_functions_style.php	16 Dec 2007 16:15:49 -0000	1.26
--- mx_functions_style.php	17 Dec 2007 01:02:46 -0000	1.27
***************
*** 540,544 ****
  			if ( !empty($this->data['user_lang']))
  			{
! 				$this->lang['default_lang'] = phpBB2::phpbb_ltrim(basename(phpBB2::phpbb_rtrim($this->data['user_lang'])), "'");
  			}
  
--- 540,558 ----
  			if ( !empty($this->data['user_lang']))
  			{
! 			
! 				switch (PORTAL_BACKEND)
! 				{
! 					case 'internal':
! 
! 					case 'phpbb2':
! 
! 						$this->lang['default_lang'] = phpBB2::phpbb_ltrim(basename(phpBB2::phpbb_rtrim($this->data['user_lang'])), "'");
! 						break;
! 
! 					case 'phpbb3':
! 
! 						$this->lang['default_lang'] = $this->data['user_lang'];
! 						break;
! 				}
  			}
  
***************
*** 629,634 ****
  		if( !file_exists(@phpBB2::phpbb_realpath($mx_root_path . 'includes/shared/phpbb2/language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx)) )
  		{
! 			@mx_message_die(GENERAL_ERROR, "Could not locate user language file: lang_main.php that most be uploaded in your includes/shared/phpbb2/language/your_language/ folder");
! 			$board_config['default_lang'] = 'english';
  		}
  		
--- 643,648 ----
  		if( !file_exists(@phpBB2::phpbb_realpath($mx_root_path . 'includes/shared/phpbb2/language/lang_' . $board_config['default_lang'] . '/lang_main.'.$phpEx)) )
  		{
! 			mx_message_die(GENERAL_ERROR, "Could not locate user language file: lang_main.php that most be uploaded in your includes/shared/phpbb2/language/your_language/ folder", "", __LINE__, __FILE__, $board_config['default_lang']);
! 			//$board_config['default_lang'] = 'english';
  		}