Completed
Push — 1.7 ( 35206a...5c14a5 )
by Greg
17:33 queued 07:18
created
app/Module/FamilyTreeFavoritesModule.php 1 patch
Switch Indentation   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -85,43 +85,43 @@  discard block
 block discarded – undo
85 85
 
86 86
 		$action = Filter::get('action');
87 87
 		switch ($action) {
88
-		case 'deletefav':
89
-			$favorite_id = Filter::getInteger('favorite_id');
90
-			if ($favorite_id) {
91
-				self::deleteFavorite($favorite_id);
92
-			}
93
-			break;
94
-		case 'addfav':
95
-			$gid      = Filter::get('gid', WT_REGEX_XREF);
96
-			$favnote  = Filter::get('favnote');
97
-			$url      = Filter::getUrl('url');
98
-			$favtitle = Filter::get('favtitle');
88
+			case 'deletefav':
89
+				$favorite_id = Filter::getInteger('favorite_id');
90
+				if ($favorite_id) {
91
+					self::deleteFavorite($favorite_id);
92
+				}
93
+				break;
94
+			case 'addfav':
95
+				$gid      = Filter::get('gid', WT_REGEX_XREF);
96
+				$favnote  = Filter::get('favnote');
97
+				$url      = Filter::getUrl('url');
98
+				$favtitle = Filter::get('favtitle');
99 99
 
100
-			if ($gid) {
101
-				$record = GedcomRecord::getInstance($gid, $WT_TREE);
102
-				if ($record && $record->canShow()) {
100
+				if ($gid) {
101
+					$record = GedcomRecord::getInstance($gid, $WT_TREE);
102
+					if ($record && $record->canShow()) {
103
+						self::addFavorite(array(
104
+							'user_id'   => $ctype === 'user' ? Auth::id() : null,
105
+							'gedcom_id' => $WT_TREE->getTreeId(),
106
+							'gid'       => $record->getXref(),
107
+							'type'      => $record::RECORD_TYPE,
108
+							'url'       => null,
109
+							'note'      => $favnote,
110
+							'title'     => $favtitle,
111
+						));
112
+					}
113
+				} elseif ($url) {
103 114
 					self::addFavorite(array(
104 115
 						'user_id'   => $ctype === 'user' ? Auth::id() : null,
105 116
 						'gedcom_id' => $WT_TREE->getTreeId(),
106
-						'gid'       => $record->getXref(),
107
-						'type'      => $record::RECORD_TYPE,
108
-						'url'       => null,
117
+						'gid'       => null,
118
+						'type'      => 'URL',
119
+						'url'       => $url,
109 120
 						'note'      => $favnote,
110
-						'title'     => $favtitle,
121
+						'title'     => $favtitle ? $favtitle : $url,
111 122
 					));
112 123
 				}
113
-			} elseif ($url) {
114
-				self::addFavorite(array(
115
-					'user_id'   => $ctype === 'user' ? Auth::id() : null,
116
-					'gedcom_id' => $WT_TREE->getTreeId(),
117
-					'gid'       => null,
118
-					'type'      => 'URL',
119
-					'url'       => $url,
120
-					'note'      => $favnote,
121
-					'title'     => $favtitle ? $favtitle : $url,
122
-				));
123
-			}
124
-			break;
124
+				break;
125 125
 		}
126 126
 
127 127
 		$block = $this->getBlockSetting($block_id, 'block', '0');
@@ -168,14 +168,14 @@  discard block
 block discarded – undo
168 168
 						if ($record instanceof Individual) {
169 169
 							$content .= '<div id="box' . $favorite["gid"] . '.0" class="person_box action_header';
170 170
 							switch ($record->getSex()) {
171
-							case 'M':
172
-								break;
173
-							case 'F':
174
-								$content .= 'F';
175
-								break;
176
-							default:
177
-								$content .= 'NN';
178
-								break;
171
+								case 'M':
172
+									break;
173
+								case 'F':
174
+									$content .= 'F';
175
+									break;
176
+								default:
177
+									$content .= 'NN';
178
+									break;
179 179
 							}
180 180
 							$content .= '">';
181 181
 							if ($ctype == "user" || Auth::isManager($WT_TREE)) {
Please login to merge, or discard this patch.
app/Module/FamiliesSidebarModule.php 1 patch
Switch Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -45,13 +45,13 @@  discard block
 block discarded – undo
45 45
 	 */
46 46
 	public function modAction($mod_action) {
47 47
 		switch ($mod_action) {
48
-		case 'ajax':
49
-			header('Content-Type: text/html; charset=UTF-8');
50
-			echo $this->getSidebarAjaxContent();
51
-			break;
52
-		default:
53
-			http_response_code(404);
54
-			break;
48
+			case 'ajax':
49
+				header('Content-Type: text/html; charset=UTF-8');
50
+				echo $this->getSidebarAjaxContent();
51
+				break;
52
+			default:
53
+				http_response_code(404);
54
+				break;
55 55
 		}
56 56
 	}
57 57
 
@@ -149,18 +149,18 @@  discard block
 block discarded – undo
149 149
 		$out = '<form method="post" action="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax" onsubmit="return false;"><input type="search" name="sb_fam_name" id="sb_fam_name" placeholder="' . I18N::translate('Search') . '"><p>';
150 150
 		foreach ($initials as $letter => $count) {
151 151
 			switch ($letter) {
152
-			case '@':
153
-				$html = I18N::translateContext('Unknown surname', '…');
154
-				break;
155
-			case ',':
156
-				$html = I18N::translate('None');
157
-				break;
158
-			case ' ':
159
-				$html = '&nbsp;';
160
-				break;
161
-			default:
162
-				$html = $letter;
163
-				break;
152
+				case '@':
153
+					$html = I18N::translateContext('Unknown surname', '…');
154
+					break;
155
+				case ',':
156
+					$html = I18N::translate('None');
157
+					break;
158
+				case ' ':
159
+					$html = '&nbsp;';
160
+					break;
161
+				default:
162
+					$html = $letter;
163
+					break;
164 164
 			}
165 165
 			$html = '<a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;alpha=' . urlencode($letter) . '" class="sb_fam_letter">' . $html . '</a>';
166 166
 			$out .= $html . " ";
Please login to merge, or discard this patch.
app/Module/RecentChangesModule.php 1 patch
Switch Indentation   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -89,12 +89,12 @@  discard block
 block discarded – undo
89 89
 			$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));
90 90
 		} else {
91 91
 			switch ($infoStyle) {
92
-			case 'list':
93
-				$content .= $this->changesList($records, $sortStyle, $show_user);
94
-				break;
95
-			case 'table':
96
-				$content .= $this->changesTable($records, $sortStyle, $show_user);
97
-				break;
92
+				case 'list':
93
+					$content .= $this->changesList($records, $sortStyle, $show_user);
94
+					break;
95
+				case 'table':
96
+					$content .= $this->changesTable($records, $sortStyle, $show_user);
97
+					break;
98 98
 			}
99 99
 		}
100 100
 
@@ -229,15 +229,15 @@  discard block
 block discarded – undo
229 229
 	 */
230 230
 	private function changesList(array $records, $sort, $show_user) {
231 231
 		switch ($sort) {
232
-		case 'name':
233
-			uasort($records, array('self', 'sortByNameAndChangeDate'));
234
-			break;
235
-		case 'date_asc':
236
-			uasort($records, array('self', 'sortByChangeDateAndName'));
237
-			$records = array_reverse($records);
238
-			break;
239
-		case 'date_desc':
240
-			uasort($records, array('self', 'sortByChangeDateAndName'));
232
+			case 'name':
233
+				uasort($records, array('self', 'sortByNameAndChangeDate'));
234
+				break;
235
+			case 'date_asc':
236
+				uasort($records, array('self', 'sortByChangeDateAndName'));
237
+				$records = array_reverse($records);
238
+				break;
239
+			case 'date_desc':
240
+				uasort($records, array('self', 'sortByChangeDateAndName'));
241 241
 		}
242 242
 
243 243
 		$html = '';
@@ -282,16 +282,16 @@  discard block
 block discarded – undo
282 282
 		$table_id = 'table-chan-' . Uuid::uuid4(); // lists requires a unique ID in case there are multiple lists per page
283 283
 
284 284
 		switch ($sort) {
285
-		case 'name':
286
-		default:
287
-			$aaSorting = "[1,'asc'], [2,'desc']";
288
-			break;
289
-		case 'date_asc':
290
-			$aaSorting = "[2,'asc'], [1,'asc']";
291
-			break;
292
-		case 'date_desc':
293
-			$aaSorting = "[2,'desc'], [1,'asc']";
294
-			break;
285
+			case 'name':
286
+			default:
287
+				$aaSorting = "[1,'asc'], [2,'desc']";
288
+				break;
289
+			case 'date_asc':
290
+				$aaSorting = "[2,'asc'], [1,'asc']";
291
+				break;
292
+			case 'date_desc':
293
+				$aaSorting = "[2,'desc'], [1,'asc']";
294
+				break;
295 295
 		}
296 296
 
297 297
 		$html = '';
@@ -327,24 +327,24 @@  discard block
 block discarded – undo
327 327
 		foreach ($records as $record) {
328 328
 			$html .= '<tr><td>';
329 329
 			switch ($record::RECORD_TYPE) {
330
-			case 'INDI':
331
-				$html .= $record->getSexImage('small');
332
-				break;
333
-			case 'FAM':
334
-				$html .= '<i class="icon-button_family"></i>';
335
-				break;
336
-			case 'OBJE':
337
-				$html .= '<i class="icon-button_media"></i>';
338
-				break;
339
-			case 'NOTE':
340
-				$html .= '<i class="icon-button_note"></i>';
341
-				break;
342
-			case 'SOUR':
343
-				$html .= '<i class="icon-button_source"></i>';
344
-				break;
345
-			case 'REPO':
346
-				$html .= '<i class="icon-button_repository"></i>';
347
-				break;
330
+				case 'INDI':
331
+					$html .= $record->getSexImage('small');
332
+					break;
333
+				case 'FAM':
334
+					$html .= '<i class="icon-button_family"></i>';
335
+					break;
336
+				case 'OBJE':
337
+					$html .= '<i class="icon-button_media"></i>';
338
+					break;
339
+				case 'NOTE':
340
+					$html .= '<i class="icon-button_note"></i>';
341
+					break;
342
+				case 'SOUR':
343
+					$html .= '<i class="icon-button_source"></i>';
344
+					break;
345
+				case 'REPO':
346
+					$html .= '<i class="icon-button_repository"></i>';
347
+					break;
348 348
 			}
349 349
 			$html .= '</td>';
350 350
 			$html .= '<td data-sort="' . Filter::escapeHtml($record->getSortName()) . '">';
Please login to merge, or discard this patch.
app/Module/CensusAssistantModule.php 1 patch
Switch Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -52,17 +52,17 @@
 block discarded – undo
52 52
 	 */
53 53
 	public function modAction($mod_action) {
54 54
 		switch ($mod_action) {
55
-		case 'census_find':
56
-			self::censusFind();
57
-			break;
58
-		case 'media_find':
59
-			self::mediaFind();
60
-			break;
61
-		case 'media_query_3a':
62
-			self::mediaQuery();
63
-			break;
64
-		default:
65
-			http_response_code(404);
55
+			case 'census_find':
56
+				self::censusFind();
57
+				break;
58
+			case 'media_find':
59
+				self::mediaFind();
60
+				break;
61
+			case 'media_query_3a':
62
+				self::mediaQuery();
63
+				break;
64
+			default:
65
+				http_response_code(404);
66 66
 		}
67 67
 	}
68 68
 
Please login to merge, or discard this patch.
app/Module/UserMessagesModule.php 1 patch
Switch Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -46,15 +46,15 @@
 block discarded – undo
46 46
 	 */
47 47
 	public function modAction($mod_action) {
48 48
 		switch ($mod_action) {
49
-		case 'delete':
50
-			$stmt = Database::prepare("DELETE FROM `##message` WHERE user_id = :user_id AND message_id = :message_id");
51
-
52
-			foreach (Filter::postArray('message_id') as $id) {
53
-				$stmt->execute(array(
54
-					'message_id' => $id,
55
-					'user_id'    => Auth::id(),
56
-				));
57
-			}
49
+			case 'delete':
50
+				$stmt = Database::prepare("DELETE FROM `##message` WHERE user_id = :user_id AND message_id = :message_id");
51
+
52
+				foreach (Filter::postArray('message_id') as $id) {
53
+					$stmt->execute(array(
54
+						'message_id' => $id,
55
+						'user_id'    => Auth::id(),
56
+					));
57
+				}
58 58
 		}
59 59
 
60 60
 		$ged   = Filter::post('ged');
Please login to merge, or discard this patch.
app/Module/InteractiveTreeModule.php 1 patch
Switch Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -122,53 +122,53 @@
 block discarded – undo
122 122
 		global $controller, $WT_TREE;
123 123
 
124 124
 		switch ($mod_action) {
125
-		case 'treeview':
126
-			$controller = new ChartController;
127
-			$tv         = new TreeView('tv');
128
-			ob_start();
129
-
130
-			$person = $controller->getSignificantIndividual();
131
-
132
-			list($html, $js) = $tv->drawViewport($person, 4);
133
-
134
-			$controller
135
-				->setPageTitle(I18N::translate('Interactive tree of %s', $person->getFullName()))
136
-				->pageHeader()
137
-				->addExternalJavascript($this->js())
138
-				->addExternalJavascript(WT_JQUERYUI_TOUCH_PUNCH_URL)
139
-				->addInlineJavascript($js)
140
-				->addInlineJavascript('
125
+			case 'treeview':
126
+				$controller = new ChartController;
127
+				$tv         = new TreeView('tv');
128
+				ob_start();
129
+
130
+				$person = $controller->getSignificantIndividual();
131
+
132
+				list($html, $js) = $tv->drawViewport($person, 4);
133
+
134
+				$controller
135
+					->setPageTitle(I18N::translate('Interactive tree of %s', $person->getFullName()))
136
+					->pageHeader()
137
+					->addExternalJavascript($this->js())
138
+					->addExternalJavascript(WT_JQUERYUI_TOUCH_PUNCH_URL)
139
+					->addInlineJavascript($js)
140
+					->addInlineJavascript('
141 141
 					if (document.createStyleSheet) {
142 142
 						document.createStyleSheet("' . $this->css() . '"); // For Internet Explorer
143 143
 					} else {
144 144
 						jQuery("head").append(\'<link rel="stylesheet" type="text/css" href="' . $this->css() . '">\');
145 145
 					}
146 146
 				');
147
-			echo $html;
148
-			break;
149
-
150
-		case 'getDetails':
151
-			header('Content-Type: text/html; charset=UTF-8');
152
-			$pid        = Filter::get('pid', WT_REGEX_XREF);
153
-			$i          = Filter::get('instance');
154
-			$tv         = new TreeView($i);
155
-			$individual = Individual::getInstance($pid, $WT_TREE);
156
-			if ($individual) {
157
-				echo $tv->getDetails($individual);
158
-			}
159
-			break;
160
-
161
-		case 'getPersons':
162
-			header('Content-Type: text/html; charset=UTF-8');
163
-			$q  = Filter::get('q');
164
-			$i  = Filter::get('instance');
165
-			$tv = new TreeView($i);
166
-			echo $tv->getPersons($q);
167
-			break;
168
-
169
-		default:
170
-			http_response_code(404);
171
-			break;
147
+				echo $html;
148
+				break;
149
+
150
+			case 'getDetails':
151
+				header('Content-Type: text/html; charset=UTF-8');
152
+				$pid        = Filter::get('pid', WT_REGEX_XREF);
153
+				$i          = Filter::get('instance');
154
+				$tv         = new TreeView($i);
155
+				$individual = Individual::getInstance($pid, $WT_TREE);
156
+				if ($individual) {
157
+					echo $tv->getDetails($individual);
158
+				}
159
+				break;
160
+
161
+			case 'getPersons':
162
+				header('Content-Type: text/html; charset=UTF-8');
163
+				$q  = Filter::get('q');
164
+				$i  = Filter::get('instance');
165
+				$tv = new TreeView($i);
166
+				echo $tv->getPersons($q);
167
+				break;
168
+
169
+			default:
170
+				http_response_code(404);
171
+				break;
172 172
 		}
173 173
 	}
174 174
 
Please login to merge, or discard this patch.
app/Module/InteractiveTree/TreeView.php 1 patch
Switch Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -92,25 +92,25 @@  discard block
 block discarded – undo
92 92
 			$firstLetter = substr($jsonRequest, 0, 1);
93 93
 			$jsonRequest = substr($jsonRequest, 1);
94 94
 			switch ($firstLetter) {
95
-			case 'c':
96
-				$fidlist = explode(',', $jsonRequest);
97
-				$flist   = array();
98
-				foreach ($fidlist as $fid) {
99
-					$flist[] = Family::getInstance($fid, $WT_TREE);
100
-				}
101
-				$r[] = $this->drawChildren($flist, 1, true);
102
-				break;
103
-			case 'p':
104
-				$params = explode('@', $jsonRequest);
105
-				$fid    = $params[0];
106
-				$order  = $params[1];
107
-				$f      = Family::getInstance($fid, $WT_TREE);
108
-				if ($f->getHusband()) {
109
-					$r[] = $this->drawPerson($f->getHusband(), 0, 1, $f, $order);
110
-				} elseif ($f->getWife()) {
111
-					$r[] = $this->drawPerson($f->getWife(), 0, 1, $f, $order);
112
-				}
113
-				break;
95
+				case 'c':
96
+					$fidlist = explode(',', $jsonRequest);
97
+					$flist   = array();
98
+					foreach ($fidlist as $fid) {
99
+						$flist[] = Family::getInstance($fid, $WT_TREE);
100
+					}
101
+					$r[] = $this->drawChildren($flist, 1, true);
102
+					break;
103
+				case 'p':
104
+					$params = explode('@', $jsonRequest);
105
+					$fid    = $params[0];
106
+					$order  = $params[1];
107
+					$f      = Family::getInstance($fid, $WT_TREE);
108
+					if ($f->getHusband()) {
109
+						$r[] = $this->drawPerson($f->getHusband(), 0, 1, $f, $order);
110
+					} elseif ($f->getWife()) {
111
+						$r[] = $this->drawPerson($f->getWife(), 0, 1, $f, $order);
112
+					}
113
+					break;
114 114
 			}
115 115
 		}
116 116
 
@@ -342,15 +342,15 @@  discard block
 block discarded – undo
342 342
 				$family_name = I18N::translateContext('unknown family', 'unknown');
343 343
 			}
344 344
 			switch ($individual->getSex()) {
345
-			case 'M':
346
-				$title = ' title="' . /* I18N: e.g. “Son of [father name & mother name]” */ I18N::translate('Son of %s', $family_name) . '"';
347
-				break;
348
-			case 'F':
349
-				$title = ' title="' . /* I18N: e.g. “Daughter of [father name & mother name]” */ I18N::translate('Daughter of %s', $family_name) . '"';
350
-				break;
351
-			default:
352
-				$title = ' title="' . /* I18N: e.g. “Child of [father name & mother name]” */ I18N::translate('Child of %s', $family_name) . '"';
353
-				break;
345
+				case 'M':
346
+					$title = ' title="' . /* I18N: e.g. “Son of [father name & mother name]” */ I18N::translate('Son of %s', $family_name) . '"';
347
+					break;
348
+				case 'F':
349
+					$title = ' title="' . /* I18N: e.g. “Daughter of [father name & mother name]” */ I18N::translate('Daughter of %s', $family_name) . '"';
350
+					break;
351
+				default:
352
+					$title = ' title="' . /* I18N: e.g. “Child of [father name & mother name]” */ I18N::translate('Child of %s', $family_name) . '"';
353
+					break;
354 354
 			}
355 355
 		} else {
356 356
 			$title = '';
Please login to merge, or discard this patch.
app/Module/IndividualSidebarModule.php 1 patch
Switch Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -46,13 +46,13 @@  discard block
 block discarded – undo
46 46
 	 */
47 47
 	public function modAction($mod_action) {
48 48
 		switch ($mod_action) {
49
-		case 'ajax':
50
-			header('Content-Type: text/html; charset=UTF-8');
51
-			echo $this->getSidebarAjaxContent();
52
-			break;
53
-		default:
54
-			http_response_code(404);
55
-			break;
49
+			case 'ajax':
50
+				header('Content-Type: text/html; charset=UTF-8');
51
+				echo $this->getSidebarAjaxContent();
52
+				break;
53
+			default:
54
+				http_response_code(404);
55
+				break;
56 56
 		}
57 57
 	}
58 58
 
@@ -150,18 +150,18 @@  discard block
 block discarded – undo
150 150
 		$out = '<form method="post" action="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax" onsubmit="return false;"><input type="search" name="sb_indi_name" id="sb_indi_name" placeholder="' . I18N::translate('Search') . '"><p>';
151 151
 		foreach ($initials as $letter => $count) {
152 152
 			switch ($letter) {
153
-			case '@':
154
-				$html = I18N::translateContext('Unknown surname', '…');
155
-				break;
156
-			case ',':
157
-				$html = I18N::translate('None');
158
-				break;
159
-			case ' ':
160
-				$html = '&nbsp;';
161
-				break;
162
-			default:
163
-				$html = $letter;
164
-				break;
153
+				case '@':
154
+					$html = I18N::translateContext('Unknown surname', '…');
155
+					break;
156
+				case ',':
157
+					$html = I18N::translate('None');
158
+					break;
159
+				case ' ':
160
+					$html = '&nbsp;';
161
+					break;
162
+				default:
163
+					$html = $letter;
164
+					break;
165 165
 			}
166 166
 			$html = '<a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;alpha=' . urlencode($letter) . '" class="sb_indi_letter">' . $html . '</a>';
167 167
 			$out .= $html . " ";
Please login to merge, or discard this patch.
app/Module/ChartsBlockModule.php 1 patch
Switch Indentation   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -82,57 +82,57 @@
 block discarded – undo
82 82
 		if ($person) {
83 83
 			$content = '';
84 84
 			switch ($type) {
85
-			case 'pedigree':
86
-				$title .= I18N::translate('Pedigree of %s', $person->getFullName());
87
-				$chartController = new HourglassController($person->getXref(), $details, false);
88
-				$controller->addInlineJavascript($chartController->setupJavascript());
89
-				$content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
90
-				$content .= '<td>';
91
-				ob_start();
92
-				FunctionsPrint::printPedigreePerson($person, $details);
93
-				$content .= ob_get_clean();
94
-				$content .= '</td>';
95
-				$content .= '<td>';
96
-				ob_start();
97
-				$chartController->printPersonPedigree($person, 1);
98
-				$content .= ob_get_clean();
99
-				$content .= '</td>';
100
-				$content .= '</tr></table>';
101
-				break;
102
-			case 'descendants':
103
-				$title .= I18N::translate('Descendants of %s', $person->getFullName());
104
-				$chartController = new HourglassController($person->getXref(), $details, false);
105
-				$controller->addInlineJavascript($chartController->setupJavascript());
106
-				ob_start();
107
-				$chartController->printDescendency($person, 1, false);
108
-				$content .= ob_get_clean();
109
-				break;
110
-			case 'hourglass':
111
-				$title .= I18N::translate('Hourglass chart of %s', $person->getFullName());
112
-				$chartController = new HourglassController($person->getXref(), $details, false);
113
-				$controller->addInlineJavascript($chartController->setupJavascript());
114
-				$content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
115
-				$content .= '<td>';
116
-				ob_start();
117
-				$chartController->printDescendency($person, 1, false);
118
-				$content .= ob_get_clean();
119
-				$content .= '</td>';
120
-				$content .= '<td>';
121
-				ob_start();
122
-				$chartController->printPersonPedigree($person, 1);
123
-				$content .= ob_get_clean();
124
-				$content .= '</td>';
125
-				$content .= '</tr></table>';
126
-				break;
127
-			case 'treenav':
128
-				$title .= I18N::translate('Interactive tree of %s', $person->getFullName());
129
-				$mod = new InteractiveTreeModule(WT_MODULES_DIR . 'tree');
130
-				$tv  = new TreeView;
131
-				$content .= '<script>jQuery("head").append(\'<link rel="stylesheet" href="' . $mod->css() . '" type="text/css" />\');</script>';
132
-				$content .= '<script src="' . $mod->js() . '"></script>';
133
-				list($html, $js) = $tv->drawViewport($person, 2);
134
-				$content .= $html . '<script>' . $js . '</script>';
135
-				break;
85
+				case 'pedigree':
86
+					$title .= I18N::translate('Pedigree of %s', $person->getFullName());
87
+					$chartController = new HourglassController($person->getXref(), $details, false);
88
+					$controller->addInlineJavascript($chartController->setupJavascript());
89
+					$content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
90
+					$content .= '<td>';
91
+					ob_start();
92
+					FunctionsPrint::printPedigreePerson($person, $details);
93
+					$content .= ob_get_clean();
94
+					$content .= '</td>';
95
+					$content .= '<td>';
96
+					ob_start();
97
+					$chartController->printPersonPedigree($person, 1);
98
+					$content .= ob_get_clean();
99
+					$content .= '</td>';
100
+					$content .= '</tr></table>';
101
+					break;
102
+				case 'descendants':
103
+					$title .= I18N::translate('Descendants of %s', $person->getFullName());
104
+					$chartController = new HourglassController($person->getXref(), $details, false);
105
+					$controller->addInlineJavascript($chartController->setupJavascript());
106
+					ob_start();
107
+					$chartController->printDescendency($person, 1, false);
108
+					$content .= ob_get_clean();
109
+					break;
110
+				case 'hourglass':
111
+					$title .= I18N::translate('Hourglass chart of %s', $person->getFullName());
112
+					$chartController = new HourglassController($person->getXref(), $details, false);
113
+					$controller->addInlineJavascript($chartController->setupJavascript());
114
+					$content .= '<table cellspacing="0" cellpadding="0" border="0"><tr>';
115
+					$content .= '<td>';
116
+					ob_start();
117
+					$chartController->printDescendency($person, 1, false);
118
+					$content .= ob_get_clean();
119
+					$content .= '</td>';
120
+					$content .= '<td>';
121
+					ob_start();
122
+					$chartController->printPersonPedigree($person, 1);
123
+					$content .= ob_get_clean();
124
+					$content .= '</td>';
125
+					$content .= '</tr></table>';
126
+					break;
127
+				case 'treenav':
128
+					$title .= I18N::translate('Interactive tree of %s', $person->getFullName());
129
+					$mod = new InteractiveTreeModule(WT_MODULES_DIR . 'tree');
130
+					$tv  = new TreeView;
131
+					$content .= '<script>jQuery("head").append(\'<link rel="stylesheet" href="' . $mod->css() . '" type="text/css" />\');</script>';
132
+					$content .= '<script src="' . $mod->js() . '"></script>';
133
+					list($html, $js) = $tv->drawViewport($person, 2);
134
+					$content .= $html . '<script>' . $js . '</script>';
135
+					break;
136 136
 			}
137 137
 		} else {
138 138
 			$content = I18N::translate('You must select an individual and a chart type in the block preferences');
Please login to merge, or discard this patch.