|
@@ -113,12 +113,12 @@ discard block |
|
|
block discarded – undo |
|
113
|
113
|
$this->name = $this->languageInstance->getLocalisedValue($this->getAttributes('general:instname')); |
|
114
|
114
|
$eligibility = $this->eligibility(); |
|
115
|
115
|
if (in_array(IdP::ELIGIBILITY_IDP, $eligibility) && in_array(IdP::ELIGIBILITY_SP, $eligibility)) { |
|
116
|
|
- $eligType = IdP::TYPE_IDPSP . ""; |
|
|
116
|
+ $eligType = IdP::TYPE_IDPSP.""; |
|
117
|
117
|
$this->type = $eligType; |
|
118
|
118
|
} elseif (in_array(IdP::ELIGIBILITY_IDP, $eligibility)) { |
|
119
|
|
- $eligType = IdP::TYPE_IDP . ""; |
|
|
119
|
+ $eligType = IdP::TYPE_IDP.""; |
|
120
|
120
|
} else { |
|
121
|
|
- $eligType = IdP::TYPE_SP . ""; |
|
|
121
|
+ $eligType = IdP::TYPE_SP.""; |
|
122
|
122
|
} |
|
123
|
123
|
$this->type = $eligType; |
|
124
|
124
|
$this->loggerInstance->debug(3, "--- END Constructing new IdP object ... ---\n"); |
|
@@ -131,7 +131,7 @@ discard block |
|
|
block discarded – undo |
|
131
|
131
|
* @return \core\AbstractProfile[] list of Profiles of this IdP |
|
132
|
132
|
*/ |
|
133
|
133
|
public function listProfiles(bool $activeOnly = FALSE) { |
|
134
|
|
- $query = "SELECT profile_id FROM profile WHERE inst_id = $this->identifier" . ($activeOnly ? " AND showtime = 1" : ""); |
|
|
134
|
+ $query = "SELECT profile_id FROM profile WHERE inst_id = $this->identifier".($activeOnly ? " AND showtime = 1" : ""); |
|
135
|
135
|
$allProfiles = $this->databaseHandle->exec($query); |
|
136
|
136
|
$returnarray = []; |
|
137
|
137
|
// SELECT -> resource, not boolean |
|
@@ -141,7 +141,7 @@ discard block |
|
|
block discarded – undo |
|
141
|
141
|
$returnarray[] = $oneProfile; |
|
142
|
142
|
} |
|
143
|
143
|
|
|
144
|
|
- $this->loggerInstance->debug(4, "listProfiles: " . print_r($returnarray, true)); |
|
|
144
|
+ $this->loggerInstance->debug(4, "listProfiles: ".print_r($returnarray, true)); |
|
145
|
145
|
return $returnarray; |
|
146
|
146
|
} |
|
147
|
147
|
|
|
@@ -152,7 +152,7 @@ discard block |
|
|
block discarded – undo |
|
152
|
152
|
* @return \core\AbstractDeployment[] list of deployments of this IdP |
|
153
|
153
|
*/ |
|
154
|
154
|
public function listDeployments(bool $activeOnly = FALSE) { |
|
155
|
|
- $query = "SELECT deployment_id FROM deployment WHERE inst_id = $this->identifier" . ($activeOnly ? " AND status = " . AbstractDeployment::ACTIVE : ""); |
|
|
155
|
+ $query = "SELECT deployment_id FROM deployment WHERE inst_id = $this->identifier".($activeOnly ? " AND status = ".AbstractDeployment::ACTIVE : ""); |
|
156
|
156
|
$allDeployments = $this->databaseHandle->exec($query); |
|
157
|
157
|
$returnarray = []; |
|
158
|
158
|
// SELECT -> resource, not boolean |
|
@@ -160,7 +160,7 @@ discard block |
|
|
block discarded – undo |
|
160
|
160
|
$returnarray[] = new DeploymentManaged($this, $deploymentQuery->deployment_id); |
|
161
|
161
|
} |
|
162
|
162
|
|
|
163
|
|
- $this->loggerInstance->debug(4, "listDeployments: " . print_r($returnarray, true)); |
|
|
163
|
+ $this->loggerInstance->debug(4, "listDeployments: ".print_r($returnarray, true)); |
|
164
|
164
|
return $returnarray; |
|
165
|
165
|
} |
|
166
|
166
|
|
|
@@ -294,7 +294,7 @@ discard block |
|
|
block discarded – undo |
|
294
|
294
|
case AbstractProfile::PROFILETYPE_SILVERBULLET: |
|
295
|
295
|
$theProfile = new ProfileSilverbullet($identifier, $this); |
|
296
|
296
|
$theProfile->addSupportedEapMethod(new \core\common\EAP(\core\common\EAP::EAPTYPE_SILVERBULLET), 1); |
|
297
|
|
- $theProfile->setRealm($this->identifier . "-" . $theProfile->identifier . "." . strtolower($this->federation) . strtolower(\config\ConfAssistant::SILVERBULLET['realm_suffix'])); |
|
|
297
|
+ $theProfile->setRealm($this->identifier."-".$theProfile->identifier.".".strtolower($this->federation).strtolower(\config\ConfAssistant::SILVERBULLET['realm_suffix'])); |
|
298
|
298
|
return $theProfile; |
|
299
|
299
|
default: |
|
300
|
300
|
throw new Exception("This type of profile is unknown and can not be added."); |
|
@@ -430,7 +430,7 @@ discard block |
|
|
block discarded – undo |
|
430
|
430
|
*/ |
|
431
|
431
|
public function getExternalDBId() { |
|
432
|
432
|
if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") { // SW: APPROVED |
|
433
|
|
- $idQuery = $this->databaseHandle->exec("SELECT external_db_id FROM institution WHERE inst_id = $this->identifier AND external_db_syncstate = " . self::EXTERNAL_DB_SYNCSTATE_SYNCED); |
|
|
433
|
+ $idQuery = $this->databaseHandle->exec("SELECT external_db_id FROM institution WHERE inst_id = $this->identifier AND external_db_syncstate = ".self::EXTERNAL_DB_SYNCSTATE_SYNCED); |
|
434
|
434
|
// SELECT -> it's a resource, not a boolean |
|
435
|
435
|
if (mysqli_num_rows(/** @scrutinizer ignore-type */ $idQuery) == 0) { |
|
436
|
436
|
return FALSE; |