Blocktype JS includes not loaded correctly on https sites using subdirectory for wwwroot

[Simon Coggins]

There are a few places which do this:

if (strpos($jsfile, 'http://' === false)) { ...

when they should do this:

if (stripos($jsfile, 'http://' === false) && stripos($jsfile, 'https://' === false)) { ...

the problem only reveals itself on https sites where the wwwroot is in a subdirectory such as https://mysite/mahara/.

The result is that the URL to include files is wrong so the files aren't loaded.

[Mahara Bot (dev-mahara)]

Patch for "master" branch: https://reviews.mahara.org/3627

[Mahara Bot (dev-mahara)]

Reviewed: https://reviews.mahara.org/3627
Committed: http://gitorious.org/mahara/mahara/commit/01072e9f7cd24f2537b21c947418176e573ebad8
Submitter: Son Nguyen (<email address hidden>)
Branch: master

commit 01072e9f7cd24f2537b21c947418176e573ebad8
Author: Simon Coggins <email address hidden>
Date: Tue Aug 12 15:26:01 2014 +1200

(Bug1355572) Fix broken blocktype JS includes for https sites in subdirectories

Change-Id: I88bbb537d94d2bb3c9a96f2ac721b629f64cd003
Signed-off-by: Simon Coggins <email address hidden>