Changeset 9

Timestamp:

Sep 11, 2005 9:58:14 PM (19 years ago)

Author:

scdev

Message:

updated DB.inc.php so SET NAMES query is only used on MySQL versions > 4.1

Location:

trunk/lib

Files:

• DB.inc.php (modified) (1 diff)
• Utilities.inc.php (modified) (1 diff)

trunk/lib/DB.inc.php

@@ -160 +160 @@
         $this->_connected = true;
 
-        // Set the character set used for communicating with MySQL.
-        $this->query("SET NAMES '" . $this->mysql_character_sets[strtolower(App::getParam('character_set'))] . "'");
+        // Tell MySQL what character set we're useing.
+        if (preg_match('/^4\.[1-9].*$|^5.*$/', mysql_get_server_info())) {
+            $this->query("SET NAMES '" . $this->mysql_character_sets[strtolower(App::getParam('character_set'))] . "'");
+        }
         
         return true;

trunk/lib/Utilities.inc.php

@@ -187 +187 @@
     }
     return $output;
+}
+
+/**
+ * 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);
 }