[mxbb-commits] mx_smartor/album_mod album_bbconstants.php, 1.7, 1.8 album_common.php, 1.22, 1.23 al

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

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

Modified Files:
	album_bbconstants.php album_common.php album_integration.php 
Log Message:
2.0.1

Index: album_bbconstants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_bbconstants.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** album_bbconstants.php	8 Feb 2008 10:47:59 -0000	1.7
--- album_bbconstants.php	6 Mar 2008 06:43:47 -0000	1.8
***************
*** 29,33 ****
  if ( !($result = $db->sql_query($sql)) )
  {
! 	message_die(CRITICAL_ERROR, 'Could not query album config database');
  }

--- 29,33 ----
  if ( !($result = $db->sql_query($sql)) )
  {
! 	$album_index = 6;
  }

***************
*** 38,63 ****
  }

! function this_smartor_mxurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $album_index, $phpEx, $integration_enabled;
! 
! 	$module_root_path = $mx_root_path . 'modules/mx_smartor/';
! 
! 	if( $force_standalone_mode )
! 	{
! 		$mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
! 	}
! 	else
  	{
! 		$mxurl = $mx_root_path . 'index.' . $phpEx;
! 		$mxurl .= '?page=' . $album_index . ($args == '' ? '' : '&' . $args);
  	}
- 	return $mxurl;
  }

! define('ALBUM_INDEX', this_smartor_mxurl());
! define('ALBUM_SHOWPAGE', this_smartor_mxurl('smartor_mode=album_showpage', false));
! define('ALBUM_PICM', this_smartor_mxurl('smartor_mode=album_picm', true));
! define('ALBUM_THUMBNAIL', this_smartor_mxurl('smartor_mode=album_thumbnail', true));

  ?>
\ No newline at end of file
--- 38,71 ----
  }

! if (!function_exists('this_smartor_mxurl'))
  {
! 	function this_smartor_mxurl($args = '', $force_standalone_mode = false)
  	{
! 		global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled;
! 
! 		if($force_standalone_mode)
! 		{
! 			$mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
! 		}
! 		else
! 		{
! 			$mxurl = $mx_root_path . 'index.' . $phpEx;
! 			if( is_numeric($page_id) && !empty($page_id) )
! 			{
! 				$mxurl .= '?page=' . $page_id . ($args == '' ? '' : '&' . $args);
! 			}
! 			else
! 			{
! 				$mxurl .= '?page=' . $album_index . ($args == '' ? '' : '&' . $args);
! 			}
! 		}
! 		return $mxurl;
  	}
  }

! @define('ALBUM_INDEX', this_smartor_mxurl());
! @define('ALBUM_SHOWPAGE', this_smartor_mxurl('smartor_mode=album_showpage', false));
! @define('ALBUM_PICM', this_smartor_mxurl('smartor_mode=album_picm', true));
! @define('ALBUM_THUMBNAIL', this_smartor_mxurl('smartor_mode=album_thumbnail', true));

  ?>
\ No newline at end of file

Index: album_integration.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_integration.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** album_integration.php	8 Feb 2008 10:47:59 -0000	1.6
--- album_integration.php	6 Mar 2008 06:43:47 -0000	1.7
***************
*** 45,70 ****
  // Generate paths for page and standalone mode
  // ...function based on original function written by Markus :-)
! function this_smartor_mxurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
! 
! 
! 	if( $force_standalone_mode || !$is_block )
! 	{
! 		$mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
! 	}
! 	else
  	{
! 		$mxurl = $mx_root_path . 'index.' . $phpEx;
! 		if( is_numeric($page_id) && !empty($page_id) )
  		{
! 			$mxurl .= '?page=' . $page_id . ($args == '' ? '' : '&' . $args);
  		}
  		else
  		{
! 			$mxurl .= '?page=' . $album_index . ($args == '' ? '' : '&' . $args);
  		}
  	}
- 	return $mxurl;
  }
  function this_fap_addonurl($args = '', $force_standalone_mode = false)
--- 45,72 ----
  // Generate paths for page and standalone mode
  // ...function based on original function written by Markus :-)
! if (!function_exists('this_smartor_mxurl'))
  {
! 	function this_smartor_mxurl($args = '', $force_standalone_mode = false)
  	{
! 		global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
! 
! 		if( $force_standalone_mode || !$is_block )
  		{
! 			$mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  		}
  		else
  		{
! 			$mxurl = $mx_root_path . 'index.' . $phpEx;
! 			if( is_numeric($page_id) && !empty($page_id) )
! 			{
! 				$mxurl .= '?page=' . $page_id . ($args == '' ? '' : '&' . $args);
! 			}
! 			else
! 			{
! 				$mxurl .= '?page=' . $album_index . ($args == '' ? '' : '&' . $args);
! 			}
  		}
+ 		return $mxurl;
  	}
  }
  function this_fap_addonurl($args = '', $force_standalone_mode = false)

Index: album_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_common.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** album_common.php	8 Feb 2008 10:47:59 -0000	1.22
--- album_common.php	6 Mar 2008 06:43:47 -0000	1.23
***************
*** 30,71 ****
  //  Read main language definition and theme images definition
  // **********************************************************************
  $mx_user->extend(MX_LANG_MAIN, MX_IMAGES);

  //
  // Get Album Config
  //
! $sql = "SELECT *
! 		FROM ". ALBUM_CONFIG_TABLE;
! if(!$result = $db->sql_query($sql, false, true))
  {
! 	mx_message_die(GENERAL_ERROR, 'Could not query Album config information', '', __LINE__, __FILE__, $sql);
  }
! while( $row = $db->sql_fetchrow($result) )
  {
! 	$album_config_name = $row['config_name'];
! 	$album_config_value = $row['config_value'];
! 	$album_config[$album_config_name] = $album_config_value;
! }

! /*
! // for compatibility with mxBB 2.7.x and SP...
! 	$album_config['rate'] = '1';
! 	$album_config['comment'] = '1';
! 	$album_config['fullpic_popup'] = '0';
! */

  //get SP config info
! $sql = "SELECT *
! 		FROM ". ALBUM_SP_CONFIG_TABLE;
! if(!$result = $db->sql_query($sql))
  {
! 	mx_message_die(GENERAL_ERROR, "Could not query SP config information", "", __LINE__, __FILE__, $sql);
  }
! while( $row = $db->sql_fetchrow($result) )
  {
! 	$album_sp_config_name = $row['config_name'];
! 	$album_sp_config_value = $row['config_value'];
! 	
! 	$album_sp_config[$album_sp_config_name] = $album_sp_config_value;
  }
  //end get SP config info
--- 30,109 ----
  //  Read main language definition and theme images definition
  // **********************************************************************
+ $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
  $mx_user->extend(MX_LANG_MAIN, MX_IMAGES);

+ // Cache settings
+ $use_cache = 1;
+ 
  //
  // Get Album Config
  //
! if (($mx_cache->get('album_config')) && ($use_cache))
  {
! 	$album_config = $mx_cache->get('album_config');
  }
! else
  {
! 	$sql = "SELECT * FROM " . ALBUM_CONFIG_TABLE;

! 	if (!($result = $db->sql_query($sql)))
! 	{
! 		if (!function_exists('mx_message_die'))
! 		{
! 			die("Couldnt query smartor album config information, Allso this hosting or server is using a cache optimizer not compatible with MX-Publisher or just lost connection to database wile query.");
! 		}
! 		else
! 		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt query smartor album config information', '', __LINE__, __FILE__, $sql );
! 		}
! 	}
! 
! 	while ($row = $db->sql_fetchrow($result))
! 	{
! 		$album_config_name = $row['config_name'];
! 		$album_config_value = $row['config_value'];
! 		$album_config[$album_config_name] = $album_config_value;
! 	}
! 	$db->sql_freeresult($result);
! 
! 	if ($use_cache)
! 	{
! 		$mx_cache->put('album_config', $album_config);
! 	}
! }

  //get SP config info
! if (($mx_cache->get('album_sp_config')) && ($use_cache))
  {
! 	$album_sp_config = $mx_cache->get('album_sp_config');
  }
! else
  {
! 	$sql = "SELECT * FROM " . ALBUM_SP_CONFIG_TABLE;
! 
! 	if (!($result = $db->sql_query($sql)))
! 	{
! 		if (!function_exists('mx_message_die'))
! 		{
! 			die("Couldnt query smartor album sp config information, Allso this hosting or server is using a cache optimizer not compatible with MX-Publisher or just lost connection to database wile query.");
! 		}
! 		else
! 		{
! 			mx_message_die( GENERAL_ERROR, 'Couldnt query smartor album sp config information', '', __LINE__, __FILE__, $sql );
! 		}
! 	}
! 
! 	while ($row = $db->sql_fetchrow($result))
! 	{
! 		$album_sp_config_name = $row['config_name'];
! 		$album_sp_config_value = $row['config_value'];
! 		$album_sp_config[$album_sp_config_name] = $album_sp_config_value;
! 	}
! 	$db->sql_freeresult($result);
! 
! 	if ($use_cache)
! 	{
! 		$mx_cache->put('album_sp_config', $album_sp_config);
! 	}
  }
  //end get SP config info

[mxbb-commits] mx_smartor/album_mod album_bbconstants.php, 1.7, 1.8 album_common.php, 1.22, 1.23 al

[mxbb-commits] mx_smartor/album_mod album_bbconstants.php, 1.7, 1.8 album_common.php, 1.22, 1.23 album_integration.php, 1.6, 1.7