--- rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders-0.1-users_acl.patch 2012/02/13 20:51:40 1.1 +++ rpms/smeserver-shared-folders/contribs7/smeserver-shared-folders-0.1-users_acl.patch 2012/02/14 20:23:44 1.3 @@ -1,6 +1,6 @@ -diff -Nur -x '*.orig' -x '*.rej' smeserver-shared-folders-0.1/createlinks mezzanine_patched_smeserver-shared-folders-0.1/createlinks ---- smeserver-shared-folders-0.1/createlinks 2012-02-13 20:08:07.000000000 +0100 -+++ mezzanine_patched_smeserver-shared-folders-0.1/createlinks 2012-02-13 20:08:04.000000000 +0100 +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 @@ -11,12 +11,12 @@ panel_link("userpanel-encfs", $panel); @@ -18,9 +18,9 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv #-------------------------------------------------- # actions for share-delete event -diff -Nur -x '*.orig' -x '*.rej' smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/group-share-modify mezzanine_patched_smeserver-shared-folders-0.1/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-13 20:08:07.000000000 +0100 -+++ mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/group-share-modify 2012-02-08 15:39:15.000000000 +0100 +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 @@ -7,40 +7,47 @@ my $accounts = esmith::AccountsDB->open() or die "Unable to open accounts db: $!"; @@ -84,9 +84,9 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv event_signal("share-modify-files", $share->key) or die ("Error occurred while updating shared folder.\n"); } -diff -Nur -x '*.orig' -x '*.rej' smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify ---- smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify 2012-02-13 20:08:07.000000000 +0100 -+++ mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify 2012-02-08 15:18:24.000000000 +0100 +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 @@ -90,8 +90,10 @@ #-------------------------------------------------- @@ -135,9 +135,9 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv system($setfacl, '-m', -diff -Nur -x '*.orig' -x '*.rej' smeserver-shared-folders-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares mezzanine_patched_smeserver-shared-folders-0.1/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-13 20:08:07.000000000 +0100 -+++ mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares 2012-02-11 02:06:41.000000000 +0100 +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 @@ -155,7 +155,7 @@ DESC_PERMISSIONS @@ -164,9 +164,9 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv + + -diff -Nur -x '*.orig' -x '*.rej' smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares mezzanine_patched_smeserver-shared-folders-0.1/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-13 20:08:07.000000000 +0100 -+++ mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares 2012-02-08 15:17:54.000000000 +0100 +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 @@ -16,7 +16,7 @@ my $satisfy; my $webdav = (($properties{'WebDav'} || 'disabled') =~ m/^(enabled|on|yes)$/i) ? 1 : 0; @@ -208,9 +208,9 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv my %seen = (); @readers = sort (grep { ! $seen{ $_ }++ } (@readers,@writers)); -diff -Nur -x '*.orig' -x '*.rej' smeserver-shared-folders-0.1/root/etc/e-smith/web/functions/shares mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/web/functions/shares ---- smeserver-shared-folders-0.1/root/etc/e-smith/web/functions/shares 2012-02-13 20:08:07.000000000 +0100 -+++ mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/web/functions/shares 2012-02-11 01:57:28.000000000 +0100 +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 @@ -51,16 +51,6 @@ -diff -Nur -x '*.orig' -x '*.rej' smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm mezzanine_patched_smeserver-shared-folders-0.1/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-13 20:08:07.000000000 +0100 -+++ mezzanine_patched_smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm 2012-02-11 01:56:52.000000000 +0100 +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 @@ -26,7 +26,7 @@ print_share_name_field print_encryption_fields @@ -254,12 +254,12 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv smbAccess_list httpAccess_list max_share_name_length -@@ -38,10 +38,9 @@ +@@ -38,10 +38,8 @@ print_section_bar ); -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 +267,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv *wherenext = \&CGI::FormMagick::wherenext; -@@ -62,12 +61,12 @@ +@@ -62,12 +60,12 @@ my $name = $self->localise('NAME'); my $description = $self->localise('DESCRIPTION'); my $modify = $self->localise('MODIFY'); @@ -283,7 +283,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv print $q->Tr($q->td($self->localise('NO_SHARES'))); return ""; } -@@ -81,22 +80,25 @@ +@@ -81,22 +79,25 @@ my $scriptname = basename($0); @@ -313,7 +313,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv esmith::cgi::genSmallCell($q, $actionModify,"normal"), esmith::cgi::genSmallCell($q, $actionRemove,"normal") ); -@@ -109,58 +111,55 @@ +@@ -109,58 +110,55 @@ sub print_custom_button{ @@ -386,7 +386,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv # Clear these values to prevent collisions when the page reloads. $q->delete("cancel"); -@@ -172,12 +171,13 @@ +@@ -172,12 +170,13 @@ sub print_share_name_field { my $self = shift; @@ -404,7 +404,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv $q->param(-name=>'encryption',-value=>'disabled'); $q->param(-name=>'inactivity',-value=>'30'); $q->param(-name=>'smbaccess',-value=>'browseable'); -@@ -204,7 +204,7 @@ +@@ -204,7 +203,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 +413,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv if ($rec) { $q->param(-name=>'description',-value=> -@@ -213,10 +213,6 @@ +@@ -213,10 +212,6 @@ ($rec->prop('Encryption') || 'disabled')); $q->param(-name=>'inactivity',-value=> ($rec->prop('InactivityTimeOut') || '30')); @@ -424,7 +424,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv $q->param(-name=>'smbaccess',-value=> ($rec->prop('smbAccess') || 'enabled')); $q->param(-name=>'recyclebin',-value=> -@@ -233,8 +229,6 @@ +@@ -233,8 +228,6 @@ ($rec->prop('Indexes') || 'enabled')); $q->param(-name=>'dynamic',-value=> ($rec->prop('DynamicContent') || 'disabled')); @@ -433,7 +433,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv } } else { -@@ -253,18 +247,19 @@ +@@ -253,18 +246,19 @@ # If EncFS is available, print encryptions options sub print_encryption_fields { my $self = shift; @@ -458,7 +458,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv print_section_bar(); -@@ -316,13 +311,13 @@ +@@ -316,13 +310,13 @@ # If ajaxplorer is enabled: sub print_ajaxplorer_fields { @@ -475,7 +475,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv # If share exists and Ajxplorer is enabled if ($share){ if (($share->prop('Ajaxplorer') || 'disabled') eq 'enabled'){ -@@ -345,24 +340,31 @@ +@@ -345,24 +339,31 @@ return undef; } @@ -518,7 +518,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv foreach my $group ( split ( /[,;]/, $WriteGroups ) ) { $WriteGroups{$group} = 1; -@@ -370,22 +372,31 @@ +@@ -370,22 +371,31 @@ foreach my $group ( split ( /[,;]/, $ReadGroups ) ) { $ReadGroups{$group} = 1; } @@ -555,7 +555,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv if ( $WriteGroups{$name} ) { $write = "checked"; } -@@ -395,23 +406,56 @@ +@@ -395,23 +405,56 @@ $out .= $q->Tr( esmith::cgi::genSmallCell($q, $name, "normal"), @@ -615,7 +615,7 @@ diff -Nur -x '*.orig' -x '*.rej' smeserv print " \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