Commit 5622bce2 authored by Gábor Hojtsy's avatar Gábor Hojtsy

#198579 by webernet and hswong3i: a huge set of coding style fixes, including:

 - whitespaces at end of lines
 - indentation
 - control structure usage
 - whitespace in empty lines
 - phpdoc comment formatting
parent aaaf8f57
......@@ -2,9 +2,9 @@
// $Id$
/**
* @file
* This is the actions engine for executing stored actions.
*/
* @file
* This is the actions engine for executing stored actions.
*/
/**
* Perform a given list of actions by executing their callback functions.
......
......@@ -291,7 +291,7 @@ function _batch_finished() {
$batch =& batch_get();
// Execute the 'finished' callbacks for each batch set.
foreach($batch['sets'] as $key => $batch_set) {
foreach ($batch['sets'] as $key => $batch_set) {
if (isset($batch_set['finished'])) {
// Check if the set requires an additional file for functions definitions.
if (isset($batch_set['file']) && is_file($batch_set['file'])) {
......
......@@ -521,7 +521,7 @@ function bootstrap_invoke_all($hook) {
foreach (module_list(TRUE, TRUE) as $module) {
drupal_load('module', $module);
module_invoke($module, $hook);
}
}
}
/**
......@@ -786,7 +786,7 @@ function drupal_get_messages($type = NULL, $clear_queue = TRUE) {
if ($messages = drupal_set_message()) {
if ($type) {
if ($clear_queue) {
unset($_SESSION['messages'][$type]);
unset($_SESSION['messages'][$type]);
}
if (isset($messages[$type])) {
return array($type => $messages[$type]);
......@@ -794,7 +794,7 @@ function drupal_get_messages($type = NULL, $clear_queue = TRUE) {
}
else {
if ($clear_queue) {
unset($_SESSION['messages']);
unset($_SESSION['messages']);
}
return $messages;
}
......
......@@ -1319,7 +1319,7 @@ function url($path = NULL, $options = array()) {
// Will be empty if there is no language prefix.
$path = trim($options['prefix'], '/');
}
if ($clean_url) {
// With Clean URLs.
if ($options['query']) {
......@@ -1337,7 +1337,7 @@ function url($path = NULL, $options = array()) {
}
if (!empty($options['query'])) {
$variables[] = $options['query'];
}
}
if ($query = join('&', $variables)) {
return $base . $script .'?'. $query . $options['fragment'];
}
......@@ -1757,7 +1757,7 @@ function drupal_build_css_cache($types, $filename) {
/**
* Helper function for drupal_build_css_cache().
*
*
* This function will prefix all paths within a CSS file.
*/
function _drupal_build_css_path($matches, $base = NULL) {
......@@ -1835,7 +1835,7 @@ function drupal_load_stylesheet($file, $optimize = NULL) {
/**
* Loads stylesheets recursively and returns contents with corrected paths.
*
*
* This function is used for recursive loading of stylesheets and
* returns the stylesheet content with all url() paths corrected.
*/
......@@ -1914,7 +1914,7 @@ function drupal_add_js($data = NULL, $type = 'module', $scope = 'header', $defer
static $javascript = array();
if (isset($data)) {
// Add jquery.js and drupal.js the first time a Javascript file is added.
if (empty($javascript)) {
$javascript['header'] = array(
......@@ -1925,7 +1925,7 @@ function drupal_add_js($data = NULL, $type = 'module', $scope = 'header', $defer
'module' => array(), 'theme' => array(), 'setting' => array(), 'inline' => array(),
);
}
if (isset($scope) && !isset($javascript[$scope])) {
$javascript[$scope] = array('core' => array(), 'module' => array(), 'theme' => array(), 'setting' => array(), 'inline' => array());
}
......@@ -1933,7 +1933,7 @@ function drupal_add_js($data = NULL, $type = 'module', $scope = 'header', $defer
if (isset($type) && isset($scope) && !isset($javascript[$scope][$type])) {
$javascript[$scope][$type] = array();
}
switch ($type) {
case 'setting':
$javascript[$scope][$type][] = $data;
......@@ -1948,7 +1948,7 @@ function drupal_add_js($data = NULL, $type = 'module', $scope = 'header', $defer
}
if (isset($scope)) {
if (isset($javascript[$scope])) {
return $javascript[$scope];
}
......
......@@ -514,7 +514,7 @@ function db_change_field(&$ret, $table, $field, $field_new, $spec, $keys_new = a
$sql = 'ALTER TABLE {'. $table .'} CHANGE '. $field .' '.
_db_create_field_sql($field_new, _db_process_field($spec));
if (count($keys_new)) {
$sql .= ', ADD '.implode(', ADD ', _db_create_keys_sql($keys_new));
$sql .= ', ADD '. implode(', ADD ', _db_create_keys_sql($keys_new));
}
$ret[] = update_sql($sql);
}
......
......@@ -74,7 +74,7 @@ function db_connect($url) {
// Allow for non-standard MySQL port.
if (isset($url['port'])) {
$url['host'] = $url['host'] .':'. $url['port'];
$url['host'] = $url['host'] .':'. $url['port'];
}
// - TRUE makes mysql_connect() always open a new link, even if
......
......@@ -203,16 +203,16 @@ function db_fetch_array($result) {
}
/**
* Return an individual result field from the previous query.
*
* Only use this function if exactly one field is being selected; otherwise,
* use db_fetch_object() or db_fetch_array().
*
* @param $result
* A database query result resource, as returned from db_query().
* @return
* The resulting field or FALSE.
*/
* Return an individual result field from the previous query.
*
* Only use this function if exactly one field is being selected; otherwise,
* use db_fetch_object() or db_fetch_array().
*
* @param $result
* A database query result resource, as returned from db_query().
* @return
* The resulting field or FALSE.
*/
function db_result($result) {
if ($result && mysqli_num_rows($result) > 0) {
// The mysqli_fetch_row function has an optional second parameter $row
......
......@@ -415,7 +415,7 @@ function drupal_process_form($form_id, &$form, &$form_state) {
// however, we'll skip this and let the calling function examine
// the resulting $form_state bundle itself.
if (!$form['#programmed'] && empty($form_state['rebuild']) && empty($form_state['storage'])) {
drupal_redirect_form($form, $form_state['redirect']);
drupal_redirect_form($form, $form_state['redirect']);
}
}
}
......@@ -1432,7 +1432,7 @@ function theme_fieldset($element) {
$element['#attributes']['class'] .= ' collapsible';
if ($element['#collapsed']) {
$element['#attributes']['class'] .= ' collapsed';
$element['#attributes']['class'] .= ' collapsed';
}
}
......
......@@ -35,7 +35,7 @@ function drupal_test_mysql($url, &$success) {
// Allow for non-standard MySQL port.
if (isset($url['port'])) {
$url['host'] = $url['host'] .':'. $url['port'];
$url['host'] = $url['host'] .':'. $url['port'];
}
// Test connecting to the database.
......
......@@ -106,7 +106,7 @@ function language_url_rewrite(&$path, &$options) {
if (!isset($options['language'])) {
$options['language'] = $language;
}
switch (variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE)) {
case LANGUAGE_NEGOTIATION_NONE:
// No language dependent path allowed in this mode.
......
......@@ -1792,8 +1792,8 @@ function menu_link_save(&$item) {
}
/**
* Helper function to clear the page and block caches at most twice per page load.
*/
* Helper function to clear the page and block caches at most twice per page load.
*/
function _menu_clear_page_cache() {
static $cache_cleared = 0;
......@@ -1814,8 +1814,8 @@ function _menu_clear_page_cache() {
}
/**
* Helper function to update a list of menus with expanded items
*/
* Helper function to update a list of menus with expanded items
*/
function _menu_set_expanded_menus() {
$names = array();
$result = db_query("SELECT menu_name FROM {menu_links} WHERE expanded != 0 GROUP BY menu_name");
......
......@@ -1627,7 +1627,7 @@ function template_preprocess(&$variables, $hook) {
// Tell all templates where they are located.
$variables['directory'] = path_to_theme();
// Set default variables that depend on the database.
$variables['is_admin'] = FALSE;
$variables['is_front'] = FALSE;
......
......@@ -78,7 +78,7 @@ function _theme_load_offline_registry($theme, $base_theme = NULL, $theme_engine
/**
* Return a themed list of maintenance tasks to perform.
*
*
* @ingroup themeable
*/
function theme_task_list($items, $active = NULL) {
......
......@@ -7,7 +7,7 @@
Site: http://scripts.incutio.com/xmlrpc/
Manual: http://scripts.incutio.com/xmlrpc/manual.php
This version is made available under the GNU GPL License
*/
*/
/**
* Recursively turn a data structure into objects with 'data' and 'type' attributes.
......
......@@ -55,7 +55,7 @@ function xmlrpc_server($callbacks) {
$data = file_get_contents('php://input');
if (!$data) {
die('XML-RPC server accepts POST requests only.');
die('XML-RPC server accepts POST requests only.');
}
$xmlrpc_server->message = xmlrpc_message($data);
if (!xmlrpc_message_parse($xmlrpc_server->message)) {
......
......@@ -73,7 +73,7 @@ function aggregator_schema() {
'not null' => TRUE,
'default' => 0,
'description' => t('The {aggregator_category}.cid to which the feed is being assigned.'),
)
)
),
'primary key' => array('fid', 'cid'),
);
......
......@@ -577,7 +577,7 @@ function aggregator_refresh($feed) {
case 302:
case 307:
// Filter the input data:
if (aggregator_parse_feed($result->data, $feed)) {
if (aggregator_parse_feed($result->data, $feed)) {
$modified = empty($result->headers['Last-Modified']) ? 0 : strtotime($result->headers['Last-Modified']);
......
......@@ -39,21 +39,21 @@
define('BLOCK_NO_CACHE', -1);
/**
* The block can change depending on the roles the user viewing the page belongs to.
* This is the default setting, used when the block does not specify anything.
*/
* The block can change depending on the roles the user viewing the page belongs to.
* This is the default setting, used when the block does not specify anything.
*/
define('BLOCK_CACHE_PER_ROLE', 0x0001);
/**
* The block can change depending on the user viewing the page.
* This setting can be resource-consuming for sites with large number of users,
* and thus should only be used when BLOCK_CACHE_PER_ROLE is not sufficient.
*/
* The block can change depending on the user viewing the page.
* This setting can be resource-consuming for sites with large number of users,
* and thus should only be used when BLOCK_CACHE_PER_ROLE is not sufficient.
*/
define('BLOCK_CACHE_PER_USER', 0x0002);
/**
* The block can change depending on the page being viewed.
*/
* The block can change depending on the page being viewed.
*/
define('BLOCK_CACHE_PER_PAGE', 0x0004);
/**
......
......@@ -231,7 +231,7 @@ function theme_book_admin_table($form) {
*/
function _book_admin_sort_tree(&$tree) {
uasort($tree, '_book_admin_compare');
foreach($tree as $key => $subtree) {
foreach ($tree as $key => $subtree) {
if (!empty($tree[$key]['below'])) {
_book_admin_sort_tree($tree[$key]['below']);
}
......
......@@ -159,44 +159,44 @@ function comment_schema() {
'primary key' => array('cid'),
);
$schema['node_comment_statistics'] = array(
'description' => t('Maintains statistics of node and comments posts to show "new" and "updated" flags.'),
'fields' => array(
'nid' => array(
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
'description' => t('The {node}.nid for which the statistics are compiled.'),
),
'last_comment_timestamp' => array(
'type' => 'int',
'not null' => TRUE,
'default' => 0,
'description' => t('The Unix timestamp of the last comment that was posted within this node, from {comments}.timestamp.'),
),
'last_comment_name' => array(
'type' => 'varchar',
'length' => 60,
'not null' => FALSE,
'description' => t('The name of the latest author to post a comment on this node, from {comments}.name.'),
),
'last_comment_uid' => array(
'type' => 'int',
'not null' => TRUE,
'default' => 0,
'description' => t('The user ID of the latest author to post a comment on this node, from {comments}.uid.'),
),
'comment_count' => array(
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
'description' => t('The total number of comments on this node.'),
),
),
'indexes' => array('node_comment_timestamp' => array('last_comment_timestamp')),
'primary key' => array('nid'),
$schema['node_comment_statistics'] = array(
'description' => t('Maintains statistics of node and comments posts to show "new" and "updated" flags.'),
'fields' => array(
'nid' => array(
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
'description' => t('The {node}.nid for which the statistics are compiled.'),
),
'last_comment_timestamp' => array(
'type' => 'int',
'not null' => TRUE,
'default' => 0,
'description' => t('The Unix timestamp of the last comment that was posted within this node, from {comments}.timestamp.'),
),
'last_comment_name' => array(
'type' => 'varchar',
'length' => 60,
'not null' => FALSE,
'description' => t('The name of the latest author to post a comment on this node, from {comments}.name.'),
),
'last_comment_uid' => array(
'type' => 'int',
'not null' => TRUE,
'default' => 0,
'description' => t('The user ID of the latest author to post a comment on this node, from {comments}.uid.'),
),
'comment_count' => array(
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
'description' => t('The total number of comments on this node.'),
),
),
'indexes' => array('node_comment_timestamp' => array('last_comment_timestamp')),
'primary key' => array('nid'),
);
return $schema;
......
......@@ -1050,8 +1050,8 @@ function comment_operations($action = NULL) {
}
/**
*** misc functions: helpers, privates, history
**/
* Misc functions: helpers, privates, history
*/
/**
* Load the entire comment by cid.
......@@ -1318,7 +1318,7 @@ function comment_form(&$form_state, $edit, $title = NULL) {
if (!form_get_errors() && ((variable_get('comment_preview_'. $node->type, COMMENT_PREVIEW_REQUIRED) == COMMENT_PREVIEW_OPTIONAL) || ($op == t('Preview')) || ($op == t('Save')))) {
$form['submit'] = array('#type' => 'submit', '#value' => t('Save'), '#weight' => 19);
}
$form['preview'] = array('#type' => 'button', '#value' => t('Preview'), '#weight' => 20);
$form['#token'] = 'comment'. $edit['nid'] . (isset($edit['pid']) ? $edit['pid'] : '');
......
......@@ -274,7 +274,7 @@ function filter_filter_tips($delta, $format, $long = FALSE) {
}
break;
case 2:
return t('Web page addresses and e-mail addresses turn into links automatically.');
return t('Web page addresses and e-mail addresses turn into links automatically.');
}
}
......
......@@ -190,7 +190,7 @@ function forum_nodeapi(&$node, $op, $teaser, $page) {
if ($parents = taxonomy_get_parents_all($node->tid)) {
$parents = array_reverse($parents);
foreach ($parents as $p) {
$breadcrumb[] = l($p->name, 'forum/'.$p->tid);
$breadcrumb[] = l($p->name, 'forum/'. $p->tid);
}
}
drupal_set_breadcrumb($breadcrumb);
......
......@@ -384,7 +384,7 @@ function node_admin_nodes() {
'#submit' => array('node_admin_nodes_submit'),
);
$languages = language_list();
$languages = language_list();
$destination = drupal_get_destination();
$nodes = array();
while ($node = db_fetch_object($result)) {
......
......@@ -253,7 +253,7 @@ function node_teaser_js(&$form, &$form_state) {
* @param $size
* The desired character length of the teaser. If omitted, the default
* value will be used. Ignored if the special delimiter is present
* in $body.
* in $body.
* @return
* The generated teaser.
*/
......@@ -514,7 +514,7 @@ function _node_types_build() {
// Types defined by the node module in the database (rather than by a separate
// module using hook_node_info) have a module value of 'node'.
if ($type_object->module != 'node' && empty($info_array[$type_object->type])) {
$type_object->disabled = TRUE;
$type_object->disabled = TRUE;
}
if (!isset($_node_types[$type_object->type]) || $type_object->modified) {
$_node_types[$type_object->type] = $type_object;
......
......@@ -384,10 +384,10 @@ function node_preview($node) {
// 'teaser' form item).
if (!isset($node->teaser)) {
$node->teaser = empty($node->body) ? '' : node_teaser($node->body, $node->format);
// Chop off the teaser from the body if needed.
if (!$node->teaser_include && $node->teaser == substr($node->body, 0, strlen($node->teaser))) {
$node->body = substr($node->body, strlen($node->teaser));
}
// Chop off the teaser from the body if needed.
if (!$node->teaser_include && $node->teaser == substr($node->body, 0, strlen($node->teaser))) {
$node->body = substr($node->body, strlen($node->teaser));
}
}
// Display a preview of the node:
......
......@@ -44,7 +44,7 @@ function openid_help($path, $arg) {
case 'user/%/openid':
$output = '<p>'. t('This site supports <a href="@openid-net">OpenID</a>, a secure way to log into many websites using a single username and password. OpenID can reduce the necessity of managing many usernames and passwords for many websites.', array('@openid-net' => url('http://openid.net'))) .'</p>';
$output .= '<p>' . t('To use OpenID you must first establish an identity on a public or private OpenID server. If you do not have an OpenID and would like one, look into one of the <a href="@openid-providers">free public providers</a>. You can find out more about OpenID at <a href="@openid-net">this website</a>.', array('@openid-providers' => url('http://openid.net/wiki/index.php/OpenIDServers'), '@openid-net' => url('http://openid.net'))) .'</p>';
$output .= '<p>'. t('To use OpenID you must first establish an identity on a public or private OpenID server. If you do not have an OpenID and would like one, look into one of the <a href="@openid-providers">free public providers</a>. You can find out more about OpenID at <a href="@openid-net">this website</a>.', array('@openid-providers' => url('http://openid.net/wiki/index.php/OpenIDServers'), '@openid-net' => url('http://openid.net'))) .'</p>';
$output .= '<p>'. t('If you already have an OpenID, enter the URL to your OpenID server below (e.g. myusername.openidprovider.com). Next time you login, you will be able to use this URL instead of a regular username and password. You can have multiple OpenID servers if you like; just keep adding them here.') .'</p>';
return $output;
......
......@@ -117,7 +117,7 @@ function path_set_alias($path = NULL, $alias = NULL, $pid = NULL, $language = ''
}
else {
db_query("DELETE FROM {url_alias} WHERE src = '%s'", $path);
}
}
}
drupal_clear_path_cache();
}
......
......@@ -304,7 +304,7 @@ function _poll_choice_form($delta, $value = '', $votes = 0) {
'#type' => 'textfield',
'#title' => t('Choice @n', array('@n' => ($delta + 1))),
'#default_value' => $value,
'#parents' => array('choice', $delta,'chtext'),
'#parents' => array('choice', $delta, 'chtext'),
);
if ($admin) {
......
......@@ -8,13 +8,13 @@
/**
* Form builder to display a listing of all editable profile fields.
*
*
* @ingroup forms
* @see profile_admin_overview_submit().
*/
function profile_admin_overview(&$form_state = NULL) {
$result = db_query('SELECT title, name, type, category, fid, weight FROM {profile_fields} ORDER BY category, weight');
$form = array();
$categories = array();
while ($field = db_fetch_object($result)) {
......@@ -30,15 +30,15 @@ function profile_admin_overview(&$form_state = NULL) {
$form[$field->fid]['edit'] = array('#value' => l(t('edit'), "admin/user/profile/edit/$field->fid"));
$form[$field->fid]['delete'] = array('#value' => l(t('delete'), "admin/user/profile/delete/$field->fid"));
}
// Add the cateogory combo boxes
$categories = array_unique($categories);
foreach($form as $fid => $field) {
foreach($categories as $cat => $category) {
foreach ($form as $fid => $field) {
foreach ($categories as $cat => $category) {
$form[$fid]['category']['#options'][$category] = $category;
}
}
// Display the submit button only when there's more than one field
if (count($form) > 1) {
$form['submit'] = array('#type' => 'submit', '#value' => t('Save configuration'));
......@@ -51,7 +51,7 @@ function profile_admin_overview(&$form_state = NULL) {
}
}
$form['#tree'] = TRUE;
$addnewfields = '<h2>'. t('Add new field') .'</h2>';
$addnewfields .= '<ul>';
foreach (_profile_field_types() as $key => $value) {
......@@ -65,7 +65,7 @@ function profile_admin_overview(&$form_state = NULL) {
/**
* Submit hanlder to update changed profile field weights and categories.
*
*
* @see profile_admin_overview().
*/
function profile_admin_overview_submit($form, &$form_state) {
......@@ -113,7 +113,7 @@ function theme_profile_admin_overview($form) {
$category_field['#attributes']['class'] = 'profile-category profile-category-'. $category_number;
$rows[] = array(array('data' => $category, 'colspan' => 7, 'class' => 'category'));
$rows[] = array('data' => array(array('data' => '<em>'. t('No fields in this category. If this category remains empty when saved, it will be removed.') .'</em>', 'colspan' => 7)), 'class' => 'category-'. $category_number .'-message category-message category-populated');
// Make it dragable only if there is more than one field
if (isset($form['submit'])) {
drupal_add_tabledrag('profile-fields', 'order', 'sibling', 'profile-weight', 'profile-weight-'. $category_number);
......@@ -125,7 +125,7 @@ function theme_profile_admin_overview($form) {
// Add special drag and drop classes that group fields together.
$field['weight']['#attributes']['class'] = 'profile-weight profile-weight-'. $categories[$category];
$field['category']['#attributes']['class'] = 'profile-category profile-category-'. $categories[$category];
// Add the row
$row = array();
$row[] = drupal_render($field['title']);
......@@ -143,7 +143,7 @@ function theme_profile_admin_overview($form) {
if (empty($rows)) {
$rows[] = array(array('data' => t('No fields available.'), 'colspan' => 7));
}
$header = array(t('Title'), t('Name'), t('Type'));
if (isset($form['submit'])) {
$header[] = t('Category');
......@@ -153,7 +153,7 @@ function theme_profile_admin_overview($form) {
$output = theme('table', $header, $rows, array('id' => 'profile-fields'));
$output .= drupal_render($form);
return $output;
}
......
......@@ -46,7 +46,7 @@ Drupal.behaviors.profileDrag = function(context) {
if (!categoryField.is('.profile-category-'+ categoryNum)) {
categoryField.removeClass('profile-category-' + oldcategoryNum).addClass('profile-category-' + categoryNum);
weightField.removeClass('profile-weight-' + oldcategoryNum).addClass('profile-weight-' + categoryNum);
categoryField.val(categoryField[0].options[categoryNum].value);
}
}
......
......@@ -136,9 +136,9 @@ function profile_menu() {
function profile_block($op = 'list', $delta = 0, $edit = array()) {
if ($op == 'list') {
$blocks[0]['info'] = t('Author information');
$blocks[0]['cache'] = BLOCK_CACHE_PER_PAGE | BLOCK_CACHE_PER_ROLE;
return $blocks;
$blocks[0]['info'] = t('Author information');
$blocks[0]['cache'] = BLOCK_CACHE_PER_PAGE | BLOCK_CACHE_PER_ROLE;
return $blocks;
}