-$javascript_setting =
- getPref($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT);
-$javascript_on = getPref($data_dir, $username, 'javascript_on', SMPREF_ON);
-
+$javascript_setting = getPref($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT);
+if ( checkForJavascript() )
+{
+ $use_javascript_folder_list = getPref($data_dir, $username, 'use_javascript_folder_list');
+ $use_javascript_addr_book = getPref($data_dir, $username, 'use_javascript_addr_book', $default_use_javascript_addr_book);
+} else {
+ $use_javascript_folder_list = false;
+ $use_javascript_addr_book = false;
+}