Merge branch 'master' into 'master'

Latest fixes

See merge request !37

lib/API.php

@@ -799,24 +799,30 @@ class API {
         global $accessKeys;
         $this->description([
             'header' => "List full federation details incliding contact e-mails to federation representatives.",
-            'supportedFormats' => ['xml - this is set automatically and need not be specified'],
+            'supportedFormats' => ['print_r', 'json'],
             'arguments' => [
                 [
                     'arg' => 'key',
-                    'required' => TRUE,
+                    'required' => FALSE,
                     'values' => 'secret value provided by eduGAIN OT',
-                    'description' => 'This method is resticted since it shows federation representatives e-mails even in cases where they have been declared not to be public.',
+                    'description' => 'If this method is used without providing a registered key then it shows all publicly avaliable information (as can be seen on the status page) if used with a valid key it will additionaly show emails of delegate and deputy.',
                 ],
                 $this->addStdArgument('format'),
-            ]
+            ],
+            'examples' => [
+                ['format' => 'print_r',
+                    'title' => 'show full output'],
+            ],
         ]);
         if ($this->opts['help'] == 1) {
             return "";
         }
-        if (!in_array($this->key, $accessKeys))
-            return;
+        $showEmail = 0;
+        if (in_array($this->key, $accessKeys)) {
+            $showEmail = 1;
+        }
         $edugain = new eduGAIN();
-        $edugain->load_all();
+        $edugain->load_all('sha256', $showEmail);
         $out = $edugain->FEDS;
         return $out;
     }
@@ -915,7 +921,7 @@ class API {
     }
     
     private function action_show_entity_details() {
-                $this->description([
+        $this->description([
             'header' => "Show the full entity info. This method is mostly for internal use.",
             'supportedFormats' => ['json', 'html', 'print_r'],
             'arguments' => [

templates/whatsnew.html

@@ -42,6 +42,7 @@
   var current_id;
   var coco_id = 0;
   var coco_always = {{ constant('COCO_ALWAYS') }};
+  var eccs_url = "{{ constant('ECCS_URL') }}";
   var eccs_status = 0;
   </script>