Skip to content

Commit

Permalink
:fix doc: correction de l'affichage du fichier news.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Quinton committed Feb 19, 2019
1 parent 4940007 commit d77a043
Show file tree
Hide file tree
Showing 7 changed files with 69 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,6 @@ _minted*
# WinEdt
*.bak
*.sav
/sonar-scanner.sh
/.scannerwork/.sonar_lock
/.scannerwork/report-task.txt
3 changes: 2 additions & 1 deletion display/templates/apropos_fr.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ Le logiciel USACT permet de décrire les conflits d'usage dans un secteur géogr
<br>
Pour plus d'informations, consultez le wiki de l'application :
<a href="https://gitlab.irstea.fr/eric.quinton/usact/wikis/home">https://gitlab.irstea.fr/eric.quinton/usact/wikis/home</a>
<br>Pour les versions déployées depuis Github, consultez le wiki : https://github.com/Irstea/usact/wiki
<br>
Réalisation : Éric Quinton pour IRSTEA Bordeaux - © 2015-2018 - Tous droits réservés
Réalisation : Éric Quinton pour IRSTEA Bordeaux - © 2015-2019 - Tous droits réservés
14 changes: 14 additions & 0 deletions doc/quoideneuf.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@


<?php $fichier = file("param/news.txt");
$doc = "";
foreach ($fichier as $key => $value) {
if (substr($value, 1, 1) == "*" or substr($value, 0, 1) == "*") {
$doc .= "&nbsp;&nbsp;&nbsp;";
}
if ($APPLI_utf8 == true) utf8_encode($value);
$doc .= htmlentities($value) . "<br>";
}
$smarty->assign("texteNews", $doc);
$smarty->assign("corps", "documentation/quoideneuf.tpl");
?>
2 changes: 1 addition & 1 deletion param/actions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<apropos action="framework/apropos.php" ></apropos>
<testcalendrier action="test/testcalendrier.php"></testcalendrier>
<phpinfo action="framework/phpinfo.php" droits="admin" />
<quoideneuf action="doc/quoideneuf.php" ></quoideneuf>
<quoideneuf action="doc/quoideneuf.php" />
<setlanguage action='framework/setlanguage.php' retourlogin="1" />

<!-- Modules -->
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions param/param.default.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
*
* Parametres par defaut de l'application
*/
$APPLI_version = "1.1.2";
$APPLI_versiondate = "10/12/2018";
$APPLI_version = "1.1.3";
$APPLI_versiondate = "19/02/2019";
$language = "fr";
$DEFAULT_formatdate = "fr";
/*
Expand Down
47 changes: 47 additions & 0 deletions param/param.inc.php.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php
/** Fichier cree le 4 mai 07 par quinton
*
*UTF-8
*/

$APPLI_modeDeveloppement = false;
$APPLI_modeDeveloppement == true ? $ERROR_display=1 : $_ERROR_display = 0;
$ERROR_level = E_ERROR ;
$ADODB_debugmode = 0;
$OBJETBDD_debugmode = 1;
$APPLI_utf8 = true;

$ident_type = "LDAP-BDD";
/*
* Parametres concernant la base de donnees
*/
$BDD_login = "usact";
$BDD_passwd = "usactPassword";
$BDD_dsn = "pgsq:host=localhost;dbname=usact";
$BDD_schema = "usact";

/*
* Rights management, logins and logs records database
*/
$GACL_dblogin = "usact";
$GACL_dbpasswd = "usactPassword";
$GACL_aco = "usact";
$GACL_dsn = "pgsql:host=localhost;dbname=usact";
$GACL_schema = "gacl";

$APPLI_address = "http://localhost/usact";
$APPLI_mail = "[email protected]";
$APPLI_nom = "Usact";
$APPLI_code = 'usact';


$LDAPGROUP_address = "ldaps://ldap.societe.fr";
$LDAPGROUP_attributnomgroupe = "cn";
$LDAPGROUP_attributnomlogin = "memberuid";
$LDAPGROUP_basedngroup = "dc=societe,dc=fr";
$LDAP_address = "ldaps://ldap.societe.fr";
$LDAP_port = 636;
$LDAP_basedn = "ou=people,dc=societe,dc=fr";

$paramIniFile = "./param.ini";
?>

0 comments on commit d77a043

Please sign in to comment.