Fixed tabbed dialogs. Removed redundant 'popup' variables.

[fa-stable.git] / inventory / manage / items.php

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 46fb1469df7a62b634399003e52a13f5bde6ca0e..fc7f1a7a8f3ff4b634ecc7d2eeb6337614a185d4 100644 (file)
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -14,12 +14,12 @@ $path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 500);
 if (user_use_date_picker())
        $js .= get_js_date_picker();
 
-page(_($help_context = "Items"), @$_REQUEST['popup'], false, "", $js);
+page(_($help_context = "Items"), false, false, "", $js);
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
@@ -64,13 +64,22 @@ if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
                mkdir($filename);
        }       
        $filename .= "/".item_img_name($stock_id).".jpg";
+
+  if ($_FILES['pic']['error'] == UPLOAD_ERR_INI_SIZE) {
+    display_error(_('The file size is over the maximum allowed.'));
+               $upload_file ='No';
+  }
+  elseif ($_FILES['pic']['error'] > 0) {
+               display_error(_('Error uploading file.'));
+               $upload_file ='No';
+  }
        
        //But check for the worst 
        if ((list($width, $height, $type, $attr) = getimagesize($_FILES['pic']['tmp_name'])) !== false)
                $imagetype = $type;
        else
                $imagetype = false;
-       //$imagetype = exif_imagetype($_FILES['pic']['tmp_name']);
+
        if ($imagetype != IMAGETYPE_GIF && $imagetype != IMAGETYPE_JPEG && $imagetype != IMAGETYPE_PNG)
        {       //File type Check
                display_warning( _('Only graphics files can be uploaded'));
@@ -81,15 +90,15 @@ if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
                display_warning(_('Only graphics files are supported - a file extension of .jpg, .png or .gif is expected'));
                $upload_file ='No';
        } 
-       elseif ( $_FILES['pic']['size'] > ($max_image_size * 1024)) 
+       elseif ( $_FILES['pic']['size'] > ($SysPrefs->max_image_size * 1024)) 
        { //File Size Check
-               display_warning(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $max_image_size);
+               display_warning(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $SysPrefs->max_image_size);
                $upload_file ='No';
        } 
        elseif ( $_FILES['pic']['type'] == "text/plain" ) 
        {  //File type Check
                display_warning( _('Only graphics files can be uploaded'));
-               $upload_file ='No';
+        $upload_file ='No';
        } 
        elseif (file_exists($filename))
        {
@@ -254,15 +263,15 @@ if (isset($_POST['delete']) && strlen($_POST['delete']) > 1)
        }
 }
 
-function item_settings(&$stock_id) 
+function item_settings(&$stock_id, $new_item) 
 {
-       global $SysPrefs, $path_to_root, $new_item, $pic_height;
+       global $SysPrefs, $path_to_root, $page_nested;
 
        start_outer_table(TABLESTYLE2);
 
        table_section(1);
 
-       table_section_title(_("Item"));
+       table_section_title(_("General Settings"));
 
        //------------------------------------------------------------------------------------
        if ($new_item) 
@@ -393,10 +402,10 @@ function item_settings(&$stock_id)
        if (isset($_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. Thanks to Peter D.
+        // 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='$pic_height' border='0'>";
+                       ".jpg?nocache=".rand()."'"." height='".$SysPrefs->pic_height."' border='0'>";
                $check_remove_image = true;
        } 
        else 
@@ -419,7 +428,7 @@ function item_settings(&$stock_id)
        else 
        {
                submit_center_first('addupdate', _("Update Item"), '', 
-                       @$_REQUEST['popup'] ? true : 'default');
+                       $page_nested ? true : 'default');
                submit_return('select', get_post('stock_id'), 
                        _("Select this items and return to document entry."), 'default');
                submit('clone', _("Clone This Item"), true, '', true);
@@ -474,21 +483,21 @@ tabbed_content_start('tabs', array(
        switch (get_post('_tabs_sel')) {
                default:
                case 'settings':
-                       item_settings($stock_id); 
+                       item_settings($stock_id, $new_item); 
                        break;
                case 'sales_pricing':
                        $_GET['stock_id'] = $stock_id;
-                       $_GET['popup'] = 1;
+                       $_GET['page_level'] = 1;
                        include_once($path_to_root."/inventory/prices.php");
                        break;
                case 'purchase_pricing':
                        $_GET['stock_id'] = $stock_id;
-                       $_GET['popup'] = 1;
+                       $_GET['page_level'] = 1;
                        include_once($path_to_root."/inventory/purchasing_data.php");
                        break;
                case 'standard_cost':
                        $_GET['stock_id'] = $stock_id;
-                       $_GET['popup'] = 1;
+                       $_GET['page_level'] = 1;
                        include_once($path_to_root."/inventory/cost_update.php");
                        break;
                case 'reorder_level':
@@ -496,18 +505,16 @@ tabbed_content_start('tabs', array(
                        {
                                break;
                        }       
+                       $_GET['page_level'] = 1;
                        $_GET['stock_id'] = $stock_id;
-                       $_GET['popup'] = 1;
                        include_once($path_to_root."/inventory/reorder_level.php");
                        break;
                case 'movement':
                        $_GET['stock_id'] = $stock_id;
-                       $_GET['popup'] = 1;
                        include_once($path_to_root."/inventory/inquiry/stock_movements.php");
                        break;
                case 'status':
                        $_GET['stock_id'] = $stock_id;
-                       $_GET['popup'] = 1;
                        include_once($path_to_root."/inventory/inquiry/stock_status.php");
                        break;
        };
@@ -516,10 +523,8 @@ tabbed_content_end();
 
 div_end();
 
-hidden('popup', @$_REQUEST['popup']);
 end_form();
 
 //------------------------------------------------------------------------------------
 
-end_page(@$_REQUEST['popup']);
-?>
+end_page();