Menu
▾
▴
[mxbb-commits] core/includes mx_functions.php, 1.104, 1.105 mx_functions_admincp.php, 1.67, 1.68 mx_functions_core.php, 1.122, 1.123
|
From: Florin C B. <ory...@us...> - 2011-07-27 19:45:00
|
Update of /cvsroot/mxbb/core/includes
In directory vz-cvs-4.sog:/tmp/cvs-serv13410/includes
Modified Files:
mx_functions.php mx_functions_admincp.php
mx_functions_core.php
Log Message:
clenup
Index: mx_functions_core.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_core.php,v
retrieving revision 1.122
retrieving revision 1.123
diff -C2 -d -r1.122 -r1.123
*** mx_functions_core.php 30 Mar 2011 10:03:55 -0000 1.122
--- mx_functions_core.php 27 Jul 2011 19:44:58 -0000 1.123
***************
*** 555,563 ****
while ( $row = $db->sql_fetchrow( $result ) )
{
- $next_page = ( $page_id != $row['page_id'] ) ? true : false;
- $next_column = ( $column_id != $row['column_id'] ) ? true : false;
$page_id = $row['page_id'];
$column_id = $row['column_id'];
!
$page_row = array(
"page_id" => $row['page_id'],
--- 555,563 ----
while ( $row = $db->sql_fetchrow( $result ) )
{
$page_id = $row['page_id'];
$column_id = $row['column_id'];
! $next_page = ( $page_id != $row['page_id'] ) ? true : false;
! $next_column = ( $column_id != $row['column_id'] ) ? true : false;
!
$page_row = array(
"page_id" => $row['page_id'],
***************
*** 635,639 ****
* @access private
*/
! function _update_cache( )
{
global $db, $mx_root_path, $phpbb_root_path, $mx_use_cache, $portal_config;
--- 635,639 ----
* @access private
*/
! function _update_cache()
{
global $db, $mx_root_path, $phpbb_root_path, $mx_use_cache, $portal_config;
***************
*** 645,649 ****
WHERE portal_id = 1";
! if ( !( $result = $db->sql_query( $sql, BEGIN_TRANSACTION ) ) )
{
mx_message_die( GENERAL_ERROR, "Could not update portal cache time.", "", __LINE__, __FILE__, $sql );
--- 645,649 ----
WHERE portal_id = 1";
! if ( !($result = $db->sql_query($sql)) )
{
mx_message_die( GENERAL_ERROR, "Could not update portal cache time.", "", __LINE__, __FILE__, $sql );
***************
*** 3034,3052 ****
FROM ' . PAGE_TABLE . '
ORDER BY page_parent, page_order ASC';
!
//display an error debuging message only if the portal is installed/upgraded
! if(!@$db->sql_query($sql) && @!file_exists('install'))
{
mx_message_die(GENERAL_ERROR, 'Couldnt Query pages info', '', __LINE__, __FILE__, $sql);
}
! elseif(!@$db->sql_query($sql) && @file_exists('install'))
{
mx_message_die(GENERAL_ERROR, "Couldnt Query pages info"."<br />Please finish installin/upgrading the database. <br />".$lang['Please_remove_install_contrib'], "",__LINE__, __FILE__, $sql);
}
! $page_rowset = $db->sql_fetchrowset( $result );
!
! $db->sql_freeresult( $result );
!
for( $i = 0; $i < count( $page_rowset ); $i++ )
{
--- 3034,3053 ----
FROM ' . PAGE_TABLE . '
ORDER BY page_parent, page_order ASC';
!
! $result = @$db->sql_query($sql);
!
//display an error debuging message only if the portal is installed/upgraded
! if(!$result && @!file_exists('install'))
{
mx_message_die(GENERAL_ERROR, 'Couldnt Query pages info', '', __LINE__, __FILE__, $sql);
}
! elseif(!$result && @file_exists('install'))
{
mx_message_die(GENERAL_ERROR, "Couldnt Query pages info"."<br />Please finish installin/upgrading the database. <br />".$lang['Please_remove_install_contrib'], "",__LINE__, __FILE__, $sql);
}
! $page_rowset = $db->sql_fetchrowset($result);
! $db->sql_freeresult($result);
!
for( $i = 0; $i < count( $page_rowset ); $i++ )
{
***************
*** 3285,3289 ****
function generate_jumpbox( $page_id = 0, $depth = 0, $default = '' )
{
! $page_list .= '';
$pre = str_repeat( ' ', $depth );
--- 3286,3290 ----
function generate_jumpbox( $page_id = 0, $depth = 0, $default = '' )
{
! $page_list = '';
$pre = str_repeat( ' ', $depth );
Index: mx_functions_admincp.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_admincp.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** mx_functions_admincp.php 8 Oct 2009 17:01:05 -0000 1.67
--- mx_functions_admincp.php 27 Jul 2011 19:44:58 -0000 1.68
***************
*** 1151,1158 ****
* @return unknown
*/
! function _do_delete($type, $id, $parent, $recache )
{
global $template, $lang, $db, $board_config, $theme, $phpEx, $mx_request_vars, $mx_cache, $mx_root_path, $mx_table_prefix, $table_prefix, $userdata;
global $controller_block;
switch ( $type )
--- 1151,1160 ----
* @return unknown
*/
! function _do_delete($type, $id, $parent, $recache)
{
global $template, $lang, $db, $board_config, $theme, $phpEx, $mx_request_vars, $mx_cache, $mx_root_path, $mx_table_prefix, $table_prefix, $userdata;
global $controller_block;
+
+ $message_child = '';
switch ( $type )
***************
*** 1191,1195 ****
}
}
!
//
// Now also delete module tables
--- 1193,1197 ----
}
}
!
//
// Now also delete module tables
***************
*** 1637,1641 ****
$message_child .= $this->do_it(MX_BLOCK_TYPE, MX_DO_DELETE, $delete_id);
}
! }
$controller_block = '';
--- 1639,1643 ----
$message_child .= $this->do_it(MX_BLOCK_TYPE, MX_DO_DELETE, $delete_id);
}
! }
$controller_block = '';
***************
*** 3693,3707 ****
else
{
$is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0;
- if (!$is_admin)
- {
- //
- // Authorization SQL
- //
- $auth_blocks = get_auth_blocks();
- $auth_sql = " AND blk.block_id in ( ". $auth_blocks. " ) ";
- }
-
//
// Generate dynamic block select
--- 3695,3705 ----
else
{
+ //
+ // Authorization SQL
+ //
$is_admin = ( $userdata['user_level'] == ADMIN && $userdata['session_logged_in'] ) ? TRUE : 0;
+ $auth_blocks = get_auth_blocks();
+ $auth_sql = (!$is_admin) ? " AND blk.block_id in ( ". $auth_blocks. " ) " : "";
//
// Generate dynamic block select
Index: mx_functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions.php,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** mx_functions.php 9 Apr 2011 16:30:57 -0000 1.104
--- mx_functions.php 27 Jul 2011 19:44:58 -0000 1.105
***************
*** 1500,1504 ****
$multiple_select_option = 'multiple="multiple"';
}
!
$column_list = '<select name="' . $name_select . '" '.$multiple_select_option.'>';
if( $type == 'page_list' )
--- 1500,1508 ----
$multiple_select_option = 'multiple="multiple"';
}
! else
! {
! $multiple_select_option = '';
! }
!
$column_list = '<select name="' . $name_select . '" '.$multiple_select_option.'>';
if( $type == 'page_list' )
***************
*** 2102,2105 ****
--- 2106,2110 ----
$curicons = 1;
+ $posticons = '';
if ( $file_posticon == 'none' || $file_posticon == 'none.gif' or empty( $file_posticon ) )
{
|
