Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code refactoring

Browse source 
a lot of small fixes (Closes #173)
Added login field (ownCloud package)
This commit is contained in:
RainLoop Team 2014-05-24 02:14:16 +04:00
parent a059b3d063
commit fed896776f
129 changed files with 1016 additions and 804 deletions
Download patch file Download diff file Expand all files Collapse all files

5
build/configs/apache2/.htaccess
View file

@ -1,5 +0,0 @@
<IfModule mod_rewrite.c>
RewriteEngine On
RewriteRule /.well-known/carddav /index.php/dav [R,L]
</IfModule>

14
build/configs/apache2/dav.mydomain.com
View file

@ -1,14 +0,0 @@
<VirtualHost *:80>
AcceptPathInfo On
ServerName dav.mydomain.com
DocumentRoot /var/www/mydomain.com
RewriteEngine On
RewriteRule /.well-known/carddav /index.php/dav [R,L]
<Directory "/var/www/mydomain.com">
Options None
Options +FollowSymlinks
AllowOverride All
</Directory>
</VirtualHost>

14
build/configs/apache2/mydomain.com
View file

@ -1,14 +0,0 @@
<VirtualHost *:80>
AcceptPathInfo On
ServerName mydomain.com
DocumentRoot /var/www/mydomain.com
RewriteEngine On
RewriteRule /.well-known/carddav /index.php/dav [R,L]
<Directory "/var/www/mydomain.com">
Options None
Options +FollowSymlinks
AllowOverride All
</Directory>
</VirtualHost>

43
build/configs/nginx/dav.mydomain.com.conf
View file

@ -1,43 +0,0 @@
server {
listen 80;
server_name dav.mydomain.com;
root /var/www/mydomain.com;
access_log /var/log/nginx/dav.mydomain.com.access.log;
error_log /var/log/nginx/dav.mydomain.com.error.log;
index index.php;
charset utf-8;
log_not_found off;
location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
expires max;
add_header Pragma public;
add_header Cache-Control "public, must-revalidate, proxy-revalidate";
}
location = /favicon.ico { access_log off; log_not_found off; }
location = /robots.txt { access_log off; log_not_found off; }
location = /humans.txt { access_log off; log_not_found off; }
location ~ /\.ht { access_log off; log_not_found off; deny all; return 404; }
location ^~ /data { access_log off; log_not_found off; deny all; return 404; }
# rewrite for carddav autoprovision
rewrite ^/.well-known/carddav / redirect;
rewrite ^(.*)$ /index.php/dav$1 last;
# php for carddav only
location ~ /index\.php/dav/.*$ {
include fastcgi_params;
fastcgi_pass 127.0.0.1:9000; # unix:/var/run/php5-fpm.sock;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_split_path_info ^(.+\.php)(/[^?]*).*$;
fastcgi_index index.php;
fastcgi_param SCRIPT_NAME index.php;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
}
}

48
build/configs/nginx/mydomain.com.conf
View file

@ -1,48 +0,0 @@
server {
listen 80;
server_name mydomain.com;
root /var/www/mydomain.com;
access_log /var/log/nginx/mydomain.com.access.log;
error_log /var/log/nginx/mydomain.com.error.log;
index index.php index.html;
charset utf-8;
log_not_found off;
location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
expires max;
add_header Pragma public;
add_header Cache-Control "public, must-revalidate, proxy-revalidate";
}
location = /favicon.ico { access_log off; log_not_found off; }
location = /robots.txt { access_log off; log_not_found off; }
location = /humans.txt { access_log off; log_not_found off; }
location ~ /\.ht { access_log off; log_not_found off; deny all; return 404; }
location ^~ /data { access_log off; log_not_found off; deny all; return 404; }
# rewrite for carddav autoprovision
rewrite ^/.well-known/carddav /index.php/dav/ redirect;
# php for carddav
location ~ /index\.php/dav/.*$ {
include fastcgi_params;
fastcgi_pass 127.0.0.1:9000; # unix:/var/run/php5-fpm.sock;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_split_path_info ^(.+\.php)(/[^?]*).*$;
fastcgi_index index.php;
fastcgi_param SCRIPT_NAME index.php;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
}
# php (other)
location ~ \.php {
include fastcgi_params;
fastcgi_pass 127.0.0.1:9000; # unix:/var/run/php5-fpm.sock;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
}
}

2
build/owncloud/rainloop-app/INSTALL
View file

@ -25,5 +25,5 @@ external_sso_key = "super-secret-key"
ownCloud:
1) In the Apps > Enable 'RainLoop' plugin
2) In the Settings > Admin > Enter "RainLoop Webmail URL" and "SSO key"
3) In the Settings > Personal > Type your mail server email and password
3) In the Settings > Personal > Type your mail server email (login) and password

2
build/owncloud/rainloop-app/VERSION
View file

@ -1 +1 @@
1.1
0.0

1
build/owncloud/rainloop-app/ajax/personal.php
View file

@ -23,6 +23,7 @@ if (isset($_POST['appname'], $_POST['rainloop-password'], $_POST['rainloop-email
$sPostLogin = isset($_POST['rainloop-login']) ? $_POST['rainloop-login'] : '';
OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-email', $sPostEmail);
OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-login', $sPostLogin);
$sPass = $_POST['rainloop-password'];
if ('******' !== $sPass && '' !== $sPass)

3
build/owncloud/rainloop-app/templates/personal.php
View file

@ -8,6 +8,9 @@
<input type="text" id="rainloop-email" name="rainloop-email"
value="<?php echo $_['rainloop-email']; ?>" placeholder="<?php p($l->t('Email')); ?>" />
<input type="text" id="rainloop-email" name="rainloop-login"
value="<?php echo $_['rainloop-login']; ?>" placeholder="<?php p($l->t('Login (optional)')); ?>" />
<input type="password" id="rainloop-password" name="rainloop-password"
value="<?php echo $_['rainloop-password']; ?>" placeholder="<?php p($l->t('Password')); ?>" />

6
build/plugin.xml
View file

@ -58,9 +58,9 @@
<param name="plugin-name" value="directadmin-change-password"/>
</antcall>
</target>
<target name="ispmanager-change-password">
<target name="ispconfig-change-password">
<antcall target="_build_plugin_">
<param name="plugin-name" value="ispmanager-change-password"/>
<param name="plugin-name" value="ispconfig-change-password"/>
</antcall>
</target>
<target name="poppassd-change-password">
@ -94,5 +94,5 @@
</antcall>
</target>
</project>