lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: uniformize code

Browse Source
This commit is contained in:
Regis Houssin 2009-11-06 11:31:51 +00:00
parent b320208d3a
commit 1411cbf9ca
2 changed files with 15 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
htdocs/cashdesk/classes/Auth.class.php
View File

@ -19,25 +19,18 @@
class Auth {
protected $db;
protected $login;
protected $passwd;
protected $host;
protected $user;
protected $name;
protected $base;
protected $reponse;
protected $sql;
protected $sqlQuery;
public function __construct ($aHost, $aUser, $aPass, $aBase) {
$this->host = $aHost;
$this->user = $aUser;
$this->pass = $aPass;
$this->base = $aBase;
public function __construct ($DB) {
$this->db = $DB;
$this->reponse (null);
}
@ -53,34 +46,6 @@
$this->passwd = $aPasswd;
}
public function host ($aHost) {
$this->host = $aHost;
}
public function user ($aUser) {
$this->user = $aUser;
}
public function pass ($aPass) {
$this->pass = $aPass;
}
public function base ($aBase) {
$this->base = $aBase;
}
public function reponse ($aReponse) {
@ -91,27 +56,23 @@
/**
* Authentification d'un demandeur
* @return (int) 0 = Ok; -1 = login incorrect; -2 = login ok, mais compte d<EFBFBD>sactiv<EFBFBD>; -10 = aucune entr<EFBFBD>e trouv<EFBFBD>e dans la base
* @return (int) 0 = Ok; -1 = login incorrect; -2 = login ok, mais compte desactive; -10 = aucune entree trouvee dans la base
*/
protected function verif_utilisateurs () {
global $conf, $db;
//var_dump($conf->db);
//$sql = new Sql ($conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name);
$sql = $db;
global $conf;
// Verification des informations dans la base
$resql = $sql->query ($this->sql);
$resql = $this->db->query ($this->sqlQuery);
if ($resql)
{
$num = $sql->num_rows ($resql);
$num = $this->db->num_rows ($resql);
if ( $num ) {
// fetchFirst
$ret=array();
$tab = $sql->fetch_array($resql);
$tab = $this->db->fetch_array($resql);
foreach ( $tab as $cle => $valeur )
{
$ret[$cle] = $valeur;
@ -156,10 +117,10 @@
$this->login ($aLogin);
$this->passwd ($aPasswd);
$this->sql = "SELECT rowid, pass_crypted, statut
FROM ".MAIN_DB_PREFIX."user
WHERE login = '".$this->login."' and entity IN (0,".$conf->entity.")";
$this->sqlQuery = "SELECT rowid, pass_crypted, statut";
$this->sqlQuery.= " FROM ".MAIN_DB_PREFIX."user";
$this->sqlQuery.= " WHERE login = '".$this->login."'";
$this->sqlQuery.= " AND entity IN (0,".$conf->entity.")";
$this->verif_utilisateurs();

5
htdocs/cashdesk/index_verif.php
View File

@ -24,15 +24,12 @@ require ('classes/Auth.class.php');
$username = $_POST['txtUsername'];
$password = $_POST['pwdPassword'];
$auth = new Auth ($conf_db_host,$conf_db_user, $conf_db_pass, $conf_db_base );
$auth = new Auth($db);
$retour = $auth->verif ($username, $password);
if ( $retour >= 0 ) {
// $db = mysql_connect ($conf_db_host,$conf_db_user, $conf_db_pass);
// mysql_select_db ($conf_db_base, $db);
$res=$sql->query (
"SELECT rowid, name, firstname
FROM ".MAIN_DB_PREFIX."user