[mxbb-commits] mx_pafiledb/pafiledb pafiledb_common.php,1.11,1.12

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/mx_pafiledb/pafiledb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5653/modules/mx_pafiledb/pafiledb

Modified Files:
	pafiledb_common.php 
Log Message:
in progress commit for mx_pafiledb

Index: pafiledb_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/pafiledb_common.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pafiledb_common.php	1 Oct 2005 14:15:20 -0000	1.11
--- pafiledb_common.php	8 Dec 2005 15:15:13 -0000	1.12
***************
*** 24,27 ****
--- 24,28 ----
  }
  
+ /*
  // ===================================================
  // addslashes to vars if magic_quotes_gpc is off
***************
*** 67,70 ****
--- 68,72 ----
  	$_REQUEST = slash_input_data( $_REQUEST );
  }
+ */
  
  // ===================================================
***************
*** 75,105 ****
  include_once( $module_root_path . 'pafiledb/includes/functions.' . $phpEx );
  include_once( $module_root_path . 'pafiledb/includes/functions_cache.' . $phpEx );
  include_once( $module_root_path . 'pafiledb/includes/functions_mx.' . $phpEx );
- include_once( $module_root_path . 'pafiledb/includes/template.' . $phpEx );
  include_once( $module_root_path . 'pafiledb/includes/functions_pafiledb.' . $phpEx );
  
! $cache = new acm();
  $pafiledb_functions = new pafiledb_functions();
  
! if ( $cache->exists( 'config' ) )
  {
! 	$pafiledb_config = $cache->get( 'config' );
  }
  else
  {
  	$pafiledb_config = $pafiledb_functions->pafiledb_config();
! 	$cache->put( 'config', $pafiledb_config );
  }
  
- $pafiledb_user = new user_info();
  $pafiledb_template = new pafiledb_template();
  $pafiledb_template->set_template( $theme['template_name'] );
  
  $pafiledb = new pafiledb_public();
  
! // MX add-on
! // Generate paths for page and standalone mode
! // ...function based on original function written by Markus :-)
! function pa_this_mxurl( $args = '', $force_standalone_mode = false )
  {
  	global $mx_root_path, $module_root_path, $page_id, $phpEx, $is_block;
--- 77,108 ----
  include_once( $module_root_path . 'pafiledb/includes/functions.' . $phpEx );
  include_once( $module_root_path . 'pafiledb/includes/functions_cache.' . $phpEx );
+ include_once( $module_root_path . 'pafiledb/includes/functions_auth.' . $phpEx );
  include_once( $module_root_path . 'pafiledb/includes/functions_mx.' . $phpEx );
  include_once( $module_root_path . 'pafiledb/includes/functions_pafiledb.' . $phpEx );
+ include_once( $module_root_path . 'pafiledb/includes/template.' . $phpEx );
  
! $pafiledb_cache = new pafiledb_cache();
  $pafiledb_functions = new pafiledb_functions();
  
! if ( $pafiledb_cache->exists( 'config' ) )
  {
! 	$pafiledb_config = $pafiledb_cache->get( 'config' );
  }
  else
  {
  	$pafiledb_config = $pafiledb_functions->pafiledb_config();
! 	$pafiledb_cache->put( 'config', $pafiledb_config );
  }
  
  $pafiledb_template = new pafiledb_template();
  $pafiledb_template->set_template( $theme['template_name'] );
  
+ $pafiledb_user = new pafiledb_user_info();
  $pafiledb = new pafiledb_public();
  
! // ===================================================
! // url rewrites
! // ===================================================
! function pa_this_mxurl( $args = '', $force_standalone_mode = false, $non_html_amp = false )
  {
  	global $mx_root_path, $module_root_path, $page_id, $phpEx, $is_block;
***************
*** 112,118 ****
  	{
  		$mxurl = $mx_root_path . 'index.' . $phpEx;
  		if ( is_numeric( $page_id ) )
  		{
! 			$mxurl .= '?page=' . $page_id . ( $args == '' ? '' : '&' . $args );
  		}
  		else
--- 115,122 ----
  	{
  		$mxurl = $mx_root_path . 'index.' . $phpEx;
+ 		
  		if ( is_numeric( $page_id ) )
  		{
! 			$mxurl .= '?page=' . $page_id . ( $args == '' ? '' : ( $non_html_amp ? '&' : '&' ) . $args );
  		}
  		else