Update ownCloud package

This commit is contained in:
RainLoop Team 2014-07-26 22:51:34 +04:00
parent 1d39879765
commit ba1f0403f7
6 changed files with 142 additions and 139 deletions

View file

@ -22,5 +22,5 @@ INSTALL:
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

Before After
Before After

View file

@ -16,12 +16,11 @@ class OC_RainLoop_Helper
$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);
} }
} }
@ -36,8 +35,8 @@ class OC_RainLoop_Helper
*/ */
public static function normalizeUrl($sUrl) public static function normalizeUrl($sUrl)
{ {
$sUrl = \rtrim($sUrl, '/\\'); $sUrl = \rtrim(\trim($sUrl), '/\\');
if ('.php' !== \strtolower(\substr($sUrl), -4)) if ('.php' !== \strtolower(\substr($sUrl, -4)))
{ {
$sUrl .= '/'; $sUrl .= '/';
} }

View file

@ -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"> <fieldset class="personalblock">
<h2><?php p($l->t('RainLoop Webmail')); ?></h2> <h2><?php p($l->t('RainLoop Webmail')); ?></h2>
<br />
<p>
<?php p($l->t('RainLoop Webmail URL')); ?>:
<br /> <br />
<input type="text" style="width:300px;" id="rainloop-url" name="rainloop-url" value="<?php echo $_['rainloop-url']; ?>" placeholder="https://" /> <p>
<br /> <?php p($l->t('RainLoop Webmail URL')); ?>:
<br /> <br />
<?php p($l->t('Absolute file path to RainLoop Webmail installation')); ?>: <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-path" name="rainloop-path" value="<?php echo $_['rainloop-path']; ?>" /> <br />
<br /> <?php p($l->t('Absolute (full) path to RainLoop Webmail installation')); ?>:
<br /> <br />
<input type="button" id="rainloop-save-button" name="rainloop-save-button" value="<?php p($l->t('Save')); ?>" /> <input type="text" style="width:300px;" id="rainloop-path" name="rainloop-path" value="<?php echo $_['rainloop-path']; ?>" />
&nbsp;&nbsp;<span class="rainloop-result-desc"></span> <br />
</p> <br />
</fieldset> <input type="button" id="rainloop-save-button" name="rainloop-save-button" value="<?php p($l->t('Save')); ?>" />
</form> &nbsp;&nbsp;<span class="rainloop-result-desc"></span>
</p>
</fieldset>
</form>
</div>

View file

@ -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"> <fieldset class="personalblock">
<h2><?php p($l->t('RainLoop Webmail')); ?></h2> <h2><?php p($l->t('RainLoop Webmail')); ?></h2>
<p> <p>
<input type="text" id="rainloop-email" name="rainloop-email" <input type="text" id="rainloop-email" name="rainloop-email"
value="<?php echo $_['rainloop-email']; ?>" placeholder="<?php p($l->t('Email')); ?>" /> value="<?php echo $_['rainloop-email']; ?>" placeholder="<?php p($l->t('Email')); ?>" />
<input type="password" id="rainloop-password" name="rainloop-password" <input type="password" id="rainloop-password" name="rainloop-password"
value="<?php echo $_['rainloop-password']; ?>" placeholder="<?php p($l->t('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')); ?>" /> <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> &nbsp;&nbsp;<span class="rainloop-result-desc"></span>
</p> </p>
</fieldset> </fieldset>
</form> </form>
</div>

View file

@ -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"
}, },