Skip to content
Snippets Groups Projects
Commit a3242dab authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: Correction bug création adhérent 

Look: Mise au norme du look d'une partie de la zone adhérent.
parent 81b99269
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
htdocs/adherents/XML-RPC.functions.php
+ 18
− 15
View file @ a3242dab
......@@ -10,6 +10,9 @@ This code is Open Source, released under terms similar to the Artistic License.
Read the license at http://www.keithdevens.com/software/license/
Note: this code requires version 4.1.0 or higher of PHP.
Adaptation pour fonctionnner en PHP 5.0
*/
function & XML_serialize(&$data, $level = 0, $prior_key = NULL){
......@@ -80,7 +83,7 @@ class XML {
$this->parser = xml_parser_create();
xml_parser_set_option ($this->parser, XML_OPTION_CASE_FOLDING, 0);
xml_set_object($this->parser, &$this);
xml_set_object($this->parser, $this);
xml_set_element_handler($this->parser, "open", "close");
xml_set_character_data_handler($this->parser, "data");
# register_shutdown_function(array(&$this, 'destruct'));
......@@ -133,7 +136,7 @@ class XML {
$this->parent[$key] = array();
$this->parent = &$this->parent[$key];
array_unshift($this->parents, &$this->parent);
array_unshift($this->parents, $this->parent);
}
function data($parser, $data){
......@@ -156,7 +159,7 @@ class XML {
function & XML_unserialize(&$xml){
$xml_parser = new XML();
$data = &$xml_parser->parse(&$xml);
$data = &$xml_parser->parse($xml);
$xml_parser->destruct();
return $data;
}
......@@ -165,7 +168,7 @@ function & XMLRPC_parse(&$request){
if(defined('XMLRPC_DEBUG') and XMLRPC_DEBUG){
XMLRPC_debug('XMLRPC_parse', "<p>Received the following raw request:</p>" . XMLRPC_show($request, 'print_r', true));
}
$data = &XML_unserialize(&$request);
$data = &XML_unserialize($request);
if(defined('XMLRPC_DEBUG') and XMLRPC_DEBUG){
XMLRPC_debug('XMLRPC_parse', "<p>Returning the following parsed request:</p>" . XMLRPC_show($data, 'print_r', true));
}
......@@ -187,7 +190,7 @@ function & XMLRPC_prepare($data, $type = NULL){
if(array_key_exists("$n type", $data)){
$type = $data["$n type"];
}
$temp[$n] = XMLRPC_prepare(&$data[$n], $type);
$temp[$n] = XMLRPC_prepare($data[$n], $type);
}
}
}else{ #it's a struct
......@@ -202,7 +205,7 @@ function & XMLRPC_prepare($data, $type = NULL){
if(array_key_exists("$key type", $data)){
$type = $data["$key type"];
}
$temp[] = array('name' => $key, 'value' => XMLRPC_prepare(&$value, $type));
$temp[] = array('name' => $key, 'value' => XMLRPC_prepare($value, $type));
}
}
}
......@@ -244,12 +247,12 @@ function & XMLRPC_adjustValue(&$current_node){
if(is_array($temp) and array_key_exists(0, $temp)){
$count = count($temp);
for($n=0;$n<$count;$n++){
$temp2[$n] = &XMLRPC_adjustValue(&$temp[$n]);
$temp2[$n] = &XMLRPC_adjustValue($temp[$n]);
}
$temp = &$temp2;
}else{
$temp2 = &XMLRPC_adjustValue(&$temp);
$temp = array(&$temp2);
$temp2 = &XMLRPC_adjustValue($temp);
$temp = array($temp2);
#I do the temp assignment because it avoids copying,
# since I can put a reference in the array
#PHP's reference model is a bit silly, and I can't just say:
......@@ -267,12 +270,12 @@ function & XMLRPC_adjustValue(&$current_node){
$count = count($temp);
for($n=0;$n<$count;$n++){
#echo "Passing name {$temp[$n][name]}. Value is: " . show($temp[$n][value], var_dump, true) . "<br>\n";
$temp2[$temp[$n]['name']] = &XMLRPC_adjustValue(&$temp[$n]['value']);
$temp2[$temp[$n]['name']] = &XMLRPC_adjustValue($temp[$n]['value']);
#echo "adjustValue(): After assigning, the value is " . show($temp2[$temp[$n]['name']], var_dump, true) . "<br>\n";
}
}else{
#echo "Passing name $temp[name]<br>\n";
$temp2[$temp['name']] = &XMLRPC_adjustValue(&$temp['value']);
$temp2[$temp['name']] = &XMLRPC_adjustValue($temp['value']);
}
$temp = &$temp2;
}
......@@ -316,7 +319,7 @@ function XMLRPC_getParams($request){
$count = count($temp);
for($n = 0; $n < $count; $n++){
#echo "Serializing parameter $n<br>";
$temp2[$n] = &XMLRPC_adjustValue(&$temp[$n]['value']);
$temp2[$n] = &XMLRPC_adjustValue($temp[$n]['value']);
}
}else{
$temp2[0] = &XMLRPC_adjustValue($temp['value']);
......@@ -390,13 +393,13 @@ function XMLRPC_request($site, $location, $methodName, $params = NULL, $user_age
XMLRPC_debug('XMLRPC_request', "<p>Received the following response:</p>\n\n" . XMLRPC_show($response, 'print_r', true) . "<p>Which was serialized into the following data:</p>\n\n" . XMLRPC_show($data, 'print_r', true));
}
if(isset($data['methodResponse']['fault'])){
$return = array(false, XMLRPC_adjustValue(&$data['methodResponse']['fault']['value']));
$return = array(false, XMLRPC_adjustValue($data['methodResponse']['fault']['value']));
if(defined('XMLRPC_DEBUG') and XMLRPC_DEBUG){
XMLRPC_debug('XMLRPC_request', "<p>Returning:</p>\n\n" . XMLRPC_show($return, 'var_dump', true));
}
return $return;
}else{
$return = array(true, XMLRPC_adjustValue(&$data['methodResponse']['params']['param']['value']));
$return = array(true, XMLRPC_adjustValue($data['methodResponse']['params']['param']['value']));
if(defined('XMLRPC_DEBUG') and XMLRPC_DEBUG){
XMLRPC_debug('XMLRPC_request', "<p>Returning:</p>\n\n" . XMLRPC_show($return, 'var_dump', true));
}
......@@ -407,7 +410,7 @@ function XMLRPC_request($site, $location, $methodName, $params = NULL, $user_age
function XMLRPC_response($return_value, $server = NULL){
$data["methodResponse"]["params"]["param"]["value"] = &$return_value;
$return = XML_serialize(&$data);
$return = XML_serialize($data);
if(defined('XMLRPC_DEBUG') and XMLRPC_DEBUG){
XMLRPC_debug('XMLRPC_response', "<p>Received the following data to return:</p>\n\n" . XMLRPC_show($return_value, 'print_r', true));
......
htdocs/adherents/fiche.php
+ 29
− 23
View file @ a3242dab
<?PHP
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2002-2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -41,7 +42,7 @@ if (isset($action) && $action=='sendinfo')
}
if ($HTTP_POST_VARS["action"] == 'cotisation')
if ($_POST["action"] == 'cotisation')
{
$adh = new Adherent($db);
$adh->id = $rowid;
......@@ -65,7 +66,7 @@ if ($HTTP_POST_VARS["action"] == 'cotisation')
//$dateop="$reyear$remonth$reday";
$amount=$cotisation;
$acct=new Account($db,ADHERENT_BANK_ACCOUNT);
$insertid=$acct->addline($dateop, $HTTP_POST_VARS["operation"], $HTTP_POST_VARS["label"], $amount, $HTTP_POST_VARS["num_chq"],ADHERENT_BANK_CATEGORIE);
$insertid=$acct->addline($dateop, $_POST["operation"], $_POST["label"], $amount, $_POST["num_chq"],ADHERENT_BANK_CATEGORIE);
if ($insertid == '')
{
print "<p> Probleme d'insertion : ".$db->error();
......@@ -89,8 +90,13 @@ if ($HTTP_POST_VARS["action"] == 'cotisation')
$action = "edit";
}
if ($HTTP_POST_VARS["action"] == 'add')
if ($_POST["action"] == 'add')
{
$type=$_POST["type"];
if(!isset($type) || $type==''){
$error+=1;
$errmsg .="Le type d'adhrent n'est pas renseign. Vous devez configurer les types d'adhrents avant de pouvoir les ajouter.<BR>\n";
}
$login=$_POST["login"];
// test si le login existe deja
if(!isset($login) || $login==''){
......@@ -147,8 +153,8 @@ if ($HTTP_POST_VARS["action"] == 'add')
$adh->note = $note;
$adh->pays = $pays;
$adh->typeid = $type;
$adh->commentaire = $HTTP_POST_VARS["comment"];
$adh->morphy = $HTTP_POST_VARS["morphy"];
$adh->commentaire = $_POST["comment"];
$adh->morphy = $_POST["morphy"];
foreach($_POST as $key => $value){
if (ereg("^options_",$key)){
......@@ -167,7 +173,7 @@ if ($HTTP_POST_VARS["action"] == 'add')
//$dateop="$reyear$remonth$reday";
$amount=$cotisation;
$acct=new Account($db,ADHERENT_BANK_ACCOUNT);
$insertid=$acct->addline($dateop, $HTTP_POST_VARS["operation"], $HTTP_POST_VARS["label"], $amount, $HTTP_POST_VARS["num_chq"],ADHERENT_BANK_CATEGORIE);
$insertid=$acct->addline($dateop, $_POST["operation"], $_POST["label"], $amount, $_POST["num_chq"],ADHERENT_BANK_CATEGORIE);
if ($insertid == '')
{
print "<p> Probleme d'insertion : ".$db->error();
......@@ -193,14 +199,14 @@ if ($HTTP_POST_VARS["action"] == 'add')
}
}
if ($HTTP_POST_VARS["action"] == 'confirm_delete' && $HTTP_POST_VARS["confirm"] == yes)
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == yes)
{
$adh = new Adherent($db);
$adh->delete($rowid);
Header("Location: liste.php");
}
if ($HTTP_POST_VARS["action"] == 'confirm_valid' && $HTTP_POST_VARS["confirm"] == yes)
if ($_POST["action"] == 'confirm_valid' && $_POST["confirm"] == yes)
{
$adh = new Adherent($db, $rowid);
$adh->validate($user->id);
......@@ -226,7 +232,7 @@ if ($HTTP_POST_VARS["action"] == 'confirm_valid' && $HTTP_POST_VARS["confirm"] =
}
if ($HTTP_POST_VARS["action"] == 'confirm_resign' && $HTTP_POST_VARS["confirm"] == yes)
if ($_POST["action"] == 'confirm_resign' && $_POST["confirm"] == yes)
{
$adh = new Adherent($db, $rowid);
$adh->resiliate($user->id);
......@@ -247,7 +253,7 @@ if ($HTTP_POST_VARS["action"] == 'confirm_resign' && $HTTP_POST_VARS["confirm"]
llxHeader();
if ($HTTP_POST_VARS["action"] == 'confirm_add_glasnost' && $HTTP_POST_VARS["confirm"] == yes)
if ($_POST["action"] == 'confirm_add_glasnost' && $_POST["confirm"] == yes)
{
$adh = new Adherent($db, $rowid);
$adh->fetch($rowid);
......@@ -264,7 +270,7 @@ if ($HTTP_POST_VARS["action"] == 'confirm_add_glasnost' && $HTTP_POST_VARS["conf
}
}
if ($HTTP_POST_VARS["action"] == 'confirm_del_glasnost' && $HTTP_POST_VARS["confirm"] == yes)
if ($_POST["action"] == 'confirm_del_glasnost' && $_POST["confirm"] == yes)
{
$adh = new Adherent($db, $rowid);
$adh->fetch($rowid);
......@@ -281,7 +287,7 @@ if ($HTTP_POST_VARS["action"] == 'confirm_del_glasnost' && $HTTP_POST_VARS["conf
}
}
if ($HTTP_POST_VARS["action"] == 'confirm_del_spip' && $HTTP_POST_VARS["confirm"] == yes)
if ($_POST["action"] == 'confirm_del_spip' && $_POST["confirm"] == yes)
{
$adh = new Adherent($db, $rowid);
$adh->fetch($rowid);
......@@ -290,7 +296,7 @@ if ($HTTP_POST_VARS["action"] == 'confirm_del_spip' && $HTTP_POST_VARS["confirm"
}
}
if ($HTTP_POST_VARS["action"] == 'confirm_add_spip' && $HTTP_POST_VARS["confirm"] == yes)
if ($_POST["action"] == 'confirm_add_spip' && $_POST["confirm"] == yes)
{
$adh = new Adherent($db, $rowid);
$adh->fetch($rowid);
......@@ -309,7 +315,7 @@ if ($errmsg != '')
{
print '<table cellspacing="0" border="1" width="100%" cellpadding="3">';
print '<th>Erreur dans l\'execution du formulaire</th>';
print "<tr><td class=\"delete\"><b>$errmsg</b></td></tr>\n";
print "<tr><td class=\"error\"><b>$errmsg</b></td></tr>\n";
print '</table>';
}
......@@ -430,13 +436,13 @@ if ($rowid > 0)
print '<tr><td colspan="3">Supprimer un adhrent</td></tr>';
print "<tr><td colspan=\"3\">La suppression d'un adhrent entraine la suppression de toutes ses cotisations !!!</td></tr>\n";
print '<tr><td class="delete">Etes-vous sur de vouloir supprimer cet adhrent ?</td><td class="delete">';
print '<tr><td class="warning">Etes-vous sur de vouloir supprimer cet adhrent ?</td><td class="warning">';
$htmls = new Form($db);
$htmls->selectyesno("confirm","no");
print "</td>\n";
print '<td class="delete" align="center"><input type="submit" value="Confirmer"</td></tr>';
print '<td class="warning" align="center"><input type="submit" value="Confirmer"</td></tr>';
print '</table>';
print "</form>\n";
}
......@@ -481,13 +487,13 @@ if ($rowid > 0)
print '<tr><td colspan="3">Rsilier une adhsion</td></tr>';
print '<tr><td class="delete">Etes-vous sur de vouloir rsilier cette adhsion ?</td><td class="delete">';
print '<tr><td class="warning">Etes-vous sur de vouloir rsilier cette adhsion ?</td><td class="warning">';
$htmls = new Form($db);
$htmls->selectyesno("confirm","no");
print "</td>\n";
print '<td class="delete" align="center"><input type="submit" value="Confirmer"</td></tr>';
print '<td class="warning" align="center"><input type="submit" value="Confirmer"</td></tr>';
print '</table>';
print "</form>\n";
}
......@@ -531,13 +537,13 @@ if ($rowid > 0)
print '<tr><td colspan="3">Valider un adhrent</td></tr>';
print '<tr><td class="delete">Etes-vous sur de vouloir effacer cet adhrent de glasnost ? (serveur : '.ADHERENT_GLASNOST_SERVEUR.')</td><td class="delete">';
print '<tr><td class="warning">Etes-vous sur de vouloir effacer cet adhrent de glasnost ? (serveur : '.ADHERENT_GLASNOST_SERVEUR.')</td><td class="warning">';
$htmls = new Form($db);
$htmls->selectyesno("confirm","no");
print "</td>\n";
print '<td class="delete" align="center"><input type="submit" value="Confirmer"</td></tr>';
print '<td class="warning" align="center"><input type="submit" value="Confirmer"</td></tr>';
print '</table>';
print "</form>\n";
}
......@@ -581,13 +587,13 @@ if ($rowid > 0)
print '<tr><td colspan="3">Valider un adhrent</td></tr>';
print '<tr><td class="delete">Etes-vous sur de vouloir effacer cet adhrent de glasnost ? (serveur : '.ADHERENT_SPIP_SERVEUR.')</td><td class="delete">';
print '<tr><td class="warning">Etes-vous sur de vouloir effacer cet adhrent de glasnost ? (serveur : '.ADHERENT_SPIP_SERVEUR.')</td><td class="warning">';
$htmls = new Form($db);
$htmls->selectyesno("confirm","no");
print "</td>\n";
print '<td class="delete" align="center"><input type="submit" value="Confirmer"</td></tr>';
print '<td class="warning" align="center"><input type="submit" value="Confirmer"</td></tr>';
print '</table>';
print "</form>\n";
}
......
htdocs/adherents/options.php
+ 7
− 25
View file @ a3242dab
......@@ -98,32 +98,14 @@ if (sizeof($array_options)>0)
}
print "</table>";
}
print "<p><TABLE border=\"1\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\"><tr class=\"barreBouton\">";
/*
* Case 1
*/
print "<td align=\"center\" width=\"25%\" class=\"bouton\">[<a href=\"$PHP_SELF?action=create\">Nouvel attribut</a>]</td>";
/*
* Case 2
*/
print "<td align=\"center\" width=\"25%\" class=\"bouton\">-</td>";
/*
* Case 3
*/
print "<td align=\"center\" width=\"25%\" class=\"bouton\">-</td>";
/*
* Case 4
*/
print "<td align=\"center\" width=\"25%\" class=\"bouton\">-</td>";
print "</tr></table></form><p>";
/*
* Barre d'actions
*
*/
print '<div class="tabsAction">';
print "<a class=\"tabAction\" href=\"$PHP_SELF?action=create\">Nouvel attribut</a>";
print "</div>";
......
htdocs/adherents/type.php
+ 20
− 38
View file @ a3242dab
......@@ -24,16 +24,16 @@ require("./pre.inc.php");
require(DOL_DOCUMENT_ROOT."/adherents/adherent.class.php");
require(DOL_DOCUMENT_ROOT."/adherents/adherent_type.class.php");
if ($HTTP_POST_VARS["action"] == 'add' && $user->admin)
if ($_POST["action"] == 'add' && $user->admin)
{
$adht = new AdherentType($db);
$adht->libelle = $HTTP_POST_VARS["libelle"];
$adht->cotisation = $HTTP_POST_VARS["cotisation"];
$adht->commentaire = $HTTP_POST_VARS["comment"];
$adht->mail_valid = $HTTP_POST_VARS["mail_valid"];
$adht->vote = $HTTP_POST_VARS["vote"];
$adht->libelle = $_POST["libelle"];
$adht->cotisation = $_POST["cotisation"];
$adht->commentaire = $_POST["comment"];
$adht->mail_valid = $_POST["mail_valid"];
$adht->vote = $_POST["vote"];
if ($adht->create($user->id) )
{
......@@ -41,16 +41,16 @@ if ($HTTP_POST_VARS["action"] == 'add' && $user->admin)
}
}
if ($HTTP_POST_VARS["action"] == 'update' && $user->admin)
if ($_POST["action"] == 'update' && $user->admin)
{
$adht = new AdherentType($db);
$adht->id = $rowid;
$adht->libelle = $HTTP_POST_VARS["libelle"];
$adht->cotisation = $HTTP_POST_VARS["cotisation"];
$adht->commentaire = $HTTP_POST_VARS["comment"];
$adht->mail_valid = $HTTP_POST_VARS["mail_valid"];
$adht->vote = $HTTP_POST_VARS["vote"];
$adht->libelle = $_POST["libelle"];
$adht->cotisation = $_POST["cotisation"];
$adht->commentaire = $_POST["comment"];
$adht->mail_valid = $_POST["mail_valid"];
$adht->vote = $_POST["vote"];
if ($adht->update($user->id) )
{
......@@ -67,7 +67,7 @@ if ($action == 'delete')
if ($action == 'commentaire')
{
$don = new Don($db);
$don->set_commentaire($rowid,$HTTP_POST_VARS["commentaire"]);
$don->set_commentaire($rowid,$_POST["commentaire"]);
$action = "edit";
}
......@@ -122,32 +122,14 @@ else
}
print "<p><TABLE border=\"1\" width=\"100%\" cellspacing=\"0\" cellpadding=\"4\"><tr class=\"barreBouton\">";
/*
* Case 1
*/
print '<td align="center" width="25%" class=\"bouton\">[<a href="type.php?action=create">Nouveau Type</a>]</td>';
/*
* Case 2
*/
print "<td align=\"center\" width=\"25%\" class=\"bouton\">-</td>";
/*
* Case 3
*/
print "<td align=\"center\" width=\"25%\" class=\"bouton\">-</td>";
/*
* Case 4
*/
print "<td align=\"center\" width=\"25%\" class=\"bouton\">-</td>";
print "</tr></table></form><p>";
/*
* Barre d'actions
*
*/
print '<div class="tabsAction">';
print "<a class=\"tabAction\" href=\"type.php?action=create\">Nouveau Type</a>";
print "</div>";
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment