Change license to AGPL

Author: RainLoop

LICENSE

@@ -1,8 +1,6 @@
 RainLoop Webmail
 ==================
 
-[![Join the chat at https://gitter.im/RainLoop/rainloop-webmail](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/RainLoop/rainloop-webmail?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
 Simple, modern & fast web-based email client.
 
 Modest system requirements, decent performance, simple installation and upgrade, no database required - all these make RainLoop Webmail a perfect choice for your email solution.
@@ -18,7 +16,8 @@ It's not recommended to use in production environment.
 
 ## License
 
-**Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported (CC BY-NC-SA 3.0)**
-http://creativecommons.org/licenses/by-nc-sa/3.0/
+RainLoop Webmail (**Community edition**) is released under
+**GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (AGPL)**.
+http://www.gnu.org/licenses/agpl-3.0.html
 
 Copyright (c) 2015 Rainloop Team

README.md

@@ -285,7 +285,7 @@
 		});
 
 		this.hasUnreadMessages = ko.computed(function () {
-			return 0 < this.messageCountUnread();
+			return 0 < this.messageCountUnread() && '' !== this.printableUnreadCount();
 		}, this);
 
 		this.hasSubScribedUnreadMessagesSubfolders = ko.computed(function () {

dev/Model/Folder.js

@@ -1,8 +1,12 @@
-/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */
+/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
 'use strict';
 
 var
 	pkg = require('./package.json'),
+	head = {
+		cc: '/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */',
+		agpl: '/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */'
+	},
 	cfg = {
 		devVersion: '0.0.0',
 		releasesPath: 'build/dist/releases',
@@ -40,6 +44,11 @@ var
 	gutil = require('gulp-util')
 ;
 
+function getHead()
+{
+	return !cfg.community ? head.cc : head.agpl;
+}
+
 function regOtherMinTask(sName, sPath, sInc, sOut, sHeader)
 {
 	gulp.task(sName, function() {
@@ -330,23 +339,23 @@ gulp.task('js:webpack', ['js:webpack:clear'], function(callback) {
 
 gulp.task('js:app', ['js:webpack'], function() {
 	return gulp.src(cfg.paths.staticJS + cfg.paths.js.app.name)
-		.pipe(header('/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */\n'))
+		.pipe(header(getHead() + '\n'))
 		.pipe(eol('\n', true))
 		.pipe(gulp.dest(cfg.paths.staticJS))
 		.on('error', gutil.log);
 });
 
 gulp.task('js:admin', ['js:webpack'], function() {
 	return gulp.src(cfg.paths.staticJS + cfg.paths.js.admin.name)
-		.pipe(header('/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */\n'))
+		.pipe(header(getHead() + '\n'))
 		.pipe(eol('\n', true))
 		.pipe(gulp.dest(cfg.paths.staticJS))
 		.on('error', gutil.log);
 });
 
 gulp.task('js:chunks', ['js:webpack'], function() {
 	return gulp.src(cfg.paths.staticJS + '*.subapp.js')
-		.pipe(header('/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */\n'))
+		.pipe(header(getHead() + '\n'))
 		.pipe(eol('\n', true))
 		.pipe(gulp.dest(cfg.paths.staticJS))
 		.on('error', gutil.log);
@@ -357,7 +366,7 @@ gulp.task('js:min', ['js:app', 'js:admin', 'js:chunks'], function() {
 	return gulp.src(cfg.paths.staticJS + '*.js')
 		.pipe(replace(/"rainloop\/v\/([^\/]+)\/static\/js\/"/g, '"rainloop/v/$1/static/js/min/"'))
 		.pipe(uglify(cfg.uglify))
-		.pipe(header('/* RainLoop Webmail (c) RainLoop Team | Licensed under CC BY-NC-SA 3.0 */\n'))
+		.pipe(header(getHead() + '\n'))
 		.pipe(eol('\n', true))
 		.pipe(gulp.dest(cfg.paths.staticMinJS))
 		.on('error', gutil.log);
@@ -482,6 +491,11 @@ gulp.task('rainloop:setup', ['rainloop:copy'], function() {
 
 	fs.writeFileSync(dist + 'rainloop/v/' + versionFull + '/index.php.root', fs.readFileSync(dist + 'index.php'));
 
+	if (cfg.community)
+	{
+		require('rimraf').sync(dist + 'rainloop/v/' + versionFull + '/app/libraries/RainLoop/Prem/');
+	}
+
 	cfg.destPath = cfg.releasesPath + '/webmail/' + versionFull + '/';
 	cfg.cleanPath = dist;
 	cfg.zipSrcPath = dist;
@@ -578,33 +592,51 @@ gulp.task('rainloop:owncloud:clean', ['rainloop:owncloud:copy', 'rainloop:ownclo
 
 // MAIN
 gulp.task('default', ['js:libs', 'js:boot', 'js:openpgp', 'js:min', 'css:main:min', 'ckeditor', 'fontastic']);
-gulp.task('fast', ['js:app', 'js:admin', 'js:chunks', 'css:main']);
+gulp.task('fast-', ['js:app', 'js:admin', 'js:chunks', 'css:main']);
+
+gulp.task('fast', ['package:community-on', 'fast-']);
+gulp.task('fast+', ['package:community-off', 'fast-']);
 
 gulp.task('rainloop:start', ['js:lint', 'rainloop:copy', 'rainloop:setup']);
 
-gulp.task('rainloop', ['package:community-on', 'rainloop:start', 'rainloop:zip', 'rainloop:md5', 'rainloop:clean']);
-gulp.task('rainloop+', ['package:community-off', 'rainloop']);
+gulp.task('rainloop-', ['rainloop:start', 'rainloop:zip', 'rainloop:md5', 'rainloop:clean']);
 
-gulp.task('owncloud', ['package:community-on', 'rainloop:owncloud:copy',
+gulp.task('rainloop', ['package:community-on', 'rainloop-']);
+gulp.task('rainloop+', ['package:community-off', 'rainloop-']);
+
+gulp.task('owncloud-', ['rainloop:owncloud:copy',
 	'rainloop:owncloud:copy-rainloop', 'rainloop:owncloud:copy-rainloop:clean',
 	'rainloop:owncloud:setup', 'rainloop:owncloud:zip', 'rainloop:owncloud:md5', 'rainloop:owncloud:clean']);
 
-gulp.task('owncloud+', ['package:community-off', 'owncloud']);
+gulp.task('owncloud', ['package:community-on', 'owncloud-']);
+gulp.task('owncloud+', ['package:community-off', 'owncloud-']);
 
 //WATCH
 gulp.task('watch', ['fast'], function() {
 	gulp.watch(cfg.paths.globjs, {interval: 1000}, ['js:app', 'js:admin']);
 	gulp.watch(cfg.paths.less.main.watch, {interval: 1000}, ['css:main']);
 });
 
+gulp.task('watch+', ['fast+'], function() {
+	gulp.watch(cfg.paths.globjs, {interval: 1000}, ['js:app', 'js:admin']);
+	gulp.watch(cfg.paths.less.main.watch, {interval: 1000}, ['css:main']);
+});
+
 // ALIASES
 gulp.task('build', ['rainloop']);
+gulp.task('build+', ['rainloop+']);
 gulp.task('js:hint', ['js:lint']);
 
 gulp.task('w', ['watch']);
+gulp.task('w+', ['watch+']);
 gulp.task('f', ['fast']);
+gulp.task('f+', ['fast+']);
+
 gulp.task('b', ['build']);
 gulp.task('b+', ['build+']);
+
 gulp.task('o', ['owncloud']);
 gulp.task('o+', ['owncloud+']);
-gulp.task('h', ['js:lint']);
+
+gulp.task('h', ['js:lint']);
+gulp.task('l', ['js:lint']);

gulpfile.js

@@ -17,8 +17,8 @@
 	},
 	"licenses": [
 		{
-			"type": "CC BY-NC-SA 3.0",
-			"ulr": "http://creativecommons.org/licenses/by-nc-sa/3.0/"
+			"type": "AGPL 3.0",
+			"ulr": "http://www.gnu.org/licenses/agpl-3.0.html"
 		}
 	],
 	"bugs": {
@@ -43,6 +43,7 @@
 	"devDependencies": {
 
 		"node-fs": "*",
+		"rimraf": "*",
 		"jshint-summary": "*",
 
 		"webpack": "*",
@@ -67,9 +68,5 @@
 		"gulp-beautify": "*",
 		"gulp-plumber": "*",
 		"gulp-concat-util": "*"
-	},
-	"scripts": {
-		"gulp": "gulp",
-		"w": "gulp w"
 	}
 }

package.json

@@ -1932,7 +1932,7 @@ public function LoginProcess(&$sEmail, &$sPassword, $sSignMeToken = '',
 				{
 					$sLine = \trim(\implode('.', $aDomainParts), '. ');
 
-					$oDomain = $oDomainProvider->Load($sLine);
+					$oDomain = $oDomainProvider->Load($sLine, false);
 					if ($oDomain && $oDomain instanceof \RainLoop\Model\Domain)
 					{
 						$bAdded = true;
@@ -1951,6 +1951,24 @@ public function LoginProcess(&$sEmail, &$sPassword, $sSignMeToken = '',
 					$iLimit--;
 				}
 
+				if (!$bAdded)
+				{
+					$sLine = $sUserHost;
+					$oDomain = $oDomainProvider->Load($sLine, true);
+					if ($oDomain && $oDomain instanceof \RainLoop\Model\Domain)
+					{
+						$bAdded = true;
+						$this->Logger()->Write('Check "'.$sLine.'" with wildcard: OK ('.$sEmail.' > '.$sEmail.'@'.$sLine.')',
+							\MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
+
+						$sEmail = $sEmail.'@'.$sLine;
+					}
+					else
+					{
+						$this->Logger()->Write('Check "'.$sLine.'" with wildcard: NO', \MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
+					}
+				}
+
 				if (!$bAdded)
 				{
 					$this->Logger()->Write('Domain was not found!', \MailSo\Log\Enumerations\Type::INFO, 'LOGIN');