fisharebest / webtrees

app/Module/UserJournalModule.php

Switch Indentation +6 added lines, -6 removed lines

@@ -69,12 +69,12 @@
 		global $ctype, $WT_TREE;
 
 		switch (Filter::get('action')) {
-		case 'deletenews':
-			$news_id = Filter::getInteger('news_id');
-			if ($news_id) {
-				Database::prepare("DELETE FROM `##news` WHERE news_id = ?")->execute(array($news_id));
-			}
-			break;
+		    case 'deletenews':
+			    $news_id = Filter::getInteger('news_id');
+			    if ($news_id) {
+				    Database::prepare("DELETE FROM `##news` WHERE news_id = ?")->execute(array($news_id));
+			    }
+			    break;
 		}
 
 		$articles = Database::prepare(

app/Module/InteractiveTreeModule.php

Switch Indentation +41 added lines, -41 removed lines

@@ -122,53 +122,53 @@
 		global $controller, $WT_TREE;
 
 		switch ($mod_action) {
-		case 'treeview':
-			$controller = new ChartController;
-			$tv         = new TreeView('tv');
-			ob_start();
-
-			$person = $controller->getSignificantIndividual();
-
-			list($html, $js) = $tv->drawViewport($person, 4);
-
-			$controller
-				->setPageTitle(I18N::translate('Interactive tree of %s', $person->getFullName()))
-				->pageHeader()
-				->addExternalJavascript($this->js())
-				->addExternalJavascript(WT_JQUERYUI_TOUCH_PUNCH_URL)
-				->addInlineJavascript($js)
-				->addInlineJavascript('
+		    case 'treeview':
+			    $controller = new ChartController;
+			    $tv         = new TreeView('tv');
+			    ob_start();
+
+			    $person = $controller->getSignificantIndividual();
+
+			    list($html, $js) = $tv->drawViewport($person, 4);
+
+			    $controller
+				    ->setPageTitle(I18N::translate('Interactive tree of %s', $person->getFullName()))
+				    ->pageHeader()
+				    ->addExternalJavascript($this->js())
+				    ->addExternalJavascript(WT_JQUERYUI_TOUCH_PUNCH_URL)
+				    ->addInlineJavascript($js)
+				    ->addInlineJavascript('
 					if (document.createStyleSheet) {
 						document.createStyleSheet("' . $this->css() . '"); // For Internet Explorer
 					} else {
 						jQuery("head").append(\'<link rel="stylesheet" type="text/css" href="' . $this->css() . '">\');
 					}
 				');
-			echo $html;
-			break;
-
-		case 'getDetails':
-			header('Content-Type: text/html; charset=UTF-8');
-			$pid        = Filter::get('pid', WT_REGEX_XREF);
-			$i          = Filter::get('instance');
-			$tv         = new TreeView($i);
-			$individual = Individual::getInstance($pid, $WT_TREE);
-			if ($individual) {
-				echo $tv->getDetails($individual);
-			}
-			break;
-
-		case 'getPersons':
-			header('Content-Type: text/html; charset=UTF-8');
-			$q  = Filter::get('q');
-			$i  = Filter::get('instance');
-			$tv = new TreeView($i);
-			echo $tv->getPersons($q);
-			break;
-
-		default:
-			http_response_code(404);
-			break;
+			    echo $html;
+			    break;
+
+		    case 'getDetails':
+			    header('Content-Type: text/html; charset=UTF-8');
+			    $pid        = Filter::get('pid', WT_REGEX_XREF);
+			    $i          = Filter::get('instance');
+			    $tv         = new TreeView($i);
+			    $individual = Individual::getInstance($pid, $WT_TREE);
+			    if ($individual) {
+				    echo $tv->getDetails($individual);
+			    }
+			    break;
+
+		    case 'getPersons':
+			    header('Content-Type: text/html; charset=UTF-8');
+			    $q  = Filter::get('q');
+			    $i  = Filter::get('instance');
+			    $tv = new TreeView($i);
+			    echo $tv->getPersons($q);
+			    break;
+
+		    default:
+			    http_response_code(404);
+			    break;
 		}
 	}
 

app/Module/RecentChangesModule.php

Switch Indentation +43 added lines, -43 removed lines

@@ -89,12 +89,12 @@ 
 			$content .= I18N::plural('There have been no changes within the last %s day.', 'There have been no changes within the last %s days.', $days, I18N::number($days));
 		} else {
 			switch ($infoStyle) {
-			case 'list':
-				$content .= $this->changesList($records, $sortStyle, $show_user);
-				break;
-			case 'table':
-				$content .= $this->changesTable($records, $sortStyle, $show_user);
-				break;
+			    case 'list':
+				    $content .= $this->changesList($records, $sortStyle, $show_user);
+				    break;
+			    case 'table':
+				    $content .= $this->changesTable($records, $sortStyle, $show_user);
+				    break;
 			}
 		}
 
@@ -229,15 +229,15 @@ 
 	 */
 	private function changesList(array $records, $sort, $show_user) {
 		switch ($sort) {
-		case 'name':
-			uasort($records, array('self', 'sortByNameAndChangeDate'));
-			break;
-		case 'date_asc':
-			uasort($records, array('self', 'sortByChangeDateAndName'));
-			$records = array_reverse($records);
-			break;
-		case 'date_desc':
-			uasort($records, array('self', 'sortByChangeDateAndName'));
+		    case 'name':
+			    uasort($records, array('self', 'sortByNameAndChangeDate'));
+			    break;
+		    case 'date_asc':
+			    uasort($records, array('self', 'sortByChangeDateAndName'));
+			    $records = array_reverse($records);
+			    break;
+		    case 'date_desc':
+			    uasort($records, array('self', 'sortByChangeDateAndName'));
 		}
 
 		$html = '';
@@ -282,16 +282,16 @@ 
 		$table_id = 'table-chan-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
 
 		switch ($sort) {
-		case 'name':
-		default:
-			$aaSorting = "[1,'asc'], [2,'desc']";
-			break;
-		case 'date_asc':
-			$aaSorting = "[2,'asc'], [1,'asc']";
-			break;
-		case 'date_desc':
-			$aaSorting = "[2,'desc'], [1,'asc']";
-			break;
+		    case 'name':
+		    default:
+			    $aaSorting = "[1,'asc'], [2,'desc']";
+			    break;
+		    case 'date_asc':
+			    $aaSorting = "[2,'asc'], [1,'asc']";
+			    break;
+		    case 'date_desc':
+			    $aaSorting = "[2,'desc'], [1,'asc']";
+			    break;
 		}
 
 		$html = '';
@@ -327,24 +327,24 @@ 
 		foreach ($records as $record) {
 			$html .= '<tr><td>';
 			switch ($record::RECORD_TYPE) {
-			case 'INDI':
-				$html .= $record->getSexImage('small');
-				break;
-			case 'FAM':
-				$html .= '<i class="icon-button_family"></i>';
-				break;
-			case 'OBJE':
-				$html .= '<i class="icon-button_media"></i>';
-				break;
-			case 'NOTE':
-				$html .= '<i class="icon-button_note"></i>';
-				break;
-			case 'SOUR':
-				$html .= '<i class="icon-button_source"></i>';
-				break;
-			case 'REPO':
-				$html .= '<i class="icon-button_repository"></i>';
-				break;
+			    case 'INDI':
+				    $html .= $record->getSexImage('small');
+				    break;
+			    case 'FAM':
+				    $html .= '<i class="icon-button_family"></i>';
+				    break;
+			    case 'OBJE':
+				    $html .= '<i class="icon-button_media"></i>';
+				    break;
+			    case 'NOTE':
+				    $html .= '<i class="icon-button_note"></i>';
+				    break;
+			    case 'SOUR':
+				    $html .= '<i class="icon-button_source"></i>';
+				    break;
+			    case 'REPO':
+				    $html .= '<i class="icon-button_repository"></i>';
+				    break;
 			}
 			$html .= '</td>';
 			$html .= '<td data-sort="' . Filter::escapeHtml($record->getSortName()) . '">';

app/Module/TopGivenNamesModule.php

Switch Indentation +23 added lines, -23 removed lines

@@ -77,32 +77,32 @@
 		$content = '<div class="normal_inner_block">';
 		//Select List or Table
 		switch ($infoStyle) {
-		case "list": // Output style 1:  Simple list style. Better suited to left side of page.
-			if (I18N::direction() === 'ltr') {
-				$padding = 'padding-left: 15px';
-			} else {
-				$padding = 'padding-right: 15px';
-			}
-			$params = array(1, $num, 'rcount');
-			// List Female names
-			$totals = $stats->commonGivenFemaleTotals($params);
-			if ($totals) {
-				$content .= '<b>' . I18N::translate('Females') . '</b><div class="wrap" style="' . $padding . '">' . $totals . '</div><br>';
-			}
-			// List Male names
-			$totals = $stats->commonGivenMaleTotals($params);
-			if ($totals) {
-				$content .= '<b>' . I18N::translate('Males') . '</b><div class="wrap" style="' . $padding . '">' . $totals . '</div><br>';
-			}
-			break;
-		case "table": // Style 2: Tabular format. Narrow, 2 or 3 column table, good on right side of page
-			$params = array(1, $num, 'rcount');
-			$content .= '<table style="margin:auto;">
+		    case "list": // Output style 1:  Simple list style. Better suited to left side of page.
+			    if (I18N::direction() === 'ltr') {
+				    $padding = 'padding-left: 15px';
+			    } else {
+				    $padding = 'padding-right: 15px';
+			    }
+			    $params = array(1, $num, 'rcount');
+			    // List Female names
+			    $totals = $stats->commonGivenFemaleTotals($params);
+			    if ($totals) {
+				    $content .= '<b>' . I18N::translate('Females') . '</b><div class="wrap" style="' . $padding . '">' . $totals . '</div><br>';
+			    }
+			    // List Male names
+			    $totals = $stats->commonGivenMaleTotals($params);
+			    if ($totals) {
+				    $content .= '<b>' . I18N::translate('Males') . '</b><div class="wrap" style="' . $padding . '">' . $totals . '</div><br>';
+			    }
+			    break;
+		    case "table": // Style 2: Tabular format. Narrow, 2 or 3 column table, good on right side of page
+			    $params = array(1, $num, 'rcount');
+			    $content .= '<table style="margin:auto;">
 						<tr>
 						<td>' . $stats->commonGivenFemaleTable($params) . '</td>
 						<td>' . $stats->commonGivenMaleTable($params) . '</td>';
-			$content .= '</tr></table>';
-			break;
+			    $content .= '</tr></table>';
+			    break;
 		}
 		$content .= "</div>";
 

app/Module/OnThisDayModule.php

Switch Indentation +10 added lines, -10 removed lines

@@ -76,16 +76,16 @@
 		$tags = $filter ? 'BIRT MARR' : 'BIRT MARR DEAT';
 
 		switch ($infoStyle) {
-		case 'list':
-			// Output style 1:  Old format, no visible tables, much smaller text. Better suited to right side of page.
-			$content .= FunctionsPrintLists::eventsList($todayjd, $todayjd, $tags, $filter, $sortStyle);
-			break;
-		case 'table':
-			// Style 2: New format, tables, big text, etc. Not too good on right side of page
-			ob_start();
-			$content .= FunctionsPrintLists::eventsTable($todayjd, $todayjd, $tags, $filter, $sortStyle);
-			$content .= ob_get_clean();
-			break;
+		    case 'list':
+			    // Output style 1:  Old format, no visible tables, much smaller text. Better suited to right side of page.
+			    $content .= FunctionsPrintLists::eventsList($todayjd, $todayjd, $tags, $filter, $sortStyle);
+			    break;
+		    case 'table':
+			    // Style 2: New format, tables, big text, etc. Not too good on right side of page
+			    ob_start();
+			    $content .= FunctionsPrintLists::eventsTable($todayjd, $todayjd, $tags, $filter, $sortStyle);
+			    $content .= ob_get_clean();
+			    break;
 		}
 
 		if ($template) {

app/Module/YahrzeitModule.php

Switch Indentation +61 added lines, -61 removed lines

@@ -119,24 +119,24 @@ 
 		}
 
 		switch ($infoStyle) {
-		case 'list':
-			foreach ($yahrzeits as $yahrzeit) {
-				if ($yahrzeit->jd >= $startjd && $yahrzeit->jd < $startjd + $days) {
-					$ind = $yahrzeit->getParent();
-					$content .= "<a href=\"" . $ind->getHtmlUrl() . "\" class=\"list_item name2\">" . $ind->getFullName() . "</a>" . $ind->getSexImage();
-					$content .= "<div class=\"indent\">";
-					$content .= $yahrzeit->getDate()->display(true);
-					$content .= ', ' . I18N::translate('%s year anniversary', $yahrzeit->anniv);
-					$content .= "</div>";
-				}
-			}
-			break;
-		case 'table':
-		default:
-			$table_id = Uuid::uuid4(); // table requires a unique ID
-			$controller
-				->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
-				->addInlineJavascript('
+		    case 'list':
+			    foreach ($yahrzeits as $yahrzeit) {
+				    if ($yahrzeit->jd >= $startjd && $yahrzeit->jd < $startjd + $days) {
+					    $ind = $yahrzeit->getParent();
+					    $content .= "<a href=\"" . $ind->getHtmlUrl() . "\" class=\"list_item name2\">" . $ind->getFullName() . "</a>" . $ind->getSexImage();
+					    $content .= "<div class=\"indent\">";
+					    $content .= $yahrzeit->getDate()->display(true);
+					    $content .= ', ' . I18N::translate('%s year anniversary', $yahrzeit->anniv);
+					    $content .= "</div>";
+				    }
+			    }
+			    break;
+		    case 'table':
+		    default:
+			    $table_id = Uuid::uuid4(); // table requires a unique ID
+			    $controller
+				    ->addExternalJavascript(WT_JQUERY_DATATABLES_JS_URL)
+				    ->addInlineJavascript('
 					jQuery("#' . $table_id . '").dataTable({
 						dom: \'t\',
 						' . I18N::datatablesI18N() . ',
@@ -160,53 +160,53 @@ 
 					jQuery("#' . $table_id . '").css("visibility", "visible");
 					jQuery(".loading-image").css("display", "none");
 				');
-			$content = '';
-			$content .= '<div class="loading-image">&nbsp;</div>';
-			$content .= '<table id="' . $table_id . '" class="width100" style="visibility:hidden;">';
-			$content .= '<thead><tr>';
-			$content .= '<th>' . GedcomTag::getLabel('NAME') . '</th>';
-			$content .= '<th>' . GedcomTag::getLabel('NAME') . '</th>';
-			$content .= '<th>' . GedcomTag::getLabel('DEAT') . '</th>';
-			$content .= '<th>DEAT</th>';
-			$content .= '<th><i class="icon-reminder" title="' . I18N::translate('Anniversary') . '"></i></th>';
-			$content .= '<th>' . GedcomTag::getLabel('_YART') . '</th>';
-			$content .= '<th>_YART</th>';
-			$content .= '</tr></thead><tbody>';
+			    $content = '';
+			    $content .= '<div class="loading-image">&nbsp;</div>';
+			    $content .= '<table id="' . $table_id . '" class="width100" style="visibility:hidden;">';
+			    $content .= '<thead><tr>';
+			    $content .= '<th>' . GedcomTag::getLabel('NAME') . '</th>';
+			    $content .= '<th>' . GedcomTag::getLabel('NAME') . '</th>';
+			    $content .= '<th>' . GedcomTag::getLabel('DEAT') . '</th>';
+			    $content .= '<th>DEAT</th>';
+			    $content .= '<th><i class="icon-reminder" title="' . I18N::translate('Anniversary') . '"></i></th>';
+			    $content .= '<th>' . GedcomTag::getLabel('_YART') . '</th>';
+			    $content .= '<th>_YART</th>';
+			    $content .= '</tr></thead><tbody>';
 
-			foreach ($yahrzeits as $yahrzeit) {
-				if ($yahrzeit->jd >= $startjd && $yahrzeit->jd < $startjd + $days) {
-					$content .= '<tr>';
-					$ind = $yahrzeit->getParent();
-					// Individual name(s)
-					$name = $ind->getFullName();
-					$url  = $ind->getHtmlUrl();
-					$content .= '<td>';
-					$content .= '<a href="' . $url . '">' . $name . '</a>';
-					$content .= $ind->getSexImage();
-					$addname = $ind->getAddName();
-					if ($addname) {
-						$content .= '<br><a href="' . $url . '">' . $addname . '</a>';
-					}
-					$content .= '</td>';
-					$content .= '<td>' . $ind->getSortName() . '</td>';
+			    foreach ($yahrzeits as $yahrzeit) {
+				    if ($yahrzeit->jd >= $startjd && $yahrzeit->jd < $startjd + $days) {
+					    $content .= '<tr>';
+					    $ind = $yahrzeit->getParent();
+					    // Individual name(s)
+					    $name = $ind->getFullName();
+					    $url  = $ind->getHtmlUrl();
+					    $content .= '<td>';
+					    $content .= '<a href="' . $url . '">' . $name . '</a>';
+					    $content .= $ind->getSexImage();
+					    $addname = $ind->getAddName();
+					    if ($addname) {
+						    $content .= '<br><a href="' . $url . '">' . $addname . '</a>';
+					    }
+					    $content .= '</td>';
+					    $content .= '<td>' . $ind->getSortName() . '</td>';
 
-					// death/yahrzeit event date
-					$content .= '<td>' . $yahrzeit->getDate()->display() . '</td>';
-					$content .= '<td>' . $yahrzeit->getDate()->julianDay() . '</td>'; // sortable date
+					    // death/yahrzeit event date
+					    $content .= '<td>' . $yahrzeit->getDate()->display() . '</td>';
+					    $content .= '<td>' . $yahrzeit->getDate()->julianDay() . '</td>'; // sortable date
 
-					// Anniversary
-					$content .= '<td>' . $yahrzeit->anniv . '</td>';
+					    // Anniversary
+					    $content .= '<td>' . $yahrzeit->anniv . '</td>';
 
-					// upcomming yahrzeit dates
-					switch ($calendar) {
-					case 'gregorian':
-						$today = new GregorianDate($yahrzeit->jd);
-						break;
-					case 'jewish':
-					default:
-						$today = new JewishDate($yahrzeit->jd);
-						break;
-					}
+					    // upcomming yahrzeit dates
+					    switch ($calendar) {
+					        case 'gregorian':
+						        $today = new GregorianDate($yahrzeit->jd);
+						        break;
+					        case 'jewish':
+					        default:
+						        $today = new JewishDate($yahrzeit->jd);
+						        break;
+					    }
 					$td = new Date($today->format('%@ %A %O %E'));
 					$content .= '<td>' . $td->display() . '</td>';
 					$content .= '<td>' . $td->julianDay() . '</td>'; // sortable date

app/Module/UserFavoritesModule.php

Switch Indentation +16 added lines, -16 removed lines

@@ -80,22 +80,22 @@
 		global $WT_TREE;
 
 		switch ($mod_action) {
-		case 'menu-add-favorite':
-			// Process the "add to user favorites" menu item on indi/fam/etc. pages
-			$record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
-			if (Auth::check() && $record->canShowName()) {
-				self::addFavorite(array(
-					'user_id'   => Auth::id(),
-					'gedcom_id' => $record->getTree()->getTreeId(),
-					'gid'       => $record->getXref(),
-					'type'      => $record::RECORD_TYPE,
-					'url'       => null,
-					'note'      => null,
-					'title'     => null,
-				));
-				FlashMessages::addMessage(/* I18N: %s is the name of an individual, source or other record */ I18N::translate('“%s” has been added to your favorites.', $record->getFullName()));
-			}
-			break;
+		    case 'menu-add-favorite':
+			    // Process the "add to user favorites" menu item on indi/fam/etc. pages
+			    $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
+			    if (Auth::check() && $record->canShowName()) {
+				    self::addFavorite(array(
+					    'user_id'   => Auth::id(),
+					    'gedcom_id' => $record->getTree()->getTreeId(),
+					    'gid'       => $record->getXref(),
+					    'type'      => $record::RECORD_TYPE,
+					    'url'       => null,
+					    'note'      => null,
+					    'title'     => null,
+				    ));
+				    FlashMessages::addMessage(/* I18N: %s is the name of an individual, source or other record */ I18N::translate('“%s” has been added to your favorites.', $record->getFullName()));
+			    }
+			    break;
 		}
 	}
 }

app/Module/UserMessagesModule.php

Switch Indentation +9 added lines, -9 removed lines

@@ -46,15 +46,15 @@
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'delete':
-			$stmt = Database::prepare("DELETE FROM `##message` WHERE user_id = :user_id AND message_id = :message_id");
-
-			foreach (Filter::postArray('message_id') as $id) {
-				$stmt->execute(array(
-					'message_id' => $id,
-					'user_id'    => Auth::id(),
-				));
-			}
+		    case 'delete':
+			    $stmt = Database::prepare("DELETE FROM `##message` WHERE user_id = :user_id AND message_id = :message_id");
+
+			    foreach (Filter::postArray('message_id') as $id) {
+				    $stmt->execute(array(
+					    'message_id' => $id,
+					    'user_id'    => Auth::id(),
+				    ));
+			    }
 		}
 
 		$ged   = Filter::post('ged');

app/Module/CensusAssistantModule.php

Switch Indentation +11 added lines, -11 removed lines

@@ -52,17 +52,17 @@
 	 */
 	public function modAction($mod_action) {
 		switch ($mod_action) {
-		case 'census_find':
-			self::censusFind();
-			break;
-		case 'media_find':
-			self::mediaFind();
-			break;
-		case 'media_query_3a':
-			self::mediaQuery();
-			break;
-		default:
-			http_response_code(404);
+		    case 'census_find':
+			    self::censusFind();
+			    break;
+		    case 'media_find':
+			    self::mediaFind();
+			    break;
+		    case 'media_query_3a':
+			    self::mediaQuery();
+			    break;
+		    default:
+			    http_response_code(404);
 		}
 	}