fisharebest / webtrees

app/Module/PedigreeChartModule.php

Indentation +47 added lines, -47 removed lines

@@ -24,55 +24,55 @@
  * Class PedigreeChartModule
  */
 class PedigreeChartModule extends AbstractModule implements ModuleChartInterface {
-	/**
-	 * How should this module be labelled on tabs, menus, etc.?
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		return /* I18N: Name of a module/chart */ I18N::translate('Pedigree');
-	}
+    /**
+     * How should this module be labelled on tabs, menus, etc.?
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return /* I18N: Name of a module/chart */ I18N::translate('Pedigree');
+    }
 
-	/**
-	 * A sentence describing what this module does.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return /* I18N: Description of the “PedigreeChart” module */ I18N::translate('A chart of an individual’s ancestors, formatted as a tree.');
-	}
+    /**
+     * A sentence describing what this module does.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return /* I18N: Description of the “PedigreeChart” module */ I18N::translate('A chart of an individual’s ancestors, formatted as a tree.');
+    }
 
-	/**
-	 * What is the default access level for this module?
-	 *
-	 * Some modules are aimed at admins or managers, and are not generally shown to users.
-	 *
-	 * @return int
-	 */
-	public function defaultAccessLevel() {
-		return Auth::PRIV_PRIVATE;
-	}
+    /**
+     * What is the default access level for this module?
+     *
+     * Some modules are aimed at admins or managers, and are not generally shown to users.
+     *
+     * @return int
+     */
+    public function defaultAccessLevel() {
+        return Auth::PRIV_PRIVATE;
+    }
 
-	/**
-	 * Return a menu item for this chart.
-	 *
-	 * @return Menu|null
-	 */
-	public function getChartMenu(Individual $individual) {
-		return new Menu(
-			$this->getTitle(),
-			'pedigree.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
-			'menu-chart-pedigree',
-			array('rel' => 'nofollow')
-		);
-	}
+    /**
+     * Return a menu item for this chart.
+     *
+     * @return Menu|null
+     */
+    public function getChartMenu(Individual $individual) {
+        return new Menu(
+            $this->getTitle(),
+            'pedigree.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
+            'menu-chart-pedigree',
+            array('rel' => 'nofollow')
+        );
+    }
 
-	/**
-	 * Return a menu item for this chart - for use in individual boxes.
-	 *
-	 * @return Menu|null
-	 */
-	public function getBoxChartMenu(Individual $individual) {
-		return $this->getChartMenu($individual);
-	}
+    /**
+     * Return a menu item for this chart - for use in individual boxes.
+     *
+     * @return Menu|null
+     */
+    public function getBoxChartMenu(Individual $individual) {
+        return $this->getChartMenu($individual);
+    }
 }

Braces +12 added lines, -6 removed lines

@@ -23,13 +23,15 @@ 
 /**
  * Class PedigreeChartModule
  */
-class PedigreeChartModule extends AbstractModule implements ModuleChartInterface {
+class PedigreeChartModule extends AbstractModule implements ModuleChartInterface
+{
 	/**
 	 * How should this module be labelled on tabs, menus, etc.?
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module/chart */ I18N::translate('Pedigree');
 	}
 
@@ -38,7 +40,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “PedigreeChart” module */ I18N::translate('A chart of an individual’s ancestors, formatted as a tree.');
 	}
 
@@ -49,7 +52,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_PRIVATE;
 	}
 
@@ -58,7 +62,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getChartMenu(Individual $individual) {
+	public function getChartMenu(Individual $individual)
+	{
 		return new Menu(
 			$this->getTitle(),
 			'pedigree.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
@@ -72,7 +77,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getBoxChartMenu(Individual $individual) {
+	public function getBoxChartMenu(Individual $individual)
+	{
 		return $this->getChartMenu($individual);
 	}
 }

app/Module/BatchUpdateModule.php

Indentation +328 added lines, -328 removed lines

@@ -35,158 +35,158 @@ 
  * Class BatchUpdateModule
  */
 class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface {
-	/** @var string  Form parameter: chosen plugin*/
-	private $plugin;
-
-	/** @var string Form parameter: record to update */
-	private $xref;
-
-	/** @var string Form parameter: how to update record */
-	private $action;
-
-	/** @var string Form parameter: additional details for $action */
-	private $data;
-
-	/** @var BatchUpdateBasePlugin[] All available plugins */
-	private $plugins;
-
-	/** @var BatchUpdateBasePlugin  The current plugin */
-	private $PLUGIN;
-
-	/** @var string[] n array of all xrefs that might need to be updated */
-	private $all_xrefs;
-
-	/** @var string The previous xref to process */
-	private $prev_xref;
-
-	/** @var String The current xref being process */
-	private $curr_xref;
-
-	/** @var string The next xref to process */
-	private $next_xref;
-
-	/** @var GedcomRecord The record corresponding to $curr_xref */
-	private $record;
-
-	/**
-	 * How should this module be labelled on tabs, menus, etc.?
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Batch update');
-	}
-
-	/**
-	 * A sentence describing what this module does.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return /* I18N: Description of the “Batch update” module */ I18N::translate('Apply automatic corrections to your genealogy data.');
-	}
-
-	/**
-	 * This is a general purpose hook, allowing modules to respond to routes
-	 * of the form module.php?mod=FOO&mod_action=BAR
-	 *
-	 * @param string $mod_action
-	 */
-	public function modAction($mod_action) {
-		switch ($mod_action) {
-		case 'admin_batch_update':
-			echo $this->main();
-			break;
-
-		default:
-			http_response_code(404);
-			break;
-		}
-	}
-
-	/**
-	 * Main entry point
-	 *
-	 * @return string
-	 */
-	private function main() {
-		global $WT_TREE;
-
-		$this->plugins = $this->getPluginList(); // List of available plugins
-		$this->plugin  = Filter::get('plugin'); // User parameters
-		$this->xref    = Filter::get('xref', WT_REGEX_XREF);
-		$this->action  = Filter::get('action');
-		$this->data    = Filter::get('data');
-
-		// Don't do any processing until a plugin is chosen.
-		if ($this->plugin && array_key_exists($this->plugin, $this->plugins)) {
-			$this->PLUGIN = new $this->plugin;
-			$this->PLUGIN->getOptions();
-			$this->getAllXrefs();
-
-			switch ($this->action) {
-			case 'update':
-				$record = self::getLatestRecord($this->xref, $this->all_xrefs[$this->xref]);
-				if ($this->PLUGIN->doesRecordNeedUpdate($this->xref, $record)) {
-					$newrecord = $this->PLUGIN->updateRecord($this->xref, $record);
-					if ($newrecord != $record) {
-						if ($newrecord) {
-							GedcomRecord::getInstance($this->xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
-						} else {
-							GedcomRecord::getInstance($this->xref, $WT_TREE)->deleteRecord();
-						}
-					}
-				}
-				$this->xref = $this->findNextXref($this->xref);
-				break;
-			case 'update_all':
-				foreach ($this->all_xrefs as $xref => $type) {
-					$record = self::getLatestRecord($xref, $type);
-					if ($this->PLUGIN->doesRecordNeedUpdate($xref, $record)) {
-						$newrecord = $this->PLUGIN->updateRecord($xref, $record);
-						if ($newrecord != $record) {
-							if ($newrecord) {
-								GedcomRecord::getInstance($xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
-							} else {
-								GedcomRecord::getInstance($xref, $WT_TREE)->deleteRecord();
-							}
-						}
-					}
-				}
-				$this->xref = '';
-				break;
-			}
-
-			// Make sure that our requested record really does need updating.
-			// It may have been updated in another session, or may not have
-			// been specified at all.
-			if (array_key_exists($this->xref, $this->all_xrefs) &&
-				$this->PLUGIN->doesRecordNeedUpdate($this->xref, self::getLatestRecord($this->xref, $this->all_xrefs[$this->xref]))) {
-				$this->curr_xref = $this->xref;
-			}
-			// The requested record doesn't need updating - find one that does
-			if (!$this->curr_xref) {
-				$this->curr_xref = $this->findNextXref($this->xref);
-			}
-			if (!$this->curr_xref) {
-				$this->curr_xref = $this->findPrevXref($this->xref);
-			}
-			// If we've found a record to update, get details and look for the next/prev
-			if ($this->curr_xref) {
-				$this->prev_xref = $this->findPrevXref($this->curr_xref);
-				$this->next_xref = $this->findNextXref($this->curr_xref);
-			}
-		}
-
-		// HTML common to all pages
-		$controller = new PageController;
-			$controller
-				->setPageTitle(I18N::translate('Batch update'))
-				->restrictAccess(Auth::isAdmin())
-				->pageHeader();
-
-		echo $this->getJavascript();
-		?>
+    /** @var string  Form parameter: chosen plugin*/
+    private $plugin;
+
+    /** @var string Form parameter: record to update */
+    private $xref;
+
+    /** @var string Form parameter: how to update record */
+    private $action;
+
+    /** @var string Form parameter: additional details for $action */
+    private $data;
+
+    /** @var BatchUpdateBasePlugin[] All available plugins */
+    private $plugins;
+
+    /** @var BatchUpdateBasePlugin  The current plugin */
+    private $PLUGIN;
+
+    /** @var string[] n array of all xrefs that might need to be updated */
+    private $all_xrefs;
+
+    /** @var string The previous xref to process */
+    private $prev_xref;
+
+    /** @var String The current xref being process */
+    private $curr_xref;
+
+    /** @var string The next xref to process */
+    private $next_xref;
+
+    /** @var GedcomRecord The record corresponding to $curr_xref */
+    private $record;
+
+    /**
+     * How should this module be labelled on tabs, menus, etc.?
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Batch update');
+    }
+
+    /**
+     * A sentence describing what this module does.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return /* I18N: Description of the “Batch update” module */ I18N::translate('Apply automatic corrections to your genealogy data.');
+    }
+
+    /**
+     * This is a general purpose hook, allowing modules to respond to routes
+     * of the form module.php?mod=FOO&mod_action=BAR
+     *
+     * @param string $mod_action
+     */
+    public function modAction($mod_action) {
+        switch ($mod_action) {
+        case 'admin_batch_update':
+            echo $this->main();
+            break;
+
+        default:
+            http_response_code(404);
+            break;
+        }
+    }
+
+    /**
+     * Main entry point
+     *
+     * @return string
+     */
+    private function main() {
+        global $WT_TREE;
+
+        $this->plugins = $this->getPluginList(); // List of available plugins
+        $this->plugin  = Filter::get('plugin'); // User parameters
+        $this->xref    = Filter::get('xref', WT_REGEX_XREF);
+        $this->action  = Filter::get('action');
+        $this->data    = Filter::get('data');
+
+        // Don't do any processing until a plugin is chosen.
+        if ($this->plugin && array_key_exists($this->plugin, $this->plugins)) {
+            $this->PLUGIN = new $this->plugin;
+            $this->PLUGIN->getOptions();
+            $this->getAllXrefs();
+
+            switch ($this->action) {
+            case 'update':
+                $record = self::getLatestRecord($this->xref, $this->all_xrefs[$this->xref]);
+                if ($this->PLUGIN->doesRecordNeedUpdate($this->xref, $record)) {
+                    $newrecord = $this->PLUGIN->updateRecord($this->xref, $record);
+                    if ($newrecord != $record) {
+                        if ($newrecord) {
+                            GedcomRecord::getInstance($this->xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
+                        } else {
+                            GedcomRecord::getInstance($this->xref, $WT_TREE)->deleteRecord();
+                        }
+                    }
+                }
+                $this->xref = $this->findNextXref($this->xref);
+                break;
+            case 'update_all':
+                foreach ($this->all_xrefs as $xref => $type) {
+                    $record = self::getLatestRecord($xref, $type);
+                    if ($this->PLUGIN->doesRecordNeedUpdate($xref, $record)) {
+                        $newrecord = $this->PLUGIN->updateRecord($xref, $record);
+                        if ($newrecord != $record) {
+                            if ($newrecord) {
+                                GedcomRecord::getInstance($xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
+                            } else {
+                                GedcomRecord::getInstance($xref, $WT_TREE)->deleteRecord();
+                            }
+                        }
+                    }
+                }
+                $this->xref = '';
+                break;
+            }
+
+            // Make sure that our requested record really does need updating.
+            // It may have been updated in another session, or may not have
+            // been specified at all.
+            if (array_key_exists($this->xref, $this->all_xrefs) &&
+                $this->PLUGIN->doesRecordNeedUpdate($this->xref, self::getLatestRecord($this->xref, $this->all_xrefs[$this->xref]))) {
+                $this->curr_xref = $this->xref;
+            }
+            // The requested record doesn't need updating - find one that does
+            if (!$this->curr_xref) {
+                $this->curr_xref = $this->findNextXref($this->xref);
+            }
+            if (!$this->curr_xref) {
+                $this->curr_xref = $this->findPrevXref($this->xref);
+            }
+            // If we've found a record to update, get details and look for the next/prev
+            if ($this->curr_xref) {
+                $this->prev_xref = $this->findPrevXref($this->curr_xref);
+                $this->next_xref = $this->findNextXref($this->curr_xref);
+            }
+        }
+
+        // HTML common to all pages
+        $controller = new PageController;
+            $controller
+                ->setPageTitle(I18N::translate('Batch update'))
+                ->restrictAccess(Auth::isAdmin())
+                ->pageHeader();
+
+        echo $this->getJavascript();
+        ?>
 		<ol class="breadcrumb small">
 			<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 			<li><a href="admin_modules.php"><?php echo I18N::translate('Module administration'); ?></a></li>
@@ -261,181 +261,181 @@ 
 		<?php endif; ?>
 		</form>
 		<?php
-	}
-
-	/**
-	 * Find the next record that needs to be updated.
-	 *
-	 * @param string $xref
-	 *
-	 * @return string|null
-	 */
-	private function findNextXref($xref) {
-		foreach (array_keys($this->all_xrefs) as $key) {
-			if ($key > $xref) {
-				$record = self::getLatestRecord($key, $this->all_xrefs[$key]);
-				if ($this->PLUGIN->doesRecordNeedUpdate($key, $record)) {
-					return $key;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Find the previous record that needs to be updated.
-	 *
-	 * @param string $xref
-	 *
-	 * @return string|null
-	 */
-	private function findPrevXref($xref) {
-		foreach (array_reverse(array_keys($this->all_xrefs)) as $key) {
-			if ($key < $xref) {
-				$record = self::getLatestRecord($key, $this->all_xrefs[$key]);
-				if ($this->PLUGIN->doesRecordNeedUpdate($key, $record)) {
-					return $key;
-				}
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * Generate a list of all XREFs.
-	 */
-	private function getAllXrefs() {
-		global $WT_TREE;
-
-		$sql  = array();
-		$vars = array();
-		foreach ($this->PLUGIN->getRecordTypesToUpdate() as $type) {
-			switch ($type) {
-			case 'INDI':
-				$sql[]  = "SELECT i_id, 'INDI' FROM `##individuals` WHERE i_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			case 'FAM':
-				$sql[]  = "SELECT f_id, 'FAM' FROM `##families` WHERE f_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			case 'SOUR':
-				$sql[]  = "SELECT s_id, 'SOUR' FROM `##sources` WHERE s_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			case 'OBJE':
-				$sql[]  = "SELECT m_id, 'OBJE' FROM `##media` WHERE m_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			default:
-				$sql[]  = "SELECT o_id, ? FROM `##other` WHERE o_type=? AND o_file=?";
-				$vars[] = $type;
-				$vars[] = $type;
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			}
-		}
-		$this->all_xrefs =
-			Database::prepare(implode(' UNION ', $sql) . ' ORDER BY 1 ASC')
-				->execute($vars)
-				->fetchAssoc();
-	}
-
-	/**
-	 * Scan the plugin folder for a list of plugins
-	 *
-	 * @return BatchUpdateBasePlugin[]
-	 */
-	private function getPluginList() {
-		$plugins    = array();
-		$dir_handle = opendir(__DIR__ . '/BatchUpdate');
-		while (($file = readdir($dir_handle)) !== false) {
-			if (substr($file, -10) == 'Plugin.php' && $file !== 'BatchUpdateBasePlugin.php') {
-				$class           = '\Fisharebest\Webtrees\Module\BatchUpdate\\' . basename($file, '.php');
-				$plugins[$class] = new $class;
-			}
-		}
-		closedir($dir_handle);
-
-		return $plugins;
-	}
-
-	/**
-	 * Javascript that gets included on every page
-	 *
-	 * @return string
-	 */
-	private function getJavascript() {
-		return
-			'<script>' .
-			'function reset_reload() {' .
-			' var bu_form=document.getElementById("batch_update_form");' .
-			' bu_form.xref.value="";' .
-			' bu_form.action.value="";' .
-			' bu_form.data.value="";' .
-			' bu_form.submit();' .
-			'}</script>';
-	}
-
-	/**
-	 * Create a submit button for our form
-	 *
-	 * @param string $text
-	 * @param string $xref
-	 * @param string $action
-	 * @param string $data
-	 *
-	 * @return string
-	 */
-	public static function createSubmitButton($text, $xref, $action = '', $data = '') {
-		return
-			'<input class="btn btn-primary" type="submit" value="' . $text . '" onclick="' .
-			'this.form.xref.value=\'' . Filter::escapeHtml($xref) . '\';' .
-			'this.form.action.value=\'' . Filter::escapeHtml($action) . '\';' .
-			'this.form.data.value=\'' . Filter::escapeHtml($data) . '\';' .
-			'return true;"' .
-			($xref ? '' : ' disabled') . '>';
-	}
-
-	/**
-	 * Get the current view of a record, allowing for pending changes
-	 *
-	 * @param string $xref
-	 * @param string $type
-	 *
-	 * @return string
-	 */
-	public static function getLatestRecord($xref, $type) {
-		global $WT_TREE;
-
-		switch ($type) {
-		case 'INDI':
-			return Individual::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'FAM':
-			return Family::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'SOUR':
-			return Source::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'REPO':
-			return Repository::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'OBJE':
-			return Media::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'NOTE':
-			return Note::getInstance($xref, $WT_TREE)->getGedcom();
-		default:
-			return GedcomRecord::getInstance($xref, $WT_TREE)->getGedcom();
-		}
-	}
-
-	/**
-	 * The URL to a page where the user can modify the configuration of this module.
-	 * These links are displayed in the admin page menu.
-	 *
-	 * @return string
-	 */
-	public function getConfigLink() {
-		return 'module.php?mod=' . $this->getName() . '&amp;mod_action=admin_batch_update';
-	}
+    }
+
+    /**
+     * Find the next record that needs to be updated.
+     *
+     * @param string $xref
+     *
+     * @return string|null
+     */
+    private function findNextXref($xref) {
+        foreach (array_keys($this->all_xrefs) as $key) {
+            if ($key > $xref) {
+                $record = self::getLatestRecord($key, $this->all_xrefs[$key]);
+                if ($this->PLUGIN->doesRecordNeedUpdate($key, $record)) {
+                    return $key;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Find the previous record that needs to be updated.
+     *
+     * @param string $xref
+     *
+     * @return string|null
+     */
+    private function findPrevXref($xref) {
+        foreach (array_reverse(array_keys($this->all_xrefs)) as $key) {
+            if ($key < $xref) {
+                $record = self::getLatestRecord($key, $this->all_xrefs[$key]);
+                if ($this->PLUGIN->doesRecordNeedUpdate($key, $record)) {
+                    return $key;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Generate a list of all XREFs.
+     */
+    private function getAllXrefs() {
+        global $WT_TREE;
+
+        $sql  = array();
+        $vars = array();
+        foreach ($this->PLUGIN->getRecordTypesToUpdate() as $type) {
+            switch ($type) {
+            case 'INDI':
+                $sql[]  = "SELECT i_id, 'INDI' FROM `##individuals` WHERE i_file=?";
+                $vars[] = $WT_TREE->getTreeId();
+                break;
+            case 'FAM':
+                $sql[]  = "SELECT f_id, 'FAM' FROM `##families` WHERE f_file=?";
+                $vars[] = $WT_TREE->getTreeId();
+                break;
+            case 'SOUR':
+                $sql[]  = "SELECT s_id, 'SOUR' FROM `##sources` WHERE s_file=?";
+                $vars[] = $WT_TREE->getTreeId();
+                break;
+            case 'OBJE':
+                $sql[]  = "SELECT m_id, 'OBJE' FROM `##media` WHERE m_file=?";
+                $vars[] = $WT_TREE->getTreeId();
+                break;
+            default:
+                $sql[]  = "SELECT o_id, ? FROM `##other` WHERE o_type=? AND o_file=?";
+                $vars[] = $type;
+                $vars[] = $type;
+                $vars[] = $WT_TREE->getTreeId();
+                break;
+            }
+        }
+        $this->all_xrefs =
+            Database::prepare(implode(' UNION ', $sql) . ' ORDER BY 1 ASC')
+                ->execute($vars)
+                ->fetchAssoc();
+    }
+
+    /**
+     * Scan the plugin folder for a list of plugins
+     *
+     * @return BatchUpdateBasePlugin[]
+     */
+    private function getPluginList() {
+        $plugins    = array();
+        $dir_handle = opendir(__DIR__ . '/BatchUpdate');
+        while (($file = readdir($dir_handle)) !== false) {
+            if (substr($file, -10) == 'Plugin.php' && $file !== 'BatchUpdateBasePlugin.php') {
+                $class           = '\Fisharebest\Webtrees\Module\BatchUpdate\\' . basename($file, '.php');
+                $plugins[$class] = new $class;
+            }
+        }
+        closedir($dir_handle);
+
+        return $plugins;
+    }
+
+    /**
+     * Javascript that gets included on every page
+     *
+     * @return string
+     */
+    private function getJavascript() {
+        return
+            '<script>' .
+            'function reset_reload() {' .
+            ' var bu_form=document.getElementById("batch_update_form");' .
+            ' bu_form.xref.value="";' .
+            ' bu_form.action.value="";' .
+            ' bu_form.data.value="";' .
+            ' bu_form.submit();' .
+            '}</script>';
+    }
+
+    /**
+     * Create a submit button for our form
+     *
+     * @param string $text
+     * @param string $xref
+     * @param string $action
+     * @param string $data
+     *
+     * @return string
+     */
+    public static function createSubmitButton($text, $xref, $action = '', $data = '') {
+        return
+            '<input class="btn btn-primary" type="submit" value="' . $text . '" onclick="' .
+            'this.form.xref.value=\'' . Filter::escapeHtml($xref) . '\';' .
+            'this.form.action.value=\'' . Filter::escapeHtml($action) . '\';' .
+            'this.form.data.value=\'' . Filter::escapeHtml($data) . '\';' .
+            'return true;"' .
+            ($xref ? '' : ' disabled') . '>';
+    }
+
+    /**
+     * Get the current view of a record, allowing for pending changes
+     *
+     * @param string $xref
+     * @param string $type
+     *
+     * @return string
+     */
+    public static function getLatestRecord($xref, $type) {
+        global $WT_TREE;
+
+        switch ($type) {
+        case 'INDI':
+            return Individual::getInstance($xref, $WT_TREE)->getGedcom();
+        case 'FAM':
+            return Family::getInstance($xref, $WT_TREE)->getGedcom();
+        case 'SOUR':
+            return Source::getInstance($xref, $WT_TREE)->getGedcom();
+        case 'REPO':
+            return Repository::getInstance($xref, $WT_TREE)->getGedcom();
+        case 'OBJE':
+            return Media::getInstance($xref, $WT_TREE)->getGedcom();
+        case 'NOTE':
+            return Note::getInstance($xref, $WT_TREE)->getGedcom();
+        default:
+            return GedcomRecord::getInstance($xref, $WT_TREE)->getGedcom();
+        }
+    }
+
+    /**
+     * The URL to a page where the user can modify the configuration of this module.
+     * These links are displayed in the admin page menu.
+     *
+     * @return string
+     */
+    public function getConfigLink() {
+        return 'module.php?mod=' . $this->getName() . '&amp;mod_action=admin_batch_update';
+    }
 
 }

Switch Indentation +72 added lines, -72 removed lines

@@ -94,13 +94,13 @@ 
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'admin_batch_update':
-			echo $this->main();
-			break;
+		    case 'admin_batch_update':
+			    echo $this->main();
+			    break;
 
-		default:
-			http_response_code(404);
-			break;
+		    default:
+			    http_response_code(404);
+			    break;
 		}
 	}
 
@@ -125,36 +125,36 @@ 
 			$this->getAllXrefs();
 
 			switch ($this->action) {
-			case 'update':
-				$record = self::getLatestRecord($this->xref, $this->all_xrefs[$this->xref]);
-				if ($this->PLUGIN->doesRecordNeedUpdate($this->xref, $record)) {
-					$newrecord = $this->PLUGIN->updateRecord($this->xref, $record);
-					if ($newrecord != $record) {
-						if ($newrecord) {
-							GedcomRecord::getInstance($this->xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
-						} else {
-							GedcomRecord::getInstance($this->xref, $WT_TREE)->deleteRecord();
-						}
-					}
-				}
-				$this->xref = $this->findNextXref($this->xref);
-				break;
-			case 'update_all':
-				foreach ($this->all_xrefs as $xref => $type) {
-					$record = self::getLatestRecord($xref, $type);
-					if ($this->PLUGIN->doesRecordNeedUpdate($xref, $record)) {
-						$newrecord = $this->PLUGIN->updateRecord($xref, $record);
-						if ($newrecord != $record) {
-							if ($newrecord) {
-								GedcomRecord::getInstance($xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
-							} else {
-								GedcomRecord::getInstance($xref, $WT_TREE)->deleteRecord();
-							}
-						}
-					}
-				}
-				$this->xref = '';
-				break;
+			    case 'update':
+				    $record = self::getLatestRecord($this->xref, $this->all_xrefs[$this->xref]);
+				    if ($this->PLUGIN->doesRecordNeedUpdate($this->xref, $record)) {
+					    $newrecord = $this->PLUGIN->updateRecord($this->xref, $record);
+					    if ($newrecord != $record) {
+						    if ($newrecord) {
+							    GedcomRecord::getInstance($this->xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
+						    } else {
+							    GedcomRecord::getInstance($this->xref, $WT_TREE)->deleteRecord();
+						    }
+					    }
+				    }
+				    $this->xref = $this->findNextXref($this->xref);
+				    break;
+			    case 'update_all':
+				    foreach ($this->all_xrefs as $xref => $type) {
+					    $record = self::getLatestRecord($xref, $type);
+					    if ($this->PLUGIN->doesRecordNeedUpdate($xref, $record)) {
+						    $newrecord = $this->PLUGIN->updateRecord($xref, $record);
+						    if ($newrecord != $record) {
+							    if ($newrecord) {
+								    GedcomRecord::getInstance($xref, $WT_TREE)->updateRecord($newrecord, !$this->PLUGIN->chan);
+							    } else {
+								    GedcomRecord::getInstance($xref, $WT_TREE)->deleteRecord();
+							    }
+						    }
+					    }
+				    }
+				    $this->xref = '';
+				    break;
 			}
 
 			// Make sure that our requested record really does need updating.
@@ -313,28 +313,28 @@ 
 		$vars = array();
 		foreach ($this->PLUGIN->getRecordTypesToUpdate() as $type) {
 			switch ($type) {
-			case 'INDI':
-				$sql[]  = "SELECT i_id, 'INDI' FROM `##individuals` WHERE i_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			case 'FAM':
-				$sql[]  = "SELECT f_id, 'FAM' FROM `##families` WHERE f_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			case 'SOUR':
-				$sql[]  = "SELECT s_id, 'SOUR' FROM `##sources` WHERE s_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			case 'OBJE':
-				$sql[]  = "SELECT m_id, 'OBJE' FROM `##media` WHERE m_file=?";
-				$vars[] = $WT_TREE->getTreeId();
-				break;
-			default:
-				$sql[]  = "SELECT o_id, ? FROM `##other` WHERE o_type=? AND o_file=?";
-				$vars[] = $type;
-				$vars[] = $type;
-				$vars[] = $WT_TREE->getTreeId();
-				break;
+			    case 'INDI':
+				    $sql[]  = "SELECT i_id, 'INDI' FROM `##individuals` WHERE i_file=?";
+				    $vars[] = $WT_TREE->getTreeId();
+				    break;
+			    case 'FAM':
+				    $sql[]  = "SELECT f_id, 'FAM' FROM `##families` WHERE f_file=?";
+				    $vars[] = $WT_TREE->getTreeId();
+				    break;
+			    case 'SOUR':
+				    $sql[]  = "SELECT s_id, 'SOUR' FROM `##sources` WHERE s_file=?";
+				    $vars[] = $WT_TREE->getTreeId();
+				    break;
+			    case 'OBJE':
+				    $sql[]  = "SELECT m_id, 'OBJE' FROM `##media` WHERE m_file=?";
+				    $vars[] = $WT_TREE->getTreeId();
+				    break;
+			    default:
+				    $sql[]  = "SELECT o_id, ? FROM `##other` WHERE o_type=? AND o_file=?";
+				    $vars[] = $type;
+				    $vars[] = $type;
+				    $vars[] = $WT_TREE->getTreeId();
+				    break;
 			}
 		}
 		$this->all_xrefs =
@@ -411,20 +411,20 @@ 
 		global $WT_TREE;
 
 		switch ($type) {
-		case 'INDI':
-			return Individual::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'FAM':
-			return Family::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'SOUR':
-			return Source::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'REPO':
-			return Repository::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'OBJE':
-			return Media::getInstance($xref, $WT_TREE)->getGedcom();
-		case 'NOTE':
-			return Note::getInstance($xref, $WT_TREE)->getGedcom();
-		default:
-			return GedcomRecord::getInstance($xref, $WT_TREE)->getGedcom();
+		    case 'INDI':
+			    return Individual::getInstance($xref, $WT_TREE)->getGedcom();
+		    case 'FAM':
+			    return Family::getInstance($xref, $WT_TREE)->getGedcom();
+		    case 'SOUR':
+			    return Source::getInstance($xref, $WT_TREE)->getGedcom();
+		    case 'REPO':
+			    return Repository::getInstance($xref, $WT_TREE)->getGedcom();
+		    case 'OBJE':
+			    return Media::getInstance($xref, $WT_TREE)->getGedcom();
+		    case 'NOTE':
+			    return Note::getInstance($xref, $WT_TREE)->getGedcom();
+		    default:
+			    return GedcomRecord::getInstance($xref, $WT_TREE)->getGedcom();
 		}
 	}
 

Braces +36 added lines, -17 removed lines

@@ -34,7 +34,8 @@ 
 /**
  * Class BatchUpdateModule
  */
-class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface {
+class BatchUpdateModule extends AbstractModule implements ModuleConfigInterface
+{
 	/** @var string  Form parameter: chosen plugin*/
 	private $plugin;
 
@@ -73,7 +74,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Batch update');
 	}
 
@@ -82,7 +84,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Batch update” module */ I18N::translate('Apply automatic corrections to your genealogy data.');
 	}
 
@@ -92,7 +95,8 @@ 
 	 *
 	 * @param string $mod_action
 	 */
-	public function modAction($mod_action) {
+	public function modAction($mod_action)
+	{
 		switch ($mod_action) {
 		case 'admin_batch_update':
 			echo $this->main();
@@ -109,7 +113,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function main() {
+	private function main()
+	{
 		global $WT_TREE;
 
 		$this->plugins = $this->getPluginList(); // List of available plugins
@@ -236,12 +241,15 @@ 
 					<?php // Reset - otherwise we might "undo all changes", which refreshes the ?>
 					<?php // page, which makes them all again!  ?>
 					<script>reset_reload();</script>
-			<?php else: ?>
+			<?php else {
+    : ?>
 					<hr>
 					<div id="batch_update2" class="col-sm-12">
 						<?php if ($this->curr_xref): ?>
 							<?php // Create an object, so we can get the latest version of the name. ?>
-								<?php $this->record = GedcomRecord::getInstance($this->curr_xref, $WT_TREE); ?>
+								<?php $this->record = GedcomRecord::getInstance($this->curr_xref, $WT_TREE);
+}
+?>
 							<div class="form-group">
 								<?php echo self::createSubmitButton(I18N::translate('previous'), $this->prev_xref) ?>
 					<?php echo self::createSubmitButton(I18N::translate('next'), $this->next_xref) ?>
@@ -253,8 +261,11 @@ 
 							<div class="form-group">
 							<?php echo implode(' ', $this->PLUGIN->getActionButtons($this->curr_xref, $this->record)); ?>
 							</div>
-						<?php else: ?>
-							<div class="alert alert-info"><?php echo I18N::translate('Nothing found.'); ?></div>
+						<?php else {
+    : ?>
+							<div class="alert alert-info"><?php echo I18N::translate('Nothing found.');
+}
+?></div>
 					<?php endif; ?>
 					</div>
 				<?php endif; ?>
@@ -270,7 +281,8 @@ 
 	 *
 	 * @return string|null
 	 */
-	private function findNextXref($xref) {
+	private function findNextXref($xref)
+	{
 		foreach (array_keys($this->all_xrefs) as $key) {
 			if ($key > $xref) {
 				$record = self::getLatestRecord($key, $this->all_xrefs[$key]);
@@ -290,7 +302,8 @@ 
 	 *
 	 * @return string|null
 	 */
-	private function findPrevXref($xref) {
+	private function findPrevXref($xref)
+	{
 		foreach (array_reverse(array_keys($this->all_xrefs)) as $key) {
 			if ($key < $xref) {
 				$record = self::getLatestRecord($key, $this->all_xrefs[$key]);
@@ -306,7 +319,8 @@ 
 	/**
 	 * Generate a list of all XREFs.
 	 */
-	private function getAllXrefs() {
+	private function getAllXrefs()
+	{
 		global $WT_TREE;
 
 		$sql  = array();
@@ -348,7 +362,8 @@ 
 	 *
 	 * @return BatchUpdateBasePlugin[]
 	 */
-	private function getPluginList() {
+	private function getPluginList()
+	{
 		$plugins    = array();
 		$dir_handle = opendir(__DIR__ . '/BatchUpdate');
 		while (($file = readdir($dir_handle)) !== false) {
@@ -367,7 +382,8 @@ 
 	 *
 	 * @return string
 	 */
-	private function getJavascript() {
+	private function getJavascript()
+	{
 		return
 			'<script>' .
 			'function reset_reload() {' .
@@ -389,7 +405,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function createSubmitButton($text, $xref, $action = '', $data = '') {
+	public static function createSubmitButton($text, $xref, $action = '', $data = '')
+	{
 		return
 			'<input class="btn btn-primary" type="submit" value="' . $text . '" onclick="' .
 			'this.form.xref.value=\'' . Filter::escapeHtml($xref) . '\';' .
@@ -407,7 +424,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getLatestRecord($xref, $type) {
+	public static function getLatestRecord($xref, $type)
+	{
 		global $WT_TREE;
 
 		switch ($type) {
@@ -434,7 +452,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getConfigLink() {
+	public function getConfigLink()
+	{
 		return 'module.php?mod=' . $this->getName() . '&amp;mod_action=admin_batch_update';
 	}
 

app/Module/BatchUpdate/BatchUpdateMarriedNamesPlugin.php

Indentation +127 added lines, -127 removed lines

@@ -23,143 +23,143 @@
  * Class BatchUpdateMarriedNamesPlugin Batch Update plugin: add missing 2 _MARNM records
  */
 class BatchUpdateMarriedNamesPlugin extends BatchUpdateBasePlugin {
-	/** @var string User option: add or replace husband’s surname */
-	private $surname;
+    /** @var string User option: add or replace husband’s surname */
+    private $surname;
 
-	/**
-	 * User-friendly name for this plugin.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return I18N::translate('Add missing married names');
-	}
+    /**
+     * User-friendly name for this plugin.
+     *
+     * @return string
+     */
+    public function getName() {
+        return I18N::translate('Add missing married names');
+    }
 
-	/**
-	 * Description / help-text for this plugin.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return I18N::translate('You can make it easier to search for married women by recording their married name. However not all women take their husband’s surname, so beware of introducing incorrect information into your database.');
-	}
+    /**
+     * Description / help-text for this plugin.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return I18N::translate('You can make it easier to search for married women by recording their married name. However not all women take their husband’s surname, so beware of introducing incorrect information into your database.');
+    }
 
-	/**
-	 * Does this record need updating?
-	 *
-	 * @param string $xref
-	 * @param string $gedrec
-	 *
-	 * @return bool
-	 */
-	public function doesRecordNeedUpdate($xref, $gedrec) {
-		return preg_match('/^1 SEX F/m', $gedrec) && preg_match('/^1 NAME /m', $gedrec) && self::surnamesToAdd($xref, $gedrec);
-	}
+    /**
+     * Does this record need updating?
+     *
+     * @param string $xref
+     * @param string $gedrec
+     *
+     * @return bool
+     */
+    public function doesRecordNeedUpdate($xref, $gedrec) {
+        return preg_match('/^1 SEX F/m', $gedrec) && preg_match('/^1 NAME /m', $gedrec) && self::surnamesToAdd($xref, $gedrec);
+    }
 
-	/**
-	 * Apply any updates to this record
-	 *
-	 * @param string $xref
-	 * @param string $gedrec
-	 *
-	 * @return string
-	 */
-	public function updateRecord($xref, $gedrec) {
-		global $WT_TREE;
+    /**
+     * Apply any updates to this record
+     *
+     * @param string $xref
+     * @param string $gedrec
+     *
+     * @return string
+     */
+    public function updateRecord($xref, $gedrec) {
+        global $WT_TREE;
 
-		$SURNAME_TRADITION = $WT_TREE->getPreference('SURNAME_TRADITION');
+        $SURNAME_TRADITION = $WT_TREE->getPreference('SURNAME_TRADITION');
 
-		preg_match('/^1 NAME (.*)/m', $gedrec, $match);
-		$wife_name     = $match[1];
-		$married_names = array();
-		foreach (self::surnamesToAdd($xref, $gedrec) as $surname) {
-			switch ($this->surname) {
-			case 'add':
-				$married_names[] = "\n2 _MARNM " . str_replace('/', '', $wife_name) . ' /' . $surname . '/';
-				break;
-			case 'replace':
-				if ($SURNAME_TRADITION === 'polish') {
-					$surname = preg_replace(array('/ski$/', '/cki$/', '/dzki$/'), array('ska', 'cka', 'dzka'), $surname);
-				}
-				$married_names[] = "\n2 _MARNM " . preg_replace('!/.*/!', '/' . $surname . '/', $wife_name);
-				break;
-			}
-		}
+        preg_match('/^1 NAME (.*)/m', $gedrec, $match);
+        $wife_name     = $match[1];
+        $married_names = array();
+        foreach (self::surnamesToAdd($xref, $gedrec) as $surname) {
+            switch ($this->surname) {
+            case 'add':
+                $married_names[] = "\n2 _MARNM " . str_replace('/', '', $wife_name) . ' /' . $surname . '/';
+                break;
+            case 'replace':
+                if ($SURNAME_TRADITION === 'polish') {
+                    $surname = preg_replace(array('/ski$/', '/cki$/', '/dzki$/'), array('ska', 'cka', 'dzka'), $surname);
+                }
+                $married_names[] = "\n2 _MARNM " . preg_replace('!/.*/!', '/' . $surname . '/', $wife_name);
+                break;
+            }
+        }
 
-		return preg_replace('/(^1 NAME .*([\r\n]+[2-9].*)*)/m', '\\1' . implode('', $married_names), $gedrec, 1);
-	}
+        return preg_replace('/(^1 NAME .*([\r\n]+[2-9].*)*)/m', '\\1' . implode('', $married_names), $gedrec, 1);
+    }
 
-	/**
-	 * Generate a list of married surnames that are not already present.
-	 *
-	 * @param string $xref
-	 * @param string $gedrec
-	 *
-	 * @return string[]
-	 */
-	private function surnamesToAdd($xref, $gedrec) {
-		$wife_surnames    = self::surnames($xref, $gedrec);
-		$husb_surnames    = array();
-		$missing_surnames = array();
-		preg_match_all('/^1 FAMS @(.+)@/m', $gedrec, $fmatch);
-		foreach ($fmatch[1] as $famid) {
-			$famrec = BatchUpdateModule::getLatestRecord($famid, 'FAM');
-			if (preg_match('/^1 MARR/m', $famrec) && preg_match('/^1 HUSB @(.+)@/m', $famrec, $hmatch)) {
-				$husbrec       = BatchUpdateModule::getLatestRecord($hmatch[1], 'INDI');
-				$husb_surnames = array_unique(array_merge($husb_surnames, self::surnames($hmatch[1], $husbrec)));
-			}
-		}
-		foreach ($husb_surnames as $husb_surname) {
-			if (!in_array($husb_surname, $wife_surnames)) {
-				$missing_surnames[] = $husb_surname;
-			}
-		}
+    /**
+     * Generate a list of married surnames that are not already present.
+     *
+     * @param string $xref
+     * @param string $gedrec
+     *
+     * @return string[]
+     */
+    private function surnamesToAdd($xref, $gedrec) {
+        $wife_surnames    = self::surnames($xref, $gedrec);
+        $husb_surnames    = array();
+        $missing_surnames = array();
+        preg_match_all('/^1 FAMS @(.+)@/m', $gedrec, $fmatch);
+        foreach ($fmatch[1] as $famid) {
+            $famrec = BatchUpdateModule::getLatestRecord($famid, 'FAM');
+            if (preg_match('/^1 MARR/m', $famrec) && preg_match('/^1 HUSB @(.+)@/m', $famrec, $hmatch)) {
+                $husbrec       = BatchUpdateModule::getLatestRecord($hmatch[1], 'INDI');
+                $husb_surnames = array_unique(array_merge($husb_surnames, self::surnames($hmatch[1], $husbrec)));
+            }
+        }
+        foreach ($husb_surnames as $husb_surname) {
+            if (!in_array($husb_surname, $wife_surnames)) {
+                $missing_surnames[] = $husb_surname;
+            }
+        }
 
-		return $missing_surnames;
-	}
+        return $missing_surnames;
+    }
 
-	/**
-	 * Extract a list of surnames from a GEDCOM record.
-	 *
-	 * @param string $xref
-	 * @param string $gedrec
-	 *
-	 * @return string[]
-	 */
-	private function surnames($xref, $gedrec) {
-		if (preg_match_all('/^(?:1 NAME|2 _MARNM) .*\/(.+)\//m', $gedrec, $match)) {
-			return $match[1];
-		} else {
-			return array();
-		}
-	}
+    /**
+     * Extract a list of surnames from a GEDCOM record.
+     *
+     * @param string $xref
+     * @param string $gedrec
+     *
+     * @return string[]
+     */
+    private function surnames($xref, $gedrec) {
+        if (preg_match_all('/^(?:1 NAME|2 _MARNM) .*\/(.+)\//m', $gedrec, $match)) {
+            return $match[1];
+        } else {
+            return array();
+        }
+    }
 
-	/**
-	 * Process the user-supplied options.
-	 */
-	public function getOptions() {
-		parent::getOptions();
-		$this->surname = Filter::get('surname', 'add|replace', 'replace');
-	}
+    /**
+     * Process the user-supplied options.
+     */
+    public function getOptions() {
+        parent::getOptions();
+        $this->surname = Filter::get('surname', 'add|replace', 'replace');
+    }
 
-	/**
-	 * Generate a form to ask the user for options.
-	 *
-	 * @return string
-	 */
-	public function getOptionsForm() {
-		return
-			'<div class="form-group">' .
-			'<label class="control-label col-sm-3">' . I18N::translate('Surname option') . '</label>' .
-			'<div class="col-sm-9">' .
-			'<select class="form-control" name="surname" onchange="reset_reload();">' .
-			'<option value="replace" ' .
-			($this->surname == 'replace' ? 'selected' : '') .
-			'">' . I18N::translate('Wife’s surname replaced by husband’s surname') . '</option><option value="add" ' .
-			($this->surname == 'add' ? 'selected' : '') .
-			'">' . I18N::translate('Wife’s maiden surname becomes new given name') . '</option>' .
-			'</select>' .
-			'</div></div>' .
-			parent::getOptionsForm();
-	}
+    /**
+     * Generate a form to ask the user for options.
+     *
+     * @return string
+     */
+    public function getOptionsForm() {
+        return
+            '<div class="form-group">' .
+            '<label class="control-label col-sm-3">' . I18N::translate('Surname option') . '</label>' .
+            '<div class="col-sm-9">' .
+            '<select class="form-control" name="surname" onchange="reset_reload();">' .
+            '<option value="replace" ' .
+            ($this->surname == 'replace' ? 'selected' : '') .
+            '">' . I18N::translate('Wife’s surname replaced by husband’s surname') . '</option><option value="add" ' .
+            ($this->surname == 'add' ? 'selected' : '') .
+            '">' . I18N::translate('Wife’s maiden surname becomes new given name') . '</option>' .
+            '</select>' .
+            '</div></div>' .
+            parent::getOptionsForm();
+    }
 }

Switch Indentation +9 added lines, -9 removed lines

@@ -74,15 +74,15 @@
 		$married_names = array();
 		foreach (self::surnamesToAdd($xref, $gedrec) as $surname) {
 			switch ($this->surname) {
-			case 'add':
-				$married_names[] = "\n2 _MARNM " . str_replace('/', '', $wife_name) . ' /' . $surname . '/';
-				break;
-			case 'replace':
-				if ($SURNAME_TRADITION === 'polish') {
-					$surname = preg_replace(array('/ski$/', '/cki$/', '/dzki$/'), array('ska', 'cka', 'dzka'), $surname);
-				}
-				$married_names[] = "\n2 _MARNM " . preg_replace('!/.*/!', '/' . $surname . '/', $wife_name);
-				break;
+			    case 'add':
+				    $married_names[] = "\n2 _MARNM " . str_replace('/', '', $wife_name) . ' /' . $surname . '/';
+				    break;
+			    case 'replace':
+				    if ($SURNAME_TRADITION === 'polish') {
+					    $surname = preg_replace(array('/ski$/', '/cki$/', '/dzki$/'), array('ska', 'cka', 'dzka'), $surname);
+				    }
+				    $married_names[] = "\n2 _MARNM " . preg_replace('!/.*/!', '/' . $surname . '/', $wife_name);
+				    break;
 			}
 		}
 

Braces +18 added lines, -9 removed lines

@@ -22,7 +22,8 @@ 
 /**
  * Class BatchUpdateMarriedNamesPlugin Batch Update plugin: add missing 2 _MARNM records
  */
-class BatchUpdateMarriedNamesPlugin extends BatchUpdateBasePlugin {
+class BatchUpdateMarriedNamesPlugin extends BatchUpdateBasePlugin
+{
 	/** @var string User option: add or replace husband’s surname */
 	private $surname;
 
@@ -31,7 +32,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getName() {
+	public function getName()
+	{
 		return I18N::translate('Add missing married names');
 	}
 
@@ -40,7 +42,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return I18N::translate('You can make it easier to search for married women by recording their married name. However not all women take their husband’s surname, so beware of introducing incorrect information into your database.');
 	}
 
@@ -52,7 +55,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function doesRecordNeedUpdate($xref, $gedrec) {
+	public function doesRecordNeedUpdate($xref, $gedrec)
+	{
 		return preg_match('/^1 SEX F/m', $gedrec) && preg_match('/^1 NAME /m', $gedrec) && self::surnamesToAdd($xref, $gedrec);
 	}
 
@@ -64,7 +68,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function updateRecord($xref, $gedrec) {
+	public function updateRecord($xref, $gedrec)
+	{
 		global $WT_TREE;
 
 		$SURNAME_TRADITION = $WT_TREE->getPreference('SURNAME_TRADITION');
@@ -97,7 +102,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	private function surnamesToAdd($xref, $gedrec) {
+	private function surnamesToAdd($xref, $gedrec)
+	{
 		$wife_surnames    = self::surnames($xref, $gedrec);
 		$husb_surnames    = array();
 		$missing_surnames = array();
@@ -126,7 +132,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	private function surnames($xref, $gedrec) {
+	private function surnames($xref, $gedrec)
+	{
 		if (preg_match_all('/^(?:1 NAME|2 _MARNM) .*\/(.+)\//m', $gedrec, $match)) {
 			return $match[1];
 		} else {
@@ -137,7 +144,8 @@ 
 	/**
 	 * Process the user-supplied options.
 	 */
-	public function getOptions() {
+	public function getOptions()
+	{
 		parent::getOptions();
 		$this->surname = Filter::get('surname', 'add|replace', 'replace');
 	}
@@ -147,7 +155,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getOptionsForm() {
+	public function getOptionsForm()
+	{
 		return
 			'<div class="form-group">' .
 			'<label class="control-label col-sm-3">' . I18N::translate('Surname option') . '</label>' .

app/Module/BatchUpdate/BatchUpdateNameFormatPlugin.php

Indentation +50 added lines, -50 removed lines

@@ -21,57 +21,57 @@
  * Class BatchUpdateNameFormatPlugin Batch Update plugin: fix spacing in names, particularly that before/after the surname slashes
  */
 class BatchUpdateNameFormatPlugin extends BatchUpdateBasePlugin {
-	/**
-	 * User-friendly name for this plugin.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return I18N::translate('Fix name slashes and spaces');
-	}
+    /**
+     * User-friendly name for this plugin.
+     *
+     * @return string
+     */
+    public function getName() {
+        return I18N::translate('Fix name slashes and spaces');
+    }
 
-	/**
-	 * Description / help-text for this plugin.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return I18N::translate('Correct NAME records of the form “John/DOE/” or “John /DOE”, as produced by older genealogy programs.');
-	}
+    /**
+     * Description / help-text for this plugin.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return I18N::translate('Correct NAME records of the form “John/DOE/” or “John /DOE”, as produced by older genealogy programs.');
+    }
 
-	/**
-	 * Does this record need updating?
-	 *
-	 * @param string $xref
-	 * @param string $gedrec
-	 *
-	 * @return bool
-	 */
-	public function doesRecordNeedUpdate($xref, $gedrec) {
-		return
-			preg_match('/^(?:1 NAME|2 (?:FONE|ROMN|_MARNM|_AKA|_HEB)) [^\/\n]*\/[^\/\n]*$/m', $gedrec) ||
-			preg_match('/^(?:1 NAME|2 (?:FONE|ROMN|_MARNM|_AKA|_HEB)) [^\/\n]*[^\/ ]\//m', $gedrec);
-	}
+    /**
+     * Does this record need updating?
+     *
+     * @param string $xref
+     * @param string $gedrec
+     *
+     * @return bool
+     */
+    public function doesRecordNeedUpdate($xref, $gedrec) {
+        return
+            preg_match('/^(?:1 NAME|2 (?:FONE|ROMN|_MARNM|_AKA|_HEB)) [^\/\n]*\/[^\/\n]*$/m', $gedrec) ||
+            preg_match('/^(?:1 NAME|2 (?:FONE|ROMN|_MARNM|_AKA|_HEB)) [^\/\n]*[^\/ ]\//m', $gedrec);
+    }
 
-	/**
-	 * Apply any updates to this record
-	 *
-	 * @param string $xref
-	 * @param string $gedrec
-	 *
-	 * @return string
-	 */
-	public function updateRecord($xref, $gedrec) {
-		return preg_replace(
-			array(
-				'/^((?:1 NAME|2 (?:FONE|ROMN|_MARNM|_AKA|_HEB)) [^\/\n]*\/[^\/\n]*)$/m',
-				'/^((?:1 NAME|2 (?:FONE|ROMN|_MARNM|_AKA|_HEB)) [^\/\n]*[^\/ ])(\/)/m',
-			),
-			array(
-				'$1/',
-				'$1 $2',
-			),
-			$gedrec
-		);
-	}
+    /**
+     * Apply any updates to this record
+     *
+     * @param string $xref
+     * @param string $gedrec
+     *
+     * @return string
+     */
+    public function updateRecord($xref, $gedrec) {
+        return preg_replace(
+            array(
+                '/^((?:1 NAME|2 (?:FONE|ROMN|_MARNM|_AKA|_HEB)) [^\/\n]*\/[^\/\n]*)$/m',
+                '/^((?:1 NAME|2 (?:FONE|ROMN|_MARNM|_AKA|_HEB)) [^\/\n]*[^\/ ])(\/)/m',
+            ),
+            array(
+                '$1/',
+                '$1 $2',
+            ),
+            $gedrec
+        );
+    }
 }

Braces +10 added lines, -5 removed lines

@@ -20,13 +20,15 @@ 
 /**
  * Class BatchUpdateNameFormatPlugin Batch Update plugin: fix spacing in names, particularly that before/after the surname slashes
  */
-class BatchUpdateNameFormatPlugin extends BatchUpdateBasePlugin {
+class BatchUpdateNameFormatPlugin extends BatchUpdateBasePlugin
+{
 	/**
 	 * User-friendly name for this plugin.
 	 *
 	 * @return string
 	 */
-	public function getName() {
+	public function getName()
+	{
 		return I18N::translate('Fix name slashes and spaces');
 	}
 
@@ -35,7 +37,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return I18N::translate('Correct NAME records of the form “John/DOE/” or “John /DOE”, as produced by older genealogy programs.');
 	}
 
@@ -47,7 +50,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function doesRecordNeedUpdate($xref, $gedrec) {
+	public function doesRecordNeedUpdate($xref, $gedrec)
+	{
 		return
 			preg_match('/^(?:1 NAME|2 (?:FONE|ROMN|_MARNM|_AKA|_HEB)) [^\/\n]*\/[^\/\n]*$/m', $gedrec) ||
 			preg_match('/^(?:1 NAME|2 (?:FONE|ROMN|_MARNM|_AKA|_HEB)) [^\/\n]*[^\/ ]\//m', $gedrec);
@@ -61,7 +65,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function updateRecord($xref, $gedrec) {
+	public function updateRecord($xref, $gedrec)
+	{
 		return preg_replace(
 			array(
 				'/^((?:1 NAME|2 (?:FONE|ROMN|_MARNM|_AKA|_HEB)) [^\/\n]*\/[^\/\n]*)$/m',

app/Module/BatchUpdate/BatchUpdateSearchReplacePlugin.php

Indentation +151 added lines, -151 removed lines

@@ -23,155 +23,155 @@
  * Class BatchUpdateSearchReplacePlugin Batch Update plugin: search/replace
  */
 class BatchUpdateSearchReplacePlugin extends BatchUpdateBasePlugin {
-	/** @var string Search string */
-	private $search;
-
-	/** @var string Replace string */
-	private $replace;
-
-	/** @var string simple/wildcards/regex */
-	private $method;
-
-	/** @var string Search string, converted to a regex */
-	private $regex;
-
-	/** @var string "i" for case insensitive, "" for case sensitive */
-	private $case;
-
-	/** @var string Message for bad user parameters */
-	private $error;
-
-	/**
-	 * User-friendly name for this plugin.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return I18N::translate('Search and replace');
-	}
-
-	/**
-	 * Description / help-text for this plugin.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return /* I18N: Description of the “Search and replace” option of the batch update module */ I18N::translate('Search and replace text, using simple searches or advanced pattern matching.');
-	}
-
-	/**
-	 * This plugin will update all types of record.
-	 *
-	 * @return string[]
-	 */
-	public function getRecordTypesToUpdate() {
-		return array('INDI', 'FAM', 'SOUR', 'REPO', 'NOTE', 'OBJE');
-	}
-
-	/**
-	 * Does this record need updating?
-	 *
-	 * @param string $xref
-	 * @param string $gedrec
-	 *
-	 * @return bool
-	 */
-	public function doesRecordNeedUpdate($xref, $gedrec) {
-		return !$this->error && preg_match('/(?:' . $this->regex . ')/mu' . $this->case, $gedrec);
-	}
-
-	/**
-	 * Apply any updates to this record
-	 *
-	 * @param string $xref
-	 * @param string $gedrec
-	 *
-	 * @return string
-	 */
-	public function updateRecord($xref, $gedrec) {
-		// Allow "\n" to indicate a line-feed in replacement text.
-		// Back-references such as $1, $2 are handled automatically.
-		return preg_replace('/' . $this->regex . '/mu' . $this->case, str_replace('\n', "\n", $this->replace), $gedrec);
-	}
-
-	/**
-	 * Process the user-supplied options.
-	 */
-	public function getOptions() {
-		parent::getOptions();
-		$this->search  = Filter::get('search');
-		$this->replace = Filter::get('replace');
-		$this->method  = Filter::get('method', 'exact|words|wildcards|regex', 'exact');
-		$this->case    = Filter::get('case', 'i');
-
-		$this->error = '';
-		switch ($this->method) {
-		case 'exact':
-			$this->regex = preg_quote($this->search, '/');
-			break;
-		case 'words':
-			$this->regex = '\b' . preg_quote($this->search, '/') . '\b';
-			break;
-		case 'wildcards':
-			$this->regex = '\b' . str_replace(array('\*', '\?'), array('.*', '.'), preg_quote($this->search, '/')) . '\b';
-			break;
-		case 'regex':
-			$this->regex = $this->search;
-			// Check for invalid regular expressions.
-			// A valid regex on a null string returns zero.
-			// An invalid regex on a null string returns false and throws a warning.
-			try {
-				preg_match('/' . $this->search . '/', null);
-			} catch (\ErrorException $ex) {
-				$this->error = '<div class="alert alert-danger">' . /* I18N: http://en.wikipedia.org/wiki/Regular_expression */ I18N::translate('The regular expression appears to contain an error. It can’t be used.') . '</div>';
-			}
-			break;
-		}
-	}
-
-	/**
-	 * Generate a form to ask the user for options.
-	 *
-	 * @return string
-	 */
-	public function getOptionsForm() {
-		$descriptions = array(
-			'exact'     => I18N::translate('Match the exact text, even if it occurs in the middle of a word.'),
-			'words'     => I18N::translate('Match the exact text, unless it occurs in the middle of a word.'),
-			'wildcards' => I18N::translate('Use a “?” to match a single character, use “*” to match zero or more characters.'),
-			'regex'     => /* I18N: http://en.wikipedia.org/wiki/Regular_expression */ I18N::translate('Regular expressions are an advanced pattern matching technique.') . '<br>' . /* I18N: %s is a URL */ I18N::translate('See %s for more information.', '<a href="http://php.net/manual/regexp.reference.php">php.net/manual/regexp.reference.php</a>'),
-		);
-
-		return
-			'<div class="form-group">' .
-			'<label class="control-label col-sm-3">' . I18N::translate('Search text/pattern') . '</label>' .
-			'<div class="col-sm-9">' .
-			'<input class="form-control" name="search" size="40" value="' . Filter::escapeHtml($this->search) .
-			'" onchange="this.form.submit();">' .
-			'</div></div>' .
-			'<div class="form-group">' .
-			'<label class="control-label col-sm-3">' . I18N::translate('Replacement text') . '</label>' .
-			'<div class="col-sm-9">' .
-			'<input class="form-control" name="replace" size="40" value="' . Filter::escapeHtml($this->replace) .
-			'" onchange="this.form.submit();"></td></tr>' .
-			'</div></div>' .
-			'<div class="form-group">' .
-			'<label class="control-label col-sm-3">' . I18N::translate('Search method') . '</label>' .
-			'<div class="col-sm-9">' .
-			'<select class="form-control" name="method" onchange="this.form.submit();">' .
-			'<option value="exact" ' . ($this->method == 'exact' ? 'selected' : '') . '>' . I18N::translate('Exact text') . '</option>' .
-			'<option value="words" ' . ($this->method == 'words' ? 'selected' : '') . '>' . I18N::translate('Whole words only') . '</option>' .
-			'<option value="wildcards" ' . ($this->method == 'wildcards' ? 'selected' : '') . '>' . I18N::translate('Wildcards') . '</option>' .
-			'<option value="regex" ' . ($this->method == 'regex' ? 'selected' : '') . '>' . I18N::translate('Regular expression') . '</option>' .
-			'</select>' .
-			'<p class="small text-muted">' . $descriptions[$this->method] . '</p>' . $this->error .
-			'</div></div>' .
-			'<div class="form-group">' .
-			'<label class="control-label col-sm-3">' . I18N::translate('Case insensitive') . '</label>' .
-			'<div class="col-sm-9">' .
-			FunctionsEdit::radioButtons('case', array('I' => I18N::translate('no'), 'i' => I18N::translate('yes')), ($this->case ? 'i' : 'I'), 'class="radio-inline" onchange="this.form.submit();"') .
-			'<p class="small text-muted">' . /* I18N: Help text for "Case insensitive" searches */ I18N::translate('Match both upper and lower case letters.') . '</p>' .
-			'</div></div>' .
-			parent::getOptionsForm();
-	}
+    /** @var string Search string */
+    private $search;
+
+    /** @var string Replace string */
+    private $replace;
+
+    /** @var string simple/wildcards/regex */
+    private $method;
+
+    /** @var string Search string, converted to a regex */
+    private $regex;
+
+    /** @var string "i" for case insensitive, "" for case sensitive */
+    private $case;
+
+    /** @var string Message for bad user parameters */
+    private $error;
+
+    /**
+     * User-friendly name for this plugin.
+     *
+     * @return string
+     */
+    public function getName() {
+        return I18N::translate('Search and replace');
+    }
+
+    /**
+     * Description / help-text for this plugin.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return /* I18N: Description of the “Search and replace” option of the batch update module */ I18N::translate('Search and replace text, using simple searches or advanced pattern matching.');
+    }
+
+    /**
+     * This plugin will update all types of record.
+     *
+     * @return string[]
+     */
+    public function getRecordTypesToUpdate() {
+        return array('INDI', 'FAM', 'SOUR', 'REPO', 'NOTE', 'OBJE');
+    }
+
+    /**
+     * Does this record need updating?
+     *
+     * @param string $xref
+     * @param string $gedrec
+     *
+     * @return bool
+     */
+    public function doesRecordNeedUpdate($xref, $gedrec) {
+        return !$this->error && preg_match('/(?:' . $this->regex . ')/mu' . $this->case, $gedrec);
+    }
+
+    /**
+     * Apply any updates to this record
+     *
+     * @param string $xref
+     * @param string $gedrec
+     *
+     * @return string
+     */
+    public function updateRecord($xref, $gedrec) {
+        // Allow "\n" to indicate a line-feed in replacement text.
+        // Back-references such as $1, $2 are handled automatically.
+        return preg_replace('/' . $this->regex . '/mu' . $this->case, str_replace('\n', "\n", $this->replace), $gedrec);
+    }
+
+    /**
+     * Process the user-supplied options.
+     */
+    public function getOptions() {
+        parent::getOptions();
+        $this->search  = Filter::get('search');
+        $this->replace = Filter::get('replace');
+        $this->method  = Filter::get('method', 'exact|words|wildcards|regex', 'exact');
+        $this->case    = Filter::get('case', 'i');
+
+        $this->error = '';
+        switch ($this->method) {
+        case 'exact':
+            $this->regex = preg_quote($this->search, '/');
+            break;
+        case 'words':
+            $this->regex = '\b' . preg_quote($this->search, '/') . '\b';
+            break;
+        case 'wildcards':
+            $this->regex = '\b' . str_replace(array('\*', '\?'), array('.*', '.'), preg_quote($this->search, '/')) . '\b';
+            break;
+        case 'regex':
+            $this->regex = $this->search;
+            // Check for invalid regular expressions.
+            // A valid regex on a null string returns zero.
+            // An invalid regex on a null string returns false and throws a warning.
+            try {
+                preg_match('/' . $this->search . '/', null);
+            } catch (\ErrorException $ex) {
+                $this->error = '<div class="alert alert-danger">' . /* I18N: http://en.wikipedia.org/wiki/Regular_expression */ I18N::translate('The regular expression appears to contain an error. It can’t be used.') . '</div>';
+            }
+            break;
+        }
+    }
+
+    /**
+     * Generate a form to ask the user for options.
+     *
+     * @return string
+     */
+    public function getOptionsForm() {
+        $descriptions = array(
+            'exact'     => I18N::translate('Match the exact text, even if it occurs in the middle of a word.'),
+            'words'     => I18N::translate('Match the exact text, unless it occurs in the middle of a word.'),
+            'wildcards' => I18N::translate('Use a “?” to match a single character, use “*” to match zero or more characters.'),
+            'regex'     => /* I18N: http://en.wikipedia.org/wiki/Regular_expression */ I18N::translate('Regular expressions are an advanced pattern matching technique.') . '<br>' . /* I18N: %s is a URL */ I18N::translate('See %s for more information.', '<a href="http://php.net/manual/regexp.reference.php">php.net/manual/regexp.reference.php</a>'),
+        );
+
+        return
+            '<div class="form-group">' .
+            '<label class="control-label col-sm-3">' . I18N::translate('Search text/pattern') . '</label>' .
+            '<div class="col-sm-9">' .
+            '<input class="form-control" name="search" size="40" value="' . Filter::escapeHtml($this->search) .
+            '" onchange="this.form.submit();">' .
+            '</div></div>' .
+            '<div class="form-group">' .
+            '<label class="control-label col-sm-3">' . I18N::translate('Replacement text') . '</label>' .
+            '<div class="col-sm-9">' .
+            '<input class="form-control" name="replace" size="40" value="' . Filter::escapeHtml($this->replace) .
+            '" onchange="this.form.submit();"></td></tr>' .
+            '</div></div>' .
+            '<div class="form-group">' .
+            '<label class="control-label col-sm-3">' . I18N::translate('Search method') . '</label>' .
+            '<div class="col-sm-9">' .
+            '<select class="form-control" name="method" onchange="this.form.submit();">' .
+            '<option value="exact" ' . ($this->method == 'exact' ? 'selected' : '') . '>' . I18N::translate('Exact text') . '</option>' .
+            '<option value="words" ' . ($this->method == 'words' ? 'selected' : '') . '>' . I18N::translate('Whole words only') . '</option>' .
+            '<option value="wildcards" ' . ($this->method == 'wildcards' ? 'selected' : '') . '>' . I18N::translate('Wildcards') . '</option>' .
+            '<option value="regex" ' . ($this->method == 'regex' ? 'selected' : '') . '>' . I18N::translate('Regular expression') . '</option>' .
+            '</select>' .
+            '<p class="small text-muted">' . $descriptions[$this->method] . '</p>' . $this->error .
+            '</div></div>' .
+            '<div class="form-group">' .
+            '<label class="control-label col-sm-3">' . I18N::translate('Case insensitive') . '</label>' .
+            '<div class="col-sm-9">' .
+            FunctionsEdit::radioButtons('case', array('I' => I18N::translate('no'), 'i' => I18N::translate('yes')), ($this->case ? 'i' : 'I'), 'class="radio-inline" onchange="this.form.submit();"') .
+            '<p class="small text-muted">' . /* I18N: Help text for "Case insensitive" searches */ I18N::translate('Match both upper and lower case letters.') . '</p>' .
+            '</div></div>' .
+            parent::getOptionsForm();
+    }
 }

Switch Indentation +20 added lines, -20 removed lines

@@ -106,26 +106,26 @@
 
 		$this->error = '';
 		switch ($this->method) {
-		case 'exact':
-			$this->regex = preg_quote($this->search, '/');
-			break;
-		case 'words':
-			$this->regex = '\b' . preg_quote($this->search, '/') . '\b';
-			break;
-		case 'wildcards':
-			$this->regex = '\b' . str_replace(array('\*', '\?'), array('.*', '.'), preg_quote($this->search, '/')) . '\b';
-			break;
-		case 'regex':
-			$this->regex = $this->search;
-			// Check for invalid regular expressions.
-			// A valid regex on a null string returns zero.
-			// An invalid regex on a null string returns false and throws a warning.
-			try {
-				preg_match('/' . $this->search . '/', null);
-			} catch (\ErrorException $ex) {
-				$this->error = '<div class="alert alert-danger">' . /* I18N: http://en.wikipedia.org/wiki/Regular_expression */ I18N::translate('The regular expression appears to contain an error. It can’t be used.') . '</div>';
-			}
-			break;
+		    case 'exact':
+			    $this->regex = preg_quote($this->search, '/');
+			    break;
+		    case 'words':
+			    $this->regex = '\b' . preg_quote($this->search, '/') . '\b';
+			    break;
+		    case 'wildcards':
+			    $this->regex = '\b' . str_replace(array('\*', '\?'), array('.*', '.'), preg_quote($this->search, '/')) . '\b';
+			    break;
+		    case 'regex':
+			    $this->regex = $this->search;
+			    // Check for invalid regular expressions.
+			    // A valid regex on a null string returns zero.
+			    // An invalid regex on a null string returns false and throws a warning.
+			    try {
+				    preg_match('/' . $this->search . '/', null);
+			    } catch (\ErrorException $ex) {
+				    $this->error = '<div class="alert alert-danger">' . /* I18N: http://en.wikipedia.org/wiki/Regular_expression */ I18N::translate('The regular expression appears to contain an error. It can’t be used.') . '</div>';
+			    }
+			    break;
 		}
 	}
 

Braces +16 added lines, -8 removed lines

@@ -22,7 +22,8 @@ 
 /**
  * Class BatchUpdateSearchReplacePlugin Batch Update plugin: search/replace
  */
-class BatchUpdateSearchReplacePlugin extends BatchUpdateBasePlugin {
+class BatchUpdateSearchReplacePlugin extends BatchUpdateBasePlugin
+{
 	/** @var string Search string */
 	private $search;
 
@@ -46,7 +47,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getName() {
+	public function getName()
+	{
 		return I18N::translate('Search and replace');
 	}
 
@@ -55,7 +57,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Search and replace” option of the batch update module */ I18N::translate('Search and replace text, using simple searches or advanced pattern matching.');
 	}
 
@@ -64,7 +67,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getRecordTypesToUpdate() {
+	public function getRecordTypesToUpdate()
+	{
 		return array('INDI', 'FAM', 'SOUR', 'REPO', 'NOTE', 'OBJE');
 	}
 
@@ -76,7 +80,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function doesRecordNeedUpdate($xref, $gedrec) {
+	public function doesRecordNeedUpdate($xref, $gedrec)
+	{
 		return !$this->error && preg_match('/(?:' . $this->regex . ')/mu' . $this->case, $gedrec);
 	}
 
@@ -88,7 +93,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function updateRecord($xref, $gedrec) {
+	public function updateRecord($xref, $gedrec)
+	{
 		// Allow "\n" to indicate a line-feed in replacement text.
 		// Back-references such as $1, $2 are handled automatically.
 		return preg_replace('/' . $this->regex . '/mu' . $this->case, str_replace('\n', "\n", $this->replace), $gedrec);
@@ -97,7 +103,8 @@ 
 	/**
 	 * Process the user-supplied options.
 	 */
-	public function getOptions() {
+	public function getOptions()
+	{
 		parent::getOptions();
 		$this->search  = Filter::get('search');
 		$this->replace = Filter::get('replace');
@@ -134,7 +141,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getOptionsForm() {
+	public function getOptionsForm()
+	{
 		$descriptions = array(
 			'exact'     => I18N::translate('Match the exact text, even if it occurs in the middle of a word.'),
 			'words'     => I18N::translate('Match the exact text, unless it occurs in the middle of a word.'),

app/Module/BatchUpdate/BatchUpdateDuplicateLinksPlugin.php

Indentation +57 added lines, -57 removed lines

@@ -21,65 +21,65 @@
  * Class BatchUpdateDuplicateLinksPlugin Batch Update plugin: remove duplicate links in records
  */
 class BatchUpdateDuplicateLinksPlugin extends BatchUpdateBasePlugin {
-	/**
-	 * User-friendly name for this plugin.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return I18N::translate('Remove duplicate links');
-	}
+    /**
+     * User-friendly name for this plugin.
+     *
+     * @return string
+     */
+    public function getName() {
+        return I18N::translate('Remove duplicate links');
+    }
 
-	/**
-	 * Description / help-text for this plugin.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return I18N::translate('A common error is to have multiple links to the same record, for example listing the same child more than once in a family record.');
-	}
+    /**
+     * Description / help-text for this plugin.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return I18N::translate('A common error is to have multiple links to the same record, for example listing the same child more than once in a family record.');
+    }
 
-	/**
-	 * This plugin will update all types of record.
-	 *
-	 * @return string[]
-	 */
-	public function getRecordTypesToUpdate() {
-		return array('INDI', 'FAM', 'SOUR', 'REPO', 'NOTE', 'OBJE');
-	}
+    /**
+     * This plugin will update all types of record.
+     *
+     * @return string[]
+     */
+    public function getRecordTypesToUpdate() {
+        return array('INDI', 'FAM', 'SOUR', 'REPO', 'NOTE', 'OBJE');
+    }
 
-	/**
-	 * Does this record need updating?
-	 *
-	 * @param string $xref
-	 * @param string $gedrec
-	 *
-	 * @return bool
-	 */
-	public function doesRecordNeedUpdate($xref, $gedrec) {
-		return
-			preg_match('/(\n1.*@.+@.*(?:(?:\n[2-9].*)*))(?:\n1.*(?:\n[2-9].*)*)*\1/', $gedrec) ||
-			preg_match('/(\n2.*@.+@.*(?:(?:\n[3-9].*)*))(?:\n2.*(?:\n[3-9].*)*)*\1/', $gedrec) ||
-			preg_match('/(\n3.*@.+@.*(?:(?:\n[4-9].*)*))(?:\n3.*(?:\n[4-9].*)*)*\1/', $gedrec);
-	}
+    /**
+     * Does this record need updating?
+     *
+     * @param string $xref
+     * @param string $gedrec
+     *
+     * @return bool
+     */
+    public function doesRecordNeedUpdate($xref, $gedrec) {
+        return
+            preg_match('/(\n1.*@.+@.*(?:(?:\n[2-9].*)*))(?:\n1.*(?:\n[2-9].*)*)*\1/', $gedrec) ||
+            preg_match('/(\n2.*@.+@.*(?:(?:\n[3-9].*)*))(?:\n2.*(?:\n[3-9].*)*)*\1/', $gedrec) ||
+            preg_match('/(\n3.*@.+@.*(?:(?:\n[4-9].*)*))(?:\n3.*(?:\n[4-9].*)*)*\1/', $gedrec);
+    }
 
-	/**
-	 * Apply any updates to this record
-	 *
-	 * @param string $xref
-	 * @param string $gedrec
-	 *
-	 * @return string
-	 */
-	public function updateRecord($xref, $gedrec) {
-		return preg_replace(
-			array(
-				'/(\n1.*@.+@.*(?:(?:\n[2-9].*)*))((?:\n1.*(?:\n[2-9].*)*)*\1)/',
-				'/(\n2.*@.+@.*(?:(?:\n[3-9].*)*))((?:\n2.*(?:\n[3-9].*)*)*\1)/',
-				'/(\n3.*@.+@.*(?:(?:\n[4-9].*)*))((?:\n3.*(?:\n[4-9].*)*)*\1)/',
-			),
-			'$2',
-			$gedrec
-		);
-	}
+    /**
+     * Apply any updates to this record
+     *
+     * @param string $xref
+     * @param string $gedrec
+     *
+     * @return string
+     */
+    public function updateRecord($xref, $gedrec) {
+        return preg_replace(
+            array(
+                '/(\n1.*@.+@.*(?:(?:\n[2-9].*)*))((?:\n1.*(?:\n[2-9].*)*)*\1)/',
+                '/(\n2.*@.+@.*(?:(?:\n[3-9].*)*))((?:\n2.*(?:\n[3-9].*)*)*\1)/',
+                '/(\n3.*@.+@.*(?:(?:\n[4-9].*)*))((?:\n3.*(?:\n[4-9].*)*)*\1)/',
+            ),
+            '$2',
+            $gedrec
+        );
+    }
 }

Braces +12 added lines, -6 removed lines

@@ -20,13 +20,15 @@ 
 /**
  * Class BatchUpdateDuplicateLinksPlugin Batch Update plugin: remove duplicate links in records
  */
-class BatchUpdateDuplicateLinksPlugin extends BatchUpdateBasePlugin {
+class BatchUpdateDuplicateLinksPlugin extends BatchUpdateBasePlugin
+{
 	/**
 	 * User-friendly name for this plugin.
 	 *
 	 * @return string
 	 */
-	public function getName() {
+	public function getName()
+	{
 		return I18N::translate('Remove duplicate links');
 	}
 
@@ -35,7 +37,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return I18N::translate('A common error is to have multiple links to the same record, for example listing the same child more than once in a family record.');
 	}
 
@@ -44,7 +47,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getRecordTypesToUpdate() {
+	public function getRecordTypesToUpdate()
+	{
 		return array('INDI', 'FAM', 'SOUR', 'REPO', 'NOTE', 'OBJE');
 	}
 
@@ -56,7 +60,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function doesRecordNeedUpdate($xref, $gedrec) {
+	public function doesRecordNeedUpdate($xref, $gedrec)
+	{
 		return
 			preg_match('/(\n1.*@.+@.*(?:(?:\n[2-9].*)*))(?:\n1.*(?:\n[2-9].*)*)*\1/', $gedrec) ||
 			preg_match('/(\n2.*@.+@.*(?:(?:\n[3-9].*)*))(?:\n2.*(?:\n[3-9].*)*)*\1/', $gedrec) ||
@@ -71,7 +76,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function updateRecord($xref, $gedrec) {
+	public function updateRecord($xref, $gedrec)
+	{
 		return preg_replace(
 			array(
 				'/(\n1.*@.+@.*(?:(?:\n[2-9].*)*))((?:\n1.*(?:\n[2-9].*)*)*\1)/',

app/Module/BatchUpdate/BatchUpdateBasePlugin.php

Indentation +109 added lines, -109 removed lines

@@ -32,123 +32,123 @@
  * string updateRecord($xref, $gedrec)
  */
 class BatchUpdateBasePlugin {
-	/** @var bool User option; update change record */
-	public $chan = false;
+    /** @var bool User option; update change record */
+    public $chan = false;
 
-	/**
-	 * Default is to operate on INDI records
-	 *
-	 * @return string[]
-	 */
-	public function getRecordTypesToUpdate() {
-		return array('INDI');
-	}
+    /**
+     * Default is to operate on INDI records
+     *
+     * @return string[]
+     */
+    public function getRecordTypesToUpdate() {
+        return array('INDI');
+    }
 
-	/**
-	 * Default option is just the "don't update CHAN record"
-	 */
-	public function getOptions() {
-		$this->chan = Filter::getBool('chan');
-	}
+    /**
+     * Default option is just the "don't update CHAN record"
+     */
+    public function getOptions() {
+        $this->chan = Filter::getBool('chan');
+    }
 
-	/**
-	 * Default option is just the "don't update CHAN record"
-	 *
-	 * @return string
-	 */
-	public function getOptionsForm() {
-		return
-			'<div class="form-group">' .
-			'<label class="control-label col-sm-3">' . I18N::translate('Keep the existing “last change” information') . '</label>' .
-			'<div class="col-sm-9">' .
-			FunctionsEdit::radioButtons('chan', array(0 => I18N::translate('no'), 1 => I18N::translate('yes')), ($this->chan ? 1 : 0), 'class="radio-inline" onchange="this.form.submit();"') .
-			'</div></div>';
-	}
+    /**
+     * Default option is just the "don't update CHAN record"
+     *
+     * @return string
+     */
+    public function getOptionsForm() {
+        return
+            '<div class="form-group">' .
+            '<label class="control-label col-sm-3">' . I18N::translate('Keep the existing “last change” information') . '</label>' .
+            '<div class="col-sm-9">' .
+            FunctionsEdit::radioButtons('chan', array(0 => I18N::translate('no'), 1 => I18N::translate('yes')), ($this->chan ? 1 : 0), 'class="radio-inline" onchange="this.form.submit();"') .
+            '</div></div>';
+    }
 
-	/**
-	 * Default buttons are update and update_all
-	 *
-	 * @param string $xref
-	 *
-	 * @return string[]
-	 */
-	public function getActionButtons($xref) {
-		if (Auth::user()->getPreference('auto_accept')) {
-			return array(
-				BatchUpdateModule::createSubmitButton(I18N::translate('Update'), $xref, 'update'),
-				BatchUpdateModule::createSubmitButton(I18N::translate('Update all'), $xref, 'update_all'),
-			);
-		} else {
-			return array(
-				BatchUpdateModule::createSubmitButton(I18N::translate('Update'), $xref, 'update'),
-			);
-		}
-	}
+    /**
+     * Default buttons are update and update_all
+     *
+     * @param string $xref
+     *
+     * @return string[]
+     */
+    public function getActionButtons($xref) {
+        if (Auth::user()->getPreference('auto_accept')) {
+            return array(
+                BatchUpdateModule::createSubmitButton(I18N::translate('Update'), $xref, 'update'),
+                BatchUpdateModule::createSubmitButton(I18N::translate('Update all'), $xref, 'update_all'),
+            );
+        } else {
+            return array(
+                BatchUpdateModule::createSubmitButton(I18N::translate('Update'), $xref, 'update'),
+            );
+        }
+    }
 
-	/**
-	 * Default previewer for plugins with no custom preview.
-	 *
-	 * @param GedcomRecord $record
-	 *
-	 * @return string
-	 */
-	public function getActionPreview(GedcomRecord $record) {
-		$old_lines   = preg_split('/[\n]+/', $record->getGedcom());
-		$new_lines   = preg_split('/[\n]+/', $this->updateRecord($record->getXref(), $record->getGedcom()));
-		$algorithm   = new MyersDiff;
-		$differences = $algorithm->calculate($old_lines, $new_lines);
-		$diff_lines  = array();
+    /**
+     * Default previewer for plugins with no custom preview.
+     *
+     * @param GedcomRecord $record
+     *
+     * @return string
+     */
+    public function getActionPreview(GedcomRecord $record) {
+        $old_lines   = preg_split('/[\n]+/', $record->getGedcom());
+        $new_lines   = preg_split('/[\n]+/', $this->updateRecord($record->getXref(), $record->getGedcom()));
+        $algorithm   = new MyersDiff;
+        $differences = $algorithm->calculate($old_lines, $new_lines);
+        $diff_lines  = array();
 
-		foreach ($differences as $difference) {
-			switch ($difference[1]) {
-			case MyersDiff::DELETE:
-				$diff_lines[] = self::decorateDeletedText($difference[0]);
-				break;
-			case MyersDiff::INSERT:
-				$diff_lines[] = self::decorateInsertedText($difference[0]);
-				break;
-			default:
-				$diff_lines[] = $difference[0];
-			}
-		}
+        foreach ($differences as $difference) {
+            switch ($difference[1]) {
+            case MyersDiff::DELETE:
+                $diff_lines[] = self::decorateDeletedText($difference[0]);
+                break;
+            case MyersDiff::INSERT:
+                $diff_lines[] = self::decorateInsertedText($difference[0]);
+                break;
+            default:
+                $diff_lines[] = $difference[0];
+            }
+        }
 
-		return '<pre class="gedcom-data">' . self::createEditLinks(implode("\n", $diff_lines)) . '</pre>';
-	}
+        return '<pre class="gedcom-data">' . self::createEditLinks(implode("\n", $diff_lines)) . '</pre>';
+    }
 
-	/**
-	 * Decorate inserted text
-	 *
-	 * @param string $text
-	 *
-	 * @return string
-	 */
-	public static function decorateInsertedText($text) {
-		return '<ins>' . $text . '</ins>';
-	}
+    /**
+     * Decorate inserted text
+     *
+     * @param string $text
+     *
+     * @return string
+     */
+    public static function decorateInsertedText($text) {
+        return '<ins>' . $text . '</ins>';
+    }
 
-	/**
-	 * Decorate deleted text
-	 *
-	 * @param string $text
-	 *
-	 * @return string
-	 */
-	public static function decorateDeletedText($text) {
-		return '<del>' . $text . '</del>';
-	}
+    /**
+     * Decorate deleted text
+     *
+     * @param string $text
+     *
+     * @return string
+     */
+    public static function decorateDeletedText($text) {
+        return '<del>' . $text . '</del>';
+    }
 
-	/**
-	 * Converted gedcom links into editable links
-	 *
-	 * @param string $gedrec
-	 *
-	 * @return string
-	 */
-	public static function createEditLinks($gedrec) {
-		return preg_replace(
-			"/@([^#@\n]+)@/m",
-			'<a href="#" onclick="return edit_raw(\'\\1\');">@\\1@</a>',
-			$gedrec
-		);
-	}
+    /**
+     * Converted gedcom links into editable links
+     *
+     * @param string $gedrec
+     *
+     * @return string
+     */
+    public static function createEditLinks($gedrec) {
+        return preg_replace(
+            "/@([^#@\n]+)@/m",
+            '<a href="#" onclick="return edit_raw(\'\\1\');">@\\1@</a>',
+            $gedrec
+        );
+    }
 }

Switch Indentation +8 added lines, -8 removed lines

@@ -101,14 +101,14 @@
 
 		foreach ($differences as $difference) {
 			switch ($difference[1]) {
-			case MyersDiff::DELETE:
-				$diff_lines[] = self::decorateDeletedText($difference[0]);
-				break;
-			case MyersDiff::INSERT:
-				$diff_lines[] = self::decorateInsertedText($difference[0]);
-				break;
-			default:
-				$diff_lines[] = $difference[0];
+			    case MyersDiff::DELETE:
+				    $diff_lines[] = self::decorateDeletedText($difference[0]);
+				    break;
+			    case MyersDiff::INSERT:
+				    $diff_lines[] = self::decorateInsertedText($difference[0]);
+				    break;
+			    default:
+				    $diff_lines[] = $difference[0];
 			}
 		}
 

Braces +18 added lines, -9 removed lines

@@ -31,7 +31,8 @@ 
  * bool doesRecordNeedUpdate($xref, $gedrec)
  * string updateRecord($xref, $gedrec)
  */
-class BatchUpdateBasePlugin {
+class BatchUpdateBasePlugin
+{
 	/** @var bool User option; update change record */
 	public $chan = false;
 
@@ -40,14 +41,16 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getRecordTypesToUpdate() {
+	public function getRecordTypesToUpdate()
+	{
 		return array('INDI');
 	}
 
 	/**
 	 * Default option is just the "don't update CHAN record"
 	 */
-	public function getOptions() {
+	public function getOptions()
+	{
 		$this->chan = Filter::getBool('chan');
 	}
 
@@ -56,7 +59,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getOptionsForm() {
+	public function getOptionsForm()
+	{
 		return
 			'<div class="form-group">' .
 			'<label class="control-label col-sm-3">' . I18N::translate('Keep the existing “last change” information') . '</label>' .
@@ -72,7 +76,8 @@ 
 	 *
 	 * @return string[]
 	 */
-	public function getActionButtons($xref) {
+	public function getActionButtons($xref)
+	{
 		if (Auth::user()->getPreference('auto_accept')) {
 			return array(
 				BatchUpdateModule::createSubmitButton(I18N::translate('Update'), $xref, 'update'),
@@ -92,7 +97,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getActionPreview(GedcomRecord $record) {
+	public function getActionPreview(GedcomRecord $record)
+	{
 		$old_lines   = preg_split('/[\n]+/', $record->getGedcom());
 		$new_lines   = preg_split('/[\n]+/', $this->updateRecord($record->getXref(), $record->getGedcom()));
 		$algorithm   = new MyersDiff;
@@ -122,7 +128,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function decorateInsertedText($text) {
+	public static function decorateInsertedText($text)
+	{
 		return '<ins>' . $text . '</ins>';
 	}
 
@@ -133,7 +140,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function decorateDeletedText($text) {
+	public static function decorateDeletedText($text)
+	{
 		return '<del>' . $text . '</del>';
 	}
 
@@ -144,7 +152,8 @@ 
 	 *
 	 * @return string
 	 */
-	public static function createEditLinks($gedrec) {
+	public static function createEditLinks($gedrec)
+	{
 		return preg_replace(
 			"/@([^#@\n]+)@/m",
 			'<a href="#" onclick="return edit_raw(\'\\1\');">@\\1@</a>',

app/Module/BatchUpdate/BatchUpdateMissingDeathPlugin.php

Indentation +39 added lines, -39 removed lines

@@ -22,47 +22,47 @@
  * Class BatchUpdateMissingDeathPlugin Batch Update plugin: add missing 1 BIRT/DEAT Y
  */
 class BatchUpdateMissingDeathPlugin extends BatchUpdateBasePlugin {
-	/**
-	 * User-friendly name for this plugin.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return I18N::translate('Add missing death records');
-	}
+    /**
+     * User-friendly name for this plugin.
+     *
+     * @return string
+     */
+    public function getName() {
+        return I18N::translate('Add missing death records');
+    }
 
-	/**
-	 * Description / help-text for this plugin.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return I18N::translate('You can speed up the privacy calculations by adding a death record to individuals whose death can be inferred from other dates, but who do not have a record of death, burial, cremation, etc.');
-	}
+    /**
+     * Description / help-text for this plugin.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return I18N::translate('You can speed up the privacy calculations by adding a death record to individuals whose death can be inferred from other dates, but who do not have a record of death, burial, cremation, etc.');
+    }
 
-	/**
-	 * Does this record need updating?
-	 *
-	 * @param string $xref
-	 * @param string $gedrec
-	 *
-	 * @return bool
-	 */
-	public function doesRecordNeedUpdate($xref, $gedrec) {
-		global $WT_TREE;
+    /**
+     * Does this record need updating?
+     *
+     * @param string $xref
+     * @param string $gedrec
+     *
+     * @return bool
+     */
+    public function doesRecordNeedUpdate($xref, $gedrec) {
+        global $WT_TREE;
 
-		return !preg_match('/\n1 (' . WT_EVENTS_DEAT . ')/', $gedrec) && Individual::getInstance($xref, $WT_TREE)->isDead();
-	}
+        return !preg_match('/\n1 (' . WT_EVENTS_DEAT . ')/', $gedrec) && Individual::getInstance($xref, $WT_TREE)->isDead();
+    }
 
-	/**
-	 * Apply any updates to this record
-	 *
-	 * @param string $xref
-	 * @param string $gedrec
-	 *
-	 * @return string
-	 */
-	public function updateRecord($xref, $gedrec) {
-		return $gedrec . "\n1 DEAT Y";
-	}
+    /**
+     * Apply any updates to this record
+     *
+     * @param string $xref
+     * @param string $gedrec
+     *
+     * @return string
+     */
+    public function updateRecord($xref, $gedrec) {
+        return $gedrec . "\n1 DEAT Y";
+    }
 }

Braces +10 added lines, -5 removed lines

@@ -21,13 +21,15 @@ 
 /**
  * Class BatchUpdateMissingDeathPlugin Batch Update plugin: add missing 1 BIRT/DEAT Y
  */
-class BatchUpdateMissingDeathPlugin extends BatchUpdateBasePlugin {
+class BatchUpdateMissingDeathPlugin extends BatchUpdateBasePlugin
+{
 	/**
 	 * User-friendly name for this plugin.
 	 *
 	 * @return string
 	 */
-	public function getName() {
+	public function getName()
+	{
 		return I18N::translate('Add missing death records');
 	}
 
@@ -36,7 +38,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return I18N::translate('You can speed up the privacy calculations by adding a death record to individuals whose death can be inferred from other dates, but who do not have a record of death, burial, cremation, etc.');
 	}
 
@@ -48,7 +51,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function doesRecordNeedUpdate($xref, $gedrec) {
+	public function doesRecordNeedUpdate($xref, $gedrec)
+	{
 		global $WT_TREE;
 
 		return !preg_match('/\n1 (' . WT_EVENTS_DEAT . ')/', $gedrec) && Individual::getInstance($xref, $WT_TREE)->isDead();
@@ -62,7 +66,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function updateRecord($xref, $gedrec) {
+	public function updateRecord($xref, $gedrec)
+	{
 		return $gedrec . "\n1 DEAT Y";
 	}
 }

app/Module/HourglassChartModule.php

Indentation +47 added lines, -47 removed lines

@@ -24,55 +24,55 @@
  * Class HourglassChartModule
  */
 class HourglassChartModule extends AbstractModule implements ModuleChartInterface {
-	/**
-	 * How should this module be labelled on tabs, menus, etc.?
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		return /* I18N: Name of a module/chart */ I18N::translate('Hourglass chart');
-	}
+    /**
+     * How should this module be labelled on tabs, menus, etc.?
+     *
+     * @return string
+     */
+    public function getTitle() {
+        return /* I18N: Name of a module/chart */ I18N::translate('Hourglass chart');
+    }
 
-	/**
-	 * A sentence describing what this module does.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		return /* I18N: Description of the “HourglassChart” module */ I18N::translate('An hourglass chart of an individual’s ancestors and descendants.');
-	}
+    /**
+     * A sentence describing what this module does.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        return /* I18N: Description of the “HourglassChart” module */ I18N::translate('An hourglass chart of an individual’s ancestors and descendants.');
+    }
 
-	/**
-	 * What is the default access level for this module?
-	 *
-	 * Some modules are aimed at admins or managers, and are not generally shown to users.
-	 *
-	 * @return int
-	 */
-	public function defaultAccessLevel() {
-		return Auth::PRIV_PRIVATE;
-	}
+    /**
+     * What is the default access level for this module?
+     *
+     * Some modules are aimed at admins or managers, and are not generally shown to users.
+     *
+     * @return int
+     */
+    public function defaultAccessLevel() {
+        return Auth::PRIV_PRIVATE;
+    }
 
-	/**
-	 * Return a menu item for this chart.
-	 *
-	 * @return Menu|null
-	 */
-	public function getChartMenu(Individual $individual) {
-		return new Menu(
-			$this->getTitle(),
-			'hourglass.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
-			'menu-chart-hourglass',
-			array('rel' => 'nofollow')
-		);
-	}
+    /**
+     * Return a menu item for this chart.
+     *
+     * @return Menu|null
+     */
+    public function getChartMenu(Individual $individual) {
+        return new Menu(
+            $this->getTitle(),
+            'hourglass.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
+            'menu-chart-hourglass',
+            array('rel' => 'nofollow')
+        );
+    }
 
-	/**
-	 * Return a menu item for this chart - for use in individual boxes.
-	 *
-	 * @return Menu|null
-	 */
-	public function getBoxChartMenu(Individual $individual) {
-		return $this->getChartMenu($individual);
-	}
+    /**
+     * Return a menu item for this chart - for use in individual boxes.
+     *
+     * @return Menu|null
+     */
+    public function getBoxChartMenu(Individual $individual) {
+        return $this->getChartMenu($individual);
+    }
 }

Braces +12 added lines, -6 removed lines

@@ -23,13 +23,15 @@ 
 /**
  * Class HourglassChartModule
  */
-class HourglassChartModule extends AbstractModule implements ModuleChartInterface {
+class HourglassChartModule extends AbstractModule implements ModuleChartInterface
+{
 	/**
 	 * How should this module be labelled on tabs, menus, etc.?
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module/chart */ I18N::translate('Hourglass chart');
 	}
 
@@ -38,7 +40,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “HourglassChart” module */ I18N::translate('An hourglass chart of an individual’s ancestors and descendants.');
 	}
 
@@ -49,7 +52,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_PRIVATE;
 	}
 
@@ -58,7 +62,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getChartMenu(Individual $individual) {
+	public function getChartMenu(Individual $individual)
+	{
 		return new Menu(
 			$this->getTitle(),
 			'hourglass.php?rootid=' . $individual->getXref() . '&ged=' . $individual->getTree()->getNameUrl(),
@@ -72,7 +77,8 @@ 
 	 *
 	 * @return Menu|null
 	 */
-	public function getBoxChartMenu(Individual $individual) {
+	public function getBoxChartMenu(Individual $individual)
+	{
 		return $this->getChartMenu($individual);
 	}
 }