diff -urp tac_lite5/tac_lite.info tac_lite/tac_lite.info --- tac_lite5/tac_lite.info 2007-12-12 14:55:08.000000000 +0100 +++ tac_lite/tac_lite.info 2008-05-14 22:29:34.000000000 +0200 @@ -1,10 +1,12 @@ -; $Id: tac_lite.info,v 1.1 2007/01/11 01:48:49 yogadex Exp $ +; $Id: tac_lite.info,v 1.1 2008/05/14 01:48:49 yogadex Exp $ name = Taxonomy Access Control Lite description = Simple access control based on categories. -dependencies = taxonomy +dependencies[] = taxonomy +package = Core - optional +version = VERSION +core = 6.x ; Information added by drupal.org packaging script on 2007-12-12 -version = "5.x-1.1" -project = "tac_lite" +version = "6.0" +project = "drupal" datestamp = "1197467708" - diff -urp tac_lite5/tac_lite.module tac_lite/tac_lite.module --- tac_lite5/tac_lite.module 2007-12-12 14:42:00.000000000 +0100 +++ tac_lite/tac_lite.module 2008-05-15 08:35:53.000000000 +0200 @@ -3,8 +3,8 @@ /** * @file * Control access to site content based on taxonomy, roles and users. - * - * + * + * */ /** @@ -26,7 +26,7 @@ function tac_lite_help($section) { return $output; break; - } + } } /** @@ -36,43 +36,50 @@ function tac_lite_perm() { return array('administer_tac_lite'); } + + /** * Implementation of hook_menu(). + * 2008 : Modified by Paulo to be compliant with drupal 6 */ -function tac_lite_menu($may_cache) { +function tac_lite_menu() { global $user; - $items = array(); - $admin_access = user_access('administer_tac_lite'); + $admin_access = 'administer_tac_lite'; + + $items['admin/user/access/tac_lite'] = array( + 'title' => t('Access control by taxonomy'), + 'description' => "Manage TAC", + 'page callback' => 'drupal_get_form', + 'page arguments' => array('tac_lite_admin_settings'), + 'type' => MENU_NORMAL_ITEM, + 'weight' => 1, // after 'roles' tab + 'access arguments' => array($admin_access), + ); + + $items['admin/user/access/tac_lite/settings'] = array( + 'title' => t('Settings'), + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'weight' => -1, + ); + + $items['admin/user/access/tac_lite/roles'] = array( + 'title' => t('Role based privileges'), + 'page callback' => 'drupal_get_form', + 'page arguments' => array('tac_lite_admin_settings_defaults'), + 'type' => MENU_LOCAL_TASK, + 'access arguments' => array($admin_access) + ); - if ($may_cache) { - $items[] = array('path' => 'admin/user/access/tac_lite', - 'title' => t('Access control by taxonomy'), - 'callback' => 'drupal_get_form', - 'callback arguments' => 'tac_lite_admin_settings', - 'type' => MENU_NORMAL_ITEM, - 'weight' => 1, // after 'roles' tab - 'access' => $admin_access); - $items[] = array('path' => 'admin/user/access/tac_lite/settings', - 'title' => t('Settings'), - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'weight' => -1, - ); - $items[] = array('path' => 'admin/user/access/tac_lite/roles', - 'title' => t('Role based privileges'), - 'callback' => 'drupal_get_form', - 'callback arguments' => 'tac_lite_admin_settings_defaults', - 'type' => MENU_LOCAL_TASK, - 'access' => $admin_access); - } - return $items; } + /** * Returns the settings form */ function tac_lite_admin_settings() { $vocabularies = taxonomy_get_vocabularies(); + $options = array(); if (!count($vocabularies)) { $form['body'] = array('#type' => 'markup', @@ -82,10 +89,10 @@ function tac_lite_admin_settings() { } else { foreach ($vocabularies as $vid => $vocab) { - $options[$vid] = $vocab->name; + $options[$vid] = $vocab->name; } - - $form['tac_lite_categories'] = + + $form['tac_lite_categories'] = array('#type' => 'select', '#title' => 'Vocabularies', '#default_value' => variable_get('tac_lite_categories', null), @@ -93,21 +100,23 @@ function tac_lite_admin_settings() { '#description' => t('Select one or more vocabularies to control privacy. Do not select free tagging vocabularies, they are not supported.'), '#multiple' => true, ); - + $ret = system_settings_form($form); // Special handling is required when this form is submitted. - $ret['#submit']['_tac_lite_admin_settings_submit'] = array(); + $ret['#submit'][] = '_tac_lite_admin_settings_submit'; return $ret; } } + /** * This form submit callback ensures that the form values are saved, and also * the node access database table is rebuilt. + * 2008 : Modified by Paulo to be compliant with drupal 6 */ -function _tac_lite_admin_settings_submit($form_id, $form_values) { +function _tac_lite_admin_settings_submit($form, &$form_state) { // First, save settings the default way. - system_settings_form_submit($form_id, $form_values); + system_settings_form_submit($form, $form_state); // Next, rebuild the node_access table. node_access_rebuild(); drupal_set_message(t('The content access permissions have been rebuilt.')); @@ -122,19 +131,19 @@ function tac_lite_admin_settings_default if (count($vids)) { $all_defaults = variable_get('tac_lite_default_grants', array()); - $form['tac_lite_default_grants'] = - array('#tree' => true); + $form['tac_lite_default_grants'] = array('#tree' => true); + foreach ($roles as $rid => $role_name) { $form['tac_lite_default_grants'][$rid] = array('#type' => 'fieldset', '#tree' => true, '#title' => t('Access for %role', array('%role' => $role_name)), - '#description' => t(''), + '#description' => t(''), ); $defaults = $all_defaults[$rid]; foreach ($vids as $vid) { - $v = taxonomy_get_vocabulary($vid); - $form['tac_lite_default_grants'][$rid][$vid] = + $v = taxonomy_get_vocabularies($vid); + $form['tac_lite_default_grants'][$rid][$vid] = _taxonomy_term_select($v->name, null, // name no longer used in new form api $defaults[$vid], @@ -164,7 +173,7 @@ function tac_lite_user($op, $edit, $acco global $user; if (!user_access('administer_tac_lite')) return; - + switch ($op) { case 'categories': return array(array('name' => 'tac_lite', @@ -178,8 +187,8 @@ function tac_lite_user($op, $edit, $acco $vids = variable_get('tac_lite_categories', null); if (count($vids)) { foreach ($vids as $vid) { - $v = taxonomy_get_vocabulary($vid); - $form['tac_lite']['tac_lite'][$vid] = + $v = taxonomy_get_vocabularies($vid); + $form['tac_lite']['tac_lite'][$vid] = _taxonomy_term_select($v->name, null, // name no longer used in new form api $account->tac_lite[$vid], @@ -189,7 +198,7 @@ function tac_lite_user($op, $edit, $acco '<'.t('none').'>'); } } - $form['tac_lite'][0] = + $form['tac_lite'][0] = array('#type' => 'markup', '#value' => '

'.t('You may grant this user view access to any of the terms below. These grants are in addition to !grant_per_role_link.', array('!grant_per_role_link' => l(t('access granted to the user by virtue of his/her roles'), 'admin/user/access/tac_lite/roles'))) . "

\n", @@ -206,7 +215,7 @@ function tac_lite_user($op, $edit, $acco } /** * Implementation of hook_node_access_records - * + * */ function tac_lite_node_access_records($node) { // all terms from all vocabs @@ -223,10 +232,10 @@ function tac_lite_node_access_records($n $tids[] = $term->tid; } } - + if (!count($tids)) { // no relevant terms found. - + // in drupal 4-7 we had to write a row into the database. In drupal 5, it should be safe to do nothing. } else { @@ -297,7 +306,7 @@ function _tac_lite_get_terms_by_nid($nid /** * Return the term ids of terms this user is allowed to access - * + * * Users are granted access to terms either because of who they are, * or because of the roles they have. */ @@ -344,7 +353,7 @@ function tac_lite_node_grants(&$account, // if there is a clean way to add support for other ops, I'm open to it. However users who need that should currently use the Taxonomy Access Control module. if ($op == 'view') { $grants = _tac_lite_user_tids($account); - + return array('tac_lite' => $grants); } } @@ -367,11 +376,11 @@ function tac_lite_db_rewrite_sql($query, case 'tid': // prevent users from seeing terms they do not have permission to read. $join = "LEFT JOIN {term_data} catd ON $primary_table.tid = catd.tid"; - $where = "$primary_table.tid IN (". implode(', ', $tids) .") OR catd.vid NOT IN (". implode(',', $vids) .")"; + $where = "$primary_table.tid IN (". implode(', ', $tids) .") OR catd.vid NOT IN (". implode(',', $vids) .")"; return array('join' => $join, 'where' => $where); break; case 'vid': - + break; } }