Changeset 423 for branches/1.1dev

Timestamp:

Aug 13, 2013 11:52:52 PM (11 years ago)

Author:

anonymous

Message:

Backporting fixes to v1.1

Location:

branches/1.1dev

Files:

• config/boot.inc.php (modified) (2 diffs)
• lib/Utilities.inc.php (modified) (1 diff)

branches/1.1dev/config/boot.inc.php

@@ -76 +76 @@
     
     // Connect to MySQL
-    $dbh = mysql_connect('localhost', $CFG->username, $CFG->password);
-    
-    // Select database
-    mysql_select_db($CFG->database, $dbh);
+    if ($dbh = mysql_connect('localhost', $CFG->username, $CFG->password)) {
+        // Select database
+        mysql_select_db($CFG->database, $dbh);        
+    }
 
     // Connection errors.
@@ -109 +109 @@
             echo "<!-- --------------------------------------\n" . $debugqry . "\n-->";
         }
+        
+        // Ensure we have an active connection. 
+        // If we continue on a dead connection we might experience a "MySQL server has gone away" error.
+        // http://dev.mysql.com/doc/refman/5.0/en/gone-away.html
+        // Unfortunately we'll have redundant code with the reconnection below.
+        if (!mysql_ping($dbh)) {
+            logMsg(sprintf('MySQL ping failed; reconnecting
 ("%s")', truncate(trim($debugqry), 150)), LOG_NOTICE, __FILE__, __LINE__);
+            mysql_close($dbh);
+            if ($dbh = mysql_connect('localhost', $CFG->username, $CFG->password)) {
+                mysql_select_db($CFG->database, $dbh);        
+            }
+            if (!$dbh || mysql_error($dbh)) {
+                $mysql_error_msg = $dbh ? 'Codebase MySQL error: (' . mysql_errno($dbh) . ') ' . mysql_error($dbh) : 'Codebase MySQL error: Could not connect to server.';
+                if ($CFG->db_debug) {
+                    echo $mysql_error_msg . "\n";
+                } else {
+                    echo _("This page is temporarily unavailable. It should be back up in a few minutes.");
+                }
+                logMsg($mysql_error_msg, LOG_EMERG, __FILE__, __LINE__);
+                die;
+            }
+        }
+
         $qid = mysql_query($query, $dbh);
         if (!$qid || mysql_error($dbh)) {

branches/1.1dev/lib/Utilities.inc.php

@@ -154 +154 @@
  * @since   29 Mar 2006 13:48:49
  */
-function truncate($str, $len, $where='middle')
-{
+function truncate($str, $len, $where='end', $delim='
')
+{
+    if ($len <= 3 || mb_strlen($str) <= 3) {
+        return '';
+    }
     $part1 = floor(($len - 3) / 2);
     $part2 = ceil(($len - 3) / 2);
     switch ($where) {
     case 'start' :
-        return preg_replace(array(sprintf('/^.{4,}(.{%s})$/', $part1 + $part2), '/\s*\.{3,}\s*/'), array('...$1', '...'), $str);
+        return preg_replace(array(sprintf('/^.{4,}(.{%s})$/sU', $part1 + $part2), '/\s*\.{3,}\s*/sU'), array($delim . '$1', $delim), $str);
         break;
     default :
     case 'middle' :
-        return preg_replace(array(sprintf('/^(.{%s}).{4,}(.{%s})$/', $part1, $part2), '/\s*\.{3,}\s*/'), array('$1...$2', '...'), $str);
+        return preg_replace(array(sprintf('/^(.{%s}).{4,}(.{%s})$/sU', $part1, $part2), '/\s*\.{3,}\s*/sU'), array('$1' . $delim . '$2', $delim), $str);
         break;    
     case 'end' :
-        return preg_replace(array(sprintf('/^(.{%s}).{4,}$/', $part1 + $part2), '/\s*\.{3,}\s*/'), array('$1...', '...'), $str);
-        break;    
+        return preg_replace(array(sprintf('/^(.{%s}).{4,}$/sU', $part1 + $part2), '/\s*\.{3,}\s*/sU'), array('$1' . $delim, $delim), $str);
+        break;
     }
 }