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

Fix: Supression warning rendant inoprant wrapper de lecture image

Browse Source
This commit is contained in:
Laurent Destailleur 2007-10-30 22:54:58 +00:00
parent e13675fdd9
commit dfb453bcf6
2 changed files with 190 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/product/stats/fiche.php
View File

@ -19,7 +19,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -129,13 +128,9 @@ if ($_GET["id"] || $_GET["ref"])
} }
//show_stats_for_company($product,$socid); //show_stats_for_company($product,$socid);
/* // Graphs additionels generes pas les cron
* Graphs additionels generes pas les cron
*
*/
$year = strftime('%Y',time()); $year = strftime('%Y',time());
$file = get_exdir($product->id, 3) . "ventes-".$year."-".$product->id.".png"; $file = get_exdir($product->id, 3) . "ventes-".$year."-".$product->id.".png";
if (file_exists (DOL_DATA_ROOT.'/graph/product/'.$file) ) if (file_exists (DOL_DATA_ROOT.'/graph/product/'.$file) )
{ {
print '<tr><td>Ventes</td><td>'; print '<tr><td>Ventes</td><td>';
@ -151,6 +146,8 @@ if ($_GET["id"] || $_GET["ref"])
print '</table>'; print '</table>';
print '</div>'; print '</div>';
print '<table width="100%">'; print '<table width="100%">';
// Generation des graphs // Generation des graphs
@ -246,9 +243,10 @@ if ($_GET["id"] || $_GET["ref"])
print '</td></tr>'; print '</td></tr>';
// Image // Image
print '<tr><td colspan="2" align="center">'; print '<tr><td colspan="2" align="center">';
//print $graphfiles[$key]['modulepart']."x".urlencode($graphfiles[$key]['file']);
$url=DOL_URL_ROOT.'/viewimage.php?modulepart='.$graphfiles[$key]['modulepart'].'&file='.urlencode($graphfiles[$key]['file']); $url=DOL_URL_ROOT.'/viewimage.php?modulepart='.$graphfiles[$key]['modulepart'].'&file='.urlencode($graphfiles[$key]['file']);
//print $url; //print $url;
print '<img src="'.$url.'">'; print '<img src="'.$url.'" alt="'.$graphfiles[$key]['label'].'">';
print '</td></tr>'; print '</td></tr>';
// Date génération // Date génération
print '<tr>'; print '<tr>';

3
htdocs/viewimage.php
View File

@ -18,7 +18,6 @@
* or see http://www.gnu.org/ * or see http://www.gnu.org/
* *
* $Id$ * $Id$
* $Source$
*/ */
/** /**
@ -37,7 +36,7 @@ function llxHeader() { }
$original_file = urldecode($_GET["file"]); $original_file = urldecode($_GET["file"]);
$modulepart = urldecode($_GET["modulepart"]); $modulepart = urldecode($_GET["modulepart"]);
$type = urldecode($_GET["type"]); $type = isset($_GET["type"]) ? urldecode($_GET["type"]) : '';
// Protection, on interdit les .. dans les chemins // Protection, on interdit les .. dans les chemins
$original_file = eregi_replace('\.\.','',$original_file); $original_file = eregi_replace('\.\.','',$original_file);