GEANT / CAT

core/common/Entity.php

Spacing +20 added lines, -20 removed lines

@@ -108,7 +108,7 @@ 
      */
     public function __construct() {
         $this->loggerInstance = new Logging();
-        $this->loggerInstance->debug(3, "--- BEGIN constructing class " . get_class($this) . " .\n");
+        $this->loggerInstance->debug(3, "--- BEGIN constructing class ".get_class($this)." .\n");
         $this->languageInstance = new Language();
         Entity::intoThePotatoes();
         // some config elements are displayable. We need some dummies to 
@@ -127,13 +127,13 @@ 
         $dummy_organisation2a = _("organization");
         $dummy_organisation3 = _("entity");
         // and do something useless with the strings so that there's no "unused" complaint
-        if (strlen($dummy_NRO . $dummy_inst1 . $dummy_inst2 . $dummy_inst3 . $dummy_hotspot1 . $dummy_hotspot2 . $dummy_hotspot3 . $dummy_organisation1 . $dummy_organisation2 . $dummy_organisation2a . $dummy_organisation3) < 0) {
+        if (strlen($dummy_NRO.$dummy_inst1.$dummy_inst2.$dummy_inst3.$dummy_hotspot1.$dummy_hotspot2.$dummy_hotspot3.$dummy_organisation1.$dummy_organisation2.$dummy_organisation2a.$dummy_organisation3) < 0) {
             throw new Exception("Strings are usually not shorter than 0 characters. We've encountered a string blackhole.");
         }
-        $variableFed = \config\ConfAssistant::CONSORTIUM['nomenclature_federation'] . "";
-        $variableInst = \config\ConfAssistant::CONSORTIUM['nomenclature_institution'] . "";
-        $variableHotspot = \config\ConfAssistant::CONSORTIUM['nomenclature_hotspot'] . "";
-        $variableParticipant = \config\ConfAssistant::CONSORTIUM['nomenclature_participant'] . "";
+        $variableFed = \config\ConfAssistant::CONSORTIUM['nomenclature_federation']."";
+        $variableInst = \config\ConfAssistant::CONSORTIUM['nomenclature_institution']."";
+        $variableHotspot = \config\ConfAssistant::CONSORTIUM['nomenclature_hotspot']."";
+        $variableParticipant = \config\ConfAssistant::CONSORTIUM['nomenclature_participant']."";
         Entity::$nomenclature_fed = _($variableFed);
         Entity::$nomenclature_inst = _($variableInst);
         Entity::$nomenclature_hotspot = _($variableHotspot);
@@ -148,7 +148,7 @@ 
      * Logs the end of lifetime of the entity to the debug log on level 5.
      */
     public function __destruct() {
-        (new Logging())->debug(5, "--- KILL Destructing class " . get_class($this) . " .\n");
+        (new Logging())->debug(5, "--- KILL Destructing class ".get_class($this)." .\n");
     }
 
     /**
@@ -179,7 +179,7 @@ 
      */
     public static function createTemporaryDirectory($purpose = 'installer', $failIsFatal = 1) {
         $loggerInstance = new Logging();
-        $name = md5(time() . rand());
+        $name = md5(time().rand());
         $path = ROOT;
         switch ($purpose) {
             case 'silverbullet':
@@ -197,7 +197,7 @@ 
             default:
                 throw new Exception("unable to create temporary directory due to unknown purpose: $purpose\n");
         }
-        $tmpDir = $path . '/' . $name;
+        $tmpDir = $path.'/'.$name;
         $loggerInstance->debug(4, "temp dir: $purpose : $tmpDir\n");
         if (!mkdir($tmpDir, 0700, true)) {
             if ($failIsFatal) {
@@ -217,7 +217,7 @@ 
      * @return void
      */
     public static function rrmdir($dir) {
-        foreach (glob($dir . '/*') as $file) {
+        foreach (glob($dir.'/*') as $file) {
             if (is_dir($file)) {
                 Entity::rrmdir($file);
             } else {
@@ -242,12 +242,12 @@ 
         }
         // these substr() are guaranteed to yield actual string data, as the
         // base string is an MD5 hash - has sufficient length
-        $uuid = /** @scrutinizer ignore-type */ substr($chars, 0, 8) . '-';
-        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 8, 4) . '-';
-        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 12, 4) . '-';
-        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 16, 4) . '-';
+        $uuid = /** @scrutinizer ignore-type */ substr($chars, 0, 8).'-';
+        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 8, 4).'-';
+        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 12, 4).'-';
+        $uuid .= /** @scrutinizer ignore-type */ substr($chars, 16, 4).'-';
         $uuid .= /** @scrutinizer ignore-type */ substr($chars, 20, 12);
-        return $prefix . $uuid;
+        return $prefix.$uuid;
     }
 
     /**
@@ -292,8 +292,8 @@ 
         // if called from a class, guess based on the class name; 
         // otherwise, on the filename relative to ROOT
         $myName = $caller['class'] ?? substr($caller['file'], strlen(ROOT));
-        $loggerInstance->debug(1,$caller);
-        $loggerInstance->debug(1,"\nFOUND ".$myName."\n");
+        $loggerInstance->debug(1, $caller);
+        $loggerInstance->debug(1, "\nFOUND ".$myName."\n");
         if (preg_match("/diag/", $myName) == 1) {
             $ret = "diagnostics";
         } elseif (preg_match("/core/", $myName) == 1) {
@@ -307,7 +307,7 @@ 
         } else {
             $ret = "web_user";
         }
-        $loggerInstance->debug(1,"\nRETURNING ".$ret."\n");
+        $loggerInstance->debug(1, "\nRETURNING ".$ret."\n");
         return $ret;
     }
 
@@ -325,10 +325,10 @@ 
         if ($catalogue === NULL) {
             $theCatalogue = Entity::determineOwnCatalogue();
             textdomain($theCatalogue);
-            bindtextdomain($theCatalogue, ROOT . "/translation/");
+            bindtextdomain($theCatalogue, ROOT."/translation/");
         } else {
             textdomain($catalogue);
-            bindtextdomain($catalogue, ROOT . "/translation/");
+            bindtextdomain($catalogue, ROOT."/translation/");
         }
     }