[mxbb-commits] mx_pafiledb/pafiledb/includes functions.php, 1.54, 1.55 functions_cache.php, 1.9, 1.10 functions_pafiledb.php, 1.62, 1.63 pafiledb_constants.php, 1.26, 1.27

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

Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/includes
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5123/pafiledb/includes

Modified Files:
	functions.php functions_cache.php functions_pafiledb.php 
	pafiledb_constants.php 
Log Message:
fixed some modrewrite bugs

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** functions.php	29 Jul 2009 05:08:12 -0000	1.54
--- functions.php	8 Oct 2009 23:23:26 -0000	1.55
***************
*** 442,446 ****
  		}
  
! 		$handle = @opendir( $module_root_path . ICONS_DIR );
  
  		while ( $icon = @readdir( $handle ) )
--- 442,446 ----
  		}
  
! 		$handle = @opendir( ICONS_DIR );
  
  		while ( $icon = @readdir( $handle ) )
***************
*** 450,458 ****
  				if ( $file_posticon == $icon )
  				{
! 					$posticons .= '<input type="radio" name="posticon" value="' . $icon . '" checked><img src="' . $module_root_path . ICONS_DIR . $icon . '">&nbsp;';
  				}
  				else
  				{
! 					$posticons .= '<input type="radio" name="posticon" value="' . $icon . '"><img src="' . $module_root_path . ICONS_DIR . $icon . '">&nbsp;';
  				}
  
--- 450,458 ----
  				if ( $file_posticon == $icon )
  				{
! 					$posticons .= '<input type="radio" name="posticon" value="' . $icon . '" checked><img src="' . ICONS_DIR . $icon . '">&nbsp;';
  				}
  				else
  				{
! 					$posticons .= '<input type="radio" name="posticon" value="' . $icon . '"><img src="' . ICONS_DIR . $icon . '">&nbsp;';
  				}
  

Index: functions_cache.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_cache.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** functions_cache.php	3 Jun 2008 20:17:06 -0000	1.9
--- functions_cache.php	8 Oct 2009 23:23:26 -0000	1.10
***************
*** 201,223 ****
  	{
  		$lines = array();
! 		foreach ( $array as $k => $v )
! 		{
! 			if ( is_array( $v ) )
! 			{
! 				$lines[] = "'$k'=>" . $this->format_array( $v );
! 			}elseif ( is_int( $v ) )
! 			{
! 				$lines[] = "'$k'=>$v";
! 			}elseif ( is_bool( $v ) )
! 			{
! 				$lines[] = "'$k'=>" . ( ( $v ) ? 'TRUE' : 'FALSE' );
! 			}
! 			else
  			{
! 				$lines[] = "'$k'=>'" . str_replace( "'", "\'", str_replace( '\\', '\\\\', $v ) ) . "'";
  			}
  		}
! 		return 'array(' . implode( ',', $lines ) . ')';
! 	}
  }
  ?>
\ No newline at end of file
--- 201,230 ----
  	{
  		$lines = array();
! 		if ( is_array( $v ) )
! 		{		
! 			foreach ( $array as $k => $v )
  			{
! 				if ( is_array( $v ) )
! 				{
! 					$lines[] = "'$k'=>" . $this->format_array( $v );
! 				}elseif ( is_int( $v ) )
! 				{
! 					$lines[] = "'$k'=>$v";
! 				}elseif ( is_bool( $v ) )
! 				{
! 					$lines[] = "'$k'=>" . ( ( $v ) ? 'TRUE' : 'FALSE' );
! 				}
! 				else
! 				{
! 					$lines[] = "'$k'=>'" . str_replace( "'", "\'", str_replace( '\\', '\\\\', $v ) ) . "'";
! 				}
  			}
+ 			return 'array(' . implode( ',', $lines ) . ')';
  		}
! 		else
! 		{
! 			return 'array(' . implode( ',', $lines ) . ')';	
! 		}		
! 	}	
  }
  ?>
\ No newline at end of file

Index: pafiledb_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/pafiledb_constants.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** pafiledb_constants.php	11 Jul 2009 03:22:06 -0000	1.26
--- pafiledb_constants.php	8 Oct 2009 23:23:26 -0000	1.27
***************
*** 29,34 ****
  }
  
  define( 'PAGE_DOWNLOAD', -501 ); // If this id generates a conflict with other mods, change it ;)
! define( 'ICONS_DIR', 'pafiledb/images/icons/' );
  
  //
--- 29,37 ----
  }
  
+ //$module_root_path = PORTAL_URL . $module_root_path;
+ //die("$module_root_path");
+ 
  define( 'PAGE_DOWNLOAD', -501 ); // If this id generates a conflict with other mods, change it ;)
! define( 'ICONS_DIR', PORTAL_URL . $module_root_path . 'pafiledb/images/icons/' );
  
  //

Index: functions_pafiledb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_pafiledb.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** functions_pafiledb.php	29 Jul 2009 05:08:13 -0000	1.62
--- functions_pafiledb.php	8 Oct 2009 23:23:26 -0000	1.63
***************
*** 1060,1064 ****
  				else
  				{
! 					$posticon = $module_root_path . ICONS_DIR . $file_rowset[$i]['file_posticon'];
  				}
  			}
--- 1060,1064 ----
  				else
  				{
! 					$posticon = ICONS_DIR . $file_rowset[$i]['file_posticon'];
  				}
  			}
***************
*** 1068,1072 ****
  			}
  
! 			$save_as_icon = $module_root_path . ICONS_DIR . 'icon_download1.gif';
  
  			//
--- 1068,1072 ----
  			}
  
! 			$save_as_icon = ICONS_DIR . 'icon_download1.gif';
  
  			//
***************
*** 1386,1390 ****
  				else
  				{
! 					$posticon = $module_root_path . ICONS_DIR . $file_rowset[$i]['file_posticon'];
  				}
  			}
--- 1386,1390 ----
  				else
  				{
! 					$posticon = ICONS_DIR . $file_rowset[$i]['file_posticon'];
  				}
  			}
***************
*** 1508,1512 ****
  		if ( !MXBB_MODULE )
  		{
! 			$mxurl = $module_root_path . 'dload.' . $phpEx . ( $args == '' ? '' : '?' . $args );
  			return $mxurl;
  		}
--- 1508,1512 ----
  		if ( !MXBB_MODULE )
  		{
! 			$mxurl = PORTAL_URL . $module_root_path . 'dload.' . $phpEx . ( $args == '' ? '' : '?' . $args );
  			return $mxurl;
  		}
***************
*** 1514,1522 ****
  		if ( $force_standalone_mode || !$is_block )
  		{
! 			$mxurl = $module_root_path . 'dload.' . $phpEx . ( $args == '' ? '' : '?' . $args );
  		}
  		else
  		{
! 			$mxurl = $mx_root_path . 'index.' . $phpEx;
  			if ( is_numeric( $pageId ) )
  			{
--- 1514,1522 ----
  		if ( $force_standalone_mode || !$is_block )
  		{
! 			$mxurl = PORTAL_URL . $module_root_path . 'dload.' . $phpEx . ( $args == '' ? '' : '?' . $args );
  		}
  		else
  		{
! 			$mxurl = PORTAL_URL . 'index.' . $phpEx;
  			if ( is_numeric( $pageId ) )
  			{