[0005498] Items/Fixed Assets: Fixed item image adding/update.

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 653d9e78bfad45213db18151cc2996897ac0607e..286601efd491e32abf835c7af3c3a21f5686d293 100644 (file)
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -56,6 +56,41 @@ function set_edit($stock_id)
        $_POST['del_image'] = 0;
 }
 
+function del_image($stock_id)
+{
+       foreach (array('jpg', 'png', 'gif') as $ext) {
+               $filename = company_path().'/images/'.item_img_name($stock_id).".".$ext;
+               if (file_exists($filename) && !unlink($filename))
+                       return false;
+       }
+       return true;
+}
+
+function show_image($stock_id)
+{
+       global $SysPrefs;
+
+       $check_remove_image = false;
+       $stock_img_link = _("No image");
+
+       if (@$stock_id)
+               foreach (array('jpg', 'png', 'gif') as $ext)
+               {
+                       $file = company_path().'/images/'.item_img_name($stock_id). ".$ext";
+                       if (file_exists($file)) {
+                               // rand() call is necessary here to avoid caching problems.
+                               $check_remove_image = true; // fixme
+                               $stock_img_link = "<img id='item_img' alt = '[".$stock_id.".$ext"."]' src='".$file."?nocache=".rand()."'"
+                                       ." height='".$SysPrefs->pic_height."' border='0'>";
+                               break;
+                       }
+               }
+
+       label_row("&nbsp;", $stock_img_link);
+       if ($check_remove_image)
+               check_row(_("Delete Image:"), 'del_image');
+}
+
 if (isset($_GET['stock_id']))
 {
        $_POST['stock_id'] = $_GET['stock_id'];
@@ -125,16 +160,12 @@ if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
                display_warning( _('Only graphics files can be uploaded'));
         $upload_file ='No';
        } 
-       elseif (file_exists($filename))
+       elseif (!del_image($stock_id))
        {
-               $result = unlink($filename);
-               if (!$result) 
-               {
-                       display_error(_('The existing image could not be removed'));
-                       $upload_file ='No';
-               }
+               display_error(_('The existing image could not be removed'));
+               $upload_file ='No';
        }
-       
+
        if ($upload_file == 'Yes')
        {
                $result  =  move_uploaded_file($_FILES['pic']['tmp_name'], $filename);
@@ -227,11 +258,7 @@ if (isset($_POST['addupdate']))
        if ($input_error != 1)
        {
                if (check_value('del_image'))
-               {
-                       $filename = company_path().'/images/'.item_img_name($_POST['NewStockID']).".jpg";
-                       if (file_exists($filename))
-                               unlink($filename);
-               }
+                       del_image($_POST['NewStockID']);
                
                if (!$new_item) 
                { /*so its an existing one */
@@ -308,9 +335,7 @@ if (isset($_POST['delete']) && strlen($_POST['delete']) > 1)
 
                $stock_id = $_POST['NewStockID'];
                delete_item($stock_id);
-               $filename = company_path().'/images/'.item_img_name($stock_id).".jpg";
-               if (file_exists($filename))
-                       unlink($filename);
+               delete_image($stock_id);
                display_notification(_("Selected item has been deleted."));
                $_POST['stock_id'] = '';
                clear_data();
@@ -489,29 +514,9 @@ function item_settings(&$stock_id, $new_item)
 
        table_section_title(_("Other"));
 
-       // Add image upload for New Item  - by Joe
-       file_row(_("Image File (.jpg)") . ":", 'pic', 'pic');
-       // Add Image upload for New Item  - by Joe
-       $stock_img_link = "";
-       $check_remove_image = false;
+       file_row(_("Image File (.jpg)") . ":", 'pic', 'pic'); // fixme: png/gif
 
-       if (@$_POST['NewStockID'] && file_exists(company_path().'/images/'
-               .item_img_name($_POST['NewStockID']).".jpg")) 
-       {
-        // 31/08/08 - rand() call is necessary here to avoid caching problems.
-               $stock_img_link .= "<img id='item_img' alt = '[".$_POST['NewStockID'].".jpg".
-                       "]' src='".company_path().'/images/'.item_img_name($_POST['NewStockID']).
-                       ".jpg?nocache=".rand()."'"." height='".$SysPrefs->pic_height."' border='0'>";
-               $check_remove_image = true;
-       } 
-       else 
-       {
-               $stock_img_link .= _("No image");
-       }
-
-       label_row("&nbsp;", $stock_img_link);
-       if ($check_remove_image)
-               check_row(_("Delete Image:"), 'del_image');
+       show_image(@$_POST['NewStockID']);
 
        record_status_list_row(_("Item status:"), 'inactive');
        if (get_post('fixed_asset')) {

diff --git a/reporting/includes/tcpdf.php b/reporting/includes/tcpdf.php
index eec95ee9509fc7c5aa662e184795e751e90facea..0d3d210844778657df5a846ceb3617f2b86d11b6 100644 (file)
--- a/reporting/includes/tcpdf.php
+++ b/reporting/includes/tcpdf.php
@@ -624,7 +624,7 @@ if (!class_exists('TCPDF')) {
                 * @var Header font.
                 * @access protected
                 */
-               var $header_font;
+               var $header_font = array('helvetica', '', 12);
 
                /**
                 * @var Footer font.