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

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

Update of /cvsroot/mxbb/mx_smartor/album_mod/modules
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv30160/modules

Modified Files:
	album_pic.php album_thumbnail.php 
Log Message:


Index: album_thumbnail.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_thumbnail.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** album_thumbnail.php	23 Jul 2010 11:15:17 -0000	1.6
--- album_thumbnail.php	23 Jul 2010 12:19:18 -0000	1.7
***************
*** 80,84 ****
  $pic_filetype = strtolower(substr($pic_filename, strlen($pic_filename) - 4, 4));
  $pic_fullpath = ALBUM_UPLOAD_PATH . $pic_filename;
! $pic_fullpath = str_replace(array(' '), array('%20'), $pic_id);
  $pic_id = str_replace('http://', '', str_replace('https://', '', $pic_id));
  $pic_thumbnail_new = md5($pic_filename) . $pic_filetype;
--- 80,84 ----
  $pic_filetype = strtolower(substr($pic_filename, strlen($pic_filename) - 4, 4));
  $pic_fullpath = ALBUM_UPLOAD_PATH . $pic_filename;
! $pic_fullpath = str_replace(array(' '), array('%20'), $pic_fullpath);
  $pic_id = str_replace('http://', '', str_replace('https://', '', $pic_id));
  $pic_thumbnail_new = md5($pic_filename) . $pic_filetype;
***************
*** 96,100 ****
  {
  	$image_processed = true;
! 	$pic_size = get_full_image_info($pic_fullpath);
  
  	if($pic_size == false)
--- 96,101 ----
  {
  	$image_processed = true;
! 	$pic_size = @getimagesize($pic_fullpath);
! 	//$pic_size = get_full_image_info($pic_fullpath);
  
  	if($pic_size == false)
***************
*** 114,118 ****
  		exit;
  	}
! 	
  	$pic_width = $pic_size['width'];
  	$pic_height = $pic_size['height'];
--- 115,119 ----
  		exit;
  	}
! 	/*
  	$pic_width = $pic_size['width'];
  	$pic_height = $pic_size['height'];
***************
*** 122,126 ****
--- 123,129 ----
  	$pic_title_reg = ereg_replace("[^A-Za-z0-9]", '_', $pic_title);
  	$pic_thumbnail = $pic_thumbnail_prefix . '.' . $pic_filetype;
+ 	*/
  }
+ /*
  else
  {
***************
*** 129,132 ****
--- 132,136 ----
  	$pic_thumbnail = $pic_thumbnail_prefix . '_' . $pic_filename;
  }
+ */
  
  $pic_thumbnail_fullpath = ALBUM_CACHE_PATH . $pic_thumbnail;

Index: album_pic.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/modules/album_pic.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_pic.php	23 Jul 2010 11:15:17 -0000	1.4
--- album_pic.php	23 Jul 2010 12:19:18 -0000	1.5
***************
*** 97,101 ****
  {
  	$image_processed = true;
! 	$pic_size = get_full_image_info($pic_fullpath);
  
  	if($pic_size == false)
--- 97,102 ----
  {
  	$image_processed = true;
! 	$pic_size = @getimagesize($pic_fullpath);
! 	//$pic_size = get_full_image_info($pic_fullpath, null, true);
  
  	if($pic_size == false)
***************
*** 115,134 ****
  		exit;
  	}
- 	
- 	$pic_width = $pic_size['width'];
- 	$pic_height = $pic_size['height'];
- 	$pic_filetype = strtolower($pic_size['type']);
- 
- 	$pic_title = substr($pic_filename, 0, strlen($pic_filename) - strlen($pic_filetype) - 1);
- 	$pic_title_reg = ereg_replace("[^A-Za-z0-9]", '_', $pic_title);
  }
  
  $pic_wm_fullpath = ALBUM_WM_CACHE_PATH . 'full_' . $pic_filename;
  
  
  if(empty($thispic) || ($pic_info['exists'] == false) || !file_exists($pic_info['fullpath']))
  {
  	mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist']);
  }
  
  // ------------------------------------
--- 116,134 ----
  		exit;
  	}
  }
  
  $pic_wm_fullpath = ALBUM_WM_CACHE_PATH . 'full_' . $pic_filename;
  
+ if( empty($thispic) || !file_exists($pic_fullpath) )
+ {
+ 	mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist']);
+ }
  
+ /*
  if(empty($thispic) || ($pic_info['exists'] == false) || !file_exists($pic_info['fullpath']))
  {
  	mx_message_die(GENERAL_MESSAGE, $lang['Pic_not_exist']);
  }
+ */
  
  // ------------------------------------