Browse Source

调整

tags/6.3.0
叙述、别离 6 months ago
parent
commit
4ed5cd3f8e
5 changed files with 30 additions and 30 deletions
  1. +10
    -10
      src/admin/module_main.php
  2. +10
    -10
      src/admin/module_make.php
  3. +4
    -4
      src/admin/templets/module_edit.htm
  4. +1
    -1
      src/admin/templets/module_main.htm
  5. +5
    -5
      src/admin/templets/module_make.htm

+ 10
- 10
src/admin/module_main.php View File

@@ -67,7 +67,7 @@ if ($action == '') {
$dm->Clear();
exit();
} else if ($action == 'view_developoer') {
//检验开发者信息
//检验贡献者信息
$dm = new DedeModule($mdir);
$info = $dm->GetModuleInfo($hash);
if ($info == null) {
@@ -89,7 +89,7 @@ if ($action == '') {
$devInfo['dev_name'] = $info['team']."<span class='btn btn-warning btn-sm'>未认证</span>";
$authAt = "<span class='btn btn-warning btn-sm'>未知</span>";
}
ShowMsg("开发者名称:{$devInfo['dev_name']}<br>开发者id:{$devInfo['dev_id']}<br>认证于:{$authAt}", "-1");
ShowMsg("贡献者名称:{$devInfo['dev_name']}<br>贡献者id:{$devInfo['dev_id']}<br>认证于:{$authAt}", "-1");
exit;
} else if ($action == 'setup') {
$dm = new DedeModule($mdir);
@@ -98,7 +98,7 @@ if ($action == '') {
ShowMsg("获取模块信息错误,模块文件错误", -1);
exit;
}
$alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '<br>该模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性');
$alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '<br>该模块的语言编码与您系统的编码不一致,请向贡献者确认它的兼容性');
$filelists = (array)$dm->GetFileLists($hash);
$filelist = '';
$prvdirs = array();
@@ -169,7 +169,7 @@ if ($action == '') {
<td>{$infos['filesize']}</td>
</tr>
<tr>
<td>开发者id:</td>
<td>贡献者id:</td>
<td>{$infos['dev_id']} <a href='{$cfg_biz_dedebizUrl}/developer?dev_id={$infos['dev_id']}' target='_blank' class='btn btn-success btn-sm'>{$s}</a></td>
</tr>
<tr>
@@ -261,7 +261,7 @@ if ($action == '') {
} else if ($action == 'del') {
$dm = new DedeModule($mdir);
$infos = $dm->GetModuleInfo($hash);
$alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '<br>该模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性');
$alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '<br>该模块的语言编码与您系统的编码不一致,请向贡献者确认它的兼容性');
$dev_id = empty($infos['dev_id'])? "<a href='{$cfg_biz_dedebizUrl}/developer' target='_blank' class='btn btn-warning btn-sm'>未认证</a>" : "{$infos['dev_id']} <a href='{$cfg_biz_dedebizUrl}/developer?dev_id={$infos['dev_id']}' target='_blank' class='btn btn-success btn-sm'>已认证</a>";
$win = new OxWindow();
$win->Init("module_main.php", "/static/web/js/admin.blank.js", "post");
@@ -281,7 +281,7 @@ if ($action == '') {
<td>{$infos['filesize']}</td>
</tr>
<tr>
<td>开发者id:</td>
<td>贡献者id:</td>
<td>{$dev_id}</td>
</tr>
<tr>
@@ -310,7 +310,7 @@ if ($action == '') {
$dm = new DedeModule($mdir);
$infos = $dm->GetModuleInfo($hash);
if ($infos['url'] == '') $infos['url'] = ' ';
$alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '<br>该模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性');
$alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '<br>该模块的语言编码与您系统的编码不一致,请向贡献者确认它的兼容性');
$filelists = (array)$dm->GetFileLists($hash);
$filelist = '';
foreach ($filelists as $v) {
@@ -338,7 +338,7 @@ if ($action == '') {
<td>{$infos['filesize']}</td>
</tr>
<tr>
<td>开发者id:</td>
<td>贡献者id:</td>
<td>{$dev_id}</td>
</tr>
<tr>
@@ -415,7 +415,7 @@ if ($action == '') {
$dm = new DedeModule($mdir);
$infos = $dm->GetModuleInfo($hash);
if ($infos['url'] == '') $infos['url'] = ' ';
$alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '<br>该模块的语言编码与您系统的编码不一致,请向开发者确认它的兼容性');
$alertMsg = ($infos['lang'] == $cfg_soft_lang ? '' : '<br>该模块的语言编码与您系统的编码不一致,请向贡献者确认它的兼容性');
$filelists = (array)$dm->GetFileLists($hash);
$filelist = '';
$setupinfo = '';
@@ -456,7 +456,7 @@ if ($action == '') {
<td>{$infos['filesize']}</td>
</tr>
<tr>
<td>开发者id:</td>
<td>贡献者id:</td>
<td>{$dev_id}</td>
</tr>
<tr>


+ 10
- 10
src/admin/module_make.php View File

@@ -24,14 +24,14 @@ if ($action == '') {
//生成项目
else if ($action == 'make') {
require_once(DEDEINC.'/libraries/dedehttpdown.class.php');
//校验私钥,确定开发者身份
//校验私钥,确定贡献者身份
$devURL = DEDECDNURL."/developers/$dev_id.json";
$dhd = new DedeHttpDown();
$dhd->OpenUrl($devURL);
$devContent = $dhd->GetHtml();
$devInfo = (array)json_decode($devContent);
if (($devInfo['auth_at'] + 60 * 60 * 24 * 365) < time()) {
ShowMsg("您的开发者账号已经过期,登录DedeBIZ官网申请续费", "-1");
ShowMsg("您的贡献者账号已经过期,登录DedeBIZ官网申请续费", "-1");
exit();
}
$filelist = str_replace("\r", "\n", trim($filelist));
@@ -41,11 +41,11 @@ else if ($action == 'make') {
exit();
}
if (empty($dev_id)) {
ShowMsg("开发者id不能为空", "-1");
ShowMsg("贡献者id不能为空", "-1");
exit();
}
if (empty($priv)) {
ShowMsg("请填写开发者私钥信息", "-1");
ShowMsg("请填写贡献者私钥信息", "-1");
exit();
}
if (strlen($modulname) > 150) {
@@ -63,7 +63,7 @@ else if ($action == 'make') {
openssl_public_decrypt($encotent, $decontent, $devInfo['pub_key']);
$minfo = (array)json_decode($decontent);
if ($minfo['module_name'] != $modulname || $minfo['dev_id'] != $devInfo['dev_id']) {
ShowMsg("开发者私钥校验失败,请确保填写正确的开发者私钥", "-1");
ShowMsg("贡献者私钥校验失败,请确保填写正确的贡献者私钥", "-1");
exit();
}
//去除转义
@@ -174,21 +174,21 @@ else if ($action == 'edit') {
exit();
}
if (empty($dev_id)) {
ShowMsg("开发者id不能为空", "-1");
ShowMsg("贡献者id不能为空", "-1");
exit();
}
if (empty($priv)) {
ShowMsg("请填写开发者私钥信息", "-1");
ShowMsg("请填写贡献者私钥信息", "-1");
exit();
}
//校验私钥,确定开发者身份
//校验私钥,确定贡献者身份
$devURL = DEDECDNURL."/developers/$dev_id.json";
$dhd = new DedeHttpDown();
$dhd->OpenUrl($devURL);
$devContent = $dhd->GetHtml();
$devInfo = (array)json_decode($devContent);
if (($devInfo['auth_at'] + 60 * 60 * 24 * 365) < time()) {
ShowMsg("您的开发者账号已经过期,请登录www.dedebiz.com重新申请", "-1");
ShowMsg("您的贡献者账号已经过期,请登录www.dedebiz.com重新申请", "-1");
exit();
}
if (strlen($modulname) > 150) {
@@ -206,7 +206,7 @@ else if ($action == 'edit') {
openssl_public_decrypt($encotent, $decontent, $devInfo['pub_key']);
$minfo = (array)json_decode($decontent);
if ($minfo['module_name'] != $modulname || $minfo['dev_id'] != $devInfo['dev_id']) {
ShowMsg("开发者私钥校验失败,请确保填写正确的开发者私钥", "-1");
ShowMsg("贡献者私钥校验失败,请确保填写正确的贡献者私钥", "-1");
exit();
}
//已经去除转义


+ 4
- 4
src/admin/templets/module_edit.htm View File

@@ -22,10 +22,10 @@
<td><input type="text" name="modulname" id="modulname" class="admin-input-sm" value="<?php echo $name;?>"></td>
</tr>
<tr>
<td>开发者id:</td>
<td>贡献者id:</td>
<td>
<input type="text" name="dev_id2" id="dev_id2" class="admin-input-sm" value="<?php echo $dev_id;?>" disabled>
<a href="<?php echo $cfg_biz_dedebizUrl;?>/developer" target="_blank" class="btn btn-success btn-sm">如何获取开发者id</a>
<a href="<?php echo $cfg_biz_dedebizUrl;?>/developer" target="_blank" class="btn btn-success btn-sm">如何获取贡献者id</a>
</td>
</tr>
<tr>
@@ -115,9 +115,9 @@
</td>
</tr>
<tr>
<td>开发者私钥:</td>
<td>贡献者私钥:</td>
<td>
<p>(开发者认证后获取的私钥)</p>
<p>(贡献者认证后获取的私钥)</p>
<textarea name="priv" id="priv" class="admin-textarea-xl"></textarea>
</td>
</tr>


+ 1
- 1
src/admin/templets/module_main.htm View File

@@ -73,7 +73,7 @@
</td>
<td>
<div id="manager_<?php echo $v['hash'];?>" <?php if (!file_exists(DEDEDATA."/module/{$v['hash']}.xml")) echo "style='display:none'"?>>
<a class="btn btn-light btn-sm" href="module_main.php?action=view_developoer&hash=<?php echo $v['hash'];?>"><i class="fa fa-user-circle"></i> 开发者</a>
<a class="btn btn-light btn-sm" href="module_main.php?action=view_developoer&hash=<?php echo $v['hash'];?>"><i class="fa fa-user-circle"></i> 贡献者</a>
<a class="btn btn-light btn-sm" href="module_main.php?action=view&hash=<?php echo $v['hash'];?>"><i class="fa fa-eye"></i> 查看</a>
<a class="btn btn-light btn-sm" href="module_main.php?action=edit&hash=<?php echo $v['hash'];?>"><i class="fa fa-pencil-square"></i> 修改</a>
<a class="btn btn-danger btn-sm" href="module_main.php?action=del&hash=<?php echo $v['hash'];?>"><i class="fa fa-trash"></i> 删除</a>


+ 5
- 5
src/admin/templets/module_make.htm View File

@@ -18,7 +18,7 @@
</tr>
<tr>
<td colspan="2">
<div class="alert alert-info mb-0">开发模块插件,即表示您同意<a href="<?php echo $cfg_biz_dedebizUrl;?>/license_developer" target="_blank">《DedeBIZ开发者协议》</a></div>
<div class="alert alert-info mb-0">开发模块插件,即表示您同意<a href="<?php echo $cfg_biz_dedebizUrl;?>/developer" target="_blank">《DedeBIZ贡献者》</a></div>
</td>
</tr>
<tr>
@@ -39,10 +39,10 @@
</td>
</tr>
<tr>
<td>开发者id:</td>
<td>贡献者id:</td>
<td>
<input type="text" name="dev_id" id="dev_id" class="admin-input-sm">
<a href="<?php echo $cfg_biz_dedebizUrl;?>/developer" target="_blank" class="btn btn-success btn-sm">如何获取开发者id</a>
<a href="<?php echo $cfg_biz_dedebizUrl;?>/developer" target="_blank" class="btn btn-success btn-sm">如何获取贡献者id</a>
</td>
</tr>
<tr>
@@ -109,9 +109,9 @@
</td>
</tr>
<tr>
<td>开发者私钥:</td>
<td>贡献者私钥:</td>
<td>
<p>(开发者认证后获取的私钥)</p>
<p>(贡献者认证后获取的私钥)</p>
<textarea name="priv" id="priv" class="admin-textarea-xl"></textarea>
</td>
</tr>


Loading…
Cancel
Save