Skip to content

Commit a023e7e

Browse files
usualtoolusualtool
committed
update 260218
1 parent c248c33 commit a023e7e

55 files changed

Lines changed: 86 additions & 58 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/modules/ut-data/admin/backup.php‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,16 @@
1313
* 封装备份数据方法
1414
*/
1515
function backup(){
16-
global$m;
1716
$data=array();
1817
$fileArr = array();
19-
$handle = opendir("../modules/".$m."/backup/");
20-
while(($file=readdir($handle))<>""){
18+
$backupdir = UTF_ROOT."/log/sql";
19+
if(!is_dir($backupdir)){
20+
return [];
21+
}else{
22+
$handle = opendir($backupdir);
23+
while(($file=readdir($handle))!=false){
2124
if($file !== '.' && $file != '..'){
22-
$filedate = filemtime("../modules/".$m."/backup/".$file."");
25+
$filedate = filemtime($backupdir."/".$file."");
2326
$fileArr[$file] = $filedate;
2427
}
2528
}
@@ -30,12 +33,13 @@ function backup(){
3033
$thisName = $thisFile[0];
3134
$data[]=array(
3235
"name"=>$thisName,
33-
"size"=>UTInc::ForBytes(filesize("../modules/".$m."/backup/".$thisName."")),
34-
"time"=>date('Y-m-d H:i:s',filemtime("../modules/".$m."/backup/".$thisName.""))
36+
"size"=>UTInc::ForBytes(filesize($backupdir."/".$thisName."")),
37+
"time"=>date('Y-m-d H:i:s',filemtime($backupdir."/".$thisName.""))
3538
);
3639
}
3740
closedir($handle);
3841
return $data;
42+
}
3943
}
4044
$app->Runin("data",backup());
4145
/**
@@ -46,7 +50,10 @@ function backup(){
4650
* SQL查询
4751
*/
4852
if($do=="sql-backup"){
49-
$to_file_name = "../modules/".$m."/backup/".UTInc::GetRandomString(16).".sql";
53+
$to_file_name = UTF_ROOT."/log/sql/".UTInc::GetRandomString(16).".sql";
54+
if(!is_dir(UTF_ROOT."/log/sql/")){
55+
UTInc::MakeDir(UTF_ROOT."/log/sql/");
56+
}
5057
$tables = mysqli_query($db,"show tables");
5158
$tabList = array();
5259
while($row = mysqli_fetch_row($tables)){
@@ -89,30 +96,30 @@ function backup(){
8996
mysqli_free_result($res);
9097
file_put_contents($to_file_name,"\r\n",FILE_APPEND);
9198
}
92-
echo "<script>alert('SQL备份成功!');window.location.href='?m=ut-data&p=backup'</script>";
99+
UTInc::GoUrl("?m=ut-data&p=backup","SQL备份成功!");
93100
}
94101
/**
95102
* SQL文件还原
96103
*/
97104
if($do=="sql-rev"){
98-
$sqlfile="../modules/".$m."/backup/".$_GET['sql'];
105+
$sqlfile=UTF_ROOT."/log/sql/".$_GET['sql'];
99106
$sql=file_get_contents($sqlfile);
100107
$arr=explode('|UTSQL|', $sql);
101108
foreach ($arr as $value){
102109
$db->query($value.';');
103110
}
104-
echo "<script>alert('SQL还原执行成功!');window.location.href='?m=ut-data&p=backup'</script>";
111+
UTInc::GoUrl("?m=ut-data&p=backup","SQL还原执行成功!");
105112
}
106113
/**
107114
* SQL文件删除
108115
*/
109116
if($do=="sql-del"){
110117
$sql=str_replace("..","",$_GET['sql']);
111-
$sqlbak="../modules/".$m."/backup/".$sql."";
112-
if(UTInc::Contain($m."/backup",$sqlbak)):
118+
$sqlbak=UTF_ROOT."/log/sql/".$sql;
119+
if(file_exists($sqlbak)):
113120
UTInc::UnlinkFile($sqlbak);
114-
echo "<script>alert('SQL文件删除成功!');window.location.href='?m=ut-data&p=backup'</script>";
121+
UTInc::GoUrl("?m=ut-data&p=backup","SQL文件删除成功!");
115122
else:
116-
echo "<script>alert('SQL文件删除失败!');window.location.href='?m=ut-data&p=backup'</script>";
123+
UTInc::GoUrl("-1","SQL文件删除失败!");
117124
endif;
118125
}

‎app/modules/ut-module/admin/index.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,15 @@
2424
endforeach;
2525
if($uninstallsql=='0'):
2626
UTInc::DelDir(APP_ROOT."/modules/".$mid);
27-
echo"<script>alert('成功卸载模块!');window.location.href='?m=ut-module'</script>";
27+
UTInc::DelDir(OPEN_ROOT."/assets/modules/".$mid);
28+
UTInc::GoUrl("?m=ut-module","成功卸载模块!");
2829
else:
2930
if(UTData::RunSql($uninstallsql)):
3031
UTInc::DelDir(APP_ROOT."/modules/".$mid);
31-
echo"<script>alert('成功卸载模块!');window.location.href='?m=ut-module'</script>";
32+
UTInc::DelDir(OPEN_ROOT."/assets/modules/".$mid);
33+
UTInc::GoUrl("?m=ut-module","成功卸载模块!");
3234
else:
33-
echo"<script>alert('模块卸载失败!');window.location.href='?m=ut-module'</script>";
35+
UTInc::GoUrl("-1","模块卸载失败!");
3436
endif;
3537
endif;
3638
}

‎app/modules/ut-module/admin/module.php‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,19 @@
3838
$zip->close();
3939
unlink(APP_ROOT."/modules/".$filename);
4040
else:
41-
echo "<script>alert('modules目录775权限不足!');window.location.href='?m=ut-module&p=module'</script>";
42-
exit();
41+
UTInc::GoUrl("-1","modules目录775权限不足!");
4342
endif;
4443
else:
45-
echo "<script>alert('安装权限不足!');window.location.href='?m=ut-module&p=module'</script>";
46-
exit();
44+
UTInc::GoUrl("-1","安装权限不足!");
4745
endif;
4846
endif;
47+
if(is_dir(APP_ROOT."/modules/".$mid."/assets")):
48+
$assets_dir=OPEN_ROOT."/assets/modules/".$mid;
49+
if(!is_dir($assets_dir)):
50+
UTInc::MakeDir($assets_dir);
51+
endif;
52+
UTInc::MoveDir(APP_ROOT."/modules/".$mid."/assets",$assets_dir);
53+
endif;
4954
$modconfig=APP_ROOT."/modules/".$mid."/usualtool.config";
5055
$mods=file_get_contents($modconfig);
5156
$modname=UTInc::StrSubstr("<modname>","</modname>",$mods);
@@ -81,12 +86,12 @@
8186
"backitem"=>$backitem));
8287
endif;
8388
if($installsql=='0'):
84-
echo"<script>alert('成功安装模块!');window.location.href='?m=ut-module&p=module'</script>";
89+
UTInc::GoUrl("?m=ut-module&p=module","成功安装模块!");
8590
else:
8691
if(UTData::RunSql($installsql)):
87-
echo"<script>alert('成功安装模块!');window.location.href='?m=ut-module&p=module'</script>";
92+
UTInc::GoUrl("?m=ut-module&p=module","成功安装模块!");
8893
else:
89-
echo"<script>alert('模块安装失败!');window.location.href='?m=ut-module&p=module'</script>";
94+
UTInc::GoUrl("-1","模块安装失败!");
9095
endif;
9196
endif;
9297
}

‎app/modules/ut-plugin/admin/index.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@
1818
UTData::DelData("cms_plugin","pid='$pid'");
1919
if($uninstallsql=='0'):
2020
UTInc::DelDir(APP_ROOT."/plugins/".$pid);
21-
echo"<script>alert('成功卸载插件!');window.location.href='?m=ut-plugin'</script>";
21+
UTInc::DelDir(OPEN_ROOT."/assets/plugins/".$pid);
22+
UTInc::GoUrl("?m=ut-plugin","成功卸载插件!");
2223
else:
2324
if(UTData::RunSql($uninstallsql)):
2425
UTInc::DelDir(APP_ROOT."/plugins/".$pid);
25-
echo"<script>alert('成功卸载插件!');window.location.href='?m=ut-plugin'</script>";
26+
UTInc::DelDir(OPEN_ROOT."/assets/plugins/".$pid);
27+
UTInc::GoUrl("?m=ut-plugin","成功卸载插件!");
2628
else:
27-
echo"<script>alert('插件卸载失败!');window.location.href='?m=ut-plugin'</script>";
29+
UTInc::GoUrl("-1","插件卸载失败!");
2830
endif;
2931
endif;
3032
}

‎app/modules/ut-plugin/admin/plugin.php‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,19 @@ function plugin($data){
4646
$zip->close();
4747
unlink(APP_ROOT."/plugins/".$filename);
4848
else:
49-
echo "<script>alert('plugins目录775权限不足!');window.location.href='?m=ut-plugin&p=plugin'</script>";
50-
exit();
49+
UTInc::GoUrl("-1","plugins目录775权限不足!");
5150
endif;
5251
else:
53-
echo "<script>alert('安装权限不足!$downurl');window.location.href='?m=ut-plugin&p=plugin'</script>";
54-
exit();
52+
UTInc::GoUrl("-1","安装权限不足!");
5553
endif;
56-
endif;
54+
endif;
55+
if(is_dir(APP_ROOT."/plugins/".$pid."/assets")):
56+
$assets_dir=OPEN_ROOT."/assets/plugins/".$pid;
57+
if(!is_dir($assets_dir)):
58+
UTInc::MakeDir($assets_dir);
59+
endif;
60+
UTInc::MoveDir(APP_ROOT."/plugins/".$pid."/assets",$assets_dir);
61+
endif;
5762
$pconfig=APP_ROOT."/plugins/".$pid."/usualtool.config";
5863
$plugins=file_get_contents($pconfig);
5964
$type=UTInc::StrSubstr("<type>","</type>",$plugins);
@@ -79,12 +84,12 @@ function plugin($data){
7984
"description"=>$description));
8085
endif;
8186
if($installsql=='0'):
82-
echo"<script>alert('成功安装插件!');window.location.href='?m=ut-plugin&p=plugin'</script>";
87+
UTInc::GoUrl("?m=ut-plugin&p=plugin","成功安装插件!");
8388
else:
8489
if(UTData::RunSql($installsql)):
85-
echo"<script>alert('成功安装插件!');window.location.href='?m=ut-plugin&p=plugin'</script>";
90+
UTInc::GoUrl("?m=ut-plugin&p=plugin","成功安装插件!");
8691
else:
87-
echo"<script>alert('插件安装失败!');window.location.href='?m=ut-plugin&p=plugin'</script>";
92+
UTInc::GoUrl("-1","插件安装失败!");
8893
endif;
8994
endif;
9095
}

‎app/modules/ut-power/admin/rolex.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,29 @@
3131
if(UTData::InsertData("cms_admin_role",array(
3232
"role"=>UTInc::SqlCheck($_POST["role"]),
3333
"module"=>UTInc::SqlCheck(implode(",",$_POST["module"]))))):
34-
echo "<script>alert('创建成功!');window.location.href='?m=ut-power&p=role'</script>";
34+
UTInc::GoUrl("?m=ut-power&p=role","创建成功!");
3535
else:
36-
echo "<script>alert('创建失败!');window.location.href='?m=ut-power&p=rolex'</script>";
36+
UTInc::GoUrl("-1","创建失败!");
3737
endif;
3838
}
3939
if($do=="mon"){
4040
$id=UTInc::SqlCheck($_POST["id"]);
4141
if(UTData::UpdateData("cms_admin_role",array(
4242
"role"=>UTInc::SqlCheck($_POST["role"]),
4343
"module"=>UTInc::SqlCheck(implode(",",$_POST["module"]))),"id='$id'")):
44-
echo "<script>alert('编辑成功!');window.location.href='?m=ut-power&p=role'</script>";
44+
UTInc::GoUrl("?m=ut-power&p=role","编辑成功!");
4545
else:
46-
echo "<script>alert('编辑失败!');window.location.href='?m=ut-power&p=rolex&id=$id'</script>";
46+
UTInc::GoUrl("-1","编辑失败!");
4747
endif;
4848
}
4949
if($do=="del"){
5050
if($id==1):
51-
echo "<script>alert('删除失败,第一条记录不可删除!');window.location.href='?m=ut-power&p=role'</script>";
51+
UTInc::GoUrl("?m=ut-power&p=role","删除失败,第一条记录不可删除!");
5252
else:
5353
if(UTData::DelData("cms_admin_role","id='$id'")):
54-
echo "<script>alert('删除成功!');window.location.href='?m=ut-power&p=role'</script>";
54+
UTInc::GoUrl("?m=ut-power&p=role","删除成功!");
5555
else:
56-
echo "<script>alert('删除失败!');window.location.href='?m=ut-power&p=role'</script>";
56+
UTInc::GoUrl("-1","删除失败!");
5757
endif;
5858
endif;
5959
}

‎app/modules/ut-system/admin/index.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
use library\UsualToolInc\UTInc;
23
$do=$_GET["do"];
34
/**
45
* 加载全局配置信息
@@ -14,5 +15,5 @@
1415
$info = preg_replace("/{$k}=(.*)/","{$k}={$v}",$info);
1516
}
1617
file_put_contents(UTF_ROOT."/.ut.config",$info);
17-
echo'<script>swal("", "保存配置成功!");setTimeout(function(){window.location.href="?m=ut-system";},2000)</script>';
18+
UTInc::GoUrl("?m=ut-system","保存配置成功!");
1819
}

‎app/modules/ut-system/admin/lang.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
$info = preg_replace("/LANG=(.*)/","LANG={$lang_default}",$info);
2626
$info = preg_replace("/LANG_OPTION=(.*)/","LANG_OPTION={$lang_option}",$info);
2727
file_put_contents(UTF_ROOT."/.ut.config",$info);
28-
echo'<script>swal("", "保存配置成功!");setTimeout(function(){window.location.href="?m=ut-system&p=lang";},2000)</script>';
28+
UTInc::GoUrl("?m=ut-system&p=lang","保存配置成功!");
2929
}

‎app/modules/ut-system/admin/search.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"pages"=>$pagex[$s]),"id='".$idx[$s]."'");
3131
}
3232
UTData::RunSql($sql);
33-
}
33+
}
3434
UTInc::GoUrl("?m=ut-system&p=search","设置成功!");
3535
}
3636
if($_GET["do"]=="del"){

‎app/modules/ut-template/admin/template.php‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
UTInc::GoUrl("-1","安装权限不足!");
4545
endif;
4646
endif;
47-
if(is_dir(APP_ROOT."/template/".$tid."/move")):
48-
UTInc::MoveDir(APP_ROOT."/template/".$tid."/move",UTF_ROOT);
49-
endif;
5047
$template=file_get_contents(APP_ROOT."/template/".$tid."/usualtool.config");
5148
$md=UTInc::StrSubstr("<module>","</module>",$template);
5249
$dir_data=UTInc::DirList(APP_ROOT."/modules");
@@ -55,6 +52,16 @@
5552
UTInc::DelDir(APP_ROOT."/template/".$tid);
5653
UTInc::GoUrl("-1","模板工程依赖的模块缺失!模块如下：".$md);
5754
endif;
55+
if(is_dir(APP_ROOT."/template/".$tid."/move")):
56+
UTInc::MoveDir(APP_ROOT."/template/".$tid."/move",UTF_ROOT);
57+
endif;
58+
if(is_dir(APP_ROOT."/template/".$tid."/assets")):
59+
$assets_dir=OPEN_ROOT."/assets/template/".$tid;
60+
if(!is_dir($assets_dir)):
61+
UTInc::MakeDir($assets_dir);
62+
endif;
63+
UTInc::MoveDir(APP_ROOT."/template/".$tid."/assets",$assets_dir);
64+
endif;
5865
$id=UTInc::StrSubstr("<id>","</id>",$template);
5966
$type=UTInc::StrSubstr("<type>","</type>",$template);
6067
$lang=UTInc::StrSubstr("<lang>","</lang>",$template);
@@ -82,6 +89,7 @@
8289
$tid=str_replace(".","",UTInc::SqlCheck($_GET["tid"]));
8390
if(UTData::DelData("cms_template","tid='$tid'")){
8491
UTInc::DelDir(APP_ROOT."/template/".$tid);
92+
UTInc::DelDir(OPEN_ROOT."/assets/template/".$tid);
8593
UTInc::GoUrl("?m=ut-template&p=template","模板删除成功!");
8694
}else{
8795
UTInc::GoUrl("-1","模板删除失败!");

0 commit comments

Comments
 (0)