Changeset 103 for trunk/lib/Utilities.inc.php

Timestamp:

Apr 19, 2006 3:14:28 AM (18 years ago)

Author:

scdev

Message:

Q - Cleaned up Auth_File to work more like Auth_SQL, and fixed a few bugs here and there.

File:

• trunk/lib/Utilities.inc.php (modified) (2 diffs)

trunk/lib/Utilities.inc.php

@@ -104 +104 @@
 
 /**
- * Returns text with stylistic modifications.
+ * Returns text with stylistic modifications. Warning: this will break some HTML attibutes!
+ * FIXME: Allow a string such as this to be passted: <a href="javascript:openPopup('/foo/bar.php')">Click here</a>
  *
  * @param  string   $txt  Text to clean.
@@ -111 +112 @@
 function fancyTxt($txt)
 {
-    return $txt; /// FIXME.
-    
-//     $search = array();
-//     $replace = array();
-// 
-//     // "double quoted text"  becomes  &ldquo;double quoted text&rdquo;
-//     $search['double_quotes']    = '/(^|[^\w=])(?:"|&quot;|&#34;|&#x22;|&ldquo;)([^"]+?)(?:"|&quot;|&#34;|&#x22;|&rdquo;)([^\w]|$)/'; // " is the same as &quot; and &#34; and &#x22;
-//     $replace['double_quotes']   = '\\1&ldquo;\\2&rdquo;\\3';
-// 
-//     // text's apostrophes  become  text&rsquo;s apostrophes
-//     $search['apostrophe']       = '/(\w)(?:\'|&#39;|&#039;)(\w)/';
-//     $replace['apostrophe']      = '\\1&rsquo;\\2';
-// 
-//     // 'single quoted text'  becomes  &lsquo;single quoted text&rsquo;
-//     $search['single_quotes']    = '/(^|[^\w=])(?:\'|&#39;|&lsquo;)([^\']+?)(?:\'|&#39;|&rsquo;)([^\w]|$)/';
-//     $replace['single_quotes']   = '\\1&lsquo;\\2&rsquo;\\3';
-// 
-//     // em--dashes  become em&mdash;dashes
-//     $search['em_dash']          = '/(\s*[^!<-])--([^>-]\s*)/';
-//     $replace['em_dash']         = '\\1&mdash;\\2';
-// 
-//     return preg_replace($search, $replace, $txt);
+    $search = array();
+    $replace = array();
+
+    // "double quoted text"  becomes  &ldquo;double quoted text&rdquo;
+    $search['double_quotes']    = '/(^|[^\w=])(?:"|&quot;|&#34;|&#x22;|&ldquo;)([^"]+?)(?:"|&quot;|&#34;|&#x22;|&rdquo;)([^\w]|$)/ms'; // " is the same as &quot; and &#34; and &#x22;
+    $replace['double_quotes']   = '$1&ldquo;$2&rdquo;$3';
+
+    // text's apostrophes  become  text&rsquo;s apostrophes
+    $search['apostrophe']       = '/(\w)(?:\'|&#39;|&#039;)(\w)/ms';
+    $replace['apostrophe']      = '$1&rsquo;$2';
+
+    // 'single quoted text'  becomes  &lsquo;single quoted text&rsquo;
+    $search['single_quotes']    = '/(^|[^\w=])(?:\'|&#39;|&lsquo;)([^\']+?)(?:\'|&#39;|&rsquo;)([^\w]|$)/ms';
+    $replace['single_quotes']   = '$1&lsquo;$2&rsquo;$3';
+
+    // plural posessives' apostrophes become posessives&rsquo;
+    $search['apostrophes']      = '/(s)(?:\'|&#39;|&#039;)(\s)/ms';
+    $replace['apostrophes']     = '$1&rsquo;$2';
+
+    // em--dashes  become em&mdash;dashes
+    $search['em_dash']          = '/(\s*[^!<-])--([^>-]\s*)/';
+    $replace['em_dash']         = '$1&mdash;$2';
+
+    return preg_replace($search, $replace, $txt);
 }