Change vap in config to vif, for superwrt v0.4.x.

superwrt · Apr 16, 2017 · 2798eac · 2798eac
1 parent 53c17c5
commit 2798eac
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 31 deletions.
diff --git a/src/opwifi/app/Http/Helpers/Opwifi/DeviceConfigApply.php b/src/opwifi/app/Http/Helpers/Opwifi/DeviceConfigApply.php
@@ -16,26 +16,26 @@ private function settingConvert($path, $cfg) {
 			if (count($cfg)) {
 				$set = [
 					'radio' => [],
-					'vap' => []
+					'vif' => []
 				];
 				if (isset($cfg['_0'], $cfg['_o'])) {
-					$set['vap'] = ['_0'=>[], '_o'=>$cfg['_o']];
-					$vaps = &$set['vap']['_0'];
+					$set['vif'] = ['_0'=>[], '_o'=>$cfg['_o']];
+					$vifs = &$set['vif']['_0'];
 					$wlans = $cfg['_0'];
 				} else {
-					$vaps = &$set['vap'];
+					$vifs = &$set['vif'];
 					$wlans = $cfg;
 				}
 				foreach ($wlans as $k => $v) {
 					if (!isset($v['name']))
 						continue;
-					if (isset($v['vaps'])) {
-						foreach ($v['vaps'] as $vk => $vv) {
+					if (isset($v['vifs'])) {
+						foreach ($v['vifs'] as $vk => $vv) {
 
-							$vaps[] = array_merge($vv,
+							$vifs[] = array_merge($vv,
 									['radio' => $v['name']]);
 						}
-						unset($v['vaps']);
+						unset($v['vifs']);
 					}
 					$set['radio'][] = $v;
 				}

diff --git a/src/opwifi/config/app.php b/src/opwifi/config/app.php
@@ -99,8 +99,10 @@
     */
 
     'log' => env('APP_LOG', 'daily'),
+
+	'log_max_files' => 30,
 
-    'log-level' => 'info',
+    'log-level' => 'notice',
 
     /*
     |--------------------------------------------------------------------------

diff --git a/src/opwifi/config/opwifi.php b/src/opwifi/config/opwifi.php
@@ -1,6 +1,6 @@
 <?php
 return [
-'version'=>'v0.2.2',
-'version_raw'=>2002,
-'publish_date'=>'2017-01-19'
+'version'=>'v0.3.0',
+'version_raw'=>3000,
+'publish_date'=>'2017-04-16'
 ];
diff --git a/src/opwifi/resources/views/opwifi/device/config_edit.blade.php b/src/opwifi/resources/views/opwifi/device/config_edit.blade.php
@@ -233,7 +233,7 @@
   var config = {{ $config['config']?$config['config']:'{}' }};
   var pdata = <?php $config['pdata']?print($config['pdata']):print('{}'); ?>;
 
-  function load_vaps($t, data) {
+  function load_vifs($t, data) {
     $t.bootstrapTable({
             columns: [[
             {
@@ -313,9 +313,9 @@ function load_vaps($t, data) {
           });
   }
 
-  function wlan_add_vap(idx) {
+  function wlan_add_vif(idx) {
     var i;
-    var $t = $('#cf_wlan'+idx+'_vaps');
+    var $t = $('#cf_wlan'+idx+'_vifs');
     var all = $t.bootstrapTable('getData');
     var id = 0;
     for (id = 0; id < 8; id++) {
@@ -356,19 +356,19 @@ function load_wlan_cfg(idx) {
       if (bandwidth !== null) $('#cf_wlan'+idx+'_bw').val(bandwidth);
       if (power !== null) $('#cf_wlan'+idx+'_pw').val(power);
       var vs = [];
-      var vaps = $.opwifi.getItemField(wlan, "vaps.v");
-      if (vaps) {
-        for (var i in vaps) {
-          if (typeof(vaps[i].v) != "undefined") {
-            var vap = vaps[i].v;
-            var id = $.opwifi.getItemField(vap, "id.v");
-            if (id !== null) vs.push({'id':id, '_v':vap});
+      var vifs = $.opwifi.getItemField(wlan, "vifs.v");
+      if (vifs) {
+        for (var i in vifs) {
+          if (typeof(vifs[i].v) != "undefined") {
+            var vif = vifs[i].v;
+            var id = $.opwifi.getItemField(vif, "id.v");
+            if (id !== null) vs.push({'id':id, '_v':vif});
           }
         }
       }
-      load_vaps($('#cf_wlan'+idx+'_vaps'), vs);
+      load_vifs($('#cf_wlan'+idx+'_vifs'), vs);
     } else {
-      load_vaps($('#cf_wlan'+idx+'_vaps'), []);
+      load_vifs($('#cf_wlan'+idx+'_vifs'), []);
     }
   }
 
@@ -422,12 +422,12 @@ function add_wlan(rf, mode, idx) {
       }
       wlan.push('</select></div>');
 
-      wlan.push('<div class="form-group"><a id="cf_wlan'+idx+'_add" class="btn btn-success btn-sm" onClick="wlan_add_vap('+idx+')"><span class="glyphicon glyphicon-plus"></span> 增加SSID</a></div>');
+      wlan.push('<div class="form-group"><a id="cf_wlan'+idx+'_add" class="btn btn-success btn-sm" onClick="wlan_add_vif('+idx+')"><span class="glyphicon glyphicon-plus"></span> 增加SSID</a></div>');
 
       wlan.push('</div>');
       wlan.push('</div>');
 
-      wlan.push('<table id="cf_wlan'+idx+'_vaps" data-id-field="id"></table>');
+      wlan.push('<table id="cf_wlan'+idx+'_vifs" data-id-field="id"></table>');
       wlan.push('</div>');
 
       $('#wlan_ctx').append(wlan.join(''));
@@ -480,12 +480,12 @@ function submit_edit() {
           channel: {v:$(p+'ch').val(),c:$(p+'ch').val()?true:false},
           bandwidth: {v:$(p+'bw').val(),c:$(p+'bw').val()?true:false},
           txpower: {v:$(p+'pw').val(),c:$(p+'pw').val()?true:false},
-          vaps: {v:[], c:true}
+          vifs: {v:[], c:true}
         };
-        var vaps = wlan.vaps.v;
-        var cvaps = $(p+'vaps').bootstrapTable('getData');
-        for (var j = 0; j < cvaps.length; j++) {
-          vaps.push({v:cvaps[j]._v, c:true});
+        var vifs = wlan.vifs.v;
+        var cvifs = $(p+'vifs').bootstrapTable('getData');
+        for (var j = 0; j < cvifs.length; j++) {
+          vifs.push({v:cvifs[j]._v, c:true});
         }
         wlans.push({v:wlan, c:$(p+'cfg').prop('checked')});
       }