fisharebest / webtrees

app/Module/ClippingsCart/ClippingsCartController.php

Indentation +447 added lines, -447 removed lines

@@ -31,451 +31,451 @@
  * The clippings cart.
  */
 class ClippingsCartController {
-	/** @var string Data to be downloaded. */
-	private $download_data;
-
-	/** @var string[] List of files to include */
-	private $media_list;
-
-	/** @var string The type of the record being added */
-	public $type;
-
-	/** @var string The XREF of the record being added */
-	public $id;
-
-	/** @var string Whether to include media files for media objects */
-	private $IncludeMedia;
-
-	/** @var string The media path (if any) to prefix to the filenames */
-	public $conv_path;
-
-	/** @var string The privacy level to apply to the download */
-	private $privatize_export;
-
-	/** @var string Whether to download as ZIP file */
-	private $Zip;
-
-	/** @var int The number of ancestor generations (individuals) to add */
-	public $level1;
-
-	/** @var int The number of ancestor generations (families) to add */
-	public $level2;
-
-	/** @var int The number of descendent generations to add */
-	public $level3;
-
-	/** @var string[][] The contents of the cart */
-	private $cart;
-
-	/**
-	 * Create the clippings controller
-	 */
-	public function __construct() {
-		global $WT_TREE;
-
-		// Our cart is an array of items in the session
-		$this->cart = Session::get('cart', array());
-
-		if (!array_key_exists($WT_TREE->getTreeId(), $this->cart)) {
-			$this->cart[$WT_TREE->getTreeId()] = array();
-		}
-
-		$this->action           = Filter::get('action');
-		$this->id               = Filter::get('id');
-		$convert                = Filter::get('convert', 'yes|no', 'no');
-		$this->Zip              = Filter::get('Zip');
-		$this->IncludeMedia     = Filter::get('IncludeMedia');
-		$this->conv_path        = Filter::get('conv_path');
-		$this->privatize_export = Filter::get('privatize_export', 'none|visitor|user|gedadmin', 'visitor');
-		$this->level1           = Filter::getInteger('level1');
-		$this->level2           = Filter::getInteger('level2');
-		$this->level3           = Filter::getInteger('level3');
-		$others                 = Filter::get('others');
-		$this->type             = Filter::get('type');
-
-		if (($this->privatize_export === 'none' || $this->privatize_export === 'none') && !Auth::isManager($WT_TREE)) {
-			$this->privatize_export = 'visitor';
-		}
-		if ($this->privatize_export === 'user' && !Auth::isMember($WT_TREE)) {
-			$this->privatize_export = 'visitor';
-		}
-
-		if ($this->action === 'add') {
-			if (empty($this->type) && !empty($this->id)) {
-				$obj = GedcomRecord::getInstance($this->id, $WT_TREE);
-				if ($obj) {
-					$this->type = $obj::RECORD_TYPE;
-				} else {
-					$this->type   = '';
-					$this->id     = '';
-					$this->action = '';
-				}
-			} elseif (empty($this->id)) {
-				$this->action = '';
-			}
-			if (!empty($this->id) && $this->type !== 'FAM' && $this->type !== 'INDI' && $this->type !== 'SOUR') {
-				$this->action = 'add1';
-			}
-		}
-
-		if ($this->action === 'add1') {
-			$obj = GedcomRecord::getInstance($this->id, $WT_TREE);
-			$this->addClipping($obj);
-			if ($this->type === 'SOUR') {
-				if ($others === 'linked') {
-					foreach ($obj->linkedIndividuals('SOUR') as $indi) {
-						$this->addClipping($indi);
-					}
-					foreach ($obj->linkedFamilies('SOUR') as $fam) {
-						$this->addClipping($fam);
-					}
-				}
-			}
-			if ($this->type === 'FAM') {
-				if ($others === 'parents') {
-					$this->addClipping($obj->getHusband());
-					$this->addClipping($obj->getWife());
-				} elseif ($others === "members") {
-					$this->addFamilyMembers(Family::getInstance($this->id, $WT_TREE));
-				} elseif ($others === "descendants") {
-					$this->addFamilyDescendancy(Family::getInstance($this->id, $WT_TREE));
-				}
-			} elseif ($this->type === 'INDI') {
-				if ($others === 'parents') {
-					foreach (Individual::getInstance($this->id, $WT_TREE)->getChildFamilies() as $family) {
-						$this->addFamilyMembers($family);
-					}
-				} elseif ($others === 'ancestors') {
-					$this->addAncestorsToCart(Individual::getInstance($this->id, $WT_TREE), $this->level1);
-				} elseif ($others === 'ancestorsfamilies') {
-					$this->addAncestorsToCartFamilies(Individual::getInstance($this->id, $WT_TREE), $this->level2);
-				} elseif ($others === 'members') {
-					foreach (Individual::getInstance($this->id, $WT_TREE)->getSpouseFamilies() as $family) {
-						$this->addFamilyMembers($family);
-					}
-				} elseif ($others === 'descendants') {
-					foreach (Individual::getInstance($this->id, $WT_TREE)->getSpouseFamilies() as $family) {
-						$this->addClipping($family);
-						$this->addFamilyDescendancy($family, $this->level3);
-					}
-				}
-				uksort($this->cart[$WT_TREE->getTreeId()], array($this, 'compareClippings'));
-			}
-		} elseif ($this->action === 'remove') {
-			unset($this->cart[$WT_TREE->getTreeId()][$this->id]);
-		} elseif ($this->action === 'empty') {
-			$this->cart[$WT_TREE->getTreeId()] = array();
-		} elseif ($this->action === 'download') {
-			$media      = array();
-			$mediacount = 0;
-			$filetext   = FunctionsExport::gedcomHeader($WT_TREE);
-			// Include SUBM/SUBN records, if they exist
-			$subn =
-				Database::prepare("SELECT o_gedcom FROM `##other` WHERE o_type=? AND o_file=?")
-				->execute(array('SUBN', $WT_TREE->getTreeId()))
-				->fetchOne();
-			if ($subn) {
-				$filetext .= $subn . "\n";
-			}
-			$subm =
-				Database::prepare("SELECT o_gedcom FROM `##other` WHERE o_type=? AND o_file=?")
-				->execute(array('SUBM', $WT_TREE->getTreeId()))
-				->fetchOne();
-			if ($subm) {
-				$filetext .= $subm . "\n";
-			}
-			if ($convert === "yes") {
-				$filetext = str_replace("UTF-8", "ANSI", $filetext);
-				$filetext = utf8_decode($filetext);
-			}
-
-			switch ($this->privatize_export) {
-			case 'gedadmin':
-				$access_level = Auth::PRIV_NONE;
-				break;
-			case 'user':
-				$access_level = Auth::PRIV_USER;
-				break;
-			case 'visitor':
-				$access_level = Auth::PRIV_PRIVATE;
-				break;
-			case 'none':
-				$access_level = Auth::PRIV_HIDE;
-				break;
-			}
-
-			foreach (array_keys($this->cart[$WT_TREE->getTreeId()]) as $xref) {
-				$object = GedcomRecord::getInstance($xref, $WT_TREE);
-				// The object may have been deleted since we added it to the cart....
-				if ($object) {
-					$record = $object->privatizeGedcom($access_level);
-					// Remove links to objects that aren't in the cart
-					preg_match_all('/\n1 ' . WT_REGEX_TAG . ' @(' . WT_REGEX_XREF . ')@(\n[2-9].*)*/', $record, $matches, PREG_SET_ORDER);
-					foreach ($matches as $match) {
-						if (!array_key_exists($match[1], $this->cart[$WT_TREE->getTreeId()])) {
-							$record = str_replace($match[0], '', $record);
-						}
-					}
-					preg_match_all('/\n2 ' . WT_REGEX_TAG . ' @(' . WT_REGEX_XREF . ')@(\n[3-9].*)*/', $record, $matches, PREG_SET_ORDER);
-					foreach ($matches as $match) {
-						if (!array_key_exists($match[1], $this->cart[$WT_TREE->getTreeId()])) {
-							$record = str_replace($match[0], '', $record);
-						}
-					}
-					preg_match_all('/\n3 ' . WT_REGEX_TAG . ' @(' . WT_REGEX_XREF . ')@(\n[4-9].*)*/', $record, $matches, PREG_SET_ORDER);
-					foreach ($matches as $match) {
-						if (!array_key_exists($match[1], $this->cart[$WT_TREE->getTreeId()])) {
-							$record = str_replace($match[0], '', $record);
-						}
-					}
-					$record      = FunctionsExport::convertMediaPath($record, $this->conv_path);
-					$savedRecord = $record; // Save this for the "does this file exist" check
-					if ($convert === 'yes') {
-						$record = utf8_decode($record);
-					}
-					switch ($object::RECORD_TYPE) {
-					case 'INDI':
-						$filetext .= $record . "\n";
-						$filetext .= "1 SOUR @WEBTREES@\n";
-						$filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n";
-						break;
-					case 'FAM':
-						$filetext .= $record . "\n";
-						$filetext .= "1 SOUR @WEBTREES@\n";
-						$filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n";
-						break;
-					case 'SOUR':
-						$filetext .= $record . "\n";
-						$filetext .= "1 NOTE " . WT_BASE_URL . $object->getRawUrl() . "\n";
-						break;
-					default:
-						// This autoloads the PclZip library, so we can use its constants.
-						new PclZip('');
-
-						$ft              = preg_match_all("/\n\d FILE (.+)/", $savedRecord, $match, PREG_SET_ORDER);
-						$MEDIA_DIRECTORY = $WT_TREE->getPreference('MEDIA_DIRECTORY');
-						for ($k = 0; $k < $ft; $k++) {
-							// Skip external files and non-existant files
-							if (file_exists(WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1])) {
-								$media[$mediacount] = array(
-									\PCLZIP_ATT_FILE_NAME          => WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1],
-									\PCLZIP_ATT_FILE_NEW_FULL_NAME => $match[$k][1],
-								);
-								$mediacount++;
-							}
-						}
-						$filetext .= trim($record) . "\n";
-						break;
-					}
-				}
-			}
-
-			if ($this->IncludeMedia === "yes") {
-				$this->media_list = $media;
-			} else {
-				$this->media_list = array();
-			}
-			$filetext .= "0 @WEBTREES@ SOUR\n1 TITL " . WT_BASE_URL . "\n";
-			if ($user_id = $WT_TREE->getPreference('CONTACT_EMAIL')) {
-				$user = User::find($user_id);
-				$filetext .= "1 AUTH " . $user->getRealName() . "\n";
-			}
-			$filetext .= "0 TRLR\n";
-			//-- make sure the preferred line endings are used
-			$filetext            = preg_replace("/[\r\n]+/", WT_EOL, $filetext);
-			$this->download_data = $filetext;
-			$this->downloadClipping();
-		}
-		Session::put('cart', $this->cart);
-	}
-
-	/**
-	 * Loads everything in the clippings cart into a zip file.
-	 */
-	private function zipCart() {
-		$tempFileName = 'clipping' . rand() . '.ged';
-		$fp           = fopen(WT_DATA_DIR . $tempFileName, "wb");
-		if ($fp) {
-			flock($fp, LOCK_EX);
-			fwrite($fp, $this->download_data);
-			flock($fp, LOCK_UN);
-			fclose($fp);
-			$zipName = "clippings" . rand(0, 1500) . ".zip";
-			$fname   = WT_DATA_DIR . $zipName;
-			$comment = "Created by " . WT_WEBTREES . " " . WT_VERSION . " on " . date("d M Y") . ".";
-			$archive = new PclZip($fname);
-			// add the ged file to the root of the zip file (strip off the data folder)
-			$this->media_list[] = array(\PCLZIP_ATT_FILE_NAME => WT_DATA_DIR . $tempFileName, \PCLZIP_ATT_FILE_NEW_FULL_NAME => $tempFileName);
-			$v_list             = $archive->create($this->media_list, \PCLZIP_OPT_COMMENT, $comment);
-			if ($v_list == 0) {
-				echo "Error : " . $archive->errorInfo(true) . "</td></tr>";
-			} else {
-				$openedFile          = fopen($fname, "rb");
-				$this->download_data = fread($openedFile, filesize($fname));
-				fclose($openedFile);
-				unlink($fname);
-			}
-			unlink(WT_DATA_DIR . $tempFileName);
-		} else {
-			echo I18N::translate('The file %s could not be created.', WT_DATA_DIR . $tempFileName) . " " . I18N::translate('Check the access rights on this folder.') . "<br><br>";
-		}
-	}
-
-	/**
-	 * Brings up the download dialog box and allows the user to download the file
-	 * based on the options he or she selected.
-	 */
-	public function downloadClipping() {
-		if ($this->IncludeMedia === 'yes' || $this->Zip === 'yes') {
-			header('Content-Type: application/zip');
-			header('Content-Disposition: attachment; filename="clipping.zip"');
-			$this->zipCart();
-		} else {
-			header('Content-Type: text/plain');
-			header('Content-Disposition: attachment; filename="clipping.ged"');
-		}
-
-		header('Content-length: ' . strlen($this->download_data));
-		echo $this->download_data;
-		exit;
-	}
-
-	/**
-	 * Inserts a clipping into the clipping cart
-	 *
-	 * @param GedcomRecord $record
-	 */
-	public function addClipping(GedcomRecord $record) {
-		if ($record->canShowName()) {
-			$this->cart[$record->getTree()->getTreeId()][$record->getXref()] = true;
-			// Add directly linked records
-			preg_match_all('/\n\d (?:OBJE|NOTE|SOUR|REPO) @(' . WT_REGEX_XREF . ')@/', $record->getGedcom(), $matches);
-			foreach ($matches[1] as $match) {
-				$this->cart[$record->getTree()->getTreeId()][$match] = true;
-			}
-		}
-	}
-
-	/**
-	 * Recursive function to traverse the tree
-	 *
-	 * @param Family|null $family
-	 * @param int         $level
-	 */
-	public function addFamilyDescendancy(Family $family = null, $level = PHP_INT_MAX) {
-		if (!$family) {
-			return;
-		}
-		foreach ($family->getSpouses() as $spouse) {
-			$this->addClipping($spouse);
-		}
-		foreach ($family->getChildren() as $child) {
-			$this->addClipping($child);
-			foreach ($child->getSpouseFamilies() as $child_family) {
-				$this->addClipping($child_family);
-				if ($level > 0) {
-					$this->addFamilyDescendancy($child_family, $level - 1); // recurse on the childs family
-				}
-			}
-		}
-	}
-
-	/**
-	 * Add a family, and all its members
-	 *
-	 * @param Family|null $family
-	 */
-	public function addFamilyMembers(Family $family = null) {
-		if (!$family) {
-			return;
-		}
-		$this->addClipping($family);
-		foreach ($family->getSpouses() as $spouse) {
-			$this->addClipping($spouse);
-		}
-		foreach ($family->getChildren() as $child) {
-			$this->addClipping($child);
-		}
-	}
-
-	/**
-	 * Recursively add direct-line ancestors to cart
-	 *
-	 * @param Individual|null $person
-	 * @param int             $level
-	 */
-	public function addAncestorsToCart(Individual $person = null, $level = 0) {
-		if (!$person) {
-			return;
-		}
-		$this->addClipping($person);
-		if ($level > 0) {
-			foreach ($person->getChildFamilies() as $family) {
-				$this->addClipping($family);
-				$this->addAncestorsToCart($family->getHusband(), $level - 1);
-				$this->addAncestorsToCart($family->getWife(), $level - 1);
-			}
-		}
-	}
-
-	/**
-	 * Recursively adds direct-line ancestors and their families to the cart
-	 *
-	 * @param Individual|null $person
-	 * @param int             $level
-	 */
-	public function addAncestorsToCartFamilies(Individual $person = null, $level = 0) {
-		if (!$person) {
-			return;
-		}
-		if ($level > 0) {
-			foreach ($person->getChildFamilies() as $family) {
-				$this->addFamilyMembers($family);
-				$this->addAncestorsToCartFamilies($family->getHusband(), $level - 1);
-				$this->addAncestorsToCartFamilies($family->getWife(), $level - 1);
-			}
-		}
-	}
-
-	/**
-	 * Helper function to sort records by type/name
-	 *
-	 * @param string $a
-	 * @param string $b
-	 *
-	 * @return int
-	 */
-	private static function compareClippings($a, $b) {
-		global $WT_TREE;
-
-		$a = GedcomRecord::getInstance($a, $WT_TREE);
-		$b = GedcomRecord::getInstance($b, $WT_TREE);
-		if ($a && $b) {
-			switch ($a::RECORD_TYPE) {
-			case 'INDI': $t1 = 1; break;
-			case 'FAM':  $t1 = 2; break;
-			case 'SOUR': $t1 = 3; break;
-			case 'REPO': $t1 = 4; break;
-			case 'OBJE': $t1 = 5; break;
-			case 'NOTE': $t1 = 6; break;
-			default:     $t1 = 7; break;
-			}
-			switch ($b::RECORD_TYPE) {
-			case 'INDI': $t2 = 1; break;
-			case 'FAM':  $t2 = 2; break;
-			case 'SOUR': $t2 = 3; break;
-			case 'REPO': $t2 = 4; break;
-			case 'OBJE': $t2 = 5; break;
-			case 'NOTE': $t2 = 6; break;
-			default:     $t2 = 7; break;
-			}
-			if ($t1 != $t2) {
-				return $t1 - $t2;
-			} else {
-				return GedcomRecord::compare($a, $b);
-			}
-		} else {
-			return 0;
-		}
-	}
+    /** @var string Data to be downloaded. */
+    private $download_data;
+
+    /** @var string[] List of files to include */
+    private $media_list;
+
+    /** @var string The type of the record being added */
+    public $type;
+
+    /** @var string The XREF of the record being added */
+    public $id;
+
+    /** @var string Whether to include media files for media objects */
+    private $IncludeMedia;
+
+    /** @var string The media path (if any) to prefix to the filenames */
+    public $conv_path;
+
+    /** @var string The privacy level to apply to the download */
+    private $privatize_export;
+
+    /** @var string Whether to download as ZIP file */
+    private $Zip;
+
+    /** @var int The number of ancestor generations (individuals) to add */
+    public $level1;
+
+    /** @var int The number of ancestor generations (families) to add */
+    public $level2;
+
+    /** @var int The number of descendent generations to add */
+    public $level3;
+
+    /** @var string[][] The contents of the cart */
+    private $cart;
+
+    /**
+     * Create the clippings controller
+     */
+    public function __construct() {
+        global $WT_TREE;
+
+        // Our cart is an array of items in the session
+        $this->cart = Session::get('cart', array());
+
+        if (!array_key_exists($WT_TREE->getTreeId(), $this->cart)) {
+            $this->cart[$WT_TREE->getTreeId()] = array();
+        }
+
+        $this->action           = Filter::get('action');
+        $this->id               = Filter::get('id');
+        $convert                = Filter::get('convert', 'yes|no', 'no');
+        $this->Zip              = Filter::get('Zip');
+        $this->IncludeMedia     = Filter::get('IncludeMedia');
+        $this->conv_path        = Filter::get('conv_path');
+        $this->privatize_export = Filter::get('privatize_export', 'none|visitor|user|gedadmin', 'visitor');
+        $this->level1           = Filter::getInteger('level1');
+        $this->level2           = Filter::getInteger('level2');
+        $this->level3           = Filter::getInteger('level3');
+        $others                 = Filter::get('others');
+        $this->type             = Filter::get('type');
+
+        if (($this->privatize_export === 'none' || $this->privatize_export === 'none') && !Auth::isManager($WT_TREE)) {
+            $this->privatize_export = 'visitor';
+        }
+        if ($this->privatize_export === 'user' && !Auth::isMember($WT_TREE)) {
+            $this->privatize_export = 'visitor';
+        }
+
+        if ($this->action === 'add') {
+            if (empty($this->type) && !empty($this->id)) {
+                $obj = GedcomRecord::getInstance($this->id, $WT_TREE);
+                if ($obj) {
+                    $this->type = $obj::RECORD_TYPE;
+                } else {
+                    $this->type   = '';
+                    $this->id     = '';
+                    $this->action = '';
+                }
+            } elseif (empty($this->id)) {
+                $this->action = '';
+            }
+            if (!empty($this->id) && $this->type !== 'FAM' && $this->type !== 'INDI' && $this->type !== 'SOUR') {
+                $this->action = 'add1';
+            }
+        }
+
+        if ($this->action === 'add1') {
+            $obj = GedcomRecord::getInstance($this->id, $WT_TREE);
+            $this->addClipping($obj);
+            if ($this->type === 'SOUR') {
+                if ($others === 'linked') {
+                    foreach ($obj->linkedIndividuals('SOUR') as $indi) {
+                        $this->addClipping($indi);
+                    }
+                    foreach ($obj->linkedFamilies('SOUR') as $fam) {
+                        $this->addClipping($fam);
+                    }
+                }
+            }
+            if ($this->type === 'FAM') {
+                if ($others === 'parents') {
+                    $this->addClipping($obj->getHusband());
+                    $this->addClipping($obj->getWife());
+                } elseif ($others === "members") {
+                    $this->addFamilyMembers(Family::getInstance($this->id, $WT_TREE));
+                } elseif ($others === "descendants") {
+                    $this->addFamilyDescendancy(Family::getInstance($this->id, $WT_TREE));
+                }
+            } elseif ($this->type === 'INDI') {
+                if ($others === 'parents') {
+                    foreach (Individual::getInstance($this->id, $WT_TREE)->getChildFamilies() as $family) {
+                        $this->addFamilyMembers($family);
+                    }
+                } elseif ($others === 'ancestors') {
+                    $this->addAncestorsToCart(Individual::getInstance($this->id, $WT_TREE), $this->level1);
+                } elseif ($others === 'ancestorsfamilies') {
+                    $this->addAncestorsToCartFamilies(Individual::getInstance($this->id, $WT_TREE), $this->level2);
+                } elseif ($others === 'members') {
+                    foreach (Individual::getInstance($this->id, $WT_TREE)->getSpouseFamilies() as $family) {
+                        $this->addFamilyMembers($family);
+                    }
+                } elseif ($others === 'descendants') {
+                    foreach (Individual::getInstance($this->id, $WT_TREE)->getSpouseFamilies() as $family) {
+                        $this->addClipping($family);
+                        $this->addFamilyDescendancy($family, $this->level3);
+                    }
+                }
+                uksort($this->cart[$WT_TREE->getTreeId()], array($this, 'compareClippings'));
+            }
+        } elseif ($this->action === 'remove') {
+            unset($this->cart[$WT_TREE->getTreeId()][$this->id]);
+        } elseif ($this->action === 'empty') {
+            $this->cart[$WT_TREE->getTreeId()] = array();
+        } elseif ($this->action === 'download') {
+            $media      = array();
+            $mediacount = 0;
+            $filetext   = FunctionsExport::gedcomHeader($WT_TREE);
+            // Include SUBM/SUBN records, if they exist
+            $subn =
+                Database::prepare("SELECT o_gedcom FROM `##other` WHERE o_type=? AND o_file=?")
+                ->execute(array('SUBN', $WT_TREE->getTreeId()))
+                ->fetchOne();
+            if ($subn) {
+                $filetext .= $subn . "\n";
+            }
+            $subm =
+                Database::prepare("SELECT o_gedcom FROM `##other` WHERE o_type=? AND o_file=?")
+                ->execute(array('SUBM', $WT_TREE->getTreeId()))
+                ->fetchOne();
+            if ($subm) {
+                $filetext .= $subm . "\n";
+            }
+            if ($convert === "yes") {
+                $filetext = str_replace("UTF-8", "ANSI", $filetext);
+                $filetext = utf8_decode($filetext);
+            }
+
+            switch ($this->privatize_export) {
+            case 'gedadmin':
+                $access_level = Auth::PRIV_NONE;
+                break;
+            case 'user':
+                $access_level = Auth::PRIV_USER;
+                break;
+            case 'visitor':
+                $access_level = Auth::PRIV_PRIVATE;
+                break;
+            case 'none':
+                $access_level = Auth::PRIV_HIDE;
+                break;
+            }
+
+            foreach (array_keys($this->cart[$WT_TREE->getTreeId()]) as $xref) {
+                $object = GedcomRecord::getInstance($xref, $WT_TREE);
+                // The object may have been deleted since we added it to the cart....
+                if ($object) {
+                    $record = $object->privatizeGedcom($access_level);
+                    // Remove links to objects that aren't in the cart
+                    preg_match_all('/\n1 ' . WT_REGEX_TAG . ' @(' . WT_REGEX_XREF . ')@(\n[2-9].*)*/', $record, $matches, PREG_SET_ORDER);
+                    foreach ($matches as $match) {
+                        if (!array_key_exists($match[1], $this->cart[$WT_TREE->getTreeId()])) {
+                            $record = str_replace($match[0], '', $record);
+                        }
+                    }
+                    preg_match_all('/\n2 ' . WT_REGEX_TAG . ' @(' . WT_REGEX_XREF . ')@(\n[3-9].*)*/', $record, $matches, PREG_SET_ORDER);
+                    foreach ($matches as $match) {
+                        if (!array_key_exists($match[1], $this->cart[$WT_TREE->getTreeId()])) {
+                            $record = str_replace($match[0], '', $record);
+                        }
+                    }
+                    preg_match_all('/\n3 ' . WT_REGEX_TAG . ' @(' . WT_REGEX_XREF . ')@(\n[4-9].*)*/', $record, $matches, PREG_SET_ORDER);
+                    foreach ($matches as $match) {
+                        if (!array_key_exists($match[1], $this->cart[$WT_TREE->getTreeId()])) {
+                            $record = str_replace($match[0], '', $record);
+                        }
+                    }
+                    $record      = FunctionsExport::convertMediaPath($record, $this->conv_path);
+                    $savedRecord = $record; // Save this for the "does this file exist" check
+                    if ($convert === 'yes') {
+                        $record = utf8_decode($record);
+                    }
+                    switch ($object::RECORD_TYPE) {
+                    case 'INDI':
+                        $filetext .= $record . "\n";
+                        $filetext .= "1 SOUR @WEBTREES@\n";
+                        $filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n";
+                        break;
+                    case 'FAM':
+                        $filetext .= $record . "\n";
+                        $filetext .= "1 SOUR @WEBTREES@\n";
+                        $filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n";
+                        break;
+                    case 'SOUR':
+                        $filetext .= $record . "\n";
+                        $filetext .= "1 NOTE " . WT_BASE_URL . $object->getRawUrl() . "\n";
+                        break;
+                    default:
+                        // This autoloads the PclZip library, so we can use its constants.
+                        new PclZip('');
+
+                        $ft              = preg_match_all("/\n\d FILE (.+)/", $savedRecord, $match, PREG_SET_ORDER);
+                        $MEDIA_DIRECTORY = $WT_TREE->getPreference('MEDIA_DIRECTORY');
+                        for ($k = 0; $k < $ft; $k++) {
+                            // Skip external files and non-existant files
+                            if (file_exists(WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1])) {
+                                $media[$mediacount] = array(
+                                    \PCLZIP_ATT_FILE_NAME          => WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1],
+                                    \PCLZIP_ATT_FILE_NEW_FULL_NAME => $match[$k][1],
+                                );
+                                $mediacount++;
+                            }
+                        }
+                        $filetext .= trim($record) . "\n";
+                        break;
+                    }
+                }
+            }
+
+            if ($this->IncludeMedia === "yes") {
+                $this->media_list = $media;
+            } else {
+                $this->media_list = array();
+            }
+            $filetext .= "0 @WEBTREES@ SOUR\n1 TITL " . WT_BASE_URL . "\n";
+            if ($user_id = $WT_TREE->getPreference('CONTACT_EMAIL')) {
+                $user = User::find($user_id);
+                $filetext .= "1 AUTH " . $user->getRealName() . "\n";
+            }
+            $filetext .= "0 TRLR\n";
+            //-- make sure the preferred line endings are used
+            $filetext            = preg_replace("/[\r\n]+/", WT_EOL, $filetext);
+            $this->download_data = $filetext;
+            $this->downloadClipping();
+        }
+        Session::put('cart', $this->cart);
+    }
+
+    /**
+     * Loads everything in the clippings cart into a zip file.
+     */
+    private function zipCart() {
+        $tempFileName = 'clipping' . rand() . '.ged';
+        $fp           = fopen(WT_DATA_DIR . $tempFileName, "wb");
+        if ($fp) {
+            flock($fp, LOCK_EX);
+            fwrite($fp, $this->download_data);
+            flock($fp, LOCK_UN);
+            fclose($fp);
+            $zipName = "clippings" . rand(0, 1500) . ".zip";
+            $fname   = WT_DATA_DIR . $zipName;
+            $comment = "Created by " . WT_WEBTREES . " " . WT_VERSION . " on " . date("d M Y") . ".";
+            $archive = new PclZip($fname);
+            // add the ged file to the root of the zip file (strip off the data folder)
+            $this->media_list[] = array(\PCLZIP_ATT_FILE_NAME => WT_DATA_DIR . $tempFileName, \PCLZIP_ATT_FILE_NEW_FULL_NAME => $tempFileName);
+            $v_list             = $archive->create($this->media_list, \PCLZIP_OPT_COMMENT, $comment);
+            if ($v_list == 0) {
+                echo "Error : " . $archive->errorInfo(true) . "</td></tr>";
+            } else {
+                $openedFile          = fopen($fname, "rb");
+                $this->download_data = fread($openedFile, filesize($fname));
+                fclose($openedFile);
+                unlink($fname);
+            }
+            unlink(WT_DATA_DIR . $tempFileName);
+        } else {
+            echo I18N::translate('The file %s could not be created.', WT_DATA_DIR . $tempFileName) . " " . I18N::translate('Check the access rights on this folder.') . "<br><br>";
+        }
+    }
+
+    /**
+     * Brings up the download dialog box and allows the user to download the file
+     * based on the options he or she selected.
+     */
+    public function downloadClipping() {
+        if ($this->IncludeMedia === 'yes' || $this->Zip === 'yes') {
+            header('Content-Type: application/zip');
+            header('Content-Disposition: attachment; filename="clipping.zip"');
+            $this->zipCart();
+        } else {
+            header('Content-Type: text/plain');
+            header('Content-Disposition: attachment; filename="clipping.ged"');
+        }
+
+        header('Content-length: ' . strlen($this->download_data));
+        echo $this->download_data;
+        exit;
+    }
+
+    /**
+     * Inserts a clipping into the clipping cart
+     *
+     * @param GedcomRecord $record
+     */
+    public function addClipping(GedcomRecord $record) {
+        if ($record->canShowName()) {
+            $this->cart[$record->getTree()->getTreeId()][$record->getXref()] = true;
+            // Add directly linked records
+            preg_match_all('/\n\d (?:OBJE|NOTE|SOUR|REPO) @(' . WT_REGEX_XREF . ')@/', $record->getGedcom(), $matches);
+            foreach ($matches[1] as $match) {
+                $this->cart[$record->getTree()->getTreeId()][$match] = true;
+            }
+        }
+    }
+
+    /**
+     * Recursive function to traverse the tree
+     *
+     * @param Family|null $family
+     * @param int         $level
+     */
+    public function addFamilyDescendancy(Family $family = null, $level = PHP_INT_MAX) {
+        if (!$family) {
+            return;
+        }
+        foreach ($family->getSpouses() as $spouse) {
+            $this->addClipping($spouse);
+        }
+        foreach ($family->getChildren() as $child) {
+            $this->addClipping($child);
+            foreach ($child->getSpouseFamilies() as $child_family) {
+                $this->addClipping($child_family);
+                if ($level > 0) {
+                    $this->addFamilyDescendancy($child_family, $level - 1); // recurse on the childs family
+                }
+            }
+        }
+    }
+
+    /**
+     * Add a family, and all its members
+     *
+     * @param Family|null $family
+     */
+    public function addFamilyMembers(Family $family = null) {
+        if (!$family) {
+            return;
+        }
+        $this->addClipping($family);
+        foreach ($family->getSpouses() as $spouse) {
+            $this->addClipping($spouse);
+        }
+        foreach ($family->getChildren() as $child) {
+            $this->addClipping($child);
+        }
+    }
+
+    /**
+     * Recursively add direct-line ancestors to cart
+     *
+     * @param Individual|null $person
+     * @param int             $level
+     */
+    public function addAncestorsToCart(Individual $person = null, $level = 0) {
+        if (!$person) {
+            return;
+        }
+        $this->addClipping($person);
+        if ($level > 0) {
+            foreach ($person->getChildFamilies() as $family) {
+                $this->addClipping($family);
+                $this->addAncestorsToCart($family->getHusband(), $level - 1);
+                $this->addAncestorsToCart($family->getWife(), $level - 1);
+            }
+        }
+    }
+
+    /**
+     * Recursively adds direct-line ancestors and their families to the cart
+     *
+     * @param Individual|null $person
+     * @param int             $level
+     */
+    public function addAncestorsToCartFamilies(Individual $person = null, $level = 0) {
+        if (!$person) {
+            return;
+        }
+        if ($level > 0) {
+            foreach ($person->getChildFamilies() as $family) {
+                $this->addFamilyMembers($family);
+                $this->addAncestorsToCartFamilies($family->getHusband(), $level - 1);
+                $this->addAncestorsToCartFamilies($family->getWife(), $level - 1);
+            }
+        }
+    }
+
+    /**
+     * Helper function to sort records by type/name
+     *
+     * @param string $a
+     * @param string $b
+     *
+     * @return int
+     */
+    private static function compareClippings($a, $b) {
+        global $WT_TREE;
+
+        $a = GedcomRecord::getInstance($a, $WT_TREE);
+        $b = GedcomRecord::getInstance($b, $WT_TREE);
+        if ($a && $b) {
+            switch ($a::RECORD_TYPE) {
+            case 'INDI': $t1 = 1; break;
+            case 'FAM':  $t1 = 2; break;
+            case 'SOUR': $t1 = 3; break;
+            case 'REPO': $t1 = 4; break;
+            case 'OBJE': $t1 = 5; break;
+            case 'NOTE': $t1 = 6; break;
+            default:     $t1 = 7; break;
+            }
+            switch ($b::RECORD_TYPE) {
+            case 'INDI': $t2 = 1; break;
+            case 'FAM':  $t2 = 2; break;
+            case 'SOUR': $t2 = 3; break;
+            case 'REPO': $t2 = 4; break;
+            case 'OBJE': $t2 = 5; break;
+            case 'NOTE': $t2 = 6; break;
+            default:     $t2 = 7; break;
+            }
+            if ($t1 != $t2) {
+                return $t1 - $t2;
+            } else {
+                return GedcomRecord::compare($a, $b);
+            }
+        } else {
+            return 0;
+        }
+    }
 }

Switch Indentation +58 added lines, -58 removed lines

@@ -190,18 +190,18 @@ 
 			}
 
 			switch ($this->privatize_export) {
-			case 'gedadmin':
-				$access_level = Auth::PRIV_NONE;
-				break;
-			case 'user':
-				$access_level = Auth::PRIV_USER;
-				break;
-			case 'visitor':
-				$access_level = Auth::PRIV_PRIVATE;
-				break;
-			case 'none':
-				$access_level = Auth::PRIV_HIDE;
-				break;
+			    case 'gedadmin':
+				    $access_level = Auth::PRIV_NONE;
+				    break;
+			    case 'user':
+				    $access_level = Auth::PRIV_USER;
+				    break;
+			    case 'visitor':
+				    $access_level = Auth::PRIV_PRIVATE;
+				    break;
+			    case 'none':
+				    $access_level = Auth::PRIV_HIDE;
+				    break;
 			}
 
 			foreach (array_keys($this->cart[$WT_TREE->getTreeId()]) as $xref) {
@@ -234,38 +234,38 @@ 
 						$record = utf8_decode($record);
 					}
 					switch ($object::RECORD_TYPE) {
-					case 'INDI':
-						$filetext .= $record . "\n";
-						$filetext .= "1 SOUR @WEBTREES@\n";
-						$filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n";
-						break;
-					case 'FAM':
-						$filetext .= $record . "\n";
-						$filetext .= "1 SOUR @WEBTREES@\n";
-						$filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n";
-						break;
-					case 'SOUR':
-						$filetext .= $record . "\n";
-						$filetext .= "1 NOTE " . WT_BASE_URL . $object->getRawUrl() . "\n";
-						break;
-					default:
-						// This autoloads the PclZip library, so we can use its constants.
-						new PclZip('');
-
-						$ft              = preg_match_all("/\n\d FILE (.+)/", $savedRecord, $match, PREG_SET_ORDER);
-						$MEDIA_DIRECTORY = $WT_TREE->getPreference('MEDIA_DIRECTORY');
-						for ($k = 0; $k < $ft; $k++) {
-							// Skip external files and non-existant files
-							if (file_exists(WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1])) {
-								$media[$mediacount] = array(
-									\PCLZIP_ATT_FILE_NAME          => WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1],
-									\PCLZIP_ATT_FILE_NEW_FULL_NAME => $match[$k][1],
-								);
-								$mediacount++;
-							}
-						}
-						$filetext .= trim($record) . "\n";
-						break;
+					    case 'INDI':
+						    $filetext .= $record . "\n";
+						    $filetext .= "1 SOUR @WEBTREES@\n";
+						    $filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n";
+						    break;
+					    case 'FAM':
+						    $filetext .= $record . "\n";
+						    $filetext .= "1 SOUR @WEBTREES@\n";
+						    $filetext .= "2 PAGE " . WT_BASE_URL . $object->getRawUrl() . "\n";
+						    break;
+					    case 'SOUR':
+						    $filetext .= $record . "\n";
+						    $filetext .= "1 NOTE " . WT_BASE_URL . $object->getRawUrl() . "\n";
+						    break;
+					    default:
+						    // This autoloads the PclZip library, so we can use its constants.
+						    new PclZip('');
+
+						    $ft              = preg_match_all("/\n\d FILE (.+)/", $savedRecord, $match, PREG_SET_ORDER);
+						    $MEDIA_DIRECTORY = $WT_TREE->getPreference('MEDIA_DIRECTORY');
+						    for ($k = 0; $k < $ft; $k++) {
+							    // Skip external files and non-existant files
+							    if (file_exists(WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1])) {
+								    $media[$mediacount] = array(
+									    \PCLZIP_ATT_FILE_NAME          => WT_DATA_DIR . $MEDIA_DIRECTORY . $match[$k][1],
+									    \PCLZIP_ATT_FILE_NEW_FULL_NAME => $match[$k][1],
+								    );
+								    $mediacount++;
+							    }
+						    }
+						    $filetext .= trim($record) . "\n";
+						    break;
 					}
 				}
 			}
@@ -452,22 +452,22 @@ 
 		$b = GedcomRecord::getInstance($b, $WT_TREE);
 		if ($a && $b) {
 			switch ($a::RECORD_TYPE) {
-			case 'INDI': $t1 = 1; break;
-			case 'FAM':  $t1 = 2; break;
-			case 'SOUR': $t1 = 3; break;
-			case 'REPO': $t1 = 4; break;
-			case 'OBJE': $t1 = 5; break;
-			case 'NOTE': $t1 = 6; break;
-			default:     $t1 = 7; break;
+			    case 'INDI': $t1 = 1; break;
+			    case 'FAM':  $t1 = 2; break;
+			    case 'SOUR': $t1 = 3; break;
+			    case 'REPO': $t1 = 4; break;
+			    case 'OBJE': $t1 = 5; break;
+			    case 'NOTE': $t1 = 6; break;
+			    default:     $t1 = 7; break;
 			}
 			switch ($b::RECORD_TYPE) {
-			case 'INDI': $t2 = 1; break;
-			case 'FAM':  $t2 = 2; break;
-			case 'SOUR': $t2 = 3; break;
-			case 'REPO': $t2 = 4; break;
-			case 'OBJE': $t2 = 5; break;
-			case 'NOTE': $t2 = 6; break;
-			default:     $t2 = 7; break;
+			    case 'INDI': $t2 = 1; break;
+			    case 'FAM':  $t2 = 2; break;
+			    case 'SOUR': $t2 = 3; break;
+			    case 'REPO': $t2 = 4; break;
+			    case 'OBJE': $t2 = 5; break;
+			    case 'NOTE': $t2 = 6; break;
+			    default:     $t2 = 7; break;
 			}
 			if ($t1 != $t2) {
 				return $t1 - $t2;

Braces +20 added lines, -10 removed lines

@@ -30,7 +30,8 @@ 
 /**
  * The clippings cart.
  */
-class ClippingsCartController {
+class ClippingsCartController
+{
 	/** @var string Data to be downloaded. */
 	private $download_data;
 
@@ -70,7 +71,8 @@ 
 	/**
 	 * Create the clippings controller
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 		global $WT_TREE;
 
 		// Our cart is an array of items in the session
@@ -292,7 +294,8 @@ 
 	/**
 	 * Loads everything in the clippings cart into a zip file.
 	 */
-	private function zipCart() {
+	private function zipCart()
+	{
 		$tempFileName = 'clipping' . rand() . '.ged';
 		$fp           = fopen(WT_DATA_DIR . $tempFileName, "wb");
 		if ($fp) {
@@ -325,7 +328,8 @@ 
 	 * Brings up the download dialog box and allows the user to download the file
 	 * based on the options he or she selected.
 	 */
-	public function downloadClipping() {
+	public function downloadClipping()
+	{
 		if ($this->IncludeMedia === 'yes' || $this->Zip === 'yes') {
 			header('Content-Type: application/zip');
 			header('Content-Disposition: attachment; filename="clipping.zip"');
@@ -345,7 +349,8 @@ 
 	 *
 	 * @param GedcomRecord $record
 	 */
-	public function addClipping(GedcomRecord $record) {
+	public function addClipping(GedcomRecord $record)
+	{
 		if ($record->canShowName()) {
 			$this->cart[$record->getTree()->getTreeId()][$record->getXref()] = true;
 			// Add directly linked records
@@ -362,7 +367,8 @@ 
 	 * @param Family|null $family
 	 * @param int         $level
 	 */
-	public function addFamilyDescendancy(Family $family = null, $level = PHP_INT_MAX) {
+	public function addFamilyDescendancy(Family $family = null, $level = PHP_INT_MAX)
+	{
 		if (!$family) {
 			return;
 		}
@@ -385,7 +391,8 @@ 
 	 *
 	 * @param Family|null $family
 	 */
-	public function addFamilyMembers(Family $family = null) {
+	public function addFamilyMembers(Family $family = null)
+	{
 		if (!$family) {
 			return;
 		}
@@ -404,7 +411,8 @@ 
 	 * @param Individual|null $person
 	 * @param int             $level
 	 */
-	public function addAncestorsToCart(Individual $person = null, $level = 0) {
+	public function addAncestorsToCart(Individual $person = null, $level = 0)
+	{
 		if (!$person) {
 			return;
 		}
@@ -424,7 +432,8 @@ 
 	 * @param Individual|null $person
 	 * @param int             $level
 	 */
-	public function addAncestorsToCartFamilies(Individual $person = null, $level = 0) {
+	public function addAncestorsToCartFamilies(Individual $person = null, $level = 0)
+	{
 		if (!$person) {
 			return;
 		}
@@ -445,7 +454,8 @@ 
 	 *
 	 * @return int
 	 */
-	private static function compareClippings($a, $b) {
+	private static function compareClippings($a, $b)
+	{
 		global $WT_TREE;
 
 		$a = GedcomRecord::getInstance($a, $WT_TREE);

app/Module/LoggedInUsersModule.php

Indentation +90 added lines, -90 removed lines

@@ -27,104 +27,104 @@
  * Class LoggedInUsersModule
  */
 class LoggedInUsersModule extends AbstractModule implements ModuleBlockInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module. (A list of users who are online now) */ I18N::translate('Who is online');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module. (A list of users who are online now) */ I18N::translate('Who is online');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Who is online” module */ I18N::translate('A list of users and visitors who are currently online.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Who is online” module */ I18N::translate('A list of users and visitors who are currently online.');
+    }
 
-	/**
-	 * Generate the HTML content of this block.
-	 *
-	 * @param int      $block_id
-	 * @param bool     $template
-	 * @param string[] $cfg
-	 *
-	 * @return string
-	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
-		global $WT_TREE;
+    /**
+     * Generate the HTML content of this block.
+     *
+     * @param int      $block_id
+     * @param bool     $template
+     * @param string[] $cfg
+     *
+     * @return string
+     */
+    public function getBlock($block_id, $template = true, $cfg = array()) {
+        global $WT_TREE;
 
-		$id        = $this->getName() . $block_id;
-		$class     = $this->getName() . '_block';
-		$title     = $this->getTitle();
-		$anonymous = 0;
-		$logged_in = array();
-		$content   = '';
-		foreach (User::allLoggedIn() as $user) {
-			if (Auth::isAdmin() || $user->getPreference('visibleonline')) {
-				$logged_in[] = $user;
-			} else {
-				$anonymous++;
-			}
-		}
-		$count_logged_in = count($logged_in);
-		$content .= '<div class="logged_in_count">';
-		if ($anonymous) {
-			$content .= I18N::plural('%s anonymous signed-in user', '%s anonymous signed-in users', $anonymous, I18N::number($anonymous));
-			if ($count_logged_in) {
-				$content .= '&nbsp;|&nbsp;';
-			}
-		}
-		if ($count_logged_in) {
-			$content .= I18N::plural('%s signed-in user', '%s signed-in users', $count_logged_in, I18N::number($count_logged_in));
-		}
-		$content .= '</div>';
-		$content .= '<div class="logged_in_list">';
-		if (Auth::check()) {
-			foreach ($logged_in as $user) {
-				$individual = Individual::getInstance($WT_TREE->getUserPreference($user, 'gedcomid'), $WT_TREE);
+        $id        = $this->getName() . $block_id;
+        $class     = $this->getName() . '_block';
+        $title     = $this->getTitle();
+        $anonymous = 0;
+        $logged_in = array();
+        $content   = '';
+        foreach (User::allLoggedIn() as $user) {
+            if (Auth::isAdmin() || $user->getPreference('visibleonline')) {
+                $logged_in[] = $user;
+            } else {
+                $anonymous++;
+            }
+        }
+        $count_logged_in = count($logged_in);
+        $content .= '<div class="logged_in_count">';
+        if ($anonymous) {
+            $content .= I18N::plural('%s anonymous signed-in user', '%s anonymous signed-in users', $anonymous, I18N::number($anonymous));
+            if ($count_logged_in) {
+                $content .= '&nbsp;|&nbsp;';
+            }
+        }
+        if ($count_logged_in) {
+            $content .= I18N::plural('%s signed-in user', '%s signed-in users', $count_logged_in, I18N::number($count_logged_in));
+        }
+        $content .= '</div>';
+        $content .= '<div class="logged_in_list">';
+        if (Auth::check()) {
+            foreach ($logged_in as $user) {
+                $individual = Individual::getInstance($WT_TREE->getUserPreference($user, 'gedcomid'), $WT_TREE);
 
-				$content .= '<div class="logged_in_name">';
-				if ($individual) {
-					$content .= '<a href="' . $individual->getHtmlUrl() . '">' . $user->getRealNameHtml() . '</a>';
-				} else {
-					$content .= $user->getRealNameHtml();
-				}
-				$content .= ' - ' . Filter::escapeHtml($user->getUserName());
-				if (Auth::id() != $user->getUserId() && $user->getPreference('contactmethod') != 'none') {
-					$content .= ' <a class="icon-email" href="#" onclick="return message(\'' . Filter::escapeHtml($user->getUserName()) . '\', \'\', \'' . Filter::escapeHtml(Functions::getQueryUrl()) . '\');" title="' . I18N::translate('Send a message') . '"></a>';
-				}
-				$content .= '</div>';
-			}
-		}
-		$content .= '</div>';
+                $content .= '<div class="logged_in_name">';
+                if ($individual) {
+                    $content .= '<a href="' . $individual->getHtmlUrl() . '">' . $user->getRealNameHtml() . '</a>';
+                } else {
+                    $content .= $user->getRealNameHtml();
+                }
+                $content .= ' - ' . Filter::escapeHtml($user->getUserName());
+                if (Auth::id() != $user->getUserId() && $user->getPreference('contactmethod') != 'none') {
+                    $content .= ' <a class="icon-email" href="#" onclick="return message(\'' . Filter::escapeHtml($user->getUserName()) . '\', \'\', \'' . Filter::escapeHtml(Functions::getQueryUrl()) . '\');" title="' . I18N::translate('Send a message') . '"></a>';
+                }
+                $content .= '</div>';
+            }
+        }
+        $content .= '</div>';
 
-		if ($anonymous === 0 && $count_logged_in === 0) {
-			return '';
-		}
+        if ($anonymous === 0 && $count_logged_in === 0) {
+            return '';
+        }
 
-		if ($template) {
-			return Theme::theme()->formatBlock($id, $title, $class, $content);
-		} else {
-			return $content;
-		}
-	}
+        if ($template) {
+            return Theme::theme()->formatBlock($id, $title, $class, $content);
+        } else {
+            return $content;
+        }
+    }
 
-	/** {@inheritdoc} */
-	public function loadAjax() {
-		return false;
-	}
+    /** {@inheritdoc} */
+    public function loadAjax() {
+        return false;
+    }
 
-	/** {@inheritdoc} */
-	public function isUserBlock() {
-		return true;
-	}
+    /** {@inheritdoc} */
+    public function isUserBlock() {
+        return true;
+    }
 
-	/** {@inheritdoc} */
-	public function isGedcomBlock() {
-		return true;
-	}
+    /** {@inheritdoc} */
+    public function isGedcomBlock() {
+        return true;
+    }
 
-	/**
-	 * An HTML form to edit block settings
-	 *
-	 * @param int $block_id
-	 */
-	public function configureBlock($block_id) {
-	}
+    /**
+     * An HTML form to edit block settings
+     *
+     * @param int $block_id
+     */
+    public function configureBlock($block_id) {
+    }
 }

Braces +16 added lines, -8 removed lines

@@ -26,14 +26,17 @@ 
 /**
  * Class LoggedInUsersModule
  */
-class LoggedInUsersModule extends AbstractModule implements ModuleBlockInterface {
+class LoggedInUsersModule extends AbstractModule implements ModuleBlockInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module. (A list of users who are online now) */ I18N::translate('Who is online');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Who is online” module */ I18N::translate('A list of users and visitors who are currently online.');
 	}
 
@@ -46,7 +49,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
+	public function getBlock($block_id, $template = true, $cfg = array())
+	{
 		global $WT_TREE;
 
 		$id        = $this->getName() . $block_id;
@@ -106,17 +110,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function loadAjax() {
+	public function loadAjax()
+	{
 		return false;
 	}
 
 	/** {@inheritdoc} */
-	public function isUserBlock() {
+	public function isUserBlock()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isGedcomBlock() {
+	public function isGedcomBlock()
+	{
 		return true;
 	}
 
@@ -125,6 +132,7 @@ 
 	 *
 	 * @param int $block_id
 	 */
-	public function configureBlock($block_id) {
+	public function configureBlock($block_id)
+	{
 	}
 }

app/Module/ModuleReportInterface.php

Indentation +6 added lines, -6 removed lines

@@ -21,10 +21,10 @@
  * Interface ModuleReportInterface - Classes and libraries for module system
  */
 interface ModuleReportInterface {
-	/**
-	 * Return a menu item for this report.
-	 *
-	 * @return Menu
-	 */
-	public function getReportMenu();
+    /**
+     * Return a menu item for this report.
+     *
+     * @return Menu
+     */
+    public function getReportMenu();
 }

Braces +2 added lines, -1 removed lines

@@ -20,7 +20,8 @@
 /**
  * Interface ModuleReportInterface - Classes and libraries for module system
  */
-interface ModuleReportInterface {
+interface ModuleReportInterface
+{
 	/**
 	 * Return a menu item for this report.
 	 *

app/Module/CemeteryReportModule.php

Indentation +34 added lines, -34 removed lines

@@ -23,42 +23,42 @@
  * Class CemeteryReportModule
  */
 class CemeteryReportModule extends AbstractModule implements ModuleReportInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		// This text also appears in the .XML file - update both together
-		return /* I18N: Name of a module/report */ I18N::translate('Cemeteries');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        // This text also appears in the .XML file - update both together
+        return /* I18N: Name of a module/report */ I18N::translate('Cemeteries');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		// This text also appears in the .XML file - update both together
-		return /* I18N: Description of the “Cemeteries” module */ I18N::translate('A report of individuals who were buried in a given place.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        // This text also appears in the .XML file - update both together
+        return /* I18N: Description of the “Cemeteries” module */ I18N::translate('A report of individuals who were buried in a given place.');
+    }
 
-	/**
-	 * 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 report.
-	 *
-	 * @return Menu
-	 */
-	public function getReportMenu() {
-		global $WT_TREE;
+    /**
+     * Return a menu item for this report.
+     *
+     * @return Menu
+     */
+    public function getReportMenu() {
+        global $WT_TREE;
 
-		return new Menu(
-			$this->getTitle(),
-			'reportengine.php?ged=' . $WT_TREE->getNameUrl() . '&action=setup&report=' . WT_MODULES_DIR . $this->getName() . '/report.xml',
-			'menu-report-' . $this->getName(),
-			array('rel' => 'nofollow')
-		);
-	}
+        return new Menu(
+            $this->getTitle(),
+            'reportengine.php?ged=' . $WT_TREE->getNameUrl() . '&action=setup&report=' . WT_MODULES_DIR . $this->getName() . '/report.xml',
+            'menu-report-' . $this->getName(),
+            array('rel' => 'nofollow')
+        );
+    }
 }

Braces +10 added lines, -5 removed lines

@@ -22,15 +22,18 @@ 
 /**
  * Class CemeteryReportModule
  */
-class CemeteryReportModule extends AbstractModule implements ModuleReportInterface {
+class CemeteryReportModule extends AbstractModule implements ModuleReportInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Name of a module/report */ I18N::translate('Cemeteries');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Description of the “Cemeteries” module */ I18N::translate('A report of individuals who were buried in a given place.');
 	}
@@ -42,7 +45,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_PRIVATE;
 	}
 
@@ -51,7 +55,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	public function getReportMenu() {
+	public function getReportMenu()
+	{
 		global $WT_TREE;
 
 		return new Menu(

app/Module/FamilyTreeStatisticsModule.php

Indentation +240 added lines, -240 removed lines

@@ -29,267 +29,267 @@ 
  * Class FamilyTreeStatisticsModule
  */
 class FamilyTreeStatisticsModule extends AbstractModule implements ModuleBlockInterface {
-	/** Show this number of surnames by default */
-	const DEFAULT_NUMBER_OF_SURNAMES = 10;
+    /** Show this number of surnames by default */
+    const DEFAULT_NUMBER_OF_SURNAMES = 10;
 
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Statistics');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Statistics');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of “Statistics” module */ I18N::translate('The size of the family tree, earliest and latest events, common names, etc.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of “Statistics” module */ I18N::translate('The size of the family tree, earliest and latest events, common names, etc.');
+    }
 
-	/**
-	 * Generate the HTML content of this block.
-	 *
-	 * @param int      $block_id
-	 * @param bool     $template
-	 * @param string[] $cfg
-	 *
-	 * @return string
-	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
-		global $WT_TREE, $ctype;
+    /**
+     * Generate the HTML content of this block.
+     *
+     * @param int      $block_id
+     * @param bool     $template
+     * @param string[] $cfg
+     *
+     * @return string
+     */
+    public function getBlock($block_id, $template = true, $cfg = array()) {
+        global $WT_TREE, $ctype;
 
-		$show_last_update     = $this->getBlockSetting($block_id, 'show_last_update', '1');
-		$show_common_surnames = $this->getBlockSetting($block_id, 'show_common_surnames', '1');
-		$number_of_surnames   = $this->getBlockSetting($block_id, 'number_of_surnames', self::DEFAULT_NUMBER_OF_SURNAMES);
-		$stat_indi            = $this->getBlockSetting($block_id, 'stat_indi', '1');
-		$stat_fam             = $this->getBlockSetting($block_id, 'stat_fam', '1');
-		$stat_sour            = $this->getBlockSetting($block_id, 'stat_sour', '1');
-		$stat_media           = $this->getBlockSetting($block_id, 'stat_media', '1');
-		$stat_repo            = $this->getBlockSetting($block_id, 'stat_repo', '1');
-		$stat_surname         = $this->getBlockSetting($block_id, 'stat_surname', '1');
-		$stat_events          = $this->getBlockSetting($block_id, 'stat_events', '1');
-		$stat_users           = $this->getBlockSetting($block_id, 'stat_users', '1');
-		$stat_first_birth     = $this->getBlockSetting($block_id, 'stat_first_birth', '1');
-		$stat_last_birth      = $this->getBlockSetting($block_id, 'stat_last_birth', '1');
-		$stat_first_death     = $this->getBlockSetting($block_id, 'stat_first_death', '1');
-		$stat_last_death      = $this->getBlockSetting($block_id, 'stat_last_death', '1');
-		$stat_long_life       = $this->getBlockSetting($block_id, 'stat_long_life', '1');
-		$stat_avg_life        = $this->getBlockSetting($block_id, 'stat_avg_life', '1');
-		$stat_most_chil       = $this->getBlockSetting($block_id, 'stat_most_chil', '1');
-		$stat_avg_chil        = $this->getBlockSetting($block_id, 'stat_avg_chil', '1');
+        $show_last_update     = $this->getBlockSetting($block_id, 'show_last_update', '1');
+        $show_common_surnames = $this->getBlockSetting($block_id, 'show_common_surnames', '1');
+        $number_of_surnames   = $this->getBlockSetting($block_id, 'number_of_surnames', self::DEFAULT_NUMBER_OF_SURNAMES);
+        $stat_indi            = $this->getBlockSetting($block_id, 'stat_indi', '1');
+        $stat_fam             = $this->getBlockSetting($block_id, 'stat_fam', '1');
+        $stat_sour            = $this->getBlockSetting($block_id, 'stat_sour', '1');
+        $stat_media           = $this->getBlockSetting($block_id, 'stat_media', '1');
+        $stat_repo            = $this->getBlockSetting($block_id, 'stat_repo', '1');
+        $stat_surname         = $this->getBlockSetting($block_id, 'stat_surname', '1');
+        $stat_events          = $this->getBlockSetting($block_id, 'stat_events', '1');
+        $stat_users           = $this->getBlockSetting($block_id, 'stat_users', '1');
+        $stat_first_birth     = $this->getBlockSetting($block_id, 'stat_first_birth', '1');
+        $stat_last_birth      = $this->getBlockSetting($block_id, 'stat_last_birth', '1');
+        $stat_first_death     = $this->getBlockSetting($block_id, 'stat_first_death', '1');
+        $stat_last_death      = $this->getBlockSetting($block_id, 'stat_last_death', '1');
+        $stat_long_life       = $this->getBlockSetting($block_id, 'stat_long_life', '1');
+        $stat_avg_life        = $this->getBlockSetting($block_id, 'stat_avg_life', '1');
+        $stat_most_chil       = $this->getBlockSetting($block_id, 'stat_most_chil', '1');
+        $stat_avg_chil        = $this->getBlockSetting($block_id, 'stat_avg_chil', '1');
 
-		// This can be overriden when embedding in an HTML block
-		$block = '0';
+        // This can be overriden when embedding in an HTML block
+        $block = '0';
 
-		foreach (array('show_common_surnames', 'number_common_surnames', 'stat_indi', 'stat_fam', 'stat_sour', 'stat_media', 'stat_surname', 'stat_events', 'stat_users', 'stat_first_birth', 'stat_last_birth', 'stat_first_death', 'stat_last_death', 'stat_long_life', 'stat_avg_life', 'stat_most_chil', 'stat_avg_chil', 'block') as $name) {
-			if (array_key_exists($name, $cfg)) {
-				$$name = $cfg[$name];
-			}
-		}
+        foreach (array('show_common_surnames', 'number_common_surnames', 'stat_indi', 'stat_fam', 'stat_sour', 'stat_media', 'stat_surname', 'stat_events', 'stat_users', 'stat_first_birth', 'stat_last_birth', 'stat_first_death', 'stat_last_death', 'stat_long_life', 'stat_avg_life', 'stat_most_chil', 'stat_avg_chil', 'block') as $name) {
+            if (array_key_exists($name, $cfg)) {
+                $$name = $cfg[$name];
+            }
+        }
 
-		$id    = $this->getName() . $block_id;
-		$class = $this->getName() . '_block';
-		if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
-			$title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
-		} else {
-			$title = '';
-		}
-		$title .= $this->getTitle() . ' — ' . $WT_TREE->getTitleHtml();
+        $id    = $this->getName() . $block_id;
+        $class = $this->getName() . '_block';
+        if ($ctype === 'gedcom' && Auth::isManager($WT_TREE) || $ctype === 'user' && Auth::check()) {
+            $title = '<a class="icon-admin" title="' . I18N::translate('Preferences') . '" href="block_edit.php?block_id=' . $block_id . '&amp;ged=' . $WT_TREE->getNameHtml() . '&amp;ctype=' . $ctype . '"></a>';
+        } else {
+            $title = '';
+        }
+        $title .= $this->getTitle() . ' — ' . $WT_TREE->getTitleHtml();
 
-		$stats = new Stats($WT_TREE);
+        $stats = new Stats($WT_TREE);
 
-		$content = '';
+        $content = '';
 
-		if ($show_last_update) {
-			$content .= '<p>' . /* I18N: %s is a date */
-				I18N::translate('This family tree was last updated on %s.', strip_tags($stats->gedcomUpdated())) . '</p>';
-		}
+        if ($show_last_update) {
+            $content .= '<p>' . /* I18N: %s is a date */
+                I18N::translate('This family tree was last updated on %s.', strip_tags($stats->gedcomUpdated())) . '</p>';
+        }
 
-		/** Responsive Design */
-		$content .= '<div class="stat-table1">';
-		if ($stat_indi) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Individuals') . '</div><div class="facts_value stats_value stat-cell"><a href="' . "indilist.php?surname_sublist=no&amp;ged=" . $WT_TREE->getNameUrl() . '">' . $stats->totalIndividuals() . '</a></div></div>';
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Males') . '</div><div class="facts_value stats_value stat-cell">' . $stats->totalSexMales() . '<br>' . $stats->totalSexMalesPercentage() . '</div></div>';
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Females') . '</div><div class="facts_value stats_value stat-cell">' . $stats->totalSexFemales() . '<br>' . $stats->totalSexFemalesPercentage() . '</div></div>';
-		}
-		if ($stat_surname) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Total surnames') . '</div><div class="facts_value stats_value stat-cell"><a href="indilist.php?show_all=yes&amp;surname_sublist=yes&amp;ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalSurnames() . '</a></div></div>';
-		}
-		if ($stat_fam) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Families') . '</div><div class="facts_value stats_value stat-cell"><a href="famlist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalFamilies() . '</a></div></div>';
-		}
-		if ($stat_sour) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Sources') . '</div><div class="facts_value stats_value stat-cell"><a href="sourcelist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalSources() . '</a></div></div>';
-		}
-		if ($stat_media) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Media objects') . '</div><div class="facts_value stats_value stat-cell"><a href="medialist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalMedia() . '</a></div></div>';
-		}
-		if ($stat_repo) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Repositories') . '</div><div class="facts_value stats_value stat-cell"><a href="repolist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalRepositories() . '</a></div></div>';
-		}
-		if ($stat_events) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Total events') . '</div><div class="facts_value stats_value stat-cell">' . $stats->totalEvents() . '</div></div>';
-		}
-		if ($stat_users) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Total users') . '</div><div class="facts_value stats_value stat-cell">';
-			if (Auth::isManager($WT_TREE)) {
-				$content .= '<a href="admin_users.php">' . $stats->totalUsers() . '</a>';
-			} else {
-				$content .= $stats->totalUsers();
-			}
-			$content .= '</div></div>';
-		}
-		if (!$block) {
-			$content .= '</div><div class="facts_table stat-table2">';
-		}
-		if ($stat_first_birth) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Earliest birth year') . '</div><div class="facts_value stats_value stat-cell">' . $stats->firstBirthYear() . '</div>';
-			if (!$block) {
-				$content .= '<div class="facts_value stat-cell left">' . $stats->firstBirth() . '</div>';
-			}
-			$content .= '</div>';
-		}
-		if ($stat_last_birth) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Latest birth year') . '</div><div class="facts_value stats_value stat-cell">' . $stats->lastBirthYear() . '</div>';
-			if (!$block) {
-				$content .= '<div class="facts_value stat-cell left">' . $stats->lastBirth() . '</div>';
-			}
-			$content .= '</div>';
-		}
-		if ($stat_first_death) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Earliest death year') . '</div><div class="facts_value stats_value stat-cell">' . $stats->firstDeathYear() . '</div>';
-			if (!$block) {
-				$content .= '<div class="facts_value stat-cell left">' . $stats->firstDeath() . '</div>';
-			}
-			$content .= '</div>';
-		}
-		if ($stat_last_death) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Latest death year') . '</div><div class="facts_value stats_value stat-cell">' . $stats->lastDeathYear() . '</div>';
-			if (!$block) {
-				$content .= '<div class="facts_value stat-cell left">' . $stats->lastDeath() . '</div>';
-			}
-			$content .= '</div>';
-		}
-		if ($stat_long_life) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Individual who lived the longest') . '</div><div class="facts_value stats_value stat-cell">' . $stats->longestLifeAge() . '</div>';
-			if (!$block) {
-				$content .= '<div class="facts_value stat-cell left">' . $stats->longestLife() . '</div>';
-			}
-			$content .= '</div>';
-		}
-		if ($stat_avg_life) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Average age at death') . '</div><div class="facts_value stats_value stat-cell">' . $stats->averageLifespan() . '</div>';
-			if (!$block) {
-				$content .= '<div class="facts_value stat-cell left">' . I18N::translate('Males') . ':&nbsp;' . $stats->averageLifespanMale();
-				$content .= '&nbsp;&nbsp;&nbsp;' . I18N::translate('Females') . ':&nbsp;' . $stats->averageLifespanFemale() . '</div>';
-			}
-			$content .= '</div>';
-		}
+        /** Responsive Design */
+        $content .= '<div class="stat-table1">';
+        if ($stat_indi) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Individuals') . '</div><div class="facts_value stats_value stat-cell"><a href="' . "indilist.php?surname_sublist=no&amp;ged=" . $WT_TREE->getNameUrl() . '">' . $stats->totalIndividuals() . '</a></div></div>';
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Males') . '</div><div class="facts_value stats_value stat-cell">' . $stats->totalSexMales() . '<br>' . $stats->totalSexMalesPercentage() . '</div></div>';
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Females') . '</div><div class="facts_value stats_value stat-cell">' . $stats->totalSexFemales() . '<br>' . $stats->totalSexFemalesPercentage() . '</div></div>';
+        }
+        if ($stat_surname) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Total surnames') . '</div><div class="facts_value stats_value stat-cell"><a href="indilist.php?show_all=yes&amp;surname_sublist=yes&amp;ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalSurnames() . '</a></div></div>';
+        }
+        if ($stat_fam) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Families') . '</div><div class="facts_value stats_value stat-cell"><a href="famlist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalFamilies() . '</a></div></div>';
+        }
+        if ($stat_sour) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Sources') . '</div><div class="facts_value stats_value stat-cell"><a href="sourcelist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalSources() . '</a></div></div>';
+        }
+        if ($stat_media) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Media objects') . '</div><div class="facts_value stats_value stat-cell"><a href="medialist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalMedia() . '</a></div></div>';
+        }
+        if ($stat_repo) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Repositories') . '</div><div class="facts_value stats_value stat-cell"><a href="repolist.php?ged=' . $WT_TREE->getNameUrl() . '">' . $stats->totalRepositories() . '</a></div></div>';
+        }
+        if ($stat_events) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Total events') . '</div><div class="facts_value stats_value stat-cell">' . $stats->totalEvents() . '</div></div>';
+        }
+        if ($stat_users) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Total users') . '</div><div class="facts_value stats_value stat-cell">';
+            if (Auth::isManager($WT_TREE)) {
+                $content .= '<a href="admin_users.php">' . $stats->totalUsers() . '</a>';
+            } else {
+                $content .= $stats->totalUsers();
+            }
+            $content .= '</div></div>';
+        }
+        if (!$block) {
+            $content .= '</div><div class="facts_table stat-table2">';
+        }
+        if ($stat_first_birth) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Earliest birth year') . '</div><div class="facts_value stats_value stat-cell">' . $stats->firstBirthYear() . '</div>';
+            if (!$block) {
+                $content .= '<div class="facts_value stat-cell left">' . $stats->firstBirth() . '</div>';
+            }
+            $content .= '</div>';
+        }
+        if ($stat_last_birth) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Latest birth year') . '</div><div class="facts_value stats_value stat-cell">' . $stats->lastBirthYear() . '</div>';
+            if (!$block) {
+                $content .= '<div class="facts_value stat-cell left">' . $stats->lastBirth() . '</div>';
+            }
+            $content .= '</div>';
+        }
+        if ($stat_first_death) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Earliest death year') . '</div><div class="facts_value stats_value stat-cell">' . $stats->firstDeathYear() . '</div>';
+            if (!$block) {
+                $content .= '<div class="facts_value stat-cell left">' . $stats->firstDeath() . '</div>';
+            }
+            $content .= '</div>';
+        }
+        if ($stat_last_death) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Latest death year') . '</div><div class="facts_value stats_value stat-cell">' . $stats->lastDeathYear() . '</div>';
+            if (!$block) {
+                $content .= '<div class="facts_value stat-cell left">' . $stats->lastDeath() . '</div>';
+            }
+            $content .= '</div>';
+        }
+        if ($stat_long_life) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Individual who lived the longest') . '</div><div class="facts_value stats_value stat-cell">' . $stats->longestLifeAge() . '</div>';
+            if (!$block) {
+                $content .= '<div class="facts_value stat-cell left">' . $stats->longestLife() . '</div>';
+            }
+            $content .= '</div>';
+        }
+        if ($stat_avg_life) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Average age at death') . '</div><div class="facts_value stats_value stat-cell">' . $stats->averageLifespan() . '</div>';
+            if (!$block) {
+                $content .= '<div class="facts_value stat-cell left">' . I18N::translate('Males') . ':&nbsp;' . $stats->averageLifespanMale();
+                $content .= '&nbsp;&nbsp;&nbsp;' . I18N::translate('Females') . ':&nbsp;' . $stats->averageLifespanFemale() . '</div>';
+            }
+            $content .= '</div>';
+        }
 
-		if ($stat_most_chil && !$block) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Family with the most children') . '</div><div class="facts_value stats_value stat-cell">' . $stats->largestFamilySize() . '</div>';
-			if (!$block) {
-				$content .= '<div class="facts_value stat-cell left">' . $stats->largestFamily() . '</div>';
-			}
-			$content .= '</div>';
-		}
-		if ($stat_avg_chil) {
-			$content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Average number of children per family') . '</div><div class="facts_value stats_value stat-cell">' . $stats->averageChildren() . '</div>';
-			if (!$block) {
-				$content .= '<div class="facts_value stat-cell left"></div>';
-			}
-			$content .= '</div>';
-		}
-		$content .= '</div>';
+        if ($stat_most_chil && !$block) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Family with the most children') . '</div><div class="facts_value stats_value stat-cell">' . $stats->largestFamilySize() . '</div>';
+            if (!$block) {
+                $content .= '<div class="facts_value stat-cell left">' . $stats->largestFamily() . '</div>';
+            }
+            $content .= '</div>';
+        }
+        if ($stat_avg_chil) {
+            $content .= '<div class="stat-row"><div class="facts_label stat-cell">' . I18N::translate('Average number of children per family') . '</div><div class="facts_value stats_value stat-cell">' . $stats->averageChildren() . '</div>';
+            if (!$block) {
+                $content .= '<div class="facts_value stat-cell left"></div>';
+            }
+            $content .= '</div>';
+        }
+        $content .= '</div>';
 
-		if ($show_common_surnames) {
-			$surnames = FunctionsDb::getTopSurnames($WT_TREE->getTreeId(), 0, (int) $number_of_surnames);
+        if ($show_common_surnames) {
+            $surnames = FunctionsDb::getTopSurnames($WT_TREE->getTreeId(), 0, (int) $number_of_surnames);
 
-			$all_surnames = array();
-			foreach (array_keys($surnames) as $surname) {
-				$all_surnames = array_merge($all_surnames, QueryName::surnames($WT_TREE, $surname, '', false, false));
-			}
+            $all_surnames = array();
+            foreach (array_keys($surnames) as $surname) {
+                $all_surnames = array_merge($all_surnames, QueryName::surnames($WT_TREE, $surname, '', false, false));
+            }
 
-			if (!empty($surnames)) {
-				ksort($all_surnames);
-				$content .= '<div class="clearfloat">';
-				$content .= '<p>';
-				$content .= '<strong>' . I18N::translate('Most common surnames') . '</strong>';
-				$content .= '<br>';
-				$content .= '<span class="common_surnames">' . FunctionsPrintLists::surnameList($all_surnames, 2, false, 'indilist.php', $WT_TREE) . '</span>';
-				$content .= '</p>';
-				$content .= '</div>';
-			}
-		}
+            if (!empty($surnames)) {
+                ksort($all_surnames);
+                $content .= '<div class="clearfloat">';
+                $content .= '<p>';
+                $content .= '<strong>' . I18N::translate('Most common surnames') . '</strong>';
+                $content .= '<br>';
+                $content .= '<span class="common_surnames">' . FunctionsPrintLists::surnameList($all_surnames, 2, false, 'indilist.php', $WT_TREE) . '</span>';
+                $content .= '</p>';
+                $content .= '</div>';
+            }
+        }
 
-		if ($template) {
-			return Theme::theme()->formatBlock($id, $title, $class, $content);
-		} else {
-			return $content;
-		}
-	}
+        if ($template) {
+            return Theme::theme()->formatBlock($id, $title, $class, $content);
+        } else {
+            return $content;
+        }
+    }
 
-	/** {@inheritdoc} */
-	public function loadAjax() {
-		return true;
-	}
+    /** {@inheritdoc} */
+    public function loadAjax() {
+        return true;
+    }
 
-	/** {@inheritdoc} */
-	public function isUserBlock() {
-		return true;
-	}
+    /** {@inheritdoc} */
+    public function isUserBlock() {
+        return true;
+    }
 
-	/** {@inheritdoc} */
-	public function isGedcomBlock() {
-		return true;
-	}
+    /** {@inheritdoc} */
+    public function isGedcomBlock() {
+        return true;
+    }
 
-	/**
-	 * An HTML form to edit block settings
-	 *
-	 * @param int $block_id
-	 */
-	public function configureBlock($block_id) {
-		if (Filter::postBool('save') && Filter::checkCsrf()) {
-			$this->setBlockSetting($block_id, 'show_last_update', Filter::postBool('show_last_update'));
-			$this->setBlockSetting($block_id, 'show_common_surnames', Filter::postBool('show_common_surnames'));
-			$this->setBlockSetting($block_id, 'number_of_surnames', Filter::postInteger('number_of_surnames'));
-			$this->setBlockSetting($block_id, 'stat_indi', Filter::postBool('stat_indi'));
-			$this->setBlockSetting($block_id, 'stat_fam', Filter::postBool('stat_fam'));
-			$this->setBlockSetting($block_id, 'stat_sour', Filter::postBool('stat_sour'));
-			$this->setBlockSetting($block_id, 'stat_other', Filter::postBool('stat_other'));
-			$this->setBlockSetting($block_id, 'stat_media', Filter::postBool('stat_media'));
-			$this->setBlockSetting($block_id, 'stat_repo', Filter::postBool('stat_repo'));
-			$this->setBlockSetting($block_id, 'stat_surname', Filter::postBool('stat_surname'));
-			$this->setBlockSetting($block_id, 'stat_events', Filter::postBool('stat_events'));
-			$this->setBlockSetting($block_id, 'stat_users', Filter::postBool('stat_users'));
-			$this->setBlockSetting($block_id, 'stat_first_birth', Filter::postBool('stat_first_birth'));
-			$this->setBlockSetting($block_id, 'stat_last_birth', Filter::postBool('stat_last_birth'));
-			$this->setBlockSetting($block_id, 'stat_first_death', Filter::postBool('stat_first_death'));
-			$this->setBlockSetting($block_id, 'stat_last_death', Filter::postBool('stat_last_death'));
-			$this->setBlockSetting($block_id, 'stat_long_life', Filter::postBool('stat_long_life'));
-			$this->setBlockSetting($block_id, 'stat_avg_life', Filter::postBool('stat_avg_life'));
-			$this->setBlockSetting($block_id, 'stat_most_chil', Filter::postBool('stat_most_chil'));
-			$this->setBlockSetting($block_id, 'stat_avg_chil', Filter::postBool('stat_avg_chil'));
-		}
+    /**
+     * An HTML form to edit block settings
+     *
+     * @param int $block_id
+     */
+    public function configureBlock($block_id) {
+        if (Filter::postBool('save') && Filter::checkCsrf()) {
+            $this->setBlockSetting($block_id, 'show_last_update', Filter::postBool('show_last_update'));
+            $this->setBlockSetting($block_id, 'show_common_surnames', Filter::postBool('show_common_surnames'));
+            $this->setBlockSetting($block_id, 'number_of_surnames', Filter::postInteger('number_of_surnames'));
+            $this->setBlockSetting($block_id, 'stat_indi', Filter::postBool('stat_indi'));
+            $this->setBlockSetting($block_id, 'stat_fam', Filter::postBool('stat_fam'));
+            $this->setBlockSetting($block_id, 'stat_sour', Filter::postBool('stat_sour'));
+            $this->setBlockSetting($block_id, 'stat_other', Filter::postBool('stat_other'));
+            $this->setBlockSetting($block_id, 'stat_media', Filter::postBool('stat_media'));
+            $this->setBlockSetting($block_id, 'stat_repo', Filter::postBool('stat_repo'));
+            $this->setBlockSetting($block_id, 'stat_surname', Filter::postBool('stat_surname'));
+            $this->setBlockSetting($block_id, 'stat_events', Filter::postBool('stat_events'));
+            $this->setBlockSetting($block_id, 'stat_users', Filter::postBool('stat_users'));
+            $this->setBlockSetting($block_id, 'stat_first_birth', Filter::postBool('stat_first_birth'));
+            $this->setBlockSetting($block_id, 'stat_last_birth', Filter::postBool('stat_last_birth'));
+            $this->setBlockSetting($block_id, 'stat_first_death', Filter::postBool('stat_first_death'));
+            $this->setBlockSetting($block_id, 'stat_last_death', Filter::postBool('stat_last_death'));
+            $this->setBlockSetting($block_id, 'stat_long_life', Filter::postBool('stat_long_life'));
+            $this->setBlockSetting($block_id, 'stat_avg_life', Filter::postBool('stat_avg_life'));
+            $this->setBlockSetting($block_id, 'stat_most_chil', Filter::postBool('stat_most_chil'));
+            $this->setBlockSetting($block_id, 'stat_avg_chil', Filter::postBool('stat_avg_chil'));
+        }
 
-		$show_last_update     = $this->getBlockSetting($block_id, 'show_last_update', '1');
-		$show_common_surnames = $this->getBlockSetting($block_id, 'show_common_surnames', '1');
-		$number_of_surnames   = $this->getBlockSetting($block_id, 'number_of_surnames', self::DEFAULT_NUMBER_OF_SURNAMES);
-		$stat_indi            = $this->getBlockSetting($block_id, 'stat_indi', '1');
-		$stat_fam             = $this->getBlockSetting($block_id, 'stat_fam', '1');
-		$stat_sour            = $this->getBlockSetting($block_id, 'stat_sour', '1');
-		$stat_media           = $this->getBlockSetting($block_id, 'stat_media', '1');
-		$stat_repo            = $this->getBlockSetting($block_id, 'stat_repo', '1');
-		$stat_surname         = $this->getBlockSetting($block_id, 'stat_surname', '1');
-		$stat_events          = $this->getBlockSetting($block_id, 'stat_events', '1');
-		$stat_users           = $this->getBlockSetting($block_id, 'stat_users', '1');
-		$stat_first_birth     = $this->getBlockSetting($block_id, 'stat_first_birth', '1');
-		$stat_last_birth      = $this->getBlockSetting($block_id, 'stat_last_birth', '1');
-		$stat_first_death     = $this->getBlockSetting($block_id, 'stat_first_death', '1');
-		$stat_last_death      = $this->getBlockSetting($block_id, 'stat_last_death', '1');
-		$stat_long_life       = $this->getBlockSetting($block_id, 'stat_long_life', '1');
-		$stat_avg_life        = $this->getBlockSetting($block_id, 'stat_avg_life', '1');
-		$stat_most_chil       = $this->getBlockSetting($block_id, 'stat_most_chil', '1');
-		$stat_avg_chil        = $this->getBlockSetting($block_id, 'stat_avg_chil', '1');
+        $show_last_update     = $this->getBlockSetting($block_id, 'show_last_update', '1');
+        $show_common_surnames = $this->getBlockSetting($block_id, 'show_common_surnames', '1');
+        $number_of_surnames   = $this->getBlockSetting($block_id, 'number_of_surnames', self::DEFAULT_NUMBER_OF_SURNAMES);
+        $stat_indi            = $this->getBlockSetting($block_id, 'stat_indi', '1');
+        $stat_fam             = $this->getBlockSetting($block_id, 'stat_fam', '1');
+        $stat_sour            = $this->getBlockSetting($block_id, 'stat_sour', '1');
+        $stat_media           = $this->getBlockSetting($block_id, 'stat_media', '1');
+        $stat_repo            = $this->getBlockSetting($block_id, 'stat_repo', '1');
+        $stat_surname         = $this->getBlockSetting($block_id, 'stat_surname', '1');
+        $stat_events          = $this->getBlockSetting($block_id, 'stat_events', '1');
+        $stat_users           = $this->getBlockSetting($block_id, 'stat_users', '1');
+        $stat_first_birth     = $this->getBlockSetting($block_id, 'stat_first_birth', '1');
+        $stat_last_birth      = $this->getBlockSetting($block_id, 'stat_last_birth', '1');
+        $stat_first_death     = $this->getBlockSetting($block_id, 'stat_first_death', '1');
+        $stat_last_death      = $this->getBlockSetting($block_id, 'stat_last_death', '1');
+        $stat_long_life       = $this->getBlockSetting($block_id, 'stat_long_life', '1');
+        $stat_avg_life        = $this->getBlockSetting($block_id, 'stat_avg_life', '1');
+        $stat_most_chil       = $this->getBlockSetting($block_id, 'stat_most_chil', '1');
+        $stat_avg_chil        = $this->getBlockSetting($block_id, 'stat_avg_chil', '1');
 
-		?>
+        ?>
 		<tr>
 			<td class="descriptionbox wrap width33">
 				<label for="show-last-update">
@@ -452,5 +452,5 @@ 
 			</td>
 		</tr>
 		<?php
-	}
+    }
 }

Braces +16 added lines, -8 removed lines

@@ -28,17 +28,20 @@ 
 /**
  * Class FamilyTreeStatisticsModule
  */
-class FamilyTreeStatisticsModule extends AbstractModule implements ModuleBlockInterface {
+class FamilyTreeStatisticsModule extends AbstractModule implements ModuleBlockInterface
+{
 	/** Show this number of surnames by default */
 	const DEFAULT_NUMBER_OF_SURNAMES = 10;
 
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Statistics');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of “Statistics” module */ I18N::translate('The size of the family tree, earliest and latest events, common names, etc.');
 	}
 
@@ -51,7 +54,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
+	public function getBlock($block_id, $template = true, $cfg = array())
+	{
 		global $WT_TREE, $ctype;
 
 		$show_last_update     = $this->getBlockSetting($block_id, 'show_last_update', '1');
@@ -226,17 +230,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function loadAjax() {
+	public function loadAjax()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isUserBlock() {
+	public function isUserBlock()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isGedcomBlock() {
+	public function isGedcomBlock()
+	{
 		return true;
 	}
 
@@ -245,7 +252,8 @@ 
 	 *
 	 * @param int $block_id
 	 */
-	public function configureBlock($block_id) {
+	public function configureBlock($block_id)
+	{
 		if (Filter::postBool('save') && Filter::checkCsrf()) {
 			$this->setBlockSetting($block_id, 'show_last_update', Filter::postBool('show_last_update'));
 			$this->setBlockSetting($block_id, 'show_common_surnames', Filter::postBool('show_common_surnames'));

app/Module/MediaTabModule.php

Indentation +81 added lines, -81 removed lines

@@ -27,57 +27,57 @@ 
  * Class MediaTabModule
  */
 class MediaTabModule extends AbstractModule implements ModuleTabInterface {
-	/** @var  Fact[] A list of facts with media objects. */
-	private $facts;
+    /** @var  Fact[] A list of facts with media objects. */
+    private $facts;
 
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Media');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Media');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Media” module */ I18N::translate('A tab showing the media objects linked to an individual.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Media” module */ I18N::translate('A tab showing the media objects linked to an individual.');
+    }
 
-	/** {@inheritdoc} */
-	public function defaultTabOrder() {
-		return 50;
-	}
+    /** {@inheritdoc} */
+    public function defaultTabOrder() {
+        return 50;
+    }
 
-	/** {@inheritdoc} */
-	public function hasTabContent() {
-		global $WT_TREE;
+    /** {@inheritdoc} */
+    public function hasTabContent() {
+        global $WT_TREE;
 
-		return Auth::isEditor($WT_TREE) || $this->getFactsWithMedia();
-	}
+        return Auth::isEditor($WT_TREE) || $this->getFactsWithMedia();
+    }
 
-	/** {@inheritdoc} */
-	public function isGrayedOut() {
-		return !$this->getFactsWithMedia();
-	}
+    /** {@inheritdoc} */
+    public function isGrayedOut() {
+        return !$this->getFactsWithMedia();
+    }
 
-	/** {@inheritdoc} */
-	public function getTabContent() {
-		global $WT_TREE, $controller;
+    /** {@inheritdoc} */
+    public function getTabContent() {
+        global $WT_TREE, $controller;
 
-		ob_start();
-		echo '<table class="facts_table">';
-		foreach ($this->getFactsWithMedia() as $fact) {
-			if ($fact->getTag() == 'OBJE') {
-				FunctionsPrintFacts::printMainMedia($fact, 1);
-			} else {
-				for ($i = 2; $i < 4; ++$i) {
-					FunctionsPrintFacts::printMainMedia($fact, $i);
-				}
-			}
-		}
-		if (!$this->getFactsWithMedia()) {
-			echo '<tr><td id="no_tab4" colspan="2" class="facts_value">', I18N::translate('There are no media objects for this individual.'), '</td></tr>';
-		}
-		// New media link
-		if ($controller->record->canEdit() && $WT_TREE->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($controller->record->getTree())) {
-			?>
+        ob_start();
+        echo '<table class="facts_table">';
+        foreach ($this->getFactsWithMedia() as $fact) {
+            if ($fact->getTag() == 'OBJE') {
+                FunctionsPrintFacts::printMainMedia($fact, 1);
+            } else {
+                for ($i = 2; $i < 4; ++$i) {
+                    FunctionsPrintFacts::printMainMedia($fact, $i);
+                }
+            }
+        }
+        if (!$this->getFactsWithMedia()) {
+            echo '<tr><td id="no_tab4" colspan="2" class="facts_value">', I18N::translate('There are no media objects for this individual.'), '</td></tr>';
+        }
+        // New media link
+        if ($controller->record->canEdit() && $WT_TREE->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($controller->record->getTree())) {
+            ?>
 			<tr>
 				<td class="facts_label">
 					<?php echo GedcomTag::getLabel('OBJE'); ?>
@@ -94,49 +94,49 @@ 
 				</td>
 			</tr>
 		<?php
-		}
-		?>
+        }
+        ?>
 		</table>
 		<?php
-		return '<div id="' . $this->getName() . '_content">' . ob_get_clean() . '</div>';
-	}
+        return '<div id="' . $this->getName() . '_content">' . ob_get_clean() . '</div>';
+    }
 
-	/**
-	 * Get all the facts for an individual which contain media objects.
-	 *
-	 * @return Fact[]
-	 */
-	private function getFactsWithMedia() {
-		global $controller;
+    /**
+     * Get all the facts for an individual which contain media objects.
+     *
+     * @return Fact[]
+     */
+    private function getFactsWithMedia() {
+        global $controller;
 
-		if ($this->facts === null) {
-			$facts = $controller->record->getFacts();
-			foreach ($controller->record->getSpouseFamilies() as $family) {
-				if ($family->canShow()) {
-					foreach ($family->getFacts() as $fact) {
-						$facts[] = $fact;
-					}
-				}
-			}
-			$this->facts = array();
-			foreach ($facts as $fact) {
-				if (preg_match('/(?:^1|\n\d) OBJE @' . WT_REGEX_XREF . '@/', $fact->getGedcom())) {
-					$this->facts[] = $fact;
-				}
-			}
-			Functions::sortFacts($this->facts);
-		}
+        if ($this->facts === null) {
+            $facts = $controller->record->getFacts();
+            foreach ($controller->record->getSpouseFamilies() as $family) {
+                if ($family->canShow()) {
+                    foreach ($family->getFacts() as $fact) {
+                        $facts[] = $fact;
+                    }
+                }
+            }
+            $this->facts = array();
+            foreach ($facts as $fact) {
+                if (preg_match('/(?:^1|\n\d) OBJE @' . WT_REGEX_XREF . '@/', $fact->getGedcom())) {
+                    $this->facts[] = $fact;
+                }
+            }
+            Functions::sortFacts($this->facts);
+        }
 
-		return $this->facts;
-	}
+        return $this->facts;
+    }
 
-	/** {@inheritdoc} */
-	public function canLoadAjax() {
-		return !Auth::isSearchEngine(); // Search engines cannot use AJAX
-	}
+    /** {@inheritdoc} */
+    public function canLoadAjax() {
+        return !Auth::isSearchEngine(); // Search engines cannot use AJAX
+    }
 
-	/** {@inheritdoc} */
-	public function getPreLoadContent() {
-		return '';
-	}
+    /** {@inheritdoc} */
+    public function getPreLoadContent() {
+        return '';
+    }
 }

Braces +20 added lines, -10 removed lines

@@ -26,39 +26,46 @@ 
 /**
  * Class MediaTabModule
  */
-class MediaTabModule extends AbstractModule implements ModuleTabInterface {
+class MediaTabModule extends AbstractModule implements ModuleTabInterface
+{
 	/** @var  Fact[] A list of facts with media objects. */
 	private $facts;
 
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Media');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Media” module */ I18N::translate('A tab showing the media objects linked to an individual.');
 	}
 
 	/** {@inheritdoc} */
-	public function defaultTabOrder() {
+	public function defaultTabOrder()
+	{
 		return 50;
 	}
 
 	/** {@inheritdoc} */
-	public function hasTabContent() {
+	public function hasTabContent()
+	{
 		global $WT_TREE;
 
 		return Auth::isEditor($WT_TREE) || $this->getFactsWithMedia();
 	}
 
 	/** {@inheritdoc} */
-	public function isGrayedOut() {
+	public function isGrayedOut()
+	{
 		return !$this->getFactsWithMedia();
 	}
 
 	/** {@inheritdoc} */
-	public function getTabContent() {
+	public function getTabContent()
+	{
 		global $WT_TREE, $controller;
 
 		ob_start();
@@ -106,7 +113,8 @@ 
 	 *
 	 * @return Fact[]
 	 */
-	private function getFactsWithMedia() {
+	private function getFactsWithMedia()
+	{
 		global $controller;
 
 		if ($this->facts === null) {
@@ -131,12 +139,14 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function canLoadAjax() {
+	public function canLoadAjax()
+	{
 		return !Auth::isSearchEngine(); // Search engines cannot use AJAX
 	}
 
 	/** {@inheritdoc} */
-	public function getPreLoadContent() {
+	public function getPreLoadContent()
+	{
 		return '';
 	}
 }

app/Module/ThemeSelectModule.php

Indentation +52 added lines, -52 removed lines

@@ -22,64 +22,64 @@
  * Class ThemeSelectModule
  */
 class ThemeSelectModule extends AbstractModule implements ModuleBlockInterface {
-	/** {@inheritdoc} */
-	public function getTitle() {
-		return /* I18N: Name of a module */ I18N::translate('Theme change');
-	}
+    /** {@inheritdoc} */
+    public function getTitle() {
+        return /* I18N: Name of a module */ I18N::translate('Theme change');
+    }
 
-	/** {@inheritdoc} */
-	public function getDescription() {
-		return /* I18N: Description of the “Theme change” module */ I18N::translate('An alternative way to select a new theme.');
-	}
+    /** {@inheritdoc} */
+    public function getDescription() {
+        return /* I18N: Description of the “Theme change” module */ I18N::translate('An alternative way to select a new theme.');
+    }
 
-	/**
-	 * Generate the HTML content of this block.
-	 *
-	 * @param int      $block_id
-	 * @param bool     $template
-	 * @param string[] $cfg
-	 *
-	 * @return string
-	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
-		$id    = $this->getName() . $block_id;
-		$class = $this->getName() . '_block';
-		$title = $this->getTitle();
-		$menu  = Theme::theme()->menuThemes();
+    /**
+     * Generate the HTML content of this block.
+     *
+     * @param int      $block_id
+     * @param bool     $template
+     * @param string[] $cfg
+     *
+     * @return string
+     */
+    public function getBlock($block_id, $template = true, $cfg = array()) {
+        $id    = $this->getName() . $block_id;
+        $class = $this->getName() . '_block';
+        $title = $this->getTitle();
+        $menu  = Theme::theme()->menuThemes();
 
-		if ($menu) {
-			$content = '<div class="center theme_form">' . $menu . '</div><br>';
+        if ($menu) {
+            $content = '<div class="center theme_form">' . $menu . '</div><br>';
 
-			if ($template) {
-				return Theme::theme()->formatBlock($id, $title, $class, $content);
-			} else {
-				return $content;
-			}
-		} else {
-			return '';
-		}
-	}
+            if ($template) {
+                return Theme::theme()->formatBlock($id, $title, $class, $content);
+            } else {
+                return $content;
+            }
+        } else {
+            return '';
+        }
+    }
 
-	/** {@inheritdoc} */
-	public function loadAjax() {
-		return false;
-	}
+    /** {@inheritdoc} */
+    public function loadAjax() {
+        return false;
+    }
 
-	/** {@inheritdoc} */
-	public function isUserBlock() {
-		return true;
-	}
+    /** {@inheritdoc} */
+    public function isUserBlock() {
+        return true;
+    }
 
-	/** {@inheritdoc} */
-	public function isGedcomBlock() {
-		return true;
-	}
+    /** {@inheritdoc} */
+    public function isGedcomBlock() {
+        return true;
+    }
 
-	/**
-	 * An HTML form to edit block settings
-	 *
-	 * @param int $block_id
-	 */
-	public function configureBlock($block_id) {
-	}
+    /**
+     * An HTML form to edit block settings
+     *
+     * @param int $block_id
+     */
+    public function configureBlock($block_id) {
+    }
 }

Braces +16 added lines, -8 removed lines

@@ -21,14 +21,17 @@ 
 /**
  * Class ThemeSelectModule
  */
-class ThemeSelectModule extends AbstractModule implements ModuleBlockInterface {
+class ThemeSelectModule extends AbstractModule implements ModuleBlockInterface
+{
 	/** {@inheritdoc} */
-	public function getTitle() {
+	public function getTitle()
+	{
 		return /* I18N: Name of a module */ I18N::translate('Theme change');
 	}
 
 	/** {@inheritdoc} */
-	public function getDescription() {
+	public function getDescription()
+	{
 		return /* I18N: Description of the “Theme change” module */ I18N::translate('An alternative way to select a new theme.');
 	}
 
@@ -41,7 +44,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getBlock($block_id, $template = true, $cfg = array()) {
+	public function getBlock($block_id, $template = true, $cfg = array())
+	{
 		$id    = $this->getName() . $block_id;
 		$class = $this->getName() . '_block';
 		$title = $this->getTitle();
@@ -61,17 +65,20 @@ 
 	}
 
 	/** {@inheritdoc} */
-	public function loadAjax() {
+	public function loadAjax()
+	{
 		return false;
 	}
 
 	/** {@inheritdoc} */
-	public function isUserBlock() {
+	public function isUserBlock()
+	{
 		return true;
 	}
 
 	/** {@inheritdoc} */
-	public function isGedcomBlock() {
+	public function isGedcomBlock()
+	{
 		return true;
 	}
 
@@ -80,6 +87,7 @@ 
 	 *
 	 * @param int $block_id
 	 */
-	public function configureBlock($block_id) {
+	public function configureBlock($block_id)
+	{
 	}
 }

app/Module/ModuleBlockInterface.php

Indentation +37 added lines, -37 removed lines

@@ -19,45 +19,45 @@
  * Interface ModuleBlockInterface - Classes and libraries for module system
  */
 interface ModuleBlockInterface {
-	/**
-	 * Generate the HTML content of this block.
-	 *
-	 * @param int      $block_id
-	 * @param bool     $template
-	 * @param string[] $cfg
-	 *
-	 * @return string
-	 */
-	public function getBlock($block_id, $template = true, $cfg = array());
+    /**
+     * Generate the HTML content of this block.
+     *
+     * @param int      $block_id
+     * @param bool     $template
+     * @param string[] $cfg
+     *
+     * @return string
+     */
+    public function getBlock($block_id, $template = true, $cfg = array());
 
-	/**
-	 * Should this block load asynchronously using AJAX?
-	 *
-	 * Simple blocks are faster in-line, more comples ones
-	 * can be loaded later.
-	 *
-	 * @return bool
-	 */
-	public function loadAjax();
+    /**
+     * Should this block load asynchronously using AJAX?
+     *
+     * Simple blocks are faster in-line, more comples ones
+     * can be loaded later.
+     *
+     * @return bool
+     */
+    public function loadAjax();
 
-	/**
-	 * Can this block be shown on the user’s home page?
-	 *
-	 * @return bool
-	 */
-	public function isUserBlock();
+    /**
+     * Can this block be shown on the user’s home page?
+     *
+     * @return bool
+     */
+    public function isUserBlock();
 
-	/**
-	 * Can this block be shown on the tree’s home page?
-	 *
-	 * @return bool
-	 */
-	public function isGedcomBlock();
+    /**
+     * Can this block be shown on the tree’s home page?
+     *
+     * @return bool
+     */
+    public function isGedcomBlock();
 
-	/**
-	 * An HTML form to edit block settings
-	 *
-	 * @param int $block_id
-	 */
-	public function configureBlock($block_id);
+    /**
+     * An HTML form to edit block settings
+     *
+     * @param int $block_id
+     */
+    public function configureBlock($block_id);
 }

Braces +2 added lines, -1 removed lines

@@ -18,7 +18,8 @@
 /**
  * Interface ModuleBlockInterface - Classes and libraries for module system
  */
-interface ModuleBlockInterface {
+interface ModuleBlockInterface
+{
 	/**
 	 * Generate the HTML content of this block.
 	 *

app/Module/BirthDeathMarriageReportModule.php

Indentation +42 added lines, -42 removed lines

@@ -23,50 +23,50 @@
  * Class BirthDeathMarriageReportModule
  */
 class BirthDeathMarriageReportModule extends AbstractModule implements ModuleReportInterface {
-	/**
-	 * How should this module be labelled on tabs, menus, etc.?
-	 *
-	 * @return string
-	 */
-	public function getTitle() {
-		// This text also appears in the .XML file - update both together
-		return /* I18N: Name of a module/report. “Vital records” are life events - birth/marriage/death */ I18N::translate('Vital records');
-	}
+    /**
+     * How should this module be labelled on tabs, menus, etc.?
+     *
+     * @return string
+     */
+    public function getTitle() {
+        // This text also appears in the .XML file - update both together
+        return /* I18N: Name of a module/report. “Vital records” are life events - birth/marriage/death */ I18N::translate('Vital records');
+    }
 
-	/**
-	 * A sentence describing what this module does.
-	 *
-	 * @return string
-	 */
-	public function getDescription() {
-		// This text also appears in the .XML file - update both together
-		return /* I18N: Description of the “Vital records” module. “Vital records” are life events - birth/marriage/death */ I18N::translate('A report of vital records for a given date or place.');
-	}
+    /**
+     * A sentence describing what this module does.
+     *
+     * @return string
+     */
+    public function getDescription() {
+        // This text also appears in the .XML file - update both together
+        return /* I18N: Description of the “Vital records” module. “Vital records” are life events - birth/marriage/death */ I18N::translate('A report of vital records for a given date or place.');
+    }
 
-	/**
-	 * 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 report.
-	 *
-	 * @return Menu
-	 */
-	public function getReportMenu() {
-		global $WT_TREE;
+    /**
+     * Return a menu item for this report.
+     *
+     * @return Menu
+     */
+    public function getReportMenu() {
+        global $WT_TREE;
 
-		return new Menu(
-			$this->getTitle(),
-			'reportengine.php?ged=' . $WT_TREE->getNameUrl() . '&action=setup&report=' . WT_MODULES_DIR . $this->getName() . '/report.xml',
-			'menu-report-' . $this->getName(),
-			array('rel' => 'nofollow')
-		);
-	}
+        return new Menu(
+            $this->getTitle(),
+            'reportengine.php?ged=' . $WT_TREE->getNameUrl() . '&action=setup&report=' . WT_MODULES_DIR . $this->getName() . '/report.xml',
+            'menu-report-' . $this->getName(),
+            array('rel' => 'nofollow')
+        );
+    }
 }

Braces +10 added lines, -5 removed lines

@@ -22,13 +22,15 @@ 
 /**
  * Class BirthDeathMarriageReportModule
  */
-class BirthDeathMarriageReportModule extends AbstractModule implements ModuleReportInterface {
+class BirthDeathMarriageReportModule extends AbstractModule implements ModuleReportInterface
+{
 	/**
 	 * How should this module be labelled on tabs, menus, etc.?
 	 *
 	 * @return string
 	 */
-	public function getTitle() {
+	public function getTitle()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Name of a module/report. “Vital records” are life events - birth/marriage/death */ I18N::translate('Vital records');
 	}
@@ -38,7 +40,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function getDescription() {
+	public function getDescription()
+	{
 		// This text also appears in the .XML file - update both together
 		return /* I18N: Description of the “Vital records” module. “Vital records” are life events - birth/marriage/death */ I18N::translate('A report of vital records for a given date or place.');
 	}
@@ -50,7 +53,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function defaultAccessLevel() {
+	public function defaultAccessLevel()
+	{
 		return Auth::PRIV_PRIVATE;
 	}
 
@@ -59,7 +63,8 @@ 
 	 *
 	 * @return Menu
 	 */
-	public function getReportMenu() {
+	public function getReportMenu()
+	{
 		global $WT_TREE;
 
 		return new Menu(