Skip to content

Commit eefcc9e

Browse files
committed
change block comment style to make Github's syntax highlightning happy
1 parent 836df63 commit eefcc9e

File tree

199 files changed

+381
-381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+381
-381
lines changed

classes/Database.php

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
* @package MythWeb
3131
* @subpackage Database
3232
*
33-
/**/
33+
**/
3434

3535
/**
3636
* Abstract superclass for all database connection types. This also defines the
3737
* Database::connect() function that handles creating instances of the
3838
* appropriate database handle for the requested database engine.
39-
/**/
39+
**/
4040
class Database {
4141

4242
/** @var resource Resource handle for this database connection */
@@ -73,7 +73,7 @@ class Database {
7373

7474
/**
7575
* Legacy constructor to catch things that the abstract classification won't
76-
/**/
76+
**/
7777
function __construct() {
7878
trigger_error('The Database class should never be created as an object. Use Database::connect() instead.', E_USER_ERROR);
7979
}
@@ -98,7 +98,7 @@ function __construct() {
9898
* engines that support them
9999
*
100100
* @return object Database subclass based on requested $engine
101-
/**/
101+
**/
102102
static function &connect($db_name, $login, $password, $server='localhost', $port=NULL, $engine='mysql_detect', $options=array()) {
103103
// For consistency, engine names are all lower case.
104104
$engine = strtolower($engine);
@@ -137,7 +137,7 @@ static function &connect($db_name, $login, $password, $server='localhost', $port
137137
* @param mixed $args Scalar or nested array to be "flattened" into a single array.
138138
*
139139
* @return array Single array comprised of all scalars present in $args.
140-
/**/
140+
**/
141141
static function smart_args($args) {
142142
$new_args = array();
143143
// Not an array
@@ -160,7 +160,7 @@ static function smart_args($args) {
160160
* Calls $this->escape() on an array of strings.
161161
*
162162
* @return string
163-
/**/
163+
**/
164164
function escape_array($array) {
165165
$new = array();
166166
foreach ($array as $string) {
@@ -173,7 +173,7 @@ function escape_array($array) {
173173

174174
/**
175175
* Execute any destruct handler functions.
176-
/**/
176+
**/
177177
function __destruct() {
178178
// Globals already destroyed?
179179
if ($this->global_name && empty($GLOBALS[$this->global_name]))
@@ -195,7 +195,7 @@ function __destruct() {
195195
* might need to use it.
196196
*
197197
* @param string $name The global name this instance is registered as.
198-
/**/
198+
**/
199199
function register_global_name($name) {
200200
if ($GLOBALS[$name] === $this) {
201201
$this->global_name = $name;
@@ -210,7 +210,7 @@ function register_global_name($name) {
210210
* session_write_close) gets executed before in time.
211211
*
212212
* @link http://us2.php.net/session_set_save_handler
213-
/**/
213+
**/
214214
function register_destruct_handler($func, $params=null) {
215215
$this->destruct_handlers[] = array('f' => $func,
216216
'p' => $params);
@@ -222,7 +222,7 @@ function register_destruct_handler($func, $params=null) {
222222
* @param string $error The string to set the error message to. Set to
223223
* false if you want to wipe out the existing errors.
224224
* @param bool $backtrace Include a backtrace along with the error message.
225-
/**/
225+
**/
226226
function error($error='', $backtrace=true) {
227227
if ($error === false) {
228228
$this->err = null;
@@ -251,7 +251,7 @@ function error($error='', $backtrace=true) {
251251
* @param mixed ... Additional arguments
252252
*
253253
* @return mixed Statement handle for the current type of database connection
254-
/**/
254+
**/
255255
function &query($query) {
256256
// Hack to get query_row and query_assoc working correctly
257257
$args = array_slice(func_get_args(), 1);
@@ -275,7 +275,7 @@ function &query($query) {
275275
* @param mixed ... Additional arguments
276276
*
277277
* @return array
278-
/**/
278+
**/
279279
function query_row($query) {
280280
// Query and return
281281
$args = array_slice(func_get_args(), 1);
@@ -296,7 +296,7 @@ function query_row($query) {
296296
* @param mixed ... Additional arguments
297297
*
298298
* @return assoc
299-
/**/
299+
**/
300300
function query_assoc($query) {
301301
// Query and return
302302
$args = array_slice(func_get_args(), 1);
@@ -317,7 +317,7 @@ function query_assoc($query) {
317317
* @param mixed ... Additional arguments
318318
*
319319
* @return mixed
320-
/**/
320+
**/
321321
function query_col($query) {
322322
// Query and return
323323
$args = array_slice(func_get_args(), 1);
@@ -338,7 +338,7 @@ function query_col($query) {
338338
* @param mixed ... Additional arguments
339339
*
340340
* @return array
341-
/**/
341+
**/
342342
function query_list($query) {
343343
// Query and return
344344
$args = array_slice(func_get_args(), 1);
@@ -363,7 +363,7 @@ function query_list($query) {
363363
* @param mixed ... Additional arguments
364364
*
365365
* @return array
366-
/**/
366+
**/
367367
function query_list_array($query) {
368368
// Query and return
369369
$args = array_slice(func_get_args(), 1);
@@ -388,7 +388,7 @@ function query_list_array($query) {
388388
* @param mixed ... Additional arguments
389389
*
390390
* @return array
391-
/**/
391+
**/
392392
function query_list_assoc($query) {
393393
// Query and return
394394
$args = array_slice(func_get_args(), 1);
@@ -415,7 +415,7 @@ function query_list_assoc($query) {
415415
* @param mixed ... Additional arguments
416416
*
417417
* @return array
418-
/**/
418+
**/
419419
function query_keyed_list_array($key, $query) {
420420
// Query and return
421421
$args = array_slice(func_get_args(), 2);
@@ -442,7 +442,7 @@ function query_keyed_list_array($key, $query) {
442442
* @param mixed ... Additional arguments
443443
*
444444
* @return array
445-
/**/
445+
**/
446446
function query_keyed_list_assoc($key, $query) {
447447
// Query and return
448448
$args = array_slice(func_get_args(), 2);
@@ -466,7 +466,7 @@ function query_keyed_list_assoc($key, $query) {
466466
* @param mixed ... Additional arguments
467467
*
468468
* @return int The number of rows affected by the requested query.
469-
/**/
469+
**/
470470
function query_num_rows($query) {
471471
// Query and return
472472
$args = array_slice(func_get_args(), 1);
@@ -487,7 +487,7 @@ function query_num_rows($query) {
487487
* @param mixed ... Additional arguments
488488
*
489489
* @return int The insert_id generated by the requested query.
490-
/**/
490+
**/
491491
function query_insert_id($query) {
492492
// Query and return
493493
$args = array_slice(func_get_args(), 1);
@@ -503,29 +503,29 @@ function query_insert_id($query) {
503503
/**
504504
* Wrapper for the last query statement's insert_id method.
505505
* @return int
506-
/**/
506+
**/
507507
function insert_id() {
508508
return $this->last_sh->insert_id();
509509
}
510510

511511
/**
512512
* Wrapper for the last query statement's affected_rows method.
513513
* @return int
514-
/**/
514+
**/
515515
function affected_rows() {
516516
return $this->last_sh->affected_rows();
517517
}
518518

519519
/**
520520
* This function and the next one control if the mysql_query throws a fatal error or not
521-
/**/
521+
**/
522522
function enable_fatal_errors() {
523523
$this->fatal_errors = true;
524524
}
525525

526526
/**
527527
* This function disables the fatal error trigger code
528-
/**/
528+
**/
529529
function disable_fatal_errors() {
530530
$this->fatal_errors = false;
531531
}

classes/Database/Query.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
*
2323
* @uses Database.php
2424
*
25-
/**/
25+
**/
2626

2727
/**
2828
* Abstract superclass for all database query types.
29-
/**/
29+
**/
3030
class Database_Query {
3131

3232
/** @var resource The related database connection handle */
@@ -63,7 +63,7 @@ class Database_Query {
6363
*
6464
* @param Database $dbh The parent Database object
6565
* @param string $query The query string
66-
/**/
66+
**/
6767
function __construct(&$db, $query) {
6868
$this->dbh = $db->dbh;
6969
$this->db =& $db;

classes/Database/Query/mysql.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323
* @uses Database_mysql.php
2424
* @uses Database_Query.php
2525
*
26-
/**/
26+
**/
2727

2828
/**
2929
* The basic MySQL database query type.
30-
/**/
30+
**/
3131
class Database_Query_mysql extends Database_Query {
3232

3333
/**
3434
* Executes the query that was previously passed to the constructor.
3535
*
3636
* @param mixed $arg Query arguments to escape and insert at ? placeholders in $query
3737
* @param mixed ... Additional arguments
38-
/**/
38+
**/
3939
function execute() {
4040
// Load the function arguments, minus the query itself, which we already extracted
4141
$args = func_get_args();
@@ -89,12 +89,12 @@ function execute() {
8989
*
9090
* mysql_fetch_row($result); -> $sh->fetch_row();
9191
* mysql_affected_rows($dbh); -> $sh->affected_rows();
92-
/**/
92+
**/
9393

9494
/**
9595
* Fetch a single column
9696
* @return mixed
97-
/**/
97+
**/
9898
function fetch_col() {
9999
list($return) = mysql_fetch_row($this->sh);
100100
return $return;
@@ -112,7 +112,7 @@ function fetch_cols() {
112112
*
113113
* @link http://www.php.net/manual/en/function.mysql-fetch-row.php
114114
* @return array
115-
/**/
115+
**/
116116
function fetch_row() {
117117
return mysql_fetch_row($this->sh);
118118
}
@@ -122,7 +122,7 @@ function fetch_row() {
122122
*
123123
* @link http://www.php.net/manual/en/function.mysql-fetch-assoc.php
124124
* @return assoc
125-
/**/
125+
**/
126126
function fetch_assoc() {
127127
return mysql_fetch_assoc($this->sh);
128128
}
@@ -132,7 +132,7 @@ function fetch_assoc() {
132132
*
133133
* @link http://www.php.net/manual/en/function.mysql-fetch-array.php
134134
* @return assoc
135-
/**/
135+
**/
136136
function fetch_array($result_type=MYSQL_BOTH) {
137137
return mysql_fetch_array($this->sh, $result_type);
138138
}
@@ -142,46 +142,46 @@ function fetch_array($result_type=MYSQL_BOTH) {
142142
*
143143
* @link http://www.php.net/manual/en/function.mysql-fetch-object.php
144144
* @return object
145-
/**/
145+
**/
146146
function fetch_object() {
147147
return mysql_fetch_object($this->sh);
148148
}
149149

150150
/**
151151
* @link http://www.php.net/manual/en/function.mysql-data-seek.php
152152
* @return bool
153-
/**/
153+
**/
154154
function data_seek($row_number) {
155155
return mysql_data_seek($this->sh, $row_number);
156156
}
157157

158158
/**
159159
* @link http://www.php.net/manual/en/function.mysql-num-rows.php
160160
* @return int
161-
/**/
161+
**/
162162
function num_rows() {
163163
return $this->num_rows;
164164
}
165165

166166
/**
167167
* @link http://www.php.net/manual/en/function.mysql-data-seek.php
168168
* @return int
169-
/**/
169+
**/
170170
function affected_rows() {
171171
return $this->affected_rows;
172172
}
173173

174174
/**
175175
* @link http://www.php.net/manual/en/function.mysql-insert-id.php
176176
* @return int
177-
/**/
177+
**/
178178
function insert_id() {
179179
return $this->insert_id;
180180
}
181181

182182
/**
183183
* For anal people like me who like to free up memory manually
184-
/**/
184+
**/
185185
function finish() {
186186
if ($this->sh && is_resource($this->sh))
187187
mysql_free_result($this->sh);

0 commit comments

Comments
 (0)