major commit
This commit is contained in:
parent
70261fcd71
commit
d2e27f5cde
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
*~
|
||||
*.kate*
|
@ -1 +1 @@
|
||||
daniel:$apr1$Up83RCLZ$x46wYId2latEFsJARi/cL/
|
||||
daniel:$apr1$67uwe85A$ygTTmLOR/DxIJgPMqGVox.
|
||||
|
@ -3,7 +3,7 @@
|
||||
require_once '../session_init.php';
|
||||
require_once 'config.inc.php';
|
||||
require_once 'db.class.php';
|
||||
require_once 'entete.html';
|
||||
require_once 'entete.php';
|
||||
|
||||
$idVotation =$_GET["id"];
|
||||
|
||||
@ -21,7 +21,7 @@ $dolibarr = new dbDolibarr();
|
||||
|
||||
if (empty($idVotation))
|
||||
{
|
||||
choixVotation('/gestionsite/envoiMailing.php') ;
|
||||
choixVotation('./envoiMailing.php') ;
|
||||
}else
|
||||
{
|
||||
//chargement des données de la votation
|
||||
@ -59,6 +59,7 @@ if (empty($idVotation))
|
||||
print '<pre>' . $adherent['email'] . ' ' . $adherent['firstname'] . ' ' . $adherent['lastname'] . EOLH . nl2br($text) . '</pre>';
|
||||
if ( $_GET['status'] == 'Oui')
|
||||
{
|
||||
//print $text;
|
||||
envoiMail($adherent['email'], $sujet, $text, $html=false, $cc='', $bcc='');
|
||||
//envoiMail('dtux@free.fr', $sujet, $text, $html=false, $cc='', $bcc='');
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
require_once '../session_init.php';
|
||||
require_once 'config.inc.php';
|
||||
require_once './entete.html';
|
||||
require_once 'entete.php';
|
||||
|
||||
print(' <br><br>
|
||||
<!-- lalis Grid Section -->
|
||||
@ -20,7 +20,7 @@ print(' <br><br>
|
||||
<li><a href="creationVotation.php">nouvelle votations</a></li>
|
||||
<li><a href="modifVotation.php">Modifier une votation</a></li>
|
||||
<li><a href="cloturerVotation.php?action=cloture">Fermer une votation</a></li>
|
||||
<li><a href="envoiMailing.php.php">Envoyer le mailing</a></li>
|
||||
<li><a href="envoiMailing.php">Envoyer le mailing</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -3,7 +3,7 @@
|
||||
require_once '../session_init.php';
|
||||
require_once 'config.inc.php';
|
||||
require_once 'db.class.php';
|
||||
require_once './entete.html';
|
||||
require_once './entete.php';
|
||||
require_once 'fonctions.inc.php';
|
||||
|
||||
$action = $_GET["action"];
|
||||
@ -22,7 +22,7 @@ $db = new db();
|
||||
if (empty($action))
|
||||
{
|
||||
$action="modif";
|
||||
choixVotation('/gestionsite/modifVotation.php') ;
|
||||
choixVotation('./modifVotation.php') ;
|
||||
|
||||
}else
|
||||
{
|
||||
@ -31,7 +31,7 @@ if (empty($action))
|
||||
if ( empty($idVotation))
|
||||
{
|
||||
// choix de la votation à cloturer
|
||||
choixVotation('/gestionsite/modifVotation.php',1 );
|
||||
choixVotation('./modifVotation.php',1 );
|
||||
}else
|
||||
{
|
||||
$query = "UPDATE liste_votations SET status=0 WHERE id=" . $db->protect($idVotation); // clotûre
|
||||
|
@ -51,22 +51,22 @@
|
||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li class="hidden">
|
||||
<a href="https://lalis.fr/index.html#page-top"></a>
|
||||
<a href="<?php echo $site_path;?>/index.html#page-top"></a>
|
||||
</li>
|
||||
<li class="page-scroll">
|
||||
<a href="https://lalis.fr/index.html#content">Présentation</a>
|
||||
<a href="<?php echo $site_path;?>/index.html#content">Présentation</a>
|
||||
</li>
|
||||
<li class="page-scroll">
|
||||
<a href="https://lalis.fr/index.html#about">Nos engagements</a>
|
||||
<a href="<?php echo $site_path;?>/index.html#about">Nos engagements</a>
|
||||
</li>
|
||||
<li class="page-scroll">
|
||||
<a href="https://lalis.fr/index.html#horaires">Horaires</a>
|
||||
<a href="<?php echo $site_path;?>/index.html#horaires">Horaires</a>
|
||||
</li>
|
||||
<li class="page-scroll">
|
||||
<a href="https://lalis.fr/index.html#contact">Contact</a>
|
||||
<a href="<?php echo $site_path;?>/index.html#contact">Contact</a>
|
||||
</li>
|
||||
<li class="page-scroll">
|
||||
<a href="https://lalis.fr/index.html/votations.php">Votations</a>
|
||||
<a href="<?php echo $site_path;?>/votations.php">Votations</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div><div><a>Association loi 1901</a></div>
|
@ -76,7 +76,7 @@ function choixVotation($path, $methode=2) //2 = toutes les votations 1 = votat
|
||||
}
|
||||
$result = $db->query($query);
|
||||
$votations = $db->result->fetch_all(MYSQLI_ASSOC);
|
||||
print ('<form method="get" action="gestionsite/modifVotation.php">');
|
||||
print ('<form method="get" action="' . $path . '">');
|
||||
print "<pre>";
|
||||
if ($db->result->num_rows == 1)
|
||||
{
|
||||
@ -96,7 +96,7 @@ function choixVotation($path, $methode=2) //2 = toutes les votations 1 = votat
|
||||
}
|
||||
print '</pre><br>
|
||||
<div>
|
||||
<input type="submit" value="Voter">
|
||||
<input type="submit" value="Envoyer">
|
||||
</div>
|
||||
</form>';
|
||||
}
|
||||
|
@ -13,6 +13,6 @@ set_include_path(get_include_path() . ':' .$base_path . '/include');
|
||||
$cookiesparams = session_get_cookie_params();
|
||||
//session_set_cookie_params ( 0, $cookiesparams["path"], $cookiesparams["domain"], true, true );
|
||||
//session_start();
|
||||
|
||||
$site_path="https://lalis69.ddns.net:10443";
|
||||
|
||||
?>
|
||||
|
@ -4,7 +4,7 @@ require_once 'session_init.php';
|
||||
require_once 'config.inc.php';
|
||||
require_once 'db.class.php';
|
||||
require_once "log.php";
|
||||
require_once 'entete.html';
|
||||
require_once 'entete.php';
|
||||
|
||||
$idVotant = trim(base64_decode(urldecode($_GET["id"])), " \n\r");
|
||||
$idVotation = $_GET["v"];
|
||||
|
2
vote.php
2
vote.php
@ -3,7 +3,7 @@
|
||||
require "session_init.php";
|
||||
require "config.inc.php";
|
||||
require "db.class.php";
|
||||
require_once 'entete.html';
|
||||
require_once 'entete.php';
|
||||
|
||||
$idVotant=$_GET["id"];
|
||||
$votation=$_GET["v"];
|
||||
|
@ -3,7 +3,7 @@
|
||||
require_once 'session_init.php';
|
||||
require_once 'config.inc.php';
|
||||
require_once 'db.class.php';
|
||||
require_once 'entete.html';
|
||||
require_once 'entete.php';
|
||||
require_once 'fonctions.inc.php';
|
||||
print '<script type="text/javascript">
|
||||
function show(object, idVote)
|
||||
@ -20,21 +20,22 @@ print '<script type="text/javascript">
|
||||
|
||||
}
|
||||
</script>';
|
||||
$idVotation = $_GET["id"];
|
||||
$db = new db();
|
||||
|
||||
if ( empty($idVotation))
|
||||
{
|
||||
choixVotation('/vote.resultat.php');
|
||||
}else
|
||||
{
|
||||
print(' <br><br>
|
||||
$db = new db();
|
||||
print(' <br><br>
|
||||
<!-- lalis Grid Section -->
|
||||
|
||||
<section id="content">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-lg-12 text-center">
|
||||
<div class="col-lg-12 text-center"><h3>LISTE DES VOTATIONS</h3>');
|
||||
if ( empty( $_GET["id"]))
|
||||
{
|
||||
choixVotation('/vote.resultat.php');
|
||||
}else
|
||||
{
|
||||
$idVotation = $_GET["id"];
|
||||
print('
|
||||
<h3>VOTE</h3>
|
||||
<h4>');
|
||||
$query = 'SELECT *, UNIX_TIMESTAMP(DATE_ADD(dateFin, INTERVAL 1 DAY)) as tf FROM liste_votations WHERE id=' . $db->protect($idVotation);
|
||||
|
Reference in New Issue
Block a user