Fix missing mysqli_connect_errno (#1346)

* Fix compatibility with PHP 8.1

PHP Deprecated:  htmlspecialchars(): Passing null to parameter #1 ($string) of type string is deprecated in typecho/var/Widget/Archive.php on line 1292

* Fix login

* Fix write

* Fix manage

* Fix PHP Deprecated

.gitignore

@@ -24,6 +24,7 @@
 *.sublime*
 .sass-cache
 config.rb
+prepros.config
 /config.inc.php
 /usr/uploads/
 /usr/*.db

admin/login.php

@@ -4,7 +4,7 @@ include 'common.php';
 if ($user->hasLogin()) {
     $response->redirect($options->adminUrl);
 }
-$rememberName = htmlspecialchars(\Typecho\Cookie::get('__typecho_remember_name'));
+$rememberName = htmlspecialchars(\Typecho\Cookie::get('__typecho_remember_name', ''));
 \Typecho\Cookie::delete('__typecho_remember_name');
 
 $bodyClass = 'body-100';
@@ -25,7 +25,7 @@ include 'header.php';
             </p>
             <p class="submit">
                 <button type="submit" class="btn btn-l w-100 primary"><?php _e('登录'); ?></button>
-                <input type="hidden" name="referer" value="<?php echo htmlspecialchars($request->get('referer')); ?>" />
+                <input type="hidden" name="referer" value="<?php echo htmlspecialchars($request->get('referer') ?? ''); ?>" />
             </p>
             <p>
                 <label for="remember">

admin/manage-comments.php

@@ -69,7 +69,7 @@ $isAllComments = ('on' == $request->get('__typecho_all_comments') || 'on' == \Ty
                             (isset($request->status) ? 'status=' . htmlspecialchars($request->get('status')) : '') .
                             (isset($request->cid) ? (isset($request->status) ? '&' : '') . 'cid=' . htmlspecialchars($request->get('cid')) : '') : '')); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
                             <?php endif; ?>
-                            <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>" value="<?php echo htmlspecialchars($request->keywords); ?>"<?php if ('' == $request->keywords): ?> onclick="value='';name='keywords';" <?php else: ?> name="keywords"<?php endif; ?>/>
+                            <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>" value="<?php echo htmlspecialchars($request->keywords ?? ''); ?>"<?php if ('' == $request->keywords): ?> onclick="value='';name='keywords';" <?php else: ?> name="keywords"<?php endif; ?>/>
                             <?php if(isset($request->status)): ?>
                                 <input type="hidden" value="<?php echo htmlspecialchars($request->get('status')); ?>" name="status" />
                             <?php endif; ?>

admin/manage-medias.php

@@ -36,7 +36,7 @@ $attachments = \Widget\Contents\Attachment\Admin::alloc();
                                 <a href="<?php $options->adminUrl('manage-medias.php'); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
                             <?php endif; ?>
                             <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>"
-                                   value="<?php echo htmlspecialchars($request->keywords); ?>"<?php if ('' == $request->keywords): ?> onclick="value='';name='keywords';" <?php else: ?> name="keywords"<?php endif; ?>/>
+                                   value="<?php echo htmlspecialchars($request->keywords ?? ''); ?>"<?php if ('' == $request->keywords): ?> onclick="value='';name='keywords';" <?php else: ?> name="keywords"<?php endif; ?>/>
                             <button type="submit" class="btn btn-s"><?php _e('筛选'); ?></button>
                         </div>
                     </form>

admin/manage-pages.php

@@ -39,7 +39,7 @@ $pages = \Widget\Contents\Page\Admin::alloc();
                                 <a href="<?php $options->adminUrl('manage-pages.php'); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
                             <?php endif; ?>
                             <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>"
-                                   value="<?php echo htmlspecialchars($request->keywords); ?>" name="keywords"/>
+                                   value="<?php echo htmlspecialchars($request->keywords ?? ''); ?>" name="keywords"/>
                             <button type="submit" class="btn btn-s"><?php _e('筛选'); ?></button>
                         </div>
                     </form>

admin/manage-users.php

@@ -31,7 +31,7 @@ $users = \Widget\Users\Admin::alloc();
                                 <a href="<?php $options->adminUrl('manage-users.php'); ?>"><?php _e('&laquo; 取消筛选'); ?></a>
                             <?php endif; ?>
                             <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>"
-                                   value="<?php echo htmlspecialchars($request->keywords); ?>" name="keywords"/>
+                                   value="<?php echo htmlspecialchars($request->keywords ?? ''); ?>" name="keywords"/>
                             <button type="submit" class="btn btn-s"><?php _e('筛选'); ?></button>
                         </div>
                     </form>

admin/write-page.php

@@ -34,7 +34,7 @@ include 'menu.php';
                     if ($page->have()) {
                         $permalink = str_replace('{cid}', $page->cid, $permalink);
                     }
-                    $input = '<input type="text" id="slug" name="slug" autocomplete="off" value="' . htmlspecialchars($page->slug) . '" class="mono" />';
+                    $input = '<input type="text" id="slug" name="slug" autocomplete="off" value="' . htmlspecialchars($page->slug ?? '') . '" class="mono" />';
                     ?>
                     <p class="mono url-slug">
                         <label for="slug" class="sr-only"><?php _e('网址缩略名'); ?></label>
@@ -43,7 +43,7 @@ include 'menu.php';
                     <p>
                         <label for="text" class="sr-only"><?php _e('页面内容'); ?></label>
                         <textarea style="height: <?php $options->editorSize(); ?>px" autocomplete="off" id="text"
-                                  name="text" class="w-100 mono"><?php echo htmlspecialchars($page->text); ?></textarea>
+                                  name="text" class="w-100 mono"><?php echo htmlspecialchars($page->text ?? ''); ?></textarea>
                     </p>
 
                     <?php include 'custom-fields.php'; ?>

admin/write-post.php

@@ -38,7 +38,7 @@ include 'menu.php';
                             $post->cid, $post->category, $post->year, $post->month, $post->day
                         ], $permalink);
                     }
-                    $input = '<input type="text" id="slug" name="slug" autocomplete="off" value="' . htmlspecialchars($post->slug) . '" class="mono" />';
+                    $input = '<input type="text" id="slug" name="slug" autocomplete="off" value="' . htmlspecialchars($post->slug ?? '') . '" class="mono" />';
                     ?>
                     <p class="mono url-slug">
                         <label for="slug" class="sr-only"><?php _e('网址缩略名'); ?></label>
@@ -47,7 +47,7 @@ include 'menu.php';
                     <p>
                         <label for="text" class="sr-only"><?php _e('文章内容'); ?></label>
                         <textarea style="height: <?php $options->editorSize(); ?>px" autocomplete="off" id="text"
-                                  name="text" class="w-100 mono"><?php echo htmlspecialchars($post->text); ?></textarea>
+                                  name="text" class="w-100 mono"><?php echo htmlspecialchars($post->text ?? ''); ?></textarea>
                     </p>
 
                     <?php include 'custom-fields.php'; ?>
@@ -134,7 +134,7 @@ include 'menu.php';
                                                 <option
                                                     value="hidden"<?php if ($post->status == 'hidden'): ?> selected<?php endif; ?>><?php _e('隐藏'); ?></option>
                                                 <option
-                                                    value="password"<?php if (strlen($post->password) > 0): ?> selected<?php endif; ?>><?php _e('密码保护'); ?></option>
+                                                    value="password"<?php if (strlen($post->password ?? '') > 0): ?> selected<?php endif; ?>><?php _e('密码保护'); ?></option>
                                                 <option
                                                     value="private"<?php if ($post->status == 'private'): ?> selected<?php endif; ?>><?php _e('私密'); ?></option>
                                             <?php endif; ?>
@@ -142,7 +142,7 @@ include 'menu.php';
                                                 value="waiting"<?php if (!$user->pass('editor', true) || $post->status == 'waiting'): ?> selected<?php endif; ?>><?php _e('待审核'); ?></option>
                                         </select>
                                     </p>
-                                    <p id="post-password"<?php if (strlen($post->password) == 0): ?> class="hidden"<?php endif; ?>>
+                                    <p id="post-password"<?php if (strlen($post->password ?? '') == 0): ?> class="hidden"<?php endif; ?>>
                                         <label for="protect-pwd" class="sr-only">内容密码</label>
                                         <input type="text" name="password" id="protect-pwd" class="text-s"
                                                value="<?php $post->password(); ?>" size="16"

install.php

@@ -1021,6 +1021,9 @@ function install_step_2_perform()
         case 'SQLite':
             $error = (new \Typecho\Validate())
                 ->addRule('dbFile', 'required', _t('确认您的配置'))
+                ->addRule('dbFile', function (string $path) {
+                    return !!preg_match("/^(\/[_a-z0-9-]+)*[a-z0-9]+\.[a-z0-9]{2,}$/i", $path);
+                }, _t('确认您的配置'))
                 ->run($config);
             break;
         default:
@@ -1041,6 +1044,10 @@ function install_step_2_perform()
         $dbConfig['port'] = intval($dbConfig['port']);
     }
 
+    if (isset($dbConfig['file']) && preg_match("/^[a-z0-9]+\.[a-z0-9]{2,}$/i", $dbConfig['file'])) {
+        $dbConfig['file'] = __DIR__ . '/usr/' . $dbConfig['file'];
+    }
+
     // check config file
     if ($config['dbNext'] == 'config' && !install_check('config')) {
         $code = install_config_file($config['dbAdapter'], $config['dbPrefix'], $dbConfig, true);
@@ -1051,10 +1058,10 @@ function install_step_2_perform()
             $installDb = new \Typecho\Db($config['dbAdapter'], $config['dbPrefix']);
             $installDb->addServer($dbConfig, \Typecho\Db::READ | \Typecho\Db::WRITE);
             $installDb->query('SELECT 1=1');
-        } catch (\Typecho\Db\Adapter_Exception $e) {
+        } catch (\Typecho\Db\Adapter\ConnectionException $e) {
             install_raise_error(_t('对不起, 无法连接数据库, 请先检查数据库配置再继续进行安装'));
         } catch (\Typecho\Db\Exception $e) {
-            install_raise_error(_t('安装程序捕捉到以下错误: " %s ". 程序被终止, 请检查您的配置信息.', $e->getMessage()));
+            install_raise_error(_t('安装程序捕捉到以下错误: "%s". 程序被终止, 请检查您的配置信息.', $e->getMessage()));
         }
 
         $code = install_config_file($config['dbAdapter'], $config['dbPrefix'], $dbConfig);
@@ -1084,12 +1091,14 @@ function install_step_2_perform()
 
         try {
             foreach ($tables as $table) {
-                if ($type == 'Mysql') {
-                    $installDb->query("DROP TABLE IF EXISTS `{$table}`");
-                } elseif ($type == 'Pgsql') {
-                    $installDb->query("DROP TABLE {$table}");
-                } elseif ($type == 'SQLite') {
-                    $installDb->query("DROP TABLE {$table}");
+                switch ($type) {
+                    case 'Mysql':
+                        $installDb->query("DROP TABLE IF EXISTS `{$table}`");
+                        break;
+                    case 'Pgsql':
+                    case 'SQLite':
+                        $installDb->query("DROP TABLE {$table}");
+                        break;
                 }
             }
         } catch (\Typecho\Db\Exception $e) {

var/Typecho/Common.php

@@ -230,10 +230,10 @@ namespace Typecho {
                 //覆盖原始错误信息
                 $message = 'Database Server Error';
 
-                if ($exception instanceof \Typecho\Db\Adapter\SQLException) {
+                if ($exception instanceof \Typecho\Db\Adapter\ConnectionException) {
                     $code = 503;
                     $message = 'Error establishing a database connection';
-                } elseif ($exception instanceof \Typecho\Db\Query\Exception) {
+                } elseif ($exception instanceof \Typecho\Db\Adapter\SQLException) {
                     $message = 'Database Query Error';
                 }
             }

var/Typecho/Config.php

@@ -102,6 +102,7 @@ class Config implements \Iterator, \ArrayAccess
      * @access public
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return current($this->currentConfig);
@@ -124,6 +125,7 @@ class Config implements \Iterator, \ArrayAccess
      * @access public
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return key($this->currentConfig);
@@ -222,6 +224,7 @@ class Config implements \Iterator, \ArrayAccess
      * @param mixed $offset
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->currentConfig[$offset] ?? null;

var/Typecho/Db/Adapter/Mysqli.php

@@ -64,7 +64,7 @@ class Mysqli implements Adapter
         }
 
         /** 数据库异常 */
-        throw new ConnectionException("Couldn't connect to database.");
+        throw new ConnectionException("Couldn't connect to database.", mysqli_connect_errno());
     }
 
     /**

var/Typecho/Request.php

@@ -305,7 +305,7 @@ class Request
             return $this->pathInfo;
         }
 
-        //参考Zend Framework对pahtinfo的处理, 更好的兼容性
+        //参考Zend Framework对pathinfo的处理, 更好的兼容性
         $pathInfo = null;
 
         //处理requestUri

var/Typecho/Response.php

@@ -209,7 +209,7 @@ class Response
                 $timeout = 1;
             }
 
-            setrawcookie($key, rawurlencode($value), $timeout, $path, $domain);
+            setrawcookie($key, rawurlencode($value), $timeout, $path, $domain ?? '');
         }
     }
 

var/Typecho/Validate.php

@@ -221,7 +221,7 @@ class Validate
      * @access public
      *
      * @param string $key 数值键值
-     * @param string|array $rule 规则名称
+     * @param string|callable $rule 规则名称
      * @param string $message 错误字符串
      *
      * @return $this
@@ -271,12 +271,12 @@ class Validate
         foreach ($rules as $key => $rule) {
             $this->key = $key;
             $data[$key] = (is_array($data[$key]) ? 0 == count($data[$key])
-                : 0 == strlen($data[$key])) ? null : $data[$key];
+                : 0 == strlen($data[$key] ?? '')) ? null : $data[$key];
 
             foreach ($rule as $params) {
                 $method = $params[0];
 
-                if ('required' != $method && 'confirm' != $method && 0 == strlen($data[$key])) {
+                if ('required' != $method && 'confirm' != $method && 0 == strlen($data[$key] ?? '')) {
                     continue;
                 }
 
@@ -284,7 +284,7 @@ class Validate
                 $params[1] = $data[$key];
                 $params = array_slice($params, 1);
 
-                if (!call_user_func_array(is_array($method) ? $method : [$this, $method], $params)) {
+                if (!call_user_func_array(is_callable($method) ? $method : [$this, $method], $params)) {
                     $result[$key] = $message;
                     break;
                 }
@@ -319,11 +319,9 @@ class Validate
      *
      * @access public
      *
-     * @param string|null $str 待处理的字符串
-     *
      * @return boolean
      */
-    public function required(?string $str): bool
+    public function required(): bool
     {
         return !empty($this->data[$this->key]);
     }

var/Typecho/Widget.php

@@ -190,19 +190,24 @@ abstract class Widget
     /**
      * alloc widget instance with alias
      *
-     * @param string $alias
+     * @param string|null $alias
      * @param mixed $params
      * @param mixed $request
      * @param bool|callable $disableSandboxOrCallback
      * @return $this
      */
     public static function allocWithAlias(
-        string $alias,
+        ?string $alias,
         $params = null,
         $request = null,
         $disableSandboxOrCallback = true
     ): Widget {
-        return self::widget(static::class . '@' . $alias, $params, $request, $disableSandboxOrCallback);
+        return self::widget(
+            static::class . (isset($alias) ? '@' . $alias : ''),
+            $params,
+            $request,
+            $disableSandboxOrCallback
+        );
     }
 
     /**

var/Widget/Archive.php

@@ -1289,7 +1289,7 @@ class Archive extends Contents
         if ($return) {
             return $value;
         } else {
-            echo htmlspecialchars($value);
+            echo htmlspecialchars($value ?? '');
         }
     }
 
@@ -1498,7 +1498,7 @@ class Archive extends Contents
                     'date'            => $this->created,
                     'link'            => $this->permalink,
                     'author'          => $this->author,
-                    'excerpt'         => $this->description,
+                    'excerpt'         => $this->___description(),
                     'comments'        => $this->commentsNum,
                     'commentsFeedUrl' => $feedUrl,
                     'suffix'          => $suffix

var/Widget/Comments/Edit.php

@@ -275,7 +275,7 @@ class Edit extends Comments implements ActionInterface
             }
 
             /** 评论插件接口 */
-            self::pluginHandle()->edit($comment, $this);
+            $comment = self::pluginHandle()->edit($comment, $this);
 
             /** 更新评论 */
             $this->update($comment, $this->db->sql()->where('coid = ?', $coid));

var/Widget/User.php

@@ -268,7 +268,7 @@ class User extends Users
             } else {
                 //防止循环重定向
                 $this->response->redirect(defined('__TYPECHO_ADMIN__') ? $this->options->loginUrl .
-                    (0 === strpos($this->request->getReferer(), $this->options->loginUrl) ? '' :
+                    (0 === strpos($this->request->getReferer() ?? '', $this->options->loginUrl) ? '' :
                         '?referer=' . urlencode($this->request->makeUriByRequest())) : $this->options->siteUrl, false);
             }
         }