插件功能更新
This commit is contained in:
@@ -7,7 +7,6 @@
|
||||
// | Author: yangweijie <yangweijiester@gmail.com> <code-tech.diandian.com>
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
|
||||
namespace addons\systeminfo;
|
||||
use app\common\controller\Addons;
|
||||
|
||||
@@ -24,7 +23,7 @@ class Systeminfo extends Addons{
|
||||
'description' => '用于显示一些服务器的信息',
|
||||
'status' => 1,
|
||||
'author' => 'molong',
|
||||
'version'=>'0.1'
|
||||
'version' => '0.1',
|
||||
);
|
||||
|
||||
public function install() {
|
||||
@@ -39,7 +38,8 @@ class Systeminfo extends Addons{
|
||||
public function AdminIndex($param) {
|
||||
$config = $this->getConfig();
|
||||
|
||||
if(false){//extension_loaded('curl')
|
||||
if (false) {
|
||||
//extension_loaded('curl')
|
||||
$url = 'http://www.tensent.cn/index.php?m=home&c=version&a=check_version';
|
||||
$params = array(
|
||||
'version' => ONETHINK_VERSION,
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
<h2>{$meta_title}</h2>
|
||||
</div>
|
||||
<div class="pull-right">
|
||||
<a class="btn btn-info" href="{:url('index?refresh=1')}">更 新</a>
|
||||
<a class="btn btn-primary" href="{:url('add')}">新 增</a>
|
||||
<button class="btn btn-danger ajax-post confirm" url="{:url('del')}" target-form="ids">删 除</button>
|
||||
</div>
|
||||
@@ -41,7 +42,7 @@
|
||||
<td>{$item['author']}</td>
|
||||
<td>{$item['version']}</td>
|
||||
<td>
|
||||
{if $item['uninstall']}
|
||||
{if !$item['isinstall']}
|
||||
<a href="{:url('install?addon_name='.$item['name'])}" class="ajax-get">安装</a>
|
||||
{else/}
|
||||
<a href="{:url('uninstall?id='.$item['id'])}" class="confirm ajax-get">卸载</a>
|
||||
|
||||
@@ -207,7 +207,7 @@
|
||||
{if $meta_title}
|
||||
<span>{$meta_title}</span>
|
||||
{else/}
|
||||
<span>{:lang($Request->controller().'_'.$Request->action())}</span>
|
||||
<span>{:lang(request()->controller().'_'.request()->action())}</span>
|
||||
{/if}
|
||||
</li>
|
||||
</ol>
|
||||
|
||||
@@ -34,7 +34,7 @@ class Addons extends Base {
|
||||
|
||||
public function template($template) {
|
||||
$mc = $this->getAddonsName();
|
||||
$ac = input('get.ac', '', 'trim,strtolower');
|
||||
$ac = input('ac', '', 'trim,strtolower');
|
||||
$parse_str = \think\Config::get('parse_str');
|
||||
$parse_str['__ADDONROOT__'] = ROOT_PATH . "/addons/{$mc}";
|
||||
\think\Config::set('parse_str', $parse_str);
|
||||
@@ -52,7 +52,7 @@ class Addons extends Base {
|
||||
}
|
||||
|
||||
final public function getAddonsName() {
|
||||
$mc = input('get.mc', '', 'trim,strtolower');
|
||||
$mc = input('mc', '', 'trim,strtolower');
|
||||
if ($mc) {
|
||||
return $mc;
|
||||
} else {
|
||||
|
||||
@@ -201,6 +201,7 @@ class Admin extends Base {
|
||||
$model = db('Addons');
|
||||
$list = array();
|
||||
$map = array(
|
||||
'isinstall' => array('gt', 0),
|
||||
'status' => array('gt', 0),
|
||||
);
|
||||
$list = $model->field("name,id,title,'' as 'style'")->where($map)->select();
|
||||
|
||||
@@ -16,15 +16,15 @@ namespace app\common\model;
|
||||
*/
|
||||
class Addons extends \app\common\model\Base {
|
||||
|
||||
protected $auto = array('status');
|
||||
protected $auto = array('status', 'isinstall', 'update_time');
|
||||
protected $insert = array('create_time');
|
||||
|
||||
protected function setStatusAttr($value) {
|
||||
return 1;
|
||||
return $value ? $value : 0;
|
||||
}
|
||||
|
||||
protected function setIsinstallAttr($value) {
|
||||
return 0;
|
||||
return $value ? $value : 0;
|
||||
}
|
||||
|
||||
protected function getStatusTextAttr($value, $data) {
|
||||
@@ -49,7 +49,7 @@ class Addons extends \app\common\model\Base {
|
||||
return FALSE;
|
||||
}
|
||||
$where['name'] = array('in', $dirs);
|
||||
$addons = $this->where($where)->select();
|
||||
$addons = $this->where($where)->column('*', 'name');
|
||||
|
||||
foreach ($dirs as $value) {
|
||||
$value = ucfirst($value);
|
||||
@@ -61,12 +61,8 @@ class Addons extends \app\common\model\Base {
|
||||
continue;
|
||||
}
|
||||
$obj = new $class;
|
||||
$addons[$value] = $obj->info;
|
||||
if($addons[$value]){
|
||||
$addons[$value]['id'] = 0;
|
||||
$addons[$value]['uninstall'] = 1;
|
||||
unset($addons[$value]['status']);
|
||||
}
|
||||
$save = $obj->info;
|
||||
self::create($save);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -87,18 +83,19 @@ class Addons extends \app\common\model\Base {
|
||||
|
||||
public function install($data) {
|
||||
if ($data) {
|
||||
$info = $this->where('name', $data['name'])->find();
|
||||
if (null == $info) {
|
||||
$info = $this->where('name', $data['name'])->value('id');
|
||||
if ($info) {
|
||||
$result = $this->save(array('isinstall'=>1, 'status'=>1), array('id'=>$info));
|
||||
}else{
|
||||
$data['isinstall'] = 1;
|
||||
$data['status'] = 1;
|
||||
$result = $this->save($data);
|
||||
if ($result) {
|
||||
}
|
||||
if (false !== $result) {
|
||||
return model('Hooks')->addHooks($data['name']);
|
||||
}else{
|
||||
return false;
|
||||
}
|
||||
}else{
|
||||
$this->error = "已安装！";
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -85,12 +85,13 @@ class Hooks extends Base {
|
||||
'update_time' => time(),
|
||||
'status' => 1
|
||||
);
|
||||
$this->save($save);
|
||||
self::create($save);
|
||||
}else{
|
||||
if ($info['addons']) {
|
||||
# code...
|
||||
$addons = explode(',', $info['addons']);
|
||||
array_push($addons, substr($item, 0, -5));
|
||||
}else{
|
||||
$addons = substr($item, 0, -5);
|
||||
$addons = array(substr($item, 0, -5));
|
||||
}
|
||||
$this->where('name', $addons_name)->setField('addons', $addons);
|
||||
}
|
||||
@@ -105,6 +106,14 @@ class Hooks extends Base {
|
||||
$this->error = "未实现{$addons_name}插件的入口文件";
|
||||
return false;
|
||||
}
|
||||
$methods = get_class_methods($addons_class);
|
||||
$row = $this->where(array('addons'=>array('like',$addons_name)))->select();
|
||||
foreach ($row as $key => $value) {
|
||||
$value['addons'] = explode(',', $info['addons']);
|
||||
$key = array_search($addons_name, $value['addons']);
|
||||
unset($value['addons'][$key]);
|
||||
$addons = $value['addons'];
|
||||
$this->where('id', $value['id'])->setField('addons', $addons);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user