Changeset 30 for tags/1.0.0/lib

Timestamp:

Dec 10, 2005 2:36:04 AM (19 years ago)

Author:

scdev

Message:

reverted some changes to make more compatible with old sites, using adm_ template nmes

Location:

tags/1.0.0/lib

Files:

• App.inc.php (modified) (4 diffs)
• Utilities.inc.php (modified) (1 diff)

tags/1.0.0/lib/App.inc.php

@@ -352 +352 @@
     }
 
-    $url = ohref($url, $carry_args, $always_include_sid);
+    $url = url($url, $carry_args, $always_include_sid);
     
     header(sprintf('Location: %s', $url));
@@ -459 +459 @@
  * @return string url with attached queries and, if not using cookies, the session id
  */
-function oHREF($url='', $carry_args=null, $always_include_sid=false)
+function url($url='', $carry_args=null, $always_include_sid=false)
 {
     static $_using_trans_sid;
@@ -509 +509 @@
     // Get the first delimiter that is needed in the url.
     $delim = preg_match('/\?/', $url) ? ini_get('arg_separator.output') : '?';
-    
+
     $q = '';
     if ($do_carry_queries) {
@@ -553 +553 @@
         $url .= $q . $delim . session_name() . '=' . session_id();
 //         logMsg(sprintf('oHREF appending session id to URL: %s', $url), LOG_DEBUG, __FILE__, __LINE__);
-        return $url;
     } else {
         $url .= $q;
-        return $url;
-    }
+    }
+
+    return $url;
+}
+
+/**
+ * Returns a URL processed with App::url and htmlentities for printing in html.
+ *
+ * @access  public
+ * @param   string  $url    Input URL to parse.
+ * @return  string          URL with App::url() and htmlentities() applied.
+ * @author  Quinn Comendant <quinn@strangecode.com>
+ * @since   09 Dec 2005 17:58:45
+ */
+function oHREF($url, $carry_args=null, $always_include_sid=false)
+{
+    $url = url($url, $carry_args, $always_include_sid);
+    // Replace any & not followed by an html or unicode entity with it's &amp; equivalent.
+    $url = preg_replace('/&(?![\w\d#]{1,10};)/', '&amp;', $url);
+    return $url;
 }
 

tags/1.0.0/lib/Utilities.inc.php

@@ -206 +206 @@
 
 /**
+ * Encodes an email into a user (at) domain (dot) com format.
+ *
+ * @access  public
+ * @param   string   $email   An email to encode.
+ * @param   string   $at      Replaces the @.
+ * @param   string   $dot     Replaces the ..
+ * @return  string   Encoded email.
+ */
+function encodeEmail($email, $at='-at-', $dot='-dot-')
+{
+    $search = array('/@/', '/\./');
+    $replace = array($at, $dot);
+    return preg_replace($search, $replace, $email);
+}
+
+/**
  * Return a human readable filesize.
  *