Merge pull request #1079 from ghalse/enhancement/discopower-inline-js

Remove the inline javascript from discopower-module

modules/discopower/lib/PowerIdPDisco.php

@@ -283,17 +283,12 @@ class PowerIdPDisco extends \SimpleSAML\XHTML\IdPDisco
             $t->data['autofocus'] = 'favouritesubmit';
         }
 
-        $search = '<script type="text/javascript">
-            $(document).ready(function() {
-                $("#tabdiv").tabs({ selected: '.$t->data['defaulttab'].' });';
-        $i = 0;
-        foreach ($idpList as $tab => $slist) {
-            $search .= "\n".'$("#query_'.$tab.'").liveUpdate("#list_'.$tab.'")'.
-            (($i++ == 0) && (empty($this->data['faventry'])) ? '.focus()' : '').';';
-        }
-        $search .= "});\n</script>";
+        /* store the tab list in the session */
+        $session = \SimpleSAML\Session::getSessionFromRequest();
+        $session->setData('discopower:tabList', 'faventry', $this->data['faventry']);
+        $session->setData('discopower:tabList', 'tabs', array_keys($idpList));
+        $session->setData('discopower:tabList', 'defaulttab', $t->data['defaulttab']);
 
-        $t->data['search'] = $search;
         $t->data['score'] = $this->discoconfig->getValue('score', 'quicksilver');
         $t->data['tabNames'] = $discoPowerTabs;
         $t->data['preferredidp'] = $preferredIdP;

modules/discopower/templates/disco.tpl.php

@@ -10,7 +10,8 @@ $this->data['head'] .= '<script type="text/javascript" src="'.
     SimpleSAML\Module::getModuleURL('discopower/assets/js/jquery.livesearch.js').'"></script>'."\n";
 $this->data['head'] .= '<script type="text/javascript" src="'.
     SimpleSAML\Module::getModuleURL('discopower/assets/js/'.$this->data['score'].'.js').'"></script>'."\n";
-$this->data['head'] .= $this->data['search'];
+$this->data['head'] .= '<script type="text/javascript" src="'.
+    SimpleSAML\Module::getModuleURL('discopower/assets/js/tablist.js').'"></script>'."\n";
 
 if (!empty($this->data['faventry'])) {
     $this->data['autofocus'] = 'favouritesubmit';

modules/discopower/templates/disco.twig

@@ -9,7 +9,7 @@
     <script src="/{{ baseurlpath }}resources/jquery-ui-1.8.js"></script>
     <script src="/{{ baseurlpath }}module.php/discopower/js/jquery.livesearch.js"></script>
     <script src="/{{ baseurlpath }}module.php/discopower/js/{{ score }}.js"></script>
-    {{ search|raw }}
+    <script src="/{{ baseurlpath }}module.php/discopower/js/tablist.js"></script>
 {% endblock %}
 
 {% block content %}

modules/discopower/www/assets/js/tablist.js

+$(document).ready(function() {
+    $("#tabdiv").tabs();
+    $.getJSON("tablist.php", function(data) {
+        $("#tabdiv").select(data["default"]);
+        for (var i = 0; i < data["tabs"].length; i++) {
+            var tab = data["tabs"][i];
+            $("#query_"+tab).liveUpdate("#list_"+tab);
+            if (data["faventry"] == null && i == 0) {
+                $("#query_"+tab).focus();
+            }
+        }
+    });
+});

modules/discopower/www/tablist.php

+<?php
+/**
+ * An AJAX handler to retrieve a list of disco tabs from the session.
+ * This allows us to dynamically update the tab list without inline javascript.
+ *
+ * @author Guy Halse, http://orcid.org/0000-0002-9388-8592
+ * @package SimpleSAMLphp
+ */
+$session = \SimpleSAML\Session::getSessionFromRequest();
+$tabs = $session->getData('discopower:tabList', 'tabs');
+$faventry = $session->getData('discopower:tabList', 'faventry');
+$defaulttab = $session->getData('discopower:tabList', 'defaulttab');
+
+if (!is_array($tabs)) {
+    throw new \SimpleSAML\Error\Exception('Could not get tab list from session');
+}
+
+// handle JSON vs JSONP requests
+if (isset($_REQUEST['callback'])) {
+    if (!preg_match('/^[a-z0-9_]+$/i', $_REQUEST['callback'])) {
+        throw new \SimpleSAML\Error\Exception('Unsafe JSONP callback function name "'.$_REQUEST['callback'].'"');
+    }
+    $jsonp = true;
+    header('Content-Type: application/javascript');
+    echo addslashes($_REQUEST['callback']) . '(';
+} else {
+    $jsonp = false;
+    header('Content-Type: application/json');
+}
+
+echo json_encode(
+    [
+        'faventry' => $faventry,
+        'default' => $defaulttab,
+        'tabs' => $tabs,
+    ]
+);
+
+if ($jsonp) {
+    echo ');';
+}