diff --git a/e107_core/shortcodes/batch/bbcode_shortcodes.php b/e107_core/shortcodes/batch/bbcode_shortcodes.php index 15e1ec960..82820cc8a 100644 --- a/e107_core/shortcodes/batch/bbcode_shortcodes.php +++ b/e107_core/shortcodes/batch/bbcode_shortcodes.php @@ -44,7 +44,7 @@ class bbcode_shortcodes extends e_shortcode ); - if(e_BOOTSTRAP) + if(BOOTSTRAP) { $text = '
'; $text .= ''; @@ -169,7 +169,7 @@ class bbcode_shortcodes extends e_shortcode function bb_fontsize($id) // FIXME CSS issues { - if(deftrue('e_BOOTSTRAP')) + if(deftrue('BOOTSTRAP')) { $tp = e107::getParser(); @@ -226,7 +226,7 @@ class bbcode_shortcodes extends e_shortcode if ($pref['comments_emoticons'] && $pref['smiley_activate'] && !defsettrue('e_WYSIWYG')) { - if(deftrue('e_BOOTSTRAP')) + if(deftrue('BOOTSTRAP')) { $text = '
'; $text .= ''; diff --git a/e107_core/shortcodes/batch/news_shortcodes.php b/e107_core/shortcodes/batch/news_shortcodes.php index 5eab2a6a2..c7adb86ca 100644 --- a/e107_core/shortcodes/batch/news_shortcodes.php +++ b/e107_core/shortcodes/batch/news_shortcodes.php @@ -126,7 +126,7 @@ class news_shortcodes extends e_shortcode $NEWIMAGE = $param['image_nonew_small']; } - if(deftrue('e_BOOTSTRAP')) // Should be done with CSS, not like above. + if(deftrue('BOOTSTRAP')) // Should be done with CSS, not like above. { $NEWIMAGE = ""; } @@ -225,7 +225,7 @@ class news_shortcodes extends e_shortcode if (ADMIN && getperms('H')) { - $default = (deftrue('e_BOOTSTRAP')) ? "" : "".LAN_NEWS_25.""; + $default = (deftrue('BOOTSTRAP')) ? "" : "".LAN_NEWS_25.""; $adop_icon = (file_exists(THEME."images/newsedit.png") ? "".LAN_NEWS_25."" : $default); return " ".$adop_icon."\n"; diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php index adc73a2b3..e5412cdd7 100644 --- a/e107_core/shortcodes/batch/user_shortcodes.php +++ b/e107_core/shortcodes/batch/user_shortcodes.php @@ -274,7 +274,7 @@ class user_shortcodes extends e_shortcode */ function sc_user_icon($parm='') { - $boot = deftrue('e_BOOTSTRAP'); + $boot = deftrue('BOOTSTRAP'); switch ($parm) { diff --git a/e107_core/shortcodes/single/nextprev.php b/e107_core/shortcodes/single/nextprev.php index 2add8255e..0427f551b 100644 --- a/e107_core/shortcodes/single/nextprev.php +++ b/e107_core/shortcodes/single/nextprev.php @@ -75,7 +75,7 @@ function nextprev_shortcode($parm = '') $total_items = intval($parm['total']); $check_render = true; - if(vartrue($parm['glyphs']) && (e_BOOTSTRAP === true)) + if(vartrue($parm['glyphs']) && (BOOTSTRAP === true)) { $LAN_NP_FIRST = ""; $LAN_NP_PREVIOUS = ""; diff --git a/e107_core/templates/fpw_template.php b/e107_core/templates/fpw_template.php index d40822905..740391d7e 100644 --- a/e107_core/templates/fpw_template.php +++ b/e107_core/templates/fpw_template.php @@ -3,7 +3,7 @@ if (!defined('e107_INIT')) { exit; } -if (!defined("USER_WIDTH") && deftrue('e_BOOTSTRAP')!==true){ define("USER_WIDTH","width:70%"); } +if (!defined("USER_WIDTH") && deftrue('BOOTSTRAP')!==true){ define("USER_WIDTH","width:70%"); } // ##### FPW TABLE ----------------------------------------------------------------------------- if(!isset($FPW_TABLE)) diff --git a/e107_core/templates/usersettings_template.php b/e107_core/templates/usersettings_template.php index bcffee549..92213b5b8 100755 --- a/e107_core/templates/usersettings_template.php +++ b/e107_core/templates/usersettings_template.php @@ -17,7 +17,7 @@ if (!defined('e107_INIT')) { exit; } if (!defined("USER_WIDTH")) { - $uw = (deftrue('e_BOOTSTRAP')) ? "" : "width:97%"; + $uw = (deftrue('BOOTSTRAP')) ? "" : "width:97%"; define("USER_WIDTH", $uw); } diff --git a/e107_handlers/db_debug_class.php b/e107_handlers/db_debug_class.php index c61fcdebe..8b563df45 100644 --- a/e107_handlers/db_debug_class.php +++ b/e107_handlers/db_debug_class.php @@ -517,7 +517,7 @@ class e107_db_debug { $inc = array( - 'HEADERF','FOOTERF','FILE_UPLOADS','FLOODPROTECT','FLOODTIMEOUT','CHARSET', + 'BOOTSTRAP','HEADERF','FOOTERF','FILE_UPLOADS','FLOODPROTECT','FLOODTIMEOUT','CHARSET', 'GUESTS_ONLINE','MEMBERS_ONLINE','PAGE_NAME','STANDARDS_MODE','TIMEOFFSET', 'TOTAL_ONLINE','THEME','THEME_ABS','THEME_LAYOUT','THEME_STYLE','META_OG','META_DESCRIPTION','MPREFIX','VIEWPORT','BODYTAG','CSSORDER' ); diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php index 8c96f1223..06281eca1 100644 --- a/e107_handlers/e107_class.php +++ b/e107_handlers/e107_class.php @@ -1663,9 +1663,9 @@ class e107 */ public static function css($type, $data, $dep = null, $media = 'all', $preComment = '', $postComment = '', $dependence = null) { - if((strstr($data,'bootstrap.css') || strstr($data,'bootstrap.min.css')) && !defined("e_BOOTSTRAP")) // detect bootstrap is enabled. - used in nextprev.sc and forum currently. + if((strstr($data,'bootstrap.css') || strstr($data,'bootstrap.min.css')) && !defined("BOOTSTRAP")) // detect bootstrap is enabled. - used in nextprev.sc and forum currently. { - define("e_BOOTSTRAP", true); + define("BOOTSTRAP", true); } $jshandler = e107::getJs(); @@ -3007,6 +3007,10 @@ class e107 define('e_AVATAR_UPLOAD_ABS', $this->get_override_http('AVATARS_UPLOAD')); define('e_AVATAR_DEFAULT_ABS', $this->get_override_http('AVATARS_DEFAULT')); + // Special + + define('e_BOOTSTRAP', e_WEB."bootstrap/"); + } return $this; diff --git a/e107_handlers/emailprint_class.php b/e107_handlers/emailprint_class.php index e662e1415..208cf46b4 100644 --- a/e107_handlers/emailprint_class.php +++ b/e107_handlers/emailprint_class.php @@ -58,7 +58,7 @@ class emailprint - if(deftrue('e_BOOTSTRAP')) + if(deftrue('BOOTSTRAP')) { $genericMail = ""; $genericPrint = ""; diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 0e0c90fc2..9af3d5264 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -825,7 +825,7 @@ class e_form */ public function progressBar($name,$value,$options=array()) { - if(!deftrue('e_BOOTSTRAP')) + if(!deftrue('BOOTSTRAP')) { return; } @@ -1537,7 +1537,7 @@ class e_form */ public function button($name, $value, $action = 'submit', $label = '', $options = array()) { - if(deftrue('e_BOOTSTRAP') && $action == 'dropdown' && is_array($value)) + if(deftrue('BOOTSTRAP') && $action == 'dropdown' && is_array($value)) { // $options = $this->format_options('admin_button', $name, $options); $options['class'] = vartrue($options['class']); diff --git a/e107_handlers/user_extended_class.php b/e107_handlers/user_extended_class.php index b6d32cf7f..51a000911 100644 --- a/e107_handlers/user_extended_class.php +++ b/e107_handlers/user_extended_class.php @@ -713,7 +713,7 @@ class e107_user_extended $label = deftrue($label, $label); - if(deftrue('e_BOOTSTRAP')) + if(deftrue('BOOTSTRAP')) { $ret .= $frm->radio($fname,$val,($curval == $val),array('label'=>$label)); } @@ -749,7 +749,7 @@ class e107_user_extended } $label = deftrue($label, $label); - if(deftrue('e_BOOTSTRAP')) + if(deftrue('BOOTSTRAP')) { $ret .= $frm->checkbox($fname,$val,($curval == $val),array('label'=>$label)); } diff --git a/e107_plugins/banner/banner_menu.php b/e107_plugins/banner/banner_menu.php index 5e5eb0b96..2b5f95a0a 100644 --- a/e107_plugins/banner/banner_menu.php +++ b/e107_plugins/banner/banner_menu.php @@ -77,16 +77,19 @@ else { $parms[] = $menu_pref['banner_campaign']; } + + $txt = $BANNER_MENU_START; + + foreach ($parms as $parm) + { + $bannersccode = file_get_contents(e_CORE.'shortcodes/banner.sc'); + $BANNER = eval($bannersccode); + $txt .= preg_replace("/\{(.*?)\}/e", '$\1', $BANNER_MENU); + } + $txt .= $BANNER_MENU_END; } - $txt = $BANNER_MENU_START; - foreach ($parms as $parm) - { - $bannersccode = file_get_contents(e_CORE.'shortcodes/banner.sc'); - $BANNER = eval($bannersccode); - $txt .= preg_replace("/\{(.*?)\}/e", '$\1', $BANNER_MENU); - } - $txt .= $BANNER_MENU_END; + } if(isset($menu_pref['banner_rendertype']) && $menu_pref['banner_rendertype'] == 2) diff --git a/e107_plugins/blogcalendar_menu/blogcalendar_menu.php b/e107_plugins/blogcalendar_menu/blogcalendar_menu.php index d2451c2cf..a277bdb03 100644 --- a/e107_plugins/blogcalendar_menu/blogcalendar_menu.php +++ b/e107_plugins/blogcalendar_menu/blogcalendar_menu.php @@ -119,7 +119,7 @@ if(false === $cached) { $month_links[$xmonth] = e107::getUrl()->create('news/list/month', 'idv='.formatDate($req_year, $xmonth));//e_BASE."news.php?month.".formatDate($req_year, $xmonth); } - // if(($news['news_datestamp'] >= $month_start && $news['news_datestamp'] <= $month_end) || (deftrue('e_BOOTSTRAP') && $news['news_datestamp'] >= $year_start && $news['news_datestamp'] <= $year_end)) + // if(($news['news_datestamp'] >= $month_start && $news['news_datestamp'] <= $month_end) || (deftrue('BOOTSTRAP') && $news['news_datestamp'] >= $year_start && $news['news_datestamp'] <= $year_end)) { $xday = date("j", $news['news_datestamp']); if (!isset($day_links[$xday]) || !$day_links[$xday]) @@ -158,7 +158,7 @@ if(false === $cached) */ - if(deftrue('e_BOOTSTRAP')) // v2.x + if(deftrue('BOOTSTRAP')) // v2.x { $month_selector = '
‹ ›
'; diff --git a/e107_plugins/blogcalendar_menu/calendar.php b/e107_plugins/blogcalendar_menu/calendar.php index 3cf318595..4543749f7 100644 --- a/e107_plugins/blogcalendar_menu/calendar.php +++ b/e107_plugins/blogcalendar_menu/calendar.php @@ -138,7 +138,7 @@ function calendar($req_day, $req_month, $req_year, $links = NULL, $ws = "sunday" // $calendar .= "tablerow = ".$tablerow; - if(deftrue('e_BOOTSTRAP')) + if(deftrue('BOOTSTRAP')) { $active = date("n") == $req_month ? 'active' : ''; $text = "
"; diff --git a/e107_plugins/forum/forum.php b/e107_plugins/forum/forum.php index cec31ed91..ef7eac91e 100644 --- a/e107_plugins/forum/forum.php +++ b/e107_plugins/forum/forum.php @@ -216,7 +216,7 @@ if (!isset($FORUM_MAIN_START)) include(e_PLUGIN.'forum/templates/forum_template.php'); -if(is_array($FORUM_TEMPLATE) && (e_BOOTSTRAP === true)) // new v2.x format. +if(is_array($FORUM_TEMPLATE) && (BOOTSTRAP === true)) // new v2.x format. { $FORUM_MAIN_START = $FORUM_TEMPLATE['main-start']; diff --git a/e107_plugins/forum/forum_post.php b/e107_plugins/forum/forum_post.php index 732b9d280..f0b19f335 100644 --- a/e107_plugins/forum/forum_post.php +++ b/e107_plugins/forum/forum_post.php @@ -514,7 +514,7 @@ if (!vartrue($FORUMPOST)) } } -if(isset($FORUMPOST_TEMPLATE) && (e_BOOTSTRAP === true)) +if(isset($FORUMPOST_TEMPLATE) && (BOOTSTRAP === true)) { $FORUMPOST = $FORUMPOST_TEMPLATE['form']; $FORUMPOST_REPLY = $FORUMPOST_TEMPLATE['form']; diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php index e7b8ecded..ee33437b5 100644 --- a/e107_plugins/forum/forum_viewforum.php +++ b/e107_plugins/forum/forum_viewforum.php @@ -88,7 +88,7 @@ if (!vartrue($FORUM_VIEW_START)) } -if(is_array($FORUM_VIEWFORUM_TEMPLATE) && (e_BOOTSTRAP === true)) // New v2.x bootstrap Template. +if(is_array($FORUM_VIEWFORUM_TEMPLATE) && (BOOTSTRAP === true)) // New v2.x bootstrap Template. { $FORUM_VIEW_START_CONTAINER = $FORUM_VIEWFORUM_TEMPLATE['start']; @@ -187,7 +187,7 @@ if($forum->checkPerm($forumId, 'post')) $fVars->NEWTHREADBUTTONX = newthreadjump(e107::getUrl()->create('forum/thread/new', array('id' => $forumId))); // "New Thread"; } -if(e_BOOTSTRAP !== true) +if(BOOTSTRAP !== true) { $fVars->NEWTHREADBUTTONX = $fVars->NEWTHREADBUTTON; } @@ -578,7 +578,7 @@ function parse_thread($thread_info) $_TEMPLATE = "".substr($_TEMPLATE,4); } - if(e_BOOTSTRAP !== true) + if(BOOTSTRAP !== true) { $tVars->REPLIESX = $tVars->REPLIES; $tVars->VIEWSX = $tVars->VIEWS; diff --git a/e107_plugins/forum/forum_viewtopic.php b/e107_plugins/forum/forum_viewtopic.php index 8234623b7..2b6c19bfe 100644 --- a/e107_plugins/forum/forum_viewtopic.php +++ b/e107_plugins/forum/forum_viewtopic.php @@ -180,7 +180,7 @@ if (!vartrue($FORUMSTART)) // New in v2.x -if(is_array($FORUM_VIEWTOPIC_TEMPLATE) && (e_BOOTSTRAP === true)) +if(is_array($FORUM_VIEWTOPIC_TEMPLATE) && (BOOTSTRAP === true)) { $FORUMSTART = $FORUM_VIEWTOPIC_TEMPLATE['start']; $FORUMTHREADSTYLE = $FORUM_VIEWTOPIC_TEMPLATE['thread']; diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php index 086de663f..a5db62727 100644 --- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php @@ -144,7 +144,7 @@ class plugin_forum_view_shortcodes extends e_shortcode if(count($images) ) { - return (deftrue('e_BOOTSTRAP')) ? "
  • ".implode("
  • ",$images)."
" : implode("
",$images); + return (deftrue('BOOTSTRAP')) ? "
  • ".implode("
  • ",$images)."
" : implode("
",$images); } diff --git a/e107_plugins/log/stats.php b/e107_plugins/log/stats.php index 326c8bba4..f34b5577e 100644 --- a/e107_plugins/log/stats.php +++ b/e107_plugins/log/stats.php @@ -782,7 +782,7 @@ class siteStats } } - if(deftrue('e_BOOTSTRAP')) + if(deftrue('BOOTSTRAP')) { return "
".e107::getForm()->button('statNav',$lk,'dropdown',$links[$action]['label'], array('align'=>'right','class'=>'btn-primary'))."
"; } @@ -1973,7 +1973,7 @@ class siteStats */ function bar($percen, $val,$name) { - if(deftrue('e_BOOTSTRAP')) + if(deftrue('BOOTSTRAP')) { $text = e107::getForm()->progressBar($name,$percen); } diff --git a/e107_plugins/pdf/pdf.sc b/e107_plugins/pdf/pdf.sc index 182191806..4c41d3269 100644 --- a/e107_plugins/pdf/pdf.sc +++ b/e107_plugins/pdf/pdf.sc @@ -17,7 +17,7 @@ if (defined("ICONPRINTPDF") && file_exists(THEME."images/".ICONPRINTPDF)) } else { - $icon = deftrue('e_BOOTSTRAP') ? "" : "{$parms[0]}"; + $icon = deftrue('BOOTSTRAP') ? "" : "{$parms[0]}"; } return " ".$icon.""; diff --git a/e107_plugins/poll/poll_class.php b/e107_plugins/poll/poll_class.php index 6ab5e84af..26c5691b3 100644 --- a/e107_plugins/poll/poll_class.php +++ b/e107_plugins/poll/poll_class.php @@ -376,7 +376,7 @@ class poll - if(deftrue('e_BOOTSTRAP')) + if(deftrue('BOOTSTRAP')) { if($type == 'forum') @@ -561,7 +561,7 @@ class poll function generateBar($perc) { - if(e_BOOTSTRAP === true) + if(BOOTSTRAP === true) { return "
diff --git a/e107_themes/bootstrap/theme.php b/e107_themes/bootstrap/theme.php index 0be5879d1..718dd76f2 100644 --- a/e107_themes/bootstrap/theme.php +++ b/e107_themes/bootstrap/theme.php @@ -3,7 +3,7 @@ if ( ! defined('e107_INIT')) { exit(); } /* * This is a 100% Pure Bootstrap Theme for e107 v2 */ - +define('BOOTSTRAP',true); define("VIEWPORT", "width=device-width, initial-scale=1.0"); define("BODYTAG", ''); diff --git a/login.php b/login.php index 7928998d8..2251b4a53 100644 --- a/login.php +++ b/login.php @@ -93,7 +93,7 @@ if (!USER || getperms('0')) $sc = e107::getScBatch('login'); - if((e_BOOTSTRAP === true) && isset($LOGIN_TEMPLATE['page'])) + if((BOOTSTRAP === true) && isset($LOGIN_TEMPLATE['page'])) { $LOGIN_TABLE_HEADER = $LOGIN_TEMPLATE['page']['header']; $LOGIN_TABLE = ""; diff --git a/usersettings.php b/usersettings.php index 0e517ae48..5e5f5af63 100644 --- a/usersettings.php +++ b/usersettings.php @@ -640,7 +640,7 @@ if ($dataToSave && !$promptPassword) { $message = str_replace("{MESSAGE}",$message,$USERSETTINGS_MESSAGE); } - elseif(!deftrue('e_BOOTSTRAP')) // backwards compatible + elseif(!deftrue('BOOTSTRAP')) // backwards compatible { $message = "
".$message.'
'; @@ -692,7 +692,7 @@ if($testSessionMessage) $message = implode('
', $testSessionMessage); // we if (isset($message)) { - if(deftrue('e_BOOTSTRAP')) + if(deftrue('BOOTSTRAP')) { echo e107::getMessage()->addInfo($message)->render(); }