From ba1f0403f78d00922bd3f970827cf7b8cae93800 Mon Sep 17 00:00:00 2001
From: RainLoop Team <support@rainloop.net>
Date: Sat, 26 Jul 2014 22:51:34 +0400
Subject: [PATCH] Update ownCloud package

---
 build/owncloud/rainloop-app/INSTALL           |  52 +++----
 build/owncloud/rainloop-app/img/mail.png      | Bin 1518 -> 478 bytes
 .../rainloop-app/lib/RainLoopHelper.php       | 141 +++++++++---------
 .../owncloud/rainloop-app/templates/admin.php |  48 +++---
 .../rainloop-app/templates/personal.php       |  38 ++---
 package.json                                  |   2 +-
 6 files changed, 142 insertions(+), 139 deletions(-)

diff --git a/build/owncloud/rainloop-app/INSTALL b/build/owncloud/rainloop-app/INSTALL
index c24813c89..2f3b274e1 100644
--- a/build/owncloud/rainloop-app/INSTALL
+++ b/build/owncloud/rainloop-app/INSTALL
@@ -1,26 +1,26 @@
-************************************************************************
-*
-* ownCloud - RainLoop Webmail mail plugin
-*
-* @author RainLoop Team
-* @copyright 2014 RainLoop Team
-*
-* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
-*
-************************************************************************
-
-REQUIREMENTS:
-- Installed and configured RainLoop Webmail (standalone)
-- ownCloud version 6 or higher
-- Both apps (RainLoop & ownCloud) running on the same domain
-
-
-INSTALL:
-- Unpack the RainLoop Webmail application package in the apps directory of your OwnCloud instance
-
-
-CONFIGURATION:
-- ownCloud:
-	1) In the Apps > Enable 'RainLoop' plugin
-	2) In the Settings > Admin > Enter "RainLoop Webmail URL" and "Absolute file path to RainLoop Webmail installation"
-	3) In the Settings > Personal > Type your mail server email (login) and password
+************************************************************************
+*
+* ownCloud - RainLoop Webmail mail plugin
+*
+* @author RainLoop Team
+* @copyright 2014 RainLoop Team
+*
+* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
+*
+************************************************************************
+
+REQUIREMENTS:
+- Installed and configured RainLoop Webmail (standalone)
+- ownCloud version 6 or higher
+- Both apps (RainLoop & ownCloud) running on the same domain
+
+
+INSTALL:
+- Unpack the RainLoop Webmail application package in the apps directory of your OwnCloud instance
+
+
+CONFIGURATION:
+- ownCloud:
+	1) In the Apps > Enable 'RainLoop' plugin
+	2) In the Settings > Admin > Enter "RainLoop Webmail URL" and "Absolute (full) path to RainLoop Webmail installation"
+	3) In the Settings > Personal > Type your mail server email (login) and password
diff --git a/build/owncloud/rainloop-app/img/mail.png b/build/owncloud/rainloop-app/img/mail.png
index 21076eed70fcfaf735b09c0c5fbadf342cb72e4d..285cabee3e40e0c3dc24172e98bfb908bd526166 100644
GIT binary patch
delta 449
zcmV;y0Y3ij3*G}piBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=1ZP1_
zK>z@;j|==^1poj532;bRa{vGi!T<mc!T}X1N`RAV1Sx-7Nkl<ZSV!%aQ4)h73`9Me
zN9)acG@Hi~YAqPF_*LHwBPQ8RN@p0So10}>W?Nh4oGuVkD)G$W4~Q$Bh&*5>=pcUB
z`VvCUrIkY;pj*{M9zN*92k<~uI1+lOm42`fkfzr5x*_mZi}z`HFdb{&!|);Sl(oEh
z+WP)Ga{_;c4S|;|J3T2>{qIBIA*+L42&6kd1X@{~^gt;6aRW4x2HL2Ae6l$(1htZM
zXnG3Ct1LF8My0W*Z=ia+t+ATWn4C(w1}*o1Zlr)**Ss-_DW$p`ZeleWAiqS%RZOY1
z1x3SNA;s+3J4AR=RWpPhujQc?KSX3=x%V+vi1cy0{3Kp+%4bw_XV-6=7~R}y`dSdu
z|7g!knmcQMdfF<VWV~G3-0?oSXZa$6%bPp&QcDfsFHUt3i!-sacN0R(W816Tgy}d+
rV1vam_nPYMwaWK+H0y5ujcIxTz$Y8%9sGF800000NkvXXu0mjfa9F}O

literal 1518
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9
z?C1WI$jZRL%n;xc;tCZ1|NlRb90j8xFakp$z3fdgFrP4#1o;I6Gr~v)48h;oRe?!>
zv%n*=n1O-sFbFdq&tH)O6qG7)jVKAuPb(=;EJ|evNX*PD(erZ+Q7ALkGu1ORbpPyR
z4h%+DPZ!6K2=}*ByoC-c@Hk)oEk8?2;DLOnZ~5GeiG?j+F3mi)^HhHo<A0_fJO@{G
zNniJ`-K59U{+F>~t_ZV?VAV#ZR~*I*<K8p~GgUD>;aq&}-?7w|)(Yk+_k0A?b}%kr
zX>`A-*TSiEV!Ecs1Vg?K!4MAyB^KF<4e3ps8V7_A%4Hw0J!omtVBJ(+5}EB?z@IVG
zKsT3TUvKV|qQ!Xy%pVTTzQdOAc=wHe;vTmpVnqY=qfB+Ujy0TE^!>mO+f!V}W;~Lg
zvQlskYjVNey`3f(Ph`nGtP|IAx|=-f5`*Z(+WrL$=aiTDI55fmHdA6~+{anyuws2O
zkHDMN4}L9Z`E6unuhF@Wqd(W@Yx*2L29@879j5bnd=HdtXs%OdD7cc}!r3rYgxTa^
z-X*u)+uc~#6l!Koc(uAG6G$D=oAZ)&PeYK`Po|ibYfKs;Ywm)wqo=E%%Q~loCIGoJ
Bx~TvF

diff --git a/build/owncloud/rainloop-app/lib/RainLoopHelper.php b/build/owncloud/rainloop-app/lib/RainLoopHelper.php
index b2449e870..9c259f124 100644
--- a/build/owncloud/rainloop-app/lib/RainLoopHelper.php
+++ b/build/owncloud/rainloop-app/lib/RainLoopHelper.php
@@ -1,71 +1,70 @@
-<?php
-
-class OC_RainLoop_Helper
-{
-	/**
-	 * @param string $sPath
-	 * @param string $sEmail
-	 * @param string $sPassword
-	 * 
-	 * @return string
-	 */
-	public static function getSsoHash($sPath, $sEmail, $sPassword)
-	{
-		$SsoHash = '';
-		
-		$sPath = rtrim(trim($sPath), '\\/').'/index.php';
-		if (file_exists($sPath))
-		{
-			$_ENV['RAINLOOP_INCLUDE_AS_API'] = false;
-			include $sPath;
-			
-			if (class_exists($sPath))
-			{
-				
-				$SsoHash = \RainLoop\Api::GetUserSsoHash($sEmail, $sPassword);
-			}
-		}
-		
-		return $SsoHash;
-	}
-	
-	/**
-	 * @param string $sUrl
-	 *
-	 * @return string
-	 */
-	public static function normalizeUrl($sUrl)
-	{
-		$sUrl = \rtrim($sUrl, '/\\');
-		if ('.php' !== \strtolower(\substr($sUrl), -4))
-		{
-			$sUrl .= '/';
-		}
-
-		return $sUrl;
-	}
-
-	public static function encodePassword($sPassword, $sSalt)
-	{
-		if (function_exists('mcrypt_encrypt') && function_exists('mcrypt_create_iv') && function_exists('mcrypt_get_iv_size') &&
-			defined('MCRYPT_RIJNDAEL_256') && defined('MCRYPT_MODE_ECB') && defined('MCRYPT_RAND'))
-		{
-			return @trim(base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, md5($sSalt), $sPassword,
-				MCRYPT_MODE_ECB, mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB), MCRYPT_RAND))));
-		}
-
-		return @trim(base64_encode($sPassword));
-	}
-
-	public static function decodePassword($sPassword, $sSalt)
-	{
-		if (function_exists('mcrypt_encrypt') && function_exists('mcrypt_create_iv') && function_exists('mcrypt_get_iv_size') &&
-			defined('MCRYPT_RIJNDAEL_256') && defined('MCRYPT_MODE_ECB') && defined('MCRYPT_RAND'))
-		{
-			return @mcrypt_decrypt(MCRYPT_RIJNDAEL_256, md5($sSalt), base64_decode(trim($sPassword)),
-				MCRYPT_MODE_ECB, mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB), MCRYPT_RAND));
-		}
-
-		return @base64_decode(trim($sPassword));
-	}
-}
+<?php
+
+class OC_RainLoop_Helper
+{
+	/**
+	 * @param string $sPath
+	 * @param string $sEmail
+	 * @param string $sPassword
+	 *
+	 * @return string
+	 */
+	public static function getSsoHash($sPath, $sEmail, $sPassword)
+	{
+		$SsoHash = '';
+
+		$sPath = rtrim(trim($sPath), '\\/').'/index.php';
+		if (file_exists($sPath))
+		{
+			$_ENV['RAINLOOP_INCLUDE_AS_API'] = true;
+			include $sPath;
+
+			if (class_exists('\\RainLoop\\Api'))
+			{
+				$SsoHash = \RainLoop\Api::GetUserSsoHash($sEmail, $sPassword);
+			}
+		}
+
+		return $SsoHash;
+	}
+
+	/**
+	 * @param string $sUrl
+	 *
+	 * @return string
+	 */
+	public static function normalizeUrl($sUrl)
+	{
+		$sUrl = \rtrim(\trim($sUrl), '/\\');
+		if ('.php' !== \strtolower(\substr($sUrl, -4)))
+		{
+			$sUrl .= '/';
+		}
+
+		return $sUrl;
+	}
+
+	public static function encodePassword($sPassword, $sSalt)
+	{
+		if (function_exists('mcrypt_encrypt') && function_exists('mcrypt_create_iv') && function_exists('mcrypt_get_iv_size') &&
+			defined('MCRYPT_RIJNDAEL_256') && defined('MCRYPT_MODE_ECB') && defined('MCRYPT_RAND'))
+		{
+			return @trim(base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, md5($sSalt), $sPassword,
+				MCRYPT_MODE_ECB, mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB), MCRYPT_RAND))));
+		}
+
+		return @trim(base64_encode($sPassword));
+	}
+
+	public static function decodePassword($sPassword, $sSalt)
+	{
+		if (function_exists('mcrypt_encrypt') && function_exists('mcrypt_create_iv') && function_exists('mcrypt_get_iv_size') &&
+			defined('MCRYPT_RIJNDAEL_256') && defined('MCRYPT_MODE_ECB') && defined('MCRYPT_RAND'))
+		{
+			return @mcrypt_decrypt(MCRYPT_RIJNDAEL_256, md5($sSalt), base64_decode(trim($sPassword)),
+				MCRYPT_MODE_ECB, mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB), MCRYPT_RAND));
+		}
+
+		return @base64_decode(trim($sPassword));
+	}
+}
diff --git a/build/owncloud/rainloop-app/templates/admin.php b/build/owncloud/rainloop-app/templates/admin.php
index bb5492822..67dfd08b8 100644
--- a/build/owncloud/rainloop-app/templates/admin.php
+++ b/build/owncloud/rainloop-app/templates/admin.php
@@ -1,23 +1,25 @@
-<form id="mail-rainloop-admin-form" action="#" method="post">
-	<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken">
-	<input type="hidden" name="appname" value="rainloop">
-
-	<fieldset class="personalblock">
-		<h2><?php p($l->t('RainLoop Webmail')); ?></h2>
-		<br />
-		<p>
-			<?php p($l->t('RainLoop Webmail URL')); ?>:
-			<br />
-			<input type="text" style="width:300px;" id="rainloop-url" name="rainloop-url" value="<?php echo $_['rainloop-url']; ?>" placeholder="https://" />
-			<br />
-			<br />
-			<?php p($l->t('Absolute file path to RainLoop Webmail installation')); ?>:
-			<br />
-			<input type="text" style="width:300px;" id="rainloop-path" name="rainloop-path" value="<?php echo $_['rainloop-path']; ?>" />
-			<br />
-			<br />
-			<input type="button" id="rainloop-save-button" name="rainloop-save-button" value="<?php p($l->t('Save')); ?>" />
-			&nbsp;&nbsp;<span class="rainloop-result-desc"></span>
-		</p>
-	</fieldset>
-</form>
\ No newline at end of file
+<div class="section">
+	<form id="mail-rainloop-admin-form" action="#" method="post">
+		<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken">
+		<input type="hidden" name="appname" value="rainloop">
+
+		<fieldset class="personalblock">
+			<h2><?php p($l->t('RainLoop Webmail')); ?></h2>
+			<br />
+			<p>
+				<?php p($l->t('RainLoop Webmail URL')); ?>:
+				<br />
+				<input type="text" style="width:300px;" id="rainloop-url" name="rainloop-url" value="<?php echo $_['rainloop-url']; ?>" placeholder="https://" />
+				<br />
+				<br />
+				<?php p($l->t('Absolute (full) path to RainLoop Webmail installation')); ?>:
+				<br />
+				<input type="text" style="width:300px;" id="rainloop-path" name="rainloop-path" value="<?php echo $_['rainloop-path']; ?>" />
+				<br />
+				<br />
+				<input type="button" id="rainloop-save-button" name="rainloop-save-button" value="<?php p($l->t('Save')); ?>" />
+				&nbsp;&nbsp;<span class="rainloop-result-desc"></span>
+			</p>
+		</fieldset>
+	</form>
+</div>
\ No newline at end of file
diff --git a/build/owncloud/rainloop-app/templates/personal.php b/build/owncloud/rainloop-app/templates/personal.php
index 8b567d7a0..75daf1a40 100644
--- a/build/owncloud/rainloop-app/templates/personal.php
+++ b/build/owncloud/rainloop-app/templates/personal.php
@@ -1,18 +1,20 @@
-<form id="mail-rainloop-personal-form" action="#" method="post">
-	<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken">
-	<input type="hidden" name="appname" value="rainloop">
-
-	<fieldset class="personalblock">
-		<h2><?php p($l->t('RainLoop Webmail')); ?></h2>
-		<p>
-			<input type="text" id="rainloop-email" name="rainloop-email"
-				value="<?php echo $_['rainloop-email']; ?>" placeholder="<?php p($l->t('Email')); ?>" />
-
-			<input type="password" id="rainloop-password" name="rainloop-password"
-				value="<?php echo $_['rainloop-password']; ?>" placeholder="<?php p($l->t('Password')); ?>" />
-
-			<input type="button" id="rainloop-save-button" name="rainloop-save-button" value="<?php p($l->t('Save')); ?>" />
-			&nbsp;&nbsp;<span class="rainloop-result-desc"></span>
-		</p>
-	</fieldset>
-</form>
\ No newline at end of file
+<div class="section">
+	<form id="mail-rainloop-personal-form" action="#" method="post">
+		<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken">
+		<input type="hidden" name="appname" value="rainloop">
+
+		<fieldset class="personalblock">
+			<h2><?php p($l->t('RainLoop Webmail')); ?></h2>
+			<p>
+				<input type="text" id="rainloop-email" name="rainloop-email"
+					value="<?php echo $_['rainloop-email']; ?>" placeholder="<?php p($l->t('Email')); ?>" />
+
+				<input type="password" id="rainloop-password" name="rainloop-password"
+					value="<?php echo $_['rainloop-password']; ?>" placeholder="<?php p($l->t('Password')); ?>" />
+
+				<input type="button" id="rainloop-save-button" name="rainloop-save-button" value="<?php p($l->t('Save')); ?>" />
+				&nbsp;&nbsp;<span class="rainloop-result-desc"></span>
+			</p>
+		</fieldset>
+	</form>
+</div>
\ No newline at end of file
diff --git a/package.json b/package.json
index e3bfbd04f..bdf17768b 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
 		"plugins"
 	],
 	"readmeFilename": "README.md",
-	"ownCloudPackageVersion": "1.6",
+	"ownCloudPackageVersion": "2.0",
 	"engines": {
 		"node": ">= 0.10.0"
 	},