/[smecontribs]/rpms/smeserver-shared-folders/contribs8/smeserver-shared-folders-0.1-ajaxplorer2pydio.patch
ViewVC logotype

Annotation of /rpms/smeserver-shared-folders/contribs8/smeserver-shared-folders-0.1-ajaxplorer2pydio.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Wed Oct 23 11:15:30 2013 UTC (10 years, 6 months ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-shared-folders-0_1-83_el5_sme, smeserver-shared-folders-0_1-84_el5_sme, smeserver-shared-folders-0_1-82_el5_sme, smeserver-shared-folders-0_1-87_el5_sme, smeserver-shared-folders-0_1-86_el5_sme, smeserver-shared-folders-0_1-85_el5_sme, HEAD 
* Tue Oct 22 2013 Daniel Berteaud <daniel@firewall-services.com> 0.1-82.sme
- Rename ajaxplorer to pydio
1 vip-ire 1.1 diff -Nur smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify smeserver-shared-folders-0.1_pydio/root/etc/e-smith/events/actions/share-modify
2     --- smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify 2013-10-22 18:47:54.650543102 +0200
3     +++ smeserver-shared-folders-0.1_pydio/root/etc/e-smith/events/actions/share-modify 2013-10-22 18:54:05.919409184 +0200
4     @@ -95,7 +95,7 @@
5     my @writeusers = split(/[;,]/,($properties {'WriteUsers'} || ''));
6     my @readusers = split(/[;,]/,($properties {'ReadUsers'} || ''));
7     my $rsync = $properties{'rsyncAccess'} || 'none';
8     -my $ajaxplorer = $properties{'Ajaxplorer'} || 'disabled';
9     +my $pydio = $properties{'Pydio'} || 'disabled';
10    
11     # Don't reset permissions if ManualPermissions is set to 'yes'
12    
13     @@ -128,7 +128,7 @@
14     $acl .= 'u:'.$user.':rX,';
15     }
16     $acl .= 'u:rsync:rX,' if ($rsync =~ /^local|global$/);
17     - $acl .= 'u:www:rwX,' unless (($http eq 'none') && ($ajaxplorer ne 'enabled'));
18     + $acl .= 'u:www:rwX,' unless (($http eq 'none') && ($pydio ne 'enabled'));
19    
20     # Set the effective ACLs
21     system($setfacl,
22     @@ -163,7 +163,7 @@
23     $acl .= 'u:'.$user.':rX,';
24     }
25     $acl .= 'u:rsync:rX,' if ($rsync =~ /^local|global$/);
26     - $acl .= 'u:www:rX,' unless (($http eq 'none') && ($ajaxplorer ne 'enabled'));
27     + $acl .= 'u:www:rX,' unless (($http eq 'none') && ($pydio ne 'enabled'));
28    
29     system($setfacl,
30     '-m',
31     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_pydio/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares
32     --- smeserver-shared-folders-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares 2013-10-22 18:47:54.596543123 +0200
33     +++ smeserver-shared-folders-0.1_pydio/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares 2013-10-22 18:52:50.334434822 +0200
34     @@ -497,16 +497,16 @@
35     </entry>
36    
37     <entry>
38     - <base>DESC_AJAXPLORER</base>
39     + <base>DESC_PYDIO</base>
40     <trans>
41     - The following settings control the access of this shared folder with the web based file manager Ajaxplorer
42     + The following settings control the access of this shared folder with the web based file manager Pydio (formerly AjaXplorer)
43     </trans>
44     </entry>
45    
46     <entry>
47     - <base>LABEL_AJAXPLORER</base>
48     + <base>LABEL_PYDIO</base>
49     <trans>
50     - Ajaxplorer Access
51     + Pydio Access
52     </trans>
53     </entry>
54    
55     diff -Nur smeserver-shared-folders-0.1/root/etc/e-smith/web/functions/shares smeserver-shared-folders-0.1_pydio/root/etc/e-smith/web/functions/shares
56     --- smeserver-shared-folders-0.1/root/etc/e-smith/web/functions/shares 2013-10-22 18:47:54.618543115 +0200
57     +++ smeserver-shared-folders-0.1_pydio/root/etc/e-smith/web/functions/shares 2013-10-22 18:51:18.547467355 +0200
58     @@ -107,7 +107,7 @@
59     <label>LABEL_DYNAMIC_CONTENT</label>
60     </field>
61    
62     - <subroutine src="print_ajaxplorer_fields()" />
63     + <subroutine src="print_pydio_fields()" />
64    
65     <subroutine src="print_encryption_fields()" />
66    
67     diff -Nur smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm smeserver-shared-folders-0.1_pydio/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm
68     --- smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm 2013-10-22 18:47:54.651543102 +0200
69     +++ smeserver-shared-folders-0.1_pydio/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm 2013-10-22 19:15:20.044092421 +0200
70     @@ -25,7 +25,7 @@
71     print_share_table
72     print_share_name_field
73     print_encryption_fields
74     - print_ajaxplorer_fields
75     + print_pydio_fields
76     acl_list
77     smbAccess_list
78     httpAccess_list
79     @@ -312,29 +312,29 @@
80     return undef;
81     }
82    
83     -# If ajaxplorer is enabled:
84     -sub print_ajaxplorer_fields {
85     +# If pydio is enabled:
86     +sub print_pydio_fields {
87     my $self = shift;
88     - my $ajaxplorer = $c->get('ajaxplorer') || return undef;
89     - if (($ajaxplorer->prop('status') || 'disabled') eq 'enabled'){
90     + my $pydio = $c->get('pydio') || return undef;
91     + if (($pydio->prop('status') || 'disabled') eq 'enabled'){
92     print_section_bar();
93     my ($enabled,$disabled) = ('','');
94     my $sharename = $self->{cgi}->param('name') || '';
95     my $share = $a->get($sharename);
96     - # If share exists and Ajxplorer is enabled
97     + # If share exists and Pydio is enabled
98     if ($share){
99     - if (($share->prop('Ajaxplorer') || 'disabled') eq 'enabled'){
100     + if (($share->prop('Pydio') || 'disabled') eq 'enabled'){
101     $enabled = ' SELECTED';
102     }
103     }
104     else {
105     $disabled = ' SELECTED';
106     }
107     - print qq(<tr><td colspan="2">) . $self->localise('DESC_AJAXPLORER') . qq(</td></tr>);
108     + print qq(<tr><td colspan="2">) . $self->localise('DESC_PYDIO') . qq(</td></tr>);
109     print qq(<tr><td class="sme-noborders-label">) .
110     - $self->localise('LABEL_AJAXPLORER') . qq(</td>\n);
111     + $self->localise('LABEL_PYDIO') . qq(</td>\n);
112     print qq(
113     - <td class="sme-noborders-content"><SELECT NAME="ajaxplorer" TYPE="select">
114     + <td class="sme-noborders-content"><SELECT NAME="pydio" TYPE="select">
115     <OPTION VALUE="disabled"$disabled>) . $self->localise('DISABLED') .
116     qq(<OPTION VALUE="enabled"$enabled>) . $self->localise('ENABLED') .
117     qq(</SELECT></td>
118     @@ -593,7 +593,7 @@
119     smbAccess => $q->param('smbaccess'),
120     httpAccess => $q->param('httpaccess'),
121     WebDav => $q->param('webdav'),
122     - Ajaxplorer => ($q->param('ajaxplorer') || 'disabled'),
123     + Pydio => ($q->param('pydio') || 'disabled'),
124     RequireSSL => $q->param('requireSSL'),
125     Indexes => $q->param('indexes'),
126     DynamicContent => $q->param('dynamic'),
127     @@ -646,7 +646,7 @@
128     smbAccess => $q->param('smbaccess'),
129     httpAccess => $q->param('httpaccess'),
130     WebDav => $q->param('webdav'),
131     - Ajaxplorer => ($q->param('ajaxplorer') || 'disabled'),
132     + Pydio => ($q->param('pydio') || 'disabled'),
133     RequireSSL => $q->param('requireSSL'),
134     Indexes => $q->param('indexes'),
135     DynamicContent => $q->param('dynamic'),
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed