Changeset 12712

Timestamp:

07/05/2023 05:04:40 AM (19 months ago)

Author:

dd32

Message:

Trac: Add a custom API to fetch/set user preferences. Take Two.

See [12711].
See #5055.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications

Files:

• trac-notifications-db.php (modified) (2 diffs)
• trac-notifications-sqlite-driver.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-notifications-db.php

@@ -214 +214 @@
      * @param string $username   The username.
      * @param string $name       The preference.
-     * @param string|null $value The value to set. If null, the preference will be deleted.
+     * @param string|null $value The value to set.
      */
-    function set_user_pref( $username, $name, $value = null ) {
+    function set_user_pref( $username, $name, $value = '' ) {
         // The trac column for username is `sid`. All our users are authenticated.
         // The session_attribute table has an index: UNIQUE (sid,authenticated,name)
 
-        if ( ! is_null( $value ) ) {
+        $result = $this->db->insert( 'session_attribute', array(
+            'sid'           => $username,
+            'authenticated' => 1,
+            'name'          => $name,
+            'value'         => $value
+        ) );
+
+        if ( ! $result ) {
             $result = $this->db->update(
                 'session_attribute',
-                [ 'value' => $value ],
-                [
-                    'sid'           => $username,
-                    'authenticated' => 1,
-                    'name'          => $name
-                ]
-            );
-
-            if ( ! $result ) {
-                // Insert the session if it doesn't exist.
-                $user_has_visited_trac = $this->db->get_var( $this->db->prepare(
-                    'SELECT sid FROM session WHERE sid = %s',
-                    $username
-                ) );
-                if ( ! $user_has_visited_trac ) {
-                    $this->db->insert( 'session', [
-                        'sid'           => $username,
-                        'authenticated' => 1,
-                        'last_visit'    => time(),
-                    ] );
-                }
-
-                // Set the pref.
-                $result = $this->db->insert( 'session_attribute', [
+                array(
+                    'value'         => $value
+                ), array(
                     'sid'           => $username,
                     'authenticated' => 1,
                     'name'          => $name,
-                    'value'         => $value,
-                ] );
-            }
-
-            return $result;
-        } else {
-            return $this->db->delete( 'session_attribute', [
-                'sid'           => $username,
-                'authenticated' => 1,
-                'name'          => $name
-            ] );
-        }
+                )
+            );
+        }
+
+        return $result;
+    }
+    
+    /**
+     * Delete a user preference.
+     *
+     * @param string $username The username.
+     * @param string $name     The preference.
+     * @return bool
+     */
+    function delete_user_pref( $username, $name ) {
+        return $this->db->delete( 'session_attribute', array(
+            'sid'           => $username,
+            'authenticated' => 1,
+            'name'          => $name
+        ) );
     }
 
@@ -303 +297 @@
             'attachments',
             'comments',
-            'profile_data',
+            'profile_data'
         );
     }

sites/trunk/wordpress.org/public_html/wp-content/plugins/trac-notifications/trac-notifications-sqlite-driver.php

@@ -51 +51 @@
     }
 
+    /**
+     * Delete row(s) from a table.
+     *
+     * @return bool If the query ran.
+     */
     public function delete( $table, $where ) {
         $fields = 'AND ' . implode( ' = %s AND ', array_keys( $where ) ) . ' = %s';
@@ -57 +62 @@
             array_values( $where )
         );
-        $this->db->query( $query );
+        return (bool) $this->db->query( $query );
     }
 
+    /**
+     * Insert a row into a table.
+     *
+     * @return bool If the query ran.
+     */
     public function insert( $table, $args ) {
         $fields = "'" . implode( "', '", array_keys( $args ) ) . "'";
@@ -70 +80 @@
     }
 
+    /**
+     * Update a row in a table.
+     *
+     * @return bool If the query executed and modified rows.
+     */
     public function update( $table, $data, $wheres ) {
-        $values     = [];
-        $sql_sets   = [];
-        $sql_wheres = [];
+        $values     = array();
+        $sql_sets   = array();
+        $sql_wheres = array();
 
         foreach ( $data as $field => $value ) {
@@ -81 +96 @@
         $sql_sets = implode( ', ', $sql_sets );
 
-        foreach ( $wheres as $field => $where ) {
+        foreach ( $wheres as $field => $value ) {
             $sql_wheres[] = "$field = %s";
             $values[]     = $value;
@@ -87 +102 @@
         $sql_wheres = implode( ' AND ', $sql_wheres );
 
-        if ( ! $values ) {
+        if ( ! $values || ! $sql_wheres ) {
             return false;
         }
@@ -96 +111 @@
         );
 
-        return (bool) $this->db->query( $query );
+        $result = $this->db->query( $query );
+
+        return $result && $result->rowCount() > 0;
     }
 }