Merge pull request #439 from chris18890/dev

Spacing/Syntax fixes

Author: chris18890

README.md

@@ -1,4 +1,4 @@
-Seltzer CRM 0.5.7 - An open source CRM for hackerspaces  
+Seltzer CRM 0.5.8 - An open source CRM for hackerspaces  
 Copyright 2009-2020 Edward L. Platt <ed@elplatt.com>  
 Distributed under GPLv3 (see COPYING for more info)
 

crm/include/form.inc.php

@@ -22,11 +22,10 @@
 
 /**
  * Return the form structure for a delete confirmation form.
- *
  * @param $type The type of element to delete.
  * @param $id The id of the element to delete.
  * @return The form structure.
-*/
+ */
 function delete_form ($type, $id) {
     $function = $type . '_delete_form';
     if (function_exists($function)) {
@@ -37,23 +36,20 @@ function delete_form ($type, $id) {
 
 /**
  * Return the form structure for a filtering form.
- *
  * @param $filters Array of filter keys and labels.
  * @param $default The default filter.
  * @param $action URL to submit to.
  * @param $get HTTP GET params to pass.
  * @return The form structure.
-*/
+ */
 function filter_form ($filters, $selected, $action, $get) {
-    
     // Construct hidden fields to pass GET params
     $hidden = array();
     foreach ($get as $key => $val) {
         if ($key != 'filter') {
             $hidden[$key] = $val;
         }
     }
-    
     $form = array(
         'type' => 'form'
         , 'method' => 'get'
@@ -78,8 +74,5 @@ function filter_form ($filters, $selected, $action, $get) {
             )
         )
     );
-    
     return $form;
 }
-
-?>

crm/include/page.inc.php

@@ -46,11 +46,10 @@ function core_page_list () {
 
 /**
  * Page hook.  Adds member module content to a page before it is rendered.
- *
  * @param &$page_data Reference to data about the page being rendered.
  * @param $page_name The name of the page being rendered.
  * @param $options The array of options passed to theme('page').
-*/
+ */
 function core_page (&$page_data, $page_name, $options) {
 
     $latestNews = '<p>Welcome to ' . title() . ' version ' . crm_version() . '!</p>';
@@ -102,5 +101,5 @@ function core_page (&$page_data, $page_name, $options) {
                 $content .= theme('form', crm_get_form('module_upgrade'));
                 page_add_content_top($page_data, $content);
             }
-    }   
+    }
 }

crm/include/sys/command.inc.php

@@ -26,16 +26,13 @@
  * @return The url to redirect to.
  */
 function command ($command) {
-    
     // Initialize url and parameters
     $url = '';
     $params = array();
-    
     // Call legacy handler if it exists
     $handler = "command_$command";
     if (function_exists($handler)) {
         $res = call_user_func($handler);
-        
         // Split result into file and params
         $parts = explode('?', $res);
         $url = $parts[0];
@@ -49,21 +46,18 @@ function command ($command) {
             }
         }
     }
-    
     // Call the handler for each module if it exists
     foreach (module_list() as $module) {
         $handler = "{$module}_command";
         if (function_exists($handler)) {
             $handler($command, $url, $params);
         }
     }
-    
     // Error if the url is still empty
     if (empty($url)) {
         error_register('No such command: ' . $command);
         $url = crm_url();
     }
-    
     $url .= '?';
     $parts = array();
     foreach ($params as $key => $value) {

crm/include/sys/csv.inc.php

@@ -43,30 +43,22 @@ function remove_utf8_bom($text) {
  * Converts csv data into a data structure.  The returned value is an array
  * with each element representing a row of the csv.  Each element is an array
  * with column names as keys and fields as values.
- *
  * @param $csv_data The data.
  * @param $row_terminate The character represening a new row.
  * @param $field_terminate The character representing the end of a field.
  * @param $field_quote The character used to quote fields.
  * @param $field_escape The character used to escape special characters in the field content.
- *
  * @return The data structure corresponding to the csv data.
  */
 function csv_parse ($content, $row_terminate = "\n", $field_terminate = ",", $field_quote = '"', $field_escape = "\\") {
-    
     $content = trim(csv_normalize($content)) . "\n";
-    
     $result = array();
     $header = array();
     $row = array();
-
     $field = '';
     $is_quoted = false;
-    
     $in_body = false;
-    
     $field_index = 0;
-    
     $index = 0;
     $length = strlen($content);
     while ($index < $length) {
@@ -112,10 +104,7 @@ function csv_parse ($content, $row_terminate = "\n", $field_terminate = ",", $fi
             $field = '';
             $is_quoted = false;
             $field_index++;
-        } else if (
-            ($char == $row_terminate && !$is_quoted)
-            || $index === $length - 1)
-        {
+        } else if (($char == $row_terminate && !$is_quoted) || $index === $length - 1) {
             // End field or header
             if ($in_body) {
                 // Body
@@ -126,7 +115,6 @@ function csv_parse ($content, $row_terminate = "\n", $field_terminate = ",", $fi
             }
             $field = '';
             $is_quoted = false;
-            
             // End row
             $field_index = 0;
             if ($in_body) {
@@ -143,6 +131,5 @@ function csv_parse ($content, $row_terminate = "\n", $field_terminate = ",", $fi
         }
         $index++;
     }
-    
     return $result;
-}
+}

crm/include/sys/data.inc.php

@@ -87,4 +87,4 @@ function crm_map ($data, $key) {
         $map[$row[$key]] = $row;
     }
     return $map;
-}
+}

crm/include/sys/error.inc.php

@@ -22,27 +22,24 @@
 
 /**
  * Register an error.
- *
  * @param $error The error.
-*/
+ */
 function error_register ($error) {
     $_SESSION['errorList'][] = $error;
 }
 
 /**
  * Register a message.
- *
  * @param $message The message.
-*/
+ */
 function message_register ($message) {
     $_SESSION['messageList'][] = $message;
 }
 
 /**
  * Return all registered errors and clear the list.
- *
  * @return An array of error strings.
-*/
+ */
 function error_list () {
     $errors = $_SESSION['errorList'];
     $_SESSION['errorList'] = array();
@@ -51,9 +48,8 @@ function error_list () {
 
 /**
  * Return all registered messages and clear the list.
- *
  * @return An array of message strings.
-*/
+ */
 function message_list () {
     $errors = $_SESSION['messageList'];
     $_SESSION['messageList'] = array();
@@ -62,44 +58,36 @@ function message_list () {
 
 /**
  * @return The themed html string for any errors currently registered.
-*/
+ */
 function theme_errors () {
-
     // Pop and check errors
     $errors = error_list();
     if (empty($errors)) {
         return '';
     }
-    
     $output = '<fieldset><ul>';
-    
     // Loop through errors
     foreach ($errors as $error) {
         $output .= '<li>' . $error . '</li>';
     }
-    
     $output .= '</ul></fieldset>';
     return $output;
 }
 
 /**
  * @return The themed html string for any registered messages.
-*/
+ */
 function theme_messages () {
-
     // Pop and check messages
     $messages = message_list();
     if (empty($messages)) {
         return '';
     }
-    
     $output = '<fieldset><ul>';
-    
     // Loop through errors
     foreach ($messages as $message) {
         $output .= '<li>' . $message . '</li>';
     }
-    
     $output .= '</ul></fieldset>';
     return $output;
 }