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

#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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment