From 7313e15ce8236e19331fb6639a3a5b97c8f06ecd Mon Sep 17 00:00:00 2001 From: Bot Date: Mon, 2 Jan 2017 03:57:23 +0100 Subject: PSR-2 formatting --- includes/model/AngelType_model.php | 193 +++++++++++++++++++------------------ 1 file changed, 101 insertions(+), 92 deletions(-) (limited to 'includes/model/AngelType_model.php') diff --git a/includes/model/AngelType_model.php b/includes/model/AngelType_model.php index 8d6a89b3..022462c0 100644 --- a/includes/model/AngelType_model.php +++ b/includes/model/AngelType_model.php @@ -5,8 +5,9 @@ use Engelsystem\ValidationResult; * Returns an array containing the basic attributes of angeltypes. * FIXME! This is the big sign for needing entity objects */ -function AngelType_new() { - return [ +function AngelType_new() +{ + return [ 'id' => null, 'name' => "", 'restricted' => false, @@ -16,7 +17,7 @@ function AngelType_new() { 'contact_user_id' => null, 'contact_name' => null, 'contact_dect' => null, - 'contact_email' => null + 'contact_email' => null ]; } @@ -27,17 +28,18 @@ function AngelType_new() { * The angeltype * @return ValidationResult */ -function AngelType_validate_contact_user_id($angeltype) { - if (! isset($angeltype['contact_user_id'])) { - return new ValidationResult(true, null); - } - if (isset($angeltype['contact_name']) || isset($angeltype['contact_dect']) || isset($angeltype['contact_email'])) { - return new ValidationResult(false, $angeltype['contact_user_id']); - } - if (User($angeltype['contact_user_id']) == null) { - return new ValidationResult(false, $angeltype['contact_user_id']); - } - return new ValidationResult(true, $angeltype['contact_user_id']); +function AngelType_validate_contact_user_id($angeltype) +{ + if (! isset($angeltype['contact_user_id'])) { + return new ValidationResult(true, null); + } + if (isset($angeltype['contact_name']) || isset($angeltype['contact_dect']) || isset($angeltype['contact_email'])) { + return new ValidationResult(false, $angeltype['contact_user_id']); + } + if (User($angeltype['contact_user_id']) == null) { + return new ValidationResult(false, $angeltype['contact_user_id']); + } + return new ValidationResult(true, $angeltype['contact_user_id']); } /** @@ -46,43 +48,45 @@ function AngelType_validate_contact_user_id($angeltype) { * @param Angeltype $angeltype * The angeltype */ -function AngelType_contact_info($angeltype) { - if (isset($angeltype['contact_user_id'])) { - $contact_user = User($angeltype['contact_user_id']); - $contact_data = [ +function AngelType_contact_info($angeltype) +{ + if (isset($angeltype['contact_user_id'])) { + $contact_user = User($angeltype['contact_user_id']); + $contact_data = [ 'contact_name' => $contact_user['Nick'], - 'contact_dect' => $contact_user['DECT'] + 'contact_dect' => $contact_user['DECT'] ]; - if ($contact_user['email_by_human_allowed']) { - $contact_data['contact_email'] = $contact_user['email']; + if ($contact_user['email_by_human_allowed']) { + $contact_data['contact_email'] = $contact_user['email']; + } + return $contact_data; } - return $contact_data; - } - if (isset($angeltype['contact_name'])) { - return [ + if (isset($angeltype['contact_name'])) { + return [ 'contact_name' => $angeltype['contact_name'], 'contact_dect' => $angeltype['contact_dect'], - 'contact_email' => $angeltype['contact_email'] + 'contact_email' => $angeltype['contact_email'] ]; - } - return null; + } + return null; } /** * Delete an Angeltype. * - * @param Angeltype $angeltype + * @param Angeltype $angeltype */ -function AngelType_delete($angeltype) { - $result = sql_query(" +function AngelType_delete($angeltype) +{ + $result = sql_query(" DELETE FROM `AngelTypes` WHERE `id`='" . sql_escape($angeltype['id']) . "' LIMIT 1"); - if ($result === false) { - engelsystem_error("Unable to delete angeltype."); - } - engelsystem_log("Deleted angeltype: " . AngelType_name_render($angeltype)); - return $result; + if ($result === false) { + engelsystem_error("Unable to delete angeltype."); + } + engelsystem_log("Deleted angeltype: " . AngelType_name_render($angeltype)); + return $result; } /** @@ -91,8 +95,9 @@ function AngelType_delete($angeltype) { * @param Angeltype $angeltype * The angeltype */ -function AngelType_update($angeltype) { - $result = sql_query(" +function AngelType_update($angeltype) +{ + $result = sql_query(" UPDATE `AngelTypes` SET `name`='" . sql_escape($angeltype['name']) . "', `restricted`=" . sql_bool($angeltype['restricted']) . ", @@ -104,11 +109,11 @@ function AngelType_update($angeltype) { `contact_dect`=" . sql_null($angeltype['contact_dect']) . ", `contact_email`=" . sql_null($angeltype['contact_email']) . " WHERE `id`='" . sql_escape($angeltype['id']) . "'"); - if ($result === false) { - engelsystem_error("Unable to update angeltype."); - } - engelsystem_log("Updated angeltype: " . $angeltype['name'] . ($angeltype['restricted'] ? ", restricted" : "") . ($angeltype['no_self_signup'] ? ", no_self_signup" : "") . ($angeltype['requires_driver_license'] ? ", requires driver license" : "")); - return $result; + if ($result === false) { + engelsystem_error("Unable to update angeltype."); + } + engelsystem_log("Updated angeltype: " . $angeltype['name'] . ($angeltype['restricted'] ? ", restricted" : "") . ($angeltype['no_self_signup'] ? ", no_self_signup" : "") . ($angeltype['requires_driver_license'] ? ", requires driver license" : "")); + return $result; } /** @@ -118,8 +123,9 @@ function AngelType_update($angeltype) { * The angeltype * @return the created angeltype */ -function AngelType_create($angeltype) { - $result = sql_query(" +function AngelType_create($angeltype) +{ + $result = sql_query(" INSERT INTO `AngelTypes` SET `name`='" . sql_escape($angeltype['name']) . "', `restricted`=" . sql_bool($angeltype['restricted']) . ", @@ -130,12 +136,12 @@ function AngelType_create($angeltype) { `contact_name`=" . sql_null($angeltype['contact_name']) . ", `contact_dect`=" . sql_null($angeltype['contact_dect']) . ", `contact_email`=" . sql_null($angeltype['contact_email'])); - if ($result === false) { - engelsystem_error("Unable to create angeltype."); - } - $angeltype['id'] = sql_id(); - engelsystem_log("Created angeltype: " . $angeltype['name'] . ($angeltype['restricted'] ? ", restricted" : "") . ($angeltype['requires_driver_license'] ? ", requires driver license" : "")); - return $angeltype; + if ($result === false) { + engelsystem_error("Unable to create angeltype."); + } + $angeltype['id'] = sql_id(); + engelsystem_log("Created angeltype: " . $angeltype['name'] . ($angeltype['restricted'] ? ", restricted" : "") . ($angeltype['requires_driver_license'] ? ", requires driver license" : "")); + return $angeltype; } /** @@ -148,35 +154,37 @@ function AngelType_create($angeltype) { * The angeltype the name is for * @return ValidationResult result and validated name */ -function AngelType_validate_name($name, $angeltype) { - $name = strip_item($name); - if ($name == "") { - return new ValidationResult(false, ""); - } - if ($angeltype != null && isset($angeltype['id'])) { - $valid = sql_num_query(" +function AngelType_validate_name($name, $angeltype) +{ + $name = strip_item($name); + if ($name == "") { + return new ValidationResult(false, ""); + } + if ($angeltype != null && isset($angeltype['id'])) { + $valid = sql_num_query(" SELECT * FROM `AngelTypes` WHERE `name`='" . sql_escape($name) . "' AND NOT `id`='" . sql_escape($angeltype['id']) . "' LIMIT 1") == 0; - return new ValidationResult($valid, $name); - } - $valid = sql_num_query(" + return new ValidationResult($valid, $name); + } + $valid = sql_num_query(" SELECT `id` FROM `AngelTypes` WHERE `name`='" . sql_escape($name) . "' LIMIT 1") == 0; - return new ValidationResult($valid, $name); + return new ValidationResult($valid, $name); } /** * Returns all angeltypes and subscription state to each of them for given user. * - * @param User $user + * @param User $user */ -function AngelTypes_with_user($user) { - $result = sql_select(" +function AngelTypes_with_user($user) +{ + $result = sql_select(" SELECT `AngelTypes`.*, `UserAngelTypes`.`id` as `user_angeltype_id`, `UserAngelTypes`.`confirm_user_id`, @@ -185,35 +193,37 @@ function AngelTypes_with_user($user) { LEFT JOIN `UserAngelTypes` ON `AngelTypes`.`id`=`UserAngelTypes`.`angeltype_id` AND `UserAngelTypes`.`user_id`=" . $user['UID'] . " ORDER BY `name`"); - if ($result === false) { - engelsystem_error("Unable to load angeltypes."); - } - return $result; + if ($result === false) { + engelsystem_error("Unable to load angeltypes."); + } + return $result; } /** * Returns all angeltypes. */ -function AngelTypes() { - $result = sql_select(" +function AngelTypes() +{ + $result = sql_select(" SELECT * FROM `AngelTypes` ORDER BY `name`"); - if ($result === false) { - engelsystem_error("Unable to load angeltypes."); - } - return $result; + if ($result === false) { + engelsystem_error("Unable to load angeltypes."); + } + return $result; } /** * Returns AngelType id array */ -function AngelType_ids() { - $result = sql_select("SELECT `id` FROM `AngelTypes`"); - if ($result === false) { - engelsystem_error("Unable to load angeltypes."); - } - return select_array($result, 'id', 'id'); +function AngelType_ids() +{ + $result = sql_select("SELECT `id` FROM `AngelTypes`"); + if ($result === false) { + engelsystem_error("Unable to load angeltypes."); + } + return select_array($result, 'id', 'id'); } /** @@ -222,15 +232,14 @@ function AngelType_ids() { * @param $angeltype_id angelType * ID */ -function AngelType($angeltype_id) { - $angelType_source = sql_select("SELECT * FROM `AngelTypes` WHERE `id`='" . sql_escape($angeltype_id) . "'"); - if ($angelType_source === false) { - engelsystem_error("Unable to load angeltype."); - } - if (count($angelType_source) > 0) { - return $angelType_source[0]; - } - return null; +function AngelType($angeltype_id) +{ + $angelType_source = sql_select("SELECT * FROM `AngelTypes` WHERE `id`='" . sql_escape($angeltype_id) . "'"); + if ($angelType_source === false) { + engelsystem_error("Unable to load angeltype."); + } + if (count($angelType_source) > 0) { + return $angelType_source[0]; + } + return null; } - -?> -- cgit v1.2.3-70-g09d2