%template theme. When your site is displayed using this theme, these settings will be used. By clicking "Reset to defaults," you can choose to use the global settings for this theme.', array('%template' => $theme, '@global' => url('admin/build/themes/settings')));
case 'admin/settings/modules':
- return t('Modules are plugins for Drupal that extend its core functionality. Here you can select which modules are enabled. Click on the name of the module in the navigation menu for their individual configuration pages. Once a module is enabled, new permissions might be made available. Modules can automatically be temporarily disabled to reduce server load when your site becomes extremely busy by enabling the throttle.module and checking throttle. The auto-throttle functionality must be enabled on the throttle configuration page after having enabled the throttle module.
-It is important that update.php is run every time a module is updated to a newer version.
', array('@permissions' => url('admin/user/access'), '@throttle' => url('admin/settings/throttle'), '@update-php' => $base_url .'/update.php')); + return t('Modules are plugins for Drupal that extend its core functionality. Here you can see which modules are enabled. Some modules may include links to their administration pages. Once a module is enabled, new permissions might be made available. Modules can automatically be temporarily disabled to reduce server load when your site becomes extremely busy by enabling the throttle.module and visiting the throttle administration pages.
If a module is required by another module that is enabled, you will not be able to disable that module until all modules that require it are disabled.
+It is important that update.php is run every time a module is updated to a newer version.
', array('@permissions' => url('admin/user/access'), '@update-php' => $base_url .'/update.php')); + case 'admin/settings/modules/disabled': + return t('Modules are plugins for Drupal that extend its core functionality. Here you can install new modules or re-enable/uninstall previously disabled modules. Once a module is enabled, new permissions might be made available.
Note that uninstalling a module will remove that module\'s data from your system, and that this operation is not recoverable! If you are not sure, be sure to make a backup of your database before selecting uninstall!
If a module is required by another module, you will not be able to enable that module until all modules that it requires are enabled.
', array('@permissions' => url('admin/user/access'))); } } @@ -185,9 +187,28 @@ function system_menu($may_cache) { 'title' => t('modules'), 'description' => t('Enable or disable add-on modules for your site.'), 'weight' => -10, - 'callback' => 'drupal_get_form', - 'callback arguments' => array('system_modules'), + 'callback' => 'system_modules', + 'callback arguments' => array('enabled'), 'access' => $access); + $items[] = array('path' => 'admin/settings/modules/enabled', + 'title' => t('enabled'), + 'callback' => 'system_modules', + 'callback arguments' => array('enabled'), + 'access' => $access, + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'weight' => -10); + $items[] = array('path' => 'admin/settings/modules/disabled', + 'title' => t('disabled'), + 'callback' => 'system_modules', + 'callback arguments' => array('disabled'), + 'access' => $access, + 'type' => MENU_LOCAL_TASK); + $items[] = array('path' => 'admin/settings/modules/uninstall', + 'title' => t('confirm uninstall'), + 'callback' => 'drupal_get_form', + 'callback arguments' => array('system_confirm_uninstall'), + 'access' => $access, + 'type' => MENU_CALLBACK); // Settings: $items[] = array( @@ -1199,115 +1220,294 @@ function system_themes_submit($form_id, } /** + * Helper function to reduce code. Provides a form that is a button or two + * keyed to the module. + */ +function system_module_form($module, $metadata, $type, $type2 = NULL) { + $form['submit'] = array( + '#type' => 'submit', + '#value' => $type, + '#attributes' => array('class' => 'modules-button') + ); + + $form['submit'] = array( + '#type' => 'submit', + '#value' => $type, + '#attributes' => array('class' => 'modules-button') + ); + + $form['metadata'] = array( + '#type' => 'value', + '#value' => $metadata, + '#attributes' => array('class' => 'modules-button') + ); + + $form['#submit']['system_module_form_submit'] = array(); + + if ($type2) { + $form['submit2'] = array( + '#type' => 'submit', + '#value' => $type2, + '#attributes' => array('class' => 'modules-button') + ); + } + return $form; +} + +function system_forms() { + static $forms = array(); + if (!$forms) { + $files = system_listing('\.module$', 'modules', 'name', 0); + foreach ($files as $file) { + $forms["system_module_form_$file->name"]['callback'] = 'system_module_form'; + } + } + return $forms; + +} + +/** * Menu callback; displays a listing of all modules. */ -function system_modules() { +function system_modules($type) { // Get current list of modules $files = module_rebuild_cache(); + $required = array('block', 'filter', 'node', 'system', 'user', 'watchdog'); foreach ($files as $filename => $file) { - drupal_get_filename('module', $file->name, $file->filename); - drupal_load('module', $file->name); - - $file->description = module_invoke($file->name, 'help', 'admin/settings/modules#description'); + $metadata = $file->metadata; + if (($type == 'enabled' && $file->status) || ($type == 'disabled' && !$file->status)) { + $packages[$metadata['package']][] = $file->name; + $options[$file->name] = ''; + } - $form['name'][$file->name] = array('#value' => $file->name); - $form['description'][$file->name] = array('#value' => $file->description); - $options[$file->name] = ''; + $file->description = $metadata['description']; + + // for later dependency checking. if ($file->status) { - $status[] = $file->name; + $metadata['enabled'] = true; } - if ($file->throttle) { - $throttle[] = $file->name; + else if ($file->schema_version != -1) { + $metadata['uninstalled'] = true; } + $metadata['filename'] = $file->filename; + $modules[$filename] = $metadata; } - // Handle status checkboxes, including overriding the generated - // checkboxes for required modules. - $form['status'] = array('#type' => 'checkboxes', '#default_value' => $status, '#options' => $options); - $required = array('block', 'filter', 'node', 'system', 'user', 'watchdog'); - foreach ($required as $require) { - $form['status'][$require] = array('#type' => 'hidden', '#value' => 1, '#suffix' => t('required')); + if (!$packages) { + return t('There are currently no modules that you can enable.
'); } - /** - * Handle throttle checkboxes, including overriding the generated checkboxes for required modules. - */ - if (module_exists('throttle')) { - $form['throttle'] = array('#type' => 'checkboxes', '#default_value' => $throttle, '#options' => $options); - $throttle_required = array_merge($required, array('throttle')); - foreach ($throttle_required as $require) { - $form['throttle'][$require] = array('#type' => 'hidden', '#value' => 0, '#suffix' => t('required')); + $top_array = array(); + // Re-order packages to force core modules to the top. + foreach (array(t('Required modules'), t('Drupal core modules')) as $key) { + if (is_array($packages[$key])) { + $top_array[$key] = $packages[$key]; + unset($packages[$key]); } } - $form['buttons']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration')); + ksort($packages); + $packages = array_merge($top_array, $packages); - return $form; -} + $header = array( + array('data' => t('Name') , 'header' => TRUE, 'class' => 'modules-heading'), + array('data' => t('Version') , 'header' => TRUE, 'class' => 'modules-heading'), + array('data' => t('Related Links & Description'), 'header' => TRUE, 'class' => 'modules-heading'), + array('data' => t('Operations') , 'header' => TRUE, 'class' => 'modules-heading', 'colspan' => 2), + ); + + $rows = array(); + foreach ($packages as $group => $package) { + $rows[] = array( + array( + 'colspan' => 5, + 'header' => TRUE, + 'data' => $group, + 'class' => 'modules-header', + ) + ); + $rows[] = $header; + foreach ($package as $module) { + $modules[$module]['buttons'] = array(); + + // Check for dependencies. + $depends = ''; + $can_change = TRUE; + $compatible = strpos(VERSION, $modules[$module]['drupal']) === 0; + + if (!$modules[$module]['enabled']) { + // disabled modules and don't get their links + $modules[$module]['links'] = array(); + foreach ($modules[$module]['dependencies'] as $dependency) { + $depends .= (!$depends ? t('Depends on: ') : ', ') ."$dependency"; + if (!$modules[$dependency]['enabled']) { + $depends .= t(' (not present)'); + $can_change = FALSE; + } + } + if ($can_change&&$compatible) { + if ($modules[$module]['uninstalled']) { + $modules[$module]['buttons'][] = drupal_get_form("system_module_form_$module", $module, $modules[$module], t('Enable'), t('Uninstall')); + } + else { + $modules[$module]['buttons'][] = drupal_get_form("system_module_form_$module", $module, $modules[$module], t('Install')); + } + } + else { + if ($modules[$module]['uninstalled']) { + $modules[$module]['buttons'][] = drupal_get_form("system_module_form_$module", $module, $modules[$module], t('Uninstall')); + } + } + } + else { + // Check for modules that depend on this module. + foreach ($modules as $dependency => $module_data) { + if (in_array($module, $module_data['dependencies']) && $module_data['enabled']) { + $depends .= (!$depends ? t('Required by: ') : ', ') ."$dependency"; + $can_change = FALSE; + } + } + if ($can_change && !in_array($module, $required)) { + $modules[$module]['buttons'][] = drupal_get_form("system_module_form_$module", $module, $modules[$module], t('Disable')); + } + } + $cells = array(); + $cells[] = $modules[$module]['name']; + $cells[] = $modules[$module]['version']; + $description = theme('system_module_links', $modules[$module]['links']) . '' . $modules[$module]['description'] . '
'; + if ($depends) { + $description .= '' . $depends . '
'; + } + $cells[] = $description; + + if ($help = module_invoke($module, 'help', "admin/help#$module")) { + $modules[$module]['links'][] = array('title' => t('help'), 'href' => "admin/help/$module"); + } + if ($perms = module_invoke($module, 'perm')) { + $modules[$module]['links'][] = array('title' => t('permissions'), 'href' => 'admin/user/access', 'fragment' => "module-$module"); + } + +// $cells[] = array( +// 'data' => theme('links', $modules[$module]['links']), +// 'class' => 'modules-links', +// ); + +// if ($modules[$module]['buttons']) { + $cells[] = array( + 'data' => implode(' ', $modules[$module]['buttons']), + 'nowrap' => TRUE, + 'class' => 'modules-buttons', + ); +// } +// else { +// $cells[3]['colspan'] = 2; +// } + $rows[] = $cells; + if (!$compatible) { + $rows[] = array('', array( + 'data' => t('(This module is for Drupal version %version and not compatible with your current version)', array('%version' => $modules[$module]['drupal'])), + 'colspan' => 4) + ); + } + } + } -function theme_system_modules($form) { - foreach (element_children($form['name']) as $key) { - $row = array(); - $row[] = drupal_render($form['name'][$key]); - $row[] = drupal_render($form['description'][$key]); - $row[] = array('data' => drupal_render($form['status'][$key]), 'align' => 'center'); + if ($rows) { + $output .= theme('table', array(), $rows , array('class' => 'modules-table')); + } - if (module_exists('throttle')) { - $row[] = array('data' => drupal_render($form['throttle'][$key]), 'align' => 'center'); + return $output; +} + +function theme_system_module_links($links) { + $output = ''; + + if ($links) { + $l = array(); + + foreach ($links as $link) { + $l[] = l($link['title'], $link['href'], $link['attributes'], $link['query'], $link['fragment']); } - $rows[] = $row; - } + + $output = '' . $message . '
', + t('Uninstall'), t('Cancel') + ); } +function system_confirm_uninstall_submit($form_id, $form) { + if ($form['confirm']) { + include_once './includes/install.inc'; + drupal_uninstall_module($form['module'], true); + drupal_set_message(t('%module uninstalled.', array('%module' => $form['module']))); + } + return 'admin/settings/modules/disabled'; +} /** * Menu callback; displays a module's settings page. Index: modules/taxonomy/taxonomy.meta =================================================================== RCS file: modules/taxonomy/taxonomy.meta diff -N modules/taxonomy/taxonomy.meta --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/taxonomy/taxonomy.meta 21 Aug 2006 06:19:52 -0000 @@ -0,0 +1,6 @@ +name: Taxonomy +description: Enables the categorization of content. +package: Drupal core modules +version: SYSTEM +drupal: 4.8 +links: administer = admin/content/taxonomy Index: modules/throttle/throttle.meta =================================================================== RCS file: modules/throttle/throttle.meta diff -N modules/throttle/throttle.meta --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/throttle/throttle.meta 21 Aug 2006 06:19:52 -0000 @@ -0,0 +1,6 @@ +name: Throttle +description: Handles the auto-throttling mechanism, to control site congestion. +package: Drupal core modules +version: SYSTEM +drupal: 4.8 +links: administer = admin/settings/throttle Index: modules/throttle/throttle.module =================================================================== RCS file: /cvs/drupal/drupal/modules/throttle/throttle.module,v retrieving revision 1.65 diff -u -F^f -r1.65 throttle.module --- modules/throttle/throttle.module 18 Aug 2006 18:58:46 -0000 1.65 +++ modules/throttle/throttle.module 21 Aug 2006 06:19:53 -0000 @@ -14,10 +14,26 @@ function throttle_menu($may_cache) { 'path' => 'admin/settings/throttle', 'description' => t('Control how your site cuts out content during heavy load.'), 'title' => t('throttle'), + 'access' => user_access('administer site configuration'), + 'callback' => 'drupal_get_form', + 'callback arguments' => array('throttle_admin_modules'), + 'type' => MENU_NORMAL_ITEM, + ); + $items[] = array( + 'path' => 'admin/settings/throttle/modules', + 'title' => t('modules'), + 'callback' => 'drupal_get_form', + 'callback arguments' => array('throttle_admin_modules'), + 'access' => user_access('administer site configuration'), + 'type' => MENU_DEFAULT_LOCAL_TASK, + ); + $items[] = array( + 'path' => 'admin/settings/throttle/settings', + 'title' => t('settings'), 'callback' => 'drupal_get_form', 'callback arguments' => array('throttle_admin_settings'), 'access' => user_access('administer site configuration'), - 'type' => MENU_NORMAL_ITEM + 'type' => MENU_LOCAL_TASK, ); } @@ -171,3 +187,65 @@ function throttle_admin_settings() { return system_settings_form($form); } + +function throttle_admin_modules() { + // Get current list of modules + $result = db_query("SELECT * FROM {system} WHERE type = 'module' AND status = 1"); + + $required = array('block', 'filter', 'node', 'system', 'user', 'watchdog', 'throttle'); + while ($file = db_fetch_object($result)) { + if (!in_array($file->name, $required) && file_exists($file->filename)) { + $form['name'][$file->name] = array('#value' => $file->name); + $form['description'][$file->name] = array('#value' => $file->description); + $options[$file->name] = ''; + $form['original'][$file->name] = array( + '#type' => 'value', + '#value' => $file->throttle, + ); + $form['original']['#tree'] = TRUE; + if ($file->throttle) { + $throttle[] = $file->name; + } + } + } + + // Handle status checkboxes, including overriding the generated + // checkboxes for required modules. + $form['throttle'] = array('#type' => 'checkboxes', '#default_value' => $throttle, '#options' => $options); + foreach ($throttle_required as $require) { + $form['throttle'][$require] = array('#type' => 'hidden', '#value' => 0, '#suffix' => t('required')); + } + + $form['buttons']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration')); + + return $form; +} + +function theme_throttle_admin_modules($form) { + foreach (element_children($form['name']) as $key) { + $row = array(); + $row[] = drupal_render($form['name'][$key]); + $row[] = drupal_render($form['description'][$key]); + $row[] = array('data' => drupal_render($form['throttle'][$key]), 'align' => 'center'); + $rows[] = $row; + } + + $header = array(t('Name'), t('Description'), t('Throttle')); + + $output = theme('table', $header, $rows); + $output .= drupal_render($form); + return $output; +} + +function throttle_admin_modules_submit($form_id, $edit) { + foreach ($edit['throttle'] as $key => $choice) { + if ($choice && !$edit['original'][$key]) { + db_query("UPDATE {system} SET throttle = 1 WHERE type = 'module' and name = '%s'", $key); + } + else if (!$choice && $edit['original'][$key]) { + db_query("UPDATE {system} SET throttle = 0 WHERE type = 'module' and name = '%s'", $key); + } + } + + drupal_set_message(t('The configuration has been saved.')); +} Index: modules/tracker/tracker.meta =================================================================== RCS file: modules/tracker/tracker.meta diff -N modules/tracker/tracker.meta --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/tracker/tracker.meta 21 Aug 2006 06:19:53 -0000 @@ -0,0 +1,5 @@ +name: Tracker +description: Enables tracking of recent posts for users. +package: Drupal core modules +version: SYSTEM +drupal: 4.8 Index: modules/upload/upload.meta =================================================================== RCS file: modules/upload/upload.meta diff -N modules/upload/upload.meta --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/upload/upload.meta 21 Aug 2006 06:19:53 -0000 @@ -0,0 +1,6 @@ +name: Upload +description: Allows users to upload and attach files to content. +package: Drupal core modules +version: SYSTEM +drupal: 4.8 +links: settings = admin/settings/uploads Index: modules/user/user.meta =================================================================== RCS file: modules/user/user.meta diff -N modules/user/user.meta --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/user/user.meta 21 Aug 2006 06:19:53 -0000 @@ -0,0 +1,7 @@ +name: User +description: Manages the user registration and login system. +package: Required modules +version: SYSTEM +drupal: 4.8 +links: administer = admin/user/user, settings=admin/user/settings + Index: modules/watchdog/watchdog.meta =================================================================== RCS file: modules/watchdog/watchdog.meta diff -N modules/watchdog/watchdog.meta --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ modules/watchdog/watchdog.meta 21 Aug 2006 06:19:53 -0000 @@ -0,0 +1,6 @@ +name: Watchdog +description: Logs and records system events. +package: Required modules +version: SYSTEM +drupal: 4.8 +links: view logs = admin/logs/watchdog