mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] mx_smartor/album_mod/includes album_integration.php, 1.3, 1.4

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

Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10801

Modified Files:
	album_integration.php 
Log Message:
// Is mod_rewrite enabled? If so, do some url rewrites...

Index: album_integration.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_integration.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_integration.php	13 Mar 2008 08:35:54 -0000	1.3
--- album_integration.php	31 Aug 2008 00:06:43 -0000	1.4
***************
*** 49,53 ****
  	function this_smartor_mxurl($args = '', $force_standalone_mode = false)
  	{
! 		global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  		if( $force_standalone_mode || !$is_block )
--- 49,53 ----
  	function this_smartor_mxurl($args = '', $force_standalone_mode = false)
  	{
! 		global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite;
  
  		if( $force_standalone_mode || !$is_block )
***************
*** 67,70 ****
--- 67,76 ----
  			}
  		}
+ 		// Is mod_rewrite enabled? If so, do some url rewrites...
+ 		if (is_object($mx_mod_rewrite))
+ 		{
+ 			$mxurl = $mx_mod_rewrite->encode(PORTAL_URL . $mxurl);
+ 		}	
+ 		
  		return $mxurl;
  	}
***************
*** 72,79 ****
  function this_fap_addonurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  	$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  
  	return $mxurl;
  }
--- 78,91 ----
  function this_fap_addonurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block,$mx_mod_rewrite;
  
  	$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  
+ 	// Is mod_rewrite enabled? If so, do some url rewrites...
+ 	if (is_object($mx_mod_rewrite))
+ 	{
+ 		$mxurl = $mx_mod_rewrite->encode(PORTAL_URL . $mxurl);
+ 	}	
+ 		
  	return $mxurl;
  }
***************
*** 81,85 ****
  function this_fap_portalurl($args = '')
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  	if( $integration_enabled != "1" )
--- 93,97 ----
  function this_fap_portalurl($args = '')
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite;
  
  	if( $integration_enabled != "1" )
***************
*** 100,108 ****
  
  	}
  	return $mxurl;
  }
  function this_fap_toplisturl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled;
  
  	if( $force_standalone_mode )
--- 112,126 ----
  
  	}
+ 	// Is mod_rewrite enabled? If so, do some url rewrites...
+ 	if (is_object($mx_mod_rewrite))
+ 	{
+ 		$mxurl = $mx_mod_rewrite->encode(PORTAL_URL . $mxurl);
+ 	}	
+ 		
  	return $mxurl;
  }
  function this_fap_toplisturl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $mx_mod_rewrite;
  
  	if( $force_standalone_mode )
***************
*** 114,117 ****
--- 132,141 ----
  		$mxurl = $mx_root_path . 'index.' . $phpEx . '?page=' . $album_index . ($args == '' ? '' : '&' . $args);
  	}
+ 	// Is mod_rewrite enabled? If so, do some url rewrites...
+ 	if (is_object($mx_mod_rewrite))
+ 	{
+ 		$mxurl = $mx_mod_rewrite->encode($mxurl);
+ 	}	
+ 	
  	return $mxurl;
  }
***************
*** 149,153 ****
  function this_album_rssurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  
--- 173,177 ----
  function this_album_rssurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block, $mx_mod_rewrite;
  
  
***************
*** 168,171 ****
--- 192,202 ----
  		}
  	}
+ 	
+ 	// Is mod_rewrite enabled? If so, do some url rewrites...
+ 	if (is_object($mx_mod_rewrite))
+ 	{
+ 		$mxurl = $mx_mod_rewrite->encode($mxurl);
+ 	}	
+ 	
  	return $mxurl;
  }

[mxbb-commits] mx_smartor/album_mod/includes album_hierarchy_sql.php, 1.6, 1.7

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

Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14811

Modified Files:
	album_hierarchy_sql.php 
Log Message:
fix

Index: album_hierarchy_sql.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_hierarchy_sql.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** album_hierarchy_sql.php	30 Aug 2008 22:27:20 -0000	1.6
--- album_hierarchy_sql.php	30 Aug 2008 22:33:41 -0000	1.7
***************
*** 2059,2063 ****
  			$image_comment = ($commentsrow[$i]['comments'] == 0) ? $lang['Not_commented'] : $commentsrow[$i]['comments'];
  
! 			$thumbnail_file = mx_append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $commentsrow[$i]['pic_id'], true));
  			if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) )
  			{
--- 2059,2063 ----
  			$image_comment = ($commentsrow[$i]['comments'] == 0) ? $lang['Not_commented'] : $commentsrow[$i]['comments'];
  
! 			$thumbnail_file = mx_append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $commentsrow[$i]['pic_id']));
  			if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) )
  			{

[mxbb-commits] mx_smartor/album_mod/includes album_hierarchy_sql.php, 1.5, 1.6

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

Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6378

Modified Files:
	album_hierarchy_sql.php 
Log Message:
fix

Index: album_hierarchy_sql.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_hierarchy_sql.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** album_hierarchy_sql.php	29 Aug 2008 05:58:23 -0000	1.5
--- album_hierarchy_sql.php	30 Aug 2008 22:27:20 -0000	1.6
***************
*** 1369,1373 ****
  					}
  
! 					$thumbnail_file = mx_append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $recentrow[$j]['pic_id'], true));
  					if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) )
  					{
--- 1369,1373 ----
  					}
  
! 					$thumbnail_file = mx_append_sid(this_smartor_mxurl("smartor_mode=album_thumbnail&pic_id=" . $recentrow[$j]['pic_id']));
  					if ( ($album_config['thumbnail_cache'] == true) && ($album_config['quick_thumbs'] == true) )
  					{

[mxbb-commits] mx_smartor/album_mod/modules album_thumbnail.php, 1.4, 1.5

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

Update of /cvsroot/mxbb/mx_smartor/album_mod/modules
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30907

Modified Files:
	album_thumbnail.php 
Log Message:
admin check

Index: album_thumbnail.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_thumbnail.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_thumbnail.php	27 Mar 2008 14:31:12 -0000	1.4
--- album_thumbnail.php	30 Aug 2008 22:23:00 -0000	1.5
***************
*** 117,123 ****
  $auth_data = album_user_access($cat_id, $thiscat, 1, 0, 1, 1, 1, 1);
  
! if (($auth_data['view'] == 0) && ($album_user_access['view'] == false))
  {
! 	mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']);
  }
  
--- 117,133 ----
  $auth_data = album_user_access($cat_id, $thiscat, 1, 0, 1, 1, 1, 1);
  
! if (!(PORTAL_BACKEND == 'phpbb3') && !($userdata['user_type'] == USER_FOUNDER))
  {
! 	if (($auth_data['view'] == 0) && ($album_user_access['view'] == false))
! 	{
! 		mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']);
! 	}
! }
! elseif (!($userdata['user_level'] == ADMIN))
! {
! 	if (($auth_data['view'] == 0) && ($album_user_access['view'] == false))
! 	{
! 		mx_message_die(GENERAL_MESSAGE, $lang['Not_Authorised']);
! 	}	
  }
  

[mxbb-commits] core/admin index.php,1.52,1.53

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

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

Modified Files:
	index.php 
Log Message:
phpbb3 backend does not use decode ip features

Index: index.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** index.php	21 Jun 2008 22:20:58 -0000	1.52
--- index.php	30 Aug 2008 22:09:10 -0000	1.53
***************
*** 769,774 ****
  				$row_color = ( $registered_users % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
  				$row_class = ( $registered_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
  
! 				$reg_ip = phpBB2::decode_ip($onlinerow_reg[$i]['session_ip']);
  
  				$template->assign_block_vars("reg_user_row", array(
--- 769,785 ----
  				$row_color = ( $registered_users % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
  				$row_class = ( $registered_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
+ 				
+ 				switch (PORTAL_BACKEND)
+ 				{
+ 					case 'internal':
+ 					case 'phpbb2':
+ 						$reg_ip = phpBB2::decode_ip($onlinerow_reg[$i]['session_ip']);
+ 						break;
  
! 					case 'phpbb3':
! 						$reg_ip = $onlinerow_reg[$i]['session_ip'];
! 						break;
! 
! 				}
  
  				$template->assign_block_vars("reg_user_row", array(
***************
*** 868,873 ****
  			$row_color = ( $guest_users % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
  			$row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
  
! 			$guest_ip = phpBB2::decode_ip($onlinerow_guest[$i]['session_ip']);
  
  			$template->assign_block_vars("guest_user_row", array(
--- 879,895 ----
  			$row_color = ( $guest_users % 2 ) ? $theme['td_color1'] : $theme['td_color2'];
  			$row_class = ( $guest_users % 2 ) ? $theme['td_class1'] : $theme['td_class2'];
+ 			
+ 			switch (PORTAL_BACKEND)
+ 			{
+ 				case 'internal':
+ 				case 'phpbb2':
+ 					$guest_ip = phpBB2::decode_ip($onlinerow_guest[$i]['session_ip']);
+ 					break;
  
! 				case 'phpbb3':
! 					$guest_ip = $onlinerow_guest[$i]['session_ip'];
! 					break;
! 
! 			}			
  
  			$template->assign_block_vars("guest_user_row", array(

[mxbb-commits] core/includes mx_functions_style.php, 1.89, 1.90 template.php, 1.30, 1.31

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

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

Modified Files:
	mx_functions_style.php template.php 
Log Message:
fix for forum integration module

Index: template.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/template.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** template.php	13 Jul 2008 19:30:28 -0000	1.30
--- template.php	30 Aug 2008 19:04:58 -0000	1.31
***************
*** 817,821 ****
  
  		foreach($filename_array as $handle => $filename)
! 		{
  			$this->set_filename($handle, $filename);
  		}
--- 817,822 ----
  
  		foreach($filename_array as $handle => $filename)
! 		{		
! 		
  			$this->set_filename($handle, $filename);
  		}
***************
*** 856,859 ****
--- 857,873 ----
  			}
  		}
+ 		
+ 		if (strpos($this->files[$handle],'overall_header.') && $xs_include && defined('MX_PHPBB3_BLOCK'))
+ 		{
+ 			//Do not include phpBB3 overall header and footer files using xs_include inside forum integration
+ 			$this->files[$handle] = str_replace($filename, 'index.htm', $this->files[$handle]);													
+ 		}
+ 
+ 		if (strpos($this->files[$handle],'overall_footer.') && $xs_include && defined('MX_PHPBB3_BLOCK'))
+ 		{
+ 			//Do not include phpBB3 overall header and footer files using xs_include inside forum integration
+ 			$this->files[$handle] = str_replace($filename, 'index.htm', $this->files[$handle]);													
+ 		}		
+ 		
  		// creating cache filename
  		if($can_cache != '')
***************
*** 926,930 ****
  		// Note: This little snippet is needed to make the templating work with Olympus
  		//
! 		if ( !defined( 'IN_ADMIN' ) )
  		{
  			$admin_script = ($admin_script) ? $admin_script : $filename;
--- 940,944 ----
  		// Note: This little snippet is needed to make the templating work with Olympus
  		//
! 		if (!defined('IN_ADMIN'))
  		{
  			$admin_script = ($admin_script) ? $admin_script : $filename;
***************
*** 939,942 ****
--- 953,964 ----
  			echo '<!-- template ', $this->files[$handle], ' start -->';
  		}
+ 		
+ 		if ((strpos($filename,'overall_header.')) && defined('MX_PHPBB3_BLOCK'))
+ 		{
+ 			die("overall_header.");
+ 			//Do not include phpBB3 overall header and footer files.
+ 			$filename = str_replace('overall_header.', 'index.', $filename);
+ 			$filename = str_replace('overall_footer.', 'index.', $filename);													
+ 		}			
  
  		if ($filename)
***************
*** 993,996 ****
--- 1015,1027 ----
  		$this->xs_startup();
  		$force_recompile = empty($this->uncompiled_code[$handle]) ? false : true;
+ 		
+ 		if ((strpos($this->files_cache[$handle],'overall_header.')) && defined('MX_PHPBB3_BLOCK'))
+ 		{
+ 			die("overall_header.");
+ 			//Do not include phpBB3 overall header and footer files.
+ 			$filename = str_replace('overall_header.', 'index.', $filename);
+ 			$filename = str_replace('overall_footer.', 'index.', $filename);													
+ 		}		
+ 		
  		// checking if php file exists.
  		if (!empty($this->files_cache[$handle]) && !$force_recompile)
***************
*** 1016,1020 ****
  				$this->compiled_code[$handle] = $this->compile2($this->uncompiled_code[$handle], '', '');
  			}
! 		}
  		// Run the compiled code.
  		if (empty($this->files_cache[$handle]) || $force_recompile)
--- 1047,1052 ----
  				$this->compiled_code[$handle] = $this->compile2($this->uncompiled_code[$handle], '', '');
  			}
! 		}	
! 		
  		// Run the compiled code.
  		if (empty($this->files_cache[$handle]) || $force_recompile)
***************
*** 1026,1029 ****
--- 1058,1062 ----
  			$this->execute($this->files_cache[$handle], '', $handle);
  		}
+ 		
  		return true;
  	}
***************
*** 1073,1076 ****
--- 1106,1110 ----
  			}
  		}
+ 		
  
  		//if ($filename = $this->_tpl_load($handle))

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.89
retrieving revision 1.90
diff -C2 -d -r1.89 -r1.90
*** mx_functions_style.php	30 Aug 2008 11:20:42 -0000	1.89
--- mx_functions_style.php	30 Aug 2008 19:04:58 -0000	1.90
***************
*** 110,114 ****
  	 * @access public
  	 */
! 	function make_filename($filename)
  	{
  		global $module_root_path, $mx_root_path, $phpbb_root_path, $theme, $mx_user, $mx_block;
--- 110,114 ----
  	 * @access public
  	 */
! 	function make_filename($filename, $xs_include = false)
  	{
  		global $module_root_path, $mx_root_path, $phpbb_root_path, $theme, $mx_user, $mx_block;
***************
*** 126,129 ****
--- 126,140 ----
  		}
  		*/
+ 	
+ 		if($this->subtemplates)
+ 		{
+ 			$filename = $this->subtemplates_make_filename($filename);
+ 		}
+ 		// Check replacements list
+ 		if(!$xs_include && isset($this->replace[$filename]))
+ 		{
+ 			$filename = $this->replace[$filename];
+ 		}
+ 		
  		$style_path = $mx_user->template_name;
  
***************
*** 220,227 ****
  				$fileSearch[] = $mx_user->default_template_name . '/' . 'template'; // Then check Default template
  				$fileSearch[] = './';
  
- 				$temppath = $this->doFileSearch($fileSearch, $filename, $filename2, 'styles/', $phpbb_root_path, false);
  				if (!empty($this->module_template_path))
! 				{
  					return $temppath;
  				}
--- 231,247 ----
  				$fileSearch[] = $mx_user->default_template_name . '/' . 'template'; // Then check Default template
  				$fileSearch[] = './';
+ 				
+ 
+ 				$temppath = $this->doFileSearch($fileSearch, $filename, $filename2, 'styles/', $phpbb_root_path, false);				
  
  				if (!empty($this->module_template_path))
! 				{					
! 					if (!file_exists($root_path . $this->module_template_path . 'gecko.css'))
! 					{
! 						//Do not include phpBB3 overall header and footer files.
! 						$temppath = str_replace('overall_header', 'index', $temppath);
! 						$temppath = str_replace('overall_footer', 'index', $temppath);				
! 					}					
! 					
  					return $temppath;
  				}
***************
*** 250,253 ****
--- 270,274 ----
  		die("Template->make_filename(): Error - file $filename does not exist. <br />Class-Root: $this->root <br />Module: $module_root_path <br />Current style: $style_path <br />Cloned style: $mx_user->cloned_template_name <br />Default style: $mx_user->default_template_name <br />Custom module default style: $moduleDefault");
  	}
+ 	
  
  	/**
***************
*** 264,283 ****
  		$this->module_template_path = '';
  		foreach ($fileSearch as $key => $path)
! 		{
! 			if (!empty($path))
  			{
  				$this->debug_paths .= '<br>' . $root_path . $root . $path . '/' . $filename;
  				if( file_exists($root_path . $root . $path . '/' . $filename) )
! 				{
  					$this->module_template_path = $root . $path . '/';
! 					return $root_path . $root . $path . '/' . $filename;
  				}
! 				if ($check_file2)
  				{
! 					if( file_exists($root_path . $root . $path . '/' . $filename2) )
! 					{
! 						$this->module_template_path = $root . $path . '/';
! 						return $root_path . $root . $path . '/' . $filename2;
! 					}
  				}
  			}
--- 285,303 ----
  		$this->module_template_path = '';
  		foreach ($fileSearch as $key => $path)
! 		{		
! 			if (!empty($path) && ($path !== './'))
  			{
  				$this->debug_paths .= '<br>' . $root_path . $root . $path . '/' . $filename;
+ 				
  				if( file_exists($root_path . $root . $path . '/' . $filename) )
! 				{								
  					$this->module_template_path = $root . $path . '/';
! 					return $root_path . $root . $path . '/' . $filename;					
  				}
! 
! 				if ($check_file2 && file_exists($root_path . $root . $path . '/' . $filename2))
  				{
! 					$this->module_template_path = $root . $path . '/';
! 					return $root_path . $root . $path . '/' . $filename2;
  				}
  			}

[mxbb-commits] core/includes mx_functions_style.php,1.88,1.89

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

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

Modified Files:
	mx_functions_style.php 
Log Message:
in 'theme' folder are only css file wich we don't need in mxp but .html files are in 'template' folder wich we need in forum integration !!!!!!!!!!!!!!!!!!!

Index: mx_functions_style.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_style.php,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -d -r1.88 -r1.89
*** mx_functions_style.php	29 Aug 2008 02:48:07 -0000	1.88
--- mx_functions_style.php	30 Aug 2008 11:20:42 -0000	1.89
***************
*** 216,222 ****
  				$this->debug_paths .= '<br>phpbb3';
  				$fileSearch = array();
! 				$fileSearch[] = $style_path . '/' . 'theme'; // First check current template
! 				$fileSearch[] = $mx_user->cloned_template_name . '/' . 'theme'; // Then check Cloned template
! 				$fileSearch[] = $mx_user->default_template_name . '/' . 'theme'; // Then check Default template
  				$fileSearch[] = './';
  
--- 216,222 ----
  				$this->debug_paths .= '<br>phpbb3';
  				$fileSearch = array();
! 				$fileSearch[] = $style_path . '/' . 'template'; // First check current template
! 				$fileSearch[] = $mx_user->cloned_template_name . '/' . 'template'; // Then check Cloned template
! 				$fileSearch[] = $mx_user->default_template_name . '/' . 'template'; // Then check Default template
  				$fileSearch[] = './';
  

[mxbb-commits] mx_smartor/album_mod/modules album_rdf.php, 1.3, 1.4 album_rss.php, 1.3, 1.4

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

Update of /cvsroot/mxbb/mx_smartor/album_mod/modules
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv19871

Modified Files:
	album_rdf.php album_rss.php 
Log Message:
rss fix for phpbb3 backend

Index: album_rss.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_rss.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_rss.php	13 Mar 2008 08:35:58 -0000	1.3
--- album_rss.php	30 Aug 2008 04:37:11 -0000	1.4
***************
*** 121,125 ****
  ";
  
- 
  // If not set, set the output count to 50
  $count = ( isset($HTTP_GET_VARS['c']) ) ? intval($HTTP_GET_VARS['c']) : 25;
--- 121,124 ----
***************
*** 153,194 ****
  		}
  	}
! 	$sql_not_allowed_cat=(empty($not_allowed_cat))?"":"AND pic_cat_id NOT IN ($not_allowed_cat)";
  }
  // End check permissions
! $NotErrorFlag=false;
! $sql_limit_time="";
! if (!$no_limit and isset($HTTP_SERVER_VARS['HTTP_IF_MODIFIED_SINCE'])) {
! 		$NotErrorFlag=true;
! 		$NotModifiedSince=strtotime($HTTP_SERVER_VARS['HTTP_IF_MODIFIED_SINCE']);
! 		if($NotModifiedSince>0){
! 			 $sql_limit_time="AND pic_time > ".$NotModifiedSince;
!              $sql_limit_comment_time="AND comment_time > ".$NotModifiedSince;
! 			 }
! } 
! 
! $sql = "SELECT pic_id, pic_title, pic_time, pic_desc, pic_username, pic_cat_id, pic_approval, cat_title
! 	FROM ".ALBUM_TABLE. " LEFT JOIN ".ALBUM_CAT_TABLE." ON (cat_id = pic_cat_id)
! 	WHERE pic_approval=$check_sel
! 	$sql_not_allowed_cat $sql_cat_where $sql_limit_time
! 	ORDER  BY pic_time DESC
! 	LIMIT $count";
! 
! 	$picrow = $db->sql_query($sql);
  
! if ( !$picrow )
! {
!     die("Failed obtaining list of active pictures");
! }
! else
! {
!     $topics = $db->sql_fetchrowset($picrow);
  }
! $LastPostTime=0;
! if ( count($topics) == 0 )
  {
!     die("No pictures found");
  }
! else
  {
      // $topics contains all interesting data
      for ($i = 0; $i < count($topics); $i++)
--- 152,216 ----
  		}
  	}
! 	$sql_not_allowed_cat = (empty($not_allowed_cat)) ? "" : "AND p.pic_cat_id NOT IN ($not_allowed_cat)";
  }
  // End check permissions
! $NotErrorFlag = false;
! $sql_limit_time = "";
! if (!$no_limit and isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
! 		$NotErrorFlag = true;
! 		$NotModifiedSince = strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']);
  
! 		if($NotModifiedSince > 0)
! 		{
! 			 $sql_limit_time = "AND p.pic_time > ". $NotModifiedSince;
!              $sql_limit_comment_time = "AND p.comment_time > ". $NotModifiedSince;
! 		}
  }
! 
! $sql = "SELECT COUNT(p.pic_id) AS count
! 	FROM " . ALBUM_TABLE . ' AS p,' . ALBUM_CAT_TABLE . " AS c
! 	WHERE p.pic_cat_id = c.cat_id
! 	AND p.pic_approval = $check_sel
! 	$sql_not_allowed_cat 
! 	$sql_cat_where 
! 	$sql_limit_time
! 	ORDER  BY pic_time DESC";
! if ( !($result = $db->sql_query_limit($sql, $count)) )
  {
!    $rss .= "
! 	<item>
! 		<title>" . "Error: Could not count pics." . "</title>
! 		<description>" . $sql ."</description>           
! 	</item>";
  }
! 
! $row = $db->sql_fetchrow($result);
! 
! $total_pics = $row['count'];
! 
! if ($total_pics > 0)
  {
+ 	$sql = "SELECT p.*, c.* 
+ 		FROM " . ALBUM_TABLE . ' AS p,' . ALBUM_CAT_TABLE . " AS c
+ 		WHERE p.pic_cat_id = c.cat_id
+ 		AND p.pic_approval = $check_sel
+ 		$sql_not_allowed_cat 
+ 		$sql_cat_where 
+ 		$sql_limit_time
+ 		ORDER  BY pic_time DESC";
+ 		
+ 	if ( !($result = $db->sql_query_limit($sql, $count)) )
+ 	{
+ 		die("Failed obtaining list of active pictures");
+ 	}	
+ 
+ 	$LastPostTime = 0;
+ 
+ 	$topics = array();
+ 	while($picrow = $db->sql_fetchrow($result))
+ 	{
+ 		$topics[] = $picrow;
+ 	}
+ 
      // $topics contains all interesting data
      for ($i = 0; $i < count($topics); $i++)
***************
*** 201,217 ****
      	//$description = htmlspecialchars($entry_data[$i]['entry_text']);
      	$description = htmlentities($description);
! 	$description .= $lang['Pic_Desc'].": ".nl2br($topics[$i]['pic_desc']);
          $pic_time = date('D, j M Y G:i:s T',$topics[$i]['pic_time']);
  
          $rss .= "
! <item>
! 	<title>" . $title . "</title>
! 	<link>" . $url . "</link>
! 	<description>" . $description ."</description>
! 	<pubDate>". $pic_time ."</pubDate>            
! </item>
! ";
      }
  }
  
  // Create RDF footer
--- 223,248 ----
      	//$description = htmlspecialchars($entry_data[$i]['entry_text']);
      	$description = htmlentities($description);
! 		$description .= $lang['Pic_Desc'].": ".nl2br($topics[$i]['pic_desc']);
          $pic_time = date('D, j M Y G:i:s T',$topics[$i]['pic_time']);
  
          $rss .= "
! 		<item>
! 			<title>" . $title . "</title>
! 			<link>" . $url . "</link>
! 			<description>" . $description ."</description>
! 			<pubDate>". $pic_time  ."</pubDate>            
! 		</item>";
! 
      }
  }
+ else
+ {
+ 	$total_pics = ($total_pics) ? intval($total_pics) : 0;
+ 	$rss .= "
+ 	<item>
+ 		<title>" . $total_pics . " pictures found." . "</title>
+ 		<description>" . "No images have been added ?" ."</description>          
+ 	</item>";
+ }
  
  // Create RDF footer
***************
*** 226,230 ****
  
  // Output the RDF
! echo $rss;
  
  ?> 
\ No newline at end of file
--- 257,262 ----
  
  // Output the RDF
! 
! die("$rss");
  
  ?> 
\ No newline at end of file

Index: album_rdf.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_rdf.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_rdf.php	13 Mar 2008 08:35:58 -0000	1.3
--- album_rdf.php	30 Aug 2008 04:37:11 -0000	1.4
***************
*** 150,173 ****
  
  $sql = "SELECT pic_id, pic_title, pic_time, pic_desc, pic_username, pic_cat_id, pic_approval, cat_title
! 	FROM ".ALBUM_TABLE. " LEFT JOIN ".ALBUM_CAT_TABLE." ON (cat_id = pic_cat_id)
! 	WHERE pic_approval=$check_sel
  	$sql_not_allowed_cat $sql_cat_where $sql_limit_time
! 	ORDER  BY pic_time DESC
! 	LIMIT $count";
! 
! 	$picrow = $db->sql_query($sql);
  
! if ( !$picrow )
  {
!     die("Failed obtaining list of active pictures");
  }
! else
  {
!     $topics = $db->sql_fetchrowset($picrow);
  }
! $LastPostTime=0;
  if ( count($topics) == 0 )
  {
!     die("No pictures found");
  }
  else
--- 150,180 ----
  
  $sql = "SELECT pic_id, pic_title, pic_time, pic_desc, pic_username, pic_cat_id, pic_approval, cat_title
! 	FROM " . ALBUM_TABLE . " LEFT JOIN ". ALBUM_CAT_TABLE ." ON (cat_id = pic_cat_id)
! 	WHERE pic_approval = $check_sel
  	$sql_not_allowed_cat $sql_cat_where $sql_limit_time
! 	ORDER  BY pic_time DESC";
  
! if ( !($result = $db->sql_query_limit($sql, $count)) )
  {
! 	die("Failed obtaining list of active pictures");
  }
! 
! $topics = array();
! while($picrow = $db->sql_fetchrow($result))
  {
! 	$topics[] = $picrow;
  }
! 
! //$topics = $db->sql_fetchrowset($picrow);
! 
! $LastPostTime = 0;
! 
  if ( count($topics) == 0 )
  {
! 	$rss .= "
! 	<item>
! 		<title>" . "No pictures found." . "</title>
! 		<description>" . "Images have not been added yet ?" ."</description>          
! 	</item>";
  }
  else

[mxbb-commits] mx_smartor mx_install_readme.htm,1.14,1.15

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

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

Modified Files:
	mx_install_readme.htm 
Log Message:
2.9.3

Index: mx_install_readme.htm
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/mx_install_readme.htm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** mx_install_readme.htm	29 Aug 2008 15:40:06 -0000	1.14
--- mx_install_readme.htm	29 Aug 2008 15:41:12 -0000	1.15
***************
*** 233,237 ****
  <p><b>MX Module - Smartor Album FAP (Full Album Pack)<font style=
  "font-size: 9pt"><br />
! v. 2.8.3</font></b></p>
  <p><span style=
  "font-size: 9pt; line-height: normal; font-weight:bold">Module</span>
--- 233,237 ----
  <p><b>MX Module - Smartor Album FAP (Full Album Pack)<font style=
  "font-size: 9pt"><br />
! v. 2.9.3</font></b></p>
  <p><span style=
  "font-size: 9pt; line-height: normal; font-weight:bold">Module</span>

[mxbb-commits] mx_smartor mx_install_readme.htm,1.13,1.14

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

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

Modified Files:
	mx_install_readme.htm 
Log Message:
update

Index: mx_install_readme.htm
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/mx_install_readme.htm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** mx_install_readme.htm	3 Jun 2008 20:15:00 -0000	1.13
--- mx_install_readme.htm	29 Aug 2008 15:40:06 -0000	1.14
***************
*** 233,241 ****
  <p><b>MX Module - Smartor Album FAP (Full Album Pack)<font style=
  "font-size: 9pt"><br />
! v. 2.0</font></b></p>
  <p><span style=
  "font-size: 9pt; line-height: normal; font-weight:bold">Module</span>
  <span style="font-size: 9pt"><br />
! - for mxBB Portal v. 2.8.1</span></p>
  <p><strong><span style=
  "font-size: 9pt">Author</span></strong><span style=
--- 233,241 ----
  <p><b>MX Module - Smartor Album FAP (Full Album Pack)<font style=
  "font-size: 9pt"><br />
! v. 2.8.3</font></b></p>
  <p><span style=
  "font-size: 9pt; line-height: normal; font-weight:bold">Module</span>
  <span style="font-size: 9pt"><br />
! - for mxBB Portal v. 3.0.x / 2.8.3+</span></p>
  <p><strong><span style=
  "font-size: 9pt">Author</span></strong><span style=

[mxbb-commits] core/includes mx_functions_bbcode.php, 1.12.2.2, 1.12.2.3

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

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

Modified Files:
      Tag: core28x
	mx_functions_bbcode.php 
Log Message:
fix for 2.8.x

Index: mx_functions_bbcode.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_bbcode.php,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -C2 -d -r1.12.2.2 -r1.12.2.3
*** mx_functions_bbcode.php	15 Jul 2008 22:09:28 -0000	1.12.2.2
--- mx_functions_bbcode.php	29 Aug 2008 15:17:30 -0000	1.12.2.3
***************
*** 276,280 ****
  		// Unique ID for this message..
  
! 		$uid = $mx_backend->dss_rand();
  		$uid = substr($uid, 0, BBCODE_UID_LEN);
  
--- 276,280 ----
  		// Unique ID for this message..
  
! 		$uid = phpBB2::dss_rand();
  		$uid = substr($uid, 0, BBCODE_UID_LEN);
  

[mxbb-commits] mx_smartor/album_mod/includes album_constants.php, 1.10, 1.11

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

Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6662

Modified Files:
	album_constants.php 
Log Message:
compatibility with core 2.8.x

Index: album_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_constants.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** album_constants.php	29 Aug 2008 05:58:23 -0000	1.10
--- album_constants.php	29 Aug 2008 13:44:31 -0000	1.11
***************
*** 72,75 ****
--- 72,78 ----
  }
  
+ //Teplate files extensions check compatibility with core 2.8.x
+ $tplEx = ($tplEx) ? $tplEx : 'tpl';
+ 
  // Album Tables
  !defined('ALBUM_TABLE') ? define('ALBUM_TABLE', $mx_table_prefix.'smartor_album') : false;

[mxbb-commits] mx_smartor/templates/_core album_box.tpl, 1.3, 1.4 album_cat_body.tpl, 1.3, 1.4 album_showpage_body.tpl, 1.3, 1.4

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

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

Modified Files:
	album_box.tpl album_cat_body.tpl album_showpage_body.tpl 
Log Message:
fix

Index: album_box.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/templates/_core/album_box.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_box.tpl	29 Aug 2008 10:31:39 -0000	1.3
--- album_box.tpl	29 Aug 2008 13:34:37 -0000	1.4
***************
*** 17,21 ****
  					<th class="thCornerL" width="80%" height="25" colspan="2" nowrap="nowrap">&nbsp;{catheader.L_CATEGORY}&nbsp;</th>
  					<!-- BEGIN thumb -->
! 					<th width="5%" class="{catheader.thumb.CLASS}">&nbsp;{catheader.thumb.L_LAST_PIC_THUMB}&nbsp;</th>
  					<!-- END thumb -->
  					<!-- BEGIN total_pics -->
--- 17,25 ----
  					<th class="thCornerL" width="80%" height="25" colspan="2" nowrap="nowrap">&nbsp;{catheader.L_CATEGORY}&nbsp;</th>
  					<!-- BEGIN thumb -->
! 					<th width="5%" class="{catheader.thumb.CLASS}">
! 			
! 						{catheader.thumb.L_LAST_PIC_THUMB}
! 				
! 					</th>
  					<!-- END thumb -->
  					<!-- BEGIN total_pics -->
***************
*** 65,69 ****
  					</td>
  					<!-- BEGIN thumb -->
! 					<td class="{COL0}" align="center" onMouseOver="this.style.backgroundColor='{THUMB_OVER_COLOR}';" onMouseOut="this.style.backgroundColor='{THUMB_OUT_COLOR}';"><span class="gensmall">{catmain.catrow.thumb.LAST_PIC_URL}&nbsp;</span></td>
  					<!-- END thumb -->
  					<!-- BEGIN total_pics -->
--- 69,80 ----
  					</td>
  					<!-- BEGIN thumb -->
! 					<td class="{COL0}" align="center" onMouseOver="this.style.backgroundColor='{THUMB_OVER_COLOR}';" onMouseOut="this.style.backgroundColor='{THUMB_OUT_COLOR}';">
! 					<span class="gensmall">
! 					<div class="picshadow">
! 						<div class="picframe">
! 						{catmain.catrow.thumb.LAST_PIC_URL}
! 						</div>
! 					</div>
! 					</span></td>
  					<!-- END thumb -->
  					<!-- BEGIN total_pics -->

Index: album_showpage_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/templates/_core/album_showpage_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_showpage_body.tpl	29 Aug 2008 10:31:41 -0000	1.3
--- album_showpage_body.tpl	29 Aug 2008 13:34:38 -0000	1.4
***************
*** 190,193 ****
--- 190,194 ----
  			   <tr>
  				<td class="row1 bg1" width="100%" align="center">
+ 				
  					<!-- BEGIN switch_slideshow_enabled -->
  					<form name="slideshow" action="{U_SLIDESHOW}" method="post" onsubmit="return true;">
***************
*** 196,203 ****
  					</form>
  					<!-- END switch_slideshow_enabled -->
! 					{U_PIC_L1}<img src="{U_PIC}" border="0" vspace="10" alt="{PIC_TITLE}" title="{PIC_TITLE}" />{U_PIC_L2}<br />
  					<span class="genmed">{U_PIC_CLICK}&nbsp;</span><br />
  					<!-- BEGIN pic_nuffed_enabled -->
! 					<span class="genmed"><a href="{pic_nuffed_enabled.U_PIC_NUFFED_CLICK}" class="genmed">{pic_nuffed_enabled.L_PIC_NUFFED_CLICK}</a></span><br />
  					<!-- END pic_nuffed_enabled -->
  				</td>
--- 197,213 ----
  					</form>
  					<!-- END switch_slideshow_enabled -->
! 					
! 					<div class="picshadow">
! 					<div class="picframe">
! 					{U_PIC_L1}<img src="{U_PIC}" border="0" vspace="10" alt="{PIC_TITLE}" title="{PIC_TITLE}" />{U_PIC_L2}
! 					</div>
! 					</div>					
! 
  					<span class="genmed">{U_PIC_CLICK}&nbsp;</span><br />
  					<!-- BEGIN pic_nuffed_enabled -->
! 					<span class="genmed">
! 					<a href="{pic_nuffed_enabled.U_PIC_NUFFED_CLICK}" class="genmed">{pic_nuffed_enabled.L_PIC_NUFFED_CLICK}</a>
! 					</span>
! 					<br />
  					<!-- END pic_nuffed_enabled -->
  				</td>

Index: album_cat_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/templates/_core/album_cat_body.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_cat_body.tpl	29 Aug 2008 10:31:39 -0000	1.3
--- album_cat_body.tpl	29 Aug 2008 13:34:38 -0000	1.4
***************
*** 122,128 ****
  			<!-- BEGIN piccol -->
  			<td class="row1" align="center" width="{S_COL_WIDTH}" onMouseOver="this.className='row2';" onMouseOut="this.className='row1';">
! 				<table><tr><td><div class="picshadow"><div class="picframe">
  					<a href="{index_pics_block.picrow.piccol.U_PIC}" {TARGET_BLANK}><img src="{index_pics_block.picrow.piccol.THUMBNAIL}" {THUMB_SIZE} alt="{index_pics_block.picrow.piccol.DESC}" title="{index_pics_block.picrow.piccol.DESC}" vspace="10" border="0" {index_pics_block.picrow.piccol.PIC_PREVIEW} /></a>
! 				</div></div></td></tr></table>
  				<span class="genmed"><br />{index_pics_block.picrow.piccol.APPROVAL}</span>
  			</td>
--- 122,136 ----
  			<!-- BEGIN piccol -->
  			<td class="row1" align="center" width="{S_COL_WIDTH}" onMouseOver="this.className='row2';" onMouseOut="this.className='row1';">
! 				<table>
! 				<tr>
! 				<td>
! 				<div class="picshadow">
! 				<div class="picframe">
  					<a href="{index_pics_block.picrow.piccol.U_PIC}" {TARGET_BLANK}><img src="{index_pics_block.picrow.piccol.THUMBNAIL}" {THUMB_SIZE} alt="{index_pics_block.picrow.piccol.DESC}" title="{index_pics_block.picrow.piccol.DESC}" vspace="10" border="0" {index_pics_block.picrow.piccol.PIC_PREVIEW} /></a>
! 				</div>
! 				</div>
! 				</td>
! 				</tr>
! 				</table>
  				<span class="genmed"><br />{index_pics_block.picrow.piccol.APPROVAL}</span>
  			</td>

[mxbb-commits] core/templates/prosilver overall_header.html, 1.11, 1.12 overall_header_navigation.html, 1.15, 1.16 overall_header_navigation_nopageicon.html, 1.3, 1.4 overall_header_navigation_phpbb.html, 1.13, 1.14 overall_noheader.html, 1.6, 1.7

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

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

Modified Files:
	overall_header.html overall_header_navigation.html 
	overall_header_navigation_nopageicon.html 
	overall_header_navigation_phpbb.html overall_noheader.html 
Log Message:
fix

Index: overall_header_navigation_phpbb.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_header_navigation_phpbb.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** overall_header_navigation_phpbb.html	27 Aug 2008 06:28:17 -0000	1.13
--- overall_header_navigation_phpbb.html	29 Aug 2008 10:47:09 -0000	1.14
***************
*** 15,18 ****
--- 15,43 ----
  <!-- END switch_phpbb_stylesheet-->
  
+ <!-- This force template reloading in ie7 like CTRL+F5 does and is not very nice
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
+ -->
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" rel="stylesheet" type="text/css" media="screen, projection" />
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/normal.css" rel="stylesheet" type="text/css" title="A" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
+ 
+ <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+ 	<link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
+ <!-- ENDIF -->
+ 
+ <!-- IF GECKO -->
+ <!-- Optionally, redefine some defintions for gecko browsers -->
+ <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" >
+ <!-- ENDIF -->
+ 
+ {MX_ADDITIONAL_CSS}
+ {MX_ADDITIONAL_CSS_FILES}
+ {MX_ICON_CSS}
+ 
  <!-- IF ENABLE_PM_POPUP -->
  <script language="javascript" type="text/javascript"><!--
***************
*** 56,90 ****
  // --></script>
  
- <script type="text/javascript">
- //this will disable google traslate browsing frame, the page still will be traslated but real ip will be returned in Admin Index
- if (top.location != self.location) top.location = self.location.href;
- </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>
  
! <!-- This force template reloading in ie7 like CTRL+F5 does and is not very nice
! <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
! -->
! <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
! 
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" rel="stylesheet" type="text/css" media="screen, projection" />
! 
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/normal.css" rel="stylesheet" type="text/css" title="A" />
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
! 
! <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
! 	<link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
! <!-- ENDIF -->
! 
! <!-- IF GECKO -->
! <!-- Optionally, redefine some defintions for gecko browsers -->
! <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" >
! <!-- ENDIF -->
! 
! {MX_ADDITIONAL_CSS}
! {MX_ICON_CSS}
  
  </head>
--- 81,89 ----
  // --></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>
  
! {MX_ADDITIONAL_JS_FILES}
! {MX_ADDITIONAL_HEADER_TEXT}
  
  </head>

Index: overall_header_navigation_nopageicon.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_header_navigation_nopageicon.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** overall_header_navigation_nopageicon.html	27 Aug 2008 06:28:16 -0000	1.3
--- overall_header_navigation_nopageicon.html	29 Aug 2008 10:47:08 -0000	1.4
***************
*** 15,18 ****
--- 15,43 ----
  <!-- END switch_phpbb_stylesheet-->
  
+ <!-- This force template reloading in ie7 like CTRL+F5 does and is not very nice
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
+ -->
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" rel="stylesheet" type="text/css" media="screen, projection" />
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/normal.css" rel="stylesheet" type="text/css" title="A" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
+ 
+ <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+ 	<link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
+ <!-- ENDIF -->
+ 
+ <!-- IF GECKO -->
+ <!-- Optionally, redefine some defintions for gecko browsers -->
+ <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" >
+ <!-- ENDIF -->
+ 
+ {MX_ADDITIONAL_CSS}
+ {MX_ADDITIONAL_CSS_FILES}
+ {MX_ICON_CSS}
+ 
  <!-- IF ENABLE_PM_POPUP -->
  <script language="javascript" type="text/javascript"><!--
***************
*** 59,85 ****
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
! <!-- This force template reloading in ie7 like CTRL+F5 does and is not very nice
! <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
! -->
! <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
! 
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" rel="stylesheet" type="text/css" media="screen, projection" />
! 
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/normal.css" rel="stylesheet" type="text/css" title="A" />
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
! 
! <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
! 	<link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
! <!-- ENDIF -->
! 
! <!-- IF GECKO -->
! <!-- Optionally, redefine some defintions for gecko browsers -->
! <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" >
! <!-- ENDIF -->
! 
! {MX_ADDITIONAL_CSS}
! {MX_ICON_CSS}
  
  </head>
--- 84,89 ----
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
! {MX_ADDITIONAL_JS_FILES}
! {MX_ADDITIONAL_HEADER_TEXT}
  
  </head>

Index: overall_noheader.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_noheader.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** overall_noheader.html	27 Aug 2008 06:28:17 -0000	1.6
--- overall_noheader.html	29 Aug 2008 10:47:13 -0000	1.7
***************
*** 1,4 ****
--- 1,5 ----
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+ <html>
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
***************
*** 14,17 ****
--- 15,43 ----
  <!-- END switch_phpbb_stylesheet-->
  
+ <!-- This force template reloading in ie7 like CTRL+F5 does and is not very nice
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
+ -->
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" rel="stylesheet" type="text/css" media="screen, projection" />
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/normal.css" rel="stylesheet" type="text/css" title="A" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
+ 
+ <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+ 	<link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
+ <!-- ENDIF -->
+ 
+ <!-- IF GECKO -->
+ <!-- Optionally, redefine some defintions for gecko browsers -->
+ <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" >
+ <!-- ENDIF -->
+ 
+ {MX_ADDITIONAL_CSS}
+ {MX_ADDITIONAL_CSS_FILES}
+ {MX_ICON_CSS}
+ 
  <!-- IF ENABLE_PM_POPUP -->
  <script language="javascript" type="text/javascript"><!--
***************
*** 58,83 ****
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
! <!-- This force template reloading in ie7 like CTRL+F5 does and is not very nice
! <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
! -->
! <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
! 
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" rel="stylesheet" type="text/css" media="screen, projection" />
! 
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/normal.css" rel="stylesheet" type="text/css" title="A" />
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
! 
! <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
! 	<link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
! <!-- ENDIF -->
! 
! <!-- IF GECKO -->
! <!-- Optionally, redefine some defintions for gecko browsers -->
! <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" >
! <!-- ENDIF -->
! {MX_ADDITIONAL_CSS}
! {MX_ICON_CSS}
  
  </head>
--- 84,89 ----
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
! {MX_ADDITIONAL_JS_FILES}
! {MX_ADDITIONAL_HEADER_TEXT}
  
  </head>

Index: overall_header.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_header.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** overall_header.html	27 Aug 2008 06:28:16 -0000	1.11
--- overall_header.html	29 Aug 2008 10:47:06 -0000	1.12
***************
*** 1,4 ****
--- 1,5 ----
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
  <html xmlns="http://www.w3.org/1999/xhtml" dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}" xml:lang="{S_USER_LANG}">
+ <html>
  <head>
  <meta http-equiv="Content-Type" content="text/html; charset={S_CONTENT_ENCODING}" />
***************
*** 14,17 ****
--- 15,43 ----
  <!-- END switch_phpbb_stylesheet-->
  
+ <!-- This force template reloading in ie7 like CTRL+F5 does and is not very nice
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
+ -->
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" rel="stylesheet" type="text/css" media="screen, projection" />
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/normal.css" rel="stylesheet" type="text/css" title="A" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
+ 
+ <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+ 	<link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
+ <!-- ENDIF -->
+ 
+ <!-- IF GECKO -->
+ <!-- Optionally, redefine some defintions for gecko browsers -->
+ <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" >
+ <!-- ENDIF -->
+ 
+ {MX_ADDITIONAL_CSS}
+ {MX_ADDITIONAL_CSS_FILES}
+ {MX_ICON_CSS}
+ 
  <!-- IF ENABLE_PM_POPUP -->
  <script language="javascript" type="text/javascript"><!--
***************
*** 58,83 ****
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
! <!-- This force template reloading in ie7 like CTRL+F5 does and is not very nice
! <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
! -->
! <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
! 
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" rel="stylesheet" type="text/css" media="screen, projection" />
! 
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/normal.css" rel="stylesheet" type="text/css" title="A" />
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
! 
! <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
! 	<link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
! <!-- ENDIF -->
! 
! <!-- IF GECKO -->
! <!-- Optionally, redefine some defintions for gecko browsers -->
! <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" >
! <!-- ENDIF -->
! {MX_ADDITIONAL_CSS}
! {MX_ICON_CSS}
  
  </head>
--- 84,89 ----
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
! {MX_ADDITIONAL_JS_FILES}
! {MX_ADDITIONAL_HEADER_TEXT}
  
  </head>

Index: overall_header_navigation.html
===================================================================
RCS file: /cvsroot/mxbb/core/templates/prosilver/overall_header_navigation.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** overall_header_navigation.html	27 Aug 2008 06:28:16 -0000	1.15
--- overall_header_navigation.html	29 Aug 2008 10:47:07 -0000	1.16
***************
*** 15,18 ****
--- 15,42 ----
  <!-- END switch_phpbb_stylesheet-->
  
+ <!-- This force template reloading in ie7 like CTRL+F5 does and is not very nice
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
+ -->
+ <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" rel="stylesheet" type="text/css" media="screen, projection" />
+ 
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/normal.css" rel="stylesheet" type="text/css" title="A" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
+ <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
+ 
+ <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
+ 	<link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
+ <!-- ENDIF -->
+ 
+ <!-- IF GECKO -->
+ <!-- Optionally, redefine some defintions for gecko browsers -->
+ <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" >
+ <!-- ENDIF -->
+ 
+ {MX_ADDITIONAL_CSS}
+ {MX_ADDITIONAL_CSS_FILES}
+ {MX_ICON_CSS}
  
  <!-- IF ENABLE_PM_POPUP -->
***************
*** 60,86 ****
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
! <!-- This force template reloading in ie7 like CTRL+F5 does and is not very nice
! <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}styleswitcher.js"></script>
! -->
! <script type="text/javascript" src="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}forum_fn.js"></script>
! 
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/print.css" rel="stylesheet" type="text/css" media="print" title="printonly" />
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_MXBB_STYLESHEET}" rel="stylesheet" type="text/css" media="screen, projection" />
! 
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/normal.css" rel="stylesheet" type="text/css" title="A" />
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/medium.css" rel="alternate stylesheet" type="text/css" title="A+" />
! <link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/large.css" rel="alternate stylesheet" type="text/css" title="A++" />
! 
! <!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
! 	<link href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}theme/bidi.css" rel="stylesheet" type="text/css" media="screen, projection" />
! <!-- ENDIF -->
! 
! <!-- IF GECKO -->
! <!-- Optionally, redefine some defintions for gecko browsers -->
! <link rel="stylesheet" href="{U_PORTAL_ROOT_PATH}{TEMPLATE_ROOT_PATH}{T_GECKO_STYLESHEET}" type="text/css" >
! <!-- ENDIF -->
! 
! {MX_ADDITIONAL_CSS}
! {MX_ICON_CSS}
  
  </head>
--- 84,89 ----
  <script language="javascript" type="text/javascript" src="{U_PORTAL_ROOT_PATH}modules/mx_shared/lib/Toggle.js"></script>
  
! {MX_ADDITIONAL_JS_FILES}
! {MX_ADDITIONAL_HEADER_TEXT}
  
  </head>

[mxbb-commits] mx_smartor/templates/_core album_box.tpl, 1.2, 1.3 album_cat_body.tpl, 1.2, 1.3 album_comment_body.tpl, 1.2, 1.3 album_index_body.tpl, 1.2, 1.3 album_jupload_body.tpl, 1.2, 1.3 album_showpage_body.tpl, 1.2, 1.3 album_upload_body.tpl, 1.2, 1.3

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

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

Modified Files:
	album_box.tpl album_cat_body.tpl album_comment_body.tpl 
	album_index_body.tpl album_jupload_body.tpl 
	album_showpage_body.tpl album_upload_body.tpl 
Log Message:
Upgrade

Index: album_jupload_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/templates/_core/album_jupload_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_jupload_body.tpl	29 Aug 2008 05:58:25 -0000	1.2
--- album_jupload_body.tpl	29 Aug 2008 10:31:41 -0000	1.3
***************
*** 49,63 ****
  		<div class="textbody">
  
! 		<table width="100%" cellspacing="2" cellpadding="2" border="0">
  		  <tr>
! 			<td class="nav">
  			<span class="maintitle"><a href="{U_ALBUM}" class="maintitle">{L_ALBUM}</a></span><br />
  			<span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_ALBUM}">{L_ALBUM_INDEX}</a>&nbsp;{NAV_SEP}&nbsp;<!-- a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a -->
  			<a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a>{NAV_CAT_DESC}</span>
  			</td>
  		  </tr>
  		</table>
  
! 		<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
  		  <tr>
  			<th class="thTop" height="25">{L_UPLOAD_PIC}</th>
--- 49,78 ----
  		<div class="textbody">
  
! 		<table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline">
  		  <tr>
! 			<td class="nav row1 bg1" width="100%">
  			<span class="maintitle"><a href="{U_ALBUM}" class="maintitle">{L_ALBUM}</a></span><br />
  			<span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>&nbsp;{NAV_SEP}&nbsp;<a class="nav" href="{U_ALBUM}">{L_ALBUM_INDEX}</a>&nbsp;{NAV_SEP}&nbsp;<!-- a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a -->
  			<a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a>{NAV_CAT_DESC}</span>
  			</td>
+ 			<td class="nav row1 bg1" width="100%"></td>
  		  </tr>
  		</table>
+ 		
+ 	</div></div>
+ 	</div>
+ 	<span class="corners-bottom"><span></span></span>
+ </div>
+ <br /><br clear="all" />
+ 		
+ <div class="forabg block">
+ 	<div class="inner"><span class="corners-top"><span></span></span>
+ 	<ul class="topiclist">
+ 		<li class="header"></li>
+ 	</ul>
+ 	<div id="p1" class="post bg2 online">	
+ 	<div class="textbody">		
  
! 		<table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline">
  		  <tr>
  			<th class="thTop" height="25">{L_UPLOAD_PIC}</th>

Index: album_box.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/templates/_core/album_box.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_box.tpl	29 Aug 2008 05:58:24 -0000	1.2
--- album_box.tpl	29 Aug 2008 10:31:39 -0000	1.3
***************
*** 7,11 ****
  	<div id="p1" class="post bg2 online">	
  	<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="1" cellpadding="2">
  				<p>
  					<!-- BEGIN col_span -->
--- 7,11 ----
  	<div id="p1" class="post bg2 online">	
  	<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="0" cellpadding="0">
  				<p>
  					<!-- BEGIN col_span -->

Index: album_showpage_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/templates/_core/album_showpage_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_showpage_body.tpl	29 Aug 2008 05:58:25 -0000	1.2
--- album_showpage_body.tpl	29 Aug 2008 10:31:41 -0000	1.3
***************
*** 158,162 ****
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="100%" align="center" cellspacing="1" cellpadding="2" border="0">
  			  <tr>
  				<td class="row2 bg2 nav"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>&nbsp;&raquo;&nbsp;<a class="nav" href="{U_ALBUM}">{L_ALBUM}</a>&nbsp;&raquo;&nbsp;<a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a></span></td>
--- 158,162 ----
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="100%" align="center" cellspacing="0" cellpadding="0" border="0">
  			  <tr>
  				<td class="row2 bg2 nav"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a>&nbsp;&raquo;&nbsp;<a class="nav" href="{U_ALBUM}">{L_ALBUM}</a>&nbsp;&raquo;&nbsp;<a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a></span></td>
***************
*** 186,190 ****
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
  			   <tr><th class="thTop" width="100%" height="25">{NEXT_PIC}&nbsp;&nbsp;{PIC_TITLE}&nbsp;&nbsp;{PREV_PIC}</th></tr>
  			   <tr>
--- 186,190 ----
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table width="100%" cellpadding="3" cellspacing="0" border="0" class="forumline">
  			   <tr><th class="thTop" width="100%" height="25">{NEXT_PIC}&nbsp;&nbsp;{PIC_TITLE}&nbsp;&nbsp;{PREV_PIC}</th></tr>
  			   <tr>
***************
*** 296,300 ****
  			</table>
  			<!-- BEGIN switch_comment -->
! 			<table width="100%" cellspacing="2" border="0" cellpadding="2">
  			  <tr>
  				<td width="100%"><span class="nav">{PAGE_NUMBER}</span></td>
--- 296,300 ----
  			</table>
  			<!-- BEGIN switch_comment -->
! 			<table width="100%" cellspacing="2" border="0" cellpadding="0">
  			  <tr>
  				<td width="100%"><span class="nav">{PAGE_NUMBER}</span></td>
***************
*** 369,373 ****
  			<!-- BEGIN switch_comment_post -->
  			<form name="commentform" action="{S_ALBUM_ACTION}" method="post" onsubmit="return checkForm();">
! 			<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
  			  <tr>
  				<th class="thTop" height="25" colspan="3">{L_POST_YOUR_COMMENT}</th>
--- 369,373 ----
  			<!-- BEGIN switch_comment_post -->
  			<form name="commentform" action="{S_ALBUM_ACTION}" method="post" onsubmit="return checkForm();">
! 			<table width="100%" cellpadding="3" cellspacing="0" border="0" class="forumline">
  			  <tr>
  				<th class="thTop" height="25" colspan="3">{L_POST_YOUR_COMMENT}</th>

Index: album_index_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/templates/_core/album_index_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_index_body.tpl	29 Aug 2008 05:58:24 -0000	1.2
--- album_index_body.tpl	29 Aug 2008 10:31:40 -0000	1.3
***************
*** 3,7 ****
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="100%" align="center" cellspacing="1" cellpadding="2" border="0">
  			  <tr> 
  				<td class="row2 bg2 nav">
--- 3,7 ----
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="100%" align="center" cellspacing="0" cellpadding="0" border="0">
  			  <tr> 
  				<td class="row2 bg2 nav">
***************
*** 36,40 ****
  {ALBUM_BOARD_INDEX}
  
! <table width="98%" align="center" cellspacing="1" cellpadding="2" border="0"><tr><td align="right"><span class="gensmall">{S_TIMEZONE}</span></td></tr></table>
  
  <!-- BEGIN personal_picrow -->
--- 36,40 ----
  {ALBUM_BOARD_INDEX}
  
! <table width="98%" align="center" cellspacing="0" cellpadding="0" border="0"><tr><td align="right"><span class="gensmall">{S_TIMEZONE}</span></td></tr></table>
  
  <!-- BEGIN personal_picrow -->
***************
*** 44,48 ****
  		<li class="header">
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="1" cellpadding="2">
  				<tr>
  					<!-- BEGIN piccol -->
--- 44,48 ----
  		<li class="header">
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="0" cellpadding="0">
  				<tr>
  					<!-- BEGIN piccol -->
***************
*** 83,87 ****
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="1" cellpadding="2">
  				<tr><td class="catLeft" colspan="2" height="28"><span class="cattitle">{recent_comments_block.L_LAST_COMMENT_INFO}</span></td></tr>
  				<tr>
--- 83,87 ----
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="0" cellpadding="0">
  				<tr><td class="catLeft" colspan="2" height="28"><span class="cattitle">{recent_comments_block.L_LAST_COMMENT_INFO}</span></td></tr>
  				<tr>
***************
*** 124,128 ****
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="1" cellpadding="2">
  				<tr><th class="thTop" height="25" colspan="{S_COLS}" nowrap="nowrap">{L_RECENT_PUBLIC_PICS}</th></tr>
  				<!-- BEGIN no_pics -->
--- 124,128 ----
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="0" cellpadding="0">
  				<tr><th class="thTop" height="25" colspan="{S_COLS}" nowrap="nowrap">{L_RECENT_PUBLIC_PICS}</th></tr>
  				<!-- BEGIN no_pics -->
***************
*** 169,173 ****
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="1" cellpadding="2">
  				<tr><th height="25" colspan="{S_COLS}" nowrap="nowrap">{L_HI_RATINGS}</th></tr>
  				<!-- BEGIN no_pics -->
--- 169,173 ----
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="0" cellpadding="0">
  				<tr><th height="25" colspan="{S_COLS}" nowrap="nowrap">{L_HI_RATINGS}</th></tr>
  				<!-- BEGIN no_pics -->
***************
*** 216,220 ****
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="1" cellpadding="2">
  				<tr><th class="thTop" height="25" colspan="{S_COLS}" nowrap="nowrap">{L_MOST_VIEWED}</th></tr>
  				<!-- BEGIN no_pics -->
--- 216,220 ----
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="0" cellpadding="0">
  				<tr><th class="thTop" height="25" colspan="{S_COLS}" nowrap="nowrap">{L_MOST_VIEWED}</th></tr>
  				<!-- BEGIN no_pics -->
***************
*** 261,265 ****
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="1" cellpadding="2">
  				<tr><th class="thTop" height="25" colspan="{S_COLS}" nowrap="nowrap">{L_RAND_PICS}</th></tr>
  				<!-- BEGIN no_pics -->
--- 261,265 ----
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="0" cellpadding="0">
  				<tr><th class="thTop" height="25" colspan="{S_COLS}" nowrap="nowrap">{L_RAND_PICS}</th></tr>
  				<!-- BEGIN no_pics -->
***************
*** 305,309 ****
  <!-- BEGIN switch_user_logged_out -->
  <form method="post" action="{S_LOGIN_ACTION}">
! 	<table class="forumline" width="98%" align="center" cellspacing="1" cellpadding="2">
  		<tr>
  			<td class="catHead" height="28"><a name="login"></a><span class="cattitle">{L_LOGIN_LOGOUT}&nbsp;</span></td>
--- 305,309 ----
  <!-- BEGIN switch_user_logged_out -->
  <form method="post" action="{S_LOGIN_ACTION}">
! 	<table class="forumline" width="98%" align="center" cellspacing="0" cellpadding="0">
  		<tr>
  			<td class="catHead" height="28"><a name="login"></a><span class="cattitle">{L_LOGIN_LOGOUT}&nbsp;</span></td>

Index: album_comment_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/templates/_core/album_comment_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_comment_body.tpl	29 Aug 2008 05:58:24 -0000	1.2
--- album_comment_body.tpl	29 Aug 2008 10:31:40 -0000	1.3
***************
*** 5,9 ****
  
  		<form action="{S_ALBUM_ACTION}" method="post">
! 		<table class="forumline" width="100%" align="center" cellspacing="1" cellpadding="2" border="0">
  		  <tr>
  		   <td class="row2 bg2 nav"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a class="nav" href="{U_ALBUM}">{L_ALBUM_INDEX}</a> -> <a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a></span></td>
--- 5,9 ----
  
  		<form action="{S_ALBUM_ACTION}" method="post">
! 		<table class="forumline" width="100%" align="center" cellspacing="0" cellpadding="0" border="0">
  		  <tr>
  		   <td class="row2 bg2 nav"><span class="nav"><a href="{U_INDEX}" class="nav">{L_INDEX}</a> -> <a class="nav" href="{U_ALBUM}">{L_ALBUM_INDEX}</a> -> <a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a></span></td>
***************
*** 41,45 ****
  	<div class="textbody">
  
! 			<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
  			  <tr>
  				<th class="thTop" height="25" colspan="2">{PIC_TITLE}</th>
--- 41,45 ----
  	<div class="textbody">
  
! 			<table width="100%" cellpadding="3" cellspacing="0" border="0" class="forumline">
  			  <tr>
  				<th class="thTop" height="25" colspan="2">{PIC_TITLE}</th>
***************
*** 137,141 ****
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! <table width="100%" cellspacing="2" border="0" cellpadding="2">
    <tr>
  	<td class="catBottom" align="center" height="28" colspan="2"><span class="gensmall">{L_ORDER}:</span>
--- 137,141 ----
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! <table width="100%" cellspacing="2" border="0" cellpadding="0">
    <tr>
  	<td class="catBottom" align="center" height="28" colspan="2"><span class="gensmall">{L_ORDER}:</span>
***************
*** 146,150 ****
  
  <!-- BEGIN switch_comment -->
! <table width="100%" cellspacing="2" border="0" cellpadding="2">
    <tr>
  	<td width="100%"><span class="nav">{PAGE_NUMBER}</span></td>
--- 146,150 ----
  
  <!-- BEGIN switch_comment -->
! <table width="100%" cellspacing="2" border="0" cellpadding="0">
    <tr>
  	<td width="100%"><span class="nav">{PAGE_NUMBER}</span></td>
***************
*** 217,221 ****
  		<div class="textbody">
  			<form name="commentform" action="{S_ALBUM_ACTION}" method="post" onsubmit="return checkForm();">
! 			<table width="100%" cellpadding="3" cellspacing="1" border="0" class="forumline">
  			  <tr>
  				<th class="thTop" height="25" colspan="3">{L_POST_YOUR_COMMENT}</th>
--- 217,221 ----
  		<div class="textbody">
  			<form name="commentform" action="{S_ALBUM_ACTION}" method="post" onsubmit="return checkForm();">
! 			<table width="100%" cellpadding="3" cellspacing="0" border="0" class="forumline">
  			  <tr>
  				<th class="thTop" height="25" colspan="3">{L_POST_YOUR_COMMENT}</th>

Index: album_upload_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/templates/_core/album_upload_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_upload_body.tpl	29 Aug 2008 05:58:25 -0000	1.2
--- album_upload_body.tpl	29 Aug 2008 10:31:43 -0000	1.3
***************
*** 226,266 ****
  <div class="forabg block">
  	<div id="p1" class="post bg2 online">
! 		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
- 			<form name="upload" action="{S_ALBUM_ACTION}" method="post" enctype="multipart/form-data" onSubmit="{S_ON_SUBMIT}">
- 			<table width="98%" align="center" cellspacing="1" cellpadding="2" border="0">
- 				<tr>
- 					<td class="nav" width="100%">
- 						<span class="nav">
- 							<a href="{U_INDEX}" class="nav">{L_INDEX}</a>{NAV_SEP}
- 							<a class="nav" href="{U_ALBUM}">{L_ALBUM}</a>
- 							{NAV_SEP}
- 							<a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a>
- 						</span>
- 					</td>
- 				</tr>
- 			</table>
  
! 			<table class="forumline" width="98%" align="center" cellspacing="1" cellpadding="2">
! 				<tr><th class="thTop" height="25" colspan="2"><h3>{L_UPLOAD_PIC}</h3></th></tr>
! 				<fieldset>
  			<!-- BEGIN switch_user_logged_out -->
! 				<tr>
  					<td class="row1" width="30%" height="28"><span class="gen">{L_USERNAME}:</span></td>
  					<td class="row2"><input class="inputbox autowidth" type="text" name="pic_username" size="32" maxlength="32" /></td>
! 				</tr>
  			<!-- END switch_user_logged_out -->
! 				<tr>
  					<td class="row1" height="28"><span class="gen">{L_PIC_TITLE}:</span></td>
  					<td class="row2"><input class="inputbox autowidth" type="text" name="pic_title" size="60" /></td>
! 				</tr>
! 				<tr>
  					<td class="row1" valign="top" height="28"><span class="gen">{L_PIC_DESC}:<br />
  					</span><span class="genmed">{L_PLAIN_TEXT_ONLY}<br />{L_MAX_LENGTH}: <b>{S_PIC_DESC_MAX_LENGTH}</b></span></td>
  					<td class="row2"><textarea class="inputbox autowidth"" cols="60" rows="4" name="pic_desc" size="60"></textarea></td>
! 				</tr>
  				<!-- BEGIN switch_nuffload_enabled -->
! 				<tr>
! 				<td class="row1 bg1">
  				<div>
  					<dl>
--- 226,281 ----
  <div class="forabg block">
  	<div id="p1" class="post bg2 online">
! 		<div class="inner"><span class="corners-top"><span></span></span>	
  		<div class="textbody">
  
! 		<table class="forumline" width="100%" align="center" cellspacing="0" cellpadding="0">		
! 		<tr>
! 			<td class="nav row1 bg1" width="100%">
! 				<span class="nav">
! 					<a href="{U_INDEX}" class="nav">{L_INDEX}</a>{NAV_SEP}
! 					<a class="nav" href="{U_ALBUM}">{L_ALBUM}</a>
! 					{NAV_SEP}
! 					<a class="nav" href="{U_VIEW_CAT}">{CAT_TITLE}</a>
! 				</span>
! 			</td>
! 			<td class="nav row1 bg1" width="100%"></td>
! 		</tr>
! 		</table>
! 	</div></div>
! 	</div>
! 	<span class="corners-bottom"><span></span></span>
! </div>
! <br /><br clear="all" />
! 		
! <div class="forabg block">
! 	<div class="inner"><span class="corners-top"><span></span></span>
! 	<ul class="topiclist">
! 		<li class="header"></li>
! 	</ul>
! 	<div id="p1" class="post bg2 online">	
! 	<div class="textbody">
! 		<form name="upload" action="{S_ALBUM_ACTION}" method="post" enctype="multipart/form-data" onSubmit="{S_ON_SUBMIT}">		
! 		<table class="forumline" width="100%" align="center" cellspacing="0" cellpadding="0">		
! 		<tr>
! 		<th class="thTop" height="25" colspan="2"><h3>{L_UPLOAD_PIC}</h3></th></tr>
! 		<fieldset>
  			<!-- BEGIN switch_user_logged_out -->
! 		<tr>
  					<td class="row1" width="30%" height="28"><span class="gen">{L_USERNAME}:</span></td>
  					<td class="row2"><input class="inputbox autowidth" type="text" name="pic_username" size="32" maxlength="32" /></td>
! 		</tr>
  			<!-- END switch_user_logged_out -->
! 		<tr>
  					<td class="row1" height="28"><span class="gen">{L_PIC_TITLE}:</span></td>
  					<td class="row2"><input class="inputbox autowidth" type="text" name="pic_title" size="60" /></td>
! 		</tr>
! 		<tr>
  					<td class="row1" valign="top" height="28"><span class="gen">{L_PIC_DESC}:<br />
  					</span><span class="genmed">{L_PLAIN_TEXT_ONLY}<br />{L_MAX_LENGTH}: <b>{S_PIC_DESC_MAX_LENGTH}</b></span></td>
  					<td class="row2"><textarea class="inputbox autowidth"" cols="60" rows="4" name="pic_desc" size="60"></textarea></td>
! 		</tr>
  				<!-- BEGIN switch_nuffload_enabled -->
! 		<tr>
! 			<td class="row1 bg1">
  				<div>
  					<dl>
***************
*** 276,288 ****
  					</dl>
  				</div>	
! 				</td>
! 				<td class="row2 bg3" id="parah">
  				<div id="parah"><input class="inputbox autowidth" type="file" name="pic_file" size="52" /></div>
! 				</td>
! 				</tr>
  				<!-- END switch_nuffload_enabled -->
  				<!-- BEGIN switch_nuffload_disabled -->
! 				<tr>
! 					<td class="row1 bg1" valign="top"></div><label for="file">{L_UPLOAD_PIC_FROM_MACHINE}:</label></div></td>
  					<td class="row2 bg3">
  						<div>
--- 291,303 ----
  					</dl>
  				</div>	
! 			</td>
! 			<td class="row2 bg3" id="parah">
  				<div id="parah"><input class="inputbox autowidth" type="file" name="pic_file" size="52" /></div>
! 			</td>
! 		</tr>
  				<!-- END switch_nuffload_enabled -->
  				<!-- BEGIN switch_nuffload_disabled -->
! 		<tr>
! 					<td class="row1 bg1" valign="top"><div><label for="file">{L_UPLOAD_PIC_FROM_MACHINE}:</label></div></td>
  					<td class="row2 bg3">
  						<div>
***************
*** 294,306 ****
  									<br /><br /><br /><br /><br />
  									<br /><br /><br /><br /><br />
! 									<br /><br /><br /><br /><br />		
  								</dd>						
  							</dl>
  						</div>			
  					</td>
! 				</tr>
  				<!-- END switch_nuffload_disabled -->
  				<!-- BEGIN switch_manual_thumbnail -->
! 				<tr>
  					<td class="row1" valign="top"><span class="gen">{L_UPLOAD_THUMBNAIL}:</span></td>
  					<!-- BEGIN switch_nuffload_enabled -->
--- 309,323 ----
  									<br /><br /><br /><br /><br />
  									<br /><br /><br /><br /><br />
! 									<br /><br /><br /><br /><br />
! 									<br /><br /><br /><br /><br />
! 									<br /><br /><br /><br /><br />								
  								</dd>						
  							</dl>
  						</div>			
  					</td>
! 		</tr>
  				<!-- END switch_nuffload_disabled -->
  				<!-- BEGIN switch_manual_thumbnail -->
! 		<tr>
  					<td class="row1" valign="top"><span class="gen">{L_UPLOAD_THUMBNAIL}:</span></td>
  					<!-- BEGIN switch_nuffload_enabled -->
***************
*** 310,322 ****
  					<td class="row2"><div id="file_thumb_browse" style="position:relative;"></div></td>
  					<!-- END switch_nuffload_disabled -->
! 				</tr>
! 				<tr>
  					<td class="row1" height="28"><span class="gen">{L_THUMBNAIL_SIZE}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_THUMBNAIL_SIZE}</b></span></td>
! 				</tr>
  				<!-- END switch_manual_thumbnail -->
  				<!-- BEGIN switch_nuffload_disabled -->
  				<!-- BEGIN switch_rotation -->
! 				<tr>
  					<td height="28" class="row1"><span class="gen">{L_ROTATION}:</span></td>
  					<td class="row2"><input type="radio" name="rotation" value="0" checked="checked">
--- 327,339 ----
  					<td class="row2"><div id="file_thumb_browse" style="position:relative;"></div></td>
  					<!-- END switch_nuffload_disabled -->
! 		</tr>
! 		<tr>
  					<td class="row1" height="28"><span class="gen">{L_THUMBNAIL_SIZE}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_THUMBNAIL_SIZE}</b></span></td>
! 		</tr>
  				<!-- END switch_manual_thumbnail -->
  				<!-- BEGIN switch_nuffload_disabled -->
  				<!-- BEGIN switch_rotation -->
! 		<tr>
  					<td height="28" class="row1"><span class="gen">{L_ROTATION}:</span></td>
  					<td class="row2"><input type="radio" name="rotation" value="0" checked="checked">
***************
*** 329,373 ****
  						<input type="radio" name="rotation" value="270"><span class="gen">270</span>
  					</td>
! 				</tr>
  				<!-- END switch_rotation -->
  				<!-- END switch_nuffload_disabled -->
! 				<tr>
  					<td height="28" class="row1"><span class="gen">{L_UPLOAD_TO_CATEGORY}:</span></td>
  					<td class="row2">{SELECT_CAT}</td>
! 				</tr>
  				<!-- BEGIN switch_nuffload_disabled -->
! 				<tr>
  					<td class="row1" height="28"><span class="gen">{L_MAX_FILESIZE}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_MAX_FILESIZE}</b></span></td>
! 				</tr>
! 				<tr>
  					<td class="row1" height="28"><span class="gen">{L_MAX_WIDTH}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_MAX_WIDTH}</b></span></td>
! 				</tr>
! 				<tr>
  					<td class="row1" height="28"><span class="gen">{L_MAX_HEIGHT}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_MAX_HEIGHT}</b></span></td>
! 				</tr>
  				<!-- END switch_nuffload_disabled -->
! 				<tr>
  					<td class="row1" height="28"><span class="gen">{L_ALLOWED_JPG}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_JPG}</b></span></td>
! 				</tr>
! 				<tr>
  					<td class="row1" height="28"><span class="gen">{L_ALLOWED_PNG}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_PNG}</b></span></td>
! 				</tr>
! 				<tr>
  					<td class="row1" height="28"><span class="gen">{L_ALLOWED_GIF}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_GIF}</b></span></td>
! 				</tr>
  				<!-- BEGIN switch_nuffload_enabled -->
! 				<tr>
  					<td class="row1" height="28"><span class="gen">{L_ALLOWED_ZIP}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_ZIP}</b></span></td>
! 				</tr>
  				<!-- END switch_nuffload_enabled -->
! 				</fieldset>
! 				<tr>
  					<td class="catBottom" align="center" height="28" colspan="2">
  						<!-- BEGIN switch_nuffload_enabled -->
--- 346,390 ----
  						<input type="radio" name="rotation" value="270"><span class="gen">270</span>
  					</td>
! 		</tr>
  				<!-- END switch_rotation -->
  				<!-- END switch_nuffload_disabled -->
! 		<tr>
  					<td height="28" class="row1"><span class="gen">{L_UPLOAD_TO_CATEGORY}:</span></td>
  					<td class="row2">{SELECT_CAT}</td>
! 		</tr>
  				<!-- BEGIN switch_nuffload_disabled -->
! 		<tr>
  					<td class="row1" height="28"><span class="gen">{L_MAX_FILESIZE}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_MAX_FILESIZE}</b></span></td>
! 		</tr>
! 		<tr>
  					<td class="row1" height="28"><span class="gen">{L_MAX_WIDTH}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_MAX_WIDTH}</b></span></td>
! 		</tr>
! 		<tr>
  					<td class="row1" height="28"><span class="gen">{L_MAX_HEIGHT}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_MAX_HEIGHT}</b></span></td>
! 		</tr>
  				<!-- END switch_nuffload_disabled -->
! 		<tr>
  					<td class="row1" height="28"><span class="gen">{L_ALLOWED_JPG}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_JPG}</b></span></td>
! 		</tr>
! 		<tr>
  					<td class="row1" height="28"><span class="gen">{L_ALLOWED_PNG}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_PNG}</b></span></td>
! 		</tr>
! 		<tr>
  					<td class="row1" height="28"><span class="gen">{L_ALLOWED_GIF}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_GIF}</b></span></td>
! 		</tr>
  				<!-- BEGIN switch_nuffload_enabled -->
! 		<tr>
  					<td class="row1" height="28"><span class="gen">{L_ALLOWED_ZIP}:</span></td>
  					<td class="row2"><span class="gen"><b>{S_ZIP}</b></span></td>
! 		</tr>
  				<!-- END switch_nuffload_enabled -->
! 		</fieldset>
! 		<tr>
  					<td class="catBottom" align="center" height="28" colspan="2">
  						<!-- BEGIN switch_nuffload_enabled -->
***************
*** 380,388 ****
  						<!-- END switch_nuffload_disabled -->
  					</td>
! 				</tr>
! 			</table>
! 			<script language="JavaScript" type="text/javascript">InitForm();</script>
! 			</form>
! 		</div></div>
  	</div>
  	<span class="corners-bottom"><span></span></span>
--- 397,404 ----
  						<!-- END switch_nuffload_disabled -->
  					</td>
! 		</tr>
! 		<script language="JavaScript" type="text/javascript">InitForm();</script>
! 		</table></form>
! 	</div></div>
  	</div>
  	<span class="corners-bottom"><span></span></span>

Index: album_cat_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/templates/_core/album_cat_body.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_cat_body.tpl	29 Aug 2008 05:58:24 -0000	1.2
--- album_cat_body.tpl	29 Aug 2008 10:31:39 -0000	1.3
***************
*** 4,8 ****
  		<div class="textbody">
  
! 		<table class="forumline" width="100%" align="center" cellspacing="1" cellpadding="2" border="0">
  			<tr>
  				<td class="row2 bg2 nav">
--- 4,8 ----
  		<div class="textbody">
  
! 		<table class="forumline" width="100%" align="center" cellspacing="0" cellpadding="0" border="0">
  			<tr>
  				<td class="row2 bg2 nav">
***************
*** 38,42 ****
  
  <div class="textbody">	
! 	<table width="100%" align="center" cellspacing="1" cellpadding="2" border="0">
  		<tr>
  			<td class="nav" align="left">
--- 38,42 ----
  
  <div class="textbody">	
! 	<table width="100%" align="center" cellspacing="0" cellpadding="0" border="0">
  		<tr>
  			<td class="nav" align="left">
***************
*** 77,81 ****
  	<div id="p1" class="post bg2 online">	
  	<div class="textbody">
! 	<table width="100%" cellspacing="2" border="0" cellpadding="2">
  	<!--
  	  <tr>
--- 77,81 ----
  	<div id="p1" class="post bg2 online">	
  	<div class="textbody">
! 	<table width="100%" cellspacing="0" border="0" cellpadding="0">
  	<!--
  	  <tr>
***************
*** 91,95 ****
  	</table>
  	<!-- BEGIN index_pics_block -->
! 	<table class="forumline" width="98%" align="center" cellspacing="1" cellpadding="2">
  		<tr>
  			<th class="thTop" height="25" align="center" colspan="{S_COLS}" nowrap="nowrap">
--- 91,95 ----
  	</table>
  	<!-- BEGIN index_pics_block -->
! 	<table class="forumline" width="98%" align="center" cellspacing="0" cellpadding="0">
  		<tr>
  			<th class="thTop" height="25" align="center" colspan="{S_COLS}" nowrap="nowrap">
***************
*** 189,193 ****
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="1" cellpadding="2">
  				<tr><td class="catLeft" colspan="2" height="28"><span class="cattitle">{recent_comments_block.L_LAST_COMMENT_INFO}</span></td></tr>
  				<tr>
--- 189,193 ----
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="0" cellpadding="0">
  				<tr><td class="catLeft" colspan="2" height="28"><span class="cattitle">{recent_comments_block.L_LAST_COMMENT_INFO}</span></td></tr>
  				<tr>
***************
*** 230,234 ****
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="1" cellpadding="2">
  				<tr><th class="thTop" height="25" colspan="{S_COLS}" nowrap="nowrap">{L_RECENT_PUBLIC_PICS}</th></tr>
  				<!-- BEGIN no_pics -->
--- 230,234 ----
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="0" cellpadding="0">
  				<tr><th class="thTop" height="25" colspan="{S_COLS}" nowrap="nowrap">{L_RECENT_PUBLIC_PICS}</th></tr>
  				<!-- BEGIN no_pics -->
***************
*** 275,279 ****
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="1" cellpadding="2">
  				<tr><th class="thTop" height="25" colspan="{S_COLS}" nowrap="nowrap">{L_MOST_VIEWED}</th></tr>
  				<!-- BEGIN no_pics -->
--- 275,279 ----
  		<div class="inner"><span class="corners-top"><span></span></span>
  		<div class="textbody">
! 			<table class="forumline" width="98%" align="center" cellspacing="0" cellpadding="0">
  				<tr><th class="thTop" height="25" colspan="{S_COLS}" nowrap="nowrap">{L_MOST_VIEWED}</th></tr>
  				<!-- BEGIN no_pics -->
***************
*** 315,319 ****
  <!-- END mostviewed_pics_block -->
  
! <table width="98%" align="center" cellspacing="1" cellpadding="2" border="0">
  	<tr>
  		<td class="nav" width="100%">
--- 315,319 ----
  <!-- END mostviewed_pics_block -->
  
! <table width="98%" align="center" cellspacing="0" cellpadding="0" border="0">
  	<tr>
  		<td class="nav" width="100%">

[mxbb-commits] mx_smartor/docs album_mod_fap.sql, NONE, 1.1 album_mod_fap.xml, NONE, 1.1 modx.subsilver.en.xsl, NONE, 1.1

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

Update of /cvsroot/mxbb/mx_smartor/docs
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6379

Added Files:
	album_mod_fap.sql album_mod_fap.xml modx.subsilver.en.xsl 
Log Message:
mod stuff

--- NEW FILE: modx.subsilver.en.xsl ---
<?xml version="1.0" encoding="UTF-8" ?>
<!-- MODX by the phpBB MOD Team XSL file v1.0 copyright 2005-2006 the phpBB MOD Team. 
	$Id: modx.subsilver.en.xsl,v 1.1 2008/08/29 09:31:25 orynider Exp $ -->
<!DOCTYPE xsl:stylesheet[
	<!ENTITY nbsp "&#160;">
]>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0" xmlns:mod="http://www.phpbb.com/mods/xml/modx-1.0.xsd">
	<xsl:output method="html" omit-xml-declaration="no" indent="yes" />
<xsl:variable name="title" select="mod:mod/mod:header/mod:title" />
<xsl:variable name="version">
<xsl:for-each select="mod:mod/mod:header/mod:mod-version">
	<xsl:call-template name="give-version">
		</xsl:call-template>
	</xsl:for-each>
</xsl:variable>
	<xsl:template match="mod:mod">
		<html xmlns="http://www.w3.org/1999/xhtml">
			<head>
				<meta http-equiv="Content-Language" content="en-GB" />
				<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
				<style>

/* Style for a "Recommendation" */

/*
   Copyright 1997-2003 W3C (MIT, ERCIM, Keio). All Rights Reserved.
   The following software licensing rules apply:
   http://www.w3.org/Consortium/Legal/copyright-software */

/* $Id: modx.subsilver.en.xsl,v 1.1 2008/08/29 09:31:25 orynider Exp $ */

/* Updated by Jon Stanley for use in phpBB XML MOD */

/* Updated by David Smith to look subSilvery for phpBB */

html, body {
  font-family: Verdana, Arial, Helvetica, sans-serif;
  color: black;
  background: #E5E5E5;
  background-position: top left;
  background-attachment: fixed;
  background-repeat: no-repeat;
  }
:link { color : #006699; background: transparent }
:visited { color : #006699; background: transparent }
a:active { color : #006699; background: transparent }
a:hover { text-decoration: underline; color : #DD6900; }

a:link img, a:visited img { border-style: none } /* no border on img links */

a img { color: white; }        /* trick to hide the border in Netscape 4 */
@media all {                   /* hide the next rule from Netscape 4 */
  a img { color: inherit; }    /* undo the color change above */
}

th, td { /* ns 4 */
  font-family: sans-serif;
}

h1, h2, h3, h4, h5, h6 { text-align: left }
/* background should be transparent, but WebTV has a bug */
h1, h2, h3 { color: #006699 }
h1 { font: 170% sans-serif }
h2 { font: 140% sans-serif }
h3 { font: 120% sans-serif }
h4 { font: bold 100% sans-serif }
h5 { font: italic 100% sans-serif }
h6 { font: small-caps 100% sans-serif }

.hide { display: none }

div.head { margin-bottom: 1em }
div.head h1 { margin-top: 2em; clear: both }
div.head table { margin-left: 2em; margin-top: 2em }

p.copyright { font-size: small }
p.copyright small { font-size: small }

@media screen {  /* hide from IE3 */
a[href]:hover { background: #ffa }
}

pre { margin-left: 2em }
/*
p {
  margin-top: 0.6em;
  margin-bottom: 0.6em;
}
*/
dt, dd { margin-top: 0; margin-bottom: 0 } /* opera 3.50 */
dt { font-weight: bold }

pre, code { font-family: monospace } /* navigator 4 requires this */

ul.toc {
  list-style: disc;		/* Mac NS has problem with 'none' */
  list-style: none;
}

@media aural {  
  h1, h2, h3 { stress: 20; richness: 90 }
  .hide { speak: none }
  p.copyright { volume: x-soft; speech-rate: x-fast }
  dt { pause-before: 20% }
  pre { speak-punctuation: code } 
}

/* Additional styles */

div.editFile {border: 2px solid #333333; margin: 0em 0em 2em; padding: 1em 1em; background: #D1D7DC;}
div.editFile h2 { font-size: 170%; margin: 0.4em 0em; }
div.action { border: 2px solid #DD6900; padding: 1em; background: #DEE3E7; margin: 1em 0em; }
div.action p { font-weight: normal; margin-top: 0px; margin-bottom: 0px; font-size: 0.8em; }
div.action h3 { margin-top: 0px; margin-bottom: 0px; }
div.action pre { padding: 0.2em; background: #EFEFEF; border: 2px solid #006699; overflow: scroll; width: 95%; }
div.editFile pre { padding: 0.2em; background: #EFEFEF; border: 2px solid #006699; overflow: scroll; width: 95%; }

#pageBody { background-color: #FFFFFF; border: 1px #98AAB1 solid; padding: 1em 1em;}

hr	{ height: 0px; border: solid #D1D7DC 0px; border-top-width: 1px;}

strong.red { color: red; }

</style>

<script type="text/javascript"><![CDATA[<!--]]>
var i = 0;
var box = new Array();
<xsl:for-each select="mod:action-group/mod:open/mod:edit">
	<xsl:for-each select="mod:find|mod:action">
		box[i] = '<xsl:value-of select="generate-id()"/>';
		i += 1;
	</xsl:for-each>
	<xsl:for-each select="mod:inline-edit">
		<xsl:for-each select="mod:inline-find|mod:inline-action">
			box[i] = '<xsl:value-of select="generate-id()"/>';
			i += 1;
		</xsl:for-each>
	</xsl:for-each>
</xsl:for-each>

<![CDATA[
var selectedElement = -1;
var boxes = box.length;
var pre_count = 0;

// The following line from http://www.ryancooper.com/resources/keycode.asp
document.onkeydown = mod_doKeyPress;

function SXBB_IsIEMac()
{
	// Any better way to detect IEMac?
	var ua = String(navigator.userAgent).toLowerCase();
	if( document.all && ua.indexOf("mac") >= 0 )
	{
		return true;
	}
	return false;
}

function select_text(id)
{
	var o = document.getElementById(id);
	if( !o )
	{
		return;
	}
	var r, s;
	if( document.selection && !SXBB_IsIEMac() )
	{
		// Works on: IE5+
		// To be confirmed: IE4? / IEMac fails?
		r = document.body.createTextRange();
		r.moveToElementText(o);
		r.select();
	}
	else if( document.createRange && (document.getSelection || window.getSelection) )
	{
		// Works on: Netscape/Mozilla/Konqueror/Safari
		// To be confirmed: Konqueror/Safari use window.getSelection ?
		r = document.createRange();
		r.selectNodeContents(o);
		s = window.getSelection ? window.getSelection() : document.getSelection();
		s.removeAllRanges();
		s.addRange(r);
	}

	find_selected(id);
	return o;
}

function find_selected(id)
{
	for( x = 0; x < box.length; x++ )
	{
		if ( box[x] == id )
		{
			selectedElement = x;
		}
	}
}

// function findPosY taken from http://www.quirksmode.org/js/findpos.html
function findPosY(obj)
{
	var curtop = 0;
	if (obj.offsetParent)
	{
		while (obj.offsetParent)
		{
			curtop += obj.offsetTop
			obj = obj.offsetParent;
		}
	}
	else if (obj.y)
	{
		curtop += obj.y;
	}
	return curtop;
}

function selectNextBox()
{
	selectedElement += 1;
	if (selectedElement >= boxes) selectedElement = 0;
	obj = select_text(box[selectedElement]);
	window.scrollTo(0, findPosY(obj) - 100);
}

function selectPrevBox()
{
	selectedElement -= 1;
	if (selectedElement < 0) selectedElement = boxes - 1;
	obj = select_text(box[selectedElement]);
	window.scrollTo(0, findPosY(obj) - 100);
}

function selectFirstBox()
{
	selectedElement = 0;
	obj = select_text(box[selectedElement]);
	window.scrollTo(0, findPosY(obj) - 100);
}

function mod_doKeyPress(e)
{
	/* section from w3 schools starts here http://www.w3schools.com/jsref/jsref_onkeypress.asp */
	var keynum;
	/* section from w3 schools ends here */

	// The following line from http://www.ryancooper.com/resources/keycode.asp
	if (window.event) keynum = window.event.keyCode;
	else if (e) keynum = e.which;

	if (keynum == 84) selectNextBox();
	//if (keynum == 9) selectNextBox(); //tab
	//if (keynum == 13) selectNextBox(); //enter/return
	//if (keynum == 32) selectNextBox(); //space
	if (keynum == 40) selectNextBox(); //down key
	if (keynum == 38) selectPrevBox(); //up key
	if (keynum == 83 || keynum == 37)
	{
		selectFirstBox();
	}
	return false;
}
//-->]]></script>
				<title>phpBB MOD &#187; <xsl:value-of select="$title" /></title>
			</head>
			<body>
				<div id="pageBody">
					<div id="modInfo">
						<xsl:for-each select="mod:header">
							<xsl:call-template name="give-header"></xsl:call-template>
						</xsl:for-each>
						<div id="modInstructions">
							<xsl:for-each select="mod:action-group">
								<xsl:call-template name="give-actions"></xsl:call-template>
							</xsl:for-each>
						</div>
						<hr />
						<div class="endMOD">
							<h1>Save all files. End of MOD.</h1>
							<p>You have finished the installation for this MOD. Upload all changed files to your website. If the installation went bad, simply restore your backed up files.</p>
						</div>
					</div>
				</div>
				<p class="copyright" style="text-align: center; font-size: 10px;">MOD UA XSLT File Copyright &#169; 2006 The phpBB Group, this MOD is copyright to the author<xsl:if test="count(author) > 1">s</xsl:if> listed above.</p>
			</body>
		</html>
	</xsl:template>
	<xsl:template name="give-header">
		<h1>Installation instructions for '<xsl:value-of select="$title" />' Version <xsl:value-of select="$version" /></h1>
		<h2>About this MOD</h2>
		<dl>
			<dt>Title:</dt>
			<dd>
				<xsl:if test="count(mod:title) > 1">
					<dl id="title">
						<xsl:for-each select="mod:title">
							<dl id="{generate-id()}">
								<dt>
									<xsl:value-of select="@lang" />
								</dt>
								<dd style='white-space:pre;'>
									<xsl:value-of select="current()" />
								</dd>
							</dl>
						</xsl:for-each>
					</dl>
				</xsl:if>
				<xsl:if test="count(mod:title) = 1">
					<xsl:value-of select="mod:title" />
				</xsl:if>
			</dd>
			<dt>Description:</dt>
			<dd>
				<xsl:if test="count(mod:description) > 1">
					<dl id="description">
						<xsl:for-each select="mod:description">
							<dl id="{generate-id()}">
								<dt>
									<xsl:value-of select="@lang" />
								</dt>
								<dd>
									<xsl:call-template name="add-line-breaks">
										<xsl:with-param name="string">
											<xsl:value-of select="current()" />
										</xsl:with-param>
									</xsl:call-template>
								</dd>
							</dl>
						</xsl:for-each>
					</dl>
				</xsl:if>
				<xsl:if test="count(mod:description) = 1">
					<xsl:call-template name="add-line-breaks">
						<xsl:with-param name="string">
							<xsl:value-of select="mod:description" />
						</xsl:with-param>
					</xsl:call-template>
				</xsl:if>
			</dd>
			<dt>Version:</dt>
			<dd>
				<xsl:for-each select="mod:mod-version">
					<xsl:call-template name="give-version"></xsl:call-template>
				</xsl:for-each>
			</dd>
			<xsl:for-each select="mod:installation">
				<xsl:call-template name="give-installation"></xsl:call-template>
			</xsl:for-each>
		</dl>
		<xsl:for-each select="mod:author-group">
			<h2>Author<xsl:if test="count(mod:author) > 1">s</xsl:if></h2>
			<xsl:call-template name="give-authors"></xsl:call-template>
		</xsl:for-each>
		<h2>Files To Edit</h2>
		<xsl:for-each select="../mod:action-group">
			<xsl:call-template name="give-files-to-edit"></xsl:call-template>
		</xsl:for-each>
		<h2>Included Files</h2>
		<xsl:if test="count(../mod:action-group/mod:copy/mod:file) = 0">
			<p>No files have been included with this MOD.</p>
		</xsl:if>
		<xsl:for-each select="../mod:action-group">
			<xsl:call-template name="give-files-included"></xsl:call-template>
		</xsl:for-each>
		<hr />
		<div id="modDisclaimer">
			<h1>Disclaimer</h1>
			<p>For Security Purposes, Please Check: <a href="http://www.phpbb.com/mods/">http://www.phpbb.com/mods/</a> for the latest version of this MOD. Downloading this MOD from other sites could cause malicious code to enter into your phpBB Forum. As such, phpBB will not offer support for MOD's not offered in our MOD-Database, located at: <a href="http://www.phpbb.com/mods/">http://www.phpbb.com/mods/</a></p>
			<h2>Author Notes</h2>
			<xsl:if test="count(mod:author-notes) > 1">
				<dl id="author-notes">
					<xsl:for-each select="mod:author-notes">
						<dl id="{generate-id()}">
							<dt>
								<xsl:value-of select="@lang" />
							</dt>
							<dd>
								<xsl:call-template name="add-line-breaks">
									<xsl:with-param name="string">
										<xsl:value-of select="current()" />
									</xsl:with-param>
								</xsl:call-template>
							</dd>
						</dl>
					</xsl:for-each>
				</dl>
			</xsl:if>
			<xsl:if test="count(mod:author-notes) = 1">
				<xsl:call-template name="add-line-breaks">
					<xsl:with-param name="string">
						<xsl:value-of select="mod:author-notes" />
					</xsl:with-param>
				</xsl:call-template>
			</xsl:if>
			<xsl:for-each select="mod:history">
				<xsl:call-template name="give-mod-history"></xsl:call-template>
			</xsl:for-each>
			<h3>License</h3>
			<p>This MOD has been licensed under the following license:</p>
			<p style='white-space:pre;'>
				<xsl:value-of select="mod:license" />
			</p>
			<h3>Other Notes</h3>
			<p>Before Adding This MOD To Your Forum, You Should Back Up All Files Related To This MOD</p>
			<p>This MOD was designed for phpBB<xsl:value-of select="mod:installation/mod:target-version/mod:target-primary" /> and may not function as stated on other phpBB versions. MODs for phpBB3.0 will <strong>not</strong> work on phpBB2.0 and vice versa.</p>
			<xsl:if test="./mod:mod-version/mod:minor mod 2 != 0 or ./mod:mod-version/mod:major = 0">
				<p>
					<strong class="red">This MOD is development quality. It is not recommended that you install it on a live forum.</strong>
				</p>
			</xsl:if>
		</div>
		<hr />
	</xsl:template>
	<xsl:template name="give-authors">
		<xsl:for-each select="mod:author">
			<xsl:call-template name="give-author"></xsl:call-template>
		</xsl:for-each>
	</xsl:template>
	<xsl:template name="give-author">
		<dl>
			<dt>Username:</dt>
			<dd>
				<a href="http://www.phpbb.com/phpBB/profile.php?mode=viewprofile&amp;un={mod:username}">
					<xsl:value-of select="mod:username" />
				</a>
			</dd>
			<xsl:if test="mod:email != 'N/A' and mod:email != 'n/a' and mod:email != ''">
				<dt>Email:</dt>
				<dd>
					<a href="mailto:{mod:email}">
						<xsl:value-of select="mod:email" />
					</a>
				</dd>
			</xsl:if>
			<dt>Realname:</dt>
			<dd>
				<xsl:value-of select="mod:realname" />
			</dd>
			<xsl:if test="mod:homepage != 'N/A' and mod:homepage != 'n/a' and mod:homepage!=''">
				<dt>WWW:</dt>
				<dd>
					<a href="{mod:homepage}">
						<xsl:value-of select="mod:homepage" />
					</a>
				</dd>
			</xsl:if>
		</dl>
		<br />
	</xsl:template>
	<xsl:template name="give-version"><xsl:value-of select="concat(mod:major, '.', mod:minor, '.', mod:revision, mod:release)" /></xsl:template>
	<xsl:template name="give-installation">
		<dt>Installation Level:</dt>
		<dd>
			<xsl:if test="mod:level='easy'">Easy</xsl:if>
			<xsl:if test="mod:level='intermediate'">Intermediate</xsl:if>
			<xsl:if test="mod:level='hard'">Hard</xsl:if>
		</dd>
		<dt>Installation Time:</dt>
		<dd>~<xsl:value-of select="floor(mod:time div 60)" /> minutes</dd>
	</xsl:template>
	<xsl:template name="give-mod-history">
		<xsl:if test="count(mod:entry)>1">
			<h2>MOD History</h2>
			<dl>
				<xsl:for-each select="mod:entry">
					<xsl:call-template name="give-history-entry"></xsl:call-template>
				</xsl:for-each>
			</dl>
		</xsl:if>
	</xsl:template>
	<xsl:template name="give-history-entry">
		<dt><xsl:value-of select="substring(mod:date,1,10)" /> - Version 
			<xsl:for-each select="mod:rev-version">
					<xsl:call-template name="give-version"></xsl:call-template>
				</xsl:for-each></dt>
		<dd>
			<xsl:if test="count(mod:changelog) > 1">
				<xsl:for-each select="mod:changelog">
					<xsl:call-template name="give-history-entry-changelog"></xsl:call-template>
				</xsl:for-each>
			</xsl:if>
			<xsl:if test="count(mod:changelog) = 1">
				<xsl:for-each select="mod:changelog">
					<xsl:call-template name="give-history-entry-changelog-single"></xsl:call-template>
				</xsl:for-each>
			</xsl:if>
		</dd>
	</xsl:template>
	<xsl:template name="give-history-entry-changelog">
		<dl>
			<dt>
				<xsl:value-of select="@lang" />
			</dt>
			<dd>
				<ul>
					<xsl:for-each select="mod:change">
						<li>
							<xsl:value-of select="current()" />
						</li>
					</xsl:for-each>
				</ul>
			</dd>
		</dl>
	</xsl:template>
	<xsl:template name="give-history-entry-changelog-single">
		<ul>
			<xsl:for-each select="mod:change">
				<li>
					<xsl:value-of select="current()" />
				</li>
			</xsl:for-each>
		</ul>
	</xsl:template>
	<xsl:template name="give-files-to-edit">
		<ul>
			<xsl:for-each select="mod:open">
				<xsl:call-template name="give-file"></xsl:call-template>
			</xsl:for-each>
		</ul>
	</xsl:template>
	<xsl:template name="give-files-included">
		<ul>
			<xsl:for-each select="mod:copy">
				<xsl:call-template name="give-file-copy"></xsl:call-template>
			</xsl:for-each>
		</ul>
	</xsl:template>
	<xsl:template name="give-file">
		<li>
			<xsl:value-of select="@src" />
			<xsl:if test="position()!=last()">,</xsl:if>
		</li>
	</xsl:template>
	<xsl:template name="give-file-copy">
		<xsl:for-each select="mod:file">
			<li>
				<xsl:value-of select="@from" />
				<xsl:if test="position()!=last()">,</xsl:if>
			</li>
		</xsl:for-each>
	</xsl:template>
	<xsl:template name="give-actions">
		<xsl:if test="count(mod:sql) > 0">
			<h1 onclick="select_text('sql');">SQL</h1>
		</xsl:if>
		<div id="sql">
		<xsl:for-each select="mod:sql">			
			<xsl:call-template name="give-sql"></xsl:call-template>			
		</xsl:for-each>
		</div>
		<xsl:if test="count(mod:copy) > 0">
			<h1>File Copy</h1>
		</xsl:if>
		<xsl:for-each select="mod:copy">
			<xsl:call-template name="give-filez"></xsl:call-template>
		</xsl:for-each>
		<h1>Edits</h1>
		<p>Click on the action name or in the code box to select the code.  You may also hit '<em>s</em>' on your keyboard to go to the first code box and the <em>up</em> and <em>down</em> arrows to scroll through the code boxes.</p>
		<xsl:for-each select="mod:open">
			<xsl:call-template name="give-fileo"></xsl:call-template>
		</xsl:for-each>
		<xsl:call-template name="give-manual"></xsl:call-template>
	</xsl:template>
	<xsl:template name="give-sql">
		<div class="action">
			<pre>
				<xsl:value-of select="current()" />
			</pre>
		</div>
	</xsl:template>
	<xsl:template name="give-manual">
		<xsl:for-each select="mod:diy-instructions">
			<div class="editFile">
				<h2 onClick="select_text('{generate-id()}')">DIY Instructions<xsl:if test="count(../mod:diy-instructions) > 1"> (<xsl:value-of select="@lang" />)</xsl:if></h2>
				<p>These are manual instructions that cannot be performed automatically. You should follow these instructions carefully.</p>
				<pre id="{generate-id()}">
					<xsl:value-of select="current()" />
				</pre>
			</div>
		</xsl:for-each>
	</xsl:template>
	<xsl:template name="give-fileo">
		<div class="editFile">
			<h2>Open: <xsl:value-of select="@src" /></h2>
			<xsl:for-each select="mod:edit">
				<div class="action">
					<xsl:for-each select="mod:find|mod:action|mod:inline-edit|mod:comment">
						<xsl:if test="name() = 'find'">
							<h3 onClick="select_text('{generate-id()}')">Find</h3>
							<p><strong>Tip:</strong> This may be a partial find and not the whole line.
<xsl:if test="@type = 'regex'">
									<br />
									<em>This find contains an advanced feature known as regular expressions, click here to learn more.</em>
								</xsl:if>
</p>
							<pre id="{generate-id()}">
								<xsl:value-of select="current()" />
							</pre>
						</xsl:if>
						<xsl:if test="name() = 'action'">
							<xsl:if test="@type = 'after-add'">
								<h3 onClick="select_text('{generate-id()}')">Add after</h3>
								<p><strong>Tip:</strong> Add these lines on a new blank line after the preceding line(s) to find.</p>
							</xsl:if>
							<xsl:if test="@type = 'before-add'">
								<h3 onClick="select_text('{generate-id()}')">Add before</h3>
								<p><strong>Tip:</strong> Add these lines on a new blank line before the preceding line(s) to find.</p>
							</xsl:if>
							<xsl:if test="@type = 'replace-with'">
								<h3 onClick="select_text('{generate-id()}')">Replace With</h3>
								<p><strong>Tip:</strong> Replace the preceding line(s) to find with the following lines.</p>
							</xsl:if>
							<xsl:if test="@type = 'operation'">
								<h3 onClick="select_text('{generate-id()}')">Increment</h3>
								<p><strong>Tip:</strong> This allows you to alter integers. For help on what each operator means, click here.</p>
							</xsl:if>
							<pre id="{generate-id()}">
								<xsl:value-of select="current()" />
							</pre>
						</xsl:if>
						<xsl:if test="name() = 'comment'">
							<dl>
								<dt>Comment:<xsl:if test="count(../mod:comment) > 1"> (<xsl:value-of select="@lang" />)</xsl:if></dt>
								<dd>
									<xsl:call-template name="add-line-breaks">
										<xsl:with-param name="string">
											<xsl:value-of select="current()" />
										</xsl:with-param>
									</xsl:call-template>
								</dd>
							</dl>
						</xsl:if>
						<xsl:if test="name() = 'inline-edit'">
							<div class="action">
								<xsl:for-each select="mod:inline-find|mod:inline-action|mod:inline-comment">
									<xsl:if test="name() = 'inline-find'">
										<h3 onClick="select_text('{generate-id()}')">In-line Find</h3>
										<p><strong>Tip:</strong> This is a partial match of a line for in-line operations.
<xsl:if test="@type = 'regex'">
												<br />
												<em>This find contains an advanced feature known as regular expressions, click here to learn more.</em>
											</xsl:if>
</p>
										<pre id="{generate-id()}">
											<xsl:value-of select="current()" />
										</pre>
									</xsl:if>
									<xsl:if test="name() = 'inline-action'">
										<xsl:if test="@type = 'after-add'">
											<h3 onClick="select_text('{generate-id()}')">In-line Add after</h3>
										</xsl:if>
										<xsl:if test="@type = 'before-add'">
											<h3 onClick="select_text('{generate-id()}')">In-line Add before</h3>
										</xsl:if>
										<xsl:if test="@type = 'replace-with'">
											<h3 onClick="select_text('{generate-id()}')">In-line Replace With</h3>
										</xsl:if>
										<xsl:if test="@type = 'operation'">
											<h3 onClick="select_text('{generate-id()}')">In-line Increment</h3>
											<p><strong>Tip:</strong> This allows you to alter integers. For help on what each operator means, click here.</p>
										</xsl:if>
										<pre id="{generate-id()}">
											<xsl:value-of select="current()" />
										</pre>
									</xsl:if>
									<xsl:if test="name() = 'inline-comment'">
										<p>
											<strong>Comment:</strong>
											<em>
												<xsl:value-of select="current()" />
											</em>
										</p>
									</xsl:if>
								</xsl:for-each>
							</div>
						</xsl:if>
					</xsl:for-each>
				</div>
			</xsl:for-each>
		</div>
	</xsl:template>
	<xsl:template name="give-filez">
		<dl>
			<xsl:for-each select="mod:file">
				<dt>Copy: <xsl:value-of select="@from" /></dt>
				<dd>To: <xsl:value-of select="@to" /></dd>
			</xsl:for-each>
		</dl>
	</xsl:template>
	<xsl:template name="give-sub-action-find">
		<p>Find</p>
		<pre>
			<xsl:value-of select="find-string" />
		</pre>
		<xsl:if test="count(in-line) > 0">
			<div class="action">
				<xsl:for-each select="in-line">
					<xsl:for-each select="find-in-line|edit-in-line">
						<xsl:if test="name() = 'find-in-line'">
							<xsl:call-template name="give-sub-action-in-line-find"></xsl:call-template>
						</xsl:if>
						<xsl:if test="name() = 'edit-in-line'">
							<xsl:call-template name="give-sub-action-in-line-edit"></xsl:call-template>
						</xsl:if>
					</xsl:for-each>
				</xsl:for-each>
			</div>
		</xsl:if>
	</xsl:template>
	<xsl:template name="give-sub-action-in-line-find">
		<p>In-line, Find</p>
		<pre>
			<xsl:value-of select="find-string-in-line" />
		</pre>
	</xsl:template>
	<xsl:template name="give-sub-action-edit">
		<xsl:if test="@action = 'replace'">
			<p>Replace, Add</p>
		</xsl:if>
		<xsl:if test="@action = 'add' and @where = 'after'">
			<p>After, Add</p>
		</xsl:if>
		<xsl:if test="@action = 'add' and @where = 'before'">
			<p>Before, Add</p>
		</xsl:if>
		<pre>
			<xsl:value-of select="current()" />
		</pre>
	</xsl:template>
	<xsl:template name="give-sub-action-in-line-edit">
		<xsl:if test="@action = 'replace'">
			<p>In-line, Replace With</p>
		</xsl:if>
		<xsl:if test="@action = 'add' and @where = 'after'">
			<p>In-line, After, Add</p>
		</xsl:if>
		<xsl:if test="@action = 'add' and @where = 'before'">
			<p>In-line, Before, Add</p>
		</xsl:if>
		<xsl:if test="@action = 'operation'">
			<p>In-line, perform the following mathematical operation</p>
			<xsl:variable name="oper_body" select="@operation" />
			<pre>
				<xsl:value-of select="$oper_body" />
			</pre>
		</xsl:if>
		<pre>
			<xsl:value-of select="current()" />
		</pre>
	</xsl:template>
	<!-- add-line-breaks borrowed from http://www.stylusstudio.com/xsllist/200103/post40180.html -->
	<xsl:template name="add-line-breaks">
		<xsl:param name="string" select="." />
		<xsl:choose>
			<xsl:when test="contains($string, '&#xA;')">
				<xsl:value-of select="substring-before($string, '&#xA;')" />
				<br />
				<xsl:call-template name="add-line-breaks">
					<xsl:with-param name="string" select="substring-after($string, '&#xA;')" />
				</xsl:call-template>
			</xsl:when>
			<xsl:otherwise>
				<xsl:value-of select="$string" />
			</xsl:otherwise>
		</xsl:choose>
	</xsl:template>
</xsl:stylesheet>
--- NEW FILE: album_mod_fap.xml ---
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<?xml-stylesheet type="text/xsl" href="modx.subsilver.en.xsl"?>
<!--For security purposes, please check: http://www.phpbb.com/mods/ for the latest version of this MOD. Although MODs are checked before being allowed in the MODs Database there is no guarantee that there are no security problems within the MOD. No support will be given for MODs not found within the MODs Database which can be found at http://www.phpbb.com/mods/-->
<mod xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.phpbb.com/mods/xml/modx-1.0.xsd">
  <header>
    <license>http://opensource.org/licenses/gpl-license.php GNU General Public License v2</license>
    <title lang="en-gb">Album Mod FAP</title>
    <description lang="en-gb"><![CDATA[
- This MOD adds a full Album system, based on several MODS.
- Some modifications on the original MODS have been applied.
- The MXP Addons are phpBB mods that share most files with Mx-Publisher and require MXP MOD.
Requirements:
A running phpBB 2.0.x (recommend the lastest version)
The mxBB Mod "include/" folder that can be found in this mod "contrib/" folder
The eXtreme Styles MOD is required for this mod to have all features enabled
HTTP File Upload Enabled (this MOD can work with PHP Safe-Mode in some cases)
MySQL 4.3.3+

Features:

On The Fly Gallery
=======================================
Folders with pictures may be uploaded into a folder called OTF into album_mod/uploads/
and thumbnails and categories (based on subfolder) will be automatically generated.
This feature support only one level of subfolder, so will be browsed for images only
all the folders into album_mod/uploads/otf/.
When logged as ADMIN pictures may be automatically imported in the album.


Picture SlideShow
=======================================
All pictures in each category can be shown in SlideShow mode by clicking the link near the cat name
or in the top right corner while browsing subcat.


Album Image BBCodes Parsing
=======================================
FAP includes its own BBCode parsing function for comments page.


=======================================
Some of the included MODS:
=======================================

Photo Album 2.0.54
=======================================
MOD Author: Smartor < sma...@ho... > (Hoang Ngoc Tu) http://smartor.is-root.com
MOD Desc:
This is a phpBB-based photo album/gallery management system.
It is really powerful, stable, efficient, rich features and highly customizable.
The version 2 was written from the scratch for more security, performance, etc.
It is not really a MOD/hack, it is rather a phpBB-based system :)


Supercharged Album Pack 1.5.1
=======================================
MOD Author: Volodymyr (CLowN) Skoryk
MOD Desc:
A series of modification for Album version 2 by Smartor ( http://smartor.is-root.com )


Album Category Hierarchy 1.3.0
=======================================
MOD Author: IdleVoid < idl...@sl... > (N/A) N/A
MOD Desc:
Adds category hierarchy functionality to the album


Album Multiple Uploads 1.0.3
=======================================
MOD Author: IdleVoid < idl...@sl... > (N/A) N/A
MOD Desc:
This mod allows people to upload more than one picture at a time.


Archive Mod
=======================================
MOD Author: chadsmith < N/A > (Chad Smith) N/A
MOD Desc:
Adds a link to download all the pics in a page as a single compressed zip
MOD Link: http://smartor.is-root.com/viewtopic.php?t=14096


Thumbnail Dimension Mod
=======================================
MOD Author: nuffmon < nu...@ho... > (Nuffmon)
MOD Desc:
Places a small black band at the bottom of thumbnails with dimensions and file size on
MOD Link: http://smartor.is-root.com/viewtopic.php?t=15198


Picture Rotation Mod
=======================================
MOD Author: nuffmon < nu...@ho... > (Nuffmon)
MOD Desc:
Rotate image on upload
MOD Link: http://smartor.is-root.com/viewtopic.php?t=11971


Album Nuffload
=======================================
MOD Author: nuffmon < nu...@ho... > (Nuffmon)
MOD Desc:
Features:
- Progress bar when uploading
- PHP upload limit bypass
- Doesn't use applets or activex
- Multiple file uploads
- Auto resizing (gif's included)
- Manual-uploaded thumbnail supported
MOD Link: http://smartor.is-root.com/viewtopic.php?t=15093


Nuffimage
=======================================
MOD Author: nuffmon < nu...@ho... > (Nuffmon)
MOD Desc:
It's a class for images editing.
Features:
- Sepia
- Grayscale
- Watermarking
- Resizing
MOD Link: N/A
=======================================
]]></description>
    <author-notes lang="en-gb">- Discussion at http://www.icyphoenix.com/viewforum.php?f=25

- Thanks to Smartor, CLowN and IdleVoid for giving me the opportunity
to create and distribuite their MODS in this Package.

Features - Picture SlideShow, Album, Image Archive Download, Nuffimage,
On The Fly Gallery, Multiple Uploads, Image Rotate/Resizing,
Folders Upload Via FTP, Java Uploading Applet for browsing files/folders,
Jaime Letering and many others.
- Feature have been integrated by Mighty Gorgon.
- MXP Integration by OryNider.</author-notes>
    <author-group>
      <author>
        <realname>Florin Bodin Ciprian</realname>
        <email>ory...@rd...</email>
        <username>orynider</username>
        <homepage>http://www.mx-publisher.com/</homepage>
        <contributions />
      </author>
      <author>
        <realname>Luca Libralato</realname>
        <email>mig...@mi...</email>
        <username>Mighty Gorgon</username>
        <homepage>http://icyphoenix.com/</homepage>
        <contributions />
      </author>
    </author-group>
    <mod-version>
      <major>2</major>
      <minor>1</minor>
      <revision>0</revision>
    </mod-version>
    <installation>
      <level>easy</level>
      <time>772</time>
      <target-version>
        <target-primary>2.0.0</target-primary>
        <target-major allow="exact">2</target-major>
        <target-minor allow="exact">0</target-minor>
      </target-version>
    </installation>
    <meta name="generator" content="Phpbb.ModTeam.Tools (c#)" />
  </header>
  <action-group>
    <sql>
CREATE TABLE IF NOT EXISTS phpbb_smartor_album (
  pic_id int(11) unsigned NOT NULL auto_increment,
  pic_filename varchar(255) NOT NULL,
  pic_thumbnail varchar(255) default NULL,
  pic_title varchar(255) NOT NULL,
  pic_desc text,
  pic_user_id mediumint(8) NOT NULL,
  pic_username varchar(32) default NULL,
  pic_user_ip char(8) NOT NULL default '0',
  pic_time int(11) unsigned NOT NULL,
  pic_cat_id mediumint(8) unsigned NOT NULL default '1',
  pic_view_count int(11) unsigned NOT NULL default '0',
  pic_lock tinyint(3) NOT NULL default '0',
  pic_approval tinyint(3) NOT NULL default '1',
  PRIMARY KEY  (pic_id),
  KEY pic_cat_id (pic_cat_id),
  KEY pic_user_id (pic_user_id),
  KEY pic_time (pic_time)
);

CREATE TABLE IF NOT EXISTS phpbb_smartor_album_cat (
  cat_id mediumint(8) unsigned NOT NULL auto_increment,
  cat_title varchar(255) NOT NULL,
  cat_desc text,
  cat_wm text,
  cat_order mediumint(8) NOT NULL,
  cat_view_level tinyint(3) NOT NULL default '-1',
  cat_upload_level tinyint(3) NOT NULL default '0',
  cat_rate_level tinyint(3) NOT NULL default '0',
  cat_comment_level tinyint(3) NOT NULL default '0',
  cat_edit_level tinyint(3) NOT NULL default '0',
  cat_delete_level tinyint(3) NOT NULL default '2',
  cat_view_groups varchar(255) default NULL,
  cat_upload_groups varchar(255) default NULL,
  cat_rate_groups varchar(255) default NULL,
  cat_comment_groups varchar(255) default NULL,
  cat_edit_groups varchar(255) default NULL,
  cat_delete_groups varchar(255) default NULL,
  cat_moderator_groups varchar(255) default NULL,
  cat_approval tinyint(3) NOT NULL default '0',
  cat_parent mediumint(8) unsigned default '0',
  cat_user_id mediumint(8) unsigned default '0',
  PRIMARY KEY  (cat_id),
  KEY cat_order (cat_order)
);

INSERT INTO phpbb_smartor_album_cat VALUES(1, 'Test Category', 'First Test Category', '', 10, -1, 0, 0, 0, 0, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0);

CREATE TABLE IF NOT EXISTS phpbb_smartor_album_comment (
  comment_id int(11) unsigned NOT NULL auto_increment,
  comment_pic_id int(11) unsigned NOT NULL,
  comment_cat_id int(11) NOT NULL default '0',
  comment_user_id mediumint(8) NOT NULL,
  comment_username varchar(32) default NULL,
  comment_user_ip char(8) NOT NULL,
  comment_time int(11) unsigned NOT NULL,
  comment_text text,
  comment_edit_time int(11) unsigned default NULL,
  comment_edit_count smallint(5) unsigned NOT NULL default '0',
  comment_edit_user_id mediumint(8) default NULL,
  PRIMARY KEY  (comment_id),
  KEY comment_pic_id (comment_pic_id),
  KEY comment_user_id (comment_user_id),
  KEY comment_user_ip (comment_user_ip),
  KEY comment_time (comment_time)
);


CREATE TABLE IF NOT EXISTS phpbb_smartor_album_config (
  config_name varchar(255) NOT NULL,
  config_value varchar(255) NOT NULL,
  PRIMARY KEY  (config_name)
);

INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('max_pics', '1024');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('user_pics_limit', '50');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('mod_pics_limit', '250');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('max_file_size', '128000');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('max_width', '1024');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('max_height', '768');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('rows_per_page', '3');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('cols_per_page', '4');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('fullpic_popup', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('thumbnail_quality', '50');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('thumbnail_size', '150');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('thumbnail_cache', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('sort_method', 'pic_time');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('sort_order', 'DESC');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('jpg_allowed', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('png_allowed', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('gif_allowed', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('desc_length', '512');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('hotlink_prevent', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('hotlink_allowed', 'smartor.is-root.com');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('personal_gallery', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('personal_gallery_private', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('personal_gallery_limit', '10');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('personal_gallery_view', '-1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('rate', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('rate_scale', '10');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('comment', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('gd_version', '2');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('album_version', '.0.54');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('fap_version', '1.4.2');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_index_thumb', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_index_total_pics', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_index_total_comments', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_index_comments', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_index_last_comment', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_index_last_pic', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_index_pics', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_recent_in_subcats', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_recent_instead_of_nopics', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('line_break_subcats', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_index_subcats', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('personal_allow_gallery_mod', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('personal_allow_sub_categories', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('personal_sub_category_limit', '-1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('personal_show_subcats_in_index', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('personal_show_recent_in_subcats', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('personal_show_recent_instead_of_nopics', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_personal_gallery_link', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('album_category_sorting', 'cat_order');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('album_category_sorting_direction', 'ASC');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('album_debug_mode', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_all_in_personal_gallery', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('new_pic_check_interval', '1M');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('index_enable_supercells', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('email_notification', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_download', '2');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_slideshow', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_pic_size_on_thumb', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('max_files_to_upload', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('max_pregenerated_fields', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('dynamic_fields', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('pregenerate_fields', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('propercase_pic_title', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_index_last_pic_lv', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('personal_pics_approval', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_img_no_gd', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('dynamic_pic_resampling', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('max_file_size_resampling', '1024000');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('switch_nuffload', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('path_to_bin', './modules/mx_smartor/cgi-bin/');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('perl_uploader', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_progress_bar', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('close_on_finish', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('max_pause', '5');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('simple_format', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('multiple_uploads', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('max_uploads', '5');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('zip_uploads', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('resize_pic', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('resize_width', '600');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('resize_height', '600');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('resize_quality', '70');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_pics_nav', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_inline_copyright', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('enable_nuffimage', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('enable_sepia_bw', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('personal_allow_avatar_gallery', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_gif_mid_thumb', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('slideshow_script', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_exif', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('album_bbcode', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('quick_thumbs', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('set_memory', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('lb_preview', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('use_old_pics_gen', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_last_comments', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('enable_mooshow', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('enable_integration', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('override_default_pages', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('index', '5');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('invert_nav_arrows', '0');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_otf_link', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_all_pics_link', '1');
INSERT INTO phpbb_smartor_album_config (config_name, config_value) VALUES('show_personal_galleries_link', '1');

CREATE TABLE IF NOT EXISTS phpbb_smartor_album_rate (
  rate_pic_id int(11) unsigned NOT NULL,
  rate_user_id mediumint(8) NOT NULL,
  rate_user_ip char(8) NOT NULL,
  rate_point tinyint(3) unsigned NOT NULL,
  rate_hon_point tinyint(3) NOT NULL default '0',
  KEY rate_pic_id (rate_pic_id),
  KEY rate_user_id (rate_user_id),
  KEY rate_user_ip (rate_user_ip),
  KEY rate_point (rate_point)
);

CREATE TABLE IF NOT EXISTS phpbb_smartor_album_sp_config (
  config_name varchar(255) NOT NULL,
  config_value varchar(255) NOT NULL,
  PRIMARY KEY  (config_name)
);

INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('disp_late', '1');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('rate_type', '2');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('disp_high', '1');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('disp_mostv', '1');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('disp_rand', '1');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('img_rows', '2');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('img_cols', '3');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('use_watermark', '0');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('wut_users', '0');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('disp_watermark_at', '3');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('hon_rate_times', '1');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('hon_rate_sep', '1');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('hon_rate_where', '');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('hon_rate_users', '1');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('midthumb_use', '1');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('midthumb_height', '500');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('midthumb_width', '500');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('midthumb_cache', '1');
INSERT INTO phpbb_smartor_album_sp_config (config_name, config_value) VALUES('jaime_lettering', '0');
</sql>
    <copy>
      <file from="root/album.php" to="album.php" />
      <file from="root/album_db_install.php" to="album_db_install.php" />
      <file from="root/admin/*.php" to="admin/*.php" />
      <file from="root/album_mod/*.*" to="album_mod/*.*" />
      <file from="root/album_mod/upload/*.*" to="album_mod/upload/*.*" />
      <file from="root/album_mod/upload/cache/*.*" to="album_mod/upload/cache/*.*" />
      <file from="root/album_mod/upload/med_cache/*.*" to="album_mod/upload/med_cache/*.*" />
      <file from="root/album_mod/upload/otf/*.*" to="album_mod/upload/otf/*.*" />
      <file from="root/album_mod/upload/wm_cache/*.*" to="album_mod/upload/wm_cache/*.*" />
      <file from="root/album_mod/includes/*.php" to="album_mod/includes/*.php" />
      <file from="root/album_mod/modules/*.php" to="album_mod/modules/*.php" />
      <file from="root/album_mod/language/lang_english/*.php" to="language/lang_english/*.php" />
      <file from="root/templates/subSilver/*.*" to="templates/subSilver/*.*" />
      <file from="root/templates/subSilver/admin/*.*" to="templates/subSilver/admin/*.*" />
      <file from="root/templates/subSilver/images/*.*" to="templates/subSilver/images/*.*" />
      <file from="root/templates/subSilver/images/lang_english/*.*" to="templates/subSilver/images/lang_english/*.*" />
      <file from="root/cgi-bin/nuffload.cgi" to="cgi-bin/nuffload.cgi" />
      <file from="root/jupload/jupload.jar" to="jupload/jupload.jar" />
    </copy>
    <open src="includes/constants.php">
      <edit>
        <find>if ( !defined('IN_PHPBB') )
{
	die("Hacking attempt");
}</find>
        <action type="after-add">@define('PAGE_ALBUM', -50);	// for Session Handling
@define('PAGE_ALBUM_PERSONAL', -51);
@define('PAGE_ALBUM_PICTURE', -52);
@define('PAGE_ALBUM_SEARCH', -53);
</action>
      </edit>
    </open>
    <open src="viewonline.php">
      <edit>
        <find>				case PAGE_FAQ:
					$location = $lang['Viewing_FAQ'];
					$location_url = "faq.$phpEx";
					break;</find>
        <action type="after-add">				case PAGE_ALBUM:
					$location = $lang['View_Album_Index'];
					$location_url = "album.$phpEx";
					break;
				case PAGE_ALBUM_PERSONAL:
					$location = $lang['View_Album_Personal'];
					$location_url = "album.$phpEx?smartor_mode=album_personal_index";
					break;
</action>
      </edit>
    </open>
    <open src="includes/page_header.php">
      <edit>
        <find><![CDATA[
	'U_GROUP_CP' => append_sid('groupcp.'.$phpEx),
]]></find>
        <action type="after-add"><![CDATA[	'L_ALBUM' => $lang['Album'],
	'U_ALBUM' => append_sid('album.'.$phpEx),
	'L_PIC_NAME' => $lang['Pic_Name'],
	'L_DESCRIPTION' => $lang['Description'],
	'L_GO' => $lang['Go'],
	'L_SEARCH_CONTENTS' => $lang['Search_Contents'],
	'L_SEARCH_MATCHES' => $lang['Search_Matches'],
]]></action>
      </edit>
    </open>
    <open src="language/lang_english/lang_admin.php">
      <edit>
        <find><![CDATA[
?>
]]></find>
        <action type="before-add">
$lang['Photo_Album'] = 'Photo Album';
$lang['Categories'] = 'Categories';
$lang['Personal_Galleries'] = 'Personal Galleries';
</action>
      </edit>
    </open>
    <open src="language/lang_english/lang_main.php">
      <edit>
        <find><![CDATA[
?>
]]></find>
        <action type="before-add"><![CDATA[
$lang['Album'] = 'Album';
$lang['Personal_Gallery_Of_User'] = 'Personal Gallery Of %s';
$lang['Personal_Gallery_Of_User_Profile'] = 'Personal Gallery of %s (%d Pictures)';
$lang['Show_All_Pic_View_Mode_Profile'] = 'Show All Pictures In The Personal Gallery of %s (without sub cats)';
$lang['Not_allowed_to_view_album'] = 'Sorry, you are not allowed to view the album.';
$lang['Not_allowed_to_upload_album'] = 'Sorry, you are not allowed to upload new pic to the album. Please contact the album administrator for more information.';
$lang['Album_empty'] = 'There are no pics in the album<br />Click on the <b>Upload New Pic</b> link on this page to post one.';
$lang['Upload_New_Pic'] = 'Upload New Pic.';
$lang['Pic_Title'] = 'Pic Title';
$lang['Pic_Title_Explain'] = 'It is very important to give your pic a good title. It could be a name, a subject to make others know what it is without see it.';
$lang['Pic_Upload'] = 'Pic Upload';
$lang['Pic_Upload_Explain'] = 'Allowed types are JPG, GIF and PNG. Maximum file size is %s bytes. Maximum image dimensions are %sx%s pixels.';
$lang['Album_full'] = 'Sorry, the album has reached the maximum number of uploaded pics. Please contact the album administrator for more information.';
$lang['Album_upload_successful'] = 'Thank you, your pic has been uploaded successfully.';
$lang['Click_return_album'] = 'Click %shere%s to return to the Album.';
$lang['Invalid_upload'] = 'Invalid Upload<br /><br />Your pic is too big or its type is not allowed.';
$lang['Image_too_big'] = 'Sorry, your image dimensions is too large.';
$lang['Uploaded_by'] = 'Uploaded by';
$lang['Category_locked'] = 'Sorry, you cannot upload because this category was locked by an admin. Please contact the album administrator for more information.';
$lang['View_Album_Index'] = 'Album Index';
$lang['View_Album_Personal'] = 'Viewing Personal Album of a user';
$lang['View_Pictures'] = 'Viewing Pictures or Posting/Reading comments in the Album';
$lang['Album_Search'] = 'Searching the Album';
$lang['Pic_Name'] = 'Picture Name';
$lang['Description'] = 'Description';
$lang['Search_Contents'] = ' that contains: ';
$lang['Search_Found'] = 'Search found ';
$lang['Search_Matches'] = 'Matches:';
]]></action>
      </edit>
    </open>
    <open src="templates/subSilver/admin/page_header.tpl">
      <edit>
        <find><![CDATA[
</head>
]]></find>
        <action type="before-add"><![CDATA[
<link rel="stylesheet" href="../templates/subSilver/mx_smartor.css" type="text/css" />
]]></action>
      </edit>
    </open>
    <open src="templates/subSilver/overall_header.tpl">
      <edit>
        <find><![CDATA[
</head>
]]></find>
        <action type="before-add"><![CDATA[
<link rel="stylesheet" href="templates/subSilver/mx_smartor.css" type="text/css" />
<script language="javascript" type="text/javascript" src="album_mod/fap_loader.js"></script>
]]></action>
      </edit>
      <edit>
        <find><![CDATA[
{L_USERGROUPS}</a>&nbsp;
]]></find>
        <inline-edit>
          <inline-find><![CDATA[
{L_USERGROUPS}</a>&nbsp;
]]></inline-find>
          <inline-action type="after-add"><![CDATA[
<a href="{U_ALBUM}" class="mainmenu"><img src="templates/subSilver/images/icon_mini_album.gif" width="12" height="13" border="0" alt="{L_ALBUM}" hspace="3" />{L_ALBUM}</a>&nbsp;

]]></inline-action>
        </inline-edit>
      </edit>
    </open>
    <diy-instructions lang="en-gb">
.
CHMOD 777 album_mod/upload
CHMOD 777 album_mod/upload/cache
CHMOD 777 album_mod/upload/med_cache
CHMOD 777 album_mod/upload/otf
CHMOD 777 album_mod/upload/wm_cache
CHMOD 755 cgi-bin/nuffload.cgi
.
</diy-instructions>
  </action-group>
</mod>
--- NEW FILE: album_mod_fap.sql ---
DROP TABLE IF EXISTS `phpbb_smartor_album`;
CREATE TABLE IF NOT EXISTS `phpbb_smartor_album` (
  `pic_id` int(11) unsigned NOT NULL auto_increment,
  `pic_filename` varchar(255) NOT NULL,
  `pic_thumbnail` varchar(255) default NULL,
  `pic_title` varchar(255) NOT NULL,
  `pic_desc` text,
  `pic_user_id` mediumint(8) NOT NULL,
  `pic_username` varchar(32) default NULL,
  `pic_user_ip` char(8) NOT NULL default '0',
  `pic_time` int(11) unsigned NOT NULL,
  `pic_cat_id` mediumint(8) unsigned NOT NULL default '1',
  `pic_view_count` int(11) unsigned NOT NULL default '0',
  `pic_lock` tinyint(3) NOT NULL default '0',
  `pic_approval` tinyint(3) NOT NULL default '1',
  PRIMARY KEY  (`pic_id`),
  KEY `pic_cat_id` (`pic_cat_id`),
  KEY `pic_user_id` (`pic_user_id`),
  KEY `pic_time` (`pic_time`)
);

DROP TABLE IF EXISTS `phpbb_smartor_album_cat`;
CREATE TABLE IF NOT EXISTS `phpbb_smartor_album_cat` (
  `cat_id` mediumint(8) unsigned NOT NULL auto_increment,
  `cat_title` varchar(255) NOT NULL,
  `cat_desc` text,
  `cat_wm` text,
  `cat_order` mediumint(8) NOT NULL,
  `cat_view_level` tinyint(3) NOT NULL default '-1',
  `cat_upload_level` tinyint(3) NOT NULL default '0',
  `cat_rate_level` tinyint(3) NOT NULL default '0',
  `cat_comment_level` tinyint(3) NOT NULL default '0',
  `cat_edit_level` tinyint(3) NOT NULL default '0',
  `cat_delete_level` tinyint(3) NOT NULL default '2',
  `cat_view_groups` varchar(255) default NULL,
  `cat_upload_groups` varchar(255) default NULL,
  `cat_rate_groups` varchar(255) default NULL,
  `cat_comment_groups` varchar(255) default NULL,
  `cat_edit_groups` varchar(255) default NULL,
  `cat_delete_groups` varchar(255) default NULL,
  `cat_moderator_groups` varchar(255) default NULL,
  `cat_approval` tinyint(3) NOT NULL default '0',
  `cat_parent` mediumint(8) unsigned default '0',
  `cat_user_id` mediumint(8) unsigned default '0',
  PRIMARY KEY  (`cat_id`),
  KEY `cat_order` (`cat_order`)
);

INSERT INTO `phpbb_smartor_album_cat` (`cat_id`, `cat_title`, `cat_desc`, `cat_wm`, `cat_order`, `cat_view_level`, `cat_upload_level`, `cat_rate_level`, `cat_comment_level`, `cat_edit_level`, `cat_delete_level`, `cat_view_groups`, `cat_upload_groups`, `cat_rate_groups`, `cat_comment_groups`, `cat_edit_groups`, `cat_delete_groups`, `cat_moderator_groups`, `cat_approval`, `cat_parent`, `cat_user_id`) VALUES(1, 'Test Category', 'First Test Category', '', 10, -1, 0, 0, 0, 0, 2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0);

DROP TABLE IF EXISTS `phpbb_smartor_album_comment`;
CREATE TABLE IF NOT EXISTS `phpbb_smartor_album_comment` (
  `comment_id` int(11) unsigned NOT NULL auto_increment,
  `comment_pic_id` int(11) unsigned NOT NULL,
  `comment_cat_id` int(11) NOT NULL default '0',
  `comment_user_id` mediumint(8) NOT NULL,
  `comment_username` varchar(32) default NULL,
  `comment_user_ip` char(8) NOT NULL,
  `comment_time` int(11) unsigned NOT NULL,
  `comment_text` text,
  `comment_edit_time` int(11) unsigned default NULL,
  `comment_edit_count` smallint(5) unsigned NOT NULL default '0',
  `comment_edit_user_id` mediumint(8) default NULL,
  PRIMARY KEY  (`comment_id`),
  KEY `comment_pic_id` (`comment_pic_id`),
  KEY `comment_user_id` (`comment_user_id`),
  KEY `comment_user_ip` (`comment_user_ip`),
  KEY `comment_time` (`comment_time`)
);


DROP TABLE IF EXISTS `phpbb_smartor_album_config`;
CREATE TABLE IF NOT EXISTS `phpbb_smartor_album_config` (
  `config_name` varchar(255) NOT NULL,
  `config_value` varchar(255) NOT NULL,
  PRIMARY KEY  (`config_name`)
);

INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('max_pics', '1024');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('user_pics_limit', '50');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('mod_pics_limit', '250');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('max_file_size', '128000');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('max_width', '1024');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('max_height', '768');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('rows_per_page', '3');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('cols_per_page', '4');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('fullpic_popup', '0');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('thumbnail_quality', '50');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('thumbnail_size', '150');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('thumbnail_cache', '1');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('sort_method', 'pic_time');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('sort_order', 'DESC');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('jpg_allowed', '1');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('png_allowed', '1');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('gif_allowed', '1');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('desc_length', '512');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('hotlink_prevent', '0');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('hotlink_allowed', 'smartor.is-root.com');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('personal_gallery', '0');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('personal_gallery_private', '0');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('personal_gallery_limit', '10');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('personal_gallery_view', '-1');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('rate', '1');
INSERT INTO `phpbb_smartor_album_config` (`config_name`, `config_value`) VALUES('rate_scale', '10');
INSERT INTO `phpbb_smartor_album_config` (`config_name`,...
 
[truncated message content]

[mxbb-commits] mx_smartor/album_mod/modules album_allpics.php, 1.3, 1.4 album_cat.php, 1.4, 1.5 album_cat_sort.php, 1.4, 1.5 album_comment.php, 1.4, 1.5 album_comment_edit.php, 1.3, 1.4 album_hotornot.php, 1.3, 1.4 album_modcp.php, 1.4, 1.5 album_otf.php, 1.3, 1.4 album_page.php, 1.3, 1.4 album_rate.php, 1.3, 1.4 album_search.php, 1.3, 1.4 album_showpage.php, 1.5, 1.6 album_upload.php, 1.3, 1.4

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

Update of /cvsroot/mxbb/mx_smartor/album_mod/modules
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10881/album_mod/modules

Modified Files:
	album_allpics.php album_cat.php album_cat_sort.php 
	album_comment.php album_comment_edit.php album_hotornot.php 
	album_modcp.php album_otf.php album_page.php album_rate.php 
	album_search.php album_showpage.php album_upload.php 
Log Message:
Upgrade

Index: album_hotornot.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_hotornot.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_hotornot.php	13 Mar 2008 08:35:54 -0000	1.3
--- album_hotornot.php	29 Aug 2008 05:58:24 -0000	1.4
***************
*** 161,165 ****
  	else
  	{
! 		$poster = '<a href="'. mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $thispic['user_id']) .'">'. $thispic['username'] .'</a>';
  	}
  
--- 161,165 ----
  	else
  	{
! 		$poster = album_get_profile_url('full', $thispic['user_id'], $thispic['username'], false);
  	}
  

Index: album_showpage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_showpage.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** album_showpage.php	13 Jul 2008 19:39:29 -0000	1.5
--- album_showpage.php	29 Aug 2008 05:58:24 -0000	1.6
***************
*** 16,64 ****
  }
  
- if ( $mode == 'smilies' )
- {
- 	include_once($phpbb_root_path . 'includes/functions_post.'.$phpEx);
- 
- 	smartor_generate_smilies('window', PAGE_POSTING);
- 	exit;
- }
- 
- include_once($phpbb_root_path . 'includes/functions_validate.'.$phpEx);
- 
- 
- //
- // Get general album information
- //
- if ( !defined('ALBUM_MOD_PATH') )
- {
- 	define('ALBUM_MOD_PATH', 'album_mod/');
- }
  
- if (!isset($album_root_path) || empty($album_root_path))
- {
- 	$album_root_path = $module_root_path . ALBUM_MOD_PATH . '';
- }
  
! if ( defined('IS_PHPBBXS') )
! {
! 	include_once($phpbb_root_path . 'includes/functions_color_groups.' . $phpEx);
! 	include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx);
! 
! 	if ( isset($_POST['message']) )
! 	{
! 		$_POST['comment'] = $_POST['message'];
! 	}
! }
! else
! {
! 	if ($album_config['album_bbcode'] == 1)
! 	{
! 		include_once($album_root_path . 'includes/album_bbcode.' . $phpEx);
! 	}
! }
! 
! if( !function_exists('smilies_pass'))
  {
! 	include_once($phpbb_root_path . 'includes/bbcode.'.$phpEx);
  }
  
--- 16,24 ----
  }
  
  
  
! if ($album_config['album_bbcode'] == 1)
  {
! 	include_once($album_root_path . 'includes/album_bbcode.' . $phpEx);
  }
  
***************
*** 74,87 ****
  if( isset($_GET['mode']) && $_GET['mode'] == 'smilies' )
  {
! 	if ( defined('IS_PHPBBXS') )
! 	{
! 		generate_smilies('window', PAGE_ALBUM_PICTURE);
! 		exit;
! 	}
! 	else
! 	{
! 		generate_smilies_album('window', PAGE_ALBUM_PICTURE);
! 		exit;
! 	}
  }
  
--- 34,39 ----
  if( isset($_GET['mode']) && $_GET['mode'] == 'smilies' )
  {
! 	generate_smilies_album('window', PAGE_ALBUM_PICTURE);
! 	exit;
  }
  
***************
*** 605,609 ****
  // ------------------------------------
  
! $sql = "SELECT p.*, u.user_id, u.username, u.user_rank, r.rate_pic_id, AVG(r.rate_point) AS rating, COUNT(c.comment_id) AS comments_count
  		FROM ". ALBUM_TABLE ." AS p
  			LEFT JOIN ". USERS_TABLE ." AS u ON p.pic_user_id = u.user_id
--- 557,561 ----
  // ------------------------------------
  
! $sql = "SELECT p.*, u.*, r.rate_pic_id, AVG(r.rate_point) AS rating, COUNT(c.comment_id) AS comments_count
  		FROM ". ALBUM_TABLE ." AS p
  			LEFT JOIN ". USERS_TABLE ." AS u ON p.pic_user_id = u.user_id
***************
*** 623,627 ****
  
  $total_comments = $thispic['comments_count'];
! $comments_per_page = $board_config['posts_per_page'];
  
  if( empty($thispic) )
--- 575,592 ----
  
  $total_comments = $thispic['comments_count'];
! 
! switch (PORTAL_BACKEND)
! {
! 	case 'internal':
! 		$comments_per_page = 5;		
! 		
! 	break;
! 					
! 	case 'phpbb2':
! 	case 'phpbb3':
! 		$comments_per_page = $board_config['posts_per_page'];
! 		
! 	break;
! }
  
  if( empty($thispic) )
***************
*** 751,758 ****
  				WHERE comment_pic_id = $pic_id
  					AND comment_id < $comment_id";
! 
  		if( !$result = $db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not obtain comments information from the database', '', __LINE__, __FILE__, $sql);
  		}
  
--- 716,723 ----
  				WHERE comment_pic_id = $pic_id
  					AND comment_id < $comment_id";
! 					
  		if( !$result = $db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, "Could not obtain comments information from the database", "", __LINE__, __FILE__, $sql);
  		}
  
***************
*** 775,779 ****
  			case 'ASC':
  				$sort_order = 'ASC';
! 				break;
  			default:
  				$sort_order = 'DESC';
--- 740,744 ----
  			case 'ASC':
  				$sort_order = 'ASC';
! 			break;
  			default:
  				$sort_order = 'DESC';
***************
*** 786,790 ****
  			case 'ASC':
  				$sort_order = 'ASC';
! 				break;
  			default:
  				$sort_order = 'DESC';
--- 751,755 ----
  			case 'ASC':
  				$sort_order = 'ASC';
! 			break;
  			default:
  				$sort_order = 'DESC';
***************
*** 802,817 ****
  		$limit_sql = ($start == 0) ? $comments_per_page : $start .','. $comments_per_page;
  
! 		$sql = "SELECT c.*, u.user_id, u.username, u.user_regdate, u.user_posts, u.user_allowavatar, u.user_rank, u.user_avatar, u.user_avatar_type, u.user_email, u.user_icq, u.user_website, u.user_from, u.user_aim, u.user_yim, u.user_msnm
! 				FROM ". ALBUM_COMMENT_TABLE ." AS c
! 					LEFT JOIN ". USERS_TABLE ." AS u ON c.comment_user_id = u.user_id
! 				WHERE c.comment_pic_id = '$pic_id'
! 				ORDER BY c.comment_id $sort_order
! 				LIMIT $limit_sql";
  
! 		if( !$result = $db->sql_query($sql) )
  		{
  			mx_message_die(GENERAL_ERROR, 'Could not obtain comments information from the database', '', __LINE__, __FILE__, $sql);
  		}
! 
  		$commentrow = array();
  
--- 767,781 ----
  		$limit_sql = ($start == 0) ? $comments_per_page : $start .','. $comments_per_page;
  
! 		$sql = "SELECT c.*, u.*
! 				FROM ". ALBUM_COMMENT_TABLE ." AS c, ". USERS_TABLE ." AS u 
! 				WHERE c.comment_user_id = u.user_id
! 				AND c.comment_pic_id = '$pic_id'
! 				ORDER BY c.comment_id $sort_order";		
  
! 		if( !$result = $db->sql_query_limit($sql, $limit_sql) )
  		{
  			mx_message_die(GENERAL_ERROR, 'Could not obtain comments information from the database', '', __LINE__, __FILE__, $sql);
  		}
! 		
  		$commentrow = array();
  
***************
*** 823,838 ****
  		for ($i = 0; $i < count($commentrow); $i++)
  		{
! 			if( ($commentrow[$i]['user_id'] == ALBUM_GUEST) or ($commentrow[$i]['username'] == '') )
! 			{
! 				$poster = ($commentrow[$i]['comment_username'] == '') ? $lang['Guest'] : $commentrow[$i]['comment_username'];
! 			}
! 			else
  			{
! 				$poster = '<a href="'. mx_append_sid($phpbb_root_path ."profile.php?mode=viewprofile&amp;". POST_USERS_URL .'='. $commentrow[$i]['user_id']) .'">'. $commentrow[$i]['username'] .'</a>';
! 			}
  
  			if ($commentrow[$i]['comment_edit_count'] > 0)
  			{
! 				$sql = "SELECT c.comment_id, c.comment_edit_user_id, u.user_id, u.username
  						FROM ". ALBUM_COMMENT_TABLE ." AS c
  							LEFT JOIN ". USERS_TABLE ." AS u ON c.comment_edit_user_id = u.user_id
--- 787,814 ----
  		for ($i = 0; $i < count($commentrow); $i++)
  		{
! 
! 			$poster = album_get_profile_url('full', $commentrow[$i]['user_id'], $commentrow[$i]['username'], false);
! 			
! 			switch (PORTAL_BACKEND)
  			{
! 				case 'internal':
! 
! 					$user_allowavatar = false;
! 				break;
! 					
! 				case 'phpbb2':
! 
! 					$user_allowavatar = $commentrow[$i]['user_allowavatar'];
! 				break;
! 
! 				case 'phpbb3':
! 
! 					$user_allowavatar = ($board_config['allow_avatar_upload'] && file_exists($phpbb_root_path . $board_config['avatar_path']) && @is_writable($phpbb_root_path . $board_config['avatar_path']) && $phpbb_auth->acl_get('u_chgavatar') && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')) ? true : false;
! 				break;
! 			}	
  
  			if ($commentrow[$i]['comment_edit_count'] > 0)
  			{
! 				$sql = "SELECT c.comment_id, c.comment_edit_user_id, u.*
  						FROM ". ALBUM_COMMENT_TABLE ." AS c
  							LEFT JOIN ". USERS_TABLE ." AS u ON c.comment_edit_user_id = u.user_id
***************
*** 849,853 ****
  				$edit_info = ($commentrow[$i]['comment_edit_count'] == 1) ? $lang['Edited_time_total'] : $lang['Edited_times_total'];
  
! 				$edit_info = '<br /><br />&raquo;&nbsp;'. sprintf($edit_info, $lastedit_row['username'], create_date2($board_config['default_dateformat'], $commentrow[$i]['comment_edit_time'], $board_config['board_timezone']), $commentrow[$i]['comment_edit_count']) .'<br />';
  			}
  			else
--- 825,829 ----
  				$edit_info = ($commentrow[$i]['comment_edit_count'] == 1) ? $lang['Edited_time_total'] : $lang['Edited_times_total'];
  
! 				$edit_info = '<br /><br />&raquo;&nbsp;'. sprintf($edit_info, $lastedit_row['username'], album_create_date($board_config['default_dateformat'], $commentrow[$i]['comment_edit_time'], $board_config['board_timezone']), $commentrow[$i]['comment_edit_count']) .'<br />';
  			}
  			else
***************
*** 858,932 ****
  			// Smilies
  			$commentrow[$i]['comment_text'] = $mx_bbcode->smilies_pass($commentrow[$i]['comment_text']);
! 			$commentrow[$i]['comment_text'] = make_clickable($commentrow[$i]['comment_text']);
  			$commentrow[$i]['comment_text'] = nl2br($commentrow[$i]['comment_text']);
  
  			//email, profile, pm links
! 			$email_uri = ( $board_config['board_email_form'] ) ? mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=email&amp;" . POST_USERS_URL .'=' . $commentrow[$i]['user_id']) : 'mailto:' . $commentrow[$i]['user_email'];
! 			$profile_url = mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $commentrow[$i]['user_id'] );
! 			$pm_url = mx_append_sid($phpbb_root_path ."privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=" . $commentrow[$i]['user_id']);
  
  			//avatar
  			$poster_avatar = '';
! 			if ( $commentrow[$i]['user_avatar_type'] && $commentrow[$i]['user_id'] != ANONYMOUS && $commentrow[$i]['user_allowavatar'] )
  			{
  				switch( $commentrow[$i]['user_avatar_type'] )
  				{
  					case USER_AVATAR_UPLOAD:
! 						$poster_avatar = ( $board_config['allow_avatar_upload'] ) ? '<img src="' . $phpbb_root_path .$board_config['avatar_path'] . '/' . $commentrow[$i]['user_avatar'] . '" alt="" border="0" />' : '';
! 						break;
  					case USER_AVATAR_REMOTE:
  						$poster_avatar = ( $board_config['allow_avatar_remote'] ) ? '<img src="' .$commentrow[$i]['user_avatar'] . '" alt="" border="0" />' : '';
! 						break;
  					case USER_AVATAR_GALLERY:
  						$poster_avatar = ( $board_config['allow_avatar_local'] ) ? '<img src="' . $phpbb_root_path .$board_config['avatar_gallery_path'] . '/' . $commentrow[$i]['user_avatar'] . '" alt="" border="0" />' : '';
! 						break;
  				}
  			}
  
! 			//rank & rank image
! 			$sql = "SELECT *
! 				FROM " . RANKS_TABLE . "
! 				ORDER BY rank_special, rank_min";
! 			if ( !($result = $db->sql_query($sql)) )
! 			{
! 				mx_message_die(GENERAL_ERROR, "Could not obtain ranks information.", '', __LINE__, __FILE__, $sql);
! 			}
! 
! 			$ranksrow = array();
! 			while ( $row = $db->sql_fetchrow($result) )
  			{
! 				$ranksrow[] = $row;
! 			}
! 			$db->sql_freeresult($result);
  
  			$poster_rank = '';
  			$rank_image = '';
! 			if ($commentrow[$i]['user_id'] == ANONYMOUS)
! 			{
! 				$poster_rank = $lang['Guest'];
! 			}
! 			else if ( $commentrow[$i]['user_rank'] )
! 			{
! 				for($j = 0; $j < count($ranksrow); $j++)
  				{
! 					if ( $commentrow[$i]['user_rank'] == $ranksrow[$j]['rank_id'] && $ranksrow[$j]['rank_special'] )
  					{
! 						$poster_rank = $ranksrow[$j]['rank_title'];
! 						$rank_image = ( $ranksrow[$j]['rank_image'] ) ? '<img src="' . $phpbb_root_path .$ranksrow[$j]['rank_image'] . '" alt="' . $poster_rank . '" title="' . $poster_rank . '" border="0" /><br />' : '';
  					}
  				}
! 			}
! 			else
! 			{
! 				for($j = 0; $j < count($ranksrow); $j++)
  				{
! 					if ( $commentrow[$i]['user_posts'] >= $ranksrow[$j]['rank_min'] && !$ranksrow[$j]['rank_special'] )
  					{
! 						$poster_rank = $ranksrow[$j]['rank_title'];
! 						$rank_image = ( $ranksrow[$j]['rank_image'] ) ? '<img src="' . $phpbb_root_path . $ranksrow[$j]['rank_image'] . '" alt="' . $poster_rank . '" title="' . $poster_rank . '" border="0" /><br />' : '';
  					}
  				}
  			}
! 
  			//
  			// Handle anon users posting with usernames
--- 834,935 ----
  			// Smilies
  			$commentrow[$i]['comment_text'] = $mx_bbcode->smilies_pass($commentrow[$i]['comment_text']);
! 			$commentrow[$i]['comment_text'] = $mx_bbcode->make_clickable($commentrow[$i]['comment_text']);
  			$commentrow[$i]['comment_text'] = nl2br($commentrow[$i]['comment_text']);
  
  			//email, profile, pm links
! 			$profile_url = album_get_profile_url('profile', $commentrow[$i]['comment_user_id'], false, false);			
! 			$email_uri = ( $board_config['board_email_form'] ) ? mx_append_sid($profile_url ."&amp;mode=email") : 'mailto:' . $commentrow[$i]['user_email'];
! 
! 			switch (PORTAL_BACKEND)
! 			{
! 				case 'internal':
! 				case 'phpbb2':
! 					$pm_url = mx_append_sid($phpbb_root_path ."privmsg.$phpEx?mode=post&amp;" . POST_USERS_URL . "=" . $commentrow[$i]['user_id']);
! 				break;
! 
! 				case 'phpbb3':
! 					$pm_url = mx_append_sid($phpbb_root_path ."ucp.$phpEx?i=pm&amp;mode=compose&amp;u=" . $commentrow[$i]['user_id']);									
! 				break;
! 			}			
! 
  
  			//avatar
  			$poster_avatar = '';
! 			if ( $commentrow[$i]['user_avatar_type'] && $commentrow[$i]['user_id'] != ANONYMOUS && $user_allowavatar )
  			{
  				switch( $commentrow[$i]['user_avatar_type'] )
  				{
  					case USER_AVATAR_UPLOAD:
! 						$poster_avatar = ( $board_config['allow_avatar_upload'] ) ? '<img src="' . $phpbb_root_path . $board_config['avatar_path'] . '/' . $commentrow[$i]['user_avatar'] . '" alt="" border="0" />' : '';
! 					break;
  					case USER_AVATAR_REMOTE:
  						$poster_avatar = ( $board_config['allow_avatar_remote'] ) ? '<img src="' .$commentrow[$i]['user_avatar'] . '" alt="" border="0" />' : '';
! 					break;
  					case USER_AVATAR_GALLERY:
  						$poster_avatar = ( $board_config['allow_avatar_local'] ) ? '<img src="' . $phpbb_root_path .$board_config['avatar_gallery_path'] . '/' . $commentrow[$i]['user_avatar'] . '" alt="" border="0" />' : '';
! 					break;
  				}
  			}
  
! 			switch (PORTAL_BACKEND)
  			{
! 				case 'internal':
! 				
! 					$ranksrow = '';				
! 				break;
! 					
! 				case 'phpbb2':
! 				case 'phpbb3':
! 	
! 					//rank & rank image
! 					$sql = "SELECT *
! 						FROM " . RANKS_TABLE . "
! 						ORDER BY rank_special, rank_min";
! 					if ( !($result = $db->sql_query($sql)) )
! 					{
! 						mx_message_die(GENERAL_ERROR, "Could not obtain ranks information.", '', __LINE__, __FILE__, $sql);
! 					}
! 					$ranksrow = array();
! 					
! 					while ( $row = $db->sql_fetchrow($result) )
! 					{
! 						$ranksrow[] = $row;
! 					}
! 					$db->sql_freeresult($result);
! 				break;
! 			}			
  
  			$poster_rank = '';
  			$rank_image = '';
! 			if (PORTAL_BACKEND !== 'internal')
! 			{	
! 				if ($commentrow[$i]['user_id'] == ANONYMOUS)
  				{
! 					$poster_rank = $lang['Guest'];
! 				}
! 				else if ( $commentrow[$i]['user_rank'] )
! 				{
! 					for($j = 0; $j < count($ranksrow); $j++)
  					{
! 						if ( $commentrow[$i]['user_rank'] == $ranksrow[$j]['rank_id'] && $ranksrow[$j]['rank_special'] )
! 						{
! 							$poster_rank = $ranksrow[$j]['rank_title'];
! 							$rank_image = ( $ranksrow[$j]['rank_image'] ) ? '<img src="' . $phpbb_root_path .$ranksrow[$j]['rank_image'] . '" alt="' . $poster_rank . '" title="' . $poster_rank . '" border="0" /><br />' : '';
! 						}
  					}
  				}
! 				else
  				{
! 					for($j = 0; $j < count($ranksrow); $j++)
  					{
! 						if ( $commentrow[$i]['user_posts'] >= $ranksrow[$j]['rank_min'] && !$ranksrow[$j]['rank_special'] )
! 						{
! 							$poster_rank = $ranksrow[$j]['rank_title'];
! 							$rank_image = ( $ranksrow[$j]['rank_image'] ) ? '<img src="' . $phpbb_root_path . $ranksrow[$j]['rank_image'] . '" alt="' . $poster_rank . '" title="' . $poster_rank . '" border="0" /><br />' : '';
! 						}
  					}
  				}
  			}
! 		
  			//
  			// Handle anon users posting with usernames
***************
*** 941,950 ****
  				'ID' => $commentrow[$i]['comment_id'],
  				'POSTER_NAME' => $poster,
! 				'TIME' => create_date2($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']),
! 				'IP' => ($userdata['user_level'] == ADMIN) ? 'http://whois.domaintools.com/' . decode_ip2($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . decode_ip2($commentrow[$i]['comment_user_ip']) .'</a><br />' : '',
  
  				//users mesangers, website, email
! 				'PROFILE_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $phpbb_root_path .$profile_url . '"><img src="' . $images['icon_profile'] . '" alt="' . $lang['Read_profile'] . '" title="' . $lang['Read_profile'] . '" border="0" /></a>' : '',
! 				'PM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $phpbb_root_path .$pm_url . '"><img src="' . $images['icon_pm'] . '" alt="' . $lang['Send_private_message'] . '" title="' . $lang['Send_private_message'] . '" border="0" /></a>' : '',
  				'AIM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_aim'] ) ? '<a href="aim:goim?screenname=' . $commentrow[$i]['user_aim'] . '&amp;message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" alt="' . $lang['AIM'] . '" title="' . $lang['AIM'] . '" border="0" /></a>' : '' : '',
  				'YIM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $commentrow[$i]['user_yim'] . '&amp;.src=pg"><img src="' . $images['icon_yim'] . '" alt="' . $lang['YIM'] . '" title="' . $lang['YIM'] . '" border="0" /></a>' : '' : '',
--- 944,953 ----
  				'ID' => $commentrow[$i]['comment_id'],
  				'POSTER_NAME' => $poster,
! 				'TIME' => album_create_date($board_config['default_dateformat'], $commentrow[$i]['comment_time'], $board_config['board_timezone']),
! 				'IP' => ($userdata['user_level'] == ADMIN) ? '<a href="http://whois.domaintools.com/' . album_decode_ip($commentrow[$i]['comment_user_ip']) . '" target="_blank">' . album_decode_ip($commentrow[$i]['comment_user_ip']) .'</a><br />' : '',
  
  				//users mesangers, website, email
! 				'PROFILE_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $profile_url . '"><img src="' . $images['icon_profile'] . '" alt="' . $lang['Read_profile'] . '" title="' . $lang['Read_profile'] . '" border="0" /></a>' : '',
! 				'PM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? '<a href="' . $pm_url . '"><img src="' . $images['icon_pm'] . '" alt="' . $lang['Send_private_message'] . '" title="' . $lang['Send_private_message'] . '" border="0" /></a>' : '',
  				'AIM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_aim'] ) ? '<a href="aim:goim?screenname=' . $commentrow[$i]['user_aim'] . '&amp;message=Hello+Are+you+there?"><img src="' . $images['icon_aim'] . '" alt="' . $lang['AIM'] . '" title="' . $lang['AIM'] . '" border="0" /></a>' : '' : '',
  				'YIM_IMG' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? ( $commentrow[$i]['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $commentrow[$i]['user_yim'] . '&amp;.src=pg"><img src="' . $images['icon_yim'] . '" alt="' . $lang['YIM'] . '" title="' . $lang['YIM'] . '" border="0" /></a>' : '' : '',
***************
*** 957,965 ****
  				'POSTER_RANK' => $poster_rank,
  				'POSTER_RANK_IMGAGE' => $phpbb_root_path .$rank_image,
! 				'POSTER_JOINED' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Joined'] . ': ' . create_date2($lang['DATE_FORMAT'], $commentrow[$i]['user_regdate'], $board_config['board_timezone']) : '',
  				'POSTER_POSTS' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Posts'] . ': ' . $commentrow[$i]['user_posts'] : '',
  				'POSTER_FROM' => ( $commentrow[$i]['user_from'] && $commentrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Location'] . ': ' . $commentrow[$i]['user_from'] : '',
  
  
  				'TEXT' => $commentrow[$i]['comment_text'],
  				'EDIT_INFO' => $edit_info,
--- 960,969 ----
  				'POSTER_RANK' => $poster_rank,
  				'POSTER_RANK_IMGAGE' => $phpbb_root_path .$rank_image,
! 				'POSTER_JOINED' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Joined'] . ': ' . album_create_date($lang['DATE_FORMAT'], $commentrow[$i]['user_regdate'], $board_config['board_timezone']) : '',
  				'POSTER_POSTS' => ( $commentrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Posts'] . ': ' . $commentrow[$i]['user_posts'] : '',
  				'POSTER_FROM' => ( $commentrow[$i]['user_from'] && $commentrow[$i]['user_id'] != ANONYMOUS ) ? $lang['Location'] . ': ' . $commentrow[$i]['user_from'] : '',
  
  
+ 				
  				'TEXT' => $commentrow[$i]['comment_text'],
  				'EDIT_INFO' => $edit_info,
***************
*** 979,985 ****
  			)
  		);
  		$template->assign_block_vars('coment_switcharo_bottom', array());
  	}
! 
  	//
  	// Start output of page
--- 983,990 ----
  			)
  		);
+ 
  		$template->assign_block_vars('coment_switcharo_bottom', array());
  	}
! 	
  	//
  	// Start output of page
***************
*** 1002,1006 ****
  	else
  	{
! 		$poster = '<a href="'. mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $thispic['user_id']) .'">'. $thispic['username'] .'</a>';
  	}
  
--- 1007,1011 ----
  	else
  	{
! 		$poster = album_get_profile_url('full', $thispic['user_id'], $thispic['username'], false);
  	}
  
***************
*** 1018,1054 ****
  	}
  
! 		$image_rating = ImageRating($thispic['rating']);
! 
! 		//begin shows smilies
! 		$max_smilies = 20;
! 
! 		$sql = 'SELECT emoticon, code, smile_url
! 						FROM ' . SMILIES_TABLE . '
! 						GROUP BY smile_url
! 						ORDER BY smilies_id LIMIT ' . $max_smilies;
! 
! 		if (!$result = $db->sql_query($sql))
! 		{
! 			mx_message_die(GENERAL_ERROR, "Couldn't retrieve smilies list", '', __LINE__, __FILE__, $sql);
! 		}
! 		$smilies_count = $db->sql_numrows($result);
! 		$smilies_data = $db->sql_fetchrowset($result);
! 
! 		if ($auth_data['comment'] == 1)
! 		{
! 			for ($i = 1; $i < $smilies_count+1; $i++)
! 			{
! 				$template->assign_block_vars('switch_comment_post.smilies', array(
! 					'CODE' => $smilies_data[$i - 1]['code'],
! 					'URL' => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smilies_data[$i - 1]['smile_url'],
! 					'DESC' => $smilies_data[$i - 1]['emoticon']
! 				));
  
! 				if ( is_integer($i / 5) )
! 				{
! 					$template->assign_block_vars('switch_comment_post.smilies.new_col', array());
! 				}
! 			}
! 		}
  
  	// --------------------------------
--- 1023,1031 ----
  	}
  
! 	$image_rating = ImageRating($thispic['rating']);	
  
! 	
! 	album_comment_sql_smilies($auth_data['comment']);
! 	
  
  	// --------------------------------
***************
*** 1200,1204 ****
  		'POSTER' => $poster,
  
! 		'PIC_TIME' => create_date2($board_config['default_dateformat'], $thispic['pic_time'], $board_config['board_timezone']),
  		'PIC_VIEW' => $thispic['pic_view_count'],
  		'PIC_COMMENTS' => $total_comments,
--- 1177,1181 ----
  		'POSTER' => $poster,
  
! 		'PIC_TIME' => album_create_date($board_config['default_dateformat'], $thispic['pic_time'], $board_config['board_timezone']),
  		'PIC_VIEW' => $thispic['pic_view_count'],
  		'PIC_COMMENTS' => $total_comments,
***************
*** 1331,1340 ****
  	// Prepare variables
  	// --------------------------------
  
! 	$comment_time = time();
! 	$comment_user_id = $userdata['user_id'];
! 	$comment_user_ip = $userdata['session_ip'];
! 
  
  	// --------------------------------
  	// Get $comment_id
--- 1308,1334 ----
  	// Prepare variables
  	// --------------------------------
+ 	switch (PORTAL_BACKEND)
+ 	{
+ 		case 'internal':
+ 				
+ 			$comment_time = time();
+ 			$comment_user_id = $mx_user->data['user_id'];
+ 			$comment_user_ip = $mx_user->data['session_ip'];;
+ 			break;
+ 					
+ 		case 'phpbb2':
  
! 			$comment_time = time();
! 			$comment_user_id = $userdata['user_id'];
! 			$comment_user_ip = $userdata['session_ip'];
! 			break;
  
+ 		case 'phpbb3':
+ 			$comment_time = time();
+ 			$comment_user_id = $mx_user->data['user_id'];
+ 			$comment_user_ip = album_encode_ip($mx_user->data['session_ip']);
+ 			break;
+ 	}	
+ 	
  	// --------------------------------
  	// Get $comment_id
***************
*** 1376,1380 ****
  		if( !$result = $db->sql_query($sql) )
  		{
! 			message_die(GENERAL_ERROR, 'Could not insert new entry', '', __LINE__, __FILE__, $sql);
  		}
  	}
--- 1370,1374 ----
  		if( !$result = $db->sql_query($sql) )
  		{
! 			mx_message_die(GENERAL_ERROR, 'Could not insert new entry', '', __LINE__, __FILE__, $sql);
  		}
  	}
***************
*** 1389,1394 ****
  		}
  
! 		$rate_user_id = $userdata['user_id'];
! 		$rate_user_ip = $userdata['session_ip'];
  
  		$sql = "INSERT INTO ". ALBUM_RATE_TABLE ." (rate_pic_id, rate_user_id, rate_user_ip, rate_point)
--- 1383,1406 ----
  		}
  
! 		switch (PORTAL_BACKEND)
! 		{
! 			case 'internal':
! 					
! 				$rate_user_id = $mx_user->data['user_id'];
! 				$rate_user_ip  = $mx_user->data['session_ip'];;
! 			break;
! 						
! 			case 'phpbb2':
! 
! 				$rate_user_id  = $userdata['user_id'];
! 				$rate_user_ip  = $userdata['session_ip'];
! 			break;
! 
! 			case 'phpbb3':
! 
! 				$rate_user_id  = $mx_user->data['user_id'];
! 				$rate_user_ip  = album_encode_ip($mx_user->data['session_ip']);
! 			break;
! 		}
  
  		$sql = "INSERT INTO ". ALBUM_RATE_TABLE ." (rate_pic_id, rate_user_id, rate_user_ip, rate_point)

Index: album_allpics.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_allpics.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_allpics.php	27 Mar 2008 14:31:06 -0000	1.3
--- album_allpics.php	29 Aug 2008 05:58:23 -0000	1.4
***************
*** 24,45 ****
  }
  
- $phpEx = substr(strrchr(__FILE__, '.'), 1);
- include_once($mx_root_path . 'common.'.$phpEx);
- 
- include($phpbb_root_path . 'includes/functions_validate.'.$phpEx);
- 
- // Start session management
- $mx_user->init($user_ip, PAGE_INDEX);
- // End session management
- 
- define('ALBUM_MOD_PATH', 'album_mod/');
- 
- // Get general album information
- if (!isset($album_root_path) || empty($album_root_path))
- {
- 	$album_root_path = $module_root_path . ALBUM_MOD_PATH . '';
- }
- 
- include_once($album_root_path . 'album_common.'.$phpEx);
  
  if (isset ($_POST['mode']))
--- 24,27 ----
***************
*** 461,465 ****
  				'U_PIC_CAT' => $image_cat_url,
  
! 				'TIME' => create_date2($board_config['default_dateformat'], $picrow[$j]['pic_time'], $board_config['board_timezone']),
  
  				'VIEW' => $picrow[$j]['pic_view_count'],
--- 443,447 ----
  				'U_PIC_CAT' => $image_cat_url,
  
! 				'TIME' => album_create_date($board_config['default_dateformat'], $picrow[$j]['pic_time'], $board_config['board_timezone']),
  
  				'VIEW' => $picrow[$j]['pic_view_count'],
***************
*** 479,483 ****
  				'MOVE' => ($userdata['user_level'] == ADMIN) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp" . '&mode=move&pic_id=' . $picrow[$j]['pic_id'])) . '">' . $lang['Move'] . '</a>' : '',
  
! 				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip2($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($picrow[$j]['pic_user_ip']) .'</a><br />' : ''
  				)
  			);
--- 461,465 ----
  				'MOVE' => ($userdata['user_level'] == ADMIN) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp" . '&mode=move&pic_id=' . $picrow[$j]['pic_id'])) . '">' . $lang['Move'] . '</a>' : '',
  
! 				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . album_decode_ip($picrow[$j]['pic_user_ip']) . '" target="_blank">' . album_decode_ip($picrow[$j]['pic_user_ip']) .'</a><br />' : ''
  				)
  			);

Index: album_comment_edit.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_comment_edit.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_comment_edit.php	13 Mar 2008 08:35:54 -0000	1.3
--- album_comment_edit.php	29 Aug 2008 05:58:24 -0000	1.4
***************
*** 202,206 ****
  	else
  	{
! 		$poster = '<a href="'. mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $thispic['user_id']) .'">'. $thispic['username'] .'</a>';
  	}
  
--- 202,206 ----
  	else
  	{
! 		$poster = album_get_profile_url('full', $thispic['user_id'], $thispic['username'], false);
  	}
  
***************
*** 223,255 ****
  	$image_rating = ImageRating($thispic['rating']);
  	
!     //begin shows smilies
!     $max_smilies = 20;
! 
!     $sql = 'SELECT emoticon, code, smile_url
!                  	FROM ' . SMILIES_TABLE . ' 
!                     GROUP BY smile_url
!                     ORDER BY smilies_id LIMIT ' . $max_smilies;
! 
!     if (!$result = $db->sql_query($sql))
!     {
!     	mx_message_die(GENERAL_ERROR, "Couldn't retrieve smilies list", '', __LINE__, __FILE__, $sql);
!     }
!     $smilies_count = $db->sql_numrows($result);
!     $smilies_data = $db->sql_fetchrowset($result);
          
- 
- 	for ($i = 1; $i < $smilies_count+1; $i++)
- 	{
- 	    $template->assign_block_vars('switch_comment_post.smilies', array(
- 	        'CODE' => $smilies_data[$i - 1]['code'],
- 	        'URL' => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smilies_data[$i - 1]['smile_url'],
- 	     	'DESC' => $smilies_data[$i - 1]['emoticon']
- 	    ));
- 	            
- 		if ( is_integer($i / 5) )
- 	    	$template->assign_block_vars('switch_comment_post.smilies.new_col', array());
- 
-     }
- 
  	$template->assign_vars(array(
  		'CAT_TITLE' => $thiscat['cat_title'],
--- 223,229 ----
  	$image_rating = ImageRating($thispic['rating']);
  	
! 	
! 	album_comment_sql_smilies(true);
          
  	$template->assign_vars(array(
  		'CAT_TITLE' => $thiscat['cat_title'],
***************
*** 262,266 ****
  		'PIC_DESC' => nl2br($thispic['pic_desc']),
  		'POSTER' => $poster,
! 		'PIC_TIME' => create_date($board_config['default_dateformat'], $thispic['pic_time'], $board_config['board_timezone']),
  		'PIC_VIEW' => $thispic['pic_view_count'],
  		'PIC_COMMENTS' => $total_comments,
--- 236,240 ----
  		'PIC_DESC' => nl2br($thispic['pic_desc']),
  		'POSTER' => $poster,
! 		'PIC_TIME' => album_create_date($board_config['default_dateformat'], $thispic['pic_time'], $board_config['board_timezone']),
  		'PIC_VIEW' => $thispic['pic_view_count'],
  		'PIC_COMMENTS' => $total_comments,

Index: album_cat.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_cat.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_cat.php	27 Mar 2008 14:31:07 -0000	1.4
--- album_cat.php	29 Aug 2008 05:58:23 -0000	1.5
***************
*** 241,248 ****
  if ($thiscat['cat_moderator_groups'] != '')
  {
  	// Get the namelist of moderator usergroups
! 	$sql = "SELECT group_id, group_name, group_type, group_single_user
  			FROM " . GROUPS_TABLE . "
! 			WHERE group_single_user <> 1
  				AND group_type <> ". GROUP_HIDDEN ."
  				AND group_id IN (". $thiscat['cat_moderator_groups'] .")
--- 241,260 ----
  if ($thiscat['cat_moderator_groups'] != '')
  {
+ 	switch (PORTAL_BACKEND)
+ 	{
+ 		case 'internal':
+ 		case 'phpbb2':
+ 			$sql_where = 'group_single_user <> " . true . "';
+ 		break;
+ 
+ 		case 'phpbb3':
+ 			$sql_where = 'group_id <> " . true . "';
+ 		break;
+ 	}
+ 	
  	// Get the namelist of moderator usergroups
! 	$sql = "SELECT *
  			FROM " . GROUPS_TABLE . "
! 			WHERE " . $sql_where . "
  				AND group_type <> ". GROUP_HIDDEN ."
  				AND group_id IN (". $thiscat['cat_moderator_groups'] .")

Index: album_modcp.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_modcp.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_modcp.php	10 Jul 2008 22:23:51 -0000	1.4
--- album_modcp.php	29 Aug 2008 05:58:24 -0000	1.5
***************
*** 344,348 ****
  			else
  			{
! 				$pic_poster = '<a href="'. mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $picrow[$i]['user_id']) .'">'. $picrow[$i]['username'] .'</a>';
  			}
  
--- 344,348 ----
  			else
  			{
! 				$pic_poster = album_get_profile_url('full', $picrow[$j]['user_id'], $picrow[$j]['username'], false);
  			}
  

Index: album_upload.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_upload.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_upload.php	13 Mar 2008 08:35:59 -0000	1.3
--- album_upload.php	29 Aug 2008 05:58:24 -0000	1.4
***************
*** 342,349 ****
  	//
  	$page_title = $lang['Album'];
! 	 if ( !$is_block )
!  {
! 	include($mx_root_path . 'includes/page_header.'.$phpEx);
!  }
  
  
--- 342,350 ----
  	//
  	$page_title = $lang['Album'];
! 
! 	if ( !$is_block )
! 	{
! 		include($mx_root_path . 'includes/page_header.'.$phpEx);
! 	}
  
  
***************
*** 480,486 ****
  
  	 if ( !$is_block )
!  {
! 	include($mx_root_path . 'includes/page_tail.'.$phpEx);
!  }
  
  }
--- 481,487 ----
  
  	 if ( !$is_block )
! 	{
! 		include($mx_root_path . 'includes/page_tail.'.$phpEx);
! 	}
  
  }

Index: album_search.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_search.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_search.php	13 Mar 2008 08:35:58 -0000	1.3
--- album_search.php	29 Aug 2008 05:58:24 -0000	1.4
***************
*** 188,192 ****
  					$template->assign_block_vars('switch_search_results.search_results', array(
  						'L_USERNAME' => $row['pic_username'],
! 						'U_PROFILE' => mx_append_sid($phpbb_root_path . 'profile.' . $phpEx . '?mode=viewprofile&u=' . $row['pic_user_id']),
  
  						'L_CAT' => ($row['cat_user_id'] != ALBUM_PUBLIC_GALLERY ) ? $lang['Users_Personal_Galleries'] : $row['cat_title'],
--- 188,192 ----
  					$template->assign_block_vars('switch_search_results.search_results', array(
  						'L_USERNAME' => $row['pic_username'],
! 						'U_PROFILE' => mx_append_sid(album_get_profile_url('profile', $row['pic_user_id'], false, false)),
  
  						'L_CAT' => ($row['cat_user_id'] != ALBUM_PUBLIC_GALLERY ) ? $lang['Users_Personal_Galleries'] : $row['cat_title'],

Index: album_comment.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_comment.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_comment.php	27 Mar 2008 14:31:09 -0000	1.4
--- album_comment.php	29 Aug 2008 05:58:23 -0000	1.5
***************
*** 15,19 ****
  }
  
- include($phpbb_root_path . 'includes/functions_validate.'.$phpEx);
  
  // ------------------------------------
--- 15,18 ----
***************
*** 277,281 ****
  			else
  			{
! 				$poster = '<a href="'. mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $commentrow[$i]['user_id']) .'">'. $commentrow[$i]['username'] .'</a>';
  			}
  
--- 276,280 ----
  			else
  			{
! 				$poster = album_get_profile_url('full', $commentrow[$i]['user_id'], $commentrow[$i]['username'], false);
  			}
  
***************
*** 349,353 ****
  	else
  	{
! 		$poster = '<a href="'. mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $thispic['user_id']) .'">'. $thispic['username'] .'</a>';
  	}
  
--- 348,352 ----
  	else
  	{
! 		$poster = album_get_profile_url('full', $thispic['user_id'], $thispic['username'], false);
  	}
  

Index: album_page.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_page.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_page.php	13 Mar 2008 08:35:56 -0000	1.3
--- album_page.php	29 Aug 2008 05:58:24 -0000	1.4
***************
*** 215,219 ****
  else
  {
! 	$poster = '<a href="'. mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $thispic['user_id']) .'">'. $thispic['username'] .'</a>';
  }
  
--- 215,219 ----
  else
  {
! 	$poster = album_get_profile_url('full', $thispic['user_id'], $thispic['username'], false);
  }
  

Index: album_rate.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_rate.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_rate.php	13 Mar 2008 08:35:57 -0000	1.3
--- album_rate.php	29 Aug 2008 05:58:24 -0000	1.4
***************
*** 197,201 ****
  	else
  	{
! 		$poster = '<a href="'. mx_append_sid($phpbb_root_path ."profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $thispic['user_id']) .'">'. $thispic['username'] .'</a>';
  	}
  
--- 197,201 ----
  	else
  	{
! 		$poster = album_get_profile_url('full', $thispic['user_id'], $thispic['username'], false);
  	}
  

Index: album_otf.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_otf.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** album_otf.php	13 Mar 2008 08:35:56 -0000	1.3
--- album_otf.php	29 Aug 2008 05:58:24 -0000	1.4
***************
*** 21,77 ****
  }
  
- if( !$is_block)
- {
- 	if( empty($mx_root_path))
- 	{
- 		$module_root_path = '../';
- 		$mx_root_path = $module_root_path . '../../';
- 	}
- }
- 
- 
- $phpEx = substr(strrchr(__FILE__, '.'), 1);
- include_once($mx_root_path . 'common.'.$phpEx);
- 
- include($phpbb_root_path . 'includes/functions_validate.'.$phpEx);
- 
- // Start session management
- // $mx_user->init($user_ip, PAGE_INDEX);
- 
- /*
- if ( !$userdata['session_logged_in'] )
- {
- mx_redirect(mx_append_sid($mx_root_path . "login.php?redirect=" . this_smartor_mxurl("smartor_mode=album_otf"), true));
- }
- */
- 
- /*
- if ( !($userdata['user_level'] == ADMIN) )
- {
- 	mx_message_die(GENERAL_MESSAGE, $lang['Not_admin']);
- }
- */
- // End session management
- 
- define('ALBUM_MOD_PATH', 'album_mod/');
- 
- // Get general album information
- if (!isset($album_root_path) || empty($album_root_path))
- {
- 	$album_root_path = $module_root_path . ALBUM_MOD_PATH . '';
- }
- 
- include_once($album_root_path . 'album_common.'.$phpEx);
- 
  // **********************************************************************
  // Read admin language definition
  // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
  {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
  }
  else
  {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  }
  
--- 21,34 ----
  }
  
  // **********************************************************************
  // Read admin language definition
  // **********************************************************************
! if ( !file_exists($album_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx) )
  {
! 	include($album_root_path . 'language/lang_english/lang_admin.' . $phpEx);
  }
  else
  {
! 	include($album_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx);
  }
  

Index: album_cat_sort.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_cat_sort.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_cat_sort.php	27 Mar 2008 14:31:07 -0000	1.4
--- album_cat_sort.php	29 Aug 2008 05:58:23 -0000	1.5
***************
*** 47,51 ****
  else
  {
! 	message_die(GENERAL_ERROR, 'No categories specified');
  }
  //
--- 47,51 ----
  else
  {
! 	mx_message_die(GENERAL_ERROR, 'No categories specified');
  }
  //
***************
*** 119,123 ****
  if( !($result = $db->sql_query($sql)) )
  {
! 	message_die(GENERAL_ERROR, 'Could not query category information', '', __LINE__, __FILE__, $sql);
  }
  
--- 119,123 ----
  if( !($result = $db->sql_query($sql)) )
  {
! 	mx_message_die(GENERAL_ERROR, 'Could not query category information', '', __LINE__, __FILE__, $sql);
  }
  
***************
*** 148,152 ****
  {
  	$return_url = this_smartor_mxurl('smartor_mode=album_cat&cat_id=$cat_id&amp;sort_method=$sort_method&amp;sort_order=$sort_order&initial=all');
! 	message_die(GENERAL_MESSAGE, $lang['Category_empty'] . '<meta http-equiv="refresh" content="3; url='. $return_url .'">' );
  }
  
--- 148,152 ----
  {
  	$return_url = this_smartor_mxurl('smartor_mode=album_cat&cat_id=$cat_id&amp;sort_method=$sort_method&amp;sort_order=$sort_order&initial=all');
! 	mx_message_die(GENERAL_MESSAGE, $lang['Category_empty'] . '<meta http-equiv="refresh" content="3; url='. $return_url .'">' );
  }
  
***************
*** 163,167 ****
  	else
  	{
! 		message_die(GENERAL_ERROR, $lang['Not_Authorised']);
  	}
  }
--- 163,167 ----
  	else
  	{
! 		mx_message_die(GENERAL_ERROR, $lang['Not_Authorised']);
  	}
  }
***************
*** 212,219 ****
  if ($thiscat['cat_moderator_groups'] != '')
  {
  	// Get the namelist of moderator usergroups
! 	$sql = "SELECT group_id, group_name, group_type, group_single_user
  			FROM " . GROUPS_TABLE . "
! 			WHERE group_single_user <> 1
  				AND group_type <> ". GROUP_HIDDEN ."
  				AND group_id IN (". $thiscat['cat_moderator_groups'] .")
--- 212,231 ----
  if ($thiscat['cat_moderator_groups'] != '')
  {
+ 	switch (PORTAL_BACKEND)
+ 	{
+ 		case 'internal':
+ 		case 'phpbb2':
+ 			$sql_where = 'group_single_user <> " . true . "';
+ 		break;
+ 
+ 		case 'phpbb3':
+ 			$sql_where = 'group_id <> " . true . "';
+ 		break;
+ 	}
+ 	
  	// Get the namelist of moderator usergroups
! 	$sql = "SELECT *
  			FROM " . GROUPS_TABLE . "
! 			WHERE " . $sql_where . "
  				AND group_type <> ". GROUP_HIDDEN ."
  				AND group_id IN (". $thiscat['cat_moderator_groups'] .")
***************
*** 221,225 ****
  	if ( !$result = $db->sql_query($sql) )
  	{
! 		message_die(GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql);
  	}
  
--- 233,237 ----
  	if ( !$result = $db->sql_query($sql) )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Could not get group list', '', __LINE__, __FILE__, $sql);
  	}
  
***************
*** 390,394 ****
  	if( !($result = $db->sql_query($sql)) )
  	{
! 		message_die(GENERAL_ERROR, 'Could not query pics information', '', __LINE__, __FILE__, $sql);
  	}
  
--- 402,406 ----
  	if( !($result = $db->sql_query($sql)) )
  	{
! 		mx_message_die(GENERAL_ERROR, 'Could not query pics information', '', __LINE__, __FILE__, $sql);
  	}
  
***************
*** 449,453 ****
  			else
  			{
! 				$pic_poster = '<a href="'. mx_append_sid("profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $picrow[$j]['user_id']) .'">'. $picrow[$j]['username'] .'</a>';
  			}
  
--- 461,465 ----
  			else
  			{
! 				$pic_poster = album_get_profile_url('full', $picrow[$j]['user_id'], $picrow[$j]['username'], false);
  			}
  

[mxbb-commits] mx_smartor album.php, 1.24, 1.25 album_lists.php, 1.25, 1.26 db_install.php, 1.22, 1.23 db_upgrade.php, 1.22, 1.23 welcome.php, 1.12, 1.13

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

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

Modified Files:
	album.php album_lists.php db_install.php db_upgrade.php 
	welcome.php 
Log Message:
Upgrade

Index: album.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** album.php	13 Mar 2008 08:35:53 -0000	1.24
--- album.php	29 Aug 2008 05:58:22 -0000	1.25
***************
*** 166,171 ****
  	{
  		define('IN_PORTAL', true);
  		$mx_root_path = '../../';
! 		$module_root_path = './';
  
  		//
--- 166,173 ----
  	{
  		define('IN_PORTAL', true);
+ 		define('MXBB_MODULE', true);
+ 		
  		$mx_root_path = '../../';
! 		$module_root_path = $mx_root_path . 'modules/mx_smartor/';
  
  		//
***************
*** 173,184 ****
  		//
  		$phpEx = substr(strrchr(__FILE__, '.'), 1);
! 		include_once($mx_root_path . 'common.' . $phpEx);
  		//
! 		// Start session management
  		//
! 		$mx_user->init($user_ip, PAGE_INDEX); 
  		//
! 		// End session management
  		//
  		$block_id = ( !empty($HTTP_GET_VARS['block_id']) ) ? $HTTP_GET_VARS['block_id'] : $HTTP_POST_VARS['id'];
  		if( empty($block_id) )
--- 175,205 ----
  		//
  		$phpEx = substr(strrchr(__FILE__, '.'), 1);
! 		include($mx_root_path . 'common.' . $phpEx);
! 
  		//
! 		// Page selector
  		//
! 		$page_id = $mx_request_vars->request('page', MX_TYPE_INT, 1);
! 
  		//
! 		// Start user session
! 		// - populate $userdata and $lang
! 		//
! 		$mx_user->init($user_ip, $page_id, false);
! 
! 		//
! 		// Load and instatiate CORE (page) and block classes
! 		//
! 		$mx_page->init($page_id);
! 
! 		//
! 		// Initiate user style (template + theme) management
! 		// - populate $theme, $images and initiate $template.
  		//
+ 		$mx_user->page_id = $page_id;
+ 		$mx_user->user_ip = $user_ip;
+ 		$mx_user->_init_userprefs();
+ 		$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) )
***************
*** 195,199 ****
  	}
  	else
! 	{
  		//
  		// Read block Configuration
--- 216,221 ----
  	}
  	else
! 	{	
! 		define('MXBB_MODULE', true);
  		//
  		// Read block Configuration
***************
*** 608,615 ****
  	$page_title = $lang['Album'];
  
! 		if ( !is_object($mx_block))
! 	 	{
! 			include($mx_root_path . 'includes/page_header.'.$phpEx);
! 	 	}
  
  		$template->set_filenames(array(
--- 630,634 ----
  	$page_title = $lang['Album'];
  
! 	album_page_header();
  
  		$template->set_filenames(array(
***************
*** 651,655 ****
  		}
  
! 		$otf_link = ( $userdata['user_level'] == ADMIN ) ? append_sid(this_smartor_mxurl("smartor_mode=album_otf" . '&sid=' . $userdata['session_id'])) : append_sid(this_smartor_mxurl("smartor_mode=album_otf"));
  
  		$template->assign_vars(array(
--- 670,674 ----
  		}
  
! 		$otf_link = ( $userdata['user_level'] == ADMIN ) ? mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf" . '&sid=' . $userdata['session_id'])) : mx_append_sid(this_smartor_mxurl("smartor_mode=album_otf"));
  
  		$template->assign_vars(array(
***************
*** 673,677 ****
  			'L_ALBUM_ALLPICS' => $lang['All_Picture_List_Of_User'],
  			'L_ALBUM_OTF' => $lang['Pic_Gallery'],
! 			'U_ALBUM_ALLPICS' => append_sid(this_smartor_mxurl("smartor_mode=album_allpics")),
  			'OTF_LINK' => $otf_link,
  			'U_ALBUM_OTF' => $otf_link,
--- 692,696 ----
  			'L_ALBUM_ALLPICS' => $lang['All_Picture_List_Of_User'],
  			'L_ALBUM_OTF' => $lang['Pic_Gallery'],
! 			'U_ALBUM_ALLPICS' => mx_append_sid(this_smartor_mxurl("smartor_mode=album_allpics")),
  			'OTF_LINK' => $otf_link,
  			'U_ALBUM_OTF' => $otf_link,
***************
*** 702,709 ****
  	$template->pparse('body');
  
! 	if ( !is_object($mx_block))
! 	{
! 		include($mx_root_path . 'includes/page_tail.'.$phpEx);
! 	}
  }
  ?>
\ No newline at end of file
--- 721,725 ----
  	$template->pparse('body');
  
! 	album_page_footer();
  }
  ?>
\ No newline at end of file

Index: album_lists.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_lists.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** album_lists.php	27 Mar 2008 14:30:59 -0000	1.25
--- album_lists.php	29 Aug 2008 05:58:23 -0000	1.26
***************
*** 186,195 ****
  					else
  					{
! 						$pic_preview = 'onmouseover="showtrail(\''. append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $recentrow[$j]['pic_id'])) . '\',\'' . addslashes($recentrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"';
  					}
  
  					$template->assign_block_vars('recent_pics_block.recent_pics.recent_col', array(
! 						'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_fap_toplisturl("smartor_mode=album_pic&pic_id=". $recentrow[$j]['pic_id'], true)) : append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $recentrow[$j]['pic_id'], false)),
! 						'THUMBNAIL' => append_sid(this_fap_toplisturl("smartor_mode=album_thumbnail&pic_id=". $recentrow[$j]['pic_id'], TRUE)),
  						'PIC_PREVIEW' => $pic_preview,
  						'DESC' => $recentrow[$j]['pic_desc']
--- 186,195 ----
  					else
  					{
! 						$pic_preview = 'onmouseover="showtrail(\''. mx_append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $recentrow[$j]['pic_id'])) . '\',\'' . addslashes($recentrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"';
  					}
  
  					$template->assign_block_vars('recent_pics_block.recent_pics.recent_col', array(
! 						'U_PIC' => ($album_config['fullpic_popup']) ? mx_append_sid(this_fap_toplisturl("smartor_mode=album_pic&pic_id=". $recentrow[$j]['pic_id'], true)) : mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $recentrow[$j]['pic_id'], false)),
! 						'THUMBNAIL' => mx_append_sid(this_fap_toplisturl("smartor_mode=album_thumbnail&pic_id=". $recentrow[$j]['pic_id'], TRUE)),
  						'PIC_PREVIEW' => $pic_preview,
  						'DESC' => $recentrow[$j]['pic_desc']
***************
*** 203,207 ****
  					else
  					{
! 						$recent_poster = '<a href="'. append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $recentrow[$j]['user_id']) .'">'. $recentrow[$j]['username'] .'</a>';
  					}
  					
--- 203,207 ----
  					else
  					{
! 						$recent_poster = '<a href="'. mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $recentrow[$j]['user_id']) .'">'. $recentrow[$j]['username'] .'</a>';
  					}
  					
***************
*** 216,220 ****
  
  						'RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ',&nbsp;') : '',
! 						'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $recentrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $recentrow[$j]['comments'] . '<br />') : ''
  
  //						'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($recentrow[$j]['pic_user_ip']) .'</a><br />' : ''
--- 216,220 ----
  
  						'RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ',&nbsp;') : '',
! 						'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $recentrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $recentrow[$j]['comments'] . '<br />') : ''
  
  //						'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($recentrow[$j]['pic_user_ip']) .'</a><br />' : ''
***************
*** 307,316 ****
  					else
  					{
! 						$pic_preview = 'onmouseover="showtrail(\''. append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $mostrow[$j]['pic_id'])) . '\',\'' . addslashes($mostrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"';
  					}
  
  					$template->assign_block_vars('most_pics_block.most_pics.most_col', array(
! 						'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_fap_toplisturl("smartor_mode=album_pic&pic_id=". $mostrow[$j]['pic_id'], true)) : append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $mostrow[$j]['pic_id'], false)),
! 						'THUMBNAIL' => append_sid(this_fap_toplisturl("smartor_mode=album_thumbnail&pic_id=". $mostrow[$j]['pic_id'], TRUE)),
  						'PIC_PREVIEW' => $pic_preview,
  						'DESC' => $mostrow[$j]['pic_desc']
--- 307,316 ----
  					else
  					{
! 						$pic_preview = 'onmouseover="showtrail(\''. mx_append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $mostrow[$j]['pic_id'])) . '\',\'' . addslashes($mostrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"';
  					}
  
  					$template->assign_block_vars('most_pics_block.most_pics.most_col', array(
! 						'U_PIC' => ($album_config['fullpic_popup']) ? mx_append_sid(this_fap_toplisturl("smartor_mode=album_pic&pic_id=". $mostrow[$j]['pic_id'], true)) : mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $mostrow[$j]['pic_id'], false)),
! 						'THUMBNAIL' => mx_append_sid(this_fap_toplisturl("smartor_mode=album_thumbnail&pic_id=". $mostrow[$j]['pic_id'], TRUE)),
  						'PIC_PREVIEW' => $pic_preview,
  						'DESC' => $mostrow[$j]['pic_desc']
***************
*** 324,328 ****
  					else
  					{
! 						$most_poster = '<a href="'. append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $mostrow[$j]['user_id']) .'">'. $mostrow[$j]['username'] .'</a>';
  					}
  					
--- 324,328 ----
  					else
  					{
! 						$most_poster = '<a href="'. mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $mostrow[$j]['user_id']) .'">'. $mostrow[$j]['username'] .'</a>';
  					}
  					
***************
*** 337,341 ****
  
  						'RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ',&nbsp;') : '',
! 						'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $mostrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $mostrow[$j]['comments'] . '<br />') : ''
  
  //						'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($recentrow[$j]['pic_user_ip']) .'</a><br />' : ''
--- 337,341 ----
  
  						'RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ',&nbsp;') : '',
! 						'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $mostrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $mostrow[$j]['comments'] . '<br />') : ''
  
  //						'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($recentrow[$j]['pic_user_ip']) .'</a><br />' : ''
***************
*** 427,436 ****
  					else
  					{
! 						$pic_preview = 'onmouseover="showtrail(\''. append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $highestrow[$j]['pic_id'])) . '\',\'' . addslashes($highestrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"';
  					}
  
  					$template->assign_block_vars('highest_pics_block.highest_pics.highest_col', array( 
! 						'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_fap_toplisturl("smartor_mode=album_pic&pic_id=". $highestrow[$j]['pic_id'], true)) : append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $highestrow[$j]['pic_id'], false)), 
! 						'THUMBNAIL' => append_sid(this_fap_toplisturl("smartor_mode=album_thumbnail&pic_id=". $highestrow[$j]['pic_id'], TRUE)), 
  						'PIC_PREVIEW' => $pic_preview,
  						'DESC' => $highestrow[$j]['pic_desc'] 
--- 427,436 ----
  					else
  					{
! 						$pic_preview = 'onmouseover="showtrail(\''. mx_append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $highestrow[$j]['pic_id'])) . '\',\'' . addslashes($highestrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"';
  					}
  
  					$template->assign_block_vars('highest_pics_block.highest_pics.highest_col', array( 
! 						'U_PIC' => ($album_config['fullpic_popup']) ? mx_append_sid(this_fap_toplisturl("smartor_mode=album_pic&pic_id=". $highestrow[$j]['pic_id'], true)) : mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $highestrow[$j]['pic_id'], false)), 
! 						'THUMBNAIL' => mx_append_sid(this_fap_toplisturl("smartor_mode=album_thumbnail&pic_id=". $highestrow[$j]['pic_id'], TRUE)), 
  						'PIC_PREVIEW' => $pic_preview,
  						'DESC' => $highestrow[$j]['pic_desc'] 
***************
*** 444,448 ****
  					else 
  					{
! 						$highest_poster = '<a href="'. append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $highestrow[$j]['user_id']) .'">'. $highestrow[$j]['username'] .'</a>'; 
  					}
  			
--- 444,448 ----
  					else 
  					{
! 						$highest_poster = '<a href="'. mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&". POST_USERS_URL .'='. $highestrow[$j]['user_id']) .'">'. $highestrow[$j]['username'] .'</a>'; 
  					}
  			
***************
*** 456,460 ****
  						'H_VIEW' => $highestrow[$j]['pic_view_count'], 
  						'H_RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ',&nbsp;') : '', 
! 						'H_COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $highestrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $highestrow[$j]['comments'] . '<br />') : ''
  
  //	 					'H_IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($highestrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($highestrow[$j]['pic_user_ip']) .'</a><br />' : '' 
--- 456,460 ----
  						'H_VIEW' => $highestrow[$j]['pic_view_count'], 
  						'H_RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ',&nbsp;') : '', 
! 						'H_COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $highestrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $highestrow[$j]['comments'] . '<br />') : ''
  
  //	 					'H_IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($highestrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($highestrow[$j]['pic_user_ip']) .'</a><br />' : '' 
***************
*** 546,555 ****
  					else
  					{
! 						$pic_preview = 'onmouseover="showtrail(\''. append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $randrow[$j]['pic_id'])) . '\',\'' . addslashes($randrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"';
  					}
  
  					$template->assign_block_vars('random_pics_block.rand_pics.rand_col', array(
! 						'U_PIC' => ($album_config['fullpic_popup']) ? append_sid(this_fap_toplisturl("smartor_mode=album_pic&pic_id=". $randrow[$j]['pic_id'], true)) : append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $randrow[$j]['pic_id'], false)),
! 						'THUMBNAIL' => append_sid(this_fap_toplisturl("smartor_mode=album_thumbnail&pic_id=". $randrow[$j]['pic_id'], TRUE)),
  						'PIC_PREVIEW' => $pic_preview,
  						'DESC' => $randrow[$j]['pic_desc']
--- 546,555 ----
  					else
  					{
! 						$pic_preview = 'onmouseover="showtrail(\''. mx_append_sid(this_fap_addonurl("smartor_mode=album_picm&pic_id=" . $randrow[$j]['pic_id'])) . '\',\'' . addslashes($randrow[$j]['pic_title']) . '\', ' . $album_sp_config['midthumb_width'] . ', ' . $album_sp_config['midthumb_height'] . ')" onmouseout="hidetrail()"';
  					}
  
  					$template->assign_block_vars('random_pics_block.rand_pics.rand_col', array(
! 						'U_PIC' => ($album_config['fullpic_popup']) ? mx_append_sid(this_fap_toplisturl("smartor_mode=album_pic&pic_id=". $randrow[$j]['pic_id'], true)) : mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $randrow[$j]['pic_id'], false)),
! 						'THUMBNAIL' => mx_append_sid(this_fap_toplisturl("smartor_mode=album_thumbnail&pic_id=". $randrow[$j]['pic_id'], TRUE)),
  						'PIC_PREVIEW' => $pic_preview,
  						'DESC' => $randrow[$j]['pic_desc']
***************
*** 563,567 ****
  					else
  					{
! 						$rand_poster = '<a href="'. append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $randrow[$j]['user_id']) .'">'. $randrow[$j]['username'] .'</a>';
  					}
  					
--- 563,567 ----
  					else
  					{
! 						$rand_poster = '<a href="'. mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;". POST_USERS_URL .'='. $randrow[$j]['user_id']) .'">'. $randrow[$j]['username'] .'</a>';
  					}
  					
***************
*** 579,583 ****
  						'RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ',&nbsp;') : '',
  
! 						'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $randrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $randrow[$j]['comments'] . '<br />') : ''
  
  //						'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($randrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($randrow[$j]['pic_user_ip']) .'</a><br />' : ''
--- 579,583 ----
  						'RATING' => ($album_config['rate'] == 1) ? ( $lang['Rating'] . ': ' . $rating_image . ',&nbsp;') : '',
  
! 						'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="'. mx_append_sid(this_fap_toplisturl("smartor_mode=album_showpage&pic_id=". $randrow[$j]['pic_id'], TRUE)) . '">' . $lang['Comments'] . '</a>: ' . $randrow[$j]['comments'] . '<br />') : ''
  
  //						'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://www.nic.com/cgi-bin/whois.cgi?query=' . decode_ip2($randrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($randrow[$j]['pic_user_ip']) .'</a><br />' : ''
***************
*** 626,633 ****
  	'L_LAST_PIC' => $lang['Last_Pic'],
  
! 	'U_YOUR_PERSONAL_GALLERY' => append_sid(this_fap_toplisturl("smartor_mode=album_personal&user_id=". $userdata['user_id'])),
  	'L_YOUR_PERSONAL_GALLERY' => $lang['Your_Personal_Gallery'],
  
! 	'U_USERS_PERSONAL_GALLERIES' => append_sid(this_fap_toplisturl("smartor_mode=album_personal_index")),
  	'L_USERS_PERSONAL_GALLERIES' => $lang['Users_Personal_Galleries'],
  
--- 626,633 ----
  	'L_LAST_PIC' => $lang['Last_Pic'],
  
! 	'U_YOUR_PERSONAL_GALLERY' => mx_append_sid(this_fap_toplisturl("smartor_mode=album_personal&user_id=". $userdata['user_id'])),
  	'L_YOUR_PERSONAL_GALLERY' => $lang['Your_Personal_Gallery'],
  
! 	'U_USERS_PERSONAL_GALLERIES' => mx_append_sid(this_fap_toplisturl("smartor_mode=album_personal_index")),
  	'L_USERS_PERSONAL_GALLERIES' => $lang['Users_Personal_Galleries'],
  

Index: welcome.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/welcome.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** welcome.php	8 Feb 2008 10:47:59 -0000	1.12
--- welcome.php	29 Aug 2008 05:58:23 -0000	1.13
***************
*** 302,306 ****
  	}
  }
! $user_link = ( $user_id != ANONYMOUS ) ? '<a href="' . append_sid(PHPBB_URL."profile.$phpEx?mode=editprofile&amp;".$user_id).'">'.$username.'</a>' : $lang['Guest'];
  
  if( $report_page == 0 )
--- 302,306 ----
  	}
  }
! $user_link = ( $user_id != ANONYMOUS ) ? '<a href="' . mx_append_sid(PHPBB_URL."profile.$phpEx?mode=editprofile&amp;".$user_id).'">'.$username.'</a>' : $lang['Guest'];
  
  if( $report_page == 0 )
***************
*** 312,317 ****
  	$u_view_topics = PORTAL_URL.'index.'.$phpEx.'?page='.$report_page.'&amp;report_id=';
  }
! $u_unread = append_sid($u_view_topics.'unread');
! $u_egostarted = append_sid($u_view_topics.'egostarted');
  
  //
--- 312,317 ----
  	$u_view_topics = PORTAL_URL.'index.'.$phpEx.'?page='.$report_page.'&amp;report_id=';
  }
! $u_unread = mx_append_sid($u_view_topics.'unread');
! $u_egostarted = mx_append_sid($u_view_topics.'egostarted');
  
  //
***************
*** 324,328 ****
  	'AVATAR_IMG'			=> $avatar_img,
  
! 	'S_LOGIN_ACTION'		=> append_sid(PORTAL_URL.'login.'.$phpEx),
  	'L_USERNAME'			=> $lang['Username'],
  	'L_PASSWORD'			=> $lang['Password'],
--- 324,328 ----
  	'AVATAR_IMG'			=> $avatar_img,
  
! 	'S_LOGIN_ACTION'		=> mx_append_sid(PORTAL_URL.'login.'.$phpEx),
  	'L_USERNAME'			=> $lang['Username'],
  	'L_PASSWORD'			=> $lang['Password'],
***************
*** 330,336 ****
  	'L_LOG_ME_IN'			=> $lang['Log_me_in'],
  	'L_FORGOTTEN_PSW'		=> $lang['Forgotten_password'],
! 	'U_FORGOTTEN_PSW'		=> append_sid(PHPBB_URL.'profile.'.$phpEx.'?mode=sendpassword'),
  	'L_REGISTER'			=> $lang['Register'],
! 	'U_REGISTER'			=> append_sid(PHPBB_URL.'profile.'.$phpEx.'?mode=register'),
  	'L_REGISTER_MSG'		=> $register_msg,
  
--- 330,336 ----
  	'L_LOG_ME_IN'			=> $lang['Log_me_in'],
  	'L_FORGOTTEN_PSW'		=> $lang['Forgotten_password'],
! 	'U_FORGOTTEN_PSW'		=> mx_append_sid(PHPBB_URL.'profile.'.$phpEx.'?mode=sendpassword'),
  	'L_REGISTER'			=> $lang['Register'],
! 	'U_REGISTER'			=> mx_append_sid(PHPBB_URL.'profile.'.$phpEx.'?mode=register'),
  	'L_REGISTER_MSG'		=> $register_msg,
  
***************
*** 338,362 ****
  
  	'L_SEARCH_NEW'			=> ( isset($s_search_new) ) ? $s_search_new : $lang['Posts_since_last_visit'],
! 	'U_SEARCH_NEW'			=> append_sid(PHPBB_URL.'search.'.$phpEx.'?search_id=newposts'),
  	'L_SEARCH_UNREAD'		=> ( isset($s_search_unread) ) ? $s_search_unread : $lang['Search_unread'],
  	'U_SEARCH_UNREAD'		=> $u_unread,
  	'L_SEARCH_LATEST'		=> $lang['View_latest'],
! 	'U_SEARCH_LATEST_24'	=> append_sid($u_view_topics.'24h'),
! 	'U_SEARCH_LATEST_48'	=> append_sid($u_view_topics.'48h'),
! 	'U_SEARCH_LATEST_72'	=> append_sid($u_view_topics.'72h'),
  	'L_SEARCH_SELF_TOPICS'	=> $lang['Search_self_topics'],
  	'U_SEARCH_SELF_TOPICS'	=> $u_egostarted,
  	'L_SEARCH_SELF_POSTS'	=> $lang['Search_self_posts'],
! 	'U_SEARCH_SELF_POSTS'	=> append_sid(PHPBB_URL.'search.'.$phpEx.'?search_id=egosearch'),
  	'L_SEARCH_UNANSWERED'	=> $lang['Search_unanswered'],
! 	'U_SEARCH_UNANSWERED'	=> append_sid(PHPBB_URL.'search.'.$phpEx.'?search_id=unanswered'),
  	'L_MARK_FORUMS_READ'	=> $lang['Mark_all_forums'],
! 	'U_MARK_READ'			=> append_sid(PHPBB_URL.'index.'.$phpEx . "?mark=forums"),
  
  	'L_TOTAL_PICS'			=> sprintf($lang['Total_Personal_Pics'], $total_pics),
! 	'U_YOUR_PERSONAL_GALLERY' 	=> append_sid(this_fap_toplisturl("smartor_mode=album_personal&user_id=" . $user_id)),
  
  	'L_PRIVATE_MSGS'		=> $lang['Private_Messages'].'&nbsp;('.$userdata['user_new_privmsg'].')',
! 	'U_PRIVATE_MSGS'		=> append_sid(PHPBB_URL.'privmsg.'.$phpEx.'?folder=inbox'),
  
  	'LAST_VISIT_DATE'		=> sprintf($lang['You_last_visit'], $s_last_visit),
--- 338,362 ----
  
  	'L_SEARCH_NEW'			=> ( isset($s_search_new) ) ? $s_search_new : $lang['Posts_since_last_visit'],
! 	'U_SEARCH_NEW'			=> mx_append_sid(PHPBB_URL.'search.'.$phpEx.'?search_id=newposts'),
  	'L_SEARCH_UNREAD'		=> ( isset($s_search_unread) ) ? $s_search_unread : $lang['Search_unread'],
  	'U_SEARCH_UNREAD'		=> $u_unread,
  	'L_SEARCH_LATEST'		=> $lang['View_latest'],
! 	'U_SEARCH_LATEST_24'	=> mx_append_sid($u_view_topics.'24h'),
! 	'U_SEARCH_LATEST_48'	=> mx_append_sid($u_view_topics.'48h'),
! 	'U_SEARCH_LATEST_72'	=> mx_append_sid($u_view_topics.'72h'),
  	'L_SEARCH_SELF_TOPICS'	=> $lang['Search_self_topics'],
  	'U_SEARCH_SELF_TOPICS'	=> $u_egostarted,
  	'L_SEARCH_SELF_POSTS'	=> $lang['Search_self_posts'],
! 	'U_SEARCH_SELF_POSTS'	=> mx_append_sid(PHPBB_URL.'search.'.$phpEx.'?search_id=egosearch'),
  	'L_SEARCH_UNANSWERED'	=> $lang['Search_unanswered'],
! 	'U_SEARCH_UNANSWERED'	=> mx_append_sid(PHPBB_URL.'search.'.$phpEx.'?search_id=unanswered'),
  	'L_MARK_FORUMS_READ'	=> $lang['Mark_all_forums'],
! 	'U_MARK_READ'			=> mx_append_sid(PHPBB_URL.'index.'.$phpEx . "?mark=forums"),
  
  	'L_TOTAL_PICS'			=> sprintf($lang['Total_Personal_Pics'], $total_pics),
! 	'U_YOUR_PERSONAL_GALLERY' 	=> mx_append_sid(this_fap_toplisturl("smartor_mode=album_personal&user_id=" . $user_id)),
  
  	'L_PRIVATE_MSGS'		=> $lang['Private_Messages'].'&nbsp;('.$userdata['user_new_privmsg'].')',
! 	'U_PRIVATE_MSGS'		=> mx_append_sid(PHPBB_URL.'privmsg.'.$phpEx.'?folder=inbox'),
  
  	'LAST_VISIT_DATE'		=> sprintf($lang['You_last_visit'], $s_last_visit),

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/db_install.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** db_install.php	13 Mar 2008 08:35:53 -0000	1.22
--- db_install.php	29 Aug 2008 05:58:23 -0000	1.23
***************
*** 32,36 ****
  }
  
! $mx_module_version = '2.0.2';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';
  
--- 32,36 ----
  }
  
! $mx_module_version = '2.9.3';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';
  
***************
*** 112,116 ****
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_img_no_gd', '0')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('dynamic_pic_resampling', '1')";
! 	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_file_size_resampling', '1024000')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('switch_nuffload', '0')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('path_to_bin', './modules/mx_smartor/cgi-bin/')";
--- 112,116 ----
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_img_no_gd', '0')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('dynamic_pic_resampling', '1')";
! 	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_file_size_resampling', '5280000')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('switch_nuffload', '0')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('path_to_bin', './modules/mx_smartor/cgi-bin/')";
***************
*** 190,194 ****
  		pic_user_id mediumint(8) NOT NULL,
  		pic_username varchar(32),
! 		pic_user_ip char(8) NOT NULL DEFAULT '0',
  		pic_time int(11) UNSIGNED NOT NULL,
  		pic_cat_id mediumint(8) UNSIGNED NOT NULL DEFAULT '1',
--- 190,194 ----
  		pic_user_id mediumint(8) NOT NULL,
  		pic_username varchar(32),
! 		pic_user_ip varchar(40) DEFAULT '' NOT NULL,
  		pic_time int(11) UNSIGNED NOT NULL,
  		pic_cat_id mediumint(8) UNSIGNED NOT NULL DEFAULT '1',
***************
*** 205,209 ****
  		rate_pic_id int(11) UNSIGNED NOT NULL,
  		rate_user_id mediumint(8) NOT NULL,
! 		rate_user_ip char(8) NOT NULL,
  		rate_point tinyint(3) UNSIGNED NOT NULL,
  		KEY rate_pic_id (rate_pic_id),
--- 205,209 ----
  		rate_pic_id int(11) UNSIGNED NOT NULL,
  		rate_user_id mediumint(8) NOT NULL,
! 		rate_user_ip varchar(40) DEFAULT '' NOT NULL,
  		rate_point tinyint(3) UNSIGNED NOT NULL,
  		KEY rate_pic_id (rate_pic_id),
***************
*** 219,223 ****
  		comment_user_id mediumint(8) NOT NULL,
  		comment_username varchar(32),
! 		comment_user_ip char(8) NOT NULL,
  		comment_time int(11) UNSIGNED NOT NULL,
  		comment_text TEXT,
--- 219,223 ----
  		comment_user_id mediumint(8) NOT NULL,
  		comment_username varchar(32),
! 		comment_user_ip varchar(40) DEFAULT '' NOT NULL,
  		comment_time int(11) UNSIGNED NOT NULL,
  		comment_text TEXT,
***************
*** 268,272 ****
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('user_pics_limit', '50')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('mod_pics_limit', '250')";
! 	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_file_size', '128000')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_width', '1024')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_height', '768')";
--- 268,272 ----
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('user_pics_limit', '50')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('mod_pics_limit', '250')";
! 	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_file_size', '5280000')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_width', '1024')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_height', '768')";
***************
*** 332,336 ****
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_img_no_gd', '0')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('dynamic_pic_resampling', '1')";
! 	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_file_size_resampling', '1024000')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('switch_nuffload', '0')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('path_to_bin', './modules/mx_smartor/cgi-bin/')";
--- 332,336 ----
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('show_img_no_gd', '0')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('dynamic_pic_resampling', '1')";
! 	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('max_file_size_resampling', '5280000')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('switch_nuffload', '0')";
  	$sql[] = "INSERT INTO ".$mx_table_prefix."smartor_album_config VALUES ('path_to_bin', './modules/mx_smartor/cgi-bin/')";

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/db_upgrade.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** db_upgrade.php	13 Mar 2008 08:35:53 -0000	1.22
--- db_upgrade.php	29 Aug 2008 05:58:23 -0000	1.23
***************
*** 30,34 ****
  }
  
! $mx_module_version = '2.0.2';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';
  
--- 30,34 ----
  }
  
! $mx_module_version = '2.9.3';
  $mx_module_copy = 'Mx-Publisher <i> - smartor album FAP </i> module by Mighty Gorgon & <a href="http://www.mxbb.net" target="_blank">The Mx-Publisher Development Team</a>';
  

[mxbb-commits] mx_smartor/album_mod/includes album_header.php, NONE, 1.1 album_tail.php, NONE, 1.1 album_bbcode.php, 1.3, 1.4 album_constants.php, 1.9, 1.10 album_functions.php, 1.4, 1.5 album_hierarchy_sql.php, 1.4, 1.5

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

Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10881/album_mod/includes

Modified Files:
	album_bbcode.php album_constants.php album_functions.php 
	album_hierarchy_sql.php 
Added Files:
	album_header.php album_tail.php 
Log Message:
Upgrade

--- NEW FILE: album_header.php ---
<?php
/**
*
* @package MX-Publisher Core
* @version $Id: album_header.php,v 1.1 2008/08/29 05:58:23 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://www.mx-publisher.com
* @internal
*
*/

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

define('HEADER_INC', true);

/**********
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'] )
{
	$phpver = phpversion();

	$useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT');

	if ( $phpver >= '4.0.4pl1' && ( strstr($useragent,'compatible') || strstr($useragent,'Gecko') ) )
	{
		if ( extension_loaded('zlib') )
		{
			ob_end_clean();
			ob_start('ob_gzhandler');
		}
	}
	else if ( $phpver > '4.0' )
	{
		if ( strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') )
		{
			if ( extension_loaded('zlib') )
			{
				$do_gzip_compress = TRUE;
				ob_start();
				ob_implicit_flush(0);

				header('Content-Encoding: gzip');
			}
		}
	}
}
**********/

//
// 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/'. $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.
//
$layouttemplate->set_filenames(array(
	'overall_header' => "album_header.$tplEx")
);

//
// Generate logged in/logged out status
//
switch (PORTAL_BACKEND)
{
	case 'internal':
	case 'phpbb2':

		if ( $userdata['session_logged_in'] )
		{
			$is_logged = true;
			$u_login_logout = 'login.'.$phpEx.'?logout=true&amp;sid=' . $userdata['session_id'];
			$l_login_logout = $lang['Logout'] . ' [ ' . $userdata['username'] . ' ]';
		}
		else
		{
			$is_logged = false;
			$u_login_logout = 'login.'.$phpEx;
			$l_login_logout = $lang['Login'];
		}

		$s_last_visit = ( $userdata['session_logged_in'] ) ? phpBB2::create_date($board_config['default_dateformat'], $userdata['user_lastvisit'], $board_config['board_timezone']) : '';

		//
		// Obtain number of new private messages
		// if user is logged in
		//
		if ( ($userdata['session_logged_in']) && (empty($gen_simple_header)) )
		{
			if ( $userdata['user_new_privmsg'] )
			{
				$l_message_new = ( $userdata['user_new_privmsg'] == 1 ) ? $lang['New_pm'] : $lang['New_pms'];
				$l_privmsgs_text = sprintf($l_message_new, $userdata['user_new_privmsg']);

				if ( $userdata['user_last_privmsg'] > $userdata['user_lastvisit'] )
				{
					$sql = "UPDATE " . USERS_TABLE . "
						SET user_last_privmsg = " . $userdata['user_lastvisit'] . "
						WHERE user_id = " . $userdata['user_id'];
					if ( !$db->sql_query($sql) )
					{
						mx_message_die(GENERAL_ERROR, 'Could not update private message new/read time for user', '', __LINE__, __FILE__, $sql);
					}

					$s_privmsg_new = 1;
					$icon_pm = $images['pm_new_msg'];
				}
				else
				{
					$s_privmsg_new = 0;
					$icon_pm = $images['pm_no_new_msg'];
				}
				$mx_priv_msg = $lang['Private_Messages'] . ' (' . $userdata['user_new_privmsg'] . ')';
			}
			else
			{
				$l_privmsgs_text = $lang['No_new_pm'];

				$s_privmsg_new = 0;
				$icon_pm = $images['pm_no_new_msg'];
				$mx_priv_msg = $lang['Private_Messages'];
			}

			if ( $userdata['user_unread_privmsg'] )
			{
				$l_message_unread = ( $userdata['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms'];
				$l_privmsgs_text_unread = sprintf($l_message_unread, $userdata['user_unread_privmsg']);
			}
			else
			{
				$l_privmsgs_text_unread = $lang['No_unread_pm'];
			}
		}
		else
		{
			$icon_pm = $images['pm_no_new_msg'];
			$l_privmsgs_text = $lang['Login_check_pm'];
			$l_privmsgs_text_unread = '';
			$s_privmsg_new = 0;
			$mx_priv_msg = $lang['Private_Messages'];
		}

		break;

	case 'phpbb3':

		if ( $mx_user->data['user_id'] != 1 )
		{
			$is_logged = true;
			$u_login_logout = 'login.'.$phpEx.'?logout=true&amp;sid=' . $mx_user->data['session_id'];
			$l_login_logout = $lang['Logout'] . ' [ ' . $mx_user->data['username'] . ' ]';
		}
		else
		{
			$is_logged = false;
			$u_login_logout = 'login.'.$phpEx;
			$l_login_logout = $lang['Login'];
		}
		$s_last_visit = ( $mx_user->data['session_logged_in'] ) ? phpBB2::create_date($board_config['default_dateformat'], $mx_user->data['user_lastvisit'], $board_config['board_timezone']) : '';

		//
		// Obtain number of new private messages
		// if user is logged in
		//
		if ( ($mx_user->data['session_logged_in']) && (empty($gen_simple_header)) )
		{
			if ( $mx_user->data['user_new_privmsg'] )
			{
				$l_message_new = ( $mx_user->data['user_new_privmsg'] == 1 ) ? $lang['New_pm'] : $lang['New_pms'];
				$l_privmsgs_text = sprintf($l_message_new, $mx_user->data['user_new_privmsg']);

				if ( $mx_user->data['user_last_privmsg'] > $mx_user->data['user_lastvisit'] )
				{
					$sql = "UPDATE " . USERS_TABLE . "
						SET user_last_privmsg = " . $mx_user->data['user_lastvisit'] . "
						WHERE user_id = " . $mx_user->data['user_id'];
					if ( !$db->sql_query($sql) )
					{
						mx_message_die(GENERAL_ERROR, 'Could not update private message new/read time for user', '', __LINE__, __FILE__, $sql);
					}

					$s_privmsg_new = 1;
					$icon_pm = $images['pm_new_msg'];
				}
				else
				{
					$s_privmsg_new = 0;
					$icon_pm = $images['pm_no_new_msg'];
				}
				$mx_priv_msg = $lang['Private_Messages'] . ' (' . $mx_user->data['user_new_privmsg'] . ')';
			}
			else
			{
				$l_privmsgs_text = $lang['No_new_pm'];

				$s_privmsg_new = 0;
				$icon_pm = $images['pm_no_new_msg'];
				$mx_priv_msg = $lang['Private_Messages'];
			}

			if ( $mx_user->data['user_unread_privmsg'] )
			{
				$l_message_unread = ( $mx_user->data['user_unread_privmsg'] == 1 ) ? $lang['Unread_pm'] : $lang['Unread_pms'];
				$l_privmsgs_text_unread = sprintf($l_message_unread, $mx_user->data['user_unread_privmsg']);
			}
			else
			{
				$l_privmsgs_text_unread = $lang['No_unread_pm'];
			}
		}
		else
		{
			$icon_pm = $images['pm_no_new_msg'];
			$l_privmsgs_text = $lang['Login_check_pm'];
			$l_privmsgs_text_unread = '';
			$s_privmsg_new = 0;
			$mx_priv_msg = $lang['Private_Messages'];
		}

		break;
}


//
// Generate HTML required for Mozilla Navigation bar
//
if ( !isset( $nav_links ) )
{
	$nav_links = array();
}

$nav_links_html = '';
$nav_link_proto = '<link rel="%s" href="%s" title="%s" />' . "\n";
while( list($nav_item, $nav_array) = @each($nav_links) )
{
	if ( !empty($nav_array['url']) )
	{
		$nav_links_html .= sprintf($nav_link_proto, $nav_item, mx_append_sid($nav_array['url']), $nav_array['title']);
	}
	else
	{
		// We have a nested array, used for items like <link rel='chapter'> that can occur more than once.
		while( list(,$nested_array) = each($nav_array) )
		{
			$nav_links_html .= sprintf($nav_link_proto, $nav_item, $nested_array['url'], $nested_array['title']);
		}
	}
}

//
// 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'] )];

if (empty($mx_page->page_alt_icon))
{
	$page_icon_img = ( !empty($mx_page->page_icon) && $mx_page->page_icon != 'none' && file_exists($mx_root_path . $images['mx_graphics']['page_icons'] . '/' . $mx_page->page_icon) ) ? '<img valign="middle" src="' . PORTAL_URL . $images['mx_graphics']['page_icons'] . '/' . $mx_page->page_icon . '" alt="" />&nbsp;&nbsp;' : '';
}
else
{
	$page_icon_img = '<img valign="middle" src="' . $mx_page->page_alt_icon . '" alt="" />&nbsp;&nbsp;';
}

$search_page_id_pafiledb = get_page_id('dload.' . $phpEx, true);
$search_page_id_kb = get_page_id('kb.' . $phpEx, true);
$search_page_id_site = get_page_id('mx_search.' . $phpEx, true);

$option_search_site = !empty($search_page_id_site) ? '<option value="site">' . $lang['Mx_search_site'] . '</option>' : '';
$option_search_forum = '<option value="forum">' . $lang['Mx_search_forum'] . '</option>';
$option_search_kb = !empty($search_page_id_kb) ? '<option value="kb">' . $lang['Mx_search_kb'] . '</option>' : '';
$option_search_pafiledb = !empty($search_page_id_pafiledb) ? '<option value="pafiledb">' . $lang['Mx_search_pafiledb'] . '</option>' : '';
$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 ( count($mx_page->mxbb_css_addup) > 0 )
{
	foreach($mx_page->mxbb_css_addup as $key => $mx_css_path)
	{
		$mx_addional_css_files .= "\n".'<link rel="stylesheet" href="'. PORTAL_URL . $mx_css_path . '" type="text/css" >';
	}
}

//
// Generate list of additional js files to include (defined by modules)
//
$mx_addional_js_files = '';
if ( count($mx_page->mxbb_js_addup) > 0 )
{
	foreach($mx_page->mxbb_js_addup as $key => $mx_js_path)
	{
		$mx_addional_js_files .= "\n".'<script language="javascript" type="text/javascript" src="'. PORTAL_URL . $mx_js_path . '"></script>';
	}
}

//
// Generate additional header code (defined by modules)
//
$mx_addional_header_text = '';
if ( count($mx_page->mxbb_header_addup) > 0 )
{
	foreach($mx_page->mxbb_header_addup as $key => $mx_header_text)
	{
		$mx_addional_header_text .= "\n"."\n".$mx_header_text;
	}
}

// Definitions of main navigation links
switch (PORTAL_BACKEND)
{
	case 'internal':
	case 'phpbb2':
		$u_register = 'profile.'.$phpEx.'?mode=register' ;
		$u_profile = 'profile.'.$phpEx.'?mode=editprofile';
		$u_privatemsgs = 'privmsg.'.$phpEx.'?folder=inbox';
		$u_privatemsgs_popup = 'privmsg.'.$phpEx.'?mode=newpm';
		$u_search = 'search.'.$phpEx;
		$u_memberlist = 'memberlist.'.$phpEx;
		$u_modcp = 'modcp.'.$phpEx;
		$u_faq = 'faq.'.$phpEx;
		$u_viewonline = 'viewonline.'.$phpEx;
		$u_group_cp = 'groupcp.'.$phpEx;
		break;
	case 'phpbb3':
		$u_register = 'ucp.'.$phpEx.'?mode=register';
		$u_profile = 'ucp.'.$phpEx;
		$u_privatemsgs = 'ucp.'.$phpEx.'?i=pm&folder=inbox';
		$u_privatemsgs_popup ='ucp.'.$phpEx.'?i=pm&mode=popup';
		$u_search = 'search.'.$phpEx;
		$u_memberlist = 'memberlist.'.$phpEx;
		$u_modcp = 'mcp.'.$phpEx;
		$u_faq = 'faq.'.$phpEx;
		$u_viewonline = 'viewonline.'.$phpEx;
		$u_group_cp = 'ucp.'.$phpEx.'?i=167';
		break;
}

$useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT');

$layouttemplate->assign_vars(array(
	'SITENAME' => $board_config['sitename'],
	'SITE_DESCRIPTION' => $board_config['site_desc'],
	'PAGE_TITLE' => ($page_title) ? $page_title : $mx_page->page_title,
	'LAST_VISIT_DATE' => sprintf($lang['You_last_visit'], $s_last_visit),
	'CURRENT_TIME' => sprintf($lang['Current_time'], phpBB2::create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),

	'RECORD_USERS' => sprintf($lang['Record_online_users'], $board_config['record_online_users'], phpBB2::create_date($board_config['default_dateformat'], $board_config['record_online_date'], $board_config['board_timezone'])),
	'PRIVATE_MESSAGE_INFO' => $l_privmsgs_text,
	'PRIVATE_MESSAGE_INFO_UNREAD' => $l_privmsgs_text_unread,
	'PRIVATE_MESSAGE_NEW_FLAG' => $s_privmsg_new,

	'PRIVMSG_IMG' => $icon_pm,

	'L_USERNAME' => $lang['Username'],
	'L_PASSWORD' => $lang['Password'],
	'L_LOGIN_LOGOUT' => $l_login_logout,
	'L_LOGIN' => $lang['Login'],
	'L_LOG_ME_IN' => $lang['Log_me_in'],
	'L_AUTO_LOGIN' => $lang['Log_me_in'],
	'L_INDEX' => $board_config['sitename'],
	'L_REGISTER' => $lang['Register'],
	'L_PROFILE' => $lang['Profile'],
	'L_SEARCH' => $lang['Search'],
	'L_PRIVATEMSGS' => $mx_priv_msg,
	'L_WHO_IS_ONLINE' => $lang['Who_is_Online'],
	'L_MEMBERLIST' => $lang['Memberlist'],
	'L_FAQ' => $lang['FAQ'],
	'L_USERGROUPS' => $lang['Usergroups'],
	'L_SEARCH_NEW' => $lang['Search_new'],
	'L_SEARCH_UNANSWERED' => $lang['Search_unanswered'],
	'L_SEARCH_SELF' => $lang['Search_your_posts'],
	'L_WHOSONLINE_ADMIN' => sprintf($lang['Admin_online_color'], '<span style="color:#' . $theme['fontcolor3'] . '">', '</span>'),
	'L_WHOSONLINE_MOD' => sprintf($lang['Mod_online_color'], '<span style="color:#' . $theme['fontcolor2'] . '">', '</span>'),
	'L_BACK_TO_TOP' => $lang['Back_to_top'],

	'U_SEARCH_UNANSWERED' => mx_append_sid(PHPBB_URL . 'search.'.$phpEx.'?search_id=unanswered'),
	'U_SEARCH_SELF' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=egosearch'),
	'U_SEARCH_NEW' => mx_append_sid(PHPBB_URL .'search.'.$phpEx.'?search_id=newposts'),

	'U_REGISTER' => mx_append_sid(PHPBB_URL . $u_register),
	'U_PROFILE' => mx_append_sid(PHPBB_URL . $u_profile),
	'U_PRIVATEMSGS' => mx_append_sid(PHPBB_URL . $u_privatemsgs),
	'U_PRIVATEMSGS_POPUP' => mx_append_sid(PHPBB_URL . $u_privatemsgs_popup),
	'U_SEARCH' => mx_append_sid(PHPBB_URL . $u_search),
	'U_MEMBERLIST' =>mx_append_sid(PHPBB_URL . $u_memberlist),
	'U_MODCP' => mx_append_sid(PHPBB_URL . $u_modcp),
	'U_FAQ' => mx_append_sid(PHPBB_URL . $u_faq),
	'U_VIEWONLINE' => mx_append_sid(PHPBB_URL . $u_viewonline),
	'U_LOGIN_LOGOUT' => mx_append_sid(PORTAL_URL . $u_login_logout),
	'U_GROUP_CP' => mx_append_sid(PHPBB_URL . $u_group_cp),

	'LOGO' => $images['mx_logo'],
	'THEME_GRAPHICS' => $images['theme_graphics'],

	'NAV_IMAGES_HOME' => $images['mx_nav_home'],
	'NAV_IMAGES_FORUM' => $images['mx_nav_forum'],
	'NAV_IMAGES_PROFILE' => $images['mx_nav_profile'],
	'NAV_IMAGES_FAQ' => $images['mx_nav_faq'],
	'NAV_IMAGES_SEARCH' => $images['mx_nav_search'],
	'NAV_IMAGES_MEMBERS' => $images['mx_nav_members'],
	'NAV_IMAGES_GROUPS' => $images['mx_nav_groups'],
	'NAV_IMAGES_PRIVMSG' => $images['mx_nav_mail'],
	'NAV_IMAGES_LOGIN_LOGOUT' => $images['mx_nav_login'],
	'NAV_IMAGES_REGISTER' => $images['mx_nav_register'],

	'S_CONTENT_DIRECTION' => $lang['DIRECTION'],
	'S_CONTENT_ENCODING' => $lang['ENCODING'],
	'S_CONTENT_DIR_LEFT' => $lang['LEFT'],
	'S_CONTENT_DIR_RIGHT' => $lang['RIGHT'],
	'S_USER_LANG' => $mx_user->lang['default_lang'],
	'S_TIMEZONE' => sprintf($lang['All_times'], $l_timezone),
	'S_LOGIN_ACTION' => mx_append_sid(PORTAL_URL . 'login.'.$phpEx),

	//
	// These theme variables are not used for MX-Publisher, since MX-Publisher require a theme.css file
	//
	'T_HEAD_STYLESHEET' => $theme['head_stylesheet'],
	'T_BODY_BACKGROUND' => $theme['body_background'],
	'T_BODY_BGCOLOR' => '#'.$theme['body_bgcolor'],
	'T_BODY_TEXT' => '#'.$theme['body_text'],
	'T_BODY_LINK' => '#'.$theme['body_link'],
	'T_BODY_VLINK' => '#'.$theme['body_vlink'],
	'T_BODY_ALINK' => '#'.$theme['body_alink'],
	'T_BODY_HLINK' => '#'.$theme['body_hlink'],
	'T_TR_COLOR1' => '#'.$theme['tr_color1'],
	'T_TR_COLOR2' => '#'.$theme['tr_color2'],
	'T_TR_COLOR3' => '#'.$theme['tr_color3'],
	'T_TR_CLASS1' => $theme['tr_class1'],
	'T_TR_CLASS2' => $theme['tr_class2'],
	'T_TR_CLASS3' => $theme['tr_class3'],
	'T_TH_COLOR1' => '#'.$theme['th_color1'],
	'T_TH_COLOR2' => '#'.$theme['th_color2'],
	'T_TH_COLOR3' => '#'.$theme['th_color3'],
	'T_TH_CLASS1' => $theme['th_class1'],
	'T_TH_CLASS2' => $theme['th_class2'],
	'T_TH_CLASS3' => $theme['th_class3'],
	'T_TD_COLOR1' => '#'.$theme['td_color1'],
	'T_TD_COLOR2' => '#'.$theme['td_color2'],
	'T_TD_COLOR3' => '#'.$theme['td_color3'],
	'T_TD_CLASS1' => $theme['td_class1'],
	'T_TD_CLASS2' => $theme['td_class2'],
	'T_TD_CLASS3' => $theme['td_class3'],
	'T_FONTFACE1' => $theme['fontface1'],
	'T_FONTFACE2' => $theme['fontface2'],
	'T_FONTFACE3' => $theme['fontface3'],
	'T_FONTSIZE1' => $theme['fontsize1'],
	'T_FONTSIZE2' => $theme['fontsize2'],
	'T_FONTSIZE3' => $theme['fontsize3'],
	'T_FONTCOLOR1' => '#'.$theme['fontcolor1'],
	'T_FONTCOLOR2' => '#'.$theme['fontcolor2'],
	'T_FONTCOLOR3' => '#'.$theme['fontcolor3'],
	'T_SPAN_CLASS1' => $theme['span_class1'],
	'T_SPAN_CLASS2' => $theme['span_class2'],
	'T_SPAN_CLASS3' => $theme['span_class3'],

	//+ MX-Publisher
	'U_PORTAL_ROOT_PATH' => PORTAL_URL,
	'U_PHPBB_ROOT_PATH' => PHPBB_URL,
	'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH,

	'L_HOME' => $lang['MX_home'],
	'L_FORUM' => $lang['MX_forum'],

	'U_INDEX_FORUM' => mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=2'),
	'U_INDEX' => mx_append_sid(PORTAL_URL . 'index.' . $phpEx),
	'U_SEARCH_SITE' => mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $search_page_id_site . '&mode=results&search_terms=all'),
	'U_SEARCH_KB' => mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $search_page_id_kb . '&mode=search&search_terms=all'),
	'U_SEARCH_PAFILEDB' => mx_append_sid(PORTAL_URL . 'index.' . $phpEx . '?page=' . $search_page_id_pafiledb . '&action=search&search_terms=all'),

	'PAGE_ICON' => $page_icon_img,
	'L_SEARCH_SITE' => $option_search_site,
	'L_SEARCH_FORUM' => $option_search_forum,
	'L_SEARCH_KB' => $option_search_kb,
	'L_SEARCH_PAFILEDB' => $option_search_pafiledb,
	'L_SEARCH_GOOGLE' => $option_search_google,

	'T_PHPBB_STYLESHEET' => $theme['head_stylesheet'],
	'T_MXBB_STYLESHEET' => $theme['head_stylesheet'],
	'T_GECKO_STYLESHEET' => 'gecko.css',

	'MX_ADDITIONAL_CSS_FILES' => $mx_addional_css_files,
	'MX_ADDITIONAL_JS_FILES' => $mx_addional_js_files,
	'MX_ADDITIONAL_HEADER_TEXT' => $mx_addional_header_text,
	'MX_ICON_CSS' => $images['mx_graphics']['icon_style'],
	//- MX-Publisher

	'NAV_LINKS' => $nav_links_html,

	// swithes for logged in users?
	'USER_LOGGED_IN' => $userdata['session_logged_in'],
	'USER_LOGGED_OUT' => !$userdata['session_logged_in'],
	'IS_ADMIN' => $userdata['session_logged_in'] && $userdata['user_level'] == ADMIN,

	// Backend
	'PHPBB' => PORTAL_BACKEND != 'internal',

	// Show phpbb stats?
	'PHPBB_STATS' => $mx_page->phpbb_stats && PORTAL_BACKEND != 'internal',
	// Allow autologin?
	'ALLOW_AUTOLOGIN' => !$userdata['session_logged_in'] && (!isset($board_config['allow_autologin']) || $board_config['allow_autologin']) && PORTAL_BACKEND != 'internal',
	// phpBB PM
	'ENABLE_PM_POPUP' => $userdata['session_logged_in'] && !empty($userdata['user_popup_pm']) && PORTAL_BACKEND != 'internal',

	// Do NOT set basedir when in EDIT mode
	'SET_BASE' => !$mx_request_vars->is_request('portalpage'),
	// Additional css for gecko browsers
	'GECKO' => strstr($useragent, 'Gecko'),

));

//
// Login box & swithes for logged in users?
//
/*
if ( !$userdata['session_logged_in'] )
{
	$layouttemplate->assign_block_vars('switch_user_logged_out', array());

	//
	// Allow autologin?
	//
	if (!isset($board_config['allow_autologin']) || $board_config['allow_autologin'] )
	{
		$layouttemplate->assign_block_vars('switch_allow_autologin', array());
		$layouttemplate->assign_block_vars('switch_user_logged_out.switch_allow_autologin', array());
	}

	//
	// Show phpbb stats?
	//
	if ( $mx_page->phpbb_stats )
	{
		$layouttemplate->assign_block_vars('phpbb_stats', array());
		$layouttemplate->assign_block_vars('phpbb_stats.switch_user_logged_out', array());
	}
}
else
{
	$layouttemplate->assign_block_vars('switch_user_logged_in', array());

	if ( !empty($userdata['user_popup_pm']) )
	{
		$layouttemplate->assign_block_vars('switch_enable_pm_popup', array());
	}

	//
	// Show phpbb stats?
	//
	if ( $mx_page->phpbb_stats )
	{
		$layouttemplate->assign_block_vars('phpbb_stats', array());
		$layouttemplate->assign_block_vars('phpbb_stats.switch_user_logged_in', array());
	}
}

//
// Handy switch for Admin
//
if ( $userdata['session_logged_in'] && $userdata['user_level'] == ADMIN )
{
	$layouttemplate->assign_block_vars('is_admin', array());
}

//
// Do NOT set basedir when in EDIT mode
//
if ( !$mx_request_vars->is_request('portalpage'))
{
	$layouttemplate->assign_block_vars('switch_set_base', array());
}

//
// Determine if user have gecko/opera browser
//
$useragent = (isset($_SERVER['HTTP_USER_AGENT'])) ? $_SERVER['HTTP_USER_AGENT'] : getenv('HTTP_USER_AGENT');
if ( strstr($useragent, 'Gecko') )
{
	$layouttemplate->assign_block_vars('switch_gecko', array());
}
*/

//
// Navigation Menu in overall_header
//
if ($mx_page->auth_view || $mx_page->auth_mod)
{
	if (!is_object($mx_block))
	{
		$mx_block = new mx_block();
	}

	$block_id = $mx_page->page_navigation_block;

	if(!empty($block_id) )
	{
		define('MX_OVERALL_NAVIGATION', true);

		$mx_block->init( $block_id );

		$mx_module_path = $module_root_path;
		
		//
		// Define $module_root_path, to be used within blocks
		//
		$module_root_path = $mx_root_path . $mx_block->module_root_path;

		$template = new mx_Template($mx_root_path . 'templates/'. $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);
		}
		
		$module_root_path = $mx_module_path;
	}
}

// Add no-cache control for cookies if they are set
//$c_no_cache = (isset($_COOKIE[$board_config['cookie_name'] . '_sid']) || isset($_COOKIE[$board_config['cookie_name'] . '_data'])) ? 'no-cache="set-cookie", ' : '';

// Work around for "current" Apache 2 + PHP module which seems to not
// cope with private cache control setting
if (!empty($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache/2'))
{
	header ('Cache-Control: no-cache, pre-check=0, post-check=0');
}
else
{
	header ('Cache-Control: private, pre-check=0, post-check=0, max-age=0');
}
header ('Expires: 0');
header ('Pragma: no-cache');

$icongif = 'favicon.gif';

include($mx_root_path . 'mx_meta.inc');
$meta_str  = '<meta name="title"       content="' . $title     .'" />' . "\n";
$meta_str .= '<meta name="author"      content="' . $author    .'" />' . "\n";
$meta_str .= '<meta name="copyright"   content="' . $copyright .'" />' . "\n";
$meta_str .= '<meta name="keywords"    content="' . $keywords  .'" />' . "\n";
$meta_str .= '<meta name="description" lang="' . $langcode .'" content="'. $description .'" />' . "\n";
$meta_str .= '<link rel="shortcut icon" href="' . $icon .'" />' . "\n";

if (file_exists($mx_root_path . $icongif))
{
	$meta_str .= '<link rel="icon" href="' . $icongif .'" type="image/gif" />' . "\n";
}

$meta_str .= '<meta name="category"    content="' . $rating .'" />' . "\n";
$meta_str .= '<meta name="robots"      content="' . $index  . ',' . $follow .'" />' . "\n";
$meta_str .= $header . "\n";

$layouttemplate->assign_vars(array( 'META' => $meta_str) );
$layouttemplate->pparse('overall_header');
?>
Index: album_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_constants.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** album_constants.php	27 Mar 2008 14:31:01 -0000	1.9
--- album_constants.php	29 Aug 2008 05:58:23 -0000	1.10
***************
*** 175,178 ****
  	define('ALBUM_WM_CACHE_PATH', $module_root_path . 'upload/wm_cache/');
  	define('ALBUM_WM_FILE', $module_root_path . 'album_mod/mark_fap.png');
! }
  ?>
\ No newline at end of file
--- 175,178 ----
  	define('ALBUM_WM_CACHE_PATH', $module_root_path . 'upload/wm_cache/');
  	define('ALBUM_WM_FILE', $module_root_path . 'album_mod/mark_fap.png');
! }	
  ?>
\ No newline at end of file

Index: album_hierarchy_sql.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_hierarchy_sql.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_hierarchy_sql.php	27 Mar 2008 14:31:01 -0000	1.4
--- album_hierarchy_sql.php	29 Aug 2008 05:58:23 -0000	1.5
***************
*** 774,778 ****
  
  	// Write the Date
! 	$info = create_date2($board_config['default_dateformat'], $row['pic_time'], $board_config['board_timezone']);
  	$info .= '<br />';
  
--- 774,778 ----
  
  	// Write the Date
! 	$info = album_create_date($board_config['default_dateformat'], $row['pic_time'], $board_config['board_timezone']);
  	$info .= '<br />';
  
***************
*** 797,801 ****
  		else
  		{
! 			$info .= $lang['Pic_Poster'] . ': <a href="' . mx_append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $row['user_id']) . '">' . $row['username'] . '</a>';
  		}
  	}
--- 797,801 ----
  		else
  		{
! 			$info .= $lang['Pic_Poster'] . ': ' . album_get_profile_url('full', $row['user_id'], $row['username'], false);
  		}
  	}
***************
*** 936,940 ****
  	$db->sql_freeresult($result);
  
! 	$info = create_date2($board_config['default_dateformat'], $row['comment_time'], $board_config['board_timezone']);
  	$info .= '<br />' . $lang['Pic_Poster'] . ': ';
  
--- 936,940 ----
  	$db->sql_freeresult($result);
  
! 	$info = album_create_date($board_config['default_dateformat'], $row['comment_time'], $board_config['board_timezone']);
  	$info .= '<br />' . $lang['Pic_Poster'] . ': ';
  
***************
*** 958,962 ****
  		else
  		{
! 			$info .= '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . '=' . $row['user_id']) . '">' . $row['username'] . '</a>';
  		}
  	}
--- 958,962 ----
  		else
  		{
! 			$info .= album_get_profile_url('full', $row['user_id'], $row['username'], false);
  		}
  	}
***************
*** 1221,1225 ****
  				else
  				{
! 					$pic_poster = '<a href="'. mx_append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL .'='. $picrow[$j]['user_id']) .'">'. $picrow[$j]['username'] .'</a>';
  				}
  
--- 1221,1225 ----
  				else
  				{
! 					$pic_poster = album_get_profile_url('full', $picrow[$j]['user_id'], $picrow[$j]['username'], false);
  				}
  
***************
*** 1239,1243 ****
  				'TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $picrow[$j]['pic_id'])) . '">' . $picrow[$j]['pic_title'] . '</a>',
  				'POSTER' => $pic_poster,
! 				'TIME' => create_date2($board_config['default_dateformat'], $picrow[$j]['pic_time'], $board_config['board_timezone']),
  
  				'VIEW' => $picrow[$j]['pic_view_count'],
--- 1239,1243 ----
  				'TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $picrow[$j]['pic_id'])) . '">' . $picrow[$j]['pic_title'] . '</a>',
  				'POSTER' => $pic_poster,
! 				'TIME' => album_create_date($board_config['default_dateformat'], $picrow[$j]['pic_time'], $board_config['board_timezone']),
  
  				'VIEW' => $picrow[$j]['pic_view_count'],
***************
*** 1255,1259 ****
  				'LOCK' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=" . (($picrow[$j]['pic_lock'] == 0) ? 'lock' : 'unlock') . '&pic_id=' . $picrow[$j]['pic_id'])) .'">'. (($picrow[$j]['pic_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '',
  
! 				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip2($picrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($picrow[$j]['pic_user_ip']) .'</a><br />' : '',
  
  				'AVATAR_PIC' => ( ($album_config['personal_allow_avatar_gallery'] == 1) && ($userdata['user_id'] == $picrow[$j]['pic_user_id']) ) ? '<br /><a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_avatar&pic_id=" . $picrow[$j]['pic_id'])) . '">' . $lang['Avatar_Set'] . '</a>' : '',
--- 1255,1259 ----
  				'LOCK' => ($auth_data['moderator']) ? '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_modcp&mode=" . (($picrow[$j]['pic_lock'] == 0) ? 'lock' : 'unlock') . '&pic_id=' . $picrow[$j]['pic_id'])) .'">'. (($picrow[$j]['pic_lock'] == 0) ? $lang['Lock'] : $lang['Unlock']) .'</a>' : '',
  
! 				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . album_decode_ip($picrow[$j]['pic_user_ip']) . '" target="_blank">' . album_decode_ip($picrow[$j]['pic_user_ip']) .'</a><br />' : '',
  
  				'AVATAR_PIC' => ( ($album_config['personal_allow_avatar_gallery'] == 1) && ($userdata['user_id'] == $picrow[$j]['pic_user_id']) ) ? '<br /><a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_avatar&pic_id=" . $picrow[$j]['pic_id'])) . '">' . $lang['Avatar_Set'] . '</a>' : '',
***************
*** 1421,1425 ****
  						else
  						{
! 							$recent_poster = '<a href="'. mx_append_sid(PHPBB_URL. 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL .'='. $recentrow[$j]['user_id']) .'">'. $recentrow[$j]['username'] .'</a>';
  						}
  
--- 1421,1425 ----
  						else
  						{
! 							$recent_poster = album_get_profile_url('full', $recentrow[$j]['user_id'], $recentrow[$j]['username'], false);
  						}
  
***************
*** 1435,1439 ****
  						'TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $recentrow[$j]['pic_id'])) . '">' . $recentrow[$j]['pic_title'] . '</a>',
  						'POSTER' => $recent_poster,
! 						'TIME' => create_date2($board_config['default_dateformat'], $recentrow[$j]['pic_time'], $board_config['board_timezone']),
  
  						'VIEW' => $recentrow[$j]['pic_view_count'],
--- 1435,1439 ----
  						'TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $recentrow[$j]['pic_id'])) . '">' . $recentrow[$j]['pic_title'] . '</a>',
  						'POSTER' => $recent_poster,
! 						'TIME' => album_create_date($board_config['default_dateformat'], $recentrow[$j]['pic_time'], $board_config['board_timezone']),
  
  						'VIEW' => $recentrow[$j]['pic_view_count'],
***************
*** 1443,1447 ****
  						'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $recentrow[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '',
  
! 						'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip2($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($recentrow[$j]['pic_user_ip']) .'</a><br />' : ''
  						)
  					);
--- 1443,1447 ----
  						'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $recentrow[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '',
  
! 						'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . album_decode_ip($recentrow[$j]['pic_user_ip']) . '" target="_blank">' . album_decode_ip($recentrow[$j]['pic_user_ip']) .'</a><br />' : ''
  						)
  					);
***************
*** 1594,1598 ****
  						else
  						{
! 							$highest_poster = '<a href="' . mx_append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $highestrow[$j]['user_id']) . '">' . $highestrow[$j]['username'] . '</a>';
  						}
  
--- 1594,1598 ----
  						else
  						{
! 							$highest_poster = album_get_profile_url('full', $highestrow[$j]['user_id'], $highestrow[$j]['username'], false);
  						}
  
***************
*** 1611,1615 ****
  							'H_TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $highestrow[$j]['pic_id'])) . '">' . $highestrow[$j]['pic_title'] . '</a>',
  							'H_POSTER' => $highest_poster,
! 							'H_TIME' => create_date2($board_config['default_dateformat'], $highestrow[$j]['pic_time'], $board_config['board_timezone']),
  
  							'H_VIEW' => $highestrow[$j]['pic_view_count'],
--- 1611,1615 ----
  							'H_TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $highestrow[$j]['pic_id'])) . '">' . $highestrow[$j]['pic_title'] . '</a>',
  							'H_POSTER' => $highest_poster,
! 							'H_TIME' => album_create_date($board_config['default_dateformat'], $highestrow[$j]['pic_time'], $board_config['board_timezone']),
  
  							'H_VIEW' => $highestrow[$j]['pic_view_count'],
***************
*** 1619,1623 ****
  							'H_COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $highestrow[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '',
  
! 							'H_IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip2($highestrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($highestrow[$j]['pic_user_ip']) .'</a><br />' : ''
  							)
  						);
--- 1619,1623 ----
  							'H_COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $highestrow[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '',
  
! 							'H_IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . album_decode_ip($highestrow[$j]['pic_user_ip']) . '" target="_blank">' . album_decode_ip($highestrow[$j]['pic_user_ip']) .'</a><br />' : ''
  							)
  						);
***************
*** 1760,1764 ****
  						else
  						{
! 							$mostviewed_poster = '<a href="' . mx_append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $mostviewed[$j]['user_id']) . '">' . $mostviewed[$j]['username'] . '</a>';
  						}
  
--- 1760,1764 ----
  						else
  						{
! 							$mostviewed_poster = album_get_profile_url('full', $mostviewed[$j]['user_id'], $mostviewed[$j]['username'], false);
  						}
  
***************
*** 1774,1778 ****
  						'H_TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $mostviewed[$j]['pic_id'])) . '">' . $mostviewed[$j]['pic_title'] . '</a>',
  						'H_POSTER' => $mostviewed_poster,
! 						'H_TIME' => create_date2($board_config['default_dateformat'], $mostviewed[$j]['pic_time'], $board_config['board_timezone']),
  
  						'H_VIEW' => $mostviewed[$j]['pic_view_count'],
--- 1774,1778 ----
  						'H_TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $mostviewed[$j]['pic_id'])) . '">' . $mostviewed[$j]['pic_title'] . '</a>',
  						'H_POSTER' => $mostviewed_poster,
! 						'H_TIME' => album_create_date($board_config['default_dateformat'], $mostviewed[$j]['pic_time'], $board_config['board_timezone']),
  
  						'H_VIEW' => $mostviewed[$j]['pic_view_count'],
***************
*** 1782,1786 ****
  						'H_COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $mostviewed[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '',
  
! 						'H_IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip2($mostviewed[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($mostviewed[$j]['pic_user_ip']) .'</a><br />' : ''
  						)
  					);
--- 1782,1786 ----
  						'H_COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $mostviewed[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '',
  
! 						'H_IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . album_decode_ip($mostviewed[$j]['pic_user_ip']) . '" target="_blank">' . album_decode_ip($mostviewed[$j]['pic_user_ip']) .'</a><br />' : ''
  						)
  					);
***************
*** 1916,1920 ****
  						else
  						{
! 							$rand_poster = '<a href="' . mx_append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $randrow[$j]['user_id']) . '">' . $randrow[$j]['username'] . '</a>';
  						}
  
--- 1916,1920 ----
  						else
  						{
! 							$rand_poster = album_get_profile_url('full', $randrow[$j]['user_id'], $randrow[$j]['username'], false);
  						}
  
***************
*** 1930,1934 ****
  						'TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $randrow[$j]['pic_id'])) . '">' . $randrow[$j]['pic_title'] . '</a>',
  						'POSTER' => $rand_poster,
! 						'TIME' => create_date2($board_config['default_dateformat'], $randrow[$j]['pic_time'], $board_config['board_timezone']),
  
  						'VIEW' => $randrow[$j]['pic_view_count'],
--- 1930,1934 ----
  						'TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $randrow[$j]['pic_id'])) . '">' . $randrow[$j]['pic_title'] . '</a>',
  						'POSTER' => $rand_poster,
! 						'TIME' => album_create_date($board_config['default_dateformat'], $randrow[$j]['pic_time'], $board_config['board_timezone']),
  
  						'VIEW' => $randrow[$j]['pic_view_count'],
***************
*** 1938,1942 ****
  						'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $randrow[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '',
  
! 						'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip2($randrow[$j]['pic_user_ip']) . '" target="_blank">' . decode_ip2($randrow[$j]['pic_user_ip']) .'</a><br />' : ''
  						)
  					);
--- 1938,1942 ----
  						'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $randrow[$j]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '',
  
! 						'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . album_decode_ip($randrow[$j]['pic_user_ip']) . '" target="_blank">' . album_decode_ip($randrow[$j]['pic_user_ip']) .'</a><br />' : ''
  						)
  					);
***************
*** 2048,2052 ****
  				else
  				{
! 					$poster = '<a href="' . mx_append_sid(PHPBB_URL . 'profile.' . $phpEx . '?mode=viewprofile&' . POST_USERS_URL . '=' . $commentsrow[$i]['user_id']) . '">' . $commentsrow[$i]['username'] . '</a>';
  				}
  
--- 2048,2052 ----
  				else
  				{
! 					$poster = '<a href="' . album_get_profile_url('full', $commentsrow[$i]['user_id'], $commentsrow[$i]['username'], false);
  				}
  
***************
*** 2130,2138 ****
  				'TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $commentsrow[$i]['pic_id'])) . '">' . $commentsrow[$i]['pic_title'] . '</a>',
  				'POSTER' => $poster,
! 				'TIME' => create_date2($board_config['default_dateformat'], $commentsrow[$i]['comment_time'], $board_config['board_timezone']),
  				'VIEW' => $commentsrow[$i]['pic_view_count'],
  				'RATING' => ($album_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $commentsrow[$i]['pic_id'])) . '" ' . $image_rating_link_style .'>' . $lang['Rating'] . '</a>: ' . $image_rating . '<br />') : '',
  				'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $commentsrow[$i]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '',
! 				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . decode_ip2($commentsrow[$i]['pic_user_ip']) . '" target="_blank">' . decode_ip2($commentsrow[$i]['pic_user_ip']) .'</a><br />' : ''
  				)
  			);
--- 2130,2138 ----
  				'TITLE' => '<a href = "' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $commentsrow[$i]['pic_id'])) . '">' . $commentsrow[$i]['pic_title'] . '</a>',
  				'POSTER' => $poster,
! 				'TIME' => album_create_date($board_config['default_dateformat'], $commentsrow[$i]['comment_time'], $board_config['board_timezone']),
  				'VIEW' => $commentsrow[$i]['pic_view_count'],
  				'RATING' => ($album_config['rate'] == 1) ? ( '<a href="'. mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $commentsrow[$i]['pic_id'])) . '" ' . $image_rating_link_style .'>' . $lang['Rating'] . '</a>: ' . $image_rating . '<br />') : '',
  				'COMMENTS' => ($album_config['comment'] == 1) ? ( '<a href="' . mx_append_sid(this_smartor_mxurl("smartor_mode=album_showpage&pic_id=" . $commentsrow[$i]['pic_id'])) . '">' . $lang['Comments'] . '</a>: ' . $image_comment . '<br />') : '',
! 				'IP' => ($userdata['user_level'] == ADMIN) ? $lang['IP_Address'] . ': <a href="http://whois.sc/' . album_decode_ip($commentsrow[$i]['pic_user_ip']) . '" target="_blank">' . album_decode_ip($commentsrow[$i]['pic_user_ip']) .'</a><br />' : ''
  				)
  			);

Index: album_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_functions.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_functions.php	27 Mar 2008 14:31:01 -0000	1.4
--- album_functions.php	29 Aug 2008 05:58:23 -0000	1.5
***************
*** 20,60 ****
  
  
! if(!function_exists(create_date2))
  {
! 	if(!function_exists(create_date))
  	{
! 		function create_date2($format, $gmepoch, $tz)
  		{
! 			return phpBB2::create_date($format, $gmepoch, $tz);
  		}
  	}
  	else
  	{
! 		function create_date2($format, $gmepoch, $tz)
! 		{
! 			return create_date($format, $gmepoch, $tz);
! 		}
  	}
  }
  
! if(!function_exists(decode_ip2))
  {
! 	if(!function_exists(decode_ip))
  	{
! 		function decode_ip2($int_ip)
! 		{
! 			return phpBB2::decode_ip($int_ip);
! 		}
  	}
  	else
  	{
! 		function decode_ip2($int_ip)
  		{
! 			return decode_ip($int_ip);
  		}
  	}
  }
  
- 
  // ----------------------------------------------------------------------------
  // This function will return the access data of the current user for a category
--- 20,339 ----
  
  
! function album_encode_ip($dotquad_ip)
  {
! 	$ip_sep = @explode('.', $dotquad_ip);
! 	return sprintf('%02x%02x%02x%02x', $ip_sep[0], $ip_sep[1], $ip_sep[2], $ip_sep[3]);
! }
! 
! function album_decode_ip($int_ip)
! {
! 	$hexipbang = @explode('.', chunk_split($int_ip, 2, '.'));
! 	return hexdec($hexipbang[0]). '.' . hexdec($hexipbang[1]) . '.' . hexdec($hexipbang[2]) . '.' . hexdec($hexipbang[3]);
! }
! 
! //
! // Create date/time from format and timezone
! //
! function album_create_date($format, $gmepoch, $tz)
! {
! 	global $board_config, $lang;
! 	static $translate;
! 
! 	if ( empty($translate) && $board_config['default_lang'] != 'english' )
  	{
! 		@reset($lang['datetime']);
! 		while ( list($match, $replace) = @each($lang['datetime']) )
  		{
! 			$translate[$match] = $replace;
  		}
  	}
+ 
+ 	return ( !empty($translate) ) ? strtr(@gmdate($format, $gmepoch + (3600 * $tz)), $translate) : @gmdate($format, $gmepoch + (3600 * $tz));
+ }
+ 
+ /**
+  * Get userdata
+  *
+  * Get Userdata, $user can be username or user_id. If force_str is true, the username will be forced.
+  * Cached sql, since this function is used for every block.
+  *
+  * @param unknown_type $user id or name
+  * @param boolean $force_str force clean_username
+  * @return array
+  */
+ function album_get_userdata($user, $force_str = false)
+ {
+ 	global $db;
+ 
+ 	if (!is_numeric($user) || $force_str)
+ 	{
+ 		$user = phpBB2::phpbb_clean_username($user);
+ 	}
  	else
  	{
! 		$user = intval($user);
  	}
+ 
+ 	$sql = "SELECT *
+ 		FROM " . USERS_TABLE . "
+ 		WHERE ";
+ 	$sql .= ( ( is_integer($user) ) ? "user_id = $user" : "username = '" .  str_replace("\'", "''", $user) . "'" ) . " AND user_id <> " . ANONYMOUS;
+ 	if ( !($result = $db->sql_query($sql, 120)) )
+ 	{
+ 		mx_message_die(GENERAL_ERROR, 'Tried obtaining data for a non-existent user', '', __LINE__, __FILE__, $sql);
+ 	}
+ 
+ 	$return = ($row = $db->sql_fetchrow($result)) ? $row : false;
+ 	$db->sql_freeresult($result);
+ 	return $return;
  }
  
! function album_get_username_string($mode, $user_id, $username, $username_colour = '')
  {
! 	global $phpbb_root_path, $phpEx, $mx_user, $phpbb_auth;
! 
! 	$profile_url = '';
! 	$username_colour = ($username_colour) ? '#' . $username_colour : '';
! 
! 	if ($guest_username === false)
  	{
! 		$username = ($username) ? $username : $mx_user->lang['GUEST'];
  	}
  	else
  	{
! 		$username = ($user_id && $user_id != ANONYMOUS) ? $username : ((!empty($guest_username)) ? $guest_username : $mx_user->lang['GUEST']);
! 	}
! 
! 	// Only show the link if not anonymous
! 	if ($user_id && $user_id != ANONYMOUS)
! 	{
! 		$profile_url = mx3_append_sid(PHPBB_URL . "memberlist.$phpEx", 'mode=viewprofile&amp;u=' . (int) $user_id);
! 	}
! 	else
! 	{
! 		$profile_url = '';
! 	}
! 
! 	switch ($mode)
! 	{
! 		case 'profile':
! 			return $profile_url;
! 		break;
! 
! 		case 'username':
! 			return $username;
! 		break;
! 
! 		case 'colour':
! 			return $username_colour;
! 		break;
! 
! 		case 'full':
! 		default:
! 
! 			$tpl = '';
! 			if (!$profile_url && !$username_colour)
! 			{
! 				$tpl = '{USERNAME}';
! 			}
! 			else if (!$profile_url && $username_colour)
! 			{
! 				$tpl = '<span style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</span>';
! 			}
! 			else if ($profile_url && !$username_colour)
! 			{
! 				$tpl = '<a href="{PROFILE_URL}">{USERNAME}</a>';
! 			}
! 			else if ($profile_url && $username_colour)
! 			{
! 				$tpl = '<a href="{PROFILE_URL}" style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</a>';
! 			}
! 
! 			return str_replace(array('{PROFILE_URL}', '{USERNAME_COLOUR}', '{USERNAME}'), array($profile_url, $username_colour, $username), $tpl);
! 		break;
! 	}
! }
! 
! function album_get_profile_url($mode, $user_id, $username = false, $user_color = false)
! {
! 	global $userdata;
! 	
! 	switch (PORTAL_BACKEND)
! 	{
! 		case 'internal':
! 
! 			$album_userdata = album_get_userdata($user_id, false);
! 			$username = ($username) ? $username : $album_userdata['username'];			
! 
! 			if ($album_userdata['user_level'] == ADMIN) 
! 			{ 
! 				$user_color = $theme['fontcolor3'];
! 				$user_style = 'style="color:#' . $user_color . '; font-weight : bold;"';  
! 			} 
! 			else if ($album_userdata['user_level'] == MOD) 
! 			{ 
! 				$user_color = $theme['fontcolor2'];
! 				$user_style = 'style="color:#' . $user_color . '; font-weight : bold;"';  
! 			}
! 			else 
! 			{ 
! 				$user_colour = $theme['fontcolor1'];
! 				$topic_poster_style = 'style="font-weight : bold;"'; 
! 			}
! 			
! 			$profile_url = '';
! 			
! 			$full_url = ($user_id == ANONYMOUS) ? '<span ' . $topic_poster_style . '>' . $lang['Guest'] . '</span>' : '<span ' . $topic_poster_style . '>' . $username . '</span>';
! 
! 		break;
! 						
! 		case 'phpbb2':
! 
! 			$album_userdata = album_get_userdata($user_id, false);
! 
! 			$username = ($username) ? $username : $album_userdata['username'];			
! 
! 			if ($album_userdata['user_level'] == ADMIN) 
! 			{ 
! 				$user_color = $theme['fontcolor3'];
! 				$user_style = 'style="color:#' . $user_color . '; font-weight : bold;"';  
! 			} 
! 			else if ($album_userdata['user_level'] == MOD) 
! 			{ 
! 				$user_color = $theme['fontcolor2'];
! 				$user_style = 'style="color:#' . $user_color . '; font-weight : bold;"';  
! 			}
! 			else 
! 			{ 
! 				$user_colour = $theme['fontcolor1'];
! 				$topic_poster_style = 'style="font-weight : bold;"'; 
! 			}
! 			
! 			// Only show the link if not anonymous
! 			if ($user_id && $user_id != ANONYMOUS)
! 			{
! 				$profile_url = mx3_append_sid(PHPBB_URL . "profile.$phpEx", 'mode=viewprofile&amp;u=' . (int) $user_id);
! 				$full_url = '<a href="' . $profile_url . '"><span ' . $topic_poster_style . '>' . $username . '</span></a>';
! 			}
! 			else
! 			{
! 				$profile_url = $lang['Guest'];
! 				$full_url = $lang['Guest'];
! 			}			
! 						
! 
! 		break;
! 
! 		case 'phpbb3':
! 			
! 			if (($username == false) || ($user_color == false))
! 			{ 
! 				$album_userdata = album_get_userdata($user_id, false);
! 				$user_id = $album_userdata['user_id'];
! 				$username = $album_userdata['username'];
! 				$user_colour = $album_userdata['user_colour'];
! 			}
! 			$full_url = album_get_username_string('full', $user_id, $username, $user_colour);
! 			$profile_url = album_get_username_string('profile', $user_id, $username, $user_colour);
! 		break;
! 	}
! 	
! 	switch ($mode)
! 	{
! 		case 'profile':
! 			return $profile_url;
! 		break;
! 
! 		case 'username':
! 			return $username;
! 		break;
! 
! 		case 'colour':
! 			return $user_colour;
! 		break;
! 
! 		case 'full':
! 		default:
! 			return $full_url;
! 		break;
! 	}	
! }
! 
! function album_comment_sql_smilies($auth_data)
! {
! 	global $db, $template, $board_config;
! 	
! 	$inline_columns = 6;
! 	$max_smilies = 42;
! 	
! 	switch (PORTAL_BACKEND)
! 	{
! 		case 'internal':
! 			$smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed
! 			$fields = 'smilies';		
! 			$smiley_url = 'smile_url';
! 			$emotion = 'emoticon';
! 			$table = SMILIES_TABLE;		
! 		break;
! 		case 'phpbb2':
! 			$smiley_path_url = PHPBB_URL;
! 			$fields = 'smilies';		
! 			$smiley_url = 'smile_url';
! 			$emotion = 'emoticon';
! 			$table = SMILIES_TABLE;		
! 		break;
! 		case 'phpbb3':
! 			$smiley_path_url = PHPBB_URL;
! 			$fields = 'smiley';		
! 			$smiley_url = 'smiley_url';
! 			$emotion = 'emotion';
! 			$table = SMILIES_TABLE;	
! 			$board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']);
! 		break;
! 	}	
! 	
! 	switch (PORTAL_BACKEND)
! 	{
! 		case 'internal':
! 		case 'phpbb2':
! 			$sql = 'SELECT *
! 				FROM ' . $table . '
! 				GROUP BY ' . $smiley_url . '
! 				ORDER BY smilies_id';
! 		break;
! 
! 		case 'phpbb3':
! 			$sql = 'SELECT *
! 				FROM ' . $table . '
! 				GROUP BY code
! 				ORDER BY smiley_order';									
! 		break;
! 	}
! 	
! 	if (!$result = $db->sql_query_limit($sql, $max_smilies))
! 	{
! 		mx_message_die(GENERAL_ERROR, "Couldn't retrieve smilies list", '', __LINE__, __FILE__, $sql);
! 	}
! 	$smilies_count = $db->sql_numrows($result);
! 	$smilies_data = $db->sql_fetchrowset($result);
! 
! 	if ($auth_data == true)
! 	{
! 		for ($i = 1; $i < $smilies_count + 1; $i++)
  		{
! 			$template->assign_block_vars('switch_comment_post.smilies', array(
! 				'CODE' => $smilies_data[$i - 1]['code'],
! 				'URL' => $smiley_path_url . $board_config['smilies_path'] . '/' . $smilies_data[$i - 1][$smiley_url],
! 				'DESC' => $smilies_data[$i - 1][$emotion]
! 			));
! 			if ( is_integer($i / $inline_columns) )
! 			{
! 				$template->assign_block_vars('switch_comment_post.smilies.new_col', array());
! 			}
  		}
  	}
+ 	
  }
  
  // ----------------------------------------------------------------------------
  // This function will return the access data of the current user for a category
***************
*** 753,791 ****
  }
  
! //to have smilies window popup
! function generate_smilies_album($mode, $page_id) //borrowed from phpbbforums...modified to work with album
  {
! 	global $db, $board_config, $template, $lang, $images, $theme, $phpEx, $phpbb_root_path, $mx_root_path;
! 	global $user_ip, $session_length, $starttime;
! 	global $userdata;
! 	// Vars needed for CH 2.1.4
! 	global $config, $user, $censored_words, $icons, $navigation, $themes, $smilies;
! 
! 	$inline_columns = 4;
  	$inline_rows = 5;
  	$window_columns = 8;
  
! 	if ($mode == 'window')
! 	{
! 		//$userdata = session_pagestart( $user_ip, $page_id );
! 		//init_userprefs( $userdata );
! 
! 		$gen_simple_header = true;
! 
! 		$page_title = "Smilies";
  
! 		if ( !$is_block)
!  		{
! 			include($mx_root_path . 'includes/page_header.'.$phpEx);
!  		}
  
! 		$template->set_filenames(array(
! 			'smiliesbody' => 'album_posting_smilies.tpl')
! 		);
  	}
  
- 	$sql = "SELECT emoticon, code, smile_url
- 		FROM " . SMILIES_TABLE . "
- 		ORDER BY smilies_id";
  	if ($result = $db->sql_query($sql))
  	{
--- 1032,1106 ----
  }
  
! /**
!  * Generate phpBB smilies.
!  *
!  * Hacking generate_smilies from phpbb/includes/functions_post(ing).php
!  *
!  * @param string $mode
!  * @param integer $page_id
! *
! * Fill smiley templates (or just the variables) with smilies, either in a window or inline
! */
! function generate_smilies_album($mode, $forum_id)
  {
! 	global $mx_page, $board_config, $template, $mx_root_path, $phpbb_root_path, $phpEx;
! 	global $db, $lang, $images, $theme, $layouttemplate, $mx_request_vars, $module_root_path;
! 	global $user_ip, $session_length, $starttime, $tplEx;
! 	global $userdata, $phpbb_auth, $mx_user, $mx_backend;
! 	
! 	$inline_columns = 9;
  	$inline_rows = 5;
  	$window_columns = 8;
+ 	$page_title = 'Emoticons';
+ 	
+ 	include_once($module_root_path . 'album_mod/includes/album_header.'.$phpEx);
  
! 	$template->set_filenames(array(
! 		'smiliesbody' => 'album_posting_smilies.'.$tplEx)
! 	);
  
! 	switch (PORTAL_BACKEND)
! 	{
! 		case 'internal':
! 			$smiley_path_url = PHPBB_URL; //change this to PORTAL_URL when shared folder will be removed
! 			$fields = 'smilies';		
! 			$smiley_url = 'smile_url';
! 			$emotion = 'emoticon';
! 			$table = SMILIES_TABLE;		
! 		break;
! 		case 'phpbb2':
! 			$smiley_path_url = PHPBB_URL;
! 			$fields = 'smilies';		
! 			$smiley_url = 'smile_url';
! 			$emotion = 'emoticon';
! 			$table = SMILIES_TABLE;		
! 		break;
! 		case 'phpbb3':
! 			$smiley_path_url = PHPBB_URL;
! 			$fields = 'smiley';		
! 			$smiley_url = 'smiley_url';
! 			$emotion = 'emotion';
! 			$table = SMILIES_TABLE;	
! 			$board_config['smilies_path'] = str_replace("smiles", "smilies", $board_config['smilies_path']);
! 		break;
! 	}	
! 	
! 	switch (PORTAL_BACKEND)
! 	{
! 		case 'internal':
! 		case 'phpbb2':
! 			$sql = 'SELECT *
! 				FROM ' . $table . '
! 				GROUP BY ' . $smiley_url . '
! 				ORDER BY smilies_id';
! 		break;
  
! 		case 'phpbb3':
! 			$sql = 'SELECT *
! 				FROM ' . $table . '
! 				ORDER BY smiley_order';									
! 		break;
  	}
  
  	if ($result = $db->sql_query($sql))
  	{
***************
*** 794,801 ****
  		while ($row = $db->sql_fetchrow($result))
  		{
! 			if (empty($rowset[$row['smile_url']]))
  			{
! 				$rowset[$row['smile_url']]['code'] = str_replace("'", "\\'", str_replace('\\', '\\\\', $row['code']));
! 				$rowset[$row['smile_url']]['emoticon'] = $row['emoticon'];
  				$num_smilies++;
  			}
--- 1109,1116 ----
  		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]][$emotion] = $row[$emotion];
  				$num_smilies++;
  			}
***************
*** 820,825 ****
  				$template->assign_block_vars('smilies_row.smilies_col', array(
  					'SMILEY_CODE' => $data['code'],
! 					'SMILEY_IMG' => $phpbb_root_path . $board_config['smilies_path'] . '/' . $smile_url,
! 					'SMILEY_DESC' => $data['emoticon'])
  				);
  
--- 1135,1140 ----
  				$template->assign_block_vars('smilies_row.smilies_col', array(
  					'SMILEY_CODE' => $data['code'],
! 					'SMILEY_IMG' => $smiley_path_url  . $board_config['smilies_path'] . '/' . $smile_url,
! 					'SMILEY_DESC' => $data[$emoticon])
  				);
  
***************
*** 828,832 ****
  				if ($col == $smilies_split_row)
  				{
! 					if ( ($mode == 'inline') && ($row == $inline_rows - 1) )
  					{
  						break;
--- 1143,1147 ----
  				if ($col == $smilies_split_row)
  				{
! 					if ($mode == 'inline' && $row == $inline_rows - 1)
  					{
  						break;
***************
*** 841,845 ****
  			}
  
! 			if ( ($mode == 'inline') && ($num_smilies > $inline_rows * $inline_columns) )
  			{
  				$template->assign_block_vars('switch_smilies_extra', array());
--- 1156,1160 ----
  			}
  
! 			if ($mode == 'inline' && $num_smilies > $inline_rows * $inline_columns)
  			{
  				$template->assign_block_vars('switch_smilies_extra', array());
***************
*** 847,851 ****
  				$template->assign_vars(array(
  					'L_MORE_SMILIES' => $lang['More_emoticons'],
! 					'U_MORE_SMILIES' => mx_append_sid($phpbb_root_path . "posting.$phpEx?mode=smilies"))
  				);
  			}
--- 1162,1166 ----
  				$template->assign_vars(array(
  					'L_MORE_SMILIES' => $lang['More_emoticons'],
! 					'U_MORE_SMILIES' => mx3_append_sid(PHPBB_URL . "posting.$phpEx", "mode=smilies"))
  				);
  			}
***************
*** 861,872 ****
  	if ($mode == 'window')
  	{
! 		$template->pparse('smiliesbody');
! 
! 		if ( !$is_block)
!  		{
! 			include($mx_root_path . 'includes/page_tail.'.$phpEx);
!  		}
! 
  	}
  }
  
--- 1176,1187 ----
  	if ($mode == 'window')
  	{
! 		$template->pparse('smiliesbody');		
! 	}
! 	else
! 	{
! 		die("Mode is $mode and not 'window' ...");		
  	}
+ 	
+ 	include_once($module_root_path . 'album_mod/includes/album_tail.'.$phpEx);
  }
  
***************
*** 935,938 ****
--- 1250,1295 ----
  }
  
+ /**
+  * Enter description here...
+  *
+ */
+ function album_page_header()
+ {
+ 	global $album_config, $lang, $template, $userdata, $images, $mx_user, $mx_request_vars;
+ 	global $template, $db, $theme, $gen_simple_header, $starttime, $phpEx, $tplEx, $board_config, $user_ip;
+ 	global $admin_level, $level_prior, $tree, $do_gzip_compress, $album_root_path;
+ 	global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $title, $mx_block, $mx_page;
+ 	global $mode, $page_title;
+ 
+ 	if (($mode != 'album_download') || ($mode != 'album_rss') || ($mode != 'album_rdf') || ($mode != 'album_pic') || ($mode != 'album_picm') || ($mode != 'album_thumbnail'))
+ 	{
+ 		if (!$is_block)
+ 		{
+ 			$gen_simple_header = true;
+ 			include_once($album_root_path . "includes/album_header.$phpEx");
+ 		}				
+ 	}
+ }
+ 
+ /**
+  * Enter description here...
+  *
+  */
+ function album_page_footer()
+ {
+ 	global $album_config, $lang, $template, $board_config, $userdata;
+ 	global $phpEx, $tplEx, $template, $do_gzip_compress, $debug, $db, $album_root_path, $starttime;
+ 	global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $page_id, $mx_block, $mx_page;
+ 	global $mode;
+ 
+ 	if (($mode != 'album_download') || ($mode != 'album_rss') || ($mode != 'album_rdf') || ($mode != 'album_pic') || ($mode != 'album_picm') || ($mode != 'album_thumbnail'))
+ 	{
+ 		if (!$is_block)
+ 		{		
+ 			include_once($album_root_path . "includes/album_tail.$phpEx");
+ 		}
+ 	}
+ }
+ 
  // +------------------------------------------------------+
  // |  Powered by Photo Album 2.x.x (c) 2002-2003 Smartor  |

--- NEW FILE: album_tail.php ---
<?php
/**
*
* @package page_tail
* @version $Id: album_tail.php,v 1.1 2008/08/29 05:58:23 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://www.mx-publisher.com
* @internal
*
*/

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

global $do_gzip_compress;


$template->set_filenames(array(
	'overall_footer' => "album_footer.$tplEx"
));



$mxbb_footer_text = $lang['mx_about_title'];
$mxbb_footer_text_url = PORTAL_URL . 'index.' . $phpEx . '?sid=' . $userdata['session_id'] . '&mx_copy=true';


$template->assign_vars(array(
	'U_PORTAL_ROOT_PATH' 		=> PORTAL_URL,
	'TEMPLATE_ROOT_PATH' 		=> TEMPLATE_ROOT_PATH,
	'MXBB_EXTRA' 				=> $mxbb_footer_text,
	'MXBB_EXTRA_URL' 			=> $mxbb_footer_text_url,
	'SITENAME'					=> $board_config['sitename'],
	'POWERED_BY' 				=> $lang['Powered_by'],
	'MX_VERSION' 				=> ($userdata['user_level'] == ADMIN && $userdata['user_id'] != ANONYMOUS) ? PORTAL_VERSION : ''
));

$template->pparse('overall_footer');

//
// Close the mx_page class
//
$mx_page->_core();

//
// Unload cache, must be done before the DB connection is closed
//
if (!empty($mx_cache))
{
	$mx_cache->unload();
}

//
// Close our DB connection.
//
$db->sql_close();

exit;
?>
Index: a...
 
[truncated message content]

[mxbb-commits] mx_smartor/album_mod album_common.php,1.27,1.28

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

Update of /cvsroot/mxbb/mx_smartor/album_mod
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10881/album_mod

Modified Files:
	album_common.php 
Log Message:
Upgrade

Index: album_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_common.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** album_common.php	3 Jun 2008 20:14:59 -0000	1.27
--- album_common.php	29 Aug 2008 05:58:23 -0000	1.28
***************
*** 175,186 ****
  }
  
- if (!isset($album_root_path) || empty($album_root_path))
- {
- 	$album_root_path = $module_root_path . ALBUM_MOD_PATH . '';
- }
- 
  include_once($album_root_path . 'includes/album_integration.' . $phpEx);
  include_once($album_root_path . 'includes/album_functions.' . $phpEx);
  include_once($album_root_path . 'includes/clown_album_functions.' . $phpEx);
  //
  // Set ALBUM Version
--- 175,182 ----
  }
  
  include_once($album_root_path . 'includes/album_integration.' . $phpEx);
  include_once($album_root_path . 'includes/album_functions.' . $phpEx);
  include_once($album_root_path . 'includes/clown_album_functions.' . $phpEx);
+ 
  //
  // Set ALBUM Version
***************
*** 205,209 ****
  	'SPACER' => $images['spacer'],
  
! 	'CURRENT_TIME' => sprintf($lang['Current_time'], create_date2($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
  
  	'THUMB_SIZE' => $thumb_size,
--- 201,205 ----
  	'SPACER' => $images['spacer'],
  
! 	'CURRENT_TIME' => sprintf($lang['Current_time'], album_create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
  
  	'THUMB_SIZE' => $thumb_size,

[mxbb-commits] mx_smartor/admin admin_album_auth.php, 1.17, 1.18 admin_album_personal.php, 1.15, 1.16

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

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

Modified Files:
	admin_album_auth.php admin_album_personal.php 
Log Message:
Upgrade

Index: admin_album_personal.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_personal.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** admin_album_personal.php	27 Mar 2008 14:30:58 -0000	1.15
--- admin_album_personal.php	29 Aug 2008 05:58:22 -0000	1.16
***************
*** 153,161 ****
  		'body' => $acp_prefix . 'album_personal_body.tpl')
  	);
  
  	// Get the list of phpBB usergroups
  	$sql = "SELECT group_id, group_name
  			FROM " . GROUPS_TABLE . "
! 			WHERE group_single_user <> " . TRUE ."
  			ORDER BY group_name ASC";
  	if ( !($result = $db->sql_query($sql)) )
--- 153,173 ----
  		'body' => $acp_prefix . 'album_personal_body.tpl')
  	);
+ 	
+ 	switch (PORTAL_BACKEND)
+ 	{
+ 		case 'internal':
+ 		case 'phpbb2':
+ 			$sql_where = 'group_single_user <> " . true . "';
+ 		break;
+ 
+ 		case 'phpbb3':
+ 			$sql_where = 'group_id <> " . true . "';
+ 		break;
+ 	}	
  
  	// Get the list of phpBB usergroups
  	$sql = "SELECT group_id, group_name
  			FROM " . GROUPS_TABLE . "
! 			WHERE " . $sql_where . "
  			ORDER BY group_name ASC";
  	if ( !($result = $db->sql_query($sql)) )

Index: admin_album_auth.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/admin/admin_album_auth.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** admin_album_auth.php	27 Mar 2008 14:30:43 -0000	1.17
--- admin_album_auth.php	29 Aug 2008 05:58:22 -0000	1.18
***************
*** 215,218 ****
--- 215,230 ----
  			'S_ALBUM_ACTION' => mx_append_sid( "admin_album_auth.$phpEx?cat_id=$cat_id" ),
  		));
+ 		
+ 		switch (PORTAL_BACKEND)
+ 		{
+ 			case 'internal':
+ 			case 'phpbb2':
+ 				$sql_where = 'group_single_user <> " . true . "';
+ 			break;
+ 
+ 			case 'phpbb3':
+ 				$sql_where = 'group_id <> " . true . "';
+ 			break;
+ 		}
  
  		//
***************
*** 221,225 ****
  		$sql = "SELECT group_id, group_name
  				FROM " . GROUPS_TABLE . "
! 				WHERE group_single_user <> " . true . "
  				ORDER BY group_name ASC";
  		if ( !( $result = $db->sql_query( $sql ) ) )
--- 233,237 ----
  		$sql = "SELECT group_id, group_name
  				FROM " . GROUPS_TABLE . "
! 				WHERE " . $sql_where . "
  				ORDER BY group_name ASC";
  		if ( !( $result = $db->sql_query( $sql ) ) )

[mxbb-commits] mx_smartor/templates/prosilver mx_smartor.cfg, NONE, 1.1

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

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

Added Files:
	mx_smartor.cfg 
Log Message:
Upgrade

--- NEW FILE: mx_smartor.cfg ---
<?php
/**
*
* @package mxBB Portal Module - mx_smartor
* @version $Id: mx_smartor.cfg,v 1.1 2008/08/29 05:58:44 orynider Exp $
* @copyright (c) 2002-2006 mxBB Development Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
*
*/

//
// **      Configuration file for subSilver template       **
//
// **         copyright (C) 2001 The phpBB Group           **
// **             Created by subBlue design                **
// **                  www.subBlue.com                     **
//
// ***    subSilver dev. forum: www.subSky.com/phpBB2/      **
//
// $Id: mx_smartor.cfg,v 1.1 2008/08/29 05:58:44 orynider Exp $
//
// Please note that to enable support of different languages
// the ". LANG ." place holder is available. This will be replaced
// with xxx where xxx is the users selected language. If
// that language isn't available it will default to english.
// Therefore you MUST ensure you have at least a english
// directory if you choose to localise your template
//

//
// Do not alter this line!
//
$mx_template_config = true;

// -------------------------------------------------------------------------
// Do some checks
// -------------------------------------------------------------------------
$current_template_path = file_exists($mx_root_path . $current_template_path . "/images" ) ? $current_template_path : ( file_exists( $mx_root_path . $cloned_template_path . "/images" ) ? $cloned_template_path : $default_template_path);
$current_template_root_path = str_replace($module_root_path, "", $current_template_path);

// -------------------------------------------------------------------------
// Prefix with PORTAL_URL
// -------------------------------------------------------------------------
$current_template_images = PORTAL_URL . $current_template_path . "/images";
$current_template_theme_images	= !empty($current_template_root_path) && file_exists($mx_root_path . $current_template_root_path . "/images") ? PORTAL_URL . $current_template_root_path . "/images" : ( !empty($cloned_template_path) && file_exists( $mx_root_path . $cloned_template_path . "/images" ) ? PORTAL_URL . cloned_template_path . "/images" :  PORTAL_URL . "templates/_core/images");
$current_module_images = !empty($current_template_root_path) && file_exists($module_root_path . $current_template_root_path ."/images") ? PORTAL_URL . $module_root_path . $current_template_root_path ."/images" : $current_template_theme_images . "/phpbb2";


// -------------------------------------------------------------------------
// (Re)Define images
// -------------------------------------------------------------------------

// Rss Feed Site Images - BEGIN
$mx_images['logo_url'] = $mx_root_path . $current_template_root_path . "/images/logo.gif";

// Mighty Gorgon - Full Album Pack - BEGIN
$mx_images['icon_left_arrow3'] = "$current_module_images/icon_left_arrow3.gif";
$mx_images['icon_right_arrow3'] = "$current_module_images/icon_right_arrow3.gif";
$mx_images['no_thumbnail'] = "$current_module_images/nothumbnail.jpg";
$mx_images['spacer'] = "$current_module_images/spacer.gif";
$mx_images['mini_new_pictures'] = "$current_module_images/icon_minipost_new.gif";
$mx_images['mini_all_pic_view_mode'] = "$current_module_images/icon_mini_showall.gif";
$mx_images['icon_album'] = "$current_module_images/{LANG}/icon_album.gif";
$mx_images['manage_pic'] = "$current_module_images/{LANG}/manage_pic.gif";
$mx_images['upload_pic'] = "$current_module_images/{LANG}/upload_pic.gif";
$mx_images['jupload_pic']= "$current_module_images/{LANG}/jupload_pic.gif";
$mx_images['download_pic'] = "$current_module_images/{LANG}/download.gif";
$mx_images['download_all_pic'] = "$current_module_images/{LANG}/download_all.gif";
$mx_images['all_pic_view_mode'] = "$current_module_images/{LANG}/simple_view.gif";
$mx_images['normal_pic_view_mode'] = "$current_module_images/{LANG}/normal_view.gif";
$mx_images['show_all_pics'] = "$current_module_images/{LANG}/show_all_pics.gif";
$mx_images['show_all_ratings'] = "$current_module_images/{LANG}/show_all_ratings.gif";
$mx_images['show_all_comments'] = "$current_module_images/{LANG}/show_all_comments.gif";
$mx_images['orange_dot'] = "$current_module_images/orange_dot.png";
$mx_images['blue_dot'] = "$current_module_images/blue_dot.png";
$mx_images['green_dot'] = "$current_module_images/green_dot.png";
$mx_images['yellow_dot'] = "$current_module_images/yellow_dot.png";
$mx_images['icon_dot'] = "$current_module_images/icon_dot.gif";
$mx_images['default_avatar'] = "$current_module_images/default_avatar.png";
$mx_images['guest_avatar'] = "$current_module_images/{LANG}/guest_avatar.png";

// Use standard phpBB graphics
//
$mx_images['icon_quote'] = "$current_module_images/{LANG}/icon_post_quote.gif";
$mx_images['icon_edit'] = "$current_module_images/{LANG}/icon_post_edit.gif";
$mx_images['icon_search'] = "$current_module_images/{LANG}/icon_user_search.gif";
$mx_images['icon_profile'] = "$current_module_images/{LANG}/icon_user_profile.gif";
$mx_images['icon_pm'] = "$current_module_images/{LANG}/icon_contact_pm.gif";
$mx_images['icon_email'] = "$current_module_images/{LANG}/icon_contact_email.gif";
$mx_images['icon_delpost'] = "$current_module_images/{LANG}/icon_post_delete.gif";
$mx_images['icon_ip'] = "$current_module_images/{LANG}/icon_ip.gif";
$mx_images['icon_www'] = "$current_module_images/{LANG}/icon_contact_www.gif";
$mx_images['icon_icq'] = "$current_module_images/{LANG}/icon_contact_icq.gif";
$mx_images['icon_aim'] = "$current_module_images/{LANG}/icon_contact_aim.gif";
$mx_images['icon_yim'] = "$current_module_images/{LANG}/icon_contact_yahoo.gif";
$mx_images['icon_msnm'] = "$current_module_images/{LANG}/icon_contact_msnm.gif";

$mx_images['icon_minipost'] = "$current_module_images/icon_minipost.gif";
$mx_images['icon_gotopost'] = "$current_module_images/icon_minipost.gif";
$mx_images['icon_minipost_new'] = "$current_module_images/icon_minipost_new.gif";
//
// Last Message and Anouncement block compatibility
//
$mx_images['icon_latest_reply'] 	= "$current_module_images/icon_topic_latest.gif";
$mx_images['icon_newest_reply'] 	= "$current_module_images/icon_topic_newest.gif";

$mx_images['forum'] = "$current_module_images/forum_read.gif";
$mx_images['forum_new'] = "$current_module_images/forum_unread.gif";
$mx_images['forum_locked'] = "$current_module_images/forum_read_locked.gif";

$mx_images['folder'] = "$current_module_images/topic_read.gif";
$mx_images['folder_new'] = "$current_module_images/topic_unread.gif";
$mx_images['folder_hot'] = "$current_module_images/topic_read_hot.gif";
$mx_images['folder_hot_new'] = "$current_module_images/topic_unread_hot.gif";
$mx_images['folder_locked'] = "$current_module_images/topic_read_locked.gif";
$mx_images['folder_locked_new'] = "$current_module_images/topic_unread_locked.gif";
$mx_images['folder_sticky'] = "$current_module_images/sticky_read.gif";
$mx_images['folder_sticky_new'] = "$current_module_images/sticky_unread.gif";
$mx_images['folder_announce'] = "$current_module_images/announce_read.gif";
$mx_images['folder_announce_new'] = "$current_module_images/announce_unread.gif";



//
// Define common theme colors (if not present in db)
//
$theme['body_bgcolor']	= ( ($theme['body_bgcolor']) ? $theme['body_bgcolor'] : 'FFFFFF' );
$theme['body_text']	= ( ($theme['body_text']) ? $theme['body_text'] : '383B3F' );
$theme['body_link']	= ( ($theme['body_link']) ? $theme['body_link'] : '006699' );
$theme['body_vlink']	= ( ($theme['body_vlink']) ? $theme['body_vlink'] : '006699' );
$theme['body_alink']	= ( ($theme['body_alink']) ? $theme['body_alink'] : '006699' );
$theme['body_hlink']	= ( ($theme['body_hlink']) ? $theme['body_hlink'] : 'f3a625' );
$theme['tr_color1']	= ( ($theme['tr_color1']) ? $theme['tr_color1'] : 'F7EEEE' ); // row1
$theme['tr_color2']	= ( ($theme['tr_color2']) ? $theme['tr_color2'] : 'FBF4F4' ); // row2
$theme['tr_color3']	= ( ($theme['tr_color3']) ? $theme['tr_color3'] : 'f1f1f1' ); // row3
$theme['th_color1']	= ( ($theme['th_color1']) ? $theme['th_color1'] : 'FFA34F' ); // bodyline border color
$theme['th_color2']	= ( ($theme['th_color2']) ? $theme['th_color2'] : '333333' ); // forumline border color
$theme['th_color3']	= ( ($theme['th_color3']) ? $theme['th_color3'] : 'd1d7dc' ); // boxes border color
$theme['td_color1']	= ( ($theme['td_color1']) ? $theme['td_color1'] : 'F7EEEE' ); // code/quote boxes background
$theme['td_color2']	= ( ($theme['td_color2']) ? $theme['td_color2'] : 'FBF4F4' ); // post box background
$theme['fontface1']	= ( ($theme['fontface1']) ? $theme['fontface1'] : 'Verdana,Arial,Helvetica,sans-serif');
$theme['fontcolor1']	= ( ($theme['fontcolor1']) ? $theme['fontcolor1'] : '383B3F' ); // Main font color
$theme['fontcolor2']	= ( ($theme['fontcolor2']) ? $theme['fontcolor2'] : '726363' );
?>

[mxbb-commits] mx_smartor/templates/prosilver/images/lang_english download.gif, NONE, 1.1 download_all.gif, NONE, 1.1 guest_avatar.png, NONE, 1.1 icon_album.gif, NONE, 1.1 icon_contact_aim.gif, NONE, 1.1 icon_contact_email.gif, NONE, 1.1 icon_contact_icq.gif, NONE, 1.1 icon_contact_jabber.gif, NONE, 1.1 icon_contact_msnm.gif, NONE, 1.1 icon_contact_pm.gif, NONE, 1.1 icon_contact_www.gif, NONE, 1.1 icon_contact_yahoo.gif, NONE, 1.1 icon_ip.gif, NONE, 1.1 icon_post_delete.gif, NONE, 1.1 icon_post_edit.gif, NONE, 1.1 icon_post_info.gif, NONE, 1.1 icon_post_quote.gif, NONE, 1.1 icon_post_report.gif, NONE, 1.1 icon_user_offline.gif, NONE, 1.1 icon_user_online.gif, NONE, 1.1 icon_user_profile.gif, NONE, 1.1 icon_user_search.gif, NONE, 1.1 icon_user_warn.gif, NONE, 1.1 index.htm, NONE, 1.1 jupload_pic.gif, NONE, 1.1 manage_pic.gif, NONE, 1.1 normal_view.gif, NONE, 1.1 show_all_comments.gif, NONE, 1.1 show_all_pics.gif, NONE, 1.1 show_all_ratings.gif, NONE, 1.1 showall.gif, NONE, 1.1 simple_view.gif, NONE, 1.1 upload_pic.gif, NONE, 1.1 upload_pic_2.gif, NONE, 1.1

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

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

Added Files:
	download.gif download_all.gif guest_avatar.png icon_album.gif 
	icon_contact_aim.gif icon_contact_email.gif 
	icon_contact_icq.gif icon_contact_jabber.gif 
	icon_contact_msnm.gif icon_contact_pm.gif icon_contact_www.gif 
	icon_contact_yahoo.gif icon_ip.gif icon_post_delete.gif 
	icon_post_edit.gif icon_post_info.gif icon_post_quote.gif 
	icon_post_report.gif icon_user_offline.gif 
	icon_user_online.gif icon_user_profile.gif 
	icon_user_search.gif icon_user_warn.gif index.htm 
	jupload_pic.gif manage_pic.gif normal_view.gif 
	show_all_comments.gif show_all_pics.gif show_all_ratings.gif 
	showall.gif simple_view.gif upload_pic.gif upload_pic_2.gif 
Log Message:
Upgrade

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

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

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

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

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

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

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

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

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

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

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

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

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

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

</body>
</html>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

[mxbb-commits] mx_smartor/templates/prosilver/images announce_read.gif, NONE, 1.1 announce_read_locked.gif, NONE, 1.1 announce_read_locked_mine.gif, NONE, 1.1 announce_read_mine.gif, NONE, 1.1 announce_unread.gif, NONE, 1.1 announce_unread_locked.gif, NONE, 1.1 announce_unread_locked_mine.gif, NONE, 1.1 announce_unread_mine.gif, NONE, 1.1 blue_dot.png, NONE, 1.1 default_avatar.png, NONE, 1.1 forum_link.gif, NONE, 1.1 forum_read.gif, NONE, 1.1 forum_read_locked.gif, NONE, 1.1 forum_read_subforum.gif, NONE, 1.1 forum_unread.gif, NONE, 1.1 forum_unread_locked.gif, NONE, 1.1 forum_unread_subforum.gif, NONE, 1.1 green_dot.png, NONE, 1.1 icon_back_top.gif, NONE, 1.1 icon_contact_aim.gif, NONE, 1.1 icon_contact_email.gif, NONE, 1.1 icon_contact_icq.gif, NONE, 1.1 icon_contact_jabber.gif, NONE, 1.1 icon_contact_msnm.gif, NONE, 1.1 icon_contact_www.gif, NONE, 1.1 icon_contact_yahoo.gif, NONE, 1.1 icon_dot.gif, NONE, 1.1 icon_left_arrow.gif, NONE, 1.1 icon_left_arrow2.gif, NONE, 1.1 icon_left_arrow3.gif, NONE, 1.1 icon_mini_album.gif, NONE, 1.1 icon_mini_album_13x13.gif, NONE, 1.1 icon_mini_showall.gif, NONE, 1.1 icon_minipost.gif, NONE, 1.1 icon_minipost_new.gif, NONE, 1.1 icon_offline.gif, NONE, 1.1 icon_online.gif, NONE, 1.1 icon_post_delete.gif, NONE, 1.1 icon_post_info.gif, NONE, 1.1 icon_post_report.gif, NONE, 1.1 icon_post_target.gif, NONE, 1.1 icon_post_target_unread.gif, NONE, 1.1 icon_rate_bad.gif, NONE, 1.1 icon_rate_good.gif, NONE, 1.1 icon_right_arrow.gif, NONE, 1.1 icon_right_arrow2.gif, NONE, 1.1 icon_right_arrow3.gif, NONE, 1.1 icon_topic_attach.gif, NONE, 1.1 icon_topic_latest.gif, NONE, 1.1 icon_topic_newest.gif, NONE, 1.1 icon_topic_reported.gif, NONE, 1.1 icon_topic_unapproved.gif, NONE, 1.1 icon_user_warn.gif, NONE, 1.1 index.htm, NONE, 1.1 nothumbnail.jpg, NONE, 1.1 orange_dot.png, NONE, 1.1 poll_center.gif, NONE, 1.1 poll_left.gif, NONE, 1.1 poll_right.gif, NONE, 1.1 site_logo.gif, NONE, 1.1 spacer.gif, NONE, 1.1 sticky_read.gif, NONE, 1.1 sticky_read_locked.gif, NONE, 1.1 sticky_read_locked_mine.gif, NONE, 1.1 sticky_read_mine.gif, NONE, 1.1 sticky_unread.gif, NONE, 1.1 sticky_unread_locked.gif, NONE, 1.1 sticky_unread_locked_mine.gif, NONE, 1.1 sticky_unread_mine.gif, NONE, 1.1 subforum_read.gif, NONE, 1.1 subforum_unread.gif, NONE, 1.1 topic_moved.gif, NONE, 1.1 topic_read.gif, NONE, 1.1 topic_read_hot.gif, NONE, 1.1 topic_read_hot_mine.gif, NONE, 1.1 topic_read_locked.gif, NONE, 1.1 topic_read_locked_mine.gif, NONE, 1.1 topic_read_mine.gif, NONE, 1.1 topic_unread.gif, NONE, 1.1 topic_unread_hot.gif, NONE, 1.1 topic_unread_hot_mine.gif, NONE, 1.1 topic_unread_locked.gif, NONE, 1.1 topic_unread_locked_mine.gif, NONE, 1.1 topic_unread_mine.gif, NONE, 1.1 upload_bar.gif, NONE, 1.1 yellow_dot.png, NONE, 1.1

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

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

Added Files:
	announce_read.gif announce_read_locked.gif 
	announce_read_locked_mine.gif announce_read_mine.gif 
	announce_unread.gif announce_unread_locked.gif 
	announce_unread_locked_mine.gif announce_unread_mine.gif 
	blue_dot.png default_avatar.png forum_link.gif forum_read.gif 
	forum_read_locked.gif forum_read_subforum.gif forum_unread.gif 
	forum_unread_locked.gif forum_unread_subforum.gif 
	green_dot.png icon_back_top.gif icon_contact_aim.gif 
	icon_contact_email.gif icon_contact_icq.gif 
	icon_contact_jabber.gif icon_contact_msnm.gif 
	icon_contact_www.gif icon_contact_yahoo.gif icon_dot.gif 
	icon_left_arrow.gif icon_left_arrow2.gif icon_left_arrow3.gif 
	icon_mini_album.gif icon_mini_album_13x13.gif 
	icon_mini_showall.gif icon_minipost.gif icon_minipost_new.gif 
	icon_offline.gif icon_online.gif icon_post_delete.gif 
	icon_post_info.gif icon_post_report.gif icon_post_target.gif 
	icon_post_target_unread.gif icon_rate_bad.gif 
	icon_rate_good.gif icon_right_arrow.gif icon_right_arrow2.gif 
	icon_right_arrow3.gif icon_topic_attach.gif 
	icon_topic_latest.gif icon_topic_newest.gif 
	icon_topic_reported.gif icon_topic_unapproved.gif 
	icon_user_warn.gif index.htm nothumbnail.jpg orange_dot.png 
	poll_center.gif poll_left.gif poll_right.gif site_logo.gif 
	spacer.gif sticky_read.gif sticky_read_locked.gif 
	sticky_read_locked_mine.gif sticky_read_mine.gif 
	sticky_unread.gif sticky_unread_locked.gif 
	sticky_unread_locked_mine.gif sticky_unread_mine.gif 
	subforum_read.gif subforum_unread.gif topic_moved.gif 
	topic_read.gif topic_read_hot.gif topic_read_hot_mine.gif 
	topic_read_locked.gif topic_read_locked_mine.gif 
	topic_read_mine.gif topic_unread.gif topic_unread_hot.gif 
	topic_unread_hot_mine.gif topic_unread_locked.gif 
	topic_unread_locked_mine.gif topic_unread_mine.gif 
	upload_bar.gif yellow_dot.png 
Log Message:
Upgrade

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

</body>
</html>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

[mxbb-commits] mx_smartor/templates/_core/images/lang_romanian button_pm_new.gif, NONE, 1.1 button_pm_reply.gif, NONE, 1.1 button_topic_locked.gif, NONE, 1.1 button_topic_new.gif, NONE, 1.1 button_topic_reply.gif, NONE, 1.1 download.gif, NONE, 1.1 download_all.gif, NONE, 1.1 guest_avatar.png, NONE, 1.1 icon_album.gif, NONE, 1.1 icon_contact_aim.gif, NONE, 1.1 icon_contact_email.gif, NONE, 1.1 icon_contact_icq.gif, NONE, 1.1 icon_contact_jabber.gif, NONE, 1.1 icon_contact_msnm.gif, NONE, 1.1 icon_contact_pm.gif, NONE, 1.1 icon_contact_www.gif, NONE, 1.1 icon_contact_yahoo.gif, NONE, 1.1 icon_post_delete.gif, NONE, 1.1 icon_post_edit.gif, NONE, 1.1 icon_post_info.gif, NONE, 1.1 icon_post_quote.gif, NONE, 1.1 icon_post_report.gif, NONE, 1.1 icon_user_offline.gif, NONE, 1.1 icon_user_online.gif, NONE, 1.1 icon_user_profile.gif, NONE, 1.1 icon_user_search.gif, NONE, 1.1 icon_user_warn.gif, NONE, 1.1 imageset.cfg, NONE, 1.1 index.htm, NONE, 1.1 jupload_pic.gif, NONE, 1.1 manage_pic.gif, NONE, 1.1 normal_view.gif, NONE, 1.1 show_all_comments.gif, NONE, 1.1 show_all_pics.gif, NONE, 1.1 show_all_ratings.gif, NONE, 1.1 showall.gif, NONE, 1.1 simple_view.gif, NONE, 1.1 upload_pic.gif, NONE, 1.1 upload_pic_2.gif, NONE, 1.1

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

Update of /cvsroot/mxbb/mx_smartor/templates/_core/images/lang_romanian
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv10881/templates/_core/images/lang_romanian

Added Files:
	button_pm_new.gif button_pm_reply.gif button_topic_locked.gif 
	button_topic_new.gif button_topic_reply.gif download.gif 
	download_all.gif guest_avatar.png icon_album.gif 
	icon_contact_aim.gif icon_contact_email.gif 
	icon_contact_icq.gif icon_contact_jabber.gif 
	icon_contact_msnm.gif icon_contact_pm.gif icon_contact_www.gif 
	icon_contact_yahoo.gif icon_post_delete.gif icon_post_edit.gif 
	icon_post_info.gif icon_post_quote.gif icon_post_report.gif 
	icon_user_offline.gif icon_user_online.gif 
	icon_user_profile.gif icon_user_search.gif icon_user_warn.gif 
	imageset.cfg index.htm jupload_pic.gif manage_pic.gif 
	normal_view.gif show_all_comments.gif show_all_pics.gif 
	show_all_ratings.gif showall.gif simple_view.gif 
	upload_pic.gif upload_pic_2.gif 
Log Message:
Upgrade

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

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

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

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

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

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

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

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

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

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

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

</body>
</html>
--- NEW FILE: manage_pic.gif ---
(This appears to be a binary file; contents omitted.)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

--- NEW FILE: imageset.cfg ---
#
# phpBB Imageset Configuration File
#
# @package phpBB3
# @copyright (c) 2005 phpBB Group 
# @license http://opensource.org/licenses/gpl-license.php GNU Public License 
#
#
# At the left is the name, please do not change this
# At the right the value is entered
# For on/off options the valid values are on, off, 1, 0, true and false
#
# Values get trimmed, if you want to add a space in front or at the end of
# the value, then enclose the value with single or double quotes. 
# Single and double quotes do not need to be escaped.
#
#

# Images 
img_icon_contact_aim = icon_contact_aim.gif
img_icon_contact_email = icon_contact_email.gif
img_icon_contact_icq = icon_contact_icq.gif
img_icon_contact_jabber = icon_contact_jabber.gif
img_icon_contact_msnm = icon_contact_msnm.gif
img_icon_contact_pm = icon_contact_pm.gif
img_icon_contact_yahoo = icon_contact_yahoo.gif
img_icon_contact_www = icon_contact_www.gif

img_icon_post_delete = icon_post_delete.gif
img_icon_post_edit = icon_post_edit.gif
img_icon_post_info = icon_post_info.gif
img_icon_post_quote = icon_post_quote.gif
img_icon_post_report = icon_post_report.gif

img_icon_user_online = icon_user_online.gif
img_icon_user_offline = icon_user_offline.gif
img_icon_user_profile = icon_user_profile.gif
img_icon_user_search = icon_user_search.gif
img_icon_user_warn = icon_user_warn.gif

img_button_pm_forward =
img_button_pm_new = button_pm_new.gif
img_button_pm_reply = button_pm_reply.gif
img_button_topic_locked = button_topic_locked.gif
img_button_topic_new = button_topic_new.gif
img_button_topic_reply = button_topic_reply.gif


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

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

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

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

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

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

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

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

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

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

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