* Optimize extension activate and deactivate function.

This commit is contained in:
wangyuting
2023-12-06 16:54:01 +08:00
parent a7d88a2b52
commit 65067b5beb
3 changed files with 9 additions and 6 deletions
+7 -4
View File
@@ -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();
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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>';