Skip to content
Snippets Groups Projects

Hotline 6.47

Merged Hotline 6.47
hotline_6.47 into master
Merged Patrick Barroca requested to merge hotline_6.47 into master
Compare
and
+ 822
− 605
Preferences
Compare changes
Files
application/modules/admin/controllers/AccueilController.php
+ 55
− 63
@@ -28,7 +28,9 @@ class Admin_AccueilController extends Zend_Controller_Action {
private $_systemeModulesAccueil;
public function init() {
public function preDispatch() {
parent::preDispatch();
// Changer le layout
$viewRenderer = $this->getHelper('ViewRenderer');
$viewRenderer->setLayoutScript('subModal.phtml');
@@ -38,21 +40,13 @@ class Admin_AccueilController extends Zend_Controller_Action {
$this->id_profil = $this->_request->getParam("id_profil");
$this->config = $this->_request->getParam("config");
// On initalise les proprietes
if (!$this->profil = Class_Profil::getLoader()->find($this->id_profil)) {
if (!$this->profil = Class_Profil::find($this->id_profil)) {
$this->profil = Class_Profil::getCurrentProfil();
$this->id_profil = $this->profil->getId();
}
if (!$this->type_module = $this->_request->getParam("type_module")) {
$module_config = $this->profil->getModuleAccueilConfig($this->id_module);
$this->type_module = $module_config['type_module'];
}
xdebug_break();
$this->type_module = $this->_getParam('type_module');
$user = Class_Users::getIdentity();
if ((!$user->isAdminBib() && !$user->hasRightConfigFront())
@@ -61,13 +55,9 @@ class Admin_AccueilController extends Zend_Controller_Action {
return;
}
if ($this->config == "admin")
$this->preferences = $this->_extractProperties();
else
$this->preferences = $this->profil->getOrCreateConfigAccueil($this->id_module,
$this->type_module);
$this->preferences = ($this->config == 'admin') ?
$this->_extractProperties() :
$this->profil->getOrCreateConfigAccueil($this->id_module, $this->type_module);
$boite = isset($this->preferences["boite"]) ? $this->preferences["boite"] : '';
$this->view->preferences = $this->preferences;
@@ -78,25 +68,23 @@ class Admin_AccueilController extends Zend_Controller_Action {
$this->view->id_bib = $this->profil->getIdSite();
$this->_systemeModulesAccueil = new Class_Systeme_ModulesAccueil();
}
public function preDispatch(){
Zend_Layout::startMvc(array());
Zend_Layout::startMvc([]);
}
public function calendrierAction() {
$this->_simpleAction();
$this->_simpleAction('CALENDAR');
}
public function menuverticalAction() {
$this->_simpleAction();
$this->_simpleAction('MENU_VERTICAL');
}
public function rechguideeAction() {
$this->_simpleAction();
$this->_simpleAction('RECH_GUIDEE');
}
@@ -106,82 +94,85 @@ class Admin_AccueilController extends Zend_Controller_Action {
->setTagName('profil_redirect')
->addEmptyOption();
$this->_simpleAction();
$this->_simpleAction('RECH_SIMPLE');
}
public function cartezonesAction() {
$this->_simpleAction();
$this->_simpleAction('CARTE_ZONES');
}
public function sitothequeAction() {
$this->_simpleAction();
$this->_simpleAction('SITO');
}
public function domainBrowserAction() {
$this->view->module_settings = $this->profil->getModuleAccueilConfig($this->id_module)['preferences'];
$this->_simpleAction();
$this->view->module_settings = $this->profil
->getModuleAccueilConfig($this->id_module, 'DOMAIN_BROWSER')['preferences'];
$this->_simpleAction('DOMAIN_BROWSER');
}
public function formationsWidgetAction() {
$this->view->module_settings = $this->profil->getModuleAccueilConfig($this->id_module)['preferences'];
$this->_simpleAction();
$this->view->module_settings = $this->profil
->getModuleAccueilConfig($this->id_module, 'FORMATIONS_WIDGET')['preferences'];
$this->_simpleAction('FORMATIONS_WIDGET');
}
public function newsAction() {
if (1 == $this->_getParam('styles_reload')) {
$this->view->preferences = $this->_request->getPost();
} else {
$this->_simpleAction();
return;
}
$this->_simpleAction('NEWS');
}
public function rssAction() {
$this->_simpleAction();
$this->_simpleAction('RSS');
}
public function langueAction() {
$this->_simpleAction();
$this->_simpleAction('LANGUE');
}
public function loginAction() {
$this->_simpleAction();
$this->_simpleAction('LOGIN');
}
public function compteursAction() {
$this->_simpleAction();
$this->_simpleAction('COMPTEURS');
}
public function pretsAction() {
$this->_simpleAction();
$this->_simpleAction('PRETS');
}
public function historiqueRecherchesAction() {
$this->_simpleAction();
$this->_simpleAction('HISTORIQUE_RECHERCHES');
}
public function reservationsAction() {
$this->_simpleAction();
$this->_simpleAction('RESERVATIONS');
}
public function multimediaAction() {
$this->_simpleAction();
$this->_simpleAction('MULTIMEDIA');
}
public function newslettersAction() {
$this->_simpleAction();
$this->_simpleAction('NEWSLETTERS');
}
public function panierAction() {
$this->_simpleAction();
$this->_simpleAction('PANIER');
}
@@ -189,7 +180,7 @@ class Admin_AccueilController extends Zend_Controller_Action {
if (1 == $this->_getParam('styles_reload')) {
$this->view->preferences = $this->_request->getPost();
} else {
$this->_simpleAction();
$this->_simpleAction('BIB_NUMERIQUE');
}
$this->view->categories = Class_AlbumCategorie::getLoader()->getCollections();
@@ -208,7 +199,7 @@ class Admin_AccueilController extends Zend_Controller_Action {
$enreg['nombre'] = (int)$this->_getParam('nombre', 10);
$enreg['limite'] = (int)$this->_getParam('limite', 1000);
$enreg['type_tags'] = $enreg['type_tags_codes'];
$this->_updateEtRetour($enreg);
$this->_updateEtRetour($enreg, 'TAGS');
} else {
$this->view->catalogues = Class_Catalogue::getCataloguesForCombo();
}
@@ -227,7 +218,7 @@ class Admin_AccueilController extends Zend_Controller_Action {
$enreg["id_user"] = 0;
}
$this->_updateEtRetour($enreg);
$this->_updateEtRetour($enreg, 'CRITIQUES');
}
$this->view->catalogues = Class_Catalogue::getCataloguesForCombo();
@@ -262,7 +253,7 @@ class Admin_AccueilController extends Zend_Controller_Action {
$enreg["nb_requete"] = $nb_requete;
$enreg["nb_aff"] = $nb_aff;
$this->_updateEtRetour($enreg);
$this->_updateEtRetour($enreg, 'CATALOGUE');
}
}
@@ -272,7 +263,7 @@ class Admin_AccueilController extends Zend_Controller_Action {
if (1 == $this->_getParam('styles_reload')) {
$this->view->preferences = $this->_request->getPost();
} else {
$this->_updateConfig();
$this->_updateConfig('KIOSQUE');
}
}
@@ -312,19 +303,20 @@ class Admin_AccueilController extends Zend_Controller_Action {
}
protected function _updateConfig() {
protected function _updateConfig($type) {
$enreg = $this->_request->getPost();
$this->_unsetStyleReload($enreg);
$this->_setTypeDAnalyse($enreg);
$this->_setPanierOrDomaine($enreg);
$this->_updateEtRetour($enreg);
$this->_updateEtRetour($enreg, $type);
}
public function kiosqueChangeSelectionAction() {
$this->getHelper('ViewRenderer')->setNoRender();
$module_config = $this->profil->getModuleAccueilConfig($this->id_module);
$module_config = $this->profil
->getModuleAccueilConfig($this->id_module, 'KIOSQUE');
$selected_elementId = explode('-', $this->_request->getPost('domaine_panier'));
if($selected_elementId[0] == 'p') {
@@ -354,7 +346,7 @@ class Admin_AccueilController extends Zend_Controller_Action {
foreach (array('gauche', 'droite') as $colonne)
$this->_conteneur2colonnes_createModules($enreg, $colonne);
$this->_updateEtRetour($enreg);
$this->_updateEtRetour($enreg, 'CONTENEUR_DEUX_COLONNES');
return;
}
@@ -367,10 +359,11 @@ class Admin_AccueilController extends Zend_Controller_Action {
}
private function _simpleAction() {
private function _simpleAction($type) {
// pour combo des annexes
$this->view->ya_annexes=fetchAll("select count(*) from codif_annexe where invisible=0 order by libelle");
if ($this->_request->isPost()) $this->_updateEtRetour($this->_request->getPost());
$this->view->ya_annexes = fetchAll("select count(*) from codif_annexe where invisible=0 order by libelle");
if ($this->_request->isPost())
$this->_updateEtRetour($this->_request->getPost(), $type);
}
@@ -410,8 +403,7 @@ class Admin_AccueilController extends Zend_Controller_Action {
/**
* @param array $data
*/
protected function _updateEtRetour($data) {
protected function _updateEtRetour($data, $type) {
$enreg = [];
foreach ($data as $clef => $valeur)
@@ -420,13 +412,13 @@ class Admin_AccueilController extends Zend_Controller_Action {
if ($this->config == "admin") {
$this->view->id_module = $this->id_module;
$this->view->properties = $this->_compactProperties($enreg);
}else {
$module_config = $this->profil->getModuleAccueilConfig($this->id_module);
} else {
$module_config = $this->profil->getModuleAccueilConfig($this->id_module, $type);
$module_config['preferences'] = $enreg;
$this->profil
->updateModuleConfigAccueil($this->id_module, $module_config)
->save();
$this->view->reload = 'SITE';
}
@@ -475,7 +467,7 @@ class Admin_AccueilController extends Zend_Controller_Action {
$enreg[$id_key] = $id_module; // L'id module n'est pas dans le post.
if ($this->profil->getModuleAccueilConfig($id_module) == null)
if ($this->profil->getModuleAccueilConfig($id_module, $type_module) == null)
$id_module = null;
// Si le module existe et du même type, pas besoin de le créer
@@ -493,8 +485,8 @@ class Admin_AccueilController extends Zend_Controller_Action {
$preferences = $modules_accueil->getValeursParDefaut($type_module);
$preferences['conteneur_deux_colonnes_id'] = $this->id_module;
$config = array("preferences" => $preferences,
"type_module" => $type_module);
$config = ["preferences" => $preferences,
"type_module" => $type_module];
$this->profil->updateModuleConfigAccueil($id_module, $config);
}