Update of /cvsroot/mxbb/mx_smartor/album_mod In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18042/album_mod Modified Files: Tag: core28x album_bbconstants.php album_common.php Removed Files: Tag: core28x album_acp_functions.php album_bbcode.php album_constants.php album_exif_info.php album_functions.php album_hierarchy_auth.php album_hierarchy_debug.php album_hierarchy_functions.php album_hierarchy_sql.php album_image_class.php album_integration.php album_nuffimage_box.php clown_album_functions.php Log Message: upgrade to 2.0.1 gold --- album_constants.php DELETED --- --- album_hierarchy_functions.php DELETED --- --- album_hierarchy_sql.php DELETED --- Index: album_bbconstants.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_bbconstants.php,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** album_bbconstants.php 8 Feb 2008 10:40:42 -0000 1.1.2.7 --- album_bbconstants.php 12 Mar 2008 22:25:51 -0000 1.1.2.8 *************** *** 29,33 **** if ( !($result = $db->sql_query($sql)) ) { ! message_die(CRITICAL_ERROR, 'Could not query album config database'); } --- 29,33 ---- if ( !($result = $db->sql_query($sql)) ) { ! $album_index = 6; } *************** *** 38,63 **** } ! function this_smartor_mxurl($args = '', $force_standalone_mode = false) { ! global $mx_root_path, $album_index, $phpEx, $integration_enabled; ! ! $module_root_path = $mx_root_path . 'modules/mx_smartor/'; ! ! if( $force_standalone_mode ) ! { ! $mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args); ! } ! else { ! $mxurl = $mx_root_path . 'index.' . $phpEx; ! $mxurl .= '?page=' . $album_index . ($args == '' ? '' : '&' . $args); } - return $mxurl; } ! define('ALBUM_INDEX', this_smartor_mxurl()); ! define('ALBUM_SHOWPAGE', this_smartor_mxurl('smartor_mode=album_showpage', false)); ! define('ALBUM_PICM', this_smartor_mxurl('smartor_mode=album_picm', true)); ! define('ALBUM_THUMBNAIL', this_smartor_mxurl('smartor_mode=album_thumbnail', true)); ?> \ No newline at end of file --- 38,71 ---- } ! if (!function_exists('this_smartor_mxurl')) { ! function this_smartor_mxurl($args = '', $force_standalone_mode = '') { ! global $mx_root_path, $module_root_path, $page_id, $album_index, $phpEx, $integration_enabled; ! ! if($force_standalone_mode) ! { ! $mxurl = $mx_root_path . 'modules/mx_smartor/' . 'album.' . $phpEx . ($args == '' ? '' : '?' . $args); ! } ! else ! { ! $mxurl = $mx_root_path . 'index.' . $phpEx; ! if( is_numeric($page_id) && !empty($page_id) ) ! { ! $mxurl .= '?page=' . $page_id . ($args == '' ? '' : '&' . $args); ! } ! else ! { ! $mxurl .= '?page=' . $album_index . ($args == '' ? '' : '&' . $args); ! } ! } ! return $mxurl; } } ! @define('ALBUM_INDEX', this_smartor_mxurl()); ! @define('ALBUM_SHOWPAGE', this_smartor_mxurl('smartor_mode=album_showpage', false)); ! @define('ALBUM_PICM', this_smartor_mxurl('smartor_mode=album_picm', true)); ! @define('ALBUM_THUMBNAIL', this_smartor_mxurl('smartor_mode=album_thumbnail', true)); ?> \ No newline at end of file --- album_acp_functions.php DELETED --- --- album_functions.php DELETED --- --- album_exif_info.php DELETED --- --- album_hierarchy_auth.php DELETED --- Index: album_common.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album_mod/album_common.php,v retrieving revision 1.19.2.5 retrieving revision 1.19.2.6 diff -C2 -d -r1.19.2.5 -r1.19.2.6 *** album_common.php 8 Feb 2008 10:40:43 -0000 1.19.2.5 --- album_common.php 12 Mar 2008 22:25:51 -0000 1.19.2.6 *************** *** 24,28 **** } ! include_once($album_root_path . 'album_constants.'.$phpEx); --- 24,28 ---- } ! include_once($album_root_path . 'includes/album_constants.'.$phpEx); *************** *** 30,71 **** // Read main language definition and theme images definition // ********************************************************************** $mx_user->extend(MX_LANG_MAIN, MX_IMAGES); // // Get Album Config // ! $sql = "SELECT * ! FROM ". ALBUM_CONFIG_TABLE; ! if(!$result = $db->sql_query($sql, false, true)) { ! mx_message_die(GENERAL_ERROR, 'Could not query Album config information', '', __LINE__, __FILE__, $sql); } ! while( $row = $db->sql_fetchrow($result) ) { ! $album_config_name = $row['config_name']; ! $album_config_value = $row['config_value']; ! $album_config[$album_config_name] = $album_config_value; ! } ! /* ! // for compatibility with mxBB 2.7.x and SP... ! $album_config['rate'] = '1'; ! $album_config['comment'] = '1'; ! $album_config['fullpic_popup'] = '0'; ! */ //get SP config info ! $sql = "SELECT * ! FROM ". ALBUM_SP_CONFIG_TABLE; ! if(!$result = $db->sql_query($sql)) { ! mx_message_die(GENERAL_ERROR, "Could not query SP config information", "", __LINE__, __FILE__, $sql); } ! while( $row = $db->sql_fetchrow($result) ) { ! $album_sp_config_name = $row['config_name']; ! $album_sp_config_value = $row['config_value']; ! ! $album_sp_config[$album_sp_config_name] = $album_sp_config_value; } //end get SP config info --- 30,109 ---- // Read main language definition and theme images definition // ********************************************************************** + $mx_user->set_module_default_style('_core'); // For compatibility with core 2.8.x $mx_user->extend(MX_LANG_MAIN, MX_IMAGES); + // Cache settings + $use_cache = 1; + // // Get Album Config // ! if (($mx_cache->get('album_config')) && ($use_cache)) { ! $album_config = $mx_cache->get('album_config'); } ! else { ! $sql = "SELECT * FROM " . ALBUM_CONFIG_TABLE; ! if (!($result = $db->sql_query($sql))) ! { ! if (!function_exists('mx_message_die')) ! { ! die("Couldnt query smartor album config information, Allso this hosting or server is using a cache optimizer not compatible with MX-Publisher or just lost connection to database wile query."); ! } ! else ! { ! mx_message_die( GENERAL_ERROR, 'Couldnt query smartor album config information', '', __LINE__, __FILE__, $sql ); ! } ! } ! ! while ($row = $db->sql_fetchrow($result)) ! { ! $album_config_name = $row['config_name']; ! $album_config_value = $row['config_value']; ! $album_config[$album_config_name] = $album_config_value; ! } ! $db->sql_freeresult($result); ! ! if ($use_cache) ! { ! $mx_cache->put('album_config', $album_config); ! } ! } //get SP config info ! if (($mx_cache->get('album_sp_config')) && ($use_cache)) { ! $album_sp_config = $mx_cache->get('album_sp_config'); } ! else { ! $sql = "SELECT * FROM " . ALBUM_SP_CONFIG_TABLE; ! ! if (!($result = $db->sql_query($sql))) ! { ! if (!function_exists('mx_message_die')) ! { ! die("Couldnt query smartor album sp config information, Allso this hosting or server is using a cache optimizer not compatible with MX-Publisher or just lost connection to database wile query."); ! } ! else ! { ! mx_message_die( GENERAL_ERROR, 'Couldnt query smartor album sp config information', '', __LINE__, __FILE__, $sql ); ! } ! } ! ! while ($row = $db->sql_fetchrow($result)) ! { ! $album_sp_config_name = $row['config_name']; ! $album_sp_config_value = $row['config_value']; ! $album_sp_config[$album_sp_config_name] = $album_sp_config_value; ! } ! $db->sql_freeresult($result); ! ! if ($use_cache) ! { ! $mx_cache->put('album_sp_config', $album_sp_config); ! } } //end get SP config info *************** *** 149,155 **** } ! include_once($album_root_path . 'album_integration.' . $phpEx); ! include_once($album_root_path . 'album_functions.' . $phpEx); ! include_once($album_root_path . 'clown_album_functions.' . $phpEx); // // Set ALBUM Version --- 187,193 ---- } ! include_once($album_root_path . 'includes/album_integration.' . $phpEx); ! include_once($album_root_path . 'includes/album_functions.' . $phpEx); ! include_once($album_root_path . 'includes/clown_album_functions.' . $phpEx); // // Set ALBUM Version *************** *** 223,230 **** if ($album_config['album_bbcode'] == 1) { ! include_once($album_root_path . 'album_bbcode.' . $phpEx); } ! include_once($album_root_path . 'album_hierarchy_functions.' . $phpEx); ?> \ No newline at end of file --- 261,268 ---- if ($album_config['album_bbcode'] == 1) { ! include_once($album_root_path . 'includes/album_bbcode.' . $phpEx); } ! include_once($album_root_path . 'includes/album_hierarchy_functions.' . $phpEx); ?> \ No newline at end of file --- album_image_class.php DELETED --- --- album_integration.php DELETED --- --- clown_album_functions.php DELETED --- --- album_bbcode.php DELETED --- --- album_hierarchy_debug.php DELETED --- --- album_nuffimage_box.php DELETED --- |