Changeset 712 in subversion

Timestamp:

Aug 27, 2007 6:55:42 PM (6 years ago)

Author:

till

Message:

+ fixed cs in insert id function

File:

• branches/devel-vnext/program/include/rcube_db.inc (modified) (2 diffs)

branches/devel-vnext/program/include/rcube_db.inc

@@ -297 +297 @@
      * @return mixed   ID or FALSE on failure
      * @access public
-     */
-    function insert_id($sequence = '')
+     * @todo   Remove die() and use exceptions
+     */
+    public function insert_id($sequence = '')
     {
         if (!$this->db_handle || $this->db_mode=='r') {
@@ -309 +310 @@
                     rc_bugs::raise_error(
                         array(
-                            'code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__, 
-                            'message' => $result->getMessage()), TRUE, FALSE
+                            'code' => 500,
+                            'type' => 'db',
+                            'line' => __LINE__,
+                            'file' => __FILE__, 
+                            'message' => $result->getMessage()
+                        ), TRUE, FALSE
                     );
                 }
                 return $result;
 
-      case 'mssql':
-        $result = &$this->db_handle->getOne("SELECT @@IDENTITY");
-        if (DB::isError($result))
-          rc_bugs::raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__, 
-                            'message' => $result->getMessage()), TRUE, FALSE);
-        return $result;
+            case 'mssql':
+                $result = &$this->db_handle->getOne("SELECT @@IDENTITY");
+                if (DB::isError($result)) {
+                    rc_bugs::raise_error(
+                        array(
+                            'code' => 500,
+                            'type' => 'db',
+                            'line' => __LINE__,
+                            'file' => __FILE__, 
+                            'message' => $result->getMessage()
+                        ), TRUE, FALSE);
+                }
+                return $result;
                 
-      case 'mysql': // This is unfortuneate
-        return mysql_insert_id($this->db_handle->connection);
-
-      case 'mysqli':
-        return mysqli_insert_id($this->db_handle->connection);
-
-      case 'sqlite':
-        return sqlite_last_insert_rowid($this->db_handle->connection);
-
-      default:
-        die("portability issue with this database, please have the developer fix");
-      }
-    }
-
+            case 'mysql': // This is unfortuneate
+                return mysql_insert_id($this->db_handle->connection);
+
+            case 'mysqli':
+                return mysqli_insert_id($this->db_handle->connection);
+
+            case 'sqlite':
+                return sqlite_last_insert_rowid($this->db_handle->connection);
+
+            default:
+                die("portability issue with this database, please have the developer fix");
+        }
+    }
 
     /**