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

Merge remote-tracking branch 'origin/develop' into wip-2.9-design2016

Browse Source 
Conflicts:
	library/Application/Controller/Plugin/Auth.php
This commit is contained in:
Michael RICOIS 2016-09-21 09:42:19 +02:00
commit 05ed9c3178
11 changed files with 58 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/modules/default/controllers/SurveillanceController.php
View File

@ -163,8 +163,8 @@ class SurveillanceController extends Zend_Controller_Action
// --- Vérification des emails
$emails = explode(';', $email);
$emailsValid = true;
foreach ( $emails as $email ) {
if ( !$validateur->isValid($email) ) {
foreach ( $emails as $e ) {
if ( !$validateur->isValid($e) ) {
$emailsValid = false;
break;
}

21
application/modules/default/controllers/UserController.php
View File

@ -46,7 +46,7 @@ class UserController extends Zend_Controller_Action
$user = new Scores_Utilisateur();
if (!$user->checkPerm('MONPROFIL')){
$this->_forward('perms', 'error');
$this->forward('perms', 'error');
}
$this->view->assign('device_type', $user->getBrowserInfo()->mobile);
@ -467,9 +467,9 @@ class UserController extends Zend_Controller_Action
}
}
if (!empty($url) && $url!='/user/login' && $url!='/user/logout' && $url!='/localauth'){
$this->_redirect($url);
$this->redirect($url);
}
$this->_redirect('/');
$this->redirect('/');
}
//Auth error
else {
@ -481,6 +481,10 @@ class UserController extends Zend_Controller_Action
}
}
}
// Pas de validation du formulaire
else {
Zend_Registry::get('firebug')->info('DISPLAY');
}
}
/**
@ -515,6 +519,17 @@ class UserController extends Zend_Controller_Action
}
}
/**
* Erreur pour les connexions en ipOnly
*/
public function iponlyAction()
{
$this->_helper->layout()->disableLayout();
$request = $this->getRequest();
$message = $request->getParam('message');
$this->view->assign('message', $message);
}
/**
* Mettre à jour le mode edition en session sans refresh de la page
*/

8
application/modules/default/views/default/scripts/evaluation/cadastre.phtml
View File

@ -23,6 +23,8 @@
<?php } else {?>
<?php if (count($this->List) > 0) {?>
<h2>Propriétés baties</h2>
<div class="paragraph">
<table class="data">
@ -133,6 +135,12 @@
</table>
</div>
<?php } else {?>
Aucune information sur le patrimoine.
<?php }?>
<?php }?>
</div>

4
application/modules/default/views/default/scripts/finance/bilan.phtml
View File

@ -159,12 +159,12 @@
))?>
</div>
<h2>Soldes Intermédiaire de Gestion</h2>
<h2>Soldes Intermédiaires de Gestion</h2>
<div class="paragraph">
<table class="bilans">
<thead>
<tr>
<th colspan="2">SOLDES INTERMEDIAIRE DE GESTION</th>
<th colspan="2">SOLDES INTERMEDIAIRES DE GESTION</th>
<?php foreach($this->tabResultSig as $info) { ?>
<th class="date" >
<?=$info['dateCloture']?><br/><?=$info['duree']?>

2
application/modules/default/views/default/scripts/pieces/bilans.phtml
View File

@ -31,7 +31,7 @@ Les éléments disponibles ci-dessous en téléchargement ou commande peuvent fa
</div>
<h2>Compte annuels</h2>
<h2>Comptes annuels</h2>
<div class="paragraph">
<?php if ($this->ErreurMessage) {?>
<?=$this->ErreurMessage?>

1
application/modules/default/views/default/scripts/user/iponly.phtml Normal file
View File

@ -0,0 +1 @@
Scores & Decisions : <?=$this->message?>

1
application/modules/default/views/default/scripts/user/login.phtml
View File

@ -50,7 +50,6 @@
$('<div id="dlg"></div>').dialog(dlgOpts);
return false;
});
$('input').placeholder();
</script>
</div>

10
composer.lock generated
View File

@ -66,16 +66,16 @@
},
{
"name": "zendframework/zendframework1",
"version": "1.12.17",
"version": "1.12.20",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zf1.git",
"reference": "9f0bbc8b626bf35030afd766d9a7e506864e8e0b"
"reference": "737ef159654fbbef37cf9af742b2c8f9690c2ece"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zendframework/zf1/zipball/9f0bbc8b626bf35030afd766d9a7e506864e8e0b",
"reference": "9f0bbc8b626bf35030afd766d9a7e506864e8e0b",
"url": "https://api.github.com/repos/zendframework/zf1/zipball/737ef159654fbbef37cf9af742b2c8f9690c2ece",
"reference": "737ef159654fbbef37cf9af742b2c8f9690c2ece",
"shasum": ""
},
"require": {
@ -109,7 +109,7 @@
"ZF1",
"framework"
],
"time": "2015-11-23 15:11:10"
"time": "2016-09-08 14:50:34"
}
],
"packages-dev": [

19
library/Application/Controller/Plugin/Auth.php
View File

@ -18,6 +18,11 @@ class Application_Controller_Plugin_Auth extends Zend_Controller_Plugin_Abstract
$checkAuth = false;
}
$checkIp = $request->getParam('checkIp');
if ($checkIp !== null) {
$checkAuth = true;
}
if ($checkAuth) {
$login = $request->getParam('login');
@ -66,8 +71,18 @@ class Application_Controller_Plugin_Auth extends Zend_Controller_Plugin_Abstract
foreach ($result->getMessages() as $message) {
$messageF.= $message."<br/>";
}
$request->setModuleName('auth')->setControllerName('user')
->setActionName('logout')->setParam('message', $messageF);
if ($mode == 'iponly') {
$request->setModuleName('auth')
->setControllerName('user')
->setActionName('iponly')
->setParam('message', $messageF);
}
else {
$request->setModuleName('auth')
->setControllerName('user')
->setActionName('logout')
->setParam('message', $messageF);
}
}
// --- Sinon on reste sur le standard

6
library/Scores/Auth/Adapter/Ws.php
View File

@ -84,6 +84,8 @@ class Scores_Auth_Adapter_Ws implements Zend_Auth_Adapter_Interface
$parameters->from = 'auth';
$InfosLogin = $ws->getInfosLogin($parameters);
Zend_Registry::get('firebug')->info(__CLASS__ . ' : '.__METHOD__);
Zend_Registry::get('firebug')->info($InfosLogin);
// --- Renvoi
if ( is_string($InfosLogin) || $InfosLogin->error->errnum != 0 ) {
$message = $InfosLogin;
@ -156,8 +158,8 @@ class Scores_Auth_Adapter_Ws implements Zend_Auth_Adapter_Interface
$this->_username = $identity->username;
$this->_password = $identity->password;
return new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $identity);
} else {
}
else {
return new Zend_Auth_Result(Zend_Auth_Result::FAILURE_UNCATEGORIZED, $identity, array("Identification impossible"));
}
}

1
library/Scores/Ws/Client/Gestion.php
View File

@ -16,7 +16,6 @@ return array(
'getInfosLogin' => array(
'debug' => true,
'errorMsg' => array('ERR'),
'log' => 'mail',
),
'getListeClients' => array(
'log' => 'mail',