fisharebest / webtrees

editnews.php

Switch Indentation +38 added lines, -38 removed lines

@@ -44,44 +44,44 @@
 $text      = Filter::post('text');
 
 switch ($action) {
-case 'compose':
-	if (Module::getModuleByName('ckeditor')) {
-		CkeditorModule::enableEditor($controller);
-	}
+	case 'compose':
+		if (Module::getModuleByName('ckeditor')) {
+			CkeditorModule::enableEditor($controller);
+		}
 
-	echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
-	echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
-	if ($news_id) {
-		$news = Database::prepare("SELECT news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
-	} else {
-		$news              = array();
-		$news['user_id']   = $user_id;
-		$news['gedcom_id'] = $gedcom_id;
-		$news['date']      = WT_TIMESTAMP;
-		$news['subject']   = '';
-		$news['body']      = '';
-	}
-	echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
-	echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
-	echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
-	echo '<table>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
-	echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
-	echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
-	echo '<tr><td>';
-	echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
-	echo '</td></tr>';
-	echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
-	echo '</table>';
-	echo '</form>';
-	break;
-case 'save':
-	if ($news_id) {
-		Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
-	} else {
-		Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
-	}
+		echo '<h3>' . I18N::translate('Add/edit a journal/news entry') . '</h3>';
+		echo '<form style="overflow: hidden;" name="messageform" method="post" action="editnews.php?action=save&news_id=' . $news_id . '">';
+		if ($news_id) {
+			$news = Database::prepare("SELECT news_id AS id, user_id, gedcom_id, UNIX_TIMESTAMP(updated) AS date, subject, body FROM `##news` WHERE news_id=?")->execute(array($news_id))->fetchOneRow(PDO::FETCH_ASSOC);
+		} else {
+			$news              = array();
+			$news['user_id']   = $user_id;
+			$news['gedcom_id'] = $gedcom_id;
+			$news['date']      = WT_TIMESTAMP;
+			$news['subject']   = '';
+			$news['body']      = '';
+		}
+		echo '<input type="hidden" name="user_id" value="' . $news['user_id'] . '">';
+		echo '<input type="hidden" name="gedcom_id" value="' . $news['gedcom_id'] . '">';
+		echo '<input type="hidden" name="date" value="' . $news['date'] . '">';
+		echo '<table>';
+		echo '<tr><th style="text-align:start;">' . I18N::translate('Title') . '</th><tr>';
+		echo '<tr><td><input type="text" name="title" size="50" dir="auto" autofocus value="' . $news['subject'] . '"></td></tr>';
+		echo '<tr><th style="text-align:start;">' . I18N::translate('Content') . '</th></tr>';
+		echo '<tr><td>';
+		echo '<textarea name="text" class="html-edit" cols="80" rows="10" dir="auto">' . Filter::escapeHtml($news['body']) . '</textarea>';
+		echo '</td></tr>';
+		echo '<tr><td><input type="submit" value="' . I18N::translate('save') . '"></td></tr>';
+		echo '</table>';
+		echo '</form>';
+		break;
+	case 'save':
+		if ($news_id) {
+			Database::prepare("UPDATE `##news` SET subject=?, body=?, updated=FROM_UNIXTIME(?) WHERE news_id=?")->execute(array($title, $text, $date, $news_id));
+		} else {
+			Database::prepare("INSERT INTO `##news` (user_id, gedcom_id, subject, body, updated) VALUES (NULLIF(?, ''), NULLIF(?, '') ,? ,?, CURRENT_TIMESTAMP)")->execute(array($user_id, $gedcom_id, $title, $text));
+		}
 
-	$controller->addInlineJavascript('window.opener.location.reload();window.close();');
-	break;
+		$controller->addInlineJavascript('window.opener.location.reload();window.close();');
+		break;
 }

autocomplete.php

Switch Indentation +424 added lines, -424 removed lines

@@ -31,471 +31,471 @@
 $type = Filter::get('field');
 
 switch ($type) {
-case 'ASSO': // Associates of an individuals, whose name contains the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT 'INDI' AS type, i_id AS xref, i_gedcom AS gedcom, n_full" .
-		" FROM `##individuals`" .
-		" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
-		" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
-		" ORDER BY n_full COLLATE :collate"
-	)->execute(array(
-		'term_1'  => $term,
-		'term_2'  => $term,
-		'tree_id' => $WT_TREE->getTreeId(),
-		'collate' => I18N::collation(),
-	))->fetchAll();
-
-	// Filter for privacy and whether they could be alive at the right time
-	$event_date = Filter::get('extra');
-	$date       = new Date($event_date);
-	$event_jd   = $date->julianDay();
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShow()) {
-			if ($event_jd) {
-				// Exclude individuals who were born after the event.
-				$person_birth_jd = $person->getEstimatedBirthDate()->minimumJulianDay();
-				if ($person_birth_jd && $person_birth_jd > $event_jd) {
-					continue;
+	case 'ASSO': // Associates of an individuals, whose name contains the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT 'INDI' AS type, i_id AS xref, i_gedcom AS gedcom, n_full" .
+			" FROM `##individuals`" .
+			" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
+			" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
+			" ORDER BY n_full COLLATE :collate"
+		)->execute(array(
+			'term_1'  => $term,
+			'term_2'  => $term,
+			'tree_id' => $WT_TREE->getTreeId(),
+			'collate' => I18N::collation(),
+		))->fetchAll();
+
+		// Filter for privacy and whether they could be alive at the right time
+		$event_date = Filter::get('extra');
+		$date       = new Date($event_date);
+		$event_jd   = $date->julianDay();
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShow()) {
+				if ($event_jd) {
+					// Exclude individuals who were born after the event.
+					$person_birth_jd = $person->getEstimatedBirthDate()->minimumJulianDay();
+					if ($person_birth_jd && $person_birth_jd > $event_jd) {
+						continue;
+					}
+					// Exclude individuals who died before the event.
+					$person_death_jd = $person->getEstimatedDeathDate()->maximumJulianDay();
+					if ($person_death_jd && $person_death_jd < $event_jd) {
+						continue;
+					}
 				}
-				// Exclude individuals who died before the event.
-				$person_death_jd = $person->getEstimatedDeathDate()->maximumJulianDay();
-				if ($person_death_jd && $person_death_jd < $event_jd) {
-					continue;
+				// Add the age (if we have it) or the lifespan (if we do not).
+				$label = $person->getFullName();
+				if ($event_jd && $person->getBirthDate()->isOK()) {
+					$label .= ', <span class="age">(' . I18N::translate('Age') . ' ' . Date::getAge($person->getBirthDate(), $date, 0) . ')</span>';
+				} else {
+					$label .= ', <i>' . $person->getLifeSpan() . '</i>';
 				}
-			}
-			// Add the age (if we have it) or the lifespan (if we do not).
-			$label = $person->getFullName();
-			if ($event_jd && $person->getBirthDate()->isOK()) {
-				$label .= ', <span class="age">(' . I18N::translate('Age') . ' ' . Date::getAge($person->getBirthDate(), $date, 0) . ')</span>';
-			} else {
-				$label .= ', <i>' . $person->getLifeSpan() . '</i>';
-			}
-			$data[$row->xref] = array('value' => $row->xref, 'label' => $label);
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'CEME': // Cemetery fields, that contain the search term
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT i_id AS xref, i_gedcom AS gedcom" .
-		" FROM `##individuals`" .
-		" WHERE i_gedcom LIKE '%\n2 CEME %' AND i_file = :tree_id" .
-		" ORDER BY SUBSTRING_INDEX(i_gedcom, '\n2 CEME ', -1) COLLATE :collation"
-	)->execute(array(
-		'tree_id'   => $WT_TREE->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if (preg_match('/\n2 CEME (.*' . preg_quote($term, '/') . '.*)/i', $person->getGedcom(), $match)) {
-			if (!in_array($match[1], $data)) {
-				$data[] = $match[1];
+				$data[$row->xref] = array('value' => $row->xref, 'label' => $label);
 			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'FAM': // Families, whose name contains the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_FAM_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($family->canShowName()) {
-			$marriage_year = $family->getMarriageYear();
-			if ($marriage_year) {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
-			} else {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
-			}
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'GIVN': // Given names, that start with the search term
-	// Do not filter by privacy. Given names on their own do not identify individuals.
-	echo json_encode(
-		Database::prepare(
-			"SELECT DISTINCT n_givn" .
-			" FROM `##name`" .
-			" WHERE n_givn LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
-			" ORDER BY n_givn COLLATE :collation"
+		echo json_encode($data);
+
+		return;
+
+	case 'CEME': // Cemetery fields, that contain the search term
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT i_id AS xref, i_gedcom AS gedcom" .
+			" FROM `##individuals`" .
+			" WHERE i_gedcom LIKE '%\n2 CEME %' AND i_file = :tree_id" .
+			" ORDER BY SUBSTRING_INDEX(i_gedcom, '\n2 CEME ', -1) COLLATE :collation"
 		)->execute(array(
-			'term'      => $term,
 			'tree_id'   => $WT_TREE->getTreeId(),
 			'collation' => I18N::collation(),
-		))->fetchOneColumn()
-	);
-
-	return;
-
-case 'INDI': // Individuals, whose name contains the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT i_id AS xref, i_gedcom AS gedcom, n_full" .
-		" FROM `##individuals`" .
-		" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
-		" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
-		" ORDER BY n_full COLLATE :collation"
-	)->execute(array(
-		'term_1'    => $term,
-		'term_2'    => $term,
-		'tree_id'   => $WT_TREE->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShowName()) {
-			$data[] = array('value' => $row->xref, 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'NOTE': // Notes which contain the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_NOTE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($note->canShowName()) {
-			$data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'OBJE':
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_OBJE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($media->canShowName()) {
-			$data[] = array('value' => $row->xref, 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
-		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'PLAC': // Place names (with hierarchy), that include the search term
-	// Do not filter by privacy. Place names on their own do not identify individuals.
-	$data = array();
-	foreach (Place::findPlaces($term, $WT_TREE) as $place) {
-		$data[] = $place->getGedcomName();
-	}
-	if (!$data && $WT_TREE->getPreference('GEONAMES_ACCOUNT')) {
-		// No place found? Use an external gazetteer
-		$url =
-			"http://api.geonames.org/searchJSON" .
-			"?name_startsWith=" . urlencode($term) .
-			"&lang=" . WT_LOCALE .
-			"&fcode=CMTY&fcode=ADM4&fcode=PPL&fcode=PPLA&fcode=PPLC" .
-			"&style=full" .
-			"&username=" . $WT_TREE->getPreference('GEONAMES_ACCOUNT');
-		// try to use curl when file_get_contents not allowed
-		if (ini_get('allow_url_fopen')) {
-			$json = file_get_contents($url);
-		} elseif (function_exists('curl_init')) {
-			$ch = curl_init();
-			curl_setopt($ch, CURLOPT_URL, $url);
-			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-			$json = curl_exec($ch);
-			curl_close($ch);
-		} else {
-			return $data;
+		))->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if (preg_match('/\n2 CEME (.*' . preg_quote($term, '/') . '.*)/i', $person->getGedcom(), $match)) {
+				if (!in_array($match[1], $data)) {
+					$data[] = $match[1];
+				}
+			}
 		}
-		$places = json_decode($json, true);
-		if (isset($places['geonames']) && is_array($places['geonames'])) {
-			foreach ($places['geonames'] as $k => $place) {
-				$data[] = $place['name'] . ', ' . $place['adminName2'] . ', ' . $place['adminName1'] . ', ' . $place['countryName'];
+		echo json_encode($data);
+
+		return;
+
+	case 'FAM': // Families, whose name contains the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_FAM_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($family->canShowName()) {
+				$marriage_year = $family->getMarriageYear();
+				if ($marriage_year) {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
+				} else {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+				}
 			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'PLAC2': // Place names (without hierarchy), that include the search term
-	// Do not filter by privacy. Place names on their own do not identify individuals.
-	echo json_encode(
-		Database::prepare(
-			"SELECT p_place" .
-			" FROM `##places`" .
-			" WHERE p_place LIKE CONCAT('%', :term, '%') AND p_file = :tree_id" .
-			" ORDER BY p_place COLLATE :collation"
+		echo json_encode($data);
+
+		return;
+
+	case 'GIVN': // Given names, that start with the search term
+		// Do not filter by privacy. Given names on their own do not identify individuals.
+		echo json_encode(
+			Database::prepare(
+				"SELECT DISTINCT n_givn" .
+				" FROM `##name`" .
+				" WHERE n_givn LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
+				" ORDER BY n_givn COLLATE :collation"
+			)->execute(array(
+				'term'      => $term,
+				'tree_id'   => $WT_TREE->getTreeId(),
+				'collation' => I18N::collation(),
+			))->fetchOneColumn()
+		);
+
+		return;
+
+	case 'INDI': // Individuals, whose name contains the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT i_id AS xref, i_gedcom AS gedcom, n_full" .
+			" FROM `##individuals`" .
+			" JOIN `##name` ON i_id = n_id AND i_file = n_file" .
+			" WHERE (n_full LIKE CONCAT('%', REPLACE(:term_1, ' ', '%'), '%') OR n_surn LIKE CONCAT('%', REPLACE(:term_2, ' ', '%'), '%')) AND i_file = :tree_id" .
+			" ORDER BY n_full COLLATE :collation"
 		)->execute(array(
-			'term'      => $term,
+			'term_1'    => $term,
+			'term_2'    => $term,
 			'tree_id'   => $WT_TREE->getTreeId(),
 			'collation' => I18N::collation(),
-		))->fetchOneColumn()
-	);
-
-	return;
-
-case 'REPO': // Repositories, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_REPO_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($record->canShowName()) {
-			foreach ($record->getFacts('NAME') as $fact) {
-				$data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
+		))->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShowName()) {
+				$data[] = array('value' => $row->xref, 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
 			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'REPO_NAME': // Repository names, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_REPO_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($record->canShowName()) {
-			$data[] = strip_tags($record->getFullName());
+		echo json_encode($data);
+
+		return;
+
+	case 'NOTE': // Notes which contain the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_NOTE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($note->canShowName()) {
+				$data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
+			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'SOUR': // Sources, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_SOUR_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$record = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($record->canShowName()) {
-			foreach ($record->getFacts('TITL') as $fact) {
-				$data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
+		echo json_encode($data);
+
+		return;
+
+	case 'OBJE':
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_OBJE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($media->canShowName()) {
+				$data[] = array('value' => $row->xref, 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
 			}
 		}
-	}
-	echo json_encode($data);
+		echo json_encode($data);
 
-	return;
+		return;
 
-case 'PAGE': // Citation details, for a given source, that contain the search term
-	$data = array();
-	$sid  = Filter::get('extra', WT_REGEX_XREF);
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT i_id AS xref, i_gedcom AS gedcom" .
-		" FROM `##individuals`" .
-		" WHERE i_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND i_file = :tree_id"
-	)->execute(array(
-		'xref'    => $sid,
-		'term'    => $term,
-		'tree_id' => $WT_TREE->getTreeId(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
-			$data[] = $match[1];
+	case 'PLAC': // Place names (with hierarchy), that include the search term
+		// Do not filter by privacy. Place names on their own do not identify individuals.
+		$data = array();
+		foreach (Place::findPlaces($term, $WT_TREE) as $place) {
+			$data[] = $place->getGedcomName();
 		}
-		if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
-			$data[] = $match[1];
+		if (!$data && $WT_TREE->getPreference('GEONAMES_ACCOUNT')) {
+			// No place found? Use an external gazetteer
+			$url =
+				"http://api.geonames.org/searchJSON" .
+				"?name_startsWith=" . urlencode($term) .
+				"&lang=" . WT_LOCALE .
+				"&fcode=CMTY&fcode=ADM4&fcode=PPL&fcode=PPLA&fcode=PPLC" .
+				"&style=full" .
+				"&username=" . $WT_TREE->getPreference('GEONAMES_ACCOUNT');
+			// try to use curl when file_get_contents not allowed
+			if (ini_get('allow_url_fopen')) {
+				$json = file_get_contents($url);
+			} elseif (function_exists('curl_init')) {
+				$ch = curl_init();
+				curl_setopt($ch, CURLOPT_URL, $url);
+				curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+				$json = curl_exec($ch);
+				curl_close($ch);
+			} else {
+				return $data;
+			}
+			$places = json_decode($json, true);
+			if (isset($places['geonames']) && is_array($places['geonames'])) {
+				foreach ($places['geonames'] as $k => $place) {
+					$data[] = $place['name'] . ', ' . $place['adminName2'] . ', ' . $place['adminName1'] . ', ' . $place['countryName'];
+				}
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT f_id AS xref, f_gedcom AS gedcom" .
-		" FROM `##families`" .
-		" WHERE f_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND f_file = :tree_id"
-	)->execute(array(
-		'xref'    => $sid,
-		'term'    => $term,
-		'tree_id' => $WT_TREE->getTreeId(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
-			$data[] = $match[1];
+		echo json_encode($data);
+
+		return;
+
+	case 'PLAC2': // Place names (without hierarchy), that include the search term
+		// Do not filter by privacy. Place names on their own do not identify individuals.
+		echo json_encode(
+			Database::prepare(
+				"SELECT p_place" .
+				" FROM `##places`" .
+				" WHERE p_place LIKE CONCAT('%', :term, '%') AND p_file = :tree_id" .
+				" ORDER BY p_place COLLATE :collation"
+			)->execute(array(
+				'term'      => $term,
+				'tree_id'   => $WT_TREE->getTreeId(),
+				'collation' => I18N::collation(),
+			))->fetchOneColumn()
+		);
+
+		return;
+
+	case 'REPO': // Repositories, that include the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_REPO_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($record->canShowName()) {
+				foreach ($record->getFacts('NAME') as $fact) {
+					$data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
+				}
+			}
 		}
-		if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
-			$data[] = $match[1];
+		echo json_encode($data);
+
+		return;
+
+	case 'REPO_NAME': // Repository names, that include the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_REPO_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$record = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($record->canShowName()) {
+				$data[] = strip_tags($record->getFullName());
+			}
 		}
-	}
-	// array_unique() converts the keys from integer to string, which breaks
-	// the JSON encoding - so need to call array_values() to convert them
-	// back into integers.
-	$data = array_values(array_unique($data));
-	echo json_encode($data);
-
-	return;
-
-case 'SOUR_TITL': // Source titles, that include the search terms
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = Database::prepare(
-		"SELECT s_id AS xref, s_gedcom AS gedcom, s_name" .
-		" FROM `##sources`" .
-		" WHERE s_name LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND s_file = :tree_id" .
-		" ORDER BY s_name COLLATE :collation"
-	)->execute(array(
-		'term'      => $term,
-		'tree_id'   => $WT_TREE->getTreeId(),
-		'collation' => I18N::collation(),
-	))->fetchAll();
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($source->canShowName()) {
-			$data[] = $row->s_name;
+		echo json_encode($data);
+
+		return;
+
+	case 'SOUR': // Sources, that include the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_SOUR_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$record = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($record->canShowName()) {
+				foreach ($record->getFacts('TITL') as $fact) {
+					$data[] = array('value' => $record->getXref(), 'label' => $fact->getValue());
+				}
+			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'SURN': // Surnames, that start with the search term
-	// Do not filter by privacy. Surnames on their own do not identify individuals.
-	echo json_encode(
-		Database::prepare(
-			"SELECT DISTINCT n_surname" .
-			" FROM `##name`" .
-			" WHERE n_surname LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
-			" ORDER BY n_surname COLLATE :collation"
+		echo json_encode($data);
+
+		return;
+
+	case 'PAGE': // Citation details, for a given source, that contain the search term
+		$data = array();
+		$sid  = Filter::get('extra', WT_REGEX_XREF);
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT i_id AS xref, i_gedcom AS gedcom" .
+			" FROM `##individuals`" .
+			" WHERE i_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND i_file = :tree_id"
+		)->execute(array(
+			'xref'    => $sid,
+			'term'    => $term,
+			'tree_id' => $WT_TREE->getTreeId(),
+		))->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+			if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $person->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+		}
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT f_id AS xref, f_gedcom AS gedcom" .
+			" FROM `##families`" .
+			" WHERE f_gedcom LIKE CONCAT('%\n_ SOUR @', :xref, '@%', REPLACE(:term, ' ', '%'), '%') AND f_file = :tree_id"
+		)->execute(array(
+			'xref'    => $sid,
+			'term'    => $term,
+			'tree_id' => $WT_TREE->getTreeId(),
+		))->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if (preg_match('/\n1 SOUR @' . $sid . '@(?:\n[2-9].*)*\n2 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+			if (preg_match('/\n2 SOUR @' . $sid . '@(?:\n[3-9].*)*\n3 PAGE (.*' . str_replace(' ', '.+', preg_quote($term, '/')) . '.*)/i', $family->getGedcom(), $match)) {
+				$data[] = $match[1];
+			}
+		}
+		// array_unique() converts the keys from integer to string, which breaks
+		// the JSON encoding - so need to call array_values() to convert them
+		// back into integers.
+		$data = array_values(array_unique($data));
+		echo json_encode($data);
+
+		return;
+
+	case 'SOUR_TITL': // Source titles, that include the search terms
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = Database::prepare(
+			"SELECT s_id AS xref, s_gedcom AS gedcom, s_name" .
+			" FROM `##sources`" .
+			" WHERE s_name LIKE CONCAT('%', REPLACE(:term, ' ', '%'), '%') AND s_file = :tree_id" .
+			" ORDER BY s_name COLLATE :collation"
 		)->execute(array(
 			'term'      => $term,
 			'tree_id'   => $WT_TREE->getTreeId(),
 			'collation' => I18N::collation(),
-		))->fetchOneColumn()
-	);
-
-	return;
-
-case 'IFSRO':
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_INDI_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShowName()) {
-			$data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
+		))->fetchAll();
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($source->canShowName()) {
+				$data[] = $row->s_name;
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_SOUR_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($source->canShowName()) {
-			$data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
+		echo json_encode($data);
+
+		return;
+
+	case 'SURN': // Surnames, that start with the search term
+		// Do not filter by privacy. Surnames on their own do not identify individuals.
+		echo json_encode(
+			Database::prepare(
+				"SELECT DISTINCT n_surname" .
+				" FROM `##name`" .
+				" WHERE n_surname LIKE CONCAT(:term, '%') AND n_file = :tree_id" .
+				" ORDER BY n_surname COLLATE :collation"
+			)->execute(array(
+				'term'      => $term,
+				'tree_id'   => $WT_TREE->getTreeId(),
+				'collation' => I18N::collation(),
+			))->fetchOneColumn()
+		);
+
+		return;
+
+	case 'IFSRO':
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_INDI_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShowName()) {
+				$data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_REPO_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$repository = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($repository->canShowName()) {
-			$data[] = array('value' => $repository->getXref(), 'label' => $repository->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_SOUR_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($source->canShowName()) {
+				$data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_OBJE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($media->canShowName()) {
-			$data[] = array('value' => $media->getXref(), 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_REPO_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$repository = Repository::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($repository->canShowName()) {
+				$data[] = array('value' => $repository->getXref(), 'label' => $repository->getFullName());
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_FAM_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($family->canShowName()) {
-			$marriage_year = $family->getMarriageYear();
-			if ($marriage_year) {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
-			} else {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_OBJE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$media = Media::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($media->canShowName()) {
+				$data[] = array('value' => $media->getXref(), 'label' => '<img src="' . $media->getHtmlUrlDirect() . '" width="25"> ' . $media->getFullName());
+			}
+		}
+		// Fetch all data, regardless of privacy
+		$rows = get_FAM_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($family->canShowName()) {
+				$marriage_year = $family->getMarriageYear();
+				if ($marriage_year) {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
+				} else {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+				}
 			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_NOTE_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($note->canShowName()) {
-			$data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_NOTE_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$note = Note::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($note->canShowName()) {
+				$data[] = array('value' => $note->getXref(), 'label' => $note->getFullName());
+			}
 		}
-	}
-	echo json_encode($data);
-
-	return;
-
-case 'IFS':
-	$data = array();
-	// Fetch all data, regardless of privacy
-	$rows = get_INDI_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($person->canShowName()) {
-			$data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
+		echo json_encode($data);
+
+		return;
+
+	case 'IFS':
+		$data = array();
+		// Fetch all data, regardless of privacy
+		$rows = get_INDI_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$person = Individual::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($person->canShowName()) {
+				$data[] = array('value' => $person->getXref(), 'label' => str_replace(array('@N.N.', '@P.N.'), array(I18N::translateContext('Unknown surname', '…'), I18N::translateContext('Unknown given name', '…')), $row->n_full) . ', <i>' . $person->getLifeSpan() . '</i>');
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_SOUR_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($source->canShowName()) {
-			$data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_SOUR_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$source = Source::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($source->canShowName()) {
+				$data[] = array('value' => $source->getXref(), 'label' => $source->getFullName());
+			}
 		}
-	}
-	// Fetch all data, regardless of privacy
-	$rows = get_FAM_rows($WT_TREE, $term);
-	// Filter for privacy
-	foreach ($rows as $row) {
-		$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
-		if ($family->canShowName()) {
-			$marriage_year = $family->getMarriageYear();
-			if ($marriage_year) {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
-			} else {
-				$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+		// Fetch all data, regardless of privacy
+		$rows = get_FAM_rows($WT_TREE, $term);
+		// Filter for privacy
+		foreach ($rows as $row) {
+			$family = Family::getInstance($row->xref, $WT_TREE, $row->gedcom);
+			if ($family->canShowName()) {
+				$marriage_year = $family->getMarriageYear();
+				if ($marriage_year) {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName() . ', <i>' . $marriage_year . '</i>');
+				} else {
+					$data[] = array('value' => $family->getXref(), 'label' => $family->getFullName());
+				}
 			}
 		}
-	}
-	echo json_encode($data);
+		echo json_encode($data);
 
-	return;
+		return;
 }
 
 /**

admin_media.php

Switch Indentation +93 added lines, -93 removed lines

@@ -85,98 +85,98 @@ 
 ////////////////////////////////////////////////////////////////////////////////
 
 switch ($action) {
-case 'load_json':
-	$search = Filter::get('search');
-	$search = $search['value'];
-	$start  = Filter::getInteger('start');
-	$length = Filter::getInteger('length');
-
-	switch ($files) {
-	case 'local':
-		// Filtered rows
-		$SELECT1 =
-			"SELECT SQL_CALC_FOUND_ROWS TRIM(LEADING :media_path_1 FROM m_filename) AS media_path, m_id AS xref, m_titl, m_file AS gedcom_id, m_gedcom AS gedcom" .
-			" FROM  `##media`" .
-			" JOIN  `##gedcom_setting` ON (m_file = gedcom_id AND setting_name = 'MEDIA_DIRECTORY')" .
-			" JOIN  `##gedcom` USING (gedcom_id)" .
-			" WHERE setting_value = :media_folder" .
-			" AND   m_filename LIKE CONCAT(:media_path_2, '%')" .
-			" AND   (SUBSTRING_INDEX(m_filename, '/', -1) LIKE CONCAT('%', :search_1, '%')" .
-			"  OR   m_titl LIKE CONCAT('%', :search_2, '%'))" .
-			" AND   m_filename NOT LIKE 'http://%'" .
-			" AND   m_filename NOT LIKE 'https://%'";
-		$ARGS1 = array(
-			'media_path_1' => $media_path,
-			'media_folder' => $media_folder,
-			'media_path_2' => Filter::escapeLike($media_path),
-			'search_1'     => Filter::escapeLike($search),
-			'search_2'     => Filter::escapeLike($search),
-		);
-		// Unfiltered rows
-		$SELECT2 =
-			"SELECT COUNT(*)" .
-			" FROM  `##media`" .
-			" JOIN  `##gedcom_setting` ON (m_file = gedcom_id AND setting_name = 'MEDIA_DIRECTORY')" .
-			" WHERE setting_value = :media_folder" .
-			" AND   m_filename LIKE CONCAT(:media_path_3, '%')" .
-			" AND   m_filename NOT LIKE 'http://%'" .
-			" AND   m_filename NOT LIKE 'https://%'";
-		$ARGS2 = array(
-			'media_folder' => $media_folder,
-			'media_path_3' => $media_path,
-		);
-
-		if ($subfolders == 'exclude') {
-			$SELECT1 .= " AND m_filename NOT LIKE CONCAT(:media_path_4, '%/%')";
-			$ARGS1['media_path_4'] = Filter::escapeLike($media_path);
-			$SELECT2 .= " AND m_filename NOT LIKE CONCAT(:media_path_4, '%/%')";
-			$ARGS2['media_path_4'] = Filter::escapeLike($media_path);
-		}
-
-		$order = Filter::getArray('order');
-		$SELECT1 .= " ORDER BY ";
-		if ($order) {
-			foreach ($order as $key => $value) {
-				if ($key > 0) {
-					$SELECT1 .= ',';
+	case 'load_json':
+		$search = Filter::get('search');
+		$search = $search['value'];
+		$start  = Filter::getInteger('start');
+		$length = Filter::getInteger('length');
+
+		switch ($files) {
+			case 'local':
+				// Filtered rows
+				$SELECT1 =
+					"SELECT SQL_CALC_FOUND_ROWS TRIM(LEADING :media_path_1 FROM m_filename) AS media_path, m_id AS xref, m_titl, m_file AS gedcom_id, m_gedcom AS gedcom" .
+					" FROM  `##media`" .
+					" JOIN  `##gedcom_setting` ON (m_file = gedcom_id AND setting_name = 'MEDIA_DIRECTORY')" .
+					" JOIN  `##gedcom` USING (gedcom_id)" .
+					" WHERE setting_value = :media_folder" .
+					" AND   m_filename LIKE CONCAT(:media_path_2, '%')" .
+					" AND   (SUBSTRING_INDEX(m_filename, '/', -1) LIKE CONCAT('%', :search_1, '%')" .
+					"  OR   m_titl LIKE CONCAT('%', :search_2, '%'))" .
+					" AND   m_filename NOT LIKE 'http://%'" .
+					" AND   m_filename NOT LIKE 'https://%'";
+				$ARGS1 = array(
+					'media_path_1' => $media_path,
+					'media_folder' => $media_folder,
+					'media_path_2' => Filter::escapeLike($media_path),
+					'search_1'     => Filter::escapeLike($search),
+					'search_2'     => Filter::escapeLike($search),
+				);
+				// Unfiltered rows
+				$SELECT2 =
+					"SELECT COUNT(*)" .
+					" FROM  `##media`" .
+					" JOIN  `##gedcom_setting` ON (m_file = gedcom_id AND setting_name = 'MEDIA_DIRECTORY')" .
+					" WHERE setting_value = :media_folder" .
+					" AND   m_filename LIKE CONCAT(:media_path_3, '%')" .
+					" AND   m_filename NOT LIKE 'http://%'" .
+					" AND   m_filename NOT LIKE 'https://%'";
+				$ARGS2 = array(
+					'media_folder' => $media_folder,
+					'media_path_3' => $media_path,
+				);
+
+				if ($subfolders == 'exclude') {
+					$SELECT1 .= " AND m_filename NOT LIKE CONCAT(:media_path_4, '%/%')";
+					$ARGS1['media_path_4'] = Filter::escapeLike($media_path);
+					$SELECT2 .= " AND m_filename NOT LIKE CONCAT(:media_path_4, '%/%')";
+					$ARGS2['media_path_4'] = Filter::escapeLike($media_path);
 				}
-				// Datatables numbers columns 0, 1, 2
-				// MySQL numbers columns 1, 2, 3
-				switch ($value['dir']) {
-				case 'asc':
-					$SELECT1 .= ":col_" . $key . " ASC";
-					break;
-				case 'desc':
-					$SELECT1 .= ":col_" . $key . " DESC";
-					break;
+
+				$order = Filter::getArray('order');
+				$SELECT1 .= " ORDER BY ";
+				if ($order) {
+					foreach ($order as $key => $value) {
+						if ($key > 0) {
+							$SELECT1 .= ',';
+						}
+						// Datatables numbers columns 0, 1, 2
+						// MySQL numbers columns 1, 2, 3
+						switch ($value['dir']) {
+							case 'asc':
+								$SELECT1 .= ":col_" . $key . " ASC";
+								break;
+							case 'desc':
+								$SELECT1 .= ":col_" . $key . " DESC";
+								break;
+						}
+					$ARGS1['col_' . $key] = 1 + $value['column'];
 				}
-				$ARGS1['col_' . $key] = 1 + $value['column'];
+			} else {
+				$SELECT1 = " 1 ASC";
 			}
-		} else {
-			$SELECT1 = " 1 ASC";
-		}
 
-		if ($length > 0) {
-			$SELECT1 .= " LIMIT :length OFFSET :start";
-			$ARGS1['length'] = $length;
-			$ARGS1['start']  = $start;
-		}
-
-		$rows = Database::prepare($SELECT1)->execute($ARGS1)->fetchAll();
-		// Total filtered/unfiltered rows
-		$recordsFiltered = Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
-		$recordsTotal    = Database::prepare($SELECT2)->execute($ARGS2)->fetchOne();
+			if ($length > 0) {
+				$SELECT1 .= " LIMIT :length OFFSET :start";
+				$ARGS1['length'] = $length;
+				$ARGS1['start']  = $start;
+			}
 
-		$data = array();
-		foreach ($rows as $row) {
-			$media  = Media::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
-			$data[] = array(
-				mediaFileInfo($media_folder, $media_path, $row->media_path),
-				$media->displayImage(),
-				mediaObjectInfo($media),
-			);
-		}
-		break;
+			$rows = Database::prepare($SELECT1)->execute($ARGS1)->fetchAll();
+			// Total filtered/unfiltered rows
+			$recordsFiltered = Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
+			$recordsTotal    = Database::prepare($SELECT2)->execute($ARGS2)->fetchOne();
+
+			$data = array();
+			foreach ($rows as $row) {
+				$media  = Media::getInstance($row->xref, Tree::findById($row->gedcom_id), $row->gedcom);
+				$data[] = array(
+					mediaFileInfo($media_folder, $media_path, $row->media_path),
+					$media->displayImage(),
+					mediaObjectInfo($media),
+				);
+			}
+			break;
 
 	case 'external':
 		// Filtered rows
@@ -206,12 +206,12 @@ 
 				// Datatables numbers columns 0, 1, 2
 				// MySQL numbers columns 1, 2, 3
 				switch ($value['dir']) {
-				case 'asc':
-					$SELECT1 .= ":col_" . $key . " ASC";
-					break;
-				case 'desc':
-					$SELECT1 .= ":col_" . $key . " DESC";
-					break;
+					case 'asc':
+						$SELECT1 .= ":col_" . $key . " ASC";
+						break;
+					case 'desc':
+						$SELECT1 .= ":col_" . $key . " DESC";
+						break;
 				}
 				$ARGS1['col_' . $key] = 1 + $value['column'];
 			}

admin_site_access.php

Switch Indentation +134 added lines, -134 removed lines

@@ -38,75 +38,75 @@ 
 
 // Form actions
 switch (Filter::post('action')) {
-case 'save':
-	if (Filter::checkCsrf()) {
-		$site_access_rule_id = Filter::postInteger('site_access_rule_id');
-		$ip_address_start    = Filter::post('ip_address_start', WT_REGEX_IPV4);
-		$ip_address_end      = Filter::post('ip_address_end', WT_REGEX_IPV4);
-		$user_agent_pattern  = Filter::post('user_agent_pattern');
-		$rule                = Filter::post('rule', 'allow|deny|robot');
-		$comment             = Filter::post('comment');
-		$user_agent_string   = Filter::server('HTTP_USER_AGENT');
-		$ip_address          = WT_CLIENT_IP;
-
-		if ($ip_address_start !== null && $ip_address_end !== null && $user_agent_pattern !== null && $rule !== null) {
-			// This doesn't work with named placeholders. The :user_agent_string parameter is not recognised.
-			$oops = $rule !== 'allow' && Database::prepare(
-				"SELECT INET_ATON(:ip_address) BETWEEN INET_ATON(:ip_address_start) AND INET_ATON(:ip_address_end)" .
-				" AND :user_agent_string LIKE :user_agent_pattern"
-			)->execute(array(
-				'ip_address'         => $ip_address,
-				'ip_address_start'   => $ip_address_start,
-				'ip_address_end'     => $ip_address_end,
-				'user_agent_string'  => $user_agent_string,
-				'user_agent_pattern' => $user_agent_pattern,
-			))->fetchOne();
-
-			if ($oops) {
-				FlashMessages::addMessage(I18N::translate('You cannot create a rule which would prevent yourself from accessing the website.'), 'danger');
-			} elseif ($site_access_rule_id === null) {
-				Database::prepare(
-					"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, rule, comment) VALUES (INET_ATON(:ip_address_start), INET_ATON(:ip_address_end), :user_agent_pattern, :rule, :comment)"
-				)->execute(array(
-					'ip_address_start'    => $ip_address_start,
-					'ip_address_end'      => $ip_address_end,
-					'user_agent_pattern'  => $user_agent_pattern,
-					'rule'                => $rule,
-					'comment'             => $comment,
-				));
-				FlashMessages::addMessage(I18N::translate('The website access rule has been created.'), 'success');
-			} else {
-				Database::prepare(
-					"UPDATE `##site_access_rule` SET ip_address_start = INET_ATON(:ip_address_start), ip_address_end = INET_ATON(:ip_address_end), user_agent_pattern = :user_agent_pattern, rule = :rule, comment = :comment WHERE site_access_rule_id = :site_access_rule_id"
+	case 'save':
+		if (Filter::checkCsrf()) {
+			$site_access_rule_id = Filter::postInteger('site_access_rule_id');
+			$ip_address_start    = Filter::post('ip_address_start', WT_REGEX_IPV4);
+			$ip_address_end      = Filter::post('ip_address_end', WT_REGEX_IPV4);
+			$user_agent_pattern  = Filter::post('user_agent_pattern');
+			$rule                = Filter::post('rule', 'allow|deny|robot');
+			$comment             = Filter::post('comment');
+			$user_agent_string   = Filter::server('HTTP_USER_AGENT');
+			$ip_address          = WT_CLIENT_IP;
+
+			if ($ip_address_start !== null && $ip_address_end !== null && $user_agent_pattern !== null && $rule !== null) {
+				// This doesn't work with named placeholders. The :user_agent_string parameter is not recognised.
+				$oops = $rule !== 'allow' && Database::prepare(
+					"SELECT INET_ATON(:ip_address) BETWEEN INET_ATON(:ip_address_start) AND INET_ATON(:ip_address_end)" .
+					" AND :user_agent_string LIKE :user_agent_pattern"
 				)->execute(array(
-					'ip_address_start'    => $ip_address_start,
-					'ip_address_end'      => $ip_address_end,
-					'user_agent_pattern'  => $user_agent_pattern,
-					'rule'                => $rule,
-					'comment'             => $comment,
-					'site_access_rule_id' => $site_access_rule_id,
-				));
-				FlashMessages::addMessage(I18N::translate('The website access rule has been updated.'), 'success');
+					'ip_address'         => $ip_address,
+					'ip_address_start'   => $ip_address_start,
+					'ip_address_end'     => $ip_address_end,
+					'user_agent_string'  => $user_agent_string,
+					'user_agent_pattern' => $user_agent_pattern,
+				))->fetchOne();
+
+				if ($oops) {
+					FlashMessages::addMessage(I18N::translate('You cannot create a rule which would prevent yourself from accessing the website.'), 'danger');
+				} elseif ($site_access_rule_id === null) {
+					Database::prepare(
+						"INSERT INTO `##site_access_rule` (ip_address_start, ip_address_end, user_agent_pattern, rule, comment) VALUES (INET_ATON(:ip_address_start), INET_ATON(:ip_address_end), :user_agent_pattern, :rule, :comment)"
+					)->execute(array(
+						'ip_address_start'    => $ip_address_start,
+						'ip_address_end'      => $ip_address_end,
+						'user_agent_pattern'  => $user_agent_pattern,
+						'rule'                => $rule,
+						'comment'             => $comment,
+					));
+					FlashMessages::addMessage(I18N::translate('The website access rule has been created.'), 'success');
+				} else {
+					Database::prepare(
+						"UPDATE `##site_access_rule` SET ip_address_start = INET_ATON(:ip_address_start), ip_address_end = INET_ATON(:ip_address_end), user_agent_pattern = :user_agent_pattern, rule = :rule, comment = :comment WHERE site_access_rule_id = :site_access_rule_id"
+					)->execute(array(
+						'ip_address_start'    => $ip_address_start,
+						'ip_address_end'      => $ip_address_end,
+						'user_agent_pattern'  => $user_agent_pattern,
+						'rule'                => $rule,
+						'comment'             => $comment,
+						'site_access_rule_id' => $site_access_rule_id,
+					));
+					FlashMessages::addMessage(I18N::translate('The website access rule has been updated.'), 'success');
+				}
 			}
 		}
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+		header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-	return;
+		return;
 
-case 'delete':
-	if (Filter::checkCsrf()) {
-		$site_access_rule_id = Filter::postInteger('site_access_rule_id');
-		Database::prepare(
-			"DELETE FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
-		)->execute(array(
-			'site_access_rule_id' => $site_access_rule_id,
-		));
-		FlashMessages::addMessage(I18N::translate('The website access rule has been deleted.'), 'success');
-	}
-	header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
+	case 'delete':
+		if (Filter::checkCsrf()) {
+			$site_access_rule_id = Filter::postInteger('site_access_rule_id');
+			Database::prepare(
+				"DELETE FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
+			)->execute(array(
+				'site_access_rule_id' => $site_access_rule_id,
+			));
+			FlashMessages::addMessage(I18N::translate('The website access rule has been deleted.'), 'success');
+		}
+		header('Location: ' . WT_BASE_URL . WT_SCRIPT_NAME);
 
-	return;
+		return;
 }
 
 // Delete any "unknown" visitors that are now "known".
@@ -128,50 +128,50 @@ 
 
 $action = Filter::get('action');
 switch ($action) {
-case 'load':
-	// AJAX callback for datatables
-	$search = Filter::get('search');
-	$search = $search['value'];
-	$start  = Filter::getInteger('start');
-	$length = Filter::getInteger('length');
-
-	$sql =
-		"SELECT SQL_CALC_FOUND_ROWS" .
-		" '', INET_NTOA(ip_address_start), ip_address_start, INET_NTOA(ip_address_end), ip_address_end, user_agent_pattern, rule, comment, site_access_rule_id" .
-		" FROM `##site_access_rule`";
-	$args = array();
-
-	if ($search) {
-		$sql .=
-			" WHERE (INET_ATON(:search_1) BETWEEN ip_address_start AND ip_address_end" .
-			" OR INET_NTOA(ip_address_start) LIKE CONCAT('%', :search_2, '%')" .
-			" OR INET_NTOA(ip_address_end) LIKE CONCAT('%', :search_3, '%')" .
-			" OR user_agent_pattern LIKE CONCAT('%', :search_4, '%')" .
-			" OR comment LIKE CONCAT('%', :search_5, '%'))";
-		$args['search_1'] = Filter::escapeLike($search);
-		$args['search_2'] = Filter::escapeLike($search);
-		$args['search_3'] = Filter::escapeLike($search);
-		$args['search_4'] = Filter::escapeLike($search);
-		$args['search_5'] = Filter::escapeLike($search);
-	}
+	case 'load':
+		// AJAX callback for datatables
+		$search = Filter::get('search');
+		$search = $search['value'];
+		$start  = Filter::getInteger('start');
+		$length = Filter::getInteger('length');
+
+		$sql =
+			"SELECT SQL_CALC_FOUND_ROWS" .
+			" '', INET_NTOA(ip_address_start), ip_address_start, INET_NTOA(ip_address_end), ip_address_end, user_agent_pattern, rule, comment, site_access_rule_id" .
+			" FROM `##site_access_rule`";
+		$args = array();
+
+		if ($search) {
+			$sql .=
+				" WHERE (INET_ATON(:search_1) BETWEEN ip_address_start AND ip_address_end" .
+				" OR INET_NTOA(ip_address_start) LIKE CONCAT('%', :search_2, '%')" .
+				" OR INET_NTOA(ip_address_end) LIKE CONCAT('%', :search_3, '%')" .
+				" OR user_agent_pattern LIKE CONCAT('%', :search_4, '%')" .
+				" OR comment LIKE CONCAT('%', :search_5, '%'))";
+			$args['search_1'] = Filter::escapeLike($search);
+			$args['search_2'] = Filter::escapeLike($search);
+			$args['search_3'] = Filter::escapeLike($search);
+			$args['search_4'] = Filter::escapeLike($search);
+			$args['search_5'] = Filter::escapeLike($search);
+		}
 
-	$order = Filter::getArray('order');
-	$sql .= ' ORDER BY';
-	if ($order) {
-		foreach ($order as $key => $value) {
-			if ($key > 0) {
-				$sql .= ',';
-			}
-			// Datatables numbers columns 0, 1, 2
-			// MySQL numbers columns 1, 2, 3
-			switch ($value['dir']) {
-			case 'asc':
-				$sql .= " :col_" . $key . " ASC";
-				break;
-			case 'desc':
-				$sql .= " :col_" . $key . " DESC";
-				break;
-			}
+		$order = Filter::getArray('order');
+		$sql .= ' ORDER BY';
+		if ($order) {
+			foreach ($order as $key => $value) {
+				if ($key > 0) {
+					$sql .= ',';
+				}
+				// Datatables numbers columns 0, 1, 2
+				// MySQL numbers columns 1, 2, 3
+				switch ($value['dir']) {
+					case 'asc':
+						$sql .= " :col_" . $key . " ASC";
+						break;
+					case 'desc':
+						$sql .= " :col_" . $key . " DESC";
+						break;
+				}
 			$args['col_' . $key] = 1 + $value['column'];
 		}
 	} else {
@@ -210,31 +210,31 @@ 
 	));
 	break;
 
-case 'edit':
-case 'create':
-	if (Filter::get('action') === 'edit') {
-		$controller->setPageTitle(I18N::translate('Edit a website access rule'));
-	} else {
-		$controller->setPageTitle(I18N::translate('Create a website access rule'));
-	}
+	case 'edit':
+	case 'create':
+		if (Filter::get('action') === 'edit') {
+			$controller->setPageTitle(I18N::translate('Edit a website access rule'));
+		} else {
+			$controller->setPageTitle(I18N::translate('Create a website access rule'));
+		}
 
-	$controller->pageHeader();
+		$controller->pageHeader();
 
-	$site_access_rule = Database::prepare(
-		"SELECT site_access_rule_id, INET_NTOA(ip_address_start) AS ip_address_start, INET_NTOA(ip_address_end) AS ip_address_end, user_agent_pattern, rule, comment" .
-		" FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
-	)->execute(array(
-		'site_access_rule_id' => Filter::getInteger('site_access_rule_id'),
-	))->fetchOneRow();
+		$site_access_rule = Database::prepare(
+			"SELECT site_access_rule_id, INET_NTOA(ip_address_start) AS ip_address_start, INET_NTOA(ip_address_end) AS ip_address_end, user_agent_pattern, rule, comment" .
+			" FROM `##site_access_rule` WHERE site_access_rule_id = :site_access_rule_id"
+		)->execute(array(
+			'site_access_rule_id' => Filter::getInteger('site_access_rule_id'),
+		))->fetchOneRow();
 
-	$site_access_rule_id = $site_access_rule ? $site_access_rule->site_access_rule_id : null;
-	$ip_address_start    = $site_access_rule ? $site_access_rule->ip_address_start : '0.0.0.0';
-	$ip_address_end      = $site_access_rule ? $site_access_rule->ip_address_end : '255.255.255.255';
-	$user_agent_pattern  = $site_access_rule ? $site_access_rule->user_agent_pattern : '%';
-	$rule                = $site_access_rule ? $site_access_rule->rule : 'allow';
-	$comment             = $site_access_rule ? $site_access_rule->comment : '';
+		$site_access_rule_id = $site_access_rule ? $site_access_rule->site_access_rule_id : null;
+		$ip_address_start    = $site_access_rule ? $site_access_rule->ip_address_start : '0.0.0.0';
+		$ip_address_end      = $site_access_rule ? $site_access_rule->ip_address_end : '255.255.255.255';
+		$user_agent_pattern  = $site_access_rule ? $site_access_rule->user_agent_pattern : '%';
+		$rule                = $site_access_rule ? $site_access_rule->rule : 'allow';
+		$comment             = $site_access_rule ? $site_access_rule->comment : '';
 
-	?>
+		?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li><a href="admin_site_access.php"><?php echo I18N::translate('Website access rules'); ?></a></li>
@@ -311,12 +311,12 @@ 
 	</form>
 
 	<?php
-	break;
+		break;
 
-default:
-	$controller
-		->pageHeader()
-		->addInlineJavascript('
+	default:
+		$controller
+			->pageHeader()
+			->addInlineJavascript('
 			jQuery.fn.dataTableExt.oSort["unicode-asc" ]=function(a,b) {return a.replace(/<[^<]*>/, "").localeCompare(b.replace(/<[^<]*>/, ""))};
 			jQuery.fn.dataTableExt.oSort["unicode-desc"]=function(a,b) {return b.replace(/<[^<]*>/, "").localeCompare(a.replace(/<[^<]*>/, ""))};
 			jQuery(".table-site-access-rules").dataTable({
@@ -340,7 +340,7 @@ 
 			});
 		');
 
-	?>
+		?>
 	<ol class="breadcrumb small">
 		<li><a href="admin.php"><?php echo I18N::translate('Control panel'); ?></a></li>
 		<li class="active"><?php echo $controller->getPageTitle(); ?></li>
@@ -381,5 +381,5 @@ 
 		}
 	</script>
 	<?php
-	break;
+		break;
 }