admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve : New DEFINE NOALYSS_URL

Browse source
This commit is contained in:
Dany De Bontridder 2018-02-12 20:16:38 +01:00
parent 8dee00481a
commit 98a48dad32
3 changed files with 41 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
html/do.php
View file

@ -190,15 +190,19 @@ if ($cn->exist_table('version') == false)
}
if (DBVERSION < dossier::get_version($cn))
{
echo '<h2 class="error" style="font-size:12px">' . _("Attention: la version de base de donnée est supérieure à la version du programme, vous devriez mettre à jour") . '</h2>';
$a = _("cliquez ici pour mettre à jour ");
$base =NOALYSS_URL."/admin-noalyss.php?action=upgrade&sb=application";
echo '<h2 class="error" style="font-size:12px">' .
_("Attention: la version de base de donnée est supérieure à la version du programme, vous devriez mettre à jour") ,
'<a hreF="' . $base . '">' . $a . '</a></h2>',
'</h2>';
}
if (DBVERSION > dossier::get_version($cn))
{
echo '<h2 class="error" style="font-size:12px">' . _("Votre base de données n'est pas à jour") . ' ';
$a = _("cliquez ici pour appliquer le patch");
$base = dirname($_SERVER['REQUEST_URI']);
if ($base == '/') { $base = ''; }
$base .= '/admin-noalyss.php';
$base =NOALYSS_URL.'/admin-noalyss.php?action=upgrade&sb=database';
echo '<a hreF="' . $base . '">' . $a . '</a></h2>';
}

38
html/user_login.php
View file

@ -68,7 +68,7 @@ $hi=new HttpInput();
if ( $ac->exist_table('version') == false)
{
echo '<h2 class="error" style="font-size:12px">'._("Base de donnée invalide").'</h2>';
$base=dirname($_SERVER['REQUEST_URI']);
echo '<a hreF="'.NOALYSS_URL.'/user_login.php">'._("Retour").'</a></h2>';
exit();
}
@ -78,27 +78,30 @@ if ( $version < DBVERSIONREPO )
{
echo '<h2 class="error" style="font-size:12px">'._("Votre base de données n'est pas à jour").' ';
$a=_("cliquez ici pour appliquer le patch");
$base = dirname($_SERVER['REQUEST_URI']);
if ($base == '/') { $base = ''; }
$base .= '/admin-noalyss.php';
$base =NOALYSS_URL.'/admin-noalyss.php';
echo '<a hreF="'.$base.'">'.$a.'</a></h2>';
}
if ( $User->Admin() == 1)
{
if (SITE_UPDATE !="") {
$update=@file_get_contents(SITE_UPDATE);
if (SITE_UPDATE !="") {
$update=@file_get_contents(SITE_UPDATE);
if ($update > $version_noalyss ) {
echo '<div id="version_div" class="inner_box" style="width:25%;margin-left:10%;margin-top:3px;">';
echo '<p class="notice">';
printf ( "Mise à jour disponible de NOALYSS version actuelle : %s votre version %s ",$update,$version_noalyss);
echo '</p>';
echo '<p style="text-align:center"> <a class="button" onclick="document.body.removeChild(document.getElementById(\'version_div\'))">'.
_('Fermer').
"</a></p>";
echo '</div>';
}
}
echo '<div id="version_div" class="inner_box" style="width:25%;margin-left:10%;margin-top:3px;">';
echo '<p class="notice">';
printf ( "Mise à jour disponible de NOALYSS version actuelle : %s votre version %s ",$update,$version_noalyss);
// Link to admin_repo : upgrade application
$base =NOALYSS_URL."/admin-noalyss.php?action=upgrade&sb=application";
echo '<a hreF="' . $base . '">' . _("Cliquez ici pour mettre à jour") . '</a>';
echo '</p>';
echo '<p style="text-align:center"> <a class="button" onclick="document.body.removeChild(document.getElementById(\'version_div\'))">'.
_('Fermer').
"</a></p>";
echo '</div>';
}
}
}
include_once NOALYSS_INCLUDE."/lib/user_menu.php";
@ -144,12 +147,11 @@ if ( $User->admin == 0 || (defined("MULTI")&& MULTI == 0 ) )
if ( $folder != null && count($folder) == 1 )
{
redirect('do.php?gDossier='.$folder[0]['dos_id']);
redirect(NOALYSS_URL.'/do.php?gDossier='.$folder[0]['dos_id']);
exit();
}
}
$result="";
$result.="<table border=\"0\">";
$result.='<TR>';

14
include/constant.php
View file

@ -103,7 +103,9 @@ if ( !defined("SITE_UPDATE"))
define ("SITE_UPDATE",'http://www.noalyss.eu/last_version.txt');
if ( !defined("SITE_UPDATE_PLUGIN"))
define ("SITE_UPDATE_PLUGIN",'http://www.noalyss.eu/plugin_last_version.txt');
if ( !defined ("NOALYSS_PACKAGE_REPOSITORY")) {
define ("NOALYSS_PACKAGE_REPOSITORY","https://package.noalyss.eu/");
}
// If you don't want that the system information is accessible
if ( ! defined ("SYSINFO_DISPLAY")) {
define ("SYSINFO_DISPLAY",TRUE);
@ -311,3 +313,13 @@ define ('EXC_PARAM_TYPE',1006);
define ('EXC_DUPLICATE',1200);
define ("UNPINDG","&#xf047;");
define ("PINDG","&#xe809;");
// Url of NOALYSS (http://...)
//
if ( ! defined ("NOALYSS_URL")) {
$base=$_SERVER['REQUEST_SCHEME'].'://'.
$_SERVER['HTTP_HOST'].
":".$_SERVER['SERVER_PORT'].
dirname($_SERVER['PHP_SELF']);
define ("NOALYSS_URL",$base);
}