DedeBIZ
/
DedeV6
Watch 2
Star 0
Fork 0
Code Pull Requests 0 Releases 26 Activity
Browse Source

模块部分移除远程模块包

tags/6.0.0
tianya 4 years ago
parent
299a8b0f75
commit
fe23cd45e0
5 changed files with 104 additions and 118 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -4
      src/dede/templets/index_body.htm
  2. +95
    -86
      src/dede/templets/module_main.htm
  3. +1
    -1
      src/dede/templets/shops_operations.htm
  4. +4
    -2
      src/dede/templets/shops_operations_cart.htm
  5. +1
    -25
      src/include/dedemodule.class.php

+ 3
- 4
src/dede/templets/index_body.htm View File

@@ -70,10 +70,9 @@
<div class="card-body"> <div class="card-body">
<div id="updateinfos"> <div id="updateinfos">
<?php <?php
echo "<div class='updatedvt py-3'><b>您系统版本最后更新时间为：{$oktime} </b><br/>";
echo " <a href='javascript:LoadUpdateInfos();' class='btn btn-success btn-sm'>进行在线更新</a> &nbsp; \r\n";
echo " <a href='sys_repair.php' class='btn btn-success btn-sm'>系统错误修复</a></div>\r\n";
echo "<iframe name='stafrm' src='{$offUrl}&uptime={$oktime}' frameborder='0' id='stafrm' width='98%' height='80'></iframe>";
echo "<div class='updatedvt py-3'>";
echo "安全操作：<a href='sys_data.php' class='btn btn-secondary btn-sm'>数据库备份/还原</a> <a href='sys_safetest.php' class='btn btn-secondary btn-sm'>病毒扫描</a> <a href='sys_repair.php' class='btn btn-secondary btn-sm'>系统错误修复</a></div>\r\n";
echo "<iframe name='stafrm' src='{$offUrl}&uptime={$oktime}' frameborder='0' id='stafrm' width='98%' height='150'></iframe>";
?> ?>
</div> </div>
</div> </div>


+ 95
- 86
src/dede/templets/module_main.htm View File

@@ -1,72 +1,77 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
<title>模块打包</title>
<link rel="stylesheet" href="../static/css/bootstrap.min.css">
<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="css/base.css" rel="stylesheet" type="text/css" />
<script src="../static/js/jquery.min.js"></script>
<script src="../static/js/popper.min.js"></script>
<script src="../static/js/bootstrap.bundle.js"></script>
<script src="../static/js/dedeajax2.js" language="javascript" type="text/javascript"></script>
<script language="javascript" type="text/javascript">
function getmodule(action,hash)
{
$DE('status_'+hash).innerHTML='<img src=\'images/loadinglit.gif\'>';
var myajax = new DedeAjax($DE('status_'+hash),false,true,'-','-','...');
myajax.SendGet2('module_main.php?action=download&hash='+hash);
$DE('manager_'+hash).style.display = 'block';
DedeXHTTP = null;
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
<title>模块打包</title>
<link rel="stylesheet" href="../static/css/bootstrap.min.css">
<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="css/base.css" rel="stylesheet" type="text/css" />
<script src="../static/js/jquery.min.js"></script>
<script src="../static/js/popper.min.js"></script>
<script src="../static/js/bootstrap.bundle.js"></script>
<script src="../static/js/dedeajax2.js" language="javascript" type="text/javascript"></script>
<script language="javascript" type="text/javascript">
function getmodule(action, hash) {
$DE('status_' + hash).innerHTML = '<img src=\'images/loadinglit.gif\'>';
var myajax = new DedeAjax($DE('status_' + hash), false, true, '-', '-', '...');
myajax.SendGet2('module_main.php?action=download&hash=' + hash);
$DE('manager_' + hash).style.display = 'block';
DedeXHTTP = null;
} }
</script>
</script>
</head> </head>
<body background='images/allbg.gif' leftmargin='8' topmargin='8'> <body background='images/allbg.gif' leftmargin='8' topmargin='8'>
<div class="bodytitle mt-3">
<div class="bodytitleleft"></div>
<div class="bodytitletxt" style="padding-left:10px;">模块管理</div>
</div>
<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable" style="background:#CFCFCF;">
<form name="form1" action="plus_add.php" method="post">
<input type='hidden' name='dopost' value='save'>
<tr>
<td height="25" colspan="7" bgcolor="#EDF9D5" background="images/tbg.gif" style="padding-left:10px;">
<div style='float:left'><a href='module_main.php'><b>模块管理</b></a> &gt; <b>模块列表：</b></div>
<div style='float:right;padding-right:8px;'>
<a href='module_main.php'>全部</a> |
<a href='module_main.php?moduletype=soft'>模块</a> |
<a href='module_main.php?moduletype=templets'>模板</a> |
<a href='module_main.php?moduletype=plus'>小插件</a> |
<a href='module_main.php?moduletype=patch'>补丁</a>
</div>
</td>
</tr>
<tr bgcolor="#FBFCE2" >
<td align="center" width="16%">模块名称</td>
<td align="center" width="12%">发布时间</td>
<td align="center" width="10%">编码</td>
<td align="center" width="10%">类型</td>
<td align="center" width="12%">模块状态</td>
<td align="center" width="26%">管理</td>
</tr>
<?php
<div class="bodytitle mt-3">
<div class="bodytitleleft"></div>
<div class="bodytitletxt" style="padding-left:10px;">模块管理</div>
<div class="bodytitletxt" style="float: right;padding-right: 10px;"><a href="<?php echo $cfg_biz_dedebizUrl;?>?from=module" target="_blank">应用市场</a></div>
</div>
<table width="98%" border="0" cellpadding="1" cellspacing="1" align="center" class="table maintable"
style="background:#CFCFCF;">
<form name="form1" action="plus_add.php" method="post">
<input type='hidden' name='dopost' value='save'>
<tr>
<td height="25" colspan="7" bgcolor="#EDF9D5" background="images/tbg.gif" style="padding-left:10px;">
<div style='float:left'><a href='module_main.php'><b>模块管理</b></a> &gt; <b>模块列表：</b></div>
<div style='float:right;padding-right:8px;'>
<a href='module_main.php'>全部</a> |
<a href='module_main.php?moduletype=soft'>模块</a> |
<a href='module_main.php?moduletype=templets'>模板</a> |
<a href='module_main.php?moduletype=plus'>小插件</a> |
<a href='module_main.php?moduletype=patch'>补丁</a>
</div>
</td>
</tr>
<tr bgcolor="#FBFCE2">
<td align="center" width="16%">模块名称</td>
<td align="center" width="12%">发布时间</td>
<td align="center" width="10%">编码</td>
<td align="center" width="10%">类型</td>
<td align="center" width="12%">模块状态</td>
<td align="center" width="26%">管理</td>
</tr>
<?php
if(count($modules)>0) if(count($modules)>0)
foreach($modules as $k=>$v) foreach($modules as $k=>$v)
{ {
?>
<tr bgcolor="#FFFFFF" height="26" align="center" onMouseMove="javascript:this.bgColor='#FCFDEE';" onMouseOut="javascript:this.bgColor='#FFFFFF';">
<td><?php echo $v['name']; ?></td>
<td><?php echo $v['time']; ?></td>
<td>
<?php
?>
<tr bgcolor="#FFFFFF" height="26" align="center" onMouseMove="javascript:this.bgColor='#FCFDEE';"
onMouseOut="javascript:this.bgColor='#FFFFFF';">
<td><?php echo $v['name']; ?></td>
<td><?php echo $v['time']; ?></td>
<td>
<?php
if($cfg_soft_lang != $v['lang']) echo "<font color='red'>".$v['lang']."</font>"; if($cfg_soft_lang != $v['lang']) echo "<font color='red'>".$v['lang']."</font>";
else echo $v['lang']; else echo $v['lang'];
?> ?>
</td>
<td><?php echo $types[$v['moduletype']];?></td>
<td>
<?php
</td>
<td><?php echo $types[$v['moduletype']];?></td>
<td>
<?php
$file = DEDEDATA."/module/{$v['hash']}.xml"; $file = DEDEDATA."/module/{$v['hash']}.xml";
if(file_exists($file)) { if(file_exists($file)) {
if(file_exists(DEDEDATA."/module/{$v['hash']}-readme.php")){ if(file_exists(DEDEDATA."/module/{$v['hash']}-readme.php")){
@@ -78,34 +83,38 @@ foreach($modules as $k=>$v)
echo "<div id=\"status_{$v['hash']}\"><font color='red'>未下载</font> <a style='color:red' href=\"javascript:getmodule('download','{$v['hash']}')\"><u>下载</u></a></div>"; echo "<div id=\"status_{$v['hash']}\"><font color='red'>未下载</font> <a style='color:red' href=\"javascript:getmodule('download','{$v['hash']}')\"><u>下载</u></a></div>";
} }
?> ?>
</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-secondary" href='module_main.php?action=view_developoer&hash=<?php echo $v['hash']; ?>'>开发者信息</a>
<div class="btn-group" role="group">
<button id="btnAction" type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
操作
</button>
<div class="dropdown-menu" aria-labelledby="btnAction">
<a class="dropdown-item" href="module_main.php?action=showreadme&hash=<?php echo $v['hash']; ?>">说明</a>
<a class="dropdown-item" href="module_main.php?action=view&hash=<?php echo $v['hash']; ?>">详细</a>
<a class="dropdown-item" href="module_main.php?action=edit&hash=<?php echo $v['hash']; ?>">修改</a>
<a class="dropdown-item" href="module_main.php?action=del&hash=<?php echo $v['hash']; ?>">删除</a>
</div>
</div>
</div>
</td>
</tr>
<?php
</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-secondary"
href='module_main.php?action=view_developoer&hash=<?php echo $v['hash']; ?>'>开发者信息</a>
<div class="btn-group" role="group">
<button id="btnAction" type="button" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
操作
</button>
<div class="dropdown-menu" aria-labelledby="btnAction">
<a class="dropdown-item" href="module_main.php?action=showreadme&hash=<?php echo $v['hash']; ?>">说明</a>
<a class="dropdown-item" href="module_main.php?action=view&hash=<?php echo $v['hash']; ?>">详细</a>
<a class="dropdown-item" href="module_main.php?action=edit&hash=<?php echo $v['hash']; ?>">修改</a>
<a class="dropdown-item" href="module_main.php?action=del&hash=<?php echo $v['hash']; ?>">删除</a>
</div>
</div>
</div>
</td>
</tr>
<?php
} }
?> ?>
<tr>
<td colspan="7" align="center" bgcolor='#F9FCEF'>&nbsp;</td>
</tr>
</form>
</table>
<tr>
<td colspan="7" align="center" bgcolor='#F9FCEF'>&nbsp;</td>
</tr>
</form>
</table>
</body> </body>
</html>
</html>

+ 1
- 1
src/dede/templets/shops_operations.htm View File

@@ -135,7 +135,7 @@
</td> </td>
<td align="center"> <td align="center">
<?php echo $fields['cartcount']?> <?php echo $fields['cartcount']?>
<a href="javascript:OpenMyWinN('shops_operations_cart.php?oid=<?php echo $fields['oid']?>',680,450);">[详情]</a>
<a class="btn btn-secondary btn-sm" href="javascript:OpenMyWinN('shops_operations_cart.php?oid=<?php echo $fields['oid']?>',680,450);">详情</a>
</td> </td>
<td align="center"> <td align="center">
<?php echo GetDateTimeMk($fields['stime'])?> <?php echo GetDateTimeMk($fields['stime'])?>


+ 4
- 2
src/dede/templets/shops_operations_cart.htm View File

@@ -3,9 +3,11 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>"> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $cfg_soft_lang; ?>">
<title><?php echo $oid;?></title> <title><?php echo $oid;?></title>
<link rel="stylesheet" href="../static/css/bootstrap.min.css">
<link href="../static/font-awesome/css/font-awesome.min.css" rel="stylesheet">
<link href="css/base.css" rel="stylesheet" type="text/css" /> <link href="css/base.css" rel="stylesheet" type="text/css" />
<body> <body>
<table width="50%" border="0" align="center" cellpadding="1" cellspacing="1" bgcolor="#CCCCCC">
<table width="50%" border="0" align="center" cellpadding="1" cellspacing="1" bgcolor="#CCCCCC" class="table maintable mt-3">
<tr> <tr>
<td height="25" colspan="2" align="center" bgcolor="#F0F0F0">订单信息</td> <td height="25" colspan="2" align="center" bgcolor="#F0F0F0">订单信息</td>
</tr> </tr>
@@ -70,7 +72,7 @@
<tr> <tr>
<td height="25" colspan="2" align="right" bgcolor="#F0F0F0" style="padding-right:6px;padding-left:6px;"> <td height="25" colspan="2" align="right" bgcolor="#F0F0F0" style="padding-right:6px;padding-left:6px;">
<div style="float:left;"> <div style="float:left;">
<input type="button" name="ss12" value="关闭窗口" style="width:90px" onClick="window.close();" class='inputbut'>
<button type="button" name="ss12" style="width:90px" onClick="window.close();" class='btn btn-secondary btn-sm'>关闭窗口</button>
</div> </div>
<div style="float:right;"> <div style="float:right;">


+ 1
- 25
src/include/dedemodule.class.php View File

@@ -90,31 +90,7 @@ class DedeModule
*/ */
function GetModuleUrlList($moduletype = '', $url = '') function GetModuleUrlList($moduletype = '', $url = '')
{ {
$dh = dir($this->modulesPath) or die("没找到模块目录：({$this->modulesPath})！");
$fp = @fopen($this->modulesPath . '/modulescache.php', 'w') or die('读取文件权限出错,目录文件' . $this->modulesPath . '/modulescache.php不可写!');
$cachefile = DEDEDATA . '/module/moduleurllist.txt';
$remotelist = '';
if (file_exists($cachefile) && (filemtime($cachefile) + 60 * 30) > time()) {
// 30分钟本地缓存一次
$remotelist = file_get_contents($cachefile);
} else {
$del = new DedeHttpDown();
$del->OpenUrl($url);
$remotelist = $del->GetHtml();
PutFile($cachefile, $remotelist);
}
if (empty($remotelist)) return false;
$modules = unserialize($remotelist);
if (empty($moduletype)) {
return $modules;
}
$return = array();
foreach ($modules as $arrow => $data) {
if ($data['moduletype'] == $moduletype)
$return[] = $data;
}
return $return;
return false;
} }
/** /**
* 转换编码 * 转换编码


Write Preview
Loading…
Cancel
Save