# This patch file was generated by NetBeans IDE # This patch can be applied using context Tools: Apply Diff Patch action on respective folder. # It uses platform neutral UTF-8 encoding. # Above lines and this line are ignored by the patching process. Index: contributions/modules/article/article.module --- contributions/modules/article/article.module Base (1.23.2.5.2.1.2.13.2.3) +++ contributions/modules/article/article.module Locally Modified (Based On 1.23.2.5.2.1.2.13.2.3) @@ -2,62 +2,68 @@ // $Id: article.module,v 1.23.2.5.2.1.2.13.2.3 2009/01/01 19:07:42 msameer Exp $ /** - Article Module - an easy to use integrated article management module. + * @file + * Article Module - an easy to use integrated article management module. + * + * The article module allows for articles to be organized and displayed in + * a cenrtalized location. In essence it is a specialized taxonomy display + * module with some specific features that make it sutible for articles. + * + * @author Nicholas Young-Soares + * @author Mohammed Sameer + * @package module_article + * + * @defgroup module_article an easy to use intergrated article management module. + * @{ + */ - The article module allows for articles to be organized and displayed in - a cenrtalized location. In essence it is a specialized taxonomy display - module with some specific features that make it sutible for articles. - - @author Nicholas Young-Soares - @author Mohammed Sameer - @package module_article - - @defgroup module_article an easy to use intergrated article management module. - @{ -**/ - /** - * implementation of hook_theme() + * Implementation of hook_theme(); */ - function article_theme() { return array( 'article_index' => array( 'arguments' => array( - 'name' => NULL, 'index_list' => NULL + 'name' => NULL, + 'index_list' => NULL, ) ), - 'article_list' => array( - 'arguments' => array('output' => NULL) + 'arguments' => array( + 'output' => NULL, + ) ), - 'article_index_item' => array( - 'arguments' => array('term' => NULL) + 'arguments' => array( + 'term' => NULL, + ) ), - 'article_more_info' => array( - 'arguments' => array('content' => NULL) + 'arguments' => array( + 'content' => NULL, + ) ), ); } /** - * implementation of hook_block() + * Implementation of hook_block(); */ function article_block($op = 'list', $delta = 0, $edit = array()) { switch ($op) { case 'list': return array(array('info' => t('Latest Articles'))); + break; case 'view': $content = module_invoke('node', 'title_list', article_get_latest(variable_get('article_recent_block', '5'))); $content .= theme('article_more_info', l(t('more'), 'article', array('title' => t('Read more articles.')))); - return array('subject' => t(variable_get('article_block_title', 'Latest Articles')), - 'content' => $content); + return array('subject' => t(variable_get('article_block_title', 'Latest Articles')), 'content' => $content); + break; case 'configure': return _article_block_configure(); + break; case 'save': variable_set('article_recent_block', $edit['article_recent_block']); @@ -67,7 +73,7 @@ } /** - * implementation of hook_help() + * Implementation of hook_help(); */ function article_help($section) { switch ($section) { @@ -77,25 +83,26 @@ } /** - * implementation of hook_menu() + * Implementation of hook_menu(); */ function article_menu() { $items = array(); $items['article'] = array( - 'title' => t(variable_get('article_title', 'Articles')), + 'title' => variable_get('article_title', 'Articles'), 'page callback' => 'article_page', 'access callback' => 'user_access', 'access arguments' => array('access content'), ); $items['admin/settings/article'] = array( - 'title' => t('Article'), - 'description' => t('Administer settings for Article'), + 'title' => 'Article', + 'description' => 'Administer settings for Article', 'page callback' => 'drupal_get_form', 'page arguments' => array('article_admin_settings'), 'access callback' => 'user_access', 'access arguments' => array('administer site configuration'), ); + return $items; } @@ -137,7 +144,6 @@ '#default_value' => variable_get('article_index_depth', 'all'), '#description' => t('Defines how many levels of terms should be displayed on any given article index page. For example, if you select 1 then only one level of the Article index tree will be displayed at a time.'), ); - $form['article_categories_title'] = array( '#type' => 'textfield', '#title' => t('Categories Title'), @@ -176,7 +182,7 @@ $form['article_pathauto'] = array( '#type' => 'checkbox', '#title' => t('Enable pathauto integration'), - '#default_value' => variable_get('article_pathauto', false), + '#default_value' => variable_get('article_pathauto', FALSE), '#description' => t('Use the pathauto module to create links to article categories.') ); @@ -203,9 +209,7 @@ if ($term) { $article_index_output = article_index($term->tid); - $output = $article_index_output ? theme('box', t('%term_name - Sub Categories', - array('%term_name' => $term->name)), - $article_index_output) : ''; + $output = $article_index_output ? theme('box', t('%term_name - Sub Categories', array('%term_name' => $term->name)), $article_index_output) : ''; $output .= taxonomy_render_nodes(taxonomy_select_nodes(array($term->tid), 'or', variable_get('article_index_depth', 'all'))); return $output; } @@ -214,18 +218,18 @@ return ''; } } - else if (arg(1)) { + elseif (arg(1)) { drupal_goto('article'); } else { if (variable_get('article_recent_box_enable', 1)) { $feed = drupal_add_feed(url('article/feed'), t('Articles')); $body = theme('box', t(variable_get('article_recent_box_title', 'Latest Articles')), - node_title_list(article_get_latest(variable_get('article_recent_display', '5'))). + node_title_list(article_get_latest(variable_get('article_recent_display', '5'))) . theme('article_more_info', $feed['article/feed'])); } $content = article_index(); - return $body.theme('box', t(variable_get('article_categories_title', 'Article Categories')), $content); + return $body . theme('box', t(variable_get('article_categories_title', 'Article Categories')), $content); } } @@ -272,7 +276,7 @@ do { $cur = current($tree); $nex = next($tree); - if ($nex === false) { + if ($nex === FALSE) { $next_depth = -1; } else { @@ -288,7 +292,7 @@ // sync $next_depth, because 'next item' may be shoved forward // Thanks for the patch Roderik. $nex = current($tree); - if ($nex === false) { + if ($nex === FALSE) { $next_depth = -1; } else { @@ -352,10 +356,10 @@ /** - Get the latest articles - - @return a database query result. -**/ + * Get the latest articles + * + * @return a database query result. + */ function article_get_latest($count = 0) { $tids = article_get_article_terms(); return article_select_nodes($tids, 'or', 'all', $count); @@ -426,7 +430,7 @@ $parents = array_reverse($parents); foreach ($parents as $term) { - $breadcrumb[] = l(drupal_ucfirst($term->name), 'article/'.$term->tid); + $breadcrumb[] = l(drupal_ucfirst($term->name), 'article/'. $term->tid); } drupal_set_breadcrumb($breadcrumb); return $term; @@ -440,7 +444,7 @@ Article module specific theme functions. @{ -**/ + */ /** @@ -450,7 +454,7 @@ */ function theme_article_index(&$name, &$index_list) { if ($index_list) { - return "
'. $term->description .'
' : ''; if ($term->count > 0) { - return '