mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Remove eregi calls

Browse Source
This commit is contained in:
Garvin Hicking 2009-08-21 12:22:35 +00:00
parent a8d211724c
commit d059fffdda
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/functions_entries_admin.inc.php
View File

@ -30,7 +30,7 @@ if (!defined('S9Y_FRAMEWORK_TRACKBACKS')) {
function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = array(), $errMsg = "") {
global $serendipity;
$serendipity['EditorBrowsers'] = '(IE|Mozilla|Opera)';
$serendipity['EditorBrowsers'] = '@(IE|Mozilla|Opera)@i';
$draftD = '';
$draftP = '';
@ -155,7 +155,7 @@ function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = arr
$template_vars['show_wysiwyg'] = true;
}
if (eregi($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
if (preg_match($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
$template_vars['wysiwyg_advanced'] = true;
}
@ -378,7 +378,7 @@ function serendipity_printEntryForm($targetURL, $hiddens = array(), $entry = arr
<td align="right">
<?php
/* Since the user has WYSIWYG editor disabled, we want to check if we should use the "better" non-WYSIWYG editor */
if (!$serendipity['wysiwyg'] && eregi($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
if (!$serendipity['wysiwyg'] && preg_match($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
?>
<script type="text/javascript" language="JavaScript">
document.write('<input type="button" class="serendipityPrettyButton input_button" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms[\'serendipityEntry\'][\'serendipity[body]\'],\'<em>\',\'</em>\')" />');
@ -448,7 +448,7 @@ if (!$serendipity['wysiwyg']) {
<div id="tools_extended" style="display: none">
<?php
/* Since the user has WYSIWYG editor disabled, we want to check if we should use the "better" non-WYSIWYG editor */
if (eregi($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
if (preg_match($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
?>
<input type="button" class="serendipityPrettyButton input_button" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<em>','</em>')" />
<input type="button" class="serendipityPrettyButton input_button" name="insB" value="B" accesskey="b" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<strong>','</strong>')" />

2
plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php
View File

@ -60,7 +60,7 @@ class s9y_remoterss_XMLTree {
// Global replacements
// by: waldo@wh-e.com - trim space around tags not within
$data = eregi_replace('>[[:space:]]+<', '><', $data);
$data = preg_replace('@>[[:space:]]+<@', '><', $data);
// Flatten the input opml file to not have nested categories
$data = preg_replace('@<outline[^>]+[^/]>@imsU', '', $data);