Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
osticket
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
docker
osticket
Commits
dacb2fc0
Commit
dacb2fc0
authored
12 years ago
by
Peter Rotich
Browse files
Options
Downloads
Patches
Plain Diff
DB wrapper cleanup.
- db_input now hadles arrays correctly. - Code style cleanup..etc
parent
1c916dd8
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
include/mysql.php
+49
-64
49 additions, 64 deletions
include/mysql.php
with
49 additions
and
64 deletions
include/mysql.php
+
49
−
64
View file @
dacb2fc0
...
@@ -38,12 +38,12 @@
...
@@ -38,12 +38,12 @@
return
$dblink
;
return
$dblink
;
}
}
function
db_close
(){
function
db_close
()
{
global
$dblink
;
global
$dblink
;
return
@
mysql_close
(
$dblink
);
return
@
mysql_close
(
$dblink
);
}
}
function
db_version
(){
function
db_version
()
{
$version
=
0
;
$version
=
0
;
if
(
preg_match
(
'/(\d{1,2}\.\d{1,2}\.\d{1,2})/'
,
if
(
preg_match
(
'/(\d{1,2}\.\d{1,2}\.\d{1,2})/'
,
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
}
}
function
db_get_variable
(
$variable
,
$type
=
'session'
)
{
function
db_get_variable
(
$variable
,
$type
=
'session'
)
{
$sql
=
sprintf
(
'SELECT @@%s.%s'
,
$type
,
$variable
);
$sql
=
sprintf
(
'SELECT @@%s.%s'
,
$type
,
$variable
);
return
db_result
(
db_query
(
$sql
));
return
db_result
(
db_query
(
$sql
));
}
}
...
@@ -74,112 +74,105 @@
...
@@ -74,112 +74,105 @@
}
}
function
db_create_database
(
$database
,
$charset
=
'utf8'
,
$collate
=
'utf8_unicode_ci'
)
{
function
db_create_database
(
$database
,
$charset
=
'utf8'
,
$collate
=
'utf8_unicode_ci'
)
{
return
@
mysql_query
(
sprintf
(
'CREATE DATABASE %s DEFAULT CHARACTER SET %s COLLATE %s'
,
$database
,
$charset
,
$collate
));
return
@
mysql_query
(
sprintf
(
'CREATE DATABASE %s DEFAULT CHARACTER SET %s COLLATE %s'
,
$database
,
$charset
,
$collate
));
}
}
// execute sql query
// execute sql query
function
db_query
(
$query
,
$database
=
""
,
$conn
=
""
){
function
db_query
(
$query
,
$database
=
""
,
$conn
=
""
)
{
global
$ost
;
global
$ost
;
if
(
$conn
)
{
/* connection is provided*/
if
(
$conn
)
{
/* connection is provided*/
$res
ult
=
(
$database
)
?
mysql_db_query
(
$database
,
$query
,
$conn
)
:
mysql_query
(
$query
,
$conn
);
$res
=
(
$database
)
?
mysql_db_query
(
$database
,
$query
,
$conn
)
:
mysql_query
(
$query
,
$conn
);
}
else
{
}
else
{
$res
ult
=
(
$database
)
?
mysql_db_query
(
$database
,
$query
)
:
mysql_query
(
$query
);
$res
=
(
$database
)
?
mysql_db_query
(
$database
,
$query
)
:
mysql_query
(
$query
);
}
}
if
(
!
$res
ult
&&
$ost
)
{
//error reporting
if
(
!
$res
&&
$ost
)
{
//error reporting
$msg
=
'['
.
$query
.
']'
.
"
\n\n
"
.
db_error
();
$msg
=
'['
.
$query
.
']'
.
"
\n\n
"
.
db_error
();
$ost
->
logDBError
(
'DB Error #'
.
db_errno
(),
$msg
);
$ost
->
logDBError
(
'DB Error #'
.
db_errno
(),
$msg
);
//echo $msg; #uncomment during debuging or dev.
//echo $msg; #uncomment during debuging or dev.
}
}
return
$res
ult
;
return
$res
;
}
}
function
db_squery
(
$query
){
//smart db query...utilizing args and sprintf
function
db_squery
(
$query
)
{
//smart db query...utilizing args and sprintf
$args
=
func_get_args
();
$args
=
func_get_args
();
$query
=
array_shift
(
$args
);
$query
=
array_shift
(
$args
);
$query
=
str_replace
(
"?"
,
"%s"
,
$query
);
$query
=
str_replace
(
"?"
,
"%s"
,
$query
);
$args
=
array_map
(
'db_real_escape'
,
$args
);
$args
=
array_map
(
'db_real_escape'
,
$args
);
array_unshift
(
$args
,
$query
);
array_unshift
(
$args
,
$query
);
$query
=
call_user_func_array
(
'sprintf'
,
$args
);
$query
=
call_user_func_array
(
'sprintf'
,
$args
);
return
db_query
(
$query
);
return
db_query
(
$query
);
}
}
function
db_count
(
$query
){
function
db_count
(
$query
)
{
return
db_result
(
db_query
(
$query
));
return
db_result
(
db_query
(
$query
));
}
}
function
db_result
(
$res
ult
,
$row
=
0
)
{
function
db_result
(
$res
,
$row
=
0
)
{
return
(
$res
ult
)
?
mysql_result
(
$res
ult
,
$row
)
:
NULL
;
return
(
$res
)
?
mysql_result
(
$res
,
$row
)
:
NULL
;
}
}
function
db_fetch_array
(
$res
ult
,
$mode
=
false
)
{
function
db_fetch_array
(
$res
,
$mode
=
false
)
{
return
(
$res
ult
)
?
db_output
(
mysql_fetch_array
(
$res
ult
,(
$mode
)
?
$mode
:
MYSQL_ASSOC
))
:
NULL
;
return
(
$res
)
?
db_output
(
mysql_fetch_array
(
$res
,
(
$mode
)
?
$mode
:
MYSQL_ASSOC
))
:
NULL
;
}
}
function
db_fetch_row
(
$res
ult
)
{
function
db_fetch_row
(
$res
)
{
return
(
$res
ult
)
?
db_output
(
mysql_fetch_row
(
$res
ult
))
:
NULL
;
return
(
$res
)
?
db_output
(
mysql_fetch_row
(
$res
))
:
NULL
;
}
}
function
db_fetch_field
(
$res
ult
)
{
function
db_fetch_field
(
$res
)
{
return
(
$res
ult
)
?
mysql_fetch_field
(
$res
ult
)
:
NULL
;
return
(
$res
)
?
mysql_fetch_field
(
$res
)
:
NULL
;
}
}
function
db_assoc_array
(
$res
ult
,
$mode
=
false
)
{
function
db_assoc_array
(
$res
,
$mode
=
false
)
{
if
(
$res
ult
&&
db_num_rows
(
$res
ult
))
{
if
(
$res
&&
db_num_rows
(
$res
))
{
while
(
$row
=
db_fetch_array
(
$res
ult
,
$mode
))
while
(
$row
=
db_fetch_array
(
$res
,
$mode
))
$result
s
[]
=
$row
;
$result
[]
=
$row
;
}
}
return
$result
s
;
return
$result
;
}
}
function
db_num_rows
(
$res
ult
)
{
function
db_num_rows
(
$res
)
{
return
(
$res
ult
)
?
mysql_num_rows
(
$res
ult
)
:
0
;
return
(
$res
)
?
mysql_num_rows
(
$res
)
:
0
;
}
}
function
db_affected_rows
()
{
function
db_affected_rows
()
{
return
mysql_affected_rows
();
return
mysql_affected_rows
();
}
}
function
db_data_seek
(
$res
ult
,
$row_number
)
{
function
db_data_seek
(
$res
,
$row_number
)
{
return
mysql_data_seek
(
$res
ult
,
$row_number
);
return
mysql_data_seek
(
$res
,
$row_number
);
}
}
function
db_data_reset
(
$res
ult
)
{
function
db_data_reset
(
$res
)
{
return
mysql_data_seek
(
$res
ult
,
0
);
return
mysql_data_seek
(
$res
,
0
);
}
}
function
db_insert_id
()
{
function
db_insert_id
()
{
return
mysql_insert_id
();
return
mysql_insert_id
();
}
}
function
db_free_result
(
$res
ult
)
{
function
db_free_result
(
$res
)
{
return
mysql_free_result
(
$res
ult
);
return
mysql_free_result
(
$res
);
}
}
function
db_output
(
$
p
ar
am
)
{
function
db_output
(
$
v
ar
)
{
if
(
!
function_exists
(
'get_magic_quotes_runtime'
)
||
!
get_magic_quotes_runtime
())
//Sucker is NOT on - thanks.
if
(
!
function_exists
(
'get_magic_quotes_runtime'
)
||
!
get_magic_quotes_runtime
())
//Sucker is NOT on - thanks.
return
$
p
ar
am
;
return
$
v
ar
;
if
(
is_array
(
$param
))
{
if
(
is_array
(
$var
))
reset
(
$param
);
return
array_map
(
'db_output'
,
$var
);
while
(
list
(
$key
,
$value
)
=
each
(
$param
))
$param
[
$key
]
=
db_output
(
$value
);
return
$param
;
return
(
!
is_numeric
(
$var
))
?
stripslashes
(
$var
)
:
$var
;
}
elseif
(
!
is_numeric
(
$param
))
{
}
$param
=
trim
(
stripslashes
(
$param
));
}
return
$param
;
}
//Do not call this function directly...use db_input
//Do not call this function directly...use db_input
function
db_real_escape
(
$val
,
$quote
=
false
){
function
db_real_escape
(
$val
,
$quote
=
false
)
{
//Magic quotes crap is taken care of in main.inc.php
//Magic quotes crap is taken care of in main.inc.php
$val
=
mysql_real_escape_string
(
$val
);
$val
=
mysql_real_escape_string
(
$val
);
...
@@ -187,29 +180,21 @@
...
@@ -187,29 +180,21 @@
return
(
$quote
)
?
"'
$val
'"
:
$val
;
return
(
$quote
)
?
"'
$val
'"
:
$val
;
}
}
function
db_input
(
$param
,
$quote
=
true
)
{
function
db_input
(
$var
,
$quote
=
true
)
{
//is_numeric doesn't work all the time...9e8 is considered numeric..which is correct...but not expected.
if
(
$param
&&
preg_match
(
"/^\d+(\.\d+)?$/"
,
$param
))
return
$param
;
if
(
$param
&&
is_array
(
$param
))
{
if
(
is_array
(
$var
))
reset
(
$param
);
return
array_map
(
'db_input'
,
$var
,
array_fill
(
0
,
count
(
$var
),
$quote
));
while
(
list
(
$key
,
$value
)
=
each
(
$param
))
{
elseif
(
$var
&&
preg_match
(
"/^\d+(\.\d+)?$/"
,
$var
))
$param
[
$key
]
=
db_input
(
$value
,
$quote
);
return
$var
;
}
return
$param
;
}
return
db_real_escape
(
$
p
ar
am
,
$quote
);
return
db_real_escape
(
$
v
ar
,
$quote
);
}
}
function
db_error
(){
function
db_error
()
{
return
mysql_error
();
return
mysql_error
();
}
}
function
db_errno
(){
function
db_errno
()
{
return
mysql_errno
();
return
mysql_errno
();
}
}
?>
?>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment