--- rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders-0.1-users_acl.patch 2012/02/14 20:23:44 1.3 +++ rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders-0.1-users_acl.patch 2012/02/17 17:18:09 1.8 @@ -1,6 +1,6 @@ diff -Nur smeserver-shared-folders-0.1/createlinks smeserver-shared-folders-0.1_mod/createlinks ---- smeserver-shared-folders-0.1/createlinks 2012-02-14 21:20:32.000000000 +0100 -+++ smeserver-shared-folders-0.1_mod/createlinks 2012-02-14 19:09:01.000000000 +0100 +--- smeserver-shared-folders-0.1/createlinks 2012-02-17 18:12:49.000000000 +0100 ++++ smeserver-shared-folders-0.1_mod/createlinks 2012-02-17 17:28:33.000000000 +0100 @@ -11,12 +11,12 @@ panel_link("userpanel-encfs", $panel); @@ -19,8 +19,8 @@ diff -Nur smeserver-shared-folders-0.1/c #-------------------------------------------------- # actions for share-delete event diff -Nur smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/group-share-modify smeserver-shared-folders-0.1_mod/root/etc/e-smith/events/actions/group-share-modify ---- smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/group-share-modify 2012-02-14 21:20:32.000000000 +0100 -+++ smeserver-shared-folders-0.1_mod/root/etc/e-smith/events/actions/group-share-modify 2012-02-14 19:09:01.000000000 +0100 +--- smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/group-share-modify 2012-02-17 18:12:49.000000000 +0100 ++++ smeserver-shared-folders-0.1_mod/root/etc/e-smith/events/actions/group-share-modify 2012-02-17 17:28:33.000000000 +0100 @@ -7,40 +7,47 @@ my $accounts = esmith::AccountsDB->open() or die "Unable to open accounts db: $!"; @@ -85,8 +85,8 @@ diff -Nur smeserver-shared-folders-0.1/r die ("Error occurred while updating shared folder.\n"); } diff -Nur smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify smeserver-shared-folders-0.1_mod/root/etc/e-smith/events/actions/share-modify ---- smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify 2012-02-14 21:20:32.000000000 +0100 -+++ smeserver-shared-folders-0.1_mod/root/etc/e-smith/events/actions/share-modify 2012-02-14 19:09:01.000000000 +0100 +--- smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify 2012-02-17 18:12:49.000000000 +0100 ++++ smeserver-shared-folders-0.1_mod/root/etc/e-smith/events/actions/share-modify 2012-02-17 17:28:33.000000000 +0100 @@ -90,8 +90,10 @@ #-------------------------------------------------- @@ -136,8 +136,8 @@ diff -Nur smeserver-shared-folders-0.1/r system($setfacl, '-m', diff -Nur smeserver-shared-folders-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares smeserver-shared-folders-0.1_mod/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares ---- smeserver-shared-folders-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares 2012-02-14 21:20:32.000000000 +0100 -+++ smeserver-shared-folders-0.1_mod/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares 2012-02-14 19:09:01.000000000 +0100 +--- smeserver-shared-folders-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares 2012-02-17 18:12:49.000000000 +0100 ++++ smeserver-shared-folders-0.1_mod/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares 2012-02-17 17:28:33.000000000 +0100 @@ -155,7 +155,7 @@ DESC_PERMISSIONS @@ -165,8 +165,8 @@ diff -Nur smeserver-shared-folders-0.1/r + diff -Nur smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares smeserver-shared-folders-0.1_mod/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares ---- smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares 2012-02-14 21:20:32.000000000 +0100 -+++ smeserver-shared-folders-0.1_mod/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares 2012-02-14 19:09:01.000000000 +0100 +--- smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares 2012-02-17 18:12:49.000000000 +0100 ++++ smeserver-shared-folders-0.1_mod/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares 2012-02-17 17:28:33.000000000 +0100 @@ -16,7 +16,7 @@ my $satisfy; my $webdav = (($properties{'WebDav'} || 'disabled') =~ m/^(enabled|on|yes)$/i) ? 1 : 0; @@ -209,8 +209,8 @@ diff -Nur smeserver-shared-folders-0.1/r my %seen = (); @readers = sort (grep { ! $seen{ $_ }++ } (@readers,@writers)); diff -Nur smeserver-shared-folders-0.1/root/etc/e-smith/web/functions/shares smeserver-shared-folders-0.1_mod/root/etc/e-smith/web/functions/shares ---- smeserver-shared-folders-0.1/root/etc/e-smith/web/functions/shares 2012-02-14 21:20:32.000000000 +0100 -+++ smeserver-shared-folders-0.1_mod/root/etc/e-smith/web/functions/shares 2012-02-14 19:09:01.000000000 +0100 +--- smeserver-shared-folders-0.1/root/etc/e-smith/web/functions/shares 2012-02-17 18:12:49.000000000 +0100 ++++ smeserver-shared-folders-0.1_mod/root/etc/e-smith/web/functions/shares 2012-02-17 17:28:33.000000000 +0100 @@ -51,16 +51,6 @@ diff -Nur smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm smeserver-shared-folders-0.1_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm ---- smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm 2012-02-14 21:20:32.000000000 +0100 -+++ smeserver-shared-folders-0.1_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm 2012-02-14 19:09:33.000000000 +0100 +--- smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm 2012-02-17 18:12:49.000000000 +0100 ++++ smeserver-shared-folders-0.1_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm 2012-02-17 18:13:09.000000000 +0100 @@ -26,7 +26,7 @@ print_share_name_field print_encryption_fields @@ -254,12 +254,10 @@ diff -Nur smeserver-shared-folders-0.1/r smbAccess_list httpAccess_list max_share_name_length -@@ -38,10 +38,8 @@ - print_section_bar - ); +@@ -40,8 +40,8 @@ + + our $VERSION = sprintf '%d.%03d', q$Revision: 1.8 $ =~ /: (\d+).(\d+)/; --our $VERSION = sprintf '%d.%03d', q$Revision: 1.8 $ =~ /: (\d+).(\d+)/; -- -our $accountdb = esmith::AccountsDB->open(); -our $configdb = esmith::ConfigDB->open(); +our $a = esmith::AccountsDB->open(); @@ -267,7 +265,7 @@ diff -Nur smeserver-shared-folders-0.1/r *wherenext = \&CGI::FormMagick::wherenext; -@@ -62,12 +60,12 @@ +@@ -62,12 +62,12 @@ my $name = $self->localise('NAME'); my $description = $self->localise('DESCRIPTION'); my $modify = $self->localise('MODIFY'); @@ -283,7 +281,7 @@ diff -Nur smeserver-shared-folders-0.1/r print $q->Tr($q->td($self->localise('NO_SHARES'))); return ""; } -@@ -81,22 +79,25 @@ +@@ -81,22 +81,25 @@ my $scriptname = basename($0); @@ -313,7 +311,7 @@ diff -Nur smeserver-shared-folders-0.1/r esmith::cgi::genSmallCell($q, $actionModify,"normal"), esmith::cgi::genSmallCell($q, $actionRemove,"normal") ); -@@ -109,58 +110,55 @@ +@@ -109,58 +112,55 @@ sub print_custom_button{ @@ -386,7 +384,7 @@ diff -Nur smeserver-shared-folders-0.1/r # Clear these values to prevent collisions when the page reloads. $q->delete("cancel"); -@@ -172,12 +170,13 @@ +@@ -172,12 +172,13 @@ sub print_share_name_field { my $self = shift; @@ -404,7 +402,7 @@ diff -Nur smeserver-shared-folders-0.1/r $q->param(-name=>'encryption',-value=>'disabled'); $q->param(-name=>'inactivity',-value=>'30'); $q->param(-name=>'smbaccess',-value=>'browseable'); -@@ -204,7 +203,7 @@ +@@ -204,7 +205,7 @@ # Read the values for each field from the accounts db and store # them in the cgi object so our form will have the correct # info displayed. @@ -413,7 +411,7 @@ diff -Nur smeserver-shared-folders-0.1/r if ($rec) { $q->param(-name=>'description',-value=> -@@ -213,10 +212,6 @@ +@@ -213,10 +214,6 @@ ($rec->prop('Encryption') || 'disabled')); $q->param(-name=>'inactivity',-value=> ($rec->prop('InactivityTimeOut') || '30')); @@ -424,7 +422,7 @@ diff -Nur smeserver-shared-folders-0.1/r $q->param(-name=>'smbaccess',-value=> ($rec->prop('smbAccess') || 'enabled')); $q->param(-name=>'recyclebin',-value=> -@@ -233,8 +228,6 @@ +@@ -233,8 +230,6 @@ ($rec->prop('Indexes') || 'enabled')); $q->param(-name=>'dynamic',-value=> ($rec->prop('DynamicContent') || 'disabled')); @@ -433,7 +431,7 @@ diff -Nur smeserver-shared-folders-0.1/r } } else { -@@ -253,18 +246,19 @@ +@@ -253,18 +248,19 @@ # If EncFS is available, print encryptions options sub print_encryption_fields { my $self = shift; @@ -458,7 +456,7 @@ diff -Nur smeserver-shared-folders-0.1/r print_section_bar(); -@@ -316,13 +310,13 @@ +@@ -316,13 +312,13 @@ # If ajaxplorer is enabled: sub print_ajaxplorer_fields { @@ -475,7 +473,7 @@ diff -Nur smeserver-shared-folders-0.1/r # If share exists and Ajxplorer is enabled if ($share){ if (($share->prop('Ajaxplorer') || 'disabled') eq 'enabled'){ -@@ -345,24 +339,31 @@ +@@ -345,24 +341,31 @@ return undef; } @@ -518,7 +516,7 @@ diff -Nur smeserver-shared-folders-0.1/r foreach my $group ( split ( /[,;]/, $WriteGroups ) ) { $WriteGroups{$group} = 1; -@@ -370,22 +371,31 @@ +@@ -370,22 +373,31 @@ foreach my $group ( split ( /[,;]/, $ReadGroups ) ) { $ReadGroups{$group} = 1; } @@ -555,7 +553,7 @@ diff -Nur smeserver-shared-folders-0.1/r if ( $WriteGroups{$name} ) { $write = "checked"; } -@@ -395,23 +405,56 @@ +@@ -395,23 +407,56 @@ $out .= $q->Tr( esmith::cgi::genSmallCell($q, $name, "normal"), @@ -615,7 +613,7 @@ diff -Nur smeserver-shared-folders-0.1/r print " \n \n"; print "
\n"; return undef; -@@ -423,8 +466,8 @@ +@@ -423,8 +468,8 @@ sub smbAccess_list { return { @@ -626,7 +624,7 @@ diff -Nur smeserver-shared-folders-0.1/r 'non-browseable' => 'ENABLED_NON_BROWSEABLE', }; } -@@ -453,12 +496,13 @@ +@@ -453,12 +498,13 @@ sub max_share_name_length { my ($self, $data) = @_; @@ -643,7 +641,7 @@ diff -Nur smeserver-shared-folders-0.1/r return $self->localise("MAX_SHARE_NAME_LENGTH_ERROR", {acctName => $data, maxShareNameLength => $max, -@@ -466,46 +510,20 @@ +@@ -466,46 +512,20 @@ } } @@ -699,7 +697,7 @@ diff -Nur smeserver-shared-folders-0.1/r $self->modify_share(); } } -@@ -513,12 +531,13 @@ +@@ -513,12 +533,13 @@ # Print save or add button sub print_save_or_add_button { @@ -715,7 +713,7 @@ diff -Nur smeserver-shared-folders-0.1/r $self->print_button("ADD"); } -@@ -527,79 +546,54 @@ +@@ -527,79 +548,54 @@ # Create a new shared folder sub create_share { @@ -821,7 +819,7 @@ diff -Nur smeserver-shared-folders-0.1/r my $source = '/home/e-smith/files/shares/' . $name . '/.store'; my $dest = '/home/e-smith/files/shares/' . $name . '/files'; File::Path::mkpath ($source); -@@ -614,10 +608,12 @@ +@@ -614,10 +610,12 @@ if (system ("/sbin/e-smith/signal-event", "share-create", $name) == 0) { $self->success("SUCCESSFULLY_CREATED_SHARE"); @@ -836,7 +834,7 @@ diff -Nur smeserver-shared-folders-0.1/r $self->error('CANT_CREATE_SHARE'); } } -@@ -625,118 +621,155 @@ +@@ -625,118 +623,155 @@ # Modify a share. # This sub shares a lot of code with create share # It should be merged @@ -1084,7 +1082,7 @@ diff -Nur smeserver-shared-folders-0.1/r return $self->localise('ACCT_NAME_HAS_INVALID_CHARS', {acctName => $acctName}); } -@@ -744,13 +777,10 @@ +@@ -744,13 +779,10 @@ } # Check if inactivity is a number @@ -1100,7 +1098,7 @@ diff -Nur smeserver-shared-folders-0.1/r return $self->localise('INVALID_INACTIVITY', {inactivity => $inac}); } -@@ -759,9 +789,7 @@ +@@ -759,9 +791,7 @@ # Check if both passwords match # and are more than 8 chars