Removed deprecated files

This commit is contained in:
Laurent Destailleur 2008-11-28 09:46:47 +00:00
parent fc887d1c9d
commit 74a9927021

View File

@ -44,7 +44,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
global $conf,$langs; global $conf,$langs;
dolibarr_syslog("functions.inc::vignette file=".$file." extName=".$extName." maxWidth=".$maxWidth." maxHeight=".$maxHeight." quality=".$quality); dolibarr_syslog("functions.inc::vignette file=".$file." extName=".$extName." maxWidth=".$maxWidth." maxHeight=".$maxHeight." quality=".$quality);
// Clean parameters // Clean parameters
$file=trim($file); $file=trim($file);
@ -164,7 +164,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
} }
$thumbHeight=round($thumbHeight); $thumbHeight=round($thumbHeight);
$thumbWidth=round($thumbWidth); $thumbWidth=round($thumbWidth);
// Create empty image // Create empty image
if ($infoImg[2] == 1) if ($infoImg[2] == 1)
{ {
@ -187,7 +187,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
{ {
imagesavealpha($imgThumb, true); imagesavealpha($imgThumb, true);
} }
// Initialisation des variables selon l'extension de l'image // Initialisation des variables selon l'extension de l'image
switch($infoImg[2]) switch($infoImg[2])
{ {
@ -248,37 +248,38 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName='_small', $
/** /**
\brief permet d'afficher un thermometre monetaire. \brief permet d'afficher un thermometre monetaire.
\param actualValue \param actualValue
\param pendingValue \param pendingValue
\param intentValue \param intentValue
\return thermometer htmlLegenda \return thermometer htmlLegenda
This function returns the html for the moneymeter. This function returns the html for the moneymeter.
cachedValue: amount of actual money cachedValue: amount of actual money
pendingValue: amount of money of pending memberships pendingValue: amount of money of pending memberships
intentValue: amount of intended money (that's without the amount of actual money) intentValue: amount of intended money (that's without the amount of actual money)
*/ */
function moneyMeter($actualValue=0, $pendingValue=0, $intentValue=0) function moneyMeter($actualValue=0, $pendingValue=0, $intentValue=0)
{ {
global $langs;
// variables // variables
$height="200"; $height="200";
$maximumValue=125000; $maximumValue=125000;
$imageDir = "http://eucd.info/images/"; $imageDir = "http://eucd.info/images/";
$imageTop = $imageDir . "therm_top.png"; $imageTop = $imageDir . "therm_top.png";
$imageMiddleActual = $imageDir . "therm_actual.png"; $imageMiddleActual = $imageDir . "therm_actual.png";
$imageMiddlePending = $imageDir . "therm_pending.png"; $imageMiddlePending = $imageDir . "therm_pending.png";
$imageMiddleIntent = $imageDir . "therm_intent.png"; $imageMiddleIntent = $imageDir . "therm_intent.png";
$imageMiddleGoal = $imageDir . "therm_goal.png"; $imageMiddleGoal = $imageDir . "therm_goal.png";
$imageIndex = $imageDir . "therm_index.png"; $imageIndex = $imageDir . "therm_index.png";
$imageBottom = $imageDir . "therm_bottom.png"; $imageBottom = $imageDir . "therm_bottom.png";
$imageColorActual = $imageDir . "therm_color_actual.png"; $imageColorActual = $imageDir . "therm_color_actual.png";
$imageColorPending = $imageDir . "therm_color_pending.png"; $imageColorPending = $imageDir . "therm_color_pending.png";
$imageColorIntent = $imageDir . "therm_color_intent.png"; $imageColorIntent = $imageDir . "therm_color_intent.png";
$htmlThermTop = ' $htmlThermTop = '
<!-- Thermometer Begin --> <!-- Thermometer Begin -->
<table cellpadding="0" cellspacing="4" border="0"> <table cellpadding="0" cellspacing="4" border="0">
<tr><td> <tr><td>
@ -289,11 +290,11 @@ function moneyMeter($actualValue=0, $pendingValue=0, $intentValue=0)
<tr> <tr>
<td> <td>
<table cellpadding="0" cellspacing="0" border="0">'; <table cellpadding="0" cellspacing="0" border="0">';
$htmlSection = ' $htmlSection = '
<tr><td><img src="{image}" width="26" height="{height}" border="0"></td></tr>'; <tr><td><img src="{image}" width="26" height="{height}" border="0"></td></tr>';
$htmlThermbottom = ' $htmlThermbottom = '
</table> </table>
</td> </td>
<td><img src="' . $imageIndex . '" width="32" height="200" border="0"></td> <td><img src="' . $imageIndex . '" width="32" height="200" border="0"></td>
@ -305,104 +306,104 @@ function moneyMeter($actualValue=0, $pendingValue=0, $intentValue=0)
</td> </td>
</tr></table>'; </tr></table>';
// legenda // legenda
$legendaActual = "&euro; " . round($actualValue); $legendaActual = "&euro; " . round($actualValue);
$legendaPending = "&euro; " . round($pendingValue); $legendaPending = "&euro; " . round($pendingValue);
$legendaIntent = "&euro; " . round($intentValue); $legendaIntent = "&euro; " . round($intentValue);
$legendaTotal = "&euro; " . round($actualValue + $pendingValue + $intentValue); $legendaTotal = "&euro; " . round($actualValue + $pendingValue + $intentValue);
$htmlLegenda = ' $htmlLegenda = '
<table cellpadding="0" cellspacing="0" border="0"> <table cellpadding="0" cellspacing="0" border="0">
<tr><td><img src="' . $imageColorActual . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><b>Pay<EFBFBD>:<br />' . $legendaActual . '</b></font></td></tr> <tr><td><img src="' . $imageColorActual . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><b>'.$langs->trans("Payed").':<br />' . $legendaActual . '</b></font></td></tr>
<tr><td><img src="' . $imageColorPending . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">En attente:<br />' . $legendaPending . '</font></td></tr> <tr><td><img src="' . $imageColorPending . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">'.$langs->trans("Wainting").':<br />' . $legendaPending . '</font></td></tr>
<tr><td><img src="' . $imageColorIntent . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">Promesses:<br />' . $legendaIntent . '</font></td></tr> <tr><td><img src="' . $imageColorIntent . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">'.$langs->trans("Promesses").':<br />' . $legendaIntent . '</font></td></tr>
<tr><td>&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">Total:<br />' . $legendaTotal . '</font></td></tr> <tr><td>&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">Total:<br />' . $legendaTotal . '</font></td></tr>
</table> </table>
<!-- Thermometer End -->'; <!-- Thermometer End -->';
// check and edit some values // check and edit some values
$error = 0; $error = 0;
if ( $maximumValue <= 0 || $height <= 0 || $actualValue < 0 || $pendingValue < 0 || $intentValue < 0) if ( $maximumValue <= 0 || $height <= 0 || $actualValue < 0 || $pendingValue < 0 || $intentValue < 0)
{
return "The money meter could not be processed<br>\n";
}
if ( $actualValue > $maximumValue )
{
$actualValue = $maximumValue;
$pendingValue = 0;
$intentValue = 0;
}
else
{
if ( ($actualValue + $pendingValue) > $maximumValue )
{ {
return "The money meter could not be processed<br>\n";
}
if ( $actualValue > $maximumValue )
{
$actualValue = $maximumValue;
$pendingValue = 0;
$intentValue = 0;
}
else
{
if ( ($actualValue + $pendingValue) > $maximumValue )
{
$pendingValue = $maximumValue - $actualValue; $pendingValue = $maximumValue - $actualValue;
$intentValue = 0; $intentValue = 0;
} }
else else
{ {
if ( ($actualValue + $pendingValue + $intentValue) > $maximumValue ) if ( ($actualValue + $pendingValue + $intentValue) > $maximumValue )
{ {
$intentValue = $maximumValue - $actualValue - $pendingValue; $intentValue = $maximumValue - $actualValue - $pendingValue;
} }
}
} }
}
// start writing the html (from bottom to top)
// start writing the html (from bottom to top)
// bottom
// bottom $thermometer = $htmlThermbottom;
$thermometer = $htmlThermbottom;
// actual
// actual $sectionHeight = round(($actualValue / $maximumValue) * $height);
$sectionHeight = round(($actualValue / $maximumValue) * $height); $totalHeight = $totalHeight + $sectionHeight;
$totalHeight = $totalHeight + $sectionHeight; if ( $sectionHeight > 0 )
if ( $sectionHeight > 0 ) {
{ $section = $htmlSection;
$section = $htmlSection; $section = str_replace("{image}", $imageMiddleActual, $section);
$section = str_replace("{image}", $imageMiddleActual, $section); $section = str_replace("{height}", $sectionHeight, $section);
$section = str_replace("{height}", $sectionHeight, $section); $thermometer = $section . $thermometer;
$thermometer = $section . $thermometer; }
}
// pending
// pending $sectionHeight = round(($pendingValue / $maximumValue) * $height);
$sectionHeight = round(($pendingValue / $maximumValue) * $height); $totalHeight = $totalHeight + $sectionHeight;
$totalHeight = $totalHeight + $sectionHeight; if ( $sectionHeight > 0 )
if ( $sectionHeight > 0 ) {
{ $section = $htmlSection;
$section = $htmlSection; $section = str_replace("{image}", $imageMiddlePending, $section);
$section = str_replace("{image}", $imageMiddlePending, $section); $section = str_replace("{height}", $sectionHeight, $section);
$section = str_replace("{height}", $sectionHeight, $section); $thermometer = $section . $thermometer;
$thermometer = $section . $thermometer; }
}
// intent
// intent $sectionHeight = round(($intentValue / $maximumValue) * $height);
$sectionHeight = round(($intentValue / $maximumValue) * $height); $totalHeight = $totalHeight + $sectionHeight;
$totalHeight = $totalHeight + $sectionHeight; if ( $sectionHeight > 0 )
if ( $sectionHeight > 0 ) {
{ $section = $htmlSection;
$section = $htmlSection; $section = str_replace("{image}", $imageMiddleIntent, $section);
$section = str_replace("{image}", $imageMiddleIntent, $section); $section = str_replace("{height}", $sectionHeight, $section);
$section = str_replace("{height}", $sectionHeight, $section); $thermometer = $section . $thermometer;
$thermometer = $section . $thermometer; }
}
// goal
// goal $sectionHeight = $height- $totalHeight;
$sectionHeight = $height- $totalHeight; if ( $sectionHeight > 0 )
if ( $sectionHeight > 0 ) {
{ $section = $htmlSection;
$section = $htmlSection; $section = str_replace("{image}", $imageMiddleGoal, $section);
$section = str_replace("{image}", $imageMiddleGoal, $section); $section = str_replace("{height}", $sectionHeight, $section);
$section = str_replace("{height}", $sectionHeight, $section); $thermometer = $section . $thermometer;
$thermometer = $section . $thermometer; }
}
// top
// top $thermometer = $htmlThermTop . $thermometer;
$thermometer = $htmlThermTop . $thermometer;
return $thermometer . $htmlLegenda;
return $thermometer . $htmlLegenda;
} }
?> ?>