BOINC / boinc

drupal/sites/default/boinc/modules/boinctranslate/boinctranslate.admin.inc

Spacing +1 added lines, -1 removed lines

@@ -301,7 +301,7 @@
           
           if ($response == '404 NOT FOUND') {
             form_set_error(
-              'boinc_translate_transifex_' . ($project == $boinc_name ? 'standard' : 'project') . '_resources',
+              'boinc_translate_transifex_'.($project == $boinc_name ? 'standard' : 'project').'_resources',
               t('Resource %name not found in %project.',
                 array(
                   '%name' => $resource,

Braces +4 added lines, -8 removed lines

@@ -220,8 +220,7 @@ 
   if (!$values['boinc_translate_transifex_pass']) {
     if (!variable_get('boinc_translate_transifex_pass', '')) {
       form_set_error('boinc_translate_transifex_pass', t('Password is required.'));
-    }
-    else {
+    } else {
       unset($form_state['values']['boinc_translate_transifex_pass']);
     }
   }
@@ -260,8 +259,7 @@ 
           'boinc_translate_transifex_pass',
           t('Transifex authentication failed.')
         );
-      }
-      else {
+      } else {
         $authenticated = TRUE;
       }
     }
@@ -278,14 +276,12 @@ 
       );
       if ($project_name AND $project_resources) {
         $transifex_resources[$project_name] = $project_resources;
-      }
-      elseif ($project_name AND !$project_resources) {
+      } elseif ($project_name AND !$project_resources) {
         drupal_set_message(
           t('No project-specific resources were provided'),
           'warning'
         );
-      }
-      elseif ($project_resources AND !$project_name) {
+      } elseif ($project_resources AND !$project_name) {
         drupal_set_message(
           t('No project-specific Transifex project name was provided'),
           'warning'

Indentation +145 added lines, -145 removed lines

@@ -7,85 +7,85 @@ 
 */
 
 /**
-  * The BOINC translation settings form allows configuration of BTS integration
-  * (and other translation related settings)
-  */
+ * The BOINC translation settings form allows configuration of BTS integration
+ * (and other translation related settings)
+ */
 function boinctranslate_admin_settings(&$form_state) {
-  $form = array();
-  $initialized = FALSE;
-  $import_enabled = FALSE;
-  $default = array(
+    $form = array();
+    $initialized = FALSE;
+    $import_enabled = FALSE;
+    $default = array(
     'transifex_user' => variable_get('boinc_translate_transifex_user', ''),
     'transifex_pass' => variable_get('boinc_translate_transifex_pass', ''),
     'transifex_boinc_name' => variable_get(
-      'boinc_translate_transifex_standard_name', 'boinc'
+        'boinc_translate_transifex_standard_name', 'boinc'
     ),
     'transifex_boinc_resources' => variable_get(
-      'boinc_translate_transifex_standard_resources',
-      "project-generic\nweb"
+        'boinc_translate_transifex_standard_resources',
+        "project-generic\nweb"
     ),
     'transifex_boinc_drupal_resource' => variable_get(
-      'boinc_translate_transifex_boinc_drupal_resource',
-      'drupal'
+        'boinc_translate_transifex_boinc_drupal_resource',
+        'drupal'
     ), 
     'transifex_project_name' => variable_get(
-      'boinc_translate_transifex_project_name', ''
+        'boinc_translate_transifex_project_name', ''
     ),
     'transifex_project_resources' => variable_get(
-      'boinc_translate_transifex_project_resources', ''
+        'boinc_translate_transifex_project_resources', ''
     ), 
-  );
+    );
   
-  if ($default['transifex_user'] AND $default['transifex_pass']) {
+    if ($default['transifex_user'] AND $default['transifex_pass']) {
     if (trim($default['transifex_boinc_resources'])
     OR trim($default['transifex_project_resources'])) {
-      $import_enabled = TRUE;
+        $import_enabled = TRUE;
     }
     if ($default['transifex_boinc_name']
     AND $default['transifex_project_name']
     AND trim($default['transifex_boinc_resources'])
     AND trim($default['transifex_project_resources'])) {
-      $initialized = TRUE;
+        $initialized = TRUE;
+    }
     }
-  }
   
-  // Define the form
+    // Define the form
   
-  $form['transifex'] = array(
+    $form['transifex'] = array(
     '#title' => t('Transifex settings'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => TRUE,
     '#collapsed' => $initialized,
     '#attributes' => array('class' => '')
-  );
-  $form['transifex']['boinc_translate_transifex_user'] = array(
+    );
+    $form['transifex']['boinc_translate_transifex_user'] = array(
     '#type' => 'textfield',
     '#title' => t('User name'),
     '#default_value' => $default['transifex_user'],
-  );
-  $form['transifex']['boinc_translate_transifex_pass'] = array(
+    );
+    $form['transifex']['boinc_translate_transifex_pass'] = array(
     '#type' => 'password',
     '#title' => t('Password'),
     '#attributes' => array(
-      'placeholder' => $default['transifex_pass'] ? '********' : '',
+        'placeholder' => $default['transifex_pass'] ? '********' : '',
     ),
-  );
-  $form['transifex']['boinc_translate_transifex_standard_name'] = array(
+    );
+    $form['transifex']['boinc_translate_transifex_standard_name'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC Transifex project'),
     '#default_value' => $default['transifex_boinc_name'],
     '#description' => t('The portion of the Transifex URL that identifies BOINC.'),
-  );
-  $form['transifex']['boinc_translate_transifex_boinc_drupal_resource'] = array(
+    );
+    $form['transifex']['boinc_translate_transifex_boinc_drupal_resource'] = array(
     '#type' => 'textfield',
     '#title' => t('Official BOINC Drupal Resource'),
     '#default_value' => $default['transifex_boinc_drupal_resource'],
     '#description' => t('The portion of the Transifex URL that identifies
       the standard BOINC Resource to use for translation of the public
       content defined in the Drupal system.'),
-  );
-  $form['transifex']['boinc_translate_transifex_standard_resources'] = array(
+    );
+    $form['transifex']['boinc_translate_transifex_standard_resources'] = array(
     '#type' => 'textarea',
     '#title' => t('Additional BOINC Resources'),
     '#default_value' => $default['transifex_boinc_resources'],
@@ -96,14 +96,14 @@ 
       by any matching translations found in Resources further down the list.
       Note that strings from the Official BOINC Drupal Resource will override
       any strings from these additional Resources.'),
-  );
-  $form['transifex']['boinc_translate_transifex_project_name'] = array(
+    );
+    $form['transifex']['boinc_translate_transifex_project_name'] = array(
     '#type' => 'textfield',
     '#title' => t('Project-specific Transifex project'),
     '#default_value' => $default['transifex_project_name'],
     '#description' => t('The portion of the Transifex URL that identifies this project.'),
-  );
-  $form['transifex']['boinc_translate_transifex_project_resources'] = array(
+    );
+    $form['transifex']['boinc_translate_transifex_project_resources'] = array(
     '#type' => 'textarea',
     '#title' => t('Project-specific Resources'),
     '#default_value' => $default['transifex_project_resources'],
@@ -116,241 +116,241 @@ 
       NOTE: The first Resource listed here is considered the primary Resource
       for project-specific translations and will be updated by the "Update
       project-specific Resources" button below!'),
-  );
-  $form['transifex']['buttons']['submit'] = array(
+    );
+    $form['transifex']['buttons']['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save configuration'),
-  );
+    );
   
-  $form['tools'] = array(
+    $form['tools'] = array(
     '#title' => t('Tools'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => TRUE,
     '#collapsed' => FALSE,
     '#attributes' => array('class' => '')
-  );
-  $form['tools']['initialize_languages_text'] = array(
+    );
+    $form['tools']['initialize_languages_text'] = array(
     '#type' => 'item',
     '#title' => t('Install official BOINC languages'),
     '#value' => t('Installs all languages from the BOINC Transifex project. Also installs missing languages in Drupal. <br>Languages must be enabled manually in Administer > Site configuration > Languages.'),
-  );
-  $form['tools']['initialize_languages'] = array(
+    );
+    $form['tools']['initialize_languages'] = array(
     '#type' => 'button',
     '#value' => t('Install official BOINC languages'),
     '#executes_submit_callback' => TRUE,
     '#submit' => array('boinctranslate_admin_settings_initialize_languages'),
     '#disabled' => !$initialized,
-  );
-  $form['tools']['import_now_text'] = array(
+    );
+    $form['tools']['import_now_text'] = array(
     '#type' => 'item',
     '#title' => t('Import all translations'),
     '#value' => t('Imports from Tranifex all configured Resources into their respective text groups.'),
-  );
-  $form['tools']['import_now'] = array(
+    );
+    $form['tools']['import_now'] = array(
     '#type' => 'button',
     '#value' => t('Import all translations'),
     '#executes_submit_callback' => TRUE,
     '#submit' => array('boinctranslate_admin_settings_import_now'),
     '#disabled' => !$import_enabled,
-  );
-  $form['tools']['download_boinc_pot_text'] = array(
+    );
+    $form['tools']['download_boinc_pot_text'] = array(
     '#type' => 'item',
     '#title' => t('Download official BOINC-Drupal .pot'),
     '#value' => t('Downloads the generic BOINC-Drupal .pot file. This is the template file for the boinc text group.'),
-  );
-  $form['tools']['download_boinc_pot'] = array(
+    );
+    $form['tools']['download_boinc_pot'] = array(
     '#type' => 'button',
     '#value' => t('Download official BOINC-Drupal .pot'),
     '#executes_submit_callback' => TRUE,
     '#submit' => array('boinctranslate_admin_settings_download_boinc_pot'),
     '#disabled' => !$import_enabled,
-  );
-  $form['tools']['download_project_pot_text'] = array(
+    );
+    $form['tools']['download_project_pot_text'] = array(
     '#type' => 'item',
     '#title' => t('Download project-specific .pot'),
     '#value' => t('Downloads the project-specific .pot file. This is the template file for the project text group.'),
-  );
-  $form['tools']['download_project_pot'] = array(
+    );
+    $form['tools']['download_project_pot'] = array(
     '#type' => 'button',
     '#value' => t('Download project-specific .pot'),
     '#executes_submit_callback' => TRUE,
     '#submit' => array('boinctranslate_admin_settings_download_project_pot'),
     '#disabled' => !$import_enabled,
-  );
-  if (user_access('update official BOINC translations')) {
+    );
+    if (user_access('update official BOINC translations')) {
     $form['tools']['update_official_boinc_text'] = array(
-      '#type' => 'item',
-      '#title' => t('Update official BOINC translations'),
-      '#value' => t('Updates the official BOINC-Drupal Resource (translatable strings templates) to the BOINC Transifex project, based on the consolidated imported translations.<br><b>WARNING: Do not use unless you have write-access to the BOINC Transifex project.</b>'),
+        '#type' => 'item',
+        '#title' => t('Update official BOINC translations'),
+        '#value' => t('Updates the official BOINC-Drupal Resource (translatable strings templates) to the BOINC Transifex project, based on the consolidated imported translations.<br><b>WARNING: Do not use unless you have write-access to the BOINC Transifex project.</b>'),
     );
     $form['tools']['update_official_boinc'] = array(
-      '#type' => 'button',
-      '#value' => t('Update official BOINC translations'),
-      '#executes_submit_callback' => TRUE,
-      '#submit' => array('boinctranslate_admin_settings_update_official_boinc'),
-      '#disabled' => !$import_enabled,
+        '#type' => 'button',
+        '#value' => t('Update official BOINC translations'),
+        '#executes_submit_callback' => TRUE,
+        '#submit' => array('boinctranslate_admin_settings_update_official_boinc'),
+        '#disabled' => !$import_enabled,
     );
-  }
-  $form['tools']['export_now_text'] = array(
+    }
+    $form['tools']['export_now_text'] = array(
     '#type' => 'item',
     '#title' => t('Update project-specific Resources'),
     '#value' => t('Updates the configured Resources (translatable strings templates) to the project\'s Transifex project.<br><b>WARNING: Do not use unless you have write-access to your project\'s Transifex project.</b>'),
-  );
-  $form['tools']['export_now'] = array(
+    );
+    $form['tools']['export_now'] = array(
     '#type' => 'button',
     '#value' => t('Update project-specific Resources'),
     '#executes_submit_callback' => TRUE,
     '#submit' => array('boinctranslate_admin_settings_export_now'),
     '#disabled' => !$import_enabled,
-  );
+    );
   
-  $form['#submit'][] = 'system_settings_form_submit';
-  $form['#theme'] = 'system_settings_form'; 
+    $form['#submit'][] = 'system_settings_form_submit';
+    $form['#theme'] = 'system_settings_form'; 
   
-  return $form;
+    return $form;
 }
 
 function boinctranslate_admin_settings_export_now() {
-  drupal_goto('admin/boinc/translation/export');
+    drupal_goto('admin/boinc/translation/export');
 }
 
 function boinctranslate_admin_settings_import_now() {
-  drupal_goto('admin/boinc/translation/import');
+    drupal_goto('admin/boinc/translation/import');
 }
 
 function boinctranslate_admin_settings_initialize_languages() {
-  drupal_goto('admin/boinc/translation/initialize-languages');
+    drupal_goto('admin/boinc/translation/initialize-languages');
 }
 
 function boinctranslate_admin_settings_update_official_boinc() {
-  drupal_goto('admin/boinc/translation/update-official-boinc');
+    drupal_goto('admin/boinc/translation/update-official-boinc');
 }
 
 function boinctranslate_admin_settings_download_boinc_pot() {
-  drupal_goto('admin/boinc/translation/download-pot/boinc');
+    drupal_goto('admin/boinc/translation/download-pot/boinc');
 }
 
 function boinctranslate_admin_settings_download_project_pot() {
-  drupal_goto('admin/boinc/translation/download-pot/project');
+    drupal_goto('admin/boinc/translation/download-pot/project');
 }
 
 
 /**
-  * Validate the BOINC translation settings form.
-  */
+ * Validate the BOINC translation settings form.
+ */
 function boinctranslate_admin_settings_validate($form, &$form_state) {
-  $values = $form_state['values'];
-  $errors = array();
-  $api_base_url = 'https://www.transifex.com/api/2';
+    $values = $form_state['values'];
+    $errors = array();
+    $api_base_url = 'https://www.transifex.com/api/2';
   
-  if (!$values['boinc_translate_transifex_user']) {
+    if (!$values['boinc_translate_transifex_user']) {
     form_set_error('boinc_translate_transifex_user', t('User name is required.'));
-  }
-  if (!$values['boinc_translate_transifex_pass']) {
+    }
+    if (!$values['boinc_translate_transifex_pass']) {
     if (!variable_get('boinc_translate_transifex_pass', '')) {
-      form_set_error('boinc_translate_transifex_pass', t('Password is required.'));
+        form_set_error('boinc_translate_transifex_pass', t('Password is required.'));
     }
     else {
-      unset($form_state['values']['boinc_translate_transifex_pass']);
+        unset($form_state['values']['boinc_translate_transifex_pass']);
+    }
     }
-  }
-  if (!$values['boinc_translate_transifex_standard_name']) {
+    if (!$values['boinc_translate_transifex_standard_name']) {
     form_set_error('boinc_translate_transifex_standard_name', 
-      t('BOINC Transifex project name is required.')
+        t('BOINC Transifex project name is required.')
     );
-  }
-  if (!$values['boinc_translate_transifex_standard_resources']) {
+    }
+    if (!$values['boinc_translate_transifex_standard_resources']) {
     form_set_error('boinc_translate_transifex_standard_resources',
-      t('At least one BOINC Transifex project Resource is required.')
+        t('At least one BOINC Transifex project Resource is required.')
     );
-  }
-  if (!$values['boinc_translate_transifex_project_resources']) {
+    }
+    if (!$values['boinc_translate_transifex_project_resources']) {
     form_set_error('boinc_translate_transifex_project_resources',
-      t('At least one project-specific Transifex Resource is required.')
+        t('At least one project-specific Transifex Resource is required.')
     );
-  }
+    }
   
-  $username = $values['boinc_translate_transifex_user'];
-  $password = ($values['boinc_translate_transifex_pass']) ? $values['boinc_translate_transifex_pass'] : variable_get('boinc_translate_transifex_pass', '');
-  $boinc_name = $values['boinc_translate_transifex_standard_name'];
-  $boinc_resources = boinctranslate_parse_resources(
+    $username = $values['boinc_translate_transifex_user'];
+    $password = ($values['boinc_translate_transifex_pass']) ? $values['boinc_translate_transifex_pass'] : variable_get('boinc_translate_transifex_pass', '');
+    $boinc_name = $values['boinc_translate_transifex_standard_name'];
+    $boinc_resources = boinctranslate_parse_resources(
     $values['boinc_translate_transifex_standard_resources']
-  );
+    );
   
-  if ($username AND $password AND $boinc_name AND $boinc_resources) {
+    if ($username AND $password AND $boinc_name AND $boinc_resources) {
     // Test authentication
     $authenticated = FALSE;
     $path = "project/{$boinc_name}/resource/{$boinc_resources[0]}/translation/en";
     $response = boinctranslate_transifex_request($path, NULL, TRUE, FALSE, $username, $password);
     
     if ($response) {
-      if ($response == '401 UNAUTHORIZED') {
+        if ($response == '401 UNAUTHORIZED') {
         form_set_error(
-          'boinc_translate_transifex_pass',
-          t('Transifex authentication failed.')
+            'boinc_translate_transifex_pass',
+            t('Transifex authentication failed.')
         );
-      }
-      else {
+        }
+        else {
         $authenticated = TRUE;
-      }
+        }
     }
     
     if ($authenticated) {
-      // Prepare list of resources to validate
-      $transifex_resources = array(
+        // Prepare list of resources to validate
+        $transifex_resources = array(
         'boinc' => $boinc_resources,
-      );
-      // Parse project-specific resources
-      $project_name = trim($values['boinc_translate_transifex_project_name']);
-      $project_resources = boinctranslate_parse_resources(
+        );
+        // Parse project-specific resources
+        $project_name = trim($values['boinc_translate_transifex_project_name']);
+        $project_resources = boinctranslate_parse_resources(
         $values['boinc_translate_transifex_project_resources']
-      );
-      if ($project_name AND $project_resources) {
+        );
+        if ($project_name AND $project_resources) {
         $transifex_resources[$project_name] = $project_resources;
-      }
-      elseif ($project_name AND !$project_resources) {
+        }
+        elseif ($project_name AND !$project_resources) {
         drupal_set_message(
-          t('No project-specific resources were provided'),
-          'warning'
+            t('No project-specific resources were provided'),
+            'warning'
         );
-      }
-      elseif ($project_resources AND !$project_name) {
+        }
+        elseif ($project_resources AND !$project_name) {
         drupal_set_message(
-          t('No project-specific Transifex project name was provided'),
-          'warning'
+            t('No project-specific Transifex project name was provided'),
+            'warning'
         );
-      }
+        }
       
-      // Try to access the given resources
-      foreach ($transifex_resources as $project => $resources) {
+        // Try to access the given resources
+        foreach ($transifex_resources as $project => $resources) {
         foreach ($resources as $resource) {
           
-          $path = "project/{$project}/resource/{$resource}/translation/en";
-          $response = boinctranslate_transifex_request($path);
+            $path = "project/{$project}/resource/{$resource}/translation/en";
+            $response = boinctranslate_transifex_request($path);
           
-          if ($response == '404 NOT FOUND') {
+            if ($response == '404 NOT FOUND') {
             form_set_error(
-              'boinc_translate_transifex_' . ($project == $boinc_name ? 'standard' : 'project') . '_resources',
-              t('Resource %name not found in %project.',
+                'boinc_translate_transifex_' . ($project == $boinc_name ? 'standard' : 'project') . '_resources',
+                t('Resource %name not found in %project.',
                 array(
-                  '%name' => $resource,
-                  '%project' => $project,
+                    '%name' => $resource,
+                    '%project' => $project,
+                )
                 )
-              )
             );
-          }
+            }
         }
-      }
+        }
+    }
     }
-  }
 }
 
 /**
-  * Handle post-validation submission of BOINC translation settings form.
-  */
+ * Handle post-validation submission of BOINC translation settings form.
+ */
 function boinctranslate_admin_settings_submit($form, &$form_state) {
-  drupal_set_message(t('BOINC translation settings have been updated.'));
+    drupal_set_message(t('BOINC translation settings have been updated.'));
 }
 
 

Upper-Lower-Casing +25 added lines, -25 removed lines

@@ -12,8 +12,8 @@ 
   */
 function boinctranslate_admin_settings(&$form_state) {
   $form = array();
-  $initialized = FALSE;
-  $import_enabled = FALSE;
+  $initialized = false;
+  $import_enabled = false;
   $default = array(
     'transifex_user' => variable_get('boinc_translate_transifex_user', ''),
     'transifex_pass' => variable_get('boinc_translate_transifex_pass', ''),
@@ -36,16 +36,16 @@ 
     ), 
   );
   
-  if ($default['transifex_user'] AND $default['transifex_pass']) {
+  if ($default['transifex_user'] and $default['transifex_pass']) {
     if (trim($default['transifex_boinc_resources'])
-    OR trim($default['transifex_project_resources'])) {
-      $import_enabled = TRUE;
+    or trim($default['transifex_project_resources'])) {
+      $import_enabled = true;
     }
     if ($default['transifex_boinc_name']
-    AND $default['transifex_project_name']
-    AND trim($default['transifex_boinc_resources'])
-    AND trim($default['transifex_project_resources'])) {
-      $initialized = TRUE;
+    and $default['transifex_project_name']
+    and trim($default['transifex_boinc_resources'])
+    and trim($default['transifex_project_resources'])) {
+      $initialized = true;
     }
   }
   
@@ -55,7 +55,7 @@ 
     '#title' => t('Transifex settings'),
     '#type' => 'fieldset',
     '#description' => '',
-    '#collapsible' => TRUE,
+    '#collapsible' => true,
     '#collapsed' => $initialized,
     '#attributes' => array('class' => '')
   );
@@ -126,8 +126,8 @@ 
     '#title' => t('Tools'),
     '#type' => 'fieldset',
     '#description' => '',
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE,
+    '#collapsible' => true,
+    '#collapsed' => false,
     '#attributes' => array('class' => '')
   );
   $form['tools']['initialize_languages_text'] = array(
@@ -138,7 +138,7 @@ 
   $form['tools']['initialize_languages'] = array(
     '#type' => 'button',
     '#value' => t('Install official BOINC languages'),
-    '#executes_submit_callback' => TRUE,
+    '#executes_submit_callback' => true,
     '#submit' => array('boinctranslate_admin_settings_initialize_languages'),
     '#disabled' => !$initialized,
   );
@@ -150,7 +150,7 @@ 
   $form['tools']['import_now'] = array(
     '#type' => 'button',
     '#value' => t('Import all translations'),
-    '#executes_submit_callback' => TRUE,
+    '#executes_submit_callback' => true,
     '#submit' => array('boinctranslate_admin_settings_import_now'),
     '#disabled' => !$import_enabled,
   );
@@ -162,7 +162,7 @@ 
   $form['tools']['download_boinc_pot'] = array(
     '#type' => 'button',
     '#value' => t('Download official BOINC-Drupal .pot'),
-    '#executes_submit_callback' => TRUE,
+    '#executes_submit_callback' => true,
     '#submit' => array('boinctranslate_admin_settings_download_boinc_pot'),
     '#disabled' => !$import_enabled,
   );
@@ -174,7 +174,7 @@ 
   $form['tools']['download_project_pot'] = array(
     '#type' => 'button',
     '#value' => t('Download project-specific .pot'),
-    '#executes_submit_callback' => TRUE,
+    '#executes_submit_callback' => true,
     '#submit' => array('boinctranslate_admin_settings_download_project_pot'),
     '#disabled' => !$import_enabled,
   );
@@ -187,7 +187,7 @@ 
     $form['tools']['update_official_boinc'] = array(
       '#type' => 'button',
       '#value' => t('Update official BOINC translations'),
-      '#executes_submit_callback' => TRUE,
+      '#executes_submit_callback' => true,
       '#submit' => array('boinctranslate_admin_settings_update_official_boinc'),
       '#disabled' => !$import_enabled,
     );
@@ -200,7 +200,7 @@ 
   $form['tools']['export_now'] = array(
     '#type' => 'button',
     '#value' => t('Update project-specific Resources'),
-    '#executes_submit_callback' => TRUE,
+    '#executes_submit_callback' => true,
     '#submit' => array('boinctranslate_admin_settings_export_now'),
     '#disabled' => !$import_enabled,
   );
@@ -278,11 +278,11 @@ 
     $values['boinc_translate_transifex_standard_resources']
   );
   
-  if ($username AND $password AND $boinc_name AND $boinc_resources) {
+  if ($username and $password and $boinc_name and $boinc_resources) {
     // Test authentication
-    $authenticated = FALSE;
+    $authenticated = false;
     $path = "project/{$boinc_name}/resource/{$boinc_resources[0]}/translation/en";
-    $response = boinctranslate_transifex_request($path, NULL, TRUE, FALSE, $username, $password);
+    $response = boinctranslate_transifex_request($path, null, true, false, $username, $password);
     
     if ($response) {
       if ($response == '401 UNAUTHORIZED') {
@@ -292,7 +292,7 @@ 
         );
       }
       else {
-        $authenticated = TRUE;
+        $authenticated = true;
       }
     }
     
@@ -306,16 +306,16 @@ 
       $project_resources = boinctranslate_parse_resources(
         $values['boinc_translate_transifex_project_resources']
       );
-      if ($project_name AND $project_resources) {
+      if ($project_name and $project_resources) {
         $transifex_resources[$project_name] = $project_resources;
       }
-      elseif ($project_name AND !$project_resources) {
+      elseif ($project_name and !$project_resources) {
         drupal_set_message(
           t('No project-specific resources were provided'),
           'warning'
         );
       }
-      elseif ($project_resources AND !$project_name) {
+      elseif ($project_resources and !$project_name) {
         drupal_set_message(
           t('No project-specific Transifex project name was provided'),
           'warning'

drupal/sites/default/boinc/modules/boincuser/boincuser.views.inc

Spacing +1 added lines, -1 removed lines

@@ -274,7 +274,7 @@
 function boincuser_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincuser') . '/views',
+      'path' => drupal_get_path('module', 'boincuser').'/views',
     ),
     'handlers' => array(
       'views_handler_argument_boincuser_id' => array(

Upper-Lower-Casing +34 added lines, -34 removed lines

@@ -34,16 +34,16 @@ 
   // Primary keys allowed as arguments
   
   $data['user']['id'] = array(
-    'title' => bts('Id', array(), NULL, 'boinc:user-id'),
+    'title' => bts('Id', array(), null, 'boinc:user-id'),
     'help' => t('The BOINC ID of the user account.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_boincuser_id', // custom handler
       'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -54,16 +54,16 @@ 
     )
   );
   $data['user']['teamid'] = array(
-    'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
+    'title' => bts('Team ID', array(), null, 'boinc:team-id'),
     'help' => t('The ID of the user\'s team.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
+      'click sortable' => true,
     ),
     'argument' => array(
       'handler' => 'views_handler_argument_boincteam_id', // custom handler
       'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
+      'numeric' => true,
       'validate type' => 'id'
     ),
     'filter' => array(
@@ -77,11 +77,11 @@ 
   // Descriptions of general host fields (alphabetized)
   
   $data['user']['authenticator'] = array(
-    'title' => bts('Account Key', array(), NULL, 'boinc:user-info'),
+    'title' => bts('Account Key', array(), null, 'boinc:user-info'),
     'help' => t('The BOINC account key of the user.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -91,11 +91,11 @@ 
     )
   );
   $data['user']['country'] = array(
-    'title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
+    'title' => bts('Country', array(), null, 'boinc:country-of-origin'),
     'help' => t('The country of the user.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -105,11 +105,11 @@ 
     )
   );
   $data['user']['create_time'] = array(
-    'title' => bts('Member since', array(), NULL, 'boinc:user-info'),
+    'title' => bts('Member since', array(), null, 'boinc:user-info'),
     'help' => t('When the BOINC account was created.'),
     'field' => array(
       'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_date'
@@ -119,11 +119,11 @@ 
     )
   );
   $data['user']['cross_project_id'] = array(
-    'title' => bts('CPID', array(), NULL, 'boinc:user-info'),
+    'title' => bts('CPID', array(), null, 'boinc:user-info'),
     'help' => t('The cross project user identifier.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -133,11 +133,11 @@ 
     )
   );
   $data['user']['email_addr'] = array(
-      'title' => bts('Email Address', array(), NULL, 'boinc:user-info'),
+      'title' => bts('Email Address', array(), null, 'boinc:user-info'),
     'help' => t('The BOINC account email address.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -147,12 +147,12 @@ 
     )
   );
   $data['user']['expavg_credit'] = array(
-    'title' => bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC'),
+    'title' => bts('Recent average credit', array(), null, 'boinc:user-or-team-RAC'),
     'help' => t('A decaying average of credit per day for the user.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -162,11 +162,11 @@ 
     )
   );
   $data['user']['name'] = array(
-    'title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
+    'title' => bts('Name', array(), null, 'boinc:user-or-team-name'),
     'help' => t('The BOINC account user name.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -176,11 +176,11 @@ 
     )                           
   );
   $data['user']['passwd_hash'] = array(
-    'title' => bts('Password Hash', array(), NULL, 'boinc:user-info'),
+    'title' => bts('Password Hash', array(), null, 'boinc:user-info'),
     'help' => t('The user password hash'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -190,11 +190,11 @@ 
     )
   );
   $data['user']['postal_code'] = array(
-    'title' => bts('Postal Code', array(), NULL, 'boinc:user-info'),
+    'title' => bts('Postal Code', array(), null, 'boinc:user-info'),
     'help' => t('The postal code of the user.'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'
@@ -204,11 +204,11 @@ 
     )
   );
   $data['user']['send_email'] = array(
-    'title' => bts('Send Email', array(), NULL, 'boinc:user-info'),
+    'title' => bts('Send Email', array(), null, 'boinc:user-info'),
     'help' => t('User preference to allow email communications.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -218,11 +218,11 @@ 
     )
   );
   $data['user']['show_hosts'] = array(
-    'title' => bts('Show Hosts', array(), NULL, 'boinc:user-info'),
+    'title' => bts('Show Hosts', array(), null, 'boinc:user-info'),
     'help' => t('User preference to display owned computers.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -232,12 +232,12 @@ 
     )
   );
   $data['user']['total_credit'] = array(
-    'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
+    'title' => bts('Total credit', array(), null, 'boinc:user-or-team-total-credits'),
     'help' => t('The total accumulated BOINC credit for the user.'),
     'field' => array(
       'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+      'click sortable' => true,
+      'float' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_numeric'
@@ -247,11 +247,11 @@ 
     )
   );
   $data['user']['url'] = array(
-    'title' => bts('URL', array(), NULL, 'boinc:website-of-user-or-team'),
+    'title' => bts('URL', array(), null, 'boinc:website-of-user-or-team'),
     'help' => t('The URL provided by the user'),
     'field' => array(
       'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+      'click sortable' => true
     ),
     'filter' => array(
       'handler' => 'views_handler_filter_string'

Indentation +125 added lines, -125 removed lines

@@ -13,255 +13,255 @@ 
  */
 function boincuser_views_data() {
   
-  // -----------------------------------------------------------------------------------------------
-  // Definition for user table
-  // -----------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------------
+    // Definition for user table
+    // -----------------------------------------------------------------------------------------------
   
-  $data['user']['table']['group'] = t('BOINC');
+    $data['user']['table']['group'] = t('BOINC');
   
-  $data['user']['table']['base'] = array(
-      'field' => 'id',
-      'title' => t('BOINC user'),
-      'help' => t('BOINC account data for a user'),
-      'database' => 'boinc_ro'
-  );
+    $data['user']['table']['base'] = array(
+        'field' => 'id',
+        'title' => t('BOINC user'),
+        'help' => t('BOINC account data for a user'),
+        'database' => 'boinc_ro'
+    );
 
-  // Describe each of the individual fields in this table to Views. For
-  // each field, you may define what field, sort, argument, and/or filter
-  // handlers it supports. This will determine where in the Views interface you
-  // may use the field.
+    // Describe each of the individual fields in this table to Views. For
+    // each field, you may define what field, sort, argument, and/or filter
+    // handlers it supports. This will determine where in the Views interface you
+    // may use the field.
   
-  // Primary keys allowed as arguments
+    // Primary keys allowed as arguments
   
-  $data['user']['id'] = array(
+    $data['user']['id'] = array(
     'title' => bts('Id', array(), NULL, 'boinc:user-id'),
     'help' => t('The BOINC ID of the user account.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument_boincuser_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincuser_id', // custom handler
+        'name field' => 'title', // the field to display in the summary.
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['user']['teamid'] = array(
+    );
+    $data['user']['teamid'] = array(
     'title' => bts('Team ID', array(), NULL, 'boinc:team-id'),
     'help' => t('The ID of the user\'s team.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
     ),
     'argument' => array(
-      'handler' => 'views_handler_argument_boincteam_id', // custom handler
-      'name field' => 'title', // the field to display in the summary.
-      'numeric' => TRUE,
-      'validate type' => 'id'
+        'handler' => 'views_handler_argument_boincteam_id', // custom handler
+        'name field' => 'title', // the field to display in the summary.
+        'numeric' => TRUE,
+        'validate type' => 'id'
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
+    );
   
-  // Descriptions of general host fields (alphabetized)
+    // Descriptions of general host fields (alphabetized)
   
-  $data['user']['authenticator'] = array(
+    $data['user']['authenticator'] = array(
     'title' => bts('Account Key', array(), NULL, 'boinc:user-info'),
     'help' => t('The BOINC account key of the user.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['country'] = array(
+    );
+    $data['user']['country'] = array(
     'title' => bts('Country', array(), NULL, 'boinc:country-of-origin'),
     'help' => t('The country of the user.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['create_time'] = array(
+    );
+    $data['user']['create_time'] = array(
     'title' => bts('Member since', array(), NULL, 'boinc:user-info'),
     'help' => t('When the BOINC account was created.'),
     'field' => array(
-      'handler' => 'views_handler_field_date',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_date',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_date'
+        'handler' => 'views_handler_filter_date'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_date'
+        'handler' => 'views_handler_sort_date'
     )
-  );
-  $data['user']['cross_project_id'] = array(
+    );
+    $data['user']['cross_project_id'] = array(
     'title' => bts('CPID', array(), NULL, 'boinc:user-info'),
     'help' => t('The cross project user identifier.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['email_addr'] = array(
-      'title' => bts('Email Address', array(), NULL, 'boinc:user-info'),
+    );
+    $data['user']['email_addr'] = array(
+        'title' => bts('Email Address', array(), NULL, 'boinc:user-info'),
     'help' => t('The BOINC account email address.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['expavg_credit'] = array(
+    );
+    $data['user']['expavg_credit'] = array(
     'title' => bts('Recent average credit', array(), NULL, 'boinc:user-or-team-RAC'),
     'help' => t('A decaying average of credit per day for the user.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['user']['name'] = array(
+    );
+    $data['user']['name'] = array(
     'title' => bts('Name', array(), NULL, 'boinc:user-or-team-name'),
     'help' => t('The BOINC account user name.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )                           
-  );
-  $data['user']['passwd_hash'] = array(
+    );
+    $data['user']['passwd_hash'] = array(
     'title' => bts('Password Hash', array(), NULL, 'boinc:user-info'),
     'help' => t('The user password hash'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['postal_code'] = array(
+    );
+    $data['user']['postal_code'] = array(
     'title' => bts('Postal Code', array(), NULL, 'boinc:user-info'),
     'help' => t('The postal code of the user.'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
-  $data['user']['send_email'] = array(
+    );
+    $data['user']['send_email'] = array(
     'title' => bts('Send Email', array(), NULL, 'boinc:user-info'),
     'help' => t('User preference to allow email communications.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['user']['show_hosts'] = array(
+    );
+    $data['user']['show_hosts'] = array(
     'title' => bts('Show Hosts', array(), NULL, 'boinc:user-info'),
     'help' => t('User preference to display owned computers.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['user']['total_credit'] = array(
+    );
+    $data['user']['total_credit'] = array(
     'title' => bts('Total credit', array(), NULL, 'boinc:user-or-team-total-credits'),
     'help' => t('The total accumulated BOINC credit for the user.'),
     'field' => array(
-      'handler' => 'views_handler_field_numeric',
-      'click sortable' => TRUE,
-      'float' => TRUE
+        'handler' => 'views_handler_field_numeric',
+        'click sortable' => TRUE,
+        'float' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_numeric'
+        'handler' => 'views_handler_filter_numeric'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_numeric'
+        'handler' => 'views_handler_sort_numeric'
     )
-  );
-  $data['user']['url'] = array(
+    );
+    $data['user']['url'] = array(
     'title' => bts('URL', array(), NULL, 'boinc:website-of-user-or-team'),
     'help' => t('The URL provided by the user'),
     'field' => array(
-      'handler' => 'views_handler_field',
-      'click sortable' => TRUE
+        'handler' => 'views_handler_field',
+        'click sortable' => TRUE
     ),
     'filter' => array(
-      'handler' => 'views_handler_filter_string'
+        'handler' => 'views_handler_filter_string'
     ),
     'sort' => array(
-      'handler' => 'views_handler_sort_string'
+        'handler' => 'views_handler_sort_string'
     )
-  );
+    );
   
-  return $data;
+    return $data;
 }
 
 /*
@@ -272,17 +272,17 @@ 
  */
 
 function boincuser_views_handlers() {
-  return array(
+    return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'boincuser') . '/views',
+        'path' => drupal_get_path('module', 'boincuser') . '/views',
     ),
     'handlers' => array(
-      'views_handler_argument_boincuser_id' => array(
+        'views_handler_argument_boincuser_id' => array(
         'parent' => 'views_handler_argument_numeric'
-      ),
-      'views_handler_argument_boincteam_id' => array(
+        ),
+        'views_handler_argument_boincteam_id' => array(
         'parent' => 'views_handler_argument_numeric'
-      ),
+        ),
     )
-  );
+    );
 }

drupal/sites/default/boinc/modules/boincuser/boincuser.admin.inc

Braces +3 added lines, -6 removed lines

@@ -157,13 +157,11 @@ 
   if (!$values['boinc_root_dir']) {
     form_set_error('boinc_root_dir', t('BOINC project root directory must be
       defined!'));
-  }
-  elseif (!is_dir($values['boinc_root_dir'])) {
+  } elseif (!is_dir($values['boinc_root_dir'])) {
     form_set_error('boinc_root_dir', t('BOINC project root not found at %directory',
       array('%directory' => $values['boinc_root_dir'])
     ));
-  }
-  else {
+  } else {
     // By default, try to automatically set specific directories from the root
     if (!$values['boinc_config_xml_dir']) {
       $values['boinc_config_xml_dir'] = $values['boinc_root_dir'];
@@ -285,8 +283,7 @@ 
   if (!$values['boinc_scheduler_urls']) {
     form_set_error('boinc_scheduler_urls', t('At least one scheduling server
       URL must be specified.'));
-  }
-  else {
+  } else {
     $urls = explode("\r\n", $values['boinc_scheduler_urls']);
     foreach ($urls as $key => $url) {
       if (!$url) {

Spacing +11 added lines, -11 removed lines

@@ -120,7 +120,7 @@ 
     '#default_value' => $default['boinc_server_status_url'],
     '#description' => t('An absolute URL or path relative to the site base to the server status page (e.g. %full_url or just %relative_url).',
       array(
-        '%full_url' => $base_url . '/server_status.php',
+        '%full_url' => $base_url.'/server_status.php',
         '%relative_url' => 'server_status.php',
       )
     ),
@@ -131,7 +131,7 @@ 
     '#default_value' => $default['boinc_app_list_url'],
     '#description' => t('An absolute URL or path relative to the site base to the applications page (e.g. %full_url or just %relative_url).',
       array(
-        '%full_url' => $base_url . '/apps.php',
+        '%full_url' => $base_url.'/apps.php',
         '%relative_url' => 'apps.php',
       )
     ),
@@ -349,7 +349,7 @@ 
     '#type' => 'checkbox',
     '#title' => t('Enable create_account.php RPC'),
     '#default_value' => $default['boinc_weboptions_enableaccountcreateRPC'],
-    '#description' => t('If checked, users will be able to create an account remotely using the create_account.php RPC. This option is independent of the user regsitration option found in ') . l(t('User management -> User settings'), '/admin/user/settings') . '. If enabled, user <b>may not be able to see and agree to the terms-of-use</b> to your site\'s privacy and data retention policies!',
+    '#description' => t('If checked, users will be able to create an account remotely using the create_account.php RPC. This option is independent of the user regsitration option found in ').l(t('User management -> User settings'), '/admin/user/settings').'. If enabled, user <b>may not be able to see and agree to the terms-of-use</b> to your site\'s privacy and data retention policies!',
   );
 
   $form['boinc_weboptions_registrationtitle'] = array(
@@ -386,25 +386,25 @@ 
     '#value' => '<h3>Path Options</h3>',
   );
 
-  $form['boinc_weboptions_accountfinish'] = array (
+  $form['boinc_weboptions_accountfinish'] = array(
     '#type' => 'textfield',
     '#title' => t('Path to a custom account_finish.php page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s landing page for users create an account using the BOINC client manager. They will be directed to this page after the account is created. If blank, a default account_finish page will be used.<br>Examples: account_finish, content/welcome, node/123'),
     '#default_value' => $default['boinc_weboptions_accountfinish'],
   );
-  $form['boinc_weboptions_moderationpage'] = array (
+  $form['boinc_weboptions_moderationpage'] = array(
     '#type' => 'textfield',
     '#title' => t('Path to the site\'s content moderation info page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s page for account/content moderation information. This will be used on the default account_finish page. If blank, no link to a moderation page will be provided. If a path is provided to the custom account_finish.php page (above), this field will be ignored.<br>Examples: moderation, content/moderation, node/456'),
     '#default_value' => $default['boinc_weboptions_moderationpage'],
   );
-  $form['boinc_weboptions_rulespolicies'] = array (
+  $form['boinc_weboptions_rulespolicies'] = array(
     '#type' => 'textfield',
     '#title' => t('Path to the site\'s rule and policies page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s rules and policies page. This will be used on the Join page shown to new users. If blank, no link to a rules and policies page will be provided.<br>Examples: rules-and-policies, node/789'),
     '#default_value' => $default['boinc_weboptions_rulespolicies'],
   );
-  $form['boinc_other_frontpage'] = array (
+  $form['boinc_other_frontpage'] = array(
     '#type' => 'textarea',
     '#title' => bts('Message for site\'s Home Page', array(), NULL, 'boinc:admin-boinc-other-options'),
     '#default_value' => $default['boinc_other_frontpage'],
@@ -423,17 +423,17 @@ 
   $values = $form_state['values'];
 
   $accountfinish = $values['boinc_weboptions_accountfinish'];
-  if ( ($accountfinish) AND (!drupal_lookup_path('source', $accountfinish)) ) {
+  if (($accountfinish) AND (!drupal_lookup_path('source', $accountfinish))) {
     form_set_error('boinc weboptions_accountfinish', t('Path to custom account finish page not found. Please provide a valid path, or leave blank to unset.'));
   }
 
   $moderationpage = $values['boinc_weboptions_moderationpage'];
-  if ( ($moderationpage) AND (!drupal_lookup_path('source', $moderationpage)) ) {
+  if (($moderationpage) AND (!drupal_lookup_path('source', $moderationpage))) {
     form_set_error('boinc weboptions_moderationpage', t('Path to moderation page not found. Please provide a valid path, or leave blank to unset.'));
   }
 
   $rulespolicies = $values['boinc_weboptions_rulespolicies'];
-  if ( ($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies)) ) {
+  if (($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies))) {
     form_set_error('boinc weboptions_rulespolicies', t('Path to rules and policies page not found. Please provide a valid path, or leave blank to unset.'));
   }
 }
@@ -442,5 +442,5 @@ 
   * Submit BOINC other form
   */
 function boincuser_admin_weboptions_submit($form, &$form_state) {
-  drupal_set_message( bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options') );
+  drupal_set_message(bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options'));
 }

Indentation +172 added lines, -172 removed lines

@@ -28,13 +28,13 @@ 
 }*/
 
 /**
-  * The BOINC environment form allows paths to be set to connect Drupal to an
-  * existing BOINC web interface.
-  */
+ * The BOINC environment form allows paths to be set to connect Drupal to an
+ * existing BOINC web interface.
+ */
 function boincuser_admin_environment(&$form_state) {
-  global $base_url;
-  $form = array();
-  $default = array(
+    global $base_url;
+    $form = array();
+    $default = array(
     'boinc_root_dir' => variable_get('boinc_root_dir', ''),
     'boinc_config_xml_dir' => variable_get('boinc_config_xml_dir', ''),
     'boinc_html_inc_dir' => variable_get('boinc_html_inc_dir', ''),
@@ -45,290 +45,290 @@ 
     'boinc_app_list_url' => variable_get('boinc_app_list_url', ''),
     'boinc_debug_mode' => variable_get('boinc_debug_mode', 0),
     'boinc_project_config_keywords' => variable_get('boinc_project_config_keywords', ''),
-  );
-  //drupal_set_message(print_r($default, true));
-  //drupal_set_message(print_r($form_state, true));
-  // Show overrides if the root dir is set and others have not been detected
-  $show_overrides = FALSE;
-  if ($default['boinc_root_dir']) {
+    );
+    //drupal_set_message(print_r($default, true));
+    //drupal_set_message(print_r($form_state, true));
+    // Show overrides if the root dir is set and others have not been detected
+    $show_overrides = FALSE;
+    if ($default['boinc_root_dir']) {
     foreach ($default as $key => $dir) {
-      switch ($key) {
-      case 'boinc_config_xml_dir':
+        switch ($key) {
+        case 'boinc_config_xml_dir':
       case 'boinc_html_inc_dir':
       case 'boinc_project_config_dir':
       case 'boinc_user_image_dir':
         // If any of these values are not set, show the overrides section
         if (!$dir) {
-          $default[$key] = $form_state['values'][$key];
-          $show_overrides = TRUE;
-          break;
+            $default[$key] = $form_state['values'][$key];
+            $show_overrides = TRUE;
+            break;
         }
         break;
-      default:
+        default:
       }
-      if ($show_overrides) {
+        if ($show_overrides) {
         break;
-      }
+        }
+    }
     }
-  }
-  // Define the form
-  $form['boinc_root_dir'] = array(
+    // Define the form
+    $form['boinc_root_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC project root directory'),
     '#default_value' => $default['boinc_root_dir'], 
     '#description' => t('The filesystem path to the BOINC project root. This
       directory should contain config.xml as well as the html subdirectory,
       which itself contains inc/, project/, and user_profile/.'),
-  );
-  $form['overrides'] = array(
+    );
+    $form['overrides'] = array(
     '#title' => t('Overrides'),
     '#type' => 'fieldset',
     '#description' => '',
     '#collapsible' => TRUE,
     '#collapsed' => !$show_overrides,
     '#attributes' => array('class' => 'advanced-settings')
-  );
-  $form['overrides']['boinc_config_xml_dir'] = array(
+    );
+    $form['overrides']['boinc_config_xml_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC config.xml directory'),
     '#default_value' => $default['boinc_config_xml_dir'],
     '#description' => t('The filesystem path that contains config.xml'),
-  );
-  $form['overrides']['boinc_html_inc_dir'] = array(
+    );
+    $form['overrides']['boinc_html_inc_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC web includes directory'),
     '#default_value' => $default['boinc_html_inc_dir'],
     '#description' => t('The filesystem path to the html/inc/ directory that
       contains util.inc'),
-  );
-  $form['overrides']['boinc_project_config_dir'] = array(
+    );
+    $form['overrides']['boinc_project_config_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC project config directory'),
     '#default_value' => $default['boinc_project_config_dir'],
     '#description' => t('The filesystem path to the project/ directory that
       contains project.inc'),
-  );
-  $form['overrides']['boinc_user_image_dir'] = array(
+    );
+    $form['overrides']['boinc_user_image_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC user profile image directory'),
     '#default_value' => $default['boinc_user_image_dir'],
     '#description' => t('The filesystem directory that contains user images'),
-  );
-  $form['boinc_server_status_url'] = array(
+    );
+    $form['boinc_server_status_url'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC server status page URL (optional)'),
     '#default_value' => $default['boinc_server_status_url'],
     '#description' => t('An absolute URL or path relative to the site base to the server status page (e.g. %full_url or just %relative_url).',
-      array(
+        array(
         '%full_url' => $base_url . '/server_status.php',
         '%relative_url' => 'server_status.php',
-      )
+        )
     ),
-  );
-  $form['boinc_app_list_url'] = array(
+    );
+    $form['boinc_app_list_url'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC applications page URL (optional)'),
     '#default_value' => $default['boinc_app_list_url'],
     '#description' => t('An absolute URL or path relative to the site base to the applications page (e.g. %full_url or just %relative_url).',
-      array(
+        array(
         '%full_url' => $base_url . '/apps.php',
         '%relative_url' => 'apps.php',
-      )
+        )
     ),
-  );
-  $form['boinc_host_sched_logs_dir'] = array(
+    );
+    $form['boinc_host_sched_logs_dir'] = array(
     '#type' => 'textfield',
     '#title' => t('BOINC host scheduler log directory (optional)'),
     '#default_value' => $default['boinc_host_sched_logs_dir'],
     '#description' => t('The filesystem directory that contains host scheduler logs'),
-  );
-  $form['boinc_debug_mode'] = array(
+    );
+    $form['boinc_debug_mode'] = array(
     '#type' => 'checkbox',
     '#title' => t('Show debug messages in system log'),
     '#default_value' => $default['boinc_debug_mode']
-  );
-  $form['boinc_project_config_keywords'] = array(
+    );
+    $form['boinc_project_config_keywords'] = array(
     '#type' => 'textarea',
     '#title' => t('Project/Job Keywords for get_project_config RPC'),
     '#default_value' => $default['boinc_project_config_keywords'],
     '#description' => t('XML from this text box will be appended to the XML output from the get_project_config RPC. There is no check for XML validity! See !link for more details. It is okay to leave this blank.',
     array(
-      '!link' => l('BOINC wiki page', 'https://boinc.berkeley.edu/trac/wiki/JobKeywords')
+        '!link' => l('BOINC wiki page', 'https://boinc.berkeley.edu/trac/wiki/JobKeywords')
     )),
-  );
-  return system_settings_form($form);
+    );
+    return system_settings_form($form);
 }
 
 /**
-  * Validate the BOINC environment form.
-  */
+ * Validate the BOINC environment form.
+ */
 function boincuser_admin_environment_validate($form, &$form_state) {
-  $values = $form_state['values'];
-  if (!$values['boinc_root_dir']) {
+    $values = $form_state['values'];
+    if (!$values['boinc_root_dir']) {
     form_set_error('boinc_root_dir', t('BOINC project root directory must be
       defined!'));
-  }
-  elseif (!is_dir($values['boinc_root_dir'])) {
+    }
+    elseif (!is_dir($values['boinc_root_dir'])) {
     form_set_error('boinc_root_dir', t('BOINC project root not found at %directory',
-      array('%directory' => $values['boinc_root_dir'])
+        array('%directory' => $values['boinc_root_dir'])
     ));
-  }
-  else {
+    }
+    else {
     // By default, try to automatically set specific directories from the root
     if (!$values['boinc_config_xml_dir']) {
-      $values['boinc_config_xml_dir'] = $values['boinc_root_dir'];
-      form_set_value($form['overrides']['boinc_config_xml_dir'], $values['boinc_config_xml_dir'], $form_state);
+        $values['boinc_config_xml_dir'] = $values['boinc_root_dir'];
+        form_set_value($form['overrides']['boinc_config_xml_dir'], $values['boinc_config_xml_dir'], $form_state);
     }
     if (!$values['boinc_html_inc_dir']) {
-      $values['boinc_html_inc_dir'] = "{$values['boinc_root_dir']}/html/inc";
-      form_set_value($form['overrides']['boinc_html_inc_dir'], $values['boinc_html_inc_dir'], $form_state);
+        $values['boinc_html_inc_dir'] = "{$values['boinc_root_dir']}/html/inc";
+        form_set_value($form['overrides']['boinc_html_inc_dir'], $values['boinc_html_inc_dir'], $form_state);
     }
     if (!$values['boinc_project_config_dir']) {
-      $values['boinc_project_config_dir'] = "{$values['boinc_root_dir']}/html/project";
-      form_set_value($form['overrides']['boinc_project_config_dir'], $values['boinc_project_config_dir'], $form_state);
+        $values['boinc_project_config_dir'] = "{$values['boinc_root_dir']}/html/project";
+        form_set_value($form['overrides']['boinc_project_config_dir'], $values['boinc_project_config_dir'], $form_state);
     }
     if (!$values['boinc_user_image_dir']) {
-      $values['boinc_user_image_dir'] = "{$values['boinc_root_dir']}/html/user_profile/images";
-      form_set_value($form['overrides']['boinc_user_image_dir'], $values['boinc_user_image_dir'], $form_state);
+        $values['boinc_user_image_dir'] = "{$values['boinc_root_dir']}/html/user_profile/images";
+        form_set_value($form['overrides']['boinc_user_image_dir'], $values['boinc_user_image_dir'], $form_state);
     }
     // Validate that required BOINC content is found
     if (!is_readable("{$values['boinc_config_xml_dir']}/config.xml")) {
-      form_set_error('boinc_config_xml_dir', t('@file not found in %directory',
+        form_set_error('boinc_config_xml_dir', t('@file not found in %directory',
         array(
-          '@file' => 'config.xml',
-          '%directory' => "{$values['boinc_config_xml_dir']}/"
+            '@file' => 'config.xml',
+            '%directory' => "{$values['boinc_config_xml_dir']}/"
         )
-      ));
+        ));
     }
     if (!is_readable("{$values['boinc_html_inc_dir']}/util.inc")) {
-      form_set_error('boinc_html_inc_dir', t('@file not found in %directory',
+        form_set_error('boinc_html_inc_dir', t('@file not found in %directory',
         array(
-          '@file' => 'util.inc',
-          '%directory' => "{$values['boinc_html_inc_dir']}/"
+            '@file' => 'util.inc',
+            '%directory' => "{$values['boinc_html_inc_dir']}/"
         )
-      ));
+        ));
     }
     if (!is_readable("{$values['boinc_project_config_dir']}/project.inc")) {
-      form_set_error('boinc_project_config_dir', t('@file not found in %directory',
+        form_set_error('boinc_project_config_dir', t('@file not found in %directory',
         array(
-          '@file' => 'project.inc',
-          '%directory' => "{$values['boinc_project_config_dir']}/"
+            '@file' => 'project.inc',
+            '%directory' => "{$values['boinc_project_config_dir']}/"
         )
-      ));
+        ));
     }
     if (!is_dir($values['boinc_user_image_dir'])) {
-      form_set_error('boinc_user_image_dir', t('Profile image directory not found
+        form_set_error('boinc_user_image_dir', t('Profile image directory not found
         at %directory', array('%directory' => $values['boinc_user_image_dir'])
-      ));
+        ));
     }
     if ($values['boinc_host_sched_logs_dir']
         AND !is_dir($values['boinc_host_sched_logs_dir'])
-      ) {
-      form_set_error('boinc_host_sched_logs_dir', t('Host scheduler log
+        ) {
+        form_set_error('boinc_host_sched_logs_dir', t('Host scheduler log
         directory not found at %directory',
         array('%directory' => $values['boinc_host_sched_logs_dir'])
-      ));
+        ));
+    }
     }
-  }
 }
 
 /**
-  * Handle post-validation submission of BOINC environment form.
-  */
+ * Handle post-validation submission of BOINC environment form.
+ */
 function boincuser_admin_environment_submit($form, &$form_state) {
-  unset($_SESSION['boinc_env']);
-  drupal_set_message(t('BOINC environment settings have been updated.'));
+    unset($_SESSION['boinc_env']);
+    drupal_set_message(t('BOINC environment settings have been updated.'));
 }
 
 /**
-  * The BOINC scheduler form provides options for how scheduler tags are
-  * inserted into the front page
-  */
+ * The BOINC scheduler form provides options for how scheduler tags are
+ * inserted into the front page
+ */
 function boincuser_admin_scheduler(&$form_state) {
-  $form = array();
-  $config_cgi_url = '';
-  if ($config_xml_dir = variable_get('boinc_config_xml_dir', '')) {
+    $form = array();
+    $config_cgi_url = '';
+    if ($config_xml_dir = variable_get('boinc_config_xml_dir', '')) {
     // Get the cgi_url option from the config file as the default scheduler URL
     $xml = new DOMDocument();
     if ($xml->load("{$config_xml_dir}/config.xml")) {
-      $config = xml_to_array($xml);
-      if (isset($config['boinc']['config']['cgi_url']['@value'])) {
+        $config = xml_to_array($xml);
+        if (isset($config['boinc']['config']['cgi_url']['@value'])) {
         $config_cgi_url = rtrim(trim($config['boinc']['config']['cgi_url']['@value']), '/');
         $config_cgi_url .= '/cgi';
-      }
+        }
     }
-  }
-  $default = array(
+    }
+    $default = array(
     'boinc_scheduler_urls' => variable_get('boinc_scheduler_urls', $config_cgi_url),
     'boinc_scheduler_tag_format_old' => variable_get('boinc_scheduler_tag_format_old', 1),
     'boinc_scheduler_tag_format_new' => variable_get('boinc_scheduler_tag_format_new', 1)
-  );
+    );
   
-  // Define the form
-  $form['boinc_scheduler_urls'] = array(
+    // Define the form
+    $form['boinc_scheduler_urls'] = array(
     '#type' => 'textarea',
     '#title' => t('Scheduling server URLs'),
     '#default_value' => $default['boinc_scheduler_urls'],
     '#cols' => 60,
     '#rows' => 5,
     '#description' => t('If there are multiple URLs, please enter one per line.'),
-  );
-  $form['boinc_scheduler_tag_format_old'] = array(
+    );
+    $form['boinc_scheduler_tag_format_old'] = array(
     '#type' => 'checkbox',
     '#title' => t('Old format (@scheduler tag)', array('@scheduler' => '<scheduler>')),
     '#default_value' => $default['boinc_scheduler_tag_format_old']
-  );
-  $form['boinc_scheduler_tag_format_new'] = array(
+    );
+    $form['boinc_scheduler_tag_format_new'] = array(
     '#type' => 'checkbox',
     '#title' => t('New format (@link tag)', array('@link' => '<link>')),
     '#default_value' => $default['boinc_scheduler_tag_format_new']
-  );
+    );
   
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 
 /**
-  * Validate the BOINC scheduler form.
-  */
+ * Validate the BOINC scheduler form.
+ */
 function boincuser_admin_scheduler_validate($form, &$form_state) {
-  $values = $form_state['values'];
-  if (!$values['boinc_scheduler_urls']) {
+    $values = $form_state['values'];
+    if (!$values['boinc_scheduler_urls']) {
     form_set_error('boinc_scheduler_urls', t('At least one scheduling server
       URL must be specified.'));
-  }
-  else {
+    }
+    else {
     $urls = explode("\r\n", $values['boinc_scheduler_urls']);
     foreach ($urls as $key => $url) {
-      if (!$url) {
+        if (!$url) {
         unset($urls[$key]);
         continue;
-      }
-      if (!filter_var($url, FILTER_VALIDATE_URL)) {
+        }
+        if (!filter_var($url, FILTER_VALIDATE_URL)) {
         form_set_error('boinc_scheduler_urls', t('@url is not a valid URL
           format.', array('@url' => $url)));
         break;
-      }
+        }
     }
     $form_state['values']['boinc_scheduler_urls'] = implode("\r\n", $urls);
-  }
+    }
 }
 
 /**
-  * Handle post-validation submission of BOINC scheduler form.
-  */
+ * Handle post-validation submission of BOINC scheduler form.
+ */
 function boincuser_admin_scheduler_submit($form, &$form_state) {
-  drupal_set_message(t('BOINC scheduling server settings have been updated.'));
+    drupal_set_message(t('BOINC scheduling server settings have been updated.'));
 }
 
 
 /**
-  * Drupal-BOINC Web site related options.
-  */
+ * Drupal-BOINC Web site related options.
+ */
 function boincuser_admin_weboptions(&$form_state) {
-  $form = array();
+    $form = array();
 
-  //form defaults
-  $default = array(
+    //form defaults
+    $default = array(
     'boinc_weboptions_enableaccountcreateRPC' => variable_get('boinc_weboptions_enableaccountcreateRPC', TRUE),
     'boinc_weboptions_registrationtitle' => variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'),
     'boinc_weboptions_termsofuse' => variable_get('boinc_weboptions_termsofuse', ''),
@@ -340,123 +340,123 @@ 
     'boinc_weboptions_moderationpage' => variable_get('boinc_weboptions_moderationpage', ''),
     'boinc_weboptions_rulespolicies' => variable_get('boinc_weboptions_rulespolicies', ''),
     'boinc_other_frontpage' => variable_get('boinc_other_frontpage', ''),
-  );
+    );
   
-  // Define the form
-  $form['registrationtitle'] = array(
+    // Define the form
+    $form['registrationtitle'] = array(
     '#value' => '<h3>BOINC Registration</h3>',
-  );
+    );
 
-  $form['boinc_weboptions_enableaccountcreateRPC'] = array(
+    $form['boinc_weboptions_enableaccountcreateRPC'] = array(
     '#type' => 'checkbox',
     '#title' => t('Enable create_account.php RPC'),
     '#default_value' => $default['boinc_weboptions_enableaccountcreateRPC'],
     '#description' => t('If checked, users will be able to create an account remotely using the create_account.php RPC. This option is independent of the user regsitration option found in ') . l(t('User management -> User settings'), '/admin/user/settings') . '. If enabled, user <b>may not be able to see and agree to the terms-of-use</b> to your site\'s privacy and data retention policies!',
-  );
+    );
 
-  $form['boinc_weboptions_registrationtitle'] = array(
+    $form['boinc_weboptions_registrationtitle'] = array(
     '#type' => 'textfield',
     '#title' => t('Title of regsistration page'),
     '#description' => t('Title text presented above the terms of use text.'),
     '#default_value' => $default['boinc_weboptions_registrationtitle'],
-  );
+    );
 
-  $form['boinc_weboptions_termsofuse'] = array(
+    $form['boinc_weboptions_termsofuse'] = array(
     '#type' => 'textarea',
     '#title' => t('Terms of Use Message for User Registration Page'),
     '#default_value' => $default['boinc_weboptions_termsofuse'],
     '#cols' => 60,
     '#rows' => 8,
     '#description' => t('Text to be displayed on site\'s user registration page. Privacy policy and other data retention information goes here. If empty, there will be no terms of use message, and the title above and checkbox below will not be shown.'),
-  );
+    );
 
-  $form['boinc_weboptions_overrideboinctou'] = array(
+    $form['boinc_weboptions_overrideboinctou'] = array(
     '#type' => 'checkbox',
     '#title' => t('Override BOINC terms of use.'),
     '#default_value' => $default['boinc_weboptions_overrideboinctou'],
     '#description' => t('Override the BOINC terms_of_use.txt file for get_profject_config.php RPC. If TRUE, the get_project_config.php RPC will use the above terms of use text entered above. Otherwise, the original terms_of_use.txt text file in the project directory is used. And you will need to be responsible for keeping both the text file and the above terms of use text up-to-date and in sync with each other.'),
-  );
+    );
 
-  $form['boinc_weboptions_agreequestion'] = array(
+    $form['boinc_weboptions_agreequestion'] = array(
     '#type' => 'textfield',
     '#title' => t('Terms of use agreement question'),
     '#description' => t('This text is presented to the user as the question next to the \'I agree\' checkbox.'),
     '#default_value' => $default['boinc_weboptions_agreequestion'],
-  );
+    );
 
-  $form['boinc_weboptions_registrationtitle2'] = array(
+    $form['boinc_weboptions_registrationtitle2'] = array(
     '#type' => 'textfield',
     '#title' => t('Instructions for username/email/password questions'),
     '#description' => t('Title text presented below terms of use and above username/email/password textfields.'),
     '#default_value' => $default['boinc_weboptions_registrationtitle2'],
-  );
+    );
 
-  $form['boinc_weboptions_existinguser_tou'] = array(
+    $form['boinc_weboptions_existinguser_tou'] = array(
     '#type' => 'checkbox',
     '#title' => t('Are existing users forced to agree to the Terms of Use?'),
     '#default_value' => $default['boinc_weboptions_existinguser_tou'],
     '#description' => t('If TRUE, existing users are forced to agree to a terms of use (if present) when the login and the system has detected they have not agreed. Otherwise they may login as normal. This option has no affect on whether or not new users must agree to the terms of use.'),
-  );
+    );
 
-  $form['pathtitle'] = array(
+    $form['pathtitle'] = array(
     '#value' => '<h3>Path Options</h3>',
-  );
+    );
 
-  $form['boinc_weboptions_accountfinish'] = array (
+    $form['boinc_weboptions_accountfinish'] = array (
     '#type' => 'textfield',
     '#title' => t('Path to a custom account_finish.php page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s landing page for users create an account using the BOINC client manager. They will be directed to this page after the account is created. If blank, a default account_finish page will be used.<br>Examples: account_finish, content/welcome, node/123'),
     '#default_value' => $default['boinc_weboptions_accountfinish'],
-  );
-  $form['boinc_weboptions_moderationpage'] = array (
+    );
+    $form['boinc_weboptions_moderationpage'] = array (
     '#type' => 'textfield',
     '#title' => t('Path to the site\'s content moderation info page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s page for account/content moderation information. This will be used on the default account_finish page. If blank, no link to a moderation page will be provided. If a path is provided to the custom account_finish.php page (above), this field will be ignored.<br>Examples: moderation, content/moderation, node/456'),
     '#default_value' => $default['boinc_weboptions_moderationpage'],
-  );
-  $form['boinc_weboptions_rulespolicies'] = array (
+    );
+    $form['boinc_weboptions_rulespolicies'] = array (
     '#type' => 'textfield',
     '#title' => t('Path to the site\'s rule and policies page, should be a path to a node'),
     '#description' => t('Provide a path to a node which will serve as your site\'s rules and policies page. This will be used on the Join page shown to new users. If blank, no link to a rules and policies page will be provided.<br>Examples: rules-and-policies, node/789'),
     '#default_value' => $default['boinc_weboptions_rulespolicies'],
-  );
-  $form['boinc_other_frontpage'] = array (
+    );
+    $form['boinc_other_frontpage'] = array (
     '#type' => 'textarea',
     '#title' => bts('Message for site\'s Home Page', array(), NULL, 'boinc:admin-boinc-other-options'),
     '#default_value' => $default['boinc_other_frontpage'],
     '#cols' => 60,
     '#rows' => 8,
     '#description' => bts('Text to be displayed on the site\'s Home landing page.', array(), NULL, 'boinc:admin-boinc-other-options'),
-  );
+    );
     
-  return system_settings_form($form);
+    return system_settings_form($form);
 }
 
 /**
-  * Validate BOINC other form
-  */
+ * Validate BOINC other form
+ */
 function boincuser_admin_weboptions_validate($form, &$form_state) {
-  $values = $form_state['values'];
+    $values = $form_state['values'];
 
-  $accountfinish = $values['boinc_weboptions_accountfinish'];
-  if ( ($accountfinish) AND (!drupal_lookup_path('source', $accountfinish)) ) {
+    $accountfinish = $values['boinc_weboptions_accountfinish'];
+    if ( ($accountfinish) AND (!drupal_lookup_path('source', $accountfinish)) ) {
     form_set_error('boinc weboptions_accountfinish', t('Path to custom account finish page not found. Please provide a valid path, or leave blank to unset.'));
-  }
+    }
 
-  $moderationpage = $values['boinc_weboptions_moderationpage'];
-  if ( ($moderationpage) AND (!drupal_lookup_path('source', $moderationpage)) ) {
+    $moderationpage = $values['boinc_weboptions_moderationpage'];
+    if ( ($moderationpage) AND (!drupal_lookup_path('source', $moderationpage)) ) {
     form_set_error('boinc weboptions_moderationpage', t('Path to moderation page not found. Please provide a valid path, or leave blank to unset.'));
-  }
+    }
 
-  $rulespolicies = $values['boinc_weboptions_rulespolicies'];
-  if ( ($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies)) ) {
+    $rulespolicies = $values['boinc_weboptions_rulespolicies'];
+    if ( ($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies)) ) {
     form_set_error('boinc weboptions_rulespolicies', t('Path to rules and policies page not found. Please provide a valid path, or leave blank to unset.'));
-  }
+    }
 }
 
 /**
-  * Submit BOINC other form
-  */
+ * Submit BOINC other form
+ */
 function boincuser_admin_weboptions_submit($form, &$form_state) {
-  drupal_set_message( bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options') );
+    drupal_set_message( bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options') );
 }

Upper-Lower-Casing +13 added lines, -13 removed lines

@@ -49,7 +49,7 @@ 
   //drupal_set_message(print_r($default, true));
   //drupal_set_message(print_r($form_state, true));
   // Show overrides if the root dir is set and others have not been detected
-  $show_overrides = FALSE;
+  $show_overrides = false;
   if ($default['boinc_root_dir']) {
     foreach ($default as $key => $dir) {
       switch ($key) {
@@ -60,7 +60,7 @@ 
         // If any of these values are not set, show the overrides section
         if (!$dir) {
           $default[$key] = $form_state['values'][$key];
-          $show_overrides = TRUE;
+          $show_overrides = true;
           break;
         }
         break;
@@ -84,7 +84,7 @@ 
     '#title' => t('Overrides'),
     '#type' => 'fieldset',
     '#description' => '',
-    '#collapsible' => TRUE,
+    '#collapsible' => true,
     '#collapsed' => !$show_overrides,
     '#attributes' => array('class' => 'advanced-settings')
   );
@@ -222,7 +222,7 @@ 
       ));
     }
     if ($values['boinc_host_sched_logs_dir']
-        AND !is_dir($values['boinc_host_sched_logs_dir'])
+        and !is_dir($values['boinc_host_sched_logs_dir'])
       ) {
       form_set_error('boinc_host_sched_logs_dir', t('Host scheduler log
         directory not found at %directory',
@@ -329,13 +329,13 @@ 
 
   //form defaults
   $default = array(
-    'boinc_weboptions_enableaccountcreateRPC' => variable_get('boinc_weboptions_enableaccountcreateRPC', TRUE),
+    'boinc_weboptions_enableaccountcreateRPC' => variable_get('boinc_weboptions_enableaccountcreateRPC', true),
     'boinc_weboptions_registrationtitle' => variable_get('boinc_weboptions_registrationtitle', 'Please read and acknowledge our terms of use'),
     'boinc_weboptions_termsofuse' => variable_get('boinc_weboptions_termsofuse', ''),
-    'boinc_weboptions_overrideboinctou' => variable_get('boinc_weboptions_overrideboinctou', FALSE),
+    'boinc_weboptions_overrideboinctou' => variable_get('boinc_weboptions_overrideboinctou', false),
     'boinc_weboptions_agreequestion' => variable_get('boinc_weboptions_agreequestion', 'Do you agree with the above terms of use?'),
     'boinc_weboptions_registrationtitle2' => variable_get('boinc_weboptions_registrationtitle2', 'Fill in your name, email, and choose a secure passphrase.'),
-    'boinc_weboptions_existinguser_tou' => variable_get('boinc_weboptions_existinguser_tou', FALSE),
+    'boinc_weboptions_existinguser_tou' => variable_get('boinc_weboptions_existinguser_tou', false),
     'boinc_weboptions_accountfinish' => variable_get('boinc_weboptions_accountfinish', ''),
     'boinc_weboptions_moderationpage' => variable_get('boinc_weboptions_moderationpage', ''),
     'boinc_weboptions_rulespolicies' => variable_get('boinc_weboptions_rulespolicies', ''),
@@ -422,11 +422,11 @@ 
   );
   $form['boinc_other_frontpage'] = array (
     '#type' => 'textarea',
-    '#title' => bts('Message for site\'s Home Page', array(), NULL, 'boinc:admin-boinc-other-options'),
+    '#title' => bts('Message for site\'s Home Page', array(), null, 'boinc:admin-boinc-other-options'),
     '#default_value' => $default['boinc_other_frontpage'],
     '#cols' => 60,
     '#rows' => 8,
-    '#description' => bts('Text to be displayed on the site\'s Home landing page.', array(), NULL, 'boinc:admin-boinc-other-options'),
+    '#description' => bts('Text to be displayed on the site\'s Home landing page.', array(), null, 'boinc:admin-boinc-other-options'),
   );
     
   return system_settings_form($form);
@@ -439,17 +439,17 @@ 
   $values = $form_state['values'];
 
   $accountfinish = $values['boinc_weboptions_accountfinish'];
-  if ( ($accountfinish) AND (!drupal_lookup_path('source', $accountfinish)) ) {
+  if ( ($accountfinish) and (!drupal_lookup_path('source', $accountfinish)) ) {
     form_set_error('boinc weboptions_accountfinish', t('Path to custom account finish page not found. Please provide a valid path, or leave blank to unset.'));
   }
 
   $moderationpage = $values['boinc_weboptions_moderationpage'];
-  if ( ($moderationpage) AND (!drupal_lookup_path('source', $moderationpage)) ) {
+  if ( ($moderationpage) and (!drupal_lookup_path('source', $moderationpage)) ) {
     form_set_error('boinc weboptions_moderationpage', t('Path to moderation page not found. Please provide a valid path, or leave blank to unset.'));
   }
 
   $rulespolicies = $values['boinc_weboptions_rulespolicies'];
-  if ( ($rulespolicies) AND (!drupal_lookup_path('source', $rulespolicies)) ) {
+  if ( ($rulespolicies) and (!drupal_lookup_path('source', $rulespolicies)) ) {
     form_set_error('boinc weboptions_rulespolicies', t('Path to rules and policies page not found. Please provide a valid path, or leave blank to unset.'));
   }
 }
@@ -458,5 +458,5 @@ 
   * Submit BOINC other form
   */
 function boincuser_admin_weboptions_submit($form, &$form_state) {
-  drupal_set_message( bts("Status: Drupa-BOINC Web site options have been updated", array(), NULL, 'boinc:admin-boinc-website-options') );
+  drupal_set_message( bts("Status: Drupa-BOINC Web site options have been updated", array(), null, 'boinc:admin-boinc-website-options') );
 }

drupal/sites/default/boinc/themes/boinc/theme-settings.php

Indentation +19 added lines, -19 removed lines

@@ -15,42 +15,42 @@
  */
 function boinc_settings($saved_settings) {
 
-  // Get the default values from the .info file.
-  $defaults = zen_theme_get_default_settings('boinc');
+    // Get the default values from the .info file.
+    $defaults = zen_theme_get_default_settings('boinc');
 
-  // Merge the saved variables and their default values.
-  $settings = array_merge($defaults, $saved_settings);
+    // Merge the saved variables and their default values.
+    $settings = array_merge($defaults, $saved_settings);
 
-  /*
+    /*
    * Create the form using Forms API: http://api.drupal.org/api/6
    */
-  $form = array();
-  $form['boinc_stats_charts'] = array(
+    $form = array();
+    $form['boinc_stats_charts'] = array(
     '#type' => 'fieldset',
     '#title' => t('Chart settings'),
     '#attributes' => array(
-      'class' => 'zen-settings',
+        'class' => 'zen-settings',
     ),
-  );
-  $form['boinc_stats_charts']['boinc_stats_chart_color'] = array(
+    );
+    $form['boinc_stats_charts']['boinc_stats_chart_color'] = array(
     '#type'          => 'textfield',
     '#title'         => t('Chart color'),
     '#default_value' => $settings['boinc_stats_chart_color'],
     '#description'   => t('The primary color of the stats chart in hex format (e.g. #FAA341).'),
-  );
-  $form['boinc_stats_charts']['boinc_stats_chart_bcolor'] = array(
+    );
+    $form['boinc_stats_charts']['boinc_stats_chart_bcolor'] = array(
     '#type'          => 'textfield',
     '#title'         => t('Chart background color'),
     '#default_value' => $settings['boinc_stats_chart_bcolor'],
     '#description'   => t('The background color of the stats chart in hex format (e.g. #FFFFFF).'),
-  );
+    );
 
-  // Add the base theme's settings.
-  $form += zen_settings($saved_settings, $defaults);
+    // Add the base theme's settings.
+    $form += zen_settings($saved_settings, $defaults);
 
-  // Remove some of the base theme's settings.
-  unset($form['themedev']['zen_layout']); // We don't need to select the base stylesheet.
+    // Remove some of the base theme's settings.
+    unset($form['themedev']['zen_layout']); // We don't need to select the base stylesheet.
 
-  // Return the form
-  return $form;
+    // Return the form
+    return $form;
 }

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 // $Id: theme-settings.php,v 1.7 2008/09/11 09:36:50 johnalbin Exp $
 
 // Include the definition of zen_settings() and zen_theme_get_default_settings().
-include_once './' . drupal_get_path('theme', 'zen') . '/theme-settings.php';
+include_once './'.drupal_get_path('theme', 'zen').'/theme-settings.php';
 
 
 /**

drupal/sites/all/features/internationalization/internationalization.strongarm.inc

Indentation +22 added lines, -22 removed lines

@@ -4,34 +4,34 @@
  * Implementation of hook_strongarm().
  */
 function internationalization_strongarm() {
-  $export = array();
+    $export = array();
 
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'i18nstrings_allowed_formats';
-  $strongarm->value = array(
+    $strongarm = new stdClass;
+    $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+    $strongarm->api_version = 1;
+    $strongarm->name = 'i18nstrings_allowed_formats';
+    $strongarm->value = array(
     0 => 4,
     1 => 5,
-  );
-  $export['i18nstrings_allowed_formats'] = $strongarm;
+    );
+    $export['i18nstrings_allowed_formats'] = $strongarm;
 
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'i18ntaxonomy_vocabulary';
-  $strongarm->value = array(
+    $strongarm = new stdClass;
+    $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+    $strongarm->api_version = 1;
+    $strongarm->name = 'i18ntaxonomy_vocabulary';
+    $strongarm->value = array(
     2 => '1',
     1 => '0',
-  );
-  $export['i18ntaxonomy_vocabulary'] = $strongarm;
+    );
+    $export['i18ntaxonomy_vocabulary'] = $strongarm;
 
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
-  $strongarm->name = 'language_negotiation';
-  $strongarm->value = '2';
-  $export['language_negotiation'] = $strongarm;
+    $strongarm = new stdClass;
+    $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+    $strongarm->api_version = 1;
+    $strongarm->name = 'language_negotiation';
+    $strongarm->value = '2';
+    $export['language_negotiation'] = $strongarm;
 
-  return $export;
+    return $export;
 }

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
   $export = array();
 
   $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->disabled = false; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'i18nstrings_allowed_formats';
   $strongarm->value = array(
@@ -17,7 +17,7 @@ 
   $export['i18nstrings_allowed_formats'] = $strongarm;
 
   $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->disabled = false; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'i18ntaxonomy_vocabulary';
   $strongarm->value = array(
@@ -27,7 +27,7 @@ 
   $export['i18ntaxonomy_vocabulary'] = $strongarm;
 
   $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->disabled = false; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'language_negotiation';
   $strongarm->value = '2';

drupal/sites/all/features/internationalization/internationalization.features.user_permission.inc

Indentation +22 added lines, -22 removed lines

@@ -4,47 +4,47 @@
  * Implementation of hook_user_default_permissions().
  */
 function internationalization_user_default_permissions() {
-  $permissions = array();
+    $permissions = array();
 
-  // Exported permission: administer all languages
-  $permissions['administer all languages'] = array(
+    // Exported permission: administer all languages
+    $permissions['administer all languages'] = array(
     'name' => 'administer all languages',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer languages
-  $permissions['administer languages'] = array(
+    // Exported permission: administer languages
+    $permissions['administer languages'] = array(
     'name' => 'administer languages',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: administer translations
-  $permissions['administer translations'] = array(
+    // Exported permission: administer translations
+    $permissions['administer translations'] = array(
     'name' => 'administer translations',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: translate content
-  $permissions['translate content'] = array(
+    // Exported permission: translate content
+    $permissions['translate content'] = array(
     'name' => 'translate content',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  // Exported permission: translate interface
-  $permissions['translate interface'] = array(
+    // Exported permission: translate interface
+    $permissions['translate interface'] = array(
     'name' => 'translate interface',
     'roles' => array(
-      '0' => 'administrator',
+        '0' => 'administrator',
     ),
-  );
+    );
 
-  return $permissions;
+    return $permissions;
 }

drupal/sites/all/features/internationalization/internationalization.features.inc

Indentation +3 added lines, -3 removed lines

@@ -4,8 +4,8 @@
  * Implementation of hook_ctools_plugin_api().
  */
 function internationalization_ctools_plugin_api() {
-  list($module, $api) = func_get_args();
-  if ($module == "strongarm" && $api == "strongarm") {
+    list($module, $api) = func_get_args();
+    if ($module == "strongarm" && $api == "strongarm") {
     return array("version" => 1);
-  }
+    }
 }

drupal/sites/all/features/global_search_teams_solr/global_search_teams_solr.features.inc

Indentation +3 added lines, -3 removed lines

@@ -4,8 +4,8 @@
  * Implementation of hook_ctools_plugin_api().
  */
 function global_search_teams_solr_ctools_plugin_api() {
-  list($module, $api) = func_get_args();
-  if ($module == "apachesolr_search" && $api == "apachesolr_search_defaults") {
+    list($module, $api) = func_get_args();
+    if ($module == "apachesolr_search" && $api == "apachesolr_search_defaults") {
     return array("version" => 3);
-  }
+    }
 }

drupal/sites/all/features/global_search_teams_solr/global_search_teams_solr.apachesolr_search_defaults.inc

Indentation +15 added lines, -15 removed lines

@@ -4,20 +4,20 @@ 
  * Implementation of hook_apachesolr_search_default_searchers().
  */
 function global_search_teams_solr_apachesolr_search_default_searchers() {
-  $export = array();
+    $export = array();
 
-  $searcher = new stdClass;
-  $searcher->disabled = FALSE; /* Edit this to true to make a default searcher disabled initially */
-  $searcher->api_version = 3;
-  $searcher->page_id = 'team_search';
-  $searcher->label = 'Team search';
-  $searcher->description = '';
-  $searcher->search_path = 'search/team';
-  $searcher->page_title = 'Search teams';
-  $searcher->env_id = 'solr';
-  $searcher->settings = array(
+    $searcher = new stdClass;
+    $searcher->disabled = FALSE; /* Edit this to true to make a default searcher disabled initially */
+    $searcher->api_version = 3;
+    $searcher->page_id = 'team_search';
+    $searcher->label = 'Team search';
+    $searcher->description = '';
+    $searcher->search_path = 'search/team';
+    $searcher->page_title = 'Search teams';
+    $searcher->env_id = 'solr';
+    $searcher->settings = array(
     'fq' => array(
-      0 => 'bundle:team',
+        0 => 'bundle:team',
     ),
     'apachesolr_search_custom_enable' => 1,
     'apachesolr_search_search_type' => 'custom',
@@ -26,8 +26,8 @@ 
     'apachesolr_search_browse' => 'none',
     'apachesolr_search_spellcheck' => 1,
     'apachesolr_search_allow_user_input' => 0,
-  );
-  $export['team_search'] = $searcher;
+    );
+    $export['team_search'] = $searcher;
 
-  return $export;
+    return $export;
 }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
   $export = array();
 
   $searcher = new stdClass;
-  $searcher->disabled = FALSE; /* Edit this to true to make a default searcher disabled initially */
+  $searcher->disabled = false; /* Edit this to true to make a default searcher disabled initially */
   $searcher->api_version = 3;
   $searcher->page_id = 'team_search';
   $searcher->label = 'Team search';