mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-07-13 03:27:39 +03:00
Update ownCloud package
This commit is contained in:
RainLoop Team
parent
1d39879765
commit
ba1f0403f7
6 changed files with 142 additions and 139 deletions
|
|
@ -1,26 +1,26 @@
|
||||||
************************************************************************
|
************************************************************************
|
||||||
*
|
*
|
||||||
* ownCloud - RainLoop Webmail mail plugin
|
* ownCloud - RainLoop Webmail mail plugin
|
||||||
*
|
*
|
||||||
* @author RainLoop Team
|
* @author RainLoop Team
|
||||||
* @copyright 2014 RainLoop Team
|
* @copyright 2014 RainLoop Team
|
||||||
*
|
*
|
||||||
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
|
* https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud
|
||||||
*
|
*
|
||||||
************************************************************************
|
************************************************************************
|
||||||
|
|
||||||
REQUIREMENTS:
|
REQUIREMENTS:
|
||||||
- Installed and configured RainLoop Webmail (standalone)
|
- Installed and configured RainLoop Webmail (standalone)
|
||||||
- ownCloud version 6 or higher
|
- ownCloud version 6 or higher
|
||||||
- Both apps (RainLoop & ownCloud) running on the same domain
|
- Both apps (RainLoop & ownCloud) running on the same domain
|
||||||
|
|
||||||
|
|
||||||
INSTALL:
|
INSTALL:
|
||||||
- Unpack the RainLoop Webmail application package in the apps directory of your OwnCloud instance
|
- Unpack the RainLoop Webmail application package in the apps directory of your OwnCloud instance
|
||||||
|
|
||||||
|
|
||||||
CONFIGURATION:
|
CONFIGURATION:
|
||||||
- ownCloud:
|
- ownCloud:
|
||||||
1) In the Apps > Enable 'RainLoop' plugin
|
1) In the Apps > Enable 'RainLoop' plugin
|
||||||
2) In the Settings > Admin > Enter "RainLoop Webmail URL" and "Absolute file path to RainLoop Webmail installation"
|
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
|
3) In the Settings > Personal > Type your mail server email (login) and password
|
||||||
|
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 478 B |
|
|
@ -1,71 +1,70 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
class OC_RainLoop_Helper
|
class OC_RainLoop_Helper
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @param string $sPath
|
* @param string $sPath
|
||||||
* @param string $sEmail
|
* @param string $sEmail
|
||||||
* @param string $sPassword
|
* @param string $sPassword
|
||||||
*
|
*
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
public static function getSsoHash($sPath, $sEmail, $sPassword)
|
public static function getSsoHash($sPath, $sEmail, $sPassword)
|
||||||
{
|
{
|
||||||
$SsoHash = '';
|
$SsoHash = '';
|
||||||
|
|
||||||
$sPath = rtrim(trim($sPath), '\\/').'/index.php';
|
$sPath = rtrim(trim($sPath), '\\/').'/index.php';
|
||||||
if (file_exists($sPath))
|
if (file_exists($sPath))
|
||||||
{
|
{
|
||||||
$_ENV['RAINLOOP_INCLUDE_AS_API'] = false;
|
$_ENV['RAINLOOP_INCLUDE_AS_API'] = true;
|
||||||
include $sPath;
|
include $sPath;
|
||||||
|
|
||||||
if (class_exists($sPath))
|
if (class_exists('\\RainLoop\\Api'))
|
||||||
{
|
{
|
||||||
|
$SsoHash = \RainLoop\Api::GetUserSsoHash($sEmail, $sPassword);
|
||||||
$SsoHash = \RainLoop\Api::GetUserSsoHash($sEmail, $sPassword);
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
return $SsoHash;
|
||||||
return $SsoHash;
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* @param string $sUrl
|
||||||
* @param string $sUrl
|
*
|
||||||
*
|
* @return string
|
||||||
* @return string
|
*/
|
||||||
*/
|
public static function normalizeUrl($sUrl)
|
||||||
public static function normalizeUrl($sUrl)
|
{
|
||||||
{
|
$sUrl = \rtrim(\trim($sUrl), '/\\');
|
||||||
$sUrl = \rtrim($sUrl, '/\\');
|
if ('.php' !== \strtolower(\substr($sUrl, -4)))
|
||||||
if ('.php' !== \strtolower(\substr($sUrl), -4))
|
{
|
||||||
{
|
$sUrl .= '/';
|
||||||
$sUrl .= '/';
|
}
|
||||||
}
|
|
||||||
|
return $sUrl;
|
||||||
return $sUrl;
|
}
|
||||||
}
|
|
||||||
|
public static function encodePassword($sPassword, $sSalt)
|
||||||
public static function encodePassword($sPassword, $sSalt)
|
{
|
||||||
{
|
if (function_exists('mcrypt_encrypt') && function_exists('mcrypt_create_iv') && function_exists('mcrypt_get_iv_size') &&
|
||||||
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'))
|
||||||
defined('MCRYPT_RIJNDAEL_256') && defined('MCRYPT_MODE_ECB') && defined('MCRYPT_RAND'))
|
{
|
||||||
{
|
return @trim(base64_encode(mcrypt_encrypt(MCRYPT_RIJNDAEL_256, md5($sSalt), $sPassword,
|
||||||
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))));
|
||||||
MCRYPT_MODE_ECB, mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB), MCRYPT_RAND))));
|
}
|
||||||
}
|
|
||||||
|
return @trim(base64_encode($sPassword));
|
||||||
return @trim(base64_encode($sPassword));
|
}
|
||||||
}
|
|
||||||
|
public static function decodePassword($sPassword, $sSalt)
|
||||||
public static function decodePassword($sPassword, $sSalt)
|
{
|
||||||
{
|
if (function_exists('mcrypt_encrypt') && function_exists('mcrypt_create_iv') && function_exists('mcrypt_get_iv_size') &&
|
||||||
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'))
|
||||||
defined('MCRYPT_RIJNDAEL_256') && defined('MCRYPT_MODE_ECB') && defined('MCRYPT_RAND'))
|
{
|
||||||
{
|
return @mcrypt_decrypt(MCRYPT_RIJNDAEL_256, md5($sSalt), base64_decode(trim($sPassword)),
|
||||||
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));
|
||||||
MCRYPT_MODE_ECB, mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_256, MCRYPT_MODE_ECB), MCRYPT_RAND));
|
}
|
||||||
}
|
|
||||||
|
return @base64_decode(trim($sPassword));
|
||||||
return @base64_decode(trim($sPassword));
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,25 @@
|
||||||
<form id="mail-rainloop-admin-form" action="#" method="post">
|
<div class="section">
|
||||||
<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken">
|
<form id="mail-rainloop-admin-form" action="#" method="post">
|
||||||
<input type="hidden" name="appname" value="rainloop">
|
<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>
|
<fieldset class="personalblock">
|
||||||
<br />
|
<h2><?php p($l->t('RainLoop Webmail')); ?></h2>
|
||||||
<p>
|
<br />
|
||||||
<?php p($l->t('RainLoop Webmail URL')); ?>:
|
<p>
|
||||||
<br />
|
<?php p($l->t('RainLoop Webmail URL')); ?>:
|
||||||
<input type="text" style="width:300px;" id="rainloop-url" name="rainloop-url" value="<?php echo $_['rainloop-url']; ?>" placeholder="https://" />
|
<br />
|
||||||
<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 />
|
||||||
<br />
|
<?php p($l->t('Absolute (full) path to RainLoop Webmail installation')); ?>:
|
||||||
<input type="text" style="width:300px;" id="rainloop-path" name="rainloop-path" value="<?php echo $_['rainloop-path']; ?>" />
|
<br />
|
||||||
<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')); ?>" />
|
<br />
|
||||||
<span class="rainloop-result-desc"></span>
|
<input type="button" id="rainloop-save-button" name="rainloop-save-button" value="<?php p($l->t('Save')); ?>" />
|
||||||
</p>
|
<span class="rainloop-result-desc"></span>
|
||||||
</fieldset>
|
</p>
|
||||||
</form>
|
</fieldset>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
@ -1,18 +1,20 @@
|
||||||
<form id="mail-rainloop-personal-form" action="#" method="post">
|
<div class="section">
|
||||||
<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken">
|
<form id="mail-rainloop-personal-form" action="#" method="post">
|
||||||
<input type="hidden" name="appname" value="rainloop">
|
<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>
|
<fieldset class="personalblock">
|
||||||
<p>
|
<h2><?php p($l->t('RainLoop Webmail')); ?></h2>
|
||||||
<input type="text" id="rainloop-email" name="rainloop-email"
|
<p>
|
||||||
value="<?php echo $_['rainloop-email']; ?>" placeholder="<?php p($l->t('Email')); ?>" />
|
<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="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')); ?>" />
|
|
||||||
<span class="rainloop-result-desc"></span>
|
<input type="button" id="rainloop-save-button" name="rainloop-save-button" value="<?php p($l->t('Save')); ?>" />
|
||||||
</p>
|
<span class="rainloop-result-desc"></span>
|
||||||
</fieldset>
|
</p>
|
||||||
</form>
|
</fieldset>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
|
@ -36,7 +36,7 @@
|
||||||
"plugins"
|
"plugins"
|
||||||
],
|
],
|
||||||
"readmeFilename": "README.md",
|
"readmeFilename": "README.md",
|
||||||
"ownCloudPackageVersion": "1.6",
|
"ownCloudPackageVersion": "2.0",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 0.10.0"
|
"node": ">= 0.10.0"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue