Login-Javascript wurde falsch geladen (0b6dc51) - webinterface.git

Bernd Wurst commited on 2014-02-27 09:00:44
Zeige 2 geänderte Dateien mit 6 Einfügungen und 3 Löschungen.

inc/jquery.php 6690cae..c784c63
modules/index/include/x509.php a629a72..8534b49

inc/jquery.php

@@ -26,12 +26,15 @@ if (! defined('__JQUERY_INCLUDED')) {
 ');
 }
 
-function javascript($file = NULL) {
+function javascript($file = NULL, $module = NULL) {
   global $go, $prefix;
-  list($module, $page) = explode('/', $go, 2);
+  list($mod, $page) = explode('/', $go, 2);
   if (! $file) {
     $file = $page.'.js';
   }
+  if (! $module) {
+    $module = $mod;
+  }
   if (file_exists('modules/'.$module.'/'.$file)) {
     html_header('
 <script type="text/javascript" src="'.$prefix.'modules/'.$module.'/'.$file.'"></script>

modules/index/include/x509.php

Zeige Datei @ 0b6dc51

@@ -19,7 +19,7 @@ require_once('inc/security.php');
 function do_ajax_cert_login() {
   global $prefix;
   require_once('inc/jquery.php');
-  javascript('certlogin.js');
+  javascript('certlogin.js', 'index');
 }
 
 function get_logins_by_cert($cert) 


...	...	@@ -26,12 +26,15 @@ if (! defined('__JQUERY_INCLUDED')) {
26	26	');
27	27	}
28	28
29		-function javascript($file = NULL) {
	29	+function javascript($file = NULL, $module = NULL) {
30	30	global $go, $prefix;
31		- list($module, $page) = explode('/', $go, 2);
	31	+ list($mod, $page) = explode('/', $go, 2);
32	32	if (! $file) {
33	33	$file = $page.'.js';
34	34	}
	35	+ if (! $module) {
	36	+ $module = $mod;
	37	+ }
35	38	if (file_exists('modules/'.$module.'/'.$file)) {
36	39	html_header('
37	40	<script type="text/javascript" src="'.$prefix.'modules/'.$module.'/'.$file.'"></script>

...	...	@@ -19,7 +19,7 @@ require_once('inc/security.php');
19	19	function do_ajax_cert_login() {
20	20	global $prefix;
21	21	require_once('inc/jquery.php');
22		- javascript('certlogin.js');
	22	+ javascript('certlogin.js', 'index');
23	23	}
24	24
25	25	function get_logins_by_cert($cert)
26	26