Stable merged into unstable again (due to failure on binary file during previous...

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

diff --git a/inventory/manage/items.php b/inventory/manage/items.php
index 4254ea6eab28bfad8a9279274a97be7ff60efed8..70572f59fed52f10d7245ca162d4941a38af1864 100644 (file)
--- a/inventory/manage/items.php
+++ b/inventory/manage/items.php
@@ -12,11 +12,15 @@
 $page_security = 'SA_ITEM';
 $path_to_root = "../..";
 include($path_to_root . "/includes/session.inc");
+
 $js = "";
 if ($use_popup_windows)
        $js .= get_js_open_window(900, 500);
+if ($use_date_picker)
+       $js .= get_js_date_picker();
        
-page(_($help_context = "Items"), false, false, "", $js);
+page(_($help_context = "Items"), @$_REQUEST['popup'], false, "", $js);
+
 
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
@@ -83,6 +87,11 @@ if (isset($_FILES['pic']) && $_FILES['pic']['name'] != '')
                display_warning(_('The file size is over the maximum allowed. The maximum size allowed in KB is') . ' ' . $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';
+       } 
        elseif (file_exists($filename))
        {
                $result = unlink($filename);
@@ -462,13 +471,11 @@ tabbed_content_start('tabs', array(
                case 'movement':
                        $_GET['stock_id'] = $stock_id;
                        $_GET['popup'] = 1;
-                       $_SERVER['REQUEST_METHOD'] = 'GET';                     
                        include_once($path_to_root."/inventory/inquiry/stock_movements.php");
                        break;
                case 'status':
                        $_GET['stock_id'] = $stock_id;
                        $_GET['popup'] = 1;
-                       $_SERVER['REQUEST_METHOD'] = 'GET';                     
                        include_once($path_to_root."/inventory/inquiry/stock_status.php");
                        break;
        };
@@ -477,11 +484,10 @@ tabbed_content_end();
 
 div_end();
 
-
 hidden('popup', @$_REQUEST['popup']);
 end_form();
 
 //------------------------------------------------------------------------------------
 
-end_page();
+end_page(@$_REQUEST['popup']);
 ?>