mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] core/includes mx_functions_core.php,1.133,1.134

[Florin C B. <ory...@us...>]

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

Modified Files:
	mx_functions_core.php 
Log Message:


Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** mx_functions_core.php	25 Jun 2013 17:14:48 -0000	1.133
--- mx_functions_core.php	25 Jun 2013 18:15:06 -0000	1.134
***************
*** 2190,2257 ****
  	 * @return unknown
  	 */
! 	function _get_custom_module_parameters($parameter_data, $block_id)
! 	{
! 		global $mx_root_path, $phpEx;
! 
! 		if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.' . $phpEx ) )
! 		{
! 			include_once( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.' . $phpEx );
! 
! 			if (class_exists('mx_module_defs'))
! 			{
! 				$mx_module_defs = new mx_module_defs();
! 
! 				if ( method_exists( $mx_module_defs,  'display_module_parameters' ) )
! 				{
! 					$mx_module_defs->display_module_parameters($parameter_data, $block_id);
! 				}
! 			}
! 		}
! 
! 		return $mx_module_defs->is_panel;
! 	}
! 
! 	/**
! 	 * load custom module panels
! 	 *
! 	 * @access private
! 	 * @param unknown_type $parameter_data
! 	 * @param unknown_type $block_id
! 	 */
! 	function _get_custom_module_panels($parameter_data, $block_id)
! 	{
! 		global $mx_root_path, $phpEx;
! 
! 		if ( file_exists( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.' . $phpEx ) )
! 		{
! 			include_once( $mx_root_path . $this->module_root_path . 'admin/mx_module_defs.' . $phpEx );
! 
! 			if (class_exists('mx_module_defs'))
! 			{
! 				$mx_module_defs = new mx_module_defs();
! 
! 				if ( method_exists( $mx_module_defs,  'display_module_panels' ) )
! 				{
! 					$mx_module_defs->display_module_panels($parameter_data, $block_id);
! 				}
! 			}
! 		}
! 	}	
! 
! 	/**
! 	 * Load custom module parameters
! 	 *
! 	 * @access private
! 	 * @param unknown_type $parameter_data
! 	 * @param unknown_type $block_id
! 	 * @return unknown
! 	 */
! 	function _get_custom_module_parameters3($parameter_data, $block_id, $classname = 'mx_module_defs', $include_path = false)
  	{
  		global $mx_root_path, $phpEx;
! 		$info_file = "admin/{$classname}.$phpEx";
! 		if (file_exists((($include_path === false) ? $mx_root_path . $this->module_root_path . 'includes/' : $include_path) . $info_file))
  		{
! 			include_once((($include_path === false) ? $mx_root_path . $this->module_root_path . 'includes/' : $include_path) . $info_file);
  			if (class_exists($classname))
  			{
--- 2190,2200 ----
  	 * @return unknown
  	 */
! 	function _get_custom_module_parameters($parameter_data, $block_id, $classname = 'mx_module_defs', $include_path = false)
  	{
  		global $mx_root_path, $phpEx;
! 		$info_file = "{$classname}.$phpEx";
! 		if (file_exists((($include_path === false) ? $mx_root_path . $this->module_root_path . 'admin/' : $include_path) . $info_file))
  		{
! 			include_once((($include_path === false) ? $mx_root_path . $this->module_root_path . 'admin/' : $include_path) . $info_file);
  			if (class_exists($classname))
  			{
***************
*** 2262,2268 ****
  				}
  			}
! 			return $mx_module_defs->is_parameter;
! 		}
! 		return false;		
  	}
  
--- 2205,2210 ----
  				}
  			}
! 			//return $mx_module_defs->is_parameter;
! 		}				
  	}
  
***************
*** 2274,2284 ****
  	 * @param unknown_type $block_id
  	 */
! 	function _get_custom_module_panels3($parameter_data, $block_id, $classname = 'mx_module_defs', $include_path = false)
  	{
  		global $mx_root_path, $phpEx;
! 		$info_file = "admin/{$classname}.$phpEx";
! 		if (file_exists((($include_path === false) ? $mx_root_path . $this->module_root_path . 'includes/' : $include_path) . $info_file))
  		{
! 			include_once((($include_path === false) ? $mx_root_path . $this->module_root_path . 'includes/' : $include_path) . $info_file);
  			if (class_exists($classname))
  			{
--- 2216,2226 ----
  	 * @param unknown_type $block_id
  	 */
! 	function _get_custom_module_panels($parameter_data, $block_id, $classname = 'mx_module_defs', $include_path = false)
  	{
  		global $mx_root_path, $phpEx;
! 		$info_file = "{$classname}.$phpEx";
! 		if (file_exists((($include_path === false) ? $mx_root_path . $this->module_root_path . 'admin/' : $include_path) . $info_file))
  		{
! 			include_once((($include_path === false) ? $mx_root_path . $this->module_root_path . 'admin/' : $include_path) . $info_file);
  			if (class_exists($classname))
  			{
***************
*** 2291,2295 ****
  			return $mx_module_defs->is_panel;
  		}
- 		return false;
  	}
  	
--- 2233,2236 ----

[mxbb-commits] core/includes/sessions/phpbb3 bbcode.php,1.14,1.15

[Florin C B. <ory...@us...>]

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

Modified Files:
	bbcode.php 
Log Message:


Index: bbcode.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/sessions/phpbb3/bbcode.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** bbcode.php	2 Jun 2013 12:56:25 -0000	1.14
--- bbcode.php	25 Jun 2013 18:15:08 -0000	1.15
***************
*** 1922,1932 ****
  		$window_columns = 8;
  
  		if ($mode == 'window')
  		{
- 			$mx_user->init($user_ip, PAGE_INDEX);
- 
- 			$gen_simple_header = TRUE;
- 			$page_title = $lang['Emoticons'];
- 
  			if ($forum_id)
  			{
--- 1922,1929 ----
  		$window_columns = 8;
  
+ 		$start = phpBB3::request_var('start', 0);
+ 
  		if ($mode == 'window')
  		{
  			if ($forum_id)
  			{
***************
*** 1945,1953 ****
  			}
  
! 			include($mx_root_path . 'includes/page_header.'.$phpEx);
  
  			$template->set_filenames(array(
! 				'smiliesbody' => 'posting_smilies.html')
  			);
  		}
  
--- 1942,1964 ----
  			}
  
! 			//page_header($mx_user->lang['SMILIES']);
  
+ 			$sql = 'SELECT COUNT(smiley_id) AS item_count
+ 				FROM ' . SMILIES_TABLE . '
+ 				GROUP BY smiley_url';
+ 			$result = $db->sql_query($sql, 3600);
+ 
+ 			$smiley_count = 0;
+ 			while ($row = $db->sql_fetchrow($result))
+ 			{
+ 				++$smiley_count;
+ 			}
+ 			$db->sql_freeresult($result);
+ 			/*
  			$template->set_filenames(array(
! 				'body' => 'posting_smilies.html')
  			);
+ 			generate_pagination(mx3_append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=smilies&f=' . $forum_id), $smiley_count, $config['smilies_per_page'], $start);
+ 			*/
  		}
  
***************
*** 1967,1979 ****
  		}
  
! 		$last_url = '';
  
! 		$sql = 'SELECT *
! 			FROM ' . SMILIES_TABLE .
! 			(($mode == 'inline') ? ' WHERE display_on_posting = 1 ' : '') . '
! 			ORDER BY smiley_order';
  
  		//phpBB2 code start
! 		if ($result = $db->sql_query($sql))
  		{
  			$num_smilies = 0;
--- 1978,2002 ----
  		}
  
! 		if ($mode == 'window')
! 		{
! 			$sql = 'SELECT smiley_url, MIN(emotion) as emotion, MIN(code) AS code, smiley_width, smiley_height, MIN(smiley_order) AS min_smiley_order
! 				FROM ' . SMILIES_TABLE . '
! 				GROUP BY smiley_url, smiley_width, smiley_height
! 				ORDER BY min_smiley_order';
! 			$result = $db->sql_query_limit($sql, $config['smilies_per_page'], $start, 3600);
! 		}
! 		else
! 		{
! 			$sql = 'SELECT *
! 				FROM ' . SMILIES_TABLE . '
! 				WHERE display_on_posting = 1
! 				ORDER BY smiley_order';
! 			$result = $db->sql_query($sql, 3600);
! 		}
  
! 		$smilies = array();
  
  		//phpBB2 code start
! 		if ($result)
  		{
  			$num_smilies = 0;
***************
*** 1981,1991 ****
  			while ($row = $db->sql_fetchrow($result))
  			{
! 				if (empty($rowset[$row['smiley_url']]))
  				{
  					$rowset[$row['smiley_url']]['code'] = str_replace("'", "\\'", str_replace('\\', '\\\\', $row['code']));
! 					$rowset[$row['smiley_url']]['emoticon'] = $row['emoticon'];
! 					$num_smilies++;
  				}
  			}
  
  			if ($num_smilies)
--- 2004,2016 ----
  			while ($row = $db->sql_fetchrow($result))
  			{
! 				if (empty($smilies[$row['smiley_url']]))
  				{
+ 					$smilies[$row['smiley_url']] = $row;
  					$rowset[$row['smiley_url']]['code'] = str_replace("'", "\\'", str_replace('\\', '\\\\', $row['code']));
! 					$rowset[$row['smiley_url']]['emotion'] = $row['emotion'];
! 					$num_smilies++;					
  				}
  			}
+ 			$db->sql_freeresult($result);			
  
  			if ($num_smilies)
***************
*** 2008,2012 ****
  						'SMILEY_CODE' => $data['code'],
  						'SMILEY_IMG' => $this->smiley_path_url  . $board_config['smilies_path'] . '/' . $smile_url,
! 						'SMILEY_DESC' => $data['emoticon'])
  					);
  
--- 2033,2037 ----
  						'SMILEY_CODE' => $data['code'],
  						'SMILEY_IMG' => $this->smiley_path_url  . $board_config['smilies_path'] . '/' . $smile_url,
! 						'SMILEY_DESC' => isset($data['emotion']) ? $data['emotion'] : $row['emotion'])
  					);
  

[mxbb-commits] core/admin admin_mx_block_cp.php, 1.27, 1.28 admin_mx_module.php, 1.52, 1.53 admin_mx_module_cp.php, 1.27, 1.28 admin_mx_words.php, 1.4, 1.5 index.php, 1.64, 1.65 page_header_admin.php, 1.32, 1.33 pagestart.php, 1.41, 1.42

[Florin C B. <ory...@us...>]

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

Modified Files:
	admin_mx_block_cp.php admin_mx_module.php 
	admin_mx_module_cp.php admin_mx_words.php index.php 
	page_header_admin.php pagestart.php 
Log Message:
fixing some missing varables and indexes in AdminCP

Index: admin_mx_module.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_module.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** admin_mx_module.php	17 Jun 2013 02:53:26 -0000	1.52
--- admin_mx_module.php	25 Jun 2013 17:15:34 -0000	1.53
***************
*** 118,130 ****
  $s_hidden_module_install_fields = '<input type="hidden" name="mode" value="' . MX_MODULE_TYPE . '" />
  							<input type="hidden" name="action" value="' . MX_DO_INSTALL . '" />
! 							<input type="hidden" name="id" value="' . $module_id . '" />
  							<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
  
! $result_message_height = $is_pak ? '300px' : '50px';
  
  //
  // Hidden vars
  //
! $s_hidden_fields_module = '<input type="hidden" name="mode" value="add" /><input type="hidden" name="id" value="' . $module_id . '" />';
  
  //
--- 118,130 ----
  $s_hidden_module_install_fields = '<input type="hidden" name="mode" value="' . MX_MODULE_TYPE . '" />
  							<input type="hidden" name="action" value="' . MX_DO_INSTALL . '" />
! 							<input type="hidden" name="id" value="' . $nav_module_id . '" />
  							<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
  
! $result_message_height = isset($is_pak) ? '300px' : '50px';
  
  //
  // Hidden vars
  //
! $s_hidden_fields_module = '<input type="hidden" name="mode" value="add" /><input type="hidden" name="id" value="' . $nav_module_id . '" />';
  
  //
***************
*** 135,140 ****
  	'L_EXPLAIN' => $lang['Module_admin_explain'],
  
! 	'NAV_MODULE_ID' => $nav_module_id,
! 	'RESULT_MESSAGE'			=> !empty($result_message) ? '<div style="overflow:auto; height:'.$result_message_height.'"><span class="gensmall">' . $result_message  . '<br/> -::-</span></div>': '',
  
  	//
--- 135,140 ----
  	'L_EXPLAIN' => $lang['Module_admin_explain'],
  
! 	'NAV_MODULE_ID' 	=> $nav_module_id,
! 	'RESULT_MESSAGE'	=> !empty($result_message) ? '<div style="overflow:auto; height:'.$result_message_height.'"><span class="gensmall">' . $result_message  . '<br/> -::-</span></div>': '',
  
  	//
***************
*** 209,213 ****
  	$module_rows_current = $db->sql_fetchrowset($q_modules_current);
  }
! $db->sql_freeresult($result);
  
  //
--- 209,213 ----
  	$module_rows_current = $db->sql_fetchrowset($q_modules_current);
  }
! $db->sql_freeresult($q_modules_current);
  
  //
***************
*** 229,234 ****
  	$module_rows = $db->sql_fetchrowset($q_modules);
  }
! 
! $db->sql_freeresult($result);
  
  if ( $total_modules + $total_modules_current == 0 )
--- 229,233 ----
  	$module_rows = $db->sql_fetchrowset($q_modules);
  }
! $db->sql_freeresult($q_modules);
  
  if ( $total_modules + $total_modules_current == 0 )
***************
*** 250,259 ****
  // Loop through the rows of modules setting block vars for the template.
  //
! for( $module_count = -1; $module_count < $total_modules; $module_count++ )
  {
  	//
  	// Give main vars specific names
  	//
! 	$new_module = $module_count == -1;
  
  	$newmode = $new_module ? 'add' : 'modify';
--- 249,258 ----
  // Loop through the rows of modules setting block vars for the template.
  //
! for( $module_count = 0; $module_count < $total_modules; $module_count++ )
  {
  	//
  	// Give main vars specific names
  	//
! 	$new_module = $module_count == 0;
  
  	$newmode = $new_module ? 'add' : 'modify';

Index: page_header_admin.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/page_header_admin.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** page_header_admin.php	17 Jun 2013 02:53:26 -0000	1.32
--- page_header_admin.php	25 Jun 2013 17:15:34 -0000	1.33
***************
*** 65,69 ****
  
  $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT');
! 
  $template->assign_vars(array(
  	'SITENAME' => $board_config['sitename'],
--- 65,69 ----
  
  $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT');
! $template_config_row = $mx_user->_load_template_config();
  $template->assign_vars(array(
  	'SITENAME' => $board_config['sitename'],
***************
*** 86,90 ****
  
  	// These theme variables are not used for MX-Publisher, since MX-Publisher require a theme.css file
! 	'T_HEAD_STYLESHEET' => $mx_user->theme['head_stylesheet'],
  	//'T_BODY_BACKGROUND' => $mx_user->theme['body_background'],
  	'T_BODY_BGCOLOR' => '#'.$mx_user->theme['body_bgcolor'],
--- 86,90 ----
  
  	// These theme variables are not used for MX-Publisher, since MX-Publisher require a theme.css file
! 	'T_HEAD_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : 'stylesheet.css',
  	//'T_BODY_BACKGROUND' => $mx_user->theme['body_background'],
  	'T_BODY_BGCOLOR' => '#'.$mx_user->theme['body_bgcolor'],
***************
*** 131,136 ****
  	'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,
  
! 	'T_PHPBB_STYLESHEET' => $mx_user->theme['head_stylesheet'],
! 	'T_MXBB_STYLESHEET' => $mx_user->theme['head_stylesheet'],
  	'T_GECKO_STYLESHEET' => 'gecko.css',
  
--- 131,136 ----
  	'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,
  
! 	'T_PHPBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : 'stylesheet.css',
! 	'T_MXBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : $mx_user->template_name.'.css',
  	'T_GECKO_STYLESHEET' => 'gecko.css',
  

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** index.php	17 Jun 2013 03:24:00 -0000	1.64
--- index.php	25 Jun 2013 17:15:34 -0000	1.65
***************
*** 18,22 ****
  // Security and Page header
  //
! @define('IN_PORTAL', 1);
  $mx_root_path = './../';
  $phpEx = substr(strrchr(__FILE__, '.'), 1);
--- 18,22 ----
  // Security and Page header
  //
! define('IN_PORTAL', 1);
  $mx_root_path = './../';
  $phpEx = substr(strrchr(__FILE__, '.'), 1);
***************
*** 153,158 ****
  		while( list($action, $file) = each($action_array) )
  		{
! 			$row_color = ( !($row_count%2) ) ? $mx_user->theme['td_color1'] : $mx_user->theme['td_color2'];
! 			$row_class = ( !($row_count%2) ) ? $mx_user->theme['td_class1'] : $mx_user->theme['td_class2'];
  
  			$action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action);
--- 153,158 ----
  		while( list($action, $file) = each($action_array) )
  		{
! 			$row_color = (!($row_count%2)) ? $mx_user->theme['td_color1'] : $mx_user->theme['td_color2'];
! 			$row_class = (!($row_count%2)) ? $mx_user->theme['td_class1'] : $mx_user->theme['td_class2'];
  
  			$action = ( !empty($lang[$action]) ) ? $lang[$action] : preg_replace("/_/", " ", $action);
***************
*** 196,203 ****
  		$module_rows = $db->sql_fetchrowset($q_modules);
  	}
! 	$db->sql_freeresult($result);
  
  	$module_mx = array();
! 	for( $module_cnt = 0; $module_cnt < $total_modules; $module_cnt++ )
  	{
  		$module_path_admin = $mx_root_path . $module_rows[$module_cnt]['module_path'] . "admin/";
--- 196,203 ----
  		$module_rows = $db->sql_fetchrowset($q_modules);
  	}
! 	$db->sql_freeresult($q_modules);
  
  	$module_mx = array();
! 	for($module_cnt = 0; $module_cnt < $total_modules; $module_cnt++)
  	{
  		$module_path_admin = $mx_root_path . $module_rows[$module_cnt]['module_path'] . "admin/";
***************
*** 505,512 ****
  	/* Begin MX-Publisher version check code block */
  	$current_MXP_version = explode('.', $portal_config['portal_version']);
! 	$minor_MXP_revision = (int) $current_MXP_version[2];
  
  	$errno = 0;
! 	$errstr = $MXP_version_info = '';
  	
  	$mx_version_check = false;
--- 505,512 ----
  	/* Begin MX-Publisher version check code block */
  	$current_MXP_version = explode('.', $portal_config['portal_version']);
! 	$minor_mx_revision = (int) $current_MXP_version[2];
  
  	$errno = 0;
! 	$errstr = $mx_version_info = '';
  	
  	$mx_version_check = false;
***************
*** 534,538 ****
  			if ($get_info)
  			{
! 				$MXP_version_info .= fread($fsock, 1024);
  			}
  			else
--- 534,538 ----
  			if ($get_info)
  			{
! 				$mx_version_info .= fread($fsock, 1024);
  			}
  			else
***************
*** 546,564 ****
  		fclose($fsock);
  
! 		$MXP_version_info = explode("\n", $MXP_version_info);
! 		$latest_MXP_head_revision = (int) $MXP_version_info[0];
! 		$latest_MXP_minor_revision = (int) $MXP_version_info[2];
! 		$latest_MXP_patch_revision = (int) $MXP_version_info[3]; // For betas/RC
  
! 		$latest_MXP_version = (int) $MXP_version_info[0] . '.' . (int) $MXP_version_info[1] . '.' . (int) $MXP_version_info[2];
  
! 		if ($latest_MXP_head_revision == 3 && $minor_MXP_revision == $latest_MXP_minor_revision)
  		{
! 			$MXP_version_info = '<p style="color:green">' . $lang['MXP_Version_up_to_date'] . '</p>';
  		}
  		else
  		{
! 			$MXP_version_info = '<p style="color:red">' . $lang['MXP_Version_outdated'];
! 			$MXP_version_info .= '<br />' . sprintf($lang['MXP_Latest_version_info'], $latest_MXP_version) . sprintf($lang['MXP_Current_version_info'], $portal_config['portal_version']) . '</p>';
  		}
  	}
--- 546,564 ----
  		fclose($fsock);
  
! 		$mx_version_info = explode("\n", $mx_version_info);
! 		$latest_mx_head_revision = (int) $mx_version_info[0];
! 		$latest_mx_minor_revision = (int) $mx_version_info[2];
! 		$latest_mx_patch_revision = (int) $mx_version_info[3]; // For betas/RC
  
! 		$latest_mx_version = (int) $mx_version_info[0] . '.' . (int) $mx_version_info[1] . '.' . (int) $mx_version_info[2];
  
! 		if ($latest_mx_head_revision == 3 && $minor_mx_revision == $latest_mx_minor_revision)
  		{
! 			$mx_version_info = '<p style="color:green">' . $lang['MXP_Version_up_to_date'] . '</p>';
  		}
  		else
  		{
! 			$mx_version_info = '<p style="color:red">' . $lang['MXP_Version_outdated'];
! 			$mx_version_info .= '<br />' . sprintf($lang['MXP_Latest_version_info'], $latest_mx_version) . sprintf($lang['MXP_Current_version_info'], $portal_config['portal_version']) . '</p>';
  		}
  	}
***************
*** 567,582 ****
  		if ($errstr)
  		{
! 			$MXP_version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>';
  		}
  		else
  		{
! 			$MXP_version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>';
  		}
  	}
  
! 	$MXP_version_info .= '<p>' . $lang['MXP_Mailing_list_subscribe_reminder'] . '</p>';
  
  	$template->assign_vars(array(
! 		'MXP_VERSION_INFO'		=> $MXP_version_info,
  		'PHPBB_VERSION_INFO'	=> $phpbb_version_info,
  		'L_VERSION_INFORMATION'	=> $lang['Version_information'])
--- 567,582 ----
  		if ($errstr)
  		{
! 			$mx_version_info = '<p style="color:red">' . sprintf($lang['Connect_socket_error'], $errstr) . '</p>';
  		}
  		else
  		{
! 			$mx_version_info = '<p>' . $lang['Socket_functions_disabled'] . '</p>';
  		}
  	}
  
! 	$mx_version_info .= '<p>' . $lang['MXP_Mailing_list_subscribe_reminder'] . '</p>';
  
  	$template->assign_vars(array(
! 		'MXBB_VERSION_INFO'		=> $mx_version_info,
  		'PHPBB_VERSION_INFO'	=> $phpbb_version_info,
  		'L_VERSION_INFORMATION'	=> $lang['Version_information'])

Index: admin_mx_words.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_words.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** admin_mx_words.php	17 Jun 2013 02:53:26 -0000	1.4
--- admin_mx_words.php	25 Jun 2013 17:15:34 -0000	1.5
***************
*** 41,44 ****
--- 41,47 ----
  include_once('./page_header_admin.' . $phpEx);
  
+ $cancel = ($mx_request_vars->is_request('cancel')) ? true : false;
+ $no_page_header = $cancel;
+ 
  if ($cancel)
  {
***************
*** 250,255 ****
  		$word_id = $word_rows[$i]['word_id'];
  
! 		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
! 		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
  
  		$template->assign_block_vars("words", array(
--- 253,258 ----
  		$word_id = $word_rows[$i]['word_id'];
  
! 		$row_color = ( !($i % 2) ) ? $mx_user->theme['td_color1'] : $mx_user->theme['td_color2'];
! 		$row_class = ( !($i % 2) ) ? $mx_user->theme['td_class1'] : $mx_user->theme['td_class2'];
  
  		$template->assign_block_vars("words", array(

Index: admin_mx_module_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_module_cp.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** admin_mx_module_cp.php	17 Jun 2013 02:53:26 -0000	1.27
--- admin_mx_module_cp.php	25 Jun 2013 17:15:34 -0000	1.28
***************
*** 348,356 ****
  	$module_rows_current = $db->sql_fetchrowset($q_modules_current);
  }
! $db->sql_freeresult($result);
  
! //
! // Get the rest modules
! //
  $sql = "SELECT *
  	FROM " . MODULE_TABLE . "
--- 348,356 ----
  	$module_rows_current = $db->sql_fetchrowset($q_modules_current);
  }
! $db->sql_freeresult($q_modules_current);
  
! /*
! * Get the rest modules
! */
  $sql = "SELECT *
  	FROM " . MODULE_TABLE . "
***************
*** 368,373 ****
  	$module_rows = $db->sql_fetchrowset($q_modules);
  }
! 
! $db->sql_freeresult($result);
  
  if ( $total_modules + $total_modules_current == 0 )
--- 368,372 ----
  	$module_rows = $db->sql_fetchrowset($q_modules);
  }
! $db->sql_freeresult($q_modules);
  
  if ( $total_modules + $total_modules_current == 0 )
***************
*** 389,393 ****
  // Module loop
  //
! for( $module_count = 0; $module_count < $total_modules + 1; $module_count++ )
  {
  	//
--- 388,392 ----
  // Module loop
  //
! for( $module_count = 0; $module_count < $total_modules; $module_count++ )
  {
  	//
***************
*** 543,548 ****
  		$function_rows = $db->sql_fetchrowset($q_functions);
  	}
! 
! 	$db->sql_freeresult($result);
  
  	if ( $total_functions == 0 )
--- 542,546 ----
  		$function_rows = $db->sql_fetchrowset($q_functions);
  	}
! 	$db->sql_freeresult($q_functions);
  
  	if ( $total_functions == 0 )
***************
*** 679,690 ****
  			));
  		}
! 
! 		//
  		// Parameter loop
- 		//
  		for( $parameter_count = 0; $parameter_count < $total_parameters + 1; $parameter_count++ )
  		{
  			$new_parameter = $parameter_count == $total_parameters;
! 			$parameter_id = $new_parameter ? $function_id . '_0': $parameter_rows[$parameter_count]['parameter_id'];
  			$id = $new_parameter ? $function_id : $parameter_id;
  
--- 677,688 ----
  			));
  		}
! 		
  		// Parameter loop
  		for( $parameter_count = 0; $parameter_count < $total_parameters + 1; $parameter_count++ )
  		{
  			$new_parameter = $parameter_count == $total_parameters;
! 			$parameter_id = isset($new_parameter) ? $function_id . '_0': $parameter_rows[$parameter_count]['parameter_id'];
! 			$parameter_desc = isset($parameter_rows[$parameter_count]['parameter_desc']) ? $parameter_rows[$parameter_count]['parameter_desc'] : 0;
! 			$parameter_order = isset($parameter_rows[$parameter_count]['parameter_order']) ? $parameter_rows[$parameter_count]['parameter_order'] : 0;
  			$id = $new_parameter ? $function_id : $parameter_id;
  
***************
*** 693,702 ****
  			$deletemode = '?mode=' . $mode . '&amp;action=' . MX_DO_DELETE . '&amp;id=' . $parameter_id;
  
! 			$upmode = '?mode=' . $mode . '&amp;action=' . MX_DO_MOVE . '&amp;id=' . $parameter_id . '&amp;function_id=' . $function_id . '&amp;block_order=' . $block_order . '&amp;move=-15';
! 			$downmode = '?mode=' . $mode . '&amp;action=' . MX_DO_MOVE . '&amp;id=' . $parameter_id . '&amp;function_id=' . $function_id . '&amp;block_order=' . $block_order . '&amp;move=15';
! 
! 			//
  			// Hidden fields
- 			//
  			$s_hidden_parameter_fields = 	'<input type="hidden" name="mode" value="' . $mode . '" />
  										<input type="hidden" name="action" value="' . $action . '" />
--- 691,698 ----
  			$deletemode = '?mode=' . $mode . '&amp;action=' . MX_DO_DELETE . '&amp;id=' . $parameter_id;
  
! 			$upmode = '?mode=' . $mode . '&amp;action=' . MX_DO_MOVE . '&amp;id=' . $parameter_id . '&amp;function_id=' . $function_id . '&amp;parameter_order=' . $parameter_order . '&amp;move=-15';
! 			$downmode = '?mode=' . $mode . '&amp;action=' . MX_DO_MOVE . '&amp;id=' . $parameter_id . '&amp;function_id=' . $function_id . '&amp;parameter_order=' . $parameter_order . '&amp;move=15';
! 			
  			// Hidden fields
  			$s_hidden_parameter_fields = 	'<input type="hidden" name="mode" value="' . $mode . '" />
  										<input type="hidden" name="action" value="' . $action . '" />
***************
*** 705,712 ****
  
  			$parameter_title = !$new_parameter ? $parameter_rows[$parameter_count]['parameter_name'] : '';
! 			$parameter_type_key = $parameter_rows[$parameter_count]['parameter_type'];
  			$parameter_type = !$new_parameter ? get_list_static('parameter_type', $type_row, $parameter_type_key) : get_list_static('parameter_type', $type_row, 'BBText');
  
! 			$parameter_function = $parameter_rows[$parameter_count]['parameter_function'];
  			$parameter_function = !$new_parameter && !empty($parameter_function) ? ( $parameter_rows[$parameter_count]['parameter_type'] != 'Function' ? implode( "\n", unserialize( stripslashes( $parameter_function ) ) ) : $parameter_function ) : '';
  
--- 701,708 ----
  
  			$parameter_title = !$new_parameter ? $parameter_rows[$parameter_count]['parameter_name'] : '';
! 			$parameter_type_key = isset($parameter_rows[$parameter_count]['parameter_type']) ? $parameter_rows[$parameter_count]['parameter_type'] : 0;
  			$parameter_type = !$new_parameter ? get_list_static('parameter_type', $type_row, $parameter_type_key) : get_list_static('parameter_type', $type_row, 'BBText');
  
! 			$parameter_function = isset($parameter_rows[$parameter_count]['parameter_function']) ? $parameter_rows[$parameter_count]['parameter_function'] : 0;
  			$parameter_function = !$new_parameter && !empty($parameter_function) ? ( $parameter_rows[$parameter_count]['parameter_type'] != 'Function' ? implode( "\n", unserialize( stripslashes( $parameter_function ) ) ) : $parameter_function ) : '';
  
***************
*** 818,825 ****
  			));
  		}
! 
! 		//
  		// Block loop
- 		//
  		for( $block_count = 0; $block_count < $total_blocks + 1; $block_count++ )
  		{
--- 814,819 ----
  			));
  		}
! 		
  		// Block loop
  		for( $block_count = 0; $block_count < $total_blocks + 1; $block_count++ )
  		{
***************
*** 827,839 ****
  			$block_id = $new_block ? $function_id . '_0' : $block_rows[$block_count]['block_id'];
  			$id = $new_block ? $function_id : $block_id;
! 
  			$mode = MX_BLOCK_TYPE;
  			$mode_private = MX_BLOCK_PRIVATE_TYPE;
  			$action = $new_block ? MX_DO_INSERT : MX_DO_UPDATE;
  			$deletemode = '?mode=' . $mode . '&amp;action=' . MX_DO_DELETE . '&amp;id=' . $block_id;
! 
! 			//
  			// Hidden fields
- 			//
  			$s_hidden_block_fields = 	'<input type="hidden" name="mode" value="' . $mode . '" />
  										<input type="hidden" name="action" value="' . $action . '" />
--- 821,831 ----
  			$block_id = $new_block ? $function_id . '_0' : $block_rows[$block_count]['block_id'];
  			$id = $new_block ? $function_id : $block_id;
! 			$s_column_span = 0;
  			$mode = MX_BLOCK_TYPE;
  			$mode_private = MX_BLOCK_PRIVATE_TYPE;
  			$action = $new_block ? MX_DO_INSERT : MX_DO_UPDATE;
  			$deletemode = '?mode=' . $mode . '&amp;action=' . MX_DO_DELETE . '&amp;id=' . $block_id;
! 			
  			// Hidden fields
  			$s_hidden_block_fields = 	'<input type="hidden" name="mode" value="' . $mode . '" />
  										<input type="hidden" name="action" value="' . $action . '" />
***************
*** 841,847 ****
  										<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
  
- 			//
  			// Hidden fields
- 			//
  			$s_hidden_block_private_fields = 	'<input type="hidden" name="mode" value="' . $mode_private . '" />
  										<input type="hidden" name="action" value="' . MX_DO_UPDATE . '" />
--- 833,837 ----
***************
*** 882,889 ****
  				$block_rows[$block_count][$block_auth_fields[1]] = AUTH_ADMIN;
  			}
! 
! 			//
  			// Block subpanel - edit
- 			//
  			$visible_tag_edit = in_array('adminEdit_' . $block_id, $cookie_states);
  			$visible_tag_private = in_array('adminPrivate_' . $block_id, $cookie_states);
--- 872,877 ----
  				$block_rows[$block_count][$block_auth_fields[1]] = AUTH_ADMIN;
  			}
! 			
  			// Block subpanel - edit
  			$visible_tag_edit = in_array('adminEdit_' . $block_id, $cookie_states);
  			$visible_tag_private = in_array('adminPrivate_' . $block_id, $cookie_states);
***************
*** 918,924 ****
  				'U_BLOCK_PERMISSIONS' => mx_append_sid(PORTAL_URL . "admin/admin_mx_block_auth.$phpEx?cat_id=$block_id"),
  
- 				//
  				// Block subpanel - edit
- 				//
  				'L_FUNCTION' => $lang['Function'],
  
--- 906,910 ----
***************
*** 946,952 ****
  				'S_SHOW_STATS_NO' => $show_stats_no,
  
- 				//
  				// Quick Panels
- 				//
  				'MESSAGE_DELETE' => $message_delete,
  
--- 932,936 ----
***************
*** 959,965 ****
  			if ($mx_modulecp_include_block_quickedit)
  			{
- 				//
  				// Auth
- 				//
  				for( $l = 0; $l < count($block_auth_fields); $l++ )
  				{
--- 943,947 ----

Index: pagestart.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/pagestart.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** pagestart.php	17 Jun 2013 02:53:26 -0000	1.41
--- pagestart.php	25 Jun 2013 17:15:34 -0000	1.42
***************
*** 25,34 ****
  if( !function_exists('prepare_message') )
  {
! 	mx_cache::load_file('functions_post', 'phpbb2');
  }
  
  if( !function_exists('add_search_words') )
  {
! 	mx_cache::load_file('functions_search', 'phpbb2');
  }
  
--- 25,34 ----
  if( !function_exists('prepare_message') )
  {
! 	$mx_cache->load_file('functions_post', 'phpbb2');
  }
  
  if( !function_exists('add_search_words') )
  {
! 	$mx_cache->load_file('functions_search', 'phpbb2');
  }
  

Index: admin_mx_block_cp.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_block_cp.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** admin_mx_block_cp.php	17 Jun 2013 02:53:26 -0000	1.27
--- admin_mx_block_cp.php	25 Jun 2013 17:15:34 -0000	1.28
***************
*** 50,56 ****
  $sid = $mx_request_vars->request('sid', MX_TYPE_NO_TAGS, '');
  
- //
  // Initial vars
- //
  $block_id = $mx_request_vars->is_request('block_id') ? $mx_request_vars->request('block_id', MX_TYPE_INT, '') : $mx_request_vars->request('id', MX_TYPE_INT, '');
  $portalpage = $mx_request_vars->request('portalpage', MX_TYPE_INT, 0);
--- 50,54 ----
***************
*** 58,69 ****
  $blog_u = $mx_request_vars->request('u', MX_TYPE_INT, $userdata['user_id']);
  
- //
  // Parameters
- //
  $submit = $mx_request_vars->is_post('submit');
  $submit_pars = $mx_request_vars->is_post('submit_pars');
  $cancel = $mx_request_vars->is_post('cancel');
  $preview = $mx_request_vars->is_post('preview');
! $refresh = $preview || $submit_search;
  
  //
--- 56,65 ----
  $blog_u = $mx_request_vars->request('u', MX_TYPE_INT, $userdata['user_id']);
  
  // Parameters
  $submit = $mx_request_vars->is_post('submit');
  $submit_pars = $mx_request_vars->is_post('submit_pars');
  $cancel = $mx_request_vars->is_post('cancel');
  $preview = $mx_request_vars->is_post('preview');
! $refresh = $preview || $submit;
  
  //
***************
*** 159,165 ****
  } // if .. !empty($mode)
  
- //
  // Hidden vars
- //
  $s_hidden_fields = '<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
  $s_hidden_fields .= '<input type="hidden" name="block_id" value="' . $block_id . '" />';
--- 155,159 ----

[mxbb-commits] core/includes mx_functions.php, 1.117, 1.118 mx_functions_admincp.php, 1.69, 1.70 mx_functions_blockcp.php, 1.30, 1.31 mx_functions_core.php, 1.132, 1.133 mx_functions_style.php, 1.132, 1.133 page_header.php, 1.74, 1.75

[Florin C B. <ory...@us...>]

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

Modified Files:
	mx_functions.php mx_functions_admincp.php 
	mx_functions_blockcp.php mx_functions_core.php 
	mx_functions_style.php page_header.php 
Log Message:
fixing some missing varables and indexes in AdminCP Class

Index: mx_functions_blockcp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_blockcp.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** mx_functions_blockcp.php	29 Jul 2009 06:31:38 -0000	1.30
--- mx_functions_blockcp.php	25 Jun 2013 17:14:48 -0000	1.31
***************
*** 60,64 ****
  	 * @return unknown
  	 */
! 	function _controlpanel( $id, $new_block = false )
  	{
  		global $blockcptemplate, $lang, $db, $board_config, $theme, $phpEx, $mx_root_path, $s_hidden_fields, $userdata, $cookie_states, $module_nav_icon_url, $portalpage, $mx_request_vars, $images, $mx_backend;
--- 60,64 ----
  	 * @return unknown
  	 */
! 	function _controlpanel($id, $new_block = false)
  	{
  		global $blockcptemplate, $lang, $db, $board_config, $theme, $phpEx, $mx_root_path, $s_hidden_fields, $userdata, $cookie_states, $module_nav_icon_url, $portalpage, $mx_request_vars, $images, $mx_backend;
***************
*** 73,103 ****
  			die('Invalid block panel call - no id');
  		}
! 
! 		//
  		// Main parameters
- 		//
  		$block_keys = array( 'block_title' => 'block_title', 'block_desc' => 'block_desc', 'show_block' => 'show_block', 'show_title' => 'show_title', 'show_stats' => 'show_stats');
! 
! 		//
  		// General
- 		//
  		$mode_general = MX_BLOCK_TYPE;
  		$mode_permissions = MX_BLOCK_PRIVATE_TYPE;
  		$mode_settings = MX_BLOCK_SETTINGS_TYPE;
! 
  		$block_id = $id;
  		$module_id = $mx_request_vars->is_request('module_id') ? $mx_request_vars->request('module_id', MX_TYPE_INT, 0) : mx_parent_data($block_id, 'module_id');
  		$function_id = $mx_request_vars->is_request('function_id') ? $mx_request_vars->request('function_id', MX_TYPE_INT, 0) : mx_parent_data($block_id, 'function_id');
! 
! 		//
  		// Define auth constants
- 		//
  		$block_auth_fields = array('auth_view', 'auth_edit');	// , 'auth_delete'
! 
  		$block_auth_ary = array(
  			'auth_view'		=> AUTH_ALL,
  			'auth_edit'		=> AUTH_ADMIN,
  		);
! 
  		$block_auth_levels = array('ALL', 'REG', 'PRIVATE', 'MOD', 'ADMIN', 'ANONYMOUS');
  		$block_auth_const = array(AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN, AUTH_ANONYMOUS);
--- 73,97 ----
  			die('Invalid block panel call - no id');
  		}
! 		
  		// Main parameters
  		$block_keys = array( 'block_title' => 'block_title', 'block_desc' => 'block_desc', 'show_block' => 'show_block', 'show_title' => 'show_title', 'show_stats' => 'show_stats');
! 		
  		// General
  		$mode_general = MX_BLOCK_TYPE;
  		$mode_permissions = MX_BLOCK_PRIVATE_TYPE;
  		$mode_settings = MX_BLOCK_SETTINGS_TYPE;
! 		
  		$block_id = $id;
  		$module_id = $mx_request_vars->is_request('module_id') ? $mx_request_vars->request('module_id', MX_TYPE_INT, 0) : mx_parent_data($block_id, 'module_id');
  		$function_id = $mx_request_vars->is_request('function_id') ? $mx_request_vars->request('function_id', MX_TYPE_INT, 0) : mx_parent_data($block_id, 'function_id');
! 		
  		// Define auth constants
  		$block_auth_fields = array('auth_view', 'auth_edit');	// , 'auth_delete'
! 		
  		$block_auth_ary = array(
  			'auth_view'		=> AUTH_ALL,
  			'auth_edit'		=> AUTH_ADMIN,
  		);
! 		
  		$block_auth_levels = array('ALL', 'REG', 'PRIVATE', 'MOD', 'ADMIN', 'ANONYMOUS');
  		$block_auth_const = array(AUTH_ALL, AUTH_REG, AUTH_ACL, AUTH_MOD, AUTH_ADMIN, AUTH_ANONYMOUS);
***************
*** 106,116 ****
  			'auth_edit'		=> $lang['Edit'],
  		);
! 
! 		//
  		// Update block
- 		//
  		$action = MX_DO_UPDATE;
  		$buttonvalue = $lang['Update'];
! 
  		$block_title = $mx_request_vars->post($block_keys['block_title'], MX_TYPE_NO_TAGS, $this->$block_keys['block_title']);
  		$block_desc = $mx_request_vars->post($block_keys['block_desc'], MX_TYPE_NO_TAGS, $this->$block_keys['block_desc']);
--- 100,108 ----
  			'auth_edit'		=> $lang['Edit'],
  		);
! 		
  		// Update block
  		$action = MX_DO_UPDATE;
  		$buttonvalue = $lang['Update'];
! 		
  		$block_title = $mx_request_vars->post($block_keys['block_title'], MX_TYPE_NO_TAGS, $this->$block_keys['block_title']);
  		$block_desc = $mx_request_vars->post($block_keys['block_desc'], MX_TYPE_NO_TAGS, $this->$block_keys['block_desc']);
***************
*** 118,125 ****
  		$show_title = $mx_request_vars->post($block_keys['show_title'],MX_TYPE_INT, $this->$block_keys['show_title']);
  		$show_stats = $mx_request_vars->post($block_keys['show_stats'], MX_TYPE_INT, $this->$block_keys['show_stats']);
! 
! 		//
  		// Add block
- 		//
  		$action_add = MX_DO_INSERT;
  		$buttonvalue_add = $lang['Create_block'];
--- 110,115 ----
  		$show_title = $mx_request_vars->post($block_keys['show_title'],MX_TYPE_INT, $this->$block_keys['show_title']);
  		$show_stats = $mx_request_vars->post($block_keys['show_stats'], MX_TYPE_INT, $this->$block_keys['show_stats']);
! 		
  		// Add block
  		$action_add = MX_DO_INSERT;
  		$buttonvalue_add = $lang['Create_block'];
***************
*** 133,146 ****
  		$show_stats_yes_add = '';
  		$show_stats_no_add = 'checked="checked"';
! 
! 		//
  		// Now get started
- 		//
  		$functionlist = get_list_formatted('function_list', $function_id, '', '', true);
  
  		
  		/*
! 		// Populate missing parameters (if any)
! 		//
  		$sql = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . " (block_id, parameter_id, parameter_value)
  			SELECT " . $block_id . ", parameter_id,   parameter_default
--- 123,134 ----
  		$show_stats_yes_add = '';
  		$show_stats_no_add = 'checked="checked"';
! 		
  		// Now get started
  		$functionlist = get_list_formatted('function_list', $function_id, '', '', true);
  
  		
  		/*
! 		* Populate missing parameters (if any)
! 		*
  		$sql = "INSERT INTO " . BLOCK_SYSTEM_PARAMETER_TABLE . " (block_id, parameter_id, parameter_value)
  			SELECT " . $block_id . ", parameter_id,   parameter_default
***************
*** 152,163 ****
  		}
  		*/
! 
! 		//
  		// Hidden fields
! 		//
! 		$s_hidden_fields .= 	'<input type="hidden" name="mode" value="' . $mode . '" />
  								<input type="hidden" name="action" value="' . $action . '" />';
! 
! 
  		$show_title_yes = ( $show_title == 1 ) ? 'checked="checked"' : '';
  		$show_title_no = ( $show_title == 0 ) ? 'checked="checked"' : '';
--- 140,148 ----
  		}
  		*/
! 		
  		// Hidden fields
! 		$s_hidden_fields .= 	'<input type="hidden" name="mode" value="' . $this->blockcp_mode . '" />
  								<input type="hidden" name="action" value="' . $action . '" />';
! 								
  		$show_title_yes = ( $show_title == 1 ) ? 'checked="checked"' : '';
  		$show_title_no = ( $show_title == 0 ) ? 'checked="checked"' : '';
***************
*** 168,177 ****
  		$show_stats_yes = ( $show_stats == 1 ) ? 'checked="checked"' : '';
  		$show_stats_no = ( $show_stats == 0 ) ? 'checked="checked"' : '';
! 
! 		//
  		// Define some graphics
- 		//
  		$module_nav_icon_url = PORTAL_URL . $images['mx_graphics']['admin_icons'] . '/';
! 
  		$admin_icon['contract'] = $module_nav_icon_url . 'contract.gif';
  		$admin_icon['expand'] = $module_nav_icon_url . 'expand.gif';
--- 153,160 ----
  		$show_stats_yes = ( $show_stats == 1 ) ? 'checked="checked"' : '';
  		$show_stats_no = ( $show_stats == 0 ) ? 'checked="checked"' : '';
! 		
  		// Define some graphics
  		$module_nav_icon_url = PORTAL_URL . $images['mx_graphics']['admin_icons'] . '/';
! 		
  		$admin_icon['contract'] = $module_nav_icon_url . 'contract.gif';
  		$admin_icon['expand'] = $module_nav_icon_url . 'expand.gif';
***************
*** 182,195 ****
  		$admin_icon['block'] = $module_nav_icon_url . 'icon_block.gif';
  		$admin_icon['edit_block'] = $module_nav_icon_url . 'icon_edit.gif';
  
- 		//
  		// JS
- 		//
  		$cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_mode';
  		$cookie_blockCP = !empty($_COOKIE[$cookie_tmp]) ? $_COOKIE[$cookie_tmp] : 'settings';
  
- 		//
  		// Send General Vars to template
- 		//
  		$visible_general_add = $cookie_blockCP == 'general_add';
  		$visible_general = $cookie_blockCP == 'general';
--- 165,175 ----
  		$admin_icon['block'] = $module_nav_icon_url . 'icon_block.gif';
  		$admin_icon['edit_block'] = $module_nav_icon_url . 'icon_edit.gif';
+ 		$admin_icon['page'] = $module_nav_icon_url . 'icon_block.gif'; 
  
  		// JS
  		$cookie_tmp = $board_config['cookie_name'].'_adminBlockCP_mode';
  		$cookie_blockCP = !empty($_COOKIE[$cookie_tmp]) ? $_COOKIE[$cookie_tmp] : 'settings';
  
  		// Send General Vars to template
  		$visible_general_add = $cookie_blockCP == 'general_add';
  		$visible_general = $cookie_blockCP == 'general';
***************
*** 197,201 ****
  		$visible_private = $cookie_blockCP == 'private';
  		$visible_delete = $cookie_blockCP == 'delete';
! 
  		$blockcptemplate->assign_vars(array(
  			'VISIBLE_GENERAL_ADD' 				=> $visible_general_add ? 'block' : 'none',
--- 177,181 ----
  		$visible_private = $cookie_blockCP == 'private';
  		$visible_delete = $cookie_blockCP == 'delete';
! 		
  		$blockcptemplate->assign_vars(array(
  			'VISIBLE_GENERAL_ADD' 				=> $visible_general_add ? 'block' : 'none',
***************
*** 209,221 ****
  			'IMG_URL_PRIVATE' 					=> $visible_private ? $admin_icon['contract'] : $admin_icon['expand'],
  			'IMG_URL_DELETE' 					=> $visible_delete ? $admin_icon['contract'] : $admin_icon['expand'],
! 
  			'L_TITLE' => $lang['Block_admin'],
  			'L_EXPLAIN' => $lang['Block_admin_explain'],
! 
  			'SID'				=> $userdata['session_id'],
! 
! 			//
  			// General
- 			//
  			"L_ACTION" => $lang['Action'],
  			"L_DELETE" => $lang['Delete'],
--- 189,199 ----
  			'IMG_URL_PRIVATE' 					=> $visible_private ? $admin_icon['contract'] : $admin_icon['expand'],
  			'IMG_URL_DELETE' 					=> $visible_delete ? $admin_icon['contract'] : $admin_icon['expand'],
! 			
  			'L_TITLE' => $lang['Block_admin'],
  			'L_EXPLAIN' => $lang['Block_admin_explain'],
! 			
  			'SID'				=> $userdata['session_id'],
! 			
  			// General
  			"L_ACTION" => $lang['Action'],
  			"L_DELETE" => $lang['Delete'],
***************
*** 227,239 ****
  			'L_YES' => $lang['Yes'],
  			'L_NO' => $lang['No'],
! 
! 			'L_SETTING' => $l_setting,
  			'L_DELETE' => $lang['Delete'],
  			'L_EDIT' => $lang['Edit'],
! 
  			'L_AUTH_TITLE' => $lang['Auth_Block'],
  			'L_AUTH_TITLE_EXPLAIN' => $lang['Auth_Block_explain'],
  			'L_FUNCTION' => $lang['Function'],
! 
  			'L_BLOCK_TITLE' 	=> $lang['Block_title'],
  			'L_BLOCK_DESC' 		=> $lang['Block_desc'],
--- 205,217 ----
  			'L_YES' => $lang['Yes'],
  			'L_NO' => $lang['No'],
! 			
! 			'L_SETTING' => isset($l_setting) ? $l_setting : $lang['Block_cp'],
  			'L_DELETE' => $lang['Delete'],
  			'L_EDIT' => $lang['Edit'],
! 			
  			'L_AUTH_TITLE' => $lang['Auth_Block'],
  			'L_AUTH_TITLE_EXPLAIN' => $lang['Auth_Block_explain'],
  			'L_FUNCTION' => $lang['Function'],
! 			
  			'L_BLOCK_TITLE' 	=> $lang['Block_title'],
  			'L_BLOCK_DESC' 		=> $lang['Block_desc'],
***************
*** 244,317 ****
  			'L_SHOW_STATS' 		=> $lang['Show_stats'],
  			'L_SHOW_STATS_EXPLAIN' => $lang['Show_stats_explain'],
! 
  			'BLOCK_ID' => $block_id,
  			'BLOCK_TITLE' => '&nbsp;&nbsp;' . $block_title,
  			'BLOCK_DESC' => ( $block_desc != '' ) ? ' - ' . $block_desc : '',
! 
  			'U_BLOCK_SETTINGS' => mx_append_sid(PORTAL_URL . "admin/admin_mx_blockcp.$phpEx?block_id=$block_id"),
  			'U_BLOCK_DELETE' => mx_append_sid(PORTAL_URL . "admin/admin_mx_block.$phpEx?mode=delete_block&amp;block_id=$block_id"),
  			'U_BLOCK_PERMISSIONS' => mx_append_sid(PORTAL_URL . "admin/admin_mx_block_auth.$phpEx?cat_id=$block_id"),
! 
  			'E_BLOCK_TITLE' => $block_title,
  			'E_BLOCK_DESC' => $block_desc,
! 
  			'S_FUNCTION_LIST' => $functionlist,
! 
! 			//
  			// Update
- 			//
  			'S_SHOW_BLOCK_YES' => $show_block_yes,
  			'S_SHOW_BLOCK_NO' => $show_block_no,
! 
  			'S_SHOW_TITLE_YES' => $show_title_yes,
  			'S_SHOW_TITLE_NO' => $show_title_no,
! 
  			'S_SHOW_STATS_YES' => $show_stats_yes,
  			'S_SHOW_STATS_NO' => $show_stats_no,
! 
! 			//
  			// Add
- 			//
  			'S_SHOW_BLOCK_YES_ADD' => $show_block_yes_add,
  			'S_SHOW_BLOCK_NO_ADD' => $show_block_no_add,
! 
  			'S_SHOW_TITLE_YES_ADD' => $show_title_yes_add,
  			'S_SHOW_TITLE_NO_ADD' => $show_title_no_add,
! 
  			'S_SHOW_STATS_YES_ADD' => $show_stats_yes_add,
  			'S_SHOW_STATS_NO_ADD' => $show_stats_no_add,
! 
  			'S_HIDDEN_FIELDS' => $s_hidden_fields,
  			'S_SUBMIT_UPDATE' => $buttonvalue,
  			'S_SUBMIT' => $lang['Update'],
! 
  			'L_GROUPS' 					=> $lang['Usergroups'],
  			'L_IS_MODERATOR' 			=> $lang['Is_Moderator'],
! 
! 			//
  			// Graphics
- 			//
  			'IMG_URL_CONTRACT' => $admin_icon['contract'],
  			'IMG_URL_EXPAND' => $admin_icon['expand'],
! 
  			'IMG_ICON_PAGE' => $admin_icon['page'],
! 			'IMG_ICON_PAGE_COLUMN' => $admin_icon['page_column'],
  			'IMG_ICON_FUNCTION' => $admin_icon['function'],
  			'IMG_ICON_PARAMETER' => $admin_icon['parameter'],
  			'IMG_ICON_BLOCK' => $admin_icon['block'],
  			'IMG_ICON_EDIT_BLOCK' => $admin_icon['edit_block'],
! 			//
  			// Cookies
- 			//
  			'COOKIE_NAME'	=> $board_config['cookie_name'],
  			'COOKIE_PATH'	=> $board_config['cookie_path'],
  			'COOKIE_DOMAIN'	=> $board_config['cookie_domain'],
  			'COOKIE_SECURE'	=> $board_config['cookie_secure'],
- 
  		));
! 
! 		//
  		// Hidden fields
- 		//
  		$s_hidden_general_fields = 	'<input type="hidden" name="mode" value="' . $mode_general . '" />
  									<input type="hidden" name="action" value="' . $action . '" />
--- 222,285 ----
  			'L_SHOW_STATS' 		=> $lang['Show_stats'],
  			'L_SHOW_STATS_EXPLAIN' => $lang['Show_stats_explain'],
! 			
  			'BLOCK_ID' => $block_id,
  			'BLOCK_TITLE' => '&nbsp;&nbsp;' . $block_title,
  			'BLOCK_DESC' => ( $block_desc != '' ) ? ' - ' . $block_desc : '',
! 			
  			'U_BLOCK_SETTINGS' => mx_append_sid(PORTAL_URL . "admin/admin_mx_blockcp.$phpEx?block_id=$block_id"),
  			'U_BLOCK_DELETE' => mx_append_sid(PORTAL_URL . "admin/admin_mx_block.$phpEx?mode=delete_block&amp;block_id=$block_id"),
  			'U_BLOCK_PERMISSIONS' => mx_append_sid(PORTAL_URL . "admin/admin_mx_block_auth.$phpEx?cat_id=$block_id"),
! 			
  			'E_BLOCK_TITLE' => $block_title,
  			'E_BLOCK_DESC' => $block_desc,
! 			
  			'S_FUNCTION_LIST' => $functionlist,
! 			
  			// Update
  			'S_SHOW_BLOCK_YES' => $show_block_yes,
  			'S_SHOW_BLOCK_NO' => $show_block_no,
! 			
  			'S_SHOW_TITLE_YES' => $show_title_yes,
  			'S_SHOW_TITLE_NO' => $show_title_no,
! 			
  			'S_SHOW_STATS_YES' => $show_stats_yes,
  			'S_SHOW_STATS_NO' => $show_stats_no,
! 			
  			// Add
  			'S_SHOW_BLOCK_YES_ADD' => $show_block_yes_add,
  			'S_SHOW_BLOCK_NO_ADD' => $show_block_no_add,
! 			
  			'S_SHOW_TITLE_YES_ADD' => $show_title_yes_add,
  			'S_SHOW_TITLE_NO_ADD' => $show_title_no_add,
! 			
  			'S_SHOW_STATS_YES_ADD' => $show_stats_yes_add,
  			'S_SHOW_STATS_NO_ADD' => $show_stats_no_add,
! 			
  			'S_HIDDEN_FIELDS' => $s_hidden_fields,
  			'S_SUBMIT_UPDATE' => $buttonvalue,
  			'S_SUBMIT' => $lang['Update'],
! 			
  			'L_GROUPS' 					=> $lang['Usergroups'],
  			'L_IS_MODERATOR' 			=> $lang['Is_Moderator'],
! 			
  			// Graphics
  			'IMG_URL_CONTRACT' => $admin_icon['contract'],
  			'IMG_URL_EXPAND' => $admin_icon['expand'],
! 			
  			'IMG_ICON_PAGE' => $admin_icon['page'],
! 			'IMG_ICON_PAGE_COLUMN' => isset($admin_icon['page_column']) ? $admin_icon['page_column'] : 0,
  			'IMG_ICON_FUNCTION' => $admin_icon['function'],
  			'IMG_ICON_PARAMETER' => $admin_icon['parameter'],
  			'IMG_ICON_BLOCK' => $admin_icon['block'],
  			'IMG_ICON_EDIT_BLOCK' => $admin_icon['edit_block'],
! 			
  			// Cookies
  			'COOKIE_NAME'	=> $board_config['cookie_name'],
  			'COOKIE_PATH'	=> $board_config['cookie_path'],
  			'COOKIE_DOMAIN'	=> $board_config['cookie_domain'],
  			'COOKIE_SECURE'	=> $board_config['cookie_secure'],
  		));
! 		
  		// Hidden fields
  		$s_hidden_general_fields = 	'<input type="hidden" name="mode" value="' . $mode_general . '" />
  									<input type="hidden" name="action" value="' . $action . '" />
***************
*** 322,326 ****
  									<input type="hidden" name="portalpage" value="' . $portalpage . '" />
  									<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
! 
  		$s_hidden_general_add_fields = 	'<input type="hidden" name="mode" value="' . $mode_general . '" />
  									<input type="hidden" name="action" value="' . MX_DO_INSERT . '" />
--- 290,294 ----
  									<input type="hidden" name="portalpage" value="' . $portalpage . '" />
  									<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
! 									
  		$s_hidden_general_add_fields = 	'<input type="hidden" name="mode" value="' . $mode_general . '" />
  									<input type="hidden" name="action" value="' . MX_DO_INSERT . '" />
***************
*** 331,335 ****
  									<input type="hidden" name="portalpage" value="' . $portalpage . '" />
  									<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
! 
  		$s_hidden_permissions_fields = 	'<input type="hidden" name="mode" value="' . $mode_permissions . '" />
  									<input type="hidden" name="action" value="' . $action . '" />
--- 299,303 ----
  									<input type="hidden" name="portalpage" value="' . $portalpage . '" />
  									<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
! 									
  		$s_hidden_permissions_fields = 	'<input type="hidden" name="mode" value="' . $mode_permissions . '" />
  									<input type="hidden" name="action" value="' . $action . '" />
***************
*** 346,366 ****
  									<input type="hidden" name="portalpage" value="' . $portalpage . '" />
  									<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
! 
! 		//
  		// Get blockcp mode -> to set action file
- 		//
  		$s_action_file = $this->blockcp_mode == 'mx_blockcp' ? $mx_root_path . 'modules/mx_coreblocks/mx_blockcp.' . $phpEx : $mx_root_path . 'admin/admin_mx_block_cp.' . $phpEx;
! 
  		$deletemode = '?mode=' . $mode_general . '&amp;action=' . MX_DO_DELETE . '&amp;id=' . $block_id . '&amp;module_id=' . $module_id . '&amp;function_id=' . $function_id . '&amp;portalpage=' . $portalpage. '&amp;sid=' . $userdata['session_id'];
! 
  		$message_delete = $lang['Delete_block'] . ' - ' . $block_title
  					. '<br /><br />' . $lang['Delete_block_explain']
  					. '<br /><br />' . sprintf($lang['Click_block_delete_yes'], '<a href="' . mx_append_sid($s_action_file . $deletemode) . '">', '</a>')
  					. '<br /><br />';
! 
! 
! 		//
  		// Activate BlockCP SubPanels, based on auth
- 		//
  		if (($this->auth_mod || $is_admin) && !$new_block)
  		{
--- 314,329 ----
  									<input type="hidden" name="portalpage" value="' . $portalpage . '" />
  									<input type="hidden" name="sid" value="' . $userdata['session_id'] . '" />';
! 									
  		// Get blockcp mode -> to set action file
  		$s_action_file = $this->blockcp_mode == 'mx_blockcp' ? $mx_root_path . 'modules/mx_coreblocks/mx_blockcp.' . $phpEx : $mx_root_path . 'admin/admin_mx_block_cp.' . $phpEx;
! 		
  		$deletemode = '?mode=' . $mode_general . '&amp;action=' . MX_DO_DELETE . '&amp;id=' . $block_id . '&amp;module_id=' . $module_id . '&amp;function_id=' . $function_id . '&amp;portalpage=' . $portalpage. '&amp;sid=' . $userdata['session_id'];
! 		
  		$message_delete = $lang['Delete_block'] . ' - ' . $block_title
  					. '<br /><br />' . $lang['Delete_block_explain']
  					. '<br /><br />' . sprintf($lang['Click_block_delete_yes'], '<a href="' . mx_append_sid($s_action_file . $deletemode) . '">', '</a>')
  					. '<br /><br />';
! 					
  		// Activate BlockCP SubPanels, based on auth
  		if (($this->auth_mod || $is_admin) && !$new_block)
  		{
***************
*** 370,380 ****
  				'S_SUBMIT' => $buttonvalue
  			));
! 
! 			//
  			// Some general blockcp settings are moderator only
- 			//
  			$blockcptemplate->assign_block_vars('blockcp_general.is_mod', array());
  		}
! 
  		if ( ($is_admin ) || $new_block)
  		{
--- 333,341 ----
  				'S_SUBMIT' => $buttonvalue
  			));
! 			
  			// Some general blockcp settings are moderator only
  			$blockcptemplate->assign_block_vars('blockcp_general.is_mod', array());
  		}
! 		
  		if ( ($is_admin ) || $new_block)
  		{
***************
*** 384,391 ****
  				'S_SUBMIT' => $buttonvalue_add
  			));
! 
! 			//
  			// Output values of individual auth fields - add
- 			//
  			for( $j = 0; $j < count($block_auth_fields); $j++ )
  			{
--- 345,350 ----
  				'S_SUBMIT' => $buttonvalue_add
  			));
! 			
  			// Output values of individual auth fields - add
  			for( $j = 0; $j < count($block_auth_fields); $j++ )
  			{
***************
*** 428,444 ****
  				'S_SUBMIT' => $buttonvalue
  			));
! 
! 			//
  			// Some general blockcp settings are moderator only
- 			//
  			$blockcptemplate->assign_block_vars('blockcp_general.is_auth', array());
  
! 			//
! 			// Now query all permissions data (not needed if not authorized ;)
! 			//
  
- 			//
  			// Output values of individual auth fields - edit
- 			//
  			for( $j = 0; $j < count($block_auth_fields); $j++ )
  			{
--- 387,399 ----
  				'S_SUBMIT' => $buttonvalue
  			));
! 			
  			// Some general blockcp settings are moderator only
  			$blockcptemplate->assign_block_vars('blockcp_general.is_auth', array());
  
! 			/*
! 			* Now query all permissions data (not needed if not authorized ;)
! 			*/
  
  			// Output values of individual auth fields - edit
  			for( $j = 0; $j < count($block_auth_fields); $j++ )
  			{
***************
*** 463,489 ****
  				));
  			}
! 
! 
! 			//
! 			// PRIVATE auth
! 			//
! 
! 			//
  			// Get the list of phpBB usergroups
- 			//
  			$sql = $mx_backend->generate_group_select_sql();
- 
  			if( !($result = $db->sql_query($sql)) )
  			{
  				mx_message_die(GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql);
  			}
! 
  			while( $row = $db->sql_fetchrow($result) )
  			{
  				$groupdata[] = $row;
! 			}
! 			
  			$db->sql_freeresult($result);
! 
  			$view_groups = @explode(',', $this->block_info['auth_view_group']);
  			$edit_groups = @explode(',', $this->block_info['auth_edit_group']);
--- 418,439 ----
  				));
  			}
! 			
! 			/*
! 			* PRIVATE auth
! 			*/
! 			
  			// Get the list of phpBB usergroups
  			$sql = $mx_backend->generate_group_select_sql();
  			if( !($result = $db->sql_query($sql)) )
  			{
  				mx_message_die(GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql);
  			}
! 			
  			while( $row = $db->sql_fetchrow($result) )
  			{
  				$groupdata[] = $row;
! 			}			
  			$db->sql_freeresult($result);
! 			
  			$view_groups = @explode(',', $this->block_info['auth_view_group']);
  			$edit_groups = @explode(',', $this->block_info['auth_edit_group']);
***************
*** 542,549 ****
  			));
  		}
! 
! 		//
  		// Load and display additional blockcp parameters or panels (if any)
- 		//
  		if (!empty($this->block_parameters))
  		{
--- 492,497 ----
  			));
  		}
! 		
  		// Load and display additional blockcp parameters or panels (if any)
  		if (!empty($this->block_parameters))
  		{
***************
*** 556,560 ****
  		}
  
! 		return $template;
  	}
  
--- 504,508 ----
  		}
  
! 		return true;
  	}
  

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** mx_functions_core.php	19 Jun 2013 12:22:41 -0000	1.132
--- mx_functions_core.php	25 Jun 2013 17:14:48 -0000	1.133
***************
*** 1498,1507 ****
  	{
  		global $userdata, $lang;
! 
! 		//
  		// Weird rewrite for php5 - anyone explaining why wins a medal ;)
! 		//
! 		$temp = $this->block_config[$this->block_id];
! 		$this->block_info = $temp['block_info'];
  		$this->block_parameters = isset($temp['block_parameters']) ? $temp['block_parameters'] : array();
  		unset($temp);
--- 1498,1505 ----
  	{
  		global $userdata, $lang;
! 		
  		// Weird rewrite for php5 - anyone explaining why wins a medal ;)
! 		$temp = isset($this->block_config[$this->block_id]) ? $this->block_config[$this->block_id] : false;
! 		$this->block_info = isset($temp['block_info']) ? $temp['block_info'] : mx_get_info(BLOCK_TABLE, 'block_id', $this->block_id);
  		$this->block_parameters = isset($temp['block_parameters']) ? $temp['block_parameters'] : array();
  		unset($temp);
***************
*** 1522,1531 ****
  		$this->block_time = $this->block_info['block_time'];
  		$this->editor_id = $this->block_info['block_editor_id'];
! 
! 		$this->module_root_path = $this->block_info['module_root_path'];
! 		$this->block_file = $this->block_info['block_file'];
! 		$this->block_edit_file = $this->block_info['block_edit_file'];
! 		$this->function_id = $this->block_info['function_id'];
! 
  		$this->is_dynamic = $this->_is_dynamic();
  		$this->is_sub = $this->_is_sub();
--- 1520,1539 ----
  		$this->block_time = $this->block_info['block_time'];
  		$this->editor_id = $this->block_info['block_editor_id'];
! 		
! 		if (isset($this->block_info['module_root_path']) && !defined('IN_ADMIN'))
! 		{
! 			$this->module_root_path = $this->block_info['module_root_path'];
! 			$this->block_file = $this->block_info['block_file'];
! 			$this->block_edit_file = $this->block_info['block_edit_file'];
! 			$this->function_id = $this->block_info['function_id'];
! 		}
! 		else
! 		{
! 			global $module_root_path;
! 			$this->module_root_path = isset($this->block_info['module_root_path']) ? $this->block_info['module_root_path'] : $module_root_path;
! 			$this->block_file = isset($this->block_info['block_file']) ? $this->block_info['block_file'] : '';
! 			$this->block_edit_file = isset($this->block_info['block_edit_file']) ? $this->block_info['block_edit_file'] : '';
! 			$this->function_id = isset($this->block_info['block_edit_file']) ? $this->block_info['block_edit_file'] : '';
! 		}
  		$this->is_dynamic = $this->_is_dynamic();
  		$this->is_sub = $this->_is_sub();
***************
*** 2173,2177 ****
  	 */
  	var $is_panel = false;
! 
  	/**
  	 * Load custom module parameters
--- 2181,2185 ----
  	 */
  	var $is_panel = false;
! 	
  	/**
  	 * Load custom module parameters
***************
*** 2229,2235 ****
--- 2237,2298 ----
  			}
  		}
+ 	}	
+ 
+ 	/**
+ 	 * Load custom module parameters
+ 	 *
+ 	 * @access private
+ 	 * @param unknown_type $parameter_data
+ 	 * @param unknown_type $block_id
+ 	 * @return unknown
+ 	 */
+ 	function _get_custom_module_parameters3($parameter_data, $block_id, $classname = 'mx_module_defs', $include_path = false)
+ 	{
+ 		global $mx_root_path, $phpEx;
+ 		$info_file = "admin/{$classname}.$phpEx";
+ 		if (file_exists((($include_path === false) ? $mx_root_path . $this->module_root_path . 'includes/' : $include_path) . $info_file))
+ 		{
+ 			include_once((($include_path === false) ? $mx_root_path . $this->module_root_path . 'includes/' : $include_path) . $info_file);
+ 			if (class_exists($classname))
+ 			{
+ 				$mx_module_defs = new $classname;
+ 				if (method_exists($mx_module_defs, 'display_module_parameters'))
+ 				{
+ 					$mx_module_defs->display_module_parameters($parameter_data, $block_id);
+ 				}
+ 			}
+ 			return $mx_module_defs->is_parameter;
+ 		}
+ 		return false;		
  	}
  
  	/**
+ 	 * load custom module panels
+ 	 *
+ 	 * @access private
+ 	 * @param unknown_type $parameter_data
+ 	 * @param unknown_type $block_id
+ 	 */
+ 	function _get_custom_module_panels3($parameter_data, $block_id, $classname = 'mx_module_defs', $include_path = false)
+ 	{
+ 		global $mx_root_path, $phpEx;
+ 		$info_file = "admin/{$classname}.$phpEx";
+ 		if (file_exists((($include_path === false) ? $mx_root_path . $this->module_root_path . 'includes/' : $include_path) . $info_file))
+ 		{
+ 			include_once((($include_path === false) ? $mx_root_path . $this->module_root_path . 'includes/' : $include_path) . $info_file);
+ 			if (class_exists($classname))
+ 			{
+ 				$mx_module_defs = new $classname;
+ 				if (method_exists($mx_module_defs, 'display_module_panels'))
+ 				{
+ 					$mx_module_defs->display_module_panels($parameter_data, $block_id);
+ 				}
+ 			}
+ 			return $mx_module_defs->is_panel;
+ 		}
+ 		return false;
+ 	}
+ 	
+ 	/**
  	 * submit custom module parameters
  	 *

Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** page_header.php	24 Jun 2013 02:12:37 -0000	1.74
--- page_header.php	25 Jun 2013 17:14:48 -0000	1.75
***************
*** 20,30 ****
  /**********
  NOTE:
- 
  The following code related to GZIP initialization has been moved to
  the new mx_session_start() function, declared in mx_functions.php
  
- //
  // gzip_compression
- //
  $do_gzip_compress = FALSE;
  if ( $board_config['gzip_compress'] )
--- 20,27 ----
***************
*** 58,88 ****
  }
  **********/
! 
! //
  // If MX-Publisher frame template is not set, instantiate it
! //
! if ( is_object($layouttemplate) == FALSE )
  {
- 	//
  	// Initialize template
! 	//
! 	$layouttemplate = new mx_Template( $mx_root_path . 'templates/'. $mx_user->theme['template_name'], $board_config, $db );
  }
- 
- //
  // If MX-Publisher page is not set, instantiate it
- //
  if (!isset($mx_page->page_navigation_block))
  {
! 	//
! 	// Load and instatiate page and block classes
! 	// - temp fix to instatiate mx_page for the login page
! 	//
! 	$mx_page->init( '1' );
  }
  
- //
  // Parse and show the overall header.
- //
  $page_ov_header2 = substr_count($mx_page->page_ov_header, 'html') ? str_replace(".html", ".tpl", $mx_page->page_ov_header) : str_replace(".tpl", ".html", $mx_page->page_ov_header);
  $layouttemplate->set_filenames(array(
--- 55,76 ----
  }
  **********/
! $layouttemplate = isset($layouttemplate) ? $layouttemplate : "";
  // If MX-Publisher frame template is not set, instantiate it
! if (!is_object($layouttemplate))
  {
  	// Initialize template
! 	$layouttemplate = new mx_Template($mx_root_path . 'templates/'. $mx_user->theme['template_name'], $board_config, $db);
  }
  // If MX-Publisher page is not set, instantiate it
  if (!isset($mx_page->page_navigation_block))
  {
! 	/*
! 	* Load and instatiate page and block classes
! 	* - temp fix to instatiate mx_page for the login page
! 	*/
! 	$mx_page->init('1');
  }
  
  // Parse and show the overall header.
  $page_ov_header2 = substr_count($mx_page->page_ov_header, 'html') ? str_replace(".html", ".tpl", $mx_page->page_ov_header) : str_replace(".tpl", ".html", $mx_page->page_ov_header);
  $layouttemplate->set_filenames(array(
***************
*** 90,101 ****
  ));
  
- //
  // Generate logged in/logged out status
- //
  $mx_backend->page_header('generate_login_logout_stats');
  
- //
  // Generate HTML required for Mozilla Navigation bar
- //
  if ( !isset( $nav_links ) )
  {
--- 78,85 ----
***************
*** 121,127 ****
  }
  
- //
  // Format Timezone. We are unable to use array_pop here, because of PHP3 compatibility
- //
  $l_timezone = explode( '.', $board_config['board_timezone'] );
  $l_timezone = ( count( $l_timezone ) > 1 && $l_timezone[count( $l_timezone )-1] != 0 ) ? $lang[sprintf( '%.1f', $board_config['board_timezone'] )] : $lang[number_format( $board_config['board_timezone'] )];
--- 105,109 ----
***************
*** 136,142 ****
  }
  
- //
  // Search box
- //
  $search_page_id_pafiledb = get_page_id('dload.' . $phpEx, true);
  $search_page_id_kb = get_page_id('kb.' . $phpEx, true);
--- 118,122 ----
***************
*** 149,155 ****
  $option_search_google = '<option value="google">' . $lang['Mx_search_google'] . '</option>';
  
- //
  // Generate list of additional css files to include (defined by modules)
- //
  $mx_addional_css_files = '';
  if (isset($mx_page->mxbb_css_addup) && (count($mx_page->mxbb_css_addup) > 0))
--- 129,133 ----
***************
*** 161,167 ****
  }
  
- //
  // Generate list of additional js files to include (defined by modules)
- //
  $mx_addional_js_files = '';
  if (isset($mx_page->mxbb_js_addup) && (count($mx_page->mxbb_js_addup) > 0))
--- 139,143 ----
***************
*** 173,179 ****
  }
  
- //
  // Generate additional header code (defined by modules)
- //
  $mx_addional_header_text = '';
  if (isset($mx_page->mxbb_header_addup) && (count($mx_page->mxbb_header_addup) > 0))
--- 149,153 ----
***************
*** 187,197 ****
  $useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT');
  
- 
  switch (PORTAL_BACKEND)
  {
  	case 'internal':
- 
  	case 'phpbb2':
- 
  		$admin = ($userdata['session_logged_in'] && $userdata['user_level'] == ADMIN) ? true : false;
  		break;
--- 161,168 ----
***************
*** 271,277 ****
  	'IS_ADMIN' => $admin, 	
  
- 	//
  	// These theme variables are not used for MX-Publisher, since MX-Publisher require a theme.css file
- 	//
  	'T_HEAD_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : 'stylesheet.css',
  	'T_BODY_BACKGROUND' => isset($mx_user->theme['body_background']) ? $mx_user->theme['body_background'] : '',
--- 242,246 ----
***************
*** 368,379 ****
  ));
  
- //
  // Definitions of main navigation links
- //
  $mx_backend->page_header('generate_nav_links');
  
- //
  // Navigation Menu in overall_header
- //
  if ($mx_page->auth_view || $mx_page->auth_mod)
  {
--- 337,344 ----
***************
*** 390,418 ****
  
  		$mx_block->init( $block_id );
- 
- 		//
  		// Define $module_root_path, to be used within blocks
- 		//
  		$mx_module_path = $module_root_path;
  		$module_root_path = $mx_root_path . $mx_block->module_root_path;
! 
  		$template = new mx_Template($mx_root_path . 'templates/'. $mx_user->theme['template_name']);
! 
! 		//
  		// Include block file and cache output
- 		//
  		ob_start();
  		@include($module_root_path . $mx_block->block_file);
  		$overall_navigation_menu = ob_get_contents();
  		ob_end_clean();
! 
! 		//
  		// Output Block contents
- 		//
  		$layouttemplate->assign_vars(array(
  			'OVERALL_NAVIGATION' => $overall_navigation_menu)
  		);
! 
! 		if ( ( ( $mx_block->auth_view && $mx_block->auth_edit && $mx_block->show_block ) || $mx_block->auth_mod ) )
  		{
  			$mx_block->output_cp_button(true);
--- 355,376 ----
  
  		$mx_block->init( $block_id );
  		// Define $module_root_path, to be used within blocks
  		$mx_module_path = $module_root_path;
  		$module_root_path = $mx_root_path . $mx_block->module_root_path;
! 		
  		$template = new mx_Template($mx_root_path . 'templates/'. $mx_user->theme['template_name']);
! 		
  		// Include block file and cache output
  		ob_start();
  		@include($module_root_path . $mx_block->block_file);
  		$overall_navigation_menu = ob_get_contents();
  		ob_end_clean();
! 		
  		// Output Block contents
  		$layouttemplate->assign_vars(array(
  			'OVERALL_NAVIGATION' => $overall_navigation_menu)
  		);
! 		
! 		if ((($mx_block->auth_view && $mx_block->auth_edit && $mx_block->show_block) || $mx_block->auth_mod))
  		{
  			$mx_block->output_cp_button(true);

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** mx_functions_style.php	24 Jun 2013 02:12:37 -0000	1.132
--- mx_functions_style.php	25 Jun 2013 17:14:48 -0000	1.133
***************
*** 1051,1058 ****
  		$this->default_style_phpbb_path = $this->style_path . $this->default_style_name; //new			
  		$this->style = $style;
! 		//
! 		// Load template settings
! 		// - pass cloned template name to $theme
! 		//
  		$template_config_row = $this->_load_template_config();
  
--- 1051,1058 ----
  		$this->default_style_phpbb_path = $this->style_path . $this->default_style_name; //new			
  		$this->style = $style;
! 		/*
! 		* Load template settings
! 		* - pass cloned template name to $theme
! 		*/
  		$template_config_row = $this->_load_template_config();
  
***************
*** 1079,1092 ****
  		$this->cloned_style_phpbb_path = !empty($this->cloned_template_name) ? $this->style_path . $this->cloned_template_name : ''; //new
  		
- 		//
  		// What template to use?
- 		//
  		$template = new mx_Template($mx_root_path . $this->template_path . $this->template_name);
! 
! 		define('TEMPLATE_ROOT_PATH', $this->template_path . $this->template_name . '/');
  		
- 		//
  		// Get missing theme colors from *.cfg file (sort of desperate fix)
- 		//
  		foreach($row as $key => $value)
  		{
--- 1079,1088 ----
  		$this->cloned_style_phpbb_path = !empty($this->cloned_template_name) ? $this->style_path . $this->cloned_template_name : ''; //new
  		
  		// What template to use?
  		$template = new mx_Template($mx_root_path . $this->template_path . $this->template_name);
! 		//todo@ remove redefination
! 		@define('TEMPLATE_ROOT_PATH', $this->template_path . $this->template_name . '/');
  		
  		// Get missing theme colors from *.cfg file (sort of desperate fix)
  		foreach($row as $key => $value)
  		{
***************
*** 1096,1107 ****
  			}
  		}
- 		//
  		// Load images
- 		//
  		$this->_load_phpbb_images();
  		$this->_load_mxbb_images();
! 		//
  		// Load backend specific style defs.
- 		//
  		$this->setup_style();
  		return $row;
--- 1092,1100 ----
  			}
  		}
  		// Load images
  		$this->_load_phpbb_images();
  		$this->_load_mxbb_images();
! 		
  		// Load backend specific style defs.
  		$this->setup_style();
  		return $row;

Index: mx_functions_admincp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** mx_functions_admincp.php	23 Jun 2013 21:46:49 -0000	1.69
--- mx_functions_admincp.php	25 Jun 2013 17:14:48 -0000	1.70
***************
*** 131,138 ****
  	* Constructor
  	*/
! 	function mx_admin($stand_alone = true, $db = true)
  	{
  		// Setup $this->db
! 		if ($db !== false)
  		{
  			if (!is_object($db) || !method_exists($db, 'sql_query'))
--- 131,138 ----
  	* Constructor
  	*/
! 	function mx_admin($stand_alone = true, $db = false)
  	{
  		// Setup $this->db
! 		if ($db == true)
  		{
  			if (!is_object($db) || !method_exists($db, 'sql_query'))
***************
*** 550,557 ****
  					$max_order = $row['max_order'];
  					$next_order = intval($max_order + 10);
! 
! 					//
  					// There is no problem having duplicate page names so we won't check for it.
- 					//
  					$sql = "INSERT INTO " . COLUMN_TABLE . " (column_title, column_order, column_size, page_id)
  						VALUES ('" . $column_title . "',  $next_order, '" . $column_size . "', $page_id)";
--- 550,555 ----
  					$max_order = $row['max_order'];
  					$next_order = intval($max_order + 10);
! 					
  					// There is no problem having duplicate page names so we won't check for it.
  					$sql = "INSERT INTO " . COLUMN_TABLE . " (column_title, column_order, column_size, page_id)
  						VALUES ('" . $column_title . "',  $next_order, '" . $column_size . "', $page_id)";
***************
*** 3853,3865 ****
  		if ($all_functions)
  		{
! 			$is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0;
! 			if (!$is_admin)
  			{
- 				//
- 				// Authorization SQL
- 				//
  				$auth_blocks = get_auth_blocks();
  				$auth_sql = " AND blk.block_id in ( ". $auth_blocks. " ) ";
  			}
  
  			//
--- 3851,3866 ----
  		if ($all_functions)
  		{
! 			$is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? true : false;
! 			// Authorization SQL	
! 			if ($is_admin !== false)
  			{
  				$auth_blocks = get_auth_blocks();
  				$auth_sql = " AND blk.block_id in ( ". $auth_blocks. " ) ";
  			}
+ 			else
+ 			{
+ 				$auth_blocks = "";
+ 				$auth_sql = " ";
+ 			}			
  
  			//
***************
*** 3923,3927 ****
  				}
  
! 				$k = $j - 1;
  				
  				if( $row[$j]['module_id'] != $row[$k]['module_id'] )
--- 3924,3928 ----
  				}
  
! 				$k = ($j > 0) ? $j - 1 : 0;
  				
  				if( $row[$j]['module_id'] != $row[$k]['module_id'] )
***************
*** 3941,3953 ****
  
  				$function_id = $row[$j]['function_id'];
! 				$function_title = ($row[$j]['function_name']) ? addslashes(strip_tags(trim($row[$j]['function_name']))) : '';
! 				$function_desc = ($function_desc_tmp) ? addslashes(strip_tags(trim($function_desc_tmp))) : '';
! 
! 				$this->_addFunction($module_id, $function_id, $function_title, $function_desc);
! 
! 				//
  				// Get all function blocks (if any)
! 				//
! 				if (isset($functionBlocks[$function_id]))
  				{
  					foreach($functionBlocks[$function_id] as $key => $block_row)
--- 3942,3955 ----
  
  				$function_id = $row[$j]['function_id'];
! 				$function_title = ($row[$j]['function_name']) ? addslashes(strip_tags(trim($row[$j]['function_name']))) : 'function';
! 				$function_desc = ($function_desc_tmp) ? addslashes(strip_tags(trim($function_desc_tmp))) : 'function desc';
! 				
! 				if(!is_null($module_id) && ($module_id !== 0))
! 				{
! 					$this->_addFunction($module_id, $function_id, $function_title, $function_desc);
! 				}				
! 									
  				// Get all function blocks (if any)
! 				if (isset($functionBlocks[$function_id]) && ($module_id !== 0))
  				{
  					foreach($functionBlocks[$function_id] as $key => $block_row)
***************
*** 3996,4000 ****
  				$row = $db->sql_fetchrowset($result);
  			}
- 
  			$db->sql_freeresult($result);
  			$module_id = $function_id = $block_id = 0;
--- 3998,4001 ----
***************
*** 4002,4006 ****
  			for( $j = 0; $j < $total_blocks; $j++ )
  			{
! 				if( $row[$j]['module_id'] != $row[$j-1]['module_id'] )
  				{
  					$module_desc_tmp = str_replace("\n", '', $row[$j]['module_desc']);
--- 4003,4008 ----
  			for( $j = 0; $j < $total_blocks; $j++ )
  			{
! 				$k = ($j > 0) ? $j - 1 : 0;
! 				if($row[$j]['module_id'] != $row[$k]['module_id'])
  				{
  					$module_desc_tmp = str_replace("\n", '', $row[$j]['module_desc']);
***************
*** 4026,4031 ****
  					$function_title = !empty($row[$j]['function_name']) ? addslashes(strip_tags(trim($row[$j]['function_name']))) : '';
  					$function_desc = !empty($function_desc_tmp) ? addslashes(strip_tags(trim($function_desc_tmp))) : '';
! 
! 					$this->_addFunction($module_id, $function_id, $function_title, $function_desc);
  				}
  
--- 4028,4036 ----
  					$function_title = !empty($row[$j]['function_name']) ? addslashes(strip_tags(trim($row[$j]['function_name']))) : '';
  					$function_desc = !empty($function_desc_tmp) ? addslashes(strip_tags(trim($function_desc_tmp))) : '';
! 					
! 					if(!is_null($module_id) && ($module_id !== 0))
! 					{
! 						$this->_addFunction($module_id, $function_id, $function_title, $function_desc);
! 					}					
  				}
  
***************
*** 4055,4059 ****
  	function _addBlock($module_id = '', $function_id = '', $block_id = '', $block_title = '', $block_desc = '')
  	{
! 		$this->functionBlocks[$module_id][$function_id] = $this->functionBlocks[$module_id][$function_id] . (!empty($this->functionBlocks[$module_id][$function_id]) ? ',' : '') . '"' . $block_title . $block_desc . '","' . $block_id . '"';
  	}
  
--- 4060,4071 ----
  	function _addBlock($module_id = '', $function_id = '', $block_id = '', $block_title = '', $block_desc = '')
  	{
! 		if (!empty($this->functionBlocks[$module_id][$function_id]))
! 		{
! 			$this->functionBlocks[$module_id][$function_id] = $this->functionBlocks[$module_id][$function_id] . (!empty($this->functionBlocks[$module_id][$function_id]) ? ',' : '') . '"' . $block_title . $block_desc . '","' . $block_id . '"';
! 		}
! 		else
! 		{
! 			$this->functionBlocks[$module_id][$function_id] = (!empty($this->functionBlocks[$module_id][$function_id]) ? ',' : '') . '"' . $block_title . $block_desc . '","' . $block_id . '"';
! 		}		
  	}
  
***************
*** 4069,4075 ****
  	function _addFunction($module_id = '', $function_id = '', $function_title = '', $function_desc = '')
  	{
! 		$this->moduleFunctions[$module_id] = $this->moduleFunctions[$module_id] . (!empty($this->moduleFunctions[$module_id]) ? ',' : '') . '"' . $function_title . '","' . $function_id . '"';
  	}
! 
  	/**
  	 * Enter description here...
--- 4081,4094 ----
  	function _addFunction($module_id = '', $function_id = '', $function_title = '', $function_desc = '')
  	{
! 		if (!empty($this->moduleFunctions[$module_id]))
! 		{
! 			$this->moduleFunctions[$module_id] = $this->moduleFunctions[$module_id] . (!empty($this->moduleFunctions[$module_id]) ? ',' : '') . '"' . $function_title . '","' . $function_id . '"';
! 		}
! 		else
! 		{
! 			$this->moduleFunctions[$module_id] =  '"' . $function_title . '","' . $function_id . '"';
! 		}		
  	}
! 	
  	/**
  	 * Enter description here...
***************
*** 4082,4086 ****
  	function _addModule($module_id = '', $module_title = '', $module_desc = '')
  	{
! 		$this->modules[$module_id] = $module_title;
  	}
  
--- 4101,4112 ----
  	function _addModule($module_id = '', $module_title = '', $module_desc = '')
  	{
! 		if (!empty($module_title))
! 		{
! 			$this->modules[$module_id] = $module_title;
! 		}
! 		else
! 		{
! 			$this->modules[$module_id] = 'Module';
! 		}	
  	}
  

Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** mx_functions.php	18 Jun 2013 22:40:28 -0000	1.117
--- mx_functions.php	25 Jun 2013 17:14:48 -0000	1.118
***************
*** 945,951 ****
  
  	$style_select = '<select name="' . $select_name . '">';
  	if ($show_instruction)
  	{
- 		$selected1 = ( $default_style == -1 ) ? ' selected="selected"' : '';
  		$style_select .= '<option value="-1"' . $selected1 . '>' . $lang['Select_page_style'] . '</option>';
  	}
--- 945,951 ----
  
  	$style_select = '<select name="' . $select_name . '">';
+ 	$selected1 = ( $default_style == -1 ) ? ' selected="selected"' : '';
  	if ($show_instruction)
  	{
  		$style_select .= '<option value="-1"' . $selected1 . '>' . $lang['Select_page_style'] . '</option>';
  	}
***************
*** 955,959 ****
  		$id = $row['themes_id'];
  		$selected = ( $id == $default_style && !$selected1) ? ' selected="selected"' : '';
! 			$style_select .= '<option value="' . $id . '"' . $selected . '>' . $row['style_name'] . '</option>';
  	}
  	$db->sql_freeresult($result);
--- 955,959 ----
  		$id = $row['themes_id'];
  		$selected = ( $id == $default_style && !$selected1) ? ' selected="selected"' : '';
! 		$style_select .= '<option value="' . $id . '"' . $selected . '>' . $row['style_name'] . '</option>';
  	}
  	$db->sql_freeresult($result);
***************
*** 1536,1540 ****
  	for( $j = 0; $j < $total_blocks; $j++ )
  	{
! 		if( $row[$j]['module_name'] != $row[$j-1]['module_name'] )
  		{
  			$column_list .= '<option value="">' . 'Module: ' . $row[$j]['module_name'] . '----------' . "</option>\n";
--- 1536,1541 ----
  	for( $j = 0; $j < $total_blocks; $j++ )
  	{
! 		$i = abs($j - 1);
! 		if( $row[$j]['module_name'] != $row[$i]['module_name'] )
  		{
  			$column_list .= '<option value="">' . 'Module: ' . $row[$j]['module_name'] . '----------' . "</option>\n";
***************
*** 1543,1547 ****
  		if( $type == 'block_list' )
  		{
! 			if( $row[$j]['function_name'] != $row[$j-1]['function_name'] )
  			{
  				$block_type = $row[$j]['function_name'] . ': ';
--- 1544,1548 ----
  		if( $type == 'block_list' )
  		{
! 			if( $row[$j]['function_name'] != $row[$i]['function_name'] )
  			{
  				$block_type = $row[$j]['function_name'] . ': ';

[mxbb-commits] mx_clock/templates/prosilver clock_body.html, 1.3, 1.4

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/mx_clock/templates/prosilver
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25495/prosilver

Modified Files:
	clock_body.html 
Log Message:


Index: clock_body.html
===================================================================
RCS file: /cvsroot/mxbb/mx_clock/templates/prosilver/clock_body.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** clock_body.html	24 Apr 2013 00:08:29 -0000	1.3
--- clock_body.html	25 Jun 2013 10:08:07 -0000	1.4
***************
*** 9,22 ****
  			</ul>		
  			<div align="center" id="clock" style="background:{WMODE};">
! 				<span class="nav" style="text-align: center;">			
! 					<script language="JavaScript">
! 						document.writeln("<object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" codebase=\"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=5,0,0,0\" width=\"{FLASH_WIDTH}\" height=\"{FLASH_HEIGHT}\">");
! 						document.writeln("<param name=movie value=\"{CLOCK_SWF}\">");
! 						document.writeln("<param name={COLOR_MODE} value=\"{WMODE}\">");
! 						document.writeln("<param name=quality value=high>");
! 						document.writeln("<embed src=\"{CLOCK_SWF}\" {COLOR_MODE}=\"{WMODE}\" quality=high pluginspage=\"http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash\" type=\"application/x-shockwave-flash\" width=\"{FLASH_WIDTH}\" height=\"{FLASH_HEIGHT}\">");
! 						document.writeln("</embed>");
! 						document.writeln("</object>");
! 					</script>
  				</span>				
  			</div> 
--- 9,25 ----
  			</ul>		
  			<div align="center" id="clock" style="background:{WMODE};">
! 				<span class="nav" style="text-align: center;">
! 		<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="{FLASH_WIDTH}" height="{FLASH_WIDTH}" id="clock" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0">
! 			<param name="movie" value="{CLOCK_SWF}" />
! 			<param name="file" value="{CLOCK_SWF}" />
! 			<param name="backcolor" value="0xcadceb" />
! 			<param name="frontcolor" value="0x007677" />
! 			<param name="lightcolor" value="0xFFD3A6" />
! 			<param name="displayheight" value="100" />
! 			<param name="height" value="{FLASH_WIDTH}" />  
! 			<param name="width" value="{FLASH_WIDTH}" />  	 
! 			<param name="wmode" value="{WMODE}" />				
! 			<embed src="{CLOCK_SWF}" wmode="{WMODE}" width="{FLASH_WIDTH}" height="{FLASH_HEIGHT}" name="clock" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
! 		</object>				
  				</span>				
  			</div> 

[mxbb-commits] core/templates/prosilver overall_header.html, 1.14, 1.15 overall_header_navigation.html, 1.20, 1.21 prosilver.cfg, 1.14, 1.15

[Florin C B. <ory...@us...>]

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

Modified Files:
	overall_header.html overall_header_navigation.html 
	prosilver.cfg 
Log Message:


Index: overall_header_navigation.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_header_navigation.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** overall_header_navigation.html	27 Jul 2011 19:44:58 -0000	1.20
--- overall_header_navigation.html	24 Jun 2013 02:13:03 -0000	1.21
***************
*** 80,85 ****
  // --></script>
  
! <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Common.js"></script>
! <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
  {MX_ADDITIONAL_JS_FILES}
--- 80,86 ----
  // --></script>
  
! <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Common.js"></script>
! <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
! <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
  
  {MX_ADDITIONAL_JS_FILES}

Index: prosilver.cfg
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/prosilver.cfg,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** prosilver.cfg	17 Jun 2013 00:40:18 -0000	1.14
--- prosilver.cfg	24 Jun 2013 02:13:03 -0000	1.15
***************
*** 31,35 ****
  // Do not alter this line!
  //
! define(MX_TEMPLATE_CONFIG, true);
  $mx_template_config = true;
  
--- 31,35 ----
  // Do not alter this line!
  //
! @define('MX_TEMPLATE_CONFIG', true);
  $mx_template_config = true;
  
***************
*** 228,235 ****
  $images['voting_graphic'][3] = "$current_template_addon_images/voting_bar.gif";
  $images['voting_graphic'][4] = "$current_template_addon_images/voting_bar.gif";
- 
- //
  // Define common theme colors (if not present in db)
- //
  $theme['body_bgcolor'] = "FFFFFF";
  $theme['body_text'] = "383B3F";
--- 228,232 ----
***************
*** 249,253 ****
  $theme['fontcolor1'] = "383B3F"; // Main font color
  $theme['fontcolor2'] = "726363";
! 
  /********************************************************************************\
  | CORE Images
--- 246,257 ----
  $theme['fontcolor1'] = "383B3F"; // Main font color
  $theme['fontcolor2'] = "726363";
! $theme['td_color1'] = "f7f7f7";
! $theme['td_color2'] = "f2f2f2";
! $theme['td_color3'] = "ebebeb";
! $theme['td_color4'] = "fbf4f4";
! $theme['td_color5'] = "f1f1f1";
! $theme['td_class1'] = "bg1";
! $theme['td_class2'] = "bg2";
! $theme['td_class3'] = "bg3";
  /********************************************************************************\
  | CORE Images

Index: overall_header.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_header.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** overall_header.html	15 Oct 2009 15:58:30 -0000	1.14
--- overall_header.html	24 Jun 2013 02:13:03 -0000	1.15
***************
*** 82,85 ****
--- 82,86 ----
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Common.js"></script>
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
+ <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/tinymce/jscripts/tiny_mce/tinymce.min.js"></script>
  
  {MX_ADDITIONAL_JS_FILES}

[mxbb-commits] core/includes mx_functions_style.php, 1.131, 1.132 page_header.php, 1.73, 1.74

[Florin C B. <ory...@us...>]

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

Modified Files:
	mx_functions_style.php page_header.php 
Log Message:


Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** page_header.php	17 Jun 2013 21:29:51 -0000	1.73
--- page_header.php	24 Jun 2013 02:12:37 -0000	1.74
***************
*** 274,278 ****
  	// These theme variables are not used for MX-Publisher, since MX-Publisher require a theme.css file
  	//
! 	'T_HEAD_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : '',
  	'T_BODY_BACKGROUND' => isset($mx_user->theme['body_background']) ? $mx_user->theme['body_background'] : '',
  	'T_BODY_BGCOLOR' => '#'.$mx_user->theme['body_bgcolor'],
--- 274,278 ----
  	// These theme variables are not used for MX-Publisher, since MX-Publisher require a theme.css file
  	//
! 	'T_HEAD_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : 'stylesheet.css',
  	'T_BODY_BACKGROUND' => isset($mx_user->theme['body_background']) ? $mx_user->theme['body_background'] : '',
  	'T_BODY_BGCOLOR' => '#'.$mx_user->theme['body_bgcolor'],
***************
*** 336,340 ****
  	'T_PHPBB_STYLESHEET' => $mx_user->theme['head_stylesheet'],
  	'T_STYLESHEET_LINK'	=> (!isset($mx_user->theme['theme_storedb'])) ? "{$phpbb_root_path}styles/" . $mx_user->theme['template_path'] . '/theme/stylesheet.css' : "{$phpbb_root_path}style.$phpEx?sid=$mx_user->session_id&id=" . $mx_user->theme['style_id'] . '&lang=' . $mx_user->encode_lang($board_config['default_lang']),
! 	'T_MXBB_STYLESHEET' => $mx_user->theme['head_stylesheet'],
  	'T_GECKO_STYLESHEET' => 'gecko.css',
  
--- 336,340 ----
  	'T_PHPBB_STYLESHEET' => $mx_user->theme['head_stylesheet'],
  	'T_STYLESHEET_LINK'	=> (!isset($mx_user->theme['theme_storedb'])) ? "{$phpbb_root_path}styles/" . $mx_user->theme['template_path'] . '/theme/stylesheet.css' : "{$phpbb_root_path}style.$phpEx?sid=$mx_user->session_id&id=" . $mx_user->theme['style_id'] . '&lang=' . $mx_user->encode_lang($board_config['default_lang']),
! 	'T_MXBB_STYLESHEET' => isset($mx_user->theme['head_stylesheet']) ? $mx_user->theme['head_stylesheet'] : $mx_user->template_name.'.css',
  	'T_GECKO_STYLESHEET' => 'gecko.css',
  

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** mx_functions_style.php	17 Jun 2013 02:51:56 -0000	1.131
--- mx_functions_style.php	24 Jun 2013 02:12:37 -0000	1.132
***************
*** 1165,1168 ****
--- 1165,1169 ----
  		global $board_config, $template, $phpbb_root_path, $mx_root_path;
  		
+ 		//unset($GLOBALS['MX_TEMPLATE_CONFIG']);
  		$mx_template_config = false;
  		
***************
*** 1179,1184 ****
  			print('template config filename ' . $template_config_filename . ' couldn\'t be opened.');
  		}
! 		
! 		// We include common temlate config file here to not load it every time a module template config file is included		
  		$this->theme['body_bgcolor'] = $theme['body_bgcolor'];
  		$this->theme['body_text'] = $theme['body_text'];
--- 1180,1185 ----
  			print('template config filename ' . $template_config_filename . ' couldn\'t be opened.');
  		}
! 		// We include common temlate config file here to not load it every time a module template config file is included
! 		/*
  		$this->theme['body_bgcolor'] = $theme['body_bgcolor'];
  		$this->theme['body_text'] = $theme['body_text'];
***************
*** 1198,1201 ****
--- 1199,1204 ----
  		$this->theme['fontcolor1'] = $theme['fontcolor1']; // Main font color
  		$this->theme['fontcolor2'] = $theme['fontcolor2'];
+ 		*/
+ 		$this->theme = is_array($this->theme) ? array_merge($this->theme, $theme) : $theme;
  		
  		/* Removed since in 3.0.x+ our default template is no style
***************
*** 1738,1745 ****
  		$template_config_d = TEMPLATE_CONFIG;
  		
! 		@include($mx_root_path . $module_root_path . $this->current_template_path . '/' . $template_name . '.cfg');
  		if (!$mx_template_config)
  		{
! 			@include($mx_root_path . $module_root_path . $this->current_template_path . '/' . $moduleCfgFile . '.cfg');
  		}
  
--- 1741,1755 ----
  		$template_config_d = TEMPLATE_CONFIG;
  		
! 		//@define('MX_TEMPLATE_CONFIG', false);
! 		$mx_template_config = false;
! 		
! 		if (@file_exists($mx_root_path . $module_root_path . $this->current_template_path . '/' . $template_name . '.cfg'))
! 		{
! 			include($mx_root_path . $module_root_path . $this->current_template_path . '/' . $template_name . '.cfg');
! 		}
! 		
  		if (!$mx_template_config)
  		{
! 			@require($mx_root_path . $module_root_path . $this->current_template_path . '/' . $moduleCfgFile . '.cfg');
  		}
  
***************
*** 1752,1759 ****
  			$template_name = $this->cloned_template_name;
  
! 			@include($mx_root_path . $module_root_path . $this->cloned_current_template_path . '/' . $template_name . '.cfg');
  			if (!$mx_template_config)
  			{
! 				@include($mx_root_path . $module_root_path . $this->cloned_current_template_path . '/' . $moduleCfgFile . '.cfg');
  			}
  		}
--- 1762,1769 ----
  			$template_name = $this->cloned_template_name;
  
! 			@require($mx_root_path . $module_root_path . $this->cloned_current_template_path . '/' . $template_name . '.cfg');
  			if (!$mx_template_config)
  			{
! 				@require($mx_root_path . $module_root_path . $this->cloned_current_template_path . '/' . $moduleCfgFile . '.cfg');
  			}
  		}
***************
*** 1767,1774 ****
  			$template_name = $this->default_template_name;
  
! 			@include($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $template_name . '.cfg');
  			if (!$mx_template_config)
  			{
! 				@include($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $moduleCfgFile . '.cfg');
  			}
  		}
--- 1777,1784 ----
  			$template_name = $this->default_template_name;
  
! 			@require($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $template_name . '.cfg');
  			if (!$mx_template_config)
  			{
! 				@require($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $moduleCfgFile . '.cfg');
  			}
  		}
***************
*** 1784,1791 ****
  			$template_name = $this->default_template_name;
  
! 			@include($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $template_name2 . '.cfg');
  			if (!$mx_template_config)
  			{
! 				@include($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $moduleCfgFile . '.cfg');
  			}
  		}
--- 1794,1801 ----
  			$template_name = $this->default_template_name;
  
! 			@require($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $template_name2 . '.cfg');
  			if (!$mx_template_config)
  			{
! 				@require($mx_root_path . $module_root_path . $this->default_current_template_path . '/' . $moduleCfgFile . '.cfg');
  			}
  		}
***************
*** 1798,1802 ****
  			mx_message_die(CRITICAL_ERROR, "Could not open " . $mx_root_path . $module_root_path . $this->default_current_template_path .  '/' . $template_name . '.cfg' . " style config file " .	"<br /> current_template_path: " . $mx_root_path . $module_root_path . $current_template_path_d  . '/' . $template_name_d . '.cfg' . "<br /> cloned_template_path: " . $mx_root_path . $module_root_path . $cloned_template_path_d . "<br /> default_template_path: " . $mx_root_path . $module_root_path . $default_template_path_d . "<br /> template_name: " . $template_name_d . "<br /> template_config: "  . $template_config_d . "", '', __LINE__, __FILE__);
  		}
! 
  		$img_lang = ( file_exists($mx_root_path . $current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english';
  
--- 1808,1812 ----
  			mx_message_die(CRITICAL_ERROR, "Could not open " . $mx_root_path . $module_root_path . $this->default_current_template_path .  '/' . $template_name . '.cfg' . " style config file " .	"<br /> current_template_path: " . $mx_root_path . $module_root_path . $current_template_path_d  . '/' . $template_name_d . '.cfg' . "<br /> cloned_template_path: " . $mx_root_path . $module_root_path . $cloned_template_path_d . "<br /> default_template_path: " . $mx_root_path . $module_root_path . $default_template_path_d . "<br /> template_name: " . $template_name_d . "<br /> template_config: "  . $template_config_d . "", '', __LINE__, __FILE__);
  		}
! 		
  		$img_lang = ( file_exists($mx_root_path . $current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english';
  
***************
*** 1825,1831 ****
  		$images = &$mx3_images;
  		
! 		// We include common temlate config file here to not load it every time a module template config file is included		
! 		$this->theme = &$theme;		
! 
  		unset($mx_images);		
  	}
--- 1835,1841 ----
  		$images = &$mx3_images;
  		
! 		// We include common temlate config file here to not load it every time a module template config file is included
! 		$this->theme = is_array($this->theme) ? array_merge($this->theme, $theme) : $theme;		
! 		//$this->theme = &$theme;
  		unset($mx_images);		
  	}

[mxbb-commits] core/includes mx_functions_admincp.php,1.68,1.69

[Florin C B. <ory...@us...>]

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

Modified Files:
	mx_functions_admincp.php 
Log Message:


Index: mx_functions_admincp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** mx_functions_admincp.php	27 Jul 2011 19:44:58 -0000	1.68
--- mx_functions_admincp.php	23 Jun 2013 21:46:49 -0000	1.69
***************
*** 82,85 ****
--- 82,170 ----
  class mx_admin
  {
+ 	/**
+ 	* This will hold the text output for the inputted command (if the mod author would like to display the command that was ran)
+ 	*
+ 	* @var string
+ 	*/
+ 	var $command = '';
+ 
+ 	/**
+ 	* This will hold the text output for the result of the command.  $user->lang['SUCCESS'] if everything worked.
+ 	*
+ 	* @var string
+ 	*/
+ 	var $result = '';
+ 
+ 	/**
+ 	* Auto run $this->display_results after running a command
+ 	*/
+ 	var $auto_display_results = false;
+ 
+ 	/**
+ 	* Stand Alone option (this makes it possible to just use the single umil file and not worry about any language stuff
+ 	*/
+ 	var $stand_alone = false;
+ 
+ 	/**
+ 	* Were any new permissions added (used in umil_frontend)?
+ 	*/
+ 	var $permissions_added = false;
+ 
+ 	/**
+ 	* Database Object
+ 	*/
+ 	var $db = false;
+ 
+ 	/**
+ 	* Database Tools Object
+ 	*/
+ 	var $db_tools = false;
+ 
+ 	/**
+ 	* Do we want a custom prefix besides the phpBB table prefix?  You *probably* should not change this...
+ 	*/
+ 	var $table_prefix = false;	
+ 	
+ 	/**#@-*/
+ 	
+ 	/**
+ 	* Constructor
+ 	*/
+ 	function mx_admin($stand_alone = true, $db = true)
+ 	{
+ 		// Setup $this->db
+ 		if ($db !== false)
+ 		{
+ 			if (!is_object($db) || !method_exists($db, 'sql_query'))
+ 			{
+ 				trigger_error('Invalid $db Object');
+ 			}
+ 
+ 			$this->db = $db;
+ 		}
+ 		else
+ 		{
+ 			global $db;
+ 			$this->db = $db;
+ 		}
+ 
+ 		// Setup $this->db_tools
+ 		if (!class_exists('mx_db_tools'))
+ 		{
+ 			global $mx_root_path, $phpEx;
+ 			include($mx_root_path . 'includes/db/db_tools.' . $phpEx);
+ 		}
+ 		$this->db_tools = new mx_db_tools($this->db);
+ 
+ 		$this->stand_alone = $stand_alone;
+ 
+ 		if (!$stand_alone)
+ 		{
+ 			global $portal_config, $mx_user, $mx_root_path, $phpEx;
+ 			// Include the language keys.  First we check if the language file for the user's language is available, if not we check if the board's default language is available, if not we use the english file.
+ 			//todo@  Dont foget to add any lang keys required to lang_admin.php
+ 		}
+ 	}
+ 	
  	// ------------------------------
  	// Private Methods
***************
*** 3532,3535 ****
--- 3617,3809 ----
  		}
  	}
+ 	/**
+ 	* _start from umil_start
+ 	*
+ 	* A function which runs (almost) every time a function here is ran
+ 	*/
+ 	function _start()
+ 	{
+ 		global $mx_user;
+ 
+ 		// Set up the command.  This will get the arguments sent to the function.
+ 		$args = func_get_args();
+ 		$this->command = call_user_func_array(array($this, 'get_output_text'), $args);
+ 
+ 		$this->result = (isset($mx_user->lang['SUCCESS'])) ? $mx_user->lang['SUCCESS'] : 'SUCCESS';
+ 		$this->db->sql_return_on_error(true);
+ 
+ 		//$this->db->sql_transaction('begin');
+ 	}
+ 
+ 	/**
+ 	* _end from umil_end
+ 	*
+ 	* A function which runs (almost) every time a function here is ran
+ 	*/
+ 	function _end()
+ 	{
+ 		global $mx_user;
+ 
+ 		// Set up the result.  This will get the arguments sent to the function.
+ 		$args = func_get_args();
+ 		$result = call_user_func_array(array($this, 'get_output_text'), $args);
+ 		$this->result = ($result) ? $result : $this->result;
+ 
+ 		if ($this->db->sql_error_triggered)
+ 		{
+ 			if ($this->result == ((isset($mx_user->lang['SUCCESS'])) ? $mx_user->lang['SUCCESS'] : 'SUCCESS'))
+ 			{
+ 				$this->result = 'SQL ERROR ' . $this->db->sql_error_returned['message'];
+ 			}
+ 			else
+ 			{
+ 				$this->result .= '<br /><br />SQL ERROR ' . $this->db->sql_error_returned['message'];
+ 			}
+ 
+ 			//$this->db->sql_transaction('rollback');
+ 		}
+ 		else
+ 		{
+ 			//$this->db->sql_transaction('commit');
+ 		}
+ 
+ 		$this->db->sql_return_on_error(false);
+ 
+ 		// Auto output if requested.
+ 		if ($this->auto_display_results && method_exists($this, 'display_results'))
+ 		{
+ 			$this->display_results();
+ 		}
+ 
+ 		return '<strong>' . $this->command . '</strong><br />' . $this->result;
+ 	}	
+ 	
+ 	/**
+ 	* Multicall Helper from umil
+ 	*
+ 	* @param mixed $function Function name to call
+ 	* @param mixed $params The parameters array
+ 	*
+ 	* @return bool True if we have done a multicall ($params is an array), false if not ($params is not an array)
+ 	*/
+ 	function multicall($function, $params)
+ 	{
+ 		if (is_array($params) && !empty($params))
+ 		{
+ 			foreach ($params as $param)
+ 			{
+ 				if (!is_array($param))
+ 				{
+ 					call_user_func(array($this, $function), $param);
+ 				}
+ 				else
+ 				{
+ 					call_user_func_array(array($this, $function), $param);
+ 				}
+ 			}
+ 			return true;
+ 		}
+ 
+ 		return false;
+ 	}	
+ 	
+ 	/**
+ 	 * Enter description here...
+ 	 * from umil module_add()
+ 	 * @access public
+ 	 * @param unknown_type $module_id
+ 	 */
+ 	function module_select($class, $parent = 0, $data = array(), $include_path = false)
+ 	{
+ 		global $mx_cache, $mx_user, $mx_root_path, $module_root_path, $phpEx;
+ 
+ 		// Multicall
+ 		if ($this->multicall(__FUNCTION__, $class))
+ 		{
+ 			return;
+ 		}
+ 
+ 		// Prevent stupid things like trying to add a module with no name or any data on it
+ 		if (empty($data))
+ 		{
+ 			$this->_start('MODULE_ADD', $class, 'UNKNOWN');
+ 			return $this->_end('FAIL');
+ 		}
+ 
+         // Allows '' to be sent as 0
+ 		$parent = (!$parent) ? 0 : $parent;
+ 
+ 		// allow sending the name as a string in $data to create a category
+ 		if (!is_array($data))
+ 		{
+ 			$data = array('module_langname' => $data);
+ 		}
+ 
+ 		if (!isset($data['module_langname']))
+ 		{
+ 			// The "automatic" way
+ 			$basename = (isset($data['module_basename'])) ? $data['module_basename'] : '';
+ 			$basename = str_replace(array('/', '\\'), '', $basename);
+ 			$class = str_replace(array('/', '\\'), '', $class);
+ 			$info_file = "$class/info/{$class}_$basename.$phpEx";
+ 
+ 			// The manual and automatic ways both failed...
+ 			if (!file_exists((($include_path === false) ? $module_root_path . 'includes/' : $include_path) . $info_file))
+ 			{
+ 				$this->_start('MODULE_ADD', $class, $info_file);
+ 				return $this->_end('FAIL');
+ 			}
+ 
+ 			$classname = "{$class}_{$basename}_info";
+ 
+ 			if (!class_exists($classname))
+ 			{
+ 				include((($include_path === false) ? $module_root_path . 'includes/' : $include_path) . $info_file);
+ 			}
+ 
+ 			$info = new $classname;
+ 			$module = $info->module();
+ 			unset($info);
+ 
+ 			$result = '';
+ 			foreach ($module['modes'] as $mode => $module_info)
+ 			{
+ 				if (!isset($data['modes']) || in_array($mode, $data['modes']))
+ 				{
+ 					$new_module = array(
+ 						'module_basename'	=> $basename,
+ 						'module_langname'	=> $module_info['title'],
+ 						'module_mode'		=> $mode,
+ 						'module_auth'		=> $module_info['auth'],
+ 						'module_display'	=> (isset($module_info['display'])) ? $module_info['display'] : true,
+ 						'before'			=> (isset($module_info['before'])) ? $module_info['before'] : false,
+ 						'after'				=> (isset($module_info['after'])) ? $module_info['after'] : false,
+ 					);
+ 
+ 					// Run the "manual" way with the data we've collected.
+ 					//$result .= ((isset($data['spacer'])) ? $data['spacer'] : '<br />') . $this->module_add($class, $parent, $new_module);
+ 					return $new_module;
+ 				}
+ 			}
+ 
+ 			//return $result;
+ 		}
+ 
+ 		// The "manual" way
+ 		//$this->_start('MODULE_ADD', $class, ((isset($mx_user->lang[$data['module_langname']])) ? $mx_user->lang[$data['module_langname']] : $data['module_langname']));
+ 		//add_log('admin', 'LOG_MODULE_ADD', ((isset($mx_user->lang[$data['module_langname']])) ? $mx_user->lang[$data['module_langname']] : $data['module_langname']));
+ 		
+ 		$new_module = array(
+ 			'module_basename'	=> $data['module_basename'],
+ 			'module_langname'	=> $data['module_langname'],
+ 			'module_mode'		=> $data['module_mode'],
+ 			'module_auth'		=> $data['module_auth'],
+ 			'module_display'	=> (isset($data['display'])) ? $data['display'] : true,
+ 			'before'			=> (isset($data['before'])) ? $data['before'] : false,
+ 			'after'				=> (isset($data['after'])) ? $data['after'] : false,
+ 		);
+ 		
+ 		return $new_module;
+ 	}	
  }	// class mx_admin
  
***************
*** 3563,3568 ****
  	var $modules = array();
  	var $moduleFunctions = array();
! 	var $functionBlocks = array();
! 	/**#@-*/
  
  	// ------------------------------
--- 3837,3841 ----
  	var $modules = array();
  	var $moduleFunctions = array();
! 	var $functionBlocks = array();	
  
  	// ------------------------------
***************
*** 3948,3952 ****
  		$this->_get_data($all_functions);
  		$this->_generate_tpl($block_id);
! 	}
  }
  
--- 4221,4225 ----
  		$this->_get_data($all_functions);
  		$this->_generate_tpl($block_id);
! 	}	
  }
  

[mxbb-commits] core/install/templates logo.gif, NONE, 1.1 mx_install_body.html, NONE, 1.1 mx_install_button.html, NONE, 1.1 mx_install_footer.html, NONE, 1.1 mx_install_header.html, NONE, 1.1 mx_install_language.html, NONE, 1.1 mx_install_phpinfo.html, NONE, 1.1

[Florin C B. <ory...@us...>]

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

Added Files:
	logo.gif mx_install_body.html mx_install_button.html 
	mx_install_footer.html mx_install_header.html 
	mx_install_language.html mx_install_phpinfo.html 
Log Message:
installer update

--- NEW FILE: mx_install_header.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<!-- /*<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-2"> */ /-->
<meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
<meta http-equiv="Content-Style-Type" content="text/css">
<title>{L_INSTALLATION}</title>
<style type="text/css"><!--

/* General proSilver Markup Styles
---------------------------------------- */

* {
	/* Reset browsers default margin, padding and font sizes */
	margin: 0;
	padding: 0;
}

html {
[...3959 lines suppressed...]
						<dl class="textbody">
						<dt class="content" id="message"><span class="mainmenu">{L_INSTRUCTION_TEXT}</span></dt>
						</dl>
						</li>
					</ul>
				<span class="corners-bottom"><span></span></span>
			</div>
		</div>
		<div class="forabg block">
			<div class="inner"><span class="corners-top"><span></span></span>
			<ul class="topiclist">
				<li class="header">
			</ul></li>
			<div id="p1" class="post bg2 online">	
			<div class="textbody">	
			<table border="0" cellspacing="0">
				<tr>
					<td class="bodyline" width="100%">
						<table width="100%" border="0" cellspacing="0">
						<tr>	
--- NEW FILE: mx_install_language.html ---
<form name="frmInstall" action="{S_FORM_ACTION}" method="post">
<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
	<tr>
		<th colspan="2">{L_INITIAL_CONFIGURATION}</th>
	</tr>
	<tr>
		<td class="row1" width="50%" align="right"><span class="gen"><b>{L_LANGUAGE}:&nbsp;</b></span></td>
		<td class="row2">{S_LANG_SELECT}</td>
	</tr>
	<tr>
		<td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="mainoption" type="submit" value="{L_SUBMIT}" /></td>
	</tr>
</table>
</form>
--- NEW FILE: logo.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: mx_install_body.html ---
<script language="javascript1.2" type="text/javascript"><!--

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

function check_phpbb_path()
{
	if( document.forms['frmInstall'] && document.forms['frmInstall'].elements['select_phpbb_path'] )
	{
		var i = document.forms['frmInstall'].elements['select_phpbb_path'].value;
		if (i == -1)
		{
			displayObj('phpbb', 'none');
			displayObj('mxbb', 'block');
		}
		else
		{
			displayObj('phpbb', 'block');
			displayObj('mxbb', 'none');
		}
		for( var x in pathinfo[i] )
		{
			document.forms['frmInstall'].elements[x].value = pathinfo[i][x];
		}
	}
}
var pathinfo = [];
var i = -1;

<!-- BEGIN datarow -->
pathinfo[i] = [];
pathinfo[i]['info'] = '{datarow.INFO}';
pathinfo[i]['phpbb_path'] = '{datarow.PHPBB_PATH}';
//pathinfo[i]['phpbb_url'] = '{datarow.PHPBB_URL}';
pathinfo[i]['portal_backend'] = '{datarow.PORTAL_BACKEND}';
pathinfo[i]['portal_url'] = '{datarow.PORTAL_URL}';
pathinfo[i]['dbms'] = '{datarow.DBMS}';
pathinfo[i]['dbms_mxbb'] = '{datarow.DBMS_SELECT}';
pathinfo[i]['dbhost'] = '{datarow.DB_HOST}';
pathinfo[i]['dbhost_mxbb'] = '{datarow.DB_HOST}';
pathinfo[i]['dbname'] = '{datarow.DB_NAME}';
pathinfo[i]['dbuser'] = '{datarow.DB_USER}';
pathinfo[i]['dbpasswd'] = '{datarow.DB_PASSWD}';
pathinfo[i]['prefix'] = '{datarow.DB_PREFIX}';
//pathinfo[i]['acm_type'] = '{datarow.ACM_TYPE}';
pathinfo[i]['phpbb_root_path'] = '{datarow.PHPBB_ROOT}';
i++;
<!-- END datarow -->

window.onload = check_phpbb_path;
//--></script>
<noscript>
<div align="center" style="color:red;">{L_NOSCRIPT_WARNING}</div>
</noscript>
<form name="frmInstall" action="{S_FORM_ACTION}" method="post">
<table cellpadding="2" cellspacing="1" border="0">
	<tr>
		<th colspan="2">{L_INITIAL_CONFIGURATION}</th>
	</tr>
	<!-- BEGIN switch_readonly_mode -->
	<tr>
		<td class="row1" align="right" width="50%"><span class="gen"><b>{L_Backend}:&nbsp;</b></span><br /><span class="gensmall">{L_Backend_explain}:&nbsp;</span></td>
		<td class="row2">{S_PHPBB_PATH}</td>
	</tr>
	<!-- END switch_readonly_mode -->
	<tr>
		<td class="row1" align="right" width="50%"><span class="gen">{L_PORTAL_BACKEND}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" name="portal_backend" value="{PORTAL_BACKEND}" {READONLY}/></td>
	</tr>	
	<tr>
		<td class="row1" colspan="2" align="center"><input size="140" class="info" type="text" name="info" value="{INFO}" /></td></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen"><b>{L_MX_DB_PREFIX}:&nbsp;</b></span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" name="mx_prefix" value="{MX_DB_PREFIX}" /></td>
	</tr>
	<!--
	<tr>
		<td class="row1" align="right"><span class="gen"><b>{L_ACM_TYPE}:&nbsp;</b></span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" name="acm_type" value="{ACM_TYPE}" /></td>
	</tr>
	-->
	<tr>
		<th colspan="2">{L_PORTAL_CONFIGURATION}{READ_ONLY}</th>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_PORTAL_URL}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" size="80" name="portal_url" value="{PORTAL_URL}" /></td>
	</tr>

	<tr><td colspan="2"><div id="phpbb" style="display:none;" class="genmed"><table width="100%" cellpadding="2" cellspacing="1" border="0">

	<!--
	<tr>
		<td class="row1" align="right"><span class="gen">{L_PHPBB_URL}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" size="80" name="phpbb_url" value="{PHPBB_URL}"{READONLY} /></td>
	</tr>
	-->
	<tr>
		<td class="row1" align="right"><span class="gen">{L_PHPBB_PATH}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" size="80" name="phpbb_path" value="{PHPBB_PATH}"{READONLY} /></td>
	</tr>
	<tr>
		<th colspan="2">{L_DATABASE_CONFIGURATION}{READ_ONLY}</th>
	</tr>
	<tr>
		<td class="row1" align="right" width="50%"><span class="gen">{L_DBMS}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" name="dbms" value="{DBMS}" {READONLY}/></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_DB_HOST}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" name="dbhost" value="{DB_HOST}"{READONLY} /></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_DB_NAME}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" name="dbname" value="{DB_NAME}"{READONLY} /></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_DB_USER}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" name="dbuser" value="{DB_USER}"{READONLY} /></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_DB_PASSWORD}:&nbsp;</span></td>
		<td class="row2"><input type="password" name="dbpasswd" value="{DB_PASSWD}"{READONLY} /></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_DB_PREFIX}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" name="prefix" value="{DB_PREFIX}"{READONLY} /></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_MXP_ADMINNAME}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" name="admin_name" value="" /></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_MXP_PASSWORD}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="password" name="admin_pass1" value="" /></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_MXP_PASSWORD2}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="password" name="admin_pass2" value="" /></td>
	</tr>
	<tr>
		<td class="row1" colspan="2" align="center"><span class="gensmall"><font color="red">{L_MXP_ADMIN}</font></span></td></td>
	</tr>
	<tr>
		<td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="liteoption" type="submit" name="debug" value="Debug" /><input class="mainoption" name="phpbb" type="submit" value="{L_SUBMIT}" /></td>
	</tr>


	</table></div></td></tr>

	<tr><td colspan="2"><div id="mxbb" style="display:none;" class="genmed"><table width="100%" cellpadding="2" cellspacing="1" border="0">

	<tr>
		<th colspan="2">{L_DATABASE_CONFIGURATION}</th>
	</tr>
	<tr>
		<td class="row1" align="right" width="50%"><span class="gen">{L_DBMS}:&nbsp;</span></td>
		<td class="row2"><select name="dbms_mxbb">{DBMS_SELECT}</select></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_DB_HOST}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" name="dbhost_mxbb" value="{DB_HOST}" /></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_DB_NAME}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" name="dbname_mxbb" value="{DB_NAME}" /></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_DB_USER}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" name="dbuser_mxbb" value="{DB_USER}" /></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_DB_PASSWORD}:&nbsp;</span></td>
		<td class="row2"><input type="password" name="dbpasswd_mxbb" value="{DB_PASSWD}" /></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_MXP_ADMINNAME}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="text" name="admin_name_mxbb" value="" /></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_MXP_PASSWORD}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="password" name="admin_pass1_mxbb" value="" /></td>
	</tr>
	<tr>
		<td class="row1" align="right"><span class="gen">{L_MXP_PASSWORD2}:&nbsp;</span></td>
		<td class="row2"><input class="inputbox autowidth" type="password" name="admin_pass2_mxbb" value="" /></td>
	</tr>
	<tr>
		<td class="row1" colspan="2" align="center"><span class="gensmall"><font color="red">{L_MXP_ADMIN}</font></span></td></td>
	</tr>
	<tr>
		<td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input class="liteoption" type="submit" name="debug" value="Debug" /><input class="mainoption" name="mxbb" type="submit" value="{L_SUBMIT}" /></td>
	</tr>

	</table></div></td></tr>


</table>
</form>
--- NEW FILE: mx_install_button.html ---
<!-- BEGIN switch_are_you_sure -->
<script language="javascript1.2" type="text/javascript"><!--
function areYouSure()
{
	return confirm('{L_ARE_YOU_SURE}');
}
//--></script>
<!-- END switch_are_you_sure -->
<form name="frmInstall" action="{S_FORM_ACTION}" method="post">
<table width="100%" cellpadding="2" cellspacing="1" border="0" class="forumline">
	<tr>
		<td class="catbottom" align="center" colspan="2">{S_HIDDEN_FIELDS}<input
<!-- BEGIN switch_are_you_sure -->
			onclick="return areYouSure();"
<!-- END switch_are_you_sure -->
			class="mainoption" type="submit" value="{L_SUBMIT}" /></td>
	</tr>
</table>
</form>
--- NEW FILE: mx_install_phpinfo.html ---
<table border="0" align="center" cellspacing="0" cellpadding="0">
	<tr>
		<td align="center">{PHPINFO}</td>
	</tr>
</table>
--- NEW FILE: mx_install_footer.html ---
					</td>
				</tr>
				<tr>
					<td>
						<table width="100%" border="0" cellspacing="0" cellpadding="0">
							<tr>
								<td align="center" valign="top" nowrap><span class="gensmall">{L_INSTALLER_NAME}<br />v. {L_INSTALLER_VERSION}</span></td>
								<td align="center" valign="top" width="100%"><span class="gen">{L_INSTALL_MOREINFO}</span></td>
								<td align="right"  valign="top"><span class="gen">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{L_INSTALL_PHPINFO}</span></td>
							</tr>
						</table>
					</td>
				</tr>
			</table>
		</td>
	</tr>
</table>
	</div></div></div>	
	<span class="corners-bottom"><span></span></span>
</div></div>
<br clear="all" />			

</body>
</html>

[mxbb-commits] core/install/includes functions_install.php, 1.22, 1.23

[Florin C B. <ory...@us...>]

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

Modified Files:
	functions_install.php 
Log Message:
installer update

Index: functions_install.php
===================================================================
RCS file: /cvsroot/mxbb/core/install/includes/functions_install.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** functions_install.php	4 Mar 2011 09:30:27 -0000	1.22
--- functions_install.php	20 Jun 2013 17:09:11 -0000	1.23
***************
*** 21,24 ****
--- 21,25 ----
  	$template->set_filenames(array('header' => 'mx_install_header.'.$tplEx));
  	$template->assign_vars(array(
+ 		'S_CONTENT_ENCODING'	=> 'UTF-8',	
  		'L_PORTAL_NAME'			=> $mx_portal_name,
  		'L_PORTAL_VERSION'		=> $mx_portal_version,

[mxbb-commits] core/modules/mx_phpbb3blocks/templates/subsilver2/images - New directory

[Florin C B. <ory...@us...>]

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

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

[mxbb-commits] mx_smartor/album_mod/includes album_constants.php, 1.18, 1.19

[Florin C B. <ory...@us...>]

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

Modified Files:
	album_constants.php 
Log Message:


Index: album_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_constants.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** album_constants.php	19 Jun 2013 12:21:54 -0000	1.18
--- album_constants.php	19 Jun 2013 12:53:23 -0000	1.19
***************
*** 210,214 ****
  define('ALBUM_MED_CACHE_PATH', ALBUM_UPLOAD_PATH . 'med_cache/');
  define('ALBUM_WM_CACHE_PATH', ALBUM_UPLOAD_PATH . 'wm_cache/');
! define('ALBUM_WM_FILE', ALBUM_UPLOAD_PATH . 'mark_fap.png');
  define('ALBUM_NOPIC_PATH', ALBUM_UPLOAD_PATH . 'album_mod/');
  //Paths to read files already uploaded
--- 210,215 ----
  define('ALBUM_MED_CACHE_PATH', ALBUM_UPLOAD_PATH . 'med_cache/');
  define('ALBUM_WM_CACHE_PATH', ALBUM_UPLOAD_PATH . 'wm_cache/');
! //Default Water Mark Picture
! define('ALBUM_WM_FILE', (!isset($album_root_path) ? $album_root_path : $module_root_path . 'album_mod/') . 'mark_fap.png');
  define('ALBUM_NOPIC_PATH', ALBUM_UPLOAD_PATH . 'album_mod/');
  //Paths to read files already uploaded

[mxbb-commits] core/includes mx_functions_core.php,1.131,1.132

[Florin C B. <ory...@us...>]

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

Modified Files:
	mx_functions_core.php 
Log Message:
fixes modules

Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** mx_functions_core.php	18 Jun 2013 21:05:04 -0000	1.131
--- mx_functions_core.php	19 Jun 2013 12:22:41 -0000	1.132
***************
*** 3439,3443 ****
  	function add_js_file($path = '')
  	{
! 		$this->mxbb_js_addup[] = $mx_block->module_root_path . $path;
  	}
  
--- 3439,3445 ----
  	function add_js_file($path = '')
  	{
! 		//global $mx_block, $module_root_path;
! 		//$this->mxbb_js_addup[] = $mx_block->module_root_path . $path;
! 		$this->mxbb_js_addup[] = $path;
  	}
  

[mxbb-commits] mx_smartor/album_mod/includes album_bbcode.php, 1.4, 1.5 album_constants.php, 1.17, 1.18 album_functions.php, 1.10, 1.11

[Florin C B. <ory...@us...>]

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

Modified Files:
	album_bbcode.php album_constants.php album_functions.php 
Log Message:
fixes modules

Index: album_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_constants.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** album_constants.php	30 May 2013 10:04:09 -0000	1.17
--- album_constants.php	19 Jun 2013 12:21:54 -0000	1.18
***************
*** 18,25 ****
   ***************************************************************************/
  
! if ( !defined('IN_PORTAL') )
  {
  	die('Hacking attempt');
  }
  
  if ( !MXBB_MODULE )
--- 18,29 ----
   ***************************************************************************/
  
! if (!defined('IN_PORTAL') || !defined('IN_PHPBB'))
  {
  	die('Hacking attempt');
  }
+ else
+ {
+ 	define('IN_ALBUM', true);
+ }
  
  if ( !MXBB_MODULE )
***************
*** 57,61 ****
  else
  {
! 	if (!$_GET['print']) // Do not "fix" with reuest wrapper!!
  	{
  		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
--- 61,65 ----
  else
  {
! 	if (!isset($_GET['print'])) // Do not "fix" with reuest wrapper!!
  	{
  		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
***************
*** 158,177 ****
  define('ALBUM_PRIVATE', 3);
  
  define('USERS_SUBFOLDERS_IMG', false); // Creates users subfolders for uploaded images
  define('USERS_SUBFOLDERS_ALBUM', false); // Creates users subfolders for images in album
- define('ALBUM_MOD_PATH', $module_root_path . 'includes/album_mod/');
- define('ALBUM_MOD_IMG_PATH', $module_root_path . 'images/album/');
- //define('ALBUM_FILES_PATH', $phpbb_root_path . 'files/album/');
- define('ALBUM_FILES_PATH', $module_root_path . 'upload/');
  
! // Path (trailing slash required)
! if (USERS_SUBFOLDERS_ALBUM == true)
! {
! 	define('ALBUM_UPLOAD_PATH', ALBUM_FILES_PATH . 'users/');
! }
! else
  {
! 	define('ALBUM_UPLOAD_PATH', ALBUM_FILES_PATH);
  }
  
  !defined('PAGE_ALBUM') ? define('PAGE_ALBUM', -502) : false;
--- 162,176 ----
  define('ALBUM_PRIVATE', 3);
  
+ //@Todo: 
+ //ENABLE this when  POSTED_IMAGES_PATH and POSTED_IMAGES_THUMBS_PATH are implemented!!!
  define('USERS_SUBFOLDERS_IMG', false); // Creates users subfolders for uploaded images
  define('USERS_SUBFOLDERS_ALBUM', false); // Creates users subfolders for images in album
  
! //Just Check (Already Defined in RSS/RSD and in Album Common)
! if (!defined('ALBUM_MOD_PATH'))
  {
! 	define('ALBUM_MOD_PATH', $module_root_path . 'includes/album_mod/');
  }
+ define('ALBUM_MOD_IMG_PATH', $module_root_path . 'images/album/');
  
  !defined('PAGE_ALBUM') ? define('PAGE_ALBUM', -502) : false;
***************
*** 189,216 ****
  {
  	// Path (trailing slash required)
! 	define('ALBUM_UPLOAD_PATH', $module_root_path . 'album_mod/upload/');
! 	define('ALBUM_OTF_PATH', $module_root_path . 'album_mod/upload/otf/');
! 	define('ALBUM_JUPLOAD_PATH', $module_root_path . 'album_mod/upload/jupload/');
! 	define('ALBUM_CACHE_PATH', $module_root_path . 'album_mod/upload/cache/');
! 	define('ALBUM_MED_CACHE_PATH', $module_root_path . 'album_mod/upload/med_cache/');
! 	define('ALBUM_WM_CACHE_PATH', $module_root_path . 'album_mod/upload/wm_cache/');
! 	define('ALBUM_WM_FILE', $module_root_path . 'album_mod/mark_fap.png');
! 	define('ALBUM_NOPIC_PATH', $module_root_path . 'album_mod/');	
! 
  }
  else
  {
  	// Path (trailing slash required)
! 	define('ALBUM_UPLOAD_PATH', $module_root_path . 'upload/');
! 	define('ALBUM_OTF_PATH', $module_root_path . 'upload/otf/');
! 	define('ALBUM_JUPLOAD_PATH', $module_root_path . 'upload/jupload/');
! 	define('ALBUM_CACHE_PATH', $module_root_path . 'upload/cache/');
! 	define('ALBUM_MED_CACHE_PATH', $module_root_path . 'upload/med_cache/');
! 	define('ALBUM_WM_CACHE_PATH', $module_root_path . 'upload/wm_cache/');
! 	define('ALBUM_WM_FILE', $module_root_path . 'album_mod/mark_fap.png');
! 	define('ALBUM_NOPIC_PATH', $module_root_path . 'album_mod/');		
  }
! define('POSTED_IMAGES_PATH', $module_root_path . 'upload/');
! define('POSTED_IMAGES_THUMBS_PATH', $module_root_path . 'upload/cache/');
  // Pic watch
  define('COMMENT_WATCH_UN_NOTIFIED', 0);
--- 188,218 ----
  {
  	// Path (trailing slash required)
! 	//define('ALBUM_FILES_PATH', $phpbb_root_path . 'files/album/');
! 	define('ALBUM_FILES_PATH', $module_root_path . 'album_mod/upload/');	
  }
  else
  {
  	// Path (trailing slash required)
! 	define('ALBUM_FILES_PATH', $module_root_path . 'upload/');		
  }
! // Path (trailing slash required)
! if (USERS_SUBFOLDERS_ALBUM == true)
! {
! 	define('ALBUM_UPLOAD_PATH', ALBUM_FILES_PATH . 'users/');
! }
! else
! {
! 	define('ALBUM_UPLOAD_PATH', ALBUM_FILES_PATH);
! }
! define('ALBUM_OTF_PATH', ALBUM_UPLOAD_PATH . 'otf/');
! define('ALBUM_JUPLOAD_PATH', ALBUM_UPLOAD_PATH . 'jupload/');
! define('ALBUM_CACHE_PATH', ALBUM_UPLOAD_PATH . 'cache/');
! define('ALBUM_MED_CACHE_PATH', ALBUM_UPLOAD_PATH . 'med_cache/');
! define('ALBUM_WM_CACHE_PATH', ALBUM_UPLOAD_PATH . 'wm_cache/');
! define('ALBUM_WM_FILE', ALBUM_UPLOAD_PATH . 'mark_fap.png');
! define('ALBUM_NOPIC_PATH', ALBUM_UPLOAD_PATH . 'album_mod/');
! //Paths to read files already uploaded
! define('POSTED_IMAGES_PATH', ALBUM_UPLOAD_PATH);
! define('POSTED_IMAGES_THUMBS_PATH', ALBUM_UPLOAD_PATH . 'cache/');
  // Pic watch
  define('COMMENT_WATCH_UN_NOTIFIED', 0);

Index: album_bbcode.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_bbcode.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_bbcode.php	29 Aug 2008 05:58:23 -0000	1.4
--- album_bbcode.php	19 Jun 2013 12:21:53 -0000	1.5
***************
*** 11,15 ****
  // Tell the Security Scanner that reachable code in this file is not a security issue
  
! define('BBCODE_UID_LEN', 10);
  define('BBCODE_NOSMILIES_START', '<!-- no smilies start -->');
  define('BBCODE_NOSMILIES_END', '<!-- no smilies end -->');
--- 11,15 ----
  // Tell the Security Scanner that reachable code in this file is not a security issue
  
! //define('BBCODE_UID_LEN', 10);
  define('BBCODE_NOSMILIES_START', '<!-- no smilies start -->');
  define('BBCODE_NOSMILIES_END', '<!-- no smilies end -->');

Index: album_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_functions.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** album_functions.php	3 Mar 2011 14:28:40 -0000	1.10
--- album_functions.php	19 Jun 2013 12:21:54 -0000	1.11
***************
*** 1202,1206 ****
  
  
! if (!function_exists(setFlag))
  {
  	function setFlag($flags, $flag)
--- 1202,1206 ----
  
  
! if (!function_exists('setFlag'))
  {
  	function setFlag($flags, $flag)
***************
*** 1210,1214 ****
  }
  
! if (!function_exists(clearFlag))
  {
  	function clearFlag($flags, $flag)
--- 1210,1214 ----
  }
  
! if (!function_exists('clearFlag'))
  {
  	function clearFlag($flags, $flag)
***************
*** 1218,1222 ****
  }
  
! if (!function_exists(checkFlag))
  {
  	function checkFlag($flags, $flag)
--- 1218,1222 ----
  }
  
! if (!function_exists('checkFlag'))
  {
  	function checkFlag($flags, $flag)

[mxbb-commits] mx_smartor album.php,1.31,1.32

[Florin C B. <ory...@us...>]

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

Modified Files:
	album.php 
Log Message:
fixes modules

Index: album.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** album.php	30 May 2013 10:04:08 -0000	1.31
--- album.php	19 Jun 2013 12:21:53 -0000	1.32
***************
*** 201,215 ****
  		$mx_user->init_style();		
  		
! 		$block_id = ( !empty($HTTP_GET_VARS['block_id']) ) ? $HTTP_GET_VARS['block_id'] : $HTTP_POST_VARS['id'];
! 		if( empty($block_id) )
! 		{
! 			$sql = "SELECT * FROM " . BLOCK_TABLE . "  WHERE block_title = 'Smartor_album' LIMIT 1";
! 			if(!$result = $db->sql_query($sql))
! 			{
! 				mx_message_die(GENERAL_ERROR, "Could not query Smartor_Album module information", "", __LINE__, __FILE__, $sql);
! 			}
! 			$row = $db->sql_fetchrow($result);
! 			$block_id = $row['block_id'];
! 		}
  		$is_block = FALSE;
  	}
--- 201,218 ----
  		$mx_user->init_style();		
  		
! 		$block_id = $mx_request_vars->request('page', MX_TYPE_INT, '');
! 		// 0: module, 1: module_id, 2: module_name, 3: module_path,
! 		// 4: module_desc, 5: module_include_admin
! 		//mx_get_info($table, $idfield = '', $id = 0, $idfield2 = '', $id2 = 0) ... ( $idfield2 != '' && $id2 != '' ) ? " AND $idfield2 = '$id2'" : '';
! 		$block_info = mx_get_info(BLOCK_TABLE, 'block_title', 'Smartor_album');		
! 		$block_id = ((isset($block_id) && !empty($block_id)) ? $block_id : $block_info['block_id']);
! 		$title = $block_info['block_title'];
! 		$block_size = ((isset($block_size) && !empty($block_size)) ? $block_size : '100%');
! 		$description = $block_info['block_desc'];
! 		$show_block = $block_info['show_block'];
! 		$show_title = ($userdata['user_level'] == ADMIN) ? true : $block_info['show_title'];
! 		$show_stats = $block_info['show_stats'];			
! 		$mx_block->init($block_id);
! 		
  		$is_block = FALSE;
  	}
***************
*** 221,233 ****
  		$title = $mx_block->block_info['block_title'];
  		$block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' );
! 
! 		$is_block = true;	
! 		  
! 	  	global $images, $is_block;
  	}	
  }
- //
  // Get general album information
- //
  $album_root_path = $module_root_path . 'album_mod/';
  include($module_root_path . 'album_mod/' . 'album_common.'.$phpEx);
--- 224,233 ----
  		$title = $mx_block->block_info['block_title'];
  		$block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' );
! 		
! 		$is_block = true;
! 		global $images, $is_block;
  	}	
  }
  // Get general album information
  $album_root_path = $module_root_path . 'album_mod/';
  include($module_root_path . 'album_mod/' . 'album_common.'.$phpEx);

[mxbb-commits] core/modules/mx_shared/tinymce/jscripts/tiny_mce/themes/simple/img icons.gif, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_shared/tinymce/jscripts/tiny_mce/themes/simple/img
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1737/themes/simple/img

Added Files:
	icons.gif 
Log Message:


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

[mxbb-commits] core/modules/mx_shared/tinymce/jscripts/tiny_mce/themes/simple/skins/default content.css, NONE, 1.1 ui.css, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_shared/tinymce/jscripts/tiny_mce/themes/simple/skins/default
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1737/themes/simple/skins/default

Added Files:
	content.css ui.css 
Log Message:


--- NEW FILE: content.css ---
body, td, pre {
	font-family: Verdana, Arial, Helvetica, sans-serif;
	font-size: 10px;
}

body {
	background-color: #FFFFFF;
}

.mceVisualAid {
	border: 1px dashed #BBBBBB;
}

/* MSIE specific */

* html body {
	scrollbar-3dlight-color: #F0F0EE;
	scrollbar-arrow-color: #676662;
	scrollbar-base-color: #F0F0EE;
	scrollbar-darkshadow-color: #DDDDDD;
	scrollbar-face-color: #E0E0DD;
	scrollbar-highlight-color: #F0F0EE;
	scrollbar-shadow-color: #F0F0EE;
	scrollbar-track-color: #F5F5F5;	
}

--- NEW FILE: ui.css ---
/* Reset */
.defaultSimpleSkin table, .defaultSimpleSkin tbody, .defaultSimpleSkin a, .defaultSimpleSkin img, .defaultSimpleSkin tr, .defaultSimpleSkin div, .defaultSimpleSkin td, .defaultSimpleSkin iframe, .defaultSimpleSkin span, .defaultSimpleSkin * {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000}

/* Containers */
.defaultSimpleSkin {position:relative}
.defaultSimpleSkin table.mceLayout {background:#F0F0EE; border:1px solid #CCC;}
.defaultSimpleSkin iframe {display:block; background:#FFF; border-bottom:1px solid #CCC;}
.defaultSimpleSkin .mceToolbar {height:24px;}

/* Layout */
.defaultSimpleSkin span.mceIcon, .defaultSimpleSkin img.mceIcon {display:block; width:20px; height:20px}
.defaultSimpleSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}

/* Button */
.defaultSimpleSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px}
.defaultSimpleSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0}
.defaultSimpleSkin a.mceButtonActive {border:1px solid #0A246A; background-color:#C2CBE0}
.defaultSimpleSkin .mceButtonDisabled span {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}

/* Separator */
.defaultSimpleSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:0 2px 0 4px}

/* Theme */
.defaultSimpleSkin span.mce_bold {background-position:0 0}
.defaultSimpleSkin span.mce_italic {background-position:-60px 0}
.defaultSimpleSkin span.mce_underline {background-position:-140px 0}
.defaultSimpleSkin span.mce_strikethrough {background-position:-120px 0}
.defaultSimpleSkin span.mce_undo {background-position:-160px 0}
.defaultSimpleSkin span.mce_redo {background-position:-100px 0}
.defaultSimpleSkin span.mce_cleanup {background-position:-40px 0}
.defaultSimpleSkin span.mce_insertunorderedlist {background-position:-20px 0}
.defaultSimpleSkin span.mce_insertorderedlist {background-position:-80px 0}

[mxbb-commits] core/modules/mx_shared/tinymce/jscripts/tiny_mce/themes/simple/images bold.gif, NONE, 1.1 bold_de_se.gif, NONE, 1.1 bold_fr.gif, NONE, 1.1 bold_ru.gif, NONE, 1.1 bold_tw.gif, NONE, 1.1 bullist.gif, NONE, 1.1 buttons.gif, NONE, 1.1 cleanup.gif, NONE, 1.1 italic.gif, NONE, 1.1 italic_de_se.gif, NONE, 1.1 italic_ru.gif, NONE, 1.1 italic_tw.gif, NONE, 1.1 numlist.gif, NONE, 1.1 redo.gif, NONE, 1.1 separator.gif, NONE, 1.1 spacer.gif, NONE, 1.1 strikethrough.gif, NONE, 1.1 underline.gif, NONE, 1.1 underline_fr.gif, NONE, 1.1 underline_ru.gif, NONE, 1.1 underline_tw.gif, NONE, 1.1 undo.gif, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_shared/tinymce/jscripts/tiny_mce/themes/simple/images
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1737/themes/simple/images

Added Files:
	bold.gif bold_de_se.gif bold_fr.gif bold_ru.gif bold_tw.gif 
	bullist.gif buttons.gif cleanup.gif italic.gif 
	italic_de_se.gif italic_ru.gif italic_tw.gif numlist.gif 
	redo.gif separator.gif spacer.gif strikethrough.gif 
	underline.gif underline_fr.gif underline_ru.gif 
	underline_tw.gif undo.gif 
Log Message:


--- NEW FILE: cleanup.gif ---

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

[mxbb-commits] core/modules/mx_shared/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img button_bg.png, NONE, 1.1 button_bg_black.png, NONE, 1.1 button_bg_silver.png, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_shared/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1737/themes/advanced/skins/o2k7/img

Added Files:
	button_bg.png button_bg_black.png button_bg_silver.png 
Log Message:


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

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

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

[mxbb-commits] core/modules/mx_shared/tinymce/jscripts/tiny_mce/themes/advanced/skins/default content.css, NONE, 1.1 dialog.css, NONE, 1.1 ui.css, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_shared/tinymce/jscripts/tiny_mce/themes/advanced/skins/default
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1737/themes/advanced/skins/default

Added Files:
	content.css dialog.css ui.css 
Log Message:


--- NEW FILE: dialog.css ---
/* Generic */
body {
font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;
scrollbar-3dlight-color:#F0F0EE;
scrollbar-arrow-color:#676662;
scrollbar-base-color:#F0F0EE;
scrollbar-darkshadow-color:#DDDDDD;
scrollbar-face-color:#E0E0DD;
scrollbar-highlight-color:#F0F0EE;
scrollbar-shadow-color:#F0F0EE;
scrollbar-track-color:#F5F5F5;
background:#F0F0EE;
padding:0;
margin:8px 8px 0 8px;
}

html {background:#F0F0EE;}
td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
textarea {resize:none;outline:none;}
a:link, a:visited {color:black;}
a:hover {color:#2B6FB6;}
.nowrap {white-space: nowrap}

/* Forms */
fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;}
legend {color:#2B6FB6; font-weight:bold;}
label.msg {display:none;}
label.invalid {color:#EE0000; display:inline;}
input.invalid {border:1px solid #EE0000;}
input {background:#FFF; border:1px solid #CCC;}
input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
input, select, textarea {border:1px solid #808080;}
input.radio {border:1px none #000000; background:transparent; vertical-align:middle;}
input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;}
.input_noborder {border:0;}

/* Buttons */
#insert, #cancel, input.button, .updateButton {
border:0; margin:0; padding:0;
font-weight:bold;
width:94px; height:26px;
background:url(img/buttons.png) 0 -26px;
cursor:pointer;
padding-bottom:2px;
float:left;
}

#insert {background:url(img/buttons.png) 0 -52px}
#cancel {background:url(img/buttons.png) 0 0; float:right}

/* Browse */
a.pickcolor, a.browse {text-decoration:none}
a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;}
.mceOldBoxModel a.browse span {width:22px; height:20px;}
a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;}
a.browse span.disabled {border:1px solid white; opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
a.browse:hover span.disabled {border:1px solid white; background-color:transparent;}
a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;}
.mceOldBoxModel a.pickcolor span {width:21px; height:17px;}
a.pickcolor:hover span {background-color:#B2BBD0;}
a.pickcolor:hover span.disabled {}

/* Charmap */
table.charmap {border:1px solid #AAA; text-align:center}
td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;}
#charmap a {display:block; color:#000; text-decoration:none; border:0}
#charmap a:hover {background:#CCC;color:#2B6FB6}
#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center}
#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center}

/* Source */
.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;}
.mceActionPanel {margin-top:5px;}

/* Tabs classes */
.tabs {width:100%; height:18px; line-height:normal; background:url(img/tabs.gif) repeat-x 0 -72px;}
.tabs ul {margin:0; padding:0; list-style:none;}
.tabs li {float:left; background:url(img/tabs.gif) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;}
.tabs li.current {background:url(img/tabs.gif) no-repeat 0 -18px; margin-right:2px;}
.tabs span {float:left; display:block; background:url(img/tabs.gif) no-repeat right -36px; padding:0px 10px 0 0;}
.tabs .current span {background:url(img/tabs.gif) no-repeat right -54px;}
.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;}
.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;}

/* Panels */
.panel_wrapper div.panel {display:none;}
.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;}
.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;}

/* Columns */
.column {float:left;}
.properties {width:100%;}
.properties .column1 {}
.properties .column2 {text-align:left;}

/* Titles */
h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;}
h3 {font-size:14px;}
.title {font-size:12px; font-weight:bold; color:#2B6FB6;}

/* Dialog specific */
#link .panel_wrapper, #link div.current {height:125px;}
#image .panel_wrapper, #image div.current {height:200px;}
#plugintable thead {font-weight:bold; background:#DDD;}
#plugintable, #about #plugintable td {border:1px solid #919B9C;}
#plugintable {width:96%; margin-top:10px;}
#pluginscontainer {height:290px; overflow:auto;}
#colorpicker #preview {display:inline-block; padding-left:40px; height:14px; border:1px solid black; margin-left:5px; margin-right: 5px}
#colorpicker #previewblock {position: relative; top: -3px; padding-left:5px; padding-top: 0px; display:inline}
#colorpicker #preview_wrapper { text-align:center; padding-top:4px; white-space: nowrap}
#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
#colorpicker #light div {overflow:hidden;}
#colorpicker .panel_wrapper div.current {height:175px;}
#colorpicker #namedcolors {width:150px;}
#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
#colorpicker #colornamecontainer {margin-top:5px;}
#colorpicker #picker_panel fieldset {margin:auto;width:325px;}

--- NEW FILE: content.css ---
body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}
body {background:#FFF;}
body.mceForceColors {background:#FFF; color:#000;}
body.mceBrowserDefaults {background:transparent; color:inherit; font-size:inherit; font-family:inherit;}
h1 {font-size: 2em}
h2 {font-size: 1.5em}
h3 {font-size: 1.17em}
h4 {font-size: 1em}
h5 {font-size: .83em}
h6 {font-size: .75em}
.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
a.mceItemAnchor {display:inline-block; -webkit-user-select:all; -webkit-user-modify:read-only; -moz-user-select:all; -moz-user-modify:read-only; width:11px !important; height:11px !important; background:url(img/items.gif) no-repeat center center}
span.mceItemNbsp {background: #DDD}
td.mceSelected, th.mceSelected {background-color:#3399ff !important}
img {border:0;}
table, img, hr, .mceItemAnchor {cursor:default}
table td, table th {cursor:text}
ins {border-bottom:1px solid green; text-decoration: none; color:green}
del {color:red; text-decoration:line-through}
cite {border-bottom:1px dashed blue}
acronym {border-bottom:1px dotted #CCC; cursor:help}
abbr {border-bottom:1px dashed #CCC; cursor:help}

/* IE */
* html body {
scrollbar-3dlight-color:#F0F0EE;
scrollbar-arrow-color:#676662;
scrollbar-base-color:#F0F0EE;
scrollbar-darkshadow-color:#DDD;
scrollbar-face-color:#E0E0DD;
scrollbar-highlight-color:#F0F0EE;
scrollbar-shadow-color:#F0F0EE;
scrollbar-track-color:#F5F5F5;
}

img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}
font[face=mceinline] {font-family:inherit !important}
*[contentEditable]:focus {outline:0}

.mceItemMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc}
.mceItemShockWave {background-image:url(../../img/shockwave.gif)}
.mceItemFlash {background-image:url(../../img/flash.gif)}
.mceItemQuickTime {background-image:url(../../img/quicktime.gif)}
.mceItemWindowsMedia {background-image:url(../../img/windowsmedia.gif)}
.mceItemRealMedia {background-image:url(../../img/realmedia.gif)}
.mceItemVideo {background-image:url(../../img/video.gif)}
.mceItemAudio {background-image:url(../../img/video.gif)}
.mceItemEmbeddedAudio {background-image:url(../../img/video.gif)}
.mceItemIframe {background-image:url(../../img/iframe.gif)}
.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../../img/pagebreak.gif) no-repeat center top;}

--- NEW FILE: ui.css ---
/* Reset */
.defaultSkin table, .defaultSkin tbody, .defaultSkin a, .defaultSkin img, .defaultSkin tr, .defaultSkin div, .defaultSkin td, .defaultSkin iframe, .defaultSkin span, .defaultSkin *, .defaultSkin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left}
.defaultSkin a:hover, .defaultSkin a:link, .defaultSkin a:visited, .defaultSkin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}
.defaultSkin table td {vertical-align:middle}

/* Containers */
.defaultSkin table {direction:ltr;background:transparent}
.defaultSkin iframe {display:block;}
.defaultSkin .mceToolbar {height:26px}
.defaultSkin .mceLeft {text-align:left}
.defaultSkin .mceRight {text-align:right}

/* External */
.defaultSkin .mceExternalToolbar {position:absolute; border:1px solid #CCC; border-bottom:0; display:none;}
.defaultSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
.defaultSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}

/* Layout */
.defaultSkin table.mceLayout {border:0; border-left:1px solid #CCC; border-right:1px solid #CCC}
.defaultSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC}
.defaultSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC}
.defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;}
.defaultSkin td.mceToolbar {background:#F0F0EE; padding-top:1px; vertical-align:top}
.defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC}
.defaultSkin .mceStatusbar {background:#F0F0EE; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}
.defaultSkin .mceStatusbar div {float:left; margin:2px}
.defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0}
.defaultSkin .mceStatusbar a:hover {text-decoration:underline}
.defaultSkin table.mceToolbar {margin-left:3px}
.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {display:block; width:20px; height:20px}
.defaultSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
.defaultSkin td.mceCenter {text-align:center;}
.defaultSkin td.mceCenter table {margin:0 auto; text-align:left;}
.defaultSkin td.mceRight table {margin:0 0 0 auto;}

/* Button */
.defaultSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px; margin-right:1px}
.defaultSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0}
.defaultSkin a.mceButtonActive, .defaultSkin a.mceButtonSelected {border:1px solid #0A246A; background-color:#C2CBE0}
.defaultSkin .mceButtonDisabled .mceIcon {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
.defaultSkin .mceButtonLabeled {width:auto}
.defaultSkin .mceButtonLabeled span.mceIcon {float:left}
.defaultSkin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica}
.defaultSkin .mceButtonDisabled .mceButtonLabel {color:#888}

/* Separator */
.defaultSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:2px 2px 0 4px}

/* ListBox */
.defaultSkin .mceListBox, .defaultSkin .mceListBox a {display:block}
.defaultSkin .mceListBox .mceText {padding-left:4px; width:70px; text-align:left; border:1px solid #CCC; border-right:0; background:#FFF; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}
.defaultSkin .mceListBox .mceOpen {width:9px; height:20px; background:url(../../img/icons.gif) -741px 0; margin-right:2px; border:1px solid #CCC;}
.defaultSkin table.mceListBoxEnabled:hover .mceText, .defaultSkin .mceListBoxHover .mceText, .defaultSkin .mceListBoxSelected .mceText {border:1px solid #A2ABC0; border-right:0; background:#FFF}
.defaultSkin table.mceListBoxEnabled:hover .mceOpen, .defaultSkin .mceListBoxHover .mceOpen, .defaultSkin .mceListBoxSelected .mceOpen {background-color:#FFF; border:1px solid #A2ABC0}
.defaultSkin .mceListBoxDisabled a.mceText {color:gray; background-color:transparent;}
.defaultSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden}
.defaultSkin .mceOldBoxModel .mceListBox .mceText {height:22px}
.defaultSkin .mceOldBoxModel .mceListBox .mceOpen {width:11px; height:22px;}
.defaultSkin select.mceNativeListBox {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:7pt; background:#F0F0EE; border:1px solid gray; margin-right:2px;}

/* SplitButton */
.defaultSkin .mceSplitButton {width:32px; height:20px; direction:ltr}
.defaultSkin .mceSplitButton a, .defaultSkin .mceSplitButton span {height:20px; display:block}
.defaultSkin .mceSplitButton a.mceAction {width:20px; border:1px solid #F0F0EE; border-right:0;}
.defaultSkin .mceSplitButton span.mceAction {width:20px; background-image:url(../../img/icons.gif);}
.defaultSkin .mceSplitButton a.mceOpen {width:9px; background:url(../../img/icons.gif) -741px 0; border:1px solid #F0F0EE;}
.defaultSkin .mceSplitButton span.mceOpen {display:none}
.defaultSkin table.mceSplitButtonEnabled:hover a.mceAction, .defaultSkin .mceSplitButtonHover a.mceAction, .defaultSkin .mceSplitButtonSelected a.mceAction {border:1px solid #0A246A; border-right:0; background-color:#B2BBD0}
.defaultSkin table.mceSplitButtonEnabled:hover a.mceOpen, .defaultSkin .mceSplitButtonHover a.mceOpen, .defaultSkin .mceSplitButtonSelected a.mceOpen {background-color:#B2BBD0; border:1px solid #0A246A;}
.defaultSkin .mceSplitButtonDisabled .mceAction, .defaultSkin .mceSplitButtonDisabled a.mceOpen {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}
.defaultSkin .mceSplitButtonActive a.mceAction {border:1px solid #0A246A; background-color:#C2CBE0}
.defaultSkin .mceSplitButtonActive a.mceOpen {border-left:0;}

/* ColorSplitButton */
.defaultSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray}
.defaultSkin .mceColorSplitMenu td {padding:2px}
.defaultSkin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080}
.defaultSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
.defaultSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}
.defaultSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2}
.defaultSkin a.mceMoreColors:hover {border:1px solid #0A246A}
.defaultSkin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a}
.defaultSkin .mce_forecolor span.mceAction, .defaultSkin .mce_backcolor span.mceAction {overflow:hidden; height:16px}

/* Menu */
.defaultSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #D4D0C8; direction:ltr}
.defaultSkin .mceNoIcons span.mceIcon {width:0;}
.defaultSkin .mceNoIcons a .mceText {padding-left:10px}
.defaultSkin .mceMenu table {background:#FFF}
.defaultSkin .mceMenu a, .defaultSkin .mceMenu span, .defaultSkin .mceMenu {display:block}
.defaultSkin .mceMenu td {height:20px}
.defaultSkin .mceMenu a {position:relative;padding:3px 0 4px 0}
.defaultSkin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block}
.defaultSkin .mceMenu span.mceText, .defaultSkin .mceMenu .mcePreview {font-size:11px}
.defaultSkin .mceMenu pre.mceText {font-family:Monospace}
.defaultSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}
.defaultSkin .mceMenu .mceMenuItemEnabled a:hover, .defaultSkin .mceMenu .mceMenuItemActive {background-color:#dbecf3}
.defaultSkin td.mceMenuItemSeparator {background:#DDD; height:1px}
.defaultSkin .mceMenuItemTitle a {border:0; background:#EEE; border-bottom:1px solid #DDD}
.defaultSkin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px}
.defaultSkin .mceMenuItemDisabled .mceText {color:#888}
.defaultSkin .mceMenuItemSelected .mceIcon {background:url(img/menu_check.gif)}
.defaultSkin .mceNoIcons .mceMenuItemSelected a {background:url(img/menu_arrow.gif) no-repeat -6px center}
.defaultSkin .mceMenu span.mceMenuLine {display:none}
.defaultSkin .mceMenuItemSub a {background:url(img/menu_arrow.gif) no-repeat top right;}
.defaultSkin .mceMenuItem td, .defaultSkin .mceMenuItem th {line-height: normal}

/* Progress,Resize */
.defaultSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=50)'; filter:alpha(opacity=50); background:#FFF}
.defaultSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}

/* Rtl */
.mceRtl .mceListBox .mceText {text-align: right; padding: 0 4px 0 0}
.mceRtl .mceMenuItem .mceText {text-align: right}

/* Formats */
.defaultSkin .mce_formatPreview a {font-size:10px}
.defaultSkin .mce_p span.mceText {}
.defaultSkin .mce_address span.mceText {font-style:italic}
.defaultSkin .mce_pre span.mceText {font-family:monospace}
.defaultSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
.defaultSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
.defaultSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
.defaultSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
.defaultSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
.defaultSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}

/* Theme */
.defaultSkin span.mce_bold {background-position:0 0}
.defaultSkin span.mce_italic {background-position:-60px 0}
.defaultSkin span.mce_underline {background-position:-140px 0}
.defaultSkin span.mce_strikethrough {background-position:-120px 0}
.defaultSkin span.mce_undo {background-position:-160px 0}
.defaultSkin span.mce_redo {background-position:-100px 0}
.defaultSkin span.mce_cleanup {background-position:-40px 0}
.defaultSkin span.mce_bullist {background-position:-20px 0}
.defaultSkin span.mce_numlist {background-position:-80px 0}
.defaultSkin span.mce_justifyleft {background-position:-460px 0}
.defaultSkin span.mce_justifyright {background-position:-480px 0}
.defaultSkin span.mce_justifycenter {background-position:-420px 0}
.defaultSkin span.mce_justifyfull {background-position:-440px 0}
.defaultSkin span.mce_anchor {background-position:-200px 0}
.defaultSkin span.mce_indent {background-position:-400px 0}
.defaultSkin span.mce_outdent {background-position:-540px 0}
.defaultSkin span.mce_link {background-position:-500px 0}
.defaultSkin span.mce_unlink {background-position:-640px 0}
.defaultSkin span.mce_sub {background-position:-600px 0}
.defaultSkin span.mce_sup {background-position:-620px 0}
.defaultSkin span.mce_removeformat {background-position:-580px 0}
.defaultSkin span.mce_newdocument {background-position:-520px 0}
.defaultSkin span.mce_image {background-position:-380px 0}
.defaultSkin span.mce_help {background-position:-340px 0}
.defaultSkin span.mce_code {background-position:-260px 0}
.defaultSkin span.mce_hr {background-position:-360px 0}
.defaultSkin span.mce_visualaid {background-position:-660px 0}
.defaultSkin span.mce_charmap {background-position:-240px 0}
.defaultSkin span.mce_paste {background-position:-560px 0}
.defaultSkin span.mce_copy {background-position:-700px 0}
.defaultSkin span.mce_cut {background-position:-680px 0}
.defaultSkin span.mce_blockquote {background-position:-220px 0}
.defaultSkin .mce_forecolor span.mceAction {background-position:-720px 0}
.defaultSkin .mce_backcolor span.mceAction {background-position:-760px 0}
.defaultSkin span.mce_forecolorpicker {background-position:-720px 0}
.defaultSkin span.mce_backcolorpicker {background-position:-760px 0}

/* Plugins */
.defaultSkin span.mce_advhr {background-position:-0px -20px}
.defaultSkin span.mce_ltr {background-position:-20px -20px}
.defaultSkin span.mce_rtl {background-position:-40px -20px}
.defaultSkin span.mce_emotions {background-position:-60px -20px}
.defaultSkin span.mce_fullpage {background-position:-80px -20px}
.defaultSkin span.mce_fullscreen {background-position:-100px -20px}
.defaultSkin span.mce_iespell {background-position:-120px -20px}
.defaultSkin span.mce_insertdate {background-position:-140px -20px}
.defaultSkin span.mce_inserttime {background-position:-160px -20px}
.defaultSkin span.mce_absolute {background-position:-180px -20px}
.defaultSkin span.mce_backward {background-position:-200px -20px}
.defaultSkin span.mce_forward {background-position:-220px -20px}
.defaultSkin span.mce_insert_layer {background-position:-240px -20px}
.defaultSkin span.mce_insertlayer {background-position:-260px -20px}
.defaultSkin span.mce_movebackward {background-position:-280px -20px}
.defaultSkin span.mce_moveforward {background-position:-300px -20px}
.defaultSkin span.mce_media {background-position:-320px -20px}
.defaultSkin span.mce_nonbreaking {background-position:-340px -20px}
.defaultSkin span.mce_pastetext {background-position:-360px -20px}
.defaultSkin span.mce_pasteword {background-position:-380px -20px}
.defaultSkin span.mce_selectall {background-position:-400px -20px}
.defaultSkin span.mce_preview {background-position:-420px -20px}
.defaultSkin span.mce_print {background-position:-440px -20px}
.defaultSkin span.mce_cancel {background-position:-460px -20px}
.defaultSkin span.mce_save {background-position:-480px -20px}
.defaultSkin span.mce_replace {background-position:-500px -20px}
.defaultSkin span.mce_search {background-position:-520px -20px}
.defaultSkin span.mce_styleprops {background-position:-560px -20px}
.defaultSkin span.mce_table {background-position:-580px -20px}
.defaultSkin span.mce_cell_props {background-position:-600px -20px}
.defaultSkin span.mce_delete_table {background-position:-620px -20px}
.defaultSkin span.mce_delete_col {background-position:-640px -20px}
.defaultSkin span.mce_delete_row {background-position:-660px -20px}
.defaultSkin span.mce_col_after {background-position:-680px -20px}
.defaultSkin span.mce_col_before {background-position:-700px -20px}
.defaultSkin span.mce_row_after {background-position:-720px -20px}
.defaultSkin span.mce_row_before {background-position:-740px -20px}
.defaultSkin span.mce_merge_cells {background-position:-760px -20px}
.defaultSkin span.mce_table_props {background-position:-980px -20px}
.defaultSkin span.mce_row_props {background-position:-780px -20px}
.defaultSkin span.mce_split_cells {background-position:-800px -20px}
.defaultSkin span.mce_template {background-position:-820px -20px}
.defaultSkin span.mce_visualchars {background-position:-840px -20px}
.defaultSkin span.mce_abbr {background-position:-860px -20px}
.defaultSkin span.mce_acronym {background-position:-880px -20px}
.defaultSkin span.mce_attribs {background-position:-900px -20px}
.defaultSkin span.mce_cite {background-position:-920px -20px}
.defaultSkin span.mce_del {background-position:-940px -20px}
.defaultSkin span.mce_ins {background-position:-960px -20px}
.defaultSkin span.mce_pagebreak {background-position:0 -40px}
.defaultSkin span.mce_restoredraft {background-position:-20px -40px}
.defaultSkin span.mce_spellchecker {background-position:-540px -20px}
.defaultSkin span.mce_visualblocks {background-position: -40px -40px}

[mxbb-commits] core/modules/mx_shared/tinymce/jscripts/tiny_mce/themes/advanced/jscripts about.js, NONE, 1.1 anchor.js, NONE, 1.1 charmap.js, NONE, 1.1 color_picker.js, NONE, 1.1 image.js, NONE, 1.1 link.js, NONE, 1.1 source_editor.js, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_shared/tinymce/jscripts/tiny_mce/themes/advanced/jscripts
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1737/themes/advanced/jscripts

Added Files:
	about.js anchor.js charmap.js color_picker.js image.js link.js 
	source_editor.js 
Log Message:


--- NEW FILE: charmap.js ---
function init() {
	tinyMCEPopup.resizeToInnerSize();
}

var charmap = new Array();

// for mor details please see w3c.org
// now here is the complete list ;)

charmap = [
	[' ',    ' ',  true, 'no-break space'],
	['&',     '&',   true, 'ampersand'],
	['"',    '"',   true, 'quotation mark'],
// finance
	['¢',    '¢',  true, 'cent sign'],
	['€',    '€', true, 'euro sign'],
	['£',   '£',  true, 'pound sign'],
	['¥',     '¥',  true, 'yen sign'],
// signs
	['©',    '©',  true, 'copyright sign'],
	['®',     '®',  true, 'registered sign'],
	['™',   '™', true, 'trade mark sign'],
	['‰',  '‰', true, 'per mille sign'],
	['µ',   'µ',  true, 'micro sign'],
	['·',  '·',  true, 'middle dot'],
	['•',    '•', true, 'bullet'],
	['…',  '…', true, 'three dot leader'],
	['′',   '′', true, 'minutes / feet'],
	['″',   '″', true, 'seconds / inches'],
	['§',    '§',  true, 'section sign'],
	['¶',    '¶',  true, 'paragraph sign'],
	['ß',   'ß',  true, 'sharp s / ess-zed'],
// quotations
	['‹',  '‹', true, 'single left-pointing angle quotation mark'],
	['›',  '›', true, 'single right-pointing angle quotation mark'],
	['«',   '«',  true, 'left pointing guillemet'],
	['»',   '»',  true, 'right pointing guillemet'],
	['‘',   '‘', true, 'left single quotation mark'],
	['’',   '’', true, 'right single quotation mark'],
	['“',   '“', true, 'left double quotation mark'],
	['”',   '”', true, 'right double quotation mark'],
	['‚',   '‚', true, 'single low-9 quotation mark'],
	['„',   '„', true, 'double low-9 quotation mark'],
	['<',      '<',   true, 'less-than sign'],
	['>',      '>',   true, 'greater-than sign'],
	['≤',      '≤', true, 'less-than or equal to'],
	['≥',      '≥', true, 'greater-than or equal to'],
	['–',   '–', true, 'en dash'],
	['—',   '—', true, 'em dash'],
	['¯',    '¯',  true, 'macron'],
	['‾',   '‾', true, 'overline'],
	['¤',  '¤',  true, 'currency sign'],
	['¦',  '¦',  true, 'broken bar'],
	['¨',     '¨',  true, 'diaeresis'],
	['¡',   '¡',  true, 'inverted exclamation mark'],
	['¿',  '¿',  true, 'turned question mark'],
	['ˆ',    'ˆ',  true, 'circumflex accent'],
	['˜',   '˜',  true, 'small tilde'],
	['°',     '°',  true, 'degree sign'],
	['−',   '−', true, 'minus sign'],
	['±',  '±',  true, 'plus-minus sign'],
	['÷',  '÷',  true, 'division sign'],
	['⁄',   '⁄', true, 'fraction slash'],
	['×',   '×',  true, 'multiplication sign'],
	['¹',    '¹',  true, 'superscript one'],
	['²',    '²',  true, 'superscript two'],
	['³',    '³',  true, 'superscript three'],
	['¼',  '¼',  true, 'fraction one quarter'],
	['½',  '½',  true, 'fraction one half'],
	['¾',  '¾',  true, 'fraction three quarters'],
// math / logical
	['ƒ',    'ƒ',  true, 'function / florin'],
	['∫',     '∫', true, 'integral'],
	['∑',     '∑', true, 'n-ary sumation'],
	['∞',   '∞', true, 'infinity'],
	['√',   '√', true, 'square root'],
	['∼',     '∼', false,'similar to'],
	['≅',    '≅', false,'approximately equal to'],
	['≈',   '≈', true, 'almost equal to'],
	['≠',      '≠', true, 'not equal to'],
	['≡',   '≡', true, 'identical to'],
	['∈',    '∈', false,'element of'],
	['∉',   '∉', false,'not an element of'],
	['∋',      '∋', false,'contains as member'],
	['∏',    '∏', true, 'n-ary product'],
	['∧',     '∧', false,'logical and'],
	['∨',      '∨', false,'logical or'],
	['¬',     '¬',  true, 'not sign'],
	['∩',     '∩', true, 'intersection'],
	['∪',     '∪', false,'union'],
	['∂',    '∂', true, 'partial differential'],
	['∀',  '∀', false,'for all'],
	['∃',   '∃', false,'there exists'],
	['∅',   '∅', false,'diameter'],
	['∇',   '∇', false,'backward difference'],
	['∗',  '∗', false,'asterisk operator'],
	['∝',    '∝', false,'proportional to'],
	['∠',     '∠', false,'angle'],
// undefined
	['´',   '´',  true, 'acute accent'],
	['¸',   '¸',  true, 'cedilla'],
	['ª',    'ª',  true, 'feminine ordinal indicator'],
	['º',    'º',  true, 'masculine ordinal indicator'],
	['†',  '†', true, 'dagger'],
	['‡',  '‡', true, 'double dagger'],
// alphabetical special chars
	['À',  'À',  true, 'A - grave'],
	['Á',  'Á',  true, 'A - acute'],
	['Â',   'Â',  true, 'A - circumflex'],
	['Ã',  'Ã',  true, 'A - tilde'],
	['Ä',    'Ä',  true, 'A - diaeresis'],
	['Å',   'Å',  true, 'A - ring above'],
	['Æ',   'Æ',  true, 'ligature AE'],
	['Ç',  'Ç',  true, 'C - cedilla'],
	['È',  'È',  true, 'E - grave'],
	['É',  'É',  true, 'E - acute'],
	['Ê',   'Ê',  true, 'E - circumflex'],
	['Ë',    'Ë',  true, 'E - diaeresis'],
	['Ì',  'Ì',  true, 'I - grave'],
	['Í',  'Í',  true, 'I - acute'],
	['Î',   'Î',  true, 'I - circumflex'],
	['Ï',    'Ï',  true, 'I - diaeresis'],
	['Ð',     'Ð',  true, 'ETH'],
	['Ñ',  'Ñ',  true, 'N - tilde'],
	['Ò',  'Ò',  true, 'O - grave'],
	['Ó',  'Ó',  true, 'O - acute'],
	['Ô',   'Ô',  true, 'O - circumflex'],
	['Õ',  'Õ',  true, 'O - tilde'],
	['Ö',    'Ö',  true, 'O - diaeresis'],
	['Ø',  'Ø',  true, 'O - slash'],
	['Œ',   'Œ',  true, 'ligature OE'],
	['Š',  'Š',  true, 'S - caron'],
	['Ù',  'Ù',  true, 'U - grave'],
	['Ú',  'Ú',  true, 'U - acute'],
	['Û',   'Û',  true, 'U - circumflex'],
	['Ü',    'Ü',  true, 'U - diaeresis'],
	['Ý',  'Ý',  true, 'Y - acute'],
	['Ÿ',    'Ÿ',  true, 'Y - diaeresis'],
	['Þ',   'Þ',  true, 'THORN'],
	['à',  'à',  true, 'a - grave'],
	['á',  'á',  true, 'a - acute'],
	['â',   'â',  true, 'a - circumflex'],
	['ã',  'ã',  true, 'a - tilde'],
	['ä',    'ä',  true, 'a - diaeresis'],
	['å',   'å',  true, 'a - ring above'],
	['æ',   'æ',  true, 'ligature ae'],
	['ç',  'ç',  true, 'c - cedilla'],
	['è',  'è',  true, 'e - grave'],
	['é',  'é',  true, 'e - acute'],
	['ê',   'ê',  true, 'e - circumflex'],
	['ë',    'ë',  true, 'e - diaeresis'],
	['ì',  'ì',  true, 'i - grave'],
	['í',  'í',  true, 'i - acute'],
	['î',   'î',  true, 'i - circumflex'],
	['ï',    'ï',  true, 'i - diaeresis'],
	['ð',     'ð',  true, 'eth'],
	['ñ',  'ñ',  true, 'n - tilde'],
	['ò',  'ò',  true, 'o - grave'],
	['ó',  'ó',  true, 'o - acute'],
	['ô',   'ô',  true, 'o - circumflex'],
	['õ',  'õ',  true, 'o - tilde'],
	['ö',    'ö',  true, 'o - diaeresis'],
	['ø',  'ø',  true, 'o slash'],
	['œ',   'œ',  true, 'ligature oe'],
	['š',  'š',  true, 's - caron'],
	['ù',  'ù',  true, 'u - grave'],
	['ú',  'ú',  true, 'u - acute'],
	['û',   'û',  true, 'u - circumflex'],
	['ü',    'ü',  true, 'u - diaeresis'],
	['ý',  'ý',  true, 'y - acute'],
	['þ',   'þ',  true, 'thorn'],
	['ÿ',    'ÿ',  true, 'y - diaeresis'],
    ['Α',   'Α',  true, 'Alpha'],
	['Β',    'Β',  true, 'Beta'],
	['Γ',   'Γ',  true, 'Gamma'],
	['Δ',   'Δ',  true, 'Delta'],
	['Ε', 'Ε',  true, 'Epsilon'],
	['Ζ',    'Ζ',  true, 'Zeta'],
	['Η',     'Η',  true, 'Eta'],
	['Θ',   'Θ',  true, 'Theta'],
	['Ι',    'Ι',  true, 'Iota'],
	['Κ',   'Κ',  true, 'Kappa'],
	['Λ',  'Λ',  true, 'Lambda'],
	['Μ',      'Μ',  true, 'Mu'],
	['Ν',      'Ν',  true, 'Nu'],
	['Ξ',      'Ξ',  true, 'Xi'],
	['Ο', 'Ο',  true, 'Omicron'],
	['Π',      'Π',  true, 'Pi'],
	['Ρ',     'Ρ',  true, 'Rho'],
	['Σ',   'Σ',  true, 'Sigma'],
	['Τ',     'Τ',  true, 'Tau'],
	['Υ', 'Υ',  true, 'Upsilon'],
	['Φ',     'Φ',  true, 'Phi'],
	['Χ',     'Χ',  true, 'Chi'],
	['Ψ',     'Ψ',  true, 'Psi'],
	['Ω',   'Ω',  true, 'Omega'],
	['α',   'α',  true, 'alpha'],
	['β',    'β',  true, 'beta'],
	['γ',   'γ',  true, 'gamma'],
	['δ',   'δ',  true, 'delta'],
	['ε', 'ε',  true, 'epsilon'],
	['ζ',    'ζ',  true, 'zeta'],
	['η',     'η',  true, 'eta'],
	['θ',   'θ',  true, 'theta'],
	['ι',    'ι',  true, 'iota'],
	['κ',   'κ',  true, 'kappa'],
	['λ',  'λ',  true, 'lambda'],
	['μ',      'μ',  true, 'mu'],
	['ν',      'ν',  true, 'nu'],
	['ξ',      'ξ',  true, 'xi'],
	['ο', 'ο',  true, 'omicron'],
	['π',      'π',  true, 'pi'],
	['ρ',     'ρ',  true, 'rho'],
	['ς',  'ς',  true, 'final sigma'],
	['σ',   'σ',  true, 'sigma'],
	['τ',     'τ',  true, 'tau'],
	['υ', 'υ',  true, 'upsilon'],
	['φ',     'φ',  true, 'phi'],
	['χ',     'χ',  true, 'chi'],
	['ψ',     'ψ',  true, 'psi'],
	['ω',   'ω',  true, 'omega'],
// symbols
	['ℵ', 'ℵ', false,'alef symbol'],
	['ϖ',     'ϖ',  false,'pi symbol'],
	['ℜ',    'ℜ', false,'real part symbol'],
	['ϑ','ϑ',  false,'theta symbol'],
	['ϒ',   'ϒ',  false,'upsilon - hook symbol'],
	['℘',  '℘', false,'Weierstrass p'],
	['ℑ',   'ℑ', false,'imaginary part'],
// arrows
	['←',    '←', true, 'leftwards arrow'],
	['↑',    '↑', true, 'upwards arrow'],
	['→',    '→', true, 'rightwards arrow'],
	['↓',    '↓', true, 'downwards arrow'],
	['↔',    '↔', true, 'left right arrow'],
	['↵',   '↵', false,'carriage return'],
	['⇐',    '⇐', false,'leftwards double arrow'],
	['⇑',    '⇑', false,'upwards double arrow'],
	['⇒',    '⇒', false,'rightwards double arrow'],
	['⇓',    '⇓', false,'downwards double arrow'],
	['⇔',    '⇔', false,'left right double arrow'],
	['∴',  '∴', false,'therefore'],
	['⊂',     '⊂', false,'subset of'],
	['⊃',     '⊃', false,'superset of'],
	['⊄',    '⊄', false,'not a subset of'],
	['⊆',    '⊆', false,'subset of or equal to'],
	['⊇',    '⊇', false,'superset of or equal to'],
	['⊕',   '⊕', false,'circled plus'],
	['⊗',  '⊗', false,'circled times'],
	['⊥',    '⊥', false,'perpendicular'],
	['⋅',    '⋅', false,'dot operator'],
	['⌈',   '⌈', false,'left ceiling'],
	['⌉',   '⌉', false,'right ceiling'],
	['⌊',  '⌊', false,'left floor'],
	['⌋',  '⌋', false,'right floor'],
	['⟨',    '〈', false,'left-pointing angle bracket'],
	['⟩',    '〉', false,'right-pointing angle bracket'],
	['◊',     '◊', true,'lozenge'],
	['♠',  '♠', false,'black spade suit'],
	['♣',   '♣', true, 'black club suit'],
	['♥',  '♥', true, 'black heart suit'],
	['♦',   '♦', true, 'black diamond suit'],
	[' ',    ' ', false,'en space'],
	[' ',    ' ', false,'em space'],
	[' ',  ' ', false,'thin space'],
	['‌',    '‌', false,'zero width non-joiner'],
	['‍',     '‍', false,'zero width joiner'],
	['‎',     '‎', false,'left-to-right mark'],
	['‏',     '‏', false,'right-to-left mark'],
	['­',     '­',  false,'soft hyphen']
];

function renderCharMapHTML() {
	var charsPerRow = 20, tdWidth=20, tdHeight=20;
	var html = '<table border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + '"><tr height="' + tdHeight + '">';
	var cols=-1;
	for (var i=0; i<charmap.length; i++) {
		if (charmap[i][2]==true) {
			cols++;
			html += ''
				+ '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap"'
				+ ' onmouseover="this.className=\'charmapOver\';'
				+ 'previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');"'
				+ ' onmouseout="this.className=\'charmap\';"'
				+ ' nowrap="nowrap" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');"><a style="text-decoration: none;" onfocus="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" href="javascript:insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + '">'
				+ charmap[i][1]
				+ '</a></td>';
			if ((cols+1) % charsPerRow == 0)
				html += '</tr><tr height="' + tdHeight + '">';
		}
	 }
	if (cols % charsPerRow > 0) {
		var padd = charsPerRow - (cols % charsPerRow);
		for (var i=0; i<padd-1; i++)
			html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';
	}
	html += '</tr></table>';
	document.write(html);
}

function insertChar(chr) {
	tinyMCEPopup.execCommand('mceInsertContent', false, '&#' + chr + ';');

	// Refocus in window
	if (tinyMCEPopup.isWindow)
		window.focus();

	tinyMCEPopup.close();
}

function previewChar(codeA, codeB, codeN) {
	var elmA = document.getElementById('codeA');
	var elmB = document.getElementById('codeB');
	var elmV = document.getElementById('codeV');
	var elmN = document.getElementById('codeN');

	if (codeA=='#160;') {
		elmV.innerHTML = '__';
	} else {
		elmV.innerHTML = '&' + codeA;
	}

	elmB.innerHTML = '&amp;' + codeA;
	elmA.innerHTML = '&amp;' + codeB;
	elmN.innerHTML = codeN;
}

--- NEW FILE: link.js ---
var url = tinyMCE.getParam("external_link_list_url");
if (url != null) {
	// Fix relative
	if (url.charAt(0) != '/' && url.indexOf('://') == -1)
		url = tinyMCE.documentBasePath + "/" + url;

	document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></sc'+'ript>');
}

function init() {
	tinyMCEPopup.resizeToInnerSize();

	document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','theme_advanced_link');

	// Handle file browser
	if (isVisible('hrefbrowser'))
		document.getElementById('href').style.width = '180px';

	var formObj = document.forms[0];

	for (var i=0; i<document.forms[0].target.options.length; i++) {
		var option = document.forms[0].target.options[i];

		if (option.value == tinyMCE.getWindowArg('target'))
			option.selected = true;
	}

	document.forms[0].href.value = tinyMCE.getWindowArg('href');
	document.forms[0].linktitle.value = tinyMCE.getWindowArg('title');
	document.forms[0].insert.value = tinyMCE.getLang('lang_' + tinyMCE.getWindowArg('action'), 'Insert', true); 

	addClassesToList('styleSelect', 'theme_advanced_link_styles');
	selectByValue(formObj, 'styleSelect', tinyMCE.getWindowArg('className'), true);

	// Hide css select row if no CSS classes
	if (formObj.styleSelect && formObj.styleSelect.options.length <= 1) {
		var sr = document.getElementById('styleSelectRow');
		sr.style.display = 'none';
		sr.parentNode.removeChild(sr);
	}

	// Auto select link in list
	if (typeof(tinyMCELinkList) != "undefined" && tinyMCELinkList.length > 0) {
		var formObj = document.forms[0];

		for (var i=0; i<formObj.link_list.length; i++) {
			if (formObj.link_list.options[i].value == tinyMCE.getWindowArg('href'))
				formObj.link_list.options[i].selected = true;
		}
	}
}

function checkPrefix(n) {
	if (Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCE.getLang('lang_is_email')))
		n.value = 'mailto:' + n.value;

	if (/^\s*www./i.test(n.value) && confirm(tinyMCE.getLang('lang_is_external')))
		n.value = 'http://' + n.value;
}

function insertLink() {
	var href = document.forms[0].href.value;
	var target = document.forms[0].target.options[document.forms[0].target.selectedIndex].value;
	var title = document.forms[0].linktitle.value;
	var style_class = document.forms[0].styleSelect ? document.forms[0].styleSelect.value : "";
	var dummy;

	if (target == '_self')
		target = '';

	tinyMCEPopup.restoreSelection();
	tinyMCE.themes['advanced']._insertLink(href, target, title, dummy, style_class);
	tinyMCEPopup.close();
}

--- NEW FILE: about.js ---
function init() {
	var inst;

	tinyMCEPopup.resizeToInnerSize();
	inst = tinyMCE.selectedInstance;

	// Give FF some time
	window.setTimeout('insertHelpIFrame();', 10);

	var tcont = document.getElementById('plugintablecontainer');
	var plugins = tinyMCE.getParam('plugins', '', true, ',');
	if (plugins.length == 0)
		document.getElementById('plugins_tab').style.display = 'none';

	var html = "";
	html += '<table id="plugintable">';
	html += '<thead>';
	html += '<tr>';
	html += '<td>' + tinyMCE.getLang('lang_plugin') + '</td>';
	html += '<td>' + tinyMCE.getLang('lang_author') + '</td>';
	html += '<td>' + tinyMCE.getLang('lang_version') + '</td>';
	html += '</tr>';
	html += '</thead>';
	html += '<tbody>';

	for (var i=0; i<inst.plugins.length; i++) {
		var info = getPluginInfo(inst.plugins[i]);

		html += '<tr>';

		if (info.infourl != null && info.infourl != '')
			html += '<td width="50%" title="' + plugins[i] + '"><a href="' + info.infourl + '" target="mceplugin">' + info.longname + '</a></td>';
		else
			html += '<td width="50%" title="' + plugins[i] + '">' + info.longname + '</td>';

		if (info.authorurl != null && info.authorurl != '')
			html += '<td width="35%"><a href="' + info.authorurl + '" target="mceplugin">' + info.author + '</a></td>';
		else
			html += '<td width="35%">' + info.author + '</td>';

		html += '<td width="15%">' + info.version + '</td>';
		html += '</tr>';
	}

	html += '</tbody>';
	html += '</table>';

	tcont.innerHTML = html;
}

function getPluginInfo(name) {
	if (tinyMCE.plugins[name].getInfo)
		return tinyMCE.plugins[name].getInfo();

	return {
		longname : name,
		authorurl : '',
		infourl : '',
		author : '--',
		version : '--'
	};
}

function insertHelpIFrame() {
	var html = '<iframe width="100%" height="300" src="' + tinyMCE.themeURL + "/docs/" + tinyMCE.settings['docs_language'] + "/index.htm" + '"></iframe>';

	document.getElementById('iframecontainer').innerHTML = html;

	html = '';
	html += '<a href="http://www.moxiecode.com" target="_blank"><img src="http://tinymce.moxiecode.com/images/gotmoxie.png" alt="Got Moxie?" border="0" /></a> ';
	html += '<a href="http://sourceforge.net/projects/tinymce/" target="_blank"><img src="http://sourceforge.net/sflogo.php?group_id=103281" alt="Hosted By Sourceforge" border="0" /></a> ';
	html += '<a href="http://www.freshmeat.net/projects/tinymce" target="_blank"><img src="http://tinymce.moxiecode.com/images/fm.gif" alt="Also on freshmeat" border="0" /></a> ';

	document.getElementById('buttoncontainer').innerHTML = html;
}

--- NEW FILE: image.js ---
var url = tinyMCE.getParam("external_image_list_url");
if (url != null) {
	// Fix relative
	if (url.charAt(0) != '/' && url.indexOf('://') == -1)
		url = tinyMCE.documentBasePath + "/" + url;

	document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + url + '"></sc'+'ript>');
}

function insertImage() {
	var src = document.forms[0].src.value;
	var alt = document.forms[0].alt.value;
	var border = document.forms[0].border.value;
	var vspace = document.forms[0].vspace.value;
	var hspace = document.forms[0].hspace.value;
	var width = document.forms[0].width.value;
	var height = document.forms[0].height.value;
	var align = document.forms[0].align.options[document.forms[0].align.selectedIndex].value;

	tinyMCEPopup.restoreSelection();
	tinyMCE.themes['advanced']._insertImage(src, alt, border, hspace, vspace, width, height, align);
	tinyMCEPopup.close();
}

function init() {
	tinyMCEPopup.resizeToInnerSize();

	document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');

	var formObj = document.forms[0];

	for (var i=0; i<document.forms[0].align.options.length; i++) {
		if (document.forms[0].align.options[i].value == tinyMCE.getWindowArg('align'))
			document.forms[0].align.options.selectedIndex = i;
	}

	formObj.src.value = tinyMCE.getWindowArg('src');
	formObj.alt.value = tinyMCE.getWindowArg('alt');
	formObj.border.value = tinyMCE.getWindowArg('border');
	formObj.vspace.value = tinyMCE.getWindowArg('vspace');
	formObj.hspace.value = tinyMCE.getWindowArg('hspace');
	formObj.width.value = tinyMCE.getWindowArg('width');
	formObj.height.value = tinyMCE.getWindowArg('height');
	formObj.insert.value = tinyMCE.getLang('lang_' + tinyMCE.getWindowArg('action'), 'Insert', true); 

	// Handle file browser
	if (isVisible('srcbrowser'))
		document.getElementById('src').style.width = '180px';

	// Auto select image in list
	if (typeof(tinyMCEImageList) != "undefined" && tinyMCEImageList.length > 0) {
		for (var i=0; i<formObj.image_list.length; i++) {
			if (formObj.image_list.options[i].value == tinyMCE.getWindowArg('src'))
				formObj.image_list.options[i].selected = true;
		}
	}
}

var preloadImg = new Image();

function resetImageData() {
	var formObj = document.forms[0];
	formObj.width.value = formObj.height.value = "";	
}

function updateImageData() {
	var formObj = document.forms[0];

	if (formObj.width.value == "")
		formObj.width.value = preloadImg.width;

	if (formObj.height.value == "")
		formObj.height.value = preloadImg.height;
}

function getImageData() {
	preloadImg = new Image();
	tinyMCE.addEvent(preloadImg, "load", updateImageData);
	tinyMCE.addEvent(preloadImg, "error", function () {var formObj = document.forms[0];formObj.width.value = formObj.height.value = "";});
	preloadImg.src = tinyMCE.convertRelativeToAbsoluteURL(tinyMCE.settings['base_href'], document.forms[0].src.value);
}

--- NEW FILE: source_editor.js ---
function saveContent() {
	tinyMCE.setContent(document.getElementById('htmlSource').value);
	tinyMCE.closeWindow(window);
}

function onLoadInit() {
	tinyMCEPopup.resizeToInnerSize();

	// Remove Gecko spellchecking
	if (tinyMCE.isGecko)
		document.body.spellcheck = tinyMCE.getParam("gecko_spellcheck");

	document.getElementById('htmlSource').value = tinyMCE.getContent(tinyMCE.getWindowArg('editor_id'));

	resizeInputs();

	if (tinyMCE.getParam("theme_advanced_source_editor_wrap", true)) {
		setWrap('soft');
		document.getElementById('wraped').checked = true;
	}
}

function setWrap(val) {
	var s = document.getElementById('htmlSource');

	s.wrap = val;

	if (tinyMCE.isGecko || tinyMCE.isOpera) {
		var v = s.value;
		var n = s.cloneNode(false);
		n.setAttribute("wrap", val);
		s.parentNode.replaceChild(n, s);
		n.value = v;
	}
}

function toggleWordWrap(elm) {
	if (elm.checked)
		setWrap('soft');
	else
		setWrap('off');
}

var wHeight=0, wWidth=0, owHeight=0, owWidth=0;

function resizeInputs() {
	var el = document.getElementById('htmlSource');

	if (!tinyMCE.isMSIE) {
		 wHeight = self.innerHeight - 60;
		 wWidth = self.innerWidth - 16;
	} else {
		 wHeight = document.body.clientHeight - 60;
		 wWidth = document.body.clientWidth - 16;
	}

	el.style.height = Math.abs(wHeight) + 'px';
	el.style.width  = Math.abs(wWidth) + 'px';
}

--- NEW FILE: color_picker.js ---
var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false;

var colors = new Array(
	"#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033",
	"#330066","#330099","#3300cc","#3300ff","#660000","#660033","#660066","#660099",
	"#6600cc","#6600ff","#990000","#990033","#990066","#990099","#9900cc","#9900ff",
	"#cc0000","#cc0033","#cc0066","#cc0099","#cc00cc","#cc00ff","#ff0000","#ff0033",
	"#ff0066","#ff0099","#ff00cc","#ff00ff","#003300","#003333","#003366","#003399",
	"#0033cc","#0033ff","#333300","#333333","#333366","#333399","#3333cc","#3333ff",
	"#663300","#663333","#663366","#663399","#6633cc","#6633ff","#993300","#993333",
	"#993366","#993399","#9933cc","#9933ff","#cc3300","#cc3333","#cc3366","#cc3399",
	"#cc33cc","#cc33ff","#ff3300","#ff3333","#ff3366","#ff3399","#ff33cc","#ff33ff",
	"#006600","#006633","#006666","#006699","#0066cc","#0066ff","#336600","#336633",
	"#336666","#336699","#3366cc","#3366ff","#666600","#666633","#666666","#666699",
	"#6666cc","#6666ff","#996600","#996633","#996666","#996699","#9966cc","#9966ff",
	"#cc6600","#cc6633","#cc6666","#cc6699","#cc66cc","#cc66ff","#ff6600","#ff6633",
	"#ff6666","#ff6699","#ff66cc","#ff66ff","#009900","#009933","#009966","#009999",
	"#0099cc","#0099ff","#339900","#339933","#339966","#339999","#3399cc","#3399ff",
	"#669900","#669933","#669966","#669999","#6699cc","#6699ff","#999900","#999933",
	"#999966","#999999","#9999cc","#9999ff","#cc9900","#cc9933","#cc9966","#cc9999",
	"#cc99cc","#cc99ff","#ff9900","#ff9933","#ff9966","#ff9999","#ff99cc","#ff99ff",
	"#00cc00","#00cc33","#00cc66","#00cc99","#00cccc","#00ccff","#33cc00","#33cc33",
	"#33cc66","#33cc99","#33cccc","#33ccff","#66cc00","#66cc33","#66cc66","#66cc99",
	"#66cccc","#66ccff","#99cc00","#99cc33","#99cc66","#99cc99","#99cccc","#99ccff",
	"#cccc00","#cccc33","#cccc66","#cccc99","#cccccc","#ccccff","#ffcc00","#ffcc33",
	"#ffcc66","#ffcc99","#ffcccc","#ffccff","#00ff00","#00ff33","#00ff66","#00ff99",
	"#00ffcc","#00ffff","#33ff00","#33ff33","#33ff66","#33ff99","#33ffcc","#33ffff",
	"#66ff00","#66ff33","#66ff66","#66ff99","#66ffcc","#66ffff","#99ff00","#99ff33",
	"#99ff66","#99ff99","#99ffcc","#99ffff","#ccff00","#ccff33","#ccff66","#ccff99",
	"#ccffcc","#ccffff","#ffff00","#ffff33","#ffff66","#ffff99","#ffffcc","#ffffff"
);

var named = {
	'#F0F8FF':'AliceBlue','#FAEBD7':'AntiqueWhite','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige',
	'#FFE4C4':'Bisque','#000000':'Black','#FFEBCD':'BlanchedAlmond','#0000FF':'Blue','#8A2BE2':'BlueViolet','#A52A2A':'Brown',
	'#DEB887':'BurlyWood','#5F9EA0':'CadetBlue','#7FFF00':'Chartreuse','#D2691E':'Chocolate','#FF7F50':'Coral','#6495ED':'CornflowerBlue',
	'#FFF8DC':'Cornsilk','#DC143C':'Crimson','#00FFFF':'Cyan','#00008B':'DarkBlue','#008B8B':'DarkCyan','#B8860B':'DarkGoldenRod',
	'#A9A9A9':'DarkGray','#A9A9A9':'DarkGrey','#006400':'DarkGreen','#BDB76B':'DarkKhaki','#8B008B':'DarkMagenta','#556B2F':'DarkOliveGreen',
	'#FF8C00':'Darkorange','#9932CC':'DarkOrchid','#8B0000':'DarkRed','#E9967A':'DarkSalmon','#8FBC8F':'DarkSeaGreen','#483D8B':'DarkSlateBlue',
	'#2F4F4F':'DarkSlateGray','#2F4F4F':'DarkSlateGrey','#00CED1':'DarkTurquoise','#9400D3':'DarkViolet','#FF1493':'DeepPink','#00BFFF':'DeepSkyBlue',
	'#696969':'DimGray','#696969':'DimGrey','#1E90FF':'DodgerBlue','#B22222':'FireBrick','#FFFAF0':'FloralWhite','#228B22':'ForestGreen',
	'#FF00FF':'Fuchsia','#DCDCDC':'Gainsboro','#F8F8FF':'GhostWhite','#FFD700':'Gold','#DAA520':'GoldenRod','#808080':'Gray','#808080':'Grey',
	'#008000':'Green','#ADFF2F':'GreenYellow','#F0FFF0':'HoneyDew','#FF69B4':'HotPink','#CD5C5C':'IndianRed','#4B0082':'Indigo','#FFFFF0':'Ivory',
	'#F0E68C':'Khaki','#E6E6FA':'Lavender','#FFF0F5':'LavenderBlush','#7CFC00':'LawnGreen','#FFFACD':'LemonChiffon','#ADD8E6':'LightBlue',
	'#F08080':'LightCoral','#E0FFFF':'LightCyan','#FAFAD2':'LightGoldenRodYellow','#D3D3D3':'LightGray','#D3D3D3':'LightGrey','#90EE90':'LightGreen',
	'#FFB6C1':'LightPink','#FFA07A':'LightSalmon','#20B2AA':'LightSeaGreen','#87CEFA':'LightSkyBlue','#778899':'LightSlateGray','#778899':'LightSlateGrey',
	'#B0C4DE':'LightSteelBlue','#FFFFE0':'LightYellow','#00FF00':'Lime','#32CD32':'LimeGreen','#FAF0E6':'Linen','#FF00FF':'Magenta','#800000':'Maroon',
	'#66CDAA':'MediumAquaMarine','#0000CD':'MediumBlue','#BA55D3':'MediumOrchid','#9370D8':'MediumPurple','#3CB371':'MediumSeaGreen','#7B68EE':'MediumSlateBlue',
	'#00FA9A':'MediumSpringGreen','#48D1CC':'MediumTurquoise','#C71585':'MediumVioletRed','#191970':'MidnightBlue','#F5FFFA':'MintCream','#FFE4E1':'MistyRose','#FFE4B5':'Moccasin',
	'#FFDEAD':'NavajoWhite','#000080':'Navy','#FDF5E6':'OldLace','#808000':'Olive','#6B8E23':'OliveDrab','#FFA500':'Orange','#FF4500':'OrangeRed','#DA70D6':'Orchid',
	'#EEE8AA':'PaleGoldenRod','#98FB98':'PaleGreen','#AFEEEE':'PaleTurquoise','#D87093':'PaleVioletRed','#FFEFD5':'PapayaWhip','#FFDAB9':'PeachPuff',
	'#CD853F':'Peru','#FFC0CB':'Pink','#DDA0DD':'Plum','#B0E0E6':'PowderBlue','#800080':'Purple','#FF0000':'Red','#BC8F8F':'RosyBrown','#4169E1':'RoyalBlue',
	'#8B4513':'SaddleBrown','#FA8072':'Salmon','#F4A460':'SandyBrown','#2E8B57':'SeaGreen','#FFF5EE':'SeaShell','#A0522D':'Sienna','#C0C0C0':'Silver',
	'#87CEEB':'SkyBlue','#6A5ACD':'SlateBlue','#708090':'SlateGray','#708090':'SlateGrey','#FFFAFA':'Snow','#00FF7F':'SpringGreen',
	'#4682B4':'SteelBlue','#D2B48C':'Tan','#008080':'Teal','#D8BFD8':'Thistle','#FF6347':'Tomato','#40E0D0':'Turquoise','#EE82EE':'Violet',
	'#F5DEB3':'Wheat','#FFFFFF':'White','#F5F5F5':'WhiteSmoke','#FFFF00':'Yellow','#9ACD32':'YellowGreen'
};

function init() {
	var inputColor = convertRGBToHex(tinyMCE.getWindowArg('input_color'));

	if (tinyMCE.isMSIE)
		tinyMCEPopup.resizeToInnerSize();

	generatePicker();

	if (inputColor) {
		changeFinalColor(inputColor);

		col = convertHexToRGB(inputColor);

		if (col)
			updateLight(col.r, col.g, col.b);
	}
}

function insertAction() {
	var color = document.getElementById("color").value;

	tinyMCEPopup.execCommand(tinyMCE.getWindowArg('command'), false, color);
	tinyMCEPopup.close();
}

function showColor(color, name) {
	if (name)
		document.getElementById("colorname").innerHTML = name;

	document.getElementById("preview").style.backgroundColor = color;
	document.getElementById("color").value = color;
}

function convertRGBToHex(col) {
	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");

	if (!col)
		return col;

	var rgb = col.replace(re, "$1,$2,$3").split(',');
	if (rgb.length == 3) {
		r = parseInt(rgb[0]).toString(16);
		g = parseInt(rgb[1]).toString(16);
		b = parseInt(rgb[2]).toString(16);

		r = r.length == 1 ? '0' + r : r;
		g = g.length == 1 ? '0' + g : g;
		b = b.length == 1 ? '0' + b : b;

		return "#" + r + g + b;
	}

	return col;
}

function convertHexToRGB(col) {
	if (col.indexOf('#') != -1) {
		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');

		r = parseInt(col.substring(0, 2), 16);
		g = parseInt(col.substring(2, 4), 16);
		b = parseInt(col.substring(4, 6), 16);

		return {r : r, g : g, b : b};
	}

	return null;
}

function generatePicker() {
	var el = document.getElementById('light'), h = '', i;

	for (i = 0; i < detail; i++){
		h += '<div id="gs'+i+'" style="background-color:#000000; width:15px; height:3px; border-style:none; border-width:0px;"'
		+ ' onclick="changeFinalColor(this.style.backgroundColor)"'
		+ ' onmousedown="isMouseDown = true; return false;"'
		+ ' onmouseup="isMouseDown = false;"'
		+ ' onmousemove="if (isMouseDown && isMouseOver) changeFinalColor(this.style.backgroundColor); return false;"'
		+ ' onmouseover="isMouseOver = true;"'
		+ ' onmouseout="isMouseOver = false;"'
		+ '></div>';
	}

	el.innerHTML = h;
}

function generateWebColors() {
	var el = document.getElementById('webcolors'), h = '', i;

	if (el.className == 'generated')
		return;

	h += '<table border="0" cellspacing="1" cellpadding="0">'
		+ '<tr>';

	for (i=0; i<colors.length; i++) {
		h += '<td bgcolor="' + colors[i] + '">'
			+ '<a href="javascript:insertAction();" onfocus="showColor(\'' + colors[i] +  '\');" onmouseover="showColor(\'' + colors[i] +  '\');">'
			+ '<img border="0" src="images/spacer.gif" width="10" height="10" title="' + colors[i] +  '" alt="' + colors[i] +  '" /></a></td>';
		if ((i+1) % 18 == 0)
			h += '</tr><tr>';
	}

	h += '</table>';

	el.innerHTML = h;
	el.className = 'generated';
}

function generateNamedColors() {
	var el = document.getElementById('namedcolors'), h = '', n, v, i = 0;

	if (el.className == 'generated')
		return;

	for (n in named) {
		v = named[n];
		h += '<a href="javascript:insertAction();" onmouseover="showColor(\'' + n +  '\',\'' + v + '\');" style="background-color: ' + n + '"><!-- IE --></a>'
	}

	el.innerHTML = h;
	el.className = 'generated';
}

function dechex(n) {
	return strhex.charAt(Math.floor(n / 16)) + strhex.charAt(n % 16);
}

function computeColor(e) {
	var x, y, partWidth, partDetail, imHeight, r, g, b, coef, i, finalCoef, finalR, finalG, finalB;

	x = e.offsetX ? e.offsetX : (e.target ? e.clientX - e.target.x : 0);
	y = e.offsetY ? e.offsetY : (e.target ? e.clientY - e.target.y : 0);

	partWidth = document.getElementById('colorpicker').width / 6;
	partDetail = detail / 2;
	imHeight = document.getElementById('colorpicker').height;

	r = (x >= 0)*(x < partWidth)*255 + (x >= partWidth)*(x < 2*partWidth)*(2*255 - x * 255 / partWidth) + (x >= 4*partWidth)*(x < 5*partWidth)*(-4*255 + x * 255 / partWidth) + (x >= 5*partWidth)*(x < 6*partWidth)*255;
	g = (x >= 0)*(x < partWidth)*(x * 255 / partWidth) + (x >= partWidth)*(x < 3*partWidth)*255	+ (x >= 3*partWidth)*(x < 4*partWidth)*(4*255 - x * 255 / partWidth);
	b = (x >= 2*partWidth)*(x < 3*partWidth)*(-2*255 + x * 255 / partWidth) + (x >= 3*partWidth)*(x < 5*partWidth)*255 + (x >= 5*partWidth)*(x < 6*partWidth)*(6*255 - x * 255 / partWidth);

	coef = (imHeight - y) / imHeight;
	r = 128 + (r - 128) * coef;
	g = 128 + (g - 128) * coef;
	b = 128 + (b - 128) * coef;

	changeFinalColor('#' + dechex(r) + dechex(g) + dechex(b));
	updateLight(r, g, b);
}

function updateLight(r, g, b) {
	var i, partDetail = detail / 2, finalCoef, finalR, finalG, finalB, color;

	for (i=0; i<detail; i++) {
		if ((i>=0) && (i<partDetail)) {
			finalCoef = i / partDetail;
			finalR = dechex(255 - (255 - r) * finalCoef);
			finalG = dechex(255 - (255 - g) * finalCoef);
			finalB = dechex(255 - (255 - b) * finalCoef);
		} else {
			finalCoef = 2 - i / partDetail;
			finalR = dechex(r * finalCoef);
			finalG = dechex(g * finalCoef);
			finalB = dechex(b * finalCoef);
		}

		color = finalR + finalG + finalB;

		document.getElementById('gs' + i).style.backgroundColor = '#'+color;
	}
}

function changeFinalColor(color) {
	if (color.indexOf('#') == -1)
		color = convertRGBToHex(color);

	document.getElementById('preview').style.backgroundColor = color;
	document.getElementById('color').value = color;
}

window.focus();
--- NEW FILE: anchor.js ---
var action, element;

function init() {
	tinyMCEPopup.resizeToInnerSize();

	var inst = tinyMCE.getInstanceById(tinyMCE.getWindowArg('editor_id'));
	var anchor = tinyMCE.getParentElement(inst.getFocusElement(), "a", "name");
	var img = inst.getFocusElement();
	action = 'insert';

	if (anchor != null) {
		element = anchor;
		action = "update";
	}

	if (tinyMCE.getAttrib(img, "class") == "mceItemAnchor") {
		element = img;
		action = "update";
	}

	if (action == "update")
		document.forms[0].anchorName.value = element.nodeName == "IMG" ? element.getAttribute("title") : element.getAttribute("name");

	document.forms[0].insert.value = tinyMCE.getLang('lang_' + action, 'Insert', true);
}

function insertAnchor() {
	var inst = tinyMCE.getInstanceById(tinyMCE.getWindowArg('editor_id'));
	var name = document.forms[0].anchorName.value, e;

	tinyMCEPopup.execCommand("mceBeginUndoLevel");

	if (action == "update") {
		if (element.nodeName == "IMG")
			element.setAttribute("title", name);
		else
			element.setAttribute("name", name);
	} else {
		var rng = inst.getRng();

		if (rng.collapse)
			rng.collapse(false);

		name = name.replace(/&/g, '&amp;');
		name = name.replace(/\"/g, '&quot;');
		name = name.replace(/</g, '&lt;');
		name = name.replace(/>/g, '&gt;');

		// Fix for bug #1447335
		if (tinyMCE.isGecko)
			html = '<a id="mceNewAnchor" name="' + name + '"></a>';
		else
			html = '<a name="' + name + '"></a>';

		tinyMCEPopup.execCommand("mceInsertContent", false, html);

		// Fix for bug #1447335 force cursor after the anchor element
		if (tinyMCE.isGecko) {
			e = inst.getDoc().getElementById('mceNewAnchor');

			if (e) {
				inst.selection.selectNode(e, true, false, false);
				e.removeAttribute('id');
			}
		}

		tinyMCE.handleVisualAid(inst.getBody(), true, inst.visualAid, inst);
	}

	tinyMCEPopup.execCommand("mceEndUndoLevel");

	tinyMCE.triggerNodeChange();
	tinyMCEPopup.close();
}

[mxbb-commits] core/modules/mx_shared/tinymce/jscripts/tiny_mce/themes/advanced/docs/en/images insert_anchor_window.gif, NONE, 1.1 insert_image_window.gif, NONE, 1.1 insert_link_window.gif, NONE, 1.1 insert_table_window.gif, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_shared/tinymce/jscripts/tiny_mce/themes/advanced/docs/en/images
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1737/themes/advanced/docs/en/images

Added Files:
	insert_anchor_window.gif insert_image_window.gif 
	insert_link_window.gif insert_table_window.gif 
Log Message:


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

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

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

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

[mxbb-commits] core/modules/mx_shared/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/images abbr.gif, NONE, 1.1 acronym.gif, NONE, 1.1 attribs.gif, NONE, 1.1 cite.gif, NONE, 1.1 date_time.gif, NONE, 1.1 del.gif, NONE, 1.1 ins.gif, NONE, 1.1 remove_button_bg.gif, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_shared/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/images
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1737/plugins/xhtmlxtras/images

Added Files:
	abbr.gif acronym.gif attribs.gif cite.gif date_time.gif 
	del.gif ins.gif remove_button_bg.gif 
Log Message:


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

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

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

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

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

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

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

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

[mxbb-commits] core/modules/mx_shared/tinymce/jscripts/tiny_mce/plugins/visualchars/images visualchars.gif, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_shared/tinymce/jscripts/tiny_mce/plugins/visualchars/images
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1737/plugins/visualchars/images

Added Files:
	visualchars.gif 
Log Message:


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

[mxbb-commits] core/modules/mx_shared/tinymce/jscripts/tiny_mce/plugins/template/images template.gif, NONE, 1.1

[Florin C B. <ory...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_shared/tinymce/jscripts/tiny_mce/plugins/template/images
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv1737/plugins/template/images

Added Files:
	template.gif 
Log Message:


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