|
From: Florin C B. <ory...@us...> - 2013-06-19 12:21:55
|
Update of /cvsroot/mxbb/mx_smartor In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24720 Modified Files: album.php Log Message: fixes modules Index: album.php =================================================================== RCS file: /cvsroot/mxbb/mx_smartor/album.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** album.php 30 May 2013 10:04:08 -0000 1.31 --- album.php 19 Jun 2013 12:21:53 -0000 1.32 *************** *** 201,215 **** $mx_user->init_style(); ! $block_id = ( !empty($HTTP_GET_VARS['block_id']) ) ? $HTTP_GET_VARS['block_id'] : $HTTP_POST_VARS['id']; ! if( empty($block_id) ) ! { ! $sql = "SELECT * FROM " . BLOCK_TABLE . " WHERE block_title = 'Smartor_album' LIMIT 1"; ! if(!$result = $db->sql_query($sql)) ! { ! mx_message_die(GENERAL_ERROR, "Could not query Smartor_Album module information", "", __LINE__, __FILE__, $sql); ! } ! $row = $db->sql_fetchrow($result); ! $block_id = $row['block_id']; ! } $is_block = FALSE; } --- 201,218 ---- $mx_user->init_style(); ! $block_id = $mx_request_vars->request('page', MX_TYPE_INT, ''); ! // 0: module, 1: module_id, 2: module_name, 3: module_path, ! // 4: module_desc, 5: module_include_admin ! //mx_get_info($table, $idfield = '', $id = 0, $idfield2 = '', $id2 = 0) ... ( $idfield2 != '' && $id2 != '' ) ? " AND $idfield2 = '$id2'" : ''; ! $block_info = mx_get_info(BLOCK_TABLE, 'block_title', 'Smartor_album'); ! $block_id = ((isset($block_id) && !empty($block_id)) ? $block_id : $block_info['block_id']); ! $title = $block_info['block_title']; ! $block_size = ((isset($block_size) && !empty($block_size)) ? $block_size : '100%'); ! $description = $block_info['block_desc']; ! $show_block = $block_info['show_block']; ! $show_title = ($userdata['user_level'] == ADMIN) ? true : $block_info['show_title']; ! $show_stats = $block_info['show_stats']; ! $mx_block->init($block_id); ! $is_block = FALSE; } *************** *** 221,233 **** $title = $mx_block->block_info['block_title']; $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' ); ! ! $is_block = true; ! ! global $images, $is_block; } } - // // Get general album information - // $album_root_path = $module_root_path . 'album_mod/'; include($module_root_path . 'album_mod/' . 'album_common.'.$phpEx); --- 224,233 ---- $title = $mx_block->block_info['block_title']; $block_size = ( isset($block_size) && !empty($block_size) ? $block_size : '100%' ); ! ! $is_block = true; ! global $images, $is_block; } } // Get general album information $album_root_path = $module_root_path . 'album_mod/'; include($module_root_path . 'album_mod/' . 'album_common.'.$phpEx); |