diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 90f751a..ab15281 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,14 @@ JavaScript callback handler x.x-x.x, xxxx-xx-xx
-----------------------------------------------
+JavaScript callback handler 7.x-2.x, xxxx-xx-xx
+-----------------------------------------------
+
+Rework of the 6.x version to make it work with Drupal 7 with some addition
+- enabled the js url's to be used in autocomplete
+- added api documentation
+
+
JavaScript callback handler 6.x-2.x, xxxx-xx-xx
-----------------------------------------------
Complete rewrite of JS callback handler. Added a requirement for hook_js() in
diff --git a/README.txt b/README.txt
index 4fdee3b..3be094b 100644
--- a/README.txt
+++ b/README.txt
@@ -116,3 +116,12 @@ Specialized in consulting and planning of Drupal powered sites, UNLEASHED
MIND offers installation, development, theming, customization, and hosting
to get you started. Visit http://www.unleashedmind.com for more information.
+- Drupal 7 -
+
+Authors:
+* Michiel Nugter (michielnugter) - http://drupal.org/user/1023784
+
+The Drupal 7 update has been sponsored by SYNETIC.
+Full service Drupal specialist. From custom made webapplications to content
+management systems, intranet and e-commerce shops. Visit http://www.synetic.nl
+for more information.
diff --git a/js.api.php b/js.api.php
new file mode 100644
index 0000000..0ef2c44
--- /dev/null
+++ b/js.api.php
@@ -0,0 +1,99 @@
+
+ * # Rewrite JavaScript callback URLs of the form 'js.php?q=x'.
+ * RewriteCond %{REQUEST_FILENAME} !-f
+ * RewriteCond %{REQUEST_FILENAME} !-d
+ * RewriteCond %{REQUEST_URI} ^\/js\/.*
+ * RewriteRule ^(.*)$ js.php?q=$1 [L,QSA]
+ *
+ *
+ * -- DEVELOPER INFORMATION --
+ *
+ * This module requires an Apache RewriteRule in your .htaccess file to point all
+ * paths starting with js/ to js.php rather than index.php. The 2nd argument
+ * following js/ determines the implementing module, which must implement hook_js()
+ * for security reasons. Apart from security, modules may also specify another
+ * bootstrap level than the default DRUPAL_BOOTSTRAP_PATH, and additionally
+ * required includes files and module dependencies to load.
+ *
+ * As an example, we'll let example.module expose its function
+ * example_somefunction() to js.php. Its hook_js() implementation might look like
+ * this:
+ *
+ *
+ * function example_js() {
+ * return array(
+ * 'somefunction' => array(
+ * 'callback' => 'example_somefunction',
+ * 'includes' => array('theme', 'unicode'),
+ * 'dependencies' => array('locale', 'filter', 'user'),
+ * ),
+ * );
+ * }
+ *
+ *
+ * The hook_js() implementation above makes JS accept the following URL:
+ *
+ * http://example.com/js/example/somefunction.
+ * ^ ^
+ * module name -| |
+ * info array key -|
+ *
+ * When called, it loads the requested include files and modules and calls the
+ * callback function.
+ *
+ * Note that it is wise to also register a corresponding menu path in hook_menu()
+ * to provide fallback functionality when js.php is not available:
+ *
+ *
+ * $items[] = array(
+ * 'path' => 'js/example/somefunction',
+ * 'callback' => 'example_somefunction',
+ * 'type' => MENU_CALLBACK,
+ * );
+ *
+ *
+ * Please note that js.php does NOT perform access checks like Drupal's menu
+ * system. If required, each callback function needs to do this on its own.
+ *
+ * js.php outputs the return value of the callback function using drupal_json_output().
+ * To use a custom output format, output the data on your own and exit()
+ * afterwards, or simply return nothing.
+ */
+
+/**
+* Register JS callbacks.
+*
+* @return
+* An array of callbacks with the following possible keys for each callback:
+* - callback: (required) The function to call to display the results when an ajax call occurs on this path
+* - includes: (optional) Load aditional files from the /includes directory
+* - dependancies: (optional) Load additional modules for this callback
+*/
+function hook_js() {
+ return array(
+ 'somefunction' => array(
+ 'callback' => 'example_somefunction',
+ 'includes' => array('includefile1', 'includefile2'),
+ 'dependencies' => array('module1', 'module2'),
+ ),
+ );
+}
diff --git a/js.info b/js.info
index a7e8e11..8626a12 100644
--- a/js.info
+++ b/js.info
@@ -1,2 +1,9 @@
name = JavaScript callback handler
description = A high-performance JavaScript callback handler for 3rd party modules.
+
+; Information added by drupal.org packaging script on 2011-02-25
+version = "7.x-2.x-dev"
+core = "7.x"
+project = "js"
+datestamp = "1298619508"
+
diff --git a/js.module b/js.module
index 60a3f57..bc9a241 100644
--- a/js.module
+++ b/js.module
@@ -1,9 +1,27 @@
'drupal_access_denied',
+ 'access arguments' => array('access content'),
+ 'type' => MENU_CALLBACK
+ );
+ }
+ return $items;
+}
diff --git a/js.php b/js.php
index a922d28..8344b57 100644
--- a/js.php
+++ b/js.php
@@ -1,37 +1,54 @@
0);
if (isset($info['dependencies']) && is_array($info['dependencies'])) {
- // Intersect list with active modules to avoid loading uninstalled ones.
- $dependencies = array_intersect(module_list(TRUE, FALSE), $info['dependencies']);
- foreach ($dependencies as $dependency) {
- drupal_load('module', $dependency);
+ foreach ($info['dependencies'] as $dependency) {
+ if(!drupal_load('module', $dependency)) {
+ throw new Exception(t('Error, the dependancy (!module) for this callback is not installed.', array('!module' => $dependency)));
+ }
$modules[$dependency] = 0;
}
}
@@ -113,9 +128,8 @@ function js_execute_callback() {
module_list(FALSE, TRUE, FALSE, $modules);
// Initialize the localization system.
- // @todo We actually need to query the database whether the site has any
- // localization module enabled, and load it automatically.
- $locale = drupal_init_language();
+ drupal_bootstrap(DRUPAL_BOOTSTRAP_LANGUAGE);
+
// Invoke implementations of hook_init().
module_invoke_all('init');
}
@@ -123,67 +137,3 @@ function js_execute_callback() {
// Invoke callback function.
return call_user_func_array($info['callback'], $args);
}
-
-/**
- * l() calls check_url(), which needs to check for XSS attacks.
- */
-function filter_xss_bad_protocol($string, $decode = TRUE) {
- static $allowed_protocols;
- if (!isset($allowed_protocols)) {
- $allowed_protocols = array_flip(variable_get('filter_allowed_protocols', array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'mailto', 'irc', 'ssh', 'sftp', 'webcal')));
- }
-
- // Get the plain text representation of the attribute value (i.e. its meaning).
- if ($decode) {
- $string = decode_entities($string);
- }
-
- // Iteratively remove any invalid protocol found.
-
- do {
- $before = $string;
- $colonpos = strpos($string, ':');
- if ($colonpos > 0) {
- // We found a colon, possibly a protocol. Verify.
- $protocol = substr($string, 0, $colonpos);
- // If a colon is preceded by a slash, question mark or hash, it cannot
- // possibly be part of the URL scheme. This must be a relative URL,
- // which inherits the (safe) protocol of the base document.
- if (preg_match('![/?#]!', $protocol)) {
- break;
- }
- // Per RFC2616, section 3.2.3 (URI Comparison) scheme comparison must be case-insensitive.
- // Check if this is a disallowed protocol.
- if (!isset($allowed_protocols[strtolower($protocol)])) {
- $string = substr($string, $colonpos + 1);
- }
- }
- } while ($before != $string);
- return check_plain($string);
-}
-
-$return = js_execute_callback();
-
-// Menu status constants are integers; page content is a string.
-if (is_int($return)) {
- drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
- switch ($return) {
- case JS_NOT_FOUND:
- drupal_not_found();
- break;
-
- case JS_ACCESS_DENIED:
- drupal_access_denied();
- break;
-
- case JS_SITE_OFFLINE:
- drupal_site_offline();
- break;
- }
-}
-elseif (isset($return)) {
- // If JavaScript callback did not exit, print any value (including an empty
- // string) except NULL or undefined:
- print drupal_to_js($return);
-}
-