--- loncom/interface/loncommon.pm	2008/05/29 15:39:16	1.656
+++ loncom/interface/loncommon.pm	2008/06/09 22:34:55	1.660
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.656 2008/05/29 15:39:16 www Exp $
+# $Id: loncommon.pm,v 1.660 2008/06/09 22:34:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -67,6 +67,7 @@ use Apache::loncoursedata();
 use Apache::lontexconvert();
 use Apache::lonclonecourse();
 use LONCAPA qw(:DEFAULT :match);
+use DateTime::TimeZone;
 
 # ---------------------------------------------- Designs
 use vars qw(%defaultdesign);
@@ -150,7 +151,6 @@ sub ssi_with_retries {
 
 # ----------------------------------------------- Filetypes/Languages/Copyright
 my %language;
-my %timezone;
 my %supported_language;
 my %cprtag;
 my %scprtag;
@@ -193,22 +193,6 @@ BEGIN {
             close($fh);
         }
     }
-# ------------------------------------------------------------------- timezones
-    {
-        my $timetabfile = $Apache::lonnet::perlvar{'lonTabDir'}.
-                                   '/timezone.tab';
-        if ( open(my $fh,"<$timetabfile") ) {
-            while (my $line = <$fh>) {
-                next if ($line=~/^\#/);
-                chomp($line);
-                my $value=$line;
-                $value=~s/\_/ /g;
-                $timezone{$line}=$value;
-            }
-            close($fh);
-        }
-    }
-
 # ------------------------------------------------------------------ copyrights
     {
         my $copyrightfile = $Apache::lonnet::perlvar{'lonIncludes'}.
@@ -652,14 +636,22 @@ ENDSCRT
 }
 
 sub select_timezone {
-   my ($name,$selected,$onchange)=@_;
-   my $output="<select name='$name' $onchange>\n";
-   foreach my $key (sort(keys(%timezone))) {
-      $output.="<option value='$timezone{$key}'";
-      if ($key eq $selected) {
-         $output.=" selected='selected'";
-      }
-      $output.=">$timezone{$key}</option>\n";
+   my ($name,$selected,$onchange,$includeempty)=@_;
+   my $output='<select name="'.$name.'" '.$onchange.'>'."\n";
+   if ($includeempty) {
+       $output .= '<option value=""';
+       if (($selected eq '') || ($selected eq 'local')) {
+           $output .= ' selected="selected" ';
+       }
+       $output .= '> </option>';
+   }
+   my @timezones = DateTime::TimeZone->all_names;
+   foreach my $tzone (@timezones) {
+       $output.= '<option value="'.$tzone.'"';
+       if ($tzone eq $selected) {
+           $output.=' selected="selected"';
+       }
+       $output.=">$tzone</option>\n";
    }
    $output.="</select>";
    return $output;
@@ -7043,6 +7035,54 @@ sub get_env_multiple {
     return(@values);
 }
 
+sub ask_for_embedded_content {
+    my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
+    my $upload_output = '
+   <form name="upload_embedded" action="'.$actionurl.'"
+                  method="post" enctype="multipart/form-data">';
+    $upload_output .= $state;
+    $upload_output .= '<b>Upload embedded files</b>:<br />'.start_data_table();
+
+    my $num = 0;
+    foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%{$allfiles})) {
+        $upload_output .= &start_data_table_row().
+            '<td>'.$embed_file.'</td><td>';
+        if ($args->{'ignore_remote_references'}
+            && $embed_file =~ m{^\w+://}) {
+            $upload_output.='<span class="LC_warning">'.&mt("URL points to other server.").'</span>';
+        } elsif ($args->{'error_on_invalid_names'}
+            && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
+
+            $upload_output.='<span class="LC_warning">'.&mt("Invalid characters").'</span>';
+
+        } else {
+
+            $upload_output .='
+           <input name="embedded_item_'.$num.'" type="file" value="bob" />
+           <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
+            my $attrib = join(':',@{$$allfiles{$embed_file}});
+            $upload_output .=
+                "\n\t\t".
+                '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.
+                $attrib.'" />';
+            if (exists($$codebase{$embed_file})) {
+                $upload_output .=
+                    "\n\t\t".
+                    '<input name="codebase_'.$num.'" type="hidden" value="'.
+                    &escape($$codebase{$embed_file}).'" />';
+            }
+        }
+        $upload_output .= '</td>'.&Apache::loncommon::end_data_table_row();
+        $num++;
+    }
+    $upload_output .= &Apache::loncommon::end_data_table().'<br />
+   <input type ="hidden" name="number_embedded_items" value="'.$num.'" />
+   <input type ="submit" value="'.&mt('Upload Listed Files').'" />
+   '.&mt('(only files for which a location has been provided will be uploaded)').'
+   </form>';
+    return $upload_output;
+}
+
 
 =pod