\n \n";
print " \n";
return undef;
-@@ -423,8 +467,8 @@
+@@ -423,8 +466,8 @@
sub smbAccess_list {
return {
@@ -626,7 +626,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv
'non-browseable' => 'ENABLED_NON_BROWSEABLE',
};
}
-@@ -453,12 +497,13 @@
+@@ -453,12 +496,13 @@
sub max_share_name_length {
my ($self, $data) = @_;
@@ -643,7 +643,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv
return $self->localise("MAX_SHARE_NAME_LENGTH_ERROR",
{acctName => $data,
maxShareNameLength => $max,
-@@ -466,46 +511,20 @@
+@@ -466,46 +510,20 @@
}
}
@@ -699,7 +699,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv
$self->modify_share();
}
}
-@@ -513,12 +532,13 @@
+@@ -513,12 +531,13 @@
# Print save or add button
sub print_save_or_add_button {
@@ -715,7 +715,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv
$self->print_button("ADD");
}
-@@ -527,79 +547,54 @@
+@@ -527,79 +546,54 @@
# Create a new shared folder
sub create_share {
@@ -821,7 +821,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv
my $source = '/home/e-smith/files/shares/' . $name . '/.store';
my $dest = '/home/e-smith/files/shares/' . $name . '/files';
File::Path::mkpath ($source);
-@@ -614,10 +609,12 @@
+@@ -614,10 +608,12 @@
if (system ("/sbin/e-smith/signal-event", "share-create", $name) == 0) {
$self->success("SUCCESSFULLY_CREATED_SHARE");
@@ -836,7 +836,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv
$self->error('CANT_CREATE_SHARE');
}
}
-@@ -625,118 +622,155 @@
+@@ -625,118 +621,155 @@
# Modify a share.
# This sub shares a lot of code with create share
# It should be merged
@@ -1084,7 +1084,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv
return $self->localise('ACCT_NAME_HAS_INVALID_CHARS',
{acctName => $acctName});
}
-@@ -744,13 +778,10 @@
+@@ -744,13 +777,10 @@
}
# Check if inactivity is a number
@@ -1100,7 +1100,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv
return $self->localise('INVALID_INACTIVITY',
{inactivity => $inac});
}
-@@ -759,9 +790,7 @@
+@@ -759,9 +789,7 @@
# Check if both passwords match
# and are more than 8 chars
|