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

Timestamp:

Jan 9, 2006 11:22:24 AM (18 years ago)

Author:

scdev

Message:

${1}

File:

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

trunk/lib/Utilities.inc.php

@@ -113 +113 @@
     return $txt; /// FIXME.
     
-    $search = array();
-    $replace = array();
-
-    // "double quoted text"  becomes  “double quoted text”
-    $search['double_quotes']    = '/(^|[^\w=])(?:"|"|"|"|“)([^"]+?)(?:"|"|"|"|”)([^\w]|$)/'; // " is the same as " and " and "
-    $replace['double_quotes']   = '\\1“\\2”\\3';
-
-    // text's apostrophes  become  text’s apostrophes
-    $search['apostrophe']       = '/(\w)(?:\'|'|')(\w)/';
-    $replace['apostrophe']      = '\\1’\\2';
-
-    // 'single quoted text'  becomes  ‘single quoted text’
-    $search['single_quotes']    = '/(^|[^\w=])(?:\'|'|‘)([^\']+?)(?:\'|'|’)([^\w]|$)/';
-    $replace['single_quotes']   = '\\1‘\\2’\\3';
-
-    // em--dashes  become em—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]|$)/'; // " 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);
 }
 
@@ -471 +471 @@
  * If magic_quotes_gpc is in use, run stripslashes() on $var. If $var is an
  * array, stripslashes is run on each value, recursivly, and the stripped
- * array is returned
+ * array is returned.
  *
  * @param  mixed $var   The string or array to un-quote, if necessary.
@@ -518 +518 @@
     }
     if (isset($_POST[$var])) {
-        return trim(dispelMagicQuotes($_POST[$var]));
+        return dispelMagicQuotes($_POST[$var]);
     } else if (isset($_GET[$var])) {
-        return trim(dispelMagicQuotes($_GET[$var]));
+        return dispelMagicQuotes($_GET[$var]);
     } else {
         return $default;
@@ -528 +528 @@
 {
     if (is_null($var)) {
-        return trim(dispelMagicQuotes($_POST));
+        return dispelMagicQuotes($_POST);
     }
     if (isset($_POST[$var])) {
-        return trim(dispelMagicQuotes($_POST[$var]));
+        return dispelMagicQuotes($_POST[$var]);
     } else {
         return $default;
@@ -539 +539 @@
 {
     if (is_null($var)) {
-        return trim(dispelMagicQuotes($_GET));
+        return dispelMagicQuotes($_GET);
     }
     if (isset($_GET[$var])) {
-        return trim(dispelMagicQuotes($_GET[$var]));
+        return dispelMagicQuotes($_GET[$var]);
     } else {
         return $default;