mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 14:17:49 +02:00
Code Issues Releases Wiki Activity

Protect admin-area tablerender() from conflicts.

Browse Source
This commit is contained in:
Cameron
2013-05-08 17:11:17 -07:00
parent 6963333389
commit 91f0d4520f
2 changed files with 201 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
class2.php
View File

@@ -780,27 +780,29 @@ if (!class_exists('e107table', false))
class e107table class e107table
{ {
public $eMenuCount = 0; public $eMenuCount = 0;
public $eMenuArea; public $eMenuArea;
public $eMenuTotal = array(); public $eMenuTotal = array();
public $eSetStyle; public $eSetStyle;
private $themeClass = '';
private $adminThemeClass = '';
function __construct()
{
// $this->themeClass = e107::getPref('sitetheme')."_theme"; // disabled at the moment.
$this->adminThemeClass = e107::getPref('admintheme')."_admintheme"; // Check for a class.
}
/** /**
* @param $caption * @param $caption string caption text
* @param $text * @param $text body text
* @param $mode * @param $mode unique identifier
* @param $return boolean : return the html instead of echo it. * @param $return boolean : return the html instead of echo it.
* @return null
*/ */
function tablerender($caption, $text, $mode = 'default', $return = false) public function tablerender($caption, $text, $mode = 'default', $return = false)
{ {
/*
# Render style table
# - parameter #1: string $caption, caption text
# - parameter #2: string $text, body text
# - return null
# - scope public
*/
$override_tablerender = e107::getSingleton('override', e_HANDLER.'override_class.php')->override_check('tablerender'); $override_tablerender = e107::getSingleton('override', e_HANDLER.'override_class.php')->override_check('tablerender');
if ($override_tablerender) if ($override_tablerender)
@@ -820,8 +822,9 @@ if (!class_exists('e107table', false))
{ {
$this->eMenuCount++; $this->eMenuCount++;
} }
ob_start(); ob_start();
tablestyle($caption, $text, $mode, array('menuArea'=>$this->eMenuArea, 'menuCount'=>$this->eMenuCount, 'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]), 'setStyle'=>$this->eSetStyle)); $this->tablestyle($caption, $text, $mode);
$ret=ob_get_contents(); $ret=ob_get_contents();
ob_end_clean(); ob_end_clean();
@@ -834,11 +837,48 @@ if (!class_exists('e107table', false))
{ {
$this->eMenuCount++; $this->eMenuCount++;
} }
tablestyle($caption, $text, $mode, array('menuArea'=>$this->eMenuArea,'menuCount'=>$this->eMenuCount,'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]),'setStyle'=>$this->eSetStyle));
$this->tablestyle($caption, $text, $mode);
return ''; return '';
} }
} }
/**
* Output the styled template.
* @param $caption
* @param $text
* @param $mode
*/
private function tablestyle($caption, $text, $mode)
{
if(class_exists($this->adminThemeClass))
{
$thm = new $this->adminThemeClass();
}
elseif(class_exists($this->themeClass)) // disabled at the moment.
{
$thm = new $this->themeClass();
}
if(is_object($thm))
{
$thm->tablestyle($caption, $text, $mode, array('menuArea'=>$this->eMenuArea, 'menuCount'=>$this->eMenuCount, 'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]), 'setStyle'=>$this->eSetStyle));
}
else
{
tablestyle($caption, $text, $mode, array('menuArea'=>$this->eMenuArea,'menuCount'=>$this->eMenuCount,'menuTotal'=>varset($this->eMenuTotal[$this->eMenuArea]),'setStyle'=>$this->eSetStyle));
}
}
} }
} }
//############################################################# //#############################################################

281
e107_themes/bootstrap/admin_theme.php
View File

@@ -48,160 +48,165 @@ else
$no_core_css = TRUE; $no_core_css = TRUE;
function tablestyle($caption, $text, $mode) class bootstrap_admintheme
{ {
global $style;
$class = '';
function tablestyle($caption, $text, $mode)
{
if(is_string($mode) && $mode == 'admin_help') $class = ' '.str_replace('_', '-', $mode); global $style;
$class = '';
if($mode == 'e_help')
{
$style = 'admin_menu';
}
if($mode == 'core-infopanel_latest' || $mode == 'core-infopanel_status')
{
//return; if(is_string($mode) && $mode == 'admin_help') $class = ' '.str_replace('_', '-', $mode);
echo '
<!-- Start Mode: '.$mode.' -->
<li class="span6 '.$mode.'" >
<div class="well" style="padding:10px;min-height:220px;" >
<div class="nav-header">'.$caption.'</div>
<!-- Content Start -->
'.$text.'
<!-- Content End -->
</div>
</li>
<!-- End Mode: '.$mode.' -->
';
return;
}
if($mode == 'personalize')
{
echo '
<!-- Mode: '.$mode.' -->
<div class="well" style="padding:10px">
<div class="nav-header">'.$caption.'</div>
<!-- Content Start -->
'.$text.'
<!-- Content End -->
</div>
<!-- End Mode: '.$mode.' -->
';
return; if($mode == 'e_help')
} {
$style = 'admin_menu';
}
if($style == 'core-infopanel')
{
echo '
<!-- Start Style: '.$style.' -->
<li class="span12"> if($mode == 'core-infopanel_latest' || $mode == 'core-infopanel_status')
{
<div class="well" > //return;
<div class="nav-header">'.$caption.'</div> echo '
<!-- Content Start --> <!-- Start Mode: '.$mode.' -->
'.$text.' <li class="span6 '.$mode.'" >
<!-- Content End -->
</div> <div class="well" style="padding:10px;min-height:220px;" >
<div class="nav-header">'.$caption.'</div>
</li> <!-- Content Start -->
<!-- End Style: '.$style.' -->
';
return;
}
if(deftrue('e_IFRAME'))
{
echo '
<div class="block">
<div class="block-text">
'.$text.' '.$text.'
</div> <!-- Content End -->
</div> </div>
';
</li>
return; <!-- End Mode: '.$mode.' -->
} ';
return;
}
if(trim($caption) == '') if($mode == 'personalize')
{ {
$style = 'no_caption';
}
switch(varset($style, 'admin_content'))
{
case 'admin_menu' :
echo ' echo '
<!-- Mode: '.$mode.' -->
<div class="well" style="padding:10px">
<div class="nav-header">'.$caption.'</div>
<!-- Content Start -->
'.$text.'
<!-- Content End -->
</div>
<!-- End Mode: '.$mode.' -->
';
return;
}
if($style == 'core-infopanel')
{
echo '
<!-- Start Style: '.$style.' -->
<li class="span12">
<div class="well" >
<div class="nav-header">'.$caption.'</div>
<!-- Content Start -->
'.$text.'
<!-- Content End -->
</div>
</li>
<!-- End Style: '.$style.' -->
';
return;
}
if(deftrue('e_IFRAME'))
{
echo '
<div class="block">
<div class="block-text">
'.$text.'
</div>
</div>
';
return;
}
if(trim($caption) == '')
{
$style = 'no_caption';
}
switch(varset($style, 'admin_content'))
{
case 'admin_menu' :
echo '
<div class="well sidebar-nav" >
<div class="nav-header">'.$caption.'</div>
'.$text.'
</div>
';
break;
case 'site_info' :
echo '
<div class="well sidebar-nav" > <div class="well sidebar-nav" >
<div class="nav-header">'.$caption.'</div> <div class="nav-header">'.$caption.'</div>
'.$text.' <p style="padding:10px">
</div> '.$text.'
'; </p>
break;
case 'site_info' :
echo '
<div class="well sidebar-nav" >
<div class="nav-header">'.$caption.'</div>
<p style="padding:10px">
'.$text.'
</p>
</div>
';
break;
/*
case 'admin_content':
echo '
<div class="block">
<h2 class="caption">'.$caption.'</h2>
<div class="block-text">
'.$text.'
</div> </div>
</div> ';
'; break;
break; /*
*/ case 'admin_content':
echo '
case 'no_caption' : <div class="block">
echo ' <h2 class="caption">'.$caption.'</h2>
<div class="block"> <div class="block-text">
<div class="block-text"> '.$text.'
'.$text.' </div>
</div> </div>
</div> ';
'; break;
break; */
case 'no_caption' :
default: echo '
echo ' <div class="block">
<div class="block"> <div class="block-text">
<h4 class="caption">'.$caption.'</h4> '.$text.'
<div class="block-text"> </div>
'.$text.'
</div> </div>
</div> ';
'; break;
break;
default:
echo '
<div class="block">
<h4 class="caption">'.$caption.'</h4>
<div class="block-text">
'.$text.'
</div>
</div>
';
break;
}
} }
} }
$HEADER = ''; $HEADER = '';
$FOOTER = ''; $FOOTER = '';