Subversion Repositories oidplus

Compare Revisions

Regard whitespace Rev 1293 → Rev 1292

/trunk/plugins/viathinksoft/adminPages/110_system_config/OIDplusPageAdminSystemConfig.class.php
26,11 → 26,13
class OIDplusPageAdminSystemConfig extends OIDplusPagePluginAdmin {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_Update(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'config_update') {
if (!OIDplus::authUtils()->isAdminLoggedIn()) {
throw new OIDplusHtmlException(_L('You need to <a %1>log in</a> as administrator.',OIDplus::gui()->link('oidplus:login$admin')), null, 401);
}
57,17 → 59,6
}
 
return array("status" => 0);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'config_update') {
return $this->action_Update($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/adminPages/120_registration/OIDplusPageAdminRegistration.class.php
58,12 → 58,15
}
 
/**
* This action is called by the ViaThinkSoft server in order to verify that the system is in the ownership of the correct private key
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_VerifyPubKey(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'verify_pubkey') {
// This action is called by the ViaThinkSoft server in order to verify that the system is in the ownership of the correct private key
 
_CheckParamExists($params, 'challenge');
 
$payload = 'oidplus-verify-pubkey:'.sha3_512($params['challenge']);
77,17 → 80,6
"status" => 0,
"response" => base64_encode($signature)
);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'verify_pubkey') {
return $this->action_VerifyPubKey($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/adminPages/130_create_ra/OIDplusPageAdminCreateRa.class.php
25,13 → 25,14
 
class OIDplusPageAdminCreateRa extends OIDplusPagePluginAdmin {
 
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_Create(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'create_ra') {
if (!OIDplus::authUtils()->isAdminLoggedIn()) {
throw new OIDplusHtmlException(_L('You need to <a %1>log in</a> as administrator.',OIDplus::gui()->link('oidplus:login$admin')), null, 401);
}
68,17 → 69,6
$ra->register_ra($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 == 'create_ra') {
return $this->action_Create($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/adminPages/400_oidinfo_export/OIDplusPageAdminOIDInfoExport.class.php
38,11 → 38,14
/*private*/ const QUERY_GET_OIDINFO_DATA_V1 = '1.3.6.1.4.1.37476.2.5.2.1.6.1';
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_ImportXml(array $params): array {
public function action(string $actionID, array $params): array {
 
if ($actionID == 'import_xml_file') {
if (!OIDplus::authUtils()->isAdminLoggedIn()) {
throw new OIDplusHtmlException(_L('You need to <a %1>log in</a> as administrator.',OIDplus::gui()->link('oidplus:login$admin')), null,401);
}
75,14 → 78,7
"count_warnings" => $count_warnings
);
}
}
 
/**
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_ImportOidInfo(array $params): array {
} else if ($actionID == 'import_oidinfo_oid') {
if (!OIDplus::authUtils()->isAdminLoggedIn()) {
throw new OIDplusHtmlException(_L('You need to <a %1>log in</a> as administrator.',OIDplus::gui()->link('oidplus:login$admin')), null, 401);
}
164,19 → 160,6
} else {
return array("status" => 0);
}
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'import_xml_file') {
return $this->action_ImportXml($params);
} else if ($actionID == 'import_oidinfo_oid') {
return $this->action_ImportOidInfo($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/adminPages/700_colors/OIDplusPageAdminColors.class.php
65,11 → 65,13
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_Update(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'color_update') {
if (!OIDplus::authUtils()->isAdminLoggedIn()) {
throw new OIDplusHtmlException(_L('You need to <a %1>log in</a> as administrator.',OIDplus::gui()->link('oidplus:login$admin')), null, 401);
}
89,17 → 91,6
OIDplus::logger()->log("V2:[OK/INFO]A", "Changed system color theme");
 
return array("status" => 0);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'color_update') {
return $this->action_Update($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/adminPages/900_software_update/OIDplusPageAdminSoftwareUpdate.class.php
49,11 → 49,13
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_Update(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'update_now') {
@set_time_limit(0);
 
if (!OIDplus::authUtils()->isAdminLoggedIn()) {
171,17 → 173,6
else {
throw new OIDplusException(_L('Multiple version files/directories (oidplus_version.txt, .version.php, .git, or .svn) are existing! Therefore, the version is ambiguous!'));
}
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'update_now') {
return $this->action_Update($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/adminPages/910_automated_ajax_calls/OIDplusPageAdminAutomatedAJAXCalls.class.php
29,11 → 29,13
class OIDplusPageAdminAutomatedAJAXCalls extends OIDplusPagePluginAdmin {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_Blacklist(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'blacklistJWT') {
if (!OIDplus::authUtils()->isAdminLoggedIn()) {
throw new OIDplusHtmlException(_L('You need to <a %1>log in</a> as administrator.',OIDplus::gui()->link('oidplus:login$admin')), null, 401);
}
48,17 → 50,6
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/adminPages/911_rest_api/OIDplusPageAdminRestApi.class.php
29,11 → 29,13
class OIDplusPageAdminRestApi extends OIDplusPagePluginAdmin {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_Blacklist(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'blacklistJWT') {
if (!OIDplus::authUtils()->isAdminLoggedIn()) {
throw new OIDplusHtmlException(_L('You need to <a %1>log in</a> as administrator.',OIDplus::gui()->link('oidplus:login$admin')), null, 401);
}
48,17 → 50,6
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/captcha/vts_challenge/OIDplusCaptchaPluginVtsClientChallenge.class.php
49,11 → 49,13
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_GetChallenge(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'get_challenge') {
$offset = 0; // doesn't matter
$min = $offset;
$max = $offset + OIDplus::baseConfig()->getValue('VTS_CAPTCHA_COMPLEXITY', 50000);
77,17 → 79,6
// Autosolve on=calculate result on page load; off=calculate result on form submit
"autosolve" => OIDplus::baseConfig()->getValue('VTS_CAPTCHA_AUTOSOLVE', true)
);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'get_challenge') {
return $this->action_GetChallenge($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/objectTypes/mac/OIDplusObjectTypePluginMac.class.php
35,11 → 35,13
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_GenerateAAI(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'generate_aai') {
_CheckParamExists($params, 'aai_bits');
_CheckParamExists($params, 'aai_multicast');
 
66,17 → 68,6
$aai = rtrim(chunk_split($aai, 2, '-'), '-');
 
return array("status" => 0, "aai" => $aai);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'generate_aai') {
return $this->action_GenerateAAI($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/publicPages/001_ra_base/OIDplusPagePublicRaBaseUtils.class.php
27,11 → 27,18
class OIDplusPagePublicRaBaseUtils extends OIDplusPagePluginPublic {
 
/**
* @param array $params email
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_Delete(array $params): array {
public function action(string $actionID, array $params): array {
 
// Action: delete_ra
// Method: POST
// Parameters: email
// Outputs: Text
if ($actionID == 'delete_ra') {
_CheckParamExists($params, 'email');
 
$email = $params['email'];
54,20 → 61,10
OIDplus::logger()->log("V2:[OK/WARN]RA(%1)+[OK/INFO]A", "RA '%1' deleted", $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 == 'delete_ra') {
return $this->action_Delete($params);
} else {
return parent::action($actionID, $params);
}
 
}
 
/**
/trunk/plugins/viathinksoft/publicPages/090_login/OIDplusPagePublicLogin.class.php
26,11 → 26,15
class OIDplusPagePublicLogin extends OIDplusPagePluginPublic {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_RaLogin(array $params): array {
public function action(string $actionID, array $params): array {
// === RA LOGIN/LOGOUT ===
 
if ($actionID == 'ra_login') {
OIDplus::getActiveCaptchaPlugin()->captchaVerify($params, 'captcha');
 
_CheckParamExists($params, 'email');
68,14 → 72,9
}
throw new OIDplusException(_L('Wrong password or user not registered'));
}
}
 
/**
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_RaLogout(array $params): array {
} else if ($actionID == 'ra_logout') {
 
_CheckParamExists($params, 'email');
 
$email = $params['email'];
85,12 → 84,9
return array("status" => 0);
}
 
/**
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_AdminLogin(array $params): array {
// === ADMIN LOGIN/LOGOUT ===
 
else if ($actionID == 'admin_login') {
OIDplus::getActiveCaptchaPlugin()->captchaVerify($params, 'captcha');
 
_CheckParamExists($params, 'password');
108,34 → 104,12
throw new OIDplusException(_L('Wrong password'));
}
}
 
/**
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_AdminLogout(array $params): array {
else if ($actionID == 'admin_logout') {
OIDplus::authUtils()->adminLogoutEx();
 
return array("status" => 0);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'ra_login') {
return $this->action_RaLogin($params);
} else if ($actionID == 'ra_logout') {
return $this->action_RaLogout($params);
} else if ($actionID == 'admin_login') {
return $this->action_AdminLogin($params);
} else if ($actionID == 'admin_logout') {
return $this->action_AdminLogout($params);
} else {
else {
return parent::action($actionID, $params);
}
}
/trunk/plugins/viathinksoft/publicPages/091_forgot_password/OIDplusPagePublicForgotPassword.class.php
26,12 → 26,14
class OIDplusPagePublicForgotPassword extends OIDplusPagePluginPublic {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
private function action_Request(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'forgot_password') {
_CheckParamExists($params, 'email');
$email = $params['email'];
 
51,15 → 53,9
OIDplus::mailUtils()->sendMail($email, OIDplus::config()->getValue('system_title').' - Password reset request', $message);
 
return array("status" => 0);
}
 
/**
* @param array $params
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
private function action_Activate(array $params): array {
} else if ($actionID == 'reset_password') {
 
_CheckParamExists($params, 'password1');
_CheckParamExists($params, 'password2');
_CheckParamExists($params, 'email');
89,20 → 85,6
$ra->change_password($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 == 'forgot_password') {
return $this->action_Request($params);
} else if ($actionID == 'reset_password') {
return $this->action_Activate($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/publicPages/095_attachments/OIDplusPagePublicAttachments.class.php
174,13 → 174,15
return OIDplus::config()->getValue('attachments_allow_ra_upload', 0);
}
 
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_Delete(array $params): array {
public function action(string $actionID, array $params): array {
 
if ($actionID == 'deleteAttachment') {
_CheckParamExists($params, 'id');
$id = $params['id'];
$obj = OIDplusObject::parse($id);
220,14 → 222,8
OIDplus::logger()->log("V2:[OK]OID(%1)+[OK/INFO]OIDRA(%1)+[OK/INFO]A", "Deleted attachment '%2' from object '%1'", $id, basename($uploadfile));
 
return array("status" => 0);
}
 
/**
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_Upload(array $params): array {
} else if ($actionID == 'uploadAttachment') {
_CheckParamExists($params, 'id');
$id = $params['id'];
$obj = OIDplusObject::parse($id);
312,19 → 308,6
OIDplus::logger()->log("V2:[OK]OID(%1)+[OK/INFO]OIDRA(%1)+[OK/INFO]A", "Uploaded attachment '%2' to object '%1'", $id, basename($uploadfile));
 
return array("status" => 0);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'deleteAttachment') {
return $this->action_Delete($params);
} else if ($actionID == 'uploadAttachment') {
return $this->action_Upload($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/publicPages/200_viathinksoft_freeoid/OIDplusPagePublicFreeOID.class.php
55,14 → 55,16
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
private function action_Request(array $params): array {
public function action(string $actionID, array $params): array {
if (empty(self::getFreeRootOid(false))) throw new OIDplusException(_L('FreeOID service not available. Please ask your administrator.'));
 
if ($actionID == 'request_freeoid') {
_CheckParamExists($params, 'email');
$email = $params['email'];
 
90,17 → 92,8
OIDplus::mailUtils()->sendMail($email, OIDplus::config()->getValue('system_title').' - Free OID request', $message);
 
return array("status" => 0);
}
 
/**
* @param array $params
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
private function action_Activate(array $params): array {
if (empty(self::getFreeRootOid(false))) throw new OIDplusException(_L('FreeOID service not available. Please ask your administrator.'));
 
} else if ($actionID == 'activate_freeoid') {
_CheckParamExists($params, 'email');
_CheckParamExists($params, 'auth');
 
204,20 → 197,6
"new_oid" => $new_oid,
"status" => 0
);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'request_freeoid') {
return $this->action_Request($params);
} else if ($actionID == 'activate_freeoid') {
return $this->action_Activate($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/publicPages/300_search/OIDplusPagePublicSearch.class.php
164,16 → 164,6
}
 
/**
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_Search(array $params): array {
$ret = $this->doSearch($params);
return array("status" => 0, "output" => $ret);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
180,11 → 170,15
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
 
if ($actionID == 'search') {
return $this->action_Search($params);
// Search with JavaScript/AJAX
$ret = $this->doSearch($params);
return array("status" => 0, "output" => $ret);
} else {
return parent::action($actionID, $params);
}
 
}
 
/**
/trunk/plugins/viathinksoft/publicPages/800_login_ldap/OIDplusPagePublicLoginLDAP.class.php
117,12 → 117,14
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusConfigInitializationException
* @throws OIDplusException
*/
private function action_Login(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'ra_login_ldap') {
if (!OIDplus::baseConfig()->getValue('LDAP_ENABLED', false)) {
throw new OIDplusException(_L('LDAP authentication is disabled on this system.'));
}
222,18 → 224,6
}
 
return array("status" => 0);
}
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusConfigInitializationException
* @throws OIDplusException
*/
public function action(string $actionID, array $params): array {
if ($actionID == 'ra_login_ldap') {
return $this->action_Login($params);
} else {
return parent::action($actionID, $params);
}
/trunk/plugins/viathinksoft/raPages/092_invite/OIDplusPageRaInvite.class.php
26,12 → 26,14
class OIDplusPageRaInvite extends OIDplusPagePluginRa {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
private function action_Request(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'invite_ra') {
$email = $params['email'];
 
if (!OIDplus::mailUtils()->validMailAddress($email)) {
52,15 → 54,9
OIDplus::mailUtils()->sendMail($email, OIDplus::config()->getValue('system_title').' - Invitation', $message);
 
return array("status" => 0);
}
 
/**
* @param array $params
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
private function action_Activate(array $params): array {
} else if ($actionID == 'activate_ra') {
 
_CheckParamExists($params, 'password1');
_CheckParamExists($params, 'password2');
_CheckParamExists($params, 'email');
90,20 → 86,6
$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,11 → 26,13
class OIDplusPageRaEditContactData extends OIDplusPagePluginRa {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_Update(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'change_ra_data') {
_CheckParamExists($params, 'email');
 
$email = $params['email'];
72,17 → 74,6
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,11 → 26,13
class OIDplusPageRaChangePassword extends OIDplusPagePluginRa {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_Update(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'change_ra_password') {
_CheckParamExists($params, 'email');
 
$email = $params['email'];
80,17 → 82,6
$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,12 → 26,14
class OIDplusPageRaChangeEMail extends OIDplusPagePluginRa {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
private function action_Request(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'change_ra_email') {
if (!OIDplus::config()->getValue('allow_ra_email_change') && !OIDplus::authUtils()->isAdminLoggedIn()) {
throw new OIDplusException(_L('This functionality has been disabled by the administrator.'));
}
107,13 → 109,7
}
}
 
/**
* @param array $params
* @return array
* @throws OIDplusException
* @throws OIDplusMailException
*/
private function action_Activate(array $params): array {
else if ($actionID == 'activate_new_ra_email') {
if (!OIDplus::config()->getValue('allow_ra_email_change')) {
throw new OIDplusException(_L('This functionality has been disabled by the administrator.'));
}
185,20 → 181,6
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,11 → 29,13
class OIDplusPageRaAutomatedAJAXCalls extends OIDplusPagePluginRa {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_Blacklist(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'blacklistJWT') {
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'));
}
51,17 → 53,6
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,11 → 29,13
class OIDplusPageRaRestApi extends OIDplusPagePluginRa {
 
/**
* @param string $actionID
* @param array $params
* @return array
* @throws OIDplusException
*/
private function action_Blacklist(array $params): array {
public function action(string $actionID, array $params): array {
if ($actionID == 'blacklistJWT') {
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'));
}
51,17 → 53,6
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);
}