[BACK]Return to course.initialization.helper CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / html / adm / helper

Diff for /loncom/html/adm/helper/course.initialization.helper between versions 1.18 and 1.25

version 1.18, 2007/09/03 20:23:57 version 1.25, 2009/02/25 16:39:59
Line 57 Line 57
       </message>        </message>
     </state>      </state>
   
   <state name="COURSE_DESCRIPTION" title="Course Description">    <state name="COURSE_DESCRIPTION" title="Course Title">
     <message nextstate="FORBID_CHAT">      <message nextstate="FORBID_CHAT">
       The &quot;Course Description&quot; is the name of the course that will be        The &quot;Course Title&quot; is the name of the course that will be
       seen by the students.  You may now modify the description and hit         seen by the students.  You may now modify the description and hit 
       <nobr>&quot;<b>Next -&gt;</b>&quot;</nobr> to continue.<br />        <nobr>&quot;<b>Next -&gt;</b>&quot;</nobr> to continue.<br />
       </message>        </message>
Line 76 Line 76
       </string>        </string>
     </state>      </state>
   
   <state name="FORBID_CHAT" title="Chat Participation">    <state name="FORBID_CHAT" title="Chat Room Participation">
     <message nextstate="FORBID_DISCUSSION">      <message nextstate="FORBID_DISCUSSION">
       <p>LON-CAPA has live chat functionality.  This course will receive        <p>LON-CAPA has chat room functionality. This course will receive
          its own chat room.  You may deny students, TAs, or instructors           its own chat room. You may deny students, TAs, or instructors
          the right to access the chat room.</p>           the right to access the chat room.</p>
       </message>        </message>
     <choices variable="BANNED_CHAT_ROLES" multichoice="1" allowempty='1'>      <choices variable="BANNED_CHAT_ROLES" multichoice="1" allowempty='1'>
Line 105 Line 105
                 $denied =~ s/,([^,]*)$/, and\1/;                  $denied =~ s/,([^,]*)$/, and\1/;
             }              }
             if ($denied) {              if ($denied) {
                 $denied = substr($denied, 1) . ' not allowed to participate in live chatroom.';                  $denied = substr($denied, 1) . ' not allowed to participate in chat room.';
                 $denied = ucfirst($denied);                  $denied = ucfirst($denied);
             } else {              } else {
                 $denied = 'Everyone can participate in live chatroom.';                  $denied = 'Everyone can participate in chat room.';
             }              }
             return $denied;              return $denied;
         } else {          } else {
Line 197 Line 197
       who will receive the feedback, such as a different instructor or a        who will receive the feedback, such as a different instructor or a
       TA. Please enter their LON-CAPA address below, in the        TA. Please enter their LON-CAPA address below, in the
       form <b>user:domain</b>, where &quot;user&quot; and &quot;domain&quot;        form <b>user:domain</b>, where &quot;user&quot; and &quot;domain&quot;
       are both the LON-CAPA username and LON-CAPA domain, not an email        are both the LON-CAPA username and LON-CAPA domain, not an e-mail
       address.</p>         address.</p> 
       </message>        </message>
     <eval>return &mt('<p>Your current LON-CAPA domain is &quot;<b>[_1]</b>&quot;.</p>',"$helper->{DATA}->{DOM}");       <eval>return &mt('<p>Your current LON-CAPA domain is &quot;<b>[_1]</b>&quot;.</p>',"$helper->{DATA}->{DOM}"); 
Line 251 Line 251
       } else {        } else {
           $cloners[0] = $val;            $cloners[0] = $val;
       }        }
       my @alldoms = &Apache::lonnet::all_domains();  
       foreach my $item (@cloners) {        foreach my $item (@cloners) {
           if ($item ne '*') {    next if ($item =~ /^\s*$/);
               my ($clname,$cldom) = split(/:/,$item);    next if ($item eq '*');
               if ($clname eq '*') {         
                   if ($cldom =~ /^$match_dom$/) {    my ($clname,$cldom) = split(/:/,$item);
                       if (!grep(/^\Q$cldom\E$/,@alldoms)) {    if ($clname eq '*') {
                           $disallowed{'domain'} .= $item.',';        if ($cldom =~ /^$match_dom$/) {
                       }    if (!&Apache::lonnet::domain($cldom)) {
                   } else {        $disallowed{'domain'} .= $item.',';
                       $disallowed{'format'} .= $item.',';    }
                   }        } else {
               } elsif ($item !~/^($match_uname)\:($match_dom)$/) {    $disallowed{'format'} .= $item.',';
                   $disallowed{'format'} .= $item.',';        }
               } else {    } elsif ($item !~/^($match_uname)\:($match_dom)$/) {
                   if (!grep(/^\Q$cldom\E$/,@alldoms)) {        $disallowed{'format'} .= $item.',';
                       $disallowed{'domain'} .= $item.',';     } else {
                   } elsif (&Apache::lonnet::homeserver($clname,$cldom) eq 'no_host') {        if (!&Apache::lonnet::domain($cldom)) {
                       $disallowed{'newuser'} .= $item.',';    $disallowed{'domain'} .= $item.','; 
                   }        } elsif (&Apache::lonnet::homeserver($clname,$cldom) eq 'no_host') {
               }    $disallowed{'newuser'} .= $item.',';
           }        }
     }
       }        }
       foreach my $key (keys(%disallowed)) {        foreach my $key (keys(%disallowed)) {
           $disallowed{$key} =~ s/,$//;            $disallowed{$key} =~ s/,$//;
Line 291 Line 291
               $output .= '<li>LON-CAPA user(s) do(es) not exist: '.                $output .= '<li>LON-CAPA user(s) do(es) not exist: '.
                          '<b>'.$disallowed{'newuser'}.'</b></li>';                           '<b>'.$disallowed{'newuser'}.'</b></li>';
           }            }
           $output .= '.</ul>';            $output .= '</ul>';
       }        }
       return $output;        return $output;
     </validator>      </validator>
Removed from v.1.18  
changed lines
  Added in v.1.25

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>