scores/webservice
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge from branch 2.7

Browse Source
This commit is contained in:
Michael RICOIS 2015-05-20 12:55:46 +00:00
commit a78555bb77
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/Scores/Ws/Server.php
View File

@ -64,7 +64,7 @@ class Scores_Ws_Server
'91.121.157.194', //Extranet - ns359466
'78.31.45.206', //SDSL RAMBOUILLET
'127.0.0.1',
'192.168.*',
'192.168.33.1',
);
protected $listProxyIp = array(
@ -549,7 +549,7 @@ class Scores_Ws_Server
$this->authenticated = $this->checkAuth($username, $password, $ip);
if ( $this->authenticated === false ) {
$this->sendError('0900');
} elseif ( $this->authenticated !== true ) {
} elseif ( is_string($this->authenticated) ) {
$this->sendError($this->authenticated);
}

2
library/WsScore/Gestion/v0.4/Gestion.php
View File

@ -175,7 +175,7 @@ class Gestion extends Scores_Ws_Server
if ($param->label == 'time') {
$time = $param->value;
}
if ($param->label == 'MAIL') {
if ($param->label == 'mail') {
$user = $param->value;
}
}

30
scripts/build/config/_sql/sdv1.utilisateurs_emails.sql
View File

@ -1,7 +1,25 @@
--
-- Structure de la table `utilisateurs_emails`
--
CREATE TABLE IF NOT EXISTS `utilisateurs_emails` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`idClient` int(11) NOT NULL,
`login` varchar(50) NOT NULL,
`email` varchar(255) NOT NULL,
PRIMARY KEY (`id`)
) DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
`id` int(11) NOT NULL,
`idClient` int(11) NOT NULL COMMENT 'ID du client',
`login` varchar(50) NOT NULL COMMENT 'login de l''utilisateur',
`emailName` varchar(50) NOT NULL DEFAULT '' COMMENT 'Nom à afficher',
`email` varchar(255) NOT NULL COMMENT 'email de l''utilisateur',
`account` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'Email principal identique compte utilisateur',
`pSurveillance` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'email à utiliser pour la prestation surveillance',
`valid` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1 si email validé',
`validToken` varchar(40) NOT NULL DEFAULT '' COMMENT 'Clé généré pour la validation par lien de l''email'
) ENGINE=MyISAM AUTO_INCREMENT=10 DEFAULT CHARSET=latin1;
--
-- Index pour les tables exportées
--
--
-- Index pour la table `utilisateurs_emails`
--
ALTER TABLE `utilisateurs_emails`
ADD PRIMARY KEY (`id`);