--- loncom/interface/loncommon.pm	2008/09/29 22:58:41	1.679.2.6
+++ loncom/interface/loncommon.pm	2008/09/05 15:48:08	1.680
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.679.2.6 2008/09/29 22:58:41 raeburn Exp $
+# $Id: loncommon.pm,v 1.680 2008/09/05 15:48:08 riegler Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1507,9 +1507,9 @@ sub create_text_file {
     $fh = Apache::File->new('>/home/httpd'.$filename);
     if (! defined($fh)) {
         $r->log_error("Couldn't open $filename for output $!");
-        $r->print(&mt('Problems occurred in creating the output file. '
-                     .'This error has been logged. '
-                     .'Please alert your LON-CAPA administrator.'));
+        $r->print("Problems occured in creating the output file.  ".
+                  "This error has been logged.  ".
+                  "Please alert your LON-CAPA administrator.");
     }
     return ($fh,$filename)
 }
@@ -2987,19 +2987,14 @@ sub preferred_languages {
             }
         }
     }
-    return &get_genlanguages(@languages);
-}
-
-sub get_genlanguages {
-    my (@languages) = @_;
 # turn "en-ca" into "en-ca,en"
     my @genlanguages;
     foreach my $lang (@languages) {
-        unless ($lang=~/\w/) { next; }
-        push(@genlanguages,$lang);
-        if ($lang=~/(\-|\_)/) {
-            push(@genlanguages,(split(/(\-|\_)/,$lang))[0]);
-        }
+	unless ($lang=~/\w/) { next; }
+	push(@genlanguages,$lang);
+	if ($lang=~/(\-|\_)/) {
+	    push(@genlanguages,(split(/(\-|\_)/,$lang))[0]);
+	}
     }
     #uniqueify the languages list
     my %count;
@@ -3353,21 +3348,16 @@ sub pprmlink {
 
 
 sub timehash {
-    my ($thistime) = @_;
-    my $timezone = &Apache::lonlocal::gettimezone();
-    my $dt = DateTime->from_epoch(epoch => $thistime)
-                     ->set_time_zone($timezone);
-    my $wday = $dt->day_of_week();
-    if ($wday == 7) { $wday = 0; }
-    return ( 'second' => $dt->second(),
-             'minute' => $dt->minute(),
-             'hour'   => $dt->hour(),
-             'day'     => $dt->day_of_month(),
-             'month'   => $dt->month(),
-             'year'    => $dt->year(),
-             'weekday' => $wday,
-             'dayyear' => $dt->day_of_year(),
-             'dlsav'   => $dt->is_dst() );
+    my @ltime=localtime(shift);
+    return ( 'seconds' => $ltime[0],
+             'minutes' => $ltime[1],
+             'hours'   => $ltime[2],
+             'day'     => $ltime[3],
+             'month'   => $ltime[4]+1,
+             'year'    => $ltime[5]+1900,
+             'weekday' => $ltime[6],
+             'dayyear' => $ltime[7]+1,
+             'dlsav'   => $ltime[8] );
 }
 
 sub utc_string {
@@ -3377,24 +3367,6 @@ sub utc_string {
 
 sub maketime {
     my %th=@_;
-    my ($epoch_time,$timezone,$dt);
-    $timezone = &Apache::lonlocal::gettimezone();
-    eval {
-        $dt = DateTime->new( year   => $th{'year'},
-                             month  => $th{'month'},
-                             day    => $th{'day'},
-                             hour   => $th{'hour'},
-                             minute => $th{'minute'},
-                             second => $th{'second'},
-                             time_zone => $timezone,
-                         );
-    };
-    if (!$@) {
-        $epoch_time = $dt->epoch;
-        if ($epoch_time) {
-            return $epoch_time;
-        }
-    }
     return POSIX::mktime(
         ($th{'seconds'},$th{'minutes'},$th{'hours'},
          $th{'day'},$th{'month'}-1,$th{'year'}-1900,0,0,-1));
@@ -3775,60 +3747,6 @@ sub blocking_status {
 
 ###############################################
 
-sub check_ip_acc {
-    my ($acc)=@_;
-    &Apache::lonxml::debug("acc is $acc");
-    if (!defined($acc) || $acc =~ /^\s*$/ || $acc =~/^\s*no\s*$/i) {
-        return 1;
-    }
-    my $allowed=0;
-    my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'};
-
-    my $name;
-    foreach my $pattern (split(',',$acc)) {
-        $pattern =~ s/^\s*//;
-        $pattern =~ s/\s*$//;
-        if ($pattern =~ /\*$/) {
-            #35.8.*
-            $pattern=~s/\*//;
-            if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
-        } elsif ($pattern =~ /(\d+\.\d+\.\d+)\.\[(\d+)-(\d+)\]$/) {
-            #35.8.3.[34-56]
-            my $low=$2;
-            my $high=$3;
-            $pattern=$1;
-            if ($ip =~ /^\Q$pattern\E/) {
-                my $last=(split(/\./,$ip))[3];
-                if ($last <=$high && $last >=$low) { $allowed=1; }
-            }
-        } elsif ($pattern =~ /^\*/) {
-            #*.msu.edu
-            $pattern=~s/\*//;
-            if (!defined($name)) {
-                use Socket;
-                my $netaddr=inet_aton($ip);
-                ($name)=gethostbyaddr($netaddr,AF_INET);
-            }
-            if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
-        } elsif ($pattern =~ /\d+\.\d+\.\d+\.\d+/) {
-            #127.0.0.1
-            if ($ip =~ /^\Q$pattern\E/) { $allowed=1; }
-        } else {
-            #some.name.com
-            if (!defined($name)) {
-                use Socket;
-                my $netaddr=inet_aton($ip);
-                ($name)=gethostbyaddr($netaddr,AF_INET);
-            }
-            if ($name =~ /\Q$pattern\E$/i) { $allowed=1; }
-        }
-        if ($allowed) { last; }
-    }
-    return $allowed;
-}
-
-###############################################
-
 =pod
 
 =head1 Domain Template Functions
@@ -4575,7 +4493,7 @@ table.LC_docs_path td.LC_docs_path_compo
 td.LC_table_cell_checkbox {
   text-align: center;
 }
-
+#changed in a new style. see at the end of the css deklaration LC_mainmenu_col__fieldset
 table#LC_mainmenu td.LC_mainmenu_column {
     vertical-align: top;
 }
@@ -4589,7 +4507,7 @@ table#LC_mainmenu td.LC_mainmenu_column
 .LC_menubuttons_link {
   text-decoration: none;
 }
-
+#2008--9-5: new menu style sheet.Changed category
 .LC_menubuttons_category {
   color: $font;
   background: $pgbg;
@@ -5446,6 +5364,23 @@ img.stift{
   border-width:0;
   vertical-align:middle;
 }
+
+#Styles for main menu
+table#LC_mainmenu td.LC_mainmenu_col_fieldset{
+  vertical-align: top;
+  width: 45%;
+}
+.LC_mainmenu_fieldset_category {
+  color: $font;
+  background: $pgbg;
+  font-family: $sans;
+  font-size: small;
+  font-weight: bold;
+}
+fieldset#LC_mainmenu_fieldset {
+  margin:0px 0px 10px 0px;
+
+}
 END
 }
 
@@ -8330,10 +8265,8 @@ sub build_recipient_list {
     } elsif ($origmail ne '') {
         push(@recipients,$origmail);
     }
-    if (defined($defmail)) {
-        if ($defmail ne '') {
-            push(@recipients,$defmail);
-        }
+    if ($defmail ne '') {
+        push(@recipients,$defmail);
     }
     if ($otheremails) {
         my @others;
@@ -9353,7 +9286,7 @@ sub init_user_environment {
 	}
 # Give them a new cookie
 	my $id = ($args->{'robot'} ? 'robot'.$args->{'robot'}
-		                   : $now.$$.int(rand(10000)));
+		                   : $now);
 	$cookie="$username\_$id\_$domain\_$authhost";
     
 # Initialize roles