Commit bfc0b9e2 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'master' of git.unicaen.fr:dsi/sygal

parents 0ead4283 e553a1cd

code/contenu-fichier.php

+2 −1
Changes for code/contenu-fichier.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ use UnicaenApp\Util; 
//

//////////////////////////////////////////////////////////////////////////



set_time_limit(120);



/** @var FichierService $fs */

$fs = $controller->getServiceLocator()->get('FichierService');

$rootdir = $fs->getRootDirectoryPath();
@@ -31,7 +33,6 @@ $createdFiles = []; 
$existingFiles = [];

$totalSize = 0;





foreach ($result as $cf) {

    /** @var ContenuFichier $cf */

    $dir = $rootdir . '/' . strtolower($cf['fichier']['nature']['code']);

module/Application/src/Application/Filter/NomCompletFormatter.php

+2 −3
Changes for module/Application/src/Application/Filter/NomCompletFormatter.php: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ class NomCompletFormatter extends AbstractFilter 
        if ($value instanceof Individu) {

            /* @var $value Individu */

            $nomUsuel = $value->getNomUsuel();

            $nomPatro = "";

            $prenom   = $value->getPrenom();

            $nomPatro = $value->getNomPatronymique();

            $prenom   = $value->getPrenom($this->tousLesPrenoms);

            $civilite = $value->getCiviliteToString();

        }

        elseif ($value instanceof DoctorantInterface) {
@@ -108,7 +108,6 @@ class NomCompletFormatter extends AbstractFilter 


        $nomUsuel = ucfirst($this->nomEnMajuscule ? mb_strtoupper($nomUsuel) : $nomUsuel);

        $nomPatro = ucfirst($this->nomEnMajuscule ? mb_strtoupper($nomPatro) : $nomPatro);

        $prenom   = ucfirst(mb_strtolower($prenom));

        $civilite = $this->avecCivilite ? $civilite : null;



        $parts = [

public/.htaccess

+0 −3
Changes for public/.htaccess: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line 
#RewriteEngine On

#RewriteBase /unicaen-skeleton-application



# The following rule tells Apache that if the requested filename

# exists, simply serve it.

RewriteCond %{REQUEST_FILENAME} -s [OR]