Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18423
Modified Files:
serendipity_db_mysql.inc.php serendipity_db_postgres.inc.php
Log Message:
First small commit: common brace style for all files
Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_db_mysql.inc.php 5 May 2004 09:14:31 -0000 1.17
+++ serendipity_db_mysql.inc.php 16 May 2004 15:20:18 -0000 1.18
@@ -7,8 +7,7 @@
* array of field values if it returned a single row and $single is true
* array of array of field values if it returned row(s)
*/
-function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false)
-{
+function serendipity_db_query($sql, $single = false, $result_type = "both", $reportErr=false) {
global $serendipity;
static $type_map = array(
'assoc' => MYSQL_ASSOC,
@@ -62,33 +61,27 @@
}
}
-function serendipity_db_insert_id()
-{
+function serendipity_db_insert_id() {
return mysql_insert_id();
}
-function serendipity_db_affected_rows()
-{
+function serendipity_db_affected_rows() {
return mysql_affected_rows();
}
-function serendipity_db_escape_string($string)
-{
+function serendipity_db_escape_string($string) {
return mysql_escape_string($string);
}
-function serendipity_db_limit($start, $offset)
-{
+function serendipity_db_limit($start, $offset) {
return $start . ', ' . $offset;
}
-function serendipity_db_limit_sql($limitstring)
-{
+function serendipity_db_limit_sql($limitstring) {
return ' LIMIT ' . $limitstring;
}
-function serendipity_db_connect()
-{
+function serendipity_db_connect() {
global $serendipity;
if (isset($serendipity['dbConn'])) {
@@ -100,8 +93,7 @@
return $serendipity['dbConn'];
}
-function serendipity_db_schema_import($query)
-{
+function serendipity_db_schema_import($query) {
static $search = array('{AUTOINCREMENT}', '{PRIMARY}',
'{UNSIGNED}', '{FULLTEXT}', '{BOOLEAN}');
static $replace = array('int(11) not null auto_increment', 'primary key',
@@ -111,8 +103,7 @@
}
/* probes the usability of the DB during installation */
-function serendipity_db_probe($hash, &$errs)
-{
+function serendipity_db_probe($hash, &$errs) {
global $serendipity;
if (!($c = @mysql_connect($hash['dbHost'], $hash['dbUser'], $hash['dbPass']))) {
Index: serendipity_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_db_postgres.inc.php 5 May 2004 11:31:38 -0000 1.11
+++ serendipity_db_postgres.inc.php 16 May 2004 15:20:18 -0000 1.12
@@ -1,7 +1,6 @@
<?php # $Id$
-function serendipity_db_connect()
-{
+function serendipity_db_connect() {
global $serendipity;
$serendipity['dbConn'] = pg_connect(
@@ -18,18 +17,15 @@
return $serendipity['dbConn'];
}
-function serendipity_db_escape_string($string)
-{
+function serendipity_db_escape_string($string) {
return pg_escape_string($string);
}
-function serendipity_db_limit($start, $offset)
-{
+function serendipity_db_limit($start, $offset) {
return $offset . ', ' . $start;
}
-function serendipity_db_limit_sql($limitstring)
-{
+function serendipity_db_limit_sql($limitstring) {
$limit_split = split(',', $limitstring);
if (count($limit_split) > 1) {
$limit = ' LIMIT ' . $limit_split[0] . ' OFFSET ' . $limit_split[1];
@@ -39,20 +35,17 @@
return $limit;
}
-function serendipity_db_affected_rows()
-{
+function serendipity_db_affected_rows() {
global $serendipity;
return pg_affected_rows($serendipity['dbLastResult']);
}
-function serendipity_db_insert_id()
-{
+function serendipity_db_insert_id() {
global $serendipity;
return pg_last_oid($serendipity['dbLastResult']);
}
-function serendipity_db_query($sql, $single = false, $result_type = "both")
-{
+function serendipity_db_query($sql, $single = false, $result_type = "both") {
global $serendipity;
static $type_map = array(
'assoc' => PGSQL_ASSOC,
@@ -101,8 +94,7 @@
}
}
-function serendipity_db_schema_import($query)
-{
+function serendipity_db_schema_import($query) {
static $search = array('{AUTOINCREMENT}', '{PRIMARY}', '{UNSIGNED}',
'{FULLTEXT}', '{BOOLEAN}', 'int(1)', 'int(10)', 'int(11)', 'int(4)');
static $replace = array('SERIAL', 'primary key', '', '', 'BOOLEAN NOT NULL', 'int2',
@@ -111,8 +103,7 @@
return serendipity_db_query(str_replace($search, $replace, $query));
}
-function serendipity_db_probe($hash, &$errs)
-{
+function serendipity_db_probe($hash, &$errs) {
global $serendipity;
$serendipity['dbConn'] = pg_connect(
|