diff --git a/includes/AdminClass.php b/includes/AdminClass.php
index 98b4a4e..d83e99a 100644
--- a/includes/AdminClass.php
+++ b/includes/AdminClass.php
@@ -61,7 +61,7 @@ class AdminClass {
* initialize the database connection via ezSQL_mysql
* @param Array $cfg configuration array retrieved from config.php to store in the object
*/
- function AdminClass($cfg) {
+ function __construct($cfg) {
$this->config = $cfg;
// if db_type is not set, default to mysqli
if (!isset($cfg['db_type']) || $cfg['db_type'] == "mysqli") {
@@ -99,7 +99,7 @@ function parse_groups($userid = false) {
foreach ($result as $group) {
$names = explode(",", $group->$field_members);
reset($names);
- while (list($key, $name) = each($names)) {
+ foreach ($names as $key => $name) {
$data[$name][$group->$field_gid] = $group->$field_groupname;
}
}
@@ -143,6 +143,18 @@ function get_users() {
return $result;
}
+ /**
+ * retrieves all login_history from db and populates an associative array
+ * @return Array an array containing the records or false on failure
+ */
+ function get_login_hst_by_userid($userid) {
+ $format = 'SELECT * FROM %s WHERE %s = "%s" ORDER BY %s DESC LIMIT %s';
+ $query = sprintf( $format, $this->config['table_login_history'], $this->config['field_userid'], $userid, $this->config['field_acessed'], $this->config['max_login_hst']);
+ $result = $this->dbConn->get_results($query, ARRAY_A);
+ if (!$result) return false;
+ return $result;
+ }
+
/**
* returns either the total number or the number of empty groups in the db
* @param Boolean $only_emtpy
@@ -513,7 +525,7 @@ function remove_user_from_group($userid, $gid) {
if(strpos($result, $userid) === false) {
return true;
}
- $members_array = explode(",", $result);
+ $members_array = explode(",", (string)$result);
$members_new_array = array_diff($members_array, array("$userid", ""));
if (is_array($members_new_array)) {
$members_new = implode(",", $members_new_array);
diff --git a/includes/ez_sql_core.php b/includes/ez_sql_core.php
index 720d060..6b37dc9 100644
--- a/includes/ez_sql_core.php
+++ b/includes/ez_sql_core.php
@@ -51,6 +51,9 @@ class ezSQLcore
var $sql_log_file = false;
var $do_profile = false;
var $profile_times = array();
+ var $func_call = null;
+ var $last_result = null;
+ var $from_disk_cache = false;
// == TJH == default now needed for echo of debug function
var $debug_echo_is_on = true;
@@ -164,8 +167,11 @@ function get_row($query=null,$output=OBJECT,$y=0)
$this->query($query);
}
+ if ( is_null($this->last_result) ){
+ return null;
+ }
// If the output is an object then return object using the row offset..
- if ( $output == OBJECT )
+ elseif ( $output == OBJECT )
{
return $this->last_result[$y]?$this->last_result[$y]:null;
}
@@ -618,7 +624,7 @@ function get_set($params)
}
}
- return implode( ', ' , $sql );
+ return implode(', ' , $sql);
}
/**
diff --git a/includes/ez_sql_mysqli.php b/includes/ez_sql_mysqli.php
index 78f4da9..bb8b84b 100644
--- a/includes/ez_sql_mysqli.php
+++ b/includes/ez_sql_mysqli.php
@@ -33,6 +33,7 @@
class ezSQL_mysqli extends ezSQLcore
{
+ var $dbh = null;
var $dbuser = false;
var $dbpassword = false;
var $dbname = false;
@@ -40,6 +41,8 @@ class ezSQL_mysqli extends ezSQLcore
var $dbport = false;
var $encoding = false;
var $rows_affected = false;
+ var $result = null;
+ var $num_rows = 0;
/**********************************************************************
* Constructor - allow the user to perform a quick connect at the