Merge branch 'master' into dist/envole/7/master

debian/compat

@@ -0,0 +1 @@
+7

debian/control

@@ -0,0 +1,24 @@
+Source: eole-ninesurvey
+Section: web
+Priority: optional
+Maintainer: Equipe Envole <eole@ac-dijon.fr>
+Build-Depends: debhelper (>= 7.0.50)
+Standards-Version: 3.8.4
+Homepage: http://eole.orion.education.fr/diff/
+Vcs-Git: http://dev-eole.ac-dijon.fr/git/ninesurvey
+Vcs-Browser: http://dev-eole.ac-dijon.fr/projects/ninesurvey/repository
+
+Package: ninesurvey-sso
+Architecture: all
+Depends: ${misc:Depends}, eole-sso
+Description: Filtre SSO pour ninesurvey "EOLE".
+
+Package: eole-ninesurvey
+Architecture: all
+Depends: ${misc:Depends}, eole-envole-dependances, ninesurvey-sso
+Description: Eolisation de l'application ninesurvey.
+
+Package: ninesurvey-apps
+Architecture: all
+Depends: ${misc:Depends}, envole-dependances-apps
+Description: Sources pour ninesurvey "EOLE".

debian/copyright

@@ -0,0 +1,44 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: {PROJECT}
+Source: {URL}
+
+Files: *
+Copyright: YEAR {UPSTREAM} {AUTHOR} <{MAIL}>
+License: {UPSTREAM LICENSE}
+
+Files: debian/*
+Copyright: 2012 Équipe EOLE <eole@ac-dijon.fr>
+License: CeCILL-2
+
+License: {UPSTREAM LICENSE}
+ {TEXT OF THE LICENSE}
+
+License: CeCILL-2
+ This software is governed by the CeCILL-2 license under French law and
+ abiding by the rules of distribution of free software.  You can  use,
+ modify and or redistribute the software under the terms of the CeCILL-2
+ license as circulated by CEA, CNRS and INRIA at the following URL
+ "http://www.cecill.info";.
+ .
+ As a counterpart to the access to the source code and  rights to copy,
+ modify and redistribute granted by the license, users are provided only
+ with a limited warranty  and the software's author,  the holder of the
+ economic rights,  and the successive licensors  have only  limited
+ liability.
+ .
+ In this respect, the user's attention is drawn to the risks associated
+ with loading,  using,  modifying and/or developing or reproducing the
+ software by the user in light of its specific status of free software,
+ that may mean  that it is complicated to manipulate,  and  that  also
+ therefore means  that it is reserved for developers  and  experienced
+ professionals having in-depth computer knowledge. Users are therefore
+ encouraged to load and test the software's suitability as regards their
+ requirements in conditions enabling the security of their systems and/or
+ data to be ensured and,  more generally, to use and operate it in the
+ same conditions as regards security.
+ .
+ The fact that you are presently reading this means that you have had
+ knowledge of the CeCILL-2 license and that you accept its terms.
+ .
+ On Eole systems, the complete text of the CeCILL-2 License can be found
+ in '/usr/share/common-licenses/CeCILL-2-en'.

debian/eole-ninesurvey.install

@@ -0,0 +1 @@
+usr/share/eole

debian/gbp.conf

@@ -0,0 +1,3 @@
+# Set per distribution debian tag
+[DEFAULT]
+debian-tag = debian/envole/%(version)s

debian/ninesurvey-apps.install

@@ -0,0 +1,2 @@
+var/www/html
+etc

debian/ninesurvey-sso.install

@@ -0,0 +1 @@
+usr/share/sso

debian/rules

@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

src/ninesurvey-1.0/src/Command/SynchroUsersCommand.php

@@ -102,17 +102,6 @@ class SynchroUsersCommand extends Command
         $ldapusers          = array();
         $ldapmails          = array();
         
-        // Suppression des groupe ninegate
-        $groups=$this->em->getRepository("App:Group")->findAll();
-        foreach($groups as $group) {
-            if($group->getIdexternal()) {
-                $this->writeln("    - Suppression dans Bundle  >> ".$group->getName());
-                if(!$simulate) {
-                    $this->em->remove($group);
-                    $this->em->flush();                           
-                }
-            }
-        }
 
         if($ldap_model=="scribe") {
             $this->writeln('');
@@ -158,32 +147,6 @@ class SynchroUsersCommand extends Command
                 if(!$simulate) $this->addmodGroup($label,$ldapfilter,true);                        
             }
 
-            // Elèves des Classes
-            $this->writeln('');
-            $this->writeln('== ELEVES DES CLASSES ==========================================');
-            $results = $this->ldap->search("type=Classe", ['cn','description','gidNumber'], $this->ldap_basedn);
-            foreach($results as $result) {
-                $cn=$result["cn"];
-                $ldapfilter="(&(type=Classe)(cn=$cn))";
-
-                $label="ELEVES - ".$result["cn"];
-                $this->writeln("    - $label");
-                if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);                        
-            }
-
-            // Professeurs des Classes
-            $this->writeln('');
-            $this->writeln('== PROFESSEURS DES CLASSES ==========================================');
-            $results = $this->ldap->search("type=Classe", ['cn','description','gidNumber'], $this->ldap_basedn);
-            foreach($results as $result) {
-                $cn=$result["cn"];
-                $ldapfilter="(|(&(type=Equipe)(cn=profs-$cn))(&(ENTPersonProfils=Administratif)(divcod=$cn)))";
-
-                $label="PROFESSEURS - ".$result["cn"];
-                $this->writeln("    - $label");
-                if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);                        
-            }
-
             // Options
             $this->writeln('');
             $this->writeln('== OPTIONS ==========================================');
@@ -416,6 +379,15 @@ class SynchroUsersCommand extends Command
         $this->writeln('== GROUPS ============================================');
         $groups=$this->em->getRepository("App:Group")->findAll();
         foreach($groups as $group) {
+            if($group->getIdexternal()) {
+                $this->writeln("    - Suppression dans Bundle  >> ".$group->getName());
+                if(!$simulate) {
+                    $this->em->remove($group);
+                    $this->em->flush();
+                                                
+                }
+            }
+
             if(!$group->getLdapfilter()) continue;
 
             if(!in_array($group->getId(),$this->ldapgroups)) {
@@ -444,23 +416,10 @@ class SynchroUsersCommand extends Command
         $this->writeln('== SYNCHONISATION NINEGATE TO BUNDLE ================');
         $this->writeln('=====================================================');
 
-
-        // Suppression des groupe annuaire
-        $groups=$this->em->getRepository("App:Group")->findAll();
-        foreach($groups as $group) {
-            if($group->getLdapfilter()) {
-                $this->writeln("    - Suppression dans Bundle  >> ".$group->getName());
-                if(!$simulate) {
-                    $this->em->remove($group);
-                    $this->em->flush();                     
-                }
-            }
-        }
-
         $appmasterurl = $this->container->getParameter("appMasterurl");
         $appmasterkey = $this->container->getParameter("appMasterkey");
 
-        // Généraltion de l'urol de communication
+        // Généraltion de l'url de communication
         if(stripos($appmasterurl,"/")===0) {
             $url="http://".$this->container->getParameter("appWeburl").$appmasterurl;
         }
@@ -482,6 +441,7 @@ class SynchroUsersCommand extends Command
         }
         catch (\Exception $e) {
             // On tente avec le proxy s'il y en a un
+            echo "pouet";
             $proxyUse = $this->container->getParameter("proxyUse");
             if($proxyUse) {
                 $proxyHost = $this->container->getParameter("proxyHost");
@@ -492,11 +452,11 @@ class SynchroUsersCommand extends Command
                     $response = \Unirest\Request::post($url.'/rest/login/'.$appmasterkey,$headers,$query);
                 }
                 catch (\Exception $e) {
-                    die("Erreur de communication API = ".$e->getMessage()."\n");
+                    die("Erreur de communication API with proxy $url = ".$e->getMessage()."\n");
                 }
             }
             else {
-                die("Erreur de communication API = ".$e->getMessage()."\n");
+                die("Erreur de communication API without proxy $url = ".$e->getMessage()."\n");
             }            
         }
         
@@ -664,6 +624,15 @@ class SynchroUsersCommand extends Command
         $this->writeln('== GROUPS ============================================');
         $groups=$this->em->getRepository("App:Group")->findAll();
         foreach($groups as $group) {
+            if($group->getLdapfilter()) {
+                $this->writeln("    - Suppression dans Bundle  >> ".$group->getName());
+                if(!$simulate) {
+                    $this->em->remove($group);
+                    $this->em->flush();
+                                                
+                }
+            }
+
             if(!$group->getIdexternal()) continue;
 
             if(!in_array($group->getIdexternal(),$lstgroups)) {

tmpl/ninesurvey-env.local

@@ -76,8 +76,8 @@ LDAP_USERNAME=uid
 LDAP_FIRSTNAME=givenname
 LDAP_LASTNAME=sn
 LDAP_EMAIL=mail
-LDAP_FILTERGROUP='(&(ObjectClass=posixGroup)(cn=*))'
-LDAP_FILTERUSER='(&(ObjectClass=person)(uid=*))'
+LDAP_FILTERGROUP=(cn=*)
+LDAP_FILTERUSER=(uid=*)
 %else
 LDAP_USERNAME=%%ninesurvey_ldapuid
 LDAP_FIRSTNAME=%%ninesurvey_ldapfirstname