|
@@ -103,7 +103,7 @@ discard block |
|
|
block discarded – undo |
|
103
|
103
|
parent::__construct(); |
|
104
|
104
|
common\Entity::intoThePotatoes(); |
|
105
|
105
|
|
|
106
|
|
- $this->catVersionString = sprintf(_("Unreleased %s Git Revision"), "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>") . "</a>"; |
|
|
106
|
+ $this->catVersionString = sprintf(_("Unreleased %s Git Revision"), "<a href='https://github.com/GEANT/CAT/tree/master/Changes.md'>")."</a>"; |
|
107
|
107
|
if (CAT::RELEASE_VERSION) { |
|
108
|
108
|
$major = CAT::VERSION_MAJOR; |
|
109
|
109
|
$minor = CAT::VERSION_MINOR; |
|
@@ -117,14 +117,14 @@ discard block |
|
|
block discarded – undo |
|
117
|
117
|
if (CAT::VERSION_EXTRA != "") { |
|
118
|
118
|
$temp_version .= "-$extra"; |
|
119
|
119
|
} |
|
120
|
|
- $this->catVersionString = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/" . $branch . "/Changes.md", $temp_version); |
|
|
120
|
+ $this->catVersionString = sprintf(_("Release <a href='%s'>%s</a>"), "https://github.com/GEANT/CAT/tree/".$branch."/Changes.md", $temp_version); |
|
121
|
121
|
} |
|
122
|
122
|
$product = \config\Master::APPEARANCE['productname']; |
|
123
|
123
|
$minYear = self::COPYRIGHT_MIN_YEAR; |
|
124
|
124
|
$maxYear = self::COPYRIGHT_MAX_YEAR; |
|
125
|
125
|
$holder = self::COPYRIGHT_HOLDER; |
|
126
|
126
|
$consortia = self::COPYRIGHT_CONSORTIA; |
|
127
|
|
- $this->catCopyright = "$product - " . $this->catVersionString . " © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>"; |
|
|
127
|
+ $this->catCopyright = "$product - ".$this->catVersionString." © $minYear-$maxYear $holder<br/>on behalf of $consortia; and others <a href='copyright.php'>Full Copyright and Licenses</a>"; |
|
128
|
128
|
|
|
129
|
129
|
|
|
130
|
130
|
/* Federations are created in DB with bootstrapFederation, and listed via listFederations |
|
@@ -616,7 +616,7 @@ discard block |
|
|
block discarded – undo |
|
616
|
616
|
* @return \core\ExternalEduroamDBData|\core\ExternalNothing |
|
617
|
617
|
*/ |
|
618
|
618
|
public static function determineExternalConnection() { |
|
619
|
|
- if(\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") { |
|
|
619
|
+ if (\config\ConfAssistant::CONSORTIUM['name'] == "eduroam" && isset(\config\ConfAssistant::CONSORTIUM['deployment-voodoo']) && \config\ConfAssistant::CONSORTIUM['deployment-voodoo'] == "Operations Team") { |
|
620
|
620
|
return new ExternalEduroamDBData(); |
|
621
|
621
|
} |
|
622
|
622
|
return new ExternalNothing(); |