Formatting

1 files changed, 210 insertions, 175 deletions

diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index 293fb891..482b7670 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -19,9 +19,9 @@ function logout_title()
 function guest_register()
 {
     global $tshirt_sizes, $enable_tshirt_size, $default_theme, $user, $min_password_length;
-  
+
     $event_config = EventConfig();
-  
+
     $msg = "";
     $nick = "";
     $lastname = "";
@@ -40,19 +40,19 @@ function guest_register()
     $password_hash = "";
     $selected_angel_types = [];
     $planned_arrival_date = null;
-  
+
     $angel_types_source = AngelTypes();
     $angel_types = [];
     foreach ($angel_types_source as $angel_type) {
         $angel_types[$angel_type['id']] = $angel_type['name'] . ($angel_type['restricted'] ? " (restricted)" : "");
-        if (! $angel_type['restricted']) {
+        if (!$angel_type['restricted']) {
             $selected_angel_types[] = $angel_type['id'];
         }
     }
-  
+
     if (isset($_REQUEST['submit'])) {
         $valid = true;
-    
+
         if (isset($_REQUEST['nick']) && strlen(User_validate_Nick($_REQUEST['nick'])) > 1) {
             $nick = User_validate_Nick($_REQUEST['nick']);
             if (sql_num_query("SELECT * FROM `User` WHERE `Nick`='" . sql_escape($nick) . "' LIMIT 1") > 0) {
@@ -61,12 +61,15 @@ function guest_register()
             }
         } else {
             $valid = false;
-            $msg .= error(sprintf(_("Your nick "%s" is too short (min. 2 characters)."), User_validate_Nick($_REQUEST['nick'])), true);
+            $msg .= error(sprintf(
+                _("Your nick "%s" is too short (min. 2 characters)."),
+                User_validate_Nick($_REQUEST['nick'])
+            ), true);
         }
-    
+
         if (isset($_REQUEST['mail']) && strlen(strip_request_item('mail')) > 0) {
             $mail = strip_request_item('mail');
-            if (! check_email($mail)) {
+            if (!check_email($mail)) {
                 $valid = false;
                 $msg .= error(_("E-mail address is not correct."), true);
             }
@@ -74,23 +77,23 @@ function guest_register()
             $valid = false;
             $msg .= error(_("Please enter your e-mail."), true);
         }
-    
+
         if (isset($_REQUEST['email_shiftinfo'])) {
             $email_shiftinfo = true;
         }
-    
+
         if (isset($_REQUEST['email_by_human_allowed'])) {
             $email_by_human_allowed = true;
         }
-    
+
         if (isset($_REQUEST['jabber']) && strlen(strip_request_item('jabber')) > 0) {
             $jabber = strip_request_item('jabber');
-            if (! check_email($jabber)) {
+            if (!check_email($jabber)) {
                 $valid = false;
                 $msg .= error(_("Please check your jabber account information."), true);
             }
         }
-    
+
         if ($enable_tshirt_size) {
             if (isset($_REQUEST['tshirt_size']) && isset($tshirt_sizes[$_REQUEST['tshirt_size']]) && $_REQUEST['tshirt_size'] != '') {
                 $tshirt_size = $_REQUEST['tshirt_size'];
@@ -99,7 +102,7 @@ function guest_register()
                 $msg .= error(_("Please select your shirt size."), true);
             }
         }
-    
+
         if (isset($_REQUEST['password']) && strlen($_REQUEST['password']) >= $min_password_length) {
             if ($_REQUEST['password'] != $_REQUEST['password2']) {
                 $valid = false;
@@ -107,30 +110,33 @@ function guest_register()
             }
         } else {
             $valid = false;
-            $msg .= error(sprintf(_("Your password is too short (please use at least %s characters)."), $min_password_length), true);
+            $msg .= error(sprintf(
+                _("Your password is too short (please use at least %s characters)."),
+                $min_password_length
+            ), true);
         }
-    
+
         if (isset($_REQUEST['planned_arrival_date'])) {
             $tmp = parse_date("Y-m-d H:i", $_REQUEST['planned_arrival_date'] . " 00:00");
             $result = User_validate_planned_arrival_date($tmp);
             $planned_arrival_date = $result->getValue();
-            if (! $result->isValid()) {
+            if (!$result->isValid()) {
                 $valid = false;
                 error(_("Please enter your planned date of arrival. It should be after the buildup start date and before teardown end date."));
             }
         }
-    
+
         $selected_angel_types = [];
         foreach (array_keys($angel_types) as $angel_type_id) {
             if (isset($_REQUEST['angel_types_' . $angel_type_id])) {
                 $selected_angel_types[] = $angel_type_id;
             }
         }
-    
-    // Trivia
-    if (isset($_REQUEST['lastname'])) {
-        $lastname = strip_request_item('lastname');
-    }
+
+        // Trivia
+        if (isset($_REQUEST['lastname'])) {
+            $lastname = strip_request_item('lastname');
+        }
         if (isset($_REQUEST['prename'])) {
             $prename = strip_request_item('prename');
         }
@@ -152,7 +158,7 @@ function guest_register()
         if (isset($_REQUEST['comment'])) {
             $comment = strip_request_item_nl('comment');
         }
-    
+
         if ($valid) {
             sql_query("
           INSERT INTO `User` SET 
@@ -176,36 +182,39 @@ function guest_register()
           `Sprache`='" . sql_escape($_SESSION["locale"]) . "',
           `arrival_date`=NULL,
           `planned_arrival_date`='" . sql_escape($planned_arrival_date) . "'");
-      
-      // Assign user-group and set password
-      $user_id = sql_id();
+
+            // Assign user-group and set password
+            $user_id = sql_id();
             sql_query("INSERT INTO `UserGroups` SET `uid`='" . sql_escape($user_id) . "', `group_id`=-2");
             set_password($user_id, $_REQUEST['password']);
-      
-      // Assign angel-types
-      $user_angel_types_info = [];
+
+            // Assign angel-types
+            $user_angel_types_info = [];
             foreach ($selected_angel_types as $selected_angel_type_id) {
                 sql_query("INSERT INTO `UserAngelTypes` SET `user_id`='" . sql_escape($user_id) . "', `angeltype_id`='" . sql_escape($selected_angel_type_id) . "'");
                 $user_angel_types_info[] = $angel_types[$selected_angel_type_id];
             }
-      
-            engelsystem_log("User " . User_Nick_render(User($user_id)) . " signed up as: " . join(", ", $user_angel_types_info));
+
+            engelsystem_log(
+                "User " . User_Nick_render(User($user_id))
+                . " signed up as: " . join(", ", $user_angel_types_info)
+            );
             success(_("Angel registration successful!"));
-      
-      // User is already logged in - that means a supporter has registered an angel. Return to register page.
-      if (isset($user)) {
-          redirect(page_link_to('register'));
-      }
-      
-      // If a welcome message is present, display registration success page.
-      if ($event_config != null && $event_config['event_welcome_msg'] != null) {
-          return User_registration_success_view($event_config['event_welcome_msg']);
-      }
-      
+
+            // User is already logged in - that means a supporter has registered an angel. Return to register page.
+            if (isset($user)) {
+                redirect(page_link_to('register'));
+            }
+
+            // If a welcome message is present, display registration success page.
+            if ($event_config != null && $event_config['event_welcome_msg'] != null) {
+                return User_registration_success_view($event_config['event_welcome_msg']);
+            }
+
             redirect('?');
         }
     }
-  
+
     $buildup_start_date = time();
     $teardown_end_date = null;
     if ($event_config != null) {
@@ -216,79 +225,105 @@ function guest_register()
             $teardown_end_date = $event_config['teardown_end_date'];
         }
     }
-  
+
     return page_with_title(register_title(), [
-      _("By completing this form you're registering as a Chaos-Angel. This script will create you an account in the angel task scheduler."),
-      $msg,
-      msg(),
-      form([
-          div('row', [
-              div('col-md-6', [
-                  div('row', [
-                      div('col-sm-4', [
-                          form_text('nick', _("Nick") . ' ' . entry_required(), $nick)
-                      ]),
-                      div('col-sm-8', [
-                          form_email('mail', _("E-Mail") . ' ' . entry_required(), $mail),
-                          form_checkbox('email_shiftinfo', _("The engelsystem is allowed to send me an email (e.g. when my shifts change)"), $email_shiftinfo),
-                          form_checkbox('email_by_human_allowed', _("Humans are allowed to send me an email (e.g. for ticket vouchers)"), $email_by_human_allowed)
-                      ])
-                  ]),
-                  div('row', [
-                      div('col-sm-6', [
-                          form_date('planned_arrival_date', _("Planned date of arrival") . ' ' . entry_required(), $planned_arrival_date, $buildup_start_date, $teardown_end_date)
-                      ]),
-                      div('col-sm-6', [
-                          $enable_tshirt_size ? form_select('tshirt_size', _("Shirt size") . ' ' . entry_required(), $tshirt_sizes, $tshirt_size) : ''
-                      ])
-                  ]),
-                  div('row', [
-                      div('col-sm-6', [
-                          form_password('password', _("Password") . ' ' . entry_required())
-                      ]),
-                      div('col-sm-6', [
-                          form_password('password2', _("Confirm password") . ' ' . entry_required())
-                      ])
-                  ]),
-                  form_checkboxes('angel_types', _("What do you want to do?") . sprintf(" (<a href=\"%s\">%s</a>)", page_link_to('angeltypes') . '&action=about', _("Description of job types")), $angel_types, $selected_angel_types),
-                  form_info("", _("Restricted angel types need will be confirmed later by a supporter. You can change your selection in the options section."))
-              ]),
-              div('col-md-6', [
-                  div('row', [
-                      div('col-sm-4', [
-                          form_text('dect', _("DECT"), $dect)
-                      ]),
-                      div('col-sm-4', [
-                          form_text('mobile', _("Mobile"), $mobile)
-                      ]),
-                      div('col-sm-4', [
-                          form_text('tel', _("Phone"), $tel)
-                      ])
-                  ]),
-                  form_text('jabber', _("Jabber"), $jabber),
-                  div('row', [
-                      div('col-sm-6', [
-                          form_text('prename', _("First name"), $prename)
-                      ]),
-                      div('col-sm-6', [
-                          form_text('lastname', _("Last name"), $lastname)
-                      ])
-                  ]),
-                  div('row', [
-                      div('col-sm-3', [
-                          form_text('age', _("Age"), $age)
-                      ]),
-                      div('col-sm-9', [
-                          form_text('hometown', _("Hometown"), $hometown)
-                      ])
-                  ]),
-                  form_info(entry_required() . ' = ' . _("Entry required!"))
-              ])
-          ]),
-          // form_textarea('comment', _("Did you help at former CCC events and which tasks have you performed then?"), $comment),
-          form_submit('submit', _("Register"))
-      ])
-  ]);
+        _("By completing this form you're registering as a Chaos-Angel. This script will create you an account in the angel task scheduler."),
+        $msg,
+        msg(),
+        form([
+            div('row', [
+                div('col-md-6', [
+                    div('row', [
+                        div('col-sm-4', [
+                            form_text('nick', _("Nick") . ' ' . entry_required(), $nick)
+                        ]),
+                        div('col-sm-8', [
+                            form_email('mail', _("E-Mail") . ' ' . entry_required(), $mail),
+                            form_checkbox(
+                                'email_shiftinfo',
+                                _("The engelsystem is allowed to send me an email (e.g. when my shifts change)"),
+                                $email_shiftinfo
+                            ),
+                            form_checkbox(
+                                'email_by_human_allowed',
+                                _("Humans are allowed to send me an email (e.g. for ticket vouchers)"),
+                                $email_by_human_allowed
+                            )
+                        ])
+                    ]),
+                    div('row', [
+                        div('col-sm-6', [
+                            form_date(
+                                'planned_arrival_date',
+                                _("Planned date of arrival") . ' ' . entry_required(),
+                                $planned_arrival_date, $buildup_start_date, $teardown_end_date
+                            )
+                        ]),
+                        div('col-sm-6', [
+                            $enable_tshirt_size ? form_select('tshirt_size',
+                                _("Shirt size") . ' ' . entry_required(),
+                                $tshirt_sizes, $tshirt_size) : ''
+                        ])
+                    ]),
+                    div('row', [
+                        div('col-sm-6', [
+                            form_password('password', _("Password") . ' ' . entry_required())
+                        ]),
+                        div('col-sm-6', [
+                            form_password('password2', _("Confirm password") . ' ' . entry_required())
+                        ])
+                    ]),
+                    form_checkboxes(
+                        'angel_types',
+                        _("What do you want to do?") . sprintf(
+                            " (<a href=\"%s\">%s</a>)",
+                            page_link_to('angeltypes') . '&action=about',
+                            _("Description of job types")
+                        ),
+                        $angel_types,
+                        $selected_angel_types
+                    ),
+                    form_info(
+                        "",
+                        _("Restricted angel types need will be confirmed later by a supporter. You can change your selection in the options section.")
+                    )
+                ]),
+                div('col-md-6', [
+                    div('row', [
+                        div('col-sm-4', [
+                            form_text('dect', _("DECT"), $dect)
+                        ]),
+                        div('col-sm-4', [
+                            form_text('mobile', _("Mobile"), $mobile)
+                        ]),
+                        div('col-sm-4', [
+                            form_text('tel', _("Phone"), $tel)
+                        ])
+                    ]),
+                    form_text('jabber', _("Jabber"), $jabber),
+                    div('row', [
+                        div('col-sm-6', [
+                            form_text('prename', _("First name"), $prename)
+                        ]),
+                        div('col-sm-6', [
+                            form_text('lastname', _("Last name"), $lastname)
+                        ])
+                    ]),
+                    div('row', [
+                        div('col-sm-3', [
+                            form_text('age', _("Age"), $age)
+                        ]),
+                        div('col-sm-9', [
+                            form_text('hometown', _("Hometown"), $hometown)
+                        ])
+                    ]),
+                    form_info(entry_required() . ' = ' . _("Entry required!"))
+                ])
+            ]),
+            // form_textarea('comment', _("Did you help at former CCC events and which tasks have you performed then?"), $comment),
+            form_submit('submit', _("Register"))
+        ])
+    ]);
 }
 
 function entry_required()
@@ -305,10 +340,10 @@ function guest_logout()
 function guest_login()
 {
     $nick = "";
-  
+
     unset($_SESSION['uid']);
     $valid = true;
-  
+
     if (isset($_REQUEST['submit'])) {
         if (isset($_REQUEST['nick']) && strlen(User_validate_Nick($_REQUEST['nick'])) > 0) {
             $nick = User_validate_Nick($_REQUEST['nick']);
@@ -316,7 +351,7 @@ function guest_login()
             if (count($login_user) > 0) {
                 $login_user = $login_user[0];
                 if (isset($_REQUEST['password'])) {
-                    if (! verify_password($_REQUEST['password'], $login_user['Passwort'], $login_user['UID'])) {
+                    if (!verify_password($_REQUEST['password'], $login_user['Passwort'], $login_user['UID'])) {
                         $valid = false;
                         error(_("Your password is incorrect.  Please try it again."));
                     }
@@ -332,75 +367,75 @@ function guest_login()
             $valid = false;
             error(_("Please enter a nickname."));
         }
-    
+
         if ($valid) {
             $_SESSION['uid'] = $login_user['UID'];
             $_SESSION['locale'] = $login_user['Sprache'];
-      
+
             redirect(page_link_to('news'));
         }
     }
-  
+
     $event_config = EventConfig();
-  
+
     return page([
-      div('col-md-12', [
-          div('row', [
-              EventConfig_countdown_page($event_config)
-          ]),
-          div('row', [
-              div('col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4', [
-                  div('panel panel-primary first', [
-                      div('panel-heading', [
-                          '<span class="icon-icon_angel"></span> ' . _("Login")
-                      ]),
-                      div('panel-body', [
-                          msg(),
-                          form([
-                              form_text_placeholder('nick', _("Nick"), $nick),
-                              form_password_placeholder('password', _("Password")),
-                              form_submit('submit', _("Login")),
-                              ! $valid ? buttons([
-                                  button(page_link_to('user_password_recovery'), _("I forgot my password"))
-                              ]) : ''
-                          ])
-                      ]),
-                      div('panel-footer', [
-                          glyph('info-sign') . _("Please note: You have to activate cookies!")
-                      ])
-                  ])
-              ])
-          ]),
-          div('row', [
-              div('col-sm-6 text-center', [
-                  heading(register_title(), 2),
-                  get_register_hint()
-              ]),
-              div('col-sm-6 text-center', [
-                  heading(_("What can I do?"), 2),
-                  '<p>' . _("Please read about the jobs you can do to help us.") . '</p>',
-                  buttons([
-                      button(page_link_to('angeltypes') . '&action=about', _("Teams/Job description") . ' &raquo;')
-                  ])
-              ])
-          ])
-      ])
-  ]);
+        div('col-md-12', [
+            div('row', [
+                EventConfig_countdown_page($event_config)
+            ]),
+            div('row', [
+                div('col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4', [
+                    div('panel panel-primary first', [
+                        div('panel-heading', [
+                            '<span class="icon-icon_angel"></span> ' . _("Login")
+                        ]),
+                        div('panel-body', [
+                            msg(),
+                            form([
+                                form_text_placeholder('nick', _("Nick"), $nick),
+                                form_password_placeholder('password', _("Password")),
+                                form_submit('submit', _("Login")),
+                                !$valid ? buttons([
+                                    button(page_link_to('user_password_recovery'), _("I forgot my password"))
+                                ]) : ''
+                            ])
+                        ]),
+                        div('panel-footer', [
+                            glyph('info-sign') . _("Please note: You have to activate cookies!")
+                        ])
+                    ])
+                ])
+            ]),
+            div('row', [
+                div('col-sm-6 text-center', [
+                    heading(register_title(), 2),
+                    get_register_hint()
+                ]),
+                div('col-sm-6 text-center', [
+                    heading(_("What can I do?"), 2),
+                    '<p>' . _("Please read about the jobs you can do to help us.") . '</p>',
+                    buttons([
+                        button(page_link_to('angeltypes') . '&action=about', _("Teams/Job description") . ' &raquo;')
+                    ])
+                ])
+            ])
+        ])
+    ]);
 }
 
 function get_register_hint()
 {
     global $privileges;
-  
+
     if (in_array('register', $privileges)) {
         return join('', [
-        '<p>' . _("Please sign up, if you want to help us!") . '</p>',
-        buttons([
-            button(page_link_to('register'), register_title() . ' &raquo;')
-        ])
-    ]);
+            '<p>' . _("Please sign up, if you want to help us!") . '</p>',
+            buttons([
+                button(page_link_to('register'), register_title() . ' &raquo;')
+            ])
+        ]);
     }
-  
-  //FIXME: return error(_("Registration is disabled."), true);
-  return error("Registration is <a href='https://engelsystem.de/33c3/overwhelmed.html'>disabled</a>.", true);
+
+    //FIXME: return error(_("Registration is disabled."), true);
+    return error("Registration is <a href='https://engelsystem.de/33c3/overwhelmed.html'>disabled</a>.", true);
 }