This commit is contained in:
RainLoop Team 2013-12-07 02:32:02 +04:00
parent 4905377bac
commit b50464afeb
2 changed files with 70 additions and 70 deletions

View file

@ -341,13 +341,13 @@ class Http
/** /**
* @param string $sUrl * @param string $sUrl
* @param array $aPost = array() * @param array $aPost = array()
* @param string $sCustomUserAgent = 'MaiSo Http User Agent (v1)' * @param string $sCustomUserAgent = 'MailSo Http User Agent (v1)'
* @param int $iCode = 0 * @param int $iCode = 0
* @param \MailSo\Log\Logger $oLogger = null * @param \MailSo\Log\Logger $oLogger = null
* *
* @return string|bool * @return string|bool
*/ */
public function SendPostRequest($sUrl, $aPost = array(), $sCustomUserAgent = 'MaiSo Http User Agent (v1)', &$iCode = 0, $oLogger = null) public function SendPostRequest($sUrl, $aPost = array(), $sCustomUserAgent = 'MailSo Http User Agent (v1)', &$iCode = 0, $oLogger = null)
{ {
$aOptions = array( $aOptions = array(
CURLOPT_URL => $sUrl, CURLOPT_URL => $sUrl,
@ -398,7 +398,7 @@ class Http
/** /**
* @param string $sUrl * @param string $sUrl
* @param resource $rFile * @param resource $rFile
* @param string $sCustomUserAgent = 'MaiSo Http User Agent (v1)' * @param string $sCustomUserAgent = 'MailSo Http User Agent (v1)'
* @param string $sContentType = '' * @param string $sContentType = ''
* @param int $iCode = 0 * @param int $iCode = 0
* @param \MailSo\Log\Logger $oLogger = null * @param \MailSo\Log\Logger $oLogger = null
@ -406,7 +406,7 @@ class Http
* *
* @return bool * @return bool
*/ */
public function SaveUrlToFile($sUrl, $rFile, $sCustomUserAgent = 'MaiSo Http User Agent (v1)', &$sContentType = '', &$iCode = 0, $oLogger = null, $iTimeout = 10) public function SaveUrlToFile($sUrl, $rFile, $sCustomUserAgent = 'MailSo Http User Agent (v1)', &$sContentType = '', &$iCode = 0, $oLogger = null, $iTimeout = 10)
{ {
if (!is_resource($rFile)) if (!is_resource($rFile))
{ {
@ -465,14 +465,14 @@ class Http
/** /**
* @param string $sUrl * @param string $sUrl
* @param string $sCustomUserAgent = 'MaiSo Http User Agent (v1)' * @param string $sCustomUserAgent = 'MailSo Http User Agent (v1)'
* @param string $sContentType = '' * @param string $sContentType = ''
* @param int $iCode = 0 * @param int $iCode = 0
* @param \MailSo\Log\Logger $oLogger = null * @param \MailSo\Log\Logger $oLogger = null
* *
* @return string|bool * @return string|bool
*/ */
public function GetUrlAsString($sUrl, $sCustomUserAgent = 'MaiSo Http User Agent (v1)', &$sContentType = '', &$iCode = 0, $oLogger = null) public function GetUrlAsString($sUrl, $sCustomUserAgent = 'MailSo Http User Agent (v1)', &$sContentType = '', &$iCode = 0, $oLogger = null)
{ {
$rMemFile = \MailSo\Base\ResourceRegistry::CreateMemoryResource(); $rMemFile = \MailSo\Base\ResourceRegistry::CreateMemoryResource();
if ($this->SaveUrlToFile($sUrl, $rMemFile, $sCustomUserAgent, $sContentType, $iCode, $oLogger) && \is_resource($rMemFile)) if ($this->SaveUrlToFile($sUrl, $rMemFile, $sCustomUserAgent, $sContentType, $iCode, $oLogger) && \is_resource($rMemFile))

View file

@ -1,64 +1,64 @@
<div class="popups"> <div class="popups">
<div class="modal hide b-activate-content" data-bind="modal: modalVisibility"> <div class="modal hide b-activate-content" data-bind="modal: modalVisibility">
<div> <div>
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-bind="command: cancelCommand">&times;</button> <button type="button" class="close" data-bind="command: cancelCommand">&times;</button>
<h3> <h3>
<span data-bind="visible: !activateProcess()">Activate Subscription Key?</span> <span data-bind="visible: !activateProcess()">Activate Subscription Key?</span>
<span data-bind="visible: activateProcess">Activation...</span> <span data-bind="visible: activateProcess">Activation...</span>
</h3> </h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="control-group"> <div class="control-group">
<label class="control-label"> <label class="control-label">
Domain Domain
</label> </label>
<div class="controls"> <div class="controls">
<h4 class="help-inline" data-bind="text: domain" style="margin-top: 5px;"></h4> <h4 class="help-inline" data-bind="text: domain" style="margin-top: 5px;"></h4>
</div> </div>
</div> </div>
<div class="control-group" data-bind="css: {'error': '' !== activateText() && activateText.isError(), 'success': '' !== activateText() && !activateText.isError() }"> <div class="control-group" data-bind="css: {'error': '' !== activateText() && activateText.isError(), 'success': '' !== activateText() && !activateText.isError() }">
<label class="control-label"> <label class="control-label">
Subscription Key Subscription Key
</label> </label>
<div class="controls "> <div class="controls ">
<input type="text" class="span5" data-bind="visible: !activateProcess() && !activationSuccessed(), value: key, valueUpdate: 'afterkeydown', hasFocus: key.focus"></input> <input type="text" class="span5" data-bind="visible: !activateProcess() && !activationSuccessed(), value: key, valueUpdate: 'afterkeydown', hasFocus: key.focus"></input>
<h4 class="help-inline" style="margin-top: 5px;" data-bind="text: key, visible: activateProcess() || activationSuccessed()"></h4> <h4 class="help-inline" style="margin-top: 5px;" data-bind="text: key, visible: activateProcess() || activationSuccessed()"></h4>
<div class="help-block" data-bind="text: activateText"></div> <div class="help-block" data-bind="text: activateText"></div>
</div> </div>
</div> </div>
</div> </div>
<br /> <br />
<div class="alert"> <div class="alert">
<p> <p>
After activation, commercial subscription for <strong data-bind="text: domain"></strong> will be extended. After activation, commercial subscription for <strong data-bind="text: domain"></strong> will be extended.
<br /> <br />
Note that subscription key can only be activated for a single domain. Note that subscription key can be activated for a single domain only.
</p> </p>
<p> <p>
Once started, the process of activation cannot be aborted or cancelled. Once started, the process of activation cannot be aborted or cancelled.
</p> </p>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<!-- <a class="btn" href="http://rainloop.net/purchase/" target="_black"> <!-- <a class="btn" href="http://rainloop.net/purchase/" target="_black">
<i class="icon-cart"></i> <i class="icon-cart"></i>
&nbsp;&nbsp; &nbsp;&nbsp;
Purchase Purchase
</a>--> </a>-->
<a class="btn buttonActivate" data-bind="visible: !activationSuccessed(), command: activateCommand"> <a class="btn buttonActivate" data-bind="visible: !activationSuccessed(), command: activateCommand">
<i class="icon-key" data-bind="css: {'icon-key': !activateProcess(), 'icon-spinner-2 animated': activateProcess()}" ></i> <i class="icon-key" data-bind="css: {'icon-key': !activateProcess(), 'icon-spinner-2 animated': activateProcess()}" ></i>
&nbsp;&nbsp; &nbsp;&nbsp;
Activate Activate
</a> </a>
<span style="color: green" data-bind="visible: activationSuccessed"> <span style="color: green" data-bind="visible: activationSuccessed">
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
<i class="icon-ok"></i> <i class="icon-ok"></i>
&nbsp;&nbsp; &nbsp;&nbsp;
Activated Activated
</span> </span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>