+
+
+
+
+
+
+
+
+
+
+
+
+ {lang board_message} {lang appdefault_board_message_text}
+
+
+ -
+
- 忽略版本限制 +
- +
+
+
+
+
+
+
+ {lang board_message}
+ {lang manual_install_tip}
+
+
+
+
+
+
+
+
+
+
+
+ $multi
+
+ | {lang application_name} | +{lang version} | +{lang label} | +{lang big_small} | +{lang operation} | +
|---|---|---|---|---|
|
+ {eval echo $value['desc_short']?$value['desc_short']:lang('none');}
+
+
+
+ |
+ $value[version] | +{$value['classid_name']} |
+ {eval echo formatsize($value['packagesize']);} | ++ + + + + + + + + + + {lang view_detail} + + + | +
+
+
+
+
\ No newline at end of file
diff --git a/admin/appmarket/template/lyear/edit.htm b/admin/appmarket/template/lyear/edit.htm
new file mode 100644
index 0000000..7d4da39
--- /dev/null
+++ b/admin/appmarket/template/lyear/edit.htm
@@ -0,0 +1,413 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/appmarket/template/lyear/import.htm b/admin/appmarket/template/lyear/import.htm
new file mode 100644
index 0000000..fc7983c
--- /dev/null
+++ b/admin/appmarket/template/lyear/import.htm
@@ -0,0 +1,84 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/appmarket/template/lyear/index.htm b/admin/appmarket/template/lyear/index.htm
new file mode 100644
index 0000000..4b45bb6
--- /dev/null
+++ b/admin/appmarket/template/lyear/index.htm
@@ -0,0 +1,225 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/appmarket/template/lyear/lyear_header_search.htm b/admin/appmarket/template/lyear/lyear_header_search.htm
new file mode 100644
index 0000000..d73955b
--- /dev/null
+++ b/admin/appmarket/template/lyear/lyear_header_search.htm
@@ -0,0 +1,68 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/appmarket/upgrade_app_ajax.php b/admin/appmarket/upgrade_app_ajax.php
index bc31f95..c6cd3d4 100644
--- a/admin/appmarket/upgrade_app_ajax.php
+++ b/admin/appmarket/upgrade_app_ajax.php
@@ -16,7 +16,7 @@ include_once libfile('function/admin');
include_once libfile('function/cache');
include_once libfile('function/appmarket');
$step = intval($_GET['step']);
-$op = $_GET['op'];
+$op = isset($_GET['op']) ? $_GET['op'] : '';
$step = $step ? $step : 1;
$operation = $_GET['operation'] ? trim($_GET['operation']) : 'upgrade';
header('Content-type:text/json');
diff --git a/admin/cloud/edit.php b/admin/cloud/edit.php
index 87f67c6..76d6002 100644
--- a/admin/cloud/edit.php
+++ b/admin/cloud/edit.php
@@ -14,7 +14,7 @@ if(!defined('IN_DZZ') || !defined('IN_ADMIN')) {
if($_GET['do']=='usercloud'){
$bz=trim($_GET['bz']);
$cloud=C::t('connect')->fetch($bz);
- $navtitle=$cloud['name'].' - '.lang('using_user');
+ $navtitle=$cloud['name'].' - '.lang('using_user').' - '.lang('cloud_set');
if(submitcheck('cloudsubmit')){
$dids=$_GET['delete'];
foreach($dids as $id){
@@ -68,7 +68,7 @@ if($_GET['do']=='usercloud'){
}else{
$bz=$_GET['bz'];
$cloud=C::t('connect')->fetch($bz);
- $navtitle=$cloud['name'].' - '.lang('set');
+ $navtitle=$cloud['name'].' - '.lang('cloud_set');
if(submitcheck('editsubmit')){
$_GET=dhtmlspecialchars($_GET);
if($cloud['type']=='pan'){
diff --git a/admin/cloud/movetool.php b/admin/cloud/movetool.php
index 4b0be02..37dc08b 100644
--- a/admin/cloud/movetool.php
+++ b/admin/cloud/movetool.php
@@ -9,7 +9,7 @@
if(!defined('IN_DZZ') || !defined('IN_ADMIN')) {
exit('Access Denied');
}
-$navtitle=lang('migration_tool');
+$navtitle=lang('dzzpan').' - '.lang('migration_tool').' - '.lang('cloud_set');
if(submitcheck('movesubmit')){
$_GET=dhtmlspecialchars($_GET);
$gets = array(
diff --git a/admin/cloud/router.php b/admin/cloud/router.php
index 46dd47c..f6857f6 100644
--- a/admin/cloud/router.php
+++ b/admin/cloud/router.php
@@ -9,7 +9,7 @@
if(!defined('IN_DZZ') || !defined('IN_ADMIN')) {
exit('Access Denied');
}
-$navtitle=lang('routing_management');
+$navtitle=lang('dzzpan').' - '.lang('routing_management').' - '.lang('cloud_set');
if(submitcheck('routersubmit')){
$_GET=dhtmlspecialchars($_GET);
$delete=$_GET['delete'];
diff --git a/admin/cloud/space.php b/admin/cloud/space.php
index c80b1e5..51f1b32 100644
--- a/admin/cloud/space.php
+++ b/admin/cloud/space.php
@@ -10,7 +10,7 @@ if(!defined('IN_DZZ') || !defined('IN_ADMIN')) {
exit('Access Denied');
}
$cloud=DB::fetch_first("select * from %t where bz='dzz'",array('connect'));
-$navtitle=$cloud['name'].' - '.lang('space_management');
+$navtitle=$cloud['name'].' - '.lang('space_management').' - '.lang('cloud_set');
if($_GET['do']=='checkspace'){
$remoteid=intval($_GET['remoteid']);
if($arr=C::t('local_storage')->update_sizecount_by_remoteid($remoteid)){
diff --git a/admin/cloud/template/lyear/cloud.htm b/admin/cloud/template/lyear/cloud.htm
new file mode 100644
index 0000000..791eff7
--- /dev/null
+++ b/admin/cloud/template/lyear/cloud.htm
@@ -0,0 +1,64 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/cloud/template/lyear/edit.htm b/admin/cloud/template/lyear/edit.htm
new file mode 100644
index 0000000..1a8dfa2
--- /dev/null
+++ b/admin/cloud/template/lyear/edit.htm
@@ -0,0 +1,293 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/appmarket/template/lyear/extopen.htm b/admin/appmarket/template/lyear/extopen.htm
new file mode 100644
index 0000000..f5e8a9b
--- /dev/null
+++ b/admin/appmarket/template/lyear/extopen.htm
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
-
+ ++
+
+ {lang delete} +
+
+
+
| + + | +
-
+
+
+
+
+
+
+
+
+
+
+
+
+ | {lang default} | +{lang application_name} | +
|---|---|
| + $key + | ++ + | +
| $multi | +|
+ {lang board_message} {lang extopen_board_message_text}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/appmarket/template/lyear/lyear_left.htm b/admin/appmarket/template/lyear/lyear_left.htm
new file mode 100644
index 0000000..486f1f9
--- /dev/null
+++ b/admin/appmarket/template/lyear/lyear_left.htm
@@ -0,0 +1,17 @@
+
\ No newline at end of file
diff --git a/admin/appmarket/template/lyear/uninstall_confirm.htm b/admin/appmarket/template/lyear/uninstall_confirm.htm
new file mode 100644
index 0000000..793dc05
--- /dev/null
+++ b/admin/appmarket/template/lyear/uninstall_confirm.htm
@@ -0,0 +1,23 @@
+
+
+
+
\ No newline at end of file
diff --git a/admin/appmarket/template/lyear/upgrade.htm b/admin/appmarket/template/lyear/upgrade.htm
new file mode 100644
index 0000000..5d1165a
--- /dev/null
+++ b/admin/appmarket/template/lyear/upgrade.htm
@@ -0,0 +1,356 @@
+
+
+
+
+
+
+
+
+ {$app['appname']}卸载
+
+
+
+ 警告
+ {$app_delete_confirm}
+
+
+
+
+
+
+
+
+
+
+
+ {lang total}$count{lang ge}{lang app}
+
+
+
+
+ {lang selected}0{lang ge}{lang app}
+ {lang update_onekey}
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+ 还没有可以升级的应用…
+ +
+ + 还没有可以升级的应用…
+ +
+
+
+
+
+
+
+
+ {lang board_message} {lang cloud_cloud_board_message_text}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {lang no_relevant_content}… +
+
+
+
+
+ + {lang no_relevant_content}… +
+
+
+
+
+
+
+
+
+ {lang board_message} {lang cloud_movetool_board_message_text}
+
+
+
+
+
+
+
+
+
+
+
+ + + + +
+-
+
- + + +
-
+ + ++
$first[attachment]
++ ++
+ - + + +
+
+ 
+
+ 
+
+
+
+ {lang board_message}{lang cloud_movetool_board_message_text1} + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/cloud/template/lyear/router.htm b/admin/cloud/template/lyear/router.htm
new file mode 100644
index 0000000..cdfaebc
--- /dev/null
+++ b/admin/cloud/template/lyear/router.htm
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {lang add_routing}
+
+
+
+ {lang board_message}{lang router_board_message_text}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {lang board_message} {lang space_board_message_text}
+
+
+
+
+
+
+
+
+
+
+ $value[header]
+-
+
+
-
+ +
+ $value1[name]
+
+
+
如果您需要强制安装本插件请在导入应用时选择忽略版本限制安装', + 'application_upgrade_version_invalid'=>'本插件适用于 Dzz! {cur_version} 与当前版本 V{set_version} 不一致。
如果您需要强制升级本插件请点击强制升级', 'add_new' => '新增', 'select' => '请选择', @@ -351,8 +256,6 @@ $lang = array 'available' => '可用', 'action' => '动作', 'ignore' => '忽略', - 'operation' => '操作', - 'operator' => '操作者', 'reason' => '原因', 'selling_price'=>'售价', 'original_price'=>'原价', @@ -368,20 +271,15 @@ $lang = array 'thread' => '帖子', 'subject' => '标题', 'nosubject' => '无标题', - 'message' => '内容', 'mergeto' => '合并到', 'doings' => '记录', 'blogs' => '日志', 'albums' => '相册', - 'shares' => '分享', 'description' => '描述', 'copyright' => '版权信息', 'attachment' => '附件', - 'rest_attachment' => '其他附件', 'file' => '文件', 'dir' => '目录', - 'ip' => 'IP 地址', - 'usergroup' => '用户组', 'according_usergroup' => '按用户组', 'usernum' => '用户数：', 'admingroup' => '管理组', @@ -393,9 +291,6 @@ $lang = array 'current_contents_without_saving'=>'当前内容没有保存，确定要离开吗？', 'mail'=>'邮件设置', - 'login_username_placeholder'=>'登录用户名', - 'login_username_text'=>'必填，可用于系统登录', - 'required_used_login_system'=>'必填，可用于系统登录', // admin/system/database.html // 'nav_db' => '数据库', 'nav_db_export' => '备份', @@ -450,11 +345,11 @@ $lang = array 'db_runquery' => '数据库升级', 'db_recover'=>'恢复数据库', - 'db_runquery_tips' => '
如果您想自己随意书写 SQL 升级语句，需要将 config/config_global.php 当中的 $_config[admincp][runquery] 设置修改为 1。
如果您想自己随意书写 SQL 升级语句，需要将 config/config.php 当中的 $_config[admincp][runquery] 设置修改为 1。
组织管理使用说明
--
-
选中机构为设置机构信息
- 
选中部门为设置部门信息
- 
选中人员为设置人员信息
- - 人员、部门、机构可直接拖拽移动更换位置。移动是更换人员所属部门、和更换部门上级机构或上级部门。 -
- 按住
键移动人员或部门为复制。用于将人员同时加入多个部门。
- - 按住 键可多选，多选后松开 键移动为批量移动。 不松开 键移动为批量复制。
-
- 在部门、机构、人员上点鼠标右键可出现右键菜单。菜单中有对应的更多操作。 -
-
',
- // admin/orguser/inport_guide.html
- 'inport_guide_download'=>'下载人员信息导入模板',
- 'inport_guide_template'=>'模板的项目会根据用户资料项的多少自动生成',
- 'inport_guide_user'=>'根据模板编辑需要人员信息表。',
- 'inport_guide_step'=>'步骤3：选择excel表',
- 'inport_guide_layout'=>'选择编辑好的人员信息表，支持 .xls、.xlsx格式',
- 'inport_guide_notice'=>'编辑人员信息表注意事项',
- 'inport_guide_notice_text'=>'删除用户说明：
--
-
- 所有机构、部门中删除用户，只是从本机构，或部门中移除，用户将不能再拥有本机构或部门的所有使用权限，不是将用户从系统中删除。 -
- 当用户没有所属机构和部门时会出现在“未加入机构用户列表”中。 “未加入机构用户列表”只有系统管理员可管理。 -
- 系统管理员在“未加入机构用户列表”中删除用户，用户会在系统中彻底删除，并且删除用户所有系统数据及保存文件。请管理员谨慎使用，确定成员要删除后再删除。 -
抱歉！您没有在此机构或部门下添加用户的权限！
可以在左侧选择有权限的部门，再重试添加
',
- 'orguser_edituser_add_user1'=>'可以在左侧选择有权限的部门，再重试添加
抱歉！您没有此用户的管理权限！
可以在左侧选择有权限管理的用户，再重试添加
',
- // admin/orguser/import.php
- 'orguser_import_user'=>'没有权限，只有系统管理员才能导入用户',
- 'orguser_import_user_table'=>'人员信息表上传未成功，请重新上传',
- 'orguser_import_xls_xlsx'=>'只允许导入xls,xlsx类型的文件',
- 'orguser_import_user_message'=>'人员信息表上传成功，正在调转到导入页面',
- 'orguser_import_tautology'=>'上传信息表未成功，请稍候重试',
- 'orguser_import_user_message_table'=>'请选择人员信息表',
- // admin/orguser/vidw.php
- 'orguser_vidw_delete'=>'可以在左侧选择有权限管理的用户，再重试添加
抱歉！您没有此部门的管理权限！
可以在左侧选择有权限管理的部门
',
// admin/setting/assistant.html
'assistant_app'=>'该应用为默认应用，可以通过它向全公司范围推送消息。如关注成功通知，公司文件，通报等。',
// admin/setting/main.html
@@ -1144,11 +948,6 @@ $lang = array
'setting_wxsyn_organization'=>'创建父机构失败，忽略',
'setting_wxsyn_synchronization1'=>'不在同步范围，已禁用',
'setting_wxsyn_synchronization2'=>'不在同步范围，忽略',
- // admin/share/share.html
- 'share_file_content'=>'好东西要晒出来，快把你的文件分享给身边的朋友们吧。',
- 'share_stop_sharing1'=>'可以在左侧选择有权限管理的部门
取消分享后，该条分享记录将被删除，将无法再访问此分享链接。
你确认要取消分享吗？
', - 'share_stop_sharing2'=>'该条分享记录将被屏蔽，将无法再访问此分享链接。
你确认要屏蔽该条分享吗？
', - 'share_stop_sharing3'=>'该条分享记录将被恢复访问。
你确认要取消屏蔽该条分享吗？
', // admin/theme/edit.html 'theme_edit_theme_name_state'=>'注意：如果您的源文件是通过 非二进制 方式上传到服务器，可能导致对比结果不准确', 'founder_upgrade_diff' => '差异', - 'founder_upgrade_normal' => '正常', 'founder_upgrade_new' => '新增', 'founder_upgrade_download_file' => '升级文件已经全部下载完毕，并存储到服务器目录: ', 'founder_upgrade_backup_file' => '继续升级，将会把现有的旧文件备份到目录: ', diff --git a/admin/login/images/adminlogin.css b/admin/login/images/adminlogin.css index 38e6db2..dbb5796 100644 --- a/admin/login/images/adminlogin.css +++ b/admin/login/images/adminlogin.css @@ -39,8 +39,9 @@ input:-webkit-autofill { text-align: center; } .avatarContainer img { - max-width: 128px; - max-height: 128px; + width: 128px; + height: 128px; + line-height: 128px; } .avatarContainer .maintitle{ font-size:20px; diff --git a/admin/login/login.php b/admin/login/login.php index 1af9c59..56fa417 100644 --- a/admin/login/login.php +++ b/admin/login/login.php @@ -128,45 +128,47 @@ function html_login_form() { $loginuser = $isguest ? '' : '
' . $_G['member']['username'] . '
' . $_G['member']['email'] . '
';
$sid = getglobal('sid');
$avatarstatus=getglobal('avatarstatus','member');
+ $avastar = '';
if(!$uid){
if($_G['setting']['bbclosed']){
$sitelogo = 'static/image/common/logo.png';
}else{
$sitelogo=$_G['setting']['sitelogo']?'index.php?mod=io&op=thumbnail&size=small&path='.dzzencode('attach::'.$_G['setting']['sitelogo']):'static/image/common/logo.png';
}
+ $avastar=''.$maintitle.'
';
$extra = BASESCRIPT . '?' . $_SERVER['QUERY_STRING'];
$forcesecques = '';
- echo <<
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {lang no_relevant_content}… +
+
+ + {lang no_relevant_content}… +
+
+
+
+
+
+
+
+
+ -
+ {lang verifyset_members_verify_text}
+
+
+
+
+
+
+
+
+
+
+
+
+ 
' . $value['username'] . ''; + $value['username'] = ''.avatar_block($value['uid']).'
' . $value['username'] . ''; + if ($anchor != 'pass') { $fields = $anchor != 'pass' ? dunserialize($value['field']) : $_G['setting']['verify'][$vid]['field']; $value['verifytype'] = $value['verifytype'] ? $_G['setting']['verify'][$value['verifytype']]['title'] : lang('members_verify_profile'); @@ -131,18 +132,18 @@ if (!submitcheck('verifysubmit', true)) { $field = profile_show($key, $fields); } - $fieldstr .= '
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+ {lang setting_mainboard_message_state}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/setting/template/lyear/smileyedit.htm b/admin/setting/template/lyear/smileyedit.htm
new file mode 100644
index 0000000..df60371
--- /dev/null
+++ b/admin/setting/template/lyear/smileyedit.htm
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/setting/template/main.htm b/admin/setting/template/main.htm
index 825691c..d99b1d2 100644
--- a/admin/setting/template/main.htm
+++ b/admin/setting/template/main.htm
@@ -324,6 +324,24 @@
>{lang no}
{lang setting_main_leave}
-->
+
-
+
@@ -594,17 +611,13 @@
diff --git a/admin/setting/wxsyn.php b/admin/setting/wxsyn.php
index d03cb2f..3eeef85 100644
--- a/admin/setting/wxsyn.php
+++ b/admin/setting/wxsyn.php
@@ -12,8 +12,8 @@ if (!defined('IN_DZZ') || !defined('IN_ADMIN')) {
//error_reporting(E_ALL);
include_once libfile('function/organization');
$navtitle = lang('data_synchronization');
-$do = $_GET['do'];
-$op = $_GET['op']?$_GET['op']:' ';
+$do = isset($_GET['do']) ? $_GET['do'] : '';
+$op = isset($_GET['op']) ? $_GET['op'] : '';
if (submitcheck('synsubmit')) {
}
diff --git a/admin/setting/wxsyn_down.php b/admin/setting/wxsyn_down.php
index 8c47b87..4ec86a1 100644
--- a/admin/setting/wxsyn_down.php
+++ b/admin/setting/wxsyn_down.php
@@ -12,8 +12,8 @@ if (!defined('IN_DZZ') || !defined('IN_ADMIN')) {
require_once libfile('function/user', '', 'user');
include_once libfile('function/organization');
$navtitle = lang('data_synchronization');
-$do = $_GET['do'];
-$op = $_GET['op']?$_GET['op']:' ';
+$do = isset($_GET['do']) ? $_GET['do'] : '';
+$op = isset($_GET['op']) ? $_GET['op'] : '';
if (submitcheck('synsubmit')) {
}
diff --git a/admin/share/index.php b/admin/share/index.php
deleted file mode 100644
index 2809926..0000000
--- a/admin/share/index.php
+++ /dev/null
@@ -1,78 +0,0 @@
- lang('been_blocked'), '-3' => lang('file_been_deleted'), '-2' => lang('degree_exhaust'), '-1' => lang('logs_invite_status_4'), '0' => lang('founder_upgrade_normal'));
-$sharestatus = array('-5'=>lang('sharefile_isdeleted_or_positionchange'),'-4' => lang('been_blocked'), '-3' => lang('file_been_deleted'), '-2' => lang('degree_exhaust'), '-1' => lang('logs_invite_status_4'), '0' => lang('founder_upgrade_normal'));
-$typearr = array('folder' => lang('catalogue'), 'image' => lang('photo'), 'document' => lang('type_attach'), 'dzzdoc' => 'Dzz'.lang('type_attach'), 'video' => lang('type_video'), 'attach' => lang('attachment'), 'link' => lang('type_link'), 'url' => lang('other'));
-$type = trim($_GET['type']);
-$keyword = trim($_GET['keyword']);
-$username = trim($_GET['username']);
-$asc = isset($_GET['asc']) ? intval($_GET['asc']) : 1;
-$uid = intval($_GET['uid']);
-$order = in_array($_GET['order'], array('title', 'dateline', 'type', 'size', 'count')) ? trim($_GET['order']) : 'dateline';
-$page = empty($_GET['page']) ? 1 : intval($_GET['page']);
-$perpage = 20;
-$start = ($page - 1) * $perpage;
-$gets = array('mod' => 'share', 'type' => $type, 'keyword' => $keyword, 'order' => $order, 'asc' => $asc, 'uid' => $uid, 'username' => $username);
-$theurl = BASESCRIPT . "?" . url_implode($gets);
-$orderby = " order by $order " . ($asc ? 'DESC' : '');
-
-$sql = "1";
-$param = array('shares');
-if ($type) {
- $sql .= " and type=%s";
- $param[] = $type;
- $navtitle=$typearr[$type].' - '.lang('appname');
-}else{
- $navtitle= lang('appname');
-}
-if ($keyword) {
- $sql .= " and title LIKE %s";
- $param[] = '%' . $keyword . '%';
-}
-if ($username) {
- $sql .= " and username=%s";
- $param[] = $username;
-}
-if ($uid) {
- $sql .= " and uid=%d";
- $param[] = $uid;
-}
-$list = array();
-if ($count = DB::result_first("SELECT COUNT(*) FROM %t WHERE $sql", $param)) {
- $list = DB::fetch_all("SELECT * FROM %t WHERE $sql $orderby limit $start,$perpage", $param);
- foreach ($list as $k=> $value) {
- $value['sharelink'] = C::t('shorturl')->getShortUrl(getglobal('siteurl').'index.php?mod=shares&sid='.dzzencode($value['id']));
- if ($value['dateline'])
- $value['fdateline'] = dgmdate($value['dateline']);
- if ($value['password'])
- $value['password'] = dzzdecode($value['password']);
- if ($value['endtime'])
- $value['fendtime'] = dgmdate($value['endtime'], 'Y-m-d');
- $value['fsize'] = formatsize($value['size']);
- $value['ftype'] = getFileTypeName($value['type'], $value['ext']);
- if ($value['type'] == 'folder')
- $value['img'] = 'dzz/images/extimg/folder.png';
- if ($value['img'])
- $value['img'] = str_replace('dzz/images/extimg/', 'dzz/images/extimg_small/', $value['img']);
- if ($value['type'] == 'image' && $value['status'] == -3)
- $value['img'] = '';
- $value['fstatus'] = $sharestatus[$value['status']];
- if (is_file($_G['setting']['attachdir'] . './qrcode/' . $value['sid'][0] . '/' . $value['sid'] . '.png'))
- $value['qrcode'] = $_G['setting']['attachurl'] . './qrcode/' . $value['sid'][0] . '/' . $value['sid'] . '.png';
- $value['shareurl'] = $_G['siteurl'] . 's.php?sid=' . $value['sid'];
- $list[$k] = $value;
- }
- $multi = multi($count, $perpage, $page, $theurl, 'pull-right');
-}
-include template('share');
-?>
diff --git a/admin/share/language/zh-cn/lang.php b/admin/share/language/zh-cn/lang.php
deleted file mode 100644
index e46047c..0000000
--- a/admin/share/language/zh-cn/lang.php
+++ /dev/null
@@ -1,6 +0,0 @@
-'分享管理'
-);
-
-?>
\ No newline at end of file
diff --git a/admin/system/cron.php b/admin/system/cron.php
index 79c7ae6..25d59fc 100644
--- a/admin/system/cron.php
+++ b/admin/system/cron.php
@@ -12,8 +12,8 @@ if (!defined('IN_DZZ') || !defined('IN_ADMIN')) {
include_once libfile('function/cache');
//error_reporting(E_ALL);
-$op = $_GET['op'];
-$navtitle = lang('cron') . ' - ' . lang('admin_navtitle');
+$op = isset($_GET['op']) ? $_GET['op'] : '';
+$navtitle = lang('cron') . ' - ' . lang('appname');
if (empty($_GET['edit']) && empty($_GET['run'])) {
if (!submitcheck('cronssubmit')) {
@@ -31,7 +31,7 @@ if (empty($_GET['edit']) && empty($_GET['run'])) {
} else {
$cron['time'] = lang('per_hour');
}
- $cron['time'] .= $cron['hour'] >= 0 && $cron['hour'] < 24 ? sprintf('%02d', $cron[hour]) . lang('timeliness') : '';
+ $cron['time'] .= $cron['hour'] >= 0 && $cron['hour'] < 24 ? sprintf('%02d', $cron['hour']) . lang('timeliness') : '';
if (!in_array($cron['minute'], array(-1, ''))) {
foreach ($cron['minute'] = explode("\t", $cron['minute']) as $k => $v) {
$cron['minute'][$k] = sprintf('%02d', $v);
@@ -85,7 +85,7 @@ if (empty($_GET['edit']) && empty($_GET['run'])) {
updatecache('setting');
$msg = lang('crons_succeed');
$redirecturl = BASESCRIPT . '?mod=system&op=cron';
- $msg_type = 'text-success';
+ $msg_type = 'success';
}
} else {
@@ -95,7 +95,7 @@ if (empty($_GET['edit']) && empty($_GET['run'])) {
if (!$cron) {
$msg = lang('cron_not_found');
$redirecturl = BASESCRIPT . '?mod=system&op=cron';
- $msg_type = 'text-error';
+ $msg_type = 'danger';
include template('cron');
exit();
}
@@ -107,7 +107,7 @@ if (empty($_GET['edit']) && empty($_GET['run'])) {
if (!submitcheck('editsubmit')) {
- $navtitle = lang('misc_cron_edit') . ' - ' . lang('admin_navtitle');
+ $navtitle = lang('misc_cron_edit') . ' - ' . lang('appname');
$weekdayselect = $dayselect = $hourselect = '';
@@ -158,7 +158,7 @@ if (empty($_GET['edit']) && empty($_GET['run'])) {
$msg = lang('crons_time_invalid');
}
if (!empty($msg)) {
- $msg_type = 'text-error';
+ $msg_type = 'danger';
$redirecturl = dreferer();
include template('cron');
exit();
@@ -169,7 +169,7 @@ if (empty($_GET['edit']) && empty($_GET['run'])) {
dzz_cron::run($cronid);
$msg = lang('crons_succeed');
- $msg_type = 'text-success';
+ $msg_type = 'success';
$redirecturl = BASESCRIPT . '?mod=system&op=cron';
}
@@ -186,13 +186,13 @@ if (empty($_GET['edit']) && empty($_GET['run'])) {
if (!file_exists($cronfile)) {
$msg = lang('crons_run_invalid', array('cronfile' => $cronfile));
- $msg_type = 'text-error';
+ $msg_type = 'danger';
} else {
dzz_cron::run($cron['cronid']);
$msg = lang('crons_run_succeed');
$redirecturl = BASESCRIPT . '?mod=system&op=cron';
- $msg_type = 'text-success';
+ $msg_type = 'success';
}
}
}
diff --git a/admin/system/database.php b/admin/system/database.php
index 9fe1934..6b9408c 100644
--- a/admin/system/database.php
+++ b/admin/system/database.php
@@ -27,10 +27,10 @@ if (!is_dir('./data/' . $backupdir)) {
mkdir('./data/' . $backupdir, 0777);
}
$operation = $_GET['operation'] ? $_GET['operation'] : 'export';
-$op = $_GET['op'];
+$op = isset($_GET['op']) ? $_GET['op'] : '';
if ($operation == 'export') {
- $navtitle = lang('database_export') . ' - ' . lang('admin_navtitle');
+ $navtitle = lang('database_export') . ' - ' . lang('appname');
if (!submitcheck('exportsubmit', 1)) {
$shelldisabled = function_exists('shell_exec') ? '' : 'disabled';
@@ -153,13 +153,13 @@ if ($operation == 'export') {
unset($sqldump, $zip, $content);
$redirecturl = BASESCRIPT . "?mod=system&op=database&operation=export&type=" . rawurlencode($_GET['type']) . "&saveto=server&filename=" . rawurlencode($_GET['filename']) . "&method=multivol&sizelimit=" . rawurlencode($_GET['sizelimit']) . "&volume=" . rawurlencode($volume) . "&tableid=" . rawurlencode($tableid) . "&startfrom=" . rawurlencode($startrow) . "&extendins=" . rawurlencode($_GET['extendins']) . "&sqlcharset=" . rawurlencode($_GET['sqlcharset']) . "&sqlcompat=" . rawurlencode($_GET['sqlcompat']) . "&exportsubmit=yes&usehex={$_GET['usehex']}&usezip={$_GET['usezip']}";
$msg = lang('database_export_multivol_redirect', array('volume' => $volume));
- $msg_type = 'text-success';
+ $msg_type = 'success';
}
} else {
$msg = '';
$volume--;
- $filelist = '
+
+
+
+
+ | {lang name} | +{lang jurisdiction} | +启用 | +{lang operation} | +
|---|---|---|---|
+ 
+ $v[pername]{lang system_default}+ |
+ + + | +
+
+ checked="checked" />
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+ {lang folder_property_group_permission}
+
+
+
\ No newline at end of file
diff --git a/admin/setting/template/lyear/smiley.htm b/admin/setting/template/lyear/smiley.htm
new file mode 100644
index 0000000..1c607ee
--- /dev/null
+++ b/admin/setting/template/lyear/smiley.htm
@@ -0,0 +1,80 @@
+
+
+
+-
+
+
- $val[0] + +
+
+
+
+
+
+
+
+
+
+
+
+
+ {lang board_message} {lang seeting_smiley_board_message_state}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
- 模板切换: +
- + + + 只对当前页面具有多套模板的情况下生效 + +
-
+
- 升级提醒: +
- + + + + + 关闭系统升级提醒后，只能前往系统工具中进行手动检测升级。关闭插件升级提醒后，只能前往应用市场进行手动检测升级。 + +
- {lang close_terrace}:
- @@ -340,8 +358,7 @@
- ';
+ $filelist = '
- $filename \n"; + $filelist .= "
- $filename \n"; } $fp = fopen($zipfilename, 'w'); if (@fwrite($fp, $zip -> file()) !== FALSE) { @@ -182,7 +182,7 @@ if ($operation == 'export') { } else { C::t('cache') -> insert(array('cachekey' => 'db_export', 'cachevalue' => serialize(array('dateline' => $_G['timestamp'])), 'dateline' => $_G['timestamp'], ), false, true); $msg .= lang('database_export_multivol_succeed', array('volume' => $volume, 'filelist' => $filelist)); - $msg_type = 'text-success'; + $msg_type = 'success'; } unset($sqldump, $zip, $content); fclose($fp); @@ -190,16 +190,16 @@ if ($operation == 'export') { $filename = $zipfilename; C::t('cache') -> insert(array('cachekey' => 'db_export', 'cachevalue' => serialize(array('dateline' => $_G['timestamp'])), 'dateline' => $_G['timestamp'], ), false, true); $msg .= lang('database_export_zip_succeed', array('filename' => $filename)); - $msg_type = 'text-success'; + $msg_type = 'success'; } else { @touch('./data/' . $backupdir . '/index.htm'); for ($i = 1; $i <= $volume; $i++) { $filename = sprintf($_GET['usezip'] == 2 ? $backupfilename . "-%s" . '.zip' : $dumpfile, $i); - $filelist .= "
- $filename \n"; + $filelist .= "
- $filename \n"; } C::t('cache') -> insert(array('cachekey' => 'db_export', 'cachevalue' => serialize(array('dateline' => $_G['timestamp'])), 'dateline' => $_G['timestamp'], ), false, true); $msg .= lang('database_export_multivol_succeed', array('volume' => $volume, 'filelist' => $filelist)); - $msg_type = 'text-success'; + $msg_type = 'success'; } } @@ -247,7 +247,7 @@ if ($operation == 'export') { unset($sqldump, $zip, $content); C::t('cache') -> insert(array('cachekey' => 'db_export', 'cachevalue' => serialize(array('dateline' => $_G['timestamp'])), 'dateline' => $_G['timestamp'], ), false, true); $msg = lang('database_export_zip_succeed', array('filename' => $filename)); - $msg_type = 'text-success'; + $msg_type = 'success'; } else { if (@is_writeable($dumpfile)) { $fp = fopen($dumpfile, 'rb+'); @@ -258,12 +258,12 @@ if ($operation == 'export') { $filename = $backupfilename . '.sql'; C::t('cache') -> insert(array('cachekey' => 'db_export', 'cachevalue' => serialize(array('dateline' => $_G['timestamp'])), 'dateline' => $_G['timestamp'], ), false, true); $msg = lang('database_export_succeed', array('filename' => $filename)); - $msg_type = 'text-success'; + $msg_type = 'success'; } } else { $msg = lang('database_shell_fail'); - $msg_type = 'text-error'; + $msg_type = 'danger'; } @@ -274,10 +274,10 @@ if ($operation == 'export') { } elseif ($operation == 'import') { $msg = ''; - $navtitle = lang('db_recover') . ' - ' . lang('admin_navtitle'); + $navtitle = lang('db_recover') . ' - ' . lang('appname'); if (($re = checkpermission('dbimport')) !== true) { $msg = $re; - $msg_type = 'text-error'; + $msg_type = 'danger'; include template('database'); exit(); } @@ -306,7 +306,7 @@ if ($operation == 'export') { $dir -> close(); } else { $msg = lang('database_export_dest_invalid'); - $msg_type = 'text-error'; + $msg_type = 'danger'; include template('database'); exit(); } @@ -365,22 +365,22 @@ if ($operation == 'export') { } } $msg = lang('database_file_delete_succeed'); - $msg_type = 'text-success'; + $msg_type = 'success'; $redirecturl = dreferer(); } else { $msg = lang('database_file_delete_invalid'); - $msg_type = 'text-error'; + $msg_type = 'danger'; $redirecturl = dreferer(); } } include template('database'); } elseif ($operation == 'runquery') { - $navtitle = lang('nav_db_runquery') . ' - ' . lang('admin_navtitle'); + $navtitle = lang('nav_db_runquery') . ' - ' . lang('appname'); $checkperm = checkpermission('runquery', 0); if ($checkperm !== true) { $msg = $checkperm; - $msg_type = 'text-error'; + $msg_type = 'danger'; include template('database'); exit(); } @@ -406,11 +406,11 @@ if ($operation == 'export') { } if ($sqlerror) { $msg = lang('database_run_query_invalid', array('sqlerror' => $sqlerror)); - $msg_type = 'text-error'; + $msg_type = 'danger'; $redirecturl = dreferer(); } else { $msg = lang('database_run_query_succeed', array('affected_rows' => $affected_rows)); - $msg_type = 'text-success'; + $msg_type = 'success'; $redirecturl = dreferer(); } } diff --git a/admin/system/fileperms.php b/admin/system/fileperms.php index 62da2f0..077bc58 100644 --- a/admin/system/fileperms.php +++ b/admin/system/fileperms.php @@ -11,13 +11,7 @@ if (!defined('IN_DZZ') || !defined('IN_ADMIN')) { } include_once libfile('function/admin'); $oparr = array('updatecache', 'database','cron', 'log','fileperms'); -$leftmenu = array(); -$op = $_GET['op']; -foreach ($oparr as $key => $value) { - $leftmenu[$value] = array('title' => lang($value), 'active' => ''); - if ($value == $op) - $leftmenu[$value]['active'] = 'class="nav-link active"'; -} +$op = isset($_GET['op']) ? $_GET['op'] : ''; $navtitle = lang('fileperms') . ' - ' . lang('appname'); $step = max(1, intval($_GET['step'])); if ($step == 1) { @@ -51,13 +45,13 @@ if ($step == 1) { continue; } else { if(!dir_writeable($fullentry)) { - $result .= '
- '.(is_dir($fullentry) ? lang('dir') : lang('file')).'./'.$entry.'无法写入 '; + $result .= '
- 无法写入'.(is_dir($fullentry) ? lang('dir') : lang('file')).'./'.$entry.'';
}
}
}
- $result .= '
- 文件及目录属性全部正确都能写入 '; + $result .= '
- 都能写入文件及目录属性全部正确';
} catch (Exception $e) {
- $result .= "
- 发生错误：".$e->getMessage()." "; + $result .= "
- 发生错误：".$e->getMessage()." "; } } include template('fileperms'); diff --git a/admin/system/index.php b/admin/system/index.php index 942e50f..ef7e666 100644 --- a/admin/system/index.php +++ b/admin/system/index.php @@ -9,7 +9,6 @@ if (!defined('IN_DZZ') || !defined('IN_ADMIN')) { exit('Access Denied'); } - $operation = $_GET['operation'] ? $_GET['operation'] : 'updatecache'; $url=getglobal('siteurl'). BASESCRIPT . '?mod=system&op=' . $operation; $url = outputurl($url); diff --git a/admin/system/language/zh-cn/lang.php b/admin/system/language/zh-cn/lang.php index a075bd0..1db6988 100644 --- a/admin/system/language/zh-cn/lang.php +++ b/admin/system/language/zh-cn/lang.php @@ -2,7 +2,7 @@ $lang = array ( 'appname'=>'系统工具', 'systemupgrade'=>'在线升级', - 'xtxx'=>'系统概览', + 'xtxx'=>'扩展信息', 'fileperms'=>'文件权限检查', ); ?> \ No newline at end of file diff --git a/admin/system/systemupgrade.php b/admin/system/systemupgrade.php index aba7727..c33f2f4 100644 --- a/admin/system/systemupgrade.php +++ b/admin/system/systemupgrade.php @@ -9,14 +9,14 @@ if (!defined('IN_DZZ') || !defined('IN_ADMIN')) { exit('Access Denied'); } -$navtitle = lang('upgrade') . ' - ' . lang('admin_navtitle'); +$navtitle = lang('upgrade') . ' - ' . lang('appname'); @set_time_limit(0); include_once DZZ_ROOT . './core/core_version.php'; include_once libfile('function/admin'); include_once libfile('function/cache'); $dzz_upgrade = new dzz_upgrade(); $step = intval($_GET['step']); -$op = $_GET['op']; +$op = isset($_GET['op']) ? $_GET['op'] : ''; $step = $step ? $step : 1; $operation = $_GET['operation'] ? trim($_GET['operation']) : 'check'; @@ -422,8 +422,8 @@ elseif ($operation == 'showupgrade') { $list[$type]['btn1'] = lang('founder_upgrade_require_config') . ' php v' . PHP_VERSION . 'MYSQL v' . $dbversion; } else { $list[$type]['title'] = 'DzzOffice' . $upgrade['latestversion'] . '_' . $locale . '_' . $charset; - $list[$type]['btn1'] = ''; - $list[$type]['official'] = '' . lang('founder_upgrade_manually') . ''; + $list[$type]['btn1'] = ''; + $list[$type]['official'] = '' . lang('founder_upgrade_manually') . ''; } } } else { diff --git a/admin/system/template/lyear/cron.htm b/admin/system/template/lyear/cron.htm new file mode 100644 index 0000000..6896b9c --- /dev/null +++ b/admin/system/template/lyear/cron.htm @@ -0,0 +1,175 @@ + + + +
- $message ", $showtrace, 0); - } else { - dzz_error::mobile_show_error('system', "
- $message ", $showtrace, 0); - } + dzz_error::show_error('system', "
- $message ", $showtrace, '', $BackTraceID); } if($halt) { @@ -61,11 +57,10 @@ class dzz_error if(in_array($func, $skipfunc)) { break; } - $error[line] = sprintf('%04d', $error['line']); + $error['line'] = sprintf('%04d', $error['line']); - $show .= "
- [Line: $error[line]]".$file."($func) "; - $log .= !empty($log) ? ' -> ' : '';$file.':'.$error['line']; - $log .= $file.':'.$error['line']; + $show .= "
- [Line: {$error['line']}]".$file."($func) "; + $log .= (!empty($log) ? ' -> ' : '').$file.'#'.$func.':'.$error['line']; } return array($show, $log); } @@ -88,8 +83,6 @@ class dzz_error $msg = '
- [Type] '.$title.' '; $msg .= $dberrno ? '
- ['.$dberrno.'] '.$dberror.' ' : ''; $msg .= $sql ? '
- [Query] '.$sql.' ' : ''; - dzz_error::show_error('db', $msg, $showtrace, false); - unset($msg, $phperror); $errormsg = ''.$title.''; $errormsg .= "[$dberrno]
- 1 '.$dot.' ' : ''). - ($curpage > 1 && !$simple ? '
- ' : ''); + $multipage = ($curpage - $offset > 1 && $pages > $page ? '
- 1 '.$dot.' ' : ''). + ($curpage > 1 && !$simple ? '
- « ' : ''); for($i = $from; $i <= $to; $i++) { - $multipage .= $i == $curpage ? '
- '.$i.'' : - '
- '.$i.' '; + $multipage .= $i == $curpage ? '
- '.$i.'' : + '
- '.$i.' '; } $wml = defined('IN_MOBILE') && IN_MOBILE == 3; @@ -88,13 +88,13 @@ class helper_page { $jsurl = $mpurl.(strpos($mpurl, '{page}') !== false ? '\'.replace(\'{page}\', this.value == 1 ? \'\' : this.value)': $pagevar.'\'+this.value;').'; doane(event);'; } - $multipage .= ($to < $pages ? '
- '.$dot.' '.$realpages.' ' : ''). - ($showpagejump && !$simple && !$ajaxtarget && !$wml ? '
- / '.$pages.' '.$lang['pageunit'].' ' : ''). - ($curpage < $pages && !$simple ? '
- ' : ''). + $multipage .= ($to < $pages ? '
- '.$dot.' '.$realpages.' ' : ''). + ($showpagejump && !$simple && !$ajaxtarget && !$wml ? '
- / '.$pages.' '.$lang['pageunit'].'' : '').
+ ($curpage < $pages && !$simple ? '
- » ' : ''). ($showkbd && !$simple && $pages > $page && !$ajaxtarget && !$wml ? '
- ' : ''); - $multipage = $multipage ? '
- '.$num.' ' : '').'
- '.$num.' ' : '').'
'.$string[1].'s• DBLink '.$links[$ismysqli ? $string[3]->thread_id : (string)$string[3]].$dt.'
'.$sql.' '.$sqldebugrow;
+ }
+ $ajaxhtml = 'data/'.$debugfile.'_ajax.php';
+ if($ajax) {
+ $idk = substr(md5($_SERVER['SCRIPT_NAME'].'?'.$_SERVER['QUERY_STRING']), 0, 4);
+ $sqldebug = 'Queries: '.$queries.' ('.$_SERVER['SCRIPT_NAME'].'?'.$_SERVER['QUERY_STRING'].')- ['$k'] => ".nl2br(str_replace(' ',' ', dhtmlspecialchars(print_r($v, true)))).' '; + } + } elseif(is_object($v)) { + $_GA .= "
- ['$k'] => object of ".get_class($v)." "; + } else { + $_GS .= "
- ['$k'] => ".dhtmlspecialchars($v)." "; + } + } + } + $modid = $_G['basescript'].(!defined('IN_ADMINCP') ? '::'.CURMODULE : ''); + $svn = ''; + if(file_exists(DZZ_ROOT.'./.svn/entries')) { + $svn = @file(DZZ_ROOT.'./.svn/entries'); + $time = $svn[9]; + preg_match('/([\d\-]+)T([\d:]+)/', $time, $a); + $svn = '.r'.$svn[10].' (最后由 '.$svn[11].' 于 '.dgmdate(strtotime($a[1].' '.$a[2]) + $_G['setting']['timeoffset'] * 3600).' 提交)'; + } + $max = 10; + $mc = $mco = ''; + if(class_exists('C') && C::memory()->enable) { + $mcarray = C::memory()->debug; + $i = 0; + $max += count($mcarray); + foreach($mcarray as $key => $value) { + $mco .= ''; + $mc .= '['.$key.']'.($value ? '
- - $_G['setting'][sitename] + $_G['setting']['sitename'] \ No newline at end of file diff --git a/core/template/default/common/header_reload.htm b/core/template/default/common/header_reload.htm index 18f441c..23de810 100644 --- a/core/template/default/common/header_reload.htm +++ b/core/template/default/common/header_reload.htm @@ -7,9 +7,9 @@
- - {eval echo avatar_block($_G[uid]);} + {eval echo avatar_block($_G['uid']);} \ No newline at end of file diff --git a/core/template/default/common/header_simple.htm b/core/template/default/common/header_simple.htm index b97d469..0689464 100644 --- a/core/template/default/common/header_simple.htm +++ b/core/template/default/common/header_simple.htm @@ -3,9 +3,9 @@ -
- + + +
- + + + + \ No newline at end of file diff --git a/core/template/lyear/common/safechk.htm b/core/template/lyear/common/safechk.htm new file mode 100644 index 0000000..d468028 --- /dev/null +++ b/core/template/lyear/common/safechk.htm @@ -0,0 +1,177 @@ +
- +
- +
- +
- +
-
+
- +
- +
- +
- +
+ - +
- +
- +
- +
-
+
- +
+- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
+ - +
-
+ target="_blank">
$value[appname] +
+
+ - '+__lang.edit+' '; - html+='
- '+__lang.delete+' '; - html+='
- '+__lang.reply+' '; + //html+='
- '+__lang.edit+' '; + html+='
- '+__lang.delete+' '; + html+='
- '+__lang.reply+' '; html+='
- ';
+ html+=' '; + html+=' '+arr['avatar']+' '; + html+=''; + html+=''; + html+=' '+arr['author']+''; + if(arr['rpost']){ + html+=''+__lang.reply+''+arr['rpost']['author']+''; + } + html+=''; + html+=''+arr['dateline']+' '+arr['xtllq']+' '+arr['ip']; + html+=''; + if(arr['haveperm']>0){ + html+=' '+__lang.delete+''+' '; + } + html+=' '+__lang.reply+''; + html+='
'+arr['message']+'
'; + if(arr['attachs']){ + html+=''; + for(var i in arr['attachs']){ + var attach=arr['attachs'][i]; + html+=''; + } + html+=''; + html+=''; + } + html+=''; + html+=''; + html+=''; + html+=''; + html+=''+attach['title']; + if(attach['filesize']){ + html+='('+attach['filesize']+')'; + } + html+='
'; + if(attach.preview>0){ + html+=''+__lang.preview+''; + } + if(attach.type=='dzzdoc' || attach.type=='link'){ + + } else { + html+=''+__lang.download; + if(attach.downloads>0){ + html+='('+attach['downloads']+__lang.degree+')'; + } + html+=''; + html+=''+__lang.js_saved_my_documents+' '; + } + html+=''; + html+=' ';
+ if(!document.getElementById('reply_list_'+arr['pcid'])){
+ var html1='';
+ html1+=' -
+
+
$val[appname] + +
+
+ -
+
+ + {eval echo avatar_block($value1[authorid],'','img-avatar img-avatar-48');} +++ $value1[author] + + {lang reply} + $value1[rpost][author] + ++$value1[dateline] $value1[xtllq] $value1[ip] + + + {lang delete} + + + {lang reply} + + ++
$value1[message]
+ ++ ++ +++ ++++++ +$attach[title]($attach['filesize'])
\ No newline at end of file
diff --git a/dzz/comment/template/lyear/lyear_thread_item.htm b/dzz/comment/template/lyear/lyear_thread_item.htm
new file mode 100644
index 0000000..75521a0
--- /dev/null
+++ b/dzz/comment/template/lyear/lyear_thread_item.htm
@@ -0,0 +1,65 @@
+ -
+
+ + {eval echo avatar_block($value[authorid],'','img-avatar img-avatar-48');} +++ $value[author] ++$value[dateline] $value[xtllq] $value[ip] + + + {lang delete} + + + {lang reply} + + ++
$value[message]
+ ++ ++ +++ +++++++ +-
+
+
+
+
+
+ + + + ++ +
\ No newline at end of file
diff --git a/dzz/comment/template/lyear_left.htm b/dzz/comment/template/lyear_left.htm
new file mode 100644
index 0000000..360a74a
--- /dev/null
+++ b/dzz/comment/template/lyear_left.htm
@@ -0,0 +1,12 @@
+ -
+
+
+
+
- - {lang delete} + {lang delete}
- - {lang reply} + {lang reply}
-
+ ++
+
+ + {eval $progressvalue = floor(($value[number]/$votetotal)*100);} + + {eval $progressvalue = '0';} + + ++$value['content']
+
+
+ -
+ +++ + {eval $progressvalue = floor(($value[number]/$votetotal)*100);} + + {eval $progressvalue = '0';} + + ++
$value['content']
+
+
+
- ';
if ($_GET['usezip'] == 1) {
$zip = new zipfile();
@@ -172,7 +172,7 @@ if ($operation == 'export') {
fclose($fp);
$zip -> addFile($content, basename($filename));
$unlinks[] = $filename;
- $filelist .= "
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $msg
+
+
+
+
+
+
+
+
+
+
+
+
+ {lang board_message}
+-
+ {lang misc_cron_edit_tips}
+
+
+
+
+
+ {lang board_message}
+-
+ {lang misc_cron_tips}
+
+
+
+
\ No newline at end of file
diff --git a/admin/system/template/lyear/lyear_left.htm b/admin/system/template/lyear/lyear_left.htm
new file mode 100644
index 0000000..3a11615
--- /dev/null
+++ b/admin/system/template/lyear/lyear_left.htm
@@ -0,0 +1,8 @@
+
+
\ No newline at end of file
diff --git a/admin/system/template/lyear/updatecache.htm b/admin/system/template/lyear/updatecache.htm
new file mode 100644
index 0000000..d864258
--- /dev/null
+++ b/admin/system/template/lyear/updatecache.htm
@@ -0,0 +1,75 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/system/template/lyear/upgrade.htm b/admin/system/template/lyear/upgrade.htm
new file mode 100644
index 0000000..7c48b46
--- /dev/null
+++ b/admin/system/template/lyear/upgrade.htm
@@ -0,0 +1,234 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/system/template/lyear/upgrade_iframe.htm b/admin/system/template/lyear/upgrade_iframe.htm
new file mode 100644
index 0000000..ce32e73
--- /dev/null
+++ b/admin/system/template/lyear/upgrade_iframe.htm
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/system/template/xtxx.htm b/admin/system/template/xtxx.htm
index fe9db66..5554534 100644
--- a/admin/system/template/xtxx.htm
+++ b/admin/system/template/xtxx.htm
@@ -100,7 +100,7 @@
+
+
+
\ No newline at end of file
diff --git a/admin/systemlog/template/lyear/list.htm b/admin/systemlog/template/lyear/list.htm
new file mode 100644
index 0000000..88468aa
--- /dev/null
+++ b/admin/systemlog/template/lyear/list.htm
@@ -0,0 +1,193 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/systemlog/template/lyear/lyear_left.htm b/admin/systemlog/template/lyear/lyear_left.htm
new file mode 100644
index 0000000..997193d
--- /dev/null
+++ b/admin/systemlog/template/lyear/lyear_left.htm
@@ -0,0 +1,8 @@
+
\ No newline at end of file
diff --git a/admin/template/lyear/lyear_header_left.htm b/admin/template/lyear/lyear_header_left.htm
new file mode 100644
index 0000000..62776b8
--- /dev/null
+++ b/admin/template/lyear/lyear_header_left.htm
@@ -0,0 +1,8 @@
+
\ No newline at end of file
diff --git a/config/config_default.php b/config/config_default.php
index a81f052..4d7255b 100644
--- a/config/config_default.php
+++ b/config/config_default.php
@@ -160,6 +160,7 @@ $_config['admincp']['checkip'] = 1; // 后台管理操作是否验证管理
$_config['admincp']['runquery'] = 0; // 是否允许后台运行 SQL 语句 1=是 0=否[安全]
$_config['admincp']['dbimport'] = 0; // 是否允许后台恢复网站数据 1=是 0=否[安全]
$_config['userlogin']['checkip'] = 1; //用户登录错误验证ip，对于同一ip同时使用时建议设置为0,否则当有一位用户登录错误次数超过5次，该ip被锁定15分钟，导致其他的同IP用户无法登录;
+$_config['debug'] = 0;
//$_config['system_os'] = 'linux'; //windows,linux,mac,系统会自动判断
//$_config['system_charset']='utf-8'; //操作系统编码，不设置系统将根据操作系统类型来判断linux:utf-8;windows:gbk;
diff --git a/config/config_frame.php b/config/config_frame.php
index cb618df..0e2f720 100644
--- a/config/config_frame.php
+++ b/config/config_frame.php
@@ -10,7 +10,7 @@ $_config['namespacelist'] = array(
'misc' => DZZ_ROOT.'misc'
);
-$_config['default_mod'] = 'index';
+$_config['default_mod'] = 'explorer';
$_config['default_op'] = 'index';
diff --git a/core/api/BaiduPCS/BaiduUtils.php b/core/api/BaiduPCS/BaiduUtils.php
index bf92557..8aca8b3 100644
--- a/core/api/BaiduPCS/BaiduUtils.php
+++ b/core/api/BaiduPCS/BaiduUtils.php
@@ -274,7 +274,7 @@ class BaiduUtils
self::$boundary = $boundary = md5('BAIDU-PHP-SDK-V2' . microtime(true));
foreach ($params as $key => $value) {
- if ($value{0} == '@') {
+ if ($value[0] == '@') {
$url = ltrim($value, '@');
$content = file_get_contents($url);
$array = explode('?', basename($url));
diff --git a/core/api/Qcos/vendor/guzzlehttp/guzzle-services/src/SchemaValidator.php b/core/api/Qcos/vendor/guzzlehttp/guzzle-services/src/SchemaValidator.php
index 4a2833f..b88d1ad 100644
--- a/core/api/Qcos/vendor/guzzlehttp/guzzle-services/src/SchemaValidator.php
+++ b/core/api/Qcos/vendor/guzzlehttp/guzzle-services/src/SchemaValidator.php
@@ -212,7 +212,7 @@ class SchemaValidator
} elseif ($type == 'array' && $valueIsArray && $param->getItems()) {
foreach ($value as $i => &$item) {
// Validate each item in an array against the items attribute of the schema
- $this->recursiveProcess($param->getItems(), $item, $path . "[{$i}]", $depth + 1);
+ $this->recursiveProcess($param->getItems(), $item, $path . "[[$i]]", $depth + 1);
}
}
diff --git a/core/api/wopi/wopi.php b/core/api/wopi/wopi.php
index b620f25..210fa5e 100644
--- a/core/api/wopi/wopi.php
+++ b/core/api/wopi/wopi.php
@@ -180,7 +180,7 @@ class Wopi
$fileExtension = $meta['ext'];
$guid = dzzencode(getglobal('uid').'|'.$lock);
- $wopi_url_temlpate = "WOPISrc={0}&access_token={1}";
+ $wopi_url_temlpate = "WOPISrc=[0]&access_token=[1]";
$fileID=dzzencode($meta['path']);
$discovery=self::getActionByDiscovery($ooServerURL);
if($discovery['error']) return $discovery;
@@ -234,8 +234,8 @@ class Wopi
$fileUrl = urlencode($internalUrl. "wopi/files/" . $fileID);
$requestUrl = preg_replace("/<.*>/", "", $urlsrc);
- $requestUrl = $requestUrl . str_replace('{1}', $guid, $wopi_url_temlpate);
- $requestUrl = str_replace("{0}", $fileUrl, $requestUrl).'&ui=zh-CN&rs=zh-CN';
+ $requestUrl = $requestUrl . str_replace('[1]', $guid, $wopi_url_temlpate);
+ $requestUrl = str_replace("[0]", $fileUrl, $requestUrl).'&ui=zh-CN&rs=zh-CN';
$wopiSrc=$internalUrl. "wopi/files/$fileID?access_token=$guid&ui=zh-CN&rs=zh-CN";
$ret=array(
'fileID'=>$fileID,
diff --git a/core/class/PHPExcel/Calculation.php b/core/class/PHPExcel/Calculation.php
index b609b0d..0469d1d 100644
--- a/core/class/PHPExcel/Calculation.php
+++ b/core/class/PHPExcel/Calculation.php
@@ -2183,7 +2183,7 @@ class PHPExcel_Calculation {
*/
public static function _unwrapResult($value) {
if (is_string($value)) {
- if ((isset($value{0})) && ($value{0} == '"') && (substr($value,-1) == '"')) {
+ if ((isset($value[0])) && ($value[0] == '"') && (substr($value,-1) == '"')) {
return substr($value,1,-1);
}
// Convert numeric errors to NaN error
@@ -2291,9 +2291,9 @@ class PHPExcel_Calculation {
// Basic validation that this is indeed a formula
// We return an empty array if not
$formula = trim($formula);
- if ((!isset($formula{0})) || ($formula{0} != '=')) return array();
+ if ((!isset($formula[0])) || ($formula[0] != '=')) return array();
$formula = ltrim(substr($formula,1));
- if (!isset($formula{0})) return array();
+ if (!isset($formula[0])) return array();
// Parse the formula and return the token stack
return $this->_parseFormula($formula);
@@ -2369,9 +2369,9 @@ class PHPExcel_Calculation {
// Basic validation that this is indeed a formula
// We simply return the cell value if not
$formula = trim($formula);
- if ($formula{0} != '=') return self::_wrapResult($formula);
+ if ($formula[0] != '=') return self::_wrapResult($formula);
$formula = ltrim(substr($formula,1));
- if (!isset($formula{0})) return self::_wrapResult($formula);
+ if (!isset($formula[0])) return self::_wrapResult($formula);
$pCellParent = ($pCell !== NULL) ? $pCell->getWorksheet() : NULL;
$wsTitle = ($pCellParent !== NULL) ? $pCellParent->getTitle() : "\x00Wrk";
@@ -2380,7 +2380,7 @@ class PHPExcel_Calculation {
return $cellValue;
}
- if (($wsTitle{0} !== "\x00") && ($this->_cyclicReferenceStack->onStack($wsTitle.'!'.$cellID))) {
+ if (($wsTitle[0] !== "\x00") && ($this->_cyclicReferenceStack->onStack($wsTitle.'!'.$cellID))) {
if ($this->cyclicFormulaCount <= 0) {
return $this->_raiseFormulaError('Cyclic Reference in Formula');
} elseif (($this->_cyclicFormulaCount >= $this->cyclicFormulaCount) &&
@@ -2629,7 +2629,7 @@ class PHPExcel_Calculation {
} else {
if ($value == '') {
return 'an empty string';
- } elseif ($value{0} == '#') {
+ } elseif ($value[0] == '#') {
return 'a '.$value.' error';
} else {
$typeString = 'a string';
@@ -2758,10 +2758,10 @@ class PHPExcel_Calculation {
// Loop through the formula extracting each operator and operand in turn
while(TRUE) {
//echo 'Assessing Expression '.substr($formula, $index),PHP_EOL;
- $opCharacter = $formula{$index}; // Get the first character of the value at the current index position
+ $opCharacter = $formula[$index]; // Get the first character of the value at the current index position
//echo 'Initial character of expression block is '.$opCharacter,PHP_EOL;
- if ((isset(self::$_comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && (isset(self::$_comparisonOperators[$formula{$index+1}]))) {
- $opCharacter .= $formula{++$index};
+ if ((isset(self::$_comparisonOperators[$opCharacter])) && (strlen($formula) > $index) && (isset(self::$_comparisonOperators[$formula[$index+1]]))) {
+ $opCharacter .= $formula[++$index];
//echo 'Initial character of expression block is comparison operator '.$opCharacter.PHP_EOL;
}
@@ -3036,11 +3036,11 @@ class PHPExcel_Calculation {
}
}
// Ignore white space
- while (($formula{$index} == "\n") || ($formula{$index} == "\r")) {
+ while (($formula[$index] == "\n") || ($formula[$index] == "\r")) {
++$index;
}
- if ($formula{$index} == ' ') {
- while ($formula{$index} == ' ') {
+ if ($formula[$index] == ' ') {
+ while ($formula[$index] == ' ') {
++$index;
}
// If we're expecting an operator, but only have a space between the previous and next operands (and both are
@@ -3456,7 +3456,7 @@ class PHPExcel_Calculation {
// echo 'Token is a PHPExcel constant: '.$excelConstant.'
'; $stack->push('Constant Value',self::$_ExcelConstants[$excelConstant]); $this->_debugLog->writeDebugLog('Evaluating Constant ', $excelConstant, ' as ', $this->_showTypeDetails(self::$_ExcelConstants[$excelConstant])); - } elseif ((is_numeric($token)) || ($token === NULL) || (is_bool($token)) || ($token == '') || ($token{0} == '"') || ($token{0} == '#')) { + } elseif ((is_numeric($token)) || ($token === NULL) || (is_bool($token)) || ($token == '') || ($token[0] == '"') || ($token[0] == '#')) { // echo 'Token is a number, boolean, string, null or an Excel error
'; $stack->push('Value',$token); // if the token is a named range, push the named range name onto the stack @@ -3498,11 +3498,11 @@ class PHPExcel_Calculation { if (is_string($operand)) { // We only need special validations for the operand if it is a string // Start by stripping off the quotation marks we use to identify true excel string values internally - if ($operand > '' && $operand{0} == '"') { $operand = self::_unwrapResult($operand); } + if ($operand > '' && $operand[0] == '"') { $operand = self::_unwrapResult($operand); } // If the string is a numeric value, we treat it as a numeric, so no further testing if (!is_numeric($operand)) { // If not a numeric, test to see if the value is an Excel error, and so can't be used in normal binary operations - if ($operand > '' && $operand{0} == '#') { + if ($operand > '' && $operand[0] == '#') { $stack->push('Value', $operand); $this->_debugLog->writeDebugLog('Evaluation Result is ', $this->_showTypeDetails($operand)); return FALSE; @@ -3555,8 +3555,8 @@ class PHPExcel_Calculation { } // Simple validate the two operands if they are string values - if (is_string($operand1) && $operand1 > '' && $operand1{0} == '"') { $operand1 = self::_unwrapResult($operand1); } - if (is_string($operand2) && $operand2 > '' && $operand2{0} == '"') { $operand2 = self::_unwrapResult($operand2); } + if (is_string($operand1) && $operand1 > '' && $operand1[0] == '"') { $operand1 = self::_unwrapResult($operand1); } + if (is_string($operand2) && $operand2 > '' && $operand2[0] == '"') { $operand2 = self::_unwrapResult($operand2); } // Use case insensitive comparaison if not OpenOffice mode if (PHPExcel_Calculation_Functions::getCompatibilityMode() != PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) diff --git a/core/class/PHPExcel/Calculation/Engineering.php b/core/class/PHPExcel/Calculation/Engineering.php index 7e32aa8..0c97607 100644 --- a/core/class/PHPExcel/Calculation/Engineering.php +++ b/core/class/PHPExcel/Calculation/Engineering.php @@ -708,7 +708,7 @@ class PHPExcel_Calculation_Engineering { // Split the input into its Real and Imaginary components $leadingSign = 0; if (strlen($workString) > 0) { - $leadingSign = (($workString{0} == '+') || ($workString{0} == '-')) ? 1 : 0; + $leadingSign = (($workString[0] == '+') || ($workString[0] == '-')) ? 1 : 0; } $power = ''; $realNumber = strtok($workString, '+-'); @@ -747,10 +747,10 @@ class PHPExcel_Calculation_Engineering { * @return string The "cleaned" complex number */ private static function _cleanComplex($complexNumber) { - if ($complexNumber{0} == '+') $complexNumber = substr($complexNumber,1); - if ($complexNumber{0} == '0') $complexNumber = substr($complexNumber,1); - if ($complexNumber{0} == '.') $complexNumber = '0'.$complexNumber; - if ($complexNumber{0} == '+') $complexNumber = substr($complexNumber,1); + if ($complexNumber[0] == '+') $complexNumber = substr($complexNumber,1); + if ($complexNumber[0] == '0') $complexNumber = substr($complexNumber,1); + if ($complexNumber[0] == '.') $complexNumber = '0'.$complexNumber; + if ($complexNumber[0] == '+') $complexNumber = substr($complexNumber,1); return $complexNumber; } diff --git a/core/class/PHPExcel/Calculation/FormulaParser.php b/core/class/PHPExcel/Calculation/FormulaParser.php index 754a638..8536a82 100644 --- a/core/class/PHPExcel/Calculation/FormulaParser.php +++ b/core/class/PHPExcel/Calculation/FormulaParser.php @@ -159,7 +159,7 @@ class PHPExcel_Calculation_FormulaParser { // Check if the formula has a valid starting = $formulaLength = strlen($this->_formula); - if ($formulaLength < 2 || $this->_formula{0} != '=') return; + if ($formulaLength < 2 || $this->_formula[0] != '=') return; // Helper variables $tokens1 = $tokens2 = $stack = array(); @@ -179,7 +179,7 @@ class PHPExcel_Calculation_FormulaParser { // embeds are doubled // end marks token if ($inString) { - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) { if ((($index + 2) <= $formulaLength) && ($this->_formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE)) { $value .= PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE; ++$index; @@ -189,7 +189,7 @@ class PHPExcel_Calculation_FormulaParser { $value = ""; } } else { - $value .= $this->_formula{$index}; + $value .= $this->_formula[$index]; } ++$index; continue; @@ -199,7 +199,7 @@ class PHPExcel_Calculation_FormulaParser { // embeds are double // end does not mark a token if ($inPath) { - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) { if ((($index + 2) <= $formulaLength) && ($this->_formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE)) { $value .= PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE; ++$index; @@ -207,7 +207,7 @@ class PHPExcel_Calculation_FormulaParser { $inPath = false; } } else { - $value .= $this->_formula{$index}; + $value .= $this->_formula[$index]; } ++$index; continue; @@ -217,10 +217,10 @@ class PHPExcel_Calculation_FormulaParser { // no embeds (changed to "()" by Excel) // end does not mark a token if ($inRange) { - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_CLOSE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::BRACKET_CLOSE) { $inRange = false; } - $value .= $this->_formula{$index}; + $value .= $this->_formula[$index]; ++$index; continue; } @@ -228,7 +228,7 @@ class PHPExcel_Calculation_FormulaParser { // error values // end marks a token, determined from absolute list of values if ($inError) { - $value .= $this->_formula{$index}; + $value .= $this->_formula[$index]; ++$index; if (in_array($value, $ERRORS)) { $inError = false; @@ -239,10 +239,10 @@ class PHPExcel_Calculation_FormulaParser { } // scientific notation check - if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_SN, $this->_formula{$index}) !== false) { + if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_SN, $this->_formula[$index]) !== false) { if (strlen($value) > 1) { - if (preg_match("/^[1-9]{1}(\.[0-9]+)?E{1}$/", $this->_formula{$index}) != 0) { - $value .= $this->_formula{$index}; + if (preg_match("/^[1-9]{1}(\.[0-9]+)?E{1}$/", $this->_formula[$index]) != 0) { + $value .= $this->_formula[$index]; ++$index; continue; } @@ -252,7 +252,7 @@ class PHPExcel_Calculation_FormulaParser { // independent character evaluation (order not important) // establish state-dependent character evaluations - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) { if (strlen($value > 0)) { // unexpected $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN); $value = ""; @@ -262,7 +262,7 @@ class PHPExcel_Calculation_FormulaParser { continue; } - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) { if (strlen($value) > 0) { // unexpected $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN); $value = ""; @@ -272,14 +272,14 @@ class PHPExcel_Calculation_FormulaParser { continue; } - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_OPEN) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::BRACKET_OPEN) { $inRange = true; $value .= PHPExcel_Calculation_FormulaParser::BRACKET_OPEN; ++$index; continue; } - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::ERROR_START) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::ERROR_START) { if (strlen($value) > 0) { // unexpected $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN); $value = ""; @@ -291,7 +291,7 @@ class PHPExcel_Calculation_FormulaParser { } // mark start and end of arrays and array rows - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_OPEN) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::BRACE_OPEN) { if (strlen($value) > 0) { // unexpected $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN); $value = ""; @@ -309,7 +309,7 @@ class PHPExcel_Calculation_FormulaParser { continue; } - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::SEMICOLON) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::SEMICOLON) { if (strlen($value) > 0) { $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND); $value = ""; @@ -331,7 +331,7 @@ class PHPExcel_Calculation_FormulaParser { continue; } - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_CLOSE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::BRACE_CLOSE) { if (strlen($value) > 0) { $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND); $value = ""; @@ -352,14 +352,14 @@ class PHPExcel_Calculation_FormulaParser { } // trim white-space - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::WHITESPACE) { if (strlen($value) > 0) { $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND); $value = ""; } $tokens1[] = new PHPExcel_Calculation_FormulaToken("", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_WHITESPACE); ++$index; - while (($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) && ($index < $formulaLength)) { + while (($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::WHITESPACE) && ($index < $formulaLength)) { ++$index; } continue; @@ -379,29 +379,29 @@ class PHPExcel_Calculation_FormulaParser { } // standard infix operators - if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_INFIX, $this->_formula{$index}) !== false) { + if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_INFIX, $this->_formula[$index]) !== false) { if (strlen($value) > 0) { $tokens1[] =new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND); $value = ""; } - $tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX); + $tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula[$index], PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX); ++$index; continue; } // standard postfix operators (only one) - if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_POSTFIX, $this->_formula{$index}) !== false) { + if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_POSTFIX, $this->_formula[$index]) !== false) { if (strlen($value) > 0) { $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND); $value = ""; } - $tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX); + $tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula[$index], PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX); ++$index; continue; } // start subexpression or function - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_OPEN) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::PAREN_OPEN) { if (strlen($value) > 0) { $tmp = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START); $tokens1[] = $tmp; @@ -417,7 +417,7 @@ class PHPExcel_Calculation_FormulaParser { } // function, subexpression, or array parameters, or operand unions - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::COMMA) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::COMMA) { if (strlen($value) > 0) { $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND); $value = ""; @@ -438,7 +438,7 @@ class PHPExcel_Calculation_FormulaParser { } // stop subexpression - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_CLOSE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::PAREN_CLOSE) { if (strlen($value) > 0) { $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND); $value = ""; @@ -454,7 +454,7 @@ class PHPExcel_Calculation_FormulaParser { } // token accumulation - $value .= $this->_formula{$index}; + $value .= $this->_formula[$index]; ++$index; } diff --git a/core/class/PHPExcel/Calculation/Functions.php b/core/class/PHPExcel/Calculation/Functions.php index 4ad1dd3..36edc52 100644 --- a/core/class/PHPExcel/Calculation/Functions.php +++ b/core/class/PHPExcel/Calculation/Functions.php @@ -308,9 +308,9 @@ class PHPExcel_Calculation_Functions { public static function _ifCondition($condition) { $condition = PHPExcel_Calculation_Functions::flattenSingleValue($condition); - if (!isset($condition{0})) + if (!isset($condition[0])) $condition = '=""'; - if (!in_array($condition{0},array('>', '<', '='))) { + if (!in_array($condition[0],array('>', '<', '='))) { if (!is_numeric($condition)) { $condition = PHPExcel_Calculation::_wrapResult(strtoupper($condition)); } return '='.$condition; } else { @@ -531,7 +531,7 @@ class PHPExcel_Calculation_Functions { break; case 'string' : // Errors - if ((strlen($value) > 0) && ($value{0} == '#')) { + if ((strlen($value) > 0) && ($value[0] == '#')) { return $value; } break; @@ -581,7 +581,7 @@ class PHPExcel_Calculation_Functions { //break; } elseif(is_string($value)) { // Errors - if ((strlen($value) > 0) && ($value{0} == '#')) { + if ((strlen($value) > 0) && ($value[0] == '#')) { return 16; } return 2; diff --git a/core/class/PHPExcel/Calculation/TextData.php b/core/class/PHPExcel/Calculation/TextData.php index d1ba272..2a0da50 100644 --- a/core/class/PHPExcel/Calculation/TextData.php +++ b/core/class/PHPExcel/Calculation/TextData.php @@ -48,19 +48,19 @@ class PHPExcel_Calculation_TextData { private static $_invalidChars = Null; private static function _uniord($c) { - if (ord($c{0}) >=0 && ord($c{0}) <= 127) - return ord($c{0}); - if (ord($c{0}) >= 192 && ord($c{0}) <= 223) - return (ord($c{0})-192)*64 + (ord($c{1})-128); - if (ord($c{0}) >= 224 && ord($c{0}) <= 239) - return (ord($c{0})-224)*4096 + (ord($c{1})-128)*64 + (ord($c{2})-128); - if (ord($c{0}) >= 240 && ord($c{0}) <= 247) - return (ord($c{0})-240)*262144 + (ord($c{1})-128)*4096 + (ord($c{2})-128)*64 + (ord($c{3})-128); - if (ord($c{0}) >= 248 && ord($c{0}) <= 251) - return (ord($c{0})-248)*16777216 + (ord($c{1})-128)*262144 + (ord($c{2})-128)*4096 + (ord($c{3})-128)*64 + (ord($c{4})-128); - if (ord($c{0}) >= 252 && ord($c{0}) <= 253) - return (ord($c{0})-252)*1073741824 + (ord($c{1})-128)*16777216 + (ord($c{2})-128)*262144 + (ord($c{3})-128)*4096 + (ord($c{4})-128)*64 + (ord($c{5})-128); - if (ord($c{0}) >= 254 && ord($c{0}) <= 255) //error + if (ord($c[0]) >=0 && ord($c[0]) <= 127) + return ord($c[0]); + if (ord($c[0]) >= 192 && ord($c[0]) <= 223) + return (ord($c[0])-192)*64 + (ord($c[1])-128); + if (ord($c[0]) >= 224 && ord($c[0]) <= 239) + return (ord($c[0])-224)*4096 + (ord($c[1])-128)*64 + (ord($c[2])-128); + if (ord($c[0]) >= 240 && ord($c[0]) <= 247) + return (ord($c[0])-240)*262144 + (ord($c[1])-128)*4096 + (ord($c[2])-128)*64 + (ord($c[3])-128); + if (ord($c[0]) >= 248 && ord($c[0]) <= 251) + return (ord($c[0])-248)*16777216 + (ord($c[1])-128)*262144 + (ord($c[2])-128)*4096 + (ord($c[3])-128)*64 + (ord($c[4])-128); + if (ord($c[0]) >= 252 && ord($c[0]) <= 253) + return (ord($c[0])-252)*1073741824 + (ord($c[1])-128)*16777216 + (ord($c[2])-128)*262144 + (ord($c[3])-128)*4096 + (ord($c[4])-128)*64 + (ord($c[5])-128); + if (ord($c[0]) >= 254 && ord($c[0]) <= 255) //error return PHPExcel_Calculation_Functions::VALUE(); return 0; } // function _uniord() diff --git a/core/class/PHPExcel/Cell.php b/core/class/PHPExcel/Cell.php index 1788559..c560ffe 100644 --- a/core/class/PHPExcel/Cell.php +++ b/core/class/PHPExcel/Cell.php @@ -769,19 +769,19 @@ class PHPExcel_Cell // We also use the language construct isset() rather than the more costly strlen() function to match the length of $pString // for improved performance - if (isset($pString{0})) { - if (!isset($pString{1})) { + if (isset($pString[0])) { + if (!isset($pString[1])) { $_indexCache[$pString] = $_columnLookup[$pString]; return $_indexCache[$pString]; - } elseif(!isset($pString{2})) { - $_indexCache[$pString] = $_columnLookup[$pString{0}] * 26 + $_columnLookup[$pString{1}]; + } elseif(!isset($pString[2])) { + $_indexCache[$pString] = $_columnLookup[$pString[0]] * 26 + $_columnLookup[$pString[1]]; return $_indexCache[$pString]; - } elseif(!isset($pString{3})) { - $_indexCache[$pString] = $_columnLookup[$pString{0}] * 676 + $_columnLookup[$pString{1}] * 26 + $_columnLookup[$pString{2}]; + } elseif(!isset($pString[3])) { + $_indexCache[$pString] = $_columnLookup[$pString[0]] * 676 + $_columnLookup[$pString[1]] * 26 + $_columnLookup[$pString[2]]; return $_indexCache[$pString]; } } - throw new PHPExcel_Exception("Column string index can not be " . ((isset($pString{0})) ? "longer than 3 characters" : "empty")); + throw new PHPExcel_Exception("Column string index can not be " . ((isset($pString[0])) ? "longer than 3 characters" : "empty")); } /** diff --git a/core/class/PHPExcel/Cell/DefaultValueBinder.php b/core/class/PHPExcel/Cell/DefaultValueBinder.php index f1880fa..67d8a1f 100644 --- a/core/class/PHPExcel/Cell/DefaultValueBinder.php +++ b/core/class/PHPExcel/Cell/DefaultValueBinder.php @@ -83,7 +83,7 @@ class PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder } elseif ($pValue instanceof PHPExcel_RichText) { return PHPExcel_Cell_DataType::TYPE_INLINE; - } elseif ($pValue{0} === '=' && strlen($pValue) > 1) { + } elseif ($pValue[0] === '=' && strlen($pValue) > 1) { return PHPExcel_Cell_DataType::TYPE_FORMULA; } elseif (is_bool($pValue)) { diff --git a/core/class/PHPExcel/IOFactory.php b/core/class/PHPExcel/IOFactory.php index 69ec8b6..1b0bfd6 100644 --- a/core/class/PHPExcel/IOFactory.php +++ b/core/class/PHPExcel/IOFactory.php @@ -52,8 +52,8 @@ class PHPExcel_IOFactory * @static */ private static $_searchLocations = array( - array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => 'PHPExcel_Writer_{0}' ), - array( 'type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => 'PHPExcel_Reader_{0}' ) + array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/[0].php', 'class' => 'PHPExcel_Writer_[0]' ), + array( 'type' => 'IReader', 'path' => 'PHPExcel/Reader/[0].php', 'class' => 'PHPExcel_Reader_[0]' ) ); /** @@ -112,8 +112,8 @@ class PHPExcel_IOFactory * @static * @access public * @param string $type Example: IWriter - * @param string $location Example: PHPExcel/Writer/{0}.php - * @param string $classname Example: PHPExcel_Writer_{0} + * @param string $location Example: PHPExcel/Writer/[0].php + * @param string $classname Example: PHPExcel_Writer_[0] */ public static function addSearchLocation($type = '', $location = '', $classname = '') { self::$_searchLocations[] = array( 'type' => $type, 'path' => $location, 'class' => $classname ); @@ -136,7 +136,7 @@ class PHPExcel_IOFactory // Include class foreach (self::$_searchLocations as $searchLocation) { if ($searchLocation['type'] == $searchType) { - $className = str_replace('{0}', $writerType, $searchLocation['class']); + $className = str_replace('[0]', $writerType, $searchLocation['class']); $instance = new $className($phpExcel); if ($instance !== NULL) { @@ -165,7 +165,7 @@ class PHPExcel_IOFactory // Include class foreach (self::$_searchLocations as $searchLocation) { if ($searchLocation['type'] == $searchType) { - $className = str_replace('{0}', $readerType, $searchLocation['class']); + $className = str_replace('[0]', $readerType, $searchLocation['class']); $instance = new $className(); if ($instance !== NULL) { diff --git a/core/class/PHPExcel/Reader/Excel2003XML.php b/core/class/PHPExcel/Reader/Excel2003XML.php index ce1f31d..4cea4e5 100644 --- a/core/class/PHPExcel/Reader/Excel2003XML.php +++ b/core/class/PHPExcel/Reader/Excel2003XML.php @@ -699,12 +699,12 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P // Empty R reference is the current row if ($rowReference == '') $rowReference = $rowID; // Bracketed R references are relative to the current row - if ($rowReference{0} == '[') $rowReference = $rowID + trim($rowReference,'[]'); + if ($rowReference[0] == '[') $rowReference = $rowID + trim($rowReference,'[]'); $columnReference = $cellReference[4][0]; // Empty C reference is the current column if ($columnReference == '') $columnReference = $columnNumber; // Bracketed C references are relative to the current column - if ($columnReference{0} == '[') $columnReference = $columnNumber + trim($columnReference,'[]'); + if ($columnReference[0] == '[') $columnReference = $columnNumber + trim($columnReference,'[]'); $A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference; $value = substr_replace($value,$A1CellReference,$cellReference[0][1],strlen($cellReference[0][0])); } diff --git a/core/class/PHPExcel/Reader/Excel5.php b/core/class/PHPExcel/Reader/Excel5.php index 91e0fa0..b53d27d 100644 --- a/core/class/PHPExcel/Reader/Excel5.php +++ b/core/class/PHPExcel/Reader/Excel5.php @@ -1859,7 +1859,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // offset: 0; size: 2; 0 = base 1900, 1 = base 1904 PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_WINDOWS_1900); - if (ord($recordData{0}) == 1) { + if (ord($recordData[0]) == 1) { PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_MAC_1904); } } @@ -2057,7 +2057,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // offset: 6; size: 1; Alignment and text break // bit 2-0, mask 0x07; horizontal alignment - $horAlign = (0x07 & ord($recordData{6})) >> 0; + $horAlign = (0x07 & ord($recordData[6])) >> 0; switch ($horAlign) { case 0: $objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_GENERAL); @@ -2082,7 +2082,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce break; } // bit 3, mask 0x08; wrap text - $wrapText = (0x08 & ord($recordData{6})) >> 3; + $wrapText = (0x08 & ord($recordData[6])) >> 3; switch ($wrapText) { case 0: $objStyle->getAlignment()->setWrapText(false); @@ -2092,7 +2092,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce break; } // bit 6-4, mask 0x70; vertical alignment - $vertAlign = (0x70 & ord($recordData{6})) >> 4; + $vertAlign = (0x70 & ord($recordData[6])) >> 4; switch ($vertAlign) { case 0: $objStyle->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_TOP); @@ -2110,7 +2110,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce if ($this->_version == self::XLS_BIFF8) { // offset: 7; size: 1; XF_ROTATION: Text rotation angle - $angle = ord($recordData{7}); + $angle = ord($recordData[7]); $rotation = 0; if ($angle <= 90) { $rotation = $angle; @@ -2123,11 +2123,11 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // offset: 8; size: 1; Indentation, shrink to cell size, and text direction // bit: 3-0; mask: 0x0F; indent level - $indent = (0x0F & ord($recordData{8})) >> 0; + $indent = (0x0F & ord($recordData[8])) >> 0; $objStyle->getAlignment()->setIndent($indent); // bit: 4; mask: 0x10; 1 = shrink content to fit into cell - $shrinkToFit = (0x10 & ord($recordData{8})) >> 4; + $shrinkToFit = (0x10 & ord($recordData[8])) >> 4; switch ($shrinkToFit) { case 0: $objStyle->getAlignment()->setShrinkToFit(false); @@ -2209,7 +2209,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // BIFF5 // offset: 7; size: 1; Text orientation and flags - $orientationAndFlags = ord($recordData{7}); + $orientationAndFlags = ord($recordData[7]); // bit: 1-0; mask: 0x03; XF_ORIENTATION: Text orientation $xfOrientation = (0x03 & $orientationAndFlags) >> 0; @@ -2333,7 +2333,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2349,7 +2349,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2365,7 +2365,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2381,7 +2381,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2397,7 +2397,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2413,7 +2413,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2429,7 +2429,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2445,7 +2445,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2487,7 +2487,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce if ($isBuiltIn) { // offset: 2; size: 1; identifier for built-in style - $builtInId = ord($recordData{2}); + $builtInId = ord($recordData[2]); switch ($builtInId) { case 0x00: @@ -2554,7 +2554,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $this->_pos += 4 + $length; // offset: 4; size: 1; sheet state - switch (ord($recordData{4})) { + switch (ord($recordData[4])) { case 0x00: $sheetState = PHPExcel_Worksheet::SHEETSTATE_VISIBLE; break; case 0x01: $sheetState = PHPExcel_Worksheet::SHEETSTATE_HIDDEN; break; case 0x02: $sheetState = PHPExcel_Worksheet::SHEETSTATE_VERYHIDDEN; break; @@ -2562,7 +2562,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce } // offset: 5; size: 1; sheet type - $sheetType = ord($recordData{5}); + $sheetType = ord($recordData[5]); // offset: 6; size: var; sheet name if ($this->_version == self::XLS_BIFF8) { @@ -2741,7 +2741,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // offset: 2; size: 1; keyboard shortcut // offset: 3; size: 1; length of the name (character count) - $nlen = ord($recordData{3}); + $nlen = ord($recordData[3]); // offset: 4; size: 2; size of the formula data (it can happen that this is zero) // note: there can also be additional data, this is not included in $flen @@ -3817,7 +3817,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // We can apparently not rely on $isPartOfSharedFormula. Even when $isPartOfSharedFormula = true // the formula data may be ordinary formula data, therefore we need to check // explicitly for the tExp token (0x01) - $isPartOfSharedFormula = $isPartOfSharedFormula && ord($formulaStructure{2}) == 0x01; + $isPartOfSharedFormula = $isPartOfSharedFormula && ord($formulaStructure[2]) == 0x01; if ($isPartOfSharedFormula) { // part of shared formula which means there will be a formula with a tExp token and nothing else @@ -3841,7 +3841,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xfIndex = self::_GetInt2d($recordData, 4); // offset: 6; size: 8; result of the formula - if ( (ord($recordData{6}) == 0) + if ( (ord($recordData[6]) == 0) && (ord($recordData{12}) == 255) && (ord($recordData{13}) == 255) ) { @@ -3857,23 +3857,23 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // read STRING record $value = $this->_readString(); - } elseif ((ord($recordData{6}) == 1) + } elseif ((ord($recordData[6]) == 1) && (ord($recordData{12}) == 255) && (ord($recordData{13}) == 255)) { // Boolean formula. Result is in +2; 0=false, 1=true $dataType = PHPExcel_Cell_DataType::TYPE_BOOL; - $value = (bool) ord($recordData{8}); + $value = (bool) ord($recordData[8]); - } elseif ((ord($recordData{6}) == 2) + } elseif ((ord($recordData[6]) == 2) && (ord($recordData{12}) == 255) && (ord($recordData{13}) == 255)) { // Error formula. Error code is in +2 $dataType = PHPExcel_Cell_DataType::TYPE_ERROR; - $value = self::_mapErrorCode(ord($recordData{8})); + $value = self::_mapErrorCode(ord($recordData[8])); - } elseif ((ord($recordData{6}) == 3) + } elseif ((ord($recordData[6]) == 3) && (ord($recordData{12}) == 255) && (ord($recordData{13}) == 255)) { @@ -3943,7 +3943,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // offset: 6, size: 1; not used // offset: 7, size: 1; number of existing FORMULA records for this shared formula - $no = ord($recordData{7}); + $no = ord($recordData[7]); // offset: 8, size: var; Binary token array of the shared formula $formula = substr($recordData, 8); @@ -4010,10 +4010,10 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xfIndex = self::_GetInt2d($recordData, 4); // offset: 6; size: 1; the boolean value or error value - $boolErr = ord($recordData{6}); + $boolErr = ord($recordData[6]); // offset: 7; size: 1; 0=boolean; 1=error - $isError = ord($recordData{7}); + $isError = ord($recordData[7]); $cell = $this->_phpSheet->getCell($columnString . ($row + 1)); switch ($isError) { @@ -4391,7 +4391,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce if (!$this->_readDataOnly) { // offset: 0; size: 1; pane identifier - $paneId = ord($recordData{0}); + $paneId = ord($recordData[0]); // offset: 1; size: 2; index to row of the active cell $r = self::_GetInt2d($recordData, 1); @@ -4411,17 +4411,17 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // first row '1' + last row '16384' indicates that full column is selected (apparently also in BIFF8!) if (preg_match('/^([A-Z]+1\:[A-Z]+)16384$/', $selectedCells)) { - $selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)16384$/', '${1}1048576', $selectedCells); + $selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)16384$/', '$[1]1048576', $selectedCells); } // first row '1' + last row '65536' indicates that full column is selected if (preg_match('/^([A-Z]+1\:[A-Z]+)65536$/', $selectedCells)) { - $selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)65536$/', '${1}1048576', $selectedCells); + $selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)65536$/', '$[1]1048576', $selectedCells); } // first column 'A' + last column 'IV' indicates that full row is selected if (preg_match('/^(A[0-9]+\:)IV([0-9]+)$/', $selectedCells)) { - $selectedCells = preg_replace('/^(A[0-9]+\:)IV([0-9]+)$/', '${1}XFD${2}', $selectedCells); + $selectedCells = preg_replace('/^(A[0-9]+\:)IV([0-9]+)$/', '$[1]XFD$[2]', $selectedCells); } $this->_phpSheet->setSelectedCells($selectedCells); @@ -6090,10 +6090,10 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $lr = self::_GetInt2d($subData, 2) + 1; // offset: 4; size: 1; index to first column - $fc = ord($subData{4}); + $fc = ord($subData[4]); // offset: 5; size: 1; index to last column - $lc = ord($subData{5}); + $lc = ord($subData[5]); // check values if ($fr > $lr || $fc > $lc) { @@ -6500,13 +6500,13 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce private static function _readRGB($rgb) { // offset: 0; size 1; Red component - $r = ord($rgb{0}); + $r = ord($rgb[0]); // offset: 1; size: 1; Green component - $g = ord($rgb{1}); + $g = ord($rgb[1]); // offset: 2; size: 1; Blue component - $b = ord($rgb{2}); + $b = ord($rgb[2]); // HEX notation, e.g. 'FF00FC' $rgb = sprintf('%02X%02X%02X', $r, $g, $b); diff --git a/core/class/PHPExcel/Reader/Excel5/MD5.php b/core/class/PHPExcel/Reader/Excel5/MD5.php index 946d5a0..f7f515a 100644 --- a/core/class/PHPExcel/Reader/Excel5/MD5.php +++ b/core/class/PHPExcel/Reader/Excel5/MD5.php @@ -72,7 +72,7 @@ class PHPExcel_Reader_Excel5_MD5 { $s = ''; foreach (array('a', 'b', 'c', 'd') as $i) { - $v = $this->{$i}; + $v = $this->[$i]; $s .= chr($v & 0xff); $s .= chr(($v >> 8) & 0xff); $s .= chr(($v >> 16) & 0xff); diff --git a/core/class/PHPExcel/Reader/SYLK.php b/core/class/PHPExcel/Reader/SYLK.php index cd87ce5..fc7b837 100644 --- a/core/class/PHPExcel/Reader/SYLK.php +++ b/core/class/PHPExcel/Reader/SYLK.php @@ -168,7 +168,7 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_ if ($dataType == 'C') { // Read cell value data foreach($rowData as $rowDatum) { - switch($rowDatum{0}) { + switch($rowDatum[0]) { case 'C' : case 'X' : $columnIndex = substr($rowDatum,1) - 1; @@ -257,7 +257,7 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_ if ($dataType == 'P') { $formatArray = array(); foreach($rowData as $rowDatum) { - switch($rowDatum{0}) { + switch($rowDatum[0]) { case 'P' : $formatArray['numberformat']['code'] = str_replace($fromFormats,$toFormats,substr($rowDatum,1)); break; case 'E' : @@ -267,7 +267,7 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_ break; case 'S' : $styleSettings = substr($rowDatum,1); for ($i=0;$i= PHPExcel_Cell::columnIndexFromString($beforeColumn));
- $updateRow = (($newRow{0} != '$') && ($beforeRow{0} != '$') &&
+ $updateRow = (($newRow[0] != '$') && ($beforeRow[0] != '$') &&
$newRow >= $beforeRow);
// Create new column reference
diff --git a/core/class/PHPExcel/Shared/OLE.php b/core/class/PHPExcel/Shared/OLE.php
index 9796282..67fe0fb 100644
--- a/core/class/PHPExcel/Shared/OLE.php
+++ b/core/class/PHPExcel/Shared/OLE.php
@@ -447,7 +447,7 @@ class PHPExcel_Shared_OLE
{
$rawname = '';
for ($i = 0; $i < strlen($ascii); ++$i) {
- $rawname .= $ascii{$i} . "\x00";
+ $rawname .= $ascii[$i] . "\x00";
}
return $rawname;
}
diff --git a/core/class/PHPExcel/Shared/String.php b/core/class/PHPExcel/Shared/String.php
index 49d217a..57fc630 100644
--- a/core/class/PHPExcel/Shared/String.php
+++ b/core/class/PHPExcel/Shared/String.php
@@ -526,15 +526,15 @@ class PHPExcel_Shared_String
*/
public static function utf16_decode($str, $bom_be = TRUE) {
if( strlen($str) < 2 ) return $str;
- $c0 = ord($str{0});
- $c1 = ord($str{1});
+ $c0 = ord($str[0]);
+ $c1 = ord($str[1]);
if( $c0 == 0xfe && $c1 == 0xff ) { $str = substr($str,2); }
elseif( $c0 == 0xff && $c1 == 0xfe ) { $str = substr($str,2); $bom_be = false; }
$len = strlen($str);
$newstr = '';
for($i=0;$i<$len;$i+=2) {
- if( $bom_be ) { $val = ord($str{$i}) << 4; $val += ord($str{$i+1}); }
- else { $val = ord($str{$i+1}) << 4; $val += ord($str{$i}); }
+ if( $bom_be ) { $val = ord($str[$i]) << 4; $val += ord($str[$i+1]); }
+ else { $val = ord($str[$i+1]) << 4; $val += ord($str[$i]); }
$newstr .= ($val == 0x228) ? "\n" : chr($val);
}
return $newstr;
diff --git a/core/class/PHPExcel/Shared/ZipStreamWrapper.php b/core/class/PHPExcel/Shared/ZipStreamWrapper.php
index 696072b..22a0108 100644
--- a/core/class/PHPExcel/Shared/ZipStreamWrapper.php
+++ b/core/class/PHPExcel/Shared/ZipStreamWrapper.php
@@ -81,7 +81,7 @@ class PHPExcel_Shared_ZipStreamWrapper {
*/
public function stream_open($path, $mode, $options, &$opened_path) {
// Check for mode
- if ($mode{0} != 'r') {
+ if ($mode[0] != 'r') {
throw new PHPExcel_Reader_Exception('Mode ' . $mode . ' is not supported. Only read mode is supported.');
}
diff --git a/core/class/PHPExcel/Worksheet/AutoFilter.php b/core/class/PHPExcel/Worksheet/AutoFilter.php
index 03055e1..abde9ad 100644
--- a/core/class/PHPExcel/Worksheet/AutoFilter.php
+++ b/core/class/PHPExcel/Worksheet/AutoFilter.php
@@ -726,7 +726,7 @@ class PHPExcel_Worksheet_AutoFilter
);
} else {
// Date based
- if ($dynamicRuleType{0} == 'M' || $dynamicRuleType{0} == 'Q') {
+ if ($dynamicRuleType[0] == 'M' || $dynamicRuleType[0] == 'Q') {
// Month or Quarter
sscanf($dynamicRuleType,'%[A-Z]%d', $periodType, $period);
if ($periodType == 'M') {
diff --git a/core/class/PHPExcel/Writer/Excel5/Parser.php b/core/class/PHPExcel/Writer/Excel5/Parser.php
index 04e674a..3c2853d 100644
--- a/core/class/PHPExcel/Writer/Excel5/Parser.php
+++ b/core/class/PHPExcel/Writer/Excel5/Parser.php
@@ -549,7 +549,7 @@ class PHPExcel_Writer_Excel5_Parser
return pack("C", $this->ptg[$token]);
// match error codes
- } elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $token) or $token == '#N/A') {
+ } elseif (preg_match("/^#[A-Z0\/]{3,5}[!?][1]$/", $token) or $token == '#N/A') {
return $this->_convertError($token);
// commented so argument number can be processed correctly. See toReversePolish().
@@ -1021,7 +1021,7 @@ class PHPExcel_Writer_Excel5_Parser
$col = 0;
$col_ref_length = strlen($col_ref);
for ($i = 0; $i < $col_ref_length; ++$i) {
- $col += (ord($col_ref{$i}) - 64) * pow(26, $expn);
+ $col += (ord($col_ref[$i]) - 64) * pow(26, $expn);
--$expn;
}
@@ -1043,28 +1043,28 @@ class PHPExcel_Writer_Excel5_Parser
$formula_length = strlen($this->_formula);
// eat up white spaces
if ($i < $formula_length) {
- while ($this->_formula{$i} == " ") {
+ while ($this->_formula[$i] == " ") {
++$i;
}
if ($i < ($formula_length - 1)) {
- $this->_lookahead = $this->_formula{$i+1};
+ $this->_lookahead = $this->_formula[$i+1];
}
$token = '';
}
while ($i < $formula_length) {
- $token .= $this->_formula{$i};
+ $token .= $this->_formula[$i];
if ($i < ($formula_length - 1)) {
- $this->_lookahead = $this->_formula{$i+1};
+ $this->_lookahead = $this->_formula[$i+1];
} else {
$this->_lookahead = '';
}
if ($this->_match($token) != '') {
//if ($i < strlen($this->_formula) - 1) {
- // $this->_lookahead = $this->_formula{$i+1};
+ // $this->_lookahead = $this->_formula[$i+1];
//}
$this->_current_char = $i + 1;
$this->_current_token = $token;
@@ -1175,7 +1175,7 @@ class PHPExcel_Writer_Excel5_Parser
return $token;
}
// If it's an error code
- elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $token) or $token == '#N/A')
+ elseif (preg_match("/^#[A-Z0\/]{3,5}[!?][1]$/", $token) or $token == '#N/A')
{
return $token;
}
@@ -1205,7 +1205,7 @@ class PHPExcel_Writer_Excel5_Parser
{
$this->_current_char = 0;
$this->_formula = $formula;
- $this->_lookahead = isset($formula{1}) ? $formula{1} : '';
+ $this->_lookahead = isset($formula[1]) ? $formula[1] : '';
$this->_advance();
$this->_parse_tree = $this->_condition();
return true;
@@ -1274,7 +1274,7 @@ class PHPExcel_Writer_Excel5_Parser
$this->_advance();
return $result;
// If it's an error code
- } elseif (preg_match("/^#[A-Z0\/]{3,5}[!?]{1}$/", $this->_current_token) or $this->_current_token == '#N/A'){
+ } elseif (preg_match("/^#[A-Z0\/]{3,5}[!?][1]$/", $this->_current_token) or $this->_current_token == '#N/A'){
$result = $this->_createTree($this->_current_token, 'ptgErr', '');
$this->_advance();
return $result;
diff --git a/core/class/PHPExcel/Writer/Excel5/Workbook.php b/core/class/PHPExcel/Writer/Excel5/Workbook.php
index e14bcba..8f31098 100644
--- a/core/class/PHPExcel/Writer/Excel5/Workbook.php
+++ b/core/class/PHPExcel/Writer/Excel5/Workbook.php
@@ -675,7 +675,7 @@ class PHPExcel_Writer_Excel5_Workbook extends PHPExcel_Writer_Excel5_BIFFwriter
$formulaData = $this->_parser->toReversePolish();
// make sure tRef3d is of type tRef3dR (0x3A)
- if (isset($formulaData{0}) and ($formulaData{0} == "\x7A" or $formulaData{0} == "\x5A")) {
+ if (isset($formulaData[0]) and ($formulaData[0] == "\x7A" or $formulaData[0] == "\x5A")) {
$formulaData = "\x3A" . substr($formulaData, 1);
}
diff --git a/core/class/PHPExcel/Writer/Excel5/Worksheet.php b/core/class/PHPExcel/Writer/Excel5/Worksheet.php
index 55da26f..bf2311f 100644
--- a/core/class/PHPExcel/Writer/Excel5/Worksheet.php
+++ b/core/class/PHPExcel/Writer/Excel5/Worksheet.php
@@ -904,7 +904,7 @@ class PHPExcel_Writer_Excel5_Worksheet extends PHPExcel_Writer_Excel5_BIFFwriter
$unknown = 0x0000; // Must be zero
// Strip the '=' or '@' sign at the beginning of the formula string
- if ($formula{0} == '=') {
+ if ($formula[0] == '=') {
$formula = substr($formula,1);
} else {
// Error handling
diff --git a/core/class/cache/cache_file.php b/core/class/cache/cache_file.php
index 3c964ff..5aca998 100644
--- a/core/class/cache/cache_file.php
+++ b/core/class/cache/cache_file.php
@@ -67,7 +67,7 @@ class ultrax_cache {
function get_cache_file_path($key) {
static $cache_path = null;
if(!isset($cache_path[$key])) {
- $dir = hexdec($key{0}.$key{1}.$key{2}) % 1000;
+ $dir = hexdec($key[0].$key[1].$key[2]) % 1000;
$cache_path[$key] = $this->conf['path'].'/'.$dir.'/'.$key.'.php';
}
return $cache_path[$key];
diff --git a/core/class/class_Chinese.php b/core/class/class_Chinese.php
index b5ddf99..1228cc4 100644
--- a/core/class/class_Chinese.php
+++ b/core/class/class_Chinese.php
@@ -64,6 +64,9 @@ class Chinese {
} elseif($this->config['SourceLang'] == 'BIG5' || $this->config['TargetLang'] == 'BIG5') {
$this->table = CODETABLE_DIR.$this->config['BIG5toUnicode_table'];
}
+ if(!$this->table) {
+ return;
+ }
$fp = fopen($this->table, 'rb');
$tabletmp = fread($fp, filesize($this->table));
for($i = 0; $i < strlen($tabletmp); $i += 4) {
diff --git a/core/class/class_FileDownload.php b/core/class/class_FileDownload.php
index ba2859c..92a22bd 100644
--- a/core/class/class_FileDownload.php
+++ b/core/class/class_FileDownload.php
@@ -20,9 +20,12 @@ class FileDownload{ // class start
* @param boolean $reload 是否开启断点续传
*/
public function download($file, $name='',$file_size=0,$dateline=0, $reload=false){
- if($name==''){
- $name = basename($file);
- }
+ if (is_array($file) && isset($file['error'])) {
+ topshowmessage(lang('file_not_exist1'));
+ }
+ if($name==''){
+ $name = basename($file);
+ }
if(!$dateline){
$dataline=TIMESTAMP;
}
@@ -35,12 +38,21 @@ class FileDownload{ // class start
if(getglobal('gzipcompress')) @ob_start('ob_gzhandler');
if(!$file_size) $file_size = filesize($file);
$ranges = $this->getRange($file_size);
-
- header('cache-control:public');
- header('Date: '.gmdate('D, d M Y H:i:s', $dateline).' GMT');
- header('Last-Modified: '.gmdate('D, d M Y H:i:s', $dateline).' GMT');
- header('content-type:application/octet-stream');
- header('content-disposition:attachment; filename='.$name);
+ $charset = CHARSET;
+ header('cache-control:public');
+ header('Date: '.gmdate('D, d M Y H:i:s', $dateline).' GMT');
+ header('Last-Modified: '.gmdate('D, d M Y H:i:s', $dateline).' GMT');
+ header('content-type:application/octet-stream');
+ if (preg_match("/Firefox/", $_SERVER["HTTP_USER_AGENT"])) {
+ $attachment = 'attachment; filename*='.$charset.'\'\'' . $name;
+ } elseif (!preg_match("/Chrome/", $_SERVER["HTTP_USER_AGENT"]) && preg_match("/Safari/", $_SERVER["HTTP_USER_AGENT"])) {
+ $name = trim($name,'"');
+ $filename = rawurlencode($name); // 注意：rawurlencode与urlencode的区别
+ $attachment = 'attachment; filename*='.$charset.'\'\'' . $filename;
+ } else{
+ $attachment = 'attachment; filename='.$name;
+ }
+ header('content-disposition:'.$attachment);
if($reload && $ranges!=null){ // 使用续传
header('HTTP/1.1 206 Partial Content');
header('Accept-Ranges:bytes');
diff --git a/core/class/class_GifMerge.php b/core/class/class_GifMerge.php
index b4000b6..20c08d7 100644
--- a/core/class/class_GifMerge.php
+++ b/core/class/class_GifMerge.php
@@ -3,7 +3,6 @@
if(!defined('IN_DZZ')) {
exit('Access Denied');
}
-
class GifMerge {
var $ver = '1.1';
var $dly = 50;
@@ -286,7 +285,7 @@ class GifMerge {
function arrcmp($b, $s, $l) {
for($i = 0; $i < $l; $i++) {
- if($s{$i} != $b{$i}) {
+ if($s[$i] != $b[$i]) {
return false;
}
}
diff --git a/core/class/class_core.php b/core/class/class_core.php
index 6f7db91..f6d7ebe 100644
--- a/core/class/class_core.php
+++ b/core/class/class_core.php
@@ -2,6 +2,7 @@
if(!defined('IN_DZZ')) {
exit('Access Denied');
}
+
class core
{
private static $_tables;
@@ -104,7 +105,10 @@ class core
}
public static function import($name, $folder = '', $force = true) {
-
+ //如果文件名为空或者false，阻止向下进行
+ if(preg_match('/^\s*$/',$name) || $name == false){
+ return false;
+ }
$key = $folder.$name;
if(!isset(self::$_imports[$key])) {
if($folder){
diff --git a/core/class/class_image.php b/core/class/class_image.php
index a4754cf..eaba0de 100644
--- a/core/class/class_image.php
+++ b/core/class/class_image.php
@@ -181,6 +181,10 @@ class image {
$this->imagecreatefromfunc = function_exists('imagecreatefrompng') ? 'imagecreatefrompng' : '';
$this->imagefunc = function_exists('imagepng') ? 'imagepng' : '';
break;
+ case 'image/webp':
+ $this->imagecreatefromfunc = function_exists('imagecreatefromwebp') ? 'imagecreatefromwebp' : '';
+ $this->imagefunc = function_exists('imagewebp') ? 'imagewebp' : '';
+ break;
}
} else {
$this->imagecreatefromfunc = $this->imagefunc = TRUE;
@@ -196,6 +200,20 @@ class image {
$content = fread($fp, $this->imginfo['size']);
fclose($fp);
$this->imginfo['animated'] = strpos($content, 'NETSCAPE2.0') === FALSE ? 0 : 1;
+ } elseif(!$this->libmethod && $this->imginfo['mime'] == 'image/webp') {
+ if(!$this->imagecreatefromfunc) {
+ return -4;
+ }
+ if(!($fp = @fopen($source, 'rb'))) {
+ return -2;
+ }
+ $content = fread($fp, 40);
+ fclose($fp);
+ if (stripos($content, 'WEBPVP8X') !== FALSE && stripos($content, 'ANIM') !== FALSE) {
+ $this->imginfo['animated'] = 1;
+ }else{
+ $this->imginfo['animated'] = 0;
+ }
}
return $this->imagecreatefromfunc ? 1 : -4;
@@ -277,9 +295,11 @@ class image {
return $attach_photo;
}
//@ini_set('memory_limit','512M');
- $copy_photo = imagecreatetruecolor($this->imginfo['width'], $this->imginfo['height']);
- imagecopy($copy_photo, $attach_photo ,0, 0, 0, 0, $this->imginfo['width'], $this->imginfo['height']);
- $attach_photo = $copy_photo;
+ if($this->imginfo['mime'] != 'image/png') {
+ $copy_photo = imagecreatetruecolor($this->imginfo['width'], $this->imginfo['height']);
+ imagecopy($copy_photo, $attach_photo , 0, 0, 0, 0, $this->imginfo['width'], $this->imginfo['height']);
+ $attach_photo = $copy_photo;
+ }
$thumb_photo = null;
switch($this->param['thumbtype']) {
@@ -291,6 +311,10 @@ class image {
$cx = $this->imginfo['width'];
$cy = $this->imginfo['height'];
$thumb_photo = imagecreatetruecolor($thumb['width'], $thumb['height']);
+ if($this->imginfo['mime'] == 'image/png') {
+ imagealphablending($thumb_photo, false);
+ imagesavealpha($thumb_photo, true);
+ }
imagecopyresampled($thumb_photo, $attach_photo ,0, 0, 0, 0, $thumb['width'], $thumb['height'], $cx, $cy);
}
break;
@@ -301,9 +325,17 @@ class image {
$dst_photo = imagecreatetruecolor($cutw, $cuth);
imagecopymerge($dst_photo, $attach_photo, 0, 0, $startx, $starty, $cutw, $cuth, 100);
$thumb_photo = imagecreatetruecolor($this->param['thumbwidth'], $this->param['thumbheight']);
+ if($this->imginfo['mime'] == 'image/png') {
+ imagealphablending($thumb_photo, false);
+ imagesavealpha($thumb_photo, true);
+ }
imagecopyresampled($thumb_photo, $dst_photo ,0, 0, 0, 0, $this->param['thumbwidth'], $this->param['thumbheight'], $cutw, $cuth);
} else {
$thumb_photo = imagecreatetruecolor($this->param['thumbwidth'], $this->param['thumbheight']);
+ if($this->imginfo['mime'] == 'image/png') {
+ imagealphablending($thumb_photo, false);
+ imagesavealpha($thumb_photo, true);
+ }
$bgcolor = imagecolorallocate($thumb_photo, 255, 255, 255);
imagefill($thumb_photo, 0, 0, $bgcolor);
$startx = ($this->param['thumbwidth'] - $this->imginfo['width']) / 2;
@@ -357,9 +389,9 @@ class image {
$im->readImage(realpath($this->target));
$im->setImageCompressionQuality($this->param['thumbquality']);
$im->thumbnailImage($this->param['thumbwidth'], $this->param['thumbheight']);
- $im->resizeImage($this->param['thumbwidth'], $this->param['thumbheight']);
+ $im->resizeImage($this->param['thumbwidth'], $this->param['thumbheight'], imagick::FILTER_LANCZOS, 1, true);
$im->setGravity(imagick::GRAVITY_CENTER );
- $im->extentImage($this->param['thumbwidth'], $this->param['thumbheight']);
+ $im->extentImage($this->param['thumbwidth'], $this->param['thumbheight'], 0, 0);
if(!$im->writeImage($this->target)) {
$im->destroy();
@@ -383,7 +415,7 @@ class image {
$im->setImageCompressionQuality($this->param['thumbquality']);
$im->thumbnailImage($this->param['thumbwidth'], $this->param['thumbheight']);
$im->setGravity(imagick::GRAVITY_CENTER );
- $im->extentImage($this->param['thumbwidth'], $this->param['thumbheight']);
+ $im->extentImage($this->param['thumbwidth'], $this->param['thumbheight'], 0, 0);
if(!$im->writeImage($this->target)) {
$im->destroy();
return -3;
diff --git a/core/class/class_pinyin.php b/core/class/class_pinyin.php
index 5df51c8..fc977c0 100644
--- a/core/class/class_pinyin.php
+++ b/core/class/class_pinyin.php
@@ -46,9 +46,9 @@ class pinyin {
$sGBK = iconv('UTF-8', 'GBK', $utf8Data);
$aBuf = array();
for ($i=0, $iLoop=strlen($sGBK); $i<$iLoop; $i++) {
- $iChr = ord($sGBK{$i});
+ $iChr = ord($sGBK[$i]);
if ($iChr>160)
- $iChr = ($iChr<<8) + ord($sGBK{++$i}) - 65536;
+ $iChr = ($iChr<<8) + ord($sGBK[++$i]) - 65536;
if ('head' === $sRetFormat)
$aBuf[] = substr(self::zh2py($iChr),0,1);
else
diff --git a/core/class/class_template.php b/core/class/class_template.php
index 8acdc44..00e7603 100644
--- a/core/class/class_template.php
+++ b/core/class/class_template.php
@@ -97,21 +97,41 @@ class template {
}
//解析模板路径
private function parse_tplfile($tplfile, $tpldir = '',$master_template = false,$nomasttplfile = false){
- if(!$tpldir){
- if( defined('CURSCRIPT') && defined('CURMODULE') && file_exists (DZZ_ROOT.'./'.CURSCRIPT.'/'.CURMODULE.'/template/'.$tplfile.'.htm')){
- $tpldir= './'.CURSCRIPT.'/'.CURMODULE.'/template/';
- if($master_template)$this->tplkey=CURSCRIPT.'_'.str_replace('/','_',CURMODULE);
- }elseif(defined('CURSCRIPT') && file_exists (DZZ_ROOT.'./'.CURSCRIPT.'/template/'.$tplfile.'.htm')){
- $tpldir= './'.CURSCRIPT.'/template/';
- if($master_template)$this->tplkey=CURSCRIPT;
- }elseif(file_exists (DZZ_ROOT.'./core/template/default/'.$tplfile.'.htm')){
- $tpldir= './core/template/default/';
- if($master_template)$this->tplkey='core';
- }elseif(file_exists (DZZ_ROOT.'./core/template/default/common/'.$tplfile.'.htm')){
- $tpldir= './core/template/default/common/';
- if($master_template)$this->tplkey='corecommon';
- }
- }
+ if ($tpldir) {
+ if (strpos($tpldir, '/') !== false) {
+ $tpldirkey = str_replace('/', '_', $tpldir);
+ }else{
+ $tpldirkey = $tpldir;
+ }
+ }
+ if($tpldir && defined('CURSCRIPT') && defined('CURMODULE') && file_exists (DZZ_ROOT.'./'.CURSCRIPT.'/'.CURMODULE.'/template/'.$tpldir.'/'.$tplfile.'.htm')){
+ $tpldir= './'.CURSCRIPT.'/'.CURMODULE.'/template/'.$tpldir.'/';
+ if($master_template)$this->tplkey=CURSCRIPT.'_'.str_replace('/','_',CURMODULE).'_'.$tpldirkey;
+ }elseif(defined('CURSCRIPT') && defined('CURMODULE') && file_exists (DZZ_ROOT.'./'.CURSCRIPT.'/'.CURMODULE.'/template/'.$tplfile.'.htm')){
+ $tpldir= './'.CURSCRIPT.'/'.CURMODULE.'/template/';
+ if($master_template)$this->tplkey=CURSCRIPT.'_'.str_replace('/','_',CURMODULE);
+ }elseif($tpldir && defined('CURSCRIPT') && file_exists (DZZ_ROOT.'./'.CURSCRIPT.'/template/'.$tpldir.'/'.$tplfile.'.htm')){
+ $tpldir= './'.CURSCRIPT.'/template/'.$tpldir.'/';
+ if($master_template)$this->tplkey=CURSCRIPT.'_'.$tpldirkey;
+ }elseif(defined('CURSCRIPT') && file_exists (DZZ_ROOT.'./'.CURSCRIPT.'/template/'.$tplfile.'.htm')){
+ $tpldir= './'.CURSCRIPT.'/template/';
+ if($master_template)$this->tplkey=CURSCRIPT;
+ }elseif($tpldir && file_exists (DZZ_ROOT.'./core/template/'.$tpldir.'/'.$tplfile.'.htm')){
+ $tpldir= './core/template/'.$tpldir.'/';
+ if($master_template)$this->tplkey='core'.'_'.$tpldirkey;
+ }elseif($tpldir && file_exists (DZZ_ROOT.'./core/template/'.$tpldir.'/common/'.$tplfile.'.htm')){
+ $tpldir= './core/template/'.$tpldir.'/common/';
+ if($master_template)$this->tplkey='corecommon'.'_'.$tpldirkey;
+ }elseif(file_exists (DZZ_ROOT.'./core/template/'.$tplfile.'.htm')){
+ $tpldir= './core/template/';
+ if($master_template)$this->tplkey='core';
+ }elseif(file_exists (DZZ_ROOT.'./core/template/default/'.$tplfile.'.htm')){
+ $tpldir= './core/template/default/';
+ if($master_template)$this->tplkey='core';
+ }elseif(file_exists (DZZ_ROOT.'./core/template/default/common/'.$tplfile.'.htm')){
+ $tpldir= './core/template/default/common/';
+ if($master_template)$this->tplkey='corecommon';
+ }
$file = $tplfile;
$tplfile = $tpldir.$tplfile.'.htm';
$basefile = basename(DZZ_ROOT . $tplfile, '.htm');
@@ -134,7 +154,13 @@ class template {
}
//读取模板内容
private function parse_template_include($tpl){
- $template = $this->parse_tplfile($tpl,'',false,true);
+ global $_G;
+ if(strpos($tpl, ':') !== false) {
+ list($templateid, $tpl) = explode(':', $tpl);
+ $tpldir = $templateid;
+ $tpl = $tpl;
+ }
+ $template = $this->parse_tplfile($tpl,$tpldir,false,true);
$this->includeTemplate[$template] = filemtime($template);
if(!is_file($template) || !$fp = fopen($template, 'r')){
return;
@@ -147,9 +173,7 @@ class template {
$template = str_replace('self.$', 'self.＄', $template);
$var_regexp = "((?!\\\$[a-zA-Z]+\()(\\\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\-\>)?[a-zA-Z0-9_\x7f-\xff]*)(\[[a-zA-Z0-9_\-\.\"\'\[\]\$\x7f-\xff]+\])*)";
$const_regexp = "([A-Z_\x7f-\xff][A-Z0-9_\x7f-\xff]*)";
-
$template = preg_replace("/([\n\r]+)\t+/s", "\\1", $template);
-
$template = preg_replace("/\<\!\-\-\{(.+?)\}\-\-\>/s", "{\\1}", $template);
// js的lang替换
$template = preg_replace_callback("/]+?src=\"(.+?)\".*?>[\s\S]*?/is", array($this, 'parse_template_callback_javascript'), $template);
@@ -178,9 +202,7 @@ class template {
$template = preg_replace_callback("/[\n\r\t]*\{Hook\s+([\w]+)\#(.+?)\#\}[\n\r\t]*/is", array($this, 'parse_template_callback_hook_1'), $template);//钩子解析,传参形式
$template = preg_replace_callback("/$var_regexp/s", array($this, 'parse_template_callback_addquote_1'), $template);
$template = preg_replace_callback("/\<\?\=\<\?\=$var_regexp\?\>\?\>/s", array($this, 'parse_template_callback_addquote_1'), $template);
-
$template = preg_replace_callback("/[\n\r\t]*\{echo\s+(.+?)\}[\n\r\t]*/is", array($this, 'parse_template_callback_stripvtags_echo1'), $template);
-
$template = preg_replace_callback("/([\n\r\t]*)\{if\s+(.+?)\}([\n\r\t]*)/is", array($this, 'parse_template_callback_stripvtags_if123'), $template);
$template = preg_replace_callback("/([\n\r\t]*)\{elseif\s+(.+?)\}([\n\r\t]*)/is", array($this, 'parse_template_callback_stripvtags_elseif123'), $template);
$template = preg_replace("/\{else\}/i", "", $template);
@@ -188,13 +210,11 @@ class template {
$template = preg_replace_callback("/[\n\r\t]*\{loop\s+(\S+)\s+(\S+)\}[\n\r\t]*/is", array($this, 'parse_template_callback_stripvtags_loop12'), $template);
$template = preg_replace_callback("/[\n\r\t]*\{loop\s+(\S+)\s+(\S+)\s+(\S+)\}[\n\r\t]*/is", array($this, 'parse_template_callback_stripvtags_loop123'), $template);
$template = preg_replace("/\{\/loop\}/i", "", $template);
-
$template = preg_replace("/\{$const_regexp\}/s", "", $template);
if (!empty($this -> replacecode)) {
$template = str_replace($this -> replacecode['search'], $this -> replacecode['replace'], $template);
}
$template = preg_replace("/ \?\>[\n\r]*\<\? /s", " ", $template);
-
$template = preg_replace_callback("/\"(http)?[\w\.\/:]+\?[^\"]+?&[^\"]+?\"/", array($this, 'parse_template_callback_transamp_0'), $template);
$template = preg_replace_callback("/\]*?src=\"(.+?)\"(.*?)\>\s*\<\/script\>/is", array($this, 'parse_template_callback_stripscriptamp_12'), $template);
$template = preg_replace_callback("/[\n\r\t]*\{block\s+([a-zA-Z0-9_\[\]]+)\}(.+?)\{\/block\}/is", array($this, 'parse_template_callback_stripblock_12'), $template);
@@ -275,7 +295,7 @@ class template {
function parse_template_callback_hooktags_13($matches) {
- return $this -> hooktags($matches[1], $matches[3]);
+ return $this->hooktags($matches[1], isset($matches[3]) ? $matches[3] : '');
}
function parse_template_callback_addquote_1($matches) {
@@ -396,10 +416,10 @@ class template {
if (!isset($langvar[$var])) {
$this -> language['inner'] = lang();
}
- if (isset($langvar[$var])) {
+ if(isset($langvar[$var])) {
return $langvar[$var];
} else {
- return $var ;
+ return $var;
}
}
// 模版lang替换
@@ -549,7 +569,6 @@ class template {
}
return;
}
-
function transamp($str) {
$str = str_replace('&', '&', $str);
$str = str_replace('&', '&', $str);
diff --git a/core/class/class_uploadhandler.php b/core/class/class_uploadhandler.php
index e5f26a0..e3a411b 100644
--- a/core/class/class_uploadhandler.php
+++ b/core/class/class_uploadhandler.php
@@ -1281,6 +1281,8 @@ class UploadHandler
return 'image/jpeg';
case 'png':
return 'image/png';
+ case 'webp':
+ return 'image/webp';
case 'gif':
return 'image/gif';
default:
diff --git a/core/class/class_xml.php b/core/class/class_xml.php
index c244302..c4ce22a 100644
--- a/core/class/class_xml.php
+++ b/core/class/class_xml.php
@@ -10,7 +10,7 @@ function xml2array(&$xml, $isnormal = FALSE,$encodeing='ISO-8859-1') {
return $data;
}
-function xmlattribute( $xml, $encodeing='ISO-8859-1') {
+function xmlattribute($xml, $encodeing='ISO-8859-1') {
$xml = str_replace($encodeing, 'UTF-8', $xml);
libxml_disable_entity_loader(true);
$values = json_decode(json_encode(simplexml_load_string($xml, 'SimpleXMLElement')), true);
@@ -20,16 +20,16 @@ function xmlattribute( $xml, $encodeing='ISO-8859-1') {
return $data;
}
-function attribute2arr( $values,$data=array() ){
+function attribute2arr($values,$data=array() ){
foreach( $values as $k=>$v ){
if( isset($v["item"]) ){
$return = attribute2arr($v["item"]);
if($return) $data[$v['@attributes']["id"]]=$return ;
}
- if( count($v['@attributes'])>1 ){
- $data[$v['@attributes']["id"]]["_attributes"]=$v['@attributes'];
- unset($data[$v['@attributes']["id"]]["_attributes"]["id"]);
- }
+ if(count($v['@attributes'])>1){
+ $data[$v['@attributes']["id"]]["_attributes"] = $v['@attributes'];
+ unset($data[$v['@attributes']["id"]]["_attributes"]["id"]);
+ }
}
return $data;
}
diff --git a/core/class/dzz/apprun.php b/core/class/dzz/apprun.php
index 023976c..f03283c 100644
--- a/core/class/dzz/apprun.php
+++ b/core/class/dzz/apprun.php
@@ -5,7 +5,7 @@ use \core as C;
class Apprun{
- public function run(){
+ public function run(){
global $_config;
diff --git a/core/class/dzz/dzz_admincp.php b/core/class/dzz/dzz_admincp.php
index c718043..a55df58 100644
--- a/core/class/dzz/dzz_admincp.php
+++ b/core/class/dzz/dzz_admincp.php
@@ -48,7 +48,7 @@ class dzz_admincp
$this->sessionlimit = TIMESTAMP - $this->sessionlife;
$this->check_cpaccess();
- if( $_GET['mod']!="systemlog"){
+ if($_GET['mod']!="systemlog"){
$this->writecplog();
}
diff --git a/core/class/dzz/dzz_app.php b/core/class/dzz/dzz_app.php
index 6b2c873..9a0031a 100644
--- a/core/class/dzz/dzz_app.php
+++ b/core/class/dzz/dzz_app.php
@@ -50,7 +50,7 @@ class dzz_app extends dzz_base{
return $object;
}
- public function __construct($params) {
+ public function __construct($params=array()) {
foreach($params as $k=>$v){
$this->$k = $v;
}
@@ -77,11 +77,21 @@ class dzz_app extends dzz_base{
public function init() {
if(!$this->initated) {
- $this->_init_setting();
- $this->_init_user();
- $this->_init_session();
- $this->_init_cron();
- $this->_init_misc();
+ if($this->init_setting){
+ $this->_init_setting();
+ }
+ if($this->init_user){
+ $this->_init_user();
+ }
+ if($this->init_session){
+ $this->_init_session();
+ }
+ if($this->init_cron){
+ $this->_init_cron();
+ }
+ if($this->init_misc){
+ $this->_init_misc();
+ }
}
$this->initated = true;
}
@@ -181,9 +191,10 @@ class dzz_app extends dzz_base{
}
$_G['browser']=helper_browser::getbrowser();
$_G['platform']=helper_browser::getplatform();
+ $ismobile=helper_browser::ismobile();
+ if($ismobile) define('IN_MOBILE',$ismobile);
+ $_G['ismobile'] = $ismobile;
$this->var = & $_G;
-
-
}
private function is_HTTPS(){
if($_SERVER['HTTPS'] === 1){ //Apache
@@ -447,6 +458,7 @@ class dzz_app extends dzz_base{
if($this->var['uid'] && !$sessionclose && ($this->session->isnew || ($this->session->get('lastactivity') + 600) < TIMESTAMP)) {
$this->session->set('lastactivity', TIMESTAMP);
+ $this->session->update();
if($this->session->isnew) {
if($this->var['member']['lastip'] && $this->var['member']['lastvisit']) {
dsetcookie('lip', $this->var['member']['lastip'].','.$this->var['member']['lastvisit']);
@@ -576,8 +588,11 @@ class dzz_app extends dzz_base{
} else {
$closedreason = C::t('setting')->fetch('closedreason');
$closedreason = str_replace(':', ':', $closedreason);
- dheader("Location: user.php?mod=login");
-
+ if ($this->var['uid']) {
+ dheader("Location: user.php?mod=profile");
+ } else {
+ dheader("Location: user.php?mod=login");
+ }
}
}
if(isset($this->var['setting']['nocacheheaders']) && $this->var['setting']['nocacheheaders']) {
@@ -592,6 +607,7 @@ class dzz_app extends dzz_base{
}
private function _init_setting() {
+ global $_G;
if($this->init_setting) {
if(empty($this->var['setting'])) {
$this->cachelist[] = 'setting';
@@ -604,9 +620,8 @@ class dzz_app extends dzz_base{
!empty($this->cachelist) && loadcache($this->cachelist);
if(!is_array($this->var['setting'])) {
- $this->var['setting'] = array();
+ $this->var['setting'] =C::t('setting')->fetch_all();
}
- if($ismobile=helper_browser::ismobile()) define('IN_MOBILE',$ismobile);
define('VERHASH',isset($this->var['setting']['verhash'])?$this->var['setting']['verhash']:random(3));
}
diff --git a/core/class/dzz/dzz_error.php b/core/class/dzz/dzz_error.php
index 3cf76eb..a25ae53 100644
--- a/core/class/dzz/dzz_error.php
+++ b/core/class/dzz/dzz_error.php
@@ -13,18 +13,14 @@ class dzz_error
}
list($showtrace, $logtrace) = dzz_error::debug_backtrace();
-
+ $messagesave = ''.$message.'
PHP:'.$logtrace; + $BackTraceID = md5(dzz_error::clear($messagesave)); if($save) { - $messagesave = ''.$message.'
PHP:'.$logtrace; - dzz_error::write_error_log($messagesave); + dzz_error::write_error_log($messagesave.' BackTraceID:'.$BackTraceID); } if($show) { - if(!defined('IN_MOBILE')) { - dzz_error::show_error('system', "
ERR: $dberror
"; @@ -98,8 +91,9 @@ class dzz_error } $errormsg .= "
"; $errormsg .= 'PHP: '.$logtrace; - - dzz_error::write_error_log($errormsg); + $BackTraceID = md5(dzz_error::clear($errormsg)); + dzz_error::write_error_log($errormsg.' BackTraceID:'.$BackTraceID); + dzz_error::show_error('db', $msg, $showtrace, '', $BackTraceID); exit(); } @@ -128,6 +122,7 @@ class dzz_error krsort($trace); $trace[] = array('file'=>$exception->getFile(), 'line'=>$exception->getLine(), 'function'=> 'break'); + $logmsg = ''; $phpmsg = array(); foreach ($trace as $error) { if(!empty($error['function'])) { @@ -148,7 +143,12 @@ class dzz_error $fun .= (defined('DZZ_DEBUG') && DZZ_DEBUG) ? $arg : '%d'; } elseif(is_float($arg)) { $fun .= (defined('DZZ_DEBUG') && DZZ_DEBUG) ? $arg : '%f'; - } else { + } elseif(is_resource($arg)) { + $fun .= (defined('DZZ_DEBUG') && DZZ_DEBUG) ? 'Resource' : '%f'; + } elseif(is_object($arg)) { + $fun .= (defined('DZZ_DEBUG') && DZZ_DEBUG) ? 'Object' : '%f'; + } else { + $arg = (string)$arg; $fun .= (defined('DZZ_DEBUG') && DZZ_DEBUG) ? '\''.dhtmlspecialchars(substr(self::clear($arg), 0, 10)).(strlen($arg) > 10 ? ' ...' : '').'\'' : '%s'; } $mark = ', '; @@ -163,34 +163,46 @@ class dzz_error 'line' => $error['line'], 'function' => $error['function'], ); + $file = str_replace(array(DZZ_ROOT, '\\'), array('', '/'), $error['file']); + $func = isset($error['class']) ? $error['class'] : ''; + $func .= isset($error['type']) ? $error['type'] : ''; + $func .= isset($error['function']) ? $error['function'] : ''; + $line = sprintf('%04d', $error['line']); + $logmsg .= (!empty($logmsg) ? ' -> ' : '').$file.'#'.$func.':'.$line; } - - self::show_error($type, $errormsg, $phpmsg); + $messagesave = ''.$errormsg.'
PHP:'.$logmsg; + $BackTraceID = md5(dzz_error::clear($messagesave)); + self::write_error_log($messagesave.' BackTraceID:'.$BackTraceID); + self::show_error($type, $errormsg, $phpmsg, '', $BackTraceID); exit(); } - public static function show_error($type, $errormsg, $phpmsg = '', $typemsg = '') { + public static function show_error($type, $errormsg, $phpmsg = '', $typemsg = '', $backtraceid = '') { global $_G; - ob_end_clean(); $gzip = getglobal('gzipcompress'); ob_start($gzip ? 'ob_gzhandler' : null); - $cur_url = $_SERVER['REQUEST_URI']; + header("HTTP/1.1 503 Service Temporarily Unavailable"); + header("Status: 503 Service Temporarily Unavailable"); + header("Retry-After: 3600"); $host = $_SERVER['HTTP_HOST']; $title = $type == 'db' ? 'Database' : 'System'; echo <<
+
$host - $title Error
-
+
+
+
+
-
-
-
-
-
-
-EOT;
- $exit && exit();
}
public static function clear($message) {
diff --git a/core/class/dzz/dzz_notification.php b/core/class/dzz/dzz_notification.php
index 557ebb1..1d7bcbd 100644
--- a/core/class/dzz/dzz_notification.php
+++ b/core/class/dzz/dzz_notification.php
@@ -29,9 +29,7 @@ class dzz_notification {
$title=lang($note.'_title',$notevars,'',$langfolder);
$oldnote = array();
- //if($notevars['from_id'] && $notevars['from_idtype']) {
- $oldnote = C::t('notification')->fetch_by_fromid_uid_type($notevars['from_id'], $notevars['from_idtype'], $touid,$type);
- //}
+ $oldnote = C::t('notification')->fetch_by_fromid_uid_type($notevars['from_id'], $notevars['from_idtype'], $touid,$type);
if(empty($oldnote['from_num'])) $oldnote['from_num'] = 0;
$notevars['from_num'] = (isset($notevars['from_num'])&& $notevars['from_num']) ? $notevars['from_num'] : 1;
@@ -52,10 +50,6 @@ class dzz_notification {
'from_num' => ($oldnote['from_num']+$notevars['from_num']),
'category'=>$category
);
- /*if($category==1) {
- $setarr['authorid'] = 0;
- $setarr['author'] = '';
- }*/
if($oldnote['id']) {
$setarr['id']=$oldnote['id'];
C::t('notification')->update($oldnote['id'], $setarr);
diff --git a/core/class/dzz/modrun.php b/core/class/dzz/modrun.php
index 58cf9d3..c1ce134 100644
--- a/core/class/dzz/modrun.php
+++ b/core/class/dzz/modrun.php
@@ -48,7 +48,7 @@ class Modrun{
//加载文件
private static function loadFile($files = null){
-
+ global $_config,$_G;
if(is_array($files)){
foreach($files as $v){
diff --git a/core/class/helper/helper_browser.php b/core/class/helper/helper_browser.php
index af089a7..daa20b6 100644
--- a/core/class/helper/helper_browser.php
+++ b/core/class/helper/helper_browser.php
@@ -123,6 +123,8 @@ class helper_browser
return 'iPhone';
} elseif (preg_match("/ipod/i", $agent) && preg_match("/mac os/i", $agent)) {
return 'iPod';
+ } elseif (preg_match("/ipad/i", $agent) && preg_match("/mac os/i", $agent)) {
+ return 'iPad';
} elseif (preg_match("/linux/i", $agent) && preg_match("/Android/i", $agent)) {
return 'Android';
}
diff --git a/core/class/helper/helper_page.php b/core/class/helper/helper_page.php
index 026c1e8..3b777bc 100644
--- a/core/class/helper/helper_page.php
+++ b/core/class/helper/helper_page.php
@@ -75,11 +75,11 @@ class helper_page {
}
}
$_G['page_next'] = $to;
- $multipage = ($curpage - $offset > 1 && $pages > $page ? '
';
+ return '';
}else{//没有上传头像，使用背景+首字母
if($uid){
if($headercolors[$uid]) $headerColor=$headercolors[$uid];
@@ -707,7 +712,7 @@ function avatar_group($gid,$groupcolors=array(),$class='iconFirstWord'){
if($groupcolors[$gid]){
if($groupcolor = $groupcolors[$gid]['aid']){
if(preg_match('/^\#.+/',$groupcolor)){
- return ''.strtoupper(new_strsubstr($groupcolors[$gid]['orgname'],1,'')).'';
+ return ''.strtoupper(new_strsubstr($groupcolors[$gid]['orgname'],1,'')).'';
}elseif(preg_match('/^\d+$/',$groupcolor) && $groupcolors > 0){
return '.' "'.$groupcolors[$gid]['orgname'].'")
';
}
@@ -715,15 +720,15 @@ function avatar_group($gid,$groupcolors=array(),$class='iconFirstWord'){
$colorkey = rand(1,15);
$groupcolor = $colors[$colorkey];
C::t('organization')->update($gid,array('aid'=>$groupcolor));
- return ''.strtoupper(new_strsubstr($groupcolors[$gid]['orgname'],1,'')).'';
+ return ''.strtoupper(new_strsubstr($groupcolors[$gid]['orgname'],1,'')).'';
}
}else{
if(!$groupinfo = C::t('organization')->fetch($gid)){
- return '';
+ return '';
}
if($groupinfo['aid']){
if(preg_match('/^\#.+/',$groupinfo['aid'])){
- return ''.strtoupper(new_strsubstr($groupinfo['orgname'],1,'')).'';
+ return ''.strtoupper(new_strsubstr($groupinfo['orgname'],1,'')).'';
}elseif(preg_match('/^\d+$/',$groupinfo['aid']) && $groupinfo['aid'] > 0){
return '.' "'.$groupinfo['orgname'].'")
';
}
@@ -732,7 +737,7 @@ function avatar_group($gid,$groupcolors=array(),$class='iconFirstWord'){
$colorkey = rand(1,15);
$groupcolor = $colors[$colorkey];
C::t('organization')->update($gid,array('aid'=>$groupcolor));
- return ''.strtoupper(new_strsubstr($groupinfo['orgname'],1,'')).'';
+ return ''.strtoupper(new_strsubstr($groupinfo['orgname'],1,'')).'';
}
}
}
@@ -852,9 +857,7 @@ function lang($langvar = null, $vars = array(), $default = null, $curpath = '')
$return = $langvar !== null ? (isset($returnvalue['template'][$langvar]) ? $returnvalue['template'][$langvar] : null) : $returnvalue['template'];
$return = $return === null ? ($default !== null ? $default : $langvar) : $return;
$searchs = $replaces = array();
-
if ($vars && is_array($vars)) {
-
foreach ($vars as $k => $v) {
$searchs[] = '{' . $k . '}';
$replaces[] = $v;
@@ -864,7 +867,6 @@ function lang($langvar = null, $vars = array(), $default = null, $curpath = '')
if (is_string($return) && strpos($return, '{_G/') !== false) {
preg_match_all('/\{_G\/(.+?)\}/', $return, $gvar);
foreach ($gvar[0] as $k => $v) {
-
$searchs[] = $v;
$replaces[] = getglobal($gvar[1][$k]);
}
@@ -882,7 +884,14 @@ function template($file, $tpldir = '', $templateNotMust = false)
{
global $_G;
static $tplrefresh, $timestamp, $targettplname;
-
+ if(!$tpldir && strpos($file, ':') !== false) {
+ list($templateid, $file) = explode(':', $file);
+ $tpldir = $templateid;
+ $file = $file;
+ }
+ if (!$tpldir && isset($_G['setting']['template'])) {
+ $tpldir = $_G['setting']['template'];
+ }
$file .= !empty($_G['inajax']) && ($file == 'common/header' || $file == 'common/footer') ? '_ajax' : '';
$tplfile = $file;
@@ -1205,7 +1214,6 @@ function aidencode($aid, $type = 0, $tid = 0)
return rawurlencode(base64_encode($s));
}
-
function output()
{
global $_G;
@@ -1214,7 +1222,7 @@ function output()
} else {
define('DZZ_OUTPUTED', 1);
}
- if ($_G['config']['rewritestatus']) {
+ if (isset($_G['setting']['rewritestatus'])) {
$content = ob_get_contents();
$content = output_replace($content);
ob_end_clean();
@@ -1226,11 +1234,10 @@ function output()
}
}
-
function outputurl( $url="" )
{
global $_G;
- if ($_G['config']['rewritestatus']) {
+ if (isset($_G['setting']['rewritestatus'])) {
$url = output_replace($url);
}
return $url;
@@ -1403,7 +1410,7 @@ function space_merge(&$values, $tablename, $isarchive = false)
if ($tablename == 'field') {
$_G['setting']['privacy'] = empty($_G['setting']['privacy']) ? array() : (is_array($_G['setting']['privacy']) ? $_G['setting']['privacy'] : dunserialize($_G['setting']['privacy']));
- $_G[$var]['privacy'] = empty($_G[$var]['privacy']) ? array() : is_array($_G[$var]['privacy']) ? $_G[$var]['privacy'] : dunserialize($_G[$var]['privacy']);
+ $_G[$var]['privacy'] = empty($_G[$var]['privacy']) ? array() : (is_array($_G[$var]['privacy']) ? $_G[$var]['privacy'] : dunserialize($_G[$var]['privacy']));
} elseif ($tablename == 'profile') {
if ($_G[$var]['department']) {
$_G[$var]['department_tree'] = C::t('organization')->getPathByOrgid(intval($_G[$var]['department']));
@@ -1464,7 +1471,6 @@ function dreferer($default = '')
return strip_tags($_G['referer']);
}
-
function diconv($str, $in_charset, $out_charset = CHARSET, $ForceTable = FALSE)
{
global $_G;
@@ -1744,7 +1750,7 @@ $textexts = array('DZZDOC', 'HTM', 'HTML', 'SHTM', 'SHTML', 'HTA', 'HTC', 'XHTML
$unRunExts = array('htm', 'html', 'js', 'php', 'jsp', 'asp', 'aspx', 'xml', 'htc', 'shtml', 'shtm', 'vbs'); //需要阻止运行的后缀名；
$docexts = array('DOC', 'DOCX', 'XLS', 'XLSX', 'PPT', 'PPTX', 'ODT', 'ODS', 'ODG', 'RTF', 'ET', 'DPX', 'WPS');
//echo strtolower(implode(',',$docexts));
-$imageexts = array('JPG', 'JPEG', 'GIF', 'PNG', 'BMP');
+$imageexts = array('JPG', 'JPEG', 'GIF', 'PNG', 'BMP', 'webp');
$videoexts =
$idtype2type = array(
'picid' => 'image',
@@ -2471,7 +2477,7 @@ function curl_redir_exec($ch, $debug = "")
function ico_png($source, $target, $proxy = '')
{
$ext = strtolower(substr(strrchr($source, '.'), 1, 10));
- $imgexts = array('png', 'jpg', 'jpeg', 'gif');
+ $imgexts = array('png', 'jpg', 'jpeg', 'gif', 'webp');
if (in_array($ext, $imgexts)) {
exit($source);
$data = dzz_file_get_contents($source, 0, $proxy);
@@ -2554,7 +2560,7 @@ function imagetolocal($source, $dir = 'appimg', $target = '')
$target = '';
}
if (!$target) {
- $imageext = array('jpg', 'jpeg', 'png', 'gif');
+ $imageext = array('jpg', 'jpeg', 'png', 'gif', 'webp');
$ext = strtolower(substr(strrchr($source, '.'), 1, 10));
if (!in_array($ext, $imageext)) return false;
$subdir = $subdir1 = $subdir2 = '';
@@ -2584,7 +2590,7 @@ function image_to_icon($source, $target, $domain)
return false;
}
if (!$target) {
- $imageext = array('jpg', 'jpeg', 'png', 'gif');
+ $imageext = array('jpg', 'jpeg', 'png', 'gif', 'webp');
$ext = str_replace("/\?.+?/i", '', strtolower(substr(strrchr($source, '.'), 1, 10)));
if (!in_array($ext, $imageext)) $ext = 'jpg';
$subdir = $subdir1 = $subdir2 = '';
@@ -2706,7 +2712,7 @@ function delete_icoid_from_container($icoid, $pfid)
global $_G;
$typefid = C::t('folder')->fetch_typefid_by_uid($_G['uid']);
if ($pfid == $typefid['dock']) {
- $docklist = DB::result_first("select docklist from " . DB::table('user_field') . " where uid='{$_G[uid]}'");
+ $docklist = DB::result_first("select docklist from " . DB::table('user_field') . " where uid='{$_G['uid']}'");
$docklist = $docklist ? explode(',', $docklist) : array();
foreach ($docklist as $key => $value) {
if ($value == $icoid) {
@@ -2716,7 +2722,7 @@ function delete_icoid_from_container($icoid, $pfid)
C::t('user_field')->update($_G['uid'], array('docklist' => implode(',', $docklist)));
} elseif ($pfid == $typefid['desktop']) {
- $icos = DB::result_first("select screenlist from " . DB::table('user_field') . " where uid='{$_G[uid]}'");
+ $icos = DB::result_first("select screenlist from " . DB::table('user_field') . " where uid='{$_G['uid']}'");
$icos = $icos ? explode(',', $icos) : array();
foreach ($icos as $key => $value) {
if ($value == $icoid) {
@@ -2985,7 +2991,7 @@ function save_to_local($source, $target)
}
-function uploadtolocal($upload, $dir = 'appimg', $target = '', $exts = array('jpg', 'jpeg', 'png', 'gif'))
+function uploadtolocal($upload, $dir = 'appimg', $target = '', $exts = array('jpg', 'jpeg', 'png', 'gif', 'webp'))
{
global $_G;
if ($target == 'dzz/images/default/icodefault.png' || $target == 'dzz/images/default/widgetdefault.png' || preg_match("/^(http|ftp|https|mms)\:\/\/(.+?)/i", $target)) {
@@ -3017,7 +3023,7 @@ function upload_to_icon($upload, $target, $domain='')
global $_G;
$source = $upload['tmp_name'];
if (!$target) {
- $imageext = array('jpg', 'jpeg', 'png', 'gif');
+ $imageext = array('jpg', 'jpeg', 'png', 'gif', 'webp');
$ext = strtolower(substr(strrchr($upload['name'], '.'), 1, 10));
if (!in_array($ext, $imageext)) return false;
$subdir = $subdir1 = $subdir2 = '';
@@ -3039,7 +3045,7 @@ function upload_to_icon($upload, $target, $domain='')
function dzz_app_pic_save($FILE, $dir = 'appimg')
{
global $_G;
- $imageext = array('jpg', 'jpeg', 'png', 'gif');
+ $imageext = array('jpg', 'jpeg', 'png', 'gif', 'webp');
$ext = strtolower(substr(strrchr($FILE['name'], '.'), 1, 10));
if (!in_array($ext, $imageext)) return '文件格式不允许';
$subdir = $subdir1 = $subdir2 = '';
@@ -3443,12 +3449,12 @@ function dzz_userconfig_init()
if ($app['position'] == 1) {
continue;
} elseif ($app['position'] == 2) { //桌面
- $fid = DB::result_first("select fid from " . DB::table('folder') . " where uid='{$_G[uid]}' and flag='desktop'");
+ $fid = DB::result_first("select fid from " . DB::table('folder') . " where uid='{$_G['uid']}' and flag='desktop'");
} else { //dock条
- $fid = DB::result_first("select fid from " . DB::table('folder') . " where uid='{$_G[uid]}' and flag='dock'");
+ $fid = DB::result_first("select fid from " . DB::table('folder') . " where uid='{$_G['uid']}' and flag='dock'");
}
if (!$fid) continue;
- if ($rid = DB::result_first("select rid from " . DB::table('resources') . " where uid='{$_G[uid]}' and oid='{$appid}' and type='app'")) {
+ if ($rid = DB::result_first("select rid from " . DB::table('resources') . " where uid='{$_G['uid']}' and oid='{$appid}' and type='app'")) {
C::t('resources')->update_by_rid($rid, array('pfid' => $fid, 'isdelete' => 0));
if ($app['position'] == 2) $userconfig['screenlist'][] = $rid;
else $userconfig['docklist'][] = $rid;
diff --git a/core/function/function_debug.php b/core/function/function_debug.php
new file mode 100644
index 0000000..283be65
--- /dev/null
+++ b/core/function/function_debug.php
@@ -0,0 +1,363 @@
+内存: '.$m.' bytes'.($mt ? ', 峰值 '.$mt.' bytes' : '').'
'; + } + global $_G; + $debugfile = $_G['adminid'] == 1 ? '_debugadmin.php' : '_debug.php'; + $akey = md5($_G['authkey'].random(8)); + if(!defined('DZZ_DEBUG') || !DZZ_DEBUG || defined('IN_ARCHIVER') || defined('IN_MOBILE')) { + return; + } + $phpinfok = 'I'; + $viewcachek = 'C'; + $mysqlplek = 'P'; + $includes = get_included_files(); + require_once DZZ_ROOT.'./core/core_version.php'; + + $sqldebug = ''; + $ismysqli = DB::$driver == 'db_driver_mysqli' ? 1 : 0; + $n = $dzz_table = 0; + $sqlw = array('Using filesort' => 0, 'Using temporary' => 0); + $db = DB::object(); + $queries = count($db->sqldebug); + $links = array(); + foreach($db->link as $k => $link) { + $links[$ismysqli ? $link->thread_id : (string)$link] = $k; + } + $sqltime = 0; + foreach ($db->sqldebug as $string) { + $sqltime += $string[1]; + $extra = $dt = ''; + $n++; + $sql = preg_replace('/'.preg_quote($_G['config']['db']['1']['tablepre']).'[\w_]+/', '\\0', nl2br(dhtmlspecialchars($string[0]))); + $sqldebugrow = ''.($extra ? $extra.'
' : '').'
'; + + $sqldebug .= '
'; + file_put_contents(DZZ_ROOT.'./'.$ajaxhtml, $sqldebug, FILE_APPEND); + return; + } + file_put_contents(DZZ_ROOT.'./'.$ajaxhtml, 'Refresh
'); + foreach($sqlw as $k => $v) { + $sqlw[$k] = $k.': '.$v; + } + $sqlw = '('.($dzz_table ? 'dzz_table: '.$dzz_table.($sqlw ? ', ' : '') : '').($sqlw ? ''.implode(', ', $sqlw).'' : '').')';
+
+ $debug = '";
+ if($_G['adminid'] == 1 && !$ajax) {
+ $debug .= 'init();
+ echo \'\';
+ if(!isset($_GET[\'c\'])) {
+ $query = DB::query("SELECT cname FROM ".DB::table("syscache"));
+ while($names = DB::fetch($query)) {
+ echo \'\'.$names[\'cname\'].\'\';
+ }
+ } else {
+ $cache = DB::fetch_first("SELECT * FROM ".DB::table("syscache")." WHERE cname=\'".$_GET[\'c\']."\'");
+ echo \'$_G[\\\'cache\\\'][\'.$_GET[\'c\'].\']
\'; + debug($cache[\'ctype\'] ? dunserialize($cache[\'data\']) : $cache[\'data\']); + } + exit; +} +elseif(isset($_GET[\''.$mysqlplek.'\'])) { + chdir(\'../\'); + define(\'APPTYPEID\', 200); + define(\'DZZSCRIPT\', \'index.php\'); + define(\'CURSCRIPT\', \'dzz\'); + require \'./core/coreBase.php\'; + $dzz = C::app(); + $dzz->init(); + if(!empty($_GET[\'Id\'])) { + $query = DB::query("KILL ".floatval($_GET[\'Id\']), \'SILENT\'); + } + $i = 0; + $query = DB::query("SHOW FULL PROCESSLIST"); + echo \'\'; + echo \'\';
+ while($row = DB::fetch($query)) {
+ if(!$i) {
+ echo \'
\';
+ exit;
+}
+ ?>';
+ }
+ $debug .= '';
+ $debug .= '';
+ $debug .= '';
+ $debug .= "";
+
+ if(!defined('IN_ADMINCP') && file_exists(DZZ_ROOT.'./static/image/common/temp-grid.png')) $debug .= <<
+var s = '';
+s += '';
+top.document.getElementById('_debug_div').innerHTML = s;
+
+EOF;
+
+ $_GS = $_GA = '';
+ if($_G['adminid'] == 1) {
+ foreach($_G as $k => $v) {
+ if(is_array($v)) {
+ if($k != 'lang') {
+ $_GA .= "('.count($value).')' : '');
+ $i++;
+ }
+ }
+ $debug .= '
+
+
+ '.
+ '
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin/system/template/lyear/fileperms.htm b/admin/system/template/lyear/fileperms.htm
new file mode 100644
index 0000000..cd9f113
--- /dev/null
+++ b/admin/system/template/lyear/fileperms.htm
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+ {lang board_message}
+-
+ {lang db_export_tips}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 正在进行文件权限检查，请稍候......
+
+
+
+
+
+
+
+ 如果某个文件或目录被检查到“无法写入”(以红色列出)，请即刻通过 FTP 或其他工具修改其属性(例如设置为 777)，以确保站点功能的正常使用。
+
+ -
+ $result
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {lang tools_updatecache_waiting}
+
+
+
+ {lang update_cache_succeed}
+ + +
+
+ {lang board_message}
+-
+ {lang tools_updatecache_tips}
+
+
+
+
+
+
+
+
+
+
+ {lang upgrade}
+
+
+ style="color:green">{$key}.{$value}
+
+
+
+
+
+
+
+
+ $msg
+
+
+
+
+
+
+
+
+
+ {lang upgrade_checking}
+
+
+
+
+
+
+
+
+
+ $msg
+
+
+
+ {lang founder_upgrade_select_version}
+
+
+
+
+
+
+
+
+
+
+ | $value[title] | +$value[btn1] | + +$value[official] | + +
+
+
+
+ $msg
+
+
+
+ {lang founder_upgrade_preupdatelist}
+
+
+
+
+
+
+
+
+ | $value | +{lang founder_upgrade_store_directory} ./data/update/dzzoffice$version | + + +{eval echo upgradeinformation(0)} | + + +
|---|
+
+
+
+ $msg
+
+
+
+
+
+
+ $msg
+
+
+
+ {lang founder_upgrade_diff_show}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | {lang founder_upgrade_diff} $v | +
| {lang founder_upgrade_normal} $v | +
| {lang founder_upgrade_new} $v | +{lang founder_upgrade_download_file} ./data/update/dzzoffice{$version} | + + +{lang founder_upgrade_backup_file} ./data/back/dzzoffice{CORE_VERSION} {lang founder_upgrade_backup_file2} | + + +{eval echo upgradeinformation(0)} | + + +
|---|
+
+
+
+
+
+ $msg
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $msg
+
+
+ $msg
+
+
+
+
\ No newline at end of file
diff --git a/admin/system/template/lyear/xtxx.htm b/admin/system/template/lyear/xtxx.htm
new file mode 100644
index 0000000..bc02328
--- /dev/null
+++ b/admin/system/template/lyear/xtxx.htm
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ PHP扩展信息PHP详情
-
\n";
}
echo $func_str;
}
@@ -141,7 +139,7 @@ function kuozhan(){
$loaded_extensions = get_loaded_extensions();
$extensions = '';
foreach ($loaded_extensions as $key => $value) {
- $extensions .= ''.$value . '';
+ $extensions .= ''.$value . '';
}
$zaixianrenshu = DB::result_first("SELECT COUNT(*) FROM " . DB::table('session') . " WHERE uid");
$yonghurenshu = DB::result_first("SELECT COUNT(*) FROM " . DB::table('user') . " WHERE uid");
diff --git a/admin/systemlog/admin.php b/admin/systemlog/admin.php
index e34033f..7d6b001 100644
--- a/admin/systemlog/admin.php
+++ b/admin/systemlog/admin.php
@@ -2,7 +2,7 @@
//error_reporting(E_ALL);
if(!defined('IN_DZZ')) {
exit('Access Denied');
-}
+}
define('NOROBOT', TRUE);
$returntype = isset($_GET['returnType']) ? $_GET['returnType']: 'json';//返回值方式
diff --git a/admin/systemlog/classes/systemlog.php b/admin/systemlog/classes/systemlog.php
index d5ae785..efd9be7 100644
--- a/admin/systemlog/classes/systemlog.php
+++ b/admin/systemlog/classes/systemlog.php
@@ -51,7 +51,7 @@ class Systemlog{
$log = array($log);
}
$cur_url = $_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI'];
- $from_url = $_SERVER['HTTP_REFERER'];
+ $from_url = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
foreach($log as $tmp) {
$tmp=implode("\t", clearlogstring(array($_G['timestamp'],$_G['username'], $_G['groupid'], $_G['clientip'],$tmp,$cur_url,$from_url,$_SERVER['HTTP_USER_AGENT'],"uid=".$_G['uid']))) ;
fwrite($fp, "\t".str_replace(array(''), '', $tmp)."\n");
diff --git a/admin/systemlog/index.php b/admin/systemlog/index.php
index fbefa1a..fee5ec6 100644
--- a/admin/systemlog/index.php
+++ b/admin/systemlog/index.php
@@ -1,30 +1,158 @@
$v){
+ $nowfilemaxnum=($jishu*($k+1))-($jishu-$firstlogsnum);
+ $startnum=($nowfilemaxnum-$jishu)<=0?0:($nowfilemaxnum-$jishu+1);
+ $newdata[]=array("file"=>$v,"start"=>$startnum,"end"=>$nowfilemaxnum);
+ }
+ //print_R($newdata);
+ //查询当前分页数据位于哪个日志文件
+ $lastlog=$last_secondlog="";
+ foreach($newdata as $k=>$v){
+ if( $start<=$v["end"]){
+ $lastlog=$v;
+ if( ($start+$limit)<$v["end"]){
+
+ }else{
+ if( isset($newdata[$k+1])){
+ $last_secondlog=$newdata[$k+1];
+ }
+ }
+ break;
+ }
+ }
+
+ $j=0;
+ for($i=$lastlog["start"];$i<$lastlog["end"];$i++){
+ if( $start<=($lastlog["start"]+$j) ){
+ break;
+ }
+ $j++;
+ }
+ //获取数据开始
+ $logs = file($logdir.$lastlog["file"]);
+ $logs = array_reverse($logs);
+ if($keyword){
+ foreach($logs as $key => $value) {
+ if(!empty($_GET['keyword']) && strpos($value, $_GET['keyword']) === FALSE) {
+ unset($logs[$key]);
+ }
+ }
+ $count = count($logs);
+ }
+ if( $lastlog["file"]!=$logfiles[0] ){
+ $j++;
+ }
+ $logs = array_slice($logs, $j, $limit);
+ $onecountget = count($logs);
+
+ $jj=0;
+ if( $last_secondlog ){
+ for($i=$last_secondlog["start"];$i<$last_secondlog["end"];$i++){
+ if( ($jj)>= ($limit-$onecountget)){
+ break;
+ }
+ $jj++;
+ }
+ }
+
+ if($last_secondlog){
+ $logs2 = file( $logdir.$last_secondlog["file"] );
+ $logs2 = array_reverse($logs2);
+ $end=$limit-count($logs);
+ $logs2 = array_slice( $logs2, 0, $jj);
+ $logs=array_merge($logs,$logs2);
+ }
+ if($logs) {
+ $usergroup = array();
+ foreach(C::t('usergroup')->range() as $group) {
+ $usergroup[$group['groupid']] = $group['grouptitle'];
+ }
+ $list=array();
+ $id = $start + 1;
+ foreach($logs as $logrow) {
+ $log = explode("\t", $logrow);
+ if(empty($log[1])) {
+ continue;
+ }
+ $log[1] = dgmdate($log[1], 'Y-n-j H:i:s');
+ $log[3] = $usergroup[$log[3]];
+ $list[] = [
+ "id" => $id++,
+ "operator" => $log[2],
+ "usergroup" => $log[3],
+ "ip" => $log[4],
+ "time" => $log[1],
+ "loginfo" => $log[5],
+ "visit" => $log[6],
+ "from" => $log[7],
+ "info" => $log[8],
+ ];
+ }
+ }
+ }
+ $return = [
+ "code"=> 0,
+ "msg"=> "",
+ "count"=> $count? $count : 0,
+ "data" => $list? $list : [],
+ ];
+ $jsonReturn = json_encode($return);
+ if ($jsonReturn === false) {
+ $errorMessage = json_last_error_msg();
+ $errorResponse = [
+ "code" => 1,
+ "msg" => "JSON 编码失败，请刷新重试: " . $errorMessage,
+ "count" => 0,
+ "data" => [],
+ ];
+ exit(json_encode($errorResponse));
+ }
+ exit($jsonReturn);
+ }
+} else {
!isset($_GET['page']) && $_GET['page']=1;
$lpp = empty($_GET['lpp']) ? 20 : $_GET['lpp'];
$keyword = isset($_GET['keyword']) ? trim($_GET['keyword']) : '';
$checklpp = array();
$checklpp[$lpp] = 'selected="selected"';
$extrainput = '';
- $systemlog_setting = unserialize($_G["setting"]["systemlog_setting"]);
$operationarr = array_keys($systemlog_setting);
- $operation = in_array($_GET['operation'], $operationarr) ? $_GET['operation'] : "cplog";
+ $operation = in_array($operation, $operationarr) ? $operation : "cplog";
$navtitle=$systemlog_setting[$operation]["title"].' - '.lang('appname');
$page = (isset($_GET['page'])) ? intval($_GET['page']) : 1;
$type = isset($_GET['type']) ? trim($_GET['type']) : '';
@@ -39,103 +167,101 @@ if($type=="list"){
$theurl = BASESCRIPT . "?" . url_implode($gets);
$logdir = DZZ_ROOT.'./data/log/';
$logfiles = get_log_files($logdir, $operation);
-
- if($logfiles) $logfiles=array_reverse($logfiles);
- //error_reporting(E_ALL);
- $firstlogs = file( $logdir.$logfiles[0] ) ;
- $firstlogsnum = count($firstlogs);
- $countlogfile=count($logfiles);
- $count = ($countlogfile-1)*4000+$firstlogsnum;
- $logs = array();
- $jishu=4000;//每个日志文件最多行数
- $start = ($page - 1) * $lpp;
- $lastlog=$last_secondlog="";
-
- $newdata=array();
- foreach($logfiles as $k=>$v){
- $nowfilemaxnum=($jishu*($k+1))-($jishu-$firstlogsnum);
- $startnum=($nowfilemaxnum-$jishu)<=0?0:($nowfilemaxnum-$jishu+1);
- $newdata[]=array("file"=>$v,"start"=>$startnum,"end"=>$nowfilemaxnum);
- }
- //print_R($newdata);
- //查询当前分页数据位于哪个日志文件
- $lastlog=$last_secondlog="";
- foreach($newdata as $k=>$v){
- if( $start<=$v["end"]){
- $lastlog=$v;
- if( ($start+$lpp)<$v["end"]){
-
- }else{
- if( isset($newdata[$k+1])){
- $last_secondlog=$newdata[$k+1];
+ if ($logfiles) {
+ $logfiles = array_reverse($logfiles);
+ $firstlogs = file($logdir.$logfiles[0]);
+ $firstlogsnum = count($firstlogs);
+ $countlogfile=count($logfiles);
+ $count = ($countlogfile-1)*4000+$firstlogsnum;
+ $logs = array();
+ $jishu=4000;//每个日志文件最多行数
+ $start = ($page - 1) * $lpp;
+ $lastlog=$last_secondlog="";
+
+ $newdata=array();
+ foreach($logfiles as $k=>$v){
+ $nowfilemaxnum=($jishu*($k+1))-($jishu-$firstlogsnum);
+ $startnum=($nowfilemaxnum-$jishu)<=0?0:($nowfilemaxnum-$jishu+1);
+ $newdata[]=array("file"=>$v,"start"=>$startnum,"end"=>$nowfilemaxnum);
+ }
+ //print_R($newdata);
+ //查询当前分页数据位于哪个日志文件
+ $lastlog=$last_secondlog="";
+ foreach($newdata as $k=>$v){
+ if( $start<=$v["end"]){
+ $lastlog=$v;
+ if( ($start+$lpp)<$v["end"]){
+
+ }else{
+ if( isset($newdata[$k+1])){
+ $last_secondlog=$newdata[$k+1];
+ }
}
- }
- break;
- }
- }
-
- $j=0;
- for($i=$lastlog["start"];$i<$lastlog["end"];$i++){
- if( $start<=($lastlog["start"]+$j) ){
- break;
- }
- $j++;
- }
- //获取数据开始
- $logs = file( $logdir.$lastlog["file"] );
- $logs = array_reverse($logs);
- if($keyword){
- foreach($logs as $key => $value) {
- if(!empty($_GET['keyword']) && strpos($value, $_GET['keyword']) === FALSE) {
- unset($logs[$key]);
- }
- }
- $count = count($logs);
- }
- if( $lastlog["file"]!=$logfiles[0] ){
- $j++;
- }
- $logs = array_slice($logs, $j, $lpp);
- $onecountget = count($logs);
-
- $jj=0;
- if( $last_secondlog ){
- for($i=$last_secondlog["start"];$i<$last_secondlog["end"];$i++){
- if( ($jj)>= ($lpp-$onecountget) ){//$last_secondlog["start"] ){
break;
}
- $jj++;
- }
- }
-
- if($last_secondlog){
- $logs2 = file( $logdir.$last_secondlog["file"] );
- $logs2 = array_reverse($logs2);
- $end=$lpp-count($logs);
- $logs2 = array_slice( $logs2, 0, $jj);
- $logs=array_merge($logs,$logs2);
- }
- $usergroup = array();
- foreach(C::t('usergroup')->range() as $group) {
- $usergroup[$group['groupid']] = $group['grouptitle'];
- }
- $list=array();
- foreach($logs as $k => $logrow) {
- $log = explode("\t", $logrow);
- if(empty($log[1])) {
- continue;
}
- $log[1] = dgmdate($log[1], 'y-n-j H:i:s');
- $log[2] = $log[2];
- $log[2] = ($log[2] != $_G['member']['username'] ? "$log[2]" : $log[2]);
- $log[3] = $usergroup[$log[3]];
- $list[$k]=$log;
- }
- $multipage = multi($count, $lpp, $page, $theurl,'pull-right');
- include template('list');
+
+ $j=0;
+ for($i=$lastlog["start"];$i<$lastlog["end"];$i++){
+ if( $start<=($lastlog["start"]+$j) ){
+ break;
+ }
+ $j++;
+ }
+ //获取数据开始
+ $logs = file($logdir.$lastlog["file"]);
+ $logs = array_reverse($logs);
+ if($keyword){
+ foreach($logs as $key => $value) {
+ if(!empty($_GET['keyword']) && strpos($value, $_GET['keyword']) === FALSE) {
+ unset($logs[$key]);
+ }
+ }
+ $count = count($logs);
+ }
+ if( $lastlog["file"]!=$logfiles[0] ){
+ $j++;
+ }
+ $logs = array_slice($logs, $j, $lpp);
+ $onecountget = count($logs);
+
+ $jj=0;
+ if( $last_secondlog ){
+ for($i=$last_secondlog["start"];$i<$last_secondlog["end"];$i++){
+ if( ($jj)>= ($lpp-$onecountget)){
+ break;
+ }
+ $jj++;
+ }
+ }
+
+ if($last_secondlog){
+ $logs2 = file( $logdir.$last_secondlog["file"] );
+ $logs2 = array_reverse($logs2);
+ $end=$lpp-count($logs);
+ $logs2 = array_slice( $logs2, 0, $jj);
+ $logs=array_merge($logs,$logs2);
+ }
+ $usergroup = array();
+ foreach(C::t('usergroup')->range() as $group) {
+ $usergroup[$group['groupid']] = $group['grouptitle'];
+ }
+ $list=array();
+ foreach($logs as $k => $logrow) {
+ $log = explode("\t", $logrow);
+ if(empty($log[1])) {
+ continue;
+ }
+ $log[1] = dgmdate($log[1], 'y-n-j H:i:s');
+ $log[2] = $log[2];
+ $log[2] = ($log[2] != $_G['member']['username'] ? "$log[2]" : $log[2]);
+ $log[3] = $usergroup[$log[3]];
+ $list[$k]=$log;
+ }
+ $multipage = multi($count, $lpp, $page, $theurl,'pull-right');
+ }
}
-
-
+include template('list');
function getactionarray() {
$isfounder = true;
unset($topmenu['index'], $menu['index']);
diff --git a/admin/systemlog/language/zh-cn/lang.php b/admin/systemlog/language/zh-cn/lang.php
index 16d7af4..32f21be 100644
--- a/admin/systemlog/language/zh-cn/lang.php
+++ b/admin/systemlog/language/zh-cn/lang.php
@@ -1,15 +1,10 @@
'系统日志',
+ 'appname'=>'系统日志',
'logs' => '运行记录',
- 'systemlog_setting'=>'设置',
- 'systemlog_list'=>'日志列表',
- 'info'=>'信息',
- 'loginfo'=>'日志信息',
- 'visit'=>'访问页面',
- 'from'=>'来源页面',
+ 'systemlog_setting'=>'设置',
+ 'systemlog_list'=>'日志列表',
'logswitch'=>'日志开关',
- 'logtype'=>'日志类型',
'logtypename'=>'日志类型名称',
'logtype'=>'日志类型',
'logflag'=>'日志标识',
diff --git a/admin/systemlog/template/lyear/admin.htm b/admin/systemlog/template/lyear/admin.htm
new file mode 100644
index 0000000..d5be3d3
--- /dev/null
+++ b/admin/systemlog/template/lyear/admin.htm
@@ -0,0 +1,121 @@
+
+
+
+已加载的扩展:
+
diff --git a/admin/system/updatecache.php b/admin/system/updatecache.php
index d15219b..153b100 100644
--- a/admin/system/updatecache.php
+++ b/admin/system/updatecache.php
@@ -9,22 +9,10 @@
if (!defined('IN_DZZ') || !defined('IN_ADMIN')) {
exit('Access Denied');
}
-
-$oparr = array('updatecache', 'database', /*'security','patch','update',*/
-'cron', 'log');
-$leftmenu = array();
-$op = $_GET['op'];
-foreach ($oparr as $key => $value) {
- $leftmenu[$value] = array('title' => lang($value), 'active' => '');
- if ($value == $op)
- $leftmenu[$value]['active'] = 'class="active"';
-}
-
include libfile('function/cache');
-
-$navtitle = lang('updatecache') . ' - ' . lang('admin_navtitle');
+$navtitle = lang('updatecache') . ' - ' . lang('appname');
$step = max(1, intval($_GET['step']));
-
+$op = isset($_GET['op']) ? $_GET['op'] : '';
if ($step == 1) {
} elseif ($step == 2) {
$type = implode('_', (array)$_GET['type']);
diff --git a/admin/system/xtxx.php b/admin/system/xtxx.php
index 2ae2467..f9bdea4 100644
--- a/admin/system/xtxx.php
+++ b/admin/system/xtxx.php
@@ -9,8 +9,8 @@
if (!defined('IN_DZZ') || !defined('IN_ADMIN')) {
exit('Access Denied');
}
-$op = $_GET['op'];
-$do=$_GET['do'];
+$op = isset($_GET['op']) ? $_GET['op'] : '';
+$do = isset($_GET['do']) ? $_GET['do'] : '';
if($do == 'phpinfo'){
exit(phpinfo());
}
@@ -125,15 +125,13 @@ function kuozhan(){
else $func_items = array('mysql_connect', 'file_get_contents', 'xml_parser_create','filesize', 'curl_init','zip_open','ffmpeg','imagick','imagemagick','cURL','date','Exif','Fileinfo','Ftp','GD','gettext','intl','Iconv','json','ldap','Mbstring','Mcrypt','Memcached','MySQLi','SQLite3','OpenSSL','PDO','pdo_mysql','pdo_sqlite','Redis','session','Sockets','Swoole','dom','xml','SimpleXML','libxml','bz2','zip','zlib');
foreach($func_items as $item) {
$status = function_exists($item);
- $func_str .= "+
已加载的扩展:
$extensions
$extensions
\n";
- $func_str .= "$item\n";
+ $func_str .= "
\n";
+ $func_str .= "\n";
}
+ $func_str .= "$item\n";
if($status) {
- $func_str .= "\n";
- $func_str .= "
\n";
+ $func_str .= "\n";
} else {
- $func_str .= "\n";
- $func_str .= "
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ '; $stack->push('Constant Value',self::$_ExcelConstants[$excelConstant]); $this->_debugLog->writeDebugLog('Evaluating Constant ', $excelConstant, ' as ', $this->_showTypeDetails(self::$_ExcelConstants[$excelConstant])); - } elseif ((is_numeric($token)) || ($token === NULL) || (is_bool($token)) || ($token == '') || ($token{0} == '"') || ($token{0} == '#')) { + } elseif ((is_numeric($token)) || ($token === NULL) || (is_bool($token)) || ($token == '') || ($token[0] == '"') || ($token[0] == '#')) { // echo 'Token is a number, boolean, string, null or an Excel error
'; $stack->push('Value',$token); // if the token is a named range, push the named range name onto the stack @@ -3498,11 +3498,11 @@ class PHPExcel_Calculation { if (is_string($operand)) { // We only need special validations for the operand if it is a string // Start by stripping off the quotation marks we use to identify true excel string values internally - if ($operand > '' && $operand{0} == '"') { $operand = self::_unwrapResult($operand); } + if ($operand > '' && $operand[0] == '"') { $operand = self::_unwrapResult($operand); } // If the string is a numeric value, we treat it as a numeric, so no further testing if (!is_numeric($operand)) { // If not a numeric, test to see if the value is an Excel error, and so can't be used in normal binary operations - if ($operand > '' && $operand{0} == '#') { + if ($operand > '' && $operand[0] == '#') { $stack->push('Value', $operand); $this->_debugLog->writeDebugLog('Evaluation Result is ', $this->_showTypeDetails($operand)); return FALSE; @@ -3555,8 +3555,8 @@ class PHPExcel_Calculation { } // Simple validate the two operands if they are string values - if (is_string($operand1) && $operand1 > '' && $operand1{0} == '"') { $operand1 = self::_unwrapResult($operand1); } - if (is_string($operand2) && $operand2 > '' && $operand2{0} == '"') { $operand2 = self::_unwrapResult($operand2); } + if (is_string($operand1) && $operand1 > '' && $operand1[0] == '"') { $operand1 = self::_unwrapResult($operand1); } + if (is_string($operand2) && $operand2 > '' && $operand2[0] == '"') { $operand2 = self::_unwrapResult($operand2); } // Use case insensitive comparaison if not OpenOffice mode if (PHPExcel_Calculation_Functions::getCompatibilityMode() != PHPExcel_Calculation_Functions::COMPATIBILITY_OPENOFFICE) diff --git a/core/class/PHPExcel/Calculation/Engineering.php b/core/class/PHPExcel/Calculation/Engineering.php index 7e32aa8..0c97607 100644 --- a/core/class/PHPExcel/Calculation/Engineering.php +++ b/core/class/PHPExcel/Calculation/Engineering.php @@ -708,7 +708,7 @@ class PHPExcel_Calculation_Engineering { // Split the input into its Real and Imaginary components $leadingSign = 0; if (strlen($workString) > 0) { - $leadingSign = (($workString{0} == '+') || ($workString{0} == '-')) ? 1 : 0; + $leadingSign = (($workString[0] == '+') || ($workString[0] == '-')) ? 1 : 0; } $power = ''; $realNumber = strtok($workString, '+-'); @@ -747,10 +747,10 @@ class PHPExcel_Calculation_Engineering { * @return string The "cleaned" complex number */ private static function _cleanComplex($complexNumber) { - if ($complexNumber{0} == '+') $complexNumber = substr($complexNumber,1); - if ($complexNumber{0} == '0') $complexNumber = substr($complexNumber,1); - if ($complexNumber{0} == '.') $complexNumber = '0'.$complexNumber; - if ($complexNumber{0} == '+') $complexNumber = substr($complexNumber,1); + if ($complexNumber[0] == '+') $complexNumber = substr($complexNumber,1); + if ($complexNumber[0] == '0') $complexNumber = substr($complexNumber,1); + if ($complexNumber[0] == '.') $complexNumber = '0'.$complexNumber; + if ($complexNumber[0] == '+') $complexNumber = substr($complexNumber,1); return $complexNumber; } diff --git a/core/class/PHPExcel/Calculation/FormulaParser.php b/core/class/PHPExcel/Calculation/FormulaParser.php index 754a638..8536a82 100644 --- a/core/class/PHPExcel/Calculation/FormulaParser.php +++ b/core/class/PHPExcel/Calculation/FormulaParser.php @@ -159,7 +159,7 @@ class PHPExcel_Calculation_FormulaParser { // Check if the formula has a valid starting = $formulaLength = strlen($this->_formula); - if ($formulaLength < 2 || $this->_formula{0} != '=') return; + if ($formulaLength < 2 || $this->_formula[0] != '=') return; // Helper variables $tokens1 = $tokens2 = $stack = array(); @@ -179,7 +179,7 @@ class PHPExcel_Calculation_FormulaParser { // embeds are doubled // end marks token if ($inString) { - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) { if ((($index + 2) <= $formulaLength) && ($this->_formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE)) { $value .= PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE; ++$index; @@ -189,7 +189,7 @@ class PHPExcel_Calculation_FormulaParser { $value = ""; } } else { - $value .= $this->_formula{$index}; + $value .= $this->_formula[$index]; } ++$index; continue; @@ -199,7 +199,7 @@ class PHPExcel_Calculation_FormulaParser { // embeds are double // end does not mark a token if ($inPath) { - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) { if ((($index + 2) <= $formulaLength) && ($this->_formula{$index + 1} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE)) { $value .= PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE; ++$index; @@ -207,7 +207,7 @@ class PHPExcel_Calculation_FormulaParser { $inPath = false; } } else { - $value .= $this->_formula{$index}; + $value .= $this->_formula[$index]; } ++$index; continue; @@ -217,10 +217,10 @@ class PHPExcel_Calculation_FormulaParser { // no embeds (changed to "()" by Excel) // end does not mark a token if ($inRange) { - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_CLOSE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::BRACKET_CLOSE) { $inRange = false; } - $value .= $this->_formula{$index}; + $value .= $this->_formula[$index]; ++$index; continue; } @@ -228,7 +228,7 @@ class PHPExcel_Calculation_FormulaParser { // error values // end marks a token, determined from absolute list of values if ($inError) { - $value .= $this->_formula{$index}; + $value .= $this->_formula[$index]; ++$index; if (in_array($value, $ERRORS)) { $inError = false; @@ -239,10 +239,10 @@ class PHPExcel_Calculation_FormulaParser { } // scientific notation check - if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_SN, $this->_formula{$index}) !== false) { + if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_SN, $this->_formula[$index]) !== false) { if (strlen($value) > 1) { - if (preg_match("/^[1-9]{1}(\.[0-9]+)?E{1}$/", $this->_formula{$index}) != 0) { - $value .= $this->_formula{$index}; + if (preg_match("/^[1-9]{1}(\.[0-9]+)?E{1}$/", $this->_formula[$index]) != 0) { + $value .= $this->_formula[$index]; ++$index; continue; } @@ -252,7 +252,7 @@ class PHPExcel_Calculation_FormulaParser { // independent character evaluation (order not important) // establish state-dependent character evaluations - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::QUOTE_DOUBLE) { if (strlen($value > 0)) { // unexpected $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN); $value = ""; @@ -262,7 +262,7 @@ class PHPExcel_Calculation_FormulaParser { continue; } - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::QUOTE_SINGLE) { if (strlen($value) > 0) { // unexpected $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN); $value = ""; @@ -272,14 +272,14 @@ class PHPExcel_Calculation_FormulaParser { continue; } - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACKET_OPEN) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::BRACKET_OPEN) { $inRange = true; $value .= PHPExcel_Calculation_FormulaParser::BRACKET_OPEN; ++$index; continue; } - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::ERROR_START) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::ERROR_START) { if (strlen($value) > 0) { // unexpected $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN); $value = ""; @@ -291,7 +291,7 @@ class PHPExcel_Calculation_FormulaParser { } // mark start and end of arrays and array rows - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_OPEN) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::BRACE_OPEN) { if (strlen($value) > 0) { // unexpected $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_UNKNOWN); $value = ""; @@ -309,7 +309,7 @@ class PHPExcel_Calculation_FormulaParser { continue; } - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::SEMICOLON) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::SEMICOLON) { if (strlen($value) > 0) { $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND); $value = ""; @@ -331,7 +331,7 @@ class PHPExcel_Calculation_FormulaParser { continue; } - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::BRACE_CLOSE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::BRACE_CLOSE) { if (strlen($value) > 0) { $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND); $value = ""; @@ -352,14 +352,14 @@ class PHPExcel_Calculation_FormulaParser { } // trim white-space - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::WHITESPACE) { if (strlen($value) > 0) { $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND); $value = ""; } $tokens1[] = new PHPExcel_Calculation_FormulaToken("", PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_WHITESPACE); ++$index; - while (($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::WHITESPACE) && ($index < $formulaLength)) { + while (($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::WHITESPACE) && ($index < $formulaLength)) { ++$index; } continue; @@ -379,29 +379,29 @@ class PHPExcel_Calculation_FormulaParser { } // standard infix operators - if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_INFIX, $this->_formula{$index}) !== false) { + if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_INFIX, $this->_formula[$index]) !== false) { if (strlen($value) > 0) { $tokens1[] =new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND); $value = ""; } - $tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX); + $tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula[$index], PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORINFIX); ++$index; continue; } // standard postfix operators (only one) - if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_POSTFIX, $this->_formula{$index}) !== false) { + if (strpos(PHPExcel_Calculation_FormulaParser::OPERATORS_POSTFIX, $this->_formula[$index]) !== false) { if (strlen($value) > 0) { $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND); $value = ""; } - $tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula{$index}, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX); + $tokens1[] = new PHPExcel_Calculation_FormulaToken($this->_formula[$index], PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERATORPOSTFIX); ++$index; continue; } // start subexpression or function - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_OPEN) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::PAREN_OPEN) { if (strlen($value) > 0) { $tmp = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_FUNCTION, PHPExcel_Calculation_FormulaToken::TOKEN_SUBTYPE_START); $tokens1[] = $tmp; @@ -417,7 +417,7 @@ class PHPExcel_Calculation_FormulaParser { } // function, subexpression, or array parameters, or operand unions - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::COMMA) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::COMMA) { if (strlen($value) > 0) { $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND); $value = ""; @@ -438,7 +438,7 @@ class PHPExcel_Calculation_FormulaParser { } // stop subexpression - if ($this->_formula{$index} == PHPExcel_Calculation_FormulaParser::PAREN_CLOSE) { + if ($this->_formula[$index] == PHPExcel_Calculation_FormulaParser::PAREN_CLOSE) { if (strlen($value) > 0) { $tokens1[] = new PHPExcel_Calculation_FormulaToken($value, PHPExcel_Calculation_FormulaToken::TOKEN_TYPE_OPERAND); $value = ""; @@ -454,7 +454,7 @@ class PHPExcel_Calculation_FormulaParser { } // token accumulation - $value .= $this->_formula{$index}; + $value .= $this->_formula[$index]; ++$index; } diff --git a/core/class/PHPExcel/Calculation/Functions.php b/core/class/PHPExcel/Calculation/Functions.php index 4ad1dd3..36edc52 100644 --- a/core/class/PHPExcel/Calculation/Functions.php +++ b/core/class/PHPExcel/Calculation/Functions.php @@ -308,9 +308,9 @@ class PHPExcel_Calculation_Functions { public static function _ifCondition($condition) { $condition = PHPExcel_Calculation_Functions::flattenSingleValue($condition); - if (!isset($condition{0})) + if (!isset($condition[0])) $condition = '=""'; - if (!in_array($condition{0},array('>', '<', '='))) { + if (!in_array($condition[0],array('>', '<', '='))) { if (!is_numeric($condition)) { $condition = PHPExcel_Calculation::_wrapResult(strtoupper($condition)); } return '='.$condition; } else { @@ -531,7 +531,7 @@ class PHPExcel_Calculation_Functions { break; case 'string' : // Errors - if ((strlen($value) > 0) && ($value{0} == '#')) { + if ((strlen($value) > 0) && ($value[0] == '#')) { return $value; } break; @@ -581,7 +581,7 @@ class PHPExcel_Calculation_Functions { //break; } elseif(is_string($value)) { // Errors - if ((strlen($value) > 0) && ($value{0} == '#')) { + if ((strlen($value) > 0) && ($value[0] == '#')) { return 16; } return 2; diff --git a/core/class/PHPExcel/Calculation/TextData.php b/core/class/PHPExcel/Calculation/TextData.php index d1ba272..2a0da50 100644 --- a/core/class/PHPExcel/Calculation/TextData.php +++ b/core/class/PHPExcel/Calculation/TextData.php @@ -48,19 +48,19 @@ class PHPExcel_Calculation_TextData { private static $_invalidChars = Null; private static function _uniord($c) { - if (ord($c{0}) >=0 && ord($c{0}) <= 127) - return ord($c{0}); - if (ord($c{0}) >= 192 && ord($c{0}) <= 223) - return (ord($c{0})-192)*64 + (ord($c{1})-128); - if (ord($c{0}) >= 224 && ord($c{0}) <= 239) - return (ord($c{0})-224)*4096 + (ord($c{1})-128)*64 + (ord($c{2})-128); - if (ord($c{0}) >= 240 && ord($c{0}) <= 247) - return (ord($c{0})-240)*262144 + (ord($c{1})-128)*4096 + (ord($c{2})-128)*64 + (ord($c{3})-128); - if (ord($c{0}) >= 248 && ord($c{0}) <= 251) - return (ord($c{0})-248)*16777216 + (ord($c{1})-128)*262144 + (ord($c{2})-128)*4096 + (ord($c{3})-128)*64 + (ord($c{4})-128); - if (ord($c{0}) >= 252 && ord($c{0}) <= 253) - return (ord($c{0})-252)*1073741824 + (ord($c{1})-128)*16777216 + (ord($c{2})-128)*262144 + (ord($c{3})-128)*4096 + (ord($c{4})-128)*64 + (ord($c{5})-128); - if (ord($c{0}) >= 254 && ord($c{0}) <= 255) //error + if (ord($c[0]) >=0 && ord($c[0]) <= 127) + return ord($c[0]); + if (ord($c[0]) >= 192 && ord($c[0]) <= 223) + return (ord($c[0])-192)*64 + (ord($c[1])-128); + if (ord($c[0]) >= 224 && ord($c[0]) <= 239) + return (ord($c[0])-224)*4096 + (ord($c[1])-128)*64 + (ord($c[2])-128); + if (ord($c[0]) >= 240 && ord($c[0]) <= 247) + return (ord($c[0])-240)*262144 + (ord($c[1])-128)*4096 + (ord($c[2])-128)*64 + (ord($c[3])-128); + if (ord($c[0]) >= 248 && ord($c[0]) <= 251) + return (ord($c[0])-248)*16777216 + (ord($c[1])-128)*262144 + (ord($c[2])-128)*4096 + (ord($c[3])-128)*64 + (ord($c[4])-128); + if (ord($c[0]) >= 252 && ord($c[0]) <= 253) + return (ord($c[0])-252)*1073741824 + (ord($c[1])-128)*16777216 + (ord($c[2])-128)*262144 + (ord($c[3])-128)*4096 + (ord($c[4])-128)*64 + (ord($c[5])-128); + if (ord($c[0]) >= 254 && ord($c[0]) <= 255) //error return PHPExcel_Calculation_Functions::VALUE(); return 0; } // function _uniord() diff --git a/core/class/PHPExcel/Cell.php b/core/class/PHPExcel/Cell.php index 1788559..c560ffe 100644 --- a/core/class/PHPExcel/Cell.php +++ b/core/class/PHPExcel/Cell.php @@ -769,19 +769,19 @@ class PHPExcel_Cell // We also use the language construct isset() rather than the more costly strlen() function to match the length of $pString // for improved performance - if (isset($pString{0})) { - if (!isset($pString{1})) { + if (isset($pString[0])) { + if (!isset($pString[1])) { $_indexCache[$pString] = $_columnLookup[$pString]; return $_indexCache[$pString]; - } elseif(!isset($pString{2})) { - $_indexCache[$pString] = $_columnLookup[$pString{0}] * 26 + $_columnLookup[$pString{1}]; + } elseif(!isset($pString[2])) { + $_indexCache[$pString] = $_columnLookup[$pString[0]] * 26 + $_columnLookup[$pString[1]]; return $_indexCache[$pString]; - } elseif(!isset($pString{3})) { - $_indexCache[$pString] = $_columnLookup[$pString{0}] * 676 + $_columnLookup[$pString{1}] * 26 + $_columnLookup[$pString{2}]; + } elseif(!isset($pString[3])) { + $_indexCache[$pString] = $_columnLookup[$pString[0]] * 676 + $_columnLookup[$pString[1]] * 26 + $_columnLookup[$pString[2]]; return $_indexCache[$pString]; } } - throw new PHPExcel_Exception("Column string index can not be " . ((isset($pString{0})) ? "longer than 3 characters" : "empty")); + throw new PHPExcel_Exception("Column string index can not be " . ((isset($pString[0])) ? "longer than 3 characters" : "empty")); } /** diff --git a/core/class/PHPExcel/Cell/DefaultValueBinder.php b/core/class/PHPExcel/Cell/DefaultValueBinder.php index f1880fa..67d8a1f 100644 --- a/core/class/PHPExcel/Cell/DefaultValueBinder.php +++ b/core/class/PHPExcel/Cell/DefaultValueBinder.php @@ -83,7 +83,7 @@ class PHPExcel_Cell_DefaultValueBinder implements PHPExcel_Cell_IValueBinder } elseif ($pValue instanceof PHPExcel_RichText) { return PHPExcel_Cell_DataType::TYPE_INLINE; - } elseif ($pValue{0} === '=' && strlen($pValue) > 1) { + } elseif ($pValue[0] === '=' && strlen($pValue) > 1) { return PHPExcel_Cell_DataType::TYPE_FORMULA; } elseif (is_bool($pValue)) { diff --git a/core/class/PHPExcel/IOFactory.php b/core/class/PHPExcel/IOFactory.php index 69ec8b6..1b0bfd6 100644 --- a/core/class/PHPExcel/IOFactory.php +++ b/core/class/PHPExcel/IOFactory.php @@ -52,8 +52,8 @@ class PHPExcel_IOFactory * @static */ private static $_searchLocations = array( - array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/{0}.php', 'class' => 'PHPExcel_Writer_{0}' ), - array( 'type' => 'IReader', 'path' => 'PHPExcel/Reader/{0}.php', 'class' => 'PHPExcel_Reader_{0}' ) + array( 'type' => 'IWriter', 'path' => 'PHPExcel/Writer/[0].php', 'class' => 'PHPExcel_Writer_[0]' ), + array( 'type' => 'IReader', 'path' => 'PHPExcel/Reader/[0].php', 'class' => 'PHPExcel_Reader_[0]' ) ); /** @@ -112,8 +112,8 @@ class PHPExcel_IOFactory * @static * @access public * @param string $type Example: IWriter - * @param string $location Example: PHPExcel/Writer/{0}.php - * @param string $classname Example: PHPExcel_Writer_{0} + * @param string $location Example: PHPExcel/Writer/[0].php + * @param string $classname Example: PHPExcel_Writer_[0] */ public static function addSearchLocation($type = '', $location = '', $classname = '') { self::$_searchLocations[] = array( 'type' => $type, 'path' => $location, 'class' => $classname ); @@ -136,7 +136,7 @@ class PHPExcel_IOFactory // Include class foreach (self::$_searchLocations as $searchLocation) { if ($searchLocation['type'] == $searchType) { - $className = str_replace('{0}', $writerType, $searchLocation['class']); + $className = str_replace('[0]', $writerType, $searchLocation['class']); $instance = new $className($phpExcel); if ($instance !== NULL) { @@ -165,7 +165,7 @@ class PHPExcel_IOFactory // Include class foreach (self::$_searchLocations as $searchLocation) { if ($searchLocation['type'] == $searchType) { - $className = str_replace('{0}', $readerType, $searchLocation['class']); + $className = str_replace('[0]', $readerType, $searchLocation['class']); $instance = new $className(); if ($instance !== NULL) { diff --git a/core/class/PHPExcel/Reader/Excel2003XML.php b/core/class/PHPExcel/Reader/Excel2003XML.php index ce1f31d..4cea4e5 100644 --- a/core/class/PHPExcel/Reader/Excel2003XML.php +++ b/core/class/PHPExcel/Reader/Excel2003XML.php @@ -699,12 +699,12 @@ class PHPExcel_Reader_Excel2003XML extends PHPExcel_Reader_Abstract implements P // Empty R reference is the current row if ($rowReference == '') $rowReference = $rowID; // Bracketed R references are relative to the current row - if ($rowReference{0} == '[') $rowReference = $rowID + trim($rowReference,'[]'); + if ($rowReference[0] == '[') $rowReference = $rowID + trim($rowReference,'[]'); $columnReference = $cellReference[4][0]; // Empty C reference is the current column if ($columnReference == '') $columnReference = $columnNumber; // Bracketed C references are relative to the current column - if ($columnReference{0} == '[') $columnReference = $columnNumber + trim($columnReference,'[]'); + if ($columnReference[0] == '[') $columnReference = $columnNumber + trim($columnReference,'[]'); $A1CellReference = PHPExcel_Cell::stringFromColumnIndex($columnReference-1).$rowReference; $value = substr_replace($value,$A1CellReference,$cellReference[0][1],strlen($cellReference[0][0])); } diff --git a/core/class/PHPExcel/Reader/Excel5.php b/core/class/PHPExcel/Reader/Excel5.php index 91e0fa0..b53d27d 100644 --- a/core/class/PHPExcel/Reader/Excel5.php +++ b/core/class/PHPExcel/Reader/Excel5.php @@ -1859,7 +1859,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // offset: 0; size: 2; 0 = base 1900, 1 = base 1904 PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_WINDOWS_1900); - if (ord($recordData{0}) == 1) { + if (ord($recordData[0]) == 1) { PHPExcel_Shared_Date::setExcelCalendar(PHPExcel_Shared_Date::CALENDAR_MAC_1904); } } @@ -2057,7 +2057,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // offset: 6; size: 1; Alignment and text break // bit 2-0, mask 0x07; horizontal alignment - $horAlign = (0x07 & ord($recordData{6})) >> 0; + $horAlign = (0x07 & ord($recordData[6])) >> 0; switch ($horAlign) { case 0: $objStyle->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_GENERAL); @@ -2082,7 +2082,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce break; } // bit 3, mask 0x08; wrap text - $wrapText = (0x08 & ord($recordData{6})) >> 3; + $wrapText = (0x08 & ord($recordData[6])) >> 3; switch ($wrapText) { case 0: $objStyle->getAlignment()->setWrapText(false); @@ -2092,7 +2092,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce break; } // bit 6-4, mask 0x70; vertical alignment - $vertAlign = (0x70 & ord($recordData{6})) >> 4; + $vertAlign = (0x70 & ord($recordData[6])) >> 4; switch ($vertAlign) { case 0: $objStyle->getAlignment()->setVertical(PHPExcel_Style_Alignment::VERTICAL_TOP); @@ -2110,7 +2110,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce if ($this->_version == self::XLS_BIFF8) { // offset: 7; size: 1; XF_ROTATION: Text rotation angle - $angle = ord($recordData{7}); + $angle = ord($recordData[7]); $rotation = 0; if ($angle <= 90) { $rotation = $angle; @@ -2123,11 +2123,11 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // offset: 8; size: 1; Indentation, shrink to cell size, and text direction // bit: 3-0; mask: 0x0F; indent level - $indent = (0x0F & ord($recordData{8})) >> 0; + $indent = (0x0F & ord($recordData[8])) >> 0; $objStyle->getAlignment()->setIndent($indent); // bit: 4; mask: 0x10; 1 = shrink content to fit into cell - $shrinkToFit = (0x10 & ord($recordData{8})) >> 4; + $shrinkToFit = (0x10 & ord($recordData[8])) >> 4; switch ($shrinkToFit) { case 0: $objStyle->getAlignment()->setShrinkToFit(false); @@ -2209,7 +2209,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // BIFF5 // offset: 7; size: 1; Text orientation and flags - $orientationAndFlags = ord($recordData{7}); + $orientationAndFlags = ord($recordData[7]); // bit: 1-0; mask: 0x03; XF_ORIENTATION: Text orientation $xfOrientation = (0x03 & $orientationAndFlags) >> 0; @@ -2333,7 +2333,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2349,7 +2349,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2365,7 +2365,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2381,7 +2381,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2397,7 +2397,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2413,7 +2413,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2429,7 +2429,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2445,7 +2445,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xclrValue = substr($extData, 4, 4); // color value (value based on color type) if ($xclfType == 2) { - $rgb = sprintf('%02X%02X%02X', ord($xclrValue{0}), ord($xclrValue{1}), ord($xclrValue{2})); + $rgb = sprintf('%02X%02X%02X', ord($xclrValue[0]), ord($xclrValue[1]), ord($xclrValue[2])); // modify the relevant style property if ( isset($this->_mapCellXfIndex[$ixfe]) ) { @@ -2487,7 +2487,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce if ($isBuiltIn) { // offset: 2; size: 1; identifier for built-in style - $builtInId = ord($recordData{2}); + $builtInId = ord($recordData[2]); switch ($builtInId) { case 0x00: @@ -2554,7 +2554,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $this->_pos += 4 + $length; // offset: 4; size: 1; sheet state - switch (ord($recordData{4})) { + switch (ord($recordData[4])) { case 0x00: $sheetState = PHPExcel_Worksheet::SHEETSTATE_VISIBLE; break; case 0x01: $sheetState = PHPExcel_Worksheet::SHEETSTATE_HIDDEN; break; case 0x02: $sheetState = PHPExcel_Worksheet::SHEETSTATE_VERYHIDDEN; break; @@ -2562,7 +2562,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce } // offset: 5; size: 1; sheet type - $sheetType = ord($recordData{5}); + $sheetType = ord($recordData[5]); // offset: 6; size: var; sheet name if ($this->_version == self::XLS_BIFF8) { @@ -2741,7 +2741,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // offset: 2; size: 1; keyboard shortcut // offset: 3; size: 1; length of the name (character count) - $nlen = ord($recordData{3}); + $nlen = ord($recordData[3]); // offset: 4; size: 2; size of the formula data (it can happen that this is zero) // note: there can also be additional data, this is not included in $flen @@ -3817,7 +3817,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // We can apparently not rely on $isPartOfSharedFormula. Even when $isPartOfSharedFormula = true // the formula data may be ordinary formula data, therefore we need to check // explicitly for the tExp token (0x01) - $isPartOfSharedFormula = $isPartOfSharedFormula && ord($formulaStructure{2}) == 0x01; + $isPartOfSharedFormula = $isPartOfSharedFormula && ord($formulaStructure[2]) == 0x01; if ($isPartOfSharedFormula) { // part of shared formula which means there will be a formula with a tExp token and nothing else @@ -3841,7 +3841,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xfIndex = self::_GetInt2d($recordData, 4); // offset: 6; size: 8; result of the formula - if ( (ord($recordData{6}) == 0) + if ( (ord($recordData[6]) == 0) && (ord($recordData{12}) == 255) && (ord($recordData{13}) == 255) ) { @@ -3857,23 +3857,23 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // read STRING record $value = $this->_readString(); - } elseif ((ord($recordData{6}) == 1) + } elseif ((ord($recordData[6]) == 1) && (ord($recordData{12}) == 255) && (ord($recordData{13}) == 255)) { // Boolean formula. Result is in +2; 0=false, 1=true $dataType = PHPExcel_Cell_DataType::TYPE_BOOL; - $value = (bool) ord($recordData{8}); + $value = (bool) ord($recordData[8]); - } elseif ((ord($recordData{6}) == 2) + } elseif ((ord($recordData[6]) == 2) && (ord($recordData{12}) == 255) && (ord($recordData{13}) == 255)) { // Error formula. Error code is in +2 $dataType = PHPExcel_Cell_DataType::TYPE_ERROR; - $value = self::_mapErrorCode(ord($recordData{8})); + $value = self::_mapErrorCode(ord($recordData[8])); - } elseif ((ord($recordData{6}) == 3) + } elseif ((ord($recordData[6]) == 3) && (ord($recordData{12}) == 255) && (ord($recordData{13}) == 255)) { @@ -3943,7 +3943,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // offset: 6, size: 1; not used // offset: 7, size: 1; number of existing FORMULA records for this shared formula - $no = ord($recordData{7}); + $no = ord($recordData[7]); // offset: 8, size: var; Binary token array of the shared formula $formula = substr($recordData, 8); @@ -4010,10 +4010,10 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $xfIndex = self::_GetInt2d($recordData, 4); // offset: 6; size: 1; the boolean value or error value - $boolErr = ord($recordData{6}); + $boolErr = ord($recordData[6]); // offset: 7; size: 1; 0=boolean; 1=error - $isError = ord($recordData{7}); + $isError = ord($recordData[7]); $cell = $this->_phpSheet->getCell($columnString . ($row + 1)); switch ($isError) { @@ -4391,7 +4391,7 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce if (!$this->_readDataOnly) { // offset: 0; size: 1; pane identifier - $paneId = ord($recordData{0}); + $paneId = ord($recordData[0]); // offset: 1; size: 2; index to row of the active cell $r = self::_GetInt2d($recordData, 1); @@ -4411,17 +4411,17 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce // first row '1' + last row '16384' indicates that full column is selected (apparently also in BIFF8!) if (preg_match('/^([A-Z]+1\:[A-Z]+)16384$/', $selectedCells)) { - $selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)16384$/', '${1}1048576', $selectedCells); + $selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)16384$/', '$[1]1048576', $selectedCells); } // first row '1' + last row '65536' indicates that full column is selected if (preg_match('/^([A-Z]+1\:[A-Z]+)65536$/', $selectedCells)) { - $selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)65536$/', '${1}1048576', $selectedCells); + $selectedCells = preg_replace('/^([A-Z]+1\:[A-Z]+)65536$/', '$[1]1048576', $selectedCells); } // first column 'A' + last column 'IV' indicates that full row is selected if (preg_match('/^(A[0-9]+\:)IV([0-9]+)$/', $selectedCells)) { - $selectedCells = preg_replace('/^(A[0-9]+\:)IV([0-9]+)$/', '${1}XFD${2}', $selectedCells); + $selectedCells = preg_replace('/^(A[0-9]+\:)IV([0-9]+)$/', '$[1]XFD$[2]', $selectedCells); } $this->_phpSheet->setSelectedCells($selectedCells); @@ -6090,10 +6090,10 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce $lr = self::_GetInt2d($subData, 2) + 1; // offset: 4; size: 1; index to first column - $fc = ord($subData{4}); + $fc = ord($subData[4]); // offset: 5; size: 1; index to last column - $lc = ord($subData{5}); + $lc = ord($subData[5]); // check values if ($fr > $lr || $fc > $lc) { @@ -6500,13 +6500,13 @@ class PHPExcel_Reader_Excel5 extends PHPExcel_Reader_Abstract implements PHPExce private static function _readRGB($rgb) { // offset: 0; size 1; Red component - $r = ord($rgb{0}); + $r = ord($rgb[0]); // offset: 1; size: 1; Green component - $g = ord($rgb{1}); + $g = ord($rgb[1]); // offset: 2; size: 1; Blue component - $b = ord($rgb{2}); + $b = ord($rgb[2]); // HEX notation, e.g. 'FF00FC' $rgb = sprintf('%02X%02X%02X', $r, $g, $b); diff --git a/core/class/PHPExcel/Reader/Excel5/MD5.php b/core/class/PHPExcel/Reader/Excel5/MD5.php index 946d5a0..f7f515a 100644 --- a/core/class/PHPExcel/Reader/Excel5/MD5.php +++ b/core/class/PHPExcel/Reader/Excel5/MD5.php @@ -72,7 +72,7 @@ class PHPExcel_Reader_Excel5_MD5 { $s = ''; foreach (array('a', 'b', 'c', 'd') as $i) { - $v = $this->{$i}; + $v = $this->[$i]; $s .= chr($v & 0xff); $s .= chr(($v >> 8) & 0xff); $s .= chr(($v >> 16) & 0xff); diff --git a/core/class/PHPExcel/Reader/SYLK.php b/core/class/PHPExcel/Reader/SYLK.php index cd87ce5..fc7b837 100644 --- a/core/class/PHPExcel/Reader/SYLK.php +++ b/core/class/PHPExcel/Reader/SYLK.php @@ -168,7 +168,7 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_ if ($dataType == 'C') { // Read cell value data foreach($rowData as $rowDatum) { - switch($rowDatum{0}) { + switch($rowDatum[0]) { case 'C' : case 'X' : $columnIndex = substr($rowDatum,1) - 1; @@ -257,7 +257,7 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_ if ($dataType == 'P') { $formatArray = array(); foreach($rowData as $rowDatum) { - switch($rowDatum{0}) { + switch($rowDatum[0]) { case 'P' : $formatArray['numberformat']['code'] = str_replace($fromFormats,$toFormats,substr($rowDatum,1)); break; case 'E' : @@ -267,7 +267,7 @@ class PHPExcel_Reader_SYLK extends PHPExcel_Reader_Abstract implements PHPExcel_ break; case 'S' : $styleSettings = substr($rowDatum,1); for ($i=0;$i
PHP:'.$logtrace; + $BackTraceID = md5(dzz_error::clear($messagesave)); if($save) { - $messagesave = ''.$message.'
PHP:'.$logtrace; - dzz_error::write_error_log($messagesave); + dzz_error::write_error_log($messagesave.' BackTraceID:'.$BackTraceID); } if($show) { - if(!defined('IN_MOBILE')) { - dzz_error::show_error('system', "
ERR: $dberror
"; @@ -98,8 +91,9 @@ class dzz_error } $errormsg .= "
"; $errormsg .= 'PHP: '.$logtrace; - - dzz_error::write_error_log($errormsg); + $BackTraceID = md5(dzz_error::clear($errormsg)); + dzz_error::write_error_log($errormsg.' BackTraceID:'.$BackTraceID); + dzz_error::show_error('db', $msg, $showtrace, '', $BackTraceID); exit(); } @@ -128,6 +122,7 @@ class dzz_error krsort($trace); $trace[] = array('file'=>$exception->getFile(), 'line'=>$exception->getLine(), 'function'=> 'break'); + $logmsg = ''; $phpmsg = array(); foreach ($trace as $error) { if(!empty($error['function'])) { @@ -148,7 +143,12 @@ class dzz_error $fun .= (defined('DZZ_DEBUG') && DZZ_DEBUG) ? $arg : '%d'; } elseif(is_float($arg)) { $fun .= (defined('DZZ_DEBUG') && DZZ_DEBUG) ? $arg : '%f'; - } else { + } elseif(is_resource($arg)) { + $fun .= (defined('DZZ_DEBUG') && DZZ_DEBUG) ? 'Resource' : '%f'; + } elseif(is_object($arg)) { + $fun .= (defined('DZZ_DEBUG') && DZZ_DEBUG) ? 'Object' : '%f'; + } else { + $arg = (string)$arg; $fun .= (defined('DZZ_DEBUG') && DZZ_DEBUG) ? '\''.dhtmlspecialchars(substr(self::clear($arg), 0, 10)).(strlen($arg) > 10 ? ' ...' : '').'\'' : '%s'; } $mark = ', '; @@ -163,34 +163,46 @@ class dzz_error 'line' => $error['line'], 'function' => $error['function'], ); + $file = str_replace(array(DZZ_ROOT, '\\'), array('', '/'), $error['file']); + $func = isset($error['class']) ? $error['class'] : ''; + $func .= isset($error['type']) ? $error['type'] : ''; + $func .= isset($error['function']) ? $error['function'] : ''; + $line = sprintf('%04d', $error['line']); + $logmsg .= (!empty($logmsg) ? ' -> ' : '').$file.'#'.$func.':'.$line; } - - self::show_error($type, $errormsg, $phpmsg); + $messagesave = ''.$errormsg.'
PHP:'.$logmsg; + $BackTraceID = md5(dzz_error::clear($messagesave)); + self::write_error_log($messagesave.' BackTraceID:'.$BackTraceID); + self::show_error($type, $errormsg, $phpmsg, '', $BackTraceID); exit(); } - public static function show_error($type, $errormsg, $phpmsg = '', $typemsg = '') { + public static function show_error($type, $errormsg, $phpmsg = '', $typemsg = '', $backtraceid = '') { global $_G; - ob_end_clean(); $gzip = getglobal('gzipcompress'); ob_start($gzip ? 'ob_gzhandler' : null); - $cur_url = $_SERVER['REQUEST_URI']; + header("HTTP/1.1 503 Service Temporarily Unavailable"); + header("Status: 503 Service Temporarily Unavailable"); + header("Retry-After: 3600"); $host = $_SERVER['HTTP_HOST']; $title = $type == 'db' ? 'Database' : 'System'; echo <<
| Dzz! $title Error | -
| Error messages: |
-
|
-- |
| Program messages: |
-
|
-$endmsg |
-
-
- '.$multipage.($shownum && !$simple ? '
- '.$multipage.($shownum && !$simple ? '
';
+ return '';
}else{//没有上传头像，使用背景+首字母
if($uid){
if($headercolors[$uid]) $headerColor=$headercolors[$uid];
@@ -707,7 +712,7 @@ function avatar_group($gid,$groupcolors=array(),$class='iconFirstWord'){
if($groupcolors[$gid]){
if($groupcolor = $groupcolors[$gid]['aid']){
if(preg_match('/^\#.+/',$groupcolor)){
- return ''.strtoupper(new_strsubstr($groupcolors[$gid]['orgname'],1,'')).'';
+ return ''.strtoupper(new_strsubstr($groupcolors[$gid]['orgname'],1,'')).'';
}elseif(preg_match('/^\d+$/',$groupcolor) && $groupcolors > 0){
return ''; + } + global $_G; + $debugfile = $_G['adminid'] == 1 ? '_debugadmin.php' : '_debug.php'; + $akey = md5($_G['authkey'].random(8)); + if(!defined('DZZ_DEBUG') || !DZZ_DEBUG || defined('IN_ARCHIVER') || defined('IN_MOBILE')) { + return; + } + $phpinfok = 'I'; + $viewcachek = 'C'; + $mysqlplek = 'P'; + $includes = get_included_files(); + require_once DZZ_ROOT.'./core/core_version.php'; + + $sqldebug = ''; + $ismysqli = DB::$driver == 'db_driver_mysqli' ? 1 : 0; + $n = $dzz_table = 0; + $sqlw = array('Using filesort' => 0, 'Using temporary' => 0); + $db = DB::object(); + $queries = count($db->sqldebug); + $links = array(); + foreach($db->link as $k => $link) { + $links[$ismysqli ? $link->thread_id : (string)$link] = $k; + } + $sqltime = 0; + foreach ($db->sqldebug as $string) { + $sqltime += $string[1]; + $extra = $dt = ''; + $n++; + $sql = preg_replace('/'.preg_quote($_G['config']['db']['1']['tablepre']).'[\w_]+/', '\\0', nl2br(dhtmlspecialchars($string[0]))); + $sqldebugrow = ''.($extra ? $extra.'
' : '').'
'; + + $sqldebug .= '
'; + file_put_contents(DZZ_ROOT.'./'.$ajaxhtml, $sqldebug, FILE_APPEND); + return; + } + file_put_contents(DZZ_ROOT.'./'.$ajaxhtml, 'Refresh
'); + foreach($sqlw as $k => $v) { + $sqlw[$k] = $k.': '.$v; + } + $sqlw = '('.($dzz_table ? 'dzz_table: '.$dzz_table.($sqlw ? ', ' : '') : '').($sqlw ? '
\'; + debug($cache[\'ctype\'] ? dunserialize($cache[\'data\']) : $cache[\'data\']); + } + exit; +} +elseif(isset($_GET[\''.$mysqlplek.'\'])) { + chdir(\'../\'); + define(\'APPTYPEID\', 200); + define(\'DZZSCRIPT\', \'index.php\'); + define(\'CURSCRIPT\', \'dzz\'); + require \'./core/coreBase.php\'; + $dzz = C::app(); + $dzz->init(); + if(!empty($_GET[\'Id\'])) { + $query = DB::query("KILL ".floatval($_GET[\'Id\']), \'SILENT\'); + } + $i = 0; + $query = DB::query("SHOW FULL PROCESSLIST"); + echo \'\'; + echo \'
| \'.implode(\' | \', array_keys($row)).\' | |
| [Kill] | \'.implode(\' | \', $row).\' |
'.
+ '
+
'.
+ '
'.
+ '| '.
+ '文件'.
+ '版本: DZZ! '.CORE_VERSION.($svn ? $svn : ' '.CORE_RELEASE).' '. + 'ModID: '. + '包含: '. + '[文件列表]'. + ' '. + '执行: '. + (isset($_ENV['analysis']['function']) ? '[函数列表]'. + ' | '.
+ '服务器'.
+ '环境: '.PHP_OS.', '.$_SERVER['SERVER_SOFTWARE'].' MySQL/'.DB::object()->version().'('.(DB::$driver).') '. + $m. + 'SQL: '. + '[SQL列表]'. + '[AjaxSQL列表]'. + ' '. + '内存缓存: '.$mc. + ' |
| '. + '客户端 [详情] '. + ' | |
'.
+ '[TOP] '.
+ ' $_COOKIE'.
+ ($_G['adminid'] == 1 ? '$_G' : '').
+ ($_G['adminid'] == 1 ?
+ 'phpinfo()'.
+ 'MySQL 进程列表'.
+ '查看缓存'.
+ '更新缓存' : '').
+ '执行 update.php'.
+ ' | |
'.
+ ''.
+ ''.
+ ''.
+ ''.$mco.'';
+ $fn = 'data/'.$debugfile;
+ file_put_contents(DZZ_ROOT.'./'.$fn, $debug);
+ echo '';
+}
+
+function memory_info(&$debug, $_fn, $function) {
+ $debug .= '';
+}
+
+function _get_addslashes() {
+ return ' function debugaddslashes($string, $force = 1) {
+ if(is_array($string)) {
+ $keys = array_keys($string);
+ foreach($keys as $key) {
+ $val = $string[$key];
+ unset($string[$key]);
+ $string[addslashes($key)] = debugaddslashes($val, $force);
+ }
+ } else {
+ $string = addslashes($string);
+ }
+ return $string;
+}
+$_GET = debugaddslashes($_GET); ';
+}
+
+
+?>
\ No newline at end of file
diff --git a/core/function/function_filesock.php b/core/function/function_filesock.php
index f412f3b..270595f 100644
--- a/core/function/function_filesock.php
+++ b/core/function/function_filesock.php
@@ -178,6 +178,4 @@ function _format_postkey($post, &$result, $key = '') {
}
}
}
-
-
-?>
+?>
\ No newline at end of file
diff --git a/core/function/function_mail.php b/core/function/function_mail.php
index b233885..c756aad 100644
--- a/core/function/function_mail.php
+++ b/core/function/function_mail.php
@@ -43,12 +43,12 @@ EOT;
$_G['setting']['mail']['mailsend'] = $_G['setting']['mail']['mailsend'] ? $_G['setting']['mail']['mailsend'] : 1;
if($_G['setting']['mail']['mailsend'] == 3) {
- $email_from = empty($from) ? $_G['setting']['adminemail'] : $from;
+ $email_from = empty($from) ? ($_G['setting']['adminemail']?$_G['setting']['adminemail']:$_G['setting']['mail']['from']) : $from;
} else {
- $email_from = $from == '' ? '=?'.CHARSET.'?B?'.base64_encode($_G['setting']['sitename'])."?= <".$_G['setting']['adminemail'].">" : (preg_match('/^(.+?) \<(.+?)\>$/',$from, $mats) ? '=?'.CHARSET.'?B?'.base64_encode($mats[1])."?= <$mats[2]>" : $from);
+ $email_from = $_G['setting']['mail']['from'];
}
- $email_to = preg_match('/^(.+?) \<(.+?)\>$/',$toemail, $mats) ? ($mailusername ? '=?'.CHARSET.'?B?'.base64_encode($mats[1])."?= <$mats[2]>" : $mats[2]) : $toemail;
+ $email_to = preg_match('/^(.+?)\s*\<(.+?)\>$/',$toemail, $mats) ? ($mailusername ? '=?'.CHARSET.'?B?'.base64_encode($mats[1])."?= <$mats[2]>" : $mats[2]) : $toemail;
$email_subject = '=?'.CHARSET.'?B?'.base64_encode(preg_replace("/[\r|\n]/", '', '['.$_G['setting']['sitename'].'] '.$subject)).'?=';
@@ -65,7 +65,7 @@ EOT;
} elseif($_G['setting']['mail']['mailsend'] == 2) {
if(!$fp = fsocketopen($_G['setting']['mail']['server'], $_G['setting']['mail']['port'], $errno, $errstr, 30)) {
- runlog('SMTP', "({$_G[setting][mail][server]}:{$_G[setting][mail][port]}) CONNECT - Unable to connect to the SMTP server", 0);
+ runlog('SMTP', "({$_G['setting']['mail']['server']}:{$_G['setting']['mail']['port']}) CONNECT - Unable to connect to the SMTP server", 0);
return false;
}
@@ -73,14 +73,14 @@ EOT;
$lastmessage = fgets($fp, 512);
if(substr($lastmessage, 0, 3) != '220') {
- runlog('SMTP', "{$_G[setting][mail][server]}:{$_G[setting][mail][port]} CONNECT - $lastmessage", 0);
+ runlog('SMTP', "{$_G['setting']['mail']['server']}:{$_G['setting']['mail']['port']} CONNECT - $lastmessage", 0);
return false;
}
fputs($fp, ($_G['setting']['mail']['auth'] ? 'EHLO' : 'HELO')." uchome\r\n");
$lastmessage = fgets($fp, 512);
if(substr($lastmessage, 0, 3) != 220 && substr($lastmessage, 0, 3) != 250) {
- runlog('SMTP', "({$_G[setting][mail][server]}:{$_G[setting][mail][port]}) HELO/EHLO - $lastmessage", 0);
+ runlog('SMTP', "({$_G['setting']['mail']['server']}:{$_G['setting']['mail']['port']}) HELO/EHLO - $lastmessage", 0);
return false;
}
@@ -95,21 +95,21 @@ EOT;
fputs($fp, "AUTH LOGIN\r\n");
$lastmessage = fgets($fp, 512);
if(substr($lastmessage, 0, 3) != 334) {
- runlog('SMTP', "({$_G[setting][mail][server]}:{$_G[setting][mail][port]}) AUTH LOGIN - $lastmessage", 0);
+ runlog('SMTP', "({$_G['setting']['mail']['server']}:{$_G['setting']['mail']['port']}) AUTH LOGIN - $lastmessage", 0);
return false;
}
fputs($fp, base64_encode($_G['setting']['mail']['auth_username'])."\r\n");
$lastmessage = fgets($fp, 512);
if(substr($lastmessage, 0, 3) != 334) {
- runlog('SMTP', "({$_G[setting][mail][server]}:{$_G[setting][mail][port]}) USERNAME - $lastmessage", 0);
+ runlog('SMTP', "({$_G['setting']['mail']['server']}:{$_G['setting']['mail']['port']}) USERNAME - $lastmessage", 0);
return false;
}
fputs($fp, base64_encode($_G['setting']['mail']['auth_password'])."\r\n");
$lastmessage = fgets($fp, 512);
if(substr($lastmessage, 0, 3) != 235) {
- runlog('SMTP', "({$_G[setting][mail][server]}:{$_G[setting][mail][port]}) PASSWORD - $lastmessage", 0);
+ runlog('SMTP', "({$_G['setting']['mail']['server']}:{$_G['setting']['mail']['server']}) PASSWORD - $lastmessage", 0);
return false;
}
@@ -122,7 +122,7 @@ EOT;
fputs($fp, "MAIL FROM: <".preg_replace("/.*\<(.+?)\>.*/", "\\1", $email_from).">\r\n");
$lastmessage = fgets($fp, 512);
if(substr($lastmessage, 0, 3) != 250) {
- runlog('SMTP', "({$_G[setting][mail][server]}:{$_G[setting][mail][port]}) MAIL FROM - $lastmessage", 0);
+ runlog('SMTP', "({$_G['setting']['mail']['server']}:{$_G['setting']['mail']['port']}) MAIL FROM - $lastmessage", 0);
return false;
}
}
@@ -132,14 +132,14 @@ EOT;
if(substr($lastmessage, 0, 3) != 250) {
fputs($fp, "RCPT TO: <".preg_replace("/.*\<(.+?)\>.*/", "\\1", $toemail).">\r\n");
$lastmessage = fgets($fp, 512);
- runlog('SMTP', "({$_G[setting][mail][server]}:{$_G[setting][mail][port]}) RCPT TO - $lastmessage", 0);
+ runlog('SMTP', "({$_G['setting']['mail']['server']}:{$_G['setting']['mail']['port']}) RCPT TO - $lastmessage", 0);
return false;
}
fputs($fp, "DATA\r\n");
$lastmessage = fgets($fp, 512);
if(substr($lastmessage, 0, 3) != 354) {
- runlog('SMTP', "({$_G[setting][mail][server]}:{$_G[setting][mail][port]}) DATA - $lastmessage", 0);
+ runlog('SMTP', "({$_G['setting']['mail']['server']}:{$_G['setting']['mail']['port']}) DATA - $lastmessage", 0);
return false;
}
@@ -157,7 +157,7 @@ EOT;
fputs($fp, "$email_message\r\n.\r\n");
$lastmessage = fgets($fp, 512);
if(substr($lastmessage, 0, 3) != 250) {
- runlog('SMTP', "({$_G[setting][mail][server]}:{$_G[setting][mail][port]}) END - $lastmessage", 0);
+ runlog('SMTP', "({$_G['setting']['mail']['server']}:{$_G['setting']['mail']['port']}) END - $lastmessage", 0);
}
fputs($fp, "QUIT\r\n");
diff --git a/core/function/function_message.php b/core/function/function_message.php
index f69e518..55ab182 100644
--- a/core/function/function_message.php
+++ b/core/function/function_message.php
@@ -39,31 +39,9 @@ function dshowmessage($message, $url_forward = '', $values = array(), $extrapara
include template('common/showmessage');
dexit();
}
-
define('CACHE_FORBIDDEN', TRUE);
$_G['setting']['msgforward'] = @dunserialize($_G['setting']['msgforward']);
$handlekey = $leftmsg = '';
-
- /*if(defined('IN_MOBILE')) {
- unset($extraparam['showdialog']);
- unset($extraparam['closetime']);
- unset($extraparam['extrajs']);
-
- if(!$url_forward && dreferer() && IN_MOBILE == 1) {
- $url_forward = $referer = dreferer();
- }
- if(!empty($url_forward) && strpos($url_forward, 'mobile') === false) {
- $url_forward_arr = explode("#", $url_forward);
- if(strpos($url_forward_arr[0], '?') !== false) {
- $url_forward_arr[0] = $url_forward_arr[0].'&mobile='.IN_MOBILE;
- } else {
- $url_forward_arr[0] = $url_forward_arr[0].'?mobile='.IN_MOBILE;
- }
- $url_forward = implode("#", $url_forward_arr);
- }
- }*/
-
-
if(empty($_G['inajax']) && (!empty($_GET['quickforward']) || $_G['setting']['msgforward']['quick'] && empty($extraparam['clean_msgforward']) && $_G['setting']['msgforward']['messages'] && @in_array($message, $_G['setting']['msgforward']['messages']))) {
$param['header'] = true;
}
@@ -121,7 +99,6 @@ function dshowmessage($message, $url_forward = '', $values = array(), $extrapara
include template('common/footer_ajax');
dexit();
}
-
$vars = explode(':', $message);
if(count($vars) == 2) {
$show_message = lang($vars[1], $values,null,$vars[0]);
@@ -214,5 +191,4 @@ function dshowmessage($message, $url_forward = '', $values = array(), $extrapara
exit();
}
-
-?>
+?>
\ No newline at end of file
diff --git a/core/function/function_misc.php b/core/function/function_misc.php
index c3178ff..f157a1d 100644
--- a/core/function/function_misc.php
+++ b/core/function/function_misc.php
@@ -2,7 +2,6 @@
if(!defined('IN_DZZ')) {
exit('Access Denied');
}
-
function convertip($ip) {
$return = '';
@@ -205,23 +204,19 @@ function convertip_full($ip, $ipdatafile) {
}
-
-
function modlog($thread, $action) {
global $_G;
$reason = $_GET['reason'];
- writelog('modslog', dhtmlspecialchars("$_G[timestamp]\t$_G[username]\t$_G[adminid]\t$_G[clientip]\t".$_G['forum']['fid']."\t".$_G['forum']['name']."\t$thread[tid]\t$thread[subject]\t$action\t$reason\t".$_G['toforum']['fid']."\t".$_G['toforum']['name']));
+ writelog('modslog', dhtmlspecialchars("{$_G['timestamp']}\t{$_G['username']}\t{$_G['adminid']}\t{$_G['clientip']}\t".$_G['forum']['fid']."\t".$_G['forum']['name']."\t{$thread['tid']}\t{$thread['subject']}\t$action\t$reason\t".$_G['toforum']['fid']."\t".$_G['toforum']['name']));
}
-
-
function savebanlog($username, $origgroupid, $newgroupid, $expiration, $reason) {
global $_G;
if($_G['setting']['plugins']['func'][HOOKTYPE]['savebanlog']) {
$param = func_get_args();
hookscript('savebanlog', 'global', 'funcs', array('param' => $param), 'savebanlog');
}
- writelog('banlog', dhtmlspecialchars("$_G[timestamp]\t{$_G[member][username]}\t$_G[groupid]\t$_G[clientip]\t$username\t$origgroupid\t$newgroupid\t$expiration\t$reason"));
+ writelog('banlog', dhtmlspecialchars("{$_G['timestamp']}\t{$_G['member']['username']}\t{$_G['groupid']}\t{$_G['clientip']}\t$username\t$origgroupid\t$newgroupid\t$expiration\t$reason"));
}
function clearlogstring($str) {
diff --git a/core/function/function_seccode.php b/core/function/function_seccode.php
index b5bac49..182d348 100644
--- a/core/function/function_seccode.php
+++ b/core/function/function_seccode.php
@@ -24,7 +24,7 @@ function make_seccode($idhash){
if($seccodeunits) {
$seccode = '';
for($i = 0; $i < 4; $i++) {
- $unit = ord($s{$i});
+ $unit = ord($s[$i]);
$seccode .= ($unit >= 0x30 && $unit <= 0x39) ? $seccodeunits[$unit - 0x30] : $seccodeunits[$unit - 0x57];
}
}
diff --git a/core/language/zh-cn/lang.php b/core/language/zh-cn/lang.php
index 43f1cc2..4b37db0 100644
--- a/core/language/zh-cn/lang.php
+++ b/core/language/zh-cn/lang.php
@@ -1,6 +1,12 @@
'更多应用',
+ 'Home page'=>'首页',
+ 'parameters_error'=>'参数错误',
+ 'Personal data display'=>'个人资料展示',
+ 'Select_the_language'=>'选择语言',
'weak'=>'弱',
+ 'appname'=>$_G['setting']['sitename'],
'center'=>'中',
'strong'=>'强',
'intension'=>'强度',
@@ -120,6 +126,7 @@ $lang = array (
'public' => '公开',
'delete'=>'删除',
'deleter'=>'删除人',
+ 'people'=>'人',
'delete_success'=>'删除成功',
'delete_time'=>'删除时间',
'delete_unsuccess'=>'删除失败',
@@ -1475,6 +1482,39 @@ $_G[siteurl]',
'title_admincp'=>'管理员登录入口',
'forbid_folder_to_sub_folder'=>'目标文件夹是源文件夹的子文件夹',
'system_error'=>'系统异常!',
+ 'operation_error'=>'操作异常!',
+ 'no_institution_users'=>'无机构用户',
+ 'compellation'=>'用户名',
+ 'usergroup' => '用户组',
+ 'organization'=>'机构',
+ 'department'=>'部门',
+ 'save_changes'=>'保存更改',
+ 'registration_time'=>'注册时间',
+
+ 'operator' => '操作者',
+ 'info'=>'信息',
+ 'loginfo'=>'日志信息',
+ 'visit'=>'访问页面',
+ 'from'=>'来源页面',
+ 'Equipment information'=>'设备信息',
+ 'ip' => 'IP 地址',
+
+ 'congratulations' => '恭喜您',
+ 'login_success' => '登录成功！',
+ 'no_relevant_content' => '没有相关的内容…',
+ 'degree_exhaust'=>'次数用尽',
+ 'short'=>'短链接',
+ 'logs_lpp' => '每页显示',
+ 'founder_upgrade_normal' => '正常',
+ 'logs_invite_status_4' => '已过期',
+ 'del_share'=>'删除分享',
+ 'app_upgrade_dzzversion_error' => 'DzzOffice版本要求：{version}',
+ 'File_open_success' =>'文件打开成功',
+ 'File_open_error' =>'文件打开失败',
+ 'file_read_no_privilege'=>'抱歉！您没有该文件的预览权限',
+ 'file_download_no_privilege'=>'抱歉！您没有该文件的下载权限',
+ 'file_edit_no_privilege'=>'抱歉！您没有该文件的编辑权限',
+ 'file_been_deleted'=>'文件已删除',
);
?>
\ No newline at end of file
diff --git a/core/template/default/common/about.htm b/core/template/default/common/about.htm
index 8e3d598..7c9e357 100644
--- a/core/template/default/common/about.htm
+++ b/core/template/default/common/about.htm
@@ -1,40 +1,41 @@
- 001Tk1^@s6j3j1m00004b3#c}2nYxW
zdKjs{jB17IZ~ebVG7wVRUJ4ZXi@?ZDjy3I4?3W
zFEKN3T>bd~0010xMObuGZ)S9NVRB^vL1b@YWgtdra%FdKa%*!SLsK^Byt0e{00cKl
zL_t(&f$f^lPupe~$G>(`ldK9e5uybYG))ttlTiMIhy!REQnrG`Dcr_(TQzZ>ChgE_
z#sZcUWHJd!lAdO>+2zT}$)8Yf*gvK@+N>)1d>%Z{Bb&`WipS&8+1c6O
zacWYv+5kZBm~{pr1er_*f*?Sa<;9hil?SV~o`eunPtE@e4b7^eX&Tb$G(=HE
zKA-=3Y;0@+r-rG75cSQZ*&bYJR+W>J6Qoip2!ilDlgTWH!{K#8NV(MswiBk!s!}Kv
z5Rb=kaBvWso}PZ*s>Iq6%Z;bc=fmLOAo~0JKWjxo?ToE1on=`t4D)fblWBKsnMKny
zD2jTk_PC~L#JGu~NHk3|GtB8)?GI07vs!4HMq;rTslA37Z7dd}e>{t2+$f5wPtwc<
z?NBTh!SlSSb18~C*MdCTDdX1{MN9EGj)NcwmNWn`JUp!b@}h`mJ6AueT4I)>C`cp{
zwmSUnKNURQlx@Y`-`__rm$RjPyeVVnFXhs6nr@b^>xjqWP*v+K7%%CF{+xqu^TmJ=
zg5BL+lu9MbTAct7pX9(xjr;7To5gV)%4O^AS4p9;urA?M<$5m#s;XjpdmFlL{W`BI
zIu_O?l$84U3TS~@9*@VC&U=I4PJn4j4lK)prtRI@od5&xjf+dW>1Ory^}*-!+0uUc
zA&d70u4h1}HEQ+EK2n4_|Hg1~en4j|Fw%=_l
zw%6-LFc`F@?PJ}TpYnsI-r$@C04|pcLqkKhhJu$N_~Nb~H$B$0Znqo3V9;hv8uL?r
z-1J=jWNBHS<@I_oFfd?Cd+TiqpMTV2Ni#Y+imt9MTk-DQ?ZGYf;z`|zy?Sqe%jG&3
zvA4I^lTa~5jy5l}612)ad<#Nz8t=YM>J(kVN=kqu`
zJOsyap;jc+&X}IFDwPU&o<};J-sE}y`X*bE!-ZzavRqv^T-w{)dpI{Y_Xp0ePy ins {
+ position:absolute;
+ left:0px;
+ top:2px;
+}
+.filemanage .filemanage-right{
+ left:0px;top:0px;padding:0px;height:100%; position:relative;
+ margin-left:180px;
+}
+.filemanage .filemanage-right .filemanage-header{
+ background: #FbFbFb;
+ border-bottom: 1px solid #ddd;
+ font-size: 12px;
+ overflow:visible;
+}
+.filemanage-header .nav,.filemanage-bottom .nav{
+ margin:0;
+}
+.nav > li > a:focus {
+ background: none;
+ text-decoration: none;
+}
+.nav-pills .dropdown-menu{
+ border-radius:0;
+ min-width:100px;
+}
+.filemanage .filemanage-right .filemanage-bottom{
+ background: #FbFbFb;
+ font-size: 12px;
+ position:absolute;
+ z-index:100;
+ left:0;
+ top:0;
+ width:100%;
+ border-left:1px solid #FFF;
+ display:none;
+ }
+ .filemanage-bottom span{
+ padding:0 10px;
+ }
+.filemanage-detail-header{
+
+}
+.filemanage .table {
+ border-collapse: initial;
+}
+
+.filemanage .table th, .filemanage .table td {
+ border-bottom: 1px solid #e7e7e7;
+ border-top:1px solid #FFF;
+ line-height: 30px;
+}
+.filemanage .detail_header_tr{
+ /*background:url(images/header.gif) repeat-x;*/
+}
+
+.filemanage .detail_header_asc{
+ display: inline-block;
+ vertical-align:middle;
+ height: 4px;
+ width: 13px;
+ margin-left: 3px;
+ background-repeat:no-repeat;
+ _margin-top:10px;
+}
+.filemanage .detail_header_asc_0{
+ background:url(images/sort_desc.gif) no-repeat;
+}
+.filemanage .detail_header_asc_1{
+ background:url(images/sort_asc.gif) no-repeat;
+}
+.filemanage .detail_header{
+/* border-left:1px solid #FF;
+ border-right:1px solid #FFF;
+*/ overflow:visible;
+}
+.filemanage .detail_header:hover,.filemanage .detail_header_hover{
+ background:#F7F7F7;
+ /*border-left:1px solid #CCC;
+ border-right:1px solid #CCC*/
+}
+.filemanage .detail_header_td_div{
+ overflow:hidden;
+ line-height:22px;
+ height:22px;
+ overflow:visible;
+ position:relative;
+}
+.filemanage .detail_header_drag{
+ position:absolute;
+ width:10px;
+ height:22px;
+ top:0px ;
+ right:-5px;
+ z-index:10;
+}
+.filemanage .detail_item_name_icon,.DragCopy .detail_item_name_icon{
+ max-width:28px;
+ max-height:28px;
+ display:inline;
+ vertical-align:middle;
+ margin-top:-5px;
+
+}
+*html .filemanage .detail_item_name_icon, *html .DragCopy .detail_item_name_icon{
+ width: expression(this.width > 28 && this.width>=this.height ? 28 : true);
+ height: expression(this.height > 28 && this.width<=this.height ? 28 : true);
+}
+
+.filemanage .detail_item_name_text,.DragCopy .detail_item_name_text{
+ margin-left:5px;
+ cursor:default;
+
+}
+.filemanage .detail_text{
+ text-shadow:1px 1px 1px #FFF;
+ word-break:break-all;
+}
+.filemanage .detail_tr{
+ height:32px;
+ border-bottom: 1px dotted rgb(204, 204, 204);
+}
+
+
+.filemanage .detail_item_td_div,.DragCopy .detail_item_td_div{
+
+ overflow:hidden;
+ line-height:30px;
+ height:30px;
+ overflow:hidden;
+ float:left;
+
+}
+
+.filemanage .treeshow-guide{
+ width:15px;
+ height:35px;
+ display:inline-block;
+ float:left;
+ margin-right:10px;
+ background:url(images/treeshow.png) 0 -2px no-repeat;
+}
+.filemanage .treeshow-guide .treeshow-guide-left{
+ width:15px;
+ height:35px;
+ display:inline-block;
+ background:url(images/treeshow.png) -15px -2px no-repeat;
+}
+.filemanage .treeshow-guide .treeshow-guide-left:hover{
+ background:url(images/treeshow.png) -30px -2px no-repeat;
+}
+.filemanage .treeshow-guide .treeshow-guide-right{
+ width:15px;
+ height:35px;
+ display:inline-block;
+ background:url(images/treeshow.png) -45px -2px no-repeat;
+}
+.filemanage .treeshow-guide .treeshow-guide-right:hover{
+ background:url(images/treeshow.png) -60px -2px no-repeat;
+}
+
+
+
+.filemanage .detail_tr a:hover{
+ text-decoration:none;
+}
+.filemanage .detail_tr.hover{
+ background:#F7F7F7;
+ transition: all 0.2s ease-in 0s;
+}
+.filemanage .detail_tr.Icoselected{
+ background:#EFEFEF;
+ transition: all 0.2s ease-in 0s;
+}
+.filemanage .detail_item_name{
+ margin:0 10px;
+ line-height:30px;
+ font-size:12px;
+ height:30px;
+ text-shadow:1px 1px 1px #FFF;
+ font-weight:700;
+ overflow:hidden;
+ word-wrap:nowrap;
+}
+.filemanage .detail_item_name span{
+ cursor:pointer;
+}
+.filemanage .detail_item_info{
+ margin:0 10px;
+ font-size:12px;
+ color:#999;
+ text-shadow:1px 1px 1px #FFF;
+ overflow:hidden;
+ word-wrap:nowrap;
+ height:18px;
+
+}
+.filemanage .detail_item_hover{
+ overflow:hidden;
+ word-wrap:nowrap;
+ position:relative;
+
+ line-height:50px;
+}
+
+.filemanage .detail_item_info span{
+ padding:0 10px 0 0;
+}
diff --git a/dzz/explorer/css/filelist_detaillist/thumb.jpg b/dzz/explorer/css/filelist_detaillist/thumb.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..56b03fd0f066ac6a80b6f9c0df535f4f2a1b617c
GIT binary patch
literal 2593
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
Am;e9(
literal 0
HcmV?d00001
diff --git a/admin/share/images/checkbox.png b/dzz/explorer/css/filelist_middleicon/images/checkbox.png
similarity index 100%
rename from admin/share/images/checkbox.png
rename to dzz/explorer/css/filelist_middleicon/images/checkbox.png
diff --git a/dzz/explorer/css/filelist_middleicon/images/index.htm b/dzz/explorer/css/filelist_middleicon/images/index.htm
new file mode 100644
index 0000000..e69de29
diff --git a/dzz/explorer/css/filelist_middleicon/images/link_small_bg.png b/dzz/explorer/css/filelist_middleicon/images/link_small_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3e0498252319f7594f564c65d3548e07772c8d2
GIT binary patch
literal 2758
zcmV;%3OV(OP)WdJcUFETYRF)?Q9R8jx{
z3L8m8K~#90?Ooq*6UiO_%>M8?wS$x6M~h+*kSl^i6sgMb$|HXWQLgIs9@^KcI(Y2s
zsZy_Z_cv6ksw+ZBsIQQqIAE@-B6z@nq9`~}Cyq_LJAH7*S|;n=nc11$HFqD$inIRi
z%y>TYozM6CU3*O^rH}z3!~$ReAP0|0MS$V>eM)JN_h1+t8Dl~S0Z;>Q1b}B`MA?C2
zNXkATWQS7P1^_|`WEZJUND%_S22j0w_wLu1E?xSS@B6-qLFq(zaw(;w2|svFDW%xl
z-0a=Hef#0Pd-uMfl>R%v(E>zfH4s7^06%~9=+W)VmoHxqpF4D(;(=0%AP7Jyh41?a
zf&jknkDd<(0}KWObh}-2yWK&%-Tw2nYuEmSp$BCSSq}jK>id2l00x7>p%-O{Q6W+0
z9Oem(6!r)oCxnc=rqk&-M~@!;bLV|e=XDUKgMexuoJekVLAjZh&(7&4PBON{6_ailO}
z7%Am)8MRssYinz`aN)v@hYufqoAp+liV&H}mT6Okm^kpH@Xr}BuIr*!tKrR?H+c5!
z87^MDxVXBy`mNMpQX;j7nA)Cn+w-K@w*B67+qU624yLB2VB0p{zI}_0jSbAt&o4F_
zjqkGZ6m46UN$t?3GrVVnb%YV)I1U`g!OqSOT-U|(=g%=eKYydyY-ZvqMl?irvQ4x*
zuKlR3i{G{!$3d^xL#$+&QTBz6Si_K>9Ya9eLraZ>DsEgW}B!;(75_!jQ5Cj3L
z)hdo0IRe|Z@#4h`)a&)n8jZ#`gb){o%0{V0J!xW!x|M~!gZCO{Ygrbir>8MHI}68g
z&}y}C=FFMJm6esh!Vn=UiQyrzNl9{JQ9D&zQG339+qOpuBRf9`hV{m&sj1O9+uPe{
zwOTlP_Uw(-)zv)%
zuP`?^_uI9#wXeeM=zvjCPnt|oJCn8yOhb4=0Km3wl*?sQt5wtvNZH)nK)pWqMWfO9
z%Ymk7nafNP!@Sy)X_pZY_KYw_q*N-X)oQ3zs@Qt{8uj|A&+p&A{}nV5l3GJV_IjB;
zURIApY(?7*3%YIFhhDdB8-z+aL4*-0@+EHCx%7pM8
zicXM;3D;rEzn@;Ohfb#h0PuYu@Ami6?e3zt*F$fw2UrA-?SK%9cDs#_KmO(Ke)!K1
zrB5z?@>v>B*Aiv%$jfWe+EO|!(@#%NMVB$Wy|hGRsw1reCdA@zF;|vGD1_
z()#*3&YwT8Oo|ag7bMs<~o+KKk5QpO2ah=U*)5uySu#lj*vMyD*xI(*qN0a~^!)dHc;%sp*eX#xTU*~J(IB|_r1nXM)
z)5)KMSWZ-Xrd}xWSbgqZM%Ji^wj`iep!G^8l`gRZ`EDK4hnK0Y*$&^4aS
zHRLBE;*p7l#0@&j3qiWKB@-~NAw|#!(YA^}n6}$9i5{QCZAsQH^Tcpmr$xvg@*+VO
zjBZ&X`Ve=%u5p;Kk+GA3u`O#-GwO*<3<)8JR=-H0FH27lwKJt5nTmS2vq|-aqUuPh
zEh|YQilz;^+mf{vfwmhd%f7CwADO<2F6clG)m~lg6nR@>+j!<*`V0>st9J5QA(fcH@vs9`Yf1L?J|-uVu;D7uhcFEFCcXEnHwS2+PwWc;u!b
zdD<~sQy!69rXGc&dxU9kNb5n`zVuo2s7W=CP$ebzuvhfX)FO5=w|Wx2iN5SORmP$N
z#uCH4b;M-ERJbTB4wF(}DjE?CnO+Yuv1(`boWBwHP1u>TK!;@bw`1L8mGqT(U`
z^78WEU%q_#>rSVW`30^t$Z88BgrHn54^~!I8W{ch($
M07*qoM6N<$f_MrjV*mgE
literal 0
HcmV?d00001
diff --git a/dzz/explorer/css/filelist_middleicon/images/ops.png b/dzz/explorer/css/filelist_middleicon/images/ops.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2cbb1a880f999a680739e4f466a3414e47f2aa3
GIT binary patch
literal 46276
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
literal 0
HcmV?d00001
diff --git a/dzz/explorer/css/filelist_middleicon/images/play.png b/dzz/explorer/css/filelist_middleicon/images/play.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c76b10a46796b79cfee43ca23dfffad91c40ef2
GIT binary patch
literal 752
zcmVw(EZ*psMAUL&X(s%#>
z0!2wgK~y-6m6K0MRB;f;Kl6L~-fHS=-347Gr7k6PDGKxuL6#K4Mg#`pCDKD(JcMVB
z=u|?df_A&ac2J1ah>|cOp*mI2!Gb8X)-`a`mu0mK)exst*hysU!gFr0EWq?P(LtwtRSXOP&0t{;O?nQro#?je~*1ob;q}G;b
zgCWKX;2iL5y#~#|?InM~yYHrwW4XlJj6eMopjI`8;^yh5BUV?pts(-P0G<~&hyeG#
z`U~}!zMmNw$qmiw6@CKXfd)8cb=3EjUp;TD$VZ?Z$f{s^o3H)7<8CT3;ttK4f;)_|vYjvbK2SU4=4smNa+VvR_~6uef=@0Gacr
zUB~~D4iqv96wqi1s21)kg~*gpxLRtegFJ%#DOA7@AY-fQ`dZa!1qaiDD1cAiyC?nM
zI(vJU+U|IuW2(`zRirNPhNoC@*n};St#Pxv3E&rK1Ecg+elpeR>>8ZR-Te#-0pe!Q
z4qGDIfQdCSF8bLmmzU4>kGjL@Vj1%Rx8vr?y1q@<2C7szU665&krw@|9(Pm8vD}TR
zxxh#<)fkGKJ=>33UEP%`Y^-Ob0$PAUPkVbDJwN04**OvA+Y*UwR?!AQUh)?!7Z3#w
i1v>xtGZo{X-uX9v#qhRA8!pNK0000DmE
literal 0
HcmV?d00001
diff --git a/dzz/explorer/css/filelist_middleicon/images/saveto.png b/dzz/explorer/css/filelist_middleicon/images/saveto.png
new file mode 100644
index 0000000000000000000000000000000000000000..74dc6ef37f3eed845780995e232c1eaa652bf8d9
GIT binary patch
literal 656
zcmV;B0&o3^P)pF7IZ~ebVG7wVRUJ4ZXi@?ZDjy3H!m|W
zFEKLHbCfm!0010xMObuGZ)S9NVRB^vL1b@YWgtdra%FdKa%*!SLsK^Byt0e{00HPp
zL_t(IjjfeCZxc}vg}>RoYj#73a1_xXlpp~;^pq3`M8OZ>hnN=pM<^(uLLwBDl#zl&
zMMMZei3_aQAm?FwANNo=ixsrqgvYJ!-I;S{=FXYBCW%?=?ydRx*R3m^z*qqAVsNj$
zbNS8s!NDv{Fp~|~=%md&lfwfZ@=R`{lQ!!xuFjYha=wt2VSORX3e{q2jcAe?{`l;V
zzx_2KK%wcy6sNGAg-~9|Pxt>sxZBUW%2Ao2a(3OQ#X6+*0x4BuPwPpRSwNKKoZI)=g@G?IC$u1l)kn#T6Mia
z;mE2T{BJE4pqe)K28DBRNEn7z?P1_kQ4W(C1Pz-hoj4?PFWw(+e%{NT4O11S`tQ+6z4<|O!NJ7!u_$v&p#ZlriGRO8lmm&k2S8t
qSlutc%wk{}C|~LCz*kA5S(u-ARO9o#=Wtp80000bd~0010xMObuGZ)S9NVRB^vL1b@YWgtdra%FdKa%*!SLsK^Byt0e{00BBl
zL_t(IjiuAEOI$$^$MMgF1to=r;7coMqtzkAQV2>Kn>6XtrifT*7s6wU2%>OAA&^2y
zu=5WvsX`z@QXGPnU?Fw~3))zy@Vun(c|1-J?r^I8&G7r~>?~7jHkw`F-TiY+|D96TBXfRC8OCE5c4vb>nat5U9~7=HE*$ns(cA25a%
zHg0SEcJLZA<#{Q^aC%$l3^B`#CwPNaiebBw&#;VP{K8I^TYN2Jf`c_?f#_WRjVgcsF)#!1pWlD~U;X`;Ve7BI3~zq?`Oom?+kXa7kco0LGKldo
zF>tUjFfbMrO#1)e!2^ahYq}V=ZQI7+tMwgh^55UTe!aMP_QAEiYcIWf@oW#!fOS9v
zUZWepa`Wa*h7TV;GQ4^7hT+SXFAP6EeP#Id9c&02uc(rmb$pH5i`y5BF7Dgt|K`#2
zl|b>AK|j6lP#u)Kc#n&HQfpA6r=ePj6i`7^_xUw;_x0}cK7;RD03U%wc{BqSK5
z
+
diff --git a/core/template/default/common/commer_header.htm b/core/template/default/common/commer_header.htm
index b2dcf77..3f94825 100644
--- a/core/template/default/common/commer_header.htm
+++ b/core/template/default/common/commer_header.htm
@@ -55,7 +55,7 @@ _notice.flashTitle=function(flag){
_notice.flashStep++;
if (_notice.flashStep==3) {_notice.flashStep=1;}
if (_notice.flashStep==1) {document.title="【您有新的通知】";}
- if (_notice.flashStep==2) {document.title="【 】";}
+ if (_notice.flashStep==2) {document.title="【$_G[setting][sitename]】";}
setTimeout(function(){_notice.flashTitle();},500); //循环
}
\ No newline at end of file
diff --git a/core/template/default/common/footer.htm b/core/template/default/common/footer.htm
index d9c3c3a..8f140bb 100644
--- a/core/template/default/common/footer.htm
+++ b/core/template/default/common/footer.htm
@@ -3,25 +3,25 @@
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
+
diff --git a/core/template/default/common/header_end.htm b/core/template/default/common/header_end.htm
index b4948a9..b6cc3e6 100644
--- a/core/template/default/common/header_end.htm
+++ b/core/template/default/common/header_end.htm
@@ -1,6 +1,6 @@
-
+
-
+
diff --git a/core/template/default/common/header_left.htm b/core/template/default/common/header_left.htm
index c37c9e7..d9b1025 100644
--- a/core/template/default/common/header_left.htm
+++ b/core/template/default/common/header_left.htm
@@ -5,6 +5,6 @@
<!--{if !empty($navtitle)}-->$navtitle -<!--{/if}--> $_G[setting][sitename]
-
-
+<!--{if !empty($navtitle)}-->$navtitle -<!--{/if}--> $_G['setting']['sitename']
+
+
diff --git a/core/template/default/common/header_simple_end.htm b/core/template/default/common/header_simple_end.htm
index 87cbdcf..fa42f0c 100644
--- a/core/template/default/common/header_simple_end.htm
+++ b/core/template/default/common/header_simple_end.htm
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/core/template/default/common/header_simple_start.htm b/core/template/default/common/header_simple_start.htm
index 6874018..93ddd38 100644
--- a/core/template/default/common/header_simple_start.htm
+++ b/core/template/default/common/header_simple_start.htm
@@ -4,9 +4,9 @@
-<!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G[setting][sitename]
-
-
+<!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G['setting']['sitename']
+
+
@@ -20,13 +20,11 @@
-
+
-
-
+
-
+
\ No newline at end of file
diff --git a/core/template/default/common/mobile_simple_process.htm b/core/template/default/common/mobile_simple_process.htm
index 84d9593..183d5e0 100644
--- a/core/template/default/common/mobile_simple_process.htm
+++ b/core/template/default/common/mobile_simple_process.htm
@@ -1,5 +1,5 @@
-
+
-
+
\ No newline at end of file
diff --git a/core/template/default/common/mobile_simple_start.htm b/core/template/default/common/mobile_simple_start.htm
index a688e24..34793bc 100644
--- a/core/template/default/common/mobile_simple_start.htm
+++ b/core/template/default/common/mobile_simple_start.htm
@@ -4,9 +4,9 @@
- <!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G[setting][sitename]
-
-
+ <!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G['setting']['sitename']
+
+
diff --git a/core/template/default/common/safechk.htm b/core/template/default/common/safechk.htm
index ebb2a05..208321f 100644
--- a/core/template/default/common/safechk.htm
+++ b/core/template/default/common/safechk.htm
@@ -165,7 +165,7 @@
sum--;
},1000);
}else if(json['error']){
- showmessage(json['error'],'danger',3000,1);
+ showmessage(json['error'],'danger','3000',1);
}
},'json')
diff --git a/core/template/default/common/seccheck.htm b/core/template/default/common/seccheck.htm
index c998f28..6843f27 100644
--- a/core/template/default/common/seccheck.htm
+++ b/core/template/default/common/seccheck.htm
@@ -12,9 +12,9 @@
-
diff --git a/dzz/dzzvote/template/vote_user.htm b/dzz/dzzvote/template/vote_user.htm
index fbed100..4bc3877 100644
--- a/dzz/dzzvote/template/vote_user.htm
+++ b/dzz/dzzvote/template/vote_user.htm
@@ -1,6 +1,6 @@
-
+
-
- 
DzzOffice
-
+ 
DzzOffice
-
+
$about[name_zh] - Dzz$about[name_en] + $about[name_en] -
- {lang about_current_version}: {lang community_edition} $about[version] + 应用版本： $about['version']
++ Dzz{lang version}： {lang community_edition} $version +
- {lang license}: AGPL V3 {lang public_license} + {lang license}： AGPL V3 {lang public_license}
- {lang service_and_support}: www.dzzoffice.com + {lang service_and_support}： www.dzzoffice.com
+
@@ -131,7 +131,7 @@
-
+
diff --git a/core/template/default/common/showmessage.htm b/core/template/default/common/showmessage.htm
index c6b3b61..1b47285 100644
--- a/core/template/default/common/showmessage.htm
+++ b/core/template/default/common/showmessage.htm
@@ -1,98 +1,89 @@
-
-
-
-
-
-
-
@@ -53,7 +53,7 @@
-
-
+
+div{display:none}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-box>div.dplayer-setting-origin-panel{display:block}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-box.dplayer-setting-box-open{transform:scale(1)}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-box.dplayer-setting-box-narrow{width:70px;text-align:center}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-box.dplayer-setting-box-speed .dplayer-setting-origin-panel{display:none}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-box.dplayer-setting-box-speed .dplayer-setting-speed-panel{display:block}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-item,.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-speed-item{height:30px;padding:5px 10px;box-sizing:border-box;cursor:pointer;position:relative}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-item:hover,.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-speed-item:hover{background-color:hsla(0,0%,100%,.1)}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku{padding:5px 0}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku .dplayer-label{padding:0 10px;display:inline}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku:hover .dplayer-label{display:none}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku:hover .dplayer-danmaku-bar-wrap{display:inline-block}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku.dplayer-setting-danmaku-active .dplayer-label{display:none}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku.dplayer-setting-danmaku-active .dplayer-danmaku-bar-wrap{display:inline-block}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku .dplayer-danmaku-bar-wrap{padding:0 10px;box-sizing:border-box;display:none;vertical-align:middle;height:100%;width:100%}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku .dplayer-danmaku-bar-wrap .dplayer-danmaku-bar{position:relative;top:8.5px;width:100%;height:3px;background:#fff;transition:all .3s ease-in-out}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku .dplayer-danmaku-bar-wrap .dplayer-danmaku-bar .dplayer-danmaku-bar-inner{position:absolute;bottom:0;left:0;height:100%;transition:all .1s ease;background:#aaa;will-change:width}.dplayer-controller .dplayer-icons .dplayer-setting .dplayer-setting-danmaku .dplayer-danmaku-bar-wrap .dplayer-danmaku-bar .dplayer-danmaku-bar-inner .dplayer-thumb{position:absolute;top:0;right:5px;margin-top:-4px;margin-right:-10px;height:11px;width:11px;border-radius:50%;cursor:pointer;transition:all .3s ease-in-out;background:#aaa}.dplayer-controller .dplayer-icons .dplayer-full{display:inline-block;height:100%;position:relative}.dplayer-controller .dplayer-icons .dplayer-full:hover .dplayer-full-in-icon{display:block}.dplayer-controller .dplayer-icons .dplayer-full .dplayer-full-in-icon{position:absolute;top:-30px;z-index:1;display:none}.dplayer-controller .dplayer-icons .dplayer-quality{position:relative;display:inline-block;height:100%;z-index:2}.dplayer-controller .dplayer-icons .dplayer-quality:hover .dplayer-quality-list,.dplayer-controller .dplayer-icons .dplayer-quality:hover .dplayer-quality-mask{display:block}.dplayer-controller .dplayer-icons .dplayer-quality .dplayer-quality-mask{display:none;position:absolute;bottom:38px;left:-18px;width:80px;padding-bottom:12px}.dplayer-controller .dplayer-icons .dplayer-quality .dplayer-quality-list{display:none;font-size:12px;width:80px;border-radius:2px;background:rgba(28,28,28,.9);padding:5px 0;transition:all .3s ease-in-out;overflow:hidden;color:#fff;text-align:center}.dplayer-controller .dplayer-icons .dplayer-quality .dplayer-quality-item{height:25px;box-sizing:border-box;cursor:pointer;line-height:25px}.dplayer-controller .dplayer-icons .dplayer-quality .dplayer-quality-item:hover{background-color:hsla(0,0%,100%,.1)}.dplayer-controller .dplayer-icons .dplayer-comment{display:inline-block;height:100%}.dplayer-controller .dplayer-icons .dplayer-label{color:#eee;font-size:13px;display:inline-block;vertical-align:middle;white-space:nowrap}.dplayer-controller .dplayer-icons .dplayer-toggle{width:32px;height:20px;text-align:center;font-size:0;vertical-align:middle;position:absolute;top:5px;right:10px}.dplayer-controller .dplayer-icons .dplayer-toggle input{max-height:0;max-width:0;display:none}.dplayer-controller .dplayer-icons .dplayer-toggle input+label{display:inline-block;position:relative;box-shadow:inset 0 0 0 0 #dfdfdf;border:1px solid #dfdfdf;height:20px;width:32px;border-radius:10px;box-sizing:border-box;cursor:pointer;transition:.2s ease-in-out}.dplayer-controller .dplayer-icons .dplayer-toggle input+label:after,.dplayer-controller .dplayer-icons .dplayer-toggle input+label:before{content:"";position:absolute;display:block;height:18px;width:18px;top:0;left:0;border-radius:15px;transition:.2s ease-in-out}.dplayer-controller .dplayer-icons .dplayer-toggle input+label:after{background:#fff;box-shadow:0 1px 3px rgba(0,0,0,.4)}.dplayer-controller .dplayer-icons .dplayer-toggle input:checked+label{border-color:hsla(0,0%,100%,.5)}.dplayer-controller .dplayer-icons .dplayer-toggle input:checked+label:before{width:30px;background:hsla(0,0%,100%,.5)}.dplayer-controller .dplayer-icons .dplayer-toggle input:checked+label:after{left:12px}.dplayer-mobile-play{display:none;width:50px;height:50px;border:none;background-color:transparent;outline:none;cursor:pointer;box-sizing:border-box;bottom:0;opacity:.8;position:absolute;left:50%;top:50%;transform:translate(-50%,-50%)}.dplayer-danmaku{position:absolute;left:0;right:0;top:0;bottom:0;font-size:22px;color:#fff}.dplayer-danmaku .dplayer-danmaku-item{display:inline-block;pointer-events:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:default;white-space:nowrap;text-shadow:.5px .5px .5px rgba(0,0,0,.5)}.dplayer-danmaku .dplayer-danmaku-item--demo{position:absolute;visibility:hidden}.dplayer-danmaku .dplayer-danmaku-right{position:absolute;right:0;transform:translateX(100%)}.dplayer-danmaku .dplayer-danmaku-right.dplayer-danmaku-move{will-change:transform;-webkit-animation:danmaku 5s linear;animation:danmaku 5s linear;-webkit-animation-play-state:paused;animation-play-state:paused}@-webkit-keyframes danmaku{0%{transform:translateX(100%)}}@keyframes danmaku{0%{transform:translateX(100%)}}.dplayer-danmaku .dplayer-danmaku-bottom,.dplayer-danmaku .dplayer-danmaku-top{position:absolute;width:100%;text-align:center;visibility:hidden}.dplayer-danmaku .dplayer-danmaku-bottom.dplayer-danmaku-move,.dplayer-danmaku .dplayer-danmaku-top.dplayer-danmaku-move{will-change:visibility;-webkit-animation:danmaku-center 4s linear;animation:danmaku-center 4s linear;-webkit-animation-play-state:paused;animation-play-state:paused}@-webkit-keyframes danmaku-center{0%{visibility:visible}to{visibility:visible}}@keyframes danmaku-center{0%{visibility:visible}to{visibility:visible}}.dplayer-logo{pointer-events:none;position:absolute;left:20px;top:20px;max-width:50px;max-height:50px}.dplayer-logo img{max-width:100%;max-height:100%;background:none}.dplayer-menu{position:absolute;width:170px;border-radius:2px;background:rgba(28,28,28,.85);padding:5px 0;overflow:hidden;z-index:3;display:none}.dplayer-menu.dplayer-menu-show{display:block}.dplayer-menu .dplayer-menu-item{height:30px;box-sizing:border-box;cursor:pointer}.dplayer-menu .dplayer-menu-item:hover{background-color:hsla(0,0%,100%,.1)}.dplayer-menu .dplayer-menu-item a{padding:0 10px;line-height:30px;color:#eee;font-size:13px;display:inline-block;vertical-align:middle;width:100%;box-sizing:border-box;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.dplayer-menu .dplayer-menu-item a:hover{text-decoration:none}.dplayer-notice{opacity:0;position:absolute;bottom:60px;left:20px;font-size:14px;border-radius:2px;background:rgba(28,28,28,.9);padding:7px 20px;transition:all .3s ease-in-out;overflow:hidden;color:#fff;pointer-events:none}.dplayer-subtitle{position:absolute;bottom:40px;width:90%;left:5%;text-align:center;color:#fff;text-shadow:.5px .5px .5px rgba(0,0,0,.5);font-size:20px}.dplayer-subtitle.dplayer-subtitle-hide{display:none}.dplayer-mask{position:absolute;top:0;bottom:0;left:0;right:0;z-index:1;display:none}.dplayer-mask.dplayer-mask-show{display:block}.dplayer-video-wrap{position:relative;background:#000;font-size:0;width:100%;height:100%}.dplayer-video-wrap .dplayer-video{width:100%;height:100%;display:none}.dplayer-video-wrap .dplayer-video-current{display:block}.dplayer-video-wrap .dplayer-video-prepare{display:none}.dplayer-info-panel{position:absolute;top:10px;left:10px;width:400px;background:rgba(28,28,28,.8);padding:10px;color:#fff;font-size:12px;border-radius:2px}.dplayer-info-panel-hide{display:none}.dplayer-info-panel .dplayer-info-panel-close{cursor:pointer;position:absolute;right:10px;top:10px}.dplayer-info-panel .dplayer-info-panel-item>span{display:inline-block;vertical-align:middle;line-height:15px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.dplayer-info-panel .dplayer-info-panel-item-title{width:100px;text-align:right;margin-right:10px}.dplayer-info-panel .dplayer-info-panel-item-data{width:260px}',""]),e.exports=t},function(e,t,a){(t=a(3)(!1)).push([e.i,':root{--balloon-border-radius:2px;--balloon-color:rgba(16,16,16,0.95);--balloon-text-color:#fff;--balloon-font-size:12px;--balloon-move:4px}button[aria-label][data-balloon-pos]{overflow:visible}[aria-label][data-balloon-pos]{position:relative;cursor:pointer}[aria-label][data-balloon-pos]:after{text-indent:0;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Open Sans,Helvetica Neue,sans-serif;font-weight:400;font-style:normal;text-shadow:none;font-size:var(--balloon-font-size);background:var(--balloon-color);border-radius:2px;color:var(--balloon-text-color);border-radius:var(--balloon-border-radius);content:attr(aria-label);padding:.5em 1em;white-space:nowrap}[aria-label][data-balloon-pos]:after,[aria-label][data-balloon-pos]:before{opacity:0;pointer-events:none;transition:all .18s ease-out .18s;position:absolute;z-index:10}[aria-label][data-balloon-pos]:before{width:0;height:0;border:5px solid transparent;border-top:5px solid var(--balloon-color);content:""}[aria-label][data-balloon-pos]:hover:after,[aria-label][data-balloon-pos]:hover:before,[aria-label][data-balloon-pos]:not([data-balloon-nofocus]):focus:after,[aria-label][data-balloon-pos]:not([data-balloon-nofocus]):focus:before,[aria-label][data-balloon-pos][data-balloon-visible]:after,[aria-label][data-balloon-pos][data-balloon-visible]:before{opacity:1;pointer-events:none}[aria-label][data-balloon-pos].font-awesome:after{font-family:FontAwesome,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Open Sans,Helvetica Neue,sans-serif}[aria-label][data-balloon-pos][data-balloon-break]:after{white-space:pre}[aria-label][data-balloon-pos][data-balloon-break][data-balloon-length]:after{white-space:pre-line;word-break:break-word}[aria-label][data-balloon-pos][data-balloon-blunt]:after,[aria-label][data-balloon-pos][data-balloon-blunt]:before{transition:none}[aria-label][data-balloon-pos][data-balloon-pos=up]:after{margin-bottom:10px}[aria-label][data-balloon-pos][data-balloon-pos=up]:after,[aria-label][data-balloon-pos][data-balloon-pos=up]:before{bottom:100%;left:50%;transform:translate(-50%,var(--balloon-move));transform-origin:top}[aria-label][data-balloon-pos][data-balloon-pos=up]:hover:after,[aria-label][data-balloon-pos][data-balloon-pos=up]:hover:before,[aria-label][data-balloon-pos][data-balloon-pos=up][data-balloon-visible]:after,[aria-label][data-balloon-pos][data-balloon-pos=up][data-balloon-visible]:before{transform:translate(-50%)}[aria-label][data-balloon-pos][data-balloon-pos=up-left]:after{bottom:100%;left:0;margin-bottom:10px;transform:translateY(var(--balloon-move));transform-origin:top}[aria-label][data-balloon-pos][data-balloon-pos=up-left]:before{bottom:100%;left:5px;transform:translateY(var(--balloon-move));transform-origin:top}[aria-label][data-balloon-pos][data-balloon-pos=up-left]:hover:after,[aria-label][data-balloon-pos][data-balloon-pos=up-left]:hover:before,[aria-label][data-balloon-pos][data-balloon-pos=up-left][data-balloon-visible]:after,[aria-label][data-balloon-pos][data-balloon-pos=up-left][data-balloon-visible]:before{transform:translate(0)}[aria-label][data-balloon-pos][data-balloon-pos=up-right]:after{bottom:100%;right:0;margin-bottom:10px;transform:translateY(var(--balloon-move));transform-origin:top}[aria-label][data-balloon-pos][data-balloon-pos=up-right]:before{bottom:100%;right:5px;transform:translateY(var(--balloon-move));transform-origin:top}[aria-label][data-balloon-pos][data-balloon-pos=up-right]:hover:after,[aria-label][data-balloon-pos][data-balloon-pos=up-right]:hover:before,[aria-label][data-balloon-pos][data-balloon-pos=up-right][data-balloon-visible]:after,[aria-label][data-balloon-pos][data-balloon-pos=up-right][data-balloon-visible]:before{transform:translate(0)}[aria-label][data-balloon-pos][data-balloon-pos=down]:after{left:50%;margin-top:10px;top:100%;transform:translate(-50%,calc(var(--balloon-move)*-1))}[aria-label][data-balloon-pos][data-balloon-pos=down]:before{width:0;height:0;border:5px solid transparent;border-bottom:5px solid var(--balloon-color);left:50%;top:100%;transform:translate(-50%,calc(var(--balloon-move)*-1))}[aria-label][data-balloon-pos][data-balloon-pos=down]:hover:after,[aria-label][data-balloon-pos][data-balloon-pos=down]:hover:before,[aria-label][data-balloon-pos][data-balloon-pos=down][data-balloon-visible]:after,[aria-label][data-balloon-pos][data-balloon-pos=down][data-balloon-visible]:before{transform:translate(-50%)}[aria-label][data-balloon-pos][data-balloon-pos=down-left]:after{left:0;margin-top:10px;top:100%;transform:translateY(calc(var(--balloon-move)*-1))}[aria-label][data-balloon-pos][data-balloon-pos=down-left]:before{width:0;height:0;border:5px solid transparent;border-bottom:5px solid var(--balloon-color);left:5px;top:100%;transform:translateY(calc(var(--balloon-move)*-1))}[aria-label][data-balloon-pos][data-balloon-pos=down-left]:hover:after,[aria-label][data-balloon-pos][data-balloon-pos=down-left]:hover:before,[aria-label][data-balloon-pos][data-balloon-pos=down-left][data-balloon-visible]:after,[aria-label][data-balloon-pos][data-balloon-pos=down-left][data-balloon-visible]:before{transform:translate(0)}[aria-label][data-balloon-pos][data-balloon-pos=down-right]:after{right:0;margin-top:10px;top:100%;transform:translateY(calc(var(--balloon-move)*-1))}[aria-label][data-balloon-pos][data-balloon-pos=down-right]:before{width:0;height:0;border:5px solid transparent;border-bottom:5px solid var(--balloon-color);right:5px;top:100%;transform:translateY(calc(var(--balloon-move)*-1))}[aria-label][data-balloon-pos][data-balloon-pos=down-right]:hover:after,[aria-label][data-balloon-pos][data-balloon-pos=down-right]:hover:before,[aria-label][data-balloon-pos][data-balloon-pos=down-right][data-balloon-visible]:after,[aria-label][data-balloon-pos][data-balloon-pos=down-right][data-balloon-visible]:before{transform:translate(0)}[aria-label][data-balloon-pos][data-balloon-pos=left]:after{margin-right:10px;right:100%;top:50%;transform:translate(var(--balloon-move),-50%)}[aria-label][data-balloon-pos][data-balloon-pos=left]:before{width:0;height:0;border:5px solid transparent;border-left:5px solid var(--balloon-color);right:100%;top:50%;transform:translate(var(--balloon-move),-50%)}[aria-label][data-balloon-pos][data-balloon-pos=left]:hover:after,[aria-label][data-balloon-pos][data-balloon-pos=left]:hover:before,[aria-label][data-balloon-pos][data-balloon-pos=left][data-balloon-visible]:after,[aria-label][data-balloon-pos][data-balloon-pos=left][data-balloon-visible]:before{transform:translateY(-50%)}[aria-label][data-balloon-pos][data-balloon-pos=right]:after{left:100%;margin-left:10px;top:50%;transform:translate(calc(var(--balloon-move)*-1),-50%)}[aria-label][data-balloon-pos][data-balloon-pos=right]:before{width:0;height:0;border:5px solid transparent;border-right:5px solid var(--balloon-color);left:100%;top:50%;transform:translate(calc(var(--balloon-move)*-1),-50%)}[aria-label][data-balloon-pos][data-balloon-pos=right]:hover:after,[aria-label][data-balloon-pos][data-balloon-pos=right]:hover:before,[aria-label][data-balloon-pos][data-balloon-pos=right][data-balloon-visible]:after,[aria-label][data-balloon-pos][data-balloon-pos=right][data-balloon-visible]:before{transform:translateY(-50%)}[aria-label][data-balloon-pos][data-balloon-length=small]:after{white-space:normal;width:80px}[aria-label][data-balloon-pos][data-balloon-length=medium]:after{white-space:normal;width:150px}[aria-label][data-balloon-pos][data-balloon-length=large]:after{white-space:normal;width:260px}[aria-label][data-balloon-pos][data-balloon-length=xlarge]:after{white-space:normal;width:380px}@media screen and (max-width:768px){[aria-label][data-balloon-pos][data-balloon-length=xlarge]:after{white-space:normal;width:90vw}}[aria-label][data-balloon-pos][data-balloon-length=fit]:after{white-space:normal;width:100%}',""]),e.exports=t},function(e,t,a){var n=Function.prototype.apply;function o(e,t){this._id=e,this._clearFn=t}t.setTimeout=function(){return new o(n.call(setTimeout,window,arguments),clearTimeout)},t.setInterval=function(){return new o(n.call(setInterval,window,arguments),clearInterval)},t.clearTimeout=t.clearInterval=function(e){e&&e.close()},o.prototype.unref=o.prototype.ref=function(){},o.prototype.close=function(){this._clearFn.call(window,this._id)},t.enroll=function(e,t){clearTimeout(e._idleTimeoutId),e._idleTimeout=t},t.unenroll=function(e){clearTimeout(e._idleTimeoutId),e._idleTimeout=-1},t._unrefActive=t.active=function(e){clearTimeout(e._idleTimeoutId);var t=e._idleTimeout;t>=0&&(e._idleTimeoutId=setTimeout((function(){e._onTimeout&&e._onTimeout()}),t))},a(40),t.setImmediate=setImmediate,t.clearImmediate=clearImmediate},function(e,t,a){(function(e,t){!function(e,a){"use strict";if(!e.setImmediate){var n,o,r,i,l,s=1,d={},p=!1,c=e.document,u=Object.getPrototypeOf&&Object.getPrototypeOf(e);u=u&&u.setTimeout?u:e,"[object process]"==={}.toString.call(e.process)?n=function(e){t.nextTick((function(){h(e)}))}:!function(){if(e.postMessage&&!e.importScripts){var t=!0,a=e.onmessage;return e.onmessage=function(){t=!1},e.postMessage("","*"),e.onmessage=a,t}}()?e.MessageChannel?((r=new MessageChannel).port1.onmessage=function(e){h(e.data)},n=function(e){r.port2.postMessage(e)}):c&&"onreadystatechange"in c.createElement("script")?(o=c.documentElement,n=function(e){var t=c.createElement("script");t.onreadystatechange=function(){h(e),t.onreadystatechange=null,o.removeChild(t),t=null},o.appendChild(t)}):n=function(e){setTimeout(h,0,e)}:(i="setImmediate$"+Math.random()+"$",l=function(t){t.source===e&&"string"==typeof t.data&&0===t.data.indexOf(i)&&h(+t.data.slice(i.length))},e.addEventListener?e.addEventListener("message",l,!1):e.attachEvent("onmessage",l),n=function(t){e.postMessage(i+t,"*")}),u.setImmediate=function(e){"function"!=typeof e&&(e=new Function(""+e));for(var t=new Array(arguments.length-1),a=0;a=0)return;i[t]="set-cookie"===t?(i[t]?i[t]:[]).concat([a]):i[t]?i[t]+", "+a:a}})),i):i}},function(e,t,a){"use strict";var n=a(0);e.exports=n.isStandardBrowserEnv()?function(){var e,t=/(msie|trident)/i.test(navigator.userAgent),a=document.createElement("a");function o(e){var n=e;return t&&(a.setAttribute("href",n),n=a.href),a.setAttribute("href",n),{href:a.href,protocol:a.protocol?a.protocol.replace(/:$/,""):"",host:a.host,search:a.search?a.search.replace(/^\?/,""):"",hash:a.hash?a.hash.replace(/^#/,""):"",hostname:a.hostname,port:a.port,pathname:"/"===a.pathname.charAt(0)?a.pathname:"/"+a.pathname}}return e=o(window.location.href),function(t){var a=n.isString(t)?o(t):t;return a.protocol===e.protocol&&a.host===e.host}}():function(){return!0}},function(e,t,a){"use strict";var n=a(0);e.exports=n.isStandardBrowserEnv()?{write:function(e,t,a,o,r,i){var l=[];l.push(e+"="+encodeURIComponent(t)),n.isNumber(a)&&l.push("expires="+new Date(a).toGMTString()),n.isString(o)&&l.push("path="+o),n.isString(r)&&l.push("domain="+r),!0===i&&l.push("secure"),document.cookie=l.join("; ")},read:function(e){var t=document.cookie.match(new RegExp("(^|;\\s*)("+e+")=([^;]*)"));return t?decodeURIComponent(t[3]):null},remove:function(e){this.write(e,"",Date.now()-864e5)}}:{write:function(){},read:function(){return null},remove:function(){}}},function(e,t,a){"use strict";var n=a(13);function o(e){if("function"!=typeof e)throw new TypeError("executor must be a function.");var t;this.promise=new Promise((function(e){t=e}));var a=this;e((function(e){a.reason||(a.reason=new n(e),t(a.reason))}))}o.prototype.throwIfRequested=function(){if(this.reason)throw this.reason},o.source=function(){var e;return{token:new o((function(t){e=t})),cancel:e}},e.exports=o},function(e,t,a){"use strict";e.exports=function(e){return function(t){return e.apply(null,t)}}},function(e,t,a){"use strict";(function(t){var a="undefined"!=typeof self?self:"undefined"!=typeof window?window:void 0!==t?t:{},n=Object.create(a),o=/["&'<>]/;n.$escape=function(e){return function(e){var t=""+e,a=o.exec(t);if(!a)return e;var n="",r=void 0,i=void 0,l=void 0;for(r=a.index,i=0;r0?[t,a,n]:[a,n]).map((function(e){return e<10?"0"+e:""+e})).join(":")},getElementViewLeft:function(e){var t=e.offsetLeft,a=e.offsetParent,n=document.body.scrollLeft+document.documentElement.scrollLeft;if(document.fullscreenElement||document.mozFullScreenElement||document.webkitFullscreenElement)for(;null!==a&&a!==e;)t+=a.offsetLeft,a=a.offsetParent;else for(;null!==a;)t+=a.offsetLeft,a=a.offsetParent;return t-n},getBoundingClientRectViewLeft:function(e){var t=window.scrollY||window.pageYOffset||document.body.scrollTop+(document.documentElement&&document.documentElement.scrollTop||0);if(e.getBoundingClientRect){if("number"!=typeof this.getBoundingClientRectViewLeft.offset){var a=document.createElement("div");a.style.cssText="position:absolute;top:0;left:0;",document.body.appendChild(a),this.getBoundingClientRectViewLeft.offset=-a.getBoundingClientRect().top-t,document.body.removeChild(a),a=null}var n=e.getBoundingClientRect(),o=this.getBoundingClientRectViewLeft.offset;return n.left+o}return this.getElementViewLeft(e)},getScrollPosition:function(){return{left:window.pageXOffset||document.documentElement.scrollLeft||document.body.scrollLeft||0,top:window.pageYOffset||document.documentElement.scrollTop||document.body.scrollTop||0}},setScrollPosition:function(e){var t=e.left,a=void 0===t?0:t,n=e.top,o=void 0===n?0:n;this.isFirefox?(document.documentElement.scrollLeft=a,document.documentElement.scrollTop=o):window.scrollTo(a,o)},isMobile:o,isSafari:/Safari/i.test(window.navigator.userAgent),isFirefox:/firefox/i.test(window.navigator.userAgent),isChrome:/chrome/i.test(window.navigator.userAgent),storage:{set:function(e,t){localStorage.setItem(e,t)},get:function(e){return localStorage.getItem(e)}},nameMap:{dragStart:o?"touchstart":"mousedown",dragMove:o?"touchmove":"mousemove",dragEnd:o?"touchend":"mouseup"},color2Number:function(e){return"#"===e[0]&&(e=e.substr(1)),3===e.length&&(e="".concat(e[0]).concat(e[0]).concat(e[1]).concat(e[1]).concat(e[2]).concat(e[2])),parseInt(e,16)+0&16777215},number2Color:function(e){return"#"+("00000"+e.toString(16)).slice(-6)},number2Type:function(e){switch(e){case 0:return"right";case 1:return"top";case 2:return"bottom";default:return"right"}}},i=a(2),l=a.n(i),s={send:function(e){l.a.post(e.url,e.data).then((function(t){var a=t.data;a&&0===a.code?e.success&&e.success(a):e.error&&e.error(a&&a.msg)})).catch((function(t){console.error(t),e.error&&e.error()}))},read:function(e){l.a.get(e.url).then((function(t){var a=t.data;a&&0===a.code?e.success&&e.success(a.data.map((function(e){return{time:e[0],type:e[1],color:e[2],author:e[3],text:e[4]}}))):e.error&&e.error(a&&a.msg)})).catch((function(t){console.error(t),e.error&&e.error()}))}};function d(e){return(d="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}var p=function(e){var t={container:e.element||document.getElementsByClassName("dplayer")[0],live:!1,autoplay:!1,theme:"#b7daff",loop:!1,lang:(navigator.language||navigator.browserLanguage).toLowerCase(),screenshot:!1,airplay:!0,hotkey:!0,preload:"metadata",volume:.7,playbackSpeed:[.5,.75,1,1.25,1.5,2],apiBackend:s,video:{},contextmenu:[],mutex:!0,pluginOptions:{hls:{},flv:{},dash:{},webtorrent:{}}};for(var a in t)t.hasOwnProperty(a)&&!e.hasOwnProperty(a)&&(e[a]=t[a]);return e.video&&!e.video.type&&(e.video.type="auto"),"object"===d(e.danmaku)&&e.danmaku&&!e.danmaku.user&&(e.danmaku.user="DIYgod"),e.subtitle&&(!e.subtitle.type&&(e.subtitle.type="webvtt"),!e.subtitle.fontSize&&(e.subtitle.fontSize="20px"),!e.subtitle.bottom&&(e.subtitle.bottom="40px"),!e.subtitle.color&&(e.subtitle.color="#fff")),e.video.quality&&(e.video.url=e.video.quality[e.video.defaultQuality].url),e.lang&&(e.lang=e.lang.toLowerCase()),e.contextmenu=e.contextmenu.concat([{text:"Video info",click:function(e){e.infoPanel.triggle()}},{text:"About author",link:"https://diygod.me"},{text:"DPlayer v".concat("1.26.0"),link:"https://github.com/MoePlayer/DPlayer"}]),e};var c={"zh-cn":{"Danmaku is loading":"弹幕加载中",Top:"顶部",Bottom:"底部",Rolling:"滚动","Input danmaku, hit Enter":"输入弹幕，回车发送","About author":"关于作者","DPlayer feedback":"播放器意见反馈","About DPlayer":"关于 DPlayer 播放器",Loop:"洗脑循环",Speed:"速度","Opacity for danmaku":"弹幕透明度",Normal:"正常","Please input danmaku content!":"要输入弹幕内容啊喂！","Set danmaku color":"设置弹幕颜色","Set danmaku type":"设置弹幕类型","Show danmaku":"显示弹幕","Video load failed":"视频加载失败","Danmaku load failed":"弹幕加载失败","Danmaku send failed":"弹幕发送失败","Switching to":"正在切换至","Switched to":"已经切换至",quality:"画质",FF:"快进",REW:"快退","Unlimited danmaku":"海量弹幕","Send danmaku":"发送弹幕",Setting:"设置","Full screen":"全屏","Web full screen":"页面全屏",Send:"发送",Screenshot:"截图",AirPlay:"无线投屏",s:"秒","Show subtitle":"显示字幕","Hide subtitle":"隐藏字幕",Volume:"音量",Live:"直播","Video info":"视频统计信息"},"zh-tw":{"Danmaku is loading":"彈幕載入中",Top:"頂部",Bottom:"底部",Rolling:"滾動","Input danmaku, hit Enter":"輸入彈幕，Enter 發送","About author":"關於作者","DPlayer feedback":"播放器意見回饋","About DPlayer":"關於 DPlayer 播放器",Loop:"循環播放",Speed:"速度","Opacity for danmaku":"彈幕透明度",Normal:"正常","Please input danmaku content!":"請輸入彈幕內容啊！","Set danmaku color":"設定彈幕顏色","Set danmaku type":"設定彈幕類型","Show danmaku":"顯示彈幕","Video load failed":"影片載入失敗","Danmaku load failed":"彈幕載入失敗","Danmaku send failed":"彈幕發送失敗","Switching to":"正在切換至","Switched to":"已經切換至",quality:"畫質",FF:"快進",REW:"快退","Unlimited danmaku":"巨量彈幕","Send danmaku":"發送彈幕",Setting:"設定","Full screen":"全螢幕","Web full screen":"頁面全螢幕",Send:"發送",Screenshot:"截圖",AirPlay:"無線投屏",s:"秒","Show subtitle":"顯示字幕","Hide subtitle":"隱藏字幕",Volume:"音量",Live:"直播","Video info":"影片統計訊息"}},u=function(e){var t=this;this.lang=e,this.tran=function(e){return c[t.lang]&&c[t.lang][e]?c[t.lang][e]:e}},y=a(17),h=a.n(y),m=a(18),f=a.n(m),v=a(19),b=a.n(v),g=a(20),w=a.n(g),x=a(21),k=a.n(x),S=a(22),T=a.n(S),L=a(23),E=a.n(L),q=a(24),B=a.n(q),M=a(25),z=a.n(M),C=a(26),A=a.n(C),O=a(27),P=a.n(O),j=a(28),F=a.n(j),_=a(29),Y=a.n(_),D=a(30),R=a.n(D),I=a(31),H=a.n(I),W=a(32),N=a.n(W),U=a(33),V=a.n(U),X={play:h.a,pause:f.a,volumeUp:b.a,volumeDown:w.a,volumeOff:k.a,full:T.a,fullWeb:E.a,setting:B.a,right:z.a,comment:A.a,commentOff:P.a,send:F.a,pallette:Y.a,camera:R.a,subtitle:N.a,loading:V.a,airplay:H.a},Q=a(34),$=a.n(Q);function J(e,t){for(var a=0;aparseFloat(t.time);)a.push(t),t=this.dan[++this.danIndex];this.draw(a)}window.requestAnimationFrame((function(){e.frame()}))}},{key:"opacity",value:function(e){if(void 0!==e){for(var t=this.container.getElementsByClassName("dplayer-danmaku-item"),a=0;a').concat(e[o].text,""):i.innerHTML=e[o].text,i.style.opacity=t._opacity,i.style.color=r.number2Color(e[o].color),i.addEventListener("animationend",(function(){t.container.removeChild(i)}));var l=t._measure(e[o].text),s=void 0;switch(e[o].type){case"right":(s=d(i,e[o].type,l))>=0&&(i.style.width=l+1+"px",i.style.top=a*s+"px",i.style.transform="translateX(-".concat(n,"px)"));break;case"top":(s=d(i,e[o].type))>=0&&(i.style.top=a*s+"px");break;case"bottom":(s=d(i,e[o].type))>=0&&(i.style.bottom=a*s+"px");break;default:console.error("Can't handled danmaku type: ".concat(e[o].type))}s>=0&&(i.classList.add("dplayer-danmaku-move"),p.appendChild(i))},u=0;u=this.options.time()){this.danIndex=e;break}this.danIndex=this.dan.length}}},{key:"clear",value:function(){this.danTunnel={right:{},top:{},bottom:{}},this.danIndex=0,this.options.container.innerHTML="",this.events&&this.events.trigger("danmaku_clear")}},{key:"htmlEncode",value:function(e){return e.replace(/&/g,"&").replace(//g,">").replace(/"/g,""").replace(/'/g,"'").replace(/\//g,"/")}},{key:"resize",value:function(){for(var e=this.container.offsetWidth,t=this.container.getElementsByClassName("dplayer-danmaku-item"),a=0;a0&&void 0!==arguments[0]?arguments[0]:"browser";switch(e){case"browser":return document.fullscreenElement||document.mozFullScreenElement||document.webkitFullscreenElement||document.msFullscreenElement;case"web":return this.player.container.classList.contains("dplayer-fulled")}}},{key:"request",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"browser",t="browser"===e?"web":"browser",a=this.isFullScreen(t);switch(a||(this.lastScrollPosition=r.getScrollPosition()),e){case"browser":this.player.container.requestFullscreen?this.player.container.requestFullscreen():this.player.container.mozRequestFullScreen?this.player.container.mozRequestFullScreen():this.player.container.webkitRequestFullscreen?this.player.container.webkitRequestFullscreen():this.player.video.webkitEnterFullscreen?this.player.video.webkitEnterFullscreen():this.player.video.webkitEnterFullScreen?this.player.video.webkitEnterFullScreen():this.player.container.msRequestFullscreen&&this.player.container.msRequestFullscreen();break;case"web":this.player.container.classList.add("dplayer-fulled"),document.body.classList.add("dplayer-web-fullscreen-fix"),this.player.events.trigger("webfullscreen")}a&&this.cancel(t)}},{key:"cancel",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"browser";switch(e){case"browser":document.cancelFullScreen?document.cancelFullScreen():document.mozCancelFullScreen?document.mozCancelFullScreen():document.webkitCancelFullScreen?document.webkitCancelFullScreen():document.webkitCancelFullscreen?document.webkitCancelFullscreen():document.msCancelFullScreen?document.msCancelFullScreen():document.msExitFullscreen&&document.msExitFullscreen();break;case"web":this.player.container.classList.remove("dplayer-fulled"),document.body.classList.remove("dplayer-web-fullscreen-fix"),this.player.events.trigger("webfullscreen_cancel")}}},{key:"toggle",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"browser";this.isFullScreen(e)?this.cancel(e):this.request(e)}}])&&ne(t.prototype,a),n&&ne(t,n),e}();function re(e,t){for(var a=0;a".concat(e,"")})).join("");e.container.innerHTML=o}e.events.trigger("subtitle_change")}}}},{key:"show",value:function(){this.container.classList.remove("dplayer-subtitle-hide"),this.events.trigger("subtitle_show")}},{key:"hide",value:function(){this.container.classList.add("dplayer-subtitle-hide"),this.events.trigger("subtitle_hide")}},{key:"toggle",value:function(){this.container.classList.contains("dplayer-subtitle-hide")?this.show():this.hide()}}])&&le(t.prototype,a),n&&le(t,n),e}();function de(e,t){for(var a=0;at&&!e.player.video.paused&&(e.player.container.classList.remove("dplayer-loading"),n=!1),t=a)}),100)}},{key:"initfpsChecker",value:function(){var e=this;window.requestAnimationFrame((function(){if(e.enablefpsChecker)if(e.initfpsChecker(),e.fpsStart){e.fpsIndex++;var t=new Date;t-e.fpsStart>1e3&&(e.player.infoPanel.fps(e.fpsIndex/(t-e.fpsStart)*1e3),e.fpsStart=new Date,e.fpsIndex=0)}else e.fpsStart=new Date,e.fpsIndex=0;else e.fpsStart=0,e.fpsIndex=0}))}},{key:"initinfoChecker",value:function(){var e=this;this.infoChecker=setInterval((function(){e.enableinfoChecker&&e.player.infoPanel.update()}),1e3)}},{key:"enable",value:function(e){this["enable".concat(e,"Checker")]=!0,"fps"===e&&this.initfpsChecker()}},{key:"disable",value:function(e){this["enable".concat(e,"Checker")]=!1}},{key:"destroy",value:function(){var e=this;this.types.map((function(t){return e["enable".concat(t,"Checker")]=!1,e["".concat(t,"Checker")]&&clearInterval(e["".concat(t,"Checker")]),t}))}}])&&ce(t.prototype,a),n&&ce(t,n),e}();function ye(e,t){for(var a=0;a'+e.player.options.highlight[a].text+"",e.player.template.playedBarWrap.insertBefore(n,e.player.template.playedBarTime)}}}))}},{key:"initThumbnails",value:function(){var e=this;this.player.options.video.thumbnails&&(this.thumbnails=new fe({container:this.player.template.barPreview,barWidth:this.player.template.barWrap.offsetWidth,url:this.player.options.video.thumbnails,events:this.player.events}),this.player.on("loadedmetadata",(function(){e.thumbnails.resize(160,e.player.video.videoHeight/e.player.video.videoWidth*160,e.player.template.barWrap.offsetWidth)})))}},{key:"initPlayedBar",value:function(){var e=this,t=function(t){var a=((t.clientX||t.changedTouches[0].clientX)-r.getBoundingClientRectViewLeft(e.player.template.playedBarWrap))/e.player.template.playedBarWrap.clientWidth;a=Math.max(a,0),a=Math.min(a,1),e.player.bar.set("played",a,"width"),e.player.template.ptime.innerHTML=r.secondToTime(a*e.player.video.duration)},a=function a(n){document.removeEventListener(r.nameMap.dragEnd,a),document.removeEventListener(r.nameMap.dragMove,t);var o=((n.clientX||n.changedTouches[0].clientX)-r.getBoundingClientRectViewLeft(e.player.template.playedBarWrap))/e.player.template.playedBarWrap.clientWidth;o=Math.max(o,0),o=Math.min(o,1),e.player.bar.set("played",o,"width"),e.player.seek(e.player.bar.get("played")*e.player.video.duration),e.player.timer.enable("progress")};this.player.template.playedBarWrap.addEventListener(r.nameMap.dragStart,(function(){e.player.timer.disable("progress"),document.addEventListener(r.nameMap.dragMove,t),document.addEventListener(r.nameMap.dragEnd,a)})),this.player.template.playedBarWrap.addEventListener(r.nameMap.dragMove,(function(t){if(e.player.video.duration){var a=e.player.template.playedBarWrap.getBoundingClientRect().left,n=(t.clientX||t.changedTouches[0].clientX)-a;if(n<0||n>e.player.template.playedBarWrap.offsetWidth)return;var o=e.player.video.duration*(n/e.player.template.playedBarWrap.offsetWidth);r.isMobile&&e.thumbnails&&e.thumbnails.show(),e.thumbnails&&e.thumbnails.move(n),e.player.template.playedBarTime.style.left="".concat(n-(o>=3600?25:20),"px"),e.player.template.playedBarTime.innerText=r.secondToTime(o),e.player.template.playedBarTime.classList.remove("hidden")}})),this.player.template.playedBarWrap.addEventListener(r.nameMap.dragEnd,(function(){r.isMobile&&e.thumbnails&&e.thumbnails.hide()})),r.isMobile||(this.player.template.playedBarWrap.addEventListener("mouseenter",(function(){e.player.video.duration&&(e.thumbnails&&e.thumbnails.show(),e.player.template.playedBarTime.classList.remove("hidden"))})),this.player.template.playedBarWrap.addEventListener("mouseleave",(function(){e.player.video.duration&&(e.thumbnails&&e.thumbnails.hide(),e.player.template.playedBarTime.classList.add("hidden"))})))}},{key:"initFullButton",value:function(){var e=this;this.player.template.browserFullButton.addEventListener("click",(function(){e.player.fullScreen.toggle("browser")})),this.player.template.webFullButton.addEventListener("click",(function(){e.player.fullScreen.toggle("web")}))}},{key:"initVolumeButton",value:function(){var e=this,t=function(t){var a=t||window.event,n=((a.clientX||a.changedTouches[0].clientX)-r.getBoundingClientRectViewLeft(e.player.template.volumeBarWrap)-5.5)/35;e.player.volume(n)},a=function a(){document.removeEventListener(r.nameMap.dragEnd,a),document.removeEventListener(r.nameMap.dragMove,t),e.player.template.volumeButton.classList.remove("dplayer-volume-active")};this.player.template.volumeBarWrapWrap.addEventListener("click",(function(t){var a=t||window.event,n=((a.clientX||a.changedTouches[0].clientX)-r.getBoundingClientRectViewLeft(e.player.template.volumeBarWrap)-5.5)/35;e.player.volume(n)})),this.player.template.volumeBarWrapWrap.addEventListener(r.nameMap.dragStart,(function(){document.addEventListener(r.nameMap.dragMove,t),document.addEventListener(r.nameMap.dragEnd,a),e.player.template.volumeButton.classList.add("dplayer-volume-active")})),this.player.template.volumeButtonIcon.addEventListener("click",(function(){e.player.video.muted?(e.player.video.muted=!1,e.player.switchVolumeIcon(),e.player.bar.set("volume",e.player.volume(),"width")):(e.player.video.muted=!0,e.player.template.volumeIcon.innerHTML=X.volumeOff,e.player.bar.set("volume",0,"width"))}))}},{key:"initQualityButton",value:function(){var e=this;this.player.options.video.quality&&this.player.template.qualityList.addEventListener("click",(function(t){t.target.classList.contains("dplayer-quality-item")&&e.player.switchQuality(t.target.dataset.index)}))}},{key:"initScreenshotButton",value:function(){var e=this;this.player.options.screenshot&&this.player.template.camareButton.addEventListener("click",(function(){var t,a=document.createElement("canvas");a.width=e.player.video.videoWidth,a.height=e.player.video.videoHeight,a.getContext("2d").drawImage(e.player.video,0,0,a.width,a.height),a.toBlob((function(e){t=URL.createObjectURL(e);var a=document.createElement("a");a.href=t,a.download="DPlayer.png",a.style.display="none",document.body.appendChild(a),a.click(),document.body.removeChild(a),URL.revokeObjectURL(t)})),e.player.events.trigger("screenshot",t)}))}},{key:"initAirplayButton",value:function(){this.player.options.airplay&&(window.WebKitPlaybackTargetAvailabilityEvent?this.player.video.addEventListener("webkitplaybacktargetavailabilitychanged",function(e){switch(e.availability){case"available":this.template.airplayButton.disable=!1;break;default:this.template.airplayButton.disable=!0}this.template.airplayButton.addEventListener("click",function(){this.video.webkitShowPlaybackTargetPicker()}.bind(this))}.bind(this.player)):this.player.template.airplayButton.style.display="none")}},{key:"initSubtitleButton",value:function(){var e=this;this.player.options.subtitle&&(this.player.events.on("subtitle_show",(function(){e.player.template.subtitleButton.dataset.balloon=e.player.tran("Hide subtitle"),e.player.template.subtitleButtonInner.style.opacity="",e.player.user.set("subtitle",1)})),this.player.events.on("subtitle_hide",(function(){e.player.template.subtitleButton.dataset.balloon=e.player.tran("Show subtitle"),e.player.template.subtitleButtonInner.style.opacity="0.4",e.player.user.set("subtitle",0)})),this.player.template.subtitleButton.addEventListener("click",(function(){e.player.subtitle.toggle()})))}},{key:"setAutoHide",value:function(){var e=this;this.show(),clearTimeout(this.autoHideTimer),this.autoHideTimer=setTimeout((function(){!e.player.video.played.length||e.player.paused||e.disableAutoHide||e.hide()}),3e3)}},{key:"show",value:function(){this.player.container.classList.remove("dplayer-hide-controller")}},{key:"hide",value:function(){this.player.container.classList.add("dplayer-hide-controller"),this.player.setting.hide(),this.player.comment&&this.player.comment.hide()}},{key:"isShow",value:function(){return!this.player.container.classList.contains("dplayer-hide-controller")}},{key:"toggle",value:function(){this.isShow()?this.hide():this.show()}},{key:"destroy",value:function(){clearTimeout(this.autoHideTimer)}}])&&ve(t.prototype,a),n&&ve(t,n),e}();function ge(e,t){for(var a=0;a=a.width?(this.player.template.menu.style.right=a.width-e+"px",this.player.template.menu.style.left="initial"):(this.player.template.menu.style.left=e+"px",this.player.template.menu.style.right="initial"),t+this.player.template.menu.offsetHeight>=a.height?(this.player.template.menu.style.bottom=a.height-t+"px",this.player.template.menu.style.top="initial"):(this.player.template.menu.style.top=t+"px",this.player.template.menu.style.bottom="initial"),this.player.template.mask.classList.add("dplayer-mask-show"),this.shown=!0,this.player.events.trigger("contextmenu_show")}},{key:"hide",value:function(){this.player.template.mask.classList.remove("dplayer-mask-show"),this.player.template.menu.classList.remove("dplayer-menu-show"),this.shown=!1,this.player.events.trigger("contextmenu_hide")}}])&&Te(t.prototype,a),n&&Te(t,n),e}();function Ee(e,t){for(var a=0;ae&&this.notice("".concat(this.tran("REW")," ").concat((this.video.currentTime-e).toFixed(0)," ").concat(this.tran("s"))),this.video.currentTime=e,this.danmaku&&this.danmaku.seek(),this.bar.set("played",e/this.video.duration,"width"),this.template.ptime.innerHTML=r.secondToTime(e)}},{key:"play",value:function(e){var t=this;if(this.paused=!1,this.video.paused&&!r.isMobile&&this.bezel.switch(X.play),this.template.playButton.innerHTML=X.pause,this.template.mobilePlayButton.innerHTML=X.pause,e||n.a.resolve(this.video.play()).catch((function(){t.pause()})).then((function(){})),this.timer.enable("loading"),this.container.classList.remove("dplayer-paused"),this.container.classList.add("dplayer-playing"),this.danmaku&&this.danmaku.play(),this.options.mutex)for(var a=0;a=.95?this.template.volumeIcon.innerHTML=X.volumeUp:this.volume()>0?this.template.volumeIcon.innerHTML=X.volumeDown:this.template.volumeIcon.innerHTML=X.volumeOff}},{key:"volume",value:function(e,t,a){if(e=parseFloat(e),!isNaN(e)){e=Math.max(e,0),e=Math.min(e,1),this.bar.set("volume",e,"width");var n="".concat((100*e).toFixed(0),"%");this.template.volumeBarWrapWrap.dataset.balloon=n,t||this.user.set("volume",e),a||this.notice("".concat(this.tran("Volume")," ").concat((100*e).toFixed(0),"%")),this.video.volume=e,this.video.muted&&(this.video.muted=!1),this.switchVolumeIcon()}return this.video.volume}},{key:"toggle",value:function(){this.video.paused?this.play():this.pause()}},{key:"on",value:function(e,t){this.events.on(e,t)}},{key:"switchVideo",value:function(e,t){this.pause(),this.video.poster=e.pic?e.pic:"",this.video.src=e.url,this.initMSE(this.video,e.type||"auto"),t&&(this.template.danmakuLoading.style.display="block",this.bar.set("played",0,"width"),this.bar.set("loaded",0,"width"),this.template.ptime.innerHTML="00:00",this.template.danmaku.innerHTML="",this.danmaku&&this.danmaku.reload({id:t.id,address:t.api,token:t.token,maximum:t.maximum,addition:t.addition,user:t.user}))}},{key:"initMSE",value:function(e,t){var a=this;if(this.type=t,this.options.video.customType&&this.options.video.customType[t])"[object Function]"===Object.prototype.toString.call(this.options.video.customType[t])?this.options.video.customType[t](this.video,this):console.error("Illegal customType: ".concat(t));else switch("auto"===this.type&&(/m3u8(#|\?|$)/i.exec(e.src)?this.type="hls":/.flv(#|\?|$)/i.exec(e.src)?this.type="flv":/.mpd(#|\?|$)/i.exec(e.src)?this.type="dash":this.type="normal"),"hls"===this.type&&(e.canPlayType("application/x-mpegURL")||e.canPlayType("application/vnd.apple.mpegURL"))&&(this.type="normal"),this.type){case"hls":if(window.Hls)if(window.Hls.isSupported()){var n=this.options.pluginOptions.hls,o=new window.Hls(n);this.plugins.hls=o,o.loadSource(e.src),o.attachMedia(e),this.events.on("destroy",(function(){o.destroy(),delete a.plugins.hls}))}else this.notice("Error: Hls is not supported.");else this.notice("Error: Can't find Hls.");break;case"flv":if(window.flvjs)if(window.flvjs.isSupported()){var r=window.flvjs.createPlayer(Object.assign(this.options.pluginOptions.flv.mediaDataSource||{},{type:"flv",url:e.src}),this.options.pluginOptions.flv.config);this.plugins.flvjs=r,r.attachMediaElement(e),r.load(),this.events.on("destroy",(function(){r.unload(),r.detachMediaElement(),r.destroy(),delete a.plugins.flvjs}))}else this.notice("Error: flvjs is not supported.");else this.notice("Error: Can't find flvjs.");break;case"dash":if(window.dashjs){var i=window.dashjs.MediaPlayer().create().initialize(e,e.src,!1),l=this.options.pluginOptions.dash;i.updateSettings(l),this.plugins.dash=i,this.events.on("destroy",(function(){window.dashjs.MediaPlayer().reset(),delete a.plugins.dash}))}else this.notice("Error: Can't find dashjs.");break;case"webtorrent":if(window.WebTorrent)if(window.WebTorrent.WEBRTC_SUPPORT){this.container.classList.add("dplayer-loading");var s=this.options.pluginOptions.webtorrent,d=new window.WebTorrent(s);this.plugins.webtorrent=d;var p=e.src;e.src="",e.preload="metadata",e.addEventListener("durationchange",(function(){return a.container.classList.remove("dplayer-loading")}),{once:!0}),d.add(p,(function(e){e.files.find((function(e){return e.name.endsWith(".mp4")})).renderTo(a.video,{autoplay:a.options.autoplay,controls:!1})})),this.events.on("destroy",(function(){d.remove(p),d.destroy(),delete a.plugins.webtorrent}))}else this.notice("Error: Webtorrent is not supported.");else this.notice("Error: Can't find Webtorrent.")}}},{key:"initVideo",value:function(e,t){var a=this;this.initMSE(e,t),this.on("durationchange",(function(){1!==e.duration&&e.duration!==1/0&&(a.template.dtime.innerHTML=r.secondToTime(e.duration))})),this.on("progress",(function(){var t=e.buffered.length?e.buffered.end(e.buffered.length-1)/e.duration:0;a.bar.set("loaded",t,"width")})),this.on("error",(function(){a.video.error&&a.tran&&a.notice&&"webtorrent"!==a.type&&a.notice(a.tran("Video load failed"),-1)})),this.on("ended",(function(){a.bar.set("played",1,"width"),a.setting.loop?(a.seek(0),a.play()):a.pause(),a.danmaku&&(a.danmaku.danIndex=0)})),this.on("play",(function(){a.paused&&a.play(!0)})),this.on("pause",(function(){a.paused||a.pause(!0)})),this.on("timeupdate",(function(){a.bar.set("played",a.video.currentTime/a.video.duration,"width");var e=r.secondToTime(a.video.currentTime);a.template.ptime.innerHTML!==e&&(a.template.ptime.innerHTML=e)}));for(var n=function(t){e.addEventListener(a.events.videoEvents[t],(function(){a.events.trigger(a.events.videoEvents[t])}))},o=0;o1&&void 0!==arguments[1]?arguments[1]:2e3,n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:.8;this.template.notice.innerHTML=e,this.template.notice.style.opacity=n,this.noticeTime&&clearTimeout(this.noticeTime),this.events.trigger("notice_show",e),a>0&&(this.noticeTime=setTimeout((function(){t.template.notice.style.opacity=0,t.events.trigger("notice_hide")}),a))}},{key:"resize",value:function(){this.danmaku&&this.danmaku.resize(),this.controller.thumbnails&&this.controller.thumbnails.resize(160,this.video.videoHeight/this.video.videoWidth*160,this.template.barWrap.offsetWidth),this.events.trigger("resize")}},{key:"speed",value:function(e){this.video.playbackRate=e}},{key:"destroy",value:function(){Pe.splice(Pe.indexOf(this),1),this.pause(),this.controller.destroy(),this.timer.destroy(),this.video.src="",this.container.innerHTML="",this.events.trigger("destroy")}}])&&Ae(t.prototype,a),o&&Ae(t,o),e}();console.log("\n".concat(" %c DPlayer v","1.26.0"," ").concat("63275c8"," %c http://dplayer.js.org ","\n","\n"),"color: #fadfa3; background: #030307; padding:5px 0;","background: #fadfa3; padding:5px 0;");t.default=je}]).default}));
\ No newline at end of file
diff --git a/dzz/DPlayer/images/dash.all.min.js b/dzz/DPlayer/images/dash.all.min.js
new file mode 100644
index 0000000..69152ab
--- /dev/null
+++ b/dzz/DPlayer/images/dash.all.min.js
@@ -0,0 +1,31 @@
+/*! v2.6.6-363caf5, 2018-02-14T14:22:17Z */
+!function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c||a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g>6),b.push(128|63&d)):d<65536?(b.push(224|d>>12),b.push(128|63&d>>6),b.push(128|63&d)):(b.push(240|d>>18),b.push(128|63&d>>12),b.push(128|63&d>>6),b.push(128|63&d))}return b},e.decode=function(a){for(var b=[],c=0;c>18)),d.push(b.charAt(63&f>>12)),d.push(b.charAt(63&f>>6)),d.push(b.charAt(63&f))}if(2==a.length-c){var f=(a[c]<<16)+(a[c+1]<<8);d.push(b.charAt(63&f>>18)),d.push(b.charAt(63&f>>12)),d.push(b.charAt(63&f>>6)),d.push("=")}else if(1==a.length-c){var f=a[c]<<16;d.push(b.charAt(63&f>>18)),d.push(b.charAt(63&f>>12)),d.push("==")}return d.join("")},d=function(){for(var a=[],c=0;c=c&&console.log(this.time+" ["+a+"] "+b)}},l=function(a){for(var b=[],c=0;ce&&(k.log("ERROR","Too large cursor position "+this.pos),this.pos=e)},moveCursor:function(a){var b=this.pos+a;if(a>1)for(var c=this.pos+1;c=144&&this.backSpace();var b=c(a);if(this.pos>=e)return void k.log("ERROR","Cannot insert "+a.toString(16)+" ("+b+") at position "+this.pos+". Skipping it!");this.chars[this.pos].setChar(b,this.currPenState),this.moveCursor(1)},clearFromPos:function(a){var b;for(b=a;b0&&(c=a?"["+b.join(" | ")+"]":b.join("\n")),c},getTextAndFormat:function(){return this.rows}};var q=function(a,b){this.chNr=a,this.outputFilter=b,this.mode=null,this.verbose=0,this.displayedMemory=new p,this.nonDisplayedMemory=new p,this.lastOutputScreen=new p,this.currRollUpRow=this.displayedMemory.rows[d-1],this.writeScreen=this.displayedMemory,this.mode=null,this.cueStartTime=null};q.prototype={modes:["MODE_ROLL-UP","MODE_POP-ON","MODE_PAINT-ON","MODE_TEXT"],reset:function(){this.mode=null,this.displayedMemory.reset(),this.nonDisplayedMemory.reset(),this.lastOutputScreen.reset(),this.currRollUpRow=this.displayedMemory.rows[d-1],this.writeScreen=this.displayedMemory,this.mode=null,this.cueStartTime=null,this.lastCueEndTime=null},getHandler:function(){return this.outputFilter},setHandler:function(a){this.outputFilter=a},setPAC:function(a){this.writeScreen.setPAC(a)},setBkgData:function(a){this.writeScreen.setBkgData(a)},setMode:function(a){a!==this.mode&&(this.mode=a,k.log("INFO","MODE="+a),"MODE_POP-ON"==this.mode?this.writeScreen=this.nonDisplayedMemory:(this.writeScreen=this.displayedMemory,this.writeScreen.reset()),"MODE_ROLL-UP"!==this.mode&&(this.displayedMemory.nrRollUpRows=null,this.nonDisplayedMemory.nrRollUpRows=null),this.mode=a)},insertChars:function(a){for(var b=0;b=46,b.italics)b.foreground="white";else{var c=Math.floor(a/2)-16,d=["white","green","blue","cyan","red","yellow","magenta"];b.foreground=d[c]}k.log("INFO","MIDROW: "+JSON.stringify(b)),this.writeScreen.setPen(b)},outputDataUpdate:function(){var a=k.time;null!==a&&this.outputFilter&&(this.outputFilter.updateData&&this.outputFilter.updateData(a,this.displayedMemory),null!==this.cueStartTime||this.displayedMemory.isEmpty()?this.displayedMemory.equals(this.lastOutputScreen)||(this.outputFilter.newCue&&this.outputFilter.newCue(this.cueStartTime,a,this.lastOutputScreen),this.cueStartTime=this.displayedMemory.isEmpty()?null:a):this.cueStartTime=a,this.lastOutputScreen.copy(this.displayedMemory))},cueSplitAtTime:function(a){this.outputFilter&&(this.displayedMemory.isEmpty()||(this.outputFilter.newCue&&this.outputFilter.newCue(this.cueStartTime,a,this.displayedMemory),this.cueStartTime=a))}};var r=function(a,b,c){this.field=a||1,this.outputs=[b,c],this.channels=[new q(1,b),new q(2,c)],this.currChNr=-1,this.lastCmdA=null,this.lastCmdB=null,this.bufferedData=[],this.startTime=null,this.lastTime=null,this.dataCounters={padding:0,char:0,cmd:0,other:0}};r.prototype={getHandler:function(a){return this.channels[a].getHandler()},setHandler:function(a,b){this.channels[a].setHandler(b)},addData:function(a,b){var c,d,e,f=!1;this.lastTime=a,k.setTime(a);for(var g=0;g=16&&d<=31&&d===this.lastCmdA&&e===this.lastCmdB)this.lastCmdA=null,this.lastCmdB=null,k.log("DEBUG","Repeated command ("+l([d,e])+") is dropped");else if(0!==d||0!==e){if(k.log("DATA","["+l([b[g],b[g+1]])+"] -> ("+l([d,e])+")"),c=this.parseCmd(d,e),c||(c=this.parseMidrow(d,e)),c||(c=this.parsePAC(d,e)),c||(c=this.parseBackgroundAttributes(d,e)),!c&&(f=this.parseChars(d,e)))if(this.currChNr&&this.currChNr>=0){var h=this.channels[this.currChNr-1];h.insertChars(f)}else k.log("WARNING","No channel found yet. TEXT-MODE?");c?this.dataCounters.cmd+=2:f?this.dataCounters.char+=2:(this.dataCounters.other+=2,k.log("WARNING","Couldn't parse cleaned data "+l([d,e])+" orig: "+l([b[g],b[g+1]])))}else this.dataCounters.padding+=2},parseCmd:function(a,b){var c=null,d=(20===a||21===a||28===a||29===a)&&32<=b&&b<=47,e=(23===a||31===a)&&33<=b&&b<=35;if(!d&&!e)return!1;c=20===a||21===a||23===a?1:2;var f=this.channels[c-1];return 20===a||21===a||28===a||29===a?32===b?f.cc_RCL():33===b?f.cc_BS():34===b?f.cc_AOF():35===b?f.cc_AON():36===b?f.cc_DER():37===b?f.cc_RU(2):38===b?f.cc_RU(3):39===b?f.cc_RU(4):40===b?f.cc_FON():41===b?f.cc_RDC():42===b?f.cc_TR():43===b?f.cc_RTD():44===b?f.cc_EDM():45===b?f.cc_CR():46===b?f.cc_ENM():47===b&&f.cc_EOC():f.cc_TO(b-32),this.lastCmdA=a,this.lastCmdB=b,this.currChNr=c,!0},parseMidrow:function(a,b){var c=null;if((17===a||25===a)&&32<=b&&b<=47){if((c=17===a?1:2)!==this.currChNr)return k.log("ERROR","Mismatch channel in midrow parsing"),!1;var d=this.channels[c-1];return d.insertChars([32]),d.cc_MIDROW(b),k.log("DEBUG","MIDROW ("+l([a,b])+")"),this.lastCmdA=a,this.lastCmdB=b,!0}return!1},parsePAC:function(a,b){var c=null,d=null,e=(17<=a&&a<=23||25<=a&&a<=31)&&64<=b&&b<=127,j=(16===a||24===a)&&64<=b&&b<=95;if(!e&&!j)return!1;c=a<=23?1:2,d=64<=b&&b<=95?1===c?f[a]:h[a]:1===c?g[a]:i[a];var k=this.interpretPAC(d,b);return this.channels[c-1].setPAC(k),this.lastCmdA=a,this.lastCmdB=b,this.currChNr=c,!0},interpretPAC:function(a,b){var c=b,d={color:null,italics:!1,indent:null,underline:!1,row:a};return c=b>95?b-96:b-64,d.underline=1==(1&c),c<=13?d.color=["white","green","blue","cyan","red","yellow","magenta","white"][Math.floor(c/2)]:c<=15?(d.italics=!0,d.color="white"):d.indent=4*Math.floor((c-16)/2),d},parseChars:function(a,b){var d=null,e=null,f=null;if(a>=25?(d=2,f=a-8):(d=1,f=a),17<=f&&f<=19){var g=b;g=17===f?b+80:18===f?b+112:b+144,k.log("INFO","Special char '"+c(g)+"' in channel "+d),e=[g],this.lastCmdA=a,this.lastCmdB=b}else 32<=a&&a<=127&&(e=0===b?[a]:[a,b],this.lastCmdA=null,this.lastCmdB=null);if(e){var h=l(e);k.log("DEBUG","Char codes = "+h.join(","))}return e},parseBackgroundAttributes:function(a,b){var c,d,e,f,g=(16===a||24===a)&&32<=b&&b<=47,h=(23===a||31===a)&&45<=b&&b<=47;return!(!g&&!h)&&(c={},16===a||24===a?(d=Math.floor((b-32)/2),c.background=j[d],b%2==1&&(c.background=c.background+"_semi")):45===b?c.background="transparent":(c.foreground="black",47===b&&(c.underline=!0)),e=a<24?1:2,f=this.channels[e-1],f.setBkgData(c),this.lastCmdA=a,this.lastCmdB=b,!0)},reset:function(){for(var a=0;a0&&g(a.arrayAccessFormPaths,b,c,d)&&(b[c]=[b[c]])}function i(a){var b=a.split(/[-T:+Z]/g),c=new Date(b[0],b[1]-1,b[2]),d=b[5].split(".");if(c.setHours(b[3],b[4],d[0]),d.length>1&&c.setMilliseconds(d[1]),b[6]&&b[7]){var e=60*b[6]+Number(b[7]);e=0+("-"==(/\d\d-\d\d:\d\d$/.test(a)?"-":"+")?-1*e:e),c.setMinutes(c.getMinutes()-e-c.getTimezoneOffset())}else-1!==a.indexOf("Z",a.length-1)&&(c=new Date(Date.UTC(c.getFullYear(),c.getMonth(),c.getDate(),c.getHours(),c.getMinutes(),c.getSeconds(),c.getMilliseconds())));return c}function j(b,c,d){if(a.datetimeAccessFormPaths.length>0){var e=d.split(".#")[0];return g(a.datetimeAccessFormPaths,b,c,e)?i(b):b}return b}function k(b,c,d,e){return!(c==z.ELEMENT_NODE&&a.xmlElementsFilter.length>0)||g(a.xmlElementsFilter,b,d,e)}function l(b,c){if(b.nodeType==z.DOCUMENT_NODE){for(var f=new Object,g=b.childNodes,i=0;i1&&null!=f.__text&&a.skipEmptyTextNodesForObj&&(a.stripWhitespaces&&""==f.__text||""==f.__text.trim())&&delete f.__text:f=f.__cdata,delete f.__cnt,!a.enableToStringFunc||null==f.__text&&null==f.__cdata||(f.toString=function(){return(null!=this.__text?this.__text:"")+(null!=this.__cdata?this.__cdata:"")}),f}if(b.nodeType==z.TEXT_NODE||b.nodeType==z.CDATA_SECTION_NODE)return b.nodeValue}function m(b,c,d,e){var g="<"+(null!=b&&null!=b.__prefix?b.__prefix+":":"")+c;if(null!=d)for(var h=0;h":">"}function n(a,b){return""}function o(a,b){return-1!==a.indexOf(b,a.length-b.length)}function p(b,c){return!!("property"==a.arrayAccessForm&&o(c.toString(),"_asArray")||0==c.toString().indexOf(a.attributePrefix)||0==c.toString().indexOf("__")||b[c]instanceof Function)}function q(a){var b=0;if(a instanceof Object)for(var c in a)p(a,c)||b++;return b}function r(b,c,d){return 0==a.jsonPropertiesFilter.length||""==d||g(a.jsonPropertiesFilter,b,c,d)}function s(b){var c=[];if(b instanceof Object)for(var d in b)-1==d.toString().indexOf("__")&&0==d.toString().indexOf(a.attributePrefix)&&c.push(d);return c}function t(b){var c="";return null!=b.__cdata&&(c+=""),null!=b.__text&&(a.escapeMode?c+=f(b.__text):c+=b.__text),c}function u(b){var c="";return b instanceof Object?c+=t(b):null!=b&&(a.escapeMode?c+=f(b):c+=b),c}function v(a,b){return""===a?b:a+"."+b}function w(a,b,c,d){var e="";if(0==a.length)e+=m(a,b,c,!0);else for(var f=0;f0)for(var d in a)if(!p(a,d)&&(""==b||r(a,d,v(b,d)))){var e=a[d],f=s(e);if(null==e||void 0==e)c+=m(e,d,f,!0);else if(e instanceof Object)if(e instanceof Array)c+=w(e,d,f,b);else if(e instanceof Date)c+=m(e,d,f,!1),c+=e.toISOString(),c+=n(e,d);else{var g=q(e);g>0||null!=e.__text||null!=e.__cdata?(c+=m(e,d,f,!1),c+=x(e,v(b,d)),c+=n(e,d)):c+=m(e,d,f,!0)}else c+=m(e,d,f,!1),c+=u(e),c+=n(e,d)}return c+=u(a)}var y="1.2.0";a=a||{},b(),c();var z={ELEMENT_NODE:1,TEXT_NODE:3,CDATA_SECTION_NODE:4,COMMENT_NODE:8,DOCUMENT_NODE:9};this.parseXmlString=function(a){window.ActiveXObject||window;if(void 0===a)return null;var b;if(window.DOMParser){var c=new window.DOMParser;try{b=c.parseFromString(a,"text/xml"),b.getElementsByTagNameNS("*","parsererror").length>0&&(b=null)}catch(d){b=null}}else 0==a.indexOf("")+2)),b=new ActiveXObject("Microsoft.XMLDOM"),b.async="false",b.loadXML(a);return b},this.asArray=function(a){return void 0===a||null==a?[]:a instanceof Array?a:[a]},this.toXmlDateTime=function(a){return a instanceof Date?a.toISOString():"number"==typeof a?new Date(a).toISOString():null},this.asDateTime=function(a){return"string"==typeof a?i(a):a},this.xml2json=function(a){return l(a)},this.xml_str2json=function(a){var b=this.parseXmlString(a);return null!=b?this.xml2json(b):null},this.json2xml_str=function(a){return x(a,"")},this.json2xml=function(a){var b=this.json2xml_str(a);return this.parseXmlString(b)},this.getVersion=function(){return y}}Object.defineProperty(c,"__esModule",{value:!0}),c.default=d,b.exports=c.default},{}],5:[function(a,b,c){"use strict";function d(a){return a&&a.__esModule?a:{default:a}}Object.defineProperty(c,"__esModule",{value:!0});var e=a(6),f=a(117),g=d(f),h=a(148),i=d(h),j=a(95),k=d(j);dashjs.Protection=i.default,dashjs.MetricsReporting=g.default,dashjs.MediaPlayerFactory=k.default,c.default=dashjs,c.MediaPlayer=e.MediaPlayer,c.Protection=i.default,c.MetricsReporting=g.default,c.MediaPlayerFactory=k.default},{117:117,148:148,6:6,95:95}],6:[function(a,b,c){(function(b){"use strict";function d(a){return a&&a.__esModule?a:{default:a}}Object.defineProperty(c,"__esModule",{value:!0});var e=a(93),f=d(e),g=a(51),h=d(g),i=a(52),j="undefined"!=typeof window&&window||b,k=j.dashjs;k||(k=j.dashjs={}),k.MediaPlayer=f.default,k.FactoryMaker=h.default,k.Version=(0,i.getVersionString)(),c.default=k,c.MediaPlayer=f.default,c.FactoryMaker=h.default}).call(this,"undefined"!=typeof global?global:"undefined"!=typeof self?self:"undefined"!=typeof window?window:{})},{51:51,52:52,93:93}],7:[function(a,b,c){!function(a){"use strict";function b(a){var b=a.charCodeAt(0);return b===f||b===k?62:b===g||b===l?63:b0)throw new Error("Invalid string. Length must be a multiple of 4");var k=a.length;i="="===a.charAt(k-2)?2:"="===a.charAt(k-1)?1:0,j=new e(3*a.length/4-i),g=i>0?a.length-4:a.length;var l=0;for(d=0,f=0;d>16),c((65280&h)>>8),c(255&h);return 2===i?(h=b(a.charAt(d))<<2|b(a.charAt(d+1))>>4,c(255&h)):1===i&&(h=b(a.charAt(d))<<10|b(a.charAt(d+1))<<4|b(a.charAt(d+2))>>2,c(h>>8&255),c(255&h)),j}function d(a){function b(a){return"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(a)}function c(a){return b(a>>18&63)+b(a>>12&63)+b(a>>6&63)+b(63&a)}var d,e,f,g=a.length%3,h="";for(d=0,f=a.length-g;d>2),h+=b(e<<4&63),h+="==";break;case 2:e=(a[a.length-2]<<8)+a[a.length-1],h+=b(e>>10),h+=b(e>>4&63),h+=b(e<<2&63),h+="="}return h}var e="undefined"!=typeof Uint8Array?Uint8Array:Array,f="+".charCodeAt(0),g="/".charCodeAt(0),h="0".charCodeAt(0),i="a".charCodeAt(0),j="A".charCodeAt(0),k="-".charCodeAt(0),l="_".charCodeAt(0);a.toByteArray=c,a.fromByteArray=d}(void 0===c?this.base64js={}:c)},{}],8:[function(a,b,c){},{}],9:[function(a,b,c){function d(a){if(a&&!i(a))throw new Error("Unknown encoding: "+a)}function e(a){return a.toString(this.encoding)}function f(a){this.charReceived=a.length%2,this.charLength=this.charReceived?2:0}function g(a){this.charReceived=a.length%3,this.charLength=this.charReceived?3:0}var h=a(10).Buffer,i=h.isEncoding||function(a){switch(a&&a.toLowerCase()){case"hex":case"utf8":case"utf-8":case"ascii":case"binary":case"base64":case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":case"raw":return!0;default:return!1}},j=c.StringDecoder=function(a){switch(this.encoding=(a||"utf8").toLowerCase().replace(/[-_]/,""),d(a),this.encoding){case"utf8":this.surrogateSize=3;break;case"ucs2":case"utf16le":this.surrogateSize=2,this.detectIncompleteChar=f;break;case"base64":this.surrogateSize=3,this.detectIncompleteChar=g;break;default:return void(this.write=e)}this.charBuffer=new h(6),this.charReceived=0,this.charLength=0};j.prototype.write=function(a){for(var b="";this.charLength;){var c=a.length>=this.charLength-this.charReceived?this.charLength-this.charReceived:a.length;if(a.copy(this.charBuffer,this.charReceived,0,c),this.charReceived+=c,this.charReceived=55296&&d<=56319)){if(this.charReceived=this.charLength=0,0===a.length)return b;break}this.charLength+=this.surrogateSize,b=""}this.detectIncompleteChar(a);var e=a.length;this.charLength&&(a.copy(this.charBuffer,0,a.length-this.charReceived,e),e-=this.charReceived),b+=a.toString(this.encoding,0,e);var e=b.length-1,d=b.charCodeAt(e);if(d>=55296&&d<=56319){var f=this.surrogateSize;return this.charLength+=f,this.charReceived+=f,this.charBuffer.copy(this.charBuffer,f,0,f),a.copy(this.charBuffer,0,0,f),b.substring(0,e)}return b},j.prototype.detectIncompleteChar=function(a){for(var b=a.length>=3?3:a.length;b>0;b--){var c=a[a.length-b];if(1==b&&c>>5==6){this.charLength=2;break}if(b<=2&&c>>4==14){this.charLength=3;break}if(b<=3&&c>>3==30){this.charLength=4;break}}this.charReceived=b},j.prototype.end=function(a){var b="";if(a&&a.length&&(b=this.write(a)),this.charReceived){var c=this.charReceived,d=this.charBuffer,e=this.encoding;b+=d.slice(0,c).toString(e)}return b}},{10:10}],10:[function(a,b,c){(function(b){/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author Feross Aboukhadijeh
+ * @license MIT
+ */
+"use strict";function d(){function a(){}try{var b=new Uint8Array(1);return b.foo=function(){return 42},b.constructor=a,42===b.foo()&&b.constructor===a&&"function"==typeof b.subarray&&0===b.subarray(1,1).byteLength}catch(c){return!1}}function e(){return f.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function f(a){return this instanceof f?(f.TYPED_ARRAY_SUPPORT||(this.length=0,this.parent=void 0),"number"==typeof a?g(this,a):"string"==typeof a?h(this,a,arguments.length>1?arguments[1]:"utf8"):i(this,a)):arguments.length>1?new f(a,arguments[1]):new f(a)}function g(a,b){if(a=p(a,b<0?0:0|q(b)),!f.TYPED_ARRAY_SUPPORT)for(var c=0;c>>1&&(a.parent=Z),a}function q(a){if(a>=e())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+e().toString(16)+" bytes");return 0|a}function r(a,b){if(!(this instanceof r))return new r(a,b);var c=new f(a,b);return delete c.parent,c}function s(a,b){"string"!=typeof a&&(a=""+a);var c=a.length;if(0===c)return 0;for(var d=!1;;)switch(b){case"ascii":case"binary":case"raw":case"raws":return c;case"utf8":case"utf-8":return R(a).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*c;case"hex":return c>>>1;case"base64":return U(a).length;default:if(d)return R(a).length;b=(""+b).toLowerCase(),d=!0}}function t(a,b,c){var d=!1;if(b|=0,c=void 0===c||c===1/0?this.length:0|c,a||(a="utf8"),b<0&&(b=0),c>this.length&&(c=this.length),c<=b)return"";for(;;)switch(a){case"hex":return F(this,b,c);case"utf8":case"utf-8":return B(this,b,c);case"ascii":return D(this,b,c);case"binary":return E(this,b,c);case"base64":return A(this,b,c);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return G(this,b,c);default:if(d)throw new TypeError("Unknown encoding: "+a);a=(a+"").toLowerCase(),d=!0}}function u(a,b,c,d){c=Number(c)||0;var e=a.length-c;d?(d=Number(d))>e&&(d=e):d=e;var f=b.length;if(f%2!=0)throw new Error("Invalid hex string");d>f/2&&(d=f/2);for(var g=0;g239?4:f>223?3:f>191?2:1;if(e+h<=c){var i,j,k,l;switch(h){case 1:f<128&&(g=f);break;case 2:i=a[e+1],128==(192&i)&&(l=(31&f)<<6|63&i)>127&&(g=l);break;case 3:i=a[e+1],j=a[e+2],128==(192&i)&&128==(192&j)&&(l=(15&f)<<12|(63&i)<<6|63&j)>2047&&(l<55296||l>57343)&&(g=l);break;case 4:i=a[e+1],j=a[e+2],k=a[e+3],128==(192&i)&&128==(192&j)&&128==(192&k)&&(l=(15&f)<<18|(63&i)<<12|(63&j)<<6|63&k)>65535&&l<1114112&&(g=l)}}null===g?(g=65533,h=1):g>65535&&(g-=65536,d.push(g>>>10&1023|55296),g=56320|1023&g),d.push(g),e+=h}return C(d)}function C(a){var b=a.length;if(b<=$)return String.fromCharCode.apply(String,a);for(var c="",d=0;dd)&&(c=d);for(var e="",f=b;fc)throw new RangeError("Trying to access beyond buffer length")}function I(a,b,c,d,e,g){if(!f.isBuffer(a))throw new TypeError("buffer must be a Buffer instance");if(b>e||ba.length)throw new RangeError("index out of range")}function J(a,b,c,d){b<0&&(b=65535+b+1);for(var e=0,f=Math.min(a.length-c,2);e>>8*(d?e:1-e)}function K(a,b,c,d){b<0&&(b=4294967295+b+1);for(var e=0,f=Math.min(a.length-c,4);e>>8*(d?e:3-e)&255}function L(a,b,c,d,e,f){if(b>e||ba.length)throw new RangeError("index out of range");if(c<0)throw new RangeError("index out of range")}function M(a,b,c,d,e){return e||L(a,b,c,4,3.4028234663852886e38,-3.4028234663852886e38),X.write(a,b,c,d,23,4),c+4}function N(a,b,c,d,e){return e||L(a,b,c,8,1.7976931348623157e308,-1.7976931348623157e308),X.write(a,b,c,d,52,8),c+8}function O(a){if(a=P(a).replace(aa,""),a.length<2)return"";for(;a.length%4!=0;)a+="=";return a}function P(a){return a.trim?a.trim():a.replace(/^\s+|\s+$/g,"")}function Q(a){return a<16?"0"+a.toString(16):a.toString(16)}function R(a,b){b=b||1/0;for(var c,d=a.length,e=null,f=[],g=0;g55295&&c<57344){if(!e){if(c>56319){(b-=3)>-1&&f.push(239,191,189);continue}if(g+1===d){(b-=3)>-1&&f.push(239,191,189);continue}e=c;continue}if(c<56320){(b-=3)>-1&&f.push(239,191,189),e=c;continue}c=65536+(e-55296<<10|c-56320)}else e&&(b-=3)>-1&&f.push(239,191,189);if(e=null,c<128){if((b-=1)<0)break;f.push(c)}else if(c<2048){if((b-=2)<0)break;f.push(c>>6|192,63&c|128)}else if(c<65536){if((b-=3)<0)break;f.push(c>>12|224,c>>6&63|128,63&c|128)}else{if(!(c<1114112))throw new Error("Invalid code point");if((b-=4)<0)break;f.push(c>>18|240,c>>12&63|128,c>>6&63|128,63&c|128)}}return f}function S(a){for(var b=[],c=0;c>8,e=c%256,f.push(e),f.push(d);return f}function U(a){return W.toByteArray(O(a))}function V(a,b,c,d){for(var e=0;e=b.length||e>=a.length);e++)b[e+c]=a[e];return e}var W=a(7),X=a(17),Y=a(27);c.Buffer=f,c.SlowBuffer=r,c.INSPECT_MAX_BYTES=50,f.poolSize=8192;var Z={};f.TYPED_ARRAY_SUPPORT=void 0!==b.TYPED_ARRAY_SUPPORT?b.TYPED_ARRAY_SUPPORT:d(),f.TYPED_ARRAY_SUPPORT?(f.prototype.__proto__=Uint8Array.prototype,f.__proto__=Uint8Array):(f.prototype.length=void 0,f.prototype.parent=void 0),f.isBuffer=function(a){return!(null==a||!a._isBuffer)},f.compare=function(a,b){if(!f.isBuffer(a)||!f.isBuffer(b))throw new TypeError("Arguments must be Buffers");if(a===b)return 0;for(var c=a.length,d=b.length,e=0,g=Math.min(c,d);e0&&(a=this.toString("hex",0,b).match(/.{2}/g).join(" "),this.length>b&&(a+=" ... ")),""},f.prototype.compare=function(a){if(!f.isBuffer(a))throw new TypeError("Argument must be a Buffer");return this===a?0:f.compare(this,a)},f.prototype.indexOf=function(a,b){function c(a,b,c){for(var d=-1,e=0;c+e2147483647?b=2147483647:b<-2147483648&&(b=-2147483648),b>>=0,0===this.length)return-1;if(b>=this.length)return-1;if(b<0&&(b=Math.max(this.length+b,0)),"string"==typeof a)return 0===a.length?-1:String.prototype.indexOf.call(this,a,b);if(f.isBuffer(a))return c(this,a,b);if("number"==typeof a)return f.TYPED_ARRAY_SUPPORT&&"function"===Uint8Array.prototype.indexOf?Uint8Array.prototype.indexOf.call(this,a,b):c(this,[a],b);throw new TypeError("val must be string, number or Buffer")},f.prototype.get=function(a){return console.log(".get() is deprecated. Access using array indexes instead."),this.readUInt8(a)},f.prototype.set=function(a,b){return console.log(".set() is deprecated. Access using array indexes instead."),this.writeUInt8(a,b)},f.prototype.write=function(a,b,c,d){if(void 0===b)d="utf8",c=this.length,b=0;else if(void 0===c&&"string"==typeof b)d=b,c=this.length,b=0;else if(isFinite(b))b|=0,isFinite(c)?(c|=0,void 0===d&&(d="utf8")):(d=c,c=void 0);else{var e=d;d=b,b=0|c,c=e}var f=this.length-b;if((void 0===c||c>f)&&(c=f),a.length>0&&(c<0||b<0)||b>this.length)throw new RangeError("attempt to write outside buffer bounds");d||(d="utf8");for(var g=!1;;)switch(d){case"hex":return u(this,a,b,c);case"utf8":case"utf-8":return v(this,a,b,c);case"ascii":return w(this,a,b,c);case"binary":return x(this,a,b,c);case"base64":return y(this,a,b,c);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return z(this,a,b,c);default:if(g)throw new TypeError("Unknown encoding: "+d);d=(""+d).toLowerCase(),g=!0}},f.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var $=4096;f.prototype.slice=function(a,b){var c=this.length;a=~~a,b=void 0===b?c:~~b,a<0?(a+=c)<0&&(a=0):a>c&&(a=c),b<0?(b+=c)<0&&(b=0):b>c&&(b=c),b0&&(e*=256);)d+=this[a+--b]*e;return d},f.prototype.readUInt8=function(a,b){return b||H(a,1,this.length),this[a]},f.prototype.readUInt16LE=function(a,b){return b||H(a,2,this.length),this[a]|this[a+1]<<8},f.prototype.readUInt16BE=function(a,b){return b||H(a,2,this.length),this[a]<<8|this[a+1]},f.prototype.readUInt32LE=function(a,b){return b||H(a,4,this.length),(this[a]|this[a+1]<<8|this[a+2]<<16)+16777216*this[a+3]},f.prototype.readUInt32BE=function(a,b){return b||H(a,4,this.length),16777216*this[a]+(this[a+1]<<16|this[a+2]<<8|this[a+3])},f.prototype.readIntLE=function(a,b,c){a|=0,b|=0,c||H(a,b,this.length);for(var d=this[a],e=1,f=0;++f=e&&(d-=Math.pow(2,8*b)),d},f.prototype.readIntBE=function(a,b,c){a|=0,b|=0,c||H(a,b,this.length);for(var d=b,e=1,f=this[a+--d];d>0&&(e*=256);)f+=this[a+--d]*e;return e*=128,f>=e&&(f-=Math.pow(2,8*b)),f},f.prototype.readInt8=function(a,b){return b||H(a,1,this.length),128&this[a]?-1*(255-this[a]+1):this[a]},f.prototype.readInt16LE=function(a,b){b||H(a,2,this.length);var c=this[a]|this[a+1]<<8;return 32768&c?4294901760|c:c},f.prototype.readInt16BE=function(a,b){b||H(a,2,this.length);var c=this[a+1]|this[a]<<8;return 32768&c?4294901760|c:c},f.prototype.readInt32LE=function(a,b){return b||H(a,4,this.length),this[a]|this[a+1]<<8|this[a+2]<<16|this[a+3]<<24},f.prototype.readInt32BE=function(a,b){return b||H(a,4,this.length),this[a]<<24|this[a+1]<<16|this[a+2]<<8|this[a+3]},f.prototype.readFloatLE=function(a,b){return b||H(a,4,this.length),X.read(this,a,!0,23,4)},f.prototype.readFloatBE=function(a,b){return b||H(a,4,this.length),X.read(this,a,!1,23,4)},f.prototype.readDoubleLE=function(a,b){return b||H(a,8,this.length),X.read(this,a,!0,52,8)},f.prototype.readDoubleBE=function(a,b){return b||H(a,8,this.length),X.read(this,a,!1,52,8)},f.prototype.writeUIntLE=function(a,b,c,d){a=+a,b|=0,c|=0,d||I(this,a,b,c,Math.pow(2,8*c),0);var e=1,f=0;for(this[b]=255&a;++f=0&&(f*=256);)this[b+e]=a/f&255;return b+c},f.prototype.writeUInt8=function(a,b,c){return a=+a,b|=0,c||I(this,a,b,1,255,0),f.TYPED_ARRAY_SUPPORT||(a=Math.floor(a)),this[b]=255&a,b+1},f.prototype.writeUInt16LE=function(a,b,c){return a=+a,b|=0,c||I(this,a,b,2,65535,0),f.TYPED_ARRAY_SUPPORT?(this[b]=255&a,this[b+1]=a>>>8):J(this,a,b,!0),b+2},f.prototype.writeUInt16BE=function(a,b,c){return a=+a,b|=0,c||I(this,a,b,2,65535,0),f.TYPED_ARRAY_SUPPORT?(this[b]=a>>>8,this[b+1]=255&a):J(this,a,b,!1),b+2},f.prototype.writeUInt32LE=function(a,b,c){return a=+a,b|=0,c||I(this,a,b,4,4294967295,0),f.TYPED_ARRAY_SUPPORT?(this[b+3]=a>>>24,this[b+2]=a>>>16,this[b+1]=a>>>8,this[b]=255&a):K(this,a,b,!0),b+4},f.prototype.writeUInt32BE=function(a,b,c){return a=+a,b|=0,c||I(this,a,b,4,4294967295,0),f.TYPED_ARRAY_SUPPORT?(this[b]=a>>>24,this[b+1]=a>>>16,this[b+2]=a>>>8,this[b+3]=255&a):K(this,a,b,!1),b+4},f.prototype.writeIntLE=function(a,b,c,d){if(a=+a,b|=0,!d){var e=Math.pow(2,8*c-1);I(this,a,b,c,e-1,-e)}var f=0,g=1,h=a<0?1:0;for(this[b]=255&a;++f>0)-h&255;return b+c},f.prototype.writeIntBE=function(a,b,c,d){if(a=+a,b|=0,!d){var e=Math.pow(2,8*c-1);I(this,a,b,c,e-1,-e)}var f=c-1,g=1,h=a<0?1:0;for(this[b+f]=255&a;--f>=0&&(g*=256);)this[b+f]=(a/g>>0)-h&255;return b+c},f.prototype.writeInt8=function(a,b,c){return a=+a,b|=0,c||I(this,a,b,1,127,-128),f.TYPED_ARRAY_SUPPORT||(a=Math.floor(a)),a<0&&(a=255+a+1),this[b]=255&a,b+1},f.prototype.writeInt16LE=function(a,b,c){return a=+a,b|=0,c||I(this,a,b,2,32767,-32768),f.TYPED_ARRAY_SUPPORT?(this[b]=255&a,this[b+1]=a>>>8):J(this,a,b,!0),b+2},f.prototype.writeInt16BE=function(a,b,c){return a=+a,b|=0,c||I(this,a,b,2,32767,-32768),f.TYPED_ARRAY_SUPPORT?(this[b]=a>>>8,this[b+1]=255&a):J(this,a,b,!1),b+2},f.prototype.writeInt32LE=function(a,b,c){return a=+a,b|=0,c||I(this,a,b,4,2147483647,-2147483648),f.TYPED_ARRAY_SUPPORT?(this[b]=255&a,this[b+1]=a>>>8,this[b+2]=a>>>16,this[b+3]=a>>>24):K(this,a,b,!0),b+4},f.prototype.writeInt32BE=function(a,b,c){return a=+a,b|=0,c||I(this,a,b,4,2147483647,-2147483648),a<0&&(a=4294967295+a+1),f.TYPED_ARRAY_SUPPORT?(this[b]=a>>>24,this[b+1]=a>>>16,this[b+2]=a>>>8,this[b+3]=255&a):K(this,a,b,!1),b+4},f.prototype.writeFloatLE=function(a,b,c){return M(this,a,b,!0,c)},f.prototype.writeFloatBE=function(a,b,c){return M(this,a,b,!1,c)},f.prototype.writeDoubleLE=function(a,b,c){return N(this,a,b,!0,c)},f.prototype.writeDoubleBE=function(a,b,c){return N(this,a,b,!1,c)},f.prototype.copy=function(a,b,c,d){if(c||(c=0),d||0===d||(d=this.length),b>=a.length&&(b=a.length),b||(b=0),d>0&&d=this.length)throw new RangeError("sourceStart out of bounds");if(d<0)throw new RangeError("sourceEnd out of bounds");d>this.length&&(d=this.length),a.length-b=0;e--)a[e+b]=this[e+c];else if(g<1e3||!f.TYPED_ARRAY_SUPPORT)for(e=0;e=this.length)throw new RangeError("start out of bounds");if(c<0||c>this.length)throw new RangeError("end out of bounds");var d;if("number"==typeof a)for(d=b;d>6),b.push(128|63&d)):d<65536?(b.push(224|d>>12),b.push(128|63&d>>6),b.push(128|63&d)):(b.push(240|d>>18),b.push(128|63&d>>12),b.push(128|63&d>>6),b.push(128|63&d))}return b},d.Utils.appendBox=function(a,b,c){if(b._offset=a._cursor.offset,b._root=a._root?a._root:a,b._raw=a._raw,b._parent=a,-1!==c){if(void 0===c||null===c)return void a.boxes.push(b);var d,e=-1;if("number"==typeof c)e=c;else{if("string"==typeof c)d=c;else{if("object"!=typeof c||!c.type)return void a.boxes.push(b);d=c.type}for(var f=0;f>3,b},f.prototype._readUint=function(a){var b,c,d=null,e=this._cursor.offset-this._raw.byteOffset;switch(a){case 8:d=this._raw.getUint8(e);break;case 16:d=this._raw.getUint16(e);break;case 24:b=this._raw.getUint16(e),c=this._raw.getUint8(e+2),d=(b<<8)+c;break;case 32:d=this._raw.getUint32(e);break;case 64:b=this._raw.getUint32(e),c=this._raw.getUint32(e+4),d=b*Math.pow(2,32)+c}return this._cursor.offset+=a>>3,d},f.prototype._readString=function(a){for(var b="",c=0;c0?a:this._raw.byteLength-(this._cursor.offset-this._offset);if(b>0){var c=new Uint8Array(this._raw.buffer,this._cursor.offset,b);return this._cursor.offset+=b,c}return null},f.prototype._readUTF8String=function(){var a=this._raw.byteLength-(this._cursor.offset-this._offset),b=null;return a>0&&(b=new DataView(this._raw.buffer,this._cursor.offset,a),this._cursor.offset+=a),b?d.Utils.dataViewToString(b):b},f.prototype._parseBox=function(){if(this._parsing=!0,this._cursor.offset=this._offset,this._offset+8>this._raw.buffer.byteLength)return void(this._root._incomplete=!0);switch(this._procField("size","uint",32),this._procField("type","string",4),1===this.size&&this._procField("largesize","uint",64),"uuid"===this.type&&this._procFieldArray("usertype",16,"uint",8),this.size){case 0:this._raw=new DataView(this._raw.buffer,this._offset,this._raw.byteLength-this._cursor.offset+8);break;case 1:this._offset+this.size>this._raw.buffer.byteLength?(this._incomplete=!0,this._root._incomplete=!0):this._raw=new DataView(this._raw.buffer,this._offset,this.largesize);break;default:this._offset+this.size>this._raw.buffer.byteLength?(this._incomplete=!0,this._root._incomplete=!0):this._raw=new DataView(this._raw.buffer,this._offset,this.size)}this._incomplete||(this._boxProcessors[this.type]&&this._boxProcessors[this.type].call(this),-1!==this._boxContainers.indexOf(this.type)?this._parseContainerBox():this._data=this._readData())},f.prototype._parseFullBox=function(){this.version=this._readUint(8),this.flags=this._readUint(24)},f.prototype._parseContainerBox=function(){for(this.boxes=[];this._cursor.offset-this._raw.byteOffset>3}else this.size+=a>>3},f.prototype._writeUint=function(a,b){if(this._rawo){var c,d,e=this._cursor.offset-this._rawo.byteOffset;switch(a){case 8:this._rawo.setUint8(e,b);break;case 16:this._rawo.setUint16(e,b);break;case 24:c=(16776960&b)>>8,d=255&b,this._rawo.setUint16(e,c),this._rawo.setUint8(e+2,d);break;case 32:this._rawo.setUint32(e,b);break;case 64:c=Math.floor(b/Math.pow(2,32)),d=b-c*Math.pow(2,32),this._rawo.setUint32(e,c),this._rawo.setUint32(e+4,d)}this._cursor.offset+=a>>3}else this.size+=a>>3},f.prototype._writeString=function(a,b){for(var c=0;c>10&31),96+(this.language>>5&31),96+(31&this.language))),this._procField("pre_defined","uint",16)},f.prototype._boxProcessors.mehd=function(){this._procFullBox(),this._procField("fragment_duration","uint",1==this.version?64:32)},f.prototype._boxProcessors.mfhd=function(){this._procFullBox(),this._procField("sequence_number","uint",32)},f.prototype._boxProcessors.mfro=function(){this._procFullBox(),this._procField("mfra_size","uint",32)},f.prototype._boxProcessors.mp4a=f.prototype._boxProcessors.enca=function(){this._procFieldArray("reserved1",6,"uint",8),this._procField("data_reference_index","uint",16),this._procFieldArray("reserved2",2,"uint",32),this._procField("channelcount","uint",16),this._procField("samplesize","uint",16),this._procField("pre_defined","uint",16),this._procField("reserved3","uint",16),this._procField("samplerate","template",32),this._procField("esds","data",-1)},f.prototype._boxProcessors.mvhd=function(){this._procFullBox(),this._procField("creation_time","uint",1==this.version?64:32),this._procField("modification_time","uint",1==this.version?64:32),this._procField("timescale","uint",32),this._procField("duration","uint",1==this.version?64:32),this._procField("rate","template",32),this._procField("volume","template",16),this._procField("reserved1","uint",16),this._procFieldArray("reserved2",2,"uint",32),this._procFieldArray("matrix",9,"template",32),this._procFieldArray("pre_defined",6,"uint",32),this._procField("next_track_ID","uint",32)},f.prototype._boxProcessors.payl=function(){this._procField("cue_text","utf8")},f.prototype._boxProcessors.pssh=function(){this._procFullBox(),this._procFieldArray("SystemID",16,"uint",8),this._procField("DataSize","uint",32),this._procFieldArray("Data",this.DataSize,"uint",8)},f.prototype._boxProcessors.schm=function(){this._procFullBox(),this._procField("scheme_type","uint",32),this._procField("scheme_version","uint",32),1&this.flags&&this._procField("scheme_uri","string",-1)},f.prototype._boxProcessors.sdtp=function(){this._procFullBox();var a=-1;this._parsing&&(a=this._raw.byteLength-(this._cursor.offset-this._raw.byteOffset)),this._procFieldArray("sample_dependency_table",a,"uint",8)},f.prototype._boxProcessors.sidx=function(){this._procFullBox(),this._procField("reference_ID","uint",32),this._procField("timescale","uint",32),this._procField("earliest_presentation_time","uint",1==this.version?64:32),this._procField("first_offset","uint",1==this.version?64:32),this._procField("reserved","uint",16),this._procField("reference_count","uint",16),this._procEntries("references",this.reference_count,function(a){this._parsing||(a.reference=(1&a.reference_type)<<31,a.reference|=2147483647&a.referenced_size,a.sap=(1&a.starts_with_SAP)<<31,a.sap|=(3&a.SAP_type)<<28,a.sap|=268435455&a.SAP_delta_time),this._procEntryField(a,"reference","uint",32),this._procEntryField(a,"subsegment_duration","uint",32),this._procEntryField(a,"sap","uint",32),this._parsing&&(a.reference_type=a.reference>>31&1,a.referenced_size=2147483647&a.reference,a.starts_with_SAP=a.sap>>31&1,a.SAP_type=a.sap>>28&7,a.SAP_delta_time=268435455&a.sap)})},f.prototype._boxProcessors.smhd=function(){this._procFullBox(),this._procField("balance","uint",16),this._procField("reserved","uint",16)},f.prototype._boxProcessors.ssix=function(){this._procFullBox(),this._procField("subsegment_count","uint",32),this._procEntries("subsegments",this.subsegment_count,function(a){this._procEntryField(a,"ranges_count","uint",32),this._procSubEntries(a,"ranges",a.ranges_count,function(a){this._procEntryField(a,"level","uint",8),this._procEntryField(a,"range_size","uint",24)})})},f.prototype._boxProcessors.stsd=function(){this._procFullBox(),this._procField("entry_count","uint",32),this._procSubBoxes("entries",this.entry_count)},f.prototype._boxProcessors.subs=function(){this._procFullBox(),this._procField("entry_count","uint",32),this._procEntries("entries",this.entry_count,function(a){this._procEntryField(a,"sample_delta","uint",32),this._procEntryField(a,"subsample_count","uint",16),this._procSubEntries(a,"subsamples",a.subsample_count,function(a){this._procEntryField(a,"subsample_size","uint",1===this.version?32:16),this._procEntryField(a,"subsample_priority","uint",8),this._procEntryField(a,"discardable","uint",8),this._procEntryField(a,"codec_specific_parameters","uint",32)})})},f.prototype._boxProcessors.tenc=function(){this._procFullBox(),this._procField("default_IsEncrypted","uint",24),this._procField("default_IV_size","uint",8),this._procFieldArray("default_KID",16,"uint",8)},f.prototype._boxProcessors.tfdt=function(){this._procFullBox(),this._procField("baseMediaDecodeTime","uint",1==this.version?64:32)},f.prototype._boxProcessors.tfhd=function(){this._procFullBox(),this._procField("track_ID","uint",32),1&this.flags&&this._procField("base_data_offset","uint",64),2&this.flags&&this._procField("sample_description_offset","uint",32),8&this.flags&&this._procField("default_sample_duration","uint",32),16&this.flags&&this._procField("default_sample_size","uint",32),32&this.flags&&this._procField("default_sample_flags","uint",32)},f.prototype._boxProcessors.tfra=function(){this._procFullBox(),this._procField("track_ID","uint",32),this._parsing||(this.reserved=0,this.reserved|=(48&this.length_size_of_traf_num)<<4,this.reserved|=(12&this.length_size_of_trun_num)<<2,this.reserved|=3&this.length_size_of_sample_num),this._procField("reserved","uint",32),this._parsing&&(this.length_size_of_traf_num=(48&this.reserved)>>4,this.length_size_of_trun_num=(12&this.reserved)>>2,this.length_size_of_sample_num=3&this.reserved),this._procField("number_of_entry","uint",32),this._procEntries("entries",this.number_of_entry,function(a){this._procEntryField(a,"time","uint",1===this.version?64:32),this._procEntryField(a,"moof_offset","uint",1===this.version?64:32),this._procEntryField(a,"traf_number","uint",8*(this.length_size_of_traf_num+1)),this._procEntryField(a,"trun_number","uint",8*(this.length_size_of_trun_num+1)),this._procEntryField(a,"sample_number","uint",8*(this.length_size_of_sample_num+1))})},f.prototype._boxProcessors.tkhd=function(){this._procFullBox(),this._procField("creation_time","uint",1==this.version?64:32),this._procField("modification_time","uint",1==this.version?64:32),this._procField("track_ID","uint",32),this._procField("reserved1","uint",32),this._procField("duration","uint",1==this.version?64:32),this._procFieldArray("reserved2",2,"uint",32),this._procField("layer","uint",16),this._procField("alternate_group","uint",16),this._procField("volume","template",16),this._procField("reserved3","uint",16),this._procFieldArray("matrix",9,"template",32),this._procField("width","template",32),this._procField("height","template",32)},f.prototype._boxProcessors.trex=function(){this._procFullBox(),this._procField("track_ID","uint",32),this._procField("default_sample_description_index","uint",32),this._procField("default_sample_duration","uint",32),this._procField("default_sample_size","uint",32),this._procField("default_sample_flags","uint",32)},f.prototype._boxProcessors.trun=function(){this._procFullBox(),this._procField("sample_count","uint",32),1&this.flags&&this._procField("data_offset","int",32),4&this.flags&&this._procField("first_sample_flags","uint",32),this._procEntries("samples",this.sample_count,function(a){256&this.flags&&this._procEntryField(a,"sample_duration","uint",32),512&this.flags&&this._procEntryField(a,"sample_size","uint",32),1024&this.flags&&this._procEntryField(a,"sample_flags","uint",32),2048&this.flags&&this._procEntryField(a,"sample_composition_time_offset",1===this.version?"int":"uint",32)})},f.prototype._boxProcessors["url "]=f.prototype._boxProcessors["urn "]=function(){this._procFullBox(),"urn "===this.type&&this._procField("name","string",-1),this._procField("location","string",-1)},f.prototype._boxProcessors.vlab=function(){this._procField("source_label","utf8")},f.prototype._boxProcessors.vmhd=function(){this._procFullBox(),this._procField("graphicsmode","uint",16),this._procFieldArray("opcolor",3,"uint",16)},f.prototype._boxProcessors.vttC=function(){this._procField("config","utf8")},f.prototype._boxProcessors.vtte=function(){}},{}],12:[function(a,b,c){(function(a){function b(a){return Array.isArray?Array.isArray(a):"[object Array]"===q(a)}function d(a){return"boolean"==typeof a}function e(a){return null===a}function f(a){return null==a}function g(a){return"number"==typeof a}function h(a){return"string"==typeof a}function i(a){return"symbol"==typeof a}function j(a){return void 0===a}function k(a){return"[object RegExp]"===q(a)}function l(a){return"object"==typeof a&&null!==a}function m(a){return"[object Date]"===q(a)}function n(a){return"[object Error]"===q(a)||a instanceof Error}function o(a){return"function"==typeof a}function p(a){return null===a||"boolean"==typeof a||"number"==typeof a||"string"==typeof a||"symbol"==typeof a||void 0===a}function q(a){return Object.prototype.toString.call(a)}c.isArray=b,c.isBoolean=d,c.isNull=e,c.isNullOrUndefined=f,c.isNumber=g,c.isString=h,c.isSymbol=i,c.isUndefined=j,c.isRegExp=k,c.isObject=l,c.isDate=m,c.isError=n,c.isFunction=o,c.isPrimitive=p,c.isBuffer=a.isBuffer}).call(this,{isBuffer:a(26)})},{26:26}],13:[function(a,b,c){function d(a){return null===a||void 0===a}function e(a){return!(!a||"object"!=typeof a||"number"!=typeof a.length)&&("function"==typeof a.copy&&"function"==typeof a.slice&&!(a.length>0&&"number"!=typeof a[0]))}function f(a,b,c){var f,k;if(d(a)||d(b))return!1;if(a.prototype!==b.prototype)return!1;if(i(a))return!!i(b)&&(a=g.call(a),b=g.call(b),j(a,b,c));if(e(a)){if(!e(b))return!1;if(a.length!==b.length)return!1;for(f=0;f=0;f--)if(l[f]!=m[f])return!1;for(f=l.length-1;f>=0;f--)if(k=l[f],!j(a[k],b[k],c))return!1;return typeof a==typeof b}var g=Array.prototype.slice,h=a(15),i=a(14),j=b.exports=function(a,b,c){return c||(c={}),a===b||(a instanceof Date&&b instanceof Date?a.getTime()===b.getTime():!a||!b||"object"!=typeof a&&"object"!=typeof b?c.strict?a===b:a==b:f(a,b,c))}},{14:14,15:15}],14:[function(a,b,c){function d(a){return"[object Arguments]"==Object.prototype.toString.call(a)}function e(a){return a&&"object"==typeof a&&"number"==typeof a.length&&Object.prototype.hasOwnProperty.call(a,"callee")&&!Object.prototype.propertyIsEnumerable.call(a,"callee")||!1}var f="[object Arguments]"==function(){return Object.prototype.toString.call(arguments)}();c=b.exports=f?d:e,c.supported=d,c.unsupported=e},{}],15:[function(a,b,c){function d(a){var b=[];for(var c in a)b.push(c);return b}c=b.exports="function"==typeof Object.keys?Object.keys:d,c.shim=d},{}],16:[function(a,b,c){function d(){this._events=this._events||{},this._maxListeners=this._maxListeners||void 0}function e(a){return"function"==typeof a}function f(a){return"number"==typeof a}function g(a){return"object"==typeof a&&null!==a}function h(a){return void 0===a}b.exports=d,d.EventEmitter=d,d.prototype._events=void 0,d.prototype._maxListeners=void 0,d.defaultMaxListeners=10,d.prototype.setMaxListeners=function(a){if(!f(a)||a<0||isNaN(a))throw TypeError("n must be a positive number");return this._maxListeners=a,this},d.prototype.emit=function(a){var b,c,d,f,i,j;if(this._events||(this._events={}),"error"===a&&(!this._events.error||g(this._events.error)&&!this._events.error.length)){if((b=arguments[1])instanceof Error)throw b;throw TypeError('Uncaught, unspecified "error" event.')}if(c=this._events[a],h(c))return!1;if(e(c))switch(arguments.length){case 1:c.call(this);break;case 2:c.call(this,arguments[1]);break;case 3:c.call(this,arguments[1],arguments[2]);break;default:for(d=arguments.length,f=new Array(d-1),i=1;i0&&this._events[a].length>c&&(this._events[a].warned=!0,console.error("(node) warning: possible EventEmitter memory leak detected. %d listeners added. Use emitter.setMaxListeners() to increase limit.",this._events[a].length),"function"==typeof console.trace&&console.trace())}return this},d.prototype.on=d.prototype.addListener,d.prototype.once=function(a,b){function c(){this.removeListener(a,c),d||(d=!0,b.apply(this,arguments))}if(!e(b))throw TypeError("listener must be a function");var d=!1;return c.listener=b,this.on(a,c),this},d.prototype.removeListener=function(a,b){var c,d,f,h;if(!e(b))throw TypeError("listener must be a function");if(!this._events||!this._events[a])return this;if(c=this._events[a],f=c.length,d=-1,c===b||e(c.listener)&&c.listener===b)delete this._events[a],this._events.removeListener&&this.emit("removeListener",a,b);else if(g(c)){for(h=f;h-- >0;)if(c[h]===b||c[h].listener&&c[h].listener===b){d=h;break}if(d<0)return this;1===c.length?(c.length=0,delete this._events[a]):c.splice(d,1),this._events.removeListener&&this.emit("removeListener",a,b)}return this},d.prototype.removeAllListeners=function(a){var b,c;if(!this._events)return this;if(!this._events.removeListener)return 0===arguments.length?this._events={}:this._events[a]&&delete this._events[a],this;if(0===arguments.length){for(b in this._events)"removeListener"!==b&&this.removeAllListeners(b);return this.removeAllListeners("removeListener"),this._events={},this}if(c=this._events[a],e(c))this.removeListener(a,c);else for(;c.length;)this.removeListener(a,c[c.length-1]);return delete this._events[a],this},d.prototype.listeners=function(a){return this._events&&this._events[a]?e(this._events[a])?[this._events[a]]:this._events[a].slice():[]},d.listenerCount=function(a,b){return a._events&&a._events[b]?e(a._events[b])?1:a._events[b].length:0}},{}],17:[function(a,b,c){c.read=function(a,b,c,d,e){var f,g,h=8*e-d-1,i=(1<>1,k=-7,l=c?e-1:0,m=c?-1:1,n=a[b+l];for(l+=m,f=n&(1<<-k)-1,n>>=-k,k+=h;k>0;f=256*f+a[b+l],l+=m,k-=8);for(g=f&(1<<-k)-1,f>>=-k,k+=d;k>0;g=256*g+a[b+l],l+=m,k-=8);if(0===f)f=1-j;else{if(f===i)return g?NaN:1/0*(n?-1:1);g+=Math.pow(2,d),f-=j}return(n?-1:1)*g*Math.pow(2,f-d)},c.write=function(a,b,c,d,e,f){var g,h,i,j=8*f-e-1,k=(1<>1,m=23===e?Math.pow(2,-24)-Math.pow(2,-77):0,n=d?0:f-1,o=d?1:-1,p=b<0||0===b&&1/b<0?1:0;for(b=Math.abs(b),isNaN(b)||b===1/0?(h=isNaN(b)?1:0,g=k):(g=Math.floor(Math.log(b)/Math.LN2),b*(i=Math.pow(2,-g))<1&&(g--,i*=2),b+=g+l>=1?m/i:m*Math.pow(2,1-l),b*i>=2&&(g++,i/=2),g+l>=k?(h=0,g=k):g+l>=1?(h=(b*i-1)*Math.pow(2,e),g+=l):(h=b*Math.pow(2,l-1)*Math.pow(2,e),g=0));e>=8;a[c+n]=255&h,n+=o,h/=256,e-=8);for(g=g<0;a[c+n]=255&g,n+=o,g/=256,j-=8);a[c+n-o]|=128*p}},{}],18:[function(a,b,c){!function(a,b,c,d,e){function f(a){this.node=a}function g(){this.events=[],this.head=null,this.body=null}function h(){this.styling=null,this.layout=null}function i(){this.styles={}}function j(){this.id=null,this.styleAttrs=null,this.styleRefs=null}function k(){this.regions={}}function l(a){this.kind=a,this.begin=null,this.end=null,this.styleAttrs=null,this.regionID=null,this.sets=null,this.timeContainer=null}function m(){l.call(this,"body")}function n(){l.call(this,"div")}function o(){l.call(this,"p")}function p(){l.call(this,"span"),this.space=null}function q(){l.call(this,"span"),this.space=null,this.text=null}function r(){l.call(this,"br")}function s(){this.id=null,this.begin=null,this.end=null,this.styleAttrs=null,this.sets=null}function t(){this.begin=null,this.end=null,this.qname=null,this.value=null}function u(a){return a&&"xml:id"in a.attributes?a.attributes["xml:id"].value||null:null}function v(a){return a&&"region"in a.attributes?a.attributes.region.value:""}function w(a,b){var c=a&&"timeContainer"in a.attributes?a.attributes.timeContainer.value:null;return c&&"par"!==c?"seq"===c?"seq":(K(b,"Illegal value of timeContainer (assuming 'par')"),"par"):"par"}function x(a){return a&&"style"in a.attributes?a.attributes.style.value.split(" "):[]}function y(a,b){var c={};if(null!==a)for(var e in a.attributes){var f=a.attributes[e].uri+" "+a.attributes[e].local,g=d.byQName[f];if(void 0!==g){var h=g.parse(a.attributes[e].value);null!==h?(c[f]=h,g===d.byName.zIndex&&J(b,"zIndex attribute present but not used by IMSC1 since regions do not overlap")):K(b,"Cannot parse styling attribute "+f+" --\x3e "+a.attributes[e].value)}}return c}function z(a,b,c){for(var d in a.attributes)if(a.attributes[d].uri===b&&a.attributes[d].local===c)return a.attributes[d].value;return null}function A(a,b){var d=z(a,c.ns_ittp,"aspectRatio"),e=null;if(null!==d){var f=/(\d+) (\d+)/,g=f.exec(d);if(null!==g){var h=parseInt(g[1]),i=parseInt(g[2]);0!==h&&0!==i?e=h/i:K(b,"Illegal aspectRatio values (ignoring)")}else K(b,"Malformed aspectRatio attribute (ignoring)")}return e}function B(a,b){var d=z(a,c.ns_ttp,"cellResolution"),e=15,f=32;if(null!==d){var g=/(\d+) (\d+)/,h=g.exec(d);null!==h?(f=parseInt(h[1]),e=parseInt(h[2])):J(b,"Malformed cellResolution value (using initial value instead)")}return{w:f,h:e}}function C(a,b){var d,e=z(a,c.ns_ttp,"frameRate"),f=30;if(null!==e){d=/(\d+)/.exec(e),null!==d?f=parseInt(d[1]):J(b,"Malformed frame rate attribute (using initial value instead)")}
+var g=z(a,c.ns_ttp,"frameRateMultiplier"),h=1;if(null!==g){d=/(\d+) (\d+)/.exec(g),null!==d?h=parseInt(d[1])/parseInt(d[2]):J(b,"Malformed frame rate multiplier attribute (using initial value instead)")}var i=h*f,j=1,k=z(a,c.ns_ttp,"tickRate");if(null===k)null!==e&&(j=i);else{d=/(\d+)/.exec(k),null!==d?j=parseInt(d[1]):J(b,"Malformed tick rate attribute (using initial value instead)")}return{effectiveFrameRate:i,tickRate:j}}function D(a,b){var d=z(a,c.ns_tts,"extent");if(null===d)return null;var f=d.split(" ");if(2!==f.length)return J(b,"Malformed extent (ignoring)"),null;var g=e.parseLength(f[0]),h=e.parseLength(f[1]);return h&&g?{h:h,w:g}:(J(b,"Malformed extent values (ignoring)"),null)}function E(a,b,c){var d,e=/^(\d{2,}):(\d\d):(\d\d(?:\.\d+)?)$/,f=/^(\d{2,}):(\d\d):(\d\d)\:(\d{2,})$/,g=/^(\d+(?:\.\d+)?)f$/,h=/^(\d+(?:\.\d+)?)t$/,i=/^(\d+(?:\.\d+)?)ms$/,j=/^(\d+(?:\.\d+)?)s$/,k=/^(\d+(?:\.\d+)?)h$/,l=/^(\d+(?:\.\d+)?)m$/,m=null;return null!==(d=g.exec(c))?null!==b&&(m=parseFloat(d[1])/b):null!==(d=h.exec(c))?null!==a&&(m=parseFloat(d[1])/a):null!==(d=i.exec(c))?m=parseFloat(d[1])/1e3:null!==(d=j.exec(c))?m=parseFloat(d[1]):null!==(d=k.exec(c))?m=3600*parseFloat(d[1]):null!==(d=l.exec(c))?m=60*parseFloat(d[1]):null!==(d=e.exec(c))?m=3600*parseInt(d[1])+60*parseInt(d[2])+parseFloat(d[3]):null!==(d=f.exec(c))&&null!==b&&(m=3600*parseInt(d[1])+60*parseInt(d[2])+parseInt(d[3])+(null===d[4]?0:parseInt(d[4])/b)),m}function F(a,b,c,d){var e=b&&"seq"===b.timeContainer,f=0;c&&"begin"in c.attributes&&null===(f=E(a.tickRate,a.effectiveFrameRate,c.attributes.begin.value))&&(J(d,"Malformed begin value "+c.attributes.begin.value+" (using 0)"),f=0);var g=e?0:null;c&&"dur"in c.attributes&&null===(g=E(a.tickRate,a.effectiveFrameRate,c.attributes.dur.value))&&J(d,"Malformed dur value "+c.attributes.dur.value+" (ignoring)");var h=null;c&&"end"in c.attributes&&null===(h=E(a.tickRate,a.effectiveFrameRate,c.attributes.end.value))&&J(d,"Malformed end value (ignoring)");var i=0;if(b&&(i=e&&"contents"in b&&b.contents.length>0?b.contents[b.contents.length-1].end:b.begin||0),f+=i,null!==g)h=f+g;else{var j=b&&"end"in b?b.end:Number.POSITIVE_INFINITY;h=null!==h?h+i:j}return{begin:f,end:h}}function G(a,b,c){for(;b.styleRefs.length>0;){var d=b.styleRefs.pop();d in a.styles?(G(a,a.styles[d],c),I(a.styles[d].styleAttrs,b.styleAttrs)):K(c,"Non-existant style id referenced")}}function H(a,b,c,d){for(var e=b.length-1;e>=0;e--){var f=b[e];f in a.styles?I(a.styles[f].styleAttrs,c):K(d,"Non-existant style id referenced")}}function I(a,b){for(var c in a)c in b||(b[c]=a[c])}function J(a,b){if(a&&a.warn&&a.warn(b))throw b}function K(a,b){if(a&&a.error&&a.error(b))throw b}function L(a,b){throw a&&a.fatal&&a.fatal(b),b}function M(a,b){for(var c,d=0,e=a.length-1;d<=e;){c=Math.floor((d+e)/2);var f=a[c];if(fb))return{found:!0,index:c};e=c-1}}return{found:!1,index:d}}a.fromXML=function(a,d,e){var l=b.parser(!0,{xmlns:!0}),u=[],v=[],w=[],x=0,y=null;l.onclosetag=function(a){if(u[0]instanceof i)for(var b in u[0].styles)G(u[0],u[0].styles[b],d);else if(u[0]instanceof o||u[0]instanceof p){if(u[0].contents.length>1){var g,h=[u[0].contents[0]];for(g=1;g0&&e&&"onCloseTag"in e&&e.onCloseTag());w.shift(),v.shift(),u.shift()},l.ontext=function(a){if(void 0===u[0]);else if(u[0]instanceof p||u[0]instanceof o){var b=new q;b.initFromText(y,u[0],a,w[0],d),u[0].contents.push(b)}else u[0]instanceof f&&x>0&&e&&"onText"in e&&e.onText(a)},l.onopentag=function(a){var b=a.attributes["xml:space"];b?w.unshift(b.value):0===w.length?w.unshift("default"):w.unshift(w[0]);var l=a.attributes["xml:lang"];if(l?v.unshift(l.value):0===v.length?v.unshift(""):v.unshift(v[0]),a.uri===c.ns_tt)if("tt"===a.local)null!==y&&L("Two elements at ("+this.line+","+this.column+")"),y=new g,y.initFromNode(a,d),u.unshift(y);else if("head"===a.local)u[0]instanceof g||L("Parent of element is not at ("+this.line+","+this.column+")"),null!==y.head&&L("Second element at ("+this.line+","+this.column+")"),y.head=new h,u.unshift(y.head);else if("styling"===a.local)u[0]instanceof h||L("Parent of element is not at ("+this.line+","+this.column+")"),null!==y.head.styling&&L("Second element at ("+this.line+","+this.column+")"),y.head.styling=new i,u.unshift(y.head.styling);else if("style"===a.local){var q;u[0]instanceof i?(q=new j,q.initFromNode(a,d),q.id?y.head.styling.styles[q.id]=q:K("
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dzz/DPlayer/template/index.htm b/dzz/DPlayer/template/index.htm
new file mode 100644
index 0000000..a903a16
--- /dev/null
+++ b/dzz/DPlayer/template/index.htm
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dzz/appmanagement/index.php b/dzz/appmanagement/index.php
index c3dcc2e..59541b5 100644
--- a/dzz/appmanagement/index.php
+++ b/dzz/appmanagement/index.php
@@ -12,7 +12,173 @@ if(!defined('IN_DZZ')) {
$navtitle=lang('后台管理');
//管理权限进入
Hook::listen('adminlogin');
+$do = isset($_GET['do']) ? $_GET['do'] : '';
+if ($do == 'stats') {
+ $starttime=trim($_GET['starttime']);
+ $endtime=trim($_GET['endtime']);
+ $time=trim($_GET['time']) ? trim($_GET['time']) : 'day';
+ $operation=trim($_GET['operation']);
+ switch($time){
+ case 'month':
+ if(!$starttime){
+ $start=strtotime("-6 month",TIMESTAMP);
+ $starttime=dgmdate($start,'Y-m');
+ }
+ if(!$endtime){
+ $endtime=dgmdate(TIMESTAMP,'Y-m');
+ }
+ break;
+ case 'week':
+ if(!$starttime){
+ $start=strtotime("-12 week",TIMESTAMP);
+ }else{
+ $start=strtotime($starttime);
+ }
+ $stamp_l=strtotime("this Monday",$start);
+ $starttime=dgmdate($stamp_l,'Y-m-d');
+
+ if(!$endtime){
+ $end=TIMESTAMP;
+ }else{
+ $end=strtotime($endtime);
+ }
+ $endtime=dgmdate($end,'Y-m-d');
+ break;
+ case 'day':
+ if(!$starttime){
+ $start=strtotime("-12 day",TIMESTAMP);
+ $starttime=dgmdate($start,'Y-m-d');
+ }
+ if(!$endtime){
+ $endtime=dgmdate(TIMESTAMP,'Y-m-d');
+ }
+ break;
+
+ }
+ if($operation=='getdata'){
+ $data=getData($time,$starttime,$endtime);
+ // 构建返回的数据
+ $response = [
+ 'success' => true,
+ 'labels' => array_keys($data['total']),
+ 'datasets' => [
+ [
+ 'label' => "用户总数",
+ 'backgroundColor' => "#33cabb",
+ 'borderColor' => "#33cabb",
+ 'fill' => false,
+ 'data' => array_values($data['total'])
+ ],
+ [
+ 'label' => '新增用户',
+ 'fill' => false,
+ 'backgroundColor' => "#fa8734",
+ 'borderColor' => "#fa8734",
+ 'data' => array_values($data['add'])
+ ]
+ ]
+ ];
+ // 返回JSON数据
+ exit(json_encode($response));
+ }else{
+ include template('stats','lyear');
+ exit();
+ }
+} elseif ($do == 'systemcheck') {
+ define('ROOT_PATH', dirname(__FILE__));
+ $lang=array (
+ 'php_version_too_low' => 'php版本太低啦，请先升级php到5.3以上，建议使用php5.4及以上',
+ 'step_env_check_desc' => '环境以及文件目录权限检查',
+ 'advice_mysql_connect' => '请检查 mysql 模块是否正确加载',
+ 'advice_gethostbyname' => '是否 PHP 配置中禁止了 gethostbyname 函数。请联系空间商，确定开启了此项功能',
+ 'advice_file_get_contents' => '该函数需要 php.ini 中 allow_url_fopen 选项开启。请联系空间商，确定开启了此项功能',
+ 'advice_xml_parser_create' => '该函数需要 PHP 支持 XML。请联系空间商，确定开启了此项功能',
+ 'advice_fsockopen' => '该函数需要 php.ini 中 allow_url_fopen 选项开启。请联系空间商，确定开启了此项功能',
+ 'advice_pfsockopen' => '该函数需要 php.ini 中 allow_url_fopen 选项开启。请联系空间商，确定开启了此项功能',
+ 'advice_stream_socket_client' => '是否 PHP 配置中禁止了 stream_socket_client 函数',
+ 'advice_curl_init' => '是否 PHP 配置中禁止了 curl_init 函数',
+ 'advice_mysql' => '请检查 mysql 模块是否正确加载',
+ 'advice_fopen' => '该函数需要 php.ini 中 allow_url_fopen 选项开启。请联系空间商，确定开启了此项功能',
+ 'advice_xml' => '该函数需要 PHP 支持 XML。请联系空间商，确定开启了此项功能',
+ );
+ $filesock_items = array('fsockopen', 'pfsockopen', 'stream_socket_client');
+ $env_items = array
+ (
+ '操作系统' => array('c' => 'PHP_OS', 'r' => '不限制', 'b' => 'Linux'),
+ 'PHP 版本' => array('c' => 'PHP_VERSION', 'r' => '7+', 'b' => 'php7+'),
+ 'PHP 平台版本' => array('c' => 'PHP_INT_SIZE', 'r' => '32位(32位不支持2G以上文件上传下载)', 'b' => '64位'),
+ '附件上传' => array('r' => '不限制', 'b' => '50M'),
+ 'GD 库' => array('r' => '1.0', 'b' => '2.0'),
+ '磁盘空间' => array('r' => '50M', 'b' => '10G以上'),
+ 'MySQL数据库持续连接' => array('r' => '不限制', 'b' => '不限制'),
+ '域名' => array('r' => '不限制', 'b' => '不限制'),
+ '服务器端口' => array('r' => '不限制', 'b' => '不限制'),
+ '运行环境' => array('r' => '不限制', 'b' => '不限制'),
+ '网站根目录' => array('r' => '不限制', 'b' => '不限制'),
+ '执行时间限制' => array('r' => '不限制', 'b' => '不限制'),
+ );
+ foreach($env_items as $key => $item) {
+ if($key == 'PHP 版本') {
+ $env_items[$key]['current'] = PHP_VERSION;
+ } elseif($key == 'PHP 平台版本') {
+ $env_items[$key]['current'] = phpBuild64() ? 64 : 32;
+ } elseif($key == '附件上传') {
+ $env_items[$key]['current'] = @ini_get('file_uploads') ? ini_get('upload_max_filesize') : 'unknow';
+ } elseif($key == 'allow_url_fopen') {
+ $env_items[$key]['current'] = @ini_get('allow_url_fopen') ? ini_get('allow_url_fopen') : 'unknow';
+ } elseif($key == 'GD 库') {
+ $tmp = function_exists('gd_info') ? gd_info() : array();
+ $env_items[$key]['current'] = empty($tmp['GD Version']) ? 'noext' : $tmp['GD Version'];
+ unset($tmp);
+ } elseif($key == '磁盘空间') {
+ if(function_exists('disk_free_space')) {
+ $env_items[$key]['current'] = floor(disk_free_space(ROOT_PATH) / (1024*1024)).'M';
+ } else {
+ $env_items[$key]['current'] = 'unknow';
+ }
+ } elseif($key == 'PHP 平台版本') {
+ if (PHP_INT_SIZE === 4) {
+ $env_items[$key]['current'] ='32位';
+ } else if (PHP_INT_SIZE === 8) {
+ $env_items[$key]['current'] ='64位';
+ } else {
+ $env_items[$key]['current'] ='无法确定架构类型';
+ }
+ }elseif($key == 'MySQL数据库持续连接') {
+ $env_items[$key]['current'] = @get_cfg_var("mysql.allow_persistent")?"是 ":"否";
+ } elseif($key == '域名') {
+ $env_items[$key]['current'] = GetHostByName($_SERVER['SERVER_NAME']);
+ } elseif($key == '服务器端口') {
+ $env_items[$key]['current'] = $_SERVER['SERVER_PORT'];
+ } elseif($key == '运行环境') {
+ $env_items[$key]['current'] = $_SERVER["SERVER_SOFTWARE"];
+ } elseif($key == '网站根目录') {
+ $env_items[$key]['current'] = $_SERVER["DOCUMENT_ROOT"];
+ } elseif($key == '执行时间限制') {
+ $env_items[$key]['current'] = ini_get('max_execution_time').'秒';
+ }
+ elseif(isset($item['c'])) {
+ $env_items[$key]['current'] = constant($item['c']);
+ }
+ $env_items[$key]['status'] = 1;
+ if($item['r'] != 'notset' && strcmp($env_items[$key]['current'], $item['r']) < 0) {
+ $env_items[$key]['status'] = 0;
+ }
+ }
+ $env_str = '';
+ foreach($env_items as $key => $item) {
+ $status = 1;
+ $env_str .= "\n";
+ $env_str .= "$key \n";
+ $env_str .= "$item[r] \n";
+ $env_str .= "$item[b] \n";
+ $env_str .= ($status ? "" : " ").$item['current']." \n";
+ $env_str .= " \n";
+ }
+ include template('systemcheck','lyear');
+ exit();
+}
$appdata=DB::fetch_all("select appname,appico,appurl,identifier from %t where `group`=3 and isshow>0 and `available`>0",array('app_market'));
$data=array();
foreach($appdata as $k => $v){
@@ -23,4 +189,119 @@ foreach($appdata as $k => $v){
$v['url']=replace_canshu($v['appurl']);
$data[]=$v;
}
-include template('main');
\ No newline at end of file
+if (isset($_G['setting']['template']) && $_G['setting']['template'] === 'lyear') {
+ $zaixianrenshu = C::app()->session->count(1);
+ $yonghurenshu = DB::result_first("SELECT COUNT(*) FROM " . DB::table('user') . " WHERE uid");
+ $tingyongrenshu = DB::result_first("SELECT COUNT(*) FROM " . DB::table('user') . " WHERE status");
+ $wenjiangeshu = DB::result_first("SELECT COUNT(*) FROM " . DB::table('attachment') . " WHERE aid");
+ $kongjianshiyong=formatsize(DB::result_first("SELECT SUM(filesize) FROM ".DB::table('attachment')));
+ $version = 'V'.CORE_VERSION;//版本信息
+ $RELEASE = CORE_RELEASE;
+ $currentHour = date('G');
+ if ($currentHour >= 5 && $currentHour < 12) {
+ $greeting = "早上好";
+ } elseif ($currentHour >= 12 && $currentHour < 18) {
+ $greeting = "下午好";
+ } elseif ($currentHour >= 18 || $currentHour < 5) {
+ $greeting = "晚上好";
+ }
+ $userstatus = C::t('user_status')->fetch($_G['uid']);
+ $weekdays = ['日', '一', '二', '三', '四', '五', '六'];
+ $dateI = date('w');
+ $dateInfo = date('Y-n-j H:i') . ' 星期' . $weekdays[$dateI];
+}
+include template('main');
+function phpBuild64(){
+ if(PHP_INT_SIZE === 8) return true;//部分版本,64位会返回4;
+ ob_clean();
+ ob_start();
+ var_dump(12345678900);
+ $res = ob_get_clean();
+ if(strstr($res,'float')) return false;
+ return true;
+}
+function getData($time,$starttime,$endtime){
+
+ $endtime=strtotime($endtime);
+ $data=array('total'=>array(),
+ 'add'=>array(),
+ 'total_d'=>array(),
+ 'add_d'=>array(),
+ );
+ switch($time){
+ case 'month':
+ $stamp=strtotime($starttime);
+ $arr=getdate($stamp);
+ $key=$arr['year'].'-'.$arr['mon'];
+ $low=strtotime($key);
+ $up=strtotime('+1 month',$low);
+ $ltotal=$data['total'][$key]=DB::result_first("select COUNT(*) from %t where regdate<%d",array('user',$up));
+ $data['add'][$key]=DB::result_first("select COUNT(*) from %t where regdate<%d and regdate>=%d",array('user',$up,$low));
+ $ltotal+=$data['add'][$key];
+ while($up<=$endtime){
+ $key=dgmdate($up,'Y-m');
+ $low=strtotime($key);
+ $up=strtotime('+1 month',$low);
+ $data['add'][$key]=DB::result_first("select COUNT(*) from %t where regdate<%d and regdate>=%d",array('user',$up,$low));
+ $ltotal+=$data['add'][$key];
+ $data['total'][$key]=$ltotal;
+ }
+ break;
+ case 'week':
+ $stamp=strtotime($starttime);
+ $arr=getdate($stamp);
+ $low=strtotime('+'.(1-$arr['wday']).' day',$stamp);
+ $up=strtotime('+1 week',$low);
+ $key=dgmdate($low,'m-d').'~'.dgmdate($up-60*60*24,'m-d');
+ $ltotal=$data['total'][$key]=DB::result_first("select COUNT(*) from %t where regdate<%d",array('user',$up));
+ $data['add'][$key]=DB::result_first("select COUNT(*) from %t where regdate<%d and regdate>=%d",array('user',$up,$low));
+ $ltotal+=$data['add'][$key];
+ while($up<$endtime){
+ $low=$up;
+ $up=strtotime('+1 week',$low);
+ $key=dgmdate($low,'m-d').'~'.dgmdate($up-60*60*24,'m-d');
+ $data['add'][$key]=DB::result_first("select COUNT(*) from %t where regdate<%d and regdate>=%d",array('user',$up,$low));
+ $ltotal+=$data['add'][$key];
+ $data['total'][$key]=$ltotal;
+ }
+ break;
+ case 'day':
+ $low=strtotime($starttime);//strtotime('+'.(1-$arr['hours']).' day',$stamp);
+ $up=$low+24*60*60;
+ $key=dgmdate($low,'Y-m-d');
+ $ltotal=$data['total'][$key]=DB::result_first("select COUNT(*) from %t where regdate<%d",array('user',$up));
+ $data['add'][$key]=DB::result_first("select COUNT(*) from %t where regdate<%d and regdate>=%d",array('user',$up,$low));
+ $ltotal+=$data['add'][$key];
+ while($up<=$endtime){
+ $low=$up;
+ $up=strtotime('+1 day',$low);
+ $key=dgmdate($low,'Y-m-d');
+ $data['add'][$key]=DB::result_first("select COUNT(*) from %t where regdate<%d and regdate>=%d",array('user',$up,$low));
+ $ltotal+=$data['add'][$key];
+ $data['total'][$key]=$ltotal;
+ }
+ break;
+ case 'all':
+ $min=DB::result_first("select min(regdate) from %t where regdate>0",array('user'));
+ $min-=60;
+ $max=TIMESTAMP+60*60*8;
+ $days=($max-$min)/(60*60*24);
+ if($days<20){
+ $time='day';
+ $starttime=gmdate('Y-m-d',$min);
+ $endtime=gmdate('Y-m-d',$max);
+ }elseif($days<70){
+ $time='week';
+ $starttime=gmdate('Y-m-d',$min);
+ $endtime=gmdate('Y-m-d',$max);
+ }else{
+ $time='month';
+ $starttime=gmdate('Y-m',$min);
+ $endtime=gmdate('Y-m',$max);
+ }
+ $data=getData($time,$starttime,$endtime);
+ break;
+ }
+
+ return $data;
+}
\ No newline at end of file
diff --git a/dzz/appmanagement/template/lyear/lyear_left.htm b/dzz/appmanagement/template/lyear/lyear_left.htm
new file mode 100644
index 0000000..830791a
--- /dev/null
+++ b/dzz/appmanagement/template/lyear/lyear_left.htm
@@ -0,0 +1,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/dzz/appmanagement/template/lyear/stats.htm b/dzz/appmanagement/template/lyear/stats.htm
new file mode 100644
index 0000000..5ac633b
--- /dev/null
+++ b/dzz/appmanagement/template/lyear/stats.htm
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
Powered By DzzOffice V{eval echo CORE_VERSION} + +
$_G[setting][sitebeian] + \ No newline at end of file diff --git a/core/template/lyear/common/footer.htm b/core/template/lyear/common/footer.htm new file mode 100644 index 0000000..c02428c --- /dev/null +++ b/core/template/lyear/common/footer.htm @@ -0,0 +1,9 @@ + + + + + + + diff --git a/core/template/lyear/common/footer_simple.htm b/core/template/lyear/common/footer_simple.htm new file mode 100644 index 0000000..27f3b48 --- /dev/null +++ b/core/template/lyear/common/footer_simple.htm @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + $_G['setting']['statcode'] + + + + + + + + + \ No newline at end of file diff --git a/core/template/lyear/common/header_common.htm b/core/template/lyear/common/header_common.htm new file mode 100644 index 0000000..287dbf0 --- /dev/null +++ b/core/template/lyear/common/header_common.htm @@ -0,0 +1,27 @@ + + + + + + +<!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G[setting][sitename]
+
+
+
+
+
+
+
+
+
+ $_G['setting']['sitename']
+ <!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G[setting][sitename]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ data-theme="$_G['cookie']['the_site_theme']" data-sidebarbg="$_G['cookie']['the_sidebar_bg']" data-headerbg="$_G['cookie']['the_header_bg']" data-logobg="$_G['cookie']['the_logo_bg']">
+
+
\ No newline at end of file
diff --git a/core/template/lyear/common/header_simple_end.htm b/core/template/lyear/common/header_simple_end.htm
new file mode 100644
index 0000000..e86661c
--- /dev/null
+++ b/core/template/lyear/common/header_simple_end.htm
@@ -0,0 +1,248 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/template/lyear/common/header_simple_noleft_end.htm b/core/template/lyear/common/header_simple_noleft_end.htm
new file mode 100644
index 0000000..c7913b5
--- /dev/null
+++ b/core/template/lyear/common/header_simple_noleft_end.htm
@@ -0,0 +1,233 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/template/lyear/common/header_simple_start.htm b/core/template/lyear/common/header_simple_start.htm
new file mode 100644
index 0000000..85a36e6
--- /dev/null
+++ b/core/template/lyear/common/header_simple_start.htm
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+ <!--{if !empty($navtitle)}-->$navtitle - <!--{/if}-->$_G[setting][sitename]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/template/lyear/common/lyear_about.htm b/core/template/lyear/common/lyear_about.htm
new file mode 100644
index 0000000..2597d44
--- /dev/null
+++ b/core/template/lyear/common/lyear_about.htm
@@ -0,0 +1,51 @@
+
+
+", $sectpl) : array('',': ','','');
+ $sectpldefault = $sectpl;
+ $sectplqaa = str_replace('', 'qaa'.$sechash, $sectpldefault);
+ $sectplcode = str_replace('', 'code'.$sechash, $sectpldefault);
+ $secshow = !isset($secshow) ? 1 : $secshow;
+ $sectabindex = !isset($sectabindex) ? 1 : $sectabindex;
+}
+
+
+
+
+
+
+
+
+
+
+$seccheckhtml
\ No newline at end of file
diff --git a/core/template/lyear/common/showmessage.htm b/core/template/lyear/common/showmessage.htm
new file mode 100644
index 0000000..3fa4fe4
--- /dev/null
+++ b/core/template/lyear/common/showmessage.htm
@@ -0,0 +1,90 @@
+
+{eval $lyeartheme=true}
+
+
\n\n
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/core/template/lyear/common/copyright.htm b/core/template/lyear/common/copyright.htm
new file mode 100644
index 0000000..3129910
--- /dev/null
+++ b/core/template/lyear/common/copyright.htm
@@ -0,0 +1,4 @@
+Copyright © 2012-{eval echo dgmdate(TIMESTAMP,'Y');} www.dzzoffice.com All Rights Reserved
-
-
-
-
-
-
- 
-
- 
-
-
-
-
-
-
-
-
-
- $show_message
- - - - - - - - - - -
-
-
- {lang board_message}
-
-
-
-$show_message
-
+
+$show_message
-
+
+
+
+
+
+
+
+
+
+
+ :'static/image/common/logo.png';}<!--{else}-->static/image/common/logo.png<!--{/if}-->)
+
+
+
+
+ $show_message
+ + + + + + + + + + +
+
+
+{lang board_message}
+
+
+
+$show_message
+
+ $show_message
+Powered By DzzOffice V{eval echo CORE_VERSION} + +
$_G[setting][sitebeian] + \ No newline at end of file diff --git a/core/template/lyear/common/footer.htm b/core/template/lyear/common/footer.htm new file mode 100644 index 0000000..c02428c --- /dev/null +++ b/core/template/lyear/common/footer.htm @@ -0,0 +1,9 @@ + + + + + + + diff --git a/core/template/lyear/common/footer_simple.htm b/core/template/lyear/common/footer_simple.htm new file mode 100644 index 0000000..27f3b48 --- /dev/null +++ b/core/template/lyear/common/footer_simple.htm @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + $_G['setting']['statcode'] + + + + + + + + + \ No newline at end of file diff --git a/core/template/lyear/common/header_common.htm b/core/template/lyear/common/header_common.htm new file mode 100644 index 0000000..287dbf0 --- /dev/null +++ b/core/template/lyear/common/header_common.htm @@ -0,0 +1,27 @@ + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+ $_G['setting']['sitename']
+
+
+
+
+
+
+
+
+ + $about['name_zh'] + + + $about['name_en'] + +
+ ++ 应用版本： $about['version'] +
+ ++ Dzz{lang version}：{lang community_edition} $version +
++ {lang license}：AGPL V3 {lang public_license} +
++ {lang service_and_support}：www.dzzoffice.com +
+
+ Copyright ©2012-{eval echo dgmdate(TIMESTAMP,'Y');} DzzOffice All Rights Reserved
+
+
$_G[setting][sitebeian] + +
+
\ No newline at end of file
diff --git a/core/template/lyear/common/lyear_header_left.htm b/core/template/lyear/common/lyear_header_left.htm
new file mode 100644
index 0000000..9679042
--- /dev/null
+++ b/core/template/lyear/common/lyear_header_left.htm
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git a/core/template/lyear/common/lyear_header_right.htm b/core/template/lyear/common/lyear_header_right.htm
new file mode 100644
index 0000000..1ccb857
--- /dev/null
+++ b/core/template/lyear/common/lyear_header_right.htm
@@ -0,0 +1,10 @@
+
+
+$_G[setting][sitebeian] + +
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/template/lyear/common/seccheck.htm b/core/template/lyear/common/seccheck.htm
new file mode 100644
index 0000000..c46910d
--- /dev/null
+++ b/core/template/lyear/common/seccheck.htm
@@ -0,0 +1,32 @@
+{eval
+ $_G['sechashi'] = !empty($_G['cookie']['sechashi']) ? $_G['sechash'] + 1 : 0;
+ $sechash = 'S'.($_G['inajax'] ? 'A' : '').$_G['sid'].$_G['sechashi'];
+ $sectpl = !empty($sectpl) ? explode("
+
+
+
+
+
+
\ No newline at end of file
diff --git a/data/attachment/appico/201712/21/123754pb0s666i6sjws1jc.png b/data/attachment/appico/202411/02/170040bgapsjg4pt4nuee4.png
similarity index 51%
rename from data/attachment/appico/201712/21/123754pb0s666i6sjws1jc.png
rename to data/attachment/appico/202411/02/170040bgapsjg4pt4nuee4.png
index aeb9521b57b0a7d2c9db1a88cfb82446a807da0d..054f08f402c28516ce919c3c75fde97de2a60f3d 100644
GIT binary patch
delta 5970
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
delta 11041
zcmb_?byQT}!uHHCLw7d=lEO&C&_hUwq?A%amvo5KnIQxubp%0DL{dUpBnD7Q6eR@7
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
BPKE#g
literal 0
HcmV?d00001
diff --git a/data/attachment/appico/202411/02/184008xbuvo0sh8y1xey8f.png b/data/attachment/appico/202411/02/184008xbuvo0sh8y1xey8f.png
new file mode 100644
index 0000000000000000000000000000000000000000..46a74d08edc99edb00aa306dc6c06695b41202e1
GIT binary patch
literal 13040
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,
+ 'about'=>array('name_en'=>'DPlayer',
+ 'version'=>'V1.2 小胡(gitee.com/xiaohu2024)')
+);
\ No newline at end of file
diff --git a/dzz/DPlayer/config/index.htm b/dzz/DPlayer/config/index.htm
new file mode 100644
index 0000000..e69de29
diff --git a/dzz/DPlayer/dzz_app_DPlayer.xml b/dzz/DPlayer/dzz_app_DPlayer.xml
new file mode 100644
index 0000000..75718d5
--- /dev/null
+++ b/dzz/DPlayer/dzz_app_DPlayer.xml
@@ -0,0 +1,34 @@
+
+
+
\ No newline at end of file
diff --git a/dzz/DPlayer/images/DPlayer.min.js b/dzz/DPlayer/images/DPlayer.min.js
new file mode 100644
index 0000000..700f5b1
--- /dev/null
+++ b/dzz/DPlayer/images/DPlayer.min.js
@@ -0,0 +1 @@
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("DPlayer",[],t):"object"==typeof exports?exports.DPlayer=t():e.DPlayer=t()}(window,(function(){return function(e){var t={};function a(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,a),o.l=!0,o.exports}return a.m=e,a.c=t,a.d=function(e,t,n){a.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,t){if(1&t&&(e=a(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(a.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)a.d(n,o,function(t){return e[t]}.bind(null,o));return n},a.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(t,"a",t),t},a.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},a.p="/",a(a.s=58)}([function(e,t,a){"use strict";function n(e){return(n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}var o=a(6),r=Object.prototype.toString;function i(e){return"[object Array]"===r.call(e)}function l(e){return void 0===e}function s(e){return null!==e&&"object"===n(e)}function d(e){return"[object Function]"===r.call(e)}function p(e,t){if(null!=e)if("object"!==n(e)&&(e=[e]),i(e))for(var a=0,o=e.length;a\n ",a&&(t+='\n \n '),t+="\n"}},function(e,t,a){e.exports=a(41)},function(e,t,a){"use strict";e.exports=function(e){var t=[];return t.toString=function(){return this.map((function(t){var a=function(e,t){var a=e[1]||"",n=e[3];if(!n)return a;if(t&&"function"==typeof btoa){var o=(i=n,l=btoa(unescape(encodeURIComponent(JSON.stringify(i)))),s="sourceMappingURL=data:application/json;charset=utf-8;base64,".concat(l),"/*# ".concat(s," */")),r=n.sources.map((function(e){return"/*# sourceURL=".concat(n.sourceRoot||"").concat(e," */")}));return[a].concat(r).concat([o]).join("\n")}var i,l,s;return[a].join("\n")}(t,e);return t[2]?"@media ".concat(t[2]," {").concat(a,"}"):a})).join("")},t.i=function(e,a,n){"string"==typeof e&&(e=[[null,e,""]]);var o={};if(n)for(var r=0;r1)for(var a=1;a=200&&e<300}};s.headers={common:{Accept:"application/json, text/plain, */*"}},n.forEach(["delete","get","head"],(function(e){s.headers[e]={}})),n.forEach(["post","put","patch"],(function(e){s.headers[e]=n.merge(r)})),e.exports=s}).call(this,a(5))},function(e,t,a){"use strict";var n=a(0),o=a(47),r=a(7),i=a(49),l=a(52),s=a(53),d=a(11);e.exports=function(e){return new Promise((function(t,p){var c=e.data,u=e.headers;n.isFormData(c)&&delete u["Content-Type"];var y=new XMLHttpRequest;if(e.auth){var h=e.auth.username||"",m=e.auth.password||"";u.Authorization="Basic "+btoa(h+":"+m)}var f=i(e.baseURL,e.url);if(y.open(e.method.toUpperCase(),r(f,e.params,e.paramsSerializer),!0),y.timeout=e.timeout,y.onreadystatechange=function(){if(y&&4===y.readyState&&(0!==y.status||y.responseURL&&0===y.responseURL.indexOf("file:"))){var a="getAllResponseHeaders"in y?l(y.getAllResponseHeaders()):null,n={data:e.responseType&&"text"!==e.responseType?y.response:y.responseText,status:y.status,statusText:y.statusText,headers:a,config:e,request:y};o(t,p,n),y=null}},y.onabort=function(){y&&(p(d("Request aborted",e,"ECONNABORTED",y)),y=null)},y.onerror=function(){p(d("Network Error",e,null,y)),y=null},y.ontimeout=function(){var t="timeout of "+e.timeout+"ms exceeded";e.timeoutErrorMessage&&(t=e.timeoutErrorMessage),p(d(t,e,"ECONNABORTED",y)),y=null},n.isStandardBrowserEnv()){var v=a(54),b=(e.withCredentials||s(f))&&e.xsrfCookieName?v.read(e.xsrfCookieName):void 0;b&&(u[e.xsrfHeaderName]=b)}if("setRequestHeader"in y&&n.forEach(u,(function(e,t){void 0===c&&"content-type"===t.toLowerCase()?delete u[t]:y.setRequestHeader(t,e)})),n.isUndefined(e.withCredentials)||(y.withCredentials=!!e.withCredentials),e.responseType)try{y.responseType=e.responseType}catch(t){if("json"!==e.responseType)throw t}"function"==typeof e.onDownloadProgress&&y.addEventListener("progress",e.onDownloadProgress),"function"==typeof e.onUploadProgress&&y.upload&&y.upload.addEventListener("progress",e.onUploadProgress),e.cancelToken&&e.cancelToken.promise.then((function(e){y&&(y.abort(),p(e),y=null)})),void 0===c&&(c=null),y.send(c)}))}},function(e,t,a){"use strict";var n=a(48);e.exports=function(e,t,a,o,r){var i=new Error(e);return n(i,t,a,o,r)}},function(e,t,a){"use strict";var n=a(0);e.exports=function(e,t){t=t||{};var a={},o=["url","method","params","data"],r=["headers","auth","proxy"],i=["baseURL","url","transformRequest","transformResponse","paramsSerializer","timeout","withCredentials","adapter","responseType","xsrfCookieName","xsrfHeaderName","onUploadProgress","onDownloadProgress","maxContentLength","validateStatus","maxRedirects","httpAgent","httpsAgent","cancelToken","socketPath"];n.forEach(o,(function(e){void 0!==t[e]&&(a[e]=t[e])})),n.forEach(r,(function(o){n.isObject(t[o])?a[o]=n.deepMerge(e[o],t[o]):void 0!==t[o]?a[o]=t[o]:n.isObject(e[o])?a[o]=n.deepMerge(e[o]):void 0!==e[o]&&(a[o]=e[o])})),n.forEach(i,(function(n){void 0!==t[n]?a[n]=t[n]:void 0!==e[n]&&(a[n]=e[n])}));var l=o.concat(r).concat(i),s=Object.keys(t).filter((function(e){return-1===l.indexOf(e)}));return n.forEach(s,(function(n){void 0!==t[n]?a[n]=t[n]:void 0!==e[n]&&(a[n]=e[n])})),a}},function(e,t,a){"use strict";function n(e){this.message=e}n.prototype.toString=function(){return"Cancel"+(this.message?": "+this.message:"")},n.prototype.__CANCEL__=!0,e.exports=n},function(e,t,a){"use strict";e.exports=a(57)},function(e,t,a){"use strict";(function(e){var n=a(16);function o(e){return(o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}var r=setTimeout;function i(e){return Boolean(e&&void 0!==e.length)}function l(){}function s(e){if(!(this instanceof s))throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._state=0,this._handled=!1,this._value=void 0,this._deferreds=[],h(e,this)}function d(e,t){for(;3===e._state;)e=e._value;0!==e._state?(e._handled=!0,s._immediateFn((function(){var a=1===e._state?t.onFulfilled:t.onRejected;if(null!==a){var n;try{n=a(e._value)}catch(e){return void c(t.promise,e)}p(t.promise,n)}else(1===e._state?p:c)(t.promise,e._value)}))):e._deferreds.push(t)}function p(e,t){try{if(t===e)throw new TypeError("A promise cannot be resolved with itself.");if(t&&("object"===o(t)||"function"==typeof t)){var a=t.then;if(t instanceof s)return e._state=3,e._value=t,void u(e);if("function"==typeof a)return void h((n=a,r=t,function(){n.apply(r,arguments)}),e)}e._state=1,e._value=t,u(e)}catch(t){c(e,t)}var n,r}function c(e,t){e._state=2,e._value=t,u(e)}function u(e){2===e._state&&0===e._deferreds.length&&s._immediateFn((function(){e._handled||s._unhandledRejectionFn(e._value)}));for(var t=0,a=e._deferreds.length;t\n
\n '),t+='\n
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/template/lyear/common/showtips.htm b/core/template/lyear/common/showtips.htm
new file mode 100644
index 0000000..3455061
--- /dev/null
+++ b/core/template/lyear/common/showtips.htm
@@ -0,0 +1,4 @@
+
+{$lang}
+
+
\ No newline at end of file
diff --git a/core/template/lyear/dzz_style_lyear.xml b/core/template/lyear/dzz_style_lyear.xml
new file mode 100644
index 0000000..8298187
--- /dev/null
+++ b/core/template/lyear/dzz_style_lyear.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $show_message
+ + + + + + + + + + +
+
+{lang board_message}
+ +
+
+
+$show_message
+
+ $show_message
+\n \n
\n \n \n \n ',i.danmaku&&(t+='\n ',t+=l(s("Danmaku is loading")),t+="\n "),t+='\n \n
\n\n \n \n \n \n
\n\n
\n\n\n"}},function(e,t,a){var n=a(36),o=a(37);"string"==typeof(o=o.__esModule?o.default:o)&&(o=[[e.i,o,""]]);var r={insert:"head",singleton:!1};n(o,r);e.exports=o.locals||{}},function(e,t,a){"use strict";var n,o=function(){return void 0===n&&(n=Boolean(window&&document&&document.all&&!window.atob)),n},r=function(){var e={};return function(t){if(void 0===e[t]){var a=document.querySelector(t);if(window.HTMLIFrameElement&&a instanceof window.HTMLIFrameElement)try{a=a.contentDocument.head}catch(e){a=null}e[t]=a}return e[t]}}(),i=[];function l(e){for(var t=-1,a=0;a[x]
\n \n Player version\n \n
\n \n Player FPS\n \n
\n \n Video type\n \n
\n \n Video url\n \n
\n \n Video resolution\n \n
\n \n Video duration\n \n
\n ',i.danmaku&&(t+='\n \n Danmaku id\n \n
\n \n Danmaku api\n \n
\n \n Danmaku amount\n \n
\n '),t+='\n-
+
+
+
+
+
+
+
+
+
+
+
+ {$_G['username']}，{$greeting}
+
+ 登录时间：，当前时间：{$dateInfo}
+
+
+
+
+ 环境检查
+
+
+ 开始检查
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dzz/appmanagement/template/lyear/systemcheck.htm b/dzz/appmanagement/template/lyear/systemcheck.htm
new file mode 100644
index 0000000..c06da2b
--- /dev/null
+++ b/dzz/appmanagement/template/lyear/systemcheck.htm
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+ 从
+
+ 至
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dzz/class/class_UploadHandler.php b/dzz/class/class_UploadHandler.php
index 1678cdc..5fc9197 100644
--- a/dzz/class/class_UploadHandler.php
+++ b/dzz/class/class_UploadHandler.php
@@ -458,6 +458,8 @@ class UploadHandler
return 'image/jpeg';
case 'png':
return 'image/png';
+ case 'webp':
+ return 'image/webp';
case 'gif':
return 'image/gif';
default:
diff --git a/dzz/class/class_json.php b/dzz/class/class_json.php
index 0cddbdd..5d7dd98 100644
--- a/dzz/class/class_json.php
+++ b/dzz/class/class_json.php
@@ -153,7 +153,7 @@ class Services_JSON
return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
}
- $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+ $bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
switch(true) {
case ((0x7F & $bytes) == $bytes):
@@ -206,17 +206,17 @@ class Services_JSON
case 2:
// return a UTF-16 character from a 2-byte UTF-8 char
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr(0x07 & (ord($utf8{0}) >> 2))
- . chr((0xC0 & (ord($utf8{0}) << 6))
- | (0x3F & ord($utf8{1})));
+ return chr(0x07 & (ord($utf8[0]) >> 2))
+ . chr((0xC0 & (ord($utf8[0]) << 6))
+ | (0x3F & ord($utf8[1])));
case 3:
// return a UTF-16 character from a 3-byte UTF-8 char
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
- return chr((0xF0 & (ord($utf8{0}) << 4))
- | (0x0F & (ord($utf8{1}) >> 2)))
- . chr((0xC0 & (ord($utf8{1}) << 6))
- | (0x7F & ord($utf8{2})));
+ return chr((0xF0 & (ord($utf8[0]) << 4))
+ | (0x0F & (ord($utf8[1]) >> 2)))
+ . chr((0xC0 & (ord($utf8[1]) << 6))
+ | (0x7F & ord($utf8[2])));
}
// ignoring UTF-32 for now, sorry
@@ -610,7 +610,7 @@ class Services_JSON
} elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
// array, or object notation
- if ($str{0} == '[') {
+ if ($str[0] == '[') {
$stk = array(SERVICES_JSON_IN_ARR);
$arr = array();
} else {
diff --git a/dzz/comment/ajax.php b/dzz/comment/ajax.php
index 4c8c075..2c6b680 100644
--- a/dzz/comment/ajax.php
+++ b/dzz/comment/ajax.php
@@ -12,13 +12,11 @@ if (!defined('IN_DZZ')) {
}
include libfile('function/code');
-$do = trim($_GET['do']);
+$do = isset($_GET['do']) ? $_GET['do'] : '';
+$template = isset($_GET['template']) ? $_GET['template'] : '';
$guests = array('getcomment', 'getThread', 'getNewThreads', 'getReply', 'getReplys', 'getUserToJson');
if (empty($_G['uid']) && !in_array($do, $guests)) {
include template('common/header_ajax');
- /*echo ""; */
echo ' '.lang('login').'';
if( $_G['setting']['regstatus']>0){
echo ' '.lang('register').'';
@@ -54,9 +52,12 @@ if (submitcheck('replysubmit')) {
$setarr['avatar']=avatar_block($setarr['authorid']);
if ($_G['adminid'] == 1 || $_G['uid'] == $setarr['authorid'])
$setarr['haveperm'] = 1;
- showmessage('do_success', DZZSCRIPT . '?mod=comment', array('data' => rawurlencode(json_encode($setarr))));
+ showmessage('comment_success', DZZSCRIPT . '?mod=comment', array('data' => rawurlencode(json_encode($setarr))));
} elseif ($do == 'edit') {
$cid = intval($_GET['cid']);
+ if(!$cid) {
+ exit('Access Denied');
+ }
if ($data = C::t('comment') -> fetch($cid)) {
$data['message'] = dzzcode($data['message'], 0, 0, 0, 0, 1);
if (!$_G['adminid'] == 1 && $_G['uid'] != $data['authorid'])
@@ -90,14 +91,17 @@ if (submitcheck('replysubmit')) {
}
} elseif ($do == 'getcomment') {
-
$id = getstr($_GET['id'], 60);
$idtype = trim($_GET['idtype']);
+ if(!$id || !$idtype) {
+ exit('Access Denied');
+ }
+ $modal = intval($_GET['modal']);
$page = empty($_GET['page']) ? 1 : intval($_GET['page']);
$perpage = 10;
$start = ($page - 1) * $perpage;
$limit = $start . "-" . $perpage;
- $gets = array('mod' => 'comment', 'op' => 'ajax', 'do' => 'getcomment', 'id' => $id, 'idtype' => $idtype, );
+ $gets = array('mod' => 'comment', 'op' => 'ajax','template'=> $template, 'do' => 'getcomment', 'id' => $id, 'idtype' => $idtype, 'modal' => $modal);
$theurl = BASESCRIPT . "?" . url_implode($gets);
$count = C::t('comment') -> fetch_all_by_idtype($id, $idtype, $limit, true);
$list = array();
@@ -107,7 +111,10 @@ if (submitcheck('replysubmit')) {
$multi = multi($count, $perpage, $page, $theurl, 'pull-right');
} elseif ($do == 'getcommentbycid') {
$cid = intval($_GET['cid']);
-
+ if(!$cid) {
+ exit('Access Denied');
+ }
+ $modal = intval($_GET['modal']);
if ($value = C::t('comment') -> fetch($cid)) {
$value['message'] = dzzcode($value['message']);
$value['dateline'] = dgmdate($value['dateline'], 'u');
@@ -118,7 +125,6 @@ if (submitcheck('replysubmit')) {
}
$value['replies'] = DB::result_first("select COUNT(*) from %t where pcid=%d", array('comment', $value['cid']));
$value['replys'] = C::t('comment') -> fetch_all_by_pcid($value['cid'], 5);
-
}
} elseif ($do == 'getreplys') {
$cid = intval($_GET['cid']);
@@ -198,6 +204,9 @@ function atreplacement($matches) {
}
}
}
-
-include template('ajax');
+if ($template == '1') {
+ include template('lyear_ajax','lyear');
+} else {
+ include template('ajax');
+}
?>
diff --git a/dzz/comment/config/config.php b/dzz/comment/config/config.php
new file mode 100644
index 0000000..a6c8efc
--- /dev/null
+++ b/dzz/comment/config/config.php
@@ -0,0 +1,6 @@
+false,
+ 'about'=>array('name_en'=>'评论管理',
+ 'version'=>'V2.0')
+);
\ No newline at end of file
diff --git a/dzz/comment/config/index.htm b/dzz/comment/config/index.htm
new file mode 100644
index 0000000..e69de29
diff --git a/dzz/comment/images/comment.css b/dzz/comment/images/comment.css
index b36e736..6016a68 100644
--- a/dzz/comment/images/comment.css
+++ b/dzz/comment/images/comment.css
@@ -407,26 +407,6 @@ a.ui-artZoom-hide:hover span, ._tt_tasklist li .ui-artZoom-hide.title_tttl:hover
overflow:hidden;
}
-
-.cancel_cpsw {
- text-decoration: none;
- display: table-cell;
- display: inline-block;
- vertical-align: middle;
- font: 12px/14px '\5B8B\4F53','\65B0\5B8B\4F53',sans-serif;
-}
-.cancel_cpsw i {
- display: block;
- font-style: normal;
- font-weight: 400;
- padding: 4px 10px;
- color: #aaa;
- cursor: pointer;
-}
-.cancel_cpsw:hover i {
- color:#08c
-}
-
.itemfeed {
font-size: 12px;
line-height: 14px;
@@ -659,6 +639,9 @@ a.ui-artZoom-hide:hover span, ._tt_tasklist li .ui-artZoom-hide.title_tttl:hover
margin-top: 1px;
*zoom:1
}
+.cmt_fed:hover .btn_acfed{
+ display: inline-block;
+}
.item_cfed {
padding: 10px 0 10px 40px;
position: relative;
diff --git a/dzz/comment/images/folder.css b/dzz/comment/images/folder.css
new file mode 100644
index 0000000..84f4501
--- /dev/null
+++ b/dzz/comment/images/folder.css
@@ -0,0 +1 @@
+.title .asc{background:url(sort_asc.gif) no-repeat;display:inline-block;width:13px;height:6px;position:relative;visibility:hidden;_vertical-align:middle;_margin:15px 0;}.title .col:hover{background-color:#F2F2F2;}.title .desc{background:url(sort_desc.gif) no-repeat;}.item .icon{max-width:24px;max-height:24px;margin-top:-2px;}.col1{float:left;height:51px;line-height:51px;width:10%;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;display:flex;align-content:center;flex-wrap:wrap;}.item-block{background:rgba(var(--bs-primary-hover),0.1);}.sharepame-selected{display:inline-block;}.breadcrumb{margin-bottom:0px;float:left;padding-right:100px;border-bottom:none;padding:1.42rem 0px;}.breadcrumb>li+li:before{content:"";}.breadcrumb li a span{padding-left:5px;padding-right:5px;}
\ No newline at end of file
diff --git a/dzz/comment/images/lyear_comment.css b/dzz/comment/images/lyear_comment.css
new file mode 100644
index 0000000..947e1c1
--- /dev/null
+++ b/dzz/comment/images/lyear_comment.css
@@ -0,0 +1,602 @@
+@charset "utf-8";
+/* CSS atwho */
+.atwho-view {
+ position:absolute;
+ top: 0;
+ left: 0;
+ display: none;
+ margin-top: 18px;
+ background: white;
+ border: 1px solid #DDD;
+ border-radius: 3px;
+ box-shadow: 0 0 5px rgba(0,0,0,0.1);
+ min-width: 120px;
+ z-index: 99999;
+}
+
+.atwho-view .cur {
+ background: #428bca;
+ color: white;
+}
+.atwho-view .cur small {
+ color: white;
+}
+.atwho-view strong {
+ color: #428bca;
+}
+.atwho-view .cur strong {
+ color: white;
+ font:bold;
+}
+.atwho-view ul {
+ /* width: 100px; */
+ list-style:none;
+ padding:0;
+ margin:auto;
+}
+.atwho-view ul li {
+ display: block;
+ padding: 5px 10px;
+ border-bottom: 1px solid #DDD;
+ cursor: pointer;
+ /* border-top: 1px solid #C8C8C8; */
+}
+.atwho-view ul li img{
+ max-height: 24px;
+}
+.atwho-view small {
+ font-size: smaller;
+ color: #777;
+ font-weight: normal;
+}
+/*ui-artZoom*/
+.ui-artZoom {
+ padding: 0 10px 10px 10px;
+ background: #f9f9f9;
+ border: solid 1px #D0D9DA
+}
+.ui-artZoom img {
+ -ms-interpolation-mode: bicubic
+}
+.ui-artZoom-toolbar {
+ height: 36px;
+ line-height: 26px;
+ padding: 5px 0
+}
+.ui-artZoom-buttons {
+ display: inline-block;
+*display:inline;
+*zoom:1;
+ height: 26px;
+ line-height: 0;
+ margin-right: 5px;
+ outline: 0
+}
+.ui-artZoom-loading {
+ color: gray;
+ font-size: 12px
+}
+.ui-artZoom-buttons a{
+ display: inline-block;
+ padding: 5px 15px 5px 0;
+ font: 12px/1.11 "Microsoft Yahei", Tahoma, Arial, Helvetica, STHeiti;
+ _font-family: Tahoma, Arial, Helvetica, STHeiti;
+ -o-font-family: Tahoma, Arial;
+ _font-size: 12px;
+ color: #3C3C3D;
+ white-space: nowrap;
+ overflow: visible;
+ cursor: pointer;
+ text-decoration: none;
+ outline: 0;
+ position: relative;
+ zoom: 1;
+*display:inline;
+*vertical-align:middle
+}
+.ui-artZoom-buttons a:hover, .ui-artZoom-buttons ._tt_tasklist li .title_tttl:hover, ._tt_tasklist li .ui-artZoom-buttons .title_tttl:hover {
+ color: #2d83cf;
+ text-decoration: none;
+ background-position: 0 -40px
+}
+.ui-artZoom-buttons a:active, .ui-artZoom-buttons ._tt_tasklist li .title_tttl:active, ._tt_tasklist li .ui-artZoom-buttons .title_tttl:active {
+ color: #2d83cf
+}
+.ui-artZoom-noLoad a.ui-artZoom-left, .ui-artZoom-noLoad ._tt_tasklist li .ui-artZoom-left.title_tttl, ._tt_tasklist li .ui-artZoom-noLoad .ui-artZoom-left.title_tttl, .ui-artZoom-noLoad a.ui-artZoom-right, .ui-artZoom-noLoad ._tt_tasklist li .ui-artZoom-right.title_tttl, ._tt_tasklist li .ui-artZoom-noLoad .ui-artZoom-right.title_tttl {
+ color: #999;
+ cursor: default
+}
+.ui-artZoom-ready .ui-artZoom-loading span {
+ width: 5px;
+ overflow: hidden;
+ visibility: hidden
+}
+a.ui-artZoom-left, ._tt_tasklist li .ui-artZoom-left.title_tttl {
+ margin-right: 0;
+ border-right: 0
+}
+a.ui-artZoom-right, ._tt_tasklist li .ui-artZoom-right.title_tttl {
+ margin-right: 0;
+ margin-left: 0
+}
+a.ui-artZoom-source, ._tt_tasklist li .ui-artZoom-source.title_tttl {
+ margin-left: 0
+}
+a.ui-artZoom-left:active, ._tt_tasklist li .ui-artZoom-left.title_tttl:active, a.ui-artZoom-right:active, ._tt_tasklist li .ui-artZoom-right.title_tttl:active, a.ui-artZoom-source:active, ._tt_tasklist li .ui-artZoom-source.title_tttl:active {
+ top: 0
+}
+.ui-artZoom-buttons a span, .ui-artZoom-buttons ._tt_tasklist li .title_tttl span, ._tt_tasklist li .ui-artZoom-buttons .title_tttl span {
+ display: inline-block;
+ width: 12px;
+ height: 12px;
+ margin: auto 3px auto auto;
+ position: relative;
+ top: 0;
+*top:0;
+ background-image: url(icons.png);
+ background-repeat: no-repeat;
+*font-size:0;
+ vertical-align: middle
+}
+a.ui-artZoom-right span, ._tt_tasklist li .ui-artZoom-right.title_tttl span, .ui-artZoom-noLoad .ui-artZoom-buttons a.ui-artZoom-right span, .ui-artZoom-noLoad .ui-artZoom-buttons ._tt_tasklist li .ui-artZoom-right.title_tttl span, ._tt_tasklist li .ui-artZoom-noLoad .ui-artZoom-buttons .ui-artZoom-right.title_tttl span {
+ background-position: 0 -0
+}
+a.ui-artZoom-left span, ._tt_tasklist li .ui-artZoom-left.title_tttl span, .ui-artZoom-noLoad .ui-artZoom-buttons a.ui-artZoom-left span, .ui-artZoom-noLoad .ui-artZoom-buttons ._tt_tasklist li .ui-artZoom-left.title_tttl span, ._tt_tasklist li .ui-artZoom-noLoad .ui-artZoom-buttons .ui-artZoom-left.title_tttl span {
+ background-position: -12px 0
+}
+a.ui-artZoom-hide span, ._tt_tasklist li .ui-artZoom-hide.title_tttl span, .ui-artZoom-noLoad .ui-artZoom-buttons a.ui-artZoom-hide span, .ui-artZoom-noLoad .ui-artZoom-buttons ._tt_tasklist li .ui-artZoom-hide.title_tttl span, ._tt_tasklist li .ui-artZoom-noLoad .ui-artZoom-buttons .ui-artZoom-hide.title_tttl span {
+ background-position: -36px 0
+}
+a.ui-artZoom-source span, ._tt_tasklist li .ui-artZoom-source.title_tttl span {
+ background-position: -24px 0
+}
+a.ui-artZoom-right:hover span, ._tt_tasklist li .ui-artZoom-right.title_tttl:hover span, a.ui-artZoom-right:active span, ._tt_tasklist li .ui-artZoom-right.title_tttl:active span {
+ background-position: 0 -12px
+}
+a.ui-artZoom-left:hover span, ._tt_tasklist li .ui-artZoom-left.title_tttl:hover span, a.ui-artZoom-left:active span, ._tt_tasklist li .ui-artZoom-left.title_tttl:active span {
+ background-position: -12px -12px
+}
+a.ui-artZoom-source:hover span, ._tt_tasklist li .ui-artZoom-source.title_tttl:hover span, a.ui-artZoom-source:active span, ._tt_tasklist li .ui-artZoom-source.title_tttl:active span {
+ background-position: -24px -12px
+}
+a.ui-artZoom-hide:hover span, ._tt_tasklist li .ui-artZoom-hide.title_tttl:hover span, a.ui-artZoom-hide:active span, ._tt_tasklist li .ui-artZoom-hide.title_tttl:active span {
+ background-position: -36px -12px
+}
+.ui-artZoom-show {
+ background: transparent
+}
+.ui-artZoom-ready .ui-artZoom-photo {
+ font-size: 0;
+ line-height: 0
+}
+.ui-artZoom-box{line-height:0}
+/*ui-artZoom*/
+.comment-page .pagination{
+ margin:10px 0;
+}
+.img_50_50{
+ max-width: 50px;
+ max-height: 50px;
+}
+* .img_50_50{
+ width: expression(this.width > 50 && this.width>=this.height ? 50 : true);
+ height: expression(this.height > 50 && this.width<=this.height ? 50 : true);
+}
+.publishsharewrap{
+ position:relative;
+}
+.count_cpsw {
+ padding: 3px 0;
+ color: #aaa;
+ text-align: right;
+ font-size: 12px;
+ line-height: 14px;
+ font-family: Verdana, Arial;
+}
+.count_cpsw span {
+ margin: 0;
+}
+.cur_num_input {
+ color: #666;
+}
+.action_cpsw {
+ text-align: right;
+}
+.list_acpsw {
+ float: left;
+ padding-top: 4px;
+ padding-left: 1px;
+ margin: 0;
+}
+.list_acpsw li {
+ padding-bottom: 1px;
+ float: left;
+ display: inline;
+ margin-right: 10px;
+ font: 12px/14px '\5B8B\4F53', '\65B0\5B8B\4F53', sans-serif;
+ line-height: 20px;
+}
+.list_acpsw .item_lacpsw {
+ background-image: url(ico_pub.gif);
+ background-repeat: no-repeat;
+ display: inline-block;
+ text-align: left;
+ overflow: hidden;
+ color: #aaa;
+ text-decoration: none;
+}
+.ament_lacpsw .item_lacpsw {
+ background-position: 0 -78px;
+ padding-left: 12px;
+}
+.ament_lacpsw .item_lacpsw:hover {
+ background-position: 0 -119px;
+ color: #0aa7da;
+}
+.emotion_lacpsw .item_lacpsw {
+ background-position: 0 -240px;
+ padding-left: 19px;
+}
+.emotion_lacpsw .item_lacpsw:hover {
+ background-position: 0 -279px;
+ color: #C63;
+}
+
+.list_acpsw .item_lacpsw {
+ background-image: url(ico_pub.gif);
+ background-repeat: no-repeat;
+ display: inline-block;
+ text-align: left;
+ overflow: hidden;
+ color: #aaa;
+ text-decoration: none;
+}
+.at_lacpsw .item_lacpsw {
+ background-position: 0 -158px;
+ padding-left: 19px;
+}
+.at_lacpsw .item_lacpsw:hover {
+ background-position: 0 -199px;
+ color: #37B201;
+}
+.actionUploadAttachment {
+ width: 136px;
+ padding: 5px 1px;
+ border: 1px solid #ccc;
+ background-color: #fff;
+ font-family: "5B8B\4F53";
+ font-size: 12px;
+ line-height: 14px;
+ position: absolute;
+ left: 0;
+ z-index: 998;
+}
+.actionUploadAttachment .local_auatth a{
+ background-position: 10px 9px;
+}
+.actionUploadAttachment a {
+ color: #666;
+ text-decoration: none;
+ padding: 8px 0 8px 30px;
+ text-align: left;
+ display: block;
+ background: url(ico_upload.gif) no-repeat;
+}
+.actionUploadAttachment .own_auatth a, .actionUploadAttachment .own_auatth ._tt_tasklist li .title_tttl, ._tt_tasklist li .actionUploadAttachment .own_auatth .title_tttl {
+ background-position: 10px -24px;
+}
+.actionUploadAttachment a:hover, .actionUploadAttachment ._tt_tasklist li .title_tttl:hover, ._tt_tasklist li .actionUploadAttachment .title_tttl:hover {
+ background-color: #f0efef;
+ color: #666;
+}
+.actionUploadAttachment .hover_local_auatth a, .actionUploadAttachment .hover_local_auatth ._tt_tasklist li .title_tttl, ._tt_tasklist li .actionUploadAttachment .hover_local_auatth .title_tttl {
+ background-color: #f0efef;
+ color: #666;
+}
+.local_auatth input {
+ position: absolute;
+ top: 0;
+ right: 0;
+ margin: 0;
+ opacity: 0;
+ -ms-filter: 'alpha(opacity=0)';
+ font-size: 200px;
+ direction: ltr;
+ cursor: pointer;
+ width:150px;
+ height:50px;
+}
+.down_quna_cpsw {
+ padding-right: 12px;
+ background: url(ico_pub.gif) no-repeat right -318px;
+ display: inline-block;
+}
+.quna_cpsw {
+ margin-right: 10px;
+ color: #666;
+ vertical-align: middle;
+ cursor: pointer;
+ font: 12px/14px Verdana, '\5B8B\4F53', '\65B0\5B8B\4F53', sans-serif;
+}
+
+.attachmentContainer {
+ text-align: left;
+ zoom: 1;
+ padding-top:8px;
+}
+.attachment_previewer{
+ margin-right:20px;
+ float:left;
+ width:180px;
+ overflow:hidden
+}
+.attachmentviewbox p {
+ margin: 0 ;
+}
+.view_attvb {
+ padding: 10px 0;
+ font-size: 12px;
+ line-height: 22px;
+}
+.view_attvb span {
+ color: #aaa;
+ margin-left: 5px;
+}
+.ico_vattvb {
+ float: left;
+ margin-right: 10px;
+ min-height:50px;
+}
+.ico_name{
+ height:25px;
+ overflow:hidden;
+}
+.dateline_fed {
+ padding: 4px 5px 4px 27px;
+ font: 12px/14px Verdana, "\5B8B\4F53", "\65B0\5B8B\4F53", sans-serif;
+ color: #aaa;
+ background: url(lock_line.gif) no-repeat 0 0;
+ position: relative;
+ float: right
+}
+.main_fed{
+ min-height:60px;
+}
+.action_mfed {
+ height: 26px;
+ color: #aaa;
+ padding: 10px 0 0;
+ position: relative;
+ z-index: 2
+}
+.btn_amfed {
+ float: right;
+ display:none;
+}
+.main_fed:hover .btn_amfed {
+ display:inline-block
+}
+.btn_amfed li {
+ float: left;
+ display: inline;
+ margin-left: 10px;
+ line-height: 0
+}
+.btn_amfed a {
+ line-height: 14px;
+ text-decoration: none;
+ color: #aaa;
+ font-size: 12px
+}
+.btn_amfed i {
+ font-style: normal
+}
+.reply_bamfed a {
+ height: auto\0;
+*height:auto
+}
+.reply_bamfed a i {
+ line-height: 12px\0;
+ cursor: pointer
+}
+.from_fed {
+ margin-left: 10px;
+ text-decoration: none;
+ color: #aaa
+}
+.comment_fed {
+ border-top: 1px solid #e1e1e1
+}
+.count_fed {
+ margin: 0 5px
+}
+.count_fed a {
+ color: #aaa;
+ text-decoration: none
+}
+.count_fed a:hover {
+ background-position: right -162px;
+ color: #145c98
+}
+.txt_cfed i {
+ width: 4px;
+ height: 14px;
+ margin-left: 4px;
+ background: url(ico_feed.png) no-repeat 0 -26px;
+ display: inline-block;
+ vertical-align: middle
+}
+.txt_cfed a:hover i {
+ background-position: 0 -51px
+}
+.txt_cfed .cur i {
+ background-position: -25px -26px
+}
+.txt_cfed .cur:hover i {
+ background-position: -25px -51px
+}
+.corner_lfed {
+ margin-top: -6px;
+ text-align: right;
+ _margin-top: -14px;
+ line-height: 0
+}
+.corner_lfed span {
+ width: 11px;
+ height: 6px;
+ margin-right: 4px;
+ background: url(comment_triangle.gif) no-repeat bottom center;
+ display: inline-block
+}
+.item .list_fed {
+ padding-left: 60px
+}
+.item_cfed {
+ padding: 10px 0 10px 40px;
+ position: relative;
+ height: auto!important;
+ height: 30px;
+ min-height: 30px
+}
+.left_icfed {
+ width: 30px;
+ height: 30px;
+ position: absolute;
+ top: 8px;
+ left: 0;
+ overflow: hidden
+}
+.master_cfed {
+ color: #666;
+ font-size: 12px;
+ line-height: 20px;
+ margin-top: -4px;
+ word-break: break-all;
+ word-wrap: break-word
+}
+
+.dehua_mcfed {
+ font-weight: 700;
+ cursor: pointer
+}
+.dehua_mcfed:hover {
+ color: #2d83cf
+}
+.action_cfed {
+ height: 18px;
+ color: #aaa;
+ padding-top: 5px
+}
+.action_cfed .lock_fed {
+ margin-right: 2px
+}
+.btn_acfed {
+ float: right;
+ display: none
+}
+.btn_acfed li {
+ float: left;
+ display: inline;
+ height: 18px;
+ line-height: 18px;
+ margin-left: 10px
+}
+.img_pfed .txt_ipfed {
+ padding: 2px 5px;
+ border: 1px solid #aaa;
+ display: inline-block
+}
+.img_pfed .artZoom {
+ display: block;
+ border: solid 1px #d0d9da;
+ padding: 3px
+}
+
+.name_pfed {
+ padding-top: 5px;
+ line-height: 20px
+}
+.kb_pfed {
+ color: #aaa;
+ padding-left: 5px
+}
+.file_ffed {
+ float: left;
+ margin-right: 10px;
+ margin-top: 3px
+}
+
+
+.sllt {
+ padding: 4px;
+ border: 1px solid;
+ min-width: 60px;
+ border-color: #DDD;
+ background: #FEFEFE;
+ box-shadow: 1px 2px 2px rgba(0,0,0,0.3);
+}
+.sllt { padding: 5px !important; }
+.sllt .sllt-wrap{
+ width:288px;
+ height:188px;
+}
+.sllt td { padding: 6px; border: none; cursor: pointer; }
+.sllt_p { *float: left; text-align: right; }
+ .sllt_p a { margin-right: 5px; font-size:12px;}
+.sl_pv { margin-top: 5px; padding: 8px; background: #FAFAFA; border: 1px solid #CCC; }
+.ie6 .slg, .ie7 .slg { width: expression(this.parentNode.offsetWidth); }
+
+.lyear-message-list {
+}
+.lyear-message-list > li {
+ border-bottom: 1px solid rgba(77, 82, 89, 0.05);
+ margin-bottom: 10px;
+}
+.lyear-message-list .lyear-message-item .lyear-message-item {
+ padding-top: 10px;
+ padding-bottom: 10px;
+}
+.lyear-message-list li:last-child .lyear-message-item {
+ padding-bottom: 0px;
+}
+.lyear-message-form {
+ position: relative;
+ display: -webkit-box;
+ display: flex;
+ -webkit-box-align: center;
+ align-items: center;
+ padding-top: 10px;
+}
+.lyear-message-list .lyear-message-form {
+ padding-bottom: 10px;
+}
+.lyear-message-form .form-control {
+ margin: 0px 10px;
+}
+.lyear-message-form .form-control:focus {
+ box-shadow: none;
+}
+.lyear-message-form .mdi {
+ font-size: 20px;
+ color: #4d5259;
+}
+.message-btn-close {
+ display: none;
+}
+.attachment .list-group-item:hover {
+ color: #495057;
+ text-decoration: none;
+ background-color: #f8f9fa;
+}
+
+.attachoffer {
+ background: #fff;
+ border: 1px solid #ebebeb;
+ box-shadow: 0 1px 15px 1px rgba(77, 82, 89, .075);
+ margin: 15px 0;
+ overflow: hidden;
+ border-color: #eff2f7;
+}
+.attachoffer:hover {
+ background: #f8f9fa;
+}
\ No newline at end of file
diff --git a/admin/filemanage/images/sort_asc.gif b/dzz/comment/images/sort_asc.gif
similarity index 100%
rename from admin/filemanage/images/sort_asc.gif
rename to dzz/comment/images/sort_asc.gif
diff --git a/admin/filemanage/images/sort_desc.gif b/dzz/comment/images/sort_desc.gif
similarity index 100%
rename from admin/filemanage/images/sort_desc.gif
rename to dzz/comment/images/sort_desc.gif
diff --git a/dzz/comment/index.php b/dzz/comment/index.php
new file mode 100644
index 0000000..6ae24e1
--- /dev/null
+++ b/dzz/comment/index.php
@@ -0,0 +1,118 @@
+fetch_by_identifier($type);
+ $navtitle = $appidxu['appname'] . ' - ' . $navtitle;
+ }
+ }
+ $limitsql = 'limit ' . $start . ',' . $limit;
+ if ($_G['adminid']) {
+ $whereClause = $sql;
+ } else {
+ $whereClause = "authorid = $uid AND $sql";
+ }
+ $count = DB::result_first("SELECT COUNT(*) FROM " . DB::table('comment') . " WHERE $whereClause", $param);
+ if ($count) {
+ $data = DB::fetch_all("SELECT * FROM " . DB::table('comment') . " WHERE $whereClause $order $limitsql", $param);
+ }
+ $list = array();
+ $id = $start + 1;
+ foreach ($data as $value) {
+ $user=getuserbyuid($value['edituid']);
+ $list[] = [
+ "id" => $id++,
+ "authorid" => $value['author'],
+ "ip" => $value['ip'],
+ "xtllq" => $value['xtllq'],
+ "dateline" => dgmdate($value['dateline'], 'Y-n-j H:i:s'),
+ "cid" => $value['cid'],
+ "edittime" => $value['edittime'] ? dgmdate($value['edittime'], 'Y-n-j H:i:s') : null,
+ "edituid" => $user['username'],
+ "message" => $value['message'],
+ "fid" => $value['id'],
+ "idtype" => $value['idtype']
+ ];
+ }
+ $return = [
+ "code"=> 0,
+ "msg"=> "",
+ "count"=> $count? $count : 0,
+ "data" => $list? $list : [],
+ ];
+ $jsonReturn = json_encode($return);
+ if ($jsonReturn === false) {
+ $errorMessage = json_last_error_msg();
+ $errorResponse = [
+ "code" => 1,
+ "msg" => "JSON 编码失败，请刷新重试: " . $errorMessage,
+ "count" => 0,
+ "data" => [],
+ ];
+ exit(json_encode($errorResponse));
+ }
+ exit($jsonReturn);
+} elseif ($do == 'delete') {
+ $cid = isset($_GET['cid']) ? trim($_GET['cid']) : '';
+ $cids = explode(',', $cid);
+ foreach ($cids as $cid) {
+ $data = C::t('comment') -> fetch($cid);
+ if ($_G['adminid'] != 1 && $_G['uid'] != $data['authorid']){
+ exit(json_encode(array('msg' => lang('privilege'))));
+ }
+ C::t('comment') -> delete_by_cid($cid);
+ }
+ exit(json_encode(array('msg' => 'success')));
+} else {
+ //获取通知包含类型
+ $searchappid = array();
+ foreach (DB::fetch_all("select distinct(module) from %t where authorid = %d", array('comment', $_G['uid'])) as $v) {
+ $searchappid[] = $v['module'];
+ }
+ $searchcats = array();
+ if ($searchappid) {
+ foreach (DB::fetch_all("select appname,identifier,appico from %t where identifier in(%n)", array('app_market', $searchappid)) as $v) {
+ $searchcats[] = array('identifier' => $v['identifier'], 'appname' => $v['appname'], 'appico' => $_G['setting']['attachurl'] . $v['appico']);
+ }
+ }
+ include template('list');
+}
+?>
\ No newline at end of file
diff --git a/dzz/comment/language/index.htm b/dzz/comment/language/index.htm
new file mode 100644
index 0000000..e69de29
diff --git a/dzz/comment/language/zh-cn/index.htm b/dzz/comment/language/zh-cn/index.htm
new file mode 100644
index 0000000..e69de29
diff --git a/dzz/comment/language/zh-cn/lang.php b/dzz/comment/language/zh-cn/lang.php
new file mode 100644
index 0000000..44d3805
--- /dev/null
+++ b/dzz/comment/language/zh-cn/lang.php
@@ -0,0 +1,6 @@
+'评论管理',
+);
+
+?>
\ No newline at end of file
diff --git a/dzz/comment/scripts/comment.js b/dzz/comment/scripts/comment.js
index 934fe31..3126175 100644
--- a/dzz/comment/scripts/comment.js
+++ b/dzz/comment/scripts/comment.js
@@ -71,9 +71,9 @@ for(var i in arr['attachs']){
html+=' | 项目 | +DzzOffice 所需配置 | +DzzOffice 最佳 | +当前服务器 | +
|---|
无法检测
+
+ ';
html+='
@@ -44,8 +43,8 @@
- {lang cancel}
-
+ {lang cancel}
+
';
html+='
';
html+=' '+arr['dateline'];
@@ -325,9 +325,9 @@ function feed_attach_saveto(qid){
showWindow('saveto','index.php?mod=system&op=filewindow&type=2','get','0',function(fid,data){
jQuery.post(url,{fid:fid},function(json){
if(json.error){
- showmessage(json.error,'danger',3000,1);
+ showmessage(json.error,'danger','3000',1);
}else{
- showmessage(__lang.savetosuccess+data.relativepath+json.filename,'success',3000,1);
+ showmessage(__lang.savetosuccess+data.relativepath+json.filename,'success','3000',1);
}
},'json');
});
diff --git a/dzz/comment/scripts/lyear_comment.js b/dzz/comment/scripts/lyear_comment.js
new file mode 100644
index 0000000..1af061a
--- /dev/null
+++ b/dzz/comment/scripts/lyear_comment.js
@@ -0,0 +1,342 @@
+
+function feed_publish(arr,tid,targetid){
+var html=''
+ html+='';
+ if(targetid && jQuery('#'+targetid).length){
+ var el=jQuery('#'+targetid+' > .itemfeed:first');
+ if(el.length>0) el.before(html);
+ else jQuery('#'+targetid).html(html);
+ }else{
+ var el=jQuery('#comment_container > .itemfeed:first');
+ if(el.length>0) el.before(html);
+ else jQuery('#comment_container').html(html);
+ }
+ jQuery('#comment_'+arr['cid']).slideDown(500);
+ jQuery('#publish_submit_'+tid).removeAttr('disabled');
+ jQuery('#message_'+tid).val(jQuery('#message_'+tid).attr('tip'));
+ jQuery('#attachmentViewBox_'+tid).empty();
+ jQuery('#comment_'+arr['cid']+' img[data-original]').dzzthumb();
+ try{
+ callback_by_comment('comment_'+arr['cid'],'add');
+ }catch(e){}
+}
+
+function feed_reply(arr){
+ var html='';
+ html+='- ';
- //html+='
'+html+'
';
+ jQuery('#comment_reply_'+arr['pcid']).html(html1);
+ }else{
+ jQuery('#reply_list_'+arr['pcid']).find('.cmt_fed:first').before(html);
+ }
+ var replysum=parseInt(jQuery('#comment_reply_'+arr['pcid']+' .txt_cfed .num_cfed').html());
+ if(replysum>0) jQuery('#comment_reply_'+arr['pcid']+' .txt_cfed .num_cfed').html(replysum+1);
+ jQuery('#message_'+arr['pcid']).val('');
+ jQuery('#pulish_submit_'+arr['pcid']).removeAttr('disabled');
+ jQuery('#reply_publish_'+arr['pcid']).slideUp(500);
+ jQuery('#attachmentViewBox_'+arr['pcid']).empty();
+ jQuery('#comment_'+arr['cid']+' img[data-original]').dzzthumb();
+
+}
+function getReplyForm(tid,pid,allowattach,allowat,allowsmiley){
+ jQuery('#comment_container .publishsharewrap').hide();
+ if(!document.getElementById('reply_publish_'+tid)){
+ var el = jQuery('').appendTo('#comment_'+tid);
+ ajaxget(DZZSCRIPT+'?mod=comment&op=ajax&do=getReplyForm&template=1&cid='+tid+'&allowattach='+allowattach+'&allowat='+allowat+'&allowsmiley='+allowsmiley,'reply_publish_'+tid,'reply_publish_'+tid,'','',function(){
+ var el=jQuery('#reply_who_'+tid);
+ if(pid>0){
+ el.find('.toname_wcpsw').html(jQuery('#comment_'+pid+' .avatar_mcfed').html());
+ el.show();
+ jQuery('#reply_pid_'+tid).val(pid);
+ }else{
+ el.hide();
+ jQuery('#reply_pid_'+tid).val('0');
+ }
+ jQuery('#comment_'+tid+' textarea[name="message"]').val('').focus();
+ });
+ }else{
+ var el=jQuery('#reply_who_'+tid);
+ if(pid>0){
+ el.find('.toname_wcpsw').html(jQuery('#comment_'+pid+' .avatar_mcfed').html());
+ el.show();
+ jQuery('#reply_pid_'+tid).val(pid);
+ }else{
+ el.hide();
+ jQuery('#reply_pid_'+tid).val('0');
+ }
+ jQuery('#reply_publish_'+tid).find('.publishsharewrap').show().end().slideDown(500);
+ jQuery('#comment_'+tid+' textarea[name="message"]').val('').focus();
+ }
+
+}
+
+function feed_edit(cid,allowattach,allowat,allowsmiley){
+ showWindow('publish_edit_'+cid,DZZSCRIPT+'?mod=comment&op=ajax&do=edit&template=1&cid='+cid+'&allowattach='+allowattach+'&allowat='+allowat+'&allowsmiley='+allowsmiley);
+}
+function feed_edit_finish(cid,allowattach,allowat,allowsmiley){
+ jQuery.get(DZZSCRIPT+'?mod=comment&op=ajax&do=getcommentbycid&template=1&cid='+cid+'&allowattach='+allowattach+'&allowat='+allowat+'&allowsmiley='+allowsmiley,function(html){
+ jQuery('#comment_'+cid).replaceWith(html);
+
+ });
+}
+function feed_delete(cid,domid,tid){
+ var msg='';
+ if(tid){
+ msg=__lang.sure_want_delete_comment;
+ }else{
+ msg=__lang.sure_want_delete_all_comment;
+ }
+ showDialog(msg, 'confirm','', function(){
+ jQuery.getJSON(DZZSCRIPT+'?mod=comment&op=ajax&do=delete&cid='+cid,function(json){
+ jQuery('#'+domid).slideUp(500,function(){
+ if(json.msg=='success') {
+ showmessage('删除成功', 'success', '3000', 1);
+ }
+ jQuery(this).remove();
+ if(tid){
+ var replysum=parseInt(jQuery('#comment_reply_'+tid+' .txt_cfed .num_cfed').html());
+ if(replysum>0) jQuery('#comment_reply_'+tid+' .txt_cfed .num_cfed').html(replysum-1);
+ }
+ });
+ try{
+ callback_by_comment(domid,'delete');
+ }catch(e){}
+ });
+ });
+}
+function feed_addAttach(arr,el,tid){
+ var html='';
+ html+=' ';
+ html+='
';
+
+ el.replaceWith(html);
+ check_attach_share_tid(tid);
+}
+function feed_downAttach(qid){
+ var url=DZZSCRIPT+'?mod=comment&op=down&qid='+qid;
+ if(BROWSER.ie){
+ window.open(url);
+ }else{
+ if(!window.frames['hidefram']) jQuery('').appendTo('body');
+ window.frames['hideframe'].location=url;
+ }
+}
+function feed_attach_saveto(qid){
+ var url=DZZSCRIPT+'?mod=comment&op=saveto&qid='+qid;
+ showWindow('saveto','index.php?mod=system&op=filewindow&type=2','get','0',function(fid,data){
+ jQuery.post(url,{fid:fid},function(json){
+ if(json.error){
+ showmessage(json.error,'danger','3000',1);
+ }else{
+ showmessage(__lang.savetosuccess+data.relativepath+json.filename,'success','3000',1);
+ }
+ },'json');
+ });
+}
+function feed_attach_preview(qid){
+ var url=DZZSCRIPT+'?mod=comment&op=preview&qid='+qid;
+ if(!top._config) window.open(url);
+ else{
+ if(!window.frames['hidefram']) jQuery('').appendTo('body');
+ window.frames['hideframe'].location=url;
+ }
+}
+
+function check_attach_share_tid(tid){
+ if(!tid) tid='0';
+ var sum=jQuery('#attachmentViewBox_'+tid).find('.attachment_previewer').length;
+ var val=jQuery('#message_'+tid).val();
+ var reg=/^__lang.share_the(\d+)__lang.js_a_file/ig;
+ if(sum<1){
+ if(val!='') jQuery('#message_'+tid).val(val.replace(reg,''));
+ }else{
+ if(val=='' || val==jQuery('#message_'+tid).attr('tip')){
+ jQuery('#message_'+tid).val(__lang.share_the+sum+__lang.js_a_file);
+ }else{
+ jQuery('#message_'+tid).val(val.replace(reg,__lang.share_the+sum+__lang.js_a_file));
+ }
+ }
+ check_publish_enable(tid);
+ jQuery('#message_'+tid).focus().caret('pos',document.getElementById('message_'+tid).value.length);
+ return sum;
+}
+function removeAttach(el,tid){
+ el.slideUp(500,function(){jQuery(this).remove();check_attach_share_tid(tid);});
+
+}
+
+//从桌面选择文件
+function uploadfrom_desktop(tid){
+ if(!tid) tid='0';
+ try{
+ var openexts = {
+ attach:[__lang.typename_attach,["ATTACH","IMAGE","DOCUMENT","VIDEO","LINK","DZZDOC"],""],
+ image:[__lang.typename_image+"(*.jpg,*.jpeg,*.png,*.gif)",["IMAGE","JPG","JPEG","PNG","GIF"],""]
+ };
+ var exts=JSON.stringify(openexts);
+ exts = exts.replace(/\"/g,'"');
+ exts = exts.replace(/\(/g,'|');
+ exts = exts.replace(/\)/g,'$');
+ exts = encodeURIComponent(exts);
+ showWindow('openfile', 'index.php?mod=system&op=filewindow&handlekey=svaefile&mulitype=1&exts='+exts+'&callback=opencallback', 'get', '0',function(data){//只打开本地盘
+ var datas=data;
+ for(var i in datas){
+ var arr=datas[i];
+ var html='';
+ html+=' ';
+ html+='
';
+ html+=' ';
+ if(arr['isimage']){
+ html+=' !['+arr['filename']+']('+arr['img']+')
';
+ }else{
+ html+=' ';
+ }
+ html+='
';
+ html+=' ';
+ html+='
';
+ html+=' '+arr['filename']+'
';
+ html+=' '+__lang.del_adjunct+'';
+ html+=' ';
+ html+=' ';
+ html+=' ';
+ html+=' ';
+ html+=' ';
+ html+=' ';
+ html+='
';
+ jQuery('#attachmentViewBox_'+tid).append(html);
+ check_attach_share_tid(tid);
+ }
+ });
+ }catch(e){
+
+ }
+}
+
+function check_publish_enable(tid){
+ //统计字数
+ if(!tid) tid='0';
+ var str=document.getElementById('message_'+tid).value.replace(/[\r\n]/i,'');
+ var length=mb_strlen(str);
+ if(length>1000){
+ length=1000-length;
+ }
+ document.getElementById('num_input_'+tid).innerHTML=length;
+ if(length>0 && length<1000){
+ jQuery('#publish_submit_'+tid).removeAttr('disabled','true');
+ jQuery('#publish_submit_'+tid).removeClass('disabled');
+ }else{
+ jQuery('#publish_submit_'+tid).attr('disabled','true');
+ jQuery('#publish_submit_'+tid).addClass('disabled');
+ }
+}
\ No newline at end of file
diff --git a/dzz/comment/template/ajax.htm b/dzz/comment/template/ajax.htm
index cebb609..6075b17 100644
--- a/dzz/comment/template/ajax.htm
+++ b/dzz/comment/template/ajax.htm
@@ -1,12 +1,16 @@
-
-
+
+ ';
+ html+='
';
+ html+=' ';
+ html+=' ';
+ html+='
';
+ html+=' ';
+ html+='
';
+ html+=' '+arr['name']+'
';
+ html+=' '+__lang.del_adjunct+'';
+ if(arr['type']=='image' || arr['type']=='attach' || arr['type']=='document'){
+ html+=' ';
+ html+=' ';
+ html+=' ';
+ html+=' ';
+ }else{
+ html+=' ';
+ html+=' ';
+ html+=' ';
+ html+=' ';
+ }
+ html+=' ';
+ html+=' ';
+
+ html+='
+
+ 所有评论列表
+ +
+
-
+
-
+
+
-
-
+
+
+
+ $multi
-
+ $multi
-
+
+
+
+ 当前评论列表
+ +
+
+
{eval $value1=$value}
-
+
+
+
+
+
-
diff --git a/dzz/comment/template/edit_form.htm b/dzz/comment/template/edit_form.htm
index 67a0d5e..5776683 100644
--- a/dzz/comment/template/edit_form.htm
+++ b/dzz/comment/template/edit_form.htm
@@ -1,9 +1,8 @@
-
-
-
-
+{lang edit}
-
+
{lang edit}
+ +
-
+
0/1000
@@ -108,7 +107,7 @@ function errorhandle_{$_GET[handlekey]}(url, message, values) {
hideWindow('{$_GET[handlekey]}');
}
- var attachextensions='{eval echo implode('|',$space[attachextensions]);}';
+ var attachextensions='{eval echo implode('|',$space['attachextensions']);}';
if(attachextensions=='') attachextensions="\.*$";
else attachextensions="(\.|\/)("+(attachextensions)+")$";
jQuery('#fileupload_edit_{$cid}').fileupload({
diff --git a/dzz/comment/template/header_search.htm b/dzz/comment/template/header_search.htm
new file mode 100644
index 0000000..4bb4618
--- /dev/null
+++ b/dzz/comment/template/header_search.htm
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dzz/comment/template/lyear/lyear_ajax.htm b/dzz/comment/template/lyear/lyear_ajax.htm
new file mode 100644
index 0000000..0bf4e52
--- /dev/null
+++ b/dzz/comment/template/lyear/lyear_ajax.htm
@@ -0,0 +1,112 @@
+
+
+
+
@@ -89,7 +89,7 @@
});
- var attachextensions='{eval echo implode('|',$space[attachextensions]);}';
+ var attachextensions='{eval echo implode('|',$space['attachextensions']);}';
if(attachextensions=='') attachextensions="\.*$";
else attachextensions="(\.|\/)("+(attachextensions)+")$";
jQuery('#fileupload_{$cid}').fileupload({
diff --git a/dzz/comment/template/reply_item.htm b/dzz/comment/template/reply_item.htm
index 17de010..78d864e 100644
--- a/dzz/comment/template/reply_item.htm
+++ b/dzz/comment/template/reply_item.htm
@@ -84,15 +84,15 @@
diff --git a/dzz/comment/template/thread_item.htm b/dzz/comment/template/thread_item.htm
index 357877c..5949c3b 100644
--- a/dzz/comment/template/thread_item.htm
+++ b/dzz/comment/template/thread_item.htm
@@ -75,17 +75,14 @@
+
+
+
+
\ No newline at end of file
diff --git a/dzz/comment/template/list.htm b/dzz/comment/template/list.htm
new file mode 100644
index 0000000..7a295ce
--- /dev/null
+++ b/dzz/comment/template/list.htm
@@ -0,0 +1,288 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 所有评论列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 当前评论列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dzz/comment/template/lyear/lyear_edit_form.htm b/dzz/comment/template/lyear/lyear_edit_form.htm
new file mode 100644
index 0000000..13dba42
--- /dev/null
+++ b/dzz/comment/template/lyear/lyear_edit_form.htm
@@ -0,0 +1,170 @@
+
+
+
+ {lang edit}
+
+
+
+
+
+
+
+
+
+
diff --git a/dzz/comment/template/lyear/lyear_left.htm b/dzz/comment/template/lyear/lyear_left.htm
new file mode 100644
index 0000000..360a74a
--- /dev/null
+++ b/dzz/comment/template/lyear/lyear_left.htm
@@ -0,0 +1,12 @@
+-
+
+
+
+
+
+
+
+
+
diff --git a/dzz/comment/template/lyear/lyear_reply_form.htm b/dzz/comment/template/lyear/lyear_reply_form.htm
new file mode 100644
index 0000000..3dc7b29
--- /dev/null
+++ b/dzz/comment/template/lyear/lyear_reply_form.htm
@@ -0,0 +1,188 @@
+
+
+
+
+
+
+
+
diff --git a/dzz/comment/template/lyear/lyear_reply_item.htm b/dzz/comment/template/lyear/lyear_reply_item.htm
new file mode 100644
index 0000000..c120484
--- /dev/null
+++ b/dzz/comment/template/lyear/lyear_reply_item.htm
@@ -0,0 +1,47 @@
+-
+
+
+
-
-
';
+ tmpl+=' ';
+ tmpl+=' ';
+ tmpl+='
';
+ var item_refresh=function(){
+ container.find('#dzzvote_post_text_'+options['voteid']+' .dzzvote-post-item-container .badge').each(function(index){
+ this.innerHTML=index+1;
+ });
+ dzzvote_maxselect_num();
+ }
+ var dzzvote_maxselect_num=function(){
+ var val=parseInt(jQuery('#dzzvote_maxselect_num_'+options['voteid']+'').val());
+ if(jQuery('#dzzvotetype_'+options['voteid']).val()>1){
+ var sum=container.find('.dzzvote-post-image-item').length;
+ }else{
+ var sum=container.find('.dzzvote-post-text-item').length;
+ }
+ var option='';
+ for(var i=1 ;i<=sum; i++){
+ if(i==val){
+ option+='';
+ }else{
+ option+='';
+ }
+ }
+ jQuery('#dzzvote_maxselect_num_'+options['voteid']+'').html(option);
+ }
+ var item_add=function(){
+
+ jQuery(tmpl).appendTo('#dzzvote_post_text_'+options['voteid']+' .dzzvote-post-item-container');
+ item_refresh();
+ }
+ var item_delete=function(){
+ if($(this).data('itemid')>0){
+ var self=this;
+ $.getJSON(options.ajaxurl+'&do=itemdelete&itemid='+$(this).data('itemid'),function(json){
+ jQuery(self).closest('.dzzvote-post-image-item,.dzzvote-post-text-item').remove();
+ item_refresh();
+ });
+
+ }else{
+ jQuery(this).closest('.dzzvote-post-image-item,.dzzvote-post-text-item').remove();
+ item_refresh();
+ }
+ }
+ var init=function(){
+ container.on('click.dzzvote','.dzzvote-post-additem',item_add);
+ container.on('click.dzzvote','.dzzvote-post-delitem',item_delete);
+ }
+ init();
+ }
+
+})(jQuery);
diff --git a/dzz/dzzvote/template/lyear/lyear_vote_ajax.htm b/dzz/dzzvote/template/lyear/lyear_vote_ajax.htm
new file mode 100644
index 0000000..e603425
--- /dev/null
+++ b/dzz/dzzvote/template/lyear/lyear_vote_ajax.htm
@@ -0,0 +1,538 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {lang vote_choose}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {lang input_self_defined_time}
+
+
+
+
+
+
+ checked="checked">
+
+
+
+ checked="checked">
+
+
+
+
+
+
+
+
+ checked="checked">
+
+
+
+ checked="checked">
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {lang number_participants} $votesum
+ $vote['subject']
+$endtime | {lang most_can_choose1} $vote['maxselectnum'] {lang item}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $value[content]
+
+
+
+
+ {eval $progressvalue = floor(($value[number]/$votetotal)*100);}
+
+ {eval $progressvalue = '0';}
+
+
+
+
+
+
+ -
+
+
+
+
+
+ {lang number_participants} $votesum
+ $vote[subject]
+$endtime | {lang most_can_choose1} $vote['maxselectnum'] {lang item}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dzz/dzzvote/template/lyear/lyear_vote_user.htm b/dzz/dzzvote/template/lyear/lyear_vote_user.htm
new file mode 100644
index 0000000..234d2dd
--- /dev/null
+++ b/dzz/dzzvote/template/lyear/lyear_vote_user.htm
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dzz/dzzvote/template/vote_ajax.htm b/dzz/dzzvote/template/vote_ajax.htm
index 82bb394..5e1beb6 100644
--- a/dzz/dzzvote/template/vote_ajax.htm
+++ b/dzz/dzzvote/template/vote_ajax.htm
@@ -38,7 +38,7 @@
+
+
+
+ $value[content]
+
+
+
+
+ {eval $progressvalue = floor(($value[number]/$votetotal)*100);}
+
+ {eval $progressvalue = '0';}
+
+
+
+
+
+
+-
+
+
-
$vote[subject]
+$vote['subject']
$endtime | {lang most_can_choose1} $vote['maxselectnum'] {lang item}
- {eval echo avatar_block($value[uid]);}
+ {eval echo avatar_block($value['uid']);}
diff --git a/dzz/explorer/ajax.php b/dzz/explorer/ajax.php
new file mode 100644
index 0000000..8910f52
--- /dev/null
+++ b/dzz/explorer/ajax.php
@@ -0,0 +1,868 @@
+ '/\.(gif|jpe?g|png)$/i',
+ 'upload_dir' => $_G['setting']['attachdir'] . 'cache/',
+ 'upload_url' => $_G['setting']['attachurl'] . 'cache/',
+ 'thumbnail' => array('max-width' => 40, 'max-height' => 40));
+ $upload_handler = new uploadhandler($options);
+ exit();
+} elseif ($operation == 'uploads') {//上传新文件(指新建)
+ $container = trim($_GET['container']);
+ $space = dzzgetspace($uid);
+ $space['self'] = intval($space['self']);
+ $bz = trim($_GET['bz']);
+ require_once dzz_libfile('class/UploadHandler');
+ //上传类型
+ $allowedExtensions = $space['attachextensions'] ? explode(',', $space['attachextensions']) : array();
+
+ $sizeLimit = ($space['maxattachsize']);
+
+ $options = array('accept_file_types' => $allowedExtensions ? ("/(\.|\/)(" . implode('|', $allowedExtensions) . ")$/i") : "/.+$/i",
+ 'max_file_size' => $sizeLimit ? $sizeLimit : null,
+ 'upload_dir' => $_G['setting']['attachdir'] . 'cache/',
+ 'upload_url' => $_G['setting']['attachurl'] . 'cache/',
+ );
+ $upload_handler = new UploadHandler($options);
+ exit();
+} elseif ($operation == 'uploadfiles') {//上传文件(单纯的上传)
+ $space = dzzgetspace($uid);
+ $space['self'] = intval($space['self']);
+ require_once libfile('class/uploadhandler', '', 'core');
+ //上传类型
+ $allowedExtensions = $space['attachextensions'] ? explode(',', $space['attachextensions']) : array();
+ $sizeLimit = ($space['maxattachsize']);
+
+ $options = array('accept_file_types' => $allowedExtensions ? ("/(\.|\/)(" . implode('|', $allowedExtensions) . ")$/i") : "/.+$/i",
+ 'max_file_size' => $sizeLimit ? $sizeLimit : null,
+ 'upload_dir' => $_G['setting']['attachdir'] . 'cache/',
+ 'upload_url' => $_G['setting']['attachurl'] . 'cache/',
+ );
+ $upload_handler = new UploadHandler($options);
+ exit();
+} elseif ($operation == 'app') {
+ $applist = $_GET['data'];
+ //获取已安装应用
+ $app = C::t('app_market')->fetch_all_by_appid($applist);
+ $applist_1 = array();
+ foreach ($app as $key => $value) {
+ if ($value['isshow'] < 1) continue;
+ if ($value['available'] < 1) continue;
+ if ($value['system'] == 2) continue;
+ $applist_1[$key] = $value;
+
+ }
+
+ exit(json_encode($applist_1));
+
+} elseif ($operation == 'selectperm') {
+
+ $fid = isset($_GET['fid']) ? intval($_GET['fid']) : '';
+ $gid = isset($_GET['gid']) ? intval($_GET['gid']) : '';
+ $inherit = true;//是否允许继承上级权限
+
+ //如果是顶级群组的文件夹权限不允许继承上级权限
+ if ($gid && $orginfo = C::t('organization')->fetch($gid)) {
+ if ($fid == $orginfo['fid']) {
+ $inherit = false;
+ } else {
+ $folderinfo = C::t('folder')->fetch($fid);
+ $inheritperm = DB::result_first("select perm from %t where fid = %d", array('folder', $folderinfo['pfid']));
+ }
+ } else {
+ $folderinfo = C::t('folder')->fetch($fid);
+ }
+
+ //是否是新建权限
+ $new = (isset($_GET['new']) && $_GET['new']) ? 1 : 0;
+
+ $setting = (isset($_GET['setting']) && $_GET['setting']) ? 1 : 0;
+
+ //获取权限
+ $groupperm = intval(C::t('folder')->fetch_perm_by_fid($fid));
+
+ //获取权限组
+ $permgroups = C::t('resources_permgroup')->fetch_all();
+
+ $perms = get_permsarray();//获取所有权限
+
+ //设置权限
+ if (isset($_GET['permsubmit']) && $_GET['permsubmit']) {
+ $perms = isset($_GET['selectperm']) ? $_GET['selectperm'] : array();
+ $perm = 0;
+ if (!empty($perms)) {
+ foreach ($perms as $v) {
+ $perm += intval($v);
+ }
+ $perm += 1;
+ }
+ if ($perm == $groupperm) exit(json_encode(array('success' => true)));
+ if (!$inherit && !$perm) exit(json_encode(array('error' => true)));
+ $fid = intval($_GET['fid']);
+ if (C::t('folder')->update($fid, array('perm' => $perm))) {
+ //如果是编辑权限，增加相关事件
+ if (!$new) {
+ //增加群组事件
+ if ($orginfo && !$inherit) {
+ $eventdata = array('username' => getglobal('username'), 'uid' => getglobal('uid'), 'folder' => $orginfo['orgname']);
+ C::t('resources_event')->addevent_by_pfid($fid, 'set_group_perm', 'setperm', $eventdata, $gid, '', $orginfo['orgname']);
+ } else {//增加文件夹事件
+ $rid = C::t('resources')->fetch_rid_by_fid($fid);
+ $path = C::t('resources_path')->fetch_pathby_pfid($fid);
+ $realpath = preg_replace('/dzz:(.+?):/', '', $path);
+ $hash = C::t('resources_event')->get_showtpl_hash_by_gpfid($fid, $gid);
+ $eventdata = array('username' => getglobal('username'), 'uid' => getglobal('uid'), 'position' => $realpath, 'hash' => $hash);
+ C::t('resources_event')->addevent_by_pfid($fid, 'set_folder_perm', 'setperm', $eventdata, $gid, $rid, $folderinfo['fname']);
+ }
+ }
+ exit(json_encode(array('success' => true, 'perm' => $perm)));
+ } else {
+ exit(json_encode(array('error' => true)));
+ }
+
+ }
+} elseif ($operation == 'addgroup') {//添加群组
+ if (isset($_GET['arr'])) {
+ $arr = $_GET['arr'];
+ $groupname = isset($arr['orgname']) ? getstr($arr['orgname']) : '';
+ $img = isset($arr['aid']) ? trim($arr['aid']) : '';
+ $groupmemorysetting = getglobal('groupmemorySpace', 'setting');
+ //if (!$img) exit(json_encode(array('error' => true, 'msg' => '请选择或者上传一张图片，作为群组头像', 'pos' => 'img')));
+ if (preg_match('/^\s*$/', $groupname)) exit(json_encode(array('error' => true, 'msg' => '群组名不能为空', 'pos' => 'name')));
+ if (!C::t('organization')->chk_by_orgname($groupname, 1)) showTips(array('error' => true, 'msg' => '群组名已被占用', 'pos' => 'name'), 'json');
+ $setarr = array(
+ 'orgname' => $groupname,
+ 'aid' => $img,
+ 'desc' => htmlspecialchars(trim($arr['desc'])),
+ 'type' => 1,
+ 'dateline' => TIMESTAMP,
+ 'maxspacesize' => $groupmemorysetting,
+ 'manageon' => 1,
+ 'diron' => 1
+ );
+ if ($return = C::t('organization')->insert_by_orgid($setarr)) {
+ if ($return) exit(json_encode(array('success' => true, 'gid' => $return)));
+ else exit(json_encode(array('error' => true, 'msg' => lang('create_group_failed'))));
+ } else {
+ exit(json_encode(array('error' => true)));
+ }
+ }
+
+} elseif ($operation == 'newFolder') {//新建文件夹
+ $fid = isset($_GET['fid']) ? intval($_GET['fid']) : '';
+ $folderinfo = C::t('folder')->fetch($fid);
+ $noperm = 1;
+ if ($folderinfo['gid'] && C::t('organization_admin')->chk_memberperm($folderinfo['gid'])) {
+ $noperm = 0;
+ $inheritperm = DB::result_first("select perm from %t where fid = %d", array('folder', $fid));
+ }
+ $permgroups = C::t('resources_permgroup')->fetch_all(true);
+ $perms = get_permsarray();//获取所有权限
+ if (isset($_GET['createfolder'])) {
+ $perms = isset($_GET['selectperm']) ? $_GET['selectperm'] : array();
+ $perm = 0;
+ if (!empty($perms) && $perms) {
+ foreach ($perms as $v) {
+ $perm += intval($v);
+ }
+ $perm += 1;
+ }
+
+ $name = !empty($_GET['foldername']) ? trim($_GET['foldername']) : lang('newfolder');
+ $fid = intval($_GET['fid']);
+ $fname = io_dzz::name_filter(getstr($name, 80));
+ if ($arr = IO::CreateFolder($fid, $fname, $perm)) {
+ if ($arr['error']) {
+ } else {
+ $arr = array_merge($arr['icoarr'], $arr['folderarr']);
+ $arr['msg'] = 'success';
+
+ }
+ } else {
+ $arr = array();
+ $arr['error'] = lang('failure_newfolder');
+ }
+ exit(json_encode($arr));
+ } else {
+ $permselect = true;
+ }
+
+
+} elseif ($operation == 'newLink') {//新建连接
+ $fid = isset($_GET['fid']) ? intval($_GET['fid']) : '';
+ if (!perm_check::checkperm_Container($fid, 'upload', $bz)) {
+ $arr = array('error' => lang('no_privilege'));
+ }
+} elseif ($operation == 'linkadd') {
+ if (isset($_GET['createlink']) && $_GET['createlink']) {
+ $link = isset($_GET['link']) ? trim($_GET['link']) : '';
+ $fid = isset($_GET['fid']) ? intval($_GET['fid']) : '';
+ //检查网址合法性
+ if (!preg_match("/^(http|ftp|https|mms)\:\/\/.{5,300}$/i", ($link))) {
+ $link = 'http://' . preg_replace("/^(http|ftp|https|mms)\:\/\//i", '', $link);
+ }
+ if (!preg_match("/^(http|ftp|https|mms)\:\/\/.{4,300}$/i", ($link))) {
+ $arr['error'] = lang('invalid_format_url');
+ } else {
+
+ $ext = strtolower(substr(strrchr($link, '.'), 1, 10));
+ $isimage = in_array(strtoupper($ext), $imageexts) ? 1 : 0;
+ $ismusic = 0;
+
+ //是图片时处理
+ if ($isimage) {
+ if (!perm_check::checkperm_Container($fid, 'upload')) {
+ $arr['error'] = lang('target_not_accept_image');
+ }
+ if ($data = io_dzz::linktoimage($link, $fid)) {
+ if ($data['error']) $arr['error'] = $data['error'];
+ else {
+ $arr = $data;
+ $arr['msg'] = 'success';
+ }
+ }
+
+ } else {
+ //试图作为视频处理
+ if ($data = io_dzz::linktovideo($link, $fid)) {
+ if (!perm_check::checkperm_Container($fid, 'upload')) {
+ $arr['error'] = lang('target_not_accept_video');
+ } else {
+ if ($data['error']) $arr['error'] = $data['error'];
+ else {
+ $arr = $data;
+ $arr['msg'] = 'success';
+ }
+ }
+ }
+ //作为网址处理
+ if (!perm_check::checkperm_Container($fid, 'upload')) {
+ $arr['error'] = lang('target_not_accept_link');
+ } else {
+ if ($data = io_dzz::linktourl($link, $fid)) {
+ if ($data['error']) {
+ $arr['error'] = $data['error'];
+ } else {
+ $arr = $data;
+ $arr['msg'] = 'success';
+ }
+ } else {
+ $arr['error'] = lang('network_error');
+ }
+ }
+
+ }
+
+ }
+ }
+ exit(json_encode($arr));
+} elseif ($operation == 'showtips') {
+ $msgtext = isset($_GET['msg']) ? trim($_GET['msg']) : lang('system_unknow_error');
+} elseif ($operation == 'dzzdocument' || $operation == 'txt') {//新建文档
+ if ($operation == 'dzzdocument') {
+ $ext = 'dzzdoc';
+ } else {
+ $ext = 'txt';
+ }
+ $name = lang('new_' . $ext);
+ $filename = $name . '.' . $ext;
+ $fid = isset($_GET['fid']) ? intval($_GET['fid']) : '';
+ if ($arr = IO::upload_by_content(' ', $fid, $filename)) {
+ if ($arr['error']) {
+
+ } else {
+ $arr['msg'] = 'success';
+ }
+ } else {
+ $arr = array();
+ $arr['error'] = lang('failure_newfolder');
+ }
+} elseif ($operation == 'newIco') {//新建文件
+ $type = trim($_GET['type']);
+ $fid = intval($_GET['fid']);
+ $filename = '';
+ $bz = getBzByPath($fid);
+ switch ($type) {
+
+ case 'newTxt':
+ $filename = lang('new_txt') . '.txt';
+ if (!perm_check::checkperm_Container($fid, 'upload', $bz)) {
+ exit(json_encode(array('error' => lang('privilege'))));
+ }
+ $content = ' ';
+ break;
+ case 'newDzzDoc':
+ $filename = lang('new_dzzdoc') . '.dzzdoc';
+ if (!perm_check::checkperm_Container($fid, 'upload', $bz)) {
+ exit(json_encode(array('error' => lang('privilege'))));
+ }
+ $content = ' ';
+ break;
+ case 'newDoc':
+ $filename = lang('new_word') . '.docx';
+ if (!perm_check::checkperm_Container($fid, 'upload', $bz)) {
+ exit(json_encode(array('error' => lang('privilege'))));
+ }
+ $content = file_get_contents(DZZ_ROOT . './dzz/images/newfile/word.docx');
+ break;
+ case 'newExcel':
+ $filename = lang('new_excel') . '.xlsx';
+ if (!perm_check::checkperm_Container($fid, 'upload', $bz)) {
+ exit(json_encode(array('error' => lang('privilege'))));
+ }
+ $content = file_get_contents(DZZ_ROOT . './dzz/images/newfile/excel.xlsx');
+ break;
+ case 'newPowerPoint':
+ $filename = lang('new_PowerPoint') . '.pptx';
+ if (!perm_check::checkperm_Container($fid, 'upload', $bz)) {
+ exit(json_encode(array('error' => lang('privilege'))));
+ }
+ $content = file_get_contents(DZZ_ROOT . './dzz/images/newfile/ppt.pptx');
+ break;
+ }
+
+ if ($arr = IO::upload_by_content($content, $fid, $filename)) {
+ if ($arr['error']) {
+ } else {
+ $arr['msg'] = 'success';
+ }
+ } else {
+ $arr = array();
+ $arr['error'] = lang('new_failure');
+ }
+ exit(json_encode($arr));
+} elseif ($operation == 'getfid') {//获取路径对应目录
+ $path = isset($_GET['name']) ? trim($_GET['name']) : '';
+ $prefix = isset($_GET['prefix']) ? trim($_GET['prefix']) : '';
+ $arr = array();
+ if ($fid = C::t('resources_path')->fetch_by_path($path, $prefix)) {
+ if (preg_match('/c_\d+/', $fid)) {
+ $arr['cid'] = str_replace('c_', '', $fid);
+ } else {
+ $folderarr = C::t('folder')->fetch($fid);
+ if ($folderarr['gid']) {
+ $arr['gid'] = $folderarr['gid'];
+ if ($folderarr['flag'] != 'organization') {
+ $arr['fid'] = $fid;
+ }
+ } else {
+ $arr['fid'] = $fid;
+ }
+ }
+ exit(json_encode(array('success' => $arr, 'json')));
+ } else {
+ exit(json_encode(array('error' => true, 'json')));
+ }
+} elseif ($operation == 'uploadfile') {//上传文件获取相关文件信息
+ $rid = isset($_GET['rid']) ? trim($_GET['rid']) : '';
+ if ($rid) {
+ $arr = C::t('resources')->fetch_by_rid($rid);
+ } else {
+ $arr = array('error' => lang('system_busy'));
+ }
+} elseif ($operation == 'getfolder') {//获取文件夹信息
+ $fid = isset($_GET['fid']) ? intval($_GET['fid']) : '';
+ if ($fid) {
+ $arr = C::t('resources')->fetch_by_oid($fid);
+ } else {
+ $arr = array('error' => lang('system_busy'));
+ }
+
+} elseif ($operation == 'collect') {//收藏与取消收藏
+ $paths = $_GET['paths'];
+ //collect参数为1为收藏,否则为取消收藏,未接收到此参数，默认为收藏
+ $collect = isset($_GET['collect']) ? $_GET['collect'] : 1;
+ $rids = array();
+ foreach ($paths as $v) {
+ $rids[] = dzzdecode($v);
+ }
+ if ($collect) {//加入收藏
+ $return = C::t('resources_collect')->add_collect_by_rid($rids);
+ exit(json_encode($return));
+ } else {//取消收藏
+ $return = C::t('resources_collect')->delete_usercollect_by_rid($rids);
+ exit(json_encode($return));
+ }
+} elseif ($operation == 'tag') {
+ $rid = isset($_GET['rid']) ? $_GET['rid'] : '';
+ if (!$fileinfo = C::t('resources')->fetch_info_by_rid($rid)) {
+ showTips(array('error' => true), 'json');
+ }
+ $tags = C::t('resources_tag')->fetch_tag_by_rid($rid);
+ if (isset($_GET['addtag']) && $_GET['addtag']) {
+ $tags = isset($_GET['tags']) ? $_GET['tags'] : '';
+ $tagsarr = array_filter(explode(',', $tags));
+ if (empty($tagsarr)) {
+ exit(json_encode(array('error' => lang('tag_name_ismust'))));
+ }
+ $tagsubmit = array();
+ foreach ($tagsarr as $v) {
+ $tagsubmit[] = getstr($v);
+ }
+ if ($insert = C::t('resources_tag')->insert_data($rid, $tagsubmit)) {
+ $statisarr = array(
+ 'uid' => $uid,
+ 'edits' => 1,
+ 'editdateline' => TIMESTAMP
+ );
+ C::t('resources_statis')->add_statis_by_rid($rid, $statisarr);
+ showTips(array('success' => true, 'tagsadd' => $insert['add'], 'tagsdel' => $insert['del']), 'json');
+ } else {
+ showTips(array('error' => true), 'json');
+ }
+ } else {
+ $tagarr = array();
+ $tagval = array();
+ foreach ($tags as $v) {
+ $tagarr[] = array('name' => $v['tagname']);
+ $tagval[] = $v['tagname'];
+ }
+ $tagstr = htmlspecialchars(json_encode($tagarr));
+ $tagval = implode(',', $tagval);
+ }
+} elseif ($operation == 'comment') {
+ include_once libfile('function/code');
+ include_once libfile('function/use');
+ $fid = intval($_GET['fid']);
+ $rid = trim($_GET['rid']);
+ $msg = isset($_GET['msg']) ? censor($_GET['msg']) : '';
+ //获得提醒用户
+ $at_users = array();
+ $message = preg_replace_callback("/@\[(.+?):(.+?)\]/i", "atreplacement", $msg);
+ $appid = C::t('app_market')->fetch_appid_by_mod('{dzzscript}?mod=' . MOD_NAME,1);
+ if ($rid) {
+ if (!$file = C::t('resources')->fetch_info_by_rid($rid)) {
+ exit(json_encode(array('error' => true)));
+ } else {
+ $eventdata = array('msg' => $msg);
+ if ($insert = C::t('resources_event')->addevent_by_pfid($file['pfid'], 'add_comment', 'addcomment', $eventdata, $file['gid'], $rid, $file['name'], 1)) {
+ $headerColor = C::t('user_setting')->fetch_by_skey('headerColor');
+ $return = array(
+ 'username' => getglobal('username'),
+ 'uid' => getglobal('uid'),
+ 'dateline' => dgmdate(TIMESTAMP, 'H:i'),
+ 'msg' => dzzcode($message),
+ 'commentid' => $insert,
+ 'avatarstatus' => getglobal('avatarstatus', 'member')
+ );
+ if (!$return['avatarstatus'] && $headerColor) {
+ $return['headerColor'] = $headerColor;
+ $return['userfirst'] = new_strsubstr(ucfirst($return['username']), 1, '');
+ }
+ if ($file['uid'] != getglobal('uid')) {
+ $notevars = array(
+ 'from_id' => $appid,
+ 'from_idtype' => 'app',
+ 'url' => ($file['gid'] > 0) ? $_G['siteurl'] . MOD_URL . '#group&do=file&gid=' . $file['gid'] . '&fid=' . $file['pfid'] : $_G['siteurl'] . MOD_URL . '#home&do=file&fid=' . $file['pfid'],
+ 'author' => getglobal('username'),
+ 'authorid' => getglobal('uid'),
+ 'dataline' => dgmdate(TIMESTAMP),
+ 'fname' => getstr($file['name'], 31),
+ 'comment' => ($message) ? getstr(dzzcode($message)) : '',
+ );
+ $action = 'explorer_comment_mydoc';
+ $type = 'explorer_comment_mydoc_' . $file['pfid'];
+ dzz_notification::notification_add($file['uid'], $type, $action, $notevars, 1, 'dzz/explorer');
+ }
+ if ($at_users) {//提醒相关人员
+ foreach ($at_users as $uid) {
+ if ($uid != getglobal('uid')) {
+ //发送通知
+ $notevars = array(
+ 'from_id' => $appid,
+ 'from_idtype' => 'app',
+ 'url' => ($file['gid'] > 0) ? $_G['siteurl'] . MOD_URL . '#group&do=file&gid=' . $file['gid'] . '&fid=' . $file['pfid'] : $_G['siteurl'] . MOD_URL . '#home&do=file&fid=' . $file['pfid'],
+ 'author' => getglobal('username'),
+ 'authorid' => getglobal('uid'),
+ 'dataline' => dgmdate(TIMESTAMP),
+ 'fname' => getstr($file['name'], 31),
+ 'comment' => ($message) ? getstr($message) : '',
+
+ );
+ $action = 'explorer_comment_at';
+ $type = 'explorer_comment_at' . $file['pfid'];
+ dzz_notification::notification_add($uid, $type, $action, $notevars, 0, MOD_PATH);
+ }
+ }
+ }
+
+ showTips(array('success' => true, 'return' => $return, 'json'));
+ }
+
+ }
+ } else {
+ if (!$folder = C::t('folder')->fetch($fid)) {
+ exit(json_encode(array('error' => true)));
+ } else {
+ $rid = C::t('resources')->fetch_rid_by_fid($fid);
+ $eventdata = array('msg' => $msg);
+ if ($insert = C::t('resources_event')->addevent_by_pfid($fid, 'add_comment', 'addcomment', $eventdata, $folder['gid'], ($rid) ? $rid : '', $folder['fname'], 1)) {
+ $headerColor = C::t('user_setting')->fetch_by_skey('headerColor');
+ $return = array(
+ 'username' => getglobal('username'),
+ 'uid' => getglobal('uid'),
+ 'dateline' => dgmdate(TIMESTAMP, 'H:i'),
+ 'msg' => dzzcode($message),
+ 'commentid' => $insert,
+ 'avatarstatus' => getglobal('avatarstatus', 'member')
+ );
+
+ if (!$return['avatarstatus'] && $headerColor) {
+ $return['headerColor'] = $headerColor;
+ $return['userfirst'] = new_strsubstr(ucfirst($return['username']), 1, '');
+ }
+ if ($folder['uid'] != getglobal('uid')) {
+ $notevars = array(
+ 'from_id' => $appid,
+ 'from_idtype' => 'app',
+ 'url' => ($folder['gid'] > 0) ? $_G['siteurl'] . MOD_URL . '#group&do=file&gid=' . $folder['gid'] . '&fid=' . $folder['fid'] : $_G['siteurl'] . MOD_URL . '#home&do=file&fid=' . $folder['fid'],
+ 'author' => getglobal('username'),
+ 'authorid' => getglobal('uid'),
+ 'dataline' => dgmdate(TIMESTAMP),
+ 'fname' => getstr($folder['fname'], 31),
+ 'comment' => ($message) ? getstr(dzzcode($message)) : '',
+ );
+ $action = 'explorer_comment_mydoc';
+ $type = 'explorer_comment_mydoc_' . $fid;
+
+ dzz_notification::notification_add($folder['uid'], $type, $action, $notevars, 0, 'dzz/explorer');
+ }
+ if ($at_users) {//提醒相关人员
+ foreach ($at_users as $uid) {
+ if ($uid != getglobal('uid')) {
+ //发送通知
+ $notevars = array(
+ 'from_id' => $appid,
+ 'from_idtype' => 'app',
+ 'url' => ($folder['gid'] > 0) ? $_G['siteurl'] . MOD_URL . '#group&do=file&gid=' . $folder['gid'] . '&fid=' . $folder['fid'] : $_G['siteurl'] . MOD_URL . '#home&do=file&fid=' . $folder['fid'],
+ 'author' => getglobal('username'),
+ 'authorid' => getglobal('uid'),
+ 'dataline' => dgmdate(TIMESTAMP),
+ 'fname' => getstr($folder['fname'], 31),
+ 'comment' => ($message) ? getstr($message) : '',
+
+ );
+ $action = 'explorer_comment_at';
+ $type = 'explorer_comment_at_' . $fid;
+
+ dzz_notification::notification_add($uid, $type, $action, $notevars, 0, MOD_PATH);
+ }
+ }
+ }
+
+ showTips(array('success' => true, 'return' => $return, 'json'));
+ }
+ }
+
+ }
+
+} elseif ($operation == 'addsearchcat') {//增加类型筛选
+ $id = isset($_GET['id']) ? intval($_GET['id']) : '';
+ if ($id) {
+ $cat = C::t('resources_cat')->fetch_by_id($id);
+ $cattidarr = explode(',', $cat['tag']);
+ $tags = '';
+ foreach (C::t('tag')->fetch_tag_by_tid($cattidarr, 'explorer') as $v) {
+ $tags .= $v['tagname'] . ',';
+ }
+
+ $cat['tag'] = substr($tags, 0, -1);
+ }
+ if (isset($_GET['editcatsearch'])) {
+ $id = $_GET['editcatsearch'];
+ $arr = $_GET['arr'];
+ if (!$arr['catname'] || preg_match('/^\s*$/', $arr['catname'])) {
+ exit(json_encode(array('error' => true, 'msg' => lang('name_is_must'))));
+ }
+
+ $catoldid = DB::result_first("select id from %t where catname = %s and uid = %d", array('resources_cat', $arr['catname'], $uid));
+ if ($catoldid && $catoldid != $id) {
+ exit(json_encode(array('error' => true, 'msg' => lang('typename_must_only'))));
+ }
+ //处理后缀名
+ if ($arr['ext']) {
+ $qualifiedExt = array();
+ $extarr = explode(',', $arr['ext']);
+ foreach ($extarr as $v) {
+ if (!preg_match('/^\.\w+$/', $v)) {
+ $v = '.' . strtolower($v);
+ }
+ if (preg_match('/^\.\w+$/', $v)) {
+ $qualifiedExt[] = strtolower($v);
+ }
+
+ }
+ $qualifiedExt = array_unique($qualifiedExt);
+ $arr['ext'] = implode(',', $qualifiedExt);
+ }
+ if (!$arr['ext']) {
+ exit(json_encode(array('error' => true, 'msg' => lang('cat_is_must'))));
+ }
+ if (C::t('resources_cat')->update($id, $arr)) {
+ exit(json_encode(array('success' => true)));
+ } else {
+ exit(json_encode(array('error' => true)));
+ }
+ }
+ if (isset($_GET['addcatsearch'])) {
+ $arr = $_GET['arr'];
+ //处理名称
+ if (!$arr['catname'] || preg_match('/^\s*$/', $arr['catname'])) {
+ exit(json_encode(array('error' => true, 'msg' => lang('name_is_must'))));
+ }
+ if (DB::result_first("select count(*) from %t where catname = %s and uid = %d", array('resources_cat', $arr['catname'], $uid)) > 0) {
+ exit(json_encode(array('error' => true, 'msg' => lang('typename_must_only'))));
+ }
+ //处理处理后缀名
+ if ($arr['ext']) {
+ $qualifiedExt = array();
+ $extarr = explode(',', $arr['ext']);
+ foreach ($extarr as $v) {
+ if (!preg_match('/^\.\w+$/', $v)) {
+ $v = '.' . strtolower($v);
+ }
+ if (preg_match('/^\.\w+$/', $v)) {
+ $qualifiedExt[] = strtolower($v);
+ }
+ }
+ $qualifiedExt = array_unique($qualifiedExt);
+ $arr['ext'] = implode(',', $qualifiedExt);
+ }
+ if (!$arr['ext']) {
+ exit(json_encode(array('error' => true, 'msg' => lang('cat_is_error'))));
+ }
+ $arr['uid'] = $uid;
+ $insert = C::t('resources_cat')->insert_cat($arr);
+ if ($insert['success']) {
+ exit(json_encode(array('success' => true, 'insertid' => $insert['insert'])));
+ } else {
+ exit(json_encode(array('error' => true, 'msg' => $insert['msg'])));
+ }
+ }
+
+} elseif ($operation == 'delsearchcat') {//删除筛选类型
+ $catid = isset($_GET['id']) ? intval($_GET['id']) : '';
+ if ($_GET['delcat']) {
+ if (C::t('resources_cat')->del_by_id($catid)) {
+ $previd = C::t('resources_cat')->fetch_rencent_id($catid);
+ exit(json_encode(array('success' => true, 'catid' => $catid, 'previd' => $previd)));
+ } else {
+ exit(json_encode(array('error' => true)));
+ }
+ } else {
+ exit(json_encode(array('error' => true)));
+ }
+
+} elseif ($operation == 'share') {//分享
+ if (isset($_GET['paths'])) {
+ $patharr = explode(',', $_GET['paths']);
+ //判断是否是分享id
+ if (count($patharr) == 1 && preg_match('/^\d+$/', $patharr[0])) {
+ $shareid = $patharr[0];
+ } else {
+ $rids = array();
+ foreach ($patharr as $v) {
+ $rids[] = dzzdecode($v);
+ }
+ $files = implode(',', $rids);
+ }
+
+ } else {
+ $files = $_GET['rid'];
+ }
+ if (isset($_GET['share'])) {
+ if (isset($_GET['delshare']) && $_GET['delshare'] == 1 && isset($_GET['do']) && $_GET['do'] == 'del') {
+ $id = isset($_GET['id']) ? intval($_GET['id']) : '';
+ $return = C::t('shares')->delete_by_id($id);
+ if ($return['success']) {
+ showTips(array('success' => true, 'shareid' => $id));
+ } else {
+ showTips(array('error' => $return['error']));
+ }
+ } else {
+ $share = $_GET['share'];
+ $share['title'] = getstr($share['title']);
+ if ($share['endtime']) $share['endtime'] = strtotime($share['endtime']) + 24 * 60 * 60;
+ if ($share['password']) $share['password'] = dzzencode($share['password']);
+ $share['times'] = intval($share['times']);
+ $perm = isset($_GET['perm']) ? $_GET['perm'] : [];
+ if (is_array($perm)) {
+ $share['perm'] = implode(',', $perm);
+ }
+ if (isset($_GET['id']) && $_GET['id']) $id = intval($_GET['id']);
+ $share['filepath'] = trim($_GET['rid']);
+ if ($id) {
+ if ($ret = C::t('shares')->update_by_id($id, $share)) {
+ showTips(array('success' => true, 'shareurl' => C::t('shorturl')->getShortUrl($_G['siteurl'].'index.php?mod=shares&sid='.dzzencode($ret)), 'shareid' => $ret));
+ } else {
+ showTips(array('error' => lang('create_share_failer') . '！'), 'json');
+ }
+ } else {
+ $ret = C::t('shares')->insert($share);
+ if ($ret['success']) {
+ showTips(array('success' => true, 'shareurl' => C::t('shorturl')->getShortUrl($_G['siteurl'].'index.php?mod=shares&sid='.dzzencode($ret['success'])), 'shareid' => $ret['success']));
+ } else {
+ showTips(array('error' => lang('create_share_failer') . '！'), 'json');
+ }
+ }
+ }
+
+ } else {
+ if ($shareid) {
+ if ($share = C::t('shares')->fetch($shareid)) {
+ $share['shareurl'] = C::t('shorturl')->getShortUrl($_G['siteurl'].'index.php?mod=shares&sid='.dzzencode($share['id']));
+ if ($share['password']) $share['password'] = dzzdecode($share['password']);
+ if ($share['status'] >= -2) {
+ if ($share['endtime'] && $share['endtime'] < TIMESTAMP) $share['status'] = -1;
+ elseif ($share['times'] && $share['times'] <= $share['count']) $share['status'] = -2;
+ else $share['status'] = 0;
+ }
+ if ($share['endtime']) $share['endtime'] = dgmdate($share['endtime'], 'Y-m-d');
+ if (!$share['times']) {
+ $share['times'] = '';
+ }
+ $files = $share['filepath'];
+ $share['perm'] = explode(',', $share['perm']);
+ }
+ } else {
+ if ($share = C::t('shares')->fetch_by_path($files)) {
+ $share['shareurl'] = C::t('shorturl')->getShortUrl($_G['siteurl'].'index.php?mod=shares&sid='.dzzencode($share['id']));
+ if ($share['password']) $share['password'] = dzzdecode($share['password']);
+ if ($share['status'] >= -2) {
+ if ($share['endtime'] && $share['endtime'] < TIMESTAMP) $share['status'] = -1;
+ elseif ($share['times'] && $share['times'] <= $share['count']) $share['status'] = -2;
+ else $share['status'] = 0;
+ }
+ if ($share['endtime']) $share['endtime'] = dgmdate($share['endtime'], 'Y-m-d');
+ if (!$share['times']) {
+ $share['times'] = '';
+ }
+ $share['perm'] = explode(',', $share['perm']);
+ $files = $share['filepath'];
+ } else {
+ $rids = explode(',', $files);
+ //默认单个文件分享
+ $more = false;
+ //多个文件分享
+ if (count($rids) > 1) $more = true;
+ $filenames = array();
+ $gidarr = array();
+ foreach (DB::fetch_all("select pfid,name,gid from %t where rid in(%n)", array('resources', $rids)) as $v) {
+ if (!perm_check::checkperm_Container($v['pfid'], 'share')) {
+ $arr = array('error' => lang('no_privilege'));
+ } else {
+ $gidarr[] = $v['gid'];
+ $filenames[] = $v['name'];
+ }
+ }
+ //判断文件来源
+ if (count(array_unique($gidarr)) > 1) {
+ $arr = array('error' => lang('share_notallow_from_different_zone'));
+ }
+ //自动生成分享标题
+ if ($more) {
+ $share['title'] = $filenames[0] . lang('more_file_or_folder');
+ } else {
+ $share['title'] = $filenames[0];
+ }
+ }
+
+ }
+
+ }
+} elseif ($operation == 'property') {//属性
+ $paths = isset($_GET['paths']) ? trim($_GET['paths']) : '';
+ $fid = 0;
+ if (preg_match('/fid_/', $paths)) {
+ $fid = intval(preg_replace('/fid_/', '', $paths));
+ }
+ if ($fid) {
+ if ($rid = C::t('resources')->fetch_rid_by_fid($fid)) {
+ $propertys = C::t('resources')->get_property_by_rid($rid);
+ } else {
+ $propertys = C::t('resources')->get_property_by_fid($fid);
+ }
+ } else {
+ $patharr = explode(',', $paths);
+ $rids = array();
+ foreach ($patharr as $v) {
+ $rids[] = dzzdecode($v);
+ }
+ $propertys = C::t('resources')->get_property_by_rid($rids);
+ }
+ if ($propertys['error']) {
+ $error = $propertys['error'];
+ }
+} elseif ($operation == 'editFileVersionInfo') {
+ $rid = isset($_GET['rid']) ? trim($_GET['rid']) : '';
+ $vid = isset($_GET['vid']) ? intval($_GET['vid']) : 0;
+ $versioninfo = C::t('resources_version')->get_versioninfo_by_rid_vid($rid, $vid);
+} elseif ($operation == 'addIndex') {//索引文件
+ global $_G;
+ $indexarr = array(
+ 'id' => $_GET['rid'].'_'.intval($_GET['vid']),
+ 'name' => $_GET['filename'],
+ 'username' => $_GET['username'],
+ 'type' => $_GET['filetype'],
+ 'flag' => 'explorer',
+ 'vid' => intval($_GET['vid']),
+ 'gid'=>intval($_GET['gid']),
+ 'uid'=>intval($_GET['uid']),
+ 'aid'=>isset($_GET['aid']) ? intval($_GET['aid']) : 0,
+ 'md5'=>isset($_GET['md5']) ? trim($_GET['md5']):'',
+ 'readperm'=>0
+ );
+ $fid = intval($_GET['pfid']);
+ $folderdata = C::t('folder')->fetch($fid);
+ $perm = $folderdata['perm_inherit'];
+ if(perm_binPerm::havePower('read2', $perm)){
+ $indexarr['readperm'] = 2;
+ }elseif(perm_binPerm::havePower('read1', $perm)){
+ $indexarr['readperm'] = 1;
+ }else{
+ $indexarr['readperm'] = 0;
+ }
+ $return = Hook::listen('solraddfile', $indexarr);
+ if ($return[0]['error']) {
+ exit(json_encode($return[0]));
+ } else {
+ exit(json_encode(array('success' => true)));
+ }
+}elseif($operation == 'updateIndex'){
+ $arr = isset($_GET['arr']) ? $_GET['arr']:'';
+ if(empty($arr)){
+ exit(json_encode(array('error' => '缺少数据')));
+ }
+ $rid = isset($arr['rid']) ? trim($arr['rid']):'';
+ if(!$rid) exit(json_encode(array('error' => '缺少数据')));
+ $vid = isset($arr['vid']) ? intval($_GET['vid']):0;
+ $result = Hook::listen('solredit',$setarr);
+ if($result[0]['error']){
+ exit(json_encode(array('error'=>$result[0]['error'])));
+ }else{
+ exit(json_encode(array('success'=>true)));
+ }
+}elseif($operation == 'deleteIndex'){
+ $rids = $_GET['rids'];
+ $ids = array();
+ foreach($rids as $v){
+ $ids[] = $v.'_'.'0';
+ }
+ Hook::listen('solrdel',$ids);
+ exit(json_encode(array('success'=>true)));
+}
+include template('ajax');
\ No newline at end of file
diff --git a/dzz/explorer/app.php b/dzz/explorer/app.php
new file mode 100644
index 0000000..cbfb319
--- /dev/null
+++ b/dzz/explorer/app.php
@@ -0,0 +1,154 @@
+ (isset($setting['explorer_usermemoryOn']) && $setting['explorer_usermemoryOn'] == 'on' )?1:0,
+ 'explorer_mermoryusersetting' => $setting['explorer_mermoryusersetting'],
+ 'explorer_memoryorgusers' => $setting['explorer_memoryorgusers'],
+ 'explorer_organizationOn' => (isset($setting['explorer_organizationOn']) && $setting['explorer_organizationOn'] == 'on' )?1:0,//isset($setting['organizationOn'])?$setting['organizationOn']:'',
+ 'explorer_groupOn' => (isset($setting['explorer_groupOn']) && $setting['explorer_groupOn'] == 'on' )?1:0,//isset($setting['groupOn'])?$setting['groupOn']:'',
+ 'explorer_groupcreate'=>(isset($setting['explorer_groupcreate']) && $setting['explorer_groupcreate'] == 'on' )?1:0,
+ 'explorer_mermorygroupsetting' => $setting['explorer_mermorygroupsetting'],
+ 'explorer_memorygroupusers' => $setting['explorer_memorygroupusers'],
+ 'explorer_catcreate'=>(isset($setting['explorer_catcreate']) && $setting['explorer_catcreate'] == 'on' )?1:0,
+ 'explorer_finallydelete'=>(isset($setting['explorer_finallydelete']))?$setting['explorer_finallydelete']:-1
+ );
+ if(C::t('setting')->update_batch($setarr)){
+ updatecache('setting');
+ exit(json_encode(array('success'=>true,'msg'=>lang('update_setting_success'))));
+ }else{
+ exit(json_encode(array('error'=>true,'msg'=>lang('update_setting_failed'))));
+ }
+}else{
+ //查询所有设置
+ $setting = C::t('setting') -> fetch_all(
+ array(
+ 'explorer_usermemoryOn',
+ 'explorer_mermoryusersetting',
+ 'explorer_memoryorgusers',
+ 'explorer_memorySpace',
+ 'explorer_organizationOn',
+ 'explorer_groupOn',
+ 'explorer_groupcreate',
+ 'explorer_mermorygroupsetting',
+ 'explorer_memorygroupusers',
+ 'explorer_catcreate',
+ 'explorer_finallydelete'
+ ));
+ //处理指定空间人员
+ if($setting['explorer_memoryorgusers']){
+ $muids=explode(',',$setting['explorer_memoryorgusers']);
+ }
+ $orgids=$uids=$sel_org=$sel_user=array();
+ foreach($muids as $value){
+ if(strpos($value,'uid_')!==false){
+ $uids[]=str_replace('uid_','',$value);
+ }else{
+ $orgids[]=$value;
+ }
+ }
+ $open=array();
+ if($orgids){
+ $sel_org=C::t('organization')->fetch_all($orgids);
+
+ foreach($sel_org as $key=> $value){
+ $orgpath=getPathByOrgid($value['orgid']);
+ $sel_org[$key]['orgpath']=implode('-',($orgpath));
+ $arr=(array_keys($orgpath));
+ //print_r($arr);
+ array_pop($arr);
+ if($count=count($arr)){
+ if($open[$arr[$count-1]]){
+ if(count($open[$arr[$count-1]])>$count) $open[$arr[count($arr)-1]]=$arr;
+ }else{
+ $open[$arr[$count-1]]=$arr;
+ }
+ }
+ }
+ if(in_array('other',$orgids)){
+ $sel_org[]=array('orgname'=>lang('no_org_user'),'orgid'=>'other','forgid'=>1);
+ }
+ }
+
+ if($uids){
+ $sel_user=C::t('user')->fetch_user_avatar_by_uids($uids);
+ if($aorgids=C::t('organization_user')->fetch_orgids_by_uid($uids)){
+ foreach($aorgids as $orgid){
+ $arr= C::t('organization')->fetch_parent_by_orgid($orgid,true);
+
+ if($count=count($arr)){
+ if($open[$arr[$count-1]]){
+ if(count($open[$arr[$count-1]])>$count) $open[$arr[count($arr)-1]]=$arr;
+ }else{
+ $open[$arr[$count-1]]=$arr;
+ }
+ }
+ }
+ }
+ }
+ if($setting['explorer_memorygroupusers']){
+ $muids=explode(',',$setting['explorer_memorygroupusers']);
+ }
+ $orgids1=$uids1=$sel_org1=$sel_user1=array();
+ foreach($muids as $value){
+ if(strpos($value,'uid_')!==false){
+ $uids1[]=str_replace('uid_','',$value);
+ }else{
+ $orgids1[]=$value;
+ }
+ }
+ //新建群组用户
+ $open1=array();
+ if($orgids1){
+ $sel_org1=C::t('organization')->fetch_all($orgids1);
+
+ foreach($sel_org1 as $key=> $value){
+ $orgpath=getPathByOrgid($value['orgid']);
+ $sel_org1[$key]['orgpath']=implode('-',($orgpath));
+ $arr=(array_keys($orgpath));
+ //print_r($arr);
+ array_pop($arr);
+ if($count=count($arr)){
+ if($open1[$arr[$count-1]]){
+ if(count($open1[$arr[$count-1]])>$count) $open1[$arr[count($arr)-1]]=$arr;
+ }else{
+ $open1[$arr[$count-1]]=$arr;
+ }
+ }
+ }
+ if(in_array('other',$orgids1)){
+ $sel_org1[]=array('orgname'=>lang('no_org_user'),'orgid'=>'other','forgid'=>1);
+ }
+ }
+
+ if($uids1){
+ $sel_user1=C::t('user')->fetch_user_avatar_by_uids($uids1);
+ if($aorgids=C::t('organization_user')->fetch_orgids_by_uid($uids1)){
+ foreach($aorgids as $orgid){
+ $arr= C::t('organization')->fetch_parent_by_orgid($orgid,true);
+
+ if($count=count($arr)){
+ if($open1[$arr[$count-1]]){
+ if(count($open[$arr[$count-1]])>$count) $open1[$arr[count($arr)-1]]=$arr;
+ }else{
+ $open1[$arr[$count-1]]=$arr;
+ }
+ }
+ }
+ }
+ }
+ $openarr=json_encode(array('orgids'=>$open,'orgids1'=>$open1));
+ require template('app_manage');
+}
diff --git a/dzz/explorer/catsearch.php b/dzz/explorer/catsearch.php
new file mode 100644
index 0000000..d73d71f
--- /dev/null
+++ b/dzz/explorer/catsearch.php
@@ -0,0 +1,187 @@
+del_by_id($catid)){
+ exit(json_encode(array('success'=>true,'insertid'=>$insert)));
+ }else{
+ exit(json_encode(array('error'=>true)));
+ }
+}elseif($do == 'searchfile'){
+ $catid = isset($_GET['id']) ? intval($_GET['id']):'';
+ $cats = C::t('resources_cat')->fetch_by_id($catid);
+ $cattext = explode(',',$cats['ext']);
+ $cattidarr = explode(',',$cats['tag']);
+ $tagarr = C::t('tag')->fetch_tag_by_tid($cattidarr,'explorer');
+}elseif($do == 'filelist'){
+
+ $perpage=isset($_GET['perpage'])?intval($_GET['perpage']):100;//默认每页条数
+ $page = empty($_GET['page'])?1:intval($_GET['page']);//页码数
+ $start = ($page-1)*$perpage;//开始条数
+ $total=0;//总条数
+ $disp=intval($_GET['disp']);
+ $sid=empty($_GET['sid'])?0:$_GET['sid'];//id
+ $catid=intval(str_replace('cat-','',$sid));
+ $marker=empty($_GET['marker'])?'':trim($_GET['marker']);
+ $data=array();
+ $limitsql = "limit $start,$perpage";
+
+ $keyword = isset($_GET['keyword']) ? urldecode($_GET['keyword']) : '';
+
+ $asc = isset($_GET['asc'])?intval($_GET['asc']):1;
+
+ $order = $asc > 0 ? 'ASC' : "DESC";
+
+ switch ($disp) {
+ case 0:
+ $orderby = 'r.name';
+ break;
+ case 1:
+ $orderby = 'r.size';
+ break;
+ case 2:
+ $orderby = array('r.type', 'r.ext');
+ break;
+ case 3:
+ $orderby = 'r.dateline';
+ break;
+
+ }
+ $ordersql='';
+ if(is_array($orderby)){
+ foreach($orderby as $key=>$value){
+ $orderby[$key]=$value.' '.$order;
+ }
+ $ordersql=' ORDER BY '.implode(',',$orderby);
+ }elseif($orderby){
+ $ordersql=' ORDER BY '.$orderby.' '.$order;
+ }
+ $wheresql=' where r.isdelete < 1';
+ $param=array('resources','folder');
+ $folderdata=array();
+ $folderids=array();
+ $cats = C::t('resources_cat')->fetch_by_id($catid);
+ //如果接收到后缀名条件，则按指定后缀名搜索
+ $exts = isset($_GET['exts'])?getstr($_GET['exts']):'';
+ $tags = isset($_GET['tags'])?getstr($_GET['tags']):'';
+ if($exts){
+ $extarr = explode(',',str_replace('.','',$exts));
+ $wheresql .= " and r.ext IN (%n)";
+ $param[]=$extarr;
+ }else{
+ if($cats['ext']){
+ $extarr = explode(',',str_replace('.','',$cats['ext']));
+ $wheresql .= " and r.ext IN (%n)";
+ $param[]=$extarr;
+ }else{
+ $wheresql .= " and 0 ";
+ }
+ }
+ //如果接收到标签条件
+ if($tags){
+ $tagsarr = explode(',',$tags);
+ // print_r($tagsarr);
+ //查询标签表中有对应rid
+ $rids = C::t('resources_tag')->fetch_rid_by_tid($tagsarr);
+ /*print_r($rids);
+ die;*/
+ if(count($rids) < 1){
+ $wheresql .= " and 0";
+ }else{
+ $wheresql .= " and r.rid IN (%n)";
+ $param[]=$rids;
+ }
+
+ }elseif($cats['tag']){
+ $tagsarr = explode(',',$cats['tag']);
+ //查询标签表中有对应rid
+ $rids = C::t('resources_tag')->fetch_rid_in_tid($tagsarr);
+ if(count($rids) < 1){
+ $wheresql .= " and 0";
+ }else{
+ $wheresql .= " and r.rid IN (%n)";
+ $param[]=$rids;
+ }
+ }
+ $explorer_setting = get_resources_some_setting();
+ $orgids = C::t('organization')->fetch_all_orgid();//获取所有有管理权限的部门
+ $powerarr=perm_binPerm::getPowerArr();
+
+ $or=array();
+ //用户自己的文件
+ if($explorer_setting['useronperm']){
+ $or[]="(r.gid=0 and r.uid=%d)";
+ $param[]=$_G['uid'];
+ }
+ //我管理的群组或部门的文件
+ if($orgids['orgids_admin']){
+ $or[]="r.gid IN (%n)";
+ $param[]=$orgids['orgids_admin'];
+ }
+ //我参与的群组的文件
+ if($orgids['orgids_member']){
+ $or[]="(r.gid IN(%n) and ((f.perm_inherit & %d) OR (r.uid=%d and f.perm_inherit & %d)))";
+ $param[]=$orgids['orgids_member'];
+ $param[]=$powerarr['read2'];
+ $param[]=$_G['uid'];
+ $param[]=$powerarr['read1'];
+ }
+ if($or) {
+ $wheresql .=" and (".implode(' OR ',$or).")";
+ $data=array();
+ $folderids=$folderdata=array();
+ if($total=DB::result_first("SELECT COUNT(*) FROM %t r LEFT JOIN %t f ON r.pfid=f.fid $wheresql", $param)){
+ foreach(DB::fetch_all("SELECT rid FROM %t r LEFT JOIN %t f ON r.pfid=f.fid $wheresql $ordersql $limitsql", $param) as $value){
+ if($arr=C::t('resources')->fetch_by_rid($value['rid'])){
+ $data[$arr['rid']]=$arr;
+ $folderids[$arr['pfid']]=$arr['pfid'];
+ if($arr['type']=='folder') $folderids[$arr['oid']]=$arr['oid'];
+ }
+ }
+ //获取目录信息
+ foreach($folderids as $fid){
+ if($folder = C::t('folder')->fetch_by_fid($fid)) $folderdata[$fid] =$folder;
+ }
+ }
+ }
+
+ $disp = isset($_GET['disp']) ? intval($_GET['disp']) : intval($cats['disp']);//文件排序
+ $iconview=(isset($_GET['iconview']) ? intval($_GET['iconview']) : intval($cats['iconview']));//排列方式
+ if(count($data) >= $perpage){
+ $total = $start + $perpage*2 -1;
+ }else{
+ $total = $start + count($data);
+ }
+ if(!$json_data=json_encode($data)) $data=array();
+ if(!$json_data=json_encode($folderdata)) $folderdata=array();
+ //返回数据
+ $return=array(
+ 'sid'=>$sid,
+ 'total'=>$total,
+
+ 'data'=>$data?$data:array(),
+ 'folderdata'=>$folderdata?$folderdata:array(),
+ 'param'=>array(
+ 'disp'=>$disp,
+ 'view'=>$iconview,
+ 'page'=>$page,
+ 'perpage'=>$perpage,
+ 'bz'=>$bz,
+ 'total'=>$total,
+ 'asc'=>$asc,
+ 'keyword'=>$keyword,
+ 'tags'=>$tags,
+ 'exts'=>$exts,
+ 'localsearch'=>$bz?1:0
+ )
+ );
+ exit(json_encode($return));
+
+}
+include template('file_content');
\ No newline at end of file
diff --git a/dzz/explorer/collection.php b/dzz/explorer/collection.php
new file mode 100644
index 0000000..321517e
--- /dev/null
+++ b/dzz/explorer/collection.php
@@ -0,0 +1,117 @@
+ 0 ? 'ASC' : "DESC";
+
+ switch ($disp) {
+ case 0:
+ $orderby = 'filename';
+ break;
+ case 1:
+ $orderby = 'size';
+ break;
+ case 2:
+ $orderby = '';
+ break;
+ case 3:
+ $orderby = 'dateline';
+ break;
+
+ }
+ $ordersql='';
+ if(is_array($orderby)){
+ foreach($orderby as $key=>$value){
+ $orderby[$key]=$value.' '.$order;
+ }
+ $ordersql=' ORDER BY '.implode(',',$orderby);
+ }elseif($orderby){
+ $ordersql=' ORDER BY '.$orderby.' '.$order;
+ }
+ $collects = C::t('resources_collect')->fetch_by_uid($limitsql,$ordersql);
+ $explorer_setting = get_resources_some_setting();
+ $data=array();
+ $folderids=$folderdata=array();
+ foreach($collects as $v){
+ $val = C::t('resources')->fetch_by_rid($v['rid']);
+ if(!$explorer_setting['useronperm'] && $val['gid'] == 0){
+ continue;
+ }
+ if(!$explorer_setting['grouponperm'] && $val['gid'] > 0){
+ if(DB::result_first("select `type` from %t where orgid = %d",array('organization',$val['gid'])) == 1){
+ continue;
+ }
+ }
+ if(!$explorer_setting['orgonperm'] && $val['gid'] > 0){
+ if(DB::result_first("select `type` from %t where orgid = %d",array('organization',$val['gid'])) == 0){
+ continue;
+ }
+ }
+ $folderids[$val['pfid']]=$val['pfid'];
+ if($val['type']=='folder') $folderids[$val['oid']]=$val['oid'];
+ /*if($val['isdelete'] > 0){
+ $val['collectstatus'] = -1;//收藏文件被删除
+ }elseif($val['pfid'] != $v['pfid']){
+ $val['collectstatus'] = -2;//收藏文件被移动
+ }*/
+ if($val['isdelete'] < 1 /*&& $val['pfid'] == $v['pfid']*/){
+ $data[$val['rid']]=$val;
+ }
+
+ }
+ //获取目录信息
+ foreach($folderids as $fid){
+ if($folder = C::t('folder')->fetch_by_fid($fid)) $folderdata[$fid] =$folder;
+ }
+
+ $disp = isset($_GET['disp']) ? intval($_GET['disp']) : 0;//文件排序
+ $iconview=isset($_GET['iconview']) ? intval($_GET['iconview']):4;//排列方式
+ $total=$start+count($data);//总条数
+ if(!$json_data=json_encode($data)) $data=array();
+ if(!$json_data=json_encode($foldedata)) $folderdata=array();
+ //返回数据
+ $return=array(
+ 'sid'=>$sid,
+ 'total'=>$total,
+
+ 'data'=>$data?$data:array(),
+ 'folderdata'=>$folderdata?$folderdata:array(),
+ 'param'=>array(
+ 'disp'=>$disp,
+ 'view'=>$iconview,
+ 'page'=>$page,
+ 'perpage'=>$perpage,
+ 'bz'=>$bz,
+ 'total'=>$total,
+ 'asc'=>$asc,
+ 'keyword'=>$keyword,
+ 'tags'=>'',
+ 'exts'=>'',
+ 'localsearch'=>$bz?1:0
+ )
+ );
+ exit(json_encode($return));
+}elseif($do == 'canclecollect'){//取消收藏
+ $rids = isset($_GET['rids'])?$_GET['rids']:'';
+ $return = C::t('resources_collect')->delete_usercollect_by_rid($rids);
+ exit(json_encode($return));
+}else{
+ $filearr = array();
+
+ include template('collection_content');
+}
diff --git a/dzz/explorer/config/config.php b/dzz/explorer/config/config.php
new file mode 100644
index 0000000..7494e63
--- /dev/null
+++ b/dzz/explorer/config/config.php
@@ -0,0 +1,7 @@
+false,
+ 'allow_view'=>1,
+ 'about'=>array('name_zh'=>'网盘','name_en'=>'Drive','version'=>'V2.05'),
+ 'libfile'=>'function/appperm',
+);
\ No newline at end of file
diff --git a/dzz/explorer/config/index.htm b/dzz/explorer/config/index.htm
new file mode 100644
index 0000000..e69de29
diff --git a/dzz/explorer/cron/cron_explorer_recycle.php b/dzz/explorer/cron/cron_explorer_recycle.php
new file mode 100644
index 0000000..f3c0165
--- /dev/null
+++ b/dzz/explorer/cron/cron_explorer_recycle.php
@@ -0,0 +1,32 @@
+fetch('explorer_finallydelete');
+$executetime = 0;
+if($day == 0){
+ $executetime = $time + 86400;
+}elseif($day > 0){
+ $executetime = $time - 86400*$day;
+}
+if($executetime > 0){
+ $rids = C::t('resources_recyle')->fetch_rid_bydate($executetime);
+ if(count($rids) > 0){
+ $i = 0;
+ foreach($rids as $v){
+ if($i <= 100){
+ IO::Delete($v,true);
+ }
+ $i++;
+ }
+ }
+}
\ No newline at end of file
diff --git a/dzz/explorer/css/file_detailed.css b/dzz/explorer/css/file_detailed.css
new file mode 100644
index 0000000..804090d
--- /dev/null
+++ b/dzz/explorer/css/file_detailed.css
@@ -0,0 +1,2025 @@
+/*头部操作*/
+
+.new-buildMenu{
+ float: right;
+}
+.header-toggle .sizeMenu li a{
+ color: #FFFFFF;
+}
+.sizeMenu{
+ float:right!important;
+}
+.sizeMenu li a{
+ float: left;
+ padding: 0 6px;
+ line-height: 34px;
+ cursor:pointer;
+}
+.sizeMenu li.background-toggle{
+ background-color:rgba(0,0,0,0.2) ;
+ border-radius: 50%;
+ width: 34px;
+ height: 34px;
+}
+.sizeMenu li a i{
+ font-size: 22px;
+ vertical-align: -4px;
+
+}
+.sizeMenu li.rightswitch{
+ display: none;
+}
+.sizeMenu li.listchange{
+ display: none;
+}
+.new-buildMenu{
+ display: none;
+}
+.select-toperate-right .sizeMenu{
+ padding-right: 15px;
+}
+.select-toperate-right .sizeMenu li a{
+ color: rgba(78,85,99,0.65);
+}
+.select-toperate-right .sizeMenu li a:hover{
+ color: rgba(78,85,99,1);
+}
+.select-toperate-right .sizeMenu li .icons-thumbnail{
+ padding: 0 8px 0px 14px;
+}
+/*头部操作*/
+/*我的网盘开始*/
+.yunfile-upload{
+ position: relative;
+}
+
+.dropdown-menu{
+ border-radius: 2px;
+ box-shadow: 0px 4px 13px 0px rgba(62, 62, 62, 0.28);
+ border: 1px solid #d8d8d8;
+}
+.new-buildMenu .dropdown-menu{
+ width: 190px;
+}
+.new-buildMenu .dropdown-menu li:hover a,.yunfile-moreMenu .dropdown-menu>li:hover>a{
+ color:rgba(76, 137, 251, 1);
+}
+.new-buildMenu .newMenu{
+ display: inline-block;
+ margin-right: 5px;
+}
+.btn-cricular{
+ border-radius:500px;
+ color: #FFFFFF;
+ background: none;
+}
+.btn-cricular:hover,.btn-cricular:focus{
+ color: #FFFFFF;
+ background-color: rgba(0, 0, 0,0.2);
+ box-shadow: none;
+}
+/*我的网盘结束*/
+/*文件列表模板详情开始*/
+.filemanage-detail-header{
+ position: relative;
+}
+/*.scroll-y{
+ padding-right: 25px;
+}*/
+.filemanage .table th{
+ border-bottom: 1px solid #EEEEEE;
+}
+.filemanage .detail_header_asc_1{
+ background: none;
+}
+.filemanage .detail_header_asc_0{
+ background: none;
+}
+.filemanage .detail_header_asc{
+ vertical-align: text-top;
+}
+.filemanage .detail_header_asc_1 span,.filemanage .detail_header_asc_0 span{
+ display: none;
+}
+.filemanage .detail_header_asc_1 .dzz-expand-less{
+ display: inline-block;
+ color:#3779ff;
+}
+.filemanage .detail_header_asc_0 .dzz-expand-more{
+ display: inline-block;
+ color:#3779ff;
+}
+.filemanage .table{
+ border-collapse:inherit;
+ margin: 0;
+}
+.filemanage .table td{
+ border-bottom: 1px solid #EEEEEE;
+ border-top:none;
+
+}
+.table>tbody>tr>td, .table>tfoot>tr>td, .table>thead>tr>td{
+ padding: 0.85rem;
+}
+.table>thead>tr>th,.table>tfoot>tr>th,.table>tbody>tr>th{
+ padding:1.42rem 0.85rem;
+}
+.filemanage .detail_tr.hover{
+ background: #F2F2F2;
+}
+.filemanage .detail_tr.Icoselected{
+ background:#3779ff;
+}
+.filemanage .detail_tr.Icoblock .dzz-colllection-item{
+ vertical-align: middle;
+ padding-left: 5px;
+ color: #BBBBBB;
+ cursor: default;
+}
+.filemanage .detail_tr.Icoselected .dzz-colllection-item{
+ vertical-align: middle;
+ padding-left: 5px;
+ color: #fff;
+}
+.filemanage .detail_tr.Icoselected td{
+ border-bottom: 1px solid transparent;
+ color: #FFFFFF;
+}
+.filemanage .detail_tr.Icoselected td .IcoText_folder,.filemanage .detail_tr.Icoselected td .detail_item_td_position_span{
+ color: #FFFFFF;
+}
+.filemanage .detail_tr.Icoselected td .detail_item_name_text input{
+ color:#666666;
+ }
+.filemanage .detail_tr.Icoselected td .hoverTools .btn{
+ color: #FFFFFF;
+}
+.filemanage .detail_text{
+ text-shadow: none;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ line-height: inherit;
+ max-width: -webkit-calc(100% - 60px);
+ max-width: -moz-calc(100% - 60px);
+ max-width: calc(100% - 60px);
+ display: inline-block;
+ float: left;
+}
+.selectbox{
+ background-image: url(../img/checkbox-check.png)!important;
+}
+.Icoselected .selectbox{
+ background-image: url(../img/checkbox-box.png)!important;
+}
+.member_item_td_select,.detail_item_td_select{
+ padding-top: 2px;
+}
+.hover .icoblank_rightbottom{
+ background-image: none!important;
+}
+.Icoselected .icoblank_rightbottom{
+ background-image: none!important;
+}
+.window .icoblank_rightbottom{
+ background-color: transparent;
+}
+.hoverTools{
+ display:none;
+ top:8px;
+ right:8px;
+ float:right;
+}
+.filemanage .detail_item_name_icon, .DragCopy .detail_item_name_icon{
+ margin-right: 0px;
+}
+.filemanage .detail_item_td_name{
+ width: calc(100% - 70px);
+ width: -webkit-calc(100% - 70px);
+ width: -moz-calc(100% - 70px);
+}
+.filemanage .detail_item_td_name>a:first-child {
+ min-width: 28px;
+ text-align: center;
+ max-height: 28px;
+}
+.hover .hoverTools{
+ display:block;
+}
+.renaming .hoverTools{/*重命名时不显示*/
+ display:none;
+}
+.filemanage .detail_header_td_div{
+ overflow: hidden;
+ position: relative;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
+.filemanage .detail_item_td_name,.filemanage td,.filemanage th{
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ line-height:inherit;
+}
+
+.yunfile-btnMenu .btn,.yunfile-moreMenu .btn,.recycle-option-icon .btn,.share-option-icon .btn{
+ padding:0px;
+ font-size:14px;
+ background:none;
+ border:0;
+ box-shadow: none;
+}
+.yunfile-btnMenu .btn i,.recycle-option-icon .btn span,.share-option-icon .btn span{
+ font-size: 22px;
+ vertical-align: top;
+ padding: 5px 9px;
+ display: inline-block;
+}
+.yunfile-moreMenu .btn i{
+ font-size: 22px;
+ vertical-align: top;
+ padding: 5px 14px 5px 7px;
+ display: inline-block;
+}
+.hoverTools .btn,.member_hoverTools .btn{
+ color: rgba(78,85,99,0.65);
+ font-size: 18px;
+ padding:0px 7px;
+ background:none;
+ border:0;
+ box-shadow: none;
+}
+.hoverTools .btn:hover,.member_hoverTools .btn:hover{
+ color:rgba(78,85,99,1);
+}
+.recycle-option-icon .btn:hover,.share-option-icon .btn:hover{
+ /*background:RGBA(0,0,0,.05);*/
+ box-shadow: none;
+ color: #666666;
+ opacity: 1;
+}
+.detail_header_tr th{
+ color:rgba(99, 99, 99, 1);
+}
+.mousehover{
+ display: none;
+}
+/*.shareMenu{
+ float:right;
+ display: inline-block;
+ line-height: 64px;
+}*/
+/*.shareMenu button:focus{
+ border:none;
+ outline: none;
+ outline-offset:0;
+}*/
+.shareMenu .btn:focus{
+ border:none;
+ outline: none;
+ outline-offset:0;
+}
+.shareMenu .btn{
+ color: rgba(78,85,99,0.65);
+}
+
+.yunfile-btnMenu .btn:hover,.yunfile-moreMenu .btn:hover{
+ color: rgba(78,85,99,1);
+}
+.recycle-option-icon button,.share-option-icon button{
+ color: #666666;
+ opacity: 0.65;
+}
+.yunfile-moreMenu{
+ border-right: 1px solid rgba(0, 0, 0, 0.1);
+}
+.yunfile-btnMenu,.yunfile-moreMenu{
+ display: inline-block;
+}
+.yunfile-moreMenu .dropdown-menu{
+ width:auto;
+ min-width:130px;
+}
+.yunfile-moreMenu .dropdown-menu>.dropdown-submenu>a:after{
+ right:15px;
+}
+.yunfile-moreMenu .dropdown-menu>.dropdown-submenu .dropdown-menu{
+ left: calc(-106%);
+ left: -moz-calc(-106%);
+ left: -webkit-calc(-106%);
+}
+.yunfile-moreMenu .dropdown-menu .filee-icon {
+ width: 16px;
+ height: 16px;
+ top: 10px;
+}
+.dropdown-menu >ul li:hover, .dropdown-menu > ul li > a:focus{
+ background-color: #f3f3f3;
+}
+/*.yunfile-moreMenu .dropdown button{
+ background: none;
+}*/
+.yunfile-moreMenu .dropdown.open button{
+ /*background: rgba(238, 238, 238, 1);*/
+}
+
+/*文件列表 全选*/
+.filemanage-header{
+ position:relative;
+ min-height:39px;
+}
+
+
+/*.selectall-box.Icoselected{
+ width:100%;
+}*/
+.selectall-box a{
+ position:absolute;
+ z-index:10;
+}
+.selectall-box .select-info{
+ font-size: 1.28rem;
+ display: inline-block;
+}
+.filemanage-header .select-info{
+ display: block;
+}
+/*全选结束*/
+/*文件列表模板详情结束*/
+/*右侧列表信息开始*/
+.nothing_message{
+ position:relative;
+ height:100%
+}
+.nothing_message .nothing_allimg{
+ position:absolute;
+ top:0;
+ left:0;
+ right:0;
+ bottom:0;
+ margin:auto;
+ height:220px;
+}
+.nothing_message .nothing_allimg img{
+ width: 200px;
+ }
+.toadytitle{
+ font-size: 14px;
+ font-weight: 600;
+ color: rgba(102, 102, 102, 1);
+ margin-bottom: 15px;
+}
+
+.right_projectmain .ensemble-left{
+ padding-left: 10px;
+ padding-right: 10px;
+}
+.right_projectmain .dynamicMenu{
+ padding:0;
+}
+
+.right-messagetable .right-progress{
+ margin-left: 1.42rem;
+ margin-right: 0.71rem;
+ margin-bottom: 0rem;
+ padding-top: 1.42rem;
+}
+.right-messagetable .progress{
+ height: 0.4rem;
+ border-radius: 0rem;
+ margin-bottom: 0rem;
+ -webkit-box-shadow: none;
+ box-shadow: none;
+}
+.right-messagetable .progress-bar{
+ background-color: #3779ff;
+}
+.dynconMenu{
+ padding-left: 1.42rem;
+ padding-right: 1.42rem;
+}
+.dynconMenu .rightcarousel{
+ border-radius: 50%;
+ text-align: center;
+ display: inline-block;
+ font-size: 18px;
+ margin-top: 2px;
+ width: 25px;
+ height: 25px;
+ position: absolute;
+}
+.dynconMenu .dynameic-times{
+ font-size:12px ;
+ color: #999999;
+}
+.activity-content span{
+ padding-right: 7px;
+ color:rgba(102, 102, 102, 1) ;
+}
+.activity-content span img{
+ width: 24px;
+ height: 24px;
+ margin-left: 5px;
+ margin-right: 5px;
+}
+.dynameic-comment{
+ margin-bottom: 5px;
+}
+.activity-content .activity-name{
+ font-weight: 600;
+
+}
+.forenoon{
+ padding-right: 10px;
+}
+.toadysmalltime{
+ position: relative;
+}
+.toadysmalltime i{
+ position: absolute;
+ top: 7px;
+ left: 1px;
+}
+.right_projectmain .dynamicMenu{
+ padding-top: 15px;
+ margin-bottom: 20px;
+}
+.comment-area{
+ position:absolute;
+ bottom:0px;
+ left: 0px;
+ padding:10px;
+ background:#FFF;
+ width:100%;
+ box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.15);
+ }
+.comment-area .messageMenu{
+ margin:0
+}
+.right_decoration{
+ bottom: -1px;
+ left: 8px;
+ right: 8px;
+ top: auto;
+ position: absolute;
+ border-bottom: 3px solid rgba(76, 137, 251, 1);
+ display: none;
+}
+.select-tab .right_decoration{
+ display: block;
+}
+.discuss-content{
+ position: relative;
+ /*border-bottom: 1px solid rgba(230, 232, 235, 1);*/
+ background: #fff;
+ margin-right: 30px;
+}
+.discuss-header{
+ position: absolute;
+ bottom: 5px;
+ left: 5px;
+}
+.discuss-content .comment-input{
+ overflow: auto;
+ height: 100%;
+ line-height: 20px;
+ /*border:none;*/
+ padding-left: 0px;
+
+}
+.right-newlabel .right-addlabel .opentagwindow{
+ display: none;
+}
+.right-label:hover .right-addlabel .opentagwindow{
+ display: block;
+}
+.right-newlabel .right-addlabel .dzz-edit-button{
+ font-size: 17px;
+ color: rgba(78,85,99,0.65);
+}
+.right-newlabel .right-addlabel .dzz-edit-button:hover{
+ color: rgba(78,85,99,1);
+}
+.righttop_title .toggright-icon{
+ line-height: 56px;
+}
+.toggright-icon{
+ font-size: 18px;
+ width: 30px;
+ line-height: 36px;
+ cursor: pointer;
+ text-align: center;
+ z-index: 1;
+ display: inline-block;
+ float: right;
+}
+.delete-comment{
+ cursor: pointer;
+ opacity: 0;
+ color: #8b8f92;
+ font-size: 16px;
+ vertical-align: sub;
+ padding-right: 0px;
+}
+.dynameic-comment:hover .delete-comment{
+ opacity: 1;
+
+}
+.delete-comment:hover{
+ color: #3779ff;
+}
+.right-numer{
+ border-bottom: 1px solid rgba(231,231,231,1);
+}
+.right-paddingnumer{
+ padding:20px;
+}
+.right-numer .numer-title{
+ display: inline-block;
+ color: rgba(102, 102, 102, 1);
+ font-weight: 600;
+ font-size: 14px;
+}
+.right-numertop .groupbutton{
+ margin-right: 0px;
+}
+.right-numertop .groupbutton{
+ display: none;
+ color:rgba(78,85,99,0.65);
+}
+.right-numer:hover .groupbutton{
+ display:inline-block ;
+}
+.right-numer .groupbutton:hover{
+ color:rgba(78,85,99,1);
+}
+.right-numerbottom .right-numer-carousel{
+ float: left;
+ margin-right: 0.5rem;
+ border-radius: 50%;
+ margin-bottom: 0.5rem;
+ text-align: center;
+ cursor: pointer;
+ position: relative;
+}
+.right-numer-carousel .Topcarousel{
+ width: 28px;
+ height: 28px;
+ line-height:28px;
+ margin-top: 0px;
+}
+.right-numer-carousel a img{
+ width: 28px;
+ height: 28px;
+}
+.right-numerbottom .numerbutton{
+ border: none;
+ background: none;
+}
+.right-numerbottom .right-numer-carousel .dzz-right-first{
+ position: absolute;
+ bottom: -2px;
+ right: -2px;
+}
+.right-numerbottom .right-numer-carousel .dzz-right-first img{
+ width: 1rem;
+ height: 1rem;
+}
+.right_popbox_header .rightdropdown_top{
+ padding-left: 10px;
+ overflow: hidden;
+ padding-top: 10px;
+}
+.right_popbox_header .rightdropdown_top img{
+ width: 25px;
+ height: 25px;
+ float: left;
+ top: 7px;
+}
+.right_popbox_header .rightdropdown_top:hover{
+ background: none;
+}
+.popbox-header-twomenu{
+ left: calc(-100%);
+ left: -moz-calc(-100%);
+ left: -webkit-calc(-100%);
+ min-width: 138px;
+ box-shadow:0 1px 6px rgba(0,0,0,.15);
+ border-radius: 2px;
+ border: 1px solid rgba(0,0,0,0.05);
+ position: absolute;
+ top: -10px;
+ display: none;
+ background:#FFF;
+}
+.popbox-header-twomenu .popbox_li .dzz-fit{
+ display: none;
+ position: absolute;
+ top: 10px;
+ left: 14px;
+}
+.popbox-header-twomenu .popbox_li .dzz-color{
+ display: inline-block;
+ color: #3779ff;
+}
+.popbox-header-twomenu .popbox-text{
+ padding-left: 15px;
+}
+.right_popbox_header>.popbox_li:hover>.right_popbox_header,.right_popbox_header>.popbox_li:focus>.right_popbox_header{
+ display: block;
+}
+.right_popbox_header .rightdropdown-first{
+ border-radius: 50%;
+ display: inline-block;
+ width: 32px;
+ height: 32px;
+ text-align: center;
+ line-height: 32px;
+ float: left;
+ color: #FFFFFF;
+}
+.rightdropdown_title{
+ padding-left: 0.71rem;
+ float: left;
+}
+.rightdropdown_title .rightdropdown_name{
+ font-size: 0.92rem;
+ color: #666666;
+}
+.rightdropdown_title .numer_admin{
+ font-size: 0.85rem;
+ color: #666666;
+}
+.rightdropdown_title .numer_admin .dzz-admin{
+ color:#b71c1c;
+ font-size: 0.85rem;
+}
+.rightdropdown_title .numer_admin .rightdropdown_admin{
+ vertical-align: top;
+}
+
+.right-numerbottom .right-numer-carousel .rightcarousel-first{
+ font-size: 16px;
+ color: #FFFFFF;
+ line-height: 27px;
+}
+.right_popbox_header .popbox_li{
+ padding: 0rem;
+ margin: 0rem;
+ position: relative;
+}
+.right_popbox_header>.popbox_li>a{
+ padding: 0.57rem 0rem 0.57rem 1.78rem;
+ border-radius: 0.14rem;
+ -webkit-transition: background-color .25s;
+ -o-transition: background-color .25s;
+ transition: background-color .25s;
+ display: block;
+ clear: both;
+ line-height: 1.42857143;
+ color: #333;
+ white-space: nowrap;
+}
+.right_popbox_header>.popbox_li>a:hover,.right_popbox_header>.popbox_li>a:focus{
+ color: #262626;
+ text-decoration: none;
+ background-color: #f5f5f5;
+}
+.right_popbox_header .dropdown-dropright{
+ position: absolute;
+ right: 0px;
+ font-size: 20px;
+ color: #333333;
+}
+/*关于开始*/
+.right-about-title{
+ float: left;
+ font-size: 14px;
+ color: rgba(102, 102, 102, 1);
+ font-weight: bold;
+}
+.right-about{
+ border-bottom:1px solid rgba(231,231,231,1);
+}
+.right-about .right-about-conter{
+ padding: 20px;
+}
+.right-about-conter .groupbutton{
+ margin-right: 0px;
+}
+.right-about-conter .right-about-bottom{
+ font-family: "微软雅黑";
+ font-size: 12px;
+}
+.right-about-conter .groupbutton{
+ display: none;
+}
+.right-about-conter:hover .groupbutton{
+ display: inline-block;
+}
+.right-about-conter .right-about-bottom .right-about-name{
+ padding-right: 10px;
+}
+.about-blockhead .about-cue{
+ font-size: 12px;
+ color: #999999;
+}
+.about-blockhead .about-checked{
+ font-size: 12px;
+ padding-left: 10px;
+}
+.about-blockhead .about-open{
+ color: #3779ff;
+}
+.about-blockhead .about-close{
+ color:#666666;
+}
+.right-about-bottom .about-img{
+ border-radius: 50%;
+ width: 24px;
+ height: 24px;
+}
+.modal-footer .btn-rdedanger{
+ cursor: pointer;
+ color: red;
+ line-height: 2.28rem;
+}
+.modal-footer .btn-gaydanger{
+ font-size: 12px;
+ color: #999;
+ font-family: "微软雅黑";
+}
+.modal-footer .btn-gaydanger span.dzz{
+ font-size: 14px;
+ padding-right: 5px;
+}
+.modal-footer .btn-rdedanger span{
+ vertical-align: middle;
+}
+.modal-footer .btn-rdedanger span.dzz{
+ font-size: 1.14rem;
+ padding-right: 5px;
+}
+.group-head .dzz-hide{
+ position: absolute;
+ left: 0px;
+ top: 0px;
+ display: none;
+}
+.group-head .head-file:hover .dzz-hide{
+ display: block;
+}
+.right-about-name-icon,.right-about-name-switch span{
+ cursor: default;
+}
+/*关于结束*/
+/*右侧列表信息结束*/
+/*缩略图样式开始*/
+.Icoblock.middleicon{
+ width: 180px;
+ height: 180px;
+ border: 1px solid #EEEEEE;
+ margin:0.71rem 1.14rem 0.71rem 0.28rem;
+}
+.fileMenu.middleicon{
+ padding-top: 0.71rem;
+}
+.IcoText_div a{
+ font-family: "微软雅黑";
+ font-size: 12px;
+ color: #666666;
+}
+.hover .IcoText_div a{
+ color: #666666;
+}
+.hover table.toggleGlow{
+ background-color:#F2F2F2;
+}
+.hover.Icoblock.middleicon{
+ border-radius: 2px;
+}
+.Icoselected .tr_item_name{
+ background-color:#3779ff;
+
+}
+.Icoselected .IcoText_div a{
+ color: #fff;
+}
+.Icoselected.Icoblock.middleicon{
+ border: 1px solid #3779ff;
+ outline:1px solid #3779ff;
+ border-radius: 2px;
+}
+.Icoblock.middleicon .IcoText_div{
+ padding: 0px 12px;
+}
+.Icoblock.middleicon .td_ico_item_name{
+ overflow: hidden;
+ text-overflow: ellipsis;
+ word-break: break-all;
+ white-space: nowrap;
+
+}
+.Icoselected .td_ico_item_name{
+ color: #fff;
+}
+.window .hover .backgound_radius{
+ border:none;
+ border-radius: 2px;
+ background: none;
+}
+.window .Icoselected .backgound_radius{
+ border: none;
+ border-radius: 2px;
+ background:none;
+}
+.Icoblock.middleicon .icoimgContainer{
+ width: auto;
+ height: auto;
+ max-height: 142px;
+}
+.Icoblock.middleicon .icoimgtips{
+ width: auto;
+ height: auto;
+ max-height: 142px;
+ overflow: hidden;
+}
+.Icoblock.middleicon .Icoblock_icon{
+ overflow: hidden;
+}
+.icoimgContainer_document .Icoblock_icon,.icoimgContainer_dzzdoc .Icoblock_icon,.icoimgContainer_attach .Icoblock_icon,.icoimgContainer_folder .Icoblock_icon{
+ max-height: 96px;
+ max-width: 96px;
+}
+/*缩略图样式开始*/
+/*群组关于样式开始*/
+.about-block{
+ padding-top: 15px;
+}
+.about-block:last-child{
+ border-bottom: none;
+}
+.about-block .about-button{
+ padding-left: 20px;
+}
+.about-blockgroup{
+ margin-bottom: 30px;
+}
+.about-block .control-label{
+ max-width: 65px;
+ float: left;
+ color: rgba(129, 129, 129, 1);
+ z-index: 2;
+ font-weight: 500;
+}
+.about-block .control-label.control-weight{
+ padding-top: 0px;
+ font-weight: 500;
+}
+.head-portrait a{
+ display: inline-block;
+}
+.head-portrait img,.head-file img,.head-file input{
+ width: 24px;
+ height: 24px;
+ border-radius: 50%;
+ /*padding: 5px;*/
+}
+.head-portrait .header-imageselect{
+ width: 25px;
+ height: 25px;
+ border-radius: 50%;
+ display: inline-block;
+ text-align: center;
+ line-height: 25px;
+ margin: 5px;
+}
+.head-portrait.head-hover{
+ background-color: #f2f2f2;
+ border-radius: 50%;
+}
+.head-portrait.head-border{
+ background-color: #dbe6fa;
+ border-radius: 50%;
+}
+.head-portrait{
+ margin-bottom: 10px;
+ position: relative;
+}
+.head-file{
+ position: relative;
+}
+.head-file input{
+ position: absolute;
+ top: 0;
+ left: 0;
+ opacity: 0;
+}
+.about-blockgroup .col-md-10{
+ padding-left: 0px;
+}
+.group-head{
+ overflow: hidden;
+}
+.headinput-checkbox{
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 29px;
+ height: 29px;
+ opacity: 0;
+}
+.about-edit{
+ position: absolute;
+ top: 0;
+ right: 0;
+}
+.about-blockhead .proper-poewr{
+ padding-left: 0px;
+}
+.col-width-500{
+ width: 500px;
+ padding-left: 20px;
+ }
+/*群组关于样式结束*/
+/*群组-成员样式开始*/
+#home-member{
+ padding-left: 25px;
+}
+.member_item_drop .member_item_admin{
+ background-color:rgba(245, 127, 23, 1) ;
+ color: #fff;
+}
+.member_item_drop .member_item_creator{
+ color: #fff;
+ background-color:rgba(76, 137, 251, 1) ;
+}
+.member_item_drop .member_item_cooperate{
+ color:rgba(129, 129, 129, 1) ;
+ background-color:rgba(242, 242, 242, 1) ;
+}
+.member_item_drop .member_item_menu{
+ position: absolute;
+ width: 100%;
+ min-width: 140px;
+}
+.members{
+ padding-top: 10px;
+}
+.group-allgame-top{
+ padding:10px;
+}
+/*群组-成员样式结束*/
+/*弹出框样式统一形式开始*/
+.modal-header{
+ color: rgba(64, 64, 64, 1);
+ border-bottom: none;
+ position: relative;
+}
+.modal-header .modal-title{
+ text-align: center;
+ font-size: 22px;
+}
+.modal-header .close{
+ color: rgba(118, 118, 132, 1);
+ opacity: 1;
+ position: absolute;
+ top: 10px;
+ right: 20px;
+}
+.modal-dialog .modal-content{
+ background:#fff;
+}
+.modal-body .modal-label{
+ color: rgba(129, 129, 129, 1);
+ font-weight: 300;
+}
+.modal-body .about-animate.col-md-11{
+ padding-left: 0px;
+}
+.modal-body .col-xs-9{
+ padding-left: 0px;
+}
+.group .col-xs-2{
+ padding-right: 0;
+}
+.group .col-xs-10{
+ padding-left: 5px;
+}
+.checkbox-custom label,.radio-custom label{
+ font-family: "微软雅黑";
+ font-weight: normal;
+ display:block;
+ padding-left: 5px;
+}
+.modal-footer{
+ border-top: 0;
+}
+.group .group-textarea{
+ resize: none;
+}
+.lbook-label{
+ font-weight: 500;
+}
+.lbook-label span{
+ font-size: 14px;
+}
+.group-head li{
+float: left;
+}
+
+.custom-from{
+ margin-bottom: 30px;
+}
+.dzz-whole-sigh{
+ color:red;
+ font-size:20px;
+ padding-right:5px;
+ vertical-align:text-top;
+}
+.delect_text_red{
+ color:red;
+}
+.delect-title-normal{
+ font-weight: normal;
+ font-size: 1.28rem;
+ /*padding-top: 15px;*/
+ display: inline-block;
+ /*padding-left: 10px;*/
+}
+.alert_error{
+ background-size: 20px 20px;
+ padding: 0px 0px 6px 35px;
+ font-size: 1.28rem;
+}
+/*弹出框新建类型结束*/
+/*弹出框创建分享开始*/
+.about-animate .share-control{
+ width: 100%;
+ border: none;
+ border-bottom: 1px solid rgba(204, 204, 204, 1);
+}
+.share-body{
+ padding:15px 40px;
+}
+.share-dropdown{
+ display: block;
+ border-bottom: 1px solid rgba(204, 204, 204, 1);
+ color: rgba(129, 129, 129, 1);
+}
+.share-glyphicon{
+ float: right;
+}
+.share-body label{
+ color:rgba(76, 137, 251, 1) ;
+ font-size: 12px;
+ font-weight: normal;
+}
+.share-body .share-label{
+ color:rgba(129, 129, 129, 1);
+ font-size: 14px;
+}
+.share-body .share-label .share-labelspan{
+ color:rgba(204, 204, 204, 1) ;
+ font-size: 12px;
+ padding-left: 5px;
+}
+.share-dropdown:hover{
+ color:rgba(129, 129, 129, 1);
+}
+.share-from{
+ margin-bottom: 30px;
+}
+.about-animate .share-readonlyinput{
+ color: rgba(204, 204, 204, 1);
+}
+.share-click{
+ padding: 0px 25px;
+ margin-bottom: 0px;
+}
+.share-click .share-label-bluer{
+ position: absolute;
+ top: 5px;
+ font-weight: normal;
+ color: #666;
+}
+.share-click .leace-blank{
+ color: #bbb;
+}
+.share-click .share-paddingleft{
+ padding-left: 0px;
+}
+.share-click .share-input-text{
+ padding-left: 70px;
+}
+.group-select-members{
+ overflow: hidden;
+}
+.select-toperate-center .share-option-icon{
+ padding-right: 1.07rem;
+}
+/*弹出框创建分享结束*/
+/*弹出框创建属性开始*/
+.nature-body{
+ padding: 15px 50px;
+}
+.nature-body label{
+ color: rgba(102, 102, 102, 1);
+}
+.nature-body .label-text{
+ color: #666;
+}
+.nature-body .nature-from{
+ padding-top: 15px;
+}
+.file-nature{
+ margin-bottom: 5px;
+ }
+/*弹出框创建属性结束*/
+/*弹出框选择成员开始*/
+.user-select-content-left{
+ width: 50%;
+ height: 300px;
+ border-right: 1px solid #d6d6d6;
+ float: left;
+}
+.user-select-content-right{
+ width: 50%;
+ height: 300px;
+ float: right;
+ overflow: auto;
+}
+.user-select-content-left .select-mech{
+ width: 20px;
+ height: 20px;
+}
+.user-select-content-left .glyphicon-menu-down,.user-select-content-left .glyphicon-menu-right{
+ margin-right: 35px;
+}
+
+.user-select-content-left .checkbox-custom{
+ left: 45px;
+}
+.all-yourself .view-eidt{
+ padding-right: 5px;
+ font-size: 18px;
+ color: #3779ff;
+ vertical-align: sub;
+}
+#permgroup .lbook-label{
+ font-size: 16px;
+}
+#permgroup .lbook-label span{
+ font-size: 12px;
+}
+.user-select-content{
+ margin-top: 20px;
+ width: 100%;
+ height: 300px;
+}
+.group-select-members p{
+ padding-left: 0!important;
+}
+.user-select-content-title{
+ padding-left: 10px;
+}
+.group-content{
+ height: 260px;
+}
+.group-content ul li{
+ position: relative;
+}
+.user-select-content-right .selected-member{
+ padding-left: 30px;
+ padding-top: 10px;
+ padding-bottom: 10px;
+}
+.sele-right-classa li{
+ height: 40px;
+ padding-left: 25px;
+ line-height: 40px;
+ margin-left: 5px;
+}
+.sele-right-classa li .ti-close{
+ float: right;
+ padding-right: 15px;
+ line-height: 40px;
+ display: none;
+}
+.sele-right-classa li img {
+ width: 20px;
+ height: 20px;
+ margin-right: 5px;
+}
+.sele-right-classa li:hover{
+ background-color: #f2f2f2;
+ border-radius: 3px;
+}
+.sele-right-classa li:hover .ti-close{
+ display: block;
+}
+.select-file{
+ overflow: hidden;
+}
+.select-file .routeMenu{
+ display: inline-block;
+ font-size: 14px;
+ font-family: "微软雅黑";
+}
+.select-file .routeMenu a{
+ color: #666666;
+}
+.select-file .form-control-feedback{
+ text-align: left;
+ cursor: pointer;
+ color: #cccccc;
+ font-size: 14px;
+}
+.select-file .has-feedback{
+ margin:0 ;
+}
+.select-file .routeMenu{
+ margin: 0;
+}
+.select-file .select-switch{
+ color: #cccccc;
+ font-size: 16px;
+ padding-top: 5px;
+ cursor: pointer;
+}
+.selectw-size,.selectw-use{
+ width: 100px;
+ float: right;
+}
+.selectw-left,.selectw-listleft{
+ padding-right: 170px;
+ overflow: hidden;
+}
+.selectw-right{
+ position: absolute;
+ top: 0px;
+ right: 0;
+ width: 150px;
+}
+.selectw-th{
+ position: relative;
+ margin-bottom: 15px;
+ margin-right: 32px;
+ color: #666666;
+ font-family: "微软雅黑";
+ font-size: 14px;
+}
+.selectw-name{
+ display: inline-block;
+}
+.selectw-name>.checkbox-custom{
+ position: absolute;
+ top: 0px;
+ left: 25px;
+}
+.selectw-name span {
+ padding-left: 35px;
+}
+.selectw-listright{
+ position: absolute;
+ top: 15px;
+ right: 0;
+ width: 150px;
+}
+.selectw-listname .imgMenu{
+ position: absolute;
+ top: 10px;
+ left: 35px;
+}
+.selectw-img{
+ width: 27px;
+ height: 32px;
+}
+.selectw-one{
+ padding-left: 65px;
+ float: left;
+}
+.selectw-listname>.checkbox-custom{
+ top: 15px;
+ left: 25px;
+}
+.selectwList{
+ margin-bottom: 20px;
+ color:#666666 ;
+ font-size: 14px;
+ font-family: "微软雅黑";
+}
+.selectwList .liste:hover{
+ background-color:#fafafa ;
+ color:#666666!important ;
+}
+.group-content-right .mCSB_container{
+ padding-right: 30px;
+ margin-right: 0;
+}
+.selectwList .liste:first-child{
+ border-top: 1px solid #e2e8ea;
+}
+.selectwList .liste{
+ position: relative;
+ padding: 15px 5px;
+ border-bottom: 1px solid #e2e8ea;
+}
+.group-content-right{
+ height: 300px;
+ overflow: auto;
+}
+.select-file li a span{
+ padding-left: 10px;
+ padding-right: 5px;
+}
+
+/*弹出框选择成员结束*/
+/*弹出框新建文件夹开始*/
+.Nfolder-right p{
+ color:#2196f3;
+ padding-bottom: 20px;
+}
+.Nfolder-right p span{
+ color: #666666;
+ padding-left: 5px;
+}
+.properties-Nexplain li{
+ float: left;
+ font-size: 12px;
+ padding-bottom: 5px;
+ padding-left: 0px;
+ width: 50%;
+}
+.all-yourself{
+ font-size: 12px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+/*弹出框新建文件夹结束*/
+/*弹出框样式统一形式结束*/
+/*类型-图片样式开始*/
+.pictures-names{
+ margin-left: 25px;
+ margin-right: 25px;
+ overflow: hidden;
+ border-bottom: 1px dashed rgba(221, 221, 221, 1);
+}
+.fileimg-top{
+ padding-right: 0px;
+ margin-right: 25px;
+ border-top:1px dashed rgba(221, 221, 221, 1);
+}
+.owm-group{
+ float: left;
+ max-width: 80%;
+ padding-top: 10px;
+ margin-bottom: 10px;
+}
+.owm-group .form-group{
+ margin-bottom: 0;
+}
+.owm-group .own-label{
+ font-size: 14px;
+ font-weight: 300;
+ width: 65px;
+ display: inline-block;
+ vertical-align: middle;
+ color: #666666;
+ text-align: right;
+ position: absolute;
+ top: 0px;
+}
+.owm-group .own-type{
+ display: inline-block;
+ padding-left: 70px;
+}
+
+.owm-group .own-type li{
+ float: left;
+ padding: 2px 0px;
+ margin-right:10px ;
+ vertical-align: middle;
+ cursor: pointer;
+ position: relative;
+ margin-bottom: 5px;
+}
+.own-type li .label{
+ font-weight: 300;
+ color: rgba(78, 85, 99, 1);
+ padding: 0.2em 1em 0.3em;
+}
+.label-glitter{
+ background-color:#ECEEF1;
+ border: 1px solid transparent;
+}
+.own-type li .label-rightimg{
+ position: absolute;
+ top:0px;
+ right: -1px;
+}
+.search-select.hover .border-glitter{
+ border: 1px solid rgba(76, 137, 251, 1);
+}
+.search-select.fileclick .border-glitter{
+ border: 1px solid rgba(76, 137, 251, 1);
+}
+.docunment-allfile{
+ float: left;
+ padding-left: 10px;
+ padding-top: 5px;
+ color: rgba(152, 159, 173, 1);
+}
+.share-editbutton{
+ float:right;
+ margin-top: 15px;
+}
+.file-editcon{
+ overflow: hidden;
+ position: relative;
+}
+.public-title .ti-pencil{
+ padding-left: 5px;
+ cursor: pointer;
+}
+/*类型-图片样式结束*/
+/*工具分享页面开始*/
+.share-word{
+ line-height: 34px;
+ height: 34px;
+}
+.share-copyaress{
+ float: left;
+ padding-right: 10px;
+}
+.input-group-addonhover{
+ background: #fff;
+ position: absolute;
+ right: -95px;
+ bottom: 0;
+ display: inline-block;
+ padding: 5px;
+ border: 1px solid #ddd;
+}
+.input-group-addonhover .shareform_qrcode{
+ display: inline-block;
+}
+.input-group-addonhover .allowContextMenu{
+ max-width: 90px;
+ max-height: 90px;
+ margin-right: 0px;
+}
+.deatisinfo td{
+ overflow: visible;
+}
+.deatisinfo a.sharelink{
+ overflow:hidden;
+ display: inline-block;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ max-width:100%;
+ max-height:25px;
+}
+.share-option-icon{
+ border-right: 1px solid rgba(0,0,0,0.1);
+}
+/*工具分享页面结束*/
+/*工具动态页面开始*/
+.form-control-group{
+ margin-bottom: 10px;
+ float: left;
+}
+.fieldset{
+ margin-bottom: 20px;
+ padding: 0px 20px 0px 0px;
+}
+.group-time{
+ margin-left: 20px;
+ float: left;
+}
+
+.group-time input{
+ border: none;
+ border-radius:0px;
+ width: 147px;
+ height: 30px;
+ text-align: left;
+}
+.group-time-animate{
+ display: inline-block;
+}
+.group-time-animate-label{
+ transform: rotate(90deg);
+ -ms-transform: rotate(90deg);
+ -webkit-transform: rotate(90deg);
+ -o-transform: rotate(90deg);
+ -moz-transform: rotate(90deg);
+}
+.group-time-animate.input-black{
+ margin-bottom: 0px;
+}
+.select2-container-multi .select2-choices .select2-search-field input{
+ padding:6px 8px!important;
+}
+.group-tableword{
+ padding:10px 20px 0px 0px;
+ cursor: pointer;
+ display: none;
+ clear: both;
+}
+.group-tableword .scree-term{
+ font-weight: 600;
+ font-size: 14px;
+ color:rgba(99, 99, 99, 1);
+ font-style: normal;
+}
+.group-tableword .label-text{
+ padding: 4px 10px;
+ height: 20px;
+ line-height: 20px;
+ margin-left: 5px;
+ background-color: rgba(227, 242, 253, 1);
+ color:rgba(76, 137, 251, 1) ;
+ font-weight: 500;
+}
+.group-tableword .label-text .group-closeicon{
+ padding-left: 20px;
+ color:rgba(118, 118, 132, 1) ;
+}
+.group-input{
+ float: left;
+ width: 400px;
+}
+.member_header_color{
+ color:#3779ff ;
+}
+.member_header_color:hover{
+ text-decoration: underline;
+}
+.group-time-animate .selectDate{
+ background-color: #FFFFFF;
+}
+.btn_dynamic_more:hover{
+ box-shadow: none;
+ text-decoration: none;
+}
+.btn_dynamic_more{
+ color: #3779ff;
+ font-size: 12px;
+}
+.righttop_title{
+ height: 56px;
+ border-bottom:1px solid rgba(231, 231, 231, 1);
+ line-height: 56px;
+}
+.righttop_title .dzz-right-backing{
+ font-size: 25px;
+ float: left;
+ line-height: 56px;
+ cursor: pointer;
+ color: #666666;
+}
+.righttop_title .right_name{
+ font-size: 14px;
+ color: #71717a;
+ float: left;
+ margin:0;
+}
+.just-now{
+ padding-top: 20px;
+}
+/*工具动态页面结束*/
+/*工具回收站页面开始*/
+.recyle-middle-select{
+ padding-right: 20px;
+}
+.recyle-checkbox{
+ margin-bottom: 10px;
+ padding-bottom: 10px;
+}
+.recyle-middle-select{
+ padding-bottom: 10px;
+}
+.recyle-option{
+ float: left;
+ overflow: hidden;
+ height: 34px;
+}
+.recyle-option .buildMenu{
+ display: inline-block;
+}
+.recyle-option .recyle-text{
+ padding-right: 10px;
+}
+.selectTime{
+ /*border: none;*/
+ height: 34px;
+ text-align: center;
+}
+.recyle-date{
+ display: inline-block;
+}
+.recyle-date .input-black{
+ display: inline-block;
+ margin-bottom: 10px;
+}
+.recyle-date .input-black .input-animate .form-control{
+ background: transparent;
+}
+.recyle-option-all{
+ float: right;
+}
+.recyle-option-all .recyle-option-dropdown{
+ display: inline-block;
+
+}
+.select-toperate-center .recycle-option-icon{
+ padding-right: 7px;
+ border-right: 1px solid rgba(0, 0, 0, 0.1);
+}
+/*工具回收站页面结束*/
+/*管理文件夹权限开始*/
+.properties-list{
+ padding: 15px 10px;
+ border-bottom: 1px solid #DDDDDD;
+ position: relative;
+}
+.perm-top{
+ padding:0px 20px 10px 0px;
+
+}
+.properties-table{
+ padding-top: 10px;
+}
+.properties-baground{
+ width: 100%;
+ background-color:#f2f2f2;
+ margin-bottom: 15px;
+}
+.properties-baground .properties-orange{
+ color: #666;
+ padding-top: 20px;
+ padding-left: 20px;
+}
+.properties-explain{
+ padding-left: 20px;
+ padding-top: 10px;
+ overflow: hidden;
+}
+.properties-explain li{
+ width: 145px;
+ float: left;
+ font-size: 12px;
+ margin-bottom:15px ;
+ /*padding-left: 24px;*/
+ /*background-image: url(../img/icons_ZG-QuanXian.png);*/
+ background-repeat: no-repeat;
+ height: 30px;
+ line-height: 25px;
+}
+.properties-explain li span{
+ font-size: 20px;
+ padding-right: 5px;
+ vertical-align: middle;
+ color: #3779ff;
+ margin-top: -1px;
+ }
+.proper-iconshow{
+ margin-left: 200px;
+ overflow: hidden;
+
+}
+.properties-listRight{
+ width: 250px;
+ position: absolute;
+ right: 0px;
+ top: 0px;
+ height: 100%;
+}
+.proper-absoleopera{
+ position: absolute;
+ top: 16px;
+ left:12px;
+}
+.proper-absoleopera .label-gainsboro{
+ margin-right: 19px;
+}
+.proper-delhover{
+ position: absolute;
+ top: 17px;
+ right: 20px;
+ cursor: pointer;
+}
+.label-gainsboro{
+ font-weight: 300;
+ color: rgba(102, 102, 102, 1);
+ background-color: #fafafa;
+ border-radius: 2px;
+ padding: 2px 5px;
+ border: 1px solid rgba(221, 221, 221, 1);
+}
+.proper-default{
+ color: #333;
+}
+.perm-ok{
+ padding-right: 5px;
+}
+.perm-ok-color{
+ color: #7cb342;
+}
+.select-p{
+ padding-top: 20px;
+ clear: both;
+}
+.select-p .select-perm{
+ padding-bottom: 20px;
+ padding-left:15px ;
+}
+.select-properties li{
+ position: relative;
+ margin-bottom: 15px;
+ height: 30px;
+}
+
+.properties-operation{
+ position: absolute;
+ top: 0;
+ right: 210px;
+}
+.properties-left,.properties-listLeft{
+ margin-right: 250px;
+ overflow: hidden;
+}
+.properties-left p{
+ display:inline-block;
+}
+.properties-left .properties-Name{
+ padding-left: 10px;
+ width: 200px;
+}
+.properties-establish{
+ padding-left: 10px;
+}
+.proper-leftimg{
+ width:200px ;
+ float: left;
+ height: 25px;
+}
+.proper-leftimg img{
+ width: 24px;
+ height: 24px;
+}
+.proper-leftimg .properties-admin{
+ margin-left: 10px;
+ display: inline-block;
+ width: 140px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ vertical-align: middle;
+}
+.proper-show {
+ overflow: hidden;
+}
+.proper-show li{
+ background-repeat: no-repeat;
+ float: left;
+ padding: 0px 5px;
+}
+
+.proper-show li span{
+ font-size: 20px;
+ color: #3779ff;
+}
+.proper-show li>.read-false{
+ color: #ddd;
+}
+.proper-bottom{
+ position: relative;
+ display: inline-block;
+ padding-right: 20px;
+}
+.proper-set{
+ color: #2196f3;
+ display: none;
+}
+.properties-list:hover .proper-delhover .proper-set{
+ display:inline-block;
+}
+.proper-edit{
+ display: inline-block;
+ width: 30px;
+ height: 23px;
+ /*background-image: url(../img/icons_ZG-QuanXian.png);*/
+ background-repeat: no-repeat;
+ vertical-align: middle;
+}
+
+.proper-absoleopera .proper-delete{
+ font-size: 20px;
+ padding-right: 17px;
+ vertical-align: middle;
+ color: #d6d6d6;
+ cursor: pointer;
+}
+.proper-absoleopera .proper-delete:hover{
+ color: #2196f3;
+ cursor: pointer;
+}
+.properties-con{
+ margin-bottom: 20px;
+}
+.properties-th{
+ border-bottom: 1px solid #ddd;
+ position: relative;
+ margin-right: 25px;
+}
+.select-properties .checkbox-custom{
+ font-size: 16px;
+ margin-top: 0px;
+}
+.proper-bottom .proper-span{
+ font-size: 12px;
+}
+/*管理文件夹权限结束*/
+/*群组管理开始*/
+.new-groupmanage{
+ float: right;
+}
+.groupmanage-header-top{
+ float: right;
+}
+.middletopMenu .groupmanage-text{
+ clear: both;
+ padding-top:1.42rem ;
+ font-size: 1rem;
+ color: #999999;
+}
+.middletopMenu .groupmanage-text span{
+ font-size: 16px;
+ padding-right: 0.24rem;
+}
+.groupmanage-time .input-black .input-animate .form-control{
+ background: transparent;
+ height: 35px;
+ padding: 0px;
+}
+.groupmanage-time .input-black .input-animate{
+ padding-bottom: 0px;
+}
+.groupmanage-time .input-black{
+ vertical-align: sub;
+}
+.public-allgroup{
+ position: relative;
+ display: inline-block;
+ min-width: 5rem;
+ padding-right: 0.71rem;
+}
+.public-allgroup.input-black{
+ margin-bottom: 0rem;
+}
+.public-allgroup .form-control[readonly]{
+ background-color: #FFFFFF;
+}
+.public-allgrouptime{
+ display: inline-block;
+}
+.middletopMenu{
+ padding-top: 10px;
+}
+.recycle-top{
+ float: right;
+}
+.groupmanage-top{
+ padding-right: 20px;
+}
+.public-sizeMenu{
+ float: right;
+}
+
+.buildMenu{
+ display: inline-block;
+}
+.groupmanage-paddingbottom{
+ padding-bottom: 20px;
+}
+.groupadmin-toggle{
+ display: inline-block;
+}
+.groupmanage-time{
+ padding-top: 2px;
+ display: inline-block;
+}
+.middletopMenu .dropdown_text{
+ padding-right: 2.14rem;
+}
+.groupmanage-time input.form-control{
+ border-radius: 0px;
+ width: 120px;
+ text-align: left;
+ background-color: transparent;
+}
+.member_item_td .member_item_td_group{
+ width: calc(100% - 40px);
+ width: -webkit-calc(100% - 40px);
+ width: -moz-calc(100% - 40px);
+}
+.member_hoverTools{
+ float: right;
+ display: none;
+}
+/*群组管理结束*/
+/*收藏开始*/
+.yellowstars{
+ color: #ffcc00;
+ padding-left: 10px;
+}
+/*收藏结束*/
+/*搜索页面开始*/
+#search{
+ width: 100%;
+ height: 100%;
+ background: #fff;
+ z-index: 1000;
+ position: fixed;
+ top: 64px;
+}
+/*搜索页面结束*/
+/*功能管理开始*/
+.function-con .switchery{
+ margin-top: 10px;
+ }
+.function-radio{
+ padding-top: 0.28rem;
+ margin-bottom: 0!important;
+}
+.form_app_manage .radio-custom{
+ margin-bottom: 0.71em;
+}
+.form_app_manage .lbook{
+ margin: 0px;
+}
+.form_app_manage .selectorguser,.form_app_manage .selectgroupuser{
+ padding-top: 1.07rem;
+}
+.btn-sorg{
+ margin: 5px 10px 5px 0px !important;
+ padding:5px 3px;
+}
+.btn-sorg .ibtn.dzz-close{
+ margin:0!important;
+
+}
+.ibtn.dzz-close {
+ border-radius: 0;
+ font-size: 18px;
+ width:24px !important;
+ height:auto;
+ line-height: normal;
+ vertical-align: sub;
+ color: rgba(102, 102, 102, 1);
+}
+.ibtn.dzz-close:hover {
+ background: #f9f9f7;
+ color: rgba(102, 102, 102, 1);
+}
+.btn-sorg:hover{
+ box-shadow: none;
+}
+.function-space{
+ width: 160px;
+}
+.function-share{
+ font-size: 14px;
+ color: #aaaaaa;
+ padding-top: 15px;
+ margin-bottom: 0;
+}
+.function-allow{
+ margin-bottom: 10px;
+ font-size: 14px;
+ color: #aaaaaa;
+}
+.function-button{
+ margin-bottom: 20px;
+ padding-top: 20px;
+ overflow: hidden;
+}
+.function-con .form-groups{
+ margin-bottom: 0;
+ padding-bottom: 0.92rem;
+}
+.form_app_manage{
+ padding-top: 1.21rem;
+}
+@media only screen and (max-width:768px ) {
+ .app-label{
+ padding-top: 7px;
+ }
+ }
+}
+
+/*功能管理结束*/
+
\ No newline at end of file
diff --git a/dzz/explorer/css/filelist_detaillist/images/index.htm b/dzz/explorer/css/filelist_detaillist/images/index.htm
new file mode 100644
index 0000000..e69de29
diff --git a/admin/share/images/sort_asc.gif b/dzz/explorer/css/filelist_detaillist/images/sort_asc.gif
similarity index 100%
rename from admin/share/images/sort_asc.gif
rename to dzz/explorer/css/filelist_detaillist/images/sort_asc.gif
diff --git a/admin/share/images/sort_desc.gif b/dzz/explorer/css/filelist_detaillist/images/sort_desc.gif
similarity index 100%
rename from admin/share/images/sort_desc.gif
rename to dzz/explorer/css/filelist_detaillist/images/sort_desc.gif
diff --git a/dzz/explorer/css/filelist_detaillist/images/treeshow.png b/dzz/explorer/css/filelist_detaillist/images/treeshow.png
new file mode 100644
index 0000000000000000000000000000000000000000..06109c6cecd037780a0c2e55918060ffef614210
GIT binary patch
literal 1247
zcmV<51R(o~P)