@@ -28,7 +28,7 @@ |
||
| 28 | 28 | * Where are our CSS, JS and other assets? |
| 29 | 29 | */ |
| 30 | 30 | protected const THEME_DIR = 'minimal'; |
| 31 | - public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 31 | + public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 32 | 32 | protected const STYLESHEET = self::ASSET_DIR . 'style.css'; |
| 33 | 33 | |
| 34 | 34 | /** |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | * Where are our CSS, JS and other assets? |
| 29 | 29 | */ |
| 30 | 30 | protected const THEME_DIR = 'xenea'; |
| 31 | - public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 31 | + public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 32 | 32 | protected const STYLESHEET = self::ASSET_DIR . 'style.css'; |
| 33 | 33 | |
| 34 | 34 | /** |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | * Where are our CSS, JS and other assets? |
| 33 | 33 | */ |
| 34 | 34 | protected const THEME_DIR = 'colors'; |
| 35 | - public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 35 | + public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 36 | 36 | protected const STYLESHEET = self::ASSET_DIR . 'style.css'; |
| 37 | 37 | |
| 38 | 38 | /** @var string[] A list of color palettes */ |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | * Where are our CSS, JS and other assets? |
| 30 | 30 | */ |
| 31 | 31 | protected const THEME_DIR = 'fab'; |
| 32 | - public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 32 | + public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 33 | 33 | protected const STYLESHEET = self::ASSET_DIR . 'style.css'; |
| 34 | 34 | |
| 35 | 35 | /** |
@@ -30,7 +30,7 @@ |
||
| 30 | 30 | * Where are our CSS, JS and other assets? |
| 31 | 31 | */ |
| 32 | 32 | protected const THEME_DIR = 'clouds'; |
| 33 | - public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 33 | + public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 34 | 34 | protected const STYLESHEET = self::ASSET_DIR . 'style.css'; |
| 35 | 35 | |
| 36 | 36 | /** |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | * Where are our CSS, JS and other assets? |
| 48 | 48 | */ |
| 49 | 49 | protected const THEME_DIR = '_common'; |
| 50 | - public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 50 | + public const ASSET_DIR = 'themes/' . self::THEME_DIR . '/css-2.0.0/'; |
|
| 51 | 51 | protected const STYLESHEET = self::ASSET_DIR . 'style.css'; |
| 52 | 52 | |
| 53 | 53 | protected const PERSON_BOX_CLASSES = [ |
@@ -145,7 +145,7 @@ discard block |
||
| 145 | 145 | 'ged' => $tree->name(), |
| 146 | 146 | 'show_all' => 'yes', |
| 147 | 147 | ]; |
| 148 | - $show = $request->get('show', 'surn'); |
|
| 148 | + $show = $request->get('show', 'surn'); |
|
| 149 | 149 | } |
| 150 | 150 | } elseif ($surname) { |
| 151 | 151 | $alpha = $this->localization_service->initialLetter($surname); // so we can highlight the initial letter |
@@ -520,7 +520,7 @@ discard block |
||
| 520 | 520 | private function allMedia(Tree $tree, string $folder, string $subfolders, string $sort, string $filter, string $form_type): array |
| 521 | 521 | { |
| 522 | 522 | // All files in the folder, plus external files |
| 523 | - $sql = |
|
| 523 | + $sql = |
|
| 524 | 524 | "SELECT m_id AS xref, m_gedcom AS gedcom" . |
| 525 | 525 | " FROM `##media`" . |
| 526 | 526 | " JOIN `##media_file` USING (m_id, m_file)" . |
@@ -539,11 +539,11 @@ discard block |
||
| 539 | 539 | // Include / exclude subfolders (but always include external) |
| 540 | 540 | switch ($subfolders) { |
| 541 | 541 | case 'include': |
| 542 | - $sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') $sql_external)"; |
|
| 542 | + $sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') $sql_external)"; |
|
| 543 | 543 | $args[] = Database::escapeLike($folder); |
| 544 | 544 | break; |
| 545 | 545 | case 'exclude': |
| 546 | - $sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') AND multimedia_file_refn NOT LIKE CONCAT(?, '%/%') $sql_external)"; |
|
| 546 | + $sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') AND multimedia_file_refn NOT LIKE CONCAT(?, '%/%') $sql_external)"; |
|
| 547 | 547 | $args[] = Database::escapeLike($folder); |
| 548 | 548 | $args[] = Database::escapeLike($folder); |
| 549 | 549 | break; |
@@ -551,13 +551,13 @@ discard block |
||
| 551 | 551 | |
| 552 | 552 | // Apply search terms |
| 553 | 553 | if ($filter) { |
| 554 | - $sql .= " AND (SUBSTRING_INDEX(multimedia_file_refn, '/', -1) LIKE CONCAT('%', ?, '%') OR descriptive_title LIKE CONCAT('%', ?, '%'))"; |
|
| 554 | + $sql .= " AND (SUBSTRING_INDEX(multimedia_file_refn, '/', -1) LIKE CONCAT('%', ?, '%') OR descriptive_title LIKE CONCAT('%', ?, '%'))"; |
|
| 555 | 555 | $args[] = Database::escapeLike($filter); |
| 556 | 556 | $args[] = Database::escapeLike($filter); |
| 557 | 557 | } |
| 558 | 558 | |
| 559 | 559 | if ($form_type) { |
| 560 | - $sql .= " AND source_media_type = ?"; |
|
| 560 | + $sql .= " AND source_media_type = ?"; |
|
| 561 | 561 | $args[] = $form_type; |
| 562 | 562 | } |
| 563 | 563 | |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | |
| 71 | 71 | $top10 = DB::table('hit_counter') |
| 72 | 72 | ->where('gedcom_id', '=', $tree->id()) |
| 73 | - ->whereIn('page_name', ['individual.php','family.php','source.php','repo.php','note.php','mediaviewer.php']) |
|
| 73 | + ->whereIn('page_name', ['individual.php', 'family.php', 'source.php', 'repo.php', 'note.php', 'mediaviewer.php']) |
|
| 74 | 74 | ->orderByDesc('page_count') |
| 75 | 75 | ->limit((int) $num) |
| 76 | 76 | ->pluck('page_count', 'page_parameter'); |
@@ -494,7 +494,7 @@ |
||
| 494 | 494 | // ... and process the differences |
| 495 | 495 | $inserted = 0; |
| 496 | 496 | if (!empty($diff)) { |
| 497 | - $nextRecordId = 1 + (int) DB::table('placelocation')->max('pl_id'); |
|
| 497 | + $nextRecordId = 1 + (int) DB::table('placelocation')->max('pl_id'); |
|
| 498 | 498 | |
| 499 | 499 | foreach ($diff as $place) { |
| 500 | 500 | // For Westminster, London, England, we must also create England and London, England |