From 9b0d7eea8e93b0e300553fc9739a2f466eb25918 Mon Sep 17 00:00:00 2001 From: tianya Date: Tue, 15 Sep 2020 14:24:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=95=8C=E9=9D=A2=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dede/album_add.php | 9 +- src/dede/album_edit.php | 9 +- src/dede/api_ucenter.php | 375 --------- src/dede/archives_add.php | 9 +- src/dede/archives_do.php | 11 +- src/dede/archives_edit.php | 9 +- src/dede/archives_sg_add.php | 11 +- src/dede/archives_sg_edit.php | 11 +- src/dede/article_add.php | 20 +- src/dede/article_allowurl_edit.php | 1 + src/dede/article_edit.php | 9 +- src/dede/css/base.css | 54 +- src/dede/dialog/select_images.php | 465 ++++++----- src/dede/dialog/select_media.php | 354 ++++---- src/dede/dialog/select_soft.php | 290 ++++--- src/dede/dialog/select_templets.php | 320 ++++---- src/dede/file_manage_control.php | 1 + src/dede/file_manage_main.php | 1 + src/dede/file_manage_view.php | 1 + src/dede/file_pic_view.php | 182 ----- src/dede/freelist_add.php | 1 + src/dede/freelist_edit.php | 1 + src/dede/freelist_main.php | 11 +- src/dede/inc/inc_action_info.php | 7 +- src/dede/inc/inc_archives_functions.php | 3 +- src/dede/inc/inc_menu.php | 1 - src/dede/inc/inc_menu_map.php | 1 - src/dede/index_menu_module.php | 3 +- src/dede/js/list.js | 2 +- src/dede/js/main.js | 25 +- src/dede/search_keywords_main.php | 13 +- src/dede/soft_add.php | 11 +- src/dede/soft_edit.php | 13 +- src/dede/spec_add.php | 7 +- src/dede/spec_edit.php | 9 +- src/dede/stepselect_main.php | 1 + src/dede/sys_safe.php | 76 -- src/dede/templets/album_add.htm | 86 +- src/dede/templets/album_edit.htm | 74 +- src/dede/templets/archives_add.htm | 79 +- src/dede/templets/archives_edit.htm | 8 +- src/dede/templets/archives_sg_add.htm | 39 +- src/dede/templets/archives_sg_edit.htm | 30 +- src/dede/templets/article_add.htm | 96 ++- .../templets/article_description_main.htm | 194 ++--- src/dede/templets/article_edit.htm | 64 +- src/dede/templets/article_keywords_main.htm | 227 +++--- src/dede/templets/article_test_same.htm | 136 ++-- src/dede/templets/cards_make.htm | 168 ++-- src/dede/templets/content_att.htm | 106 +-- src/dede/templets/content_batch_up.htm | 56 +- src/dede/templets/content_i_list.htm | 3 +- src/dede/templets/content_list.htm | 10 +- src/dede/templets/content_sg_list.htm | 11 +- src/dede/templets/diy_edit.htm | 33 +- src/dede/templets/diy_field_add.htm | 59 +- src/dede/templets/diy_field_edit.htm | 34 +- src/dede/templets/diy_main.htm | 15 +- src/dede/templets/feedback_main.htm | 32 +- src/dede/templets/file_manage_main.htm | 110 +-- src/dede/templets/file_pic_view.htm | 57 -- src/dede/templets/freelist_main.htm | 15 +- src/dede/templets/index_body.htm | 6 +- src/dede/templets/makehtml_all.htm | 21 +- src/dede/templets/makehtml_archives.htm | 153 ++-- src/dede/templets/makehtml_homepage.htm | 209 +++-- src/dede/templets/makehtml_js.htm | 181 +++-- src/dede/templets/makehtml_list.htm | 144 ++-- src/dede/templets/makehtml_map_guide.htm | 112 +-- src/dede/templets/makehtml_rss.htm | 103 +-- src/dede/templets/makehtml_spec.htm | 106 +-- src/dede/templets/makehtml_taglist.htm | 22 +- src/dede/templets/media_add.htm | 24 +- src/dede/templets/media_edit.htm | 263 +++--- src/dede/templets/media_main.htm | 15 +- src/dede/templets/member_main.htm | 17 +- src/dede/templets/member_toadmin.htm | 192 ++--- src/dede/templets/member_view.htm | 31 +- src/dede/templets/mychannel_add.htm | 541 ++++++------- src/dede/templets/mychannel_edit.htm | 638 ++++++++------- src/dede/templets/mychannel_field_add.htm | 92 ++- src/dede/templets/mychannel_field_edit.htm | 387 +++++---- src/dede/templets/mychannel_main.htm | 121 +-- src/dede/templets/recycling.htm | 8 +- src/dede/templets/search_keywords_main.htm | 13 +- src/dede/templets/shops_delivery.htm | 215 ++--- src/dede/templets/soft_add.htm | 90 +-- src/dede/templets/soft_config.htm | 270 ++++--- src/dede/templets/soft_edit.htm | 70 +- src/dede/templets/spec_add.htm | 756 ++++++++++-------- src/dede/templets/spec_edit.htm | 125 ++- src/dede/templets/stepselect_main.htm | 57 +- src/dede/templets/sys_admin_user.htm | 19 +- src/dede/templets/sys_admin_user_add.htm | 15 +- src/dede/templets/sys_admin_user_edit.htm | 173 ++-- src/dede/templets/sys_admin_user_tj.htm | 4 +- src/dede/templets/sys_cache_up.htm | 123 +-- src/dede/templets/sys_data.htm | 474 +++++------ src/dede/templets/sys_data_replace.htm | 283 +++---- src/dede/templets/sys_data_revert.htm | 222 ++--- src/dede/templets/sys_info.htm | 8 +- src/dede/templets/sys_info_mark.htm | 286 ++++--- src/dede/templets/sys_safe.htm | 178 ----- src/dede/templets/sys_sql_query.htm | 200 ++--- src/dede/templets/tags_main.htm | 20 +- src/dede/templets/templets_default.htm | 4 +- src/dede/templets/templets_one.htm | 15 +- src/dede/templets/templets_one_add.htm | 210 ++--- src/dede/templets/templets_one_edit.htm | 31 +- src/dede/templets/tpl_edit.htm | 246 +++--- src/dede/templets/vote_add.htm | 278 ++++--- src/dede/templets/vote_edit.htm | 218 +++-- src/dede/templets/vote_main.htm | 8 +- src/dede/templets_one.php | 1 + src/dede/templets_one_add.php | 1 + src/dede/templets_one_edit.php | 1 + src/dede/vote_add.php | 4 +- src/dede/vote_edit.php | 7 +- src/include/common.inc.php | 6 +- src/include/oxwindow.class.php | 28 +- src/include/taglib/adminname.lib.php | 1 + src/include/taglib/arclist.lib.php | 1 + src/include/taglib/arclistsg.lib.php | 1 + src/include/taglib/arcpagelist.lib.php | 1 + src/include/taglib/ask.lib.php | 69 -- src/include/taglib/asktype.lib.php | 58 -- src/include/taglib/autochannel.lib.php | 1 + src/include/taglib/bookcontentlist.lib.php | 1 + src/include/taglib/booklist.lib.php | 1 + src/include/taglib/cattree.lib.php | 1 + src/include/taglib/channel.lib.php | 1 + src/include/taglib/channelartlist.lib.php | 1 + src/include/taglib/comment.lib.php | 2 +- src/include/taglib/demotag.lib.php | 1 + src/include/taglib/feedback.lib.php | 1 + src/include/taglib/flink.lib.php | 1 + src/include/taglib/flinktype.lib.php | 3 +- src/include/taglib/group.lib.php | 68 -- src/include/taglib/groupthread.lib.php | 78 -- src/include/taglib/hotwords.lib.php | 1 + src/include/taglib/infoguide.lib.php | 1 + src/include/taglib/infolink.lib.php | 1 + src/include/taglib/json.lib.php | 2 +- src/include/taglib/likearticle.lib.php | 1 + src/include/taglib/loop.lib.php | 1 + src/include/taglib/mda.lib.php | 67 -- src/include/taglib/memberinfos.lib.php | 1 + src/include/taglib/memberlist.lib.php | 1 + src/include/taglib/myad.lib.php | 1 + src/include/taglib/mynews.lib.php | 1 + src/include/taglib/mytag.lib.php | 1 + src/include/taglib/php.lib.php | 1 + src/include/taglib/productimagelist.lib.php | 1 + src/include/taglib/qrcode.lib.php | 12 + src/include/taglib/softmsg.lib.php | 1 + src/include/taglib/sonchannel.lib.php | 1 + src/include/taglib/sql.lib.php | 1 + src/include/taglib/tag.lib.php | 1 + src/include/taglib/type.lib.php | 1 + src/include/taglib/vote.lib.php | 1 + src/install/sql-dfdata.txt | 4 +- src/member/templets/archives_sg_add.htm | 127 +-- src/member/templets/footer.htm | 2 +- src/static/img/base.css | 10 +- src/templets/default/article_article.htm | 3 + src/templets/default/footer.htm | 2 +- src/templets/plus/win_templet.htm | 48 +- 167 files changed, 6092 insertions(+), 6608 deletions(-) delete mode 100755 src/dede/api_ucenter.php delete mode 100755 src/dede/file_pic_view.php delete mode 100755 src/dede/sys_safe.php delete mode 100755 src/dede/templets/file_pic_view.htm delete mode 100755 src/dede/templets/sys_safe.htm delete mode 100755 src/include/taglib/ask.lib.php delete mode 100755 src/include/taglib/asktype.lib.php delete mode 100755 src/include/taglib/group.lib.php delete mode 100755 src/include/taglib/groupthread.lib.php delete mode 100755 src/include/taglib/mda.lib.php diff --git a/src/dede/album_add.php b/src/dede/album_add.php index 1cb52b87..66aea10e 100755 --- a/src/dede/album_add.php +++ b/src/dede/album_add.php @@ -5,6 +5,7 @@ * @version $Id: album_add.php 1 8:26 2010年7月12日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -388,13 +389,13 @@ else if($dopost=='save') //返回成功信息 $msg = " 　　请选择你的后续操作： - 继续发布图片 + 继续发布图片    - 更改图集 + 更改图集    - 预览文档 + 预览文档    - 已发布图片管理 + 已发布图片管理    $backurl "; diff --git a/src/dede/album_edit.php b/src/dede/album_edit.php index fe912ac2..d1462787 100755 --- a/src/dede/album_edit.php +++ b/src/dede/album_edit.php @@ -5,6 +5,7 @@ * @version $Id: album_edit.php 1 8:26 2010年7月12日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -435,13 +436,13 @@ else if($dopost=='save') //返回成功信息 $msg = " 　　请选择你的后续操作： - 继续发布图片 + 继续发布图片    - 查看更改 + 查看更改    - 预览文档 + 预览文档    - 管理已发布图片 + 管理已发布图片    $backurl "; diff --git a/src/dede/api_ucenter.php b/src/dede/api_ucenter.php deleted file mode 100755 index dc105c94..00000000 --- a/src/dede/api_ucenter.php +++ /dev/null @@ -1,375 +0,0 @@ -=5.0 - function __construct($ac = '') - { - $action = 'uc_'.(empty($ac)||(!in_array($ac,array('install','edit'))) ? 'show' : trim($ac)); - $this->dtp = new DedeTemplate(); - $this->config = DEDEINC.'/common.inc.php'; - $this->$action(); - } - - //构造类成员PHP<5.0 - function api_ucenter($ac = '') - { - $this->__construct($ac); - } - - function uc_install() - { - $uc_setings = api_gpc('uc_setings','P'); - - if(!isset($uc_setings['authkey']) || empty($uc_setings['authkey'])) - { - ShowMsg('请填写uc创始人密码!',-1); - exit(); - } - - $uc_setings['ucapi'] = preg_replace("/\/$/", '', trim($uc_setings['ucapi'])); - - if(empty($uc_setings['ucapi']) || !preg_match("/^(http:\/\/)/i", $uc_setings['ucapi'])) - { - ShowMsg('请填正确的服务端地址以http://开头!',-1); - exit(); - } - else - { - if(!$uc_setings['ucip']) - { - $temp = @parse_url($uc_setings['ucapi']); - $uc_setings['ucapi'] = gethostbyname($temp['host']); - if(ip2long($uc_setings['ucapi']) == -1 || ip2long($uc_setings['ucapi']) === FALSE) - { - $uc_setings['ucip'] = '127.0.0.1'; - } - } - } - - $ucinfo = api_fopen($uc_setings['ucapi'].'/index.php?m=app&a=ucinfo', 500, '', '', 1, $uc_setings['ucip']); - - list($status, $ucversion, $ucrelease, $uccharset, $ucdbcharset, $apptypes) = explode('|', $ucinfo); - - if($status != 'UC_STATUS_OK') - { - ShowMsg('uc服务端地址无效,请仔细检查您安装的uc服务端地址!',-1); - exit(); - } - else - { - $ucdbcharset = strtolower($ucdbcharset ? str_replace('-', '', $ucdbcharset) : $ucdbcharset); - if(UC_CLIENT_VERSION > $ucversion) - { - ShowMsg('uc服务端版本不一致,您当前的uc客服端版本为:'.UC_CLIENT_VERSION.',而服务端版本为:'.$ucversion.'!',-1); - exit(); - } - elseif($ucdbcharset != 'gbk') - { - ShowMsg('uc服务端编码与DedeCMS编码不一致!要求您的uc服务端编码为:gbk编码.',-1); - exit(); - } - //标签应用模板 - $app_tagtemplates = 'apptagtemplates[template]='.urlencode('{title}').'&'. - 'apptagtemplates[fields][title]='.urlencode('标题').'&'. - 'apptagtemplates[fields][writer]='.urlencode('作者').'&'. - 'apptagtemplates[fields][pubdate]='.urlencode('时间').'&'. - 'apptagtemplates[fields][url]='.urlencode('地址'); - - $postdata = 'm=app&a=add&ucfounder=&ucfounderpw='.urlencode($uc_setings['authkey']).'&apptype=OTHER&appname='.urlencode($GLOBALS['cfg_webname']).'&appurl='.urlencode($GLOBALS['cfg_basehost']).'&appip=&appcharset=gbk&appdbcharset=gbk&'.$app_tagtemplates.'&release='.UC_CLIENT_RELEASE; - - $ucconfig = api_fopen($uc_setings['ucapi'].'/index.php', 500, $postdata, '', 1, $uc_setings['ucip']); - - if(strstr($ucconfig,'config)) - { - ShowMsg('安装成功!',-1); - exit(); - } - else - { - ShowMsg('写入配置数据失败!'.$this->config.' 请设置可写权限!',-1); - exit(); - } - } - } - } - - function uc_edit() - { - $uc_setings = api_gpc('uc_setings','P'); - $uc_dbpass = $uc_setings['dbpass'] == '********' ? UC_DBPW : $uc_setings['dbpass']; - $fp = fopen($this->config, 'r'); - $content = fread($fp, filesize($this->config)); - $content = trim($content); - $content = substr($content, -2) == '?>' ? substr($content, 0, -2) : $content; - $content = strstr($content, '_|cfg_|GLOBALS') ? str_replace('_|cfg_|GLOBALS','cfg_|GLOBALS',$content) : $content; - fclose($fp); - - $connect = ''; - if($uc_setings['connect']) - { - $uc_dblink = @mysql_connect($uc_setings['dbhost'], $uc_setings['dbuser'], $uc_dbpass, 1); - if(!$uc_dblink) - { - ShowMsg('数据库连接失败!',-1); - exit(); - }else{ - mysql_close($uc_dblink); - } - - $connect = 'mysql'; - $content = api_insert_config($content, "/define\('UC_DBHOST',\s*'.*?'\);/i", "define('UC_DBHOST', '".$uc_setings['dbhost']."');"); - $content = api_insert_config($content, "/define\('UC_DBUSER',\s*'.*?'\);/i", "define('UC_DBUSER', '".$uc_setings['dbuser']."');"); - $content = api_insert_config($content, "/define\('UC_DBPW',\s*'.*?'\);/i", "define('UC_DBPW', '".$uc_dbpass."');"); - $content = api_insert_config($content, "/define\('UC_DBNAME',\s*'.*?'\);/i", "define('UC_DBNAME', '".$uc_setings['dbname']."');"); - $content = api_insert_config($content, "/define\('UC_DBTABLEPRE',\s*'.*?'\);/i", "define('UC_DBTABLEPRE', '`".$uc_setings['dbname'].'`.'.$uc_setings['dbtablepre']."');"); - } - - $content = api_insert_config($content, "/define\('UC_CONNECT',\s*'.*?'\);/i", "define('UC_CONNECT', '$connect');"); - $content = api_insert_config($content, "/define\('UC_KEY',\s*'.*?'\);/i", "define('UC_KEY', '".$uc_setings['authkey']."');"); - $content = api_insert_config($content, "/define\('UC_API',\s*'.*?'\);/i", "define('UC_API', '".$uc_setings['ucapi']."');"); - $content = api_insert_config($content, "/define\('UC_IP',\s*'.*?'\);/i", "define('UC_IP', '".$uc_setings['ucip']."');"); - $content = api_insert_config($content, "/define\('UC_APPID',\s*'?.*?'?\);/i", "define('UC_APPID', '".UC_APPID."');"); - $content .= '?>'; - - if($fp = @fopen($this->config, 'w')) - { - @fwrite($fp, trim($content)); - @fclose($fp); - ShowMsg('配置已经更改!',-1); - exit(); - }else{ - ShowMsg('写入配置数据失败!'.$this->config.' 请设置可写权限!',-1); - exit(); - } - } - - function uc_show() - { - $this->dtp->Assign('uc_config_file',$this->config); - - if(!defined('UC_APPID')) - { - $this->dtp->LoadTemplate(DEDEADMIN.'/templets/api_ucenter_install.htm'); - } - else - { - $uc_api_open = false; - $ucapparray = uc_app_ls(); - foreach($ucapparray as $apparray) - { - if($apparray['appid'] == UC_APPID) - { - $uc_api_open = true; - break; - } - } - - if(!$uc_api_open) - { - ShowMsg("DedeCMS没找到正确的uc配置！",-1); - exit(); - } - - - list($dbname,$dbtablepre) = explode('.',str_replace('`','',UC_DBTABLEPRE)); - $uc_setings = array('appid' => UC_APPID, 'ucapi' => UC_API, 'connect' => UC_CONNECT, 'dbhost' => UC_DBHOST, 'dbuser' => UC_DBUSER,'dbpass' => UC_DBPW, 'dbname' => $dbname, 'dbtablepre' => $dbtablepre,'ucip' => UC_IP,'authkey' => UC_KEY); - - $this->dtp->Assign('uc_setings',$uc_setings); - $this->dtp->LoadTemplate(DEDEADMIN.'/templets/api_ucenter_edit.htm'); - } - $this->dtp->Display(); - exit(); - } -} -/* -class uc_function{...} -*/ -function api_fopen($url, $limit = 0, $post = '', $cookie = '', $bysocket = FALSE, $ip = '', $timeout = 15, $block = TRUE) -{ - $return = ''; - $matches = parse_url($url); - $host = $matches['host']; - $path = $matches['path'] ? $matches['path'].($matches['query'] ? '?'.$matches['query'] : '') : '/'; - $port = !empty($matches['port']) ? $matches['port'] : 80; - if($post) - { - $out = "POST $path HTTP/1.0\r\n"; - $out .= "Accept: */*\r\n"; - //$out .= "Referer: $boardurl\r\n"; - $out .= "Accept-Language: zh-cn\r\n"; - $out .= "Content-Type: application/x-www-form-urlencoded\r\n"; - $out .= "User-Agent: $_SERVER[HTTP_USER_AGENT]\r\n"; - $out .= "Host: $host\r\n"; - $out .= 'Content-Length: '.strlen($post)."\r\n"; - $out .= "Connection: Close\r\n"; - $out .= "Cache-Control: no-cache\r\n"; - $out .= "Cookie: $cookie\r\n\r\n"; - $out .= $post; - }else{ - $out = "GET $path HTTP/1.0\r\n"; - $out .= "Accept: */*\r\n"; - //$out .= "Referer: $boardurl\r\n"; - $out .= "Accept-Language: zh-cn\r\n"; - $out .= "User-Agent: $_SERVER[HTTP_USER_AGENT]\r\n"; - $out .= "Host: $host\r\n"; - $out .= "Connection: Close\r\n"; - $out .= "Cookie: $cookie\r\n\r\n"; - } - - $fp = @fsockopen(($host ? $host : $ip), $port, $errno, $errstr, $timeout); - if(!$fp) - { - return ''; - }else{ - stream_set_blocking($fp, $block); - stream_set_timeout($fp, $timeout); - @fwrite($fp, $out); - $status = stream_get_meta_data($fp); - if(!$status['timed_out']) - { - while (!feof($fp)) - { - if(($header = @fgets($fp)) && ($header == "\r\n" || $header == "\n")) - { - break; - } - } - - $stop = false; - while(!feof($fp) && !$stop) - { - $data = fread($fp, ($limit == 0 || $limit > 8192 ? 8192 : $limit)); - $return .= $data; - if($limit) - { - $limit -= strlen($data); - $stop = $limit <= 0; - } - } - } - @fclose($fp); - return $return; - } -} - -function api_write_config($config, $file) -{ - $success = false; - list($appauthkey, $appid, $ucdbhost, $ucdbname, $ucdbuser, $ucdbpw, $ucdbcharset, $uctablepre, $uccharset, $ucapi, $ucip) = explode('|', $config); - - if($content = file_get_contents($file)) - { - $content = trim($content); - $content = substr($content, -2) == '?>' ? substr($content, 0, -2) : $content; - $content = strstr($content, '_|cfg_|GLOBALS') ? str_replace('_|cfg_|GLOBALS','cfg_|GLOBALS',$content) : $content; - $link = mysql_connect($ucdbhost, $ucdbuser, $ucdbpw, 1); - $uc_connnect = $link && mysql_select_db($ucdbname, $link) ? 'mysql' : ''; - $content = api_insert_config($content, "/define\('UC_CONNECT',\s*'.*?'\);/i", "define('UC_CONNECT', '$uc_connnect');"); - $content = api_insert_config($content, "/define\('UC_DBHOST',\s*'.*?'\);/i", "define('UC_DBHOST', '$ucdbhost');"); - $content = api_insert_config($content, "/define\('UC_DBUSER',\s*'.*?'\);/i", "define('UC_DBUSER', '$ucdbuser');"); - $content = api_insert_config($content, "/define\('UC_DBPW',\s*'.*?'\);/i", "define('UC_DBPW', '$ucdbpw');"); - $content = api_insert_config($content, "/define\('UC_DBNAME',\s*'.*?'\);/i", "define('UC_DBNAME', '$ucdbname');"); - $content = api_insert_config($content, "/define\('UC_DBCHARSET',\s*'.*?'\);/i", "define('UC_DBCHARSET', '$ucdbcharset');"); - $content = api_insert_config($content, "/define\('UC_DBTABLEPRE',\s*'.*?'\);/i", "define('UC_DBTABLEPRE', '`$ucdbname`.$uctablepre');"); - $content = api_insert_config($content, "/define\('UC_DBCONNECT',\s*'.*?'\);/i", "define('UC_DBCONNECT', '0');"); - $content = api_insert_config($content, "/define\('UC_KEY',\s*'.*?'\);/i", "define('UC_KEY', '$appauthkey');"); - $content = api_insert_config($content, "/define\('UC_API',\s*'.*?'\);/i", "define('UC_API', '$ucapi');"); - $content = api_insert_config($content, "/define\('UC_CHARSET',\s*'.*?'\);/i", "define('UC_CHARSET', '$uccharset');"); - $content = api_insert_config($content, "/define\('UC_IP',\s*'.*?'\);/i", "define('UC_IP', '$ucip');"); - $content = api_insert_config($content, "/define\('UC_APPID',\s*'?.*?'?\);/i", "define('UC_APPID', '$appid');"); - $content = api_insert_config($content, "/define\('UC_PPP',\s*'?.*?'?\);/i", "define('UC_PPP', '20');"); - $content .= "\r\n".'?>'; - - if(@file_put_contents($file, $content)) - { - $success = true; - } - } - return $success; -} - -function api_insert_config($s, $find, $replace) -{ - if(preg_match($find, $s)) - { - $s = preg_replace($find, $replace, $s); - }else{ - // 插入到最后一行 - $s .= "\r\n".$replace; - } - return $s; -} - -function api_gpc($k, $var='R') -{ - switch($var) - { - case 'G': $var = &$_GET; break; - case 'P': $var = &$_POST; break; - case 'C': $var = &$_COOKIE; break; - case 'R': $var = &$_REQUEST; break; - } - return isset($var[$k]) ? $var[$k] : NULL; -} - -if(!function_exists('file_put_contents')){ function file_put_contents($filename, $s) -{ - $fp = @fopen($filename, 'w'); - @fwrite($fp, $s); - @fclose($fp); - return TRUE; -}} -?> \ No newline at end of file diff --git a/src/dede/archives_add.php b/src/dede/archives_add.php index 53ebcf56..357b98d0 100755 --- a/src/dede/archives_add.php +++ b/src/dede/archives_add.php @@ -5,6 +5,7 @@ * @version $Id: archives_add.php 1 8:26 2010年7月12日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -234,13 +235,13 @@ color,writer,source,litpic,pubdate,senddate,mid,voteid,notpost,description,keywo ClearMyAddon($arcID, $title); //返回成功信息 $msg = " 　　请选择你的后续操作： - 继续发布文档 + 继续发布文档    - 查看文档 + 查看文档    - 更改文档 + 更改文档    - 已发布文档管理 + 已发布文档管理    $backurl "; diff --git a/src/dede/archives_do.php b/src/dede/archives_do.php index d53dd4d2..e7568d74 100755 --- a/src/dede/archives_do.php +++ b/src/dede/archives_do.php @@ -5,6 +5,7 @@ * @version $Id: archives_do.php 1 8:26 2010年7月12日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -619,9 +620,9 @@ else if($dopost=='quickEdit') { if($trow->att=='j' || $trow->att=='p') continue; if(preg_match("#".$trow->att."#", $arcRow['flag'])) - echo "{$trow->attname}.{$trow->att}"; + echo " "; else - echo "{$trow->attname}.{$trow->att}"; + echo " "; } ?> @@ -664,10 +665,10 @@ else if($dopost=='quickEdit') - - + +    - + diff --git a/src/dede/archives_edit.php b/src/dede/archives_edit.php index c103e465..4f116c67 100755 --- a/src/dede/archives_edit.php +++ b/src/dede/archives_edit.php @@ -5,6 +5,7 @@ * @version $Id: archives_edit.php 1 8:26 2010年7月12日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -244,13 +245,13 @@ else if($dopost=='save') //返回成功信息 $msg = " 　　请选择你的后续操作： - 发布新文档 + 发布新文档    - 查看更改 + 查看更改    - 查看文档 + 查看文档    - 管理文档 + 管理文档    $backurl "; diff --git a/src/dede/archives_sg_add.php b/src/dede/archives_sg_add.php index 33009ac3..25e682bf 100755 --- a/src/dede/archives_sg_add.php +++ b/src/dede/archives_sg_add.php @@ -5,6 +5,7 @@ * @version $Id: archives_sg_add.php 1 8:26 2010年7月12日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -191,15 +192,15 @@ else if($dopost=='save') //返回成功信息 $msg = " 　　请选择你的后续操作： - 继续发布文档 + 继续发布文档    - 查看文档 + 查看文档    - 更改文档 + 更改文档    - 已发布文档管理 + 已发布文档管理    - 网站栏目管理 + 网站栏目管理 "; $wintitle = "成功发布文档！"; diff --git a/src/dede/archives_sg_edit.php b/src/dede/archives_sg_edit.php index fd9261c1..a10afb8f 100755 --- a/src/dede/archives_sg_edit.php +++ b/src/dede/archives_sg_edit.php @@ -5,6 +5,7 @@ * @version $Id: archives_sg_edit.php 1 8:26 2010年7月12日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -175,15 +176,15 @@ else if($dopost=='save') //返回成功信息 $msg = " 　　请选择你的后续操作： - 发布新文档 + 发布新文档    - 查看更改 + 查看更改    - 查看文档 + 查看文档    - 管理文档 + 管理文档    - 网站栏目管理 + 网站栏目管理 "; $wintitle = "成功更改文档！"; diff --git a/src/dede/article_add.php b/src/dede/article_add.php index 21dfa7c6..cd3ab5fe 100755 --- a/src/dede/article_add.php +++ b/src/dede/article_add.php @@ -1,4 +1,14 @@ $servurl, 'username' => $servuser, 'password' => $servpwd,'debug' => 'TRUE'); @@ -278,13 +288,13 @@ else if($dopost=='save') //返回成功信息 $msg = " 　　请选择你的后续操作： - 继续发布文章 + 继续发布文章    - 查看文章 + 查看文章    - 更改文章 + 更改文章    - 已发布文章管理 + 已发布文章管理    $backurl "; diff --git a/src/dede/article_allowurl_edit.php b/src/dede/article_allowurl_edit.php index ad0455b7..513c5f1b 100755 --- a/src/dede/article_allowurl_edit.php +++ b/src/dede/article_allowurl_edit.php @@ -5,6 +5,7 @@ * @version $Id: article_allowurl_edit.php 1 11:36 2010年10月8日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ diff --git a/src/dede/article_edit.php b/src/dede/article_edit.php index 657cac8c..a4771f12 100755 --- a/src/dede/article_edit.php +++ b/src/dede/article_edit.php @@ -5,6 +5,7 @@ * @version $Id: article_edit.php 1 14:12 2010年7月12日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -261,13 +262,13 @@ else if($dopost=='save') //返回成功信息 $msg = " 　　请选择你的后续操作： - 发布新文章 + 发布新文章    - 查看更改 + 查看更改    - 查看文章 + 查看文章    - 管理文章 + 管理文章    $backurl "; diff --git a/src/dede/css/base.css b/src/dede/css/base.css index b3e3f73b..0e4a4524 100755 --- a/src/dede/css/base.css +++ b/src/dede/css/base.css @@ -47,7 +47,16 @@ background: url(../images/input.png) repeat-x scroll 0px 0px; } select { -padding: 3px; + height: calc(1.5em + .75rem + 2px); + padding: .375rem .75rem; +font-size: 1rem; +font-weight: 400; +color: #495057; +background-color: #fff; +background-clip: padding-box; +border: 1px solid #ced4da; +border-radius: .25rem; +transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; } input[type="button"],input[type="submit"],input[type="reset"] { @@ -62,11 +71,16 @@ cursor: pointer; } input[type="text"],input[type="password"] { -border-width: 1px; -border-style: solid; -border-color: #707070 #CECECE #CECECE #707070; -padding: 2px 4px; -height: 18px; +font-size: 1rem; +font-weight: 400; +color: #495057; +background-color: #fff; +background-clip: padding-box; +border: 1px solid #ced4da; +border-radius: .25rem; +height: calc(1.5em + .75rem + 2px); +padding: .375rem .75rem; +transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; line-height: 18px; vertical-align: middle; } @@ -80,6 +94,11 @@ box-shadow: 0 0 3px #A5C760; outline: none; } +label { + display: inline-block; + margin: .5rem 0; +} + .alltxt { height: 18px; line-height: 18px; @@ -91,14 +110,19 @@ border-color: #707070 #CECECE #CECECE #707070; } textarea { -background: url(../images/input.png) #fff repeat-x scroll 0px 0px; -border-width: 1px; -border-style: solid; -border-color: #707070 #CECECE #CECECE #707070; +font-size: 1rem; +font-weight: 400; +color: #495057; +background-color: #fff; +background-clip: padding-box; +border: 1px solid #ced4da; +border-radius: .25rem; +transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; padding: 2px 4px; vertical-align: middle; line-height: 16px; overflow: auto; +resize: vertical; } textarea:focus { @@ -232,7 +256,7 @@ background-color: #E6E6E6 .bline { border-bottom: 1px dotted #BCBCBC; -height: 28px; +height: 36px; background-color: #FFFFFF; } @@ -368,7 +392,7 @@ filter: Alpha(opacity=50); opacity: 0.5; position: absolute; width: 100%; -height: 2500px; +height: 120%; } .quicksel { @@ -612,7 +636,7 @@ padding-left: 23px; } #title { -background: url(../images/ruler.gif) repeat-x 0px 5px; +background: url(../images/ruler.gif) repeat-x 0px 10px; } .spec { @@ -636,10 +660,6 @@ img { vertical-align: baseline; } -input, - select { -height: auto !important; -} .maintable { width: 98%!important; diff --git a/src/dede/dialog/select_images.php b/src/dede/dialog/select_images.php index 429e3a80..f54da599 100755 --- a/src/dede/dialog/select_images.php +++ b/src/dede/dialog/select_images.php @@ -1,4 +1,5 @@ + - -图片浏览器 - - - - - -
-单击关闭预览 -
- - - - - - -
- - - - -
- - - - - - - - - - -read()) { - //-----计算文件大小和创建时间 - if($file!="." && $file!=".." && !is_dir("$inpath/$file")){ - $filesize = filesize("$inpath/$file"); - $filesize = $filesize / 1024; - if($filesize != "") - if($filesize < 0.1){ - @list($ty1, $ty2) = split("\.", $filesize); - $filesize = $ty1.".".substr($ty2, 0, 2); + function ChangeImage(surl) { + document.getElementById('picview').src = surl; } - else{ - @list($ty1, $ty2) = split("\.", $filesize); - $filesize = $ty1.".".substr($ty2, 0, 1); + + + + +
+ 单击关闭预览 +
+ + +
预览点击名称选择图片文件大小最后修改时间
-点击“V”预览图片，点击图片名选择图片，显示图片后点击该图片关闭预览。 -
+ + - -
+ + + + + + + + + + + read()) { - if($file==$comeback) $lstyle = " style='color:red' "; - else $lstyle = ""; + //-----计算文件大小和创建时间 + if ($file != "." && $file != ".." && !is_dir("$inpath/$file")) { + $filesize = filesize("$inpath/$file"); + $filesize = $filesize / 1024; + if ($filesize != "") + if ($filesize < 0.1) { + @list($ty1, $ty2) = split("\.", $filesize); + $filesize = $ty1 . "." . substr($ty2, 0, 2); + } else { + @list($ty1, $ty2) = split("\.", $filesize); + $filesize = $ty1 . "." . substr($ty2, 0, 1); + } + $filetime = filemtime("$inpath/$file"); + $filetime = MyDate("Y-m-d H:i:s", $filetime); + } - $line = "\n - - - - - "; - echo "$line"; - } -}//End Loop -$dh->close(); -?> - - + + + + "; + echo $line; + } else if (is_dir("$inpath/$file")) { + if (preg_match("#^_(.*)$#i", $file)) continue; #屏蔽FrontPage扩展目录和linux隐蔽目录 + if (preg_match("#^\.(.*)$#i", $file)) continue; + $line = "\n + + + + "; + echo "$line"; + } else if (preg_match("#\.(" . $cfg_imgtype . ")#i", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { + $reurl = $remoteupUrl . $reurl; + } else { + $reurl = $reurl; + } + + if ($file == $comeback) $lstyle = " style='color:red' "; + else $lstyle = ""; + + $line = "\n + + + + + "; + echo "$line"; + } else if (preg_match("#\.(jpg)#i", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { + $reurl = $remoteupUrl . $reurl; + } else { + $reurl = $reurl; + } -
预览点击名称选择图片文件大小最后修改时间
+ 点击“V”预览图片，点击图片名选择图片，显示图片后点击该图片关闭预览。 +
- - - $file - $filesize KB$filetime
+ if ($file == ".") continue; + else if ($file == "..") { + if ($activepath == "") continue; + $tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath); + $line = "\n
+ 上级目录 当前目录:$activepath
+ $file　　
+ + + $file$filesize KB$filetime
- -":''; echo $noeditor;?> - - - - - - - - - - -
-  上　传： - />水印 - 缩小 - 宽： - 高： - -
+ if ($file == $comeback) $lstyle = " style='color:red' "; + else $lstyle = ""; -
-
-
+ $line = "\n + + + + + $file + + $filesize KB + $filetime + "; + echo "$line"; + } + } //End Loop + $dh->close(); + ?> + + + + + " : ''; + echo $noeditor; ?> + + + + + + + + + + +
+  上　传： + + + 宽： + 高： + +
+ + + + + + + + \ No newline at end of file diff --git a/src/dede/dialog/select_media.php b/src/dede/dialog/select_media.php index 8d1f4883..04f67c08 100755 --- a/src/dede/dialog/select_media.php +++ b/src/dede/dialog/select_media.php @@ -1,4 +1,5 @@ + - -媒体文件管理器 - - + + 媒体文件管理器 + + + + - - - - - - -
- - - - - - - -read()) { - //-----计算文件大小和创建时间 - if($file!="." && $file!=".." && !is_dir("$inpath/$file")){ - $filesize = filesize("$inpath/$file"); - $filesize = $filesize/1024; - if($filesize!="") - if($filesize<0.1) - { - @list($ty1,$ty2) = split("\.", $filesize); - $filesize = $ty1.".".substr($ty2, 0, 2); - } - else{ - @list($ty1,$ty2) = split("\.", $filesize); - $filesize=$ty1.".".substr($ty2, 0, 1); + + +
点击名称选择文件文件大小最后修改时间
+ + + + + + read()) { + //-----计算文件大小和创建时间 + if ($file != "." && $file != ".." && !is_dir("$inpath/$file")) { + $filesize = filesize("$inpath/$file"); + $filesize = $filesize / 1024; + if ($filesize != "") + if ($filesize < 0.1) { + @list($ty1, $ty2) = split("\.", $filesize); + $filesize = $ty1 . "." . substr($ty2, 0, 2); + } else { + @list($ty1, $ty2) = split("\.", $filesize); + $filesize = $ty1 . "." . substr($ty2, 0, 1); + } + $filetime = filemtime("$inpath/$file"); + $filetime = MyDate("Y-m-d H:i:s", $filetime); + } + + //------判断文件类型并作处理 + if ($file == ".") continue; + else if ($file == "..") { + if ($activepath == "") continue; + $tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath); + $line = "\n + \r\n"; - echo $line; - } - else if(is_dir("$inpath/$file")) - { - if(preg_match("#^_(.*)$#i", $file)) continue; #屏蔽FrontPage扩展目录和linux隐蔽目录 - if(preg_match("#^\.(.*)$#i", $file)) continue; - $line = "\n + echo $line; + } else if (is_dir("$inpath/$file")) { + if (preg_match("#^_(.*)$#i", $file)) continue; #屏蔽FrontPage扩展目录和linux隐蔽目录 + if (preg_match("#^\.(.*)$#i", $file)) continue; + $line = "\n"; - echo "$line"; - } - else if(preg_match("#\.(swf|fly|fla|flv)#i", $file)){ - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - if($cfg_remote_site=='Y' && $remoteuploads == 1) - { - $reurl = $remoteupUrl.$reurl; - }else{ - $reurl = $reurl; - } - - if($file==$comeback) $lstyle = " style='color:red' "; - else $lstyle = ""; - - $line = "\n + echo "$line"; + } else if (preg_match("#\.(swf|fly|fla|flv)#i", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { + $reurl = $remoteupUrl . $reurl; + } else { + $reurl = $reurl; + } + + if ($file == $comeback) $lstyle = " style='color:red' "; + else $lstyle = ""; + + $line = "\n"; - echo "$line"; - } - else if(preg_match("#\.(wmv|avi)#i", $file)){ + echo "$line"; + } else if (preg_match("#\.(wmv|avi)#i", $file)) { - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - if($cfg_remote_site=='Y' && $remoteuploads == 1) - { - $reurl = $remoteupUrl.$reurl; - } else { - $reurl = $reurl; - } + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { + $reurl = $remoteupUrl . $reurl; + } else { + $reurl = $reurl; + } - if($file==$comeback) $lstyle = " style='color:red' "; - else $lstyle = ""; + if ($file == $comeback) $lstyle = " style='color:red' "; + else $lstyle = ""; - $line = "\n + $line = "\n"; - echo "$line"; - } - else if(preg_match("#\.(rm|rmvb)#i", $file)) - { - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - if($cfg_remote_site=='Y' && $remoteuploads == 1) - { - $reurl = $remoteupUrl.$reurl; - } else { - $reurl = $reurl; - } - - if($file==$comeback) $lstyle = " style='color:red' "; - else $lstyle = ""; - - $line = "\n + echo "$line"; + } else if (preg_match("#\.(rm|rmvb)#i", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { + $reurl = $remoteupUrl . $reurl; + } else { + $reurl = $reurl; + } + + if ($file == $comeback) $lstyle = " style='color:red' "; + else $lstyle = ""; + + $line = "\n"; - echo "$line"; - } - else if(preg_match("#\.(mp3|wma)#", $file)){ + echo "$line"; + } else if (preg_match("#\.(mp3|wma)#", $file)) { - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - if($cfg_remote_site=='Y' && $remoteuploads == 1) - { - $reurl = $remoteupUrl.$reurl; - }else{ - $reurl = $reurl; - } + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { + $reurl = $remoteupUrl . $reurl; + } else { + $reurl = $reurl; + } - if($file==$comeback) $lstyle = " style='color:red' "; - else $lstyle = ""; + if ($file == $comeback) $lstyle = " style='color:red' "; + else $lstyle = ""; - $line = "\n + $line = "\n"; - echo "$line"; - } -}//End Loop -$dh->close(); -?> - - - - -
点击名称选择文件文件大小最后修改时间
上级目录 当前目录:$activepath
- $file + $file - -
$file $filesize KB $filetime
$file $filesize KB $filetime
$file $filesize KB $filetime
$file $filesize KB $filetime
- - - - - - - - - - - -
-  上　传：   -
- -
- -
+ echo "$line"; + } + } //End Loop + $dh->close(); + ?> + + + + + + + + + + + + + + +
+  上　传：   +
+ + + + + \ No newline at end of file diff --git a/src/dede/dialog/select_soft.php b/src/dede/dialog/select_soft.php index f615761e..474b51b1 100755 --- a/src/dede/dialog/select_soft.php +++ b/src/dede/dialog/select_soft.php @@ -1,4 +1,5 @@ + - -软件管理器 - - + + 软件管理器 + + + + - - - - - - - -
-
- - - -  上　传： -   - 改 名： -   - -
-
- - - - - - - -read()) -{ - //-----计算文件大小和创建时间 - if($file != "." && $file != ".." && !is_dir("$inpath/$file")) - { - $filesize = filesize("$inpath/$file"); - $filesize = $filesize / 1024; - if($filesize != "") - if($filesize < 0.1){ - @list($ty1, $ty2) = split("\.", $filesize); - $filesize = $ty1.".".substr($ty2, 0, 2); + + +
点击名称选择文件文件大小最后修改时间
+ + + + + - -
+
+ + + +  上　传： +   + 改 名： +   + +
+
+ + + + + + + + read()) { + //-----计算文件大小和创建时间 + if ($file != "." && $file != ".." && !is_dir("$inpath/$file")) { + $filesize = filesize("$inpath/$file"); + $filesize = $filesize / 1024; + if ($filesize != "") + if ($filesize < 0.1) { + @list($ty1, $ty2) = split("\.", $filesize); + $filesize = $ty1 . "." . substr($ty2, 0, 2); + } else { + @list($ty1, $ty2) = split("\.", $filesize); + $filesize = $ty1 . "." . substr($ty2, 0, 1); + } + $filetime = filemtime("$inpath/$file"); + $filetime = MyDate("Y-m-d H:i:s", $filetime); + } + //------判断文件类型并作处理 + if ($file == ".") continue; + else if ($file == "..") { + if ($activepath == "") continue; + $tmp = preg_replace("#[\/][^\/]*$#i", "", $activepath); + $line = "\n + \r\n"; - echo $line; - } - else if(is_dir("$inpath/$file")) - { - if(preg_match("#^_(.*)$#i", $file)) continue; #屏蔽FrontPage扩展目录和linux隐蔽目录 - if(preg_match("#^\.(.*)$#i", $file)) continue; - $line = "\n + echo $line; + } else if (is_dir("$inpath/$file")) { + if (preg_match("#^_(.*)$#i", $file)) continue; #屏蔽FrontPage扩展目录和linux隐蔽目录 + if (preg_match("#^\.(.*)$#i", $file)) continue; + $line = "\n"; - echo "$line"; - } - else if(preg_match("#\.(zip|rar|tgr.gz)#i", $file)) - { - if($file==$comeback) $lstyle = " style='color:red' "; - else $lstyle = ""; + echo "$line"; + } else if (preg_match("#\.(zip|rar|tgr.gz)#i", $file)) { + if ($file == $comeback) $lstyle = " style='color:red' "; + else $lstyle = ""; - $reurl = "$activeurl/$file"; + $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - if($cfg_remote_site=='Y' && $remoteuploads == 1) - { - $reurl = $remoteupUrl.$reurl; - } else { - $reurl = $reurl; - } + $reurl = preg_replace("#^\.\.#", "", $reurl); + if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { + $reurl = $remoteupUrl . $reurl; + } else { + $reurl = $reurl; + } - $line = "\n + $line = "\n"; - echo "$line"; - } - else - { - if($file==$comeback) $lstyle = " style='color:red' "; - else $lstyle = ''; + echo "$line"; + } else { + if ($file == $comeback) $lstyle = " style='color:red' "; + else $lstyle = ''; - $reurl = "$activeurl/$file"; + $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - if($cfg_remote_site=='Y' && $remoteuploads == 1) - { - $reurl = $remoteupUrl.$reurl; - } else { - $reurl = $reurl; - } + $reurl = preg_replace("#^\.\.#", "", $reurl); + if ($cfg_remote_site == 'Y' && $remoteuploads == 1) { + $reurl = $remoteupUrl . $reurl; + } else { + $reurl = $reurl; + } - $line = "\n + $line = "\n"; - echo "$line"; - } -}//End Loop -$dh->close(); -?> - -
点击名称选择文件文件大小最后修改时间
上级目录 当前目录:$activepath
- $file + $file - -
$file @@ -174,38 +160,40 @@ while($file = $dh->read()) $filesize KB $filetime
$file $filesize KB $filetime
 请点击要选择的文件，红色字样的为刚上传的文件。
+ echo "$line"; + } + } //End Loop + $dh->close(); + ?> + +
+ + + +  请点击要选择的文件，红色字样的为刚上传的文件。 + + + \ No newline at end of file diff --git a/src/dede/dialog/select_templets.php b/src/dede/dialog/select_templets.php index 00d80c40..18c74ec1 100755 --- a/src/dede/dialog/select_templets.php +++ b/src/dede/dialog/select_templets.php @@ -1,4 +1,5 @@ + - -模板管理器 - - + + 模板管理器 + + + + + - - - - - -
- - - - - - - -read()) { - //-----计算文件大小和创建时间 - if($file!="." && $file!=".." && !is_dir("$inpath/$file")){ - $filesize = filesize("$inpath/$file"); - $filesize = $filesize / 1024; - if($filesize != "") - if($filesize < 0.1) - { - @list($ty1,$ty2) = split("\.", $filesize); - $filesize=$ty1.".".substr($ty2, 0, 2); - } else { - @list($ty1,$ty2) = split("\.", $filesize); - $filesize=$ty1.".".substr($ty2, 0, 1); - } - $filetime = filemtime("$inpath/$file"); - $filetime = MyDate("Y-m-d H:i:s", $filetime); + + +
点击名称选择文件文件大小最后修改时间
+ + + + + + read()) { + //-----计算文件大小和创建时间 + if ($file != "." && $file != ".." && !is_dir("$inpath/$file")) { + $filesize = filesize("$inpath/$file"); + $filesize = $filesize / 1024; + if ($filesize != "") + if ($filesize < 0.1) { + @list($ty1, $ty2) = split("\.", $filesize); + $filesize = $ty1 . "." . substr($ty2, 0, 2); + } else { + @list($ty1, $ty2) = split("\.", $filesize); + $filesize = $ty1 . "." . substr($ty2, 0, 1); + } + $filetime = filemtime("$inpath/$file"); + $filetime = MyDate("Y-m-d H:i:s", $filetime); + } + + //------判断文件类型并作处理 + if ($file == ".") continue; + else if ($file == "..") { + if ($activepath == "") continue; + $tmp = preg_replace("#[\/][^\/]*$#", "", $activepath); + $line = "\n + \r\n"; - echo $line; - } - else if(is_dir("$inpath/$file")) - { - if(preg_match("#^_(.*)$#i", $file)) continue; #屏蔽FrontPage扩展目录和linux隐蔽目录 - if(preg_match("#^\.(.*)$#i", $file)) continue; - $line = "\n + echo $line; + } else if (is_dir("$inpath/$file")) { + if (preg_match("#^_(.*)$#i", $file)) continue; #屏蔽FrontPage扩展目录和linux隐蔽目录 + if (preg_match("#^\.(.*)$#i", $file)) continue; + $line = "\n"; - echo "$line"; - } else if(preg_match("#\.(htm|html)#i", $file)) - { + echo "$line"; + } else if (preg_match("#\.(htm|html)#i", $file)) { - if($file==$comeback) $lstyle = " style='color:red' "; - else $lstyle = ""; + if ($file == $comeback) $lstyle = " style='color:red' "; + else $lstyle = ""; - $reurl = "$activeurl/$file"; + $reurl = "$activeurl/$file"; - $reurl = preg_replace("#\.\.#", "", $reurl); - $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); + $reurl = preg_replace("#\.\.#", "", $reurl); + $reurl = preg_replace("#" . $templetdir . "\/#", "", $reurl); - $line = "\n + $line = "\n"; - echo "$line"; - } else if(preg_match("#\.(css)#i", $file)) - { - if($file==$comeback) $lstyle = " style='color:red' "; - else $lstyle = ""; + echo "$line"; + } else if (preg_match("#\.(css)#i", $file)) { + if ($file == $comeback) $lstyle = " style='color:red' "; + else $lstyle = ""; - $reurl = "$activeurl/$file"; + $reurl = "$activeurl/$file"; - $reurl = preg_replace("#\.\.#", "", $reurl); - $reurl = preg_replace("#".$templetdir."/#", "", $reurl); + $reurl = preg_replace("#\.\.#", "", $reurl); + $reurl = preg_replace("#" . $templetdir . "/#", "", $reurl); - $line = "\n + $line = "\n"; - echo "$line"; - } else if(preg_match("#\.(js)#i", $file)) - { - if( $file == $comeback ) $lstyle = " style='color:red' "; - else $lstyle = ""; + echo "$line"; + } else if (preg_match("#\.(js)#i", $file)) { + if ($file == $comeback) $lstyle = " style='color:red' "; + else $lstyle = ""; - $reurl = "$activeurl/$file"; + $reurl = "$activeurl/$file"; - $reurl = preg_replace("#\.\.#", "", $reurl); - $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); + $reurl = preg_replace("#\.\.#", "", $reurl); + $reurl = preg_replace("#" . $templetdir . "\/#", "", $reurl); - $line = "\n + $line = "\n"; - echo "$line"; - } else if(preg_match("#\.(jpg)#i", $file)) - { - if($file==$comeback) $lstyle = " style='color:red' "; - else $lstyle = ""; + echo "$line"; + } else if (preg_match("#\.(jpg)#i", $file)) { + if ($file == $comeback) $lstyle = " style='color:red' "; + else $lstyle = ""; - $reurl = "$activeurl/$file"; + $reurl = "$activeurl/$file"; - $reurl = preg_replace("#\.\.#", "", $reurl); - $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); + $reurl = preg_replace("#\.\.#", "", $reurl); + $reurl = preg_replace("#" . $templetdir . "\/#", "", $reurl); - $line = "\n + $line = "\n"; - echo "$line"; - } else if(preg_match("#\.(gif|png)#i", $file)) - { + echo "$line"; + } else if (preg_match("#\.(gif|png)#i", $file)) { - if($file==$comeback) $lstyle = " style='color:red' "; - else $lstyle = ""; + if ($file == $comeback) $lstyle = " style='color:red' "; + else $lstyle = ""; - $reurl = "$activeurl/$file"; + $reurl = "$activeurl/$file"; - $reurl = preg_replace("#\.\.#", "", $reurl); - $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); + $reurl = preg_replace("#\.\.#", "", $reurl); + $reurl = preg_replace("#" . $templetdir . "\/#", "", $reurl); - $line = "\n + $line = "\n"; - echo "$line"; - } - else if(preg_match("#\.(txt)#i", $file)) - { + echo "$line"; + } else if (preg_match("#\.(txt)#i", $file)) { - if($file==$comeback) $lstyle = " style='color:red' "; - else $lstyle = ""; + if ($file == $comeback) $lstyle = " style='color:red' "; + else $lstyle = ""; - $reurl = "$activeurl/$file"; + $reurl = "$activeurl/$file"; - $reurl = preg_replace("#\.\.#", "", $reurl); - $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); + $reurl = preg_replace("#\.\.#", "", $reurl); + $reurl = preg_replace("#" . $templetdir . "\/#", "", $reurl); - $line = "\n + $line = "\n"; - echo "$line"; - } -}//End Loop -$dh->close(); -?> - - - - -
点击名称选择文件文件大小最后修改时间
上级目录 当前目录:$activepath
- $file + $file - -
$file $filesize KB $filetime
$file $filesize KB $filetime
$file $filesize KB $filetime
$file $filesize KB $filetime
$file $filesize KB $filetime
$file $filesize KB $filetime
- - - - - - - - - - -
-  上　传： - 改名： - -
- -
- -
+ echo "$line"; + } + } //End Loop + $dh->close(); + ?> + + + + + + + + + + + + + +
+  上　传： + 改名： + +
+ + + + + \ No newline at end of file diff --git a/src/dede/file_manage_control.php b/src/dede/file_manage_control.php index 2d757f69..f3ba4259 100755 --- a/src/dede/file_manage_control.php +++ b/src/dede/file_manage_control.php @@ -5,6 +5,7 @@ * @version $Id: file_manage_control.php 1 8:48 2010年7月13日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ diff --git a/src/dede/file_manage_main.php b/src/dede/file_manage_main.php index 317b8ee8..a870e9e7 100755 --- a/src/dede/file_manage_main.php +++ b/src/dede/file_manage_main.php @@ -5,6 +5,7 @@ * @version $Id: file_manage_main.php 1 8:48 2010年7月13日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ diff --git a/src/dede/file_manage_view.php b/src/dede/file_manage_view.php index 625014b3..0f5e49e4 100755 --- a/src/dede/file_manage_view.php +++ b/src/dede/file_manage_view.php @@ -5,6 +5,7 @@ * @version $Id: file_manage_view.php 1 8:48 2010年7月13日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ diff --git a/src/dede/file_pic_view.php b/src/dede/file_pic_view.php deleted file mode 100755 index 03e6bb14..00000000 --- a/src/dede/file_pic_view.php +++ /dev/null @@ -1,182 +0,0 @@ -转到上级目录\n"); - } -} - -/** - * 列出图片 - * - * @access public - * @param string $truePath 真实地址 - * @param string $nowPath 当前地址 - * @return string - */ -function ListPic($truePath, $nowPath) -{ - global $listSize; - $col=0; - $rowdd=0; - $rowdd++; - $imgfile=""; - $truePath = preg_replace("#\/$#", "", preg_replace("#\\\\{1,}#", "/", trim($truePath))); - $nowPath = preg_replace("#\/$#", "", preg_replace("#\/{1,}#", "/", trim($nowPath))); - $dh = dir($truePath); - echo("\n"); - while($filename=$dh->read()) - { - if(!preg_match("#\.$#", $filename)) - { - $fullName = $truePath."/".$filename; - $fileUrl = $nowPath."/".$filename; - if(is_dir($fullName)) - { - if($col % $listSize == 0 && $col != 0) - { - echo("\n\n"); - for($i=$rowdd-$listSize; $i<$rowdd; $i++) - { - echo("".$filelist[$i]."\n"); - } - echo("\n\n"); - } - $line = " - - -
- - -
"; - $filelist[$rowdd] = $filename; - $col++; - $rowdd++; - echo $line; - } - else if(IsImg($filename)) - { - if($col%$listSize==0&&$col!=0) - { - echo("\n\n"); - for($i=$rowdd-$listSize;$i<$rowdd;$i++) - { - echo("".$filelist[$i]."\n"); - } - echo("\n\n"); - } - $line = " - - - - -
- ".GetImgFile($truePath,$nowPath,$filename)." -
"; - $filelist[$rowdd] = $filename; - $col++; - $rowdd++; - echo $line; - } - } - } - echo("\n"); - if(!empty($filelist)) - { - echo("\n"); - $t = ($rowdd-1)%$listSize; - if($t==0) - { - $t=$listSize; - } - for($i=$rowdd-$t;$i<$rowdd;$i++) - { - echo("".$filelist[$i]."\n"); - } - echo("\n"); - } -} - -/** - * 获取图片文件 - * - * @access public - * @param string $truePath 真实地址 - * @param string $nowPath 当前地址 - * @param string $fileName 文件名称 - * @return string - */ -function GetImgFile($truePath, $nowPath, $fileName) -{ - $toW=102; - $toH=102; - $srcFile = $truePath."/".$fileName; - $info = ""; - $data = GetImageSize($srcFile, $info); - $srcW=$data[0]; - $srcH=$data[1]; - if($toW>=$srcW&&$toH>=$srcH) - { - $ftoW=$srcW; - $ftoH=$srcH; - } - else - { - $toWH=$toW / $toH; - $srcWH=$srcW / $srcH; - if($toWH<=$srcWH) - { - $ftoW=$toW; - $ftoH=$ftoW*($srcH/$srcW); - } - else - { - $ftoH=$toH; - $ftoW=$ftoH*($srcW/$srcH); - } - } - return(""); -} - -function IsImg($fileName) -{ - if(preg_match("#\.(jpg|gif|png)$#", $fileName)) return 1; - else return 0; -} \ No newline at end of file diff --git a/src/dede/freelist_add.php b/src/dede/freelist_add.php index 1ee479c6..9da25d45 100755 --- a/src/dede/freelist_add.php +++ b/src/dede/freelist_add.php @@ -5,6 +5,7 @@ * @version $Id: freelist_add.php 1 8:48 2010年7月13日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ diff --git a/src/dede/freelist_edit.php b/src/dede/freelist_edit.php index 3cf1c687..fbe3e5bd 100755 --- a/src/dede/freelist_edit.php +++ b/src/dede/freelist_edit.php @@ -5,6 +5,7 @@ * @version $Id: freelist_edit.php 1 8:48 2010年7月13日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ diff --git a/src/dede/freelist_main.php b/src/dede/freelist_main.php index 3c6275ad..e204b3df 100755 --- a/src/dede/freelist_main.php +++ b/src/dede/freelist_main.php @@ -5,6 +5,7 @@ * @version $Id: freelist_main.php 1 8:48 2010年7月13日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -40,7 +41,7 @@ if($dopost=='getlist') else if($dopost=='del') { $aid = preg_replace("#[^0-9]#", "", $aid); - $dsql->ExecuteNoneQuery("DELETE FROM #@__freelist WHERE aid='$aid'; "); + $dsql->ExecuteNoneQuery("DELETE FROM `#@__freelist` WHERE aid='$aid'; "); AjaxHead(); GetTagList($dsql,$pageno,$pagesize,$orderby); exit(); @@ -49,7 +50,7 @@ else if($dopost=='del') //第一次进入这个页面 if($dopost=='') { - $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM #@__freelist $addsql "); + $row = $dsql->GetOne("SELECT COUNT(*) AS dd FROM `#@__freelist` $addsql "); $totalRow = $row['dd']; include(DEDEADMIN."/templets/freelist_main.htm"); } @@ -88,9 +89,9 @@ function GetTagList($dsql,$pageno,$pagesize,$orderby='aid') {$row['templet']} {$row['click']} ".MyDate("y-m-d",$row['edtime'])." - 更改 | - 更新 | - 删除 + 更改 | + 更新 | + 删除 "; echo $line; diff --git a/src/dede/inc/inc_action_info.php b/src/dede/inc/inc_action_info.php index 11a5376f..12719355 100755 --- a/src/dede/inc/inc_action_info.php +++ b/src/dede/inc/inc_action_info.php @@ -5,6 +5,7 @@ * @version $Id: inc_action_info.php 2 14:55 2010-11-11 tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -398,12 +399,6 @@ $actionSearch[10] = array( 'purview' =>'sys_Log', 'linkurl' =>'log_list.php' ), - 4 => array( - 'title' =>'验证安全设置', - 'description' =>'对验证码和验证问题进行设置', - 'purview' =>'sys_safe.php', - 'linkurl' =>'sys_verify' - ), 5 => array( 'title' =>'图片水印设置', 'description' =>'对于上传的图片添加的水印进行配置', diff --git a/src/dede/inc/inc_archives_functions.php b/src/dede/inc/inc_archives_functions.php index 6a16f02c..af243750 100755 --- a/src/dede/inc/inc_archives_functions.php +++ b/src/dede/inc/inc_archives_functions.php @@ -5,6 +5,7 @@ * @version $Id: inc_archives_functions.php 1 9:56 2010年7月21日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -13,7 +14,7 @@ require_once(DEDEINC.'/image.func.php'); require_once(DEDEINC.'/archives.func.php'); require_once(DEDEINC.'/arc.partview.class.php'); $backurl = !empty($_COOKIE['ENV_GOBACK_URL']) ? $_COOKIE['ENV_GOBACK_URL'] : ''; -$backurl = preg_match("#content_#", $backurl) ? "[记忆的列表页]  " : ''; +$backurl = preg_match("#content_#", $backurl) ? "记忆的列表页  " : ''; if(!isset($_NOT_ARCHIVES)) { require_once(DEDEINC.'/customfields.func.php'); diff --git a/src/dede/inc/inc_menu.php b/src/dede/inc/inc_menu.php index 58d818c8..9a809313 100755 --- a/src/dede/inc/inc_menu.php +++ b/src/dede/inc/inc_menu.php @@ -62,7 +62,6 @@ $adminMenu2 = " - diff --git a/src/dede/inc/inc_menu_map.php b/src/dede/inc/inc_menu_map.php index cf240409..f898d493 100755 --- a/src/dede/inc/inc_menu_map.php +++ b/src/dede/inc/inc_menu_map.php @@ -115,7 +115,6 @@ $menusMain = " - diff --git a/src/dede/index_menu_module.php b/src/dede/index_menu_module.php index 91dbd629..b7791d18 100755 --- a/src/dede/index_menu_module.php +++ b/src/dede/index_menu_module.php @@ -2,9 +2,10 @@ /** * 快捷发布菜单 * - * @version $Id: file_pic_view.php 1 23:44 2011/2/16 tianya $ + * @version $Id: index_memnu_module.php 1 23:44 2011/2/16 tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ diff --git a/src/dede/js/list.js b/src/dede/js/list.js index 1a383bc2..c853f582 100755 --- a/src/dede/js/list.js +++ b/src/dede/js/list.js @@ -69,7 +69,7 @@ function delArc(aid){ function QuickEdit(aid, e, obj) { - LoadQuickDiv(e, 'archives_do.php?dopost=quickEdit&aid='+aid+'&rnd='+Math.random(), 'quickEdit', '450px', '300px'); + LoadQuickDiv(e, 'archives_do.php?dopost=quickEdit&aid='+aid+'&rnd='+Math.random(), 'quickEdit', 'auto', '300px'); ChangeFullDiv('show'); } //上下文菜单 diff --git a/src/dede/js/main.js b/src/dede/js/main.js index 1bbec8dc..3e532a6b 100755 --- a/src/dede/js/main.js +++ b/src/dede/js/main.js @@ -47,24 +47,24 @@ function ShowColor(e, o) { function ShowHide(objname) { var obj = $Obj(objname); if (obj.style.display != "none") obj.style.display = "none"; - else obj.style.display = "block"; + else obj.style.display = "inline-block"; } function ShowHideT(objname) { var obj = $Obj(objname); if (obj.style.display != "none") obj.style.display = "none"; - else obj.style.display = ($Nav() == "IE" ? "block" : "table"); + else obj.style.display = ($Nav() == "IE" ? "inline-block" : "table"); } function ShowObj(objname) { var obj = $Obj(objname); if (obj == null) return false; - obj.style.display = ($Nav() == "IE" ? "block" : "table"); + obj.style.display = ($Nav() == "IE" ? "inline-block" : "table"); } function ShowObjRow(objname) { var obj = $Obj(objname); - obj.style.display = ($Nav() == "IE" ? "block" : "table-row"); + obj.style.display = ($Nav() == "IE" ? "inline-block" : "table-row"); } function AddTypeid2() { @@ -244,7 +244,7 @@ function ChangeFullDiv(showhide, screenheigt) { newobj.id = 'fullpagediv'; newobj.style.position = 'absolute'; newobj.className = 'fullpagediv'; - newobj.style.height = screenheigt + 'px'; + newobj.style.height = document.body.clientHeight + 50 + 'px'; document.body.appendChild(newobj); } else { @@ -354,6 +354,7 @@ function CkRemote() { //载入指定宽高的AJAX窗体 function LoadQuickDiv(e, surl, oname, w, h) { + console.log(e); if ($Nav() == 'IE') { if (window.event) { var posLeft = window.event.clientX - 20; @@ -381,11 +382,12 @@ function LoadQuickDiv(e, surl, oname, w, h) { newobj.style.position = 'absolute'; newobj.className = 'pubdlg'; newobj.style.width = w; - newobj.style.height = h; + newobj.style.height = h+30; document.body.appendChild(newobj); } if (posTop > 500) posTop = 500; if (posLeft < 50) posLeft = 50; + newobj.style.minWidth = "450px"; newobj.style.top = posTop + "px"; newobj.style.left = posLeft + "px"; newobj.innerHTML = '
Loading...
'; @@ -621,7 +623,7 @@ args = { // 这里用到了一个展开语法 // https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Operators/Spread_syntax function ShowMsg(content, ...args) { - title = "DedeCMS"; + title = "DedeCMS信息提示"; if (typeof content == "undefined") content = ""; modalID = guid(); var footer = ``; @@ -792,6 +794,7 @@ $(document).ready(function () { "timePicker24Hour": true, "timePickerSeconds": true, "showCustomRangeLabel": false, + "drops": "up", ranges: { '今日': [moment(), moment()], '昨日': [moment().subtract(1, 'days'), moment().subtract(1, 'days')], @@ -810,6 +813,14 @@ $(document).ready(function () { }, function (start) { $(this).val(start.format("YYYY-MM-DD HH:mm:ss")); }); + $('.datepicker').on('show.daterangepicker', function(ev, picker) { + if (picker.element.offset().top - $(window).scrollTop() + picker.container.outerHeight() > $(window).height()) { + picker.drops = 'up'; + } else { + picker.drops = 'down'; + } + picker.move(); + }) } diff --git a/src/dede/search_keywords_main.php b/src/dede/search_keywords_main.php index 306e04af..68950881 100755 --- a/src/dede/search_keywords_main.php +++ b/src/dede/search_keywords_main.php @@ -5,6 +5,7 @@ * @version $Id: search_keywords_main.php 1 15:46 2010年7月20日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -74,7 +75,7 @@ function GetKeywordList($dsql,$pageno,$pagesize,$orderby='aid') 选择 ID 关键字 - 分词结果 + 分词结果 频率 结果 最后搜索时间 @@ -98,8 +99,8 @@ function GetKeywordList($dsql,$pageno,$pagesize,$orderby='aid') {$row['result']} ".MyDate("Y-m-d H:i:s",$row['lasttime'])." - 更新 | - 删除 + 更新 | + 删除 "; @@ -107,9 +108,9 @@ function GetKeywordList($dsql,$pageno,$pagesize,$orderby='aid') } echo " - 反选 - 取消 - 删除 + 反选 + 取消 + 删除 \r\n"; echo "\r\n"; diff --git a/src/dede/soft_add.php b/src/dede/soft_add.php index e26d5ab3..9f6c8d4b 100755 --- a/src/dede/soft_add.php +++ b/src/dede/soft_add.php @@ -5,6 +5,7 @@ * @version $Id: soft_add.php 1 16:09 2010年7月20日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -298,15 +299,15 @@ else if($dopost=='save') //返回成功信息 $msg = " 　　请选择你的后续操作： - 继续发布软件 + 继续发布软件    - 查看软件 + 查看软件    - 更改软件 + 更改软件    - 已发布软件管理 + 已发布软件管理    - 网站栏目管理 + 网站栏目管理 "; $msg = "
{$msg}
".GetUpdateTest(); diff --git a/src/dede/soft_edit.php b/src/dede/soft_edit.php index 18642237..2bef6724 100755 --- a/src/dede/soft_edit.php +++ b/src/dede/soft_edit.php @@ -5,6 +5,7 @@ * @version $Id: soft_edit.php 1 16:09 2010年7月20日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -64,7 +65,7 @@ if($dopost!='save') { $islocal = $ctag->GetAtt('islocal'); if($islocal != 1) $needmsg = "删除"; - else $needmsg = ''; + else $needmsg = ''; $nForm .= "
软件地址{$newRowStart}： 服务器名称： @@ -322,15 +323,15 @@ else if($dopost=='save') //返回成功信息 $msg = " 　　请选择你的后续操作： - 发布新软件 + 发布新软件    - 继续修改 + 继续修改    - 查看软件 + 查看软件    - 已发布软件管理 + 已发布软件管理    - 网站栏目管理 + 网站栏目管理 "; $wintitle = "成功修改一个软件！"; $wecome_info = "文章管理::修改软件"; diff --git a/src/dede/spec_add.php b/src/dede/spec_add.php index 0800efb7..0e90c600 100755 --- a/src/dede/spec_add.php +++ b/src/dede/spec_add.php @@ -5,6 +5,7 @@ * @version $Id: spec_add.php 1 16:22 2010年7月20日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -230,11 +231,11 @@ else if($dopost=='save') //返回成功信息 $msg = " 　　请选择你的后续操作： - 创建新专题 + 创建新专题    - 查看专题 + 查看专题    - 已发布专题管理 + 已发布专题管理 "; $wintitle = "成功创建专题！"; $wecome_info = "文章管理::发布专题"; diff --git a/src/dede/spec_edit.php b/src/dede/spec_edit.php index 8110b543..57c56638 100755 --- a/src/dede/spec_edit.php +++ b/src/dede/spec_edit.php @@ -5,6 +5,7 @@ * @version $Id: spec_edit.php 1 16:22 2010年7月20日Z tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ @@ -273,13 +274,13 @@ else if($dopost=='save') ClearMyAddon($id, $title); //返回成功信息 $msg = "　　请选择你的后续操作： - 发布新专题 + 发布新专题    - 查看更改 + 查看更改    - 查看专题 + 查看专题    - 已发布专题管理 "; + 已发布专题管理 "; $wintitle = "成功更改一个专题！"; $wecome_info = "专题管理::更改专题"; $win = new OxWindow(); diff --git a/src/dede/stepselect_main.php b/src/dede/stepselect_main.php index dfc6db5a..3960f728 100755 --- a/src/dede/stepselect_main.php +++ b/src/dede/stepselect_main.php @@ -5,6 +5,7 @@ * @version $Id: stepselect_main.php 2 13:23 2011-3-24 tianya $ * @package DedeCMS.Administrator * @copyright Copyright (c) 2007 - 2020, DesDev, Inc. + * @copyright Copyright (c) 2020, DedeBIZ.COM * @license http://help.dedecms.com/usersguide/license.html * @link http://www.dedecms.com */ diff --git a/src/dede/sys_safe.php b/src/dede/sys_safe.php deleted file mode 100755 index d743726b..00000000 --- a/src/dede/sys_safe.php +++ /dev/null @@ -1,76 +0,0 @@ -\r\n"; - - $fp = fopen($safeconfigfile, "w") or die("写入文件 $safeconfigfile 失败，请检查权限！"); - fwrite($fp, $configstr); - fclose($fp); - ShowMsg("修改配置成功！","sys_safe.php"); - exit; -} - -require_once($safeconfigfile); -$safefaqs = unserialize($safe_faqs); -include DedeInclude('templets/sys_safe.htm'); \ No newline at end of file diff --git a/src/dede/templets/album_add.htm b/src/dede/templets/album_add.htm index 78f18e8a..ec356b0e 100755 --- a/src/dede/templets/album_add.htm +++ b/src/dede/templets/album_add.htm @@ -54,11 +54,6 @@ img { vertical-align: baseline; } - - input, - select { - height: auto !important; - } @@ -72,12 +67,12 @@ - +
- +
 图集列表 >> 发布新图集[栏目管理] 栏目管理 
@@ -131,9 +126,9 @@ while($trow = $dsql->GetObject()) { if($trow->att=='j') - echo "{$trow->attname}[{$trow->att}]"; + echo " "; else - echo "{$trow->attname}[{$trow->att}]"; + echo " "; } ?> @@ -178,21 +173,20 @@
- - 远程 - + + + 选择图片 -
- 使用图集的第一幅图 - +
@@ -224,7 +218,7 @@ 【选择副栏目】"; + echo "选择副栏目"; } ?> @@ -317,11 +311,11 @@  上传方式： - - 手工上传 - + 手工上传 + @@ -333,8 +327,8 @@  压缩包文件： - + 处理后删除压缩文件 @@ -366,7 +360,7 @@  手工上传： - + 选择本地图片（支持多选） @@ -408,11 +402,11 @@  图集来源： - + 作　者： - + @@ -424,11 +418,11 @@  评论选项： - />允许评论 +   - />禁止评论 + 浏览次数： @@ -456,7 +450,7 @@ 标题颜色： - + @@ -479,10 +473,10 @@ 发布选项： - - 生成HTML - - 仅动态浏览 + + @@ -510,9 +504,9 @@ - +
 关键字：
@@ -521,7 +515,7 @@ - + @@ -532,7 +526,7 @@
 图集内容摘要： 图集内容摘要：  
- + @@ -541,7 +535,7 @@
 自定义文件名： 自定义文件名： （不包括后缀名如.html等）  
+ style="border:1px solid #cfcfcf;border-top:none;" class="mb-3"> @@ -318,7 +319,7 @@ if($cfg_need_typeid2=='Y') { @@ -326,7 +327,7 @@ if($cfg_need_typeid2=='Y') { @@ -478,7 +479,7 @@ if($cfg_need_typeid2=='Y') {
@@ -550,13 +544,11 @@ @@ -286,10 +287,10 @@ if($cfg_need_typeid2=='Y') { ?> - +
- -
- + + - + +
diff --git a/src/dede/templets/album_edit.htm b/src/dede/templets/album_edit.htm index cde127e0..59dd89f5 100755 --- a/src/dede/templets/album_edit.htm +++ b/src/dede/templets/album_edit.htm @@ -7,6 +7,7 @@ body { background-image: url(images/allbg.gif); } + @@ -58,9 +59,8 @@ body { vertical-align: baseline; } - input, - select { - height: auto !important; + .albEdit { + height: auto; } @@ -72,10 +72,10 @@ body { - +
- +
 &dopost=listArchives">图集列表 >> 更改图集[栏目管理] 栏目管理 
@@ -121,9 +121,9 @@ body { if($trow->att=='j') $jumpclick = " onclick='ShowUrlTr()'"; else $jumpclick = ''; if(preg_match("#".$trow->att."#", $arcRow['flag'])) - echo "{$trow->attname}[{$trow->att}]"; + echo " "; else - echo "{$trow->attname}[{$trow->att}]"; + echo " "; } ?> @@ -154,16 +154,16 @@ body { @@ -237,11 +237,12 @@ if($cfg_need_typeid2=='Y') {  评论选项： - + @@ -265,7 +266,7 @@ if($cfg_need_typeid2=='Y') { +
 缩 略 图：
 "> - - 远程 - + value=""> + + 选择图片 - /> - 允许评论 + +   - /> - 禁止评论 浏览次数： ' style='width:100px;' />
标题颜色： "> -
发布选项：> - 生成HTML - > - 仅动态浏览 +
- +
 图集内容摘要： 图集内容摘要：
- + @@ -355,7 +356,7 @@ if($cfg_need_typeid2=='Y') { '> @@ -405,9 +406,9 @@ if($cfg_need_typeid2=='Y') { + +
 自定义文件名： 自定义文件名： " /> （不包括后缀名如.html等）  
- +
 多列式参数： 多列式参数： 行 列 @@ -393,10 +394,10 @@ if($cfg_need_typeid2=='Y') {
 上传方式： - - 手工上传 - - 从ZIP压缩包中解压图片 + +
 压缩包文件： - - - 处理后删除压缩文件
 增加新图片： - + 选择本地图片（支持多选） @@ -496,15 +497,16 @@ if($cfg_need_typeid2=='Y') {
- +
@@ -351,10 +351,10 @@ + +
diff --git a/src/dede/templets/archives_add.htm b/src/dede/templets/archives_add.htm index 0f9a9da5..4fd2b6fa 100755 --- a/src/dede/templets/archives_add.htm +++ b/src/dede/templets/archives_add.htm @@ -26,11 +26,11 @@ @@ -328,7 +328,7 @@ +
  - - + +
标题颜色： -
发布选项： - - 生成HTML - - 仅动态浏览
@@ -381,11 +381,12 @@  关键字： -
+ + @@ -405,7 +406,7 @@ - + @@ -425,12 +426,10 @@
 自定义文件名： 自定义文件名： （不包括后缀名如.html等）  
- + - +
diff --git a/src/dede/templets/archives_edit.htm b/src/dede/templets/archives_edit.htm index 2fb9137c..523816a0 100755 --- a/src/dede/templets/archives_edit.htm +++ b/src/dede/templets/archives_edit.htm @@ -24,11 +24,11 @@ + - @@ -417,11 +417,9 @@ if($cfg_need_typeid2=='Y') { - +
- +
diff --git a/src/dede/templets/archives_sg_add.htm b/src/dede/templets/archives_sg_add.htm index e83c4207..93c93d3c 100755 --- a/src/dede/templets/archives_sg_add.htm +++ b/src/dede/templets/archives_sg_add.htm @@ -10,12 +10,12 @@ body { background-image: url(images/allbg.gif); } + - @@ -23,11 +23,11 @@ body { background-image: url(images/allbg.gif); } function checkSubmit() { if(document.form1.title.value==""){ - alert("不能为空！"); + ShowMsg("不能为空！"); return false; } if(document.form1.typeid.value==0){ - alert("请选择档案的主栏目！"); + ShowMsg("请选择档案的主栏目！"); return false; } } @@ -44,10 +44,11 @@ function checkSubmit() - +
- - + +
 文档列表 >> 发布文档  [栏目管理]   + 文档列表 >> 发布文档  栏目管理  
@@ -94,7 +95,7 @@ function checkSubmit() $dsql->Execute(); while($trow = $dsql->GetObject()) { - echo "{$trow->attname}[{$trow->att}]"; + echo " "; } ?> @@ -112,15 +113,15 @@ function checkSubmit() - - 远程 - + + + 选择图片 - @@ -180,8 +181,8 @@ function checkSubmit() echo ""; ?> 快捷选择 -  【栏目管理】 -  【增加大栏目】 +  栏目管理 +  增加大栏目 @@ -192,7 +193,7 @@ function checkSubmit() - +
@@ -130,16 +130,16 @@ function checkSubmit()  
@@ -200,11 +201,11 @@ function checkSubmit() diff --git a/src/dede/templets/archives_sg_edit.htm b/src/dede/templets/archives_sg_edit.htm index ff65a6f9..aead5cf4 100755 --- a/src/dede/templets/archives_sg_edit.htm +++ b/src/dede/templets/archives_sg_edit.htm @@ -23,7 +23,7 @@ body { background-image: url(images/allbg.gif); } function checkSubmit() { if(document.form1.title.value==""){ - alert("不能为空！"); + ShowMsg("不能为空！"); document.form1.title.focus(); return false; } @@ -41,11 +41,11 @@ function checkSubmit() -
  - -
- + + - + +
+
- +
 文档列表 >> 更改文档  [栏目管理]   栏目管理
@@ -89,9 +89,9 @@ function checkSubmit() while($trow = $dsql->GetObject()) { if(preg_match("#".$trow->att."#", $addRow['flag'])) - echo "{$trow->attname}[{$trow->att}]"; + echo " "; else - echo "{$trow->attname}[{$trow->att}]"; + echo " "; } ?> 		"> - - 远程 - + value=""> + + 选择图片 - @@ -187,7 +187,7 @@ function checkSubmit()
- +
@@ -195,9 +195,9 @@ function checkSubmit() diff --git a/src/dede/templets/article_add.htm b/src/dede/templets/article_add.htm index 42c2a559..6c2dc6d3 100755 --- a/src/dede/templets/article_add.htm +++ b/src/dede/templets/article_add.htm @@ -64,12 +64,12 @@ -
  - - +
- + +
+
- +
 文章列表 >> 发布文章  [栏目管理]   栏目管理
@@ -79,14 +79,14 @@ - +
 常规信息 　●输入网址采集单个网页>>单页采集...
- +
@@ -143,9 +143,9 @@ while($trow = $dsql->GetObject()) { if($trow->att=='j') - echo "{$trow->attname}[{$trow->att}]"; + echo " "; else - echo "{$trow->attname}[{$trow->att}]"; + echo " "; } ?> @@ -189,15 +189,15 @@ +
- - 远程 - + + + 选择图片 - @@ -220,11 +220,11 @@ - 作　者： - +
@@ -250,7 +250,7 @@ 【选择副栏目】"; + echo "选择副栏目"; } ?> @@ -279,11 +279,11 @@  关键字： - +
@@ -308,12 +308,10 @@
 文章内容：
- +
- +
@@ -323,18 +321,18 @@  附加选项： - /> - 下载远程图片和资源 - +