diff --git a/include/config.inc.php b/include/config.inc.php index a0769cb..b131814 100644 --- a/include/config.inc.php +++ b/include/config.inc.php @@ -19,9 +19,10 @@ $site = "Lalis"; $dossier = "/sftp"; $basedir = dirname( $_SERVER['DOCUMENT_ROOT'] ) . $dossier; -$base_url = "https://lalis69.ddns.net:10443/vote"; -$url_admin = $base_url . "/gestion"; -$accueil = $base_url . "/index.html"; +$base_url = "https://lalis69.ddns.net:10443/"; +$vote_url = $base_url . "vote/"; +$url_admin = $vote_url . "/gestion/"; +$accueil = $vote_url . "/index.html"; if (empty( $_SERVER["PHP_AUTH_USER"])) { $_SERVER["PHP_AUTH_USER"] = 'script'; diff --git a/include/fonctions.inc.php b/include/fonctions.inc.php index 5ad77e6..22c38a5 100644 --- a/include/fonctions.inc.php +++ b/include/fonctions.inc.php @@ -46,8 +46,6 @@ function mb_ucfirst($str) function choixVote($path, $idVotation, $confirm=false) { - global $base_url, $action; - $db = new db(); $query = "SELECT * FROM liste_votes WHERE idVotation=" . $idVotation; $result = $db->query($query); @@ -72,8 +70,6 @@ function choixVote($path, $idVotation, $confirm=false) function choixVotation($path, $methode = 2, $confirm = true) //2 = toutes les votations 0 = votations en cours 1 = votations cloturées { - global $base_url, $action; - $db = new db(); $query = "SELECT * FROM liste_votations"; if ($methode != 2) @@ -85,7 +81,6 @@ function choixVotation($path, $methode = 2, $confirm = true) //2 = toutes les v print ('
'); print "
";
-	print '';
 	foreach($votations as $key => $value )
 	{
 		print ' ' . $value["titre"] . ' :' . $value["libelle"] . '
';