Subversion Repositories oidplus

Compare Revisions

Regard whitespace Rev 1292 → Rev 1293

/trunk/plugins/viathinksoft/raPages/092_invite/OIDplusPageRaInvite.class.php
26,14 → 26,12
class OIDplusPageRaInvite extends OIDplusPagePluginRa {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'invite_ra') {
private function action_Request(array $params): array {
$email = $params['email'];
 
if (!OIDplus::mailUtils()->validMailAddress($email)) {
54,9 → 52,15
OIDplus::mailUtils()->sendMail($email, OIDplus::config()->getValue('system_title').' - Invitation', $message);
 
return array("status" => 0);
}
 
} else if ($actionID == 'activate_ra') {
 
/**
* @param array $params
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
private function action_Activate(array $params): array {
_CheckParamExists($params, 'password1');
_CheckParamExists($params, 'password2');
_CheckParamExists($params, 'email');
86,6 → 90,20
$ra->register_ra($password1);
 
return array("status" => 0);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'invite_ra') {
return $this->action_Request($params);
} else if ($actionID == 'activate_ra') {
return $this->action_Activate($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/raPages/100_edit_contact_data/OIDplusPageRaEditContactData.class.php
26,13 → 26,11
class OIDplusPageRaEditContactData extends OIDplusPagePluginRa {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'change_ra_data') {
private function action_Update(array $params): array {
_CheckParamExists($params, 'email');
 
$email = $params['email'];
74,6 → 72,17
OIDplus::db()->query("UPDATE ###ra SET updated = ".OIDplus::db()->sqlDate()." WHERE email = ?", array($email));
 
return array("status" => 0);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'change_ra_data') {
return $this->action_Update($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/raPages/101_change_password/OIDplusPageRaChangePassword.class.php
26,13 → 26,11
class OIDplusPageRaChangePassword extends OIDplusPagePluginRa {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'change_ra_password') {
private function action_Update(array $params): array {
_CheckParamExists($params, 'email');
 
$email = $params['email'];
82,6 → 80,17
$ra->change_password($password1);
 
return array("status" => 0);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'change_ra_password') {
return $this->action_Update($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/raPages/102_change_email/OIDplusPageRaChangeEMail.class.php
26,14 → 26,12
class OIDplusPageRaChangeEMail extends OIDplusPagePluginRa {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'change_ra_email') {
private function action_Request(array $params): array {
if (!OIDplus::config()->getValue('allow_ra_email_change') && !OIDplus::authUtils()->isAdminLoggedIn()) {
throw new OIDplusException(_L('This functionality has been disabled by the administrator.'));
}
109,7 → 107,13
}
}
 
else if ($actionID == 'activate_new_ra_email') {
/**
* @param array $params
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
private function action_Activate(array $params): array {
if (!OIDplus::config()->getValue('allow_ra_email_change')) {
throw new OIDplusException(_L('This functionality has been disabled by the administrator.'));
}
181,6 → 185,20
OIDplus::mailUtils()->sendMail($old_email, OIDplus::config()->getValue('system_title').' - eMail address changed', $message);
 
return array("status" => 0);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'change_ra_email') {
return $this->action_Request($params);
} else if ($actionID == 'activate_new_ra_email') {
return $this->action_Activate($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/raPages/910_automated_ajax_calls/OIDplusPageRaAutomatedAJAXCalls.class.php
29,13 → 29,11
class OIDplusPageRaAutomatedAJAXCalls extends OIDplusPagePluginRa {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'blacklistJWT') {
private function action_Blacklist(array $params): array {
if (!OIDplus::baseConfig()->getValue('JWT_ALLOW_AJAX_USER', true)) {
throw new OIDplusException(_L('The administrator has disabled this feature. (Base configuration setting %1).','JWT_ALLOW_AJAX_USER'));
}
53,6 → 51,17
OIDplusAuthContentStoreJWT::jwtBlacklist($gen, $sub);
 
return array("status" => 0);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'blacklistJWT') {
return $this->action_Blacklist($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/raPages/911_rest_api/OIDplusPageRaRestApi.class.php
29,13 → 29,11
class OIDplusPageRaRestApi extends OIDplusPagePluginRa {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'blacklistJWT') {
private function action_Blacklist(array $params): array {
if (!OIDplus::baseConfig()->getValue('JWT_ALLOW_REST_USER', true)) {
throw new OIDplusException(_L('The administrator has disabled this feature. (Base configuration setting %1).','JWT_ALLOW_REST_USER'));
}
53,6 → 51,17
OIDplusAuthContentStoreJWT::jwtBlacklist($gen, $sub);
 
return array("status" => 0);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'blacklistJWT') {
return $this->action_Blacklist($params);
} else {
return parent::action($actionID, $params);
}