[Phpgroupware-cvs] dj import.php templates/default/import.tpl [Version-0_9_16-branch]

[Dave Hall]

CVSROOT:        /sources/phpgroupware
Module name:    dj
Branch:         Version-0_9_16-branch
Changes by:     Dave Hall <skwashd>     06/10/24 06:23:07

Modified files:
        .              : import.php 
        templates/default: import.tpl 

Log message:
        fix import and give the user some feedback

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dj/import.php?cvsroot=phpgroupware&only_with_tag=Version-0_9_16-branch&r1=1.11.2.1&r2=1.11.2.1.2.1
http://cvs.savannah.gnu.org/viewcvs/dj/templates/default/import.tpl?cvsroot=phpgroupware&only_with_tag=Version-0_9_16-branch&r1=1.2&r2=1.2.6.1

Patches:
Index: import.php
===================================================================
RCS file: /sources/phpgroupware/dj/import.php,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.1.2.1
diff -u -b -r1.11.2.1 -r1.11.2.1.2.1
--- import.php  27 Feb 2003 21:48:38 -0000      1.11.2.1
+++ import.php  24 Oct 2006 06:23:06 -0000      1.11.2.1.2.1
@@ -10,9 +10,10 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: import.php,v 1.11.2.1 2003/02/27 21:48:38 gugux Exp $ */
+  /* $Id: import.php,v 1.11.2.1.2.1 2006/10/24 06:23:06 skwashd Exp $ */
 
-       $GLOBALS['phpgw_info']['flags'] = array(
+       $GLOBALS['phpgw_info']['flags'] = array
+       (
                'currentapp'           => 'dj',
                'enable_browser_class' => True
        );
@@ -28,7 +29,7 @@
                }
        }
 
-       if (!$HTTP_POST_VARS['convert'])
+       if (!$_POST['convert'])
        {
                $GLOBALS['phpgw']->template->set_file(array('import' => 
'import.tpl'));
 
@@ -43,24 +44,18 @@
                $GLOBALS['phpgw']->template->set_var('conv',$GLOBALS['conv']);
                $GLOBALS['phpgw']->template->set_var('debug',lang('Debug output 
in browser'));
                $GLOBALS['phpgw']->template->set_var('download',lang('Submit'));
-               /*
-               $GLOBALS['phpgw']->template->set_var('start',$GLOBALS['start']);
-               $GLOBALS['phpgw']->template->set_var('sort',$GLOBALS['sort']);
-               $GLOBALS['phpgw']->template->set_var('order',$GLOBALS['order']);
-               
$GLOBALS['phpgw']->template->set_var('filter',$GLOBALS['filter']);
-               $GLOBALS['phpgw']->template->set_var('query',$GLOBALS['query']);
-               
$GLOBALS['phpgw']->template->set_var('cat_id',$GLOBALS['cat_id']);
-               */
+
                $GLOBALS['phpgw']->template->pparse('out','import');
                $GLOBALS['phpgw']->common->phpgw_footer();
        }
        else
        {
                $cats = CreateObject('phpgwapi.categories');
-               $fp = fopen($HTTP_POST_VARS['tsvfile'],'r');
+               $fp = fopen($_FILES['tsvfile']['tmp_name'],'r');
                $num = 0;
                while ($data = fgets($fp,8000))
                {
+                       echo lang('analysing: %1', $data) . "<br />\n";
                        $buffer .= $data;
                        $mp3info = get_info($data);
 

Index: templates/default/import.tpl
===================================================================
RCS file: /sources/phpgroupware/dj/templates/default/import.tpl,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -b -r1.2 -r1.2.6.1
--- templates/default/import.tpl        5 May 2001 03:53:43 -0000       1.2
+++ templates/default/import.tpl        24 Oct 2006 06:23:07 -0000      1.2.6.1
@@ -12,7 +12,7 @@
            <TD><FORM ENCTYPE="multipart/form-data" action="{action_url}" 
method="post">
             <OL>
             <LI>
-              Create a list of your mp3s (e.g. find /mp3dir -name *.mp3 > 
mp3_list)
+              Create a list of your mp3s (e.g. find /mp3dir -name '*.mp3' &gt; 
mp3_list)
                        </LI>
             <LI>Enter the path to the exported file here:
               <INPUT NAME="tsvfile" SIZE=48 TYPE="file" 
VALUE="{tsvfilename}"><P></LI>