[mxbb-commits] mx_smartor/album_mod/includes album_bbcode.php, 1.4, 1.5 album_constants.php, 1.17, 1.18 album_functions.php, 1.10, 1.11

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

Update of /cvsroot/mxbb/mx_smartor/album_mod/includes
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24720/album_mod/includes

Modified Files:
	album_bbcode.php album_constants.php album_functions.php 
Log Message:
fixes modules

Index: album_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_constants.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** album_constants.php	30 May 2013 10:04:09 -0000	1.17
--- album_constants.php	19 Jun 2013 12:21:54 -0000	1.18
***************
*** 18,25 ****
   ***************************************************************************/
  
! if ( !defined('IN_PORTAL') )
  {
  	die('Hacking attempt');
  }
  
  if ( !MXBB_MODULE )
--- 18,29 ----
   ***************************************************************************/
  
! if (!defined('IN_PORTAL') || !defined('IN_PHPBB'))
  {
  	die('Hacking attempt');
  }
+ else
+ {
+ 	define('IN_ALBUM', true);
+ }
  
  if ( !MXBB_MODULE )
***************
*** 57,61 ****
  else
  {
! 	if (!$_GET['print']) // Do not "fix" with reuest wrapper!!
  	{
  		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
--- 61,65 ----
  else
  {
! 	if (!isset($_GET['print'])) // Do not "fix" with reuest wrapper!!
  	{
  		$mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x
***************
*** 158,177 ****
  define('ALBUM_PRIVATE', 3);
  
  define('USERS_SUBFOLDERS_IMG', false); // Creates users subfolders for uploaded images
  define('USERS_SUBFOLDERS_ALBUM', false); // Creates users subfolders for images in album
- define('ALBUM_MOD_PATH', $module_root_path . 'includes/album_mod/');
- define('ALBUM_MOD_IMG_PATH', $module_root_path . 'images/album/');
- //define('ALBUM_FILES_PATH', $phpbb_root_path . 'files/album/');
- define('ALBUM_FILES_PATH', $module_root_path . 'upload/');
  
! // Path (trailing slash required)
! if (USERS_SUBFOLDERS_ALBUM == true)
! {
! 	define('ALBUM_UPLOAD_PATH', ALBUM_FILES_PATH . 'users/');
! }
! else
  {
! 	define('ALBUM_UPLOAD_PATH', ALBUM_FILES_PATH);
  }
  
  !defined('PAGE_ALBUM') ? define('PAGE_ALBUM', -502) : false;
--- 162,176 ----
  define('ALBUM_PRIVATE', 3);
  
+ //@Todo: 
+ //ENABLE this when  POSTED_IMAGES_PATH and POSTED_IMAGES_THUMBS_PATH are implemented!!!
  define('USERS_SUBFOLDERS_IMG', false); // Creates users subfolders for uploaded images
  define('USERS_SUBFOLDERS_ALBUM', false); // Creates users subfolders for images in album
  
! //Just Check (Already Defined in RSS/RSD and in Album Common)
! if (!defined('ALBUM_MOD_PATH'))
  {
! 	define('ALBUM_MOD_PATH', $module_root_path . 'includes/album_mod/');
  }
+ define('ALBUM_MOD_IMG_PATH', $module_root_path . 'images/album/');
  
  !defined('PAGE_ALBUM') ? define('PAGE_ALBUM', -502) : false;
***************
*** 189,216 ****
  {
  	// 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');
! 	define('ALBUM_NOPIC_PATH', $module_root_path . 'album_mod/');	
! 
  }
  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');
! 	define('ALBUM_NOPIC_PATH', $module_root_path . 'album_mod/');		
  }
! define('POSTED_IMAGES_PATH', $module_root_path . 'upload/');
! define('POSTED_IMAGES_THUMBS_PATH', $module_root_path . 'upload/cache/');
  // Pic watch
  define('COMMENT_WATCH_UN_NOTIFIED', 0);
--- 188,218 ----
  {
  	// Path (trailing slash required)
! 	//define('ALBUM_FILES_PATH', $phpbb_root_path . 'files/album/');
! 	define('ALBUM_FILES_PATH', $module_root_path . 'album_mod/upload/');	
  }
  else
  {
  	// Path (trailing slash required)
! 	define('ALBUM_FILES_PATH', $module_root_path . 'upload/');		
  }
! // Path (trailing slash required)
! if (USERS_SUBFOLDERS_ALBUM == true)
! {
! 	define('ALBUM_UPLOAD_PATH', ALBUM_FILES_PATH . 'users/');
! }
! else
! {
! 	define('ALBUM_UPLOAD_PATH', ALBUM_FILES_PATH);
! }
! define('ALBUM_OTF_PATH', ALBUM_UPLOAD_PATH . 'otf/');
! define('ALBUM_JUPLOAD_PATH', ALBUM_UPLOAD_PATH . 'jupload/');
! define('ALBUM_CACHE_PATH', ALBUM_UPLOAD_PATH . 'cache/');
! define('ALBUM_MED_CACHE_PATH', ALBUM_UPLOAD_PATH . 'med_cache/');
! define('ALBUM_WM_CACHE_PATH', ALBUM_UPLOAD_PATH . 'wm_cache/');
! define('ALBUM_WM_FILE', ALBUM_UPLOAD_PATH . 'mark_fap.png');
! define('ALBUM_NOPIC_PATH', ALBUM_UPLOAD_PATH . 'album_mod/');
! //Paths to read files already uploaded
! define('POSTED_IMAGES_PATH', ALBUM_UPLOAD_PATH);
! define('POSTED_IMAGES_THUMBS_PATH', ALBUM_UPLOAD_PATH . 'cache/');
  // Pic watch
  define('COMMENT_WATCH_UN_NOTIFIED', 0);

Index: album_bbcode.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_bbcode.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** album_bbcode.php	29 Aug 2008 05:58:23 -0000	1.4
--- album_bbcode.php	19 Jun 2013 12:21:53 -0000	1.5
***************
*** 11,15 ****
  // Tell the Security Scanner that reachable code in this file is not a security issue
  
! define('BBCODE_UID_LEN', 10);
  define('BBCODE_NOSMILIES_START', '<!-- no smilies start -->');
  define('BBCODE_NOSMILIES_END', '<!-- no smilies end -->');
--- 11,15 ----
  // Tell the Security Scanner that reachable code in this file is not a security issue
  
! //define('BBCODE_UID_LEN', 10);
  define('BBCODE_NOSMILIES_START', '<!-- no smilies start -->');
  define('BBCODE_NOSMILIES_END', '<!-- no smilies end -->');

Index: album_functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_smartor/album_mod/includes/album_functions.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** album_functions.php	3 Mar 2011 14:28:40 -0000	1.10
--- album_functions.php	19 Jun 2013 12:21:54 -0000	1.11
***************
*** 1202,1206 ****
  
  
! if (!function_exists(setFlag))
  {
  	function setFlag($flags, $flag)
--- 1202,1206 ----
  
  
! if (!function_exists('setFlag'))
  {
  	function setFlag($flags, $flag)
***************
*** 1210,1214 ****
  }
  
! if (!function_exists(clearFlag))
  {
  	function clearFlag($flags, $flag)
--- 1210,1214 ----
  }
  
! if (!function_exists('clearFlag'))
  {
  	function clearFlag($flags, $flag)
***************
*** 1218,1222 ****
  }
  
! if (!function_exists(checkFlag))
  {
  	function checkFlag($flags, $flag)
--- 1218,1222 ----
  }
  
! if (!function_exists('checkFlag'))
  {
  	function checkFlag($flags, $flag)