Menu
▾
▴
[mxbb-commits] core/admin admin_mx_smilies.php, 1.22, 1.23 index_jon.php, 1.3, 1.4 index_new.php, 1.16, 1.17
|
From: Florin C B. <ory...@us...> - 2011-03-20 18:25:43
|
Update of /cvsroot/mxbb/core/admin
In directory vz-cvs-4.sog:/tmp/cvs-serv18016
Modified Files:
admin_mx_smilies.php index_jon.php index_new.php
Log Message:
other updates after php 5.3.4
Index: admin_mx_smilies.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/admin_mx_smilies.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** admin_mx_smilies.php 31 Oct 2008 19:02:20 -0000 1.22
--- admin_mx_smilies.php 20 Mar 2011 18:25:40 -0000 1.23
***************
*** 125,129 ****
while($file = @readdir($dir))
{
! if( !@is_dir(phpBB2::phpbb_realpath($smiley_root_path . $board_config['smilies_path'] . '/' . $file)) )
{
$img_size = @getimagesize($smiley_root_path . $board_config['smilies_path'] . '/' . $file);
--- 125,129 ----
while($file = @readdir($dir))
{
! if( !@is_dir($smiley_root_path . $board_config['smilies_path'] . '/' . $file) )
{
$img_size = @getimagesize($smiley_root_path . $board_config['smilies_path'] . '/' . $file);
***************
*** 133,137 ****
$smiley_images[] = $file;
}
! else if( eregi('.pak$', $file) )
{
$smiley_paks[] = $file;
--- 133,137 ----
$smiley_images[] = $file;
}
! else if( stristr($file, '.pak$') )
{
$smiley_paks[] = $file;
Index: index_jon.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index_jon.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index_jon.php 30 Sep 2008 07:04:34 -0000 1.3
--- index_jon.php 20 Mar 2011 18:25:40 -0000 1.4
***************
*** 462,466 ****
}
! $template->assign_block_vars( 'category.panel', array( "ROW_COLOR" => "#" . $row_color,
"ROW_CLASS" => $row_class,
// +MOD: DHTML Menu for ACP
--- 462,466 ----
}
! $template->assign_block_vars('category.panel', array( "ROW_COLOR" => "#" . $row_color,
"ROW_CLASS" => $row_class,
// +MOD: DHTML Menu for ACP
***************
*** 469,473 ****
"L_PANEL" => $lang_menu,
'U_PANEL' => $menu_link,
! 'A_PANEL' => $this->panel == $panel?'activemenu':'',
) );
$row_count++;
--- 469,473 ----
"L_PANEL" => $lang_menu,
'U_PANEL' => $menu_link,
! 'A_PANEL' => $this->panel == $panel ? 'activemenu' : '',
) );
$row_count++;
***************
*** 477,481 ****
// -MOD: DHTML Menufor ACP
}
! $this->menu_actions = array_merge( array( $this->action_script => $this->menu_actions[$this->action_script] ), $this->menu_actions );
}
--- 477,481 ----
// -MOD: DHTML Menufor ACP
}
! $this->menu_actions = array_merge(array( $this->action_script => $this->menu_actions[$this->action_script] ), $this->menu_actions);
}
***************
*** 593,602 ****
for( $i = 0; $i < $match_count; $i++ )
{
! if ( eregi( 'javascript:', $match_links['LINK'][$i] ) || empty( $match_links['SCRIPT'][$i] ) || eregi( $mx_root_path . 'index.' . $phpEx, $match_links['LINK'][$i] ) || eregi( $admin_path . 'index.' . $phpEx, $match_links['LINK'][$i] ) )
{
continue;
}
! if ( eregi( 'index.' . $phpEx, $match_links['LINK'][$i] ) )
! {
$text = str_replace( $match_links['LINK'][$i], PORTAL_URL . $admin_path . $match_links['LINK'][$i], $text );
continue;
--- 593,602 ----
for( $i = 0; $i < $match_count; $i++ )
{
! if ( stristr($match_links['LINK'][$i], 'javascript:') || empty($match_links['SCRIPT'][$i]) || stristr($match_links['LINK'][$i], $mx_root_path . 'index.' . $phpEx) || stristr($match_links['LINK'][$i], $admin_path . 'index.' . $phpEx) )
{
continue;
}
! if ( stristr($match_links['LINK'][$i],'index.' . $phpEx) )
! {
$text = str_replace( $match_links['LINK'][$i], PORTAL_URL . $admin_path . $match_links['LINK'][$i], $text );
continue;
***************
*** 663,668 ****
break;
case OLYMPUS_CATEGORY:
! $acp_html = $this->phpbb3_hook->assign_content_acp( $acp_html );
! // $acp_html = '<h1>' . $this->panel_title . '</h1><p>Panel: ' . $this->panel . '</p>' . $acp_html;
break;
} // switch
--- 663,668 ----
break;
case OLYMPUS_CATEGORY:
! //$acp_html = $this->phpbb3_hook->assign_content_acp( $acp_html );
! $acp_html = '<h1>' . $this->panel_title . '</h1><p>Panel: ' . $this->panel . '</p>' . $acp_html;
break;
} // switch
***************
*** 747,751 ****
'LOGO' => !empty( $images['mx_logo_acp'] ) ? @$images['mx_logo_acp']: @$images['mx_logo'],
! "U_PORTAL_INDEX" => mx_append_sid( PORTAL_URL . basename( __FILE__ ) ),
"U_FORUM_INDEX" => mx_append_sid( PHPBB_URL . "index.$phpEx" ),
"U_PORTAL_ADMIN_INDEX" => mx_append_sid( basename( __FILE__ ) ),
--- 747,751 ----
'LOGO' => !empty( $images['mx_logo_acp'] ) ? @$images['mx_logo_acp']: @$images['mx_logo'],
! "U_PORTAL_INDEX" => mx_append_sid( PORTAL_URL . basename( __FILE__ ) ),
"U_FORUM_INDEX" => mx_append_sid( PHPBB_URL . "index.$phpEx" ),
"U_PORTAL_ADMIN_INDEX" => mx_append_sid( basename( __FILE__ ) ),
***************
*** 776,789 ****
'L_INDEX' => sprintf( $lang['Forum_Index'], $board_config['sitename'] ),
'L_FAQ' => $lang['FAQ'],
! 'U_INDEX' => mx_append_sid( '../index.' . $phpEx ),
'S_TIMEZONE' => sprintf( $lang['All_times'], $l_timezone ),
'S_LOGIN_ACTION' => mx_append_sid( '../login.' . $phpEx ),
'S_JUMPBOX_ACTION' => mx_append_sid( '../viewforum.' . $phpEx ),
! 'S_CURRENT_TIME' =>
! ( PORTAL_BACKEND == 'phpbb3' )?
! sprintf( $lang['Current_time'], $phpBB2->create_date( $board_config['default_dateformat'], time(), $board_config['board_timezone'] ) ):
! sprintf( $lang['Current_time'], create_date( $board_config['default_dateformat'], time(), $board_config['board_timezone'] ) ),
!
'S_CONTENT_DIRECTION' => $lang['DIRECTION'],
'S_CONTENT_ENCODING' => $lang['ENCODING'],
--- 776,785 ----
'L_INDEX' => sprintf( $lang['Forum_Index'], $board_config['sitename'] ),
'L_FAQ' => $lang['FAQ'],
! 'U_INDEX' => mx_append_sid('../index.'.$phpEx),
'S_TIMEZONE' => sprintf( $lang['All_times'], $l_timezone ),
'S_LOGIN_ACTION' => mx_append_sid( '../login.' . $phpEx ),
'S_JUMPBOX_ACTION' => mx_append_sid( '../viewforum.' . $phpEx ),
! 'S_CURRENT_TIME' => sprintf($lang['Current_time'], phpBB2::create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
'S_CONTENT_DIRECTION' => $lang['DIRECTION'],
'S_CONTENT_ENCODING' => $lang['ENCODING'],
***************
*** 817,820 ****
--- 813,818 ----
// VERSION mxP v2.9
//$script = str_replace( 'mx_$phpBB2->', '$phpBB2->', $script );
+ // VERSION mxP v3.0
+ //$script = str_replace( 'phpBB2::', 'mx_', $script );
switch ( 0 )
Index: index_new.php
===================================================================
RCS file: /cvsroot/mxbb/core/admin/index_new.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** index_new.php 30 Sep 2008 07:04:34 -0000 1.16
--- index_new.php 20 Mar 2011 18:25:41 -0000 1.17
***************
*** 10,18 ****
*/
// Security and Page header
! define( 'IN_PORTAL', 1 );
$mx_root_path = './../';
! $phpEx = substr( strrchr( __FILE__, '.' ), 1 );
! $no_page_header = true;
! require( './pagestart.' . $phpEx );
error_reporting( E_ALL ^ E_NOTICE );
// ------------------------------
--- 10,19 ----
*/
// Security and Page header
! define('IN_PORTAL', 1);
$mx_root_path = './../';
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! $no_page_header = TRUE;
!
! require($mx_root_path.'admin/pagestart.' . $phpEx);
error_reporting( E_ALL ^ E_NOTICE );
// ------------------------------
***************
*** 617,625 ****
for( $i = 0; $i < $match_count; $i++ )
{
! if ( eregi( 'javascript:', $match_links['LINK'][$i] ) || empty( $match_links['SCRIPT'][$i] ) || eregi( $mx_root_path . 'index.' . $phpEx, $match_links['LINK'][$i] ) || eregi( $admin_path . 'index.' . $phpEx, $match_links['LINK'][$i] ) )
{
continue;
}
! if ( eregi( 'index.' . $phpEx, $match_links['LINK'][$i] ) )
{
$text = str_replace( $match_links['LINK'][$i], PORTAL_URL . $admin_path . $match_links['LINK'][$i], $text );
--- 618,626 ----
for( $i = 0; $i < $match_count; $i++ )
{
! if ( stristr($match_links['LINK'][$i], 'javascript:') || empty($match_links['SCRIPT'][$i]) || stristr($match_links['LINK'][$i], $mx_root_path . 'index.' . $phpEx) || stristr($match_links['LINK'][$i], $admin_path . 'index.' . $phpEx) )
{
continue;
}
! if ( stristr($match_links['LINK'][$i],'index.' . $phpEx) )
{
$text = str_replace( $match_links['LINK'][$i], PORTAL_URL . $admin_path . $match_links['LINK'][$i], $text );
***************
*** 805,813 ****
'S_LOGIN_ACTION' => mx_append_sid( '../login.' . $phpEx ),
'S_JUMPBOX_ACTION' => mx_append_sid( '../viewforum.' . $phpEx ),
! 'S_CURRENT_TIME' =>
! ( OLYMPUS_BACKEND == PORTAL_BACKEND )?
! sprintf( $lang['Current_time'], $phpBB2->create_date( $board_config['default_dateformat'], time(), $board_config['board_timezone'] ) ):
! sprintf( $lang['Current_time'], create_date( $board_config['default_dateformat'], time(), $board_config['board_timezone'] ) ),
!
'S_CONTENT_DIRECTION' => $lang['DIRECTION'],
'S_CONTENT_ENCODING' => $lang['ENCODING'],
--- 806,810 ----
'S_LOGIN_ACTION' => mx_append_sid( '../login.' . $phpEx ),
'S_JUMPBOX_ACTION' => mx_append_sid( '../viewforum.' . $phpEx ),
! 'S_CURRENT_TIME' => sprintf($lang['Current_time'], phpBB2::create_date($board_config['default_dateformat'], time(), $board_config['board_timezone'])),
'S_CONTENT_DIRECTION' => $lang['DIRECTION'],
'S_CONTENT_ENCODING' => $lang['ENCODING'],
***************
*** 840,847 ****
$i = 1;
// VERSION mx v2.8
! // $script = str_replace( '$phpBB2->', '', $script);
// VERSION mxP v2.9
$script = str_replace( 'mx_$phpBB2->', '$phpBB2->', $script );
!
$cache_file_name = cache_file( $script, 'PANEL');
--- 837,844 ----
$i = 1;
// VERSION mx v2.8
! //$script = str_replace( '$phpBB2->', 'phpBB2::', $script);
// VERSION mxP v2.9
$script = str_replace( 'mx_$phpBB2->', '$phpBB2->', $script );
! $script = str_replace( 'phpBB2::', '', $script );
$cache_file_name = cache_file( $script, 'PANEL');
|
