'. t('The table below shows all the affiliates sites whose content you may edit. Click on the site name link to see all content assigned to that affiliate.') .'
'; + $output .= theme_table($header, $rows); + $output .= theme('pager', NULL, variable_get('domain_list_size', DOMAIN_LIST_SIZE), 0); + return $output; + } + else { + return t('You do not have editing access to any domains. Please contact your site administrator.'); + } +} + +/** * Content administration for a specific domain. * This callback puts the user on the current domain and then * fetches the appropirate content for batch editing. @@ -44,10 +98,12 @@ function domain_content_page() { */ function domain_content_view($domain_id = NULL, $all_affiliates = FALSE) { global $_domain; + // Load the active domain, which is not necessarily the current domain. if (!is_null($domain_id) && $domain_id != $_domain['domain_id']) { domain_set_domain($domain_id); } + $output = ''; // Override the $_domain global so we can see the appropriate content if (!is_null($domain_id)) { @@ -58,6 +114,7 @@ function domain_content_view($domain_id $_domain['site_grant'] = TRUE; drupal_set_title(t('Content for all affiliate sites')); } + // KILLSWITCH CASE: returns an error else { drupal_set_message(t('Invalid request'), 'error'); Index: domain_content/domain_content.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/domain/domain_content/domain_content.module,v retrieving revision 1.28 diff -u -p -r1.28 domain_content.module --- domain_content/domain_content.module 31 May 2009 18:16:40 -0000 1.28 +++ domain_content/domain_content.module 17 Aug 2009 14:05:57 -0000 @@ -25,12 +25,12 @@ function domain_content_menu() { $items = array(); $items['admin/domain/content'] = array( 'title' => 'Affiliated content', - 'page callback' => 'domain_content_page', + 'page callback' => 'domain_content_list', 'access callback' => 'domain_content_menu_check', 'file' => 'domain_content.admin.inc', ); $items['admin/domain/content/all'] = array( - 'title' => 'Content for all affiliate sites', + 'title' => 'Content assigned to all affiliates', 'page callback' => 'domain_content_view', 'page arguments' => array(NULL, TRUE), 'access callback' => 'domain_content_menu_check', @@ -40,22 +40,51 @@ function domain_content_menu() { ); // Generate the list of active domains as menu items $domains = domain_domains(); - foreach ($domains as $domain) { - $items['admin/domain/content/'. $domain['domain_id']] = array( - 'title' => filter_xss_admin($domain['sitename']) .' content', + if (count($domains) <= variable_get('domain_list_size', DOMAIN_LIST_SIZE)) { + foreach ($domains as $domain) { + $items['admin/domain/content/'. $domain['domain_id']] = array( + 'title' => filter_xss_admin($domain['sitename']) .' content', + 'page callback' => 'domain_content_view', + 'page arguments' => array($domain['domain_id'], FALSE), + 'access callback' => 'domain_content_check', + 'access arguments' => array($domain), + 'file' => 'domain_content.admin.inc', + 'description' => 'View content assigned to '. filter_xss_admin($domain['subdomain']), + 'weight' => $domain['domain_id'] + ); + } + } + else { + $items['admin/domain/content/list'] = array( + 'title' => 'Affiliate site list', + 'page callback' => 'domain_content_list', + 'access callback' => 'domain_content_menu_check', + 'file' => 'domain_content.admin.inc', + 'description' => 'View your list of affiliates', + 'weight' => -10 + ); + $items['admin/domain/content/%'] = array( + 'title' => 'Affiliate site list', 'page callback' => 'domain_content_view', - 'page arguments' => array($domain['domain_id'], FALSE), + 'page arguments' => array(3, TRUE), 'access callback' => 'domain_content_check', - 'access arguments' => array($domain), + 'access arguments' => array(3), 'file' => 'domain_content.admin.inc', - 'description' => 'View content assigned to '. filter_xss_admin($domain['subdomain']), - 'weight' => $domain['domain_id'] + 'description' => 'Content list for a domain', + 'weight' => -10 ); } return $items; } /** + * Implement hook_perm(). + */ +function domain_content_perm() { + return array('configure domain content', 'review content for all domains'); +} + +/** * Implement hook_theme(). */ function domain_content_theme() { @@ -78,7 +107,7 @@ function domain_content_menu_check() { if (user_access('administer nodes')) { return TRUE; } - if (user_access('edit domain nodes')) { // || user_access('set domain access') + if (user_access('edit domain nodes') || user_access('review content for all domains')) { return TRUE; } return FALSE; @@ -168,3 +197,15 @@ function domain_content_form_alter(&$for $form['#redirect'] = $_GET['q']; } } + +/** + * Implement hook_domainlinks() + */ +function domain_content_domainlinks($domain) { + $links[] = array( + 'title' => t('content'), + 'path' => 'admin/domain/content/'. $domain['domain_id'] + ); + return $links; + +}