Merge pull request #3 from GEANT/dv_tncpics_cleanup1

TNC pics cleanup

src/ThemeTncController.php

@@ -22,20 +22,22 @@ public function display(array &$data): void
         $tncs = $moduleConfig->getArray('tncs');
 
         $tnc_pics_dir = Module::getModuleDir('geant') . '/public/assets/gfx';
-        $tnc_pics = array_values(preg_grep("/^tnc\d{4}_\d+\.(jpg|png)$/", scandir($tnc_pics_dir)));
-        $tnc_pic = $tnc_pics[rand(0,count($tnc_pics)-1)];
+        $tnc_pics = yaml_parse_file('/etc/simplesamlphp/wayf/metadata.yml');
+        $pic = $tnc_pics[rand(0,count($tnc_pics)-1)];
 
-        $tnc_year = substr($tnc_pic, 3, 4);
+        $tnc_year = substr($pic['filename'], 3, 4);
         # From 2015 onwards the year is depicted as "15" instead of 2015...
         $tnc_name = "TNC" . ($tnc_year < 2015 ? $tnc_year : substr($tnc_year, -2));
         $tnc_url = $tncs[$tnc_year]["url"];
 
         $tnc_location = $tncs[$tnc_year]["location"];
 
         $data['tnc_location'] = $tnc_location;
-        $data['tnc_pic'] = $tnc_pic;
+        $data['tnc_pic'] = $pic['filename'];
         $data['tnc_name'] = $tnc_name;
         $data['tnc_url'] = $tnc_url;
+        $data['copyright'] = $pic['copyright'];
+        $data['original_url'] = $pic['original_url'];
     }
 
 }

themes/tnc/default/_header.twig

@@ -10,7 +10,7 @@
   <div class="wrap">
 <img id="geant" src="{{ asset('gfx/geant-logo-white.svg', 'geant') }}" alt="GÉANT logo"/>
 <p class="credits">
-    Picture from <a title="Go to {% if 'web.archive.org' in tnc_url %}an archived copy of {% endif %}the {{ tnc_name }} website" href="{{ tnc_url }}">{{ tnc_name }}</a> in {{ tnc_location }}
+    Picture from <a title="Go to {% if 'web.archive.org' in tnc_url %}an archived copy of {% endif %}the {{ tnc_name }} website" href="{{ tnc_url }}">{{ tnc_name }}</a> in {{ tnc_location|e }}<br />&copy; {{ copyright|e }}
 </p>
     {% if not hideLanguageBar %}
     <div class="menuspace">