[php-blog-cvs] serendipity serendipity_db_mysql.inc.php,1.8,1.9 serendipity_db_postgres.inc.php,1.5,1.6 serendipity_db_sqlite.inc.php,1.4,1.5

[<gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv25556

Modified Files:
	serendipity_db_mysql.inc.php serendipity_db_postgres.inc.php 
	serendipity_db_sqlite.inc.php 
Log Message:
Code style


Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_db_mysql.inc.php	8 Jul 2003 09:13:27 -0000	1.8
+++ serendipity_db_mysql.inc.php	8 Jul 2003 12:04:22 -0000	1.9
@@ -9,110 +9,114 @@
  */
 function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false)
 {
-	global $serendipity;
-	static $type_map = array(
-		'assoc' => MYSQL_ASSOC,
-		'num'	=> MYSQL_NUM,
-		'both'	=> MYSQL_BOTH
-		);
+    global $serendipity;
+    static $type_map = array(
+                         'assoc' => MYSQL_ASSOC,
+                         'num'   => MYSQL_NUM,
+                         'both'  => MYSQL_BOTH
+    );
 
-//	highlight_string(var_export($sql, 1));
+    // highlight_string(var_export($sql, 1));
 
-	$c = mysql_db_query($serendipity['dbName'], $sql);
-	if (!$c) {
-		if (!$serendipity['production']) {
-			print mysql_error();
-			if (function_exists("debug_backtrace") && $reportErr==true) {
-	            highlight_string(var_export(debug_backtrace(), 1));
-		    }
-		}
-		return false;
-	}
-	if ($c === true) {
-		return true;
-	}
+    $c = mysql_db_query($serendipity['dbName'], $sql);
 
-	$result_type = $type_map[$result_type];
-	
-	switch(mysql_num_rows($c)) {
-		case 0:
-			if ($single) {
-				return false;
-			}
-			return true;
-		case 1:
-			if ($single) {
-				return mysql_fetch_array($c, $result_type);
-			}
-		default:
-			$rows = array();
-			while (($row = mysql_fetch_array($c, $result_type))) {
-				$rows[] = $row;
-			}
-			return $rows;
-	}
+    if (!$c) {
+        if (!$serendipity['production']) {
+            print mysql_error();
+            if (function_exists('debug_backtrace') && $reportErr == true) {
+                highlight_string(var_export(debug_backtrace(), 1));
+            }
+        }
+
+        return false;
+    }
+    if ($c === true) {
+        return true;
+    }
+
+    $result_type = $type_map[$result_type];
+    
+    switch(mysql_num_rows($c)) {
+        case 0:
+            if ($single) {
+                return false;
+            }
+            return true;
+        case 1:
+            if ($single) {
+                return mysql_fetch_array($c, $result_type);
+            }
+        default:
+            $rows = array();
+            while (($row = mysql_fetch_array($c, $result_type))) {
+                $rows[] = $row;
+            }
+            return $rows;
+    }
 }
 
 function serendipity_db_insert_id()
 {
-	return mysql_insert_id();
+    return mysql_insert_id();
 }
 
 function serendipity_db_affected_rows()
 {
-	return mysql_affected_rows();
+    return mysql_affected_rows();
 }
 
 function serendipity_db_escape_string($string)
 {
-	return mysql_escape_string($string);
+    return mysql_escape_string($string);
 }
 
 function serendipity_db_limit($start, $offset)
 {
-	return "$start, $offset";
+    return $start . ', ' . $offset;
 }
 
 function serendipity_db_connect()
 {
-	global $serendipity;
+    global $serendipity;
 
-	if ($serendipity['dbConn']) {
-	  return;
-	}
+    if ($serendipity['dbConn']) {
+        return;
+    }
 
-	$serendipity['dbConn'] = mysql_connect($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
-	return $serendipity['dbConn'];
+    $serendipity['dbConn'] = mysql_connect($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
+
+    return $serendipity['dbConn'];
 }
 
 function serendipity_db_schema_import($query)
 {
-	static $search = array('{AUTOINCREMENT}', '{UNSIGNED}', '{FULLTEXT}');
-	static $replace = array('int(11) not null auto_increment primary key', 'unsigned', 'FULLTEXT');
+    static $search  = array('{AUTOINCREMENT}'                            , '{UNSIGNED}', '{FULLTEXT}');
+    static $replace = array('int(11) not null auto_increment primary key', 'unsigned'  , 'FULLTEXT'  );
 
-	return serendipity_db_query(str_replace($search, $replace, $query));
+    return serendipity_db_query(str_replace($search, $replace, $query));
 }
 
 /* probes the usability of the DB during installation */
 function serendipity_db_probe($hash, &$errs)
 {
-	global $serendipity;
-	
-	if (!($c = @mysql_connect($hash['dbHost'], $hash['dbUser'], $hash['dbPass']))) {
-		$errs[] = "Could not connect to database; check your settings.";
-		$errs[] = "The mySQL error was: " . mysql_error();
-		return false;
-	}
-	
-	$serendipity['dbConn'] = $c;
-
-	if (!@mysql_select_db($hash['dbName'])) {
-		$errs[] = "The database you specified does not exist.";
-		$errs[] = "The mySQL error was: " . mysql_error();
-		return false;
-	}
-
-	return true;
+    global $serendipity;
+    
+    if (!($c = @mysql_connect($hash['dbHost'], $hash['dbUser'], $hash['dbPass']))) {
+        $errs[] = 'Could not connect to database; check your settings.';
+        $errs[] = 'The mySQL error was: ' . mysql_error();
+        return false;
+    }
+    
+    $serendipity['dbConn'] = $c;
+    
+    if (!@mysql_select_db($hash['dbName'])) {
+        $errs[] = 'The database you specified does not exist.';
+        $errs[] = 'The mySQL error was: ' . mysql_error();
+        return false;
+    }
+    
+    return true;
 }
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_db_postgres.inc.php	7 Jul 2003 19:29:11 -0000	1.5
+++ serendipity_db_postgres.inc.php	8 Jul 2003 12:04:22 -0000	1.6
@@ -2,106 +2,123 @@
 
 function serendipity_db_connect()
 {
-	global $serendipity;
-
-	$serendipity['dbConn'] = pg_connect(sprintf("%sdbname=%s user=%s password=%s",
-		strlen($serendipity['dbHost']) ? ('host=' . $serendipity['dbHost'] . ' ') : '',
-		$serendipity['dbName'], $serendipity['dbUser'], $serendipity['dbPass']));
+    global $serendipity;
 
-	return $serendipity['dbConn'];
+    $serendipity['dbConn'] = pg_connect(
+                               sprintf(
+                                 '%sdbname=%s user=%s password=%s',
+        
+                                 strlen($serendipity['dbHost']) ? ('host=' . $serendipity['dbHost'] . ' ') : '',
+                                 $serendipity['dbName'],
+                                 $serendipity['dbUser'],
+                                 $serendipity['dbPass']
+                               )
+                             );
+    
+    return $serendipity['dbConn'];
 }
 
 function serendipity_db_escape_string($string)
 {
-	return pg_escape_string($string);
+    return pg_escape_string($string);
 }
 
 function serendipity_db_limit($start, $offset)
 {
-	return "$offset, $start";
+    return $offset . ', ' . $start;
 }
 
 function serendipity_db_affected_rows()
 {
-	global $serendipity;
-	return pg_affected_rows($serendipity['dbLastResult']);
+    global $serendipity;
+    return pg_affected_rows($serendipity['dbLastResult']);
 }
 
 function serendipity_db_insert_id()
 {
-	global $serendipity;
-	return pg_last_oid($serendipity['dbLastResult']);
+    global $serendipity;
+    return pg_last_oid($serendipity['dbLastResult']);
 }
 
 function serendipity_db_query($sql, $single = false, $result_type = "both")
 {
-	global $serendipity;
-	static $type_map = array(
-		'assoc' => PGSQL_ASSOC,
-		'num'	=> PGSQL_NUM,
-		'both'	=> PGSQL_BOTH
-		);
+    global $serendipity;
+    static $type_map = array(
+                         'assoc' => PGSQL_ASSOC,
+                         'num'   => PGSQL_NUM,
+                         'both'  => PGSQL_BOTH
+    );
 
-	$serendipity['dbLastResult'] = pg_query($serendipity['dbConn'], $sql);
+    $serendipity['dbLastResult'] = pg_query($serendipity['dbConn'], $sql);
 
-	if (!$serendipity['dbLastResult']) {
-		if (!$serendipity['production']) {
-			print pg_last_error($serendipity['dbConn']);
-			if (function_exists("debug_backtrace")) {
-			    highlight_string(var_export(debug_backtrace(), 1));
-			}
-			print "<br><code>$sql</code>\n";
-		}
-		return false;
-	}
-	if ($serendipity['dbLastResult'] === true) {
-		return true;
-	}
+    if (!$serendipity['dbLastResult']) {
+        if (!$serendipity['production']) {
+            print pg_last_error($serendipity['dbConn']);
+            if (function_exists('debug_backtrace')) {
+                highlight_string(var_export(debug_backtrace(), 1));
+            }
+            print "<br><code>$sql</code>\n";
+        }
+        return false;
+    }
 
-	$result_type = $type_map[$result_type];
+    if ($serendipity['dbLastResult'] === true) {
+        return true;
+    }
 
-	$n = pg_num_rows($serendipity['dbLastResult']);
+    $result_type = $type_map[$result_type];
 
-	switch ($n) {
-		case 0:
-			if ($single) {
-				return false;
-			}
-			return true;
-			
-		case 1:
-			if ($single) {
-				return pg_fetch_array($serendipity['dbLastResult'], 0, $result_type);
-			}
-		default:
-			$rows = array();
-			for ($i = 0; $i < $n; $i++) {
-				$rows[] = pg_fetch_array($serendipity['dbLastResult'], $i, $result_type);
-			}
-			return $rows;
-	}
+    $n = pg_num_rows($serendipity['dbLastResult']);
+
+    switch ($n) {
+        case 0:
+            if ($single) {
+                return false;
+            }
+            return true;
+        case 1:
+            if ($single) {
+                return pg_fetch_array($serendipity['dbLastResult'], 0, $result_type);
+            }
+        default:
+            $rows = array();
+            for ($i = 0; $i < $n; $i++) {
+                $rows[] = pg_fetch_array($serendipity['dbLastResult'], $i, $result_type);
+            }
+            return $rows;
+    }
 }
 
 function serendipity_db_schema_import($query)
 {
-	static $search = array('{AUTOINCREMENT}', '{UNSIGNED}', '{FULLTEXT}', 'int(1)', 'int(10)', 'int(11)', 'int(4)');
-	static $replace = array('SERIAL primary key', '', '', 'int2', 'int4', 'int4', 'int4');
-
-	return serendipity_db_query(str_replace($search, $replace, $query));
+    static $search  = array('{AUTOINCREMENT}'   , '{UNSIGNED}', '{FULLTEXT}', 'int(1)', 'int(10)', 'int(11)', 'int(4)');
+    static $replace = array('SERIAL primary key', ''          , ''          , 'int2'  , 'int4'   , 'int4'   , 'int4'  );
+    
+    return serendipity_db_query(str_replace($search, $replace, $query));
 }
 
 function serendipity_db_probe($hash, &$errs)
 {
-	global $serendipity;
+    global $serendipity;
+    
+    $serendipity['dbConn'] = pg_connect(
+                               sprintf(
+                                 '%sdbname=%s user=%s password=%s',
 
-	$serendipity['dbConn'] = pg_connect(sprintf("%sdbname=%s user=%s password=%s",
-		strlen($hash['dbHost']) ? ('host=' . $hash['dbHost'] . ' ') : '',
-		$hash['dbName'], $hash['dbUser'], $hash['dbPass']));
-	if (!$serendipity['dbConn']) {
-		$errs[] = "Could not connect to database; check your settings.";
-		return false;
-	}
-	return true;
+                                 strlen($hash['dbHost']) ? ('host=' . $hash['dbHost'] . ' ') : '',
+                                 $hash['dbName'],
+                                 $hash['dbUser'],
+                                 $hash['dbPass']
+                               )
+                             );
+
+    if (!$serendipity['dbConn']) {
+        $errs[] = 'Could not connect to database; check your settings.';
+        return false;
+    }
+
+    return true;
 }
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_db_sqlite.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_sqlite.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_db_sqlite.inc.php	8 Jul 2003 09:13:27 -0000	1.4
+++ serendipity_db_sqlite.inc.php	8 Jul 2003 12:04:22 -0000	1.5
@@ -2,122 +2,128 @@
 
 function serendipity_db_connect()
 {
-	global $serendipity;
-
-	$serendipity['dbConn'] = sqlite_open($serendipity['serendipityPath'] . "sqlite.db");
+    global $serendipity;
+    
+    $serendipity['dbConn'] = sqlite_open($serendipity['serendipityPath'] . 'sqlite.db');
 }
 
 function serendipity_db_escape_string($string)
 {
-	static $search = array("\x00", '%', '\'', '\"');
-	static $replace = array('%00', '%25', '\\\'', '\\\"');
-
-	return str_replace($search, $replace, $string);
+    static $search  = array("\x00", '%',   '\'',   '\"');
+    static $replace = array('%00',  '%25', '\\\'', '\\\"');
+    
+    return str_replace($search, $replace, $string);
 }
 
 function serendipity_db_affected_rows()
 {
-	return sqlite_changes($GLOBALS['serendipity']['dbConn']);
+    return sqlite_changes($GLOBALS['serendipity']['dbConn']);
 }
 
 function serendipity_db_insert_id()
 {
-	return sqlite_last_insert_rowid($GLOBALS['serendipity']['dbConn']);
+    return sqlite_last_insert_rowid($GLOBALS['serendipity']['dbConn']);
 }
 
 function serendipity_db_sqlite_fetch_array($res)
 {
-	static $search = array('%00', '%25');
-	static $replace = array("\x00", '%');
-	
-	$row = sqlite_fetch_array($res);
-	if (!is_array($row))
-		return $row;
-	/* strip any slashes */
-	$r = array();
-	foreach ($row as $i => $v) {
-		$r[$i] = str_replace($search, $replace, $v);
-	}
-	return $r;
+    static $search  = array('%00',  '%25');
+    static $replace = array("\x00", '%');
+    
+    $row = sqlite_fetch_array($res);
+    if (!is_array($row)) {
+        return $row;
+    }
+    
+    /* strip any slashes */
+    $r = array();
+    foreach ($row as $i => $v) {
+        $r[$i] = str_replace($search, $replace, $v);
+    }
+
+    return $r;
 }
 
 function serendipity_db_query($sql, $single = false, $result_type = "both")
 {
-	global $serendipity;
-
-	$res = sqlite_exec($sql, $serendipity['dbConn']);
-	if (!$res) {
-		if (!$serendipity['production']) {
-			var_dump($res);
-			var_dump($sql);
-			return "problem with query";
-		}
-		return false;
-	}
-
-	if ($res === true) {
-		return true;
-	}
-
-	$rows = array();
-	
-	if ($result_type == 'num') {
-		while (($row = serendipity_db_sqlite_fetch_array($res))) {
-			$rows[] = $row;
-		}
-	} else {
-
-		$field_names = serendipity_db_sqlite_fetch_array($res);
-
-		if ($result_type == 'both') {
-			while (($row = sqlite_fetch_array($res))) {
-				foreach ($field_names as $i => $name) {
-					$row[$name] = $row[$i];
-				}
-				$rows[] = $row;
-			}
-		} else {
-			/* string keys only */
-			while (($row = serendipity_db_sqlite_fetch_array($res))) {
-				$r = array();
-				foreach ($field_names as $i => $name) {
-					$r[$name] = $row[$i];
-				}
-				$rows[] = $r;
-			}
-		}
-	}
-
-	if ($single && count($rows) == 0) {
-		return false;
-	}
-
-	if ($single && count($rows) == 1) {
-		return $rows[0];
-	}
+    global $serendipity;
+    
+    $res = sqlite_exec($sql, $serendipity['dbConn']);
+    if (!$res) {
+        if (!$serendipity['production']) {
+            var_dump($res);
+            var_dump($sql);
+            return "problem with query";
+        }
+        return false;
+    }
+    
+    if ($res === true) {
+        return true;
+    }
+    
+    $rows = array();
+    
+    if ($result_type == 'num') {
+        while (($row = serendipity_db_sqlite_fetch_array($res))) {
+            $rows[] = $row;
+        }
+    } else {
+    
+        $field_names = serendipity_db_sqlite_fetch_array($res);
+    
+        if ($result_type == 'both') {
+            while (($row = sqlite_fetch_array($res))) {
+                foreach ($field_names as $i => $name) {
+                    $row[$name] = $row[$i];
+                }
+                $rows[] = $row;
+            }
+        } else {
 
-	return $rows;
+            /* string keys only */
+            while (($row = serendipity_db_sqlite_fetch_array($res))) {
+                $r = array();
+                foreach ($field_names as $i => $name) {
+                    $r[$name] = $row[$i];
+                }
+                $rows[] = $r;
+            }
+        }
+    }
+    
+    if ($single && count($rows) == 0) {
+        return false;
+    }
+    
+    if ($single && count($rows) == 1) {
+        return $rows[0];
+    }
+    
+    return $rows;
 }
 
 function serendipity_db_probe($hash, &$errs)
 {
-	global $serendipity;
+    global $serendipity;
+    
+    $serendipity['dbConn'] = sqlite_open($serendipity['serendipityPath'] . 'sqlite.db');
 
-	$serendipity['dbConn'] = sqlite_open($serendipity['serendipityPath'] . "sqlite.db");
-	if ($serendipity['dbConn']) {
-		return true;
-	}
-	$errs[] = "Unable to open \"$serendipity[serendipityPath]sqlite.db\" - check permissions!";
-	return false;
+    if ($serendipity['dbConn']) {
+        return true;
+    }
+
+    $errs[] = "Unable to open \"{$serendipity['serendipityPath']}sqlite.db\" - check permissions!";
+    return false;
 }
 
 function serendipity_db_schema_import($query)
 {
-	static $search = array('{AUTOINCREMENT}', '{UNSIGNED}', '{FULLTEXT}');
-	static $replace = array('INTEGER PRIMARY KEY', '', '');
-
-	return serendipity_db_query(str_replace($search, $replace, $query));
+    static $search  = array('{AUTOINCREMENT}'    , '{UNSIGNED}', '{FULLTEXT}');
+    static $replace = array('INTEGER PRIMARY KEY', ''          , ''          );
 
+    return serendipity_db_query(str_replace($search, $replace, $query));
 }
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>