fisharebest / webtrees

edituser.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 $form_pass2          = Filter::post('form_pass2', WT_REGEX_PASSWORD);
 $form_email          = Filter::postEmail('form_email');
 $form_rootid         = Filter::post('form_rootid', WT_REGEX_XREF);
-$form_theme          = Filter::post('form_theme', implode('|', array_keys(Theme::themeNames())), '');;
+$form_theme          = Filter::post('form_theme', implode('|', array_keys(Theme::themeNames())), ''); ;
 $form_language       = Filter::post('form_language');
 $form_timezone       = Filter::post('form_timezone');
 $form_contact_method = Filter::post('form_contact_method');

admin_site_logs.php

Switch Indentation +39 added lines, -39 removed lines

@@ -98,52 +98,52 @@
 }
 
 switch ($action) {
-    case 'delete':
-        $sql_delete =
-        "DELETE `##log` FROM `##log`" .
-        " LEFT JOIN `##user` USING (user_id)" . // user may be deleted
-        " LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
-
-        Database::prepare($sql_delete . $where)->execute($args);
-        break;
-
-    case 'export':
-        header('Content-Type: text/csv');
-        header('Content-Disposition: attachment; filename="webtrees-logs.csv"');
-        $rows = Database::prepare($sql_select . $where . ' ORDER BY log_id')->execute($args)->fetchAll();
-        foreach ($rows as $row) {
-            echo
-            '"', $row->log_time, '",',
-            '"', $row->log_type, '",',
-            '"', str_replace('"', '""', $row->log_message), '",',
-            '"', $row->ip_address, '",',
-            '"', str_replace('"', '""', $row->user_name), '",',
-            '"', str_replace('"', '""', $row->gedcom_name), '"',
-            "\n";
-        }
+        case 'delete':
+            $sql_delete =
+            "DELETE `##log` FROM `##log`" .
+            " LEFT JOIN `##user` USING (user_id)" . // user may be deleted
+            " LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
+
+            Database::prepare($sql_delete . $where)->execute($args);
+            break;
+
+        case 'export':
+            header('Content-Type: text/csv');
+            header('Content-Disposition: attachment; filename="webtrees-logs.csv"');
+            $rows = Database::prepare($sql_select . $where . ' ORDER BY log_id')->execute($args)->fetchAll();
+            foreach ($rows as $row) {
+                echo
+                '"', $row->log_time, '",',
+                '"', $row->log_type, '",',
+                '"', str_replace('"', '""', $row->log_message), '",',
+                '"', $row->ip_address, '",',
+                '"', str_replace('"', '""', $row->user_name), '",',
+                '"', str_replace('"', '""', $row->gedcom_name), '"',
+                "\n";
+            }
 
-        return;
-    case 'load_json':
-        $start  = Filter::getInteger('start');
-        $length = Filter::getInteger('length');
-        $order  = Filter::getArray('order');
-
-        if ($order) {
-            $order_by = " ORDER BY ";
-            foreach ($order as $key => $value) {
-                if ($key > 0) {
-                    $order_by .= ',';
-                }
-                // Datatables numbers columns 0, 1, 2
-                // MySQL numbers columns 1, 2, 3
-                switch ($value['dir']) {
+            return;
+        case 'load_json':
+            $start  = Filter::getInteger('start');
+            $length = Filter::getInteger('length');
+            $order  = Filter::getArray('order');
+
+            if ($order) {
+                $order_by = " ORDER BY ";
+                foreach ($order as $key => $value) {
+                    if ($key > 0) {
+                        $order_by .= ',';
+                    }
+                    // Datatables numbers columns 0, 1, 2
+                    // MySQL numbers columns 1, 2, 3
+                    switch ($value['dir']) {
                     case 'asc':
                         $order_by .= (1 + $value['column']) . " ASC ";
                         break;
                     case 'desc':
                         $order_by .= (1 + $value['column']) . " DESC ";
                     break;
-                }
+                    }
             }
         } else {
             $order_by = " ORDER BY 1 ASC";

app/GedcomCode/GedcomCodeTemp.php

Spacing +6 added lines, -6 removed lines

@@ -60,14 +60,14 @@
             'MADRI', 'MANAU', 'MANHA', 'MANIL', 'MANTI', 'MEDFO', 'MELBO', 'MEMPH',
             'MERID', 'MEXIC', 'MNTVD', 'MONTE', 'MONTI', 'MONTR', 'MTIMP', 'NASHV',
             'NAUV2', 'NAUVO', 'NBEAC', 'NUKUA', 'NYORK', 'NZEAL', 'OAKLA', 'OAXAC',
-            'OGDEN', 'OKLAH',   'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
-            'PAYSO', 'PERTH',   'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
+            'OGDEN', 'OKLAH', 'OQUIR', 'ORLAN', 'PALEG', 'PALMY', 'PANAM', 'PAPEE',
+            'PAYSO', 'PERTH', 'PHOEN', 'POFFI', 'PORTL', 'PREST', 'PROCC', 'PROVO',
             'QUETZ', 'RALEI', 'RECIF', 'REDLA', 'REGIN', 'RENO', 'REXBU', 'SACRA',
-            'SAMOA', 'SANTI',   'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
-            'SGEOR', 'SJOSE',   'SLAKE', 'SLOUI', 'SNOWF','SPAUL', 'SPMIN', 'SPOKA',
+            'SAMOA', 'SANTI', 'SANSA', 'SANTO', 'SDIEG', 'SDOMI', 'SEATT', 'SEOUL',
+            'SGEOR', 'SJOSE', 'SLAKE', 'SLOUI', 'SNOWF', 'SPAUL', 'SPMIN', 'SPOKA',
             'STOCK', 'SUVA', 'SWISS', 'SYDNE', 'TAIPE', 'TAMPI', 'TEGUC', 'TGUTI',
-            'TIHUA', 'TOKYO',   'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
-            'VILLA', 'WASHI',   'WINTE',
+            'TIHUA', 'TOKYO', 'TORNO', 'TRUJI', 'TWINF', 'VANCO', 'VERAC', 'VERNA',
+            'VILLA', 'WASHI', 'WINTE',
         );
     }
 

app/Database.php

Spacing +1 added lines, -2 removed lines

@@ -91,8 +91,7 @@
         // Create the underlying PDO object
         self::$pdo = new PDO(
             (substr($DBHOST, 0, 1) === '/' ?
-                "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" :
-                "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
+                "mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
             ),
             $DBUSER, $DBPASS,
             array(

app/Functions/FunctionsPrintLists.php

Spacing +6 added lines, -6 removed lines

@@ -1714,24 +1714,24 @@
             if ($endjd === WT_CLIENT_JD) {
                 // We're dealing with the Today’s Events block
                 if ($filter === 0) {
-                    $html .=  I18N::translate('No events exist for today.');
+                    $html .= I18N::translate('No events exist for today.');
                 } else {
-                    $html .=  I18N::translate('No events for living individuals exist for today.');
+                    $html .= I18N::translate('No events for living individuals exist for today.');
                 }
             } else {
                 // We're dealing with the Upcoming Events block
                 if ($filter === 0) {
                     if ($endjd === $startjd) {
-                        $html .=  I18N::translate('No events exist for tomorrow.');
+                        $html .= I18N::translate('No events exist for tomorrow.');
                     } else {
-                        $html .=  /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
+                        $html .= /* I18N: translation for %s==1 is unused; it is translated separately as “tomorrow” */ I18N::plural('No events exist for the next %s day.', 'No events exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
                     }
                 } else {
                     if ($endjd === $startjd) {
-                        $html .=  I18N::translate('No events for living individuals exist for tomorrow.');
+                        $html .= I18N::translate('No events for living individuals exist for tomorrow.');
                     } else {
                         // I18N: translation for %s==1 is unused; it is translated separately as “tomorrow”
-                        $html .=  I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
+                        $html .= I18N::plural('No events for living people exist for the next %s day.', 'No events for living people exist for the next %s days.', $endjd - $startjd + 1, I18N::number($endjd - $startjd + 1));
                     }
                 }
             }

admin_site_config.php

Switch Indentation +19 added lines, -19 removed lines

@@ -137,25 +137,25 @@
 }
 
 switch (Filter::get('action')) {
-    case 'site':
-        $controller->setPageTitle(I18N::translate('Website preferences'));
-        break;
-    case 'email':
-        $controller->setPageTitle(I18N::translate('Sending email'));
-        break;
-    case 'login':
-        $controller->setPageTitle(I18N::translate('Sign-in and registration'));
-        break;
-    case 'tracking':
-        $controller->setPageTitle(/* I18N: e.g. http://www.google.com/analytics */ I18N::translate('Tracking and analytics'));
-        break;
-    case 'languages':
-        $controller->setPageTitle(I18N::translate('Languages'));
-        break;
-    default:
-        header('Location: ' . WT_BASE_URL . 'admin.php');
-
-        return;
+        case 'site':
+            $controller->setPageTitle(I18N::translate('Website preferences'));
+            break;
+        case 'email':
+            $controller->setPageTitle(I18N::translate('Sending email'));
+            break;
+        case 'login':
+            $controller->setPageTitle(I18N::translate('Sign-in and registration'));
+            break;
+        case 'tracking':
+            $controller->setPageTitle(/* I18N: e.g. http://www.google.com/analytics */ I18N::translate('Tracking and analytics'));
+            break;
+        case 'languages':
+            $controller->setPageTitle(I18N::translate('Languages'));
+            break;
+        default:
+            header('Location: ' . WT_BASE_URL . 'admin.php');
+
+            return;
 }
 
 $controller->pageHeader();

ancestry.php

Switch Indentation +38 added lines, -38 removed lines

@@ -129,46 +129,46 @@
     return;
 }
 switch ($controller->chart_style) {
-    case 0:
-        // List
-        echo '<ul id="ancestry_chart" class="chart_common">';
-        $controller->printChildAscendancy($controller->root, 1, $controller->generations - 1);
-        echo '</ul>';
-        echo '<br>';
-        break;
-    case 1:
-        echo '<div id="ancestry_booklet">';
-        // Booklet
-        // first page : show indi facts
-        FunctionsPrint::printPedigreePerson($controller->root, $controller->showFull());
-        // process the tree
-        $ancestors = $controller->sosaAncestors($controller->generations - 1);
-        $ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
+        case 0:
+            // List
+            echo '<ul id="ancestry_chart" class="chart_common">';
+            $controller->printChildAscendancy($controller->root, 1, $controller->generations - 1);
+            echo '</ul>';
+            echo '<br>';
+            break;
+        case 1:
+            echo '<div id="ancestry_booklet">';
+            // Booklet
+            // first page : show indi facts
+            FunctionsPrint::printPedigreePerson($controller->root, $controller->showFull());
+            // process the tree
+            $ancestors = $controller->sosaAncestors($controller->generations - 1);
+            $ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
 
-        foreach ($ancestors as $sosa => $individual) {
-            foreach ($individual->getChildFamilies() as $family) {
-                FunctionsCharts::printSosaFamily($family->getXref(), $individual->getXref(), $sosa, '', '', '', $controller->show_cousins, $controller->showFull());
+            foreach ($ancestors as $sosa => $individual) {
+                foreach ($individual->getChildFamilies() as $family) {
+                    FunctionsCharts::printSosaFamily($family->getXref(), $individual->getXref(), $sosa, '', '', '', $controller->show_cousins, $controller->showFull());
+                }
             }
-        }
-        echo '</div>';
-        break;
-    case 2:
-        // Individual list
-        $ancestors = $controller->sosaAncestors($controller->generations);
-        $ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
-        echo '<div id="ancestry-list">', FunctionsPrintLists::individualTable($ancestors, 'sosa'), '</div>';
-        break;
-    case 3:
-        // Family list
-        $ancestors = $controller->sosaAncestors($controller->generations - 1);
-        $ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
-        $families  = array();
-        foreach ($ancestors as $individual) {
-            foreach ($individual->getChildFamilies() as $family) {
-                $families[$family->getXref()] = $family;
+            echo '</div>';
+            break;
+        case 2:
+            // Individual list
+            $ancestors = $controller->sosaAncestors($controller->generations);
+            $ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
+            echo '<div id="ancestry-list">', FunctionsPrintLists::individualTable($ancestors, 'sosa'), '</div>';
+            break;
+        case 3:
+            // Family list
+            $ancestors = $controller->sosaAncestors($controller->generations - 1);
+            $ancestors = array_filter($ancestors); // The SOSA array includes empty placeholders
+            $families  = array();
+            foreach ($ancestors as $individual) {
+                foreach ($individual->getChildFamilies() as $family) {
+                    $families[$family->getXref()] = $family;
+                }
             }
-        }
-        echo '<div id="ancestry-list">', FunctionsPrintLists::familyTable($families), '</div>';
-        break;
+            echo '<div id="ancestry-list">', FunctionsPrintLists::familyTable($families), '</div>';
+            break;
 }
 echo '</div>';

action.php

Switch Indentation +162 added lines, -162 removed lines

@@ -38,34 +38,34 @@ 
 }
 
 switch (Filter::post('action')) {
-    case 'accept-changes':
-        // Accept all the pending changes for a record
-        $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
-        if ($record && Auth::isModerator($record->getTree()) && $record->canShow() && $record->canEdit()) {
-            if ($record->isPendingDeletion()) {
-                FlashMessages::addMessage(/* I18N: %s is the name of a genealogy record */
-                I18N::translate('“%s” has been deleted.', $record->getFullName()));
+        case 'accept-changes':
+            // Accept all the pending changes for a record
+            $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
+            if ($record && Auth::isModerator($record->getTree()) && $record->canShow() && $record->canEdit()) {
+                if ($record->isPendingDeletion()) {
+                    FlashMessages::addMessage(/* I18N: %s is the name of a genealogy record */
+                    I18N::translate('“%s” has been deleted.', $record->getFullName()));
+                } else {
+                    FlashMessages::addMessage(/* I18N: %s is the name of a genealogy record */
+                    I18N::translate('The changes to “%s” have been accepted.', $record->getFullName()));
+                }
+                FunctionsImport::acceptAllChanges($record->getXref(), $record->getTree()->getTreeId());
             } else {
-                FlashMessages::addMessage(/* I18N: %s is the name of a genealogy record */
-                I18N::translate('The changes to “%s” have been accepted.', $record->getFullName()));
+                http_response_code(406);
             }
-            FunctionsImport::acceptAllChanges($record->getXref(), $record->getTree()->getTreeId());
-        } else {
-            http_response_code(406);
-        }
-        break;
+            break;
 
-    case 'copy-fact':
-        // Copy a fact to the clipboard
-        $xref    = Filter::post('xref', WT_REGEX_XREF);
-        $fact_id = Filter::post('fact_id');
+        case 'copy-fact':
+            // Copy a fact to the clipboard
+            $xref    = Filter::post('xref', WT_REGEX_XREF);
+            $fact_id = Filter::post('fact_id');
 
-        $record = GedcomRecord::getInstance($xref, $WT_TREE);
+            $record = GedcomRecord::getInstance($xref, $WT_TREE);
 
-        if ($record && $record->canEdit()) {
-            foreach ($record->getFacts() as $fact) {
-                if ($fact->getFactId() == $fact_id) {
-                    switch ($fact->getTag()) {
+            if ($record && $record->canEdit()) {
+                foreach ($record->getFacts() as $fact) {
+                    if ($fact->getFactId() == $fact_id) {
+                        switch ($fact->getTag()) {
                         case 'NOTE':
                         case 'SOUR':
                         case 'OBJE':
@@ -74,7 +74,7 @@ 
                         default:
                             $type = $record::RECORD_TYPE; // paste only to the same record type
                         break;
-                    }
+                        }
                     $clipboard = Session::get('clipboard');
                     if (!is_array($clipboard)) {
                         $clipboard = array();
@@ -96,158 +96,158 @@ 
         }
         break;
 
-    case 'paste-fact':
-        // Paste a fact from the clipboard
-        $xref      = Filter::post('xref', WT_REGEX_XREF);
-        $fact_id   = Filter::post('fact_id');
-        $record    = GedcomRecord::getInstance($xref, $WT_TREE);
-        $clipboard = Session::get('clipboard');
+        case 'paste-fact':
+            // Paste a fact from the clipboard
+            $xref      = Filter::post('xref', WT_REGEX_XREF);
+            $fact_id   = Filter::post('fact_id');
+            $record    = GedcomRecord::getInstance($xref, $WT_TREE);
+            $clipboard = Session::get('clipboard');
 
-        if ($record && $record->canEdit() && isset($clipboard[$fact_id])) {
-            $record->createFact($clipboard[$fact_id]['factrec'], true);
-        }
-        break;
-
-    case 'delete-fact':
-        $xref    = Filter::post('xref', WT_REGEX_XREF);
-        $fact_id = Filter::post('fact_id');
-
-        $record = GedcomRecord::getInstance($xref, $WT_TREE);
-        if ($record && $record->canShow() && $record->canEdit()) {
-            foreach ($record->getFacts() as $fact) {
-                if ($fact->getFactId() == $fact_id && $fact->canShow() && $fact->canEdit()) {
-                    $record->deleteFact($fact_id, true);
-                    break 2;
+            if ($record && $record->canEdit() && isset($clipboard[$fact_id])) {
+                $record->createFact($clipboard[$fact_id]['factrec'], true);
+            }
+            break;
+
+        case 'delete-fact':
+            $xref    = Filter::post('xref', WT_REGEX_XREF);
+            $fact_id = Filter::post('fact_id');
+
+            $record = GedcomRecord::getInstance($xref, $WT_TREE);
+            if ($record && $record->canShow() && $record->canEdit()) {
+                foreach ($record->getFacts() as $fact) {
+                    if ($fact->getFactId() == $fact_id && $fact->canShow() && $fact->canEdit()) {
+                        $record->deleteFact($fact_id, true);
+                        break 2;
+                    }
                 }
             }
-        }
-
-        // Can’t find the record/fact, or don’t have permission to delete it.
-        http_response_code(406);
-        break;
 
-    case 'delete-record':
-        $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
-        if ($record && Auth::isEditor($record->getTree()) && $record->canShow() && $record->canEdit()) {
-            // Delete links to this record
-            foreach (FunctionsDb::fetchAllLinks($record->getXref(), $record->getTree()->getTreeId()) as $xref) {
-                $linker     = GedcomRecord::getInstance($xref, $WT_TREE);
-                $old_gedcom = $linker->getGedcom();
-                $new_gedcom = FunctionsEdit::removeLinks($old_gedcom, $record->getXref());
-                // FunctionsDb::fetch_all_links() does not take account of pending changes. The links (or even the
-                // record itself) may have already been deleted.
-                if ($old_gedcom !== $new_gedcom) {
-                    // If we have removed a link from a family to an individual, and it has only one member
-                    if (preg_match('/^0 @' . WT_REGEX_XREF . '@ FAM/', $new_gedcom) && preg_match_all('/\n1 (HUSB|WIFE|CHIL) @(' . WT_REGEX_XREF . ')@/', $new_gedcom, $match) == 1) {
-                        // Delete the family
-                        $family = GedcomRecord::getInstance($xref, $WT_TREE);
-                        FlashMessages::addMessage(/* I18N: %s is the name of a family group, e.g. “Husband name + Wife name” */ I18N::translate('The family “%s” has been deleted because it only has one member.', $family->getFullName()));
-                        $family->deleteRecord();
-                        // Delete any remaining link to this family
-                        if ($match) {
-                            $relict     = GedcomRecord::getInstance($match[2][0], $WT_TREE);
-                            $new_gedcom = $relict->getGedcom();
-                            $new_gedcom = FunctionsEdit::removeLinks($new_gedcom, $linker->getXref());
-                            $relict->updateRecord($new_gedcom, false);
-                            FlashMessages::addMessage(/* I18N: %s are names of records, such as sources, repositories or individuals */ I18N::translate('The link from “%1$s” to “%2$s” has been deleted.', $relict->getFullName(), $family->getFullName()));
+            // Can’t find the record/fact, or don’t have permission to delete it.
+            http_response_code(406);
+            break;
+
+        case 'delete-record':
+            $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
+            if ($record && Auth::isEditor($record->getTree()) && $record->canShow() && $record->canEdit()) {
+                // Delete links to this record
+                foreach (FunctionsDb::fetchAllLinks($record->getXref(), $record->getTree()->getTreeId()) as $xref) {
+                    $linker     = GedcomRecord::getInstance($xref, $WT_TREE);
+                    $old_gedcom = $linker->getGedcom();
+                    $new_gedcom = FunctionsEdit::removeLinks($old_gedcom, $record->getXref());
+                    // FunctionsDb::fetch_all_links() does not take account of pending changes. The links (or even the
+                    // record itself) may have already been deleted.
+                    if ($old_gedcom !== $new_gedcom) {
+                        // If we have removed a link from a family to an individual, and it has only one member
+                        if (preg_match('/^0 @' . WT_REGEX_XREF . '@ FAM/', $new_gedcom) && preg_match_all('/\n1 (HUSB|WIFE|CHIL) @(' . WT_REGEX_XREF . ')@/', $new_gedcom, $match) == 1) {
+                            // Delete the family
+                            $family = GedcomRecord::getInstance($xref, $WT_TREE);
+                            FlashMessages::addMessage(/* I18N: %s is the name of a family group, e.g. “Husband name + Wife name” */ I18N::translate('The family “%s” has been deleted because it only has one member.', $family->getFullName()));
+                            $family->deleteRecord();
+                            // Delete any remaining link to this family
+                            if ($match) {
+                                $relict     = GedcomRecord::getInstance($match[2][0], $WT_TREE);
+                                $new_gedcom = $relict->getGedcom();
+                                $new_gedcom = FunctionsEdit::removeLinks($new_gedcom, $linker->getXref());
+                                $relict->updateRecord($new_gedcom, false);
+                                FlashMessages::addMessage(/* I18N: %s are names of records, such as sources, repositories or individuals */ I18N::translate('The link from “%1$s” to “%2$s” has been deleted.', $relict->getFullName(), $family->getFullName()));
+                            }
+                        } else {
+                            // Remove links from $linker to $record
+                            FlashMessages::addMessage(/* I18N: %s are names of records, such as sources, repositories or individuals */ I18N::translate('The link from “%1$s” to “%2$s” has been deleted.', $linker->getFullName(), $record->getFullName()));
+                            $linker->updateRecord($new_gedcom, false);
                         }
-                    } else {
-                        // Remove links from $linker to $record
-                        FlashMessages::addMessage(/* I18N: %s are names of records, such as sources, repositories or individuals */ I18N::translate('The link from “%1$s” to “%2$s” has been deleted.', $linker->getFullName(), $record->getFullName()));
-                        $linker->updateRecord($new_gedcom, false);
                     }
                 }
+                // Delete the record itself
+                $record->deleteRecord();
+            } else {
+                http_response_code(406);
             }
-            // Delete the record itself
-            $record->deleteRecord();
-        } else {
-            http_response_code(406);
-        }
-        break;
-
-    case 'delete-user':
-        $user = User::find(Filter::postInteger('user_id'));
+            break;
 
-        if ($user && Auth::isAdmin() && Auth::user() !== $user) {
-            Log::addAuthenticationLog('Deleted user: ' . $user->getUserName());
-            $user->delete();
-        }
-        break;
+        case 'delete-user':
+            $user = User::find(Filter::postInteger('user_id'));
 
-    case 'language':
-        // Change the current language
-        $language = Filter::post('language');
-        try {
-            I18N::init($language);
-            Session::put('locale', $language);
-            // Remember our selection
-            Auth::user()->setPreference('language', $language);
-        } catch (\Exception $ex) {
-            // Request for a non-existant language.
-            http_response_code(406);
-        }
-        break;
-
-    case 'masquerade':
-        $user = User::find(Filter::postInteger('user_id'));
+            if ($user && Auth::isAdmin() && Auth::user() !== $user) {
+                Log::addAuthenticationLog('Deleted user: ' . $user->getUserName());
+                $user->delete();
+            }
+            break;
+
+        case 'language':
+            // Change the current language
+            $language = Filter::post('language');
+            try {
+                I18N::init($language);
+                Session::put('locale', $language);
+                // Remember our selection
+                Auth::user()->setPreference('language', $language);
+            } catch (\Exception $ex) {
+                // Request for a non-existant language.
+                http_response_code(406);
+            }
+            break;
 
-        if ($user && Auth::isAdmin() && Auth::user() !== $user) {
-            Log::addAuthenticationLog('Masquerade as user: ' . $user->getUserName());
-            Auth::login($user);
-            Session::put('masquerade', '1');
-        } else {
-            http_response_code(406);
-        }
-        break;
+        case 'masquerade':
+            $user = User::find(Filter::postInteger('user_id'));
 
-    case 'unlink-media':
-        // Remove links from an individual and their spouse-family records to a media object.
-        // Used by the "unlink" option on the album (lightbox) tab.
-        $source = Individual::getInstance(Filter::post('source', WT_REGEX_XREF), $WT_TREE);
-        $target = Filter::post('target', WT_REGEX_XREF);
-        if ($source && $source->canShow() && $source->canEdit() && $target) {
-            // Consider the individual and their spouse-family records
-            $sources   = $source->getSpouseFamilies();
-            $sources[] = $source;
-            foreach ($sources as $source) {
-                foreach ($source->getFacts() as $fact) {
-                    if (!$fact->isPendingDeletion()) {
-                        if ($fact->getValue() == '@' . $target . '@') {
-                            // Level 1 links
-                            $source->deleteFact($fact->getFactId(), true);
-                        } elseif (strpos($fact->getGedcom(), ' @' . $target . '@')) {
-                            // Level 2-3 links
-                            $source->updateFact($fact->getFactId(), preg_replace(array('/\n2 OBJE @' . $target . '@(\n[3-9].*)*/', '/\n3 OBJE @' . $target . '@(\n[4-9].*)*/'), '', $fact->getGedcom()), true);
+            if ($user && Auth::isAdmin() && Auth::user() !== $user) {
+                Log::addAuthenticationLog('Masquerade as user: ' . $user->getUserName());
+                Auth::login($user);
+                Session::put('masquerade', '1');
+            } else {
+                http_response_code(406);
+            }
+            break;
+
+        case 'unlink-media':
+            // Remove links from an individual and their spouse-family records to a media object.
+            // Used by the "unlink" option on the album (lightbox) tab.
+            $source = Individual::getInstance(Filter::post('source', WT_REGEX_XREF), $WT_TREE);
+            $target = Filter::post('target', WT_REGEX_XREF);
+            if ($source && $source->canShow() && $source->canEdit() && $target) {
+                // Consider the individual and their spouse-family records
+                $sources   = $source->getSpouseFamilies();
+                $sources[] = $source;
+                foreach ($sources as $source) {
+                    foreach ($source->getFacts() as $fact) {
+                        if (!$fact->isPendingDeletion()) {
+                            if ($fact->getValue() == '@' . $target . '@') {
+                                // Level 1 links
+                                $source->deleteFact($fact->getFactId(), true);
+                            } elseif (strpos($fact->getGedcom(), ' @' . $target . '@')) {
+                                // Level 2-3 links
+                                $source->updateFact($fact->getFactId(), preg_replace(array('/\n2 OBJE @' . $target . '@(\n[3-9].*)*/', '/\n3 OBJE @' . $target . '@(\n[4-9].*)*/'), '', $fact->getGedcom()), true);
+                            }
                         }
                     }
                 }
+            } else {
+                http_response_code(406);
             }
-        } else {
-            http_response_code(406);
-        }
-        break;
-
-    case 'reject-changes':
-        // Reject all the pending changes for a record
-        $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
-        if ($record && $record->canEdit() && Auth::isModerator($record->getTree())) {
-            FlashMessages::addMessage(/* I18N: %s is the name of an individual, source or other record */ I18N::translate('The changes to “%s” have been rejected.', $record->getFullName()));
-            FunctionsImport::rejectAllChanges($record);
-        } else {
-            http_response_code(406);
-        }
-        break;
-
-    case 'theme':
-        // Change the current theme
-        $theme = Filter::post('theme');
-        if (Site::getPreference('ALLOW_USER_THEMES') && array_key_exists($theme, Theme::themeNames())) {
-            Session::put('theme_id', $theme);
-            // Remember our selection
-            Auth::user()->setPreference('theme', $theme);
-        } else {
-            // Request for a non-existant theme.
-            http_response_code(406);
-        }
-        break;
+            break;
+
+        case 'reject-changes':
+            // Reject all the pending changes for a record
+            $record = GedcomRecord::getInstance(Filter::post('xref', WT_REGEX_XREF), $WT_TREE);
+            if ($record && $record->canEdit() && Auth::isModerator($record->getTree())) {
+                FlashMessages::addMessage(/* I18N: %s is the name of an individual, source or other record */ I18N::translate('The changes to “%s” have been rejected.', $record->getFullName()));
+                FunctionsImport::rejectAllChanges($record);
+            } else {
+                http_response_code(406);
+            }
+            break;
+
+        case 'theme':
+            // Change the current theme
+            $theme = Filter::post('theme');
+            if (Site::getPreference('ALLOW_USER_THEMES') && array_key_exists($theme, Theme::themeNames())) {
+                Session::put('theme_id', $theme);
+                // Remember our selection
+                Auth::user()->setPreference('theme', $theme);
+            } else {
+                // Request for a non-existant theme.
+                http_response_code(406);
+            }
+            break;
 }

admin_site_change.php

Switch Indentation +40 added lines, -40 removed lines

@@ -111,53 +111,53 @@
 }
 
 switch ($action) {
-    case 'delete':
-        $sql_delete =
-        "DELETE `##change` FROM `##change`" .
-        " LEFT JOIN `##user` USING (user_id)" . // user may be deleted
-        " LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
-
-        Database::prepare($sql_delete . $where)->execute($args);
-        break;
-
-    case 'export':
-        header('Content-Type: text/csv');
-        header('Content-Disposition: attachment; filename="webtrees-changes.csv"');
-        $rows = Database::prepare($sql_select . $where . ' ORDER BY change_id')->execute($args)->fetchAll();
-        foreach ($rows as $row) {
-            echo
-            '"', $row->change_time, '",',
-            '"', $row->status, '",',
-            '"', $row->xref, '",',
-            '"', str_replace('"', '""', $row->old_gedcom), '",',
-            '"', str_replace('"', '""', $row->new_gedcom), '",',
-            '"', str_replace('"', '""', $row->user_name), '",',
-            '"', str_replace('"', '""', $row->gedcom_name), '"',
-            "\n";
-        }
+        case 'delete':
+            $sql_delete =
+            "DELETE `##change` FROM `##change`" .
+            " LEFT JOIN `##user` USING (user_id)" . // user may be deleted
+            " LEFT JOIN `##gedcom` USING (gedcom_id)"; // gedcom may be deleted
+
+            Database::prepare($sql_delete . $where)->execute($args);
+            break;
+
+        case 'export':
+            header('Content-Type: text/csv');
+            header('Content-Disposition: attachment; filename="webtrees-changes.csv"');
+            $rows = Database::prepare($sql_select . $where . ' ORDER BY change_id')->execute($args)->fetchAll();
+            foreach ($rows as $row) {
+                echo
+                '"', $row->change_time, '",',
+                '"', $row->status, '",',
+                '"', $row->xref, '",',
+                '"', str_replace('"', '""', $row->old_gedcom), '",',
+                '"', str_replace('"', '""', $row->new_gedcom), '",',
+                '"', str_replace('"', '""', $row->user_name), '",',
+                '"', str_replace('"', '""', $row->gedcom_name), '"',
+                "\n";
+            }
 
-        return;
-    case 'load_json':
-        $start  = Filter::getInteger('start');
-        $length = Filter::getInteger('length');
-        $order  = Filter::getArray('order');
-
-        if ($order) {
-            $order_by = " ORDER BY ";
-            foreach ($order as $key => $value) {
-                if ($key > 0) {
-                    $order_by .= ',';
-                }
-                // Datatables numbers columns 0, 1, 2
-                // MySQL numbers columns 1, 2, 3
-                switch ($value['dir']) {
+            return;
+        case 'load_json':
+            $start  = Filter::getInteger('start');
+            $length = Filter::getInteger('length');
+            $order  = Filter::getArray('order');
+
+            if ($order) {
+                $order_by = " ORDER BY ";
+                foreach ($order as $key => $value) {
+                    if ($key > 0) {
+                        $order_by .= ',';
+                    }
+                    // Datatables numbers columns 0, 1, 2
+                    // MySQL numbers columns 1, 2, 3
+                    switch ($value['dir']) {
                     case 'asc':
                         $order_by .= (1 + $value['column']) . " ASC ";
                         break;
                     case 'desc':
                         $order_by .= (1 + $value['column']) . " DESC ";
                     break;
-                }
+                    }
             }
         } else {
             $order_by = " ORDER BY 1 DESC";