Merge branch 'master' into dist/envole/6/master
This commit is contained in:
commit
173ceacc8e
|
@ -80,37 +80,43 @@
|
|||
|
||||
<variable type='oui/non' name='activer_ninegate' description='Activer Ninegate'><value>oui</value></variable>
|
||||
|
||||
<variable type='string' name='ninegate_masteridentity' description="Maître de l'Identité" mandatory='True'><value>LDAP</value></variable>
|
||||
<variable type='string' name='ninegate_mode_auth' description="Mode Authentification" mandatory='True'><value>CAS</value></variable>
|
||||
<variable type='string' name='ninegate_api_key' description="Clé d'accès API" mandatory='True'><value>APIKeyNinegate</value></variable>
|
||||
<variable type='string' name='ninegate_masteridentity' description="Maître de l'Identité" mandatory='True'><value>LDAP</value></variable>
|
||||
<variable type='string' name='ninegate_mode_auth' description="Mode Authentification" mandatory='True'><value>CAS</value></variable>
|
||||
<variable type='string' name='ninegate_api_key' description="Clé d'accès API" mandatory='True'><value>APIKeyNinegate</value></variable>
|
||||
|
||||
<variable type='oui/non' name='ninegate_ssosynchrogroup' description="Générer automatiquement les groupes en fonction d'un attribut SSO"><value>oui</value></variable>
|
||||
<variable type='string' name='ninegate_ssoreqgroup' description="Attribut SSO associé à la notion de groupe" mandatory='True'><value>user_groups</value></variable>
|
||||
|
||||
<variable type='oui/non' name='ninegate_syncldap' description="Synchroniser Ninegate vers votre Annuaire CadolesLDAP"><value>non</value></variable>
|
||||
<variable type='string' name='ninegate_ldaptemplate' description="Modèle d'annuaire"><value>scribe</value></variable>
|
||||
<variable type='string' name='ninegate_ldaptemplate' description="Modèle d'annuaire"><value>scribe</value></variable>
|
||||
<variable type='oui/non' name='ninegate_scribegroup' description="Considérer les classes/options comme des groupes de travail"><value>oui</value></variable>
|
||||
<variable type='oui/non' name='ninegate_scribemaster' description="Placer les professeurs comme manager des groupes classes/options"><value>oui</value></variable>
|
||||
<variable type='string' name='ninegate_scribemaster' description="Placer les professeurs comme manager des groupes classes/options"><value>oui</value></variable>
|
||||
<variable type='string' name='ninegate_openldapreqniveau01' description="Lors de l'initalisation de Ninegate requete LDAP utilisateur de votre premier Niveau01" mandatory='True'><value>(uid=*)</value></variable>
|
||||
<variable type='oui/non' name='ninegate_openldapsynchrogroup' description="Générer automatiquement les groupes en fonction de votre annuaire"><value>oui</value></variable>
|
||||
<variable type='string' name='ninegate_openldapreqgroup' description="Générer automatiquement les groupes en fonction de votre annuaire" mandatory='True'><value>(objectClass=posixGroup)</value></variable>
|
||||
|
||||
<variable type='string' name='ninegate_pwdadmin' description="Mot de passe du compte admin durant l'instance (idem valeur Cadoles ldap)" mandatory='True'><value></value></variable>
|
||||
<variable type='string' name='ninegate_organization' description="Nom de l'organisation principale (idem valeur Cadoles ldap)" mandatory='True'><value></value></variable>
|
||||
<variable type='string' name='ninegate_niveau01branche' description="Nom de la branche de Niveau 01 (idem valeur Cadoles ldap)" mandatory='True'><value>niveau01</value></variable>
|
||||
<variable type='string' name='ninegate_niveau02branche' description="Nom de la branche de Niveau 02 (idem valeur Cadoles ldap)" mandatory='True'><value>niveau02</value></variable>
|
||||
<variable type='string' name='ninegate_niveau01name' description="Nom de la première orgranisation de Niveau 01 (idem valeur Cadoles ldap)" mandatory='True'><value></value></variable>
|
||||
<variable type='string' name='ninegate_niveau01siren' description="SIREN de la première orgranisation de Niveau 01 (idem valeur Cadoles ldap)"><value></value></variable>
|
||||
<variable type='string' name='ninegate_pwdadmin' description="Mot de passe du compte admin durant l'instance (idem valeur Cadoles ldap)" mandatory='True'><value></value></variable>
|
||||
<variable type='string' name='ninegate_organization' description="Nom de l'organisation principale (idem valeur Cadoles ldap)" mandatory='True'><value></value></variable>
|
||||
<variable type='string' name='ninegate_niveau01branche' description="Nom de la branche de Niveau 01 (idem valeur Cadoles ldap)" mandatory='True'><value>niveau01</value></variable>
|
||||
<variable type='string' name='ninegate_niveau02branche' description="Nom de la branche de Niveau 02 (idem valeur Cadoles ldap)" mandatory='True'><value>niveau02</value></variable>
|
||||
<variable type='string' name='ninegate_niveau01name' description="Nom de la première orgranisation de Niveau 01 (idem valeur Cadoles ldap)" mandatory='True'><value></value></variable>
|
||||
<variable type='string' name='ninegate_niveau01siren' description="SIREN de la première orgranisation de Niveau 01 (idem valeur Cadoles ldap)"><value></value></variable>
|
||||
|
||||
<variable type='string' name='ninegate_niveau01label' description="Label singulier du niveau 01 d'organisation" mandatory='True'><value>Ecole</value></variable>
|
||||
<variable type='string' name='ninegate_niveau01labels' description="Label pluriel du niveau 01 d'organisation" mandatory='True'><value>Ecoles</value></variable>
|
||||
<variable type='string' name='ninegate_niveau01icon' description="Icon du niveau 01 d'organisation" mandatory='True'><value>fa-building</value></variable>
|
||||
<variable type='string' name='ninegate_niveau01label' description="Label singulier du niveau 01 d'organisation" mandatory='True'><value>Ecole</value></variable>
|
||||
<variable type='string' name='ninegate_niveau01labels' description="Label pluriel du niveau 01 d'organisation" mandatory='True'><value>Ecoles</value></variable>
|
||||
<variable type='string' name='ninegate_niveau01icon' description="Icon du niveau 01 d'organisation" mandatory='True'><value>fa-building</value></variable>
|
||||
|
||||
<variable type='oui/non' name='ninegate_niveau02view' description="Gérer un niveau 02 d'organisation"><value>non</value></variable>
|
||||
<variable type='string' name='ninegate_niveau02label' description="Label pluriel du niveau 02 d'organisation" mandatory='True'><value>Service</value></variable>
|
||||
<variable type='string' name='ninegate_niveau02labels' description="Label pluriel du niveau 02 d'organisation" mandatory='True'><value>Services</value></variable>
|
||||
<variable type='string' name='ninegate_niveau02icon' description="Icon du niveau 02 d'organisation" mandatory='True'><value>fa-sitemap</value></variable>
|
||||
<variable type='string' name='ninegate_niveau02label' description="Label pluriel du niveau 02 d'organisation" mandatory='True'><value>Service</value></variable>
|
||||
<variable type='string' name='ninegate_niveau02labels' description="Label pluriel du niveau 02 d'organisation" mandatory='True'><value>Services</value></variable>
|
||||
<variable type='string' name='ninegate_niveau02icon' description="Icon du niveau 02 d'organisation" mandatory='True'><value>fa-sitemap</value></variable>
|
||||
|
||||
<variable type='string' name='ninegate_colormain' description="Couleur principale" mandatory='True'><value>2c3e50</value></variable>
|
||||
<variable type='string' name='ninegate_fontcolorhover' description="Couleur des polices sur fond de couleur principale" mandatory='True'><value>FFFFFF</value></variable>
|
||||
<variable type='string' name='ninegate_colormain' description="Couleur principale" mandatory='True'><value>2c3e50</value></variable>
|
||||
<variable type='string' name='ninegate_fontcolorhover' description="Couleur des polices sur fond de couleur principale" mandatory='True'><value>FFFFFF</value></variable>
|
||||
|
||||
<variable type='string' name='ninegate_moderegistration' description="Mode de registration : none / byuser / byadmin" mandatory='True'><value>none</value></variable>
|
||||
<variable type='string' name='ninegate_keyterm' description="Durée de validité du jeton d'inscription" mandatory='True'><value>8</value></variable>
|
||||
<variable type='string' name='ninegate_minpassword' description="Taille minimun du password" mandatory='True'><value>8</value></variable>
|
||||
<variable type='string' name='ninegate_moderegistration' description="Mode de registration : none / byuser / byadmin" mandatory='True'><value>none</value></variable>
|
||||
<variable type='string' name='ninegate_keyterm' description="Durée de validité du jeton d'inscription" mandatory='True'><value>8</value></variable>
|
||||
<variable type='string' name='ninegate_minpassword' description="Taille minimun du password" mandatory='True'><value>8</value></variable>
|
||||
|
||||
|
||||
<!-- MODULE PORTAL -->
|
||||
|
@ -170,208 +176,208 @@
|
|||
<variable type="oui/non" name='ninegate_activate_widadminer' description='Activer Adminer' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widadminer_url' description='URL complète de votre Adminer' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widadminer_url' description='URL complète de votre Adminer' mandatory='True' />
|
||||
|
||||
<!-- BALADO -->
|
||||
<variable type="oui/non" name='ninegate_activate_widbalado' description='Activer Balado' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widbalado_url' description='URL complète de votre Balado' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widbalado_syncenvole' description='URL Posh-Profil pour synchronisation Balado' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widbalado_url' description='URL complète de votre Balado' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widbalado_syncenvole' description='URL Posh-Profil pour synchronisation Balado' mandatory='True' />
|
||||
|
||||
<!-- DOKUWIKI -->
|
||||
<variable type="oui/non" name='ninegate_activate_widdokuwiki' description='Activer Dokuwiki' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widdokuwiki_url' description='URL complète de votre Dokuwiki' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widdokuwiki_url' description='URL complète de votre Dokuwiki' mandatory='True' />
|
||||
|
||||
<!-- ECONNECT -->
|
||||
<variable type="oui/non" name='ninegate_activate_wideconnect' description='Activer eConnect' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_wideconnect_url' description='URL complète de votre eConnect' mandatory='True' />
|
||||
<variable type='string' name='ninegate_wideconnect_url' description='URL complète de votre eConnect' mandatory='True' />
|
||||
|
||||
<!-- EAD -->
|
||||
<variable type="oui/non" name='ninegate_activate_widead' description='Activer EAD' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widead_url' description='URL complète de votre EAD' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widead_url' description='URL complète de votre EAD' mandatory='True' />
|
||||
|
||||
<!-- EOE -->
|
||||
<variable type="oui/non" name='ninegate_activate_wideoe' description='Activer EOE' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_wideoe_url' description='URL complète de votre EOE' mandatory='True' />
|
||||
<variable type='string' name='ninegate_wideoe_url' description='URL complète de votre EOE' mandatory='True' />
|
||||
|
||||
<!-- EOP -->
|
||||
<variable type="oui/non" name='ninegate_activate_wideop' description='Activer EOP' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_wideop_url' description='URL complète de votre EOP' mandatory='True' />
|
||||
<variable type='string' name='ninegate_wideop_url' description='URL complète de votre EOP' mandatory='True' />
|
||||
|
||||
<!-- ETHERHOME -->
|
||||
<variable type="oui/non" name='ninegate_activate_widetherhome' description='Activer Etherhome' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widetherhome_url' description='URL complète de votre Etherhome' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widetherhome_url' description='URL complète de votre Etherhome' mandatory='True' />
|
||||
|
||||
<!-- FLUXBB -->
|
||||
<variable type="oui/non" name='ninegate_activate_widfluxbb' description='Activer Fluxbb' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widfluxbb_url' description='URL complète de votre Fluxbb' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widfluxbb_url' description='URL complète de votre Fluxbb' mandatory='True' />
|
||||
|
||||
<!-- GENCONFIG -->
|
||||
<variable type="oui/non" name='ninegate_activate_widgenconfig' description='Activer Genconfig' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widgenconfig_url' description='URL complète de votre Genconfig' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widgenconfig_url' description='URL complète de votre Genconfig' mandatory='True' />
|
||||
|
||||
<!-- GEPI -->
|
||||
<variable type="oui/non" name='ninegate_activate_widgepi' description='Activer GEPI' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widgepi_url' description='URL complète de votre GEPI' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widgepi_syncenvole' description='URL Posh-Profil pour synchronisation GEPI' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widgepi_url' description='URL complète de votre GEPI' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widgepi_syncenvole' description='URL Posh-Profil pour synchronisation GEPI' mandatory='True' />
|
||||
|
||||
<!-- GLPI -->
|
||||
<variable type="oui/non" name='ninegate_activate_widglpi' description='Activer GLPI' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widglpi_url' description='URL complète de votre GLPI' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widglpi_url' description='URL complète de votre GLPI' mandatory='True' />
|
||||
|
||||
<!-- GRR -->
|
||||
<variable type="oui/non" name='ninegate_activate_widgrr' description='Activer Grr' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widgrr_url' description='URL complète de votre Grr' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widgrr_url' description='URL complète de votre Grr' mandatory='True' />
|
||||
|
||||
<!-- KANBOARD -->
|
||||
<variable type="oui/non" name='ninegate_activate_widkanboard' description='Activer Kanboard' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widkanboard_url' description='URL complète de votre Kanboard' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widkanboard_url' description='URL complète de votre Kanboard' mandatory='True' />
|
||||
|
||||
<!-- LIMESURVEY -->
|
||||
<variable type="oui/non" name='ninegate_activate_widlimesurvey' description='Activer Limesurvey' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widlimesurvey_url' description='URL complète de votre Limesurvey' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widlimesurvey_apiuser' description='API User de votre Limesurvey' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widlimesurvey_apikey' description='API Key de votre Limesurvey' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widlimesurvey_syncenvole' description='URL Posh-Profil pour synchronisation Limesurvey' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widlimesurvey_url' description='URL complète de votre Limesurvey' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widlimesurvey_apiuser' description='API User de votre Limesurvey' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widlimesurvey_apikey' description='API Key de votre Limesurvey' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widlimesurvey_syncenvole' description='URL Posh-Profil pour synchronisation Limesurvey' mandatory='True' />
|
||||
|
||||
<!-- MINDMAPS -->
|
||||
<variable type="oui/non" name='ninegate_activate_widmindmaps' description='Activer Mindmaps' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widmindmaps_url' description='URL complète de votre Mindmaps' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widmindmaps_url' description='URL complète de votre Mindmaps' mandatory='True' />
|
||||
|
||||
<!-- MOODLE -->
|
||||
<variable type="oui/non" name='ninegate_activate_widmoodle' description='Activer Moodle' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widmoodle_url' description='URL complète de votre Moodle' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widmoodle_apikey' description='API Key de votre Moodle' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widmoodle_syncenvole' description='URL Posh-Profil pour synchronisation Moodle' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widmoodle_url' description='URL complète de votre Moodle' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widmoodle_apikey' description='API Key de votre Moodle' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widmoodle_syncenvole' description='URL Posh-Profil pour synchronisation Moodle' mandatory='True' />
|
||||
|
||||
<!-- NEXTCLOUD -->
|
||||
<variable type="oui/non" name='ninegate_activate_widnextcloud' description='Activer Nextcloud' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widnextcloud_url' description='URL complète de votre Nextcloud' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widnextcloud_syncenvole' description='URL Posh-Profil pour synchronisation Nextcloud' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widnextcloud_url' description='URL complète de votre Nextcloud' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widnextcloud_syncenvole' description='URL Posh-Profil pour synchronisation Nextcloud' mandatory='True' />
|
||||
|
||||
<!-- NINEBOARD -->
|
||||
<variable type="oui/non" name='ninegate_activate_widnineboard' description='Activer Nineboard' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widnineboard_url' description='URL complète de votre Nineboard' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widnineboard_url' description='URL complète de votre Nineboard' mandatory='True' />
|
||||
|
||||
<!-- ONLY OFFICE -->
|
||||
<variable type="oui/non" name='ninegate_activate_widonlyoffice' description='Activer OnlyOffice' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widonlyoffice_url' description='URL complète de votre Onlyoffice' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widonlyoffice_url' description='URL complète de votre Onlyoffice' mandatory='True' />
|
||||
<variable type="oui/non" name='ninegate_widonlyoffice_sync' description='Activer la Synchronisation Onlyoffice' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widonlyoffice_user' description='Login admin de votre Onlyoffice' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widonlyoffice_password' description='Password admin de votre Onlyoffice' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widonlyoffice_user' description='Login admin de votre Onlyoffice' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widonlyoffice_password' description='Password admin de votre Onlyoffice' mandatory='True' />
|
||||
|
||||
<!-- OPENSONDAGE -->
|
||||
<variable type="oui/non" name='ninegate_activate_widopensondage' description='Activer Opensondage' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widopensondage_url' description='URL complète de votre Opensondage' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widopensondage_url' description='URL complète de votre Opensondage' mandatory='True' />
|
||||
|
||||
<!-- PHPLDAPADMIN -->
|
||||
<variable type="oui/non" name='ninegate_activate_widphpldapadmin' description='Activer phpLdapAdmin' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widphpldapadmin_url' description='URL complète de votre phpLdapAdmin' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widphpldapadmin_url' description='URL complète de votre phpLdapAdmin' mandatory='True' />
|
||||
|
||||
<!-- PIWIK -->
|
||||
<variable type="oui/non" name='ninegate_activate_widpiwik' description='Activer Piwik' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widpiwik_url' description='URL complète de votre Piwik' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widpiwik_syncenvole' description='URL Posh-Profil pour synchronisation Piwik' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widpiwik_url' description='URL complète de votre Piwik' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widpiwik_syncenvole' description='URL Posh-Profil pour synchronisation Piwik' mandatory='True' />
|
||||
|
||||
<!-- ROUNDCUBE -->
|
||||
<variable type="oui/non" name='ninegate_activate_widroundcube' description='Activer Roundcube' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widroundcube_url' description='URL complète de votre Roundcube' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widroundcube_url' description='URL complète de votre Roundcube' mandatory='True' />
|
||||
|
||||
<!-- SACOCHE -->
|
||||
<variable type="oui/non" name='ninegate_activate_widsacoche' description='Activer Sacoche' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widsacoche_url' description='URL complète de votre Sacoche' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widsacoche_syncenvole' description='URL Posh-Profil pour synchronisation Sacoche' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widsacoche_url' description='URL complète de votre Sacoche' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widsacoche_syncenvole' description='URL Posh-Profil pour synchronisation Sacoche' mandatory='True' />
|
||||
|
||||
<!-- WORDPRESS -->
|
||||
<variable type="oui/non" name='ninegate_activate_widwordpress' description='Activer Wordpress' mandatory='True'>
|
||||
<value>non</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_widwordpress_url' description='URL complète de votre Wordpress' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widwordpress_syncenvole' description='URL Posh-Profil pour synchronisation Wordpress' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widwordpress_url' description='URL complète de votre Wordpress' mandatory='True' />
|
||||
<variable type='string' name='ninegate_widwordpress_syncenvole' description='URL Posh-Profil pour synchronisation Wordpress' mandatory='True' />
|
||||
|
||||
|
||||
|
||||
<!-- WEBSOCKET -->
|
||||
<variable type='string' name='ninegate_websocket_url' description='Host du serveur Websocket' mandatory='True' />
|
||||
<variable type='string' name='ninegate_websocket_portexterne' description='Port de commuinication externe du serveur Websocket' mandatory='True' >
|
||||
<variable type='string' name='ninegate_websocket_url' description='Host du serveur Websocket' mandatory='True' />
|
||||
<variable type='string' name='ninegate_websocket_portexterne' description='Port de commuinication externe du serveur Websocket' mandatory='True' >
|
||||
<value>5555</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_websocket_portinterne' description='Port de commuinication interne du serveur Websocket' mandatory='True'>
|
||||
<variable type='string' name='ninegate_websocket_portinterne' description='Port de commuinication interne du serveur Websocket' mandatory='True'>
|
||||
<value>5556</value>
|
||||
</variable>
|
||||
|
||||
|
||||
|
||||
<!-- EMAIL -->
|
||||
<variable type='string' name='ninegate_noreply' description='Adresse mail utilisé pour le noreply' mandatory='True' />
|
||||
<variable type='string' name='ninegate_noreply' description='Adresse mail utilisé pour le noreply' mandatory='True' />
|
||||
<variable type="oui/non" name='ninegate_activer_localmail' description="Utiliser le serveur d'envoi de mail local" mandatory='True'>
|
||||
<value>oui</value>
|
||||
</variable>
|
||||
<variable type='string' name='ninegate_smtphost' description='Host du serveur SMTP' />
|
||||
<variable type='string' name='ninegate_smtpport' description='Port du serveur SMTP' />
|
||||
<variable type='string' name='ninegate_smtpuser' description='Compte du serveur SMTP' />
|
||||
<variable type='string' name='ninegate_smtppwd' description='Fichier contenant le mot de passe associé du compte SMTP' />
|
||||
<variable type='string' name='ninegate_smtpencryption' description='Type Encryptage du serveur SMTP' />
|
||||
<variable type='string' name='ninegate_smtpauthmode' description='Mode Authentification du serveur SMTP' />
|
||||
<variable type='string' name='ninegate_smtphost' description='Host du serveur SMTP' />
|
||||
<variable type='string' name='ninegate_smtpport' description='Port du serveur SMTP' />
|
||||
<variable type='string' name='ninegate_smtpuser' description='Compte du serveur SMTP' />
|
||||
<variable type='string' name='ninegate_smtppwd' description='Fichier contenant le mot de passe associé du compte SMTP' />
|
||||
<variable type='string' name='ninegate_smtpencryption' description='Type Encryptage du serveur SMTP' />
|
||||
<variable type='string' name='ninegate_smtpauthmode' description='Mode Authentification du serveur SMTP' />
|
||||
|
||||
|
||||
|
||||
<!-- EOLEDB -->
|
||||
<variable type='string' name='ninegate_db_mode' description='Serveur de bases de données à utiliser' mode='expert'/>
|
||||
<variable type='string' name='ninegate_dbserver' description='Adresse du serveur de base de données' mode='expert'/>
|
||||
<variable type='number' name='ninegate_dbport' description="Port d'écoute du serveur de base de données" mode='expert'/>
|
||||
<variable type='string' name='ninegate_allow_hosts' description="Hôtes autorisés à utiliser la base de données" multi='True' mode='expert'/>
|
||||
<variable type='string' name='ninegate_dbuser' description='Utilisateur du serveur de base de données' mode='expert'/>
|
||||
<variable type='string' name='ninegate_dbpass' description='Fichier de mot de passe du serveur' mode='expert'/>
|
||||
<variable type='string' name='ninegate_db_mode' description='Serveur de bases de données à utiliser' mode='expert'/>
|
||||
<variable type='string' name='ninegate_dbserver' description='Adresse du serveur de base de données' mode='expert'/>
|
||||
<variable type='number' name='ninegate_dbport' description="Port d'écoute du serveur de base de données" mode='expert'/>
|
||||
<variable type='string' name='ninegate_allow_hosts' description="Hôtes autorisés à utiliser la base de données" multi='True' mode='expert'/>
|
||||
<variable type='string' name='ninegate_dbuser' description='Utilisateur du serveur de base de données' mode='expert'/>
|
||||
<variable type='string' name='ninegate_dbpass' description='Fichier de mot de passe du serveur' mode='expert'/>
|
||||
</family>
|
||||
|
||||
<separators>
|
||||
|
@ -423,11 +429,16 @@
|
|||
<target type='variable'>ninegate_mode_auth</target>
|
||||
<target type='variable'>ninegate_api_key</target>
|
||||
|
||||
<target type='variable'>ninegate_ssosynchrogroup</target>
|
||||
<target type='variable'>ninegate_ssoreqgroup</target>
|
||||
|
||||
<target type='variable'>ninegate_syncldap</target>
|
||||
<target type='variable'>ninegate_ldaptemplate</target>
|
||||
<target type='variable'>ninegate_scribegroup</target>
|
||||
<target type='variable'>ninegate_scribemaster</target>
|
||||
<target type='variable'>ninegate_openldapreqniveau01</target>
|
||||
<target type='variable'>ninegate_openldapsynchrogroup</target>
|
||||
<target type='variable'>ninegate_openldapreqgroup</target>
|
||||
|
||||
<target type='variable'>ninegate_pwdadmin</target>
|
||||
<target type='variable'>ninegate_organization</target>
|
||||
|
@ -507,6 +518,14 @@
|
|||
<target type='variable'>ninegate_test_conf_cadolesldap</target>
|
||||
</condition>
|
||||
|
||||
<condition name='hidden_if_in' source='ninegate_masteridentity'>
|
||||
<param>SQL</param>
|
||||
<param>LDAP</param>
|
||||
|
||||
<target type='variable'>ninegate_ssosynchrogroup</target>
|
||||
<target type='variable'>ninegate_ssoreqgroup</target>
|
||||
</condition>
|
||||
|
||||
<condition name='hidden_if_in' source='ninegate_syncldap'>
|
||||
<param>non</param>
|
||||
|
||||
|
@ -565,7 +584,12 @@
|
|||
<param name='mismatch'>non</param>
|
||||
</auto>
|
||||
|
||||
<!-- AFFICHAGE EN FONCTION DE SSO SYNCHRO GROUPE -->
|
||||
<condition name='hidden_if_in' source='ninegate_ssosynchrogroup'>
|
||||
<param>non</param>
|
||||
|
||||
<target type='variable'>ninegate_ssoreqgroup</target>
|
||||
</condition>
|
||||
|
||||
<!-- AFFICHAGE EN FONCTION DE CADOLESLDAP -->
|
||||
<fill name='calc_val' target='ninegate_pwdadmin'>
|
||||
|
@ -604,8 +628,22 @@
|
|||
<target type='variable'>ninegate_scribemaster</target>
|
||||
</condition>
|
||||
|
||||
|
||||
|
||||
<!-- AFFICHAGE EN FONCTION DU MODE OPEN -->
|
||||
<condition name='hidden_if_not_in' source='ninegate_ldaptemplate'>
|
||||
<param>open</param>
|
||||
|
||||
<target type='variable'>ninegate_openldapreqniveau01</target>
|
||||
<target type='variable'>ninegate_openldapsynchrogroup</target>
|
||||
<target type='variable'>ninegate_openldapreqgroup</target>
|
||||
</condition>
|
||||
|
||||
<!-- AFFICHAGE EN FONCTION DU LDAP SYNCHRO GROUP -->
|
||||
<condition name='hidden_if_in' source='ninegate_openldapsynchrogroup'>
|
||||
<param>non</param>
|
||||
|
||||
<target type='variable'>ninegate_openldapreqgroup</target>
|
||||
</condition>
|
||||
|
||||
<!-- AFFICHAGE EN FONCTION DU MODULE PORTAL -->
|
||||
<condition name='hidden_if_in' source='ninegate_activate_portal'>
|
||||
<param>non</param>
|
||||
|
|
|
@ -11,6 +11,7 @@ use Symfony\Component\EventDispatcher\EventDispatcher;
|
|||
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||
|
||||
use Cadoles\CoreBundle\Entity\User;
|
||||
use Cadoles\CoreBundle\Entity\Group;
|
||||
|
||||
class SecurityController extends Controller
|
||||
{
|
||||
|
@ -28,7 +29,7 @@ class SecurityController extends Controller
|
|||
$masteridentity=$this->getParameter("masteridentity");
|
||||
|
||||
// Init Client CAS
|
||||
\phpCAS::setDebug(false);
|
||||
\phpCAS::setDebug("/var/log/phpcas/phpCAS-ninegate.log");
|
||||
\phpCAS::client(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), false);
|
||||
\phpCAS::setNoCasServerValidation();
|
||||
|
||||
|
@ -42,12 +43,6 @@ class SecurityController extends Controller
|
|||
// Récupération Attribut
|
||||
$attributes = \phpCAS::getAttributes();
|
||||
|
||||
// Suppression des Attributs en tableaux
|
||||
foreach ($attributes as $key => $value) {
|
||||
if(is_array($value))
|
||||
unset($attributes[$key]);
|
||||
}
|
||||
|
||||
// Rechercher l'utilisateur
|
||||
$em = $this->getDoctrine()->getManager();
|
||||
if(isset($attributes[$this->getParameter('user_attr_cas_username')]))
|
||||
|
@ -62,6 +57,7 @@ class SecurityController extends Controller
|
|||
if(isset($attributes[$this->getParameter('user_attr_cas_firstname')]))
|
||||
$firstname = $attributes[$this->getParameter('user_attr_cas_firstname')];
|
||||
|
||||
|
||||
$user = $em->getRepository('CadolesCoreBundle:User')->findOneBy(array("username"=>$username));
|
||||
$exists = $user ? true : false;
|
||||
|
||||
|
@ -104,11 +100,18 @@ class SecurityController extends Controller
|
|||
$user->setAuthlevel("simple");
|
||||
$user->setRole("ROLE_USER");
|
||||
|
||||
if(in_array($username,$this->getParameter("ldap_usersadmin")))
|
||||
$user->setRole("ROLE_ADMIN");
|
||||
|
||||
$em->persist($user);
|
||||
$em->flush();
|
||||
|
||||
// Génération auto des groupes
|
||||
$this->submitGroup($attributes);
|
||||
|
||||
// On calcule les groupes de l'utilisateur
|
||||
$groups=$em->getRepository('CadolesCoreBundle:Group')->calculateGroup($user,$attributes);
|
||||
$user=$em->getRepository('CadolesCoreBundle:Group')->calculateGroup($user,$attributes);
|
||||
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
@ -122,14 +125,20 @@ class SecurityController extends Controller
|
|||
// On s'assure que le niveau 02 appartient bien au niveau 01 calculé
|
||||
$sameniveau01=(!is_null($user->getNiveau02())&&$niveau01==$user->getNiveau02()->getNiveau01());
|
||||
|
||||
// On calcule les groupes de l'utilisateur
|
||||
$user=$groups=$em->getRepository('CadolesCoreBundle:Group')->calculateGroup($user,$attributes);
|
||||
|
||||
$user->setLastname($lastname);
|
||||
$user->setFirstname($firstname);
|
||||
$user->setEmail($email);
|
||||
if(!$sameniveau01) $user->setNiveau02(null);
|
||||
|
||||
if(in_array($username,$this->getParameter("ldap_usersadmin")))
|
||||
$user->setRole("ROLE_ADMIN");
|
||||
|
||||
// Génération auto des groupes
|
||||
$this->submitGroup($attributes);
|
||||
|
||||
// On calcule les groupes de l'utilisateur
|
||||
$user=$em->getRepository('CadolesCoreBundle:Group')->calculateGroup($user,$attributes);
|
||||
|
||||
|
||||
$em->persist($user);
|
||||
$em->flush();
|
||||
}
|
||||
|
@ -179,4 +188,84 @@ class SecurityController extends Controller
|
|||
$url=$this->generateUrl('cadoles_core_home', array(), UrlGeneratorInterface::ABSOLUTE_URL);
|
||||
\phpCAS::logout(array("service"=>$url));
|
||||
}
|
||||
|
||||
public function testAction() {
|
||||
$em = $this->getDoctrine()->getManager();
|
||||
|
||||
// Init Client CAS
|
||||
\phpCAS::setDebug("/var/log/phpcas/phpCAS-ninegate.log");
|
||||
\phpCAS::client(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), false);
|
||||
\phpCAS::setNoCasServerValidation();
|
||||
|
||||
|
||||
// Authentification
|
||||
\phpCAS::forceAuthentication();
|
||||
|
||||
// Récupération UID
|
||||
$username = \phpCAS::getUser();
|
||||
|
||||
// Récupération Attribut
|
||||
$attributes = \phpCAS::getAttributes();
|
||||
$user = $em->getRepository('CadolesCoreBundle:User')->findOneBy(array("username"=>$username));
|
||||
|
||||
// On calcule le niveau01 de l'utilisateur
|
||||
$niveau01=$em->getRepository('CadolesCoreBundle:Niveau01')->calculateNiveau01($attributes);
|
||||
|
||||
// Génération auto des groupes
|
||||
$groups=$this->submitGroup($attributes);
|
||||
|
||||
// On calcule les groupes de l'utilisateur
|
||||
$user=$em->getRepository('CadolesCoreBundle:Group')->calculateGroup($user,$attributes);
|
||||
|
||||
return $this->render('CadolesCASBundle:Test:test.html.twig',[
|
||||
'useheader' => true,
|
||||
'usemenu' => false,
|
||||
'usesidebar' => false,
|
||||
'attributes' => $attributes,
|
||||
'user' => $user,
|
||||
'username' => $username,
|
||||
'niveau01' => $niveau01,
|
||||
]);
|
||||
|
||||
}
|
||||
|
||||
private function submitGroup($attributes) {
|
||||
$em = $this->getDoctrine()->getManager();
|
||||
|
||||
if(!$this->getParameter('ssosynchrogroup'))
|
||||
return null;
|
||||
|
||||
$user_attr_cas_group=$this->getParameter('user_attr_cas_group');
|
||||
|
||||
// Si l'utilisateur possège l'attribut groupe dans ses attributs
|
||||
if(array_key_exists($user_attr_cas_group,$attributes)) {
|
||||
if(!is_array($attributes[$user_attr_cas_group])) {
|
||||
$attributes[$user_attr_cas_group]=[$attributes[$user_attr_cas_group]];
|
||||
}
|
||||
|
||||
foreach($attributes[$user_attr_cas_group] as $ssogroup) {
|
||||
// Recherche du groupe
|
||||
$group=$em->getRepository("CadolesCoreBundle:Group")->findOneBy(["label"=>$ssogroup]);
|
||||
if(!$group) {
|
||||
$group=new Group();
|
||||
$group->setLabel($ssogroup);
|
||||
$group->setFgcancreatepage(false);
|
||||
$group->setFgcancreateblog(false);
|
||||
$group->setFgcancreatecalendar(false);
|
||||
$group->setFgcancreateproject(false);
|
||||
$group->setFgcanshare(false);
|
||||
$group->setFgopen(false);
|
||||
$group->setFgall(false);
|
||||
}
|
||||
|
||||
$group->setAttributes('{"'.$user_attr_cas_group.'":"'.$ssogroup.'"}');
|
||||
$group->setFgtemplate(false);
|
||||
|
||||
$em->persist($group);
|
||||
$em->flush();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,3 +6,7 @@ cas_sp.logout:
|
|||
path: /logout
|
||||
defaults: { _controller: CadolesCASBundle:Security:logout }
|
||||
|
||||
cas_sp.test:
|
||||
path: /test
|
||||
defaults: { _controller: CadolesCASBundle:Security:test }
|
||||
|
||||
|
|
|
@ -0,0 +1,35 @@
|
|||
{% extends '@CadolesCore/base.html.twig' %}
|
||||
|
||||
{% block pagewrapper %}
|
||||
<h1>TEST SSO</h1>
|
||||
|
||||
<h2>Atttribut SSO</h2>
|
||||
{% for key, attribute in attributes %}
|
||||
{% if attribute is iterable %}
|
||||
{% for value in attribute %}
|
||||
<strong>{{ key }}</strong> = {{ value }}<br>
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
<strong>{{ key }}</strong> = {{ attribute }}<br>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
|
||||
<h2>Correspondance Utilisateur Ninegate</h2>
|
||||
<strong>username</strong> = {{ user.username }}<br>
|
||||
<strong>firstname</strong> = {{ user.firstname }}<br>
|
||||
<strong>lastname</strong> = {{ user.lastname }}<br>
|
||||
<strong>email</strong> = {{ user.email }}<br>
|
||||
|
||||
<h2>Appartient au Niveau 01</h2>
|
||||
<strong>{{ niveau01.label }}</strong> = {{ niveau01.attributes }}
|
||||
|
||||
<h2>Appartient aux Groupes</h2>
|
||||
{% for usergroup in user.groups %}
|
||||
{% if not usergroup.group.attributes is empty %}
|
||||
<strong>{{usergroup.group.label}}</strong> = {{usergroup.group.attributes}}<br>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
|
||||
<br><br><br><br><br><br><br>
|
||||
{% endblock %}
|
|
@ -144,13 +144,27 @@ class InitDataCommand extends ContainerAwareCommand
|
|||
if($ldap_template=="scribe")
|
||||
$niveau01->setLdapfilter("(&(uid=*)(objectclass=inetOrgPerson)(!(description=Computer)))");
|
||||
else
|
||||
$niveau01->setLdapfilter("(uid=*)");
|
||||
$niveau01->setLdapfilter($this->getContainer()->getParameter('openldapreqniveau01'));
|
||||
|
||||
$em->persist($niveau01);
|
||||
$em->flush();
|
||||
}
|
||||
}
|
||||
|
||||
// On s'assure si masteridentity est à SSO qu'au minimum un niveau01 possède un attribut
|
||||
if($masteridentity=="SSO") {
|
||||
$niveau01=$em->createQueryBuilder()->select('n')->from('CadolesCoreBundle:Niveau01','n')->where('n.attributes IS NOT NULL')->getQuery()->getResult();
|
||||
if(!$niveau01) {
|
||||
// Si ce n'est pas le cas on positionne un attribut ultra large sur le niveau01 de base
|
||||
$niveau01=$group=$em->getRepository('CadolesCoreBundle:Niveau01')->find(-100);
|
||||
$niveau01->setAttributes('{"username":"*"}');
|
||||
|
||||
$em->persist($niveau01);
|
||||
$em->flush();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$output->writeln('');
|
||||
}
|
||||
|
||||
|
|
|
@ -174,6 +174,22 @@ class SynchroCommand extends Command
|
|||
if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);
|
||||
}
|
||||
}
|
||||
elseif($ldap_template=="open") {
|
||||
if($this->container->getParameter('openldapsynchrogroup')) {
|
||||
$this->writeln('');
|
||||
$this->writeln('== GROUPES ==========================================');
|
||||
|
||||
$results = $this->ldap->search($this->container->getParameter('openldapreqgroup'), ['cn','description','gidNumber'], $this->ldap_basedn);
|
||||
foreach($results as $result) {
|
||||
$cn=$result["cn"];
|
||||
$ldapfilter="(&".$this->container->getParameter('openldapreqgroup')."(cn=$cn))";
|
||||
|
||||
$label=$result["cn"];
|
||||
$this->writeln(" - $label");
|
||||
if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$this->writeln('');
|
||||
$this->writeln('== USERS ============================================');
|
||||
|
@ -760,6 +776,12 @@ class SynchroCommand extends Command
|
|||
|
||||
protected function addmodGroup($label,$ldapfilter,$fgcanshare) {
|
||||
$portal_activate = $this->container->getParameter('portal_activate');
|
||||
$group=$this->em->getRepository('CadolesCoreBundle:Group')->findOneBy(array('fgtemplate' => false, 'label' => $label));
|
||||
if($group) {
|
||||
$this->writelnred(" - ".$label." existe déjà comme groupe interne à Ninegate");
|
||||
return 0;
|
||||
}
|
||||
|
||||
$group=$this->em->getRepository('CadolesCoreBundle:Group')->findOneBy(array('fgtemplate' => true, 'label' => $label));
|
||||
if(!$group) {
|
||||
$group=new Group();
|
||||
|
|
|
@ -58,10 +58,10 @@ class TestRestCommand extends Command
|
|||
// key = parametre obligatoire
|
||||
// key = clé d'accès du l'api
|
||||
// only = paramétre optionnel
|
||||
// only = liste des informations désirés = user, items, bookmarks, groups, alerts
|
||||
// only = liste des informations désirés = user, items, bookmarks, groups, alerts, calendars
|
||||
$apiurl = $url."/rest/user/".$login;
|
||||
$this->writeln($apiurl);
|
||||
$response = \Unirest\Request::post($apiurl,$headers,["key"=>$masterapikey,"only"=>"user,items"]);
|
||||
$response = \Unirest\Request::post($apiurl,$headers,["key"=>$masterapikey,"only"=>"user,calendars"]);
|
||||
dump($response->body);
|
||||
|
||||
$this->writeln('');
|
||||
|
|
|
@ -34,7 +34,7 @@ class RestController extends Controller
|
|||
// key = parametre obligatoire
|
||||
// key = clé d'accès de l'api
|
||||
// only = paramétre optionnel
|
||||
// only = liste des informations désirés = user, items, bookmarks, groups, alerts
|
||||
// only = liste des informations désirés = user, items, bookmarks, groups, alerts, calendars
|
||||
public function userAction($login, Request $request)
|
||||
{
|
||||
$key=$request->get('key');
|
||||
|
@ -65,6 +65,8 @@ class RestController extends Controller
|
|||
if($only==""||in_array("groups",$only)) $output["groups"] = [];
|
||||
if($only==""||in_array("alerts",$only)) $output["alerts"] = [];
|
||||
if($only==""||in_array("alerts",$only)) $output["alertcategorys"] = [];
|
||||
if($only==""||in_array("calendars",$only)) $output["calendars"] = [];
|
||||
if($only==""||in_array("calendars",$only)) $output["calendarevents"] = [];
|
||||
|
||||
$bookmarks=null;
|
||||
$items=null;
|
||||
|
@ -94,7 +96,7 @@ class RestController extends Controller
|
|||
$tmp["url"] = $bookmark->getUrl();
|
||||
$tmp["target"] = $bookmark->getTarget();
|
||||
$tmp["order"] = 0;
|
||||
$tmp["color"] = ($bookmark->getColor()?$bookmark->getColor():$this->get('session')->get('color')["main"]);
|
||||
$tmp["color"] = "#".($bookmark->getColor()?$bookmark->getColor():$this->get('session')->get('color')["main"]);
|
||||
$tmp["icon"] = $weburl.($bookmark->getIcon()?$bookmark->getIcon()->getLabel():"uploads/icon/icon_pin.png");
|
||||
|
||||
array_push($output["bookmarks"],$tmp);
|
||||
|
@ -111,7 +113,7 @@ class RestController extends Controller
|
|||
$tmp["url"] = $item->getUrl();
|
||||
$tmp["target"] = $item->getTarget();
|
||||
$tmp["order"] = $item->getRoworder();
|
||||
$tmp["color"] = ($item->getColor()?$item->getColor():$this->get('session')->get('color')["main"]);
|
||||
$tmp["color"] = "#".($item->getColor()?$item->getColor():$this->get('session')->get('color')["main"]);
|
||||
$tmp["icon"] = $weburl.($item->getIcon()?$item->getIcon()->getLabel():"uploads/icon/icon_pin.png");
|
||||
$tmp["essential"] = $item->getEssential();
|
||||
$tmp["category"] = $item->getItemcategory()->getId();
|
||||
|
@ -126,7 +128,7 @@ class RestController extends Controller
|
|||
$tmp["id"] = $itemcategory->getId();
|
||||
$tmp["title"] = $itemcategory->getLabel();
|
||||
$tmp["order"] = $itemcategory->getRoworder();
|
||||
$tmp["color"] = ($itemcategory->getColor()?$itemcategory->getColor():$this->get('session')->get('color')["main"]);
|
||||
$tmp["color"] = "#".($itemcategory->getColor()?$itemcategory->getColor():$this->get('session')->get('color')["main"]);
|
||||
|
||||
array_push($output["itemcategorys"],$tmp);
|
||||
}
|
||||
|
@ -162,13 +164,39 @@ class RestController extends Controller
|
|||
$tmp=[];
|
||||
$tmp["id"] = $alertcategory->getId();
|
||||
$tmp["title"] = $alertcategory->getLabel();
|
||||
$tmp["color"] = ($alertcategory->getColor()?$alertcategory->getColor():$this->get('session')->get('color')["main"]);
|
||||
$tmp["color"] = "#".($alertcategory->getColor()?$alertcategory->getColor():$this->get('session')->get('color')["main"]);
|
||||
$tmp["icon"] = $weburl.($alertcategory->getIcon()?$alertcategory->getIcon()->getLabel():"uploads/icon/icon_pin.png");
|
||||
|
||||
array_push($output["alertcategorys"],$tmp);
|
||||
}
|
||||
}
|
||||
|
||||
if($only==""||in_array("calendars",$only)) {
|
||||
|
||||
$events=$em->getRepository("CadolesPortalBundle:Calendarevent")->getUserCalendarevents($user,$this->get('session')->get('color')["main"],null,null,$firstcalendar);
|
||||
foreach($events as $event) {
|
||||
$tmp=[];
|
||||
$tmp["id"] = $event["id"];
|
||||
$tmp["title"] = $event["title"];
|
||||
$tmp["description"] = $event["description"];
|
||||
$tmp['start'] = $event["start"];
|
||||
$tmp['end'] = $event["end"];
|
||||
$tmp['allday'] = $event["allDay"];
|
||||
$tmp['calendar'] = $event["calendar"];
|
||||
|
||||
array_push($output["calendarevents"],$tmp);
|
||||
|
||||
$tmp=[];
|
||||
$tmp["id"] = $event["calendar"];
|
||||
$tmp["title"] = $event["name"];
|
||||
$tmp["color"] = $event["color"];
|
||||
|
||||
if(!in_array($tmp,$output["calendars"]))
|
||||
array_push($output["calendars"],$tmp);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
// Retour
|
||||
|
|
|
@ -21,15 +21,15 @@ class GroupRepository extends \Doctrine\ORM\EntityRepository
|
|||
|
||||
foreach($attgroup as $key => $value) {
|
||||
if(array_key_exists($key,$attruser)) {
|
||||
if(is_array($value)) {
|
||||
foreach($value as $val) {
|
||||
if($val=="*")
|
||||
if(is_array($attruser[$key])) {
|
||||
foreach($attruser[$key] as $val) {
|
||||
if($value=="*")
|
||||
$retgroups->add($group);
|
||||
elseif($val==$attruser[$key])
|
||||
elseif($val==$value)
|
||||
$retgroups->add($group);
|
||||
}
|
||||
}
|
||||
elseif(array_key_exists($key,$attruser)) {
|
||||
else {
|
||||
if($value=="*")
|
||||
$retgroups->add($group);
|
||||
elseif($value==$attruser[$key])
|
||||
|
|
|
@ -15,15 +15,15 @@ class Niveau01Repository extends \Doctrine\ORM\EntityRepository
|
|||
|
||||
foreach($attniveau as $key => $value) {
|
||||
if(array_key_exists($key,$attruser)) {
|
||||
if(is_array($value)) {
|
||||
foreach($value as $val) {
|
||||
if($val=="*")
|
||||
if(is_array($attruser[$key])) {
|
||||
foreach($attruser[$key] as $val) {
|
||||
if($value=="*")
|
||||
return $niveau01;
|
||||
elseif($val==$attruser[$key])
|
||||
elseif($val==$value)
|
||||
return $niveau01;
|
||||
}
|
||||
}
|
||||
else if(array_key_exists($key,$attruser)) {
|
||||
else {
|
||||
if($value=="*")
|
||||
return $niveau01;
|
||||
elseif($value==$attruser[$key])
|
||||
|
|
|
@ -849,6 +849,7 @@ class PagewidgetController extends Controller
|
|||
|
||||
// Récupération des paramétres du widget
|
||||
$idalertcategory=null;
|
||||
$alertcategoryfilter=null;
|
||||
foreach($entity->getParameter()["fields"] as $parameter) {
|
||||
switch($parameter["id"]) {
|
||||
case "alertcategory":
|
||||
|
@ -863,88 +864,8 @@ class PagewidgetController extends Controller
|
|||
|
||||
// Profilage
|
||||
$user=$this->getUser();
|
||||
$roles=($user?$user->getRoles():["ROLE_ANONYME"]);
|
||||
$niveau01=($user?$user->getNiveau01():null);
|
||||
$groups=($user?$user->getGroups():[]);
|
||||
$alertsordered=$em->getRepository("CadolesPortalBundle:Alert")->getUserAlerts($user,$idalertcategory,$alertcategoryfilter);
|
||||
|
||||
// Initialisation du calcul des alerts
|
||||
$alerts=new ArrayCollection();
|
||||
|
||||
// Récupération des alerts par rôles
|
||||
foreach($roles as $role) {
|
||||
$qb = $em->createQueryBuilder();
|
||||
$qb->select('alert')
|
||||
->from("CadolesPortalBundle:Alert", 'alert')
|
||||
->where($qb->expr()->like('alert.roles', $qb->expr()->literal("%$role%")))
|
||||
->andWhere('alert.publishedat <= :today')
|
||||
->andWhere($qb->expr()->orX(
|
||||
$qb->expr()->gt('alert.unpublishedat', ':today'),
|
||||
$qb->expr()->isNull('alert.unpublishedat')
|
||||
))
|
||||
->setParameter('today', date('Y-m-d'));
|
||||
|
||||
if($idalertcategory && $alertcategoryfilter) {
|
||||
$qb->andWhere("alert.alertcategory=:alertcategory")
|
||||
->setParameter("alertcategory",$alertcategoryfilter);
|
||||
}
|
||||
$alertsroles=$qb->getQuery()->getResult();
|
||||
foreach($alertsroles as $alertrole) {
|
||||
if(!$alerts->contains($alertrole)&&!$alertrole->getReaders()->contains($this->getUser())) $alerts->add($alertrole);
|
||||
}
|
||||
}
|
||||
|
||||
// Récupération par Niveau01
|
||||
$qb = $em->createQueryBuilder();
|
||||
$qb->select('alert')
|
||||
->from("CadolesPortalBundle:Alert", 'alert')
|
||||
->where(":niveau01 MEMBER OF alert.niveau01s")
|
||||
->andWhere('alert.publishedat <= :today')
|
||||
->andWhere($qb->expr()->orX(
|
||||
$qb->expr()->gt('alert.unpublishedat', ':today'),
|
||||
$qb->expr()->isNull('alert.unpublishedat')
|
||||
))
|
||||
->setParameter("niveau01",$niveau01)
|
||||
->setParameter('today', date('Y-m-d'));
|
||||
|
||||
if($idalertcategory && $alertcategoryfilter) {
|
||||
$qb->andWhere("alert.alertcategory=:alertcategory")
|
||||
->setParameter("alertcategory",$alertcategoryfilter);
|
||||
}
|
||||
$alertsniveau01s=$qb->getQuery()->getResult();
|
||||
foreach($alertsniveau01s as $alertniveau01) {
|
||||
if(!$alerts->contains($alertniveau01)&&!$alertniveau01->getReaders()->contains($this->getUser())) $alerts->add($alertniveau01);
|
||||
}
|
||||
|
||||
// Récupération des alerts par group
|
||||
foreach($groups as $group) {
|
||||
$qb = $em->createQueryBuilder();
|
||||
$qb->select('alert')
|
||||
->from("CadolesPortalBundle:Alert", 'alert')
|
||||
->where(":group MEMBER OF alert.groups")
|
||||
->andWhere('alert.publishedat <= :today')
|
||||
->andWhere($qb->expr()->orX(
|
||||
$qb->expr()->gt('alert.unpublishedat', ':today'),
|
||||
$qb->expr()->isNull('alert.unpublishedat')
|
||||
))
|
||||
->setParameter("group",$group->getGroup())
|
||||
->setParameter('today', date('Y-m-d'));
|
||||
|
||||
if($idalertcategory && $alertcategoryfilter) {
|
||||
$qb->andWhere("alert.alertcategory=:alertcategory")
|
||||
->setParameter("alertcategory",$alertcategoryfilter);
|
||||
}
|
||||
$alertsgroups=$qb->getQuery()->getResult();
|
||||
foreach($alertsgroups as $alertgroup) {
|
||||
if(!$alerts->contains($alertgroup)&&!$alertgroup->getReaders()->contains($this->getUser())) $alerts->add($alertgroup);
|
||||
}
|
||||
}
|
||||
|
||||
// Trie des alerts
|
||||
$alertsordered = $alerts->getIterator();
|
||||
$alertsordered->uasort(function ($first, $second) {
|
||||
return (int) $first->getRowOrder() > (int) $second->getRowOrder() ? 1 : -1;
|
||||
});
|
||||
|
||||
// Render
|
||||
return $this->render($this->labelentity.':viewalert.html.twig', [
|
||||
'entity' => $entity,
|
||||
|
@ -1720,84 +1641,11 @@ class PagewidgetController extends Controller
|
|||
|
||||
// Préference utilisateur
|
||||
$this->getPreference($entity);
|
||||
|
||||
// On récupère soit les calendriers du group en cours soit l'ensemble des calendriers de l'utilisateur
|
||||
if($usage=="group") {
|
||||
$calendars=$em->getRepository("CadolesPortalBundle:Calendar")->getCalendarsGroup($this->getUser(),$group);
|
||||
if($calendars) $firstcalendar=$calendars[0]->getId();
|
||||
}
|
||||
else {
|
||||
$this->getDoctrine()->getRepository("CadolesPortalBundle:Calendar")->getCalendarsUser($this->getUser(),$calendarssuser,$calendarsadmin,$calendarsshared);
|
||||
$calendars=array_merge($calendarssuser,$calendarsadmin->toArray(),$calendarsshared);
|
||||
$firstcalendar="all";
|
||||
}
|
||||
|
||||
// Début & fin
|
||||
$start=new \DateTime();
|
||||
$start->setTime(0,0);
|
||||
|
||||
$end=new \DateTime();
|
||||
$end->setTime(0,0);
|
||||
$end->add(new \DateInterval('P3M'));
|
||||
$end->modify('last day of this month');
|
||||
|
||||
$events=[];
|
||||
$eventids=[];
|
||||
|
||||
foreach($calendars as $calendar) {
|
||||
$calendarevents = $this->getDoctrine()->getRepository("CadolesPortalBundle:Calendarevent")->getCalendareventByDate($calendar,$start,$end);
|
||||
|
||||
foreach($calendarevents as $calendarevent) {
|
||||
$tmp=[];
|
||||
$tmp['id'] = strval($calendarevent->getId());
|
||||
$tmp['title'] = $calendarevent->getName();
|
||||
$tmp['description'] = $calendarevent->getDescription();
|
||||
$tmp['start'] = $calendarevent->getStart();
|
||||
$tmp['end'] = $calendarevent->getEnd();
|
||||
$tmp['color'] = "#".(is_null($calendar->getColor())?$this->get('session')->get('color')["main"]:$calendar->getColor());
|
||||
$tmp['allDay'] = $calendarevent->getAllday();
|
||||
$tmp['calendar'] = $calendar->getId();
|
||||
$tmp['editable'] = $calendar->getCanupdate();
|
||||
|
||||
// Si évènement sur la journée on enlève une 1 seconde à la date de fin
|
||||
if($tmp['allDay'])
|
||||
$tmp['end']->sub(new \DateInterval('PT1S'));
|
||||
|
||||
array_push($events,$tmp);
|
||||
array_push($eventids,$tmp["id"]);
|
||||
}
|
||||
}
|
||||
|
||||
// On récupére les évenement partagé de l'utilisateur
|
||||
if($this->getUser()) {
|
||||
$calendarevents = $this->getDoctrine()->getRepository("CadolesPortalBundle:Calendarevent")->getCalendareventGroupsShareByDate($this->getUser(),$start,$end);
|
||||
foreach($calendarevents as $calendarevent) {
|
||||
if($usage=="group") {
|
||||
if(!$calendarevent->getGroups()->contains($groupentity)) continue;
|
||||
}
|
||||
|
||||
$tmp=[];
|
||||
$tmp['id'] = strval($calendarevent->getId());
|
||||
$tmp['title'] = $calendarevent->getName();
|
||||
$tmp['description'] = $calendarevent->getDescription();
|
||||
$tmp['start'] = $calendarevent->getStart();
|
||||
$tmp['end'] = $calendarevent->getEnd();
|
||||
$tmp['color'] = "#".(is_null($calendar->getColor())?$this->get('session')->get('color')["main"]:$calendar->getColor());
|
||||
$tmp['allDay'] = $calendarevent->getAllday();
|
||||
$tmp['calendar'] = $calendar->getId();
|
||||
$tmp['editable'] = $calendar->getCanupdate();
|
||||
|
||||
// Si évènement sur la journée on enlève une 1 seconde à la date de fin
|
||||
if($tmp['allDay'])
|
||||
$tmp['end']->sub(new \DateInterval('PT1S'));
|
||||
|
||||
if(!in_array($tmp['id'],$eventids)) {
|
||||
array_push($events,$tmp);
|
||||
array_push($eventids,$tmp["id"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Récupérer les events de l'utilisateur
|
||||
$user=$this->getUser();
|
||||
$events=$em->getRepository("CadolesPortalBundle:Calendarevent")->getUserCalendarevents($user,$this->get('session')->get('color')["main"],$usage,$group,$firstcalendar);
|
||||
|
||||
// Render
|
||||
return $this->render($this->labelentity.':viewcalendar.html.twig', [
|
||||
'entity' => $entity,
|
||||
|
|
|
@ -93,4 +93,89 @@ class CalendareventRepository extends EntityRepository
|
|||
|
||||
return $calendareventshared;
|
||||
}
|
||||
|
||||
public function getUserCalendarevents($user,$sessioncolor,$usage,$group,&$firstcalendar) {
|
||||
$em=$this->getEntityManager();
|
||||
|
||||
// On récupère soit les calendriers du group en cours soit l'ensemble des calendriers de l'utilisateur
|
||||
if($usage=="group") {
|
||||
$calendars=$em->getRepository("CadolesPortalBundle:Calendar")->getCalendarsGroup($user,$group);
|
||||
if($calendars) $firstcalendar=$calendars[0]->getId();
|
||||
}
|
||||
else {
|
||||
$em->getRepository("CadolesPortalBundle:Calendar")->getCalendarsUser($user,$calendarssuser,$calendarsadmin,$calendarsshared);
|
||||
$calendars=array_merge($calendarssuser,$calendarsadmin->toArray(),$calendarsshared);
|
||||
$firstcalendar="all";
|
||||
}
|
||||
|
||||
// Début & fin
|
||||
$start=new \DateTime();
|
||||
$start->setTime(0,0);
|
||||
|
||||
$end=new \DateTime();
|
||||
$end->setTime(0,0);
|
||||
$end->add(new \DateInterval('P3M'));
|
||||
$end->modify('last day of this month');
|
||||
|
||||
$events=[];
|
||||
$eventids=[];
|
||||
|
||||
foreach($calendars as $calendar) {
|
||||
$calendarevents = $em->getRepository("CadolesPortalBundle:Calendarevent")->getCalendareventByDate($calendar,$start,$end);
|
||||
|
||||
foreach($calendarevents as $calendarevent) {
|
||||
$tmp=[];
|
||||
$tmp['id'] = strval($calendarevent->getId());
|
||||
$tmp['title'] = $calendarevent->getName();
|
||||
$tmp['description'] = $calendarevent->getDescription();
|
||||
$tmp['start'] = $calendarevent->getStart();
|
||||
$tmp['end'] = $calendarevent->getEnd();
|
||||
$tmp['color'] = "#".(is_null($calendar->getColor())?$sessioncolor:$calendar->getColor());
|
||||
$tmp['allDay'] = $calendarevent->getAllday();
|
||||
$tmp['calendar'] = $calendar->getId();
|
||||
$tmp['name'] = $calendar->getName();
|
||||
$tmp['editable'] = $calendar->getCanupdate();
|
||||
|
||||
// Si évènement sur la journée on enlève une 1 seconde à la date de fin
|
||||
if($tmp['allDay'])
|
||||
$tmp['end']->sub(new \DateInterval('PT1S'));
|
||||
|
||||
array_push($events,$tmp);
|
||||
array_push($eventids,$tmp["id"]);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// On récupére les évenement partagé de l'utilisateur
|
||||
if($user) {
|
||||
$calendarevents = $em->getRepository("CadolesPortalBundle:Calendarevent")->getCalendareventGroupsShareByDate($user,$start,$end);
|
||||
foreach($calendarevents as $calendarevent) {
|
||||
if($usage=="group") {
|
||||
if(!$calendarevent->getGroups()->contains($groupentity)) continue;
|
||||
}
|
||||
|
||||
$tmp=[];
|
||||
$tmp['id'] = strval($calendarevent->getId());
|
||||
$tmp['title'] = $calendarevent->getName();
|
||||
$tmp['description'] = $calendarevent->getDescription();
|
||||
$tmp['start'] = $calendarevent->getStart();
|
||||
$tmp['end'] = $calendarevent->getEnd();
|
||||
$tmp['color'] = "#".(is_null($calendar->getColor())?$sessioncolor:$calendar->getColor());
|
||||
$tmp['allDay'] = $calendarevent->getAllday();
|
||||
$tmp['calendar'] = $calendar->getId();
|
||||
$tmp['name'] = $calendar->getName();
|
||||
$tmp['editable'] = $calendar->getCanupdate();
|
||||
|
||||
// Si évènement sur la journée on enlève une 1 seconde à la date de fin
|
||||
if($tmp['allDay'])
|
||||
$tmp['end']->sub(new \DateInterval('PT1S'));
|
||||
|
||||
if(!in_array($tmp['id'],$eventids)) {
|
||||
array_push($events,$tmp);
|
||||
array_push($eventids,$tmp["id"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
return $events;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,14 +1,8 @@
|
|||
[user]
|
||||
[attributes]
|
||||
user=uid
|
||||
|
||||
[username]
|
||||
username=uid
|
||||
|
||||
[firstname]
|
||||
firstname=givenName
|
||||
|
||||
[lastname]
|
||||
lastname=sn
|
||||
email=mail
|
||||
user_groups=user_groups
|
||||
|
||||
[email]
|
||||
email=mail
|
|
@ -203,6 +203,23 @@ parameters:
|
|||
scribe_master: false
|
||||
%end if
|
||||
|
||||
%if %%getVar("ninegate_ldaptemplate", 'non') == "open"
|
||||
openldapreqniveau01: %%ninegate_openldapreqniveau01
|
||||
|
||||
%if %%getVar("ninegate_openldapsynchrogroup", 'non') == "oui"
|
||||
openldapsynchrogroup: true
|
||||
openldapreqgroup: %%ninegate_openldapreqgroup
|
||||
%else
|
||||
openldapsynchrogroup: false
|
||||
openldapreqgroup:
|
||||
%end if
|
||||
%else
|
||||
openldapreqniveau01:
|
||||
openldapsynchrogroup: false
|
||||
openldapreqgroup:
|
||||
%end if
|
||||
|
||||
|
||||
|
||||
# Activation Widget
|
||||
%if %%getVar("ninegate_activate_widadminer", 'non') == "oui"
|
||||
|
@ -470,7 +487,15 @@ parameters:
|
|||
user_attr_saml_mail: mail
|
||||
user_attr_saml_lastname: sn
|
||||
user_attr_saml_firstname: givenName
|
||||
|
||||
|
||||
%if %%getVar("ninegate_ssosynchrogroup", 'non') == "oui"
|
||||
ssosynchrogroup: true
|
||||
user_attr_cas_group: %%ninegate_ssoreqgroup
|
||||
%else
|
||||
ssosynchrogroup: fase
|
||||
user_attr_cas_group:
|
||||
%end if
|
||||
|
||||
%if %%is_defined("ninegate_smtpport")
|
||||
mailer_port: '%%ninegate_smtpport'
|
||||
mailer_encryption: %%ninegate_smtpencryption
|
||||
|
|
Loading…
Reference in New Issue