';
if (isset($_GET['sort'])) {
$value = '';
@@ -513,7 +524,7 @@ function biblio_show_results($nodes, $query_info, $inline = FALSE) {
if (strpos($_GET['q'],'ag') ||
strpos($_GET['q'],'tg') ||
strpos($_GET['q'],'keyword')) {
- $value = substr($_GET['q'],strrpos($_GET['q'],'/') + 1);
+ $value = substr($_GET['q'], strrpos($_GET['q'], '/') + 1);
}
$content .= theme('biblio_alpha_line', $_GET['sort'], $value);
}
@@ -525,10 +536,15 @@ function biblio_show_results($nodes, $query_info, $inline = FALSE) {
foreach ($nodes as $node) {
$count++;
- if (is_array($node)) $node = (object)$node;
- if (variable_get('biblio_hide_bibtex_braces', 0)) $node->title = biblio_remove_brace($node->title);
- if (variable_get('biblio_fix_isi_links', 0)) biblio_fix_isi_links($node);
-
+ if (is_array($node)) {
+ $node = (object) $node;
+ }
+ if (variable_get('biblio_hide_bibtex_braces', 0)) {
+ $node->title = biblio_remove_brace($node->title);
+ }
+ if (variable_get('biblio_fix_isi_links', 0)) {
+ biblio_fix_isi_links($node);
+ }
// Add a separator bar if needed.
$content .= _biblio_category_separator_bar($attrib, $node);
@@ -576,9 +592,12 @@ function _biblio_sort_tabs($attrib, $options = NULL) {
$content = '';
$sort_links = array();
$tabs = variable_get('biblio_sort_tabs_style', 0);
- // What is the default for $order in event $attrib['order'] not defined?
- $order = ($attrib['order'] == "desc" || $attrib['order'] == "DESC") ? "asc" : "desc";
- $cur_order = ($attrib['order'] == "desc" || $attrib['order'] == "DESC") ? "desc" : "asc";
+ $order = 'desc';
+ $cur_order = 'asc';
+ if (isset($attrib['order']) && (strtolower($attrib['order'] == "desc"))) {
+ $order = 'asc';
+ $cur_oreder = 'desc';
+ }
$path = drupal_get_path('module', 'biblio');
$order_arrow = ($order == 'asc')
? ' 
'
@@ -598,7 +617,7 @@ function _biblio_sort_tabs($attrib, $options = NULL) {
$tab['attributes'] = array("title"=>t("Click a second time to reverse the sort order"));
$tab['html'] = TRUE;
$tab['text'] = t(ucfirst($title));
- if ($key === $title && $title == $attrib['sort']) {
+ if ($key === $title && isset($attrib['sort']) && $title == $attrib['sort']) {
$tab['query'] = array('sort' => $title, 'order' => $order);
$tab['attributes'] += array('class' => "active");
$tab['active'] = TRUE;
@@ -715,7 +734,7 @@ function _biblio_filter_info_line($args) {
}
}
array_shift($args);
- $params = array('%a' => check_plain(ucwords($type)) , '%b' => check_plain($value) );
+ $params = array('%a' => check_plain(ucwords($type)) , '%b' => check_plain($value) );
$filtercontent .= ($i++ ? t(' and %a is %b', $params) : t('%a is %b', $params)) ;
}
if ($search_content) {
@@ -733,17 +752,17 @@ function _biblio_filter_info_line($args) {
$link_options = array();
$link_options['query'] = '';
if (isset($_GET['sort'])) {
- $link_options['query'] .= "sort=" . $_GET['sort'];
+ $link_options['query'] .= "sort=" . $_GET['sort'];
}
if (isset($_GET['order'])) {
- $link_options['query'] .= $link_options['query'] ? "&" : "" ;
- $link_options['query'] .= "order=" . $_GET['order'];
+ $link_options['query'] .= $link_options['query'] ? "&" : "" ;
+ $link_options['query'] .= "order=" . $_GET['order'];
}
if ($search_content) {
- $content .= ' '.l('['.t('Reset Search').']',"$base/filter/clear", $link_options);
+ $content .= ' ' . l('[' . t('Reset Search') . ']', "$base/filter/clear", $link_options);
} else {
- $content .= ' '.l('['.t('Clear All Filters').']',"$base/filter/clear", $link_options);
+ $content .= ' ' . l('[' . t('Clear All Filters') . ']',"$base/filter/clear", $link_options);
}
$content .= '
';
}
@@ -785,7 +804,7 @@ function _biblio_category_separator_bar($attrib, $node, $reset = FALSE) {
case 'author':
if ( (isset($node->biblio_contributors[1][0]['lastname'])) &&
(drupal_substr(drupal_ucfirst(ltrim($node->biblio_contributors[1][0]['lastname'])), 0, 1) != $_text)) {
- if ($_text != '' ) {
+ if ($_text != '') {
$content .= theme_biblio_end_category_section();
}
$_text = drupal_substr(drupal_ucfirst(ltrim($node->biblio_contributors[1][0]['lastname'])), 0, 1);
@@ -795,7 +814,7 @@ function _biblio_category_separator_bar($attrib, $node, $reset = FALSE) {
case 'type':
if ($node->biblio_type_name != $_text) {
- if ($_text != '' ) {
+ if ($_text != '') {
$content .= theme_biblio_end_category_section();
}
$_text = $node->biblio_type_name;
@@ -843,8 +862,8 @@ function _biblio_category_separator_bar($attrib, $node, $reset = FALSE) {
*
*/
function theme_biblio_separator_bar($text) {
- $content = "\n".'\n";
- $content .= "\n".''
@@ -598,7 +617,7 @@ function _biblio_sort_tabs($attrib, $options = NULL) {
$tab['attributes'] = array("title"=>t("Click a second time to reverse the sort order"));
$tab['html'] = TRUE;
$tab['text'] = t(ucfirst($title));
- if ($key === $title && $title == $attrib['sort']) {
+ if ($key === $title && isset($attrib['sort']) && $title == $attrib['sort']) {
$tab['query'] = array('sort' => $title, 'order' => $order);
$tab['attributes'] += array('class' => "active");
$tab['active'] = TRUE;
@@ -715,7 +734,7 @@ function _biblio_filter_info_line($args) {
}
}
array_shift($args);
- $params = array('%a' => check_plain(ucwords($type)) , '%b' => check_plain($value) );
+ $params = array('%a' => check_plain(ucwords($type)) , '%b' => check_plain($value) );
$filtercontent .= ($i++ ? t(' and %a is %b', $params) : t('%a is %b', $params)) ;
}
if ($search_content) {
@@ -733,17 +752,17 @@ function _biblio_filter_info_line($args) {
$link_options = array();
$link_options['query'] = '';
if (isset($_GET['sort'])) {
- $link_options['query'] .= "sort=" . $_GET['sort'];
+ $link_options['query'] .= "sort=" . $_GET['sort'];
}
if (isset($_GET['order'])) {
- $link_options['query'] .= $link_options['query'] ? "&" : "" ;
- $link_options['query'] .= "order=" . $_GET['order'];
+ $link_options['query'] .= $link_options['query'] ? "&" : "" ;
+ $link_options['query'] .= "order=" . $_GET['order'];
}
if ($search_content) {
- $content .= ' '.l('['.t('Reset Search').']',"$base/filter/clear", $link_options);
+ $content .= ' ' . l('[' . t('Reset Search') . ']', "$base/filter/clear", $link_options);
} else {
- $content .= ' '.l('['.t('Clear All Filters').']',"$base/filter/clear", $link_options);
+ $content .= ' ' . l('[' . t('Clear All Filters') . ']',"$base/filter/clear", $link_options);
}
$content .= '';
+ $content = "\n" . '\n";
+ $content .= "\n" . '
';
return $content;
}
@@ -1073,10 +1092,11 @@ function _get_biblio_filters() {
* @return array $form
* An assoicative array with form elements for the biblio content filter.
*
- * @see biblio_form_filter_submit()
+ * @see biblio_filter_form_submit()
+ *
* @ingroup forms
*/
-function biblio_form_filter() {
+function biblio_filter_form() {
// No longer use &$_SESSION so that we can alter $session in case of the search filter.
$session = $_SESSION['biblio_filter'];
$session = is_array($session) ? $session : array();
@@ -1090,7 +1110,8 @@ function biblio_form_filter() {
);
foreach ($session as $filter) {
list($type, $value) = $filter;
- // Don't show the search filter. Reset $session because of the $count(session) below.
+ // Don't show the search filter. Reset $session because of the
+ // $count(session) below.
if ($type == 'search') {
$session = array();
break;
@@ -1127,9 +1148,9 @@ function biblio_form_filter() {
}
/**
- * Form submission handler for biblio_form_filter().
+ * Form submission handler for biblio_filter_form().
*/
-function biblio_form_filter_submit($form, &$form_state) {
+function biblio_filter_form_submit($form, &$form_state) {
// If the search filter was set, remove it now.
if(_get_biblio_search_filter()){
$_SESSION['biblio_filter'] = array ();
@@ -1469,7 +1490,7 @@ function _biblio_get_keywords($filter = NULL) {
$keywords = array();
$where = array();
$where_clause = '';
-
+
if ($filter) {
$filter = strtoupper($filter);
$where[] = "UPPER(SUBSTRING(word,1,1)) = '%s' ";
diff --git a/includes/biblio_theme.inc b/includes/biblio_theme.inc
index 88d22d2..158398a 100644
--- a/includes/biblio_theme.inc
+++ b/includes/biblio_theme.inc
@@ -1,28 +1,32 @@
';
+ // @todo: Add CSS class or ID for targetting format via CSS.
+ $name = isset($element['#name']) ? $element['#name'] : '';
+ $value = isset($element['#value']) ? $element['#value'] : '';
+ $output = '';
+ return $output;
}
/**
*
*
* @param object $node
- *
+ * A node object possibly with biblio_baseopenurl property.
*
* @ingroup themeable
*/
@@ -93,8 +97,8 @@ function biblio_openURL($node) {
$query[$coKey] = rawurlencode($coValue);
}
- $sid = "biblio:". variable_get('site_name', 'Drupal');
- $user_sid = !empty($user->biblio_openurl_sid)?$user->biblio_openurl_sid:'';
+ $sid = "biblio:" . variable_get('site_name', 'Drupal');
+ $user_sid = !empty($user->biblio_openurl_sid) ? $user->biblio_openurl_sid : '';
$query["sid"] = !empty($user_sid) ? check_plain($user_sid) : check_plain(variable_get('biblio_openurl_sid', $sid));
return $query;
@@ -257,7 +261,7 @@ function theme_biblio_tabular($node, $base = 'biblio', $teaser = false) {
$attrib = (variable_get('biblio_links_target_new_window', null)) ? array('target' => '_blank') : array();
if ( ($doi_start = strpos($node->biblio_doi, '10.')) !== FALSE) {
$doi = substr($node->biblio_doi, $doi_start);
- $doi_url .= 'http://dx.doi.org/'. $doi;
+ $doi_url .= 'http://dx.doi.org/' . $doi;
}
$node->biblio_doi = l($node->biblio_doi, $doi_url, $attrib);
}
@@ -267,7 +271,7 @@ function theme_biblio_tabular($node, $base = 'biblio', $teaser = false) {
if ($row['type'] == 'contrib_widget' && !empty($node->biblio_contributors[$row['fid']][0]['name']) ) {
$data = biblio_format_authors($node->biblio_contributors[$row['fid']]);
}
- elseif (empty ($node->$row['name']) || $row['name'] == 'biblio_coins') {
+ elseif (empty($node->$row['name']) || $row['name'] == 'biblio_coins') {
continue;
}
else {
@@ -275,12 +279,14 @@ function theme_biblio_tabular($node, $base = 'biblio', $teaser = false) {
case 'biblio_keywords' :
$data = _biblio_keyword_links($node->$row['name'], $base);
break;
+
case 'biblio_url' :
case 'biblio_doi' :
// check_plain is not need on these since they have gone through
// the l() function which does a check_plain
$data = $node-> $row['name'];
break;
+
default :
if ($row['type'] == 'textarea') {
$format = isset($node->biblio_formats[$row['name']]) ? $node->biblio_formats[$row['name']] : $node->format;
@@ -289,27 +295,26 @@ function theme_biblio_tabular($node, $base = 'biblio', $teaser = false) {
else {
$data = check_plain($node-> $row['name']);
}
+ break;
}
}
$rows[] = array(
- array(
+ array(
'data' => t($row['title']),
- 'class' => 'biblio-row-title biblio-field-title-'.str_replace('_', '-', str_replace('biblio_', '', $row['name']))
- ),
- array(
+ 'class' => 'biblio-row-title biblio-field-title-' . str_replace('_', '-', str_replace('biblio_', '', $row['name'])),
+ ),
+ array(
'data' => $data,
- 'class' => 'biblio-field-contents-'.str_replace('_', '-', str_replace('biblio_', '', $row['name']))
- )
+ 'class' => 'biblio-field-contents-' . str_replace('_', '-', str_replace('biblio_', '', $row['name'])),
+ ),
);
}
-
if (strlen(trim($node->body)) && user_access('view full text')) {
$rows[] = array(
- array('data' => t('Full Text'), 'valign' => 'top'),
- array('data' => check_markup($node->body, $node->format, FALSE))
+ array('data' => t('Full Text'), 'valign' => 'top'),
+ array('data' => check_markup($node->body, $node->format, FALSE))
);
-
}
$output = '
';
$output .= filter_xss($node->biblio_coins, array('span'));
@@ -336,7 +341,7 @@ function theme_biblio_tabular($node, $base = 'biblio', $teaser = false) {
* @ingroup themeable
*/
function theme_biblio_authors($contributors, $style = 'classic', $cat = 1, $inline = false, $glue = ', ') {
- // Immediately return if there are no contributors
+ // Immediately return if there are no contributors.
if (empty($contributors)) {
// @todo: Shouldn't this return any empty string?
return;
@@ -867,18 +872,18 @@ function theme_biblio_style($node, $base = 'biblio', $style_name = 'classic', $i
* @ingroup themeable
*/
function theme_biblio_entry($node, $base = 'biblio', $style = 'classic', $inline = false) {
- $output = "\n".'
' . "\n" ;
- $output .= '
' . "\n" ;
+ $output = "\n" . '
' . "\n" ;
+ $output .= '
";
-
return $output;
}
/**
+ * Returns HTML string for the filter in biblio_filter_form.
*
+ * @param array $form
+ * A form array with keys that defines the filter form and its elements.
*
- * @param $form
- *
- * @see biblio_filters()
+ * @see biblio_filter_form()
*
* @ingroup themeable
*/
function theme_biblio_filters($form) {
$output = '';
- if (sizeof($form['current'])) {
+ $size = isset($form['current']) ? count($form['current']) : 0;
+ if ($size > 0) {
$output .= '' . "\n" ;
if (!$node->status) {
$output .= '
';
}
- // first add the styled entry...
+ // First add the styled entry...
$output .= theme('biblio_style', $node, $base, $style, $inline);
- // now add the various links
+ // Now add the various links.
if ($node->biblio_abst_e) {
$output .= '';
- $output .= l(" Abstract", "node/$node->nid") ."\n";
+ $output .= l(" Abstract", "node/$node->nid") . "\n";
$output .= '';
}
$annotation_field = variable_get('biblio_annotations', 'none');
@@ -894,46 +899,47 @@ function theme_biblio_entry($node, $base = 'biblio', $style = 'classic', $inline
}
if (biblio_access('export', $node)) {
- $output .= theme('biblio_export_links',$node);
+ $output .= theme('biblio_export_links', $node);
}
if (biblio_access('download', $node)) {
// add links to attached files (if any)
- $output .= theme('biblio_download_links',$node);
+ $output .= theme('biblio_download_links', $node);
}
if (!$node->status) {
$output .= '
';
}
$output .= "\n- ';
foreach (element_children($form['current']) as $key) {
$output .= '
- ' . drupal_render($form['current'][$key]) . ' '; } $output .= '
- ' . (sizeof($form['current']) ? '
- ' . t('and') . ' ' . t('where') . ' ' : '') . '
- ';
+ $output .= '
- ' . (($size > 0) ? '
- ' . t('and') . ' ' . t('where') . ' ' : '') . '
- '; foreach (element_children($form['filter']) as $key) { $output .= drupal_render($form['filter'][$key]); } $output .= ' '; - $output .= '
- '. t('is') .'
- '; + $output .= '
- ' . t('is') . '
- '; foreach (element_children($form['status']) as $key) { $output .= drupal_render($form['status'][$key]); } @@ -945,9 +951,12 @@ function theme_biblio_filters($form) { } /** + * Returns HTML string for complete biblio_filter_form. + * @param $form + * A form array with keys that defines the filter form and its elements. * - * @see biblio_admin_types_edit_form() + * @see biblio_filter_form() * * @ingroup themeable */