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

Add error message on adminpanel contacts configuration page.

Browse source
This commit is contained in:
RainLoop Team 2013-12-10 20:07:10 +04:00
parent a531846b8f
commit 869e0ed181
9 changed files with 120 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dev/Admin/Contacts.js
View file

@ -21,11 +21,13 @@ function AdminContacts()
this.testing = ko.observable(false); this.testing = ko.observable(false);
this.testContactsSuccess = ko.observable(false); this.testContactsSuccess = ko.observable(false);
this.testContactsError = ko.observable(false); this.testContactsError = ko.observable(false);
this.testContactsErrorMessage = ko.observable('');
this.testContactsCommand = Utils.createCommand(this, function () { this.testContactsCommand = Utils.createCommand(this, function () {
this.testContactsSuccess(false); this.testContactsSuccess(false);
this.testContactsError(false); this.testContactsError(false);
this.testContactsErrorMessage('');
this.testing(true); this.testing(true);
RL.remote().testContacts(this.onTestContactsResponse, { RL.remote().testContacts(this.onTestContactsResponse, {
@ -45,13 +47,18 @@ Utils.addSettingsViewModel(AdminContacts, 'AdminSettingsContacts', 'Contacts', '
AdminContacts.prototype.onTestContactsResponse = function (sResult, oData) AdminContacts.prototype.onTestContactsResponse = function (sResult, oData)
{ {
if (Enums.StorageResultType.Success === sResult && oData && oData.Result) this.testContactsSuccess(false);
this.testContactsError(false);
this.testContactsErrorMessage('');
if (Enums.StorageResultType.Success === sResult && oData && oData.Result && oData.Result.Result)
{ {
this.testContactsSuccess(true); this.testContactsSuccess(true);
} }
else else
{ {
this.testContactsError(true); this.testContactsError(true);
this.testContactsErrorMessage(oData.Result.Message || '');
} }
this.testing(false); this.testing(false);
@ -61,6 +68,7 @@ AdminContacts.prototype.onShow = function ()
{ {
this.testContactsSuccess(false); this.testContactsSuccess(false);
this.testContactsError(false); this.testContactsError(false);
this.testContactsErrorMessage('');
}; };
AdminContacts.prototype.onBuild = function () AdminContacts.prototype.onBuild = function ()

108
rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php
View file

@ -228,6 +228,16 @@ class Utils
return !\preg_match('/[^\x09\x10\x13\x0A\x0D\x20-\x7E]/', $sValue); return !\preg_match('/[^\x09\x10\x13\x0A\x0D\x20-\x7E]/', $sValue);
} }
/**
* @param string $sValue
*
* @return bool
*/
public static function IsUtf8($sValue)
{
return (bool) \preg_match('//u', $sValue);
}
/** /**
* @param int $iSize * @param int $iSize
* @param int $iRound * @param int $iRound
@ -831,55 +841,55 @@ class Utils
{ {
return \json_encode($mInput, defined('JSON_UNESCAPED_UNICODE') ? JSON_UNESCAPED_UNICODE : 0); return \json_encode($mInput, defined('JSON_UNESCAPED_UNICODE') ? JSON_UNESCAPED_UNICODE : 0);
if (\is_null($mInput)) // if (\is_null($mInput))
{ // {
return 'null'; // return 'null';
} // }
else if ($mInput === false) // else if ($mInput === false)
{ // {
return 'false'; // return 'false';
} // }
else if ($mInput === true) // else if ($mInput === true)
{ // {
return 'true'; // return 'true';
} // }
else if (\is_scalar($mInput)) // else if (\is_scalar($mInput))
{ // {
if (\is_float($mInput)) // if (\is_float($mInput))
{ // {
$mInput = \str_replace(',', '.', \strval($mInput)); // $mInput = \str_replace(',', '.', \strval($mInput));
} // }
//
return '"'.\MailSo\Base\Utils::InlineRebuildStringToJsString($mInput).'"'; // return '"'.\MailSo\Base\Utils::InlineRebuildStringToJsString($mInput).'"';
} // }
//
$bIsList = true; // $bIsList = true;
for ($iIndex = 0, \reset($mInput), $iLen = \count($mInput); $iIndex < $iLen; $iIndex++, \next($mInput)) // for ($iIndex = 0, \reset($mInput), $iLen = \count($mInput); $iIndex < $iLen; $iIndex++, \next($mInput))
{ // {
if (\key($mInput) !== $iIndex) // if (\key($mInput) !== $iIndex)
{ // {
$bIsList = false; // $bIsList = false;
break; // break;
} // }
} // }
//
$aResult = array(); // $aResult = array();
if ($bIsList) // if ($bIsList)
{ // {
foreach ($mInput as $mValue) // foreach ($mInput as $mValue)
{ // {
$aResult[] = \MailSo\Base\Utils::Php2js($mValue); // $aResult[] = \MailSo\Base\Utils::Php2js($mValue);
} // }
return '['.\join(',', $aResult).']'; // return '['.\join(',', $aResult).']';
} // }
else // else
{ // {
foreach ($mInput as $sKey => $mValue) // foreach ($mInput as $sKey => $mValue)
{ // {
$aResult[] = \MailSo\Base\Utils::Php2js($sKey).':'.\MailSo\Base\Utils::Php2js($mValue); // $aResult[] = \MailSo\Base\Utils::Php2js($sKey).':'.\MailSo\Base\Utils::Php2js($mValue);
} // }
return '{'.\join(',', $aResult).'}'; // return '{'.\join(',', $aResult).'}';
} // }
} }
/** /**

6
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -1942,7 +1942,11 @@ class Actions
$this->setConfigFromParams($oConfig, 'ContactsPdoUser', 'contacts', 'pdo_user', 'string'); $this->setConfigFromParams($oConfig, 'ContactsPdoUser', 'contacts', 'pdo_user', 'string');
$this->setConfigFromParams($oConfig, 'ContactsPdoPassword', 'contacts', 'pdo_password', 'dummy'); $this->setConfigFromParams($oConfig, 'ContactsPdoPassword', 'contacts', 'pdo_password', 'dummy');
return $this->DefaultResponse(__FUNCTION__, $this->PersonalAddressBookProvider(null, true)->Test()); $sTestMessage = $this->PersonalAddressBookProvider(null, true)->Test();
return $this->DefaultResponse(__FUNCTION__, array(
'Result' => '' === $sTestMessage,
'Message' => \MailSo\Base\Utils::Utf8Clear($sTestMessage, '?')
));
} }
/** /**

2
rainloop/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php
View file

@ -72,7 +72,7 @@ abstract class PdoAbstract
$oPdo = false; $oPdo = false;
try try
{ {
$oPdo = new \PDO($sDsn, $sDbLogin, $sDbPassword); $oPdo = @new \PDO($sDsn, $sDbLogin, $sDbPassword);
if ($oPdo) if ($oPdo)
{ {
$oPdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION); $oPdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);

4
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/PersonalAddressBook.php
View file

@ -24,13 +24,13 @@ class PersonalAddressBook extends \RainLoop\Providers\AbstractProvider
} }
/** /**
* @return bool * @return string
*/ */
public function Test() public function Test()
{ {
\sleep(1); \sleep(1);
return $this->oDriver instanceof \RainLoop\Providers\PersonalAddressBook\PersonalAddressBookInterface ? return $this->oDriver instanceof \RainLoop\Providers\PersonalAddressBook\PersonalAddressBookInterface ?
$this->oDriver->Test() : false; $this->oDriver->Test() : 'Personal address book driver is not allowed';
} }
/** /**

27
rainloop/v/0.0.0/app/libraries/RainLoop/Providers/PersonalAddressBook/PdoPersonalAddressBook.php
View file

@ -752,8 +752,31 @@ class PdoPersonalAddressBook
*/ */
public function Test() public function Test()
{ {
$this->Sync(); $sResult = '';
return 0 < $this->getVersion('mysql-pab-version'); try
{
$this->Sync();
if (0 >= $this->getVersion('mysql-pab-version'))
{
$sResult = 'Unknown database error';
}
}
catch (\Exception $oException)
{
$sResult = $oException->getMessage();
if (!empty($sResult) && !\MailSo\Base\Utils::IsAscii($sResult) && !\MailSo\Base\Utils::IsUtf8($sResult))
{
$sResult = @\utf8_encode($sResult);
}
if (!\is_string($sResult) || empty($sResult))
{
$sResult = 'Unknown database error';
}
}
return $sResult;
} }
/** /**

7
rainloop/v/0.0.0/app/templates/Views/AdminSettingsContacts.html
View file

@ -59,5 +59,12 @@
</a> </a>
</div> </div>
</div> </div>
<div class="control-group" data-bind="visible: '' !== testContactsErrorMessage()">
<div class="controls">
<div class="row">
<div class="alert span8" data-bind="text: testContactsErrorMessage"></div>
</div>
</div>
</div>
</div> </div>
</div> </div>

10
rainloop/v/0.0.0/static/js/admin.js
View file

@ -5261,11 +5261,13 @@ function AdminContacts()
this.testing = ko.observable(false); this.testing = ko.observable(false);
this.testContactsSuccess = ko.observable(false); this.testContactsSuccess = ko.observable(false);
this.testContactsError = ko.observable(false); this.testContactsError = ko.observable(false);
this.testContactsErrorMessage = ko.observable('');
this.testContactsCommand = Utils.createCommand(this, function () { this.testContactsCommand = Utils.createCommand(this, function () {
this.testContactsSuccess(false); this.testContactsSuccess(false);
this.testContactsError(false); this.testContactsError(false);
this.testContactsErrorMessage('');
this.testing(true); this.testing(true);
RL.remote().testContacts(this.onTestContactsResponse, { RL.remote().testContacts(this.onTestContactsResponse, {
@ -5285,13 +5287,18 @@ Utils.addSettingsViewModel(AdminContacts, 'AdminSettingsContacts', 'Contacts', '
AdminContacts.prototype.onTestContactsResponse = function (sResult, oData) AdminContacts.prototype.onTestContactsResponse = function (sResult, oData)
{ {
if (Enums.StorageResultType.Success === sResult && oData && oData.Result) this.testContactsSuccess(false);
this.testContactsError(false);
this.testContactsErrorMessage('');
if (Enums.StorageResultType.Success === sResult && oData && oData.Result && oData.Result.Result)
{ {
this.testContactsSuccess(true); this.testContactsSuccess(true);
} }
else else
{ {
this.testContactsError(true); this.testContactsError(true);
this.testContactsErrorMessage(oData.Result.Message || '');
} }
this.testing(false); this.testing(false);
@ -5301,6 +5308,7 @@ AdminContacts.prototype.onShow = function ()
{ {
this.testContactsSuccess(false); this.testContactsSuccess(false);
this.testContactsError(false); this.testContactsError(false);
this.testContactsErrorMessage('');
}; };
AdminContacts.prototype.onBuild = function () AdminContacts.prototype.onBuild = function ()

6
rainloop/v/0.0.0/static/js/admin.min.js vendored
View file

File diff suppressed because one or more lines are too long