Replaced " with '

1 files changed, 98 insertions, 66 deletions

diff --git a/includes/pages/admin_user.php b/includes/pages/admin_user.php
index c6ce628f..ef0c9df8 100644
--- a/includes/pages/admin_user.php
+++ b/includes/pages/admin_user.php
@@ -5,7 +5,7 @@
  */
 function admin_user_title()
 {
-    return _("All Angels");
+    return _('All Angels');
 }
 
 /**
@@ -29,75 +29,80 @@ function admin_user()
             redirect(users_link());
         }
 
-        $html .= "Hallo,<br />" . "hier kannst du den Eintrag &auml;ndern. Unter dem Punkt 'Gekommen' " . "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, " . "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. " . "Wenn T-Shirt ein 'Ja' enth&auml;lt, bedeutet dies, dass der Engel " . "bereits sein T-Shirt erhalten hat.<br /><br />\n";
-
-        $html .= "<form action=\"" . page_link_to("admin_user") . "&action=save&id=$user_id\" method=\"post\">\n";
-        $html .= "<table border=\"0\">\n";
-        $html .= "<input type=\"hidden\" name=\"Type\" value=\"Normal\">\n";
-        $html .= "<tr><td>\n";
-        $html .= "<table>\n";
-        $html .= "  <tr><td>Nick</td><td>" . "<input type=\"text\" size=\"40\" name=\"eNick\" value=\"" . $user_source['Nick'] . "\"></td></tr>\n";
-        $html .= "  <tr><td>lastLogIn</td><td>" . date("Y-m-d H:i", $user_source['lastLogIn']) . "</td></tr>\n";
-        $html .= "  <tr><td>Name</td><td>" . "<input type=\"text\" size=\"40\" name=\"eName\" value=\"" . $user_source['Name'] . "\"></td></tr>\n";
-        $html .= "  <tr><td>Vorname</td><td>" . "<input type=\"text\" size=\"40\" name=\"eVorname\" value=\"" . $user_source['Vorname'] . "\"></td></tr>\n";
-        $html .= "  <tr><td>Alter</td><td>" . "<input type=\"text\" size=\"5\" name=\"eAlter\" value=\"" . $user_source['Alter'] . "\"></td></tr>\n";
-        $html .= "  <tr><td>Telefon</td><td>" . "<input type=\"text\" size=\"40\" name=\"eTelefon\" value=\"" . $user_source['Telefon'] . "\"></td></tr>\n";
-        $html .= "  <tr><td>Handy</td><td>" . "<input type=\"text\" size=\"40\" name=\"eHandy\" value=\"" . $user_source['Handy'] . "\"></td></tr>\n";
-        $html .= "  <tr><td>DECT</td><td>" . "<input type=\"text\" size=\"4\" name=\"eDECT\" value=\"" . $user_source['DECT'] . "\"></td></tr>\n";
+        $html .= 'Hallo,<br />'
+            . 'hier kannst du den Eintrag &auml;ndern. Unter dem Punkt \'Gekommen\' '
+            . 'wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, '
+            . 'dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. '
+            . 'Wenn T-Shirt ein \'Ja\' enth&auml;lt, bedeutet dies, dass der Engel '
+            . 'bereits sein T-Shirt erhalten hat.<br /><br />' . "\n";
+
+        $html .= '<form action="' . page_link_to('admin_user') . '&action=save&id=$user_id" method="post">' . "\n";
+        $html .= '<table border="0">' . "\n";
+        $html .= '<input type="hidden" name="Type" value="Normal">' . "\n";
+        $html .= '<tr><td>' . "\n";
+        $html .= '<table>' . "\n";
+        $html .= '  <tr><td>Nick</td><td>' . '<input type="text" size="40" name="eNick" value="' . $user_source['Nick'] . '"></td></tr>' . "\n";
+        $html .= '  <tr><td>lastLogIn</td><td>' . date('Y-m-d H:i', $user_source['lastLogIn']) . '</td></tr>' . "\n";
+        $html .= '  <tr><td>Name</td><td>' . '<input type="text" size="40" name="eName" value="' . $user_source['Name'] . '"></td></tr>' . "\n";
+        $html .= '  <tr><td>Vorname</td><td>' . '<input type="text" size="40" name="eVorname" value="' . $user_source['Vorname'] . '"></td></tr>' . "\n";
+        $html .= '  <tr><td>Alter</td><td>' . '<input type="text" size="5" name="eAlter" value="' . $user_source['Alter'] . '"></td></tr>' . "\n";
+        $html .= '  <tr><td>Telefon</td><td>' . '<input type="text" size="40" name="eTelefon" value="' . $user_source['Telefon'] . '"></td></tr>' . "\n";
+        $html .= '  <tr><td>Handy</td><td>' . '<input type="text" size="40" name="eHandy" value="' . $user_source['Handy'] . '"></td></tr>' . "\n";
+        $html .= '  <tr><td>DECT</td><td>' . '<input type="text" size="4" name="eDECT" value="' . $user_source['DECT'] . '"></td></tr>' . "\n";
         if ($user_source['email_by_human_allowed']) {
-            $html .= "  <tr><td>email</td><td>" . "<input type=\"text\" size=\"40\" name=\"eemail\" value=\"" . $user_source['email'] . "\"></td></tr>\n";
+            $html .= "  <tr><td>email</td><td>" . '<input type="text" size="40" name="eemail" value="' . $user_source['email'] . '"></td></tr>' . "\n";
         }
-        $html .= "  <tr><td>jabber</td><td>" . "<input type=\"text\" size=\"40\" name=\"ejabber\" value=\"" . $user_source['jabber'] . "\"></td></tr>\n";
-        $html .= "  <tr><td>Size</td><td>"
-            . html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size'])
-            . "</td></tr>\n";
+        $html .= "  <tr><td>jabber</td><td>" . '<input type="text" size="40" name="ejabber" value="' . $user_source['jabber'] . '"></td></tr>' . "\n";
+        $html .= '  <tr><td>Size</td><td>'
+            . html_select_key('size', 'eSize', $tshirt_sizes, $user_source['Size']) . '</td></tr>' . "\n";
 
         $options = [
-            '1' => _("Yes"),
-            '0' => _("No")
+            '1' => _('Yes'),
+            '0' => _('No')
         ];
 
         // Gekommen?
-        $html .= "  <tr><td>Gekommen</td><td>\n";
-        $html .= html_options('eGekommen', $options, $user_source['Gekommen']) . "</td></tr>\n";
+        $html .= '  <tr><td>Gekommen</td><td>' . "\n";
+        $html .= html_options('eGekommen', $options, $user_source['Gekommen']) . '</td></tr>' . "\n";
 
         // Aktiv?
-        $html .= "  <tr><td>Aktiv</td><td>\n";
-        $html .= html_options('eAktiv', $options, $user_source['Aktiv']) . "</td></tr>\n";
+        $html .= '  <tr><td>Aktiv</td><td>' . "\n";
+        $html .= html_options('eAktiv', $options, $user_source['Aktiv']) . '</td></tr>' . "\n";
 
         // Aktiv erzwingen
         if (in_array('admin_active', $privileges)) {
-            $html .= "  <tr><td>" . _("Force active") . "</td><td>\n";
-            $html .= html_options('force_active', $options, $user_source['force_active']) . "</td></tr>\n";
+            $html .= '  <tr><td>' . _('Force active') . '</td><td>' . "\n";
+            $html .= html_options('force_active', $options, $user_source['force_active']) . '</td></tr>' . "\n";
         }
 
         // T-Shirt bekommen?
-        $html .= "  <tr><td>T-Shirt</td><td>\n";
-        $html .= html_options('eTshirt', $options, $user_source['Tshirt']) . "</td></tr>\n";
+        $html .= '  <tr><td>T-Shirt</td><td>' . "\n";
+        $html .= html_options('eTshirt', $options, $user_source['Tshirt']) . '</td></tr>' . "\n";
 
-        $html .= "  <tr><td>Hometown</td><td>" . "<input type=\"text\" size=\"40\" name=\"Hometown\" value=\"" . $user_source['Hometown'] . "\"></td></tr>\n";
+        $html .= '  <tr><td>Hometown</td><td>' . '<input type="text" size="40" name="Hometown" value="' . $user_source['Hometown'] . '"></td></tr>' . "\n";
 
-        $html .= "</table>\n</td><td valign=\"top\"></td></tr>";
+        $html .= '</table>' . "\n" . '</td><td valign="top"></td></tr>';
 
-        $html .= "</td></tr>\n";
-        $html .= "</table>\n<br />\n";
-        $html .= "<input type=\"submit\" value=\"Speichern\">\n";
-        $html .= "</form>";
+        $html .= '</td></tr>' . "\n";
+        $html .= '</table>' . "\n" . '<br />' . "\n";
+        $html .= '<input type="submit" value="Speichern">';
+        $html .= '</form>';
 
-        $html .= "<hr />";
+        $html .= '<hr />';
 
         $html .= form_info('', _('Please visit the angeltypes page or the users profile to manage users angeltypes.'));
 
-        $html .= "Hier kannst Du das Passwort dieses Engels neu setzen:<form action=\"" . page_link_to("admin_user") . "&action=change_pw&id=$user_id\" method=\"post\">\n";
-        $html .= "<table>\n";
-        $html .= "  <tr><td>Passwort</td><td>" . "<input type=\"password\" size=\"40\" name=\"new_pw\" value=\"\"></td></tr>\n";
-        $html .= "  <tr><td>Wiederholung</td><td>" . "<input type=\"password\" size=\"40\" name=\"new_pw2\" value=\"\"></td></tr>\n";
+        $html .= 'Hier kannst Du das Passwort dieses Engels neu setzen:<form action="'
+            . page_link_to('admin_user') . '&action=change_pw&id=' . $user_id . '" method="post">' . "\n";
+        $html .= '<table>' . "\n";
+        $html .= '  <tr><td>Passwort</td><td>' . '<input type="password" size="40" name="new_pw" value=""></td></tr>' . "\n";
+        $html .= '  <tr><td>Wiederholung</td><td>' . '<input type="password" size="40" name="new_pw2" value=""></td></tr>' . "\n";
 
-        $html .= "</table>";
-        $html .= "<input type=\"submit\" value=\"Speichern\">\n";
-        $html .= "</form>";
+        $html .= '</table>';
+        $html .= '<input type="submit" value="Speichern">' . "\n";
+        $html .= '</form>';
 
-        $html .= "<hr />";
+        $html .= '<hr />';
 
         $my_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`='" . sql_escape($user['UID']) . "' ORDER BY `group_id` LIMIT 1");
         if (count($my_highest_group) > 0) {
@@ -110,24 +115,36 @@ function admin_user()
         }
 
         if ($user_id != $user['UID'] && $my_highest_group <= $his_highest_group) {
-            $html .= "Hier kannst Du die Benutzergruppen des Engels festlegen:<form action=\"" . page_link_to("admin_user") . "&action=save_groups&id=" . $user_id . "\" method=\"post\">\n";
+            $html .= 'Hier kannst Du die Benutzergruppen des Engels festlegen:<form action="'
+                . page_link_to('admin_user') . '&action=save_groups&id=' . $user_id . '" method="post">' . "\n";
             $html .= '<table>';
 
-            $groups = sql_select("SELECT * FROM `Groups` LEFT OUTER JOIN `UserGroups` ON (`UserGroups`.`group_id` = `Groups`.`UID` AND `UserGroups`.`uid` = '" . sql_escape($user_id) . "') WHERE `Groups`.`UID` >= '" . sql_escape($my_highest_group) . "' ORDER BY `Groups`.`Name`");
+            $groups = sql_select("
+                SELECT *
+                FROM `Groups`
+                LEFT OUTER JOIN `UserGroups` ON (
+                    `UserGroups`.`group_id` = `Groups`.`UID`
+                    AND `UserGroups`.`uid` = '" . sql_escape($user_id) . "'
+                )
+                WHERE `Groups`.`UID` >= '" . sql_escape($my_highest_group) . "'
+                ORDER BY `Groups`.`Name`
+            ");
             foreach ($groups as $group) {
-                $html .= '<tr><td><input type="checkbox" name="groups[]" value="' . $group['UID'] . '" ' . ($group['group_id'] != "" ? ' checked="checked"' : '') . ' /></td><td>' . $group['Name'] . '</td></tr>';
+                $html .= '<tr><td><input type="checkbox" name="groups[]" value="' . $group['UID'] . '" '
+                    . ($group['group_id'] != '' ? ' checked="checked"' : '')
+                    . ' /></td><td>' . $group['Name'] . '</td></tr>';
             }
 
             $html .= '</table>';
 
-            $html .= "<input type=\"submit\" value=\"Speichern\">\n";
-            $html .= "</form>";
+            $html .= '<input type="submit" value="Speichern">' . "\n";
+            $html .= '</form>';
 
-            $html .= "<hr />";
+            $html .= '<hr />';
         }
 
         $html .= buttons([
-            button(user_delete_link($user_source), glyph('lock') . _("delete"), 'btn-danger')
+            button(user_delete_link($user_source), glyph('lock') . _('delete'), 'btn-danger')
         ]);
 
         $html .= "<hr />";
@@ -139,7 +156,16 @@ function admin_user()
                     $his_highest_group = sql_select("SELECT * FROM `UserGroups` WHERE `uid`='" . sql_escape($user_id) . "' ORDER BY `group_id`");
 
                     if (count($my_highest_group) > 0 && (count($his_highest_group) == 0 || ($my_highest_group[0]['group_id'] <= $his_highest_group[0]['group_id']))) {
-                        $groups_source = sql_select("SELECT * FROM `Groups` LEFT OUTER JOIN `UserGroups` ON (`UserGroups`.`group_id` = `Groups`.`UID` AND `UserGroups`.`uid` = '" . sql_escape($user_id) . "') WHERE `Groups`.`UID` >= '" . sql_escape($my_highest_group[0]['group_id']) . "' ORDER BY `Groups`.`Name`");
+                        $groups_source = sql_select("
+                            SELECT *
+                            FROM `Groups`
+                            LEFT OUTER JOIN `UserGroups` ON (
+                                `UserGroups`.`group_id` = `Groups`.`UID`
+                                AND `UserGroups`.`uid` = '" . sql_escape($user_id) . "'
+                            )
+                            WHERE `Groups`.`UID` >= '" . sql_escape($my_highest_group[0]['group_id']) . "'
+                            ORDER BY `Groups`.`Name`
+                        ");
                         $groups = [];
                         $grouplist = [];
                         foreach ($groups_source as $group) {
@@ -160,14 +186,15 @@ function admin_user()
                             }
                         }
                         $user_source = User($user_id);
-                        engelsystem_log("Set groups of " . User_Nick_render($user_source) . " to: " . join(", ",
-                                $user_groups_info));
-                        $html .= success("Benutzergruppen gespeichert.", true);
+                        engelsystem_log(
+                            'Set groups of ' . User_Nick_render($user_source) . ' to: ' . join(', ', $user_groups_info)
+                        );
+                        $html .= success('Benutzergruppen gespeichert.', true);
                     } else {
-                        $html .= error("Du kannst keine Engel mit mehr Rechten bearbeiten.", true);
+                        $html .= error('Du kannst keine Engel mit mehr Rechten bearbeiten.', true);
                     }
                 } else {
-                    $html .= error("Du kannst Deine eigenen Rechte nicht bearbeiten.", true);
+                    $html .= error('Du kannst Deine eigenen Rechte nicht bearbeiten.', true);
                 }
                 break;
 
@@ -196,24 +223,29 @@ function admin_user()
               WHERE `UID` = '" . sql_escape($user_id) . "' 
               LIMIT 1";
                 sql_query($SQL);
-                engelsystem_log("Updated user: " . $_POST["eNick"] . ", " . $_POST["eSize"] . ", arrived: " . $_POST["eGekommen"] . ", active: " . $_POST["eAktiv"] . ", tshirt: " . $_POST["eTshirt"]);
-                $html .= success("Änderung wurde gespeichert...\n", true);
+                engelsystem_log(
+                    'Updated user: ' . $_POST['eNick'] . ', ' . $_POST['eSize']
+                    . ', arrived: ' . $_POST['eGekommen']
+                    . ', active: ' . $_POST['eAktiv']
+                    . ', tshirt: ' . $_POST['eTshirt']
+                );
+                $html .= success('Änderung wurde gespeichert...' . '\n', true);
                 break;
 
             case 'change_pw':
-                if ($_REQUEST['new_pw'] != "" && $_REQUEST['new_pw'] == $_REQUEST['new_pw2']) {
+                if ($_REQUEST['new_pw'] != '' && $_REQUEST['new_pw'] == $_REQUEST['new_pw2']) {
                     set_password($user_id, $_REQUEST['new_pw']);
                     $user_source = User($user_id);
-                    engelsystem_log("Set new password for " . User_Nick_render($user_source));
-                    $html .= success("Passwort neu gesetzt.", true);
+                    engelsystem_log('Set new password for ' . User_Nick_render($user_source));
+                    $html .= success('Passwort neu gesetzt.', true);
                 } else {
-                    $html .= error("Die Eingaben müssen übereinstimmen und dürfen nicht leer sein!", true);
+                    $html .= error('Die Eingaben müssen übereinstimmen und dürfen nicht leer sein!', true);
                 }
                 break;
         }
     }
 
-    return page_with_title(_("Edit user"), [
+    return page_with_title(_('Edit user'), [
         $html
     ]);
 }