diff --git a/view_alias.module b/view_alias.module index a64acec..695cca9 100644 --- a/view_alias.module +++ b/view_alias.module @@ -8,7 +8,7 @@ */ /** - * Implementation of hook_pathauto(). + * Implementation of hook_pathauto() */ function view_alias_pathauto($op) { switch ($op) { @@ -17,14 +17,16 @@ function view_alias_pathauto($op) { $settings['module'] = 'view_alias'; $settings['token_type'] = 'view_alias'; $settings['groupheader'] = t('View Alias settings'); - $settings['patterndescr'] = t('Default View Alias pattern (applies to all views with a term argument and page display)'); - $settings['patterndefault'] = t(''); + $settings['patterndescr'] = t('Default View Alias pattern + (applies to all views with a term argument and page display)'); + $settings['patterndefault'] = ''; $settings['bulkname'] = t('Bulk generate aliases for views with term arguments that are not aliased'); - $settings['bulkdescr'] = t('Generate aliases for all existing views with term arguments which do not already have aliases.'); + $settings['bulkdescr'] = t('Generate aliases for all existing views with term arguments + which do not already have aliases.'); // left out patterns since we dont use them. $settings['placeholders'] = array( t('[cat-raw]'), t('The View argument taxonomy name')); - + $settings['patternitems'] = array(); return (object) $settings; @@ -41,7 +43,6 @@ function view_alias_pathauto($op) { function view_alias_pathauto_bulkupdate() { $aliasable = _get_aliasable_displays(); - foreach ($aliasable as $alias) { if (variable_get("pathauto_view_alias_{$alias->path}", FALSE)) { $terms = _gather_terms_for_alias($alias->varg); @@ -57,7 +58,7 @@ function _gather_terms_for_alias($validator_vocab_ids) { $vocabs = explode(",", $validator_vocab_ids); $terms_to_alias = array(); - + foreach($vocabs as $vocab) { $terms = taxonomy_get_tree($vocab); $terms_to_alias = array_merge($terms_to_alias, $terms); @@ -75,10 +76,10 @@ function _gather_terms_for_alias($validator_vocab_ids) { function view_alias_path_alias_types() { $aliasable = _get_aliasable_displays(); foreach($aliasable as $alias) { - $objects["$alias->path"] = t("View page displays having a path of '$alias->path'"); + $objects[$alias->path] = t('View page displays having a path of %path', array('%path' => $alias->path)); } - return $objects; + return $objects; } /** @@ -90,7 +91,7 @@ function view_alias_path_alias_types() { */ function view_alias_form_alter(&$form, $form_state, $form_id) { if($form_id == 'pathauto_admin_settings') { - + unset($form['view_alias']['pathauto_view_alias_pattern']); unset($form['view_alias']['token_help']); $form['view_alias']['views_to_alias'] = array( @@ -105,7 +106,14 @@ function view_alias_form_alter(&$form, $form_state, $form_id) { $voc = taxonomy_vocabulary_load($alias->varg); $form['view_alias']['views_to_alias']["pathauto_view_alias_{$alias->path}"] = array( '#type' => 'checkbox', - '#title' => t("View $alias->view_name, display $alias->display_name, on path $alias->path, with $voc->name arguments."), + '#title' => t('View %view, display %display, on path %path, with %vocab arguments.', + array( + '%view' => $alias->view_name, + '%display' => $alias->display_name, + '%path' => $alias->path, + '%vocab' => $voc->name + ) + ), '#weight' => -1, '#default_value' => variable_get("pathauto_view_alias_{$alias->path}", 0), ); @@ -140,7 +148,7 @@ function view_alias_create_alias($term, $alias, $op) { module_load_include('inc', 'pathauto'); // switch around the pattern based on if the term id is contained within the new alias - if (strpos($alias->path, '%') === FALSE) { + if (strpos($alias->path, '%') === FALSE) { $source = "$alias->path/$term->tid"; $GLOBALS['conf']['pathauto_view_alias_pattern'] = $alias->path."/[cat-raw]"; } @@ -148,12 +156,12 @@ function view_alias_create_alias($term, $alias, $op) { $source = str_replace('%', $term->tid, $alias->path); $GLOBALS['conf']['pathauto_view_alias_pattern'] = str_replace('%', '[cat-raw]', $alias->path); } - + $placeholders = array( 'tokens' => array(t('[cat-raw]')), 'values' => array(pathauto_cleanstring($term->name)), ); - + $alias_path = pathauto_create_alias('view_alias', $op, $placeholders, $source, $alias->path); unset($GLOBALS['conf']['pathauto_view_alias_pattern']); return $alias_path; @@ -171,7 +179,8 @@ function view_alias_delete_alias($term, $alias) { * * find the views that can be aliased. * that means have a path url and use a term id as an argument - * build and array of objects, keyed with the view name, having the view path, and the vocab id for the terms used + * build and array of objects, keyed with the view name, + * having the view path, and the vocab id for the terms used * array( * 0 => * object ( @@ -187,18 +196,18 @@ function _get_aliasable_displays() { $sql = "SELECT DISTINCT(vv.name) FROM {views_view} vv JOIN {views_display} vd "; $sql .= "ON vv.vid = vd.vid where vd.display_plugin = 'page'"; - + $result = db_query($sql); while($row = db_fetch_object($result)) { $aview = views_get_view($row->name); $alias = NULL; $alias->view_name = $row->name; $default_vocab_arg; - + foreach($aview->display as $key => $display) { // check default for args and save for later $alias->display_name = $key; - + if($key == 'default') { $alias->varg = _find_view_arguments($display); continue; @@ -206,13 +215,13 @@ function _get_aliasable_displays() { // its some sort of page cause the query says so. else { // add the page and replace overridden args. - $alias->path = $display->display_options['path']; + $alias->path = $display->display_options['path']; $overridden = _find_view_arguments($display); - if($overridden) { + if($overridden) { $alias->varg = $overridden; } } - if(!empty($alias->path) && !empty($alias->varg)) + if(!empty($alias->path) && !empty($alias->varg)) $aliasable_views[] = drupal_clone($alias); } @@ -227,14 +236,14 @@ function _get_aliasable_displays() { function _find_view_arguments($display) { $dis_args = $display->display_options['arguments']['tid']; // array_sum is used since if no vocabularies are selected, the sum of the argumets will be 0 - // and we need to make sure there is a vocabular set. - - if($dis_args['validate_argument_type'] == 'tid' && array_sum($dis_args['validate_argument_vocabulary']) > 0) { + // and we need to make sure there is a vocabular set + if($dis_args['validate_argument_type'] == 'tid' && + array_sum($dis_args['validate_argument_vocabulary']) > 0) { // remove zero entries $no_zeroes = array_diff($dis_args['validate_argument_vocabulary'], array(0)); - + $view_args = implode(",", $no_zeroes); return $view_args; } return FALSE; -} +} \ No newline at end of file