Changeset 5 for trunk/bb-includes/formatting-functions.php

Timestamp:

12/27/2004 11:22:22 AM (22 years ago)

Author:

matt

Message:

Login, logout, sanitize everything, be fast.

File:

• trunk/bb-includes/formatting-functions.php (modified) (4 diffs)

trunk/bb-includes/formatting-functions.php

@@ -18 +18 @@
 }
 
-function bb_autop($pee, $br = 1) {
+function bb_autop($pee, $br = 1) { // Reduced to be faster
         $pee = $pee . "\n"; // just to make things a little easier, pad the end
         $pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee);
         // Space things out a little
-        $pee = preg_replace('!(<(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|math|p|h[1-6])[^>]*>)!', "\n$1", $pee); 
-        $pee = preg_replace('!(</(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|math|p|h[1-6])>)!', "$1\n", $pee);
+        $pee = preg_replace('!(<(?:ul|ol|li|pre|blockquote|p|h[1-6])[^>]*>)!', "\n$1", $pee); 
+        $pee = preg_replace('!(</(?:ul|ol|li|pre|blockquote|p|h[1-6])>)!', "$1\n", $pee);
         $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines 
         $pee = preg_replace("/\n\n+/", "\n\n", $pee); // take care of duplicates
         $pee = preg_replace('/\n?(.+?)(?:\n\s*\n|\z)/s', "\t<p>$1</p>\n", $pee); // make paragraphs, including one at the end 
         $pee = preg_replace('|<p>\s*?</p>|', '', $pee); // under certain strange conditions it could create a P of entirely whitespace 
-    $pee = preg_replace('!<p>\s*(</?(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|hr|pre|select|form|blockquote|math|p|h[1-6])[^>]*>)\s*</p>!', "$1", $pee); // don't pee all over a tag
+    $pee = preg_replace('!<p>\s*(</?(?:ul|ol|li|pre|blockquote|p|h[1-6])[^>]*>)\s*</p>!', "$1", $pee); // don't pee all over a tag
         $pee = preg_replace("|<p>(<li.+?)</p>|", "$1", $pee); // problem with nested lists
         $pee = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $pee);
         $pee = str_replace('</blockquote></p>', '</p></blockquote>', $pee);
-        $pee = preg_replace('!<p>\s*(</?(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|hr|pre|select|form|blockquote|math|p|h[1-6])[^>]*>)!', "$1", $pee);
-        $pee = preg_replace('!(</?(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|math|p|h[1-6])[^>]*>)\s*</p>!', "$1", $pee); 
+        $pee = preg_replace('!<p>\s*(</?(?:ul|ol|li|pre|blockquote|p|h[1-6])[^>]*>)!', "$1", $pee);
+        $pee = preg_replace('!(</?(?:ul|ol|li|pre|blockquote|p|h[1-6])[^>]*>)\s*</p>!', "$1", $pee); 
         if ($br) $pee = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee); // optionally make line breaks
-        $pee = preg_replace('!(</?(?:table|thead|tfoot|caption|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|blockquote|math|p|h[1-6])[^>]*>)\s*<br />!', "$1", $pee);
+        $pee = preg_replace('!(</?(?:ul|ol|li|pre|blockquote|p|h[1-6])[^>]*>)\s*<br />!', "$1", $pee);
         $pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)!', '$1', $pee);
         $pee = preg_replace('!(<pre.*?>)(.*?)</pre>!ise', " stripslashes('$1') .  clean_pre('$2')  . '</pre>' ", $pee);
@@ -42 +42 @@
 }
 function encodeit($text) {
-        $text = stripslashes($text);
-        $text = preg_replace("|\n+|", "\n", $text);
-        $text = nl2br($text);
-        return $text;
+        $text = stripslashes($text); // because it's a regex callback
+        $text = htmlspecialchars($text, ENT_QUOTES);
+        $text = preg_replace("|\n+|", "\n", $text);
+        $text = nl2br($text);
+        return $text;
 }
 
@@ -61 +62 @@
         $text = preg_replace('|&lt;(/?ul)&gt;|', '<$1>', $text);
         $text = preg_replace('|&lt;(/?li)&gt;|', '<$1>', $text);
-        $text = preg_replace('|&lt;(/?blockquote)&gt;|', '<$1>', $text);
+        $text = preg_replace('|&lt;(/?blockquote.*?)&gt;|', '<$1>', $text);
         $text = preg_replace('|&lt;(/?code)&gt;|', '<$1>', $text);
+
+        $text = preg_replace("|`(.*?)`|se", "'<code>' . encodeit('$1') . '</code>'", $text);
+
         return $text;
 }
 
-function wp_filter_kses($data) {
+function bb_filter_kses($data) {
         $allowedtags = array(
                 'a' => array(
@@ -86 +90 @@
         return wp_kses($data, $allowedtags);
 }
+
+function user_sanitize( $text ) {
+    $text = preg_replace('/[^a-z0-9_-]/i', '', $text);
+        return $text;
+}
 ?>