SlatePermutate Changeset - 77ca830d601d · protofusion repositories

Changeset - 77ca830d601d

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Nathan Brink (binki) - 13 years ago 2012-11-10 00:59:43
ohnobinki@ohnopublishing.net

Drop some leftover remnants of the JSONP callback portion of the WebAdvisor automatic registration hack.

2 files changed with 11 insertions and 25 deletions:

scripts/webadvisor_tokenidx.js

webadvisor.php

0 comments (0 inline, 0 general)

scripts/webadvisor_tokenidx.js

➞

Show inline comments

@@ @@ -12,31 +12,33 @@ @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with SlatePermutate.  If not, see <http://www.gnu.org/licenses/>.
  */
 /*
  * Assumes that WebAdvisor_scripts.js for WebAdvisor-2.x is loaded,
  * displayFormHTML() or something was called and thus
  * readURLParameters() was called. We attempt to extract TOKENIDX and
  * asynchronously inform slate_permutate about it. We currently assume
  * we're on a login form too.
  * update the URL GET parameter to contain TOKENIDX so that, after the
  * user is logged in, the webadvisor.php will know a valid TOKENIDX to
  * be used to forge a form for the user. We currently assume we're on
  * a login form too.
  */
 var slate_permutate_input_login;
 (function() {
 	var slate_permutate_input_login;
 (function() {
 		var slate_permutate_onload = function() {
 				/*
 				 * Override the login form's submission handler to catch the
 				 * case where we're still trying to load the TOKENIDX or
 				 * something else.
 				 */
 				var inputs = document.getElementsByTagName('input');
 				for (var i = 0; i < inputs.length; i ++)
+				{
 						slate_permutate_input_login = inputs.item(i);
 						if (slate_permutate_input_login.getAttribute('name') == 'SUBMIT2')

webadvisor.php

➞

Show inline comments

@@ @@ -29,46 +29,31 @@ if (empty($school['webadvisor_url'])) @@
       $school['webadvisor_url'] = $matches[1];
     else
       $school['webadvisor_url'] = $school['url'] . 'WebAdvisor';
+  }
 /**
  * \brief
  *   Calculate the URI necessary for logging into WebAdvisor.
+ *
  * \param $school
  *   The school.
  * \param $dest
  *   The URI to visit after the user has logged into WebAdvisor and
  *   the TOKENIDX has been communicated to $tokenidx_callback.
  * \param $tokenidx_callback
  *   A JSONP-compatible callback which must be passed the TOKENIDX
  *   parameter the WebAdvisor is using. Treat as if is terminated with
  *   a `?' -- i.e., just append the querystring without the `?' to
  *   this URI when constructing the callback. To use, for example, in
  *   JavaScript you may create a DOMElement 'script' with attributes
  *   type="text/javascript" and
  *   src="$tokenidx_callback?callback=jsonp_callback&TOKENIDX=<detected
  *   TOKENIDX>". When jsonp_callback gets called, your script knows
  *   that $dest may be returned to. Don't forget to allow the user to
  *   log in first. This is normally done by setting SP_CALLBACK GET
  *   variable to this value inserting the
  *   scripts/webadvisor_tokenidx.js script into the WebAdvisor login
  *   page using cross-site-scripting HTML injection such as through
  *   the ERROR GET parameter.
  *   The URI to visit after the user has logged into WebAdvisor. A
  *   TOKENIDX GET parameter shall be appended to this with the
  *   assumption that this URI has a ‘?’ in it.
  * \return
  *   Just ensure that $tokenidx_callback gets called; do not return
  *   except by redirecting to $dest.
  *   Does not return, redirects to WebAdvisor.
  */
-function webadvisor_login($page, array $school, $dest, $tokenidx_callback)
 function webadvisor_login($page, array $school, $dest)
+{
   if (strpos($dest, '?') !== FALSE)
     $dest .= '&';
   else
     $dest .= '?';
   $dest .= 'from_webadvisor';
   $webadvisor_login_func = $school['id'] . '_webadvisor_login';
   if (function_exists($webadvisor_login_func))
     $webadvisor_login_func($school, $dest);
   /*
@@ @@ -87,25 +72,24 @@ function webadvisor_login($page, array $ @@
    * HOWEVER, if the browser already has a TOKENIDX-related cookie,
    * then visiting TOKENIDX=&SS=LGRQ&URL=<URL> will cause WebAdvisor
    * to keep redirecting to itself infinitely. Similarly, if the
    * browser does not yet have a TOKENIDX-related cookie,
    * SS=LGRQ&URL=<URL> will redirect the user to URL without giving
    * the user a cookie. Thus, our strategy is to specify
    * LASTTOKEN=NULL: this is the magic which prevents the silly
    * infinite looping when the user already has cookies and also works
    * when the user doesn’t have a cookie to start with.
    */
   $login_form_uri = $school['webadvisor_url'] . '?LASTTOKEN=NULL&SS=LGRQ&URL=' . rawurlencode($dest)
     . '&SP_CALLBACK=' . rawurlencode($tokenidx_callback)
     . '&ERROR=' . rawurlencode('<script type="text/javascript" src="' . htmlentities(page::uri_resolve_sslasset('scripts/webadvisor_tokenidx.js', 'text/javascript'), ENT_QUOTES) . '"></script><span id="sp_err">Slate Permutate loading… (automatic registration may not be working)</span>');
   redir($login_form_uri);
+}
 function redir($dest)
+{
   header('HTTP/1.1 302 Found');
   header('Location: ' . $dest);
   header('Content-Type: text/plain; charset=utf-8');
   echo 'Location: ' . $dest;
   exit;
+}

0 comments (0 inline, 0 general)