From b40b1916a3e248a2f0e43fe5f2c2df095cc0341a Mon Sep 17 00:00:00 2001 From: Cameron Date: Wed, 10 Jan 2018 15:06:40 -0800 Subject: [PATCH] Issue #2970 btn-default > btn-default btn-secondary --- e107_admin/banlist.php | 2 +- e107_admin/db.php | 2 +- e107_admin/image.php | 2 +- e107_admin/mailout.php | 8 +++---- e107_admin/menus.php | 2 +- e107_admin/message.php | 4 ++-- e107_admin/newspost.php | 6 ++--- e107_admin/search.php | 4 ++-- e107_admin/theme.php | 12 +++++----- e107_admin/upload.php | 2 +- e107_admin/users.php | 14 ++++++------ e107_admin/users_extended.php | 2 +- .../shortcodes/batch/admin_shortcodes.php | 4 ++-- .../shortcodes/batch/bbcode_shortcodes.php | 16 +++++++------- .../shortcodes/batch/comment_shortcodes.php | 10 ++++----- .../shortcodes/batch/page_shortcodes.php | 2 +- .../shortcodes/batch/user_shortcodes.php | 4 ++-- e107_core/shortcodes/single/custom.php | 2 +- e107_core/templates/nextprev_template.php | 20 ++++++++--------- e107_core/templates/search_template.php | 2 +- e107_handlers/comment_class.php | 6 ++--- e107_handlers/form_handler.php | 22 +++++++++---------- e107_handlers/media_class.php | 4 ++-- e107_handlers/sitelinks_class.php | 4 ++-- e107_handlers/theme_handler.php | 16 +++++++------- e107_handlers/user_select_class.php | 4 ++-- .../blogcalendar_menu/blogcalendar_menu.php | 4 ++-- e107_plugins/chatbox_menu/chat.php | 2 +- e107_plugins/chatbox_menu/chatbox_menu.php | 4 ++-- e107_plugins/download/admin_download.php | 4 ++-- e107_plugins/download/download_shortcodes.php | 4 ++-- e107_plugins/download/includes/admin.php | 12 +++++----- e107_plugins/forum/forum_conf.php | 4 ++-- e107_plugins/forum/forum_post.php | 8 +++---- e107_plugins/forum/forum_uploads.php | 2 +- e107_plugins/forum/forum_viewforum.php | 4 ++-- .../shortcodes/batch/forum_shortcodes.php | 2 +- .../shortcodes/batch/post_shortcodes.php | 4 ++-- .../shortcodes/batch/view_shortcodes.php | 12 +++++----- .../shortcodes/batch/viewforum_shortcodes.php | 4 ++-- .../gallery/includes/gallery_load.php | 2 +- .../gallery/templates/gallery_template.php | 2 +- e107_plugins/gsitemap/admin_config.php | 2 +- .../login_menu/login_menu_shortcodes.php | 2 +- e107_plugins/news/news_months_menu.php | 2 +- e107_plugins/newsletter/admin_config.php | 8 +++---- .../newsletter/newsletter_legacy_menu.php | 4 ++-- e107_plugins/newsletter/nl_archive.php | 4 ++-- e107_plugins/page/page_navigation_menu.php | 2 +- e107_plugins/pm/pm_shortcodes.php | 4 ++-- e107_plugins/poll/admin_config.php | 4 ++-- e107_plugins/poll/poll_class.php | 4 ++-- e107_plugins/search_menu/search_menu.php | 2 +- e107_plugins/social/e_shortcode.php | 4 ++-- e107_plugins/tinymce4/admin_config.php | 2 +- e107_plugins/tinymce4/plugins/e107/dialog.php | 2 +- e107_plugins/trackback/modtrackback.php | 2 +- e107_plugins/user/userlanguage_menu.php | 2 +- e107_plugins/user/usertheme_menu.php | 2 +- e107_themes/bootstrap3/theme_config.php | 2 +- e107_themes/bootstrap3/theme_shortcodes.php | 4 ++-- .../templates/gallery/gallery_template.php | 2 +- .../landingzero/templates/menu_template.php | 4 ++-- e107_themes/landingzero/theme_shortcodes.php | 4 ++-- e107_themes/voux/theme_shortcodes.php | 4 ++-- e107_web/utilities/dbgen.php | 2 +- e107_web/utilities/passcalc.php | 2 +- e107_web/utilities/passconv.php | 2 +- e107_web/utilities/resetcore.php | 4 ++-- email.php | 2 +- install.php | 2 +- search.php | 4 ++-- userposts.php | 4 ++-- 73 files changed, 172 insertions(+), 172 deletions(-) diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php index bfbbecfa7..dd5fd65cb 100644 --- a/e107_admin/banlist.php +++ b/e107_admin/banlist.php @@ -1002,7 +1002,7 @@ switch ($action) $text .= "
".$tp->parseTemplate("{NEXTPREV={$parms}}".'

'); } $text .= " - + "; diff --git a/e107_admin/db.php b/e107_admin/db.php index 3b457d772..7ef00053a 100644 --- a/e107_admin/db.php +++ b/e107_admin/db.php @@ -1034,7 +1034,7 @@ class system_tools { $text .= "
- ".ADMIN_EXECUTE_ICON." + ".ADMIN_EXECUTE_ICON."

".$val['label']."

".$val['diz']."
"; diff --git a/e107_admin/image.php b/e107_admin/image.php index b61395a85..4f1636360 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -1507,7 +1507,7 @@ class media_admin_ui extends e_admin_ui - "; diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php index 73496c50f..2c0d9d200 100644 --- a/e107_admin/mailout.php +++ b/e107_admin/mailout.php @@ -1696,7 +1696,7 @@ class mailout_admin_form_ui extends e_admin_form_ui $preview = e_SELF."?mode=main&action=preview&id=".$id; $text .= ""; $text .= "".E_32_MAIL.""; - $text .= "".E_32_SEARCH.""; + $text .= "".E_32_SEARCH.""; $text .= $this->renderValue('options',$value,$attributes,$id); @@ -1710,8 +1710,8 @@ class mailout_admin_form_ui extends e_admin_form_ui $preview = e_SELF."?mode=main&action=preview&id=".$id.'&user='.$user; $text = ""; - $text .= "".E_32_USER.""; - $text .= "".E_32_SEARCH.""; + $text .= "".E_32_USER.""; + $text .= "".E_32_SEARCH.""; $attributes['readParms']['editClass'] = e_UC_NOBODY; $text .= $this->renderValue('options',$value,$attributes,$id); @@ -1882,7 +1882,7 @@ class mailout_recipients_form_ui extends e_admin_form_ui $preview = e_SELF."?mode=main&action=preview&id=".$eid.'&user='.$user; $text = ""; - $text .= "".E_32_SEARCH.""; + $text .= "".E_32_SEARCH.""; diff --git a/e107_admin/menus.php b/e107_admin/menus.php index 276f87b4f..763849b4a 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -961,7 +961,7 @@ class e_menu_layout
- '.LAN_GO." ".e107::getParser()->toGlyph('fa-chevron-right').''; + '.LAN_GO." ".e107::getParser()->toGlyph('fa-chevron-right').''; $menuButtonLabel = defset("MENLAN_59", "Area [x]"); diff --git a/e107_admin/message.php b/e107_admin/message.php index bdc99aa9c..d381fc2a0 100644 --- a/e107_admin/message.php +++ b/e107_admin/message.php @@ -77,13 +77,13 @@ if($amount = $sql -> db_Select("generic", "*", $queryString)) ".MESSLAN_9.": ".$gen->convert_date($gen_datestamp, 'long')."
".MESSLAN_10.": $user
".MESSLAN_13.": $link ". -($gen_chardata ? "
".MESSLAN_12.": $gen_chardata" : "")."
+($gen_chardata ? "
".MESSLAN_12.": $gen_chardata" : "")."
\n\n"; } $text .= " -
+
".MESSLAN_5." diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index 7520027a5..80d34345a 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -382,7 +382,7 @@ class news_sub_form_ui extends e_admin_form_ui // $text .= ""; - $text = "".ADMIN_VIEW_ICON.""; + $text = "".ADMIN_VIEW_ICON.""; @@ -390,7 +390,7 @@ class news_sub_form_ui extends e_admin_form_ui if($approved == 0) { //$text = $this->submit_image('submitnews['.$id.']', 1, 'execute', NWSLAN_58); - $text .= "".ADMIN_EXECUTE_ICON.""; + $text .= "".ADMIN_EXECUTE_ICON.""; // NWSLAN_103; } else // Already submitted; @@ -398,7 +398,7 @@ class news_sub_form_ui extends e_admin_form_ui } - $text .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'btn btn-default btn-large action delete')); + $text .= $this->submit_image('etrigger_delete['.$id.']', $id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'btn btn-default btn-secondary btn-large action delete')); $text .= "
"; return $text; } diff --git a/e107_admin/search.php b/e107_admin/search.php index d2e0697a9..d40d84143 100644 --- a/e107_admin/search.php +++ b/e107_admin/search.php @@ -394,7 +394,7 @@ else - ".ADMIN_EDIT_ICON." + ".ADMIN_EDIT_ICON." "; @@ -448,7 +448,7 @@ else - ".ADMIN_EDIT_ICON." + ".ADMIN_EDIT_ICON." "; diff --git a/e107_admin/theme.php b/e107_admin/theme.php index 89fb5dea2..cb52833b4 100644 --- a/e107_admin/theme.php +++ b/e107_admin/theme.php @@ -873,11 +873,11 @@ class theme_admin_form_ui extends e_admin_form_ui $infoPath = e_SELF."?mode=".$_GET['mode']."&id=".$theme['path']."&action=info&iframe=1"; $previewPath = $tp->replaceConstants($theme['thumbnail'],'abs'); - $main_icon = ($pref['sitetheme'] != $theme['path']) ? "" : ""; - $info_icon = "".$tp->toGlyph('fa-info-circle',array('size'=>'2x')).""; + $main_icon = ($pref['sitetheme'] != $theme['path']) ? "" : ""; + $info_icon = "".$tp->toGlyph('fa-info-circle',array('size'=>'2x')).""; // $admin_icon = ($pref['admintheme'] != $theme['path'] ) ? "" : ""; - $preview_icon = "".$tp->toGlyph('fa-search',array('size'=>'2x')).""; + $preview_icon = "".$tp->toGlyph('fa-search',array('size'=>'2x')).""; return $main_icon.$info_icon.$preview_icon; } @@ -913,9 +913,9 @@ class theme_admin_form_ui extends e_admin_form_ui // $viewUrl = $theme['url']; $modalCaption = (empty($theme['price'])) ? ' '.LAN_DOWNLOADING.' '.$theme['name']." ".$theme['version'] :' '.LAN_PURCHASE.' '.$theme['name']." ".$theme['version']; - $main_icon = "".$tp->toGlyph('download',array('size'=>'2x')).""; + $main_icon = "".$tp->toGlyph('download',array('size'=>'2x')).""; - $info_icon = "".$tp->toGlyph('fa-info-circle',array('size'=>'2x')).""; + $info_icon = "".$tp->toGlyph('fa-info-circle',array('size'=>'2x')).""; if(!empty($theme['preview'][0])) { @@ -926,7 +926,7 @@ class theme_admin_form_ui extends e_admin_form_ui $previewPath = $theme['livedemo']; } - $preview_icon = "".$tp->toGlyph('fa-search',array('size'=>'2x')).""; + $preview_icon = "".$tp->toGlyph('fa-search',array('size'=>'2x')).""; } return $main_icon.$info_icon.$preview_icon; diff --git a/e107_admin/upload.php b/e107_admin/upload.php index eed1363a8..0b854bfd1 100644 --- a/e107_admin/upload.php +++ b/e107_admin/upload.php @@ -740,7 +740,7 @@ switch ($action) $text .= " - + diff --git a/e107_admin/users.php b/e107_admin/users.php index 3792f1a1f..f9075f492 100644 --- a/e107_admin/users.php +++ b/e107_admin/users.php @@ -1647,7 +1647,7 @@ class users_admin_ui extends e_admin_ui ".USRLAN_120." - ".USRLAN_120." + ".USRLAN_120."
{$temp}
@@ -1660,7 +1660,7 @@ class users_admin_ui extends e_admin_ui ".USRLAN_35." - ".USRLAN_243." + ".USRLAN_243."
"; @@ -2319,10 +2319,10 @@ class users_admin_ui extends e_admin_ui { // Option to delete emails - only if there are some in the list $text .= " - \n - \n - \n - \n + \n + \n + \n + \n "; } $text .= "
"; @@ -2751,7 +2751,7 @@ class users_admin_form_ui extends e_admin_form_ui $btn = '
- diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php index 2f4cc85ab..38e37a58f 100755 --- a/e107_admin/users_extended.php +++ b/e107_admin/users_extended.php @@ -2111,7 +2111,7 @@ class users_ext ".ADMIN_EDIT_ICON." - +
diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php index 21fa34faf..ca7859bee 100644 --- a/e107_core/shortcodes/batch/admin_shortcodes.php +++ b/e107_core/shortcodes/batch/admin_shortcodes.php @@ -101,7 +101,7 @@ class admin_shortcodes if (!ADMIN) { return ''; } return "
- +
"; } @@ -339,7 +339,7 @@ class admin_shortcodes { $text .= $sql->mySQLlanguage; $text .= " (".$slng->convert($sql->mySQLlanguage).") - :   ".count($aff)." ".UTHEME_MENU_L3."  
+ :   ".count($aff)." ".UTHEME_MENU_L3."  
- + "; @@ -725,7 +725,7 @@ class forum_post_handler
- ".LAN_CANCEL." + ".LAN_CANCEL."
@@ -843,7 +843,7 @@ class forum_post_handler
- ".LAN_CANCEL." + ".LAN_CANCEL."
@@ -955,7 +955,7 @@ class forum_post_handler -
+
"; diff --git a/e107_plugins/forum/forum_uploads.php b/e107_plugins/forum/forum_uploads.php index 0fed72252..6a081ae2a 100644 --- a/e107_plugins/forum/forum_uploads.php +++ b/e107_plugins/forum/forum_uploads.php @@ -103,7 +103,7 @@ if(is_array($fileList)) } else { - $txt .= "".LAN_FORUM_7008." "; + $txt .= "".LAN_FORUM_7008." "; } $txt .= ""; } diff --git a/e107_plugins/forum/forum_viewforum.php b/e107_plugins/forum/forum_viewforum.php index e3265c4ba..bb27e9138 100644 --- a/e107_plugins/forum/forum_viewforum.php +++ b/e107_plugins/forum/forum_viewforum.php @@ -972,7 +972,7 @@ function forumjump() { $text .= "\n"; } - $text .= " "; + $text .= " "; return $text; } @@ -984,7 +984,7 @@ function fadminoptions($thread_info) $tp = e107::getParser(); // $text = "
"; - $text = '
    diff --git a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php index 8bbe2550b..bde56098d 100644 --- a/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/forum_shortcodes.php @@ -181,7 +181,7 @@ class forum_shortcodes extends e_shortcode - +
diff --git a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php index e2238ee55..58e918af1 100644 --- a/e107_plugins/forum/shortcodes/batch/post_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/post_shortcodes.php @@ -67,7 +67,7 @@ class plugin_forum_post_shortcodes extends e_shortcode { $text .= "\n"; } - $text .= "

"; + $text .= "

"; return $text; @@ -184,7 +184,7 @@ class plugin_forum_post_shortcodes extends e_shortcode function sc_forum_post_buttons() { - $ret = " "; + $ret = " "; if($this->var['action'] == 'edit') { diff --git a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php index 442d70cdf..c2fa7559f 100644 --- a/e107_plugins/forum/shortcodes/batch/view_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/view_shortcodes.php @@ -782,8 +782,8 @@ // e_HTTP.'user.php?id.'.$this->postInfo['post_user'] $text = '
- ' . $username . ' -
    @@ -831,7 +831,7 @@ // {EMAILITEM} {PRINTITEM} {REPORTIMG}{EDITIMG}{QUOTEIMG} $text = '
    - @@ -930,11 +930,11 @@ if($prev !== false) { - $options[] = "« " . LAN_FORUM_2001 . ""; + $options[] = "« " . LAN_FORUM_2001 . ""; } if($next !== false) { - $options[] = "" . LAN_FORUM_2002 . " »"; + $options[] = "" . LAN_FORUM_2002 . " »"; } //---- $tVars->NEXTPREV = implode(" | ", $options); @@ -1167,7 +1167,7 @@ { $text .= "\n"; } - $text .= "

    "; + $text .= "

    "; return $text; } diff --git a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php index 41b952369..a4fd1f883 100644 --- a/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php +++ b/e107_plugins/forum/shortcodes/batch/viewforum_shortcodes.php @@ -289,7 +289,7 @@

    - +

    @@ -337,7 +337,7 @@ { $text .= "\n"; } - $text .= "
    "; + $text .= " "; return $text; } diff --git a/e107_plugins/gallery/includes/gallery_load.php b/e107_plugins/gallery/includes/gallery_load.php index 9523ee241..6278c5f6b 100644 --- a/e107_plugins/gallery/includes/gallery_load.php +++ b/e107_plugins/gallery/includes/gallery_load.php @@ -66,7 +66,7 @@ function gallery_load_prettyphoto() // @lonalore FIXME Stop loading this on ever if(vartrue($plugPref['downloadable'], false)) { $settings['prettyphoto']['image_markup'] .= ''; - $settings['prettyphoto']['image_markup'] .= '' . LAN_DOWNLOAD . ''; + $settings['prettyphoto']['image_markup'] .= '' . LAN_DOWNLOAD . ''; $settings['prettyphoto']['image_markup'] .= ''; } diff --git a/e107_plugins/gallery/templates/gallery_template.php b/e107_plugins/gallery/templates/gallery_template.php index b671b4309..1ed010617 100644 --- a/e107_plugins/gallery/templates/gallery_template.php +++ b/e107_plugins/gallery/templates/gallery_template.php @@ -66,7 +66,7 @@ $GALLERY_TEMPLATE['slideshow_wrapper'] = '
    - + ' . LAN_NEXT . ' {GLYPH=fa-chevron-right} diff --git a/e107_plugins/gsitemap/admin_config.php b/e107_plugins/gsitemap/admin_config.php index 096f805b1..03193da0d 100644 --- a/e107_plugins/gsitemap/admin_config.php +++ b/e107_plugins/gsitemap/admin_config.php @@ -165,7 +165,7 @@ class gsitemap
    - +
    diff --git a/e107_plugins/login_menu/login_menu_shortcodes.php b/e107_plugins/login_menu/login_menu_shortcodes.php index 1c0ccedc5..84c51932a 100755 --- a/e107_plugins/login_menu/login_menu_shortcodes.php +++ b/e107_plugins/login_menu/login_menu_shortcodes.php @@ -156,7 +156,7 @@ e107::getLanguage()->bcDefs($bcDefs); function sc_lm_loginbutton($parm='') { - return ""; + return ""; } function sc_lm_rememberme($parm='') diff --git a/e107_plugins/news/news_months_menu.php b/e107_plugins/news/news_months_menu.php index 22b4b6e41..0f2f93e11 100644 --- a/e107_plugins/news/news_months_menu.php +++ b/e107_plugins/news/news_months_menu.php @@ -129,7 +129,7 @@ if(false === $cached) { if(!$parms['showarchive']) { - $footer = '
    '.BLOGCAL_L2.'
    '; + $footer = '
    '.BLOGCAL_L2.'
    '; $ns->setContent('footer', $footer); $cached .= $footer; diff --git a/e107_plugins/newsletter/admin_config.php b/e107_plugins/newsletter/admin_config.php index 41338bb41..83954b197 100644 --- a/e107_plugins/newsletter/admin_config.php +++ b/e107_plugins/newsletter/admin_config.php @@ -151,8 +151,8 @@ class newsletter ".$data['newsletter_title']." ".((substr_count($data['newsletter_subscribers'], chr(1))!= 0)?"".substr_count($data['newsletter_subscribers'], chr(1))."":substr_count($data['newsletter_subscribers'], chr(1)))." - ".ADMIN_EDIT_ICON." - toJS(LAN_CONFIRMDEL." [ID: ".$data['newsletter_id']." ]")."') \"/> + ".ADMIN_EDIT_ICON." + toJS(LAN_CONFIRMDEL." [ID: ".$data['newsletter_id']." ]")."') \"/> @@ -200,7 +200,7 @@ class newsletter ".$data['newsletter_id']." ".$data['newsletter_issue']." [ ".$data['newsletter_parent']." ] ".$data['newsletter_title']." - ".($data['newsletter_flag'] ? LAN_YES : "toJS(NLLAN_18)."') \" />")." + ".($data['newsletter_flag'] ? LAN_YES : "toJS(NLLAN_18)."') \" />")." ".ADMIN_EDIT_ICON."toJS(NLLAN_19." [ID: ".$data['newsletter_id']." ]")."') \"/> @@ -611,7 +611,7 @@ class newsletter { $mes->addError(NLLAN_56); $vs_text .= "
    - +
    "; $ns -> tablerender(NLLAN_65.' '.$p_id, $mes->render() . $vs_text); return; diff --git a/e107_plugins/newsletter/newsletter_legacy_menu.php b/e107_plugins/newsletter/newsletter_legacy_menu.php index 9cc57b11b..8f10bc191 100644 --- a/e107_plugins/newsletter/newsletter_legacy_menu.php +++ b/e107_plugins/newsletter/newsletter_legacy_menu.php @@ -84,13 +84,13 @@ foreach($newsletterArray as $nl) if(preg_match("#".chr(1).USERID."(".chr(1)."|$)#si", $nl['newsletter_subscribers'])) { $text .= NLLAN_48."

    - toJS(NLLAN_49)."') \" /> + toJS(NLLAN_49)."') \" /> "; } else { $text .= NLLAN_50." ".USEREMAIL.")

    - toJS(NLLAN_53)."') \" /> + toJS(NLLAN_53)."') \" /> "; } $nl_count = $sql->count('newsletter', "(*)", "WHERE newsletter_parent='".$nl['newsletter_id']."' AND newsletter_flag='1'"); diff --git a/e107_plugins/newsletter/nl_archive.php b/e107_plugins/newsletter/nl_archive.php index c258d8042..0c1a08389 100644 --- a/e107_plugins/newsletter/nl_archive.php +++ b/e107_plugins/newsletter/nl_archive.php @@ -94,7 +94,7 @@ else if($limit_start + $page_size < $nl_count) { $text .= "
    -
    +
    "; } } @@ -116,7 +116,7 @@ else // Display parent footer $text .= "$parent_newsletter_footer
    "; // Display back to newsletter overview button - $text .= "
    "; + $text .= "
    "; } else { diff --git a/e107_plugins/page/page_navigation_menu.php b/e107_plugins/page/page_navigation_menu.php index 42c52ade9..7a808088d 100644 --- a/e107_plugins/page/page_navigation_menu.php +++ b/e107_plugins/page/page_navigation_menu.php @@ -72,7 +72,7 @@ $text = $pg->sc_page_navigation($parm); if($expandable) { e107::js('page','js/jquery.page.navigation.js','jquery'); - $template['caption'] .= "+-"; + $template['caption'] .= "+-"; } diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php index 09b2525a7..a75b13709 100644 --- a/e107_plugins/pm/pm_shortcodes.php +++ b/e107_plugins/pm/pm_shortcodes.php @@ -556,7 +556,7 @@ if(!class_exists('plugin_pm_pm_shortcodes')) { $icon = (deftrue('FONTAWESOME')) ? e107::getParser()->toGlyph('fa-user-plus','fw=1') : "".LAN_PM_51.""; - return "".$icon.""; + return "".$icon.""; } else { @@ -721,7 +721,7 @@ if(!class_exists('plugin_pm_pm_shortcodes')) public function sc_pm_delete_blocked_selected() { - return ""; + return ""; } diff --git a/e107_plugins/poll/admin_config.php b/e107_plugins/poll/admin_config.php index 8edb61cac..1d21aa452 100644 --- a/e107_plugins/poll/admin_config.php +++ b/e107_plugins/poll/admin_config.php @@ -210,8 +210,8 @@ function poll_list() $text .= " - - + + "; } diff --git a/e107_plugins/poll/poll_class.php b/e107_plugins/poll/poll_class.php index 20012d805..8cdb5d6fc 100644 --- a/e107_plugins/poll/poll_class.php +++ b/e107_plugins/poll/poll_class.php @@ -769,7 +769,7 @@ class poll $text .="
    -
    +
    @@ -1057,7 +1057,7 @@ class poll_shortcodes extends e_shortcode if (('preview' == $this->pollType || $this->pollPreview == true) && strpos(e_REQUEST_SELF, "forum") === false) { - return ""; + return ""; } return ""; diff --git a/e107_plugins/search_menu/search_menu.php b/e107_plugins/search_menu/search_menu.php index a4e86d441..7398bb6d0 100644 --- a/e107_plugins/search_menu/search_menu.php +++ b/e107_plugins/search_menu/search_menu.php @@ -52,7 +52,7 @@ if (isset($custom_query[1]) && $custom_query[1] != '') } else { - $search_button = ""; + $search_button = ""; } if (isset($custom_query[5]) && $custom_query[5]) { diff --git a/e107_plugins/social/e_shortcode.php b/e107_plugins/social/e_shortcode.php index 6986fda97..03e3128c8 100644 --- a/e107_plugins/social/e_shortcode.php +++ b/e107_plugins/social/e_shortcode.php @@ -304,7 +304,7 @@ class social_shortcodes extends e_shortcode $twitterAccount = basename(XURL_TWITTER); - $btnClass = varset($parm['btnClass'], 'btn btn-default social-share'); + $btnClass = varset($parm['btnClass'], 'btn btn-default btn-secondary social-share'); // return print_a($hashtags,true); foreach($providers as $k=>$val) @@ -373,7 +373,7 @@ class social_shortcodes extends e_shortcode $text = '"; + $text .= "
"; } $ns->tablerender(TRACKBACK_L13, $text); diff --git a/e107_plugins/user/userlanguage_menu.php b/e107_plugins/user/userlanguage_menu.php index e68be38bf..9df11d3ba 100644 --- a/e107_plugins/user/userlanguage_menu.php +++ b/e107_plugins/user/userlanguage_menu.php @@ -58,7 +58,7 @@ else

- '; + '; $text .= ' '; diff --git a/e107_plugins/user/usertheme_menu.php b/e107_plugins/user/usertheme_menu.php index c8bb06c72..41577547a 100644 --- a/e107_plugins/user/usertheme_menu.php +++ b/e107_plugins/user/usertheme_menu.php @@ -68,7 +68,7 @@ if ((USER == TRUE) && check_class(varset($pref['allow_theme_select'],FALSE))) } $text .= "

- + "; $ns->tablerender(LAN_UMENU_THEME_2, $text, 'usertheme'); diff --git a/e107_themes/bootstrap3/theme_config.php b/e107_themes/bootstrap3/theme_config.php index 556ffcd2f..f630fcc3b 100644 --- a/e107_themes/bootstrap3/theme_config.php +++ b/e107_themes/bootstrap3/theme_config.php @@ -33,7 +33,7 @@ class theme_config implements e_theme_config ); - $previewLink = " ".LAN_PREVIEW.""; + $previewLink = " ".LAN_PREVIEW.""; $fields = array( 'branding' => array('title'=>LAN_THEMEPREF_00, 'type'=>'dropdown', 'writeParms'=>array('optArray'=> $brandingOpts)), diff --git a/e107_themes/bootstrap3/theme_shortcodes.php b/e107_themes/bootstrap3/theme_shortcodes.php index ea81b954f..a1d7aa848 100644 --- a/e107_themes/bootstrap3/theme_shortcodes.php +++ b/e107_themes/bootstrap3/theme_shortcodes.php @@ -155,8 +155,8 @@ class theme_shortcodes extends e_shortcode $text .= ' - '.LAN_LOGINMENU_4.' - '.LAN_LOGINMENU_40.' + '.LAN_LOGINMENU_4.' + '.LAN_LOGINMENU_40.' '; diff --git a/e107_themes/landingzero/templates/gallery/gallery_template.php b/e107_themes/landingzero/templates/gallery/gallery_template.php index b63a03863..d1bf4dead 100644 --- a/e107_themes/landingzero/templates/gallery/gallery_template.php +++ b/e107_themes/landingzero/templates/gallery/gallery_template.php @@ -24,7 +24,7 @@ $GALLERY_TEMPLATE['slideshow_wrapper'] = '
- + ' . LAN_NEXT . ' {GLYPH=fa-chevron-right} diff --git a/e107_themes/landingzero/templates/menu_template.php b/e107_themes/landingzero/templates/menu_template.php index e37bc5feb..760ecbbc3 100644 --- a/e107_themes/landingzero/templates/menu_template.php +++ b/e107_themes/landingzero/templates/menu_template.php @@ -46,7 +46,7 @@

{CMENUTITLE}


{CMENUBODY}

- {CMENUTEXT} + {CMENUTEXT}
'; $MENU_TEMPLATE['sectionone']['end'] = ''; @@ -93,7 +93,7 @@ $MENU_TEMPLATE['call-to-action']['body'] = '

{CMENUTITLE}

- {CMENUTEXT} + {CMENUTEXT}

diff --git a/e107_themes/landingzero/theme_shortcodes.php b/e107_themes/landingzero/theme_shortcodes.php index 0cc5f1da6..924404f53 100644 --- a/e107_themes/landingzero/theme_shortcodes.php +++ b/e107_themes/landingzero/theme_shortcodes.php @@ -308,8 +308,8 @@ class theme_shortcodes extends e_shortcode $text .= ' - '.LAN_LOGINMENU_4.' - '.LAN_LOGINMENU_40.' + '.LAN_LOGINMENU_4.' + '.LAN_LOGINMENU_40.' '; diff --git a/e107_themes/voux/theme_shortcodes.php b/e107_themes/voux/theme_shortcodes.php index 1a723dc2f..24930dd72 100644 --- a/e107_themes/voux/theme_shortcodes.php +++ b/e107_themes/voux/theme_shortcodes.php @@ -169,8 +169,8 @@ class theme_shortcodes extends e_shortcode $text .= ' - '.LAN_LOGINMENU_4.' - '.LAN_LOGINMENU_40.' + '.LAN_LOGINMENU_4.' + '.LAN_LOGINMENU_40.' '; diff --git a/e107_web/utilities/dbgen.php b/e107_web/utilities/dbgen.php index a56cbe495..dc649eedd 100644 --- a/e107_web/utilities/dbgen.php +++ b/e107_web/utilities/dbgen.php @@ -189,7 +189,7 @@ $text .= " $text .= " - + "; diff --git a/e107_web/utilities/passcalc.php b/e107_web/utilities/passcalc.php index 4d582b36d..a9b8271b3 100644 --- a/e107_web/utilities/passcalc.php +++ b/e107_web/utilities/passcalc.php @@ -107,7 +107,7 @@ if (isset($_POST['show_password'])) $text .= " - + "; diff --git a/e107_web/utilities/passconv.php b/e107_web/utilities/passconv.php index e566ae5b6..6b9b394f5 100644 --- a/e107_web/utilities/passconv.php +++ b/e107_web/utilities/passconv.php @@ -277,7 +277,7 @@ $text = $text .= " - + "; diff --git a/e107_web/utilities/resetcore.php b/e107_web/utilities/resetcore.php index e43cf0332..be6e021e6 100644 --- a/e107_web/utilities/resetcore.php +++ b/e107_web/utilities/resetcore.php @@ -278,7 +278,7 @@ if (isset($_POST['reset_core_sub']) && $_POST['mode'] == 1) } echo " -
+
@@ -318,7 +318,7 @@ echo "
- + diff --git a/email.php b/email.php index 6cde64263..79ae46dce 100644 --- a/email.php +++ b/email.php @@ -229,7 +229,7 @@ $text .= " - + diff --git a/install.php b/install.php index b8f545932..5a0e42e9f 100644 --- a/install.php +++ b/install.php @@ -332,7 +332,7 @@ class e_install { // $this->form .= "« ".LAN_BACK." "; $prevStage = ($this->stage - 1); - $e_forms->form .= " "; + $e_forms->form .= " "; } if($id != 'back') { diff --git a/search.php b/search.php index a4502fddf..00572b115 100644 --- a/search.php +++ b/search.php @@ -202,7 +202,7 @@ class search extends e_shortcode { if($this->search_prefs['selector'] == 1) { - return ""; + return ""; } } @@ -210,7 +210,7 @@ class search extends e_shortcode { if($this->search_prefs['selector'] == 1) { - return ""; + return ""; } } diff --git a/userposts.php b/userposts.php index 2152f6f9e..7613d4b26 100644 --- a/userposts.php +++ b/userposts.php @@ -258,8 +258,8 @@ elseif ($action == 'forums') if($vars->NEXTPREV) $vars->NEXTPREV = str_replace('{USERPOSTS_NEXTPREV}', $vars->NEXTPREV, $USERPOSTS_TEMPLATE['np_table']); $vars->USERPOSTS_FORUM_SEARCH_VALUE = htmlspecialchars($_POST['f_query'], ENT_QUOTES, CHARSET); $vars->USERPOSTS_FORUM_SEARCH_FIELD = ""; - $vars->USERPOSTS_FORUM_SEARCH_BUTTON = ""; - $vars->USERPOSTS_FORUM_SEARCH = " "; + $vars->USERPOSTS_FORUM_SEARCH_BUTTON = ""; + $vars->USERPOSTS_FORUM_SEARCH = " "; // $userposts_forum_table_start = preg_replace("/\{(.*?)\}/e", '$\1', $USERPOSTS_FORUM_TABLE_START); $userposts_forum_table_start = $tp->simpleParse($USERPOSTS_TEMPLATE['forum_table_start'], $vars);