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

dicos/91_ninegate.xml

@@ -88,6 +88,7 @@
             <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_ssosynchroitem' description="Associer automatiquement les items en fonction d'un attribut SSO"><value>non</value></variable>
             <variable type='string'  name='ninegate_ssoreqitem' description="Attribut SSO associé à la notion d'item" mandatory='True'><value></value></variable>
+            <variable type='string'  name='ninegate_typesso' description="Mode de connexion SSO (Client ou Proxy)" mandatory='True'><value>client</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>
@@ -463,7 +464,8 @@
             <target type='variable'>ninegate_ssoreqgroup</target>
             <target type='variable'>ninegate_ssosynchroitem</target>
             <target type='variable'>ninegate_ssoreqitem</target>
-            
+            <target type='variable'>ninegate_typesso</target>
+
             <target type='variable'>ninegate_syncldap</target>
             <target type='variable'>ninegate_ldaptemplate</target>
             <target type='variable'>ninegate_scribegroup</target>
@@ -562,7 +564,15 @@
             <target type='variable'>ninegate_ssosynchrogroup</target>
             <target type='variable'>ninegate_ssoreqgroup</target>
             <target type='variable'>ninegate_ssosynchroitem</target>
-            <target type='variable'>ninegate_ssoreqitem</target>                
+            <target type='variable'>ninegate_ssoreqitem</target> 
+        </condition>
+
+        <condition name='hidden_if_in' source='ninegate_mode_auth'>
+            <param>SQL</param>
+            <param>LDAP</param>
+            <param>SAML</param>
+            
+            <target type='variable'>ninegate_typesso</target>                           
         </condition>
 
         <condition name='hidden_if_in' source='ninegate_syncldap'>
@@ -1636,6 +1646,10 @@
             <param>['CAS', 'SAML', 'SQL', 'LDAP']</param>
         </check>
 
+        <check name='valid_enum' target='ninegate_typesso'>
+            <param>['client', 'proxy']</param>
+        </check>
+
         <check name='valid_enum' target='ninegate_moderegistration'>
             <param>['none', 'byuser', 'byadmin']</param>
         </check>

src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php

@@ -30,7 +30,10 @@ class SecurityController extends Controller
 
         // Init Client CAS
         \phpCAS::setDebug("/var/log/phpcas/phpCAS-ninegate.log");
-        @\phpCAS::proxy(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), false);
+        if($this->getParameter("cas_type")=="client")
+            @\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);
+        else
+            @\phpCAS::proxy(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();
 
 
@@ -195,7 +198,10 @@ class SecurityController extends Controller
     public function logoutAction() {
         // Init Client CAS
         \phpCAS::setDebug(false);
-        @\phpCAS::proxy(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), true);
+        if($this->getParameter("cas_type")=="client")
+            @\phpCAS::client(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), true);
+        else
+            @\phpCAS::proxy(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), true);
         \phpCAS::setNoCasServerValidation();
 
 
@@ -209,7 +215,10 @@ class SecurityController extends Controller
 
         // Init Client CAS
         \phpCAS::setDebug("/var/log/phpcas/phpCAS-ninegate.log");
-        @\phpCAS::proxy(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), false);
+        if($this->getParameter("cas_type")=="client")
+            @\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);
+        else
+            @\phpCAS::proxy(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();
 
 
@@ -297,7 +306,7 @@ class SecurityController extends Controller
     }
 
     function imapunreadAction() {
-        if($this->getParameter("active_imapunread")) {
+        if($this->getParameter("active_imapunread")&&$this->getParameter("cas_type")=="proxy") {
             $ip=$this->getParameter("imapundread_ip");
 
             // Init Client CAS

src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php

@@ -973,7 +973,12 @@ class InitDataCommand extends ContainerAwareCommand
                 $entityItem->addGroup($groupall);
             }
             $entityItem->setUrl($widroundcube_url);
-            $entityItem->setBadgeurl("/ninegate/cas/imapunread");
+
+            if($this->getContainer()->getParameter('cas_type')=="proxy")
+                $entityItem->setBadgeurl("/ninegate/cas/imapunread");
+            else
+                $entityItem->setBadgeurl(null);
+                
             $em->persist($entityItem);            
         } 
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig

@@ -180,7 +180,7 @@
                         {%endif%}
 
                         <div class="grid-item {{ stylegrid }}" data-idcategory="bookmark" data-title="{{ bookmark.item.title|lower }}">
-                            <div class="grid-item-content" style="background-color: {{ bookmark.color ? "#"~bookmark.color : '#'~colormain }};">
+                            <div class="grid-item-content" style="background-color: {{ bookmark.item.color ? "#"~bookmark.item.color : '#'~colormain }};">
                                 {% if bookmark.item.content %}
                                 <a  style="cursor:pointer" class="item-preview"><i style="color: #FFF" class="fa fa-info" title="Informations sur ce service"></i></a>
                                 {% endif %}
@@ -207,10 +207,10 @@
 
                                     <div class="grid-item-title">
                                         <h2>{{ bookmark.item.title }}</h2>
+                                        <span>{{ bookmark.item.subtitle|nl2br }}</span>
                                         {% if not bookmark.item.badgeurl is empty %}
-                                            <div class="itembadgeurl badge badge-pill" data-url="{{bookmark.item.badgeurl}}" style="background-color: #449d44;"></div>
+                                            <div class="itembadgeurl badge badge-pill" data-url="{{bookmark.item.badgeurl}}" style="background-color: #ffffff; color: {{ bookmark.item.color ? "#"~bookmark.item.color : '#'~colormain }};"></div>
-                                        {% endif %}                                          
+                                        {% endif %}                                         
-                                        <span>{{ bookmark.item.subtitle|nl2br }}</<span>
                                     </div>                    
                                 </div>
                                 </a>
@@ -236,7 +236,7 @@
                         {% for bookmark in bookmarks %}
                             {% if bookmark.item %}
                                 <div class="grid-item {{ stylegrid }}" data-idcategory="bookmark" data-title="{{ bookmark.item.title|lower }}">
-                                    <div class="grid-item-content" style="background-color: {{ bookmark.color ? "#"~bookmark.color : '#'~colormain }};">
+                                    <div class="grid-item-content" style="background-color: {{ bookmark.item.color ? "#"~bookmark.item.color : '#'~colormain }};">
                                         {% if bookmark.item.content %}
                                         <a  style="cursor:pointer" class="item-preview"><i style="color: #FFF" class="fa fa-info" title="Informations sur ce service"></i></a>
                                         {% endif %}
@@ -263,10 +263,12 @@
 
                                             <div class="grid-item-title">
                                                 <h2>{{ bookmark.item.title }}</h2>
+                                                <span>{{ bookmark.item.subtitle|nl2br }}</span>
                                                 {% if not bookmark.item.badgeurl is empty %}
-                                                    <div class="itembadgeurl badge badge-pill" data-url="{{bookmark.item.badgeurl}}" style="background-color: #449d44;"></div>
+                                                    <div style="margin-top:5px;text-align:center;{% if stylegrid == "grid-list"%} float: right;position: absolute;top: 10px;right: -50px; {%endif%}">
-                                                {% endif %}                                                   
+                                                        <div class="itembadgeurl badge badge-pill" data-url="{{bookmark.item.badgeurl}}" style="background-color: #ffffff; color: {{ bookmark.color ? "#"~bookmark.color : '#'~colormain }};"></div>
-                                                <span>{{ bookmark.item.subtitle|nl2br }}</<span>
+                                                    </div>
+                                                {% endif %}                                                    
                                             </div>                    
                                         </div>
                                         </a>
@@ -301,7 +303,7 @@
 
                                             <div class="grid-item-title">
                                                 <h2>{{ bookmark.title }}</h2>
-                                                <span>{{ bookmark.subtitle|nl2br }}</<span>
+                                                <span>{{ bookmark.subtitle|nl2br }}</span>
                                             </div>                    
                                         </div>
                                         </a>
@@ -412,10 +414,12 @@
 
                                     <div class="grid-item-title">
                                         <h2>{{ item.title }}</h2>
+                                        <span>{{ item.subtitle|nl2br }}</span>
                                         {% if not item.badgeurl is empty %}
-                                            <div class="itembadgeurl badge badge-pill" data-url="{{item.badgeurl}}" style="background-color: #449d44;"></div>
+                                            <div style="margin-top:5px;text-align:center;{% if stylegrid == "grid-list"%} float: right;position: absolute;top: 10px;right: -50px; {%endif%}">
-                                        {% endif %}                                           
+                                                <div class="itembadgeurl badge badge-pill" data-url="{{item.badgeurl}}" style="background-color: #ffffff; color: {{ item.color ? "#"~item.color : '#'~colormain }};"></div>
-                                        <span>{{ item.subtitle|nl2br }}</<span>
+                                            </div>
+                                        {% endif %}                                          
                                     </div>                    
                                 </div>
                                 </a>

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig

@@ -89,7 +89,7 @@
                 {% for bookmark in bookmarks %}
                     {% if bookmark.item %}
                         <div class="grid-item {{ stylegrid }}" data-idcategory="bookmark" data-title="{{ bookmark.item.title|lower }}">
-                            <div class="grid-item-content" style="background-color: {{ bookmark.color ? "#"~bookmark.color : '#'~colormain }};">
+                            <div class="grid-item-content" style="background-color: {{ bookmark.item.color ? "#"~bookmark.item.color : '#'~colormain }};">
                                 {% if bookmark.item.content %}
                                 <a  style="cursor:pointer" class="item-preview"><i style="color: #FFF" class="fa fa-info" title="Informations sur ce service"></i></a>
                                 {% endif %}
@@ -106,9 +106,6 @@
                                 {% endif %}
 
                                 <div class="item-link clearfix">
-                                    {% if not bookmark.item.badgeurl is empty %}
-                                        <span class="badge badge-primary">3</span>
-                                    {% endif %}
                                     <div class="grid-item-logo" title="{{ bookmark.item.subtitle|nl2br }}">
                                         {% if bookmark.item.icon %}
                                             <img class="grid-item-img" src="/{{ alias }}/{{ bookmark.item.icon.label }}">
@@ -119,10 +116,12 @@
 
                                     <div class="grid-item-title">
                                         <h2>{{ bookmark.item.title }}</h2>
+                                        <span>{{ bookmark.item.subtitle|nl2br }}</span>
                                         {% if not bookmark.item.badgeurl is empty %}
-                                            <div class="itembadgeurl badge badge-pill" data-url="{{bookmark.item.badgeurl}}" style="background-color: #449d44;"></div>
+                                            <div style="margin-top:5px;text-align:center;{% if stylegrid == "grid-list"%} float: right;position: absolute;top: 10px;right: -50px; {%endif%}">
+                                                <div class="itembadgeurl badge badge-pill" data-url="{{bookmark.item.badgeurl}}" style="background-color: #ffffff; color: {{ bookmark.item.color ? "#"~bookmark.item.color : '#'~colormain }};"></div>
+                                            </div>
                                         {% endif %}                                        
-                                        <span>{{ bookmark.item.subtitle|nl2br }}</<span>
                                     </div>                    
                                 </div>
                                 </a>
@@ -207,10 +206,12 @@
 
                                 <div class="grid-item-title">
                                     <h2>{{ item.title }}</h2>
+                                    <span>{{ item.subtitle|nl2br }}</span>
                                     {% if not item.badgeurl is empty %}
-                                        <div class="itembadgeurl badge badge-pill" data-url="{{item.badgeurl}}" style="background-color: #449d44;"></div>
+                                        <div style="margin-top:5px;text-align:center;{% if stylegrid == "grid-list"%} float: right;position: absolute;top: 10px;right: -50px; {%endif%}">
-                                    {% endif %}
+                                            <div class="itembadgeurl badge badge-pill" data-url="{{item.badgeurl}}" style="background-color: #ffffff; color: {{ item.color ? "#"~item.color : '#'~colormain }};"></div>
-                                    <span>{{ item.subtitle|nl2br }}</<span>
+                                        </div>
+                                    {% endif %}                                      
                                 </div>                    
                             </div>
                             </a>

tmpl/ninegate-template.yml

@@ -540,6 +540,8 @@ parameters:
     cas_host: %%eolesso_adresse
     cas_path: %%getVar("eolesso_cas_folder", '')
     cas_port: %%eolesso_port
+    cas_type: %%getVar("ninegate_typesso", 'client')
+    
 
     # Si mode_aut = SAML
     saml_entityid: 'http://dev.nuonet.cadoles'