version 1.4, 2011/10/27 03:43:53
|
version 1.7, 2011/12/09 03:01:44
|
Line 38 use LONCAPA qw(:DEFAULT :match);
|
Line 38 use LONCAPA qw(:DEFAULT :match);
|
use Apache::lonlocal; |
use Apache::lonlocal; |
use File::Copy; |
use File::Copy; |
use GDBM_File; |
use GDBM_File; |
|
use DBI; |
|
|
|
my ($lonusersdir,$londocroot,$londaemons,$lonsqlaccess); |
|
|
|
BEGIN { |
|
my $perlvar=&LONCAPA::Configuration::read_conf(); |
|
if (ref($perlvar) eq 'HASH') { |
|
$lonusersdir = $perlvar->{'lonUsersDir'}; |
|
$londocroot = $perlvar->{'lonDocRoot'}; |
|
$londaemons = $perlvar->{'lonDaemons'}; |
|
$lonsqlaccess = $perlvar->{'lonSqlAccess'}; |
|
} |
|
undef($perlvar); |
|
} |
|
|
my $lang = &Apache::lonlocal::choose_language(); |
my $lang = &Apache::lonlocal::choose_language(); |
&Apache::lonlocal::get_language_handle(undef,$lang); |
&Apache::lonlocal::get_language_handle(undef,$lang); |
Line 48 if ($< != 0) {
|
Line 62 if ($< != 0) {
|
exit; |
exit; |
} |
} |
|
|
my $perlvar=&LONCAPA::Configuration::read_conf(); |
if ($lonusersdir eq '') { |
my ($lonuserdir,$londocroot,$londaemons); |
|
if (ref($perlvar) eq 'HASH') { |
|
$lonuserdir = $perlvar->{'lonUsersDir'}; |
|
$londocroot = $perlvar->{'lonDocRoot'}; |
|
$londaemons = $perlvar->{'lonDaemons'}; |
|
} |
|
undef($perlvar); |
|
|
|
if ($lonuserdir eq '') { |
|
print &mt('Could not determine location of [_1] directory.',"'lonUsersDir'")."\n". |
print &mt('Could not determine location of [_1] directory.',"'lonUsersDir'")."\n". |
&mt('Stopping')."\n"; |
&mt('Stopping')."\n"; |
exit; |
exit; |
Line 168 if ($action eq '') {
|
Line 173 if ($action eq '') {
|
} |
} |
|
|
if ($action eq 'dryrun') { |
if ($action eq 'dryrun') { |
print "\n". |
print "\n\n". |
&mt('Running in exploratory mode ...')."\n\n". |
&mt('Running in exploratory mode ...')."\n\n". |
&mt('Run with argument [_1] to actually move Construction Spaces to [_2], i.e., [_3]', |
&mt('Run with argument [_1] to actually move Construction Spaces to [_2], i.e., [_3]', |
"'move'","'$londocroot/priv'","\n\nperl move_construction_spaces.pl move")."\n\n\n". |
"'move'","'$londocroot/priv'","\n\nperl move_construction_spaces.pl move")."\n\n\n". |
Line 247 if ($action eq 'move') {
|
Line 252 if ($action eq 'move') {
|
} |
} |
|
|
my @machinedoms; |
my @machinedoms; |
if ($lonuserdir) { |
if ($lonusersdir) { |
my ($dir,$output); |
my ($dir,$output); |
if (opendir($dir,$lonuserdir)) { |
if (opendir($dir,$lonusersdir)) { |
my @contents = (grep(!/^\.{1,2}$/,readdir($dir))); |
my @contents = (grep(!/^\.{1,2}$/,readdir($dir))); |
|
closedir($dir); |
foreach my $item (@contents) { |
foreach my $item (@contents) { |
if (-d "$lonuserdir/$item") { |
if (-d "$lonusersdir/$item") { |
if ($item =~ /^$match_domain$/) { |
if ($item =~ /^$match_domain$/) { |
my $domain = $item; |
my $domain = $item; |
unless (grep(/^\Q$domain\E$/,@machinedoms)) { |
unless (grep(/^\Q$domain\E$/,@machinedoms)) { |
Line 279 if ($lonuserdir) {
|
Line 285 if ($lonuserdir) {
|
} |
} |
} |
} |
my %authors=(); |
my %authors=(); |
my $fname = "$lonuserdir/$domain/nohist_domainroles.db"; |
my $fname = "$lonusersdir/$domain/nohist_domainroles.db"; |
my $dbref; |
my $dbref; |
if (-e $fname) { |
if (-e $fname) { |
$dbref=&LONCAPA::locking_hash_tie($fname,&GDBM_READER()); |
$dbref=&LONCAPA::locking_hash_tie($fname,&GDBM_READER()); |
Line 298 if ($lonuserdir) {
|
Line 304 if ($lonuserdir) {
|
} |
} |
} |
} |
} |
} |
closedir($dir); |
|
} else { |
} else { |
$output = &mt('Could not open [_1].',"'$lonuserdir'")."\n"; |
$output = &mt('Could not open [_1].',"'$lonusersdir'")."\n"; |
print $output; |
print $output; |
&stop_logging($logfh,$output); |
&stop_logging($logfh,$output); |
print &mt('Stopping')."\n"; |
print &mt('Stopping')."\n"; |
Line 313 if ($londocroot ne '') {
|
Line 318 if ($londocroot ne '') {
|
my ($dir,$domdir); |
my ($dir,$domdir); |
if (opendir($dir,"$londocroot/res")) { |
if (opendir($dir,"$londocroot/res")) { |
my @contents = (grep(!/^\.{1,2}$/,readdir($dir))); |
my @contents = (grep(!/^\.{1,2}$/,readdir($dir))); |
|
closedir($dir); |
foreach my $dom (@contents) { |
foreach my $dom (@contents) { |
if ((grep(/^\Q$dom\E/,@machinedoms)) && (-d "$londocroot/res/$dom")) { |
if ((grep(/^\Q$dom\E/,@machinedoms)) && (-d "$londocroot/res/$dom")) { |
if (opendir($domdir,"$londocroot/res/$dom")) { |
if (opendir($domdir,"$londocroot/res/$dom")) { |
my @unames = (grep(!/^\.{1,2}$/,readdir($domdir))); |
my @unames = (grep(!/^\.{1,2}$/,readdir($domdir))); |
|
closedir($domdir); |
foreach my $uname (@unames) { |
foreach my $uname (@unames) { |
if ($uname =~ /^$match_username$/) { |
if ($uname =~ /^$match_username$/) { |
push(@{$pubusers{$uname}},$dom); |
push(@{$pubusers{$uname}},$dom); |
Line 336 if ($action eq 'undo') {
|
Line 343 if ($action eq 'undo') {
|
my ($dir,$domdir); |
my ($dir,$domdir); |
if (opendir($dir,"$londocroot/priv")) { |
if (opendir($dir,"$londocroot/priv")) { |
my @contents = (grep(!/^\.{1,2}/,readdir($dir))); |
my @contents = (grep(!/^\.{1,2}/,readdir($dir))); |
|
closedir($dir); |
foreach my $dom (@contents) { |
foreach my $dom (@contents) { |
next if (!-d "$londocroot/priv/$dom"); |
next if (!-d "$londocroot/priv/$dom"); |
if (opendir($domdir,"$londocroot/priv/$dom")) { |
if (opendir($domdir,"$londocroot/priv/$dom")) { |
my @unames = (grep(!/^\.{1,2}$/,readdir($domdir))); |
my @unames = (grep(!/^\.{1,2}$/,readdir($domdir))); |
|
closedir($domdir); |
foreach my $uname (@unames) { |
foreach my $uname (@unames) { |
if ($uname =~ /^$match_username$/) { |
if ($uname =~ /^$match_username$/) { |
push(@{$privspaces{$uname}},$dom); |
push(@{$privspaces{$uname}},$dom); |
Line 352 if ($action eq 'undo') {
|
Line 361 if ($action eq 'undo') {
|
} |
} |
foreach my $uname (keys(%privspaces)) { |
foreach my $uname (keys(%privspaces)) { |
if (ref($privspaces{$uname}) eq 'ARRAY') { |
if (ref($privspaces{$uname}) eq 'ARRAY') { |
|
my $output; |
if (@{$privspaces{$uname}} > 1) { |
if (@{$privspaces{$uname}} > 1) { |
my $displaydoms = join(', ',@{$privspaces{$uname}}); |
my $displaydoms = join(', ',@{$privspaces{$uname}}); |
print &mt('Same username used for authors in multiple domains.')."\n". |
print &mt('Same username used for authors in multiple domains.')."\n". |
Line 362 if ($action eq 'undo') {
|
Line 372 if ($action eq 'undo') {
|
my $choice=<STDIN>; |
my $choice=<STDIN>; |
chomp($choice); |
chomp($choice); |
if (grep(/^\Q$choice\E$/,@{$privspaces{$uname}})) { |
if (grep(/^\Q$choice\E$/,@{$privspaces{$uname}})) { |
my $output = &move_priv_to_home($londocroot,$uid,$gid,$uname,$choice); |
$output = &move_priv_to_home($londocroot,$uid,$gid,$uname,$choice); |
print $output; |
|
print $logfh $output; |
|
} else { |
} else { |
print &mt('Invalid choice of domain:')." $choice\n"; |
print &mt('Invalid choice of domain:')." $choice\n"; |
my $output = &mt('Skipping this user: [_1].',"'$uname'")."\n"; |
$output = &mt('Skipping this user: [_1].',"'$uname'")."\n"; |
print $output; |
print $output; |
print $logfh $output; |
print $logfh $output; |
next; |
next; |
} |
} |
} elsif (@{$privspaces{$uname}} == 1) { |
} elsif (@{$privspaces{$uname}} == 1) { |
my $output = &move_priv_to_home($londocroot,$uid,$gid,$uname,$privspaces{$uname}[0]); |
$output = &move_priv_to_home($londocroot,$uid,$gid,$uname,$privspaces{$uname}[0]); |
print $output; |
|
print $logfh $output; |
|
} else { |
} else { |
print &mt('Username [_1] found in [_2] was not within a domain', |
print &mt('Username [_1] found in [_2] was not within a domain', |
"'$uname'","'$londocroot/priv'")."\n"; |
"'$uname'","'$londocroot/priv'")."\n"; |
my $output = &mt('Skipping this user: [_1].',"'$uname'")."\n"; |
$output = &mt('Skipping this user: [_1].',"'$uname'")."\n"; |
print $output; |
} |
print $logfh $output; |
print $output; |
|
print $logfh $output; |
|
} |
|
} |
|
if (-d "$londocroot/priv") { |
|
my $output; |
|
if (opendir(my $dir,"$londocroot/priv")) { |
|
my @doms = grep(!/^\.{1,2}/,readdir($dir)); |
|
closedir($dir); |
|
foreach my $dom (@doms) { |
|
if (opendir(my $domdir,"$londocroot/priv/$dom")) { |
|
my @contents = grep(!/^\.{1,2}/,readdir($domdir)); |
|
closedir($domdir); |
|
if (@contents == 0) { |
|
if (rmdir("$londocroot/priv/$dom")) { |
|
$output = &mt('Removed empty directory: [_1]', |
|
"'$londocroot/priv/$dom'")."\n"; |
|
} else { |
|
$output = &mt('Failed to remove directory: [_1]', |
|
"'$londocroot/priv/$dom'")."\n"; |
|
} |
|
} |
|
} |
} |
} |
} |
} |
|
my $warning = &mt('WARNING: Access to Construction Spaces in their old locations (i.e., in [_1]) via LON-CAPA with URLs of the form [_2] will not work until the directory at [_3] is moved or deleted.',"'/home/<user>/'","'/priv/<user>/'","'$londocroot/priv/'")."\n"; |
|
if (opendir(my $dir,"$londocroot/priv")) { |
|
my @contents = (grep(!/^\.{1,2}/,readdir($dir))); |
|
closedir($dir); |
|
if (@contents == 0) { |
|
if (rmdir("$londocroot/priv")) { |
|
$output .= &mt('Removed empty directory: [_1]', |
|
"'$londocroot/priv'")."\n"; |
|
} else { |
|
$output .= &mt('Failed to remove directory: [_1]', |
|
"'$londocroot/priv'")."\n". |
|
$warning."\n"; |
|
} |
|
} else { |
|
$output .= $warning."\n". |
|
&mt('The attempt to remove the directory failed, because it is not empty.')."\n"; |
|
} |
|
} else { |
|
$output .= $warning."\n". |
|
&mt('The attempt to open the directory to see its contents failed, hence no attempt was made to remove it.')."\n"; |
|
} |
|
print $output; |
|
print $logfh $output; |
} |
} |
&stop_logging($logfh); |
&stop_logging($logfh); |
print "\n".&mt('Done')."\n"; |
print "\n".&mt('Done')."\n"; |
exit; |
exit; |
} |
} |
|
|
|
my @allskipped; |
|
my %allmoved; |
|
my ($dbh,$dbflag); |
|
|
# Iterate over directories in /home |
# Iterate over directories in /home |
if (opendir(my $dir,"/home")) { |
if (opendir(my $dir,"/home")) { |
foreach my $item (grep(!/^\.{1,2}$/,readdir($dir))) { |
my @possibles = grep(!/^\.{1,2}$/,readdir($dir)); |
|
closedir($dir); |
|
foreach my $item (sort(@possibles)) { |
next if ($item eq 'www'); |
next if ($item eq 'www'); |
if ((-d "/home/$item") && ($item ne '')) { |
if ((-d "/home/$item") && ($item ne '')) { |
# Is there a public_html-directory? |
# Is there a public_html-directory? |
if (-d "/home/$item/public_html") { |
if (-d "/home/$item/public_html") { |
my $author = $item; |
my $author = $item; |
my ($domain,$skipped,$output); |
my ($domain,$skipped,$output,$stopnow); |
if (ref($pubusers{$author}) eq 'ARRAY') { |
if (ref($allauthors{$author}) eq 'ARRAY') { |
($domain,$skipped) = &choose_domain($action,$author,$pubusers{$author}); |
($domain,$skipped,$stopnow) = |
|
&choose_domain($action,$author,$allauthors{$author}); |
|
if ($stopnow) { |
|
if ($action ne 'dryrun') { |
|
my $output = &mt('Stopped by user at author: [_1].', |
|
"'$author'")/"\n"; |
|
&stop_logging($logfh,$output); |
|
} |
|
if ($dbflag == 1) { |
|
&disconnect_mysql($dbh); |
|
} |
|
print &mt('Stopped.')."\n"; |
|
exit; |
|
} |
|
} |
|
if (($domain eq '') && (!$skipped)) { |
|
if (ref($pubusers{$author}) eq 'ARRAY') { |
|
($domain,$skipped,$stopnow) = |
|
&choose_domain($action,$author,$pubusers{$author}); |
|
} |
|
if ($stopnow) { |
|
if ($action ne 'dryrun') { |
|
my $output = &mt('Stopped by user at author: [_1].', |
|
"'$author'")/"\n"; |
|
&stop_logging($logfh,$output); |
|
} |
|
if ($dbflag == 1) { |
|
&disconnect_mysql($dbh); |
|
} |
|
print &mt('Stopped.')."\n"; |
|
exit; |
|
} |
|
} |
|
if (($domain eq '') && (!$skipped)) { |
|
my @foundauthor = (); |
|
foreach my $dom (@machinedoms) { |
|
my $posspath = &LONCAPA::propath($dom,$author); |
|
if (-e $posspath) { |
|
my $rolesdbref; |
|
my $fname = "$posspath/roles.db"; |
|
if (-e "$fname") { |
|
$rolesdbref=&LONCAPA::locking_hash_tie($fname,&GDBM_READER()); |
|
if (!$rolesdbref) { |
|
print &mt('Unable to tie to [_1].',"'$fname'")."\n"; |
|
} elsif (ref($rolesdbref) eq 'HASH') { |
|
foreach my $key (keys(%{$rolesdbref})) { |
|
if ($key eq "/$dom/_au") { |
|
unless(grep(/^\Q$dom\E$/,@foundauthor)) { |
|
push(@foundauthor,$dom); |
|
} |
|
} |
|
} |
|
&LONCAPA::locking_hash_untie($rolesdbref); |
|
} |
|
} |
|
} |
|
} |
|
if (@foundauthor > 0) { |
|
($domain,$skipped,$stopnow) = |
|
&choose_domain($action,$author,\@foundauthor); |
|
if ($stopnow) { |
|
if ($action ne 'dryrun') { |
|
my $output = &mt('Stopped by user at author: [_1].', |
|
"'$author'")/"\n"; |
|
&stop_logging($logfh,$output); |
|
} |
|
if ($dbflag == 1) { |
|
&disconnect_mysql($dbh); |
|
} |
|
print &mt('Stopped.')."\n"; |
|
exit; |
|
} |
|
} |
} |
} |
if (($domain eq '') && (!$skipped)) { |
if (($domain eq '') && (!$skipped)) { |
if (ref($allauthors{$author}) eq 'ARRAY') { |
if (!$dbflag) { |
($domain,$skipped) = &choose_domain($action,$author,$allauthors{$author}); |
($dbh,$dbflag) = &connect_mysql($lonsqlaccess); |
|
} |
|
if (defined($dbh)) { |
|
my $foundusers = &search_allusers($dbh,$author); |
|
if (ref($foundusers) eq 'HASH') { |
|
($domain,$skipped,$stopnow) = |
|
&choose_domain($action,$author,$foundusers); |
|
} |
|
if ($stopnow) { |
|
if ($action ne 'dryrun') { |
|
my $output = &mt('Stopped by user at author: [_1].', |
|
"'$author'")/"\n"; |
|
&stop_logging($logfh,$output); |
|
} |
|
if ($dbflag == 1) { |
|
&disconnect_mysql($dbh); |
|
} |
|
print &mt('Stopped.')."\n"; |
|
exit; |
|
} |
} |
} |
} |
} |
my $source_path="/home/$author/public_html"; |
my $source_path="/home/$author/public_html"; |
if ($domain) { |
if ($domain) { |
my $target_path="$londocroot/priv/$domain/$author"; |
my $target_path="$londocroot/priv/$domain/$author"; |
if ($action eq 'move') { |
if ($action eq 'move') { |
if (move($source_path,$target_path)) { |
if (move($source_path,$target_path)) { |
chown($uid,$gid,$target_path); |
my (undef,undef,$userid,$groupid) = getpwnam($author); |
chmod($target_path,0750); |
if ($userid eq '' && $groupid eq '' && $author ne '') { |
|
chown($uid,$gid,$target_path); |
|
} |
$output = &mt('Moved [_1] to [_2].', |
$output = &mt('Moved [_1] to [_2].', |
"'$source_path'","'$target_path'")."\n"; |
"'$source_path'","'$target_path'")."\n"; |
|
push(@{$allmoved{$domain}},$author); |
my (undef,undef,$userid,$groupid) = getpwnam($author); |
my (undef,undef,$userid,$groupid) = getpwnam($author); |
if ($userid eq '' && $groupid eq '' && $author ne '') { |
if ($userid eq '' && $groupid eq '' && $author ne '') { |
&check_for_restore_files($londaemons,$author,$domain); |
&check_for_restore_files($londaemons,$author,$domain); |
if (opendir(my $homedir,"/home/$author")) { |
if (opendir(my $homedir,"/home/$author")) { |
my @contents = |
my @contents = |
grep(!/^\.{1,2}$/,readdir($homedir)); |
grep(!/^\.{1,2}$/,readdir($homedir)); |
|
closedir($homedir); |
if (@contents == 0) { |
if (@contents == 0) { |
if (rmdir("/home/$author/")) { |
if (rmdir("/home/$author/")) { |
$output .= &mt('Removed empty directory: [_1]', |
$output .= &mt('Removed empty directory: [_1]', |
Line 447 if (opendir(my $dir,"/home")) {
|
Line 599 if (opendir(my $dir,"/home")) {
|
print $output; |
print $output; |
print $logfh $output; |
print $logfh $output; |
} elsif ($action eq 'dryrun') { |
} elsif ($action eq 'dryrun') { |
|
push(@{$allmoved{$domain}},$author); |
print &mt('Would move [_1] to [_2].',"'$source_path'","'$target_path'")."\n"; |
print &mt('Would move [_1] to [_2].',"'$source_path'","'$target_path'")."\n"; |
} |
} |
} elsif ($skipped) { |
} elsif ($skipped) { |
|
push(@allskipped,$author); |
if ($action ne 'dryrun') { |
if ($action ne 'dryrun') { |
print $logfh &mt('Skipping this user: [_1].',"'$author'")."\n"; |
my $output = &mt('Skipping this user: [_1].',"'$author'")."\n"; |
|
print $logfh $output; |
} |
} |
} else { |
} else { |
print '*** '.&mt('WARNING: [_1] has no domain.',"'$author'")."\n". |
print '*** '.&mt('WARNING: [_1] has no domain.',"'$author'")."\n". |
&mt('Enter [_1]: do nothing, continue.','1')."\n". |
&mt('Enter [_1]: skip this user.','1')."\n". |
&mt('Enter [_2]: stop.','2')."\n". |
&mt('Enter [_1]: stop.','2')."\n". |
&mt('or enter domain for user to be placed into')."\n". |
&mt('or enter domain for user to be placed into')."\n". |
&mt('Your input: '); |
&mt('Your input: '); |
my $choice=<STDIN>; |
my $choice=<STDIN>; |
chomp($choice); |
chomp($choice); |
if ($choice ==1) { |
$choice =~ s/^\s+//; |
print $logfh &mt('Skipping -- no domain for user: [_1].',"'$author'")."\n"; |
$choice =~ s/\s+$//; |
|
if ($choice == 1) { |
|
my $output = &mt('Skipping -- no domain for user: [_1].',"'$author'")."\n"; |
|
print $output; |
|
if ($action ne 'dryrun') { |
|
print $logfh $output; |
|
} |
|
push(@allskipped,$author); |
|
next; |
} |
} |
if ($choice == 2) { |
if ($choice == 2) { |
print &mt('Stopped.')."\n"; |
print &mt('Stopped.')."\n"; |
Line 471 if (opendir(my $dir,"/home")) {
|
Line 634 if (opendir(my $dir,"/home")) {
|
"'$author'")/"\n"; |
"'$author'")/"\n"; |
&stop_logging($logfh,$output); |
&stop_logging($logfh,$output); |
} |
} |
|
if ($dbflag == 1) { |
|
&disconnect_mysql($dbh); |
|
} |
exit; |
exit; |
} |
} elsif ($choice =~ /^$match_domain$/) { |
if ($choice =~ /^$match_domain$/) { |
print &mt('You entered:')." $choice\n". |
|
&mt('Is this ok? ~[Y/n~] '); |
|
if (!&get_user_selection(1)) { |
|
print &mt('Try again ...')."\n". |
|
&mt('Enter [_1]: skip this user.','1')."\n". |
|
&mt('Enter [_1]: stop.','2')."\n". |
|
&mt('or enter domain for user to be placed into')."\n". |
|
&mt('Your input: '); |
|
$choice=<STDIN>; |
|
chomp($choice); |
|
$choice =~ s/^\s+//; |
|
$choice =~ s/\s+$//; |
|
if ($choice == 1) { |
|
my $output = &mt('Skipping -- no domain for user: [_1].',"'$author'")."\n"; |
|
print $output; |
|
if ($action ne 'dryrun') { |
|
print $logfh $output; |
|
} |
|
push(@allskipped,$author); |
|
next; |
|
} |
|
if ($choice == 2) { |
|
print &mt('Stopped.')."\n"; |
|
if ($action ne 'dryrun') { |
|
my $output = &mt('Stopped by user because of author without domain: [_1].', |
|
"'$author'")/"\n"; |
|
&stop_logging($logfh,$output); |
|
} |
|
if ($dbflag == 1) { |
|
&disconnect_mysql($dbh); |
|
} |
|
exit; |
|
} elsif ($choice !~ /^$match_domain$/) { |
|
print &mt('Invalid domain entered:')." $choice\n"; |
|
my $output = &mt('Skipping -- no domain for user: [_1].',"'$author'")."\n"; |
|
print $output; |
|
if ($action ne 'dryrun') { |
|
print $logfh $output; |
|
} |
|
push(@allskipped,$author); |
|
next; |
|
} |
|
} |
my $dompath="$londocroot/priv/$choice"; |
my $dompath="$londocroot/priv/$choice"; |
my $newpath="$londocroot/priv/$choice/$author"; |
my $newpath="$londocroot/priv/$choice/$author"; |
unless (-e $dompath) { |
unless (-e $dompath) { |
print '*** '.&mt('WARNING: [_1] does not yet exist.',"'$dompath'")."\n"; |
if ($action eq 'move') { |
|
print '*** '.&mt('WARNING: [_1] does not yet exist.',"'$dompath'")."\n"; |
|
} |
} |
} |
if ($action eq 'move') { |
if ($action eq 'move') { |
unless (-e $dompath) { |
unless (-e $dompath) { |
Line 489 if (opendir(my $dir,"/home")) {
|
Line 699 if (opendir(my $dir,"/home")) {
|
if (-e $dompath) { |
if (-e $dompath) { |
if (move($source_path,$newpath)) { |
if (move($source_path,$newpath)) { |
chown($uid,$gid,$newpath); |
chown($uid,$gid,$newpath); |
chmod($newpath,0750); |
chmod(0750,$newpath); |
$output = &mt('Moved [_1] to [_2].', |
$output = &mt('Moved [_1] to [_2].', |
"'$source_path'","'$newpath'")."\n"; |
"'$source_path'","'$newpath'")."\n"; |
} else { |
} else { |
Line 509 if (opendir(my $dir,"/home")) {
|
Line 719 if (opendir(my $dir,"/home")) {
|
} |
} |
print &mt('Would make [_1].',"'$newpath'")."\n"; |
print &mt('Would make [_1].',"'$newpath'")."\n"; |
} |
} |
|
} else { |
|
print &mt('Invalid domain:')." $choice\n"; |
|
if ($action eq 'move') { |
|
print $logfh &mt('Skipping -- no domain for user: [_1].',"'$author'")."\n"; |
|
} |
|
push(@allskipped,$author); |
|
next; |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
if ($action ne 'dryrun') { |
|
&stop_logging($logfh); |
my ($moveinfo,$skipcount); |
|
if (keys(%allmoved) == 0) { |
|
$moveinfo = &mt('None')."\n"; |
|
} else { |
|
foreach my $dom (sort(keys(%allmoved))) { |
|
if (ref($allmoved{$dom}) eq 'ARRAY') { |
|
$moveinfo .= "\n ".&mt('Domain: [_1], number of authors: [_2]', |
|
"'$dom'",scalar(@{$allmoved{$dom}})); |
|
} |
|
} |
} |
} |
print "\n".&mt('Done.')."\n"; |
|
|
|
sub choose_domain { |
$skipcount = scalar(@allskipped); |
my ($action,$author,$domarrayref) = @_; |
|
my ($domain,$skipped); |
print "\n"; |
if (ref($domarrayref) eq 'ARRAY') { |
if ($action ne 'dryrun') { |
if (@{$domarrayref} > 1) { |
my $output = &mt('You skipped: [_1].',$skipcount)."\n". |
print '*** '.&mt('ERROR: [_1] found in multiple domains.',"'$author'")."\n". |
join("\n",sort(@allskipped))."\n\n". |
&mt('Enter a number to choose what action to take.')."\n"; |
&mt('Moved ... [_1]',$moveinfo); |
my $num = 1; |
print $output; |
for (my $i=0; $i<@{$domarrayref}; $i++) { |
print $logfh $output; |
print &mt('To use: [_1] enter [_2].',$domarrayref->[$i],$num)."\n"; |
&stop_logging($logfh); |
$num ++; |
} else { |
} |
print &mt('You would have skipped: [_1].',$skipcount)."\n". |
print &mt('To skip this user enter: [_1].',$num)."\n". |
join("\n",sort(@allskipped))."\n\n". |
&mt('Your choice:').' '; |
&mt('You would have moved ... [_1]',$moveinfo); |
my $choice=<STDIN>; |
} |
chomp($choice); |
print "\n\n".&mt('Done.')."\n"; |
if ($choice =~ /^\d+$/) { |
|
if (($choice == $num) || ($choice > $num)) { |
sub choose_domain { |
$skipped = 1; |
my ($action,$author,$domref) = @_; |
} elsif (($choice < $num) && ($choice > 0)) { |
my ($domain,$skipped,$stopnow,@domains); |
$domain = $domarrayref->[$choice-1]; |
if (ref($domref) eq 'ARRAY') { |
} else { |
@domains = @{$domref}; |
print &mt('Invalid choice:')." $choice\n"; |
} elsif (ref($domref) eq 'HASH') { |
$skipped = 1; |
@domains = sort(keys(%{$domref})); |
} |
} |
} else { |
if (@domains > 1) { |
print &mt('Invalid choice:')." $choice\n"; |
print '*** '.&mt('ERROR: [_1] found in multiple domains.',"'$author'")."\n". |
$skipped = 1; |
&mt('Enter a number to choose what action to take.')."\n"; |
} |
my $num = 1; |
} elsif (@{$domarrayref} == 1) { |
print &mt('Enter [_1]: skip this user.',$num)."\n"; |
$domain = $domarrayref->[0]; |
for (my $i=0; $i<@domains; $i++) { |
} |
my $shown = $domains[$i]; |
|
if (ref($domref) eq 'HASH') { |
|
if ($domref->{$shown} ne '') { |
|
$shown .= ' ('.$domref->{$shown}.') '; |
|
} |
|
} |
|
$num ++; |
|
print &mt('Enter [_1]: use domain - [_2].',$num,$shown)."\n"; |
|
} |
|
$num ++; |
|
print &mt('Enter [_1]: stop.',$num)."\n"; |
|
print &mt('Your choice:').' '; |
|
my $choice=<STDIN>; |
|
chomp($choice); |
|
if ($choice =~ /^\d+$/) { |
|
if ($choice == 1) { |
|
$skipped = 1; |
|
} elsif (($choice < $num) && ($choice > 1)) { |
|
$domain = $domains[$choice-2]; |
|
} elsif ($choice == $num) { |
|
$stopnow = 1; |
|
} else { |
|
print &mt('Invalid choice:')." $choice\n". |
|
&mt('Skipping this user.')."\n"; |
|
$skipped = 1; |
|
} |
|
} else { |
|
print &mt('Invalid choice:')." $choice\n". |
|
&mt('Skipping this user.')."\n"; |
|
$skipped = 1; |
|
} |
|
} elsif (@domains == 1) { |
|
$domain = $domains[0]; |
} |
} |
return ($domain,$skipped); |
return ($domain,$skipped,$stopnow); |
} |
} |
|
|
sub move_priv_to_home { |
sub move_priv_to_home { |
Line 578 sub move_priv_to_home {
|
Line 835 sub move_priv_to_home {
|
if (!-e $target_path) { |
if (!-e $target_path) { |
move($source_path,$target_path); |
move($source_path,$target_path); |
chown($uid,$gid,$target_path); |
chown($uid,$gid,$target_path); |
chmod($target_path,2770); |
chmod(0750,$target_path); |
$output = &mt('Moved [_1] to [_2].',"'$source_path'","'$target_path'")."\n"; |
if (-e $target_path && !-e $source_path) { |
|
$output = &mt('Moved [_1] to [_2].',"'$source_path'","'$target_path'")."\n"; |
|
} else { |
|
$output = &mt('Failed to move [_1] to [_2].',"'$source_path'","'$target_path'")."\n"; |
|
} |
} else { |
} else { |
$output = &mt('Directory [_1] already exists -- not moving [_2].', |
$output = &mt('Directory [_1] already exists -- not moving [_2].', |
"'$target_path'","'$source_path'")."\n"; |
"'$target_path'","'$source_path'")."\n"; |
Line 633 sub check_for_restore_files {
|
Line 894 sub check_for_restore_files {
|
my ($londaemons,$author,$domain) = @_; |
my ($londaemons,$author,$domain) = @_; |
if (opendir(my $homedir,"/home/$author")) { |
if (opendir(my $homedir,"/home/$author")) { |
my @contents = grep(!/^\.{1,2}$/,readdir($homedir)); |
my @contents = grep(!/^\.{1,2}$/,readdir($homedir)); |
|
closedir($homedir); |
if (@contents > 0) { |
if (@contents > 0) { |
if (grep(/^restore_\d+\.sh$/,@contents)) { |
if (grep(/^restore_\d+\.sh$/,@contents)) { |
if (!-e "$londaemons/logs/moved_construction_spaces") { |
if (!-e "$londaemons/logs/moved_construction_spaces") { |
Line 671 sub check_for_restore_files {
|
Line 933 sub check_for_restore_files {
|
return; |
return; |
} |
} |
|
|
|
sub connect_mysql { |
|
my ($lonsqlaccess) = @_; |
|
my ($dbh,$dbflag); |
|
eval { $dbh = DBI->connect("DBI:mysql:loncapa","www", |
|
$lonsqlaccess, |
|
{RaiseError =>0,PrintError=>0}); |
|
}; |
|
if ($@) { |
|
$dbflag = -1; |
|
} else { |
|
if (defined($dbh)) { |
|
$dbflag = 1; |
|
} |
|
} |
|
return ($dbh,$dbflag); |
|
} |
|
|
|
sub disconnect_mysql { |
|
my ($dbh) = @_; |
|
if (ref($dbh)) { |
|
$dbh->disconnect; |
|
} |
|
return; |
|
} |
|
|
|
sub search_allusers { |
|
my ($dbh,$author) = @_; |
|
my %fullnames; |
|
if ((ref($dbh)) && ($author ne '')) { |
|
eval { |
|
my $statement = "SELECT domain, lastname, firstname FROM allusers WHERE username='$author'"; |
|
my $sth = $dbh->prepare($statement); |
|
$sth->execute(); |
|
while ( my ($dom,$last,$first) = $sth->fetchrow_array()) { |
|
if ($dom ne '') { |
|
$fullnames{$dom} = "$first $last"; |
|
} |
|
} |
|
$sth->finish; |
|
}; |
|
} |
|
return \%fullnames; |
|
} |