Changeset 747

Timestamp:

Aug 27, 2021 2:27:14 AM (3 years ago)

Author:

anonymous

Message:

Set default mysql connection charset to utf8mb4

Location:

trunk/lib

Files:

• App.inc.php (modified) (2 diffs)
• DBSessionHandler.inc.php (modified) (1 diff)
• PDO.inc.php (modified) (2 diffs)
• Utilities.inc.php (modified) (1 diff)

trunk/lib/App.inc.php

@@ -1494 +1494 @@
      *                                          -false  <-- To not carry any queries. If URL already has queries those will be retained.
      * @param   bool    $always_include_sid     Force session id to be added to Location header.
-     */
-    public function dieURL($url, $carry_args=null, $always_include_sid=false)
+     * @param   int     $http_response_code     The HTTP response code to include with the Location header. Use 303 when the redirect should be GET, or
+     *                                          use 307 when the redirect should use the same method as the original request.
+     */
+    public function dieURL($url, $carry_args=null, $always_include_sid=false, $http_response_code=303)
     {
         if (!$this->running) {
@@ -1509 +1511 @@
         $url = $this->url($url, $carry_args, $always_include_sid);
 
-        // Should we send a "303 See Other" header here instead of relying on the 302 sent automatically by PHP?
         if (!headers_sent($h_file, $h_line)) {
-            header(sprintf('Location: %s', $url));
+            header(sprintf('Location: %s', $url), true, $http_response_code);
             $this->logMsg(sprintf('dieURL: %s', $url), LOG_DEBUG, __FILE__, __LINE__);
         } else {

trunk/lib/DBSessionHandler.inc.php

@@ -112 +112 @@
                 PRIMARY KEY `session_id` (`session_id`),
                 KEY `last_access` (`last_access`)
-            ) ENGINE=InnoDB DEFAULT CHARSET=utf8");
+            ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4");
 
             if (!$this->db->columnExists($this->_params['db_table'], array(

trunk/lib/PDO.inc.php

@@ -88 +88 @@
     // Translate between HTML and MySQL character set names.
     public $mysql_character_sets = array(
-        'utf-8' => 'utf8',
+        'utf-8' => 'utf8mb4',
         'iso-8859-1' => 'latin1',
     );
@@ -255 +255 @@
     public function close()
     {
-        $app =& App::getInstance();
-
-        if (!$this->_connected) {
-            throw new \Exception(sprintf('No DB connection to run %s', __METHOD__));
-        }
-
         $this->_connected = false;
         $this->dbh = null;

trunk/lib/Utilities.inc.php

@@ -1087 +1087 @@
  * quotes if necessary.
  *
- * @param string $key (optional) The name of a $_REQUEST key.
- * @param string $default (optional) The value to return if the
- *                                   variable is not there.
+ * @param string $key       The name of a $_REQUEST key (optional).
+ * @param string $default   The value to return if the variable is set (optional).
  * @return mixed      A cleaned GET or POST array if no key specified.
- * @return string     A cleaned form value if found, or $default.
+ * @return string     A cleaned form value if set, or $default.
  */
 function getFormData($key=null, $default=null)