GEANT / CAT

web/lib/admin/view/TitledBlockDecorator.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 namespace web\lib\admin\view;
 
-class TitledBlockDecorator extends PageElementDecorator{
+class TitledBlockDecorator extends PageElementDecorator {
     
     /**
      * 
@@ -15,7 +15,7 @@ 
      * @param string $class
      * @param string $title
      */
-    public function __construct($element, $title, $class = ""){
+    public function __construct($element, $title, $class = "") {
         parent::__construct($element, $class);
         $this->title = $title;
         

web/lib/admin/view/YesNoDialogBox.php

Braces +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
             <button type="submit" name="<?php echo $this->controls[self::YES]['name']; ?>" value="<?php echo $this->controls[self::YES]['value']; ?>"><?php echo _('Yes'); ?></button>
         <?php if($this->controls[self::NO]['name'] == ''){ ?>
             <button class="<?php echo $this->id . '-close'; ?>" type="reset"><?php echo _('No'); ?></button>
-        <?php }else{ ?>
+        <?php } else{ ?>
             <button type="submit" name="<?php echo $this->controls[self::NO]['name']; ?>" value="<?php echo $this->controls[self::NO]['value']; ?>"><?php echo _('No'); ?></button>
         <?php }
     }

Spacing +7 added lines, -7 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class YesNoDialogBox extends AbstractTextDialogBox{
+class YesNoDialogBox extends AbstractTextDialogBox {
 
     const NO = 0;
     const YES = 1;
@@ -25,7 +25,7 @@ 
      * @param string $action
      * @param string $text
      */
-    public function __construct($id, $action, $text){
+    public function __construct($id, $action, $text) {
         parent::__construct($action, $text);
         $this->id = $id;
     }
@@ -35,7 +35,7 @@ 
      * @param string $name
      * @param string $value
      */
-    public function setYesControl($name, $value){
+    public function setYesControl($name, $value) {
         $this->controls[self::YES]['name'] = $name;
         $this->controls[self::YES]['value'] = $value;
     }
@@ -45,7 +45,7 @@ 
      * @param string $name
      * @param string $value
      */
-    public function setNoControl($name, $value){
+    public function setNoControl($name, $value) {
         $this->controls[self::NO]['name'] = $name;
         $this->controls[self::NO]['value'] = $value;
     }
@@ -55,12 +55,12 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\view\AbstractDialogBox::renderControls()
      */
-    protected function renderControls(){
+    protected function renderControls() {
         ?>
             <button type="submit" name="<?php echo $this->controls[self::YES]['name']; ?>" value="<?php echo $this->controls[self::YES]['value']; ?>"><?php echo _('Yes'); ?></button>
-        <?php if($this->controls[self::NO]['name'] == ''){ ?>
+        <?php if ($this->controls[self::NO]['name'] == '') { ?>
             <button class="<?php echo $this->id . '-close'; ?>" type="reset"><?php echo _('No'); ?></button>
-        <?php }else{ ?>
+        <?php } else { ?>
             <button type="submit" name="<?php echo $this->controls[self::NO]['name']; ?>" value="<?php echo $this->controls[self::NO]['value']; ?>"><?php echo _('No'); ?></button>
         <?php }
     }

web/lib/admin/view/PageElementDecorator.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 
 use web\lib\admin\view\html\Attribute;
 
-abstract class PageElementDecorator implements PageElementInterface{
+abstract class PageElementDecorator implements PageElementInterface {
     
     /**
      * 

web/lib/admin/view/html/Table.php

Doc Comments +1 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
     
     /**
      * 
-     * @return number
+     * @return integer
      */
     public function size(){
         return count($this->rows);
@@ -53,7 +53,6 @@ 
     
     /**
      * 
-     * @param array $row
      */
     public function addRowArray($cells){
         $this->addRow(new Row($cells));

Spacing +17 added lines, -17 removed lines

@@ -5,7 +5,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class Table extends Tag{
+class Table extends Tag {
     
     const TITLED_CELL_CLASS = 'sb-titled-cell';
     
@@ -24,7 +24,7 @@ 
      * 
      * @param array $rows
      */
-    public function __construct($rows = array()){
+    public function __construct($rows = array()) {
         parent::__construct('table');
         $this->setRows($rows);
     }
@@ -33,7 +33,7 @@ 
      * 
      * @return number
      */
-    public function size(){
+    public function size() {
         return count($this->rows);
     }
 
@@ -42,11 +42,11 @@ 
      * @param int $row
      * @param string $column
      */
-    private function createRow($row, $column){
-        if(!in_array($column, $this->columns)){
+    private function createRow($row, $column) {
+        if (!in_array($column, $this->columns)) {
             $this->columns [] = $column;
         }
-        if(!isset($this->rows[$row])){
+        if (!isset($this->rows[$row])) {
             $this->rows [$row] = new Row();
         }
     }
@@ -57,7 +57,7 @@ 
      * @param string $column
      * @param UnaryTag $element
      */
-    public function addToCell($row, $column, $element){
+    public function addToCell($row, $column, $element) {
         $this->createRow($row, $column);
         $this->rows[$row]->addToCell($column, $element);
     }
@@ -68,7 +68,7 @@ 
      * @param string $column
      * @return \web\lib\admin\view\html\CompositeTag
      */
-    public function getCell($row, $column){
+    public function getCell($row, $column) {
         $this->createRow($row, $column);
         return $this->rows[$row]->getCell($column);
     }
@@ -77,7 +77,7 @@ 
      * 
      * @param array $row
      */
-    public function addRowArray($cells){
+    public function addRowArray($cells) {
         $this->addRow(new Row($cells));
     }
     
@@ -85,8 +85,8 @@ 
      *
      * @param Row $row
      */
-    public function addRow($row){
-        if(count($row->size())>0){
+    public function addRow($row) {
+        if (count($row->size()) > 0) {
             $this->rows [] = $row;
             $this->setColumns($row);
         }
@@ -96,8 +96,8 @@ 
      * 
      * @param array $rows
      */
-    public function setRows($rows){
-        if(count($rows)>0){
+    public function setRows($rows) {
+        if (count($rows) > 0) {
             foreach ($rows as $cells) {
                 $this->addRowArray($cells);
             }
@@ -108,10 +108,10 @@ 
      * 
      * @param Row $row
      */
-    private function setColumns($row){
+    private function setColumns($row) {
         $cells = $row->getCells();
         foreach ($cells as $key => $value) {
-            if(!in_array($key, $this->columns)){
+            if (!in_array($key, $this->columns)) {
                 $this->columns [] = $key;
             }
         }
@@ -121,11 +121,11 @@ 
      * 
      * @return string
      */
-    protected function composeInnerString(){
+    protected function composeInnerString() {
         $innerString = "";
         foreach ($this->rows as $row) {
             $row->setColumns($this->columns);
-            $row->setTab("\t".$this->tab);
+            $row->setTab("\t" . $this->tab);
             $innerString .= $row;
         }
         return $innerString;

tests/unit/web/lib/admin/view/InstitutionPageBuilderTest.php

Braces +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
     private function valid_IdP($input, $owner){
         if ($input == 1){
             return new MockInstitution();
-        }else{
+        } else{
             throw new Exception('IdP '.$input.' not found in database!');
         }
     }

Doc Comments +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
      * @param unknown $input
      * @param unknown $owner
      * @throws Exception
-     * @return mixed
+     * @return MockInstitution
      */
     private function valid_IdP($input, $owner){
         if ($input == 1){

Spacing +12 added lines, -12 removed lines

@@ -3,9 +3,9 @@ 
 use web\lib\admin\view\DefaultHtmlPage;
 use web\lib\admin\view\InstitutionPageBuilder;
 
-class MockValidateInstitutionPageBuilder extends InstitutionPageBuilder{
+class MockValidateInstitutionPageBuilder extends InstitutionPageBuilder {
     
-    protected function validateInstitution(){
+    protected function validateInstitution() {
         $this->institution = $this->valid_IdP($_GET['inst_id'], $_SESSION['user']);
     }
     
@@ -16,34 +16,34 @@ 
      * @throws Exception
      * @return mixed
      */
-    private function valid_IdP($input, $owner){
-        if ($input == 1){
+    private function valid_IdP($input, $owner) {
+        if ($input == 1) {
             return new MockInstitution();
-        }else{
-            throw new Exception('IdP '.$input.' not found in database!');
+        } else {
+            throw new Exception('IdP ' . $input . ' not found in database!');
         }
     }
     
 }
 
-class MockInstitution{
+class MockInstitution {
     public $name = "Test name";
 }
 
-class InstitutionPageBuilderTest extends \PHPUnit_Framework_TestCase{
+class InstitutionPageBuilderTest extends \PHPUnit_Framework_TestCase {
     
     protected function setUp() {
         $_SESSION['user'] = "user";
     }
     
-    public function testConstructorSuccess(){
-        $_GET['inst_id']=1;
+    public function testConstructorSuccess() {
+        $_GET['inst_id'] = 1;
         $builder = new MockValidateInstitutionPageBuilder(new DefaultHtmlPage("Testing Page"));
         $this->assertTrue($builder->isReady());
     }
     
-    public function testConstructorFailure(){
-        $_GET['inst_id']=-1;
+    public function testConstructorFailure() {
+        $_GET['inst_id'] = -1;
         $builder = new MockValidateInstitutionPageBuilder(new DefaultHtmlPage("Testing Page"));
         $this->assertFalse($builder->isReady());
         

web/lib/admin/view/html/Attribute.php

Spacing +5 added lines, -5 removed lines

@@ -7,7 +7,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class Attribute implements HtmlElementInterface{
+class Attribute implements HtmlElementInterface {
     
     /**
      * 
@@ -26,15 +26,15 @@ 
      * @param string $name
      * @param string $value
      */
-    public function __construct($name, $value){
+    public function __construct($name, $value) {
         $this->name = str_replace('"', '', $name);
         $this->value = str_replace('"', '', $value);
     }
     
-    public function __toString(){
-        if(!empty($this->name) && $this->value!=''){
+    public function __toString() {
+        if (!empty($this->name) && $this->value != '') {
             return ' ' . $this->name . '="' . $this->value . '"';
-        }else{
+        } else {
             return '';
         }
     }

Braces +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     public function __toString(){
         if(!empty($this->name) && $this->value!=''){
             return ' ' . $this->name . '="' . $this->value . '"';
-        }else{
+        } else{
             return '';
         }
     }

web/lib/admin/domain/SilverbulletUser.php

Braces +4 added lines, -4 removed lines

@@ -102,7 +102,7 @@ 
         $tokenExpiry = date('Y-m-d H:i:s', strtotime($date));
         if($tokenExpiry > $this->defaultUserExpiry){
             $this->set(self::EXPIRY, $tokenExpiry);
-        }else{
+        } else{
             $this->clear();
         }
     }
@@ -124,9 +124,9 @@ 
         $days = $this->getAcknowledgeDays();
         if($days <= $max * 0.2 && $days > $max * 0.1){
             return self::LEVEL_YELLOW;
-        }elseif ($days <= $max * 0.1){
+        } elseif ($days <= $max * 0.1){
             return self::LEVEL_RED;
-        }else{
+        } else{
             return self::LEVEL_GREEN;
         }
     }
@@ -212,7 +212,7 @@ 
             foreach ($this->certificates as $certificate) {
                 $certificate->revoke($profile);
             }
-        }else{
+        } else{
             $this->set(self::DEACTIVATION_TIME, '0000-00-00 00:00:00');
         }
     }

Spacing +30 added lines, -30 removed lines

@@ -6,7 +6,7 @@ 
  * @author Zilvinas Vaira
  *
  */
-class SilverbulletUser extends PersistentEntity{
+class SilverbulletUser extends PersistentEntity {
     
     const LEVEL_GREEN = 0;
     const LEVEL_YELLOW = 1;
@@ -89,14 +89,14 @@ 
      * @param int $profileId
      * @param string $username
      */
-    public function __construct($profileId, $username){
+    public function __construct($profileId, $username) {
         parent::__construct(self::TABLE, self::TYPE_INST);
         $this->setAttributeType(self::PROFILEID, Attribute::TYPE_INTEGER);
         
         $this->set(self::PROFILEID, $profileId);
         $this->set(self::USERNAME, $username);
         //$this->set(self::EXPIRY, 'NOW() + INTERVAL 1 WEEK');
-        $this->defaultUserExpiry = date('Y-m-d H:i:s',strtotime("today"));
+        $this->defaultUserExpiry = date('Y-m-d H:i:s', strtotime("today"));
         //$this->set(self::EXPIRY, $this->defaultUserExpiry);
     }
     
@@ -105,7 +105,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::validate()
      */
-    public function validate(){
+    public function validate() {
         return (
                 !empty($this->get(self::PROFILEID))
         );
@@ -116,11 +116,11 @@ 
      * 
      * @param string $date Takes any string value that can passed to strtotime() function.
      */
-    public function setExpiry($date){
+    public function setExpiry($date) {
         $tokenExpiry = date('Y-m-d H:i:s', strtotime($date));
-        if($tokenExpiry > $this->defaultUserExpiry){
+        if ($tokenExpiry > $this->defaultUserExpiry) {
             $this->set(self::EXPIRY, $tokenExpiry);
-        }else{
+        } else {
             $this->clear();
         }
     }
@@ -128,8 +128,8 @@ 
     /**
      * 
      */
-    public function makeAcknowledged(){
-        $this->set(self::LAST_ACKNOWLEDGE, date('Y-m-d H:i:s',strtotime("now")));
+    public function makeAcknowledged() {
+        $this->set(self::LAST_ACKNOWLEDGE, date('Y-m-d H:i:s', strtotime("now")));
     }
     
     /**
@@ -137,14 +137,14 @@ 
      * 
      * @return int One of the following constants LEVEL_GREEN, LEVEL_YELLOW, LEVEL_RED.
      */
-    public function getAcknowledgeLevel(){
+    public function getAcknowledgeLevel() {
         $max = CONFIG_CONFASSISTANT['SILVERBULLET']['gracetime'] ?? SilverbulletUser::MAX_ACKNOWLEDGE;
         $days = $this->getAcknowledgeDays();
-        if($days <= $max * 0.2 && $days > $max * 0.1){
+        if ($days <= $max * 0.2 && $days > $max * 0.1) {
             return self::LEVEL_YELLOW;
-        }elseif ($days <= $max * 0.1){
+        }elseif ($days <= $max * 0.1) {
             return self::LEVEL_RED;
-        }else{
+        } else {
             return self::LEVEL_GREEN;
         }
     }
@@ -154,7 +154,7 @@ 
      * 
      * @return number Number of days from 0 to maximum period.
      */
-    public function getAcknowledgeDays(){
+    public function getAcknowledgeDays() {
         $max = CONFIG_CONFASSISTANT['SILVERBULLET']['gracetime'] ?? SilverbulletUser::MAX_ACKNOWLEDGE;
         $lastAcknowledge = strtotime($this->get(self::LAST_ACKNOWLEDGE));
         $now = strtotime('now');
@@ -162,11 +162,11 @@ 
         return $days > 0 ? $days : 0;
     }
     
-    public function getProfileId(){
+    public function getProfileId() {
         return $this->get(self::PROFILEID);
     }
     
-    public function getUsername(){
+    public function getUsername() {
         return $this->get(self::USERNAME);
     }
     
@@ -174,7 +174,7 @@ 
      * 
      * @return boolean
      */
-    public function isExpired(){
+    public function isExpired() {
         $expiryTime = strtotime($this->get(self::EXPIRY));
         $currentTime = time();
         return $currentTime > $expiryTime;
@@ -184,7 +184,7 @@ 
      *
      * @return string
      */
-    public function getExpiry(){
+    public function getExpiry() {
         return date('Y-m-d', strtotime($this->get(self::EXPIRY)));
     }
     
@@ -192,7 +192,7 @@ 
      * 
      * @return \web\lib\admin\domain\SilverbulletCertificate
      */
-    public function getCertificates(){
+    public function getCertificates() {
         return $this->certificates;
     }
 
@@ -200,7 +200,7 @@ 
      *
      * @return \web\lib\admin\domain\SilverbulletInvitation
      */
-    public function getInvitations(){
+    public function getInvitations() {
         return $this->invitations;
     }
     
@@ -208,7 +208,7 @@ 
      * 
      * @return boolean
      */
-    public function hasCertificates(){
+    public function hasCertificates() {
         return count($this->certificates) > 0;
     }
     
@@ -216,10 +216,10 @@ 
      *
      * @return boolean
      */
-    public function hasActiveCertificates(){
+    public function hasActiveCertificates() {
         $count = 0;
         foreach ($this->certificates as $certificate) {
-            if(!$certificate->isExpired() && !$certificate->isRevoked()){
+            if (!$certificate->isExpired() && !$certificate->isRevoked()) {
                 $count++;
             }
         }
@@ -231,14 +231,14 @@ 
      * 
      * @param boolean $isDeactivated
      */
-    public function setDeactivated($isDeactivated, $profile){
+    public function setDeactivated($isDeactivated, $profile) {
         $this->set(self::DEACTIVATION_STATUS, $isDeactivated ? self::INACTIVE : self::ACTIVE);
-        if($isDeactivated){
+        if ($isDeactivated) {
             $this->set(self::DEACTIVATION_TIME, date('Y-m-d H:i:s', strtotime("now")));
             foreach ($this->certificates as $certificate) {
                 $certificate->revoke($profile);
             }
-        }else{
+        } else {
             $this->set(self::DEACTIVATION_TIME, '0000-00-00 00:00:00');
         }
     }
@@ -247,7 +247,7 @@ 
      * 
      * @return boolean
      */
-    public function isDeactivated(){
+    public function isDeactivated() {
         return $this->get(self::DEACTIVATION_STATUS) == self::INACTIVE;
     }
     
@@ -256,7 +256,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::load()
      */
-    public function load($searchAttribute = null){
+    public function load($searchAttribute = null) {
         $state = parent::load();
         $this->certificates = SilverbulletCertificate::getList($this, $searchAttribute);
         $this->invitations = SilverbulletInvitation::getList($this);
@@ -268,7 +268,7 @@ 
      * {@inheritDoc}
      * @see \web\lib\admin\domain\PersistentInterface::delete()
      */
-    public function delete(){
+    public function delete() {
         $state = parent::delete();
         foreach ($this->certificates as $certificate) {
             $certificate->delete();
@@ -284,7 +284,7 @@ 
      * @param integer $userId
      * @return \web\lib\admin\domain\SilverbulletUser
      */
-    public static function prepare($userId){
+    public static function prepare($userId) {
         $instance = new SilverbulletUser(null, '');
         $instance->set(self::ID, $userId);
         return $instance;

web/lib/admin/UIElements.php

Spacing +2 added lines, -2 removed lines

@@ -122,7 +122,7 @@ 
                         }
                         break;
                     case "boolean":
-                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off") ) . "</strong></td></tr>";
+                        $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>" . ($content == "on" ? _("on") : _("off")) . "</strong></td></tr>";
                         break;
                     default:
                         $retval .= "<tr><td>" . $this->displayName($option['name']) . "</td><td>$language</td><td><strong>$content</strong></td></tr>";
@@ -191,7 +191,7 @@ 
 
         $details['name'] = preg_replace('/(.)\/(.)/', "$1<br/>$2", $details['name']);
         $details['name'] = preg_replace('/\//', "", $details['name']);
-        $certstatus = ( $details['root'] == 1 ? "R" : "I");
+        $certstatus = ($details['root'] == 1 ? "R" : "I");
         if ($details['ca'] == 0 && $details['root'] != 1) {
             return "<div class='ca-summary' style='background-color:red'><div style='position:absolute; right: 0px; width:20px; height:20px; background-color:maroon;  border-radius:10px; text-align: center;'><div style='padding-top:3px; font-weight:bold; color:#ffffff;'>S</div></div>" . _("This is a <strong>SERVER</strong> certificate!") . "<br/>" . $details['name'] . "</div>";
         }

Doc Comments +11 added lines, -4 removed lines

@@ -120,6 +120,9 @@ 
         return $find[0];
     }
 
+    /**
+     * @param string $input
+     */
     public function tooltip($input) {
         $descriptions = [];
         if (count(CONFIG_CONFASSISTANT['CONSORTIUM']['ssid']) > 0) {
@@ -256,6 +259,10 @@ 
         return $number . " B";
     }
 
+    /**
+     * @param string $ref
+     * @param boolean $checkpublic
+     */
     public static function getBlobFromDB($ref, $checkpublic) {
         $validator = new \web\lib\common\InputValidation();
         $reference = $validator->databaseReference($ref);
@@ -402,7 +409,7 @@ 
      * @param string $text the text to display
      * @param string $caption the caption to display
      * @param bool $omittabletags the output usually has tr/td table tags, this option suppresses them
-     * @return type
+     * @return string
      */
     public function boxOkay(string $text = NULL, string $caption = NULL, bool $omittabletags = FALSE) {
         return $this->boxFlexible(\core\common\Entity::L_OK, $text, $caption, $omittabletags);
@@ -414,7 +421,7 @@ 
      * @param string $text the text to display
      * @param string $caption the caption to display
      * @param bool $omittabletags the output usually has tr/td table tags, this option suppresses them
-     * @return type
+     * @return string
      */
     public function boxRemark(string $text = NULL, string $caption = NULL, bool $omittabletags = FALSE) {
         return $this->boxFlexible(\core\common\Entity::L_REMARK, $text, $caption, $omittabletags);
@@ -426,7 +433,7 @@ 
      * @param string $text the text to display
      * @param string $caption the caption to display
      * @param bool $omittabletags the output usually has tr/td table tags, this option suppresses them
-     * @return type
+     * @return string
      */
     public function boxWarning(string $text = NULL, string $caption = NULL, bool $omittabletags = FALSE) {
         return $this->boxFlexible(\core\common\Entity::L_WARN, $text, $caption, $omittabletags);
@@ -438,7 +445,7 @@ 
      * @param string $text the text to display
      * @param string $caption the caption to display
      * @param bool $omittabletags the output usually has tr/td table tags, this option suppresses them
-     * @return type
+     * @return string
      */
     public function boxError(string $text = NULL, string $caption = NULL, bool $omittabletags = FALSE) {
         return $this->boxFlexible(\core\common\Entity::L_ERROR, $text, $caption, $omittabletags);

web/admin/inc/manageAdmins.inc.php

Switch Indentation +8 added lines, -8 removed lines

@@ -97,14 +97,14 @@
         case "SUCCESS":
             $cryptText = "";
             switch ($_GET['transportsecurity']) {
-            case "ENCRYPTED":
-                $cryptText = _("and <b>encrypted</b> to the mail domain");
-                break;
-            case "CLEAR":
-                $cryptText = _("but <b>in clear text</b> to the mail domain");
-                break;
-            default:
-                throw new Exception("Error: unknown encryption status of invitation!?!");
+                case "ENCRYPTED":
+                    $cryptText = _("and <b>encrypted</b> to the mail domain");
+                    break;
+                case "CLEAR":
+                    $cryptText = _("but <b>in clear text</b> to the mail domain");
+                    break;
+                default:
+                    throw new Exception("Error: unknown encryption status of invitation!?!");
             }
             echo $uiElements->boxRemark(sprintf(_("The invitation email was sent successfully %s."), $cryptText), _("The invitation email was sent."));
             break;

Spacing +4 added lines, -4 removed lines

@@ -78,7 +78,7 @@ 
             $ownermgmt = new \core\UserManagement();
             $ownermgmt->addAdminToIdp($my_inst, $_SESSION['user']);
         } else {
-            echo "Fatal Error: you wanted to take control over an ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'].", but are not a ".CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation']." operator!";
+            echo "Fatal Error: you wanted to take control over an " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_institution'] . ", but are not a " . CONFIG_CONFASSISTANT['CONSORTIUM']['nomenclature_federation'] . " operator!";
             exit(1);
         }
     }
@@ -121,13 +121,13 @@ 
 
 if ($isFedAdmin) {
     echo "<div class='ca-summary' style='position:relative;'><table>";
-    echo $uiElements->boxRemark(sprintf(_("You are the %s administrator of this %s. You can invite new administrators, who can in turn appoint further administrators on their own."),$uiElements->nomenclature_fed, $uiElements->nomenclature_inst), sprintf(_("%s Administrator"),$uiElements->nomenclature_fed));
+    echo $uiElements->boxRemark(sprintf(_("You are the %s administrator of this %s. You can invite new administrators, who can in turn appoint further administrators on their own."), $uiElements->nomenclature_fed, $uiElements->nomenclature_inst), sprintf(_("%s Administrator"), $uiElements->nomenclature_fed));
     echo "</table></div>";
 }
 
 if (!$isFedAdmin && $is_admin_with_blessing) {
     echo "<div class='ca-summary' style='position:relative;'><table>";
-    echo $uiElements->boxRemark(sprintf(_("You are an administrator of this %s, and were directly appointed by the %s administrator. You can appoint further administrators, but these can't in turn appoint any more administrators."),$uiElements->nomenclature_inst ,$uiElements->nomenclature_fed), _("Directly Appointed IdP Administrator"));
+    echo $uiElements->boxRemark(sprintf(_("You are an administrator of this %s, and were directly appointed by the %s administrator. You can appoint further administrators, but these can't in turn appoint any more administrators."), $uiElements->nomenclature_inst, $uiElements->nomenclature_fed), _("Directly Appointed IdP Administrator"));
     echo "</table></div>";
 }
 ?>
@@ -155,7 +155,7 @@ 
 
         echo "</td>
               <td>
-                <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier . "' method='post' " . ( $oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "" ) . " accept-charset='UTF-8'>
+                <form action='inc/manageAdmins.inc.php?inst_id=" . $my_inst->identifier . "' method='post' " . ($oneowner['ID'] != $_SESSION['user'] ? "onsubmit='popupRedirectWindow(this); return false;'" : "") . " accept-charset='UTF-8'>
                 <input type='hidden' name='admin_id' value='" . $oneowner['ID'] . "'></input>
                 <button type='submit' name='submitbutton' class='delete' value='" . web\lib\common\FormElements::BUTTON_DELETE . "'>" . _("Delete Administrator") . "</button>
                 </form>