'. $permission_help .'
') : ''; } @@ -935,13 +948,12 @@ function l10n_community_get_languages($k /** * Get translation permission level for a specific user. * - * * @param $langcode * Language code, for example 'hu', 'pt-br', 'de' or 'it'. * @param $account - * Optional user account. + * (Optional) A user account object. If not passed, the current user is used. * @return - * L10N_PERM_NONE, L10N_PERM_SUGGEST or L10N_PERM_ALL + * A bitmask of all permission flags the user has. */ function l10n_community_get_permission($langcode, $account = NULL) { static $permissions = array(); @@ -954,28 +966,25 @@ function l10n_community_get_permission($ $account = $user; } - if (isset($permissions[$account->uid][$langcode])) { - // Return cached value if available. - return $permissions[$account->uid][$langcode]; + if (!isset($permissions[$account->uid])) { + $permissions[$account->uid] = array(); } + if (!isset($permissions[$account->uid][$langcode])) { + // Minimal permission. + $global = L10N_PERM_NONE; + $global |= user_access('browse translations', $account) ? L10N_PERM_VIEW : 0; + $global |= user_access('submit suggestions', $account) ? L10N_PERM_SUGGEST : 0; + $global |= user_access("moderate other people's suggestions", $account) ? L10N_PERM_MODERATE_OTHERS : 0; + $global |= user_access('moderate own suggestions', $account) ? L10N_PERM_MODERATE_OWN : 0; + $global |= user_access('import gettext files', $account) ? L10N_PERM_IMPORT : 0; + $global |= user_access('export gettext templates and translations', $account) ? L10N_PERM_EXPORT : 0; - // Initialize to lowest possible permission. - $permissions[$account->uid][$langcode] = L10N_PERM_NONE; - - if ($account->uid == 1) { - // The administrator has all permissions in all languages. - return ($permissions[$account->uid][$langcode] = L10N_PERM_ALL); - } - - $global_permission = user_access('submit translations and approve suggestions', $account) ? L10N_PERM_ALL : (user_access('submit suggestions', $account) ? L10N_PERM_SUGGEST : L10N_PERM_NONE); - - if (($global_permission != L10N_PERM_NONE) && module_exists('l10n_groups')) { - // Fill up permission information for this account if it has any permission. - l10n_groups_get_permission($permissions, $global_permission, $langcode, $account); - } - else { - // Remember global permission if using l10n_community standalone. - $permissions[$account->uid][$langcode] = $global_permission; + if (!module_exists('l10n_groups')) { + $permissions[$account->uid][$langcode] = $global; + } + else { + l10n_groups_get_permission($permissions, $account, $global); + } } // Return from local cache. @@ -983,6 +992,20 @@ function l10n_community_get_permission($ } /** + * Checks whether the current user has a certain permission. + * + * @param $langcode + * Language code, for example 'hu', 'pt-br', 'de' or 'it'. + * @param $permission + * The permission to check for. + * @return + * TRUE if the user has at least one of the specified permissions. + */ +function l10n_community_has_permission($langcode, $permission) { + return (bool)(l10n_community_get_permission($langcode, NULL) & $permission); +} + +/** * Provides a list of projects from the database, ordered by uri. * * @param $options Index: l10n_community/moderate.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_community/Attic/moderate.inc,v retrieving revision 1.1.2.4 diff -u -p -u -p -r1.1.2.4 moderate.inc --- l10n_community/moderate.inc 6 Nov 2009 16:00:57 -0000 1.1.2.4 +++ l10n_community/moderate.inc 10 Nov 2009 13:04:24 -0000 @@ -77,11 +77,12 @@ function l10n_community_moderation_form( '#type' => 'submit', '#value' => t('Decline all selected'), ); - + // All strings and suggestions $form['strings'] = array( '#tree' => TRUE, ); + foreach ($strings as $string) { $form['strings']['tid'][$string->tid] = array( '#type' => 'checkbox', @@ -145,6 +146,8 @@ function l10n_community_moderation_form_ * An array of suggestion records from database. */ function l10n_community_get_suggestions($langcode, $filters) { + global $user; + $join = $join_args = $where = $where_args = array(); $sql = $sql_count = ''; @@ -205,6 +208,19 @@ function l10n_community_get_suggestions( $join[] = "LEFT JOIN {l10n_community_translation} tt ON tt.sid = ts.sid AND tt.is_suggestion = 0 AND tt.is_active = 1 AND tt.language = '%s'"; $join_args[] = $langcode; } + + // Only show strings matching the user's permissions. It should be already + // ensured that the user has either one of these permissions, when calling + // this function, or nothing will be returned. + $permission = l10n_community_get_permission($langcode); + if (!($permission & L10N_PERM_MODERATE_OWN)) { + $where[] = "(ts.uid_entered <> %d)"; + $where_args[] = $user->uid; + } + if (!($permission & L10N_PERM_MODERATE_OTHERS)) { + $where[] = "(ts.uid_entered = %d)"; + $where_args[] = $user->uid; + } // Build the queries $sql_args = array_merge($join_args, $where_args); Index: l10n_community/translate.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_community/Attic/translate.inc,v retrieving revision 1.1.2.7.2.25 diff -u -p -u -p -r1.1.2.7.2.25 translate.inc --- l10n_community/translate.inc 6 Nov 2009 16:00:57 -0000 1.1.2.7.2.25 +++ l10n_community/translate.inc 10 Nov 2009 13:04:25 -0000 @@ -37,7 +37,7 @@ function l10n_community_translate_page($ if (!count($strings)) { drupal_set_message(t('No strings found with this filter. Try adjusting the filter options.')); } - elseif ($perm == L10N_PERM_NONE || $mode == 'view') { + elseif (!($perm & L10N_PERM_SUGGEST) || $mode == 'view') { // For users without permission to translate or suggest, display the view. drupal_set_title(t('@language translations', array('@language' => $languages[$langcode]->name))); $output .= l10n_community_translate_view($strings, $languages[$langcode], $filters); @@ -349,11 +349,11 @@ function l10n_community_translate_form(& $target = $string->sid .'-'. $i; if ($translated) { // Already translated so we ask for new translation or suggestion. - $description = ($perm == L10N_PERM_SUGGEST) ? t('New suggestion for variant #%d', array('%d' => $i)) : t('New translation for variant #%d', array('%d' => $i)); + $description = !($perm & L10N_PERM_MODERATE_OWN) ? t('New suggestion for variant #%d', array('%d' => $i)) : t('New translation for variant #%d', array('%d' => $i)); } else { // Not translated yet, so we ask for initial translation or suggestion. - $description = ($perm == L10N_PERM_SUGGEST) ? t('Suggestion for variant #%d', array('%d' => $i)) : t('Translation for variant #%d', array('%d' => $i)); + $description = !($perm & L10N_PERM_MODERATE_OWN) ? t('Suggestion for variant #%d', array('%d' => $i)) : t('Translation for variant #%d', array('%d' => $i)); } // Include editing area for each plural variant. @@ -381,7 +381,7 @@ function l10n_community_translate_form(& // Use textarea for long and multiline strings. '#type' => ((strlen($string->value) > 45) || (count(explode("\n", $string->value)) > 1)) ? 'textarea' : 'textfield', // Provide accurate title based on previous data and permission. - '#description' => $translated ? (($perm == L10N_PERM_SUGGEST) ? t('Add a new suggestion') : t('Add a new translation')) : (($perm == L10N_PERM_SUGGEST) ? t('Suggestion') : ''), + '#description' => $translated ? (!($perm & L10N_PERM_MODERATE_OWN) ? t('Add a new suggestion') : t('Add a new translation')) : (!($perm & L10N_PERM_MODERATE_OWN) ? t('Suggestion') : ''), '#rows' => 4, '#resizable' => FALSE, '#cols' => NULL, @@ -406,7 +406,7 @@ function l10n_community_translate_form(& '#type' => 'markup', ); - if ($perm == L10N_PERM_SUGGEST) { + if (!($perm & L10N_PERM_MODERATE_OWN)) { // User with suggestion capability only, record this. $form[$string->sid]['translation']['is_suggestion'] = array( '#type' => 'value', @@ -445,7 +445,7 @@ function l10n_community_translate_form(& // Let the user submit the form. $form['submit'] = array( '#type' => 'submit', - '#value' => ($perm == L10N_PERM_SUGGEST) ? t('Save suggestions') : t('Save translations') + '#value' => !($perm & L10N_PERM_MODERATE_OWN) ? t('Save suggestions') : t('Save translations') ); $form['#theme'] = 'l10n_community_translate_form'; Index: l10n_community/welcome.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_community/Attic/welcome.inc,v retrieving revision 1.1.2.7.2.13 diff -u -p -u -p -r1.1.2.7.2.13 welcome.inc --- l10n_community/welcome.inc 2 Oct 2009 08:55:36 -0000 1.1.2.7.2.13 +++ l10n_community/welcome.inc 10 Nov 2009 13:04:25 -0000 @@ -170,7 +170,7 @@ function l10n_community_pick_go_submit($ // Project surely selected, possibly with language too. if (!empty($form_state['values']['langcode'])) { if (user_access('browse translations')) { - $action = l10n_community_contribute_access($form_state['values']['langcode']) ? 'edit' : 'view'; + $action = l10n_community_has_permission($form_state['values']['langcode'], L10N_PERM_SUGGEST) ? 'edit' : 'view'; drupal_goto('translate/languages/'. $form_state['values']['langcode'] .'/'. $action, 'project='. $uri); } else { Index: l10n_community/tests/l10n_community.test =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_community/tests/Attic/l10n_community.test,v retrieving revision 1.1.2.13 diff -u -p -u -p -r1.1.2.13 l10n_community.test --- l10n_community/tests/l10n_community.test 22 Oct 2009 14:34:23 -0000 1.1.2.13 +++ l10n_community/tests/l10n_community.test 10 Nov 2009 13:04:25 -0000 @@ -28,7 +28,7 @@ class L10nServerTestCase extends DrupalW $this->u_auth = $this->drupalCreateUser(array('access localization community', 'browse translations')); $this->u_member_1 = $this->drupalCreateUser(array('access localization community', 'browse translations', 'submit suggestions', 'import gettext files')); $this->u_member_2 = $this->drupalCreateUser(array('access localization community', 'browse translations', 'submit suggestions', 'import gettext files')); - $this->u_moderator = $this->drupalCreateUser(array('access localization community', 'browse translations', 'submit translations and approve suggestions', 'import gettext files')); + $this->u_moderator = $this->drupalCreateUser(array('access localization community', 'browse translations', 'moderate own suggestions', 'moderate other people\'s suggestions', 'import gettext files', 'submit suggestions')); $this->u_admin = $this->drupalCreateUser(array('administer languages', 'administer localization community', 'administer localization community for local packages', 'import gettext files')); $this->u_team = $this->drupalCreateUser(); Index: l10n_groups/l10n_groups.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_groups/Attic/l10n_groups.module,v retrieving revision 1.1.2.4.2.7 diff -u -p -u -p -r1.1.2.4.2.7 l10n_groups.module --- l10n_groups/l10n_groups.module 18 Sep 2009 18:03:19 -0000 1.1.2.4.2.7 +++ l10n_groups/l10n_groups.module 10 Nov 2009 13:04:25 -0000 @@ -242,18 +242,19 @@ function l10n_groups_block_help($perm, $ $groups = l10n_groups_get_groups(); $permission_help = ''; - switch ($perm) { - // Inform user about her permission level in this group. - case L10N_PERM_NONE: - $permission_help = t('You are not a member of this translation group, but you can still view the existing translations and export templates or translations for your own use.') .' '. ($user->uid ? t('Subscribe to this group if you would like to help out.', array('@group' => url('node/'. $groups[$langcode]->nid))) : t('Create an account or log in and subscribe to this group if you would like to help out.', array('@register' => url('user'), '@group' => url('node/'. $groups[$langcode]->nid)))); - break; - case L10N_PERM_SUGGEST: - $permission_help = t('You are a member of this translation group, so you can suggest translations or import complete Gettext translation files to suggest multiple translations at once. Administrators of this group either accept or decline suggestions provided by members of the group. To work offline, export a translation template, which contains the current state of the translation.'); - break; - case L10N_PERM_ALL: - $permission_help = t('As a member of this translation group, you can suggest translations as well as approve translations suggested by other members of the group. Export/import of Gettext translation files is also possible.'); - break; + + // Inform user about her permission level in this group. + // @todo: fixme for permission descriptions, especially import and export. + if (!((L10N_PERM_REVIEW | L10N_PERM_SUGGEST) & ~$perm)) { + $permission_help = t('As a member of this translation group, you can suggest translations as well as approve translations suggested by other members of the group. Export/import of Gettext translation files is also possible.'); + } + elseif (L10N_PERM_SUGGEST & $perm) { + $permission_help = t('You are a member of this translation group, so you can suggest translations or import complete Gettext translation files to suggest multiple translations at once. Administrators of this group either accept or decline suggestions provided by members of the group. To work offline, export a translation template, which contains the current state of the translation.'); + } + elseif (L10N_PERM_VIEW & $perm) { + $permission_help = t('You are not a member of this translation group, but you can still view the existing translations and export templates or translations for your own use.') .' '. ($user->uid ? t('Subscribe to this group if you would like to help out.', array('@group' => url('node/'. $groups[$langcode]->nid))) : t('Create an account or log in and subscribe to this group if you would like to help out.', array('@register' => url('user'), '@group' => url('node/'. $groups[$langcode]->nid)))); } + return ''. $permission_help .'
'; } @@ -280,36 +281,33 @@ function l10n_groups_get_groups() { /** * Get permission level for a specific user based on group membership. * - * The group permissio model is taken into account and membership of + * The group permission model is taken into account and membership of * the user in language groups is checked. * * @param $permissions * Permission cache array to tunnel cache values to. - * @param $global_permission - * Permission based on user access settings to consider as a base. - * @param $langcode - * Language code, for example 'hu', 'pt-br', 'de' or 'it'. * @param $account * Optional user account. + * @param $global + * Permission based on user access settings to consider as a base. */ -function l10n_groups_get_permission(&$permissions, $global_permission, $langcode, $account) { +function l10n_groups_get_permission(&$permissions, $account, $global) { if ($groups = l10n_groups_get_groups()) { // Fill up local cache with all langcode permissions of this account for // future reference (eg. a page showing links for all languages). foreach ($groups as $group) { - $permission = L10N_PERM_NONE; - if (!empty($account->og_groups) and !empty($account->og_groups[$group->nid])) { - if (!empty($account->og_groups[$group->nid]['is_admin'])) { - // Administrators of groups have all permissions in the group. - $permission = L10N_PERM_ALL; - } - elseif ($account->og_groups[$group->nid]['is_active']) { - // Members in the group have a permission depending on the model used. - $permission = ($group->model == L10N_MODEL_OPEN ? L10N_PERM_ALL : L10N_PERM_SUGGEST); - } + $permission = $global; + + if (empty($account->og_groups) || empty($account->og_groups[$group->nid])) { + // The user is not in the group and may therefore only view. + $permission = $permission & ~(L10N_PERM_CONTRIBUTE | L10N_PERM_REVIEW); } - // Save the lowest common denominator of permissions given. - $permissions[$account->uid][$group->language] = min($permission, $global_permission); + elseif (empty($account->og_groups[$group->nid]['is_admin']) && $group->model != L10N_MODEL_OPEN) { + // Non-Admins of group don't have these permissions. + $permission = $permission & ~(L10N_PERM_REVIEW); + } + + $permissions[$account->uid][$group->language] = $permission; } } } Index: l10n_remote/l10n_remote.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_remote/Attic/l10n_remote.module,v retrieving revision 1.1.2.3 diff -u -p -u -p -r1.1.2.3 l10n_remote.module --- l10n_remote/l10n_remote.module 30 Sep 2009 12:17:09 -0000 1.1.2.3 +++ l10n_remote/l10n_remote.module 10 Nov 2009 13:04:25 -0000 @@ -142,8 +142,8 @@ function l10n_remote_xmlrpc_string_submi return array('status' => FALSE, 'reason' => 'Language not accepted.'); } - // Check if the user has permission to submit strings in this language. - if (l10n_community_get_permission($langcode, $account) == L10N_PERM_NONE) { + // Check if the user has permission to submit strings in this language. + if (!(l10n_community_get_permission($langcode, $account) & L10N_PERM_SUGGEST)) { //watchdog('l10n_community', 'Not allowed to submit translations in this language remotely.', NULL, WATCHDOG_WARNING); return array('status' => FALSE, 'reason' => 'Not allowed to submit translations in this language.'); }