[mxbb-commits] mx_smartor/includes album_cat.php, 1.12.2.1, 1.12.2.2 album_jupload.php, 1.2.2.1, 1.2.2.2 album_showpage.php, 1.12, 1.12.2.1 album_upload.php, 1.10, 1.10.2.1

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

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

Modified Files:
      Tag: core28x
	album_cat.php album_jupload.php album_showpage.php 
	album_upload.php 
Log Message:




Index: album_upload.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/includes/album_upload.php,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** album_upload.php	17 Jul 2007 05:38:27 -0000	1.10
--- album_upload.php	28 Sep 2007 22:59:17 -0000	1.10.2.1
***************
*** 21,55 ****
  }
  
- if( empty($module_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);
- 
- 
- if( !defined('ALBUM_MOD_PATH') )
- {
- 	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 . '';
- }
  
- if( !is_object($mx_block) )
- {
- 	// Start session management
- 	$mx_user->init($user_ip, PAGE_INDEX);
- 	// End session management
- 
- 	include_once($album_root_path . 'album_common.'.$phpEx);
- }
  
  
--- 21,25 ----

Index: album_showpage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/includes/album_showpage.php,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** album_showpage.php	9 Aug 2007 13:17:00 -0000	1.12
--- album_showpage.php	28 Sep 2007 22:59:17 -0000	1.12.2.1
***************
*** 115,122 ****
  else
  {
! 	if ($album_config['midthumb_use'] == 1)
  	{
  		$picm = true;
! 		$full_size_param = '';
  	}
  	else
--- 115,122 ----
  else
  {
! 	if ($album_sp_config['midthumb_use'] == 1)
  	{
  		$picm = true;
! 		$full_size_param = '&full=false';
  	}
  	else
***************
*** 1065,1070 ****
  		//'U_PIC' => ( $picm ) ? append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=$pic_id", TRUE)) : append_sid(this_smartor_mxurl("smartor_mode=album_picm&pic_id=$pic_id", TRUE)),
  		'U_PIC' => $pic_link,
! 		'U_PIC_L1' => ( $picm ) ? '' : '<a href='.this_smartor_mxurl("smartor_mode=album_showpage&full=&pic_id=" . $pic_id) . '>',
! 		'U_PIC_L2' => ( $picm ) ? '' : '</a>',
  		'U_PIC_CLICK' => ( $picm ) ? '' : 'Click on image to view larger image',
  		
--- 1065,1070 ----
  		//'U_PIC' => ( $picm ) ? append_sid(this_smartor_mxurl("smartor_mode=album_pic&pic_id=$pic_id", TRUE)) : append_sid(this_smartor_mxurl("smartor_mode=album_picm&pic_id=$pic_id", TRUE)),
  		'U_PIC' => $pic_link,
! 		'U_PIC_L1' => ( $picm ) ? '<a href='.this_smartor_mxurl("smartor_mode=album_showpage&full=true&pic_id=" . $pic_id) . '>' : '',
! 		'U_PIC_L2' => ( $picm ) ? '</a>' : '',
  		'U_PIC_CLICK' => ( $picm ) ? '' : 'Click on image to view larger image',