From 490a8bec7611798f67532ac258d7bc5496af36a9 Mon Sep 17 00:00:00 2001
From: efalcy <efalcy@afi-sa.fr>
Date: Fri, 18 Dec 2015 18:44:07 +0100
Subject: [PATCH] dev #33376 : redmine script , remove comments
---
.../admin/controllers/UsersController.php | 82 +-------
.../admin/views/scripts/users/_form.phtml | 180 +-----------------
2 files changed, 3 insertions(+), 259 deletions(-)
diff --git a/application/modules/admin/controllers/UsersController.php b/application/modules/admin/controllers/UsersController.php
index 45f88422dc8..8a9d6c73ca7 100644
--- a/application/modules/admin/controllers/UsersController.php
+++ b/application/modules/admin/controllers/UsersController.php
@@ -33,9 +33,9 @@ class Admin_UsersController extends ZendAfi_Controller_Action {
'actions' => ['add' => ['title' => $this->_("Ajouter un utilisateur")],
'edit' => ['title' => $this->_("Modifier le utilisateur: %s")],
'delete' => ['title' => $this->_("Supprimer le utilisateur: %s")]
- ],
+ ],
- 'form_class_name' => 'ZendAfi_Form_Admin_User'];
+ 'form_class_name' => 'ZendAfi_Form_Admin_User'];
}
@@ -79,84 +79,6 @@ class Admin_UsersController extends ZendAfi_Controller_Action {
}
-/* protected function _addOrEditUser($user) { */
-/* $class_role = new ZendAfi_Acl_AdminControllerRoles(); */
-
-/* // Retour du formulaire */
-/* if ($this->_request->isPost()) { */
-/* // Filtrage et controle des parametres */
-/* $data=ZendAfi_Filters_Post::filterStatic($this->_request->getPost()); */
-/* $data['ordre']=intval($data['ordre']); */
-/* if($data['role'] > 4) $data['bib']=0; */
-/* if($data['role'] < 2) {$data['id_abon']=0; $data['ordre']=0;} */
-
-/* $user_groups = array_filter( */
-/* array_map(function($id) { return Class_UserGroup::find((int)$id);}, */
-/* explode('-', isset($data['id_items']) ? $data['id_items'] : '')) */
-/* ); */
-
-/* $user */
-/* ->setLogin($data['username']) */
-/* ->setPassword($data['password']) */
-/* ->setNom($data['nom']) */
-/* ->setPrenom($data['prenom']) */
-/* ->setPseudo($data['pseudo']) */
-/* ->setMail($data['mail']) */
-/* ->setNaissance($data['naissance']) */
-/* ->setRoleLevel($data['role']) */
-/* ->setRole($class_role->rendNomRole($data['role'])) */
-/* ->setIdSite($data['bib']) */
-/* ->setIdabon($data['id_abon']) */
-/* ->setOrdreabon($data['ordre']) */
-/* ->setTelephone($data['telephone']) */
-/* ->setMobile($data['mobile']) */
-/* ->setCivilite($data['civilite']) */
-/* ->setAdresse($data['adresse']) */
-/* ->setVille($data['ville']) */
-/* ->setCodePostal($data['code_postal']) */
-/* ->setUserGroups($user_groups) */
-/* ->setRedmineLibrary(isset($data['redmine_library']) ? $data['redmine_library'] : null); */
-
-/* try { */
-/* if ($user->save()) */
-/* $this->_redirectToReferer(); */
-/* else */
-/* $this->view->erreurs = implode(BR, $user->getErrors()); */
-/* } catch (Exception $e) { */
-/* $this->view->erreurs = $e->getMessage(); */
-/* } */
-/* } */
-
-/* // Variables de vue */
-/* $this->view->user = $user; */
-
-/* $this->view->library_options = Class_AdminVar::isRedmineEnabled() */
-/* ? Class_Bib::findAllWithRedmine($user) */
-/* : []; */
-/* } */
-
-
-/* /\* //------------------------------------------------------------------------------------------------------ *\/ */
-/* /\* // Modification utilisateur *\/ */
-/* /\* //------------------------------------------------------------------------------------------------------ *\/ */
-/* /\* function editAction() { *\/ */
-/* /\* $id_user = $this->_request->getParam('id',0); *\/ */
-/* /\* $user = Class_Users::find($id_user); *\/ */
-/* /\* $this->view->titre = "Modifier l'utilisateur: ".$user->getLogin(); *\/ */
-
-/* /\* if ($this->_request->isPost()) *\/ */
-/* /\* $user->updateSIGBOnSave(); *\/ */
-
-/* /\* $this->_addOrEditUser($user); *\/ */
-/* /\* $this->view->id_user = $id_user; *\/ */
-/* /\* $this->view->action = 'edit'; *\/ */
-/* /\* if ($bib = $user->getBib()) { *\/ */
-/* /\* $this->view->id_bib = $bib->getId(); *\/ */
-/* /\* $this->view->id_zone = $bib->getIdZone(); *\/ */
-/* /\* } *\/ */
-/* /\* } *\/ */
-/* } */
-
protected function _getPost() {
$post = $this->_request->getPost();
$post['user_groups'] = array_filter(
diff --git a/application/modules/admin/views/scripts/users/_form.phtml b/application/modules/admin/views/scripts/users/_form.phtml
index 8a3df9d878d..6caeed980e5 100644
--- a/application/modules/admin/views/scripts/users/_form.phtml
+++ b/application/modules/admin/views/scripts/users/_form.phtml
@@ -1,179 +1 @@
-<?php echo $this->renderForm($this->form);
-
-
-
-/* /\* <script src="<?php echo URL_ADMIN_JS?>common.js"> </script> */
-/* <script src="<?php echo URL_ADMIN_JS?>subModal.js"> </script> */
-
-/* <link rel="stylesheet" type="text/css" media="screen" href="<?php echo URL_ADMIN_CSS?>subModal.css" /> */
-
-/* <div class="form"> */
-/* <form name="form" action="<?php echo BASE_URL ?>/admin/users/<?php print($this->action."/id/".$this->id_user); ?>"method="post"> */
-/* <fieldset> */
-/* <legend><?php echo $this->traduire('Utilisateur'); ?></legend> */
-/* <span id="abonne_erreur" class="abonne"><?php echo $this->erreurs; ?></span> */
-/* <table cellspacing="2"> */
-/* <tr> */
-/* <td class="droite">Identifiant *</td> */
-/* <td class="gauche"><input type="text" name="username" onkeypress="if (event.keyCode == 13) {javascript:PicToolbarOver( getElementById('menu_item975'), 'menu_item975');this.form.submit();return false;}" value="<?php echo $this->escape($this->user->getLogin());?>" maxlength="80"/></td> */
-/* </tr> */
-/* <tr> */
-/* <td class="droite">Mot de passe *</td> */
-/* <td class="gauche"><input type="password" name="password" onkeypress="if (event.keyCode == 13) {javascript:PicToolbarOver( getElementById('menu_item975'), 'menu_item975');this.form.submit();return false;}" value="<?php echo $this->escape($this->user->getPassword());?>"/></td> */
-/* </tr> */
-/* <tr> */
-/* <td class="droite">Nom </td> */
-/* <td class="gauche"><input type="text" name="nom" size="50" value="<?php echo $this->escape($this->user->getNom());?>"/></td> */
-/* </tr> */
-/* <tr> */
-/* <td class="droite">Prénom </td> */
-/* <td class="gauche"><input type="text" name="prenom" size="50" value="<?php echo $this->escape($this->user->getPrenom());?>"/></td> */
-/* </tr> */
-/* <tr> */
-/* <td class="droite">Pseudo </td> */
-/* <td class="gauche"><input type="text" name="pseudo" size="50" value="<?php echo $this->escape($this->user->getPseudo());?>"/></td> */
-/* </tr> */
-
-/* <tr> */
-/* <td class="droite">Civilité </td> */
-/* <td class="gauche"> */
-/* <?php */
-/* echo $this->formSelect('civilite', */
-/* $this->user->getCivilite(), */
-/* null, */
-/* [Class_Users::CIVILITE_INDEFINIE => 'Indéfinie', */
-/* Class_Users::CIVILITE_MADAME => 'Madame', */
-/* Class_Users::CIVILITE_MONSIEUR => 'Monsieur']); */
-/* ?> */
-/* </td> */
-/* </tr> */
-
-/* <tr> */
-/* <td class="droite">Date de naissance </td> */
-/* <td class="gauche"><input type="text" name="naissance" size="10" value="<?php echo $this->escape($this->user->getNaissance());?>"/></td> */
-/* </tr> */
-/* <tr> */
-/* <td class="droite"><?php echo $this->traduire('Rôle'); ?> </td> */
-/* <td class="gauche"> */
-/* <?php $comboListeRole = new ZendAfi_Acl_AdminControllerRoles(); */
-/* if ($this->user->isSuperAdmin()) */
-/* echo '<select disabled="disabled"><option selected="selected" value="7">super_admin</option></select><input type="hidden" value="' . ZendAfi_Acl_AdminControllerRoles::SUPER_ADMIN . '" name="role" id="role"/>'; */
-/* else */
-/* echo $this->user->isAbonne() */
-/* ? ZendAfi_Acl_AdminControllerRoles::getLibelleRole($this->user->getRoleLevel()) */
-/* : $comboListeRole->rendCombo($this->user->getRole(), $this->authUser->ROLE_LEVEL); */
-
-
-/* if ($this->user->isAbonne()) */
-/* echo $this->tag('input','',['type' =>'hidden', */
-/* 'value' => ZendAfi_Acl_AdminControllerRoles::ABONNE_SIGB, */
-/* 'name' => 'role', */
-/* 'id' => 'role']); */
-
-
-
-/* ?> */
-
-/* </td> */
-/* </tr> */
-
-/* <tr> */
-/* <td class="droite"><?php echo $this->traduire('Groupes'); ?> </td> */
-/* <td class="gauche"> */
-/* <?php */
-/* echo $this->getHelper('TreeSelect') */
-/* ->categoriesNotSelectable() */
-/* ->treeSelect(implode('-', $this->user->getUserGroupsIds()), */
-/* '', */
-/* true, */
-/* $this->url(['module' => 'admin', */
-/* 'controller' => 'usergroup', */
-/* 'action' => 'list.json']), */
-/* "form", */
-/* "usergroup_categories_ids"); */
-/* ?> */
-/* </td> */
-/* </tr> */
-
-
-/* <tr id="option_bib"> */
-/* <td class="droite">Bibliothèque </td> */
-/* <td class="gauche"> */
-/* <?php */
-/* if (($this->user->getRoleLevel() <= ZendAfi_Acl_AdminControllerRoles::ADMIN_BIB) and ($bib = Class_Bib::getLoader()->find($this->id_bib))) { */
-/* echo '<select disabled="disabled"><option selected="selected" value="'.$this->id_bib.'">'.$bib->LIBELLE.'</option></select> */
-/* <input type="hidden" value="'.$this->id_bib.'" name="bib" id="bib"/>'; */
-/* } else { */
-/* $bib = new Class_Bib(); */
-/* echo $bib->getComboBib($this->user->getIdSite()); */
-/* } */
-/* ?> */
-/* <script type="text/javascript"> */
-/* formSelectToggleVisibilityForElement("select[name='role']", */
-/* "#option_bib", */
-/* ["2", "3", "4"]); */
-/* formSelectToggleVisibilityForElement("select[name='role']", */
-/* "#abonne_sigb", "2"); */
-/* </script> */
-/* </td> */
-/* </tr> */
-/* <tr> */
-/* <td class="droite">E-mail </td> */
-/* <td class="gauche"><input type="text" name="mail" size="50" value="<?php echo $this->escape($this->user->getMail());?>"/></td> */
-/* </tr> */
-/* <tr> */
-/* <td class="droite">Téléphone </td> */
-/* <td class="gauche"><input type="text" name="telephone" size="50" value="<?php echo $this->escape($this->user->getTelephone());?>"/></td> */
-/* </tr> */
-/* <tr> */
-/* <td class="droite">Mobile </td> */
-/* <td class="gauche"><input type="text" name="mobile" size="50" value="<?php echo $this->escape($this->user->getMobile());?>"/></td> */
-/* </tr> */
-/* <tr> */
-/* <td class="droite">Adresse </td> */
-/* <td class="gauche"><textarea name="adresse" rows="5"><?php echo $this->escape($this->user->getAdresse());?></textarea></td> */
-/* </tr> */
-/* <tr> */
-/* <td class="droite">Code postal </td> */
-/* <td class="gauche"><input type="text" name="code_postal" size="10" value="<?php echo $this->escape($this->user->getCodePostal());?>"/></td> */
-/* </tr> */
-/* <tr> */
-/* <td class="droite">Ville </td> */
-/* <td class="gauche"><input type="text" name="ville" size="50" value="<?php echo $this->escape($this->user->getVille());?>"/></td> */
-/* </tr> */
-/* </table> */
-/* </fieldset> */
-
-/* <fieldset id="abonne_sigb"> */
-/* <legend><?php echo $this->traduire('Abonné sigb'); ?></legend> */
-/* <table cellspacing="2"> */
-/* <tr> */
-/* <td class="droite" style="width:150px">Numéro de carte </td> */
-/* <td class="gauche"><input type="text" name="id_abon" value="<?php echo $this->escape($this->user->getIdabon());?>"/></td> */
-/* </tr> */
-/* <tr> */
-/* <td class="droite">Ordre </td> */
-/* <td class="gauche"><input type="text" name="ordre" size="3" onkeypress="if (event.keyCode == 13) {javascript:PicToolbarOver( getElementById('menu_item975'), 'menu_item975');this.form.submit();return false;}" value="<?php echo $this->escape($this->user->getOrdreabon());?>"/></td> */
-/* </tr> */
-/* <tr> */
-/* <td class="droite">Abonnement valide - du </td> */
-/* <td class="gauche"><?php echo formatDate($this->user->getDateDebut(),1);?></td> */
-/* </tr> */
-/* <tr> */
-/* <td class="droite">au </td> */
-/* <td class="gauche"><?php echo formatDate($this->user->getDateFin(),1);?></td> */
-/* </tr> */
-/* </table> */
-
-/* <input type="hidden" name="id" value="<?php echo $this->user->getId(); ?>" /> */
-/* </fieldset> */
-/* <?php echo $this->Redmine_LibrarySelector($this->user->getRedmineLibrary(), $this->library_options); ?> */
-/* <table> */
-/* <tr> */
-/* <td align="right" style="padding-right:5px;"><?php echo $this->bouton('type=V'); ?> </td> */
-/* <td align="left" style="padding-left:5px;"> <?php echo $this->bouton('id=29','picto=del.gif','texte=Annuler','url='.BASE_URL.'/admin/users?z='.$this->id_zone.'&b='.$this->id_bib,'largeur=120px'); ?></td> */
-/* </tr> */
-/* </table> */
-/* </form> */
-/* </div> */
-?>
\ No newline at end of file
+<?php echo $this->renderForm($this->form); ?>
--
GitLab