Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 20:49:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed cPanel plugin

Browse source
This commit is contained in:
RainLoop Team 2014-09-25 14:54:20 +04:00
parent 67678017a8
commit 4c38993c26
3 changed files with 57 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/cpanel-change-password/CpanelChangePasswordDriver.php
View file

@ -152,6 +152,11 @@ class CpanelChangePasswordDriver implements \RainLoop\Providers\ChangePassword\C
$sResult = $oXmlApi->api2_query($sUser, 'Email', 'passwdpop', $aArgs);
if ($sResult)
{
if ($this->oLogger)
{
$this->oLogger->Write('CPANEL: '.$sResult, \MailSo\Log\Enumerations\Type::INFO);
}
$aResult = @\json_decode($sResult, true);
$bResult = isset($aResult['cpanelresult']['data'][0]['result']) &&
!!$aResult['cpanelresult']['data'][0]['result'];

30
plugins/cpanel-change-password/xmlapi.php
View file

@ -656,7 +656,7 @@ class xmlapi
// Set the $auth string
$authstr;
$authstr = '';
if ($this->auth_type == 'hash') {
$authstr = 'Authorization: WHM ' . $this->user . ':' . $this->auth . "\r\n";
} elseif ($this->auth_type == 'pass') {
@ -671,13 +671,33 @@ class xmlapi
// Perform the query (or pass the info to the functions that actually do perform the query)
$response;
$response = '';
if ($this->http_client == 'curl') {
$response = $this->curl_query($url, $args, $authstr);
} elseif ($this->http_client == 'fopen') {
$response = $this->fopen_query($url, $args, $authstr);
}
// fix #1
$aMatch = array();
if ($response && false !== stripos($response, '<html>') &&
preg_match('/HTTP-EQUIV[\s]?=[\s]?"refresh"/i', $response) &&
preg_match('/<meta [^>]+url[\s]?=[\s]?([^">]+)/i', $response, $aMatch) &&
!empty($aMatch[1]) && 0 === strpos(trim($aMatch[1]), 'http'))
{
$url = trim($aMatch[1]) . $query_type . $function;
if ($this->debug) {
error_log('new URL: ' . $url);
}
if ($this->http_client == 'curl') {
$response = $this->curl_query($url, $args, $authstr);
} elseif ($this->http_client == 'fopen') {
$response = $this->fopen_query($url, $args, $authstr);
}
}
// ---
/*
* Post-Query Block
* Handle response, return proper data types, debug, etc
@ -1543,7 +1563,7 @@ class xmlapi
*/
public function editpkg($pkg)
{
if (!$isset($pkg['name'])) {
if (!isset($pkg['name'])) {
error_log("editpkg requires that name is defined in the array passed to it");
return false;
@ -2183,7 +2203,7 @@ class xmlapi
* Service Status
*
* This function will return the status of all services on the and whether they are running or not
* @param string $service A single service to filter for.
* @param array $args A single service to filter for.
* @return mixed
* @link http://docs.cpanel.net/twiki/bin/view/AllDocumentation/AutomationIntegration/ServiceStatus XML API Call documentation
*/
@ -2456,7 +2476,7 @@ class xmlapi
}
if (is_array($args)) {
$display = '';
foreach ($args as $key => $value) {
foreach ($args as $value) {
$display .= $value . '|';
}
$values['display'] = substr($display, 0, -1);