优化写配置文件

Author: karsonzhang

composer.json

@@ -3,7 +3,7 @@
     "description": "addons package for fastadmin",
     "homepage": "https://github.com/karsonzhang/fastadmin-addons",
     "license": "Apache-2.0",
-    "version": "1.2.10",
+    "version": "1.2.11",
     "authors": [
         {
             "name": "Karson",

src/Addons.php

@@ -20,6 +20,8 @@ abstract class Addons
     protected $error;
     // 插件目录
     public $addons_path = '';
+    public $addonPath = '';
+
     // 插件标识
     protected $addonName = '';
     // 插件配置作用域
@@ -39,10 +41,11 @@ public function __construct($name = null)
         $this->addonName = $name;
 
         // 获取当前插件目录
-        $this->addons_path = ADDON_PATH . $name . DS;
+        $this->addonPath = ADDON_PATH . $name . DS;
+        $this->addons_path = $this->addonPath;
 
         // 初始化视图模型
-        $config = ['view_path' => $this->addons_path];
+        $config = ['view_path' => $this->addonPath];
         $config = array_merge(Config::get('template'), $config);
         $this->view = new View($config, Config::get('view_replace_str'));
 
@@ -69,9 +72,9 @@ final public function getInfo($name = '', $force = false)
             }
         }
         $info = [];
-        $info_file = $this->addons_path . 'info.ini';
-        if (is_file($info_file)) {
-            $info = Config::parse($info_file, '', $name, $this->infoRange);
+        $infoFile = $this->addonPath . 'info.ini';
+        if (is_file($infoFile)) {
+            $info = Config::parse($infoFile, '', $name, $this->infoRange);
             $info['url'] = addon_url($name);
         }
         Config::set($name, $info, $this->infoRange);
@@ -96,13 +99,15 @@ final public function getConfig($name = '', $force = false)
             }
         }
         $config = [];
-        $config_file = $this->addons_path . 'config.php';
-        if (is_file($config_file)) {
-            $temp_arr = include $config_file;
-            foreach ($temp_arr as $key => $value) {
-                $config[$value['name']] = $value['value'];
+        $configFile = $this->addonPath . 'config.php';
+        if (is_file($configFile)) {
+            $configArr = include $configFile;
+            if (is_array($configArr)) {
+                foreach ($configArr as $key => $value) {
+                    $config[$value['name']] = $value['value'];
+                }
+                unset($configArr);
             }
-            unset($temp_arr);
         }
         Config::set($name, $config, $this->configRange);
 
@@ -154,9 +159,9 @@ final public function getFullConfig($name = '')
         if (empty($name)) {
             $name = $this->getName();
         }
-        $config_file = $this->addons_path . 'config.php';
-        if (is_file($config_file)) {
-            $fullConfigArr = include $config_file;
+        $configFile = $this->addonPath . 'config.php';
+        if (is_file($configFile)) {
+            $fullConfigArr = include $configFile;
         }
         return $fullConfigArr;
     }

src/addons/Route.php

@@ -40,7 +40,7 @@ public function execute($addon = null, $controller = null, $action = null)
             }
             $dispatch = $request->dispatch();
             if (isset($dispatch['var']) && $dispatch['var']) {
-                //$request->route($dispatch['var']);
+                $request->route(array_diff_key($dispatch['var'], array_flip(['addon', 'controller', 'action'])));
             }
 
             // 设置当前请求的控制器、操作

src/addons/Service.php

@@ -387,12 +387,7 @@ public static function refresh()
             throw new Exception(__("Unable to open file '%s' for writing", "addons.php"));
         }
 
-        if ($handle = fopen($file, 'w')) {
-            fwrite($handle, "<?php\n\n" . "return " . VarExporter::export($config) . ";\n");
-            fclose($handle);
-        } else {
-            throw new Exception(__("Unable to open file '%s' for writing", "addons.php"));
-        }
+        file_put_contents($file, "<?php\n\n" . "return " . VarExporter::export($config) . ";\n", LOCK_EX);
         return true;
     }
 

src/common.php

@@ -456,9 +456,7 @@ function set_addon_info($name, $array)
             $res[] = "$key = " . (is_numeric($val) ? $val : $val);
         }
     }
-    if ($handle = fopen($file, 'w')) {
-        fwrite($handle, implode("\n", $res) . "\n");
-        fclose($handle);
+    if (file_put_contents($file, implode("\n", $res) . "\n", LOCK_EX)) {
         //清空当前配置缓存
         Config::set($name, null, 'addoninfo');
     } else {
@@ -504,14 +502,9 @@ function set_addon_config($name, $config, $writefile = true)
 function set_addon_fullconfig($name, $array)
 {
     $file = ADDON_PATH . $name . DS . 'config.php';
-    if (!is_really_writable($file)) {
-        throw new Exception("文件没有写入权限");
-    }
-    if ($handle = fopen($file, 'w')) {
-        fwrite($handle, "<?php\n\n" . "return " . VarExporter::export($array) . ";\n");
-        fclose($handle);
-    } else {
-        throw new Exception("文件没有写入权限");
+    $ret = file_put_contents($file, "<?php\n\n" . "return " . VarExporter::export($array) . ";\n", LOCK_EX);
+    if (!$ret) {
+        throw new Exception("配置写入失败");
     }
     return true;
 }