1 |
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 |
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 |
2 |
--- smeserver-shared-folders-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares 2011-06-27 19:31:39.000000000 +0200 |
--- smeserver-shared-folders-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares 2011-06-28 15:44:43.000000000 +0200 |
3 |
+++ smeserver-shared-folders-0.1_mod/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares 2011-06-27 19:45:48.000000000 +0200 |
+++ smeserver-shared-folders-0.1_mod/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares 2011-06-28 15:51:25.000000000 +0200 |
4 |
@@ -284,7 +284,7 @@ |
@@ -489,4 +489,18 @@ |
5 |
<trans>Entire Internet (no password required)</trans> |
</trans> |
6 |
</entry> |
</entry> |
7 |
|
|
|
- <entry> |
|
8 |
+ <entry> |
+ <entry> |
9 |
<base>ENTIRE_INTERNET_PASSWORD</base> |
+ <base>DESC_AJAXPLORER</base> |
10 |
<trans>Entire Internet (password required)</trans> |
+ <trans> |
11 |
</entry> |
+ The following settings control the access of this shared folder with the web based file manager Ajaxplorer |
12 |
@@ -295,6 +295,16 @@ |
+ </trans> |
|
</entry> |
|
|
|
|
|
<entry> |
|
|
+ <base>ENTIRE_INTERNET_AJAXPLORER</base> |
|
|
+ <trans>Entire Internet with a web-based management interface</trans> |
|
13 |
+ </entry> |
+ </entry> |
14 |
+ |
+ |
15 |
+ <entry> |
+ <entry> |
16 |
+ <base>LOCAL_NETWORK_AJAXPLORER</base> |
+ <base>LABEL_AJAXPLORER</base> |
17 |
+ <trans>Local network with a web-based management interface</trans> |
+ <trans> |
18 |
|
+ Ajaxplorer Access |
19 |
|
+ </trans> |
20 |
+ </entry> |
+ </entry> |
21 |
+ |
+ |
22 |
+ <entry> |
</lexicon> |
23 |
<base>ENABLED_BROWSEABLE</base> |
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 |
24 |
<trans>Enabled, browseable</trans> |
--- smeserver-shared-folders-0.1/root/etc/e-smith/web/functions/shares 2011-06-28 15:44:43.000000000 +0200 |
25 |
</entry> |
+++ smeserver-shared-folders-0.1_mod/root/etc/e-smith/web/functions/shares 2011-06-28 15:52:03.000000000 +0200 |
26 |
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 |
@@ -117,6 +117,8 @@ |
27 |
--- smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm 2011-06-27 19:31:39.000000000 +0200 |
<label>LABEL_DYNAMIC_CONTENT</label> |
28 |
+++ smeserver-shared-folders-0.1_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm 2011-06-27 19:50:55.000000000 +0200 |
</field> |
|
@@ -382,7 +382,7 @@ |
|
|
# access drop down list. |
|
29 |
|
|
30 |
sub httpAccess_list { |
+ <subroutine src="print_ajaxplorer_fields()" /> |
|
- return { |
|
|
+ my $list = { |
|
|
'none' => 'NONE', |
|
|
'local' => 'LOCAL_NETWORK_NO_PASSWORD', |
|
|
'local-pw' => 'LOCAL_NETWORK_PASSWORD', |
|
|
@@ -390,6 +390,15 @@ |
|
|
'global-pw' => 'ENTIRE_INTERNET_PASSWORD', |
|
|
'global-pw-remote' => 'ENTIRE_INTERNET_PASSWORD_REMOTE' |
|
|
}; |
|
31 |
+ |
+ |
32 |
+ # Check if ajaxplorer is enabled |
<subroutine src="print_section_bar()" /> |
33 |
|
|
34 |
|
<subroutine src="print_encryption_fields()" /> |
35 |
|
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 |
36 |
|
--- smeserver-shared-folders-0.1/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm 2011-06-28 15:44:43.000000000 +0200 |
37 |
|
+++ smeserver-shared-folders-0.1_mod/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/shares.pm 2011-06-28 15:54:57.000000000 +0200 |
38 |
|
@@ -25,6 +25,7 @@ |
39 |
|
print_share_table |
40 |
|
print_share_name_field |
41 |
|
print_encryption_fields |
42 |
|
+ print_ajaxplorer_fields |
43 |
|
genGroupAccess |
44 |
|
smbAccess_list |
45 |
|
httpAccess_list |
46 |
|
@@ -293,6 +294,32 @@ |
47 |
|
return undef; |
48 |
|
} |
49 |
|
|
50 |
|
+# If ajaxplorer is enabled: |
51 |
|
+sub print_ajaxplorer_fields { |
52 |
|
+ my ($self) = @_; |
53 |
+ if (($configdb->get('ajaxplorer')->prop('status') || 'disabled') eq 'enabled'){ |
+ if (($configdb->get('ajaxplorer')->prop('status') || 'disabled') eq 'enabled'){ |
54 |
+ my $access = (($configdb->get('ajaxplorer')->prop('access') || 'private') eq 'public') ? |
+ print_section_bar(); |
55 |
+ 'ENTIRE_INTERNET':'LOCAL_NETWORK'; |
+ my ($enabled,$disabled) = ('',''); |
56 |
+ $list->{'ajaxplorer'} = $access . '_AJAXPLORER'; |
+ if (($accountdb->get($self->{cgi}->param('name'))->prop('Ajaxplorer') || 'disabled') eq 'enabled'){ |
57 |
|
+ $enabled = ' SELECTED'; |
58 |
|
+ } |
59 |
|
+ else { |
60 |
|
+ $disabled = ' SELECTED'; |
61 |
|
+ } |
62 |
|
+ print qq(<tr><td colspan="2">) . $self->localise('DESC_AJAXPLORER') . qq(</td></tr>); |
63 |
|
+ print qq(<tr><td class="sme-noborders-label">) . |
64 |
|
+ $self->localise('LABEL_AJAXPLORER') . qq(</td>\n); |
65 |
|
+ print qq( |
66 |
|
+ <td class="sme-noborders-content"><SELECT NAME="ajaxplorer" TYPE="select"> |
67 |
|
+ <OPTION VALUE="disabled"$disabled>) . $self->localise('DISABLED') . |
68 |
|
+ qq(<OPTION VALUE="enabled"$enabled>) . $self->localise('ENABLED') . |
69 |
|
+ qq(</SELECT></td> |
70 |
|
+ ); |
71 |
+ } |
+ } |
72 |
|
+ return undef; |
73 |
|
+} |
74 |
+ |
+ |
75 |
+ return $list; |
+ |
76 |
} |
# Takes a comma delimited list of groups and returns a string of |
77 |
|
# html checkboxes for all system groups with the groups having write and read access. |
78 |
|
|
79 |
# VALIDATION ROUTINES |
@@ -537,6 +564,7 @@ |
80 |
|
smbAccess => $self->cgi->param('smbaccess'), |
81 |
|
httpAccess => $self->cgi->param('httpaccess'), |
82 |
|
WebDav => $self->cgi->param('webdav'), |
83 |
|
+ Ajaxplorer => ($self->cgi->param('ajaxplorer') || 'disabled'), |
84 |
|
RequireSSL => $self->cgi->param('requireSSL'), |
85 |
|
Indexes => $self->cgi->param('indexes'), |
86 |
|
DynamicContent => $self->cgi->param('dynamic'), |
87 |
|
@@ -608,6 +636,7 @@ |
88 |
|
smbAccess => $self->cgi->param('smbaccess'), |
89 |
|
httpAccess => $self->cgi->param('httpaccess'), |
90 |
|
WebDav => $self->cgi->param('webdav'), |
91 |
|
+ Ajaxplorer => ($self->cgi->param('ajaxplorer') || 'disabled'), |
92 |
|
RequireSSL => $self->cgi->param('requireSSL'), |
93 |
|
Indexes => $self->cgi->param('indexes'), |
94 |
|
DynamicContent => $self->cgi->param('dynamic'), |