lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Bad doxygen description

Browse Source
This commit is contained in:
Laurent Destailleur 2011-08-08 16:00:16 +00:00
parent 0d36d426a8
commit 6d6434d84b
6 changed files with 144 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/adherents/info_subscription.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2005-2009 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2006 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2006 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -17,10 +17,10 @@
*/ */
/** /**
* \file htdocs/adherents/info.php * \file htdocs/adherents/info_subscription.php
* \ingroup member * \ingroup member
* \brief Page des informations d'un adherent * \brief Page with information of subscriptions of a member
* \version $Id: info_subscription.php,v 1.12 2011/07/31 22:23:28 eldy Exp $ * \version $Id: info_subscription.php,v 1.13 2011/08/08 16:00:18 eldy Exp $
*/ */
require("../main.inc.php"); require("../main.inc.php");
@ -80,5 +80,5 @@ print '</div>';
$db->close(); $db->close();
llxFooter('$Date: 2011/07/31 22:23:28 $ - $Revision: 1.12 $'); llxFooter('$Date: 2011/08/08 16:00:18 $ - $Revision: 1.13 $');
?> ?>

249
htdocs/adherents/stats/geo.php
View File

@ -1,6 +1,5 @@
<?php <?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (c) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (c) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -17,11 +16,11 @@
*/ */
/** /**
* \file htdocs/adherents/stats/index.php * \file htdocs/adherents/stats/geo.php
* \ingroup member * \ingroup member
* \brief Page des stats * \brief Page with geographical statistics on members
* \version $Id: geo.php,v 1.2 2011/08/03 00:45:44 eldy Exp $ * \version $Id: geo.php,v 1.3 2011/08/08 16:00:20 eldy Exp $
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/dolgraph.class.php");
@ -37,8 +36,8 @@ $mode=GETPOST('mode')?GETPOST('mode'):'';
// Security check // Security check
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$action = ''; $action = '';
$socid = $user->societe_id; $socid = $user->societe_id;
} }
if (! $user->rights->adherent->cotisation->lire) if (! $user->rights->adherent->cotisation->lire)
accessforbidden(); accessforbidden();
@ -67,34 +66,34 @@ create_exdir($dir);
if ($mode) if ($mode)
{ {
// Define sql // Define sql
if ($mode == 'memberbycountry') if ($mode == 'memberbycountry')
{ {
$label=$langs->trans("Country"); $label=$langs->trans("Country");
$tab='statscountry'; $tab='statscountry';
$data = array(); $data = array();
$sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, c.code, c.libelle as label"; $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, c.code, c.libelle as label";
$sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_pays as c on d.pays = c.rowid"; $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_pays as c on d.pays = c.rowid";
$sql.=" WHERE d.statut = 1"; $sql.=" WHERE d.statut = 1";
$sql.=" GROUP BY c.libelle, c.code"; $sql.=" GROUP BY c.libelle, c.code";
//print $sql; //print $sql;
} }
if ($mode == 'memberbystate') if ($mode == 'memberbystate')
{ {
$label=$langs->trans("Country"); $label=$langs->trans("Country");
$label2=$langs->trans("State"); $label2=$langs->trans("State");
$tab='statsstate'; $tab='statsstate';
$data = array(); $data = array();
$sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, p.code, p.libelle as label, c.nom as label2"; $sql.="SELECT COUNT(d.rowid) as nb, MAX(d.datevalid) as lastdate, p.code, p.libelle as label, c.nom as label2";
$sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.fk_departement = c.rowid"; $sql.=" FROM ".MAIN_DB_PREFIX."adherent as d LEFT JOIN ".MAIN_DB_PREFIX."c_departements as c on d.fk_departement = c.rowid";
$sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region"; $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r on c.fk_region = r.code_region";
$sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p on d.pays = p.rowid"; $sql.=" LEFT JOIN ".MAIN_DB_PREFIX."c_pays as p on d.pays = p.rowid";
$sql.=" WHERE d.statut = 1"; $sql.=" WHERE d.statut = 1";
$sql.=" GROUP BY p.libelle, p.code, c.nom"; $sql.=" GROUP BY p.libelle, p.code, c.nom";
//print $sql; //print $sql;
} }
if ($mode == 'memberbytown') if ($mode == 'memberbytown')
{ {
$label=$langs->trans("Country"); $label=$langs->trans("Country");
@ -110,39 +109,39 @@ if ($mode)
//print $sql; //print $sql;
} }
$langsen=new Translate('',$conf); $langsen=new Translate('',$conf);
$langsen->setDefaultLang('en_US'); $langsen->setDefaultLang('en_US');
$langsen->load("dict"); $langsen->load("dict");
//print $langsen->trans("Country"."FI");exit; //print $langsen->trans("Country"."FI");exit;
// Define $data array // Define $data array
dol_syslog("Count member sql=".$sql); dol_syslog("Count member sql=".$sql);
$resql=$db->query($sql); $resql=$db->query($sql);
if ($resql) if ($resql)
{ {
$num=$db->num_rows($resql); $num=$db->num_rows($resql);
$i=0; $i=0;
while ($i < $num) while ($i < $num)
{ {
$obj=$db->fetch_object($resql); $obj=$db->fetch_object($resql);
if ($mode == 'memberbycountry') if ($mode == 'memberbycountry')
{ {
$data[]=array('label'=>(($obj->code && $langs->trans("Country".$obj->code)!="Country".$obj->code)?$langs->trans("Country".$obj->code):($obj->label?$obj->label:$langs->trans("Unknown"))), $data[]=array('label'=>(($obj->code && $langs->trans("Country".$obj->code)!="Country".$obj->code)?$langs->trans("Country".$obj->code):($obj->label?$obj->label:$langs->trans("Unknown"))),
'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code)!="Country".$obj->code)?$langsen->transnoentitiesnoconv("Country".$obj->code):($obj->label?$obj->label:$langs->trans("Unknown"))), 'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code)!="Country".$obj->code)?$langsen->transnoentitiesnoconv("Country".$obj->code):($obj->label?$obj->label:$langs->trans("Unknown"))),
'code'=>$obj->code, 'code'=>$obj->code,
'nb'=>$obj->nb, 'nb'=>$obj->nb,
'lastdate'=>$db->jdate($obj->lastdate) 'lastdate'=>$db->jdate($obj->lastdate)
); );
} }
if ($mode == 'memberbystate') if ($mode == 'memberbystate')
{ {
$data[]=array('label'=>(($obj->code && $langs->trans("Country".$obj->code)!="Country".$obj->code)?$langs->trans("Country".$obj->code):($obj->label?$obj->label:$langs->trans("Unknown"))), $data[]=array('label'=>(($obj->code && $langs->trans("Country".$obj->code)!="Country".$obj->code)?$langs->trans("Country".$obj->code):($obj->label?$obj->label:$langs->trans("Unknown"))),
'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code)!="Country".$obj->code)?$langsen->transnoentitiesnoconv("Country".$obj->code):($obj->label?$obj->label:$langs->trans("Unknown"))), 'label_en'=>(($obj->code && $langsen->transnoentitiesnoconv("Country".$obj->code)!="Country".$obj->code)?$langsen->transnoentitiesnoconv("Country".$obj->code):($obj->label?$obj->label:$langs->trans("Unknown"))),
'label2'=>($obj->label2?$obj->label2:$langs->trans("Unknown")), 'label2'=>($obj->label2?$obj->label2:$langs->trans("Unknown")),
'nb'=>$obj->nb, 'nb'=>$obj->nb,
'lastdate'=>$db->jdate($obj->lastdate) 'lastdate'=>$db->jdate($obj->lastdate)
); );
} }
if ($mode == 'memberbytown') if ($mode == 'memberbytown')
{ {
$data[]=array('label'=>(($obj->code && $langs->trans("Country".$obj->code)!="Country".$obj->code)?$langs->trans("Country".$obj->code):($obj->label?$obj->label:$langs->trans("Unknown"))), $data[]=array('label'=>(($obj->code && $langs->trans("Country".$obj->code)!="Country".$obj->code)?$langs->trans("Country".$obj->code):($obj->label?$obj->label:$langs->trans("Unknown"))),
@ -153,14 +152,14 @@ if ($mode)
); );
} }
$i++; $i++;
} }
$db->free($resql); $db->free($resql);
} }
else else
{ {
dol_print_error($db); dol_print_error($db);
} }
} }
@ -172,101 +171,101 @@ dol_fiche_head($head, $tab, $langs->trans("Statistics"), 0, 'user');
// Print title // Print title
if ($mode && ! sizeof($data)) if ($mode && ! sizeof($data))
{ {
print $langs->trans("NoValidatedMemberYet").'<br>'; print $langs->trans("NoValidatedMemberYet").'<br>';
print '<br>'; print '<br>';
} }
else else
{ {
if ($mode == 'memberbycountry') print $langs->trans("MembersByCountryDesc").'<br>'; if ($mode == 'memberbycountry') print $langs->trans("MembersByCountryDesc").'<br>';
else if ($mode == 'memberbystate') print $langs->trans("MembersByStateDesc").'<br>'; else if ($mode == 'memberbystate') print $langs->trans("MembersByStateDesc").'<br>';
else if ($mode == 'memberbytown') print $langs->trans("MembersByTownDesc").'<br>'; else if ($mode == 'memberbytown') print $langs->trans("MembersByTownDesc").'<br>';
else else
{ {
print $langs->trans("MembersStatisticsDesc").'<br>'; print $langs->trans("MembersStatisticsDesc").'<br>';
print '<br>'; print '<br>';
print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbycountry">'.$langs->trans("MembersStatisticsByCountries").'</a><br>'; print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbycountry">'.$langs->trans("MembersStatisticsByCountries").'</a><br>';
print '<br>'; print '<br>';
print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbystate">'.$langs->trans("MembersStatisticsByState").'</a><br>'; print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbystate">'.$langs->trans("MembersStatisticsByState").'</a><br>';
print '<br>'; print '<br>';
print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbytown">'.$langs->trans("MembersStatisticsByTown").'</a><br>'; print '<a href="'.$_SERVER["PHP_SELF"].'?mode=memberbytown">'.$langs->trans("MembersStatisticsByTown").'</a><br>';
} }
print '<br>'; print '<br>';
} }
// Show graphics // Show graphics
if ($mode == 'memberbycountry') if ($mode == 'memberbycountry')
{ {
// Assume we've already included the proper headers so just call our script inline // Assume we've already included the proper headers so just call our script inline
print "\n<script type='text/javascript'>\n"; print "\n<script type='text/javascript'>\n";
print "google.load('visualization', '1', {'packages': ['geomap']});\n"; print "google.load('visualization', '1', {'packages': ['geomap']});\n";
print "google.setOnLoadCallback(drawMap);\n"; print "google.setOnLoadCallback(drawMap);\n";
print "function drawMap() {\n\tvar data = new google.visualization.DataTable();\n"; print "function drawMap() {\n\tvar data = new google.visualization.DataTable();\n";
// Get the total number of rows // Get the total number of rows
print "\tdata.addRows(".sizeof($data).");\n"; print "\tdata.addRows(".sizeof($data).");\n";
print "\tdata.addColumn('string', 'Country');\n"; print "\tdata.addColumn('string', 'Country');\n";
print "\tdata.addColumn('number', 'Number');\n"; print "\tdata.addColumn('number', 'Number');\n";
// loop and dump // loop and dump
$i=0; $i=0;
foreach($data as $val) foreach($data as $val)
{ {
//$valcountry=ucfirst($val['code']); //$valcountry=ucfirst($val['code']);
$valcountry=ucfirst($val['label_en']); $valcountry=ucfirst($val['label_en']);
// fix case of uk // fix case of uk
if ($valcountry == 'Great Britain') { $valcountry = 'United Kingdom'; } if ($valcountry == 'Great Britain') { $valcountry = 'United Kingdom'; }
print "\tdata.setValue(".$i.", 0, \"".$valcountry."\");\n"; print "\tdata.setValue(".$i.", 0, \"".$valcountry."\");\n";
print "\tdata.setValue(".$i.", 1, ".$val['nb'].");\n"; print "\tdata.setValue(".$i.", 1, ".$val['nb'].");\n";
// Google's Geomap only supports up to 400 entries // Google's Geomap only supports up to 400 entries
if ($i >= 400){ break; } if ($i >= 400){ break; }
$i++; $i++;
} }
print "\tvar options = {};\n"; print "\tvar options = {};\n";
print "\toptions['dataMode'] = 'regions';\n"; print "\toptions['dataMode'] = 'regions';\n";
print "\toptions['showZoomOut'] = false;\n"; print "\toptions['showZoomOut'] = false;\n";
//print "\toptions['zoomOutLabel'] = '".dol_escape_js($langs->transnoentitiesnoconv("Numbers"))."';\n"; //print "\toptions['zoomOutLabel'] = '".dol_escape_js($langs->transnoentitiesnoconv("Numbers"))."';\n";
print "\toptions['width'] = ".$graphwidth.";\n"; print "\toptions['width'] = ".$graphwidth.";\n";
print "\toptions['height'] = ".$graphheight.";\n"; print "\toptions['height'] = ".$graphheight.";\n";
print "\tvar container = document.getElementById('".$mode."');\n"; print "\tvar container = document.getElementById('".$mode."');\n";
print "\tvar geomap = new google.visualization.GeoMap(container);\n"; print "\tvar geomap = new google.visualization.GeoMap(container);\n";
print "\tgeomap.draw(data, options);\n"; print "\tgeomap.draw(data, options);\n";
print "};\n"; print "};\n";
print "</script>\n"; print "</script>\n";
// print the div tag that will contain the map // print the div tag that will contain the map
print '<div align="center" id="'.$mode.'"></div>'."\n"; print '<div align="center" id="'.$mode.'"></div>'."\n";
print '<br>'; print '<br>';
} }
if ($mode) if ($mode)
{ {
// Print array // Print array
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td align="center">'.$label.'</td>'; print '<td align="center">'.$label.'</td>';
if ($label2) print '<td align="center">'.$label2.'</td>'; if ($label2) print '<td align="center">'.$label2.'</td>';
print '<td align="center">'.$langs->trans("NbOfMembers").'</td>'; print '<td align="center">'.$langs->trans("NbOfMembers").'</td>';
print '<td align="center">'.$langs->trans("LastMemberDate").'</td>'; print '<td align="center">'.$langs->trans("LastMemberDate").'</td>';
print '</tr>'; print '</tr>';
$oldyear=0; $oldyear=0;
$var=true; $var=true;
foreach ($data as $val) foreach ($data as $val)
{ {
$year = $val['year']; $year = $val['year'];
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td align="center">'.$val['label'].'</td>'; print '<td align="center">'.$val['label'].'</td>';
if ($label2) print '<td align="center">'.$val['label2'].'</td>'; if ($label2) print '<td align="center">'.$val['label2'].'</td>';
print '<td align="right">'.$val['nb'].'</td>'; print '<td align="right">'.$val['nb'].'</td>';
print '<td align="right">'.dol_print_date($val['lastdate'],'dayhour').'</td>'; print '<td align="right">'.dol_print_date($val['lastdate'],'dayhour').'</td>';
print '</tr>'; print '</tr>';
$oldyear=$year; $oldyear=$year;
} }
print '</table>'; print '</table>';
} }
@ -275,5 +274,5 @@ dol_fiche_end();
$db->close(); $db->close();
llxFooter('$Date: 2011/08/03 00:45:44 $ - $Revision: 1.2 $'); llxFooter('$Date: 2011/08/08 16:00:20 $ - $Revision: 1.3 $');
?> ?>

10
htdocs/admin/workflow.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2004 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2010 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -19,10 +19,10 @@
*/ */
/** /**
* \file htdocs/admin/societe.php * \file htdocs/admin/workflow.php
* \ingroup company * \ingroup company
* \brief Third party module setup page * \brief Workflows setup page
* \version $Id: workflow.php,v 1.5 2011/07/31 22:23:21 eldy Exp $ * \version $Id: workflow.php,v 1.6 2011/08/08 16:00:18 eldy Exp $
*/ */
require("../main.inc.php"); require("../main.inc.php");
@ -135,5 +135,5 @@ print '</table>';
$db->close(); $db->close();
llxFooter('$Date: 2011/07/31 22:23:21 $ - $Revision: 1.5 $'); llxFooter('$Date: 2011/08/08 16:00:18 $ - $Revision: 1.6 $');
?> ?>

6
htdocs/projet/ganttchart.php
View File

@ -16,10 +16,10 @@
*/ */
/** /**
* \file htdocs/projet/ganttview.php * \file htdocs/projet/ganttchart.php
* \ingroup projet * \ingroup projet
* \brief Gantt diagrame of a project * \brief Gantt diagram of a project
* \version $Id: ganttchart.php,v 1.7 2011/07/31 23:23:36 eldy Exp $ * \version $Id: ganttchart.php,v 1.8 2011/08/08 16:00:46 eldy Exp $
*/ */
?> ?>

8
htdocs/public/paypal/paymentko.php
View File

@ -17,13 +17,13 @@
*/ */
/** /**
* \file htdocs/public/paybox/paymentko.php * \file htdocs/public/paypal/paymentko.php
* \ingroup paybox * \ingroup paypal
* \brief File to show page after a failed payment. * \brief File to show page after a failed payment.
* This page is called by paypal with url provided to payal competed with parameter TOKEN=xxx * This page is called by paypal with url provided to payal competed with parameter TOKEN=xxx
* This token can be used to get more informations. * This token can be used to get more informations.
* \author Laurent Destailleur * \author Laurent Destailleur
* \version $Id: paymentko.php,v 1.7 2011/07/31 23:23:20 eldy Exp $ * \version $Id: paymentko.php,v 1.8 2011/08/08 16:00:19 eldy Exp $
*/ */
define("NOLOGIN",1); // This means this output page does not require to be logged. define("NOLOGIN",1); // This means this output page does not require to be logged.
@ -81,5 +81,5 @@ html_print_paypal_footer($mysoc,$langs);
$db->close(); $db->close();
llxFooterPaypal('$Date: 2011/07/31 23:23:20 $ - $Revision: 1.7 $'); llxFooterPaypal('$Date: 2011/08/08 16:00:19 $ - $Revision: 1.8 $');
?> ?>

6
htdocs/societe/notify/fiche.php
View File

@ -19,9 +19,9 @@
/** /**
* \file htdocs/societe/notify/fiche.php * \file htdocs/societe/notify/fiche.php
* \ingroup societe, notification * \ingroup societe notification
* \brief Tab for notifications of third party * \brief Tab for notifications of third party
* \version $Id: fiche.php,v 1.70 2011/07/31 23:22:58 eldy Exp $ * \version $Id: fiche.php,v 1.71 2011/08/08 16:00:16 eldy Exp $
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
@ -349,6 +349,6 @@ if ( $soc->fetch($soc->id) )
$db->close(); $db->close();
llxFooter('$Date: 2011/07/31 23:22:58 $ - $Revision: 1.70 $'); llxFooter('$Date: 2011/08/08 16:00:16 $ - $Revision: 1.71 $');
?> ?>