[mxbb-commits] mx_smartor/album_mod/includes album_bbcode.php, 1.2, 1.3 album_constants.php, 1.2, 1.3 album_functions.php, 1.2, 1.3 album_hierarchy_functions.php, 1.2, 1.3 album_hierarchy_sql.php, 1.2, 1.3 album_integration.php, 1.2, 1.3 album_nuffimage_box.php, 1.2, 1.3 clown_album_functions.php, 1.2, 1.3

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

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

Modified Files:
	album_bbcode.php album_constants.php album_functions.php 
	album_hierarchy_functions.php album_hierarchy_sql.php 
	album_integration.php album_nuffimage_box.php 
	clown_album_functions.php 
Log Message:
upgrade version to 2.0.2 for core29x branch

Index: album_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_constants.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_constants.php	13 Mar 2008 03:43:55 -0000	1.2
--- album_constants.php	13 Mar 2008 08:35:54 -0000	1.3
***************
*** 23,26 ****
--- 23,35 ----
  }
  
+ if ( !MXBB_MODULE )
+ {
+ 	define('PORTAL_URL', $portal_config['portal_url']);
+ 	define('PHPBB_URL', PORTAL_URL);
+ 
+ 	$mx_table_prefix = $table_prefix;
+ 	$is_block = false; // This also makes the script work for phpBB ;)
+ }
+ 
  // -------------------------------------------------------------------------
  // Extend User Style with module lang and images
***************
*** 30,35 ****
  // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
  // -------------------------------------------------------------------------
! $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
! $mx_user->extend(MX_LANG_MAIN, MX_IMAGES);
  
  // Album Tables
--- 39,70 ----
  // - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
  // -------------------------------------------------------------------------
! if (!MXBB_MODULE)
! {
! 	if (!defined( 'IN_ADMIN' ))
! 	{
! 		$mx_user->set_module_cfg_name('mx_smartor');
! 		$mx_user->set_module_lang_path($module_root_path . 'album_mod/');
! 		$mx_user->extend(MX_LANG_ALL, MX_IMAGES);
! 	}
! }
! else
! {
! 	if (!$_GET['print']) // Do not "fix" with reuest wrapper!!
! 	{
! 		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
! 	}
! 
! 	if (is_object($mx_page))
! 	{
! 		// -------------------------------------------------------------------------
! 		// Extend User Style with module lang and images
! 		// Usage:  $mx_user->extend(LANG, IMAGES)
! 		// Switches:
! 		// - LANG: MX_LANG_MAIN (default), MX_LANG_ADMIN, MX_LANG_ALL, MX_LANG_NONE
! 		// - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
! 		// -------------------------------------------------------------------------
! 		$mx_user->extend(MX_LANG_ALL, MX_IMAGES);
! 	}
! }
  
  // Album Tables
***************
*** 114,125 ****
  !defined('IMG_GIF') ? define('IMG_GIF', IMAGETYPE_GIF) : false;
  
! // Path (trailing slash required)
! define('ALBUM_UPLOAD_PATH', $module_root_path . 'upload/');
! define('ALBUM_OTF_PATH', $module_root_path . 'upload/otf/');
! define('ALBUM_JUPLOAD_PATH', $module_root_path . 'upload/jupload/');
! define('ALBUM_CACHE_PATH', $module_root_path . 'upload/cache/');
! define('ALBUM_MED_CACHE_PATH', $module_root_path . 'upload/med_cache/');
! define('ALBUM_WM_CACHE_PATH', $module_root_path . 'upload/wm_cache/');
! define('ALBUM_WM_FILE', $module_root_path . 'album_mod/mark_fap.png');
  
  ?>
\ No newline at end of file
--- 149,174 ----
  !defined('IMG_GIF') ? define('IMG_GIF', IMAGETYPE_GIF) : false;
  
! if ( !MXBB_MODULE )
! {
! 	// Path (trailing slash required)
! 	define('ALBUM_UPLOAD_PATH', $module_root_path . 'album_mod/upload/');
! 	define('ALBUM_OTF_PATH', $module_root_path . 'album_mod/upload/otf/');
! 	define('ALBUM_JUPLOAD_PATH', $module_root_path . 'album_mod/upload/jupload/');
! 	define('ALBUM_CACHE_PATH', $module_root_path . 'album_mod/upload/cache/');
! 	define('ALBUM_MED_CACHE_PATH', $module_root_path . 'album_mod/upload/med_cache/');
! 	define('ALBUM_WM_CACHE_PATH', $module_root_path . 'album_mod/upload/wm_cache/');
! 	define('ALBUM_WM_FILE', $module_root_path . 'album_mod/mark_fap.png');
  
+ }
+ else
+ {
+ 	// Path (trailing slash required)
+ 	define('ALBUM_UPLOAD_PATH', $module_root_path . 'upload/');
+ 	define('ALBUM_OTF_PATH', $module_root_path . 'upload/otf/');
+ 	define('ALBUM_JUPLOAD_PATH', $module_root_path . 'upload/jupload/');
+ 	define('ALBUM_CACHE_PATH', $module_root_path . 'upload/cache/');
+ 	define('ALBUM_MED_CACHE_PATH', $module_root_path . 'upload/med_cache/');
+ 	define('ALBUM_WM_CACHE_PATH', $module_root_path . 'upload/wm_cache/');
+ 	define('ALBUM_WM_FILE', $module_root_path . 'album_mod/mark_fap.png');
+ }
  ?>
\ No newline at end of file

Index: album_hierarchy_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_hierarchy_functions.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_hierarchy_functions.php	13 Mar 2008 03:43:57 -0000	1.2
--- album_hierarchy_functions.php	13 Mar 2008 08:35:54 -0000	1.3
***************
*** 138,146 ****
  			'INC_SPAN' => $max_level - $level +1 , // + $column_offset,
  
! 			'U_CAT_EDIT' => mx_append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id")),
! 			'U_CAT_DELETE' => ($is_root && $userdata['user_level'] != ADMIN) ? '' : mx_append_sid(album_append_uid("$admin_url?action=delete&cat_id=$cat_id")),
! 			'U_CAT_MOVE_UP' => ($is_root) ? '' : mx_append_sid(album_append_uid("$admin_url?action=move&move=-15&cat_id=$cat_id")),
! 			'U_CAT_MOVE_DOWN' => ($is_root) ? '' : mx_append_sid(album_append_uid("$admin_url?action=move&move=15&cat_id=$cat_id")),
! 			'U_VIEWCAT' => mx_append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id")),
  
  			'L_MOVE_UP' => ($is_root) ? '' : $lang['Move_up'],
--- 138,146 ----
  			'INC_SPAN' => $max_level - $level +1 , // + $column_offset,
  
! 			'U_CAT_EDIT' => mx_append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id"), true),
! 			'U_CAT_DELETE' => ($is_root && $userdata['user_level'] != ADMIN) ? '' : mx_append_sid(album_append_uid("$admin_url?action=delete&cat_id=$cat_id"), true),
! 			'U_CAT_MOVE_UP' => ($is_root) ? '' : mx_append_sid(album_append_uid("$admin_url?action=move&move=-15&cat_id=$cat_id"), true),
! 			'U_CAT_MOVE_DOWN' => ($is_root) ? '' : mx_append_sid(album_append_uid("$admin_url?action=move&move=15&cat_id=$cat_id"), true),
! 			'U_VIEWCAT' => mx_append_sid(album_append_uid("$admin_url?action=edit&cat_id=$cat_id"), true),
  
  			'L_MOVE_UP' => ($is_root) ? '' : $lang['Move_up'],


Index: album_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_functions.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_functions.php	13 Mar 2008 03:43:56 -0000	1.2
--- album_functions.php	13 Mar 2008 08:35:54 -0000	1.3
***************
*** 25,28 ****
--- 25,29 ----
  		return phpBB2::create_date($format, $gmepoch, $tz);
  	}
+ }
  
  if(!function_exists(create_date2))

Index: album_integration.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_integration.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** album_integration.php	13 Mar 2008 03:43:58 -0000	1.2
--- album_integration.php	13 Mar 2008 08:35:54 -0000	1.3
***************
*** 49,57 ****
  	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
--- 49,57 ----
  	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 )
  		{
! 			$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  		}
  		else
***************
*** 72,78 ****
  function this_fap_addonurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
! 	$mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  
  	return $mxurl;
--- 72,78 ----
  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;
***************
*** 81,89 ****
  function this_fap_portalurl($args = '')
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  	if( $integration_enabled != "1" )
  	{
! 		$mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
--- 81,89 ----
  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" )
  	{
! 		$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
***************
*** 104,112 ****
  function this_fap_toplisturl($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
--- 104,112 ----
  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 )
  	{
! 		$mxurl = ( !MXBB_MODULE ) ? $phpbb_root_path . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
***************
*** 118,122 ****
  function this_fap_loginurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  
--- 118,122 ----
  function this_fap_loginurl($args = '', $force_standalone_mode = false)
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  
***************
*** 134,142 ****
  function this_fap_rssurl($args = '')
  {
! 	global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  	if( $integration_enabled != "1" )
  	{
! 		$mxurl = 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
--- 134,142 ----
  function this_fap_rssurl($args = '')
  {
! 	global $mx_root_path, $phpbb_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled, $is_block;
  
  	if( $integration_enabled != "1" )
  	{
! 		$mxurl = ( !MXBB_MODULE ) ? 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
***************
*** 154,158 ****
  	if( $force_standalone_mode || !$is_block )
  	{
! 		$mxurl = 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else
--- 154,158 ----
  	if( $force_standalone_mode || !$is_block )
  	{
! 		$mxurl = ( !MXBB_MODULE ) ? 'album.' . $phpEx . ($args == '' ? '' : '?' . $args) : 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args);
  	}
  	else