diff --git a/module/extension/control.php b/module/extension/control.php
index 7ea873d288..ece1ceeb2b 100644
--- a/module/extension/control.php
+++ b/module/extension/control.php
@@ -210,13 +210,14 @@ class extension extends control
     }
 
     /**
+     * 激活插件。
      * Activate an extension;
      *
-     * @param  string    $extension
+     * @param  string $extension
      * @access public
      * @return void
      */
-    public function activate($extension, $ignore = 'no')
+    public function activate(string $extension, string $ignore = 'no')
     {
         $this->checkSafe();
 
@@ -235,18 +236,20 @@ class extension extends control
         $this->extension->togglePackageDisable($extension, 'active');
         $this->extension->copyPackageFiles($extension);
         $this->extension->updateExtension($extension, array('status' => 'installed'));
+
         $this->view->title = $this->lang->extension->activateFinished;
         $this->display();
     }
 
     /**
+     * 禁用插件。
      * Deactivate an extension
      *
-     * @param  string    $extension
+     * @param  string $extension
      * @access public
      * @return void
      */
-    public function deactivate($extension)
+    public function deactivate(string $extension)
     {
         $this->checkSafe();
 
diff --git a/module/misc/control.php b/module/misc/control.php
index b8620b6d6b..3326a52033 100644
--- a/module/misc/control.php
+++ b/module/misc/control.php
@@ -193,7 +193,7 @@ class misc extends control
             while($line = fgets($handle))
             {
                 $line = trim($line);
-                if($tag and empty($line)) break;
+                if($tag && empty($line)) break;
                 if($tag) $detailed .= $line . '<br />';
 
                 if(preg_match("/{$version}$/", $line) > 0) $tag = true;
diff --git a/module/misc/model.php b/module/misc/model.php
index ce0f812b94..fec5d4510b 100644
--- a/module/misc/model.php
+++ b/module/misc/model.php
@@ -49,7 +49,7 @@ class miscModel extends model
     public function getRemind(): string
     {
         $remind = '';
-        if(!empty($this->config->global->showAnnual) and empty($this->config->global->annualShowed))
+        if(!empty($this->config->global->showAnnual) && empty($this->config->global->annualShowed))
         {
             $remind  = '<h4>' . $this->lang->misc->showAnnual . '</h4>';
             $remind .= '<p>' . sprintf($this->lang->misc->annualDesc, helper::createLink('report', 'annualData')) . '</p>';