FloatSystems/float-gate
1
0
Fork 0
Code Issues Pull Requests Releases Activity

expnaded sample env

Browse Source
This commit is contained in:
Jenkins Automation
2023-02-25 18:34:20 -05:00
parent b5736e8121
commit b6abcb1586
12 changed files with 536 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/baseModel.php
+54 -16
View File
@@ -2,6 +2,8 @@
namespace App\Models;
use CodeIgniter\Model;
use CodeIgniter\Database\RawSql;
class baseModel extends Model
{
@@ -12,27 +14,46 @@ class baseModel extends Model
{
parent::__construct();
$this->db = \Config\Database::connect($this->con_name);
log_message('critical', "BaseModel-Entered" );
}
public function insert_db($inserDataArray, $insertTable)
{
$insert_id=0;
$ic = 0;
$fl_part = '';
$val_part = '';
$sqlQ = '';
$fields = array_keys($inserDataArray);
foreach ($fields as $field) {
$fl_part .= $ic > 0 ? ',' : '';
$fl_part .= $field;
log_message('critical', "insert_db-WAS CALLED user 000=>" );
$insert_id=0;
$ic = 0;
$fl_part = '';
$val_part = '';
$sqlQ = '';
// try {
$fields = array_keys($inserDataArray);
log_message('critical', "insert_db-WAS CALLED user 009a=>" );
foreach ($fields as $field) {
$fl_part .= $ic > 0 ? ',' : '';
$fl_part .= $field;
$val_part .= $ic > 0 ? ',' : '';
$val_part .= "'" . $inserDataArray[$field] . "'";
$ic++;
}
log_message('critical', "insert_db-WAS CALLED user 009b=>" );
$sqlQ = "INSERT INTO $insertTable ($fl_part) VALUES ($val_part)";
log_message('critical', "SQL-WAS CALLED user =>". $sqlQ );
$query = $this->db->query($sqlQ);
if(!$query){
$insert_id=-1;
}
// $insert_id = $this->db->insert_id();
// $insert_id = $this->db->getInsertID();
// $this->db->insert($insertTable,$inserDataArray);
// $insert_id = $this->db->insert_id();
// } catch (Exception $e) {
//echo 'Caught exception: ', $e->getMessage(), "\n";
// log_message('critical', "Caught exception: => ".$e->getMessage() );
// }
$val_part .= $ic > 0 ? ',' : '';
$val_part .= "'" . $inserDataArray[$field] . "'";
$ic++;
}
$sqlQ = "INSERT INTO $insertTable ($fl_part) VALUES ($val_part)";
$query = $this->db->query($sqlQ);
$insert_id = $this->db->insert_id();
return $insert_id;
}
public function update_db($UupdateDataArray,$whereAray, $updateTable)
@@ -60,4 +81,21 @@ class baseModel extends Model
$query = $this->db->query($sqlQ);
return 0;
}
public function getIPAddress()
{
//whether ip is from the share internet
if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
$ip = $_SERVER['HTTP_CLIENT_IP'];
}
//whether ip is from the proxy
elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
}
//whether ip is from the remote address
else {
$ip = $_SERVER['REMOTE_ADDR'];
}
return $ip;
}
}
app/Models/myfitHx.php
+5 -5
View File
@@ -5,29 +5,29 @@ use CodeIgniter\Model;
class myfitHx extends baseModel
{
protected $db;
// public $con_name = 'mermsemr';
public function __construct()
{
parent::__construct();
// $this->db = \Config\Database::connect($this->con_name);
}
public function readLoginHx($in)
{
// $in['member_id'] = 16;
$member_id =
$member_id2 =
isset($in['member_id']) &&
$in['member_id'] > 0 &&
is_int($in['member_id'])
? $in['member_id']
: 0;
// $member_id = 13;
$member_id = isset($in["member_id"]) ? (int) $in["member_id"]: 0 ;
$member_id = 13;
$sqlQ =
'SELECT * FROM members_login_hx WHERE member_id=' .
$member_id .
' ORDER BY id DESC LIMIT 15';
log_message('critical', "readLoginHx=>".$sqlQ );
$query = $this->db->query($sqlQ);
$data['loginhx_data'] = $query->getResultArray();
return $inx = [
app/Models/myfitTracking.php
+24 -7
View File
@@ -23,12 +23,13 @@ class myfitTracking extends baseModel
public function readTracking($in)
{
$sqlQ = 'SELECT * FROM members_reminders';
$code_line = ( isset($in["code"]) && $in["code"] !='') ? " AND code= '".$in['code']."'" :'';
$member_id = isset($in["member_id"]) ? (int) $in["member_id"]: 0 ;
$sqlQ = "SELECT * FROM members_tracking WHERE member_id=$member_id $code_line";
$query = $this->db->query($sqlQ);
$data['reminders_data'] = $query->getResultArray();
$data['tracking_data'] = $query->getResultArray();
return $inx = [
'reminders' => $data['reminders_data'],
'tracking_data' => $data['tracking_data'],
'status' => 1,
'raw_data' => $in,
];
@@ -49,15 +50,31 @@ class myfitTracking extends baseModel
switch($in['code']){
case "WEIGT":
$inData = [
'code'=>$in['code'],
'member_id'=>$in['member_id'],
'val1'=>$in['value'],
'val1'=>$in['val1'],
'munit'=>$in['unit'],
'event_time'=>$in['event_time'],
'loc'=>$this->getIPAddress()
];
$insert_id = $this->insert_db($inData, 'members_tracking_summary');
$insert_id = $this->insert_db($inData, 'members_tracking');
break;
case 'BLPR':
$inData = [
'code'=>$in['code'],
'member_id'=>$in['member_id'],
'val1'=>$in['val1'],
'val2'=>$in['val2'],
'val3'=>$in['val3'],
'munit'=>$in['unit'],
'event_time'=>$in['event_time'],
'loc'=>$this->getIPAddress()
];
$insert_id = $this->insert_db($inData, 'members_tracking');
break;
}
return ['insert_id'=> $insert_id, 'raw_data'=>$in ];
return ['insert_id'=> $insert_id, 'raw_data'=>$in ,'inData'=> $inData];
}
}
app/Models/userAccess.php
+2 -5
View File
@@ -5,14 +5,11 @@ use CodeIgniter\Model;
class userAccess extends baseModel
{
protected $db;
// public $con_name = 'mermsemr';
// protected $db;
public function __construct()
{
parent::__construct();
//$db = \Config\Database::connect('mermsemr');
// $this->db = \Config\Database::connect($this->con_name);
}
public function startLogin($in)
@@ -105,7 +102,7 @@ class userAccess extends baseModel
return $tk;
}
private function getIPAddress()
private function getIPAddress_old()
{
//whether ip is from the share internet
if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
app/Models/userSignUp.php
+90
View File
@@ -0,0 +1,90 @@
<?php
namespace App\Models;
use CodeIgniter\Model;
class userSignUp extends baseModel
{
// protected $db;
public function __construct()
{
parent::__construct();
}
/*
CREATE TABLE members_pending (
id SERIAL,
uuid UUID DEFAULT (gen_random_uuid()),
username VARCHAR(50) NOT NULL,
firstname VARCHAR(50),
lastname VARCHAR(50),
email VARCHAR(50),
password VARCHAR(100) NOT NULL,
random_text VARCHAR(15),
status INT DEFAULT 0,
updated timestamp without time zone DEFAULT now(),
added timestamp without time zone DEFAULT now()
);
*/
public function startSignUp($in)
{
$insert_id=0;
$uuid='';
$status=0;
$passEnr = $this->encryptmd5($in["password"]);
$randomText = rand(1010101,999999);// rand(1010101,999999);
$inData =[
'username'=> $in["username"],
'email'=> $in["email"],
'password'=> $passEnr,
'firstname'=> $in["firstname"],
'lastname'=> $in["lastname"],
'random_text' => $randomText
];
$insert_id = $this->insert_db($inData, 'members_pending');
if( $insert_id>=0){ // for now
$sqlQ = "SELECT id AS insert_id,uuid FROM members_pending WHERE username='".$in["username"]."' AND random_text='$randomText' AND password='$passEnr' LIMIT 1";
$query = $this->db->query($sqlQ);
$dat = $query->getResultArray();
$insert_id = $dat[0]['insert_id'];
$uuid = $dat[0]['uuid'];
$status=1;
}
return $inx = [
'insert_id' => $insert_id,
'uuid' => $uuid,
'status' => $status,
'error_msg' => '',
'raw_data' => $in,
];
}
private function encryptmd5($rwStstr){
$sqlQ = "SELECT md5('$rwStstr') AS md5_string";
log_message('critical', "encryptmd5-Entered".$sqlQ );
$query = $this->db->query($sqlQ);
$data = $query->getResultArray();
return $data[0]['md5_string'];
}
public function tempCodes(){
$sqlQ = "SELECT id AS insert_id,uuid,username,random_text FROM members_pending ORDER BY id DESC LIMIT 10";
$query = $this->db->query($sqlQ);
return $query->getResultArray();
}
}
/*
CREATE TABLE members_login_hx (
id SERIAL,
member_id INT REFERENCES members(id) NOT NULL,
channel VARCHAR(15),
added timestamp without time zone DEFAULT now(),
loc INET
);
ALTER TABLE ONLY members_login_hx
ADD CONSTRAINT members_login_hx_id_key UNIQUE (id);*/
app/Models/usersResetPass.php
+133
View File
@@ -0,0 +1,133 @@
<?php
namespace App\Models;
use CodeIgniter\Model;
class usersResetPass extends baseModel
{
// protected $db;
public function __construct()
{
parent::__construct();
}
/*
$res1 = [
'email' => $raw_array['email'],
'status' => 1,
];
CREATE TABLE members_pending (
id SERIAL,
uuid UUID DEFAULT (gen_random_uuid()),
username VARCHAR(50) NOT NULL,
firstname VARCHAR(50),
lastname VARCHAR(50),
email VARCHAR(50),
password VARCHAR(100) NOT NULL,
random_text VARCHAR(15),
status INT DEFAULT 0,
updated timestamp without time zone DEFAULT now(),
added timestamp without time zone DEFAULT now()
);
*/
public function startPassReset($in)
{
$insert_id=0;
$uuid='';
$status=0;
$passEnr = '';// $this->encryptmd5($in["password"]);
$randomText = rand(1010101,999999);// rand(1010101,999999);
$pdata =[];
$sqlQ = "SELECT id AS member_id,uuid FROM members WHERE username='".$in["username"]."' ";
$query = $this->db->query($sqlQ);
$data['user_data'] = $query->getResultArray();
if (count($data['user_data']) == 1) {
$userData = $data['user_data'][0];
$pdata = [
'username'=> $in["username"],
'member_uid'=> $userData["uuid"],
'random_text' => $randomText,
'status'=>1
];
$insert_id = $this->insert_db($pdata, 'members_password_reset');
if( $insert_id>=0){ // for now
}
}
/*
CREATE TABLE members_password_reset (
id SERIAL,
uuid UUID DEFAULT (gen_random_uuid()),
username VARCHAR(50) NOT NULL,
member_uid VARCHAR(50),
random_text VARCHAR(15),
status INT DEFAULT 0,
updated timestamp without time zone DEFAULT now(),
added timestamp without time zone DEFAULT now()
);
$inData =[
'username'=> $in["username"],
'email'=> $in["email"],
'password'=> $passEnr,
'firstname'=> $in["firstname"],
'lastname'=> $in["lastname"],
'random_text' => $randomText
];
$insert_id = $this->insert_db($inData, 'members_pending');
if( $insert_id>=0){ // for now
$sqlQ = "SELECT id AS insert_id,uuid FROM members WHERE username='".$in["username"]."' AND random_text='$randomText' AND password='$passEnr' LIMIT 1";
$query = $this->db->query($sqlQ);
$dat = $query->getResultArray();
$insert_id = $dat[0]['insert_id'];
$uuid = $dat[0]['uuid'];
$status=1;
}
*/
return $inx = [
'insert_id' => $insert_id,
'uuid' => $uuid,
'status' => $status,
'pdata' => $pdata,
'error_msg' => '',
'raw_data' => $in,
];
}
public function tempCodes(){
$sqlQ = "SELECT username,uuid,member_uid,random_text FROM members_password_reset WHERE status = 1 ORDER BY id DESC LIMIT 10";
$query = $this->db->query($sqlQ);
return $query->getResultArray();
}
private function encryptmd5($rwStstr){
$sqlQ = "SELECT md5('$rwStstr') AS md5_string";
log_message('critical', "encryptmd5-Entered".$sqlQ );
$query = $this->db->query($sqlQ);
$data = $query->getResultArray();
return $data[0]['md5_string'];
}
}
/*
CREATE TABLE members_login_hx (
id SERIAL,
member_id INT REFERENCES members(id) NOT NULL,
channel VARCHAR(15),
added timestamp without time zone DEFAULT now(),
loc INET
);
ALTER TABLE ONLY members_login_hx
ADD CONSTRAINT members_login_hx_id_key UNIQUE (id);*/