From a17c5b5f05ca4c7cf4f0d0d640f95ae283b1796a Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 10 Apr 2021 15:24:51 +0200 Subject: Use (object) notation to create plain objects. --- includes/venue.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'includes') diff --git a/includes/venue.php b/includes/venue.php index 9b4a3af..896f448 100644 --- a/includes/venue.php +++ b/includes/venue.php @@ -1,5 +1,4 @@ // SPDX-FileCopyrightText: 2021 Harald Eilertsen // @@ -30,11 +29,11 @@ if ( !class_exists('GiglogAdmin_Venue') ) { } static function create($name,$city) - { if(empty($city)) $city='Oslo'; - $attrs = new stdClass(); - $attrs->wpgvenue_name = $name; - $attrs->wpgvenue_city = $city; - $venue = new GiglogAdmin_Venue($attrs); + { + $venue = new GiglogAdmin_Venue((object) [ + 'wpgvenue_name' => $name, + 'wpgvenue_city' => !empty($city) ? $city : 'Oslo', + ]); $venue->save(); return $venue; -- cgit v1.2.3 From 96fbcbc6a915fc284a6a07de6696be66ef5cecb2 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Wed, 14 Apr 2021 21:44:42 +0200 Subject: GiglogAdmin_Venue: Use default args to set default city. --- includes/venue.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'includes') diff --git a/includes/venue.php b/includes/venue.php index 896f448..1b3d79b 100644 --- a/includes/venue.php +++ b/includes/venue.php @@ -28,21 +28,20 @@ if ( !class_exists('GiglogAdmin_Venue') ) { $this->webpage = isset($attrs->wpgvenue_webpage) ? $attrs->wpgvenue_webpage : NULL; } - static function create($name,$city) + static function create($name, $city = 'Oslo') { $venue = new GiglogAdmin_Venue((object) [ 'wpgvenue_name' => $name, - 'wpgvenue_city' => !empty($city) ? $city : 'Oslo', + 'wpgvenue_city' => $city, ]); $venue->save(); return $venue; } - static function find_or_create($name, $city) + static function find_or_create($name, $city = 'Oslo') { global $wpdb; - if(empty($city)) $city='Oslo'; $venuesql = 'SELECT * FROM wpg_venues WHERE upper(wpgvenue_name)="' . $name . '"'; $results = $wpdb->get_results($venuesql); -- cgit v1.2.3 From 0420c538c92e1351c1fbf145a6dd12f8e1be6e1a Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Thu, 15 Apr 2021 00:50:30 +0200 Subject: Fix prepare call in Venue::venues_in_city. --- includes/venue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'includes') diff --git a/includes/venue.php b/includes/venue.php index 1b3d79b..850aaa0 100644 --- a/includes/venue.php +++ b/includes/venue.php @@ -75,7 +75,7 @@ if ( !class_exists('GiglogAdmin_Venue') ) { { global $wpdb; $q = $wpdb->prepare( - "select id, wpgvenue_name from wpg_venues where wpgvenue_city=?", $city); + "select id, wpgvenue_name from wpg_venues where wpgvenue_city=%s", $city); $results = $wpdb->get_results($q); return array_map(function ($r) { return new GiglogAdmin_Venue($r); }, $results); -- cgit v1.2.3 From 68df3cb908f8d6658fa39ef81a923bf8dc21509d Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Thu, 15 Apr 2021 00:52:02 +0200 Subject: Save city for venues too. --- includes/venue.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'includes') diff --git a/includes/venue.php b/includes/venue.php index 850aaa0..07dec0e 100644 --- a/includes/venue.php +++ b/includes/venue.php @@ -87,7 +87,8 @@ if ( !class_exists('GiglogAdmin_Venue') ) { $wpdb->insert('wpg_venues', array( 'id' => '', - 'wpgvenue_name' => $this->name + 'wpgvenue_name' => $this->name, + 'wpgvenue_city' => $this->city, )); $this->id = $wpdb->insert_id; -- cgit v1.2.3