WindyMadman/dzzoffice
1
0
Fork 0
mirror of https://github.com/zyx0814/dzzoffice.git synced 2025-01-08 11:57:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新1.3.1文件

Browse Source
This commit is contained in:
fhxsnabi 2017-05-03 18:33:54 +08:00
parent d3883af1c6
commit 2b5315470b
33 changed files with 650 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
upload/admin/app/cp.php
View File

@ -28,7 +28,7 @@ if ($do == 'export') {//应用导出
unset($app['dateline']);
$apparray = array();
if ($app['identifier']) {
$entrydir = DZZ_ROOT . './dzz/' . $app['identifier'];
$entrydir = DZZ_ROOT . './dzz/' . str_replace(':','/',$app['identifier']);
if (file_exists($entrydir . '/install.php')) {
$app['extra']['installfile'] = 'install.php';
@ -51,7 +51,7 @@ if ($do == 'export') {//应用导出
}
$apparray['app'] = $app;
$apparray['version'] = strip_tags($_G['setting']['version']);
exportdata('Dzz! app', $app['identifier'] ? $app['identifier'] : random(5), $apparray);
exportdata('Dzz! app', $app['identifier'] ? str_replace(':','_',$app['identifier']) : random(5), $apparray);
exit();
} elseif ($do == 'import') {//导入应用
@ -60,13 +60,13 @@ if ($do == 'export') {//应用导出
} else {
$apparray = getimportdata('Dzz! app');
if ($apparray['app']['identifier']) {
if (!is_dir(DZZ_ROOT . './dzz/' . $apparray['app']['identifier'])) {
if (!is_dir(DZZ_ROOT . './dzz/' . str_replace(':','/',$apparray['app']['identifier']))) {
showmessage('list_cp_Application_directory_exist');
}
$extra = unserialize($apparray['app']['extra']);
$filename = $extra['installfile'];
if (!empty($filename) && preg_match('/^[\w\.]+$/', $filename)) {
$filename = DZZ_ROOT . './dzz/' . $$apparray['app']['identifier'] . '/' . $filename;
$filename = DZZ_ROOT . './dzz/' . str_replace(':','/',$apparray['app']['identifier']) . '/' . $filename;
if (file_exists($filename)) {
@include_once $filename;
} else {
@ -93,8 +93,8 @@ if ($do == 'export') {//应用导出
showmessage('list_cp_Application_delete');
}
if ($app['identifier']) {
$entrydir = DZZ_ROOT . './dzz/' . $app['identifier'];
$file = $entrydir . '/dzz_app_' . $value['identifier'] . '.xml';
$entrydir = DZZ_ROOT . './dzz/' . str_replace(':','/',$app['identifier']);
$file = $entrydir . '/dzz_app_' . str_replace(':','_',$app['identifier']) . '.xml';
if (!file_exists($file)) {
$apparray['disablefile'] = $app['extra']['disablefile'];
$apparray['app']['version'] = $app['version'];
@ -103,7 +103,7 @@ if ($do == 'export') {//应用导出
$apparray = getimportdata('Dzz! app');
}
if (!empty($apparray['disablefile']) && preg_match('/^[\w\.]+$/', $apparray['disablefile'])) {
$filename = entrydir . '/' . $apparray['disablefile'];
$filename = $entrydir . '/' . $apparray['disablefile'];
if (file_exists($filename)) {
@include $filename;
} else {
@ -127,8 +127,8 @@ if ($do == 'export') {//应用导出
}
$finish = FALSE;
if ($app['identifier']) {
$entrydir = DZZ_ROOT . './dzz/' . $app['identifier'];
$file = $entrydir . '/dzz_app_' . $value['identifier'] . '.xml';
$entrydir = DZZ_ROOT . './dzz/' . str_replace(':','/',$app['identifier']);
$file = $entrydir . '/dzz_app_' . str_replace(':','_',$app['identifier']) . '.xml';
if (!file_exists($file)) {
$apparray['app']['extra']['enablefile'] = $app['extra']['enablefile'];
$apparray['app']['version'] = $app['version'];
@ -137,7 +137,7 @@ if ($do == 'export') {//应用导出
$apparray = getimportdata('Dzz! app');
}
if (!empty($apparray['app']['extra']['enablefile']) && preg_match('/^[\w\.]+$/', $apparray['app']['extra']['enablefile'])) {
$filename = entrydir . '/' . $apparray['app']['extra']['enablefile'];
$filename = $entrydir . '/' . $apparray['app']['extra']['enablefile'];
if (file_exists($filename)) {
@include $filename;
} else {
@ -157,17 +157,17 @@ if ($do == 'export') {//应用导出
} elseif ($do == 'install') {//安装应用
$finish = FALSE;
$dir = $_GET['dir'];
$xmlfile = 'dzz_app_' . $dir . '.xml';
$importfile = DZZ_ROOT . './dzz/' . $dir . '/' . $xmlfile;
$xmlfile = 'dzz_app_' . str_replace(':','_',$dir) . '.xml';
$importfile = DZZ_ROOT . './dzz/' . str_replace(':','/',$dir) . '/' . $xmlfile;
if (!file_exists($importfile)) {
showmessage('list_cp_Application_allocation' . '：' . $xmlfile, $_GET['refer']);
showmessage('list_cp_Application_allocation' . ':' . $xmlfile, $_GET['refer']);
}
$importtxt = @implode('', file($importfile));
$apparray = getimportdata('Dzz! app');
$filename = $apparray['app']['extra']['installfile'];
$request_uri = ADMINSCRIPT . '?mod=app';
if (!empty($filename) && preg_match('/^[\w\.]+$/', $filename)) {
$filename = DZZ_ROOT . './dzz/' . $dir . '/' . $filename;
$filename = DZZ_ROOT . './dzz/' . str_replace(':','/',$dir) . '/' . $filename;
if (file_exists($filename)) {
@include_once $filename;
} else {
@ -193,8 +193,8 @@ if ($do == 'export') {//应用导出
$request_uri = ADMINSCRIPT . '?mod=app';
$msg = lang('application_uninstall_successful');
if ($app['identifier']) {
$entrydir = DZZ_ROOT . './dzz/' . $app['identifier'];
$file = $entrydir . '/dzz_app_' . $app['identifier'] . '.xml';
$entrydir = DZZ_ROOT . './dzz/' . str_replace(':','/',$app['identifier']);
$file = $entrydir . '/dzz_app_' . str_replace(':','_',$app['identifier']) . '.xml';
if (!file_exists($file)) {
$apparray['app']['extra']['uninstallfile'] = $app['extra']['uninstallfile'];
$apparray['app']['version'] = $app['version'];
@ -230,8 +230,8 @@ if ($do == 'export') {//应用导出
$finish = FALSE;
$msg = lang('application_upgrade_successful');
$entrydir = DZZ_ROOT . './dzz/' . $app['identifier'];
$file = $entrydir . '/dzz_app_' . $app['identifier'] . '.xml';
$entrydir = DZZ_ROOT . './dzz/' . str_replace(':','/',$app['identifier']);
$file = $entrydir . '/dzz_app_' . str_replace(':','_',$app['identifier']) . '.xml';
if (!file_exists($file)) {
showmessage('list_cp_Application_tautology');
}

32
upload/admin/app/import.php
View File

@ -28,21 +28,49 @@ if ($do == 'available') {
$multi = multi($count, $perpage, $page, $theurl, 'pull-right');
}
} elseif ($do == 'notinstall') {
$identifiers = C::t('app_market') -> fetch_all_identifier();
//$identifiers = C::t('app_market') -> fetch_all_identifier();
$plugindir = DZZ_ROOT . './dzz';
$pluginsdir = dir($plugindir);
$newplugins = array();
print_r($plugindir);exit('ddd');
$list = array();
while ($entry = $pluginsdir -> read()) {
echo $entry;
if (!in_array($entry, array('.', '..')) && is_dir($plugindir . '/' . $entry) && !in_array($entry, $identifiers)) {
$entrydir = DZZ_ROOT . './dzz/' . $entry;
$d = dir($entrydir);
$filemtime = filemtime($entrydir);
$entrytitle = $entry;
$entryversion = $entrycopyright = $importtxt = '';
if (file_exists($entrydir . '/dzz_app_' . $entry . '.xml')) {
$importtxt = @implode('', file($entrydir . '/dzz_app_' . $entry . '.xml'));
}else{
$plugindir1 = $entrydir;
$pluginsdir1 = dir($plugindir1);
while ($entry1 = $pluginsdir1 -> read()) {
if (!in_array($entry1, array('.', '..')) && is_dir($plugindir1 . '/' . $entry1) && !in_array($entry.':'.$entry1, $identifiers)) {
$entrydir1 = $entrydir.'/'. $entry1;
//$filemtime = filemtime($entrydir1);
$entrytitle1 = $entry1;
$entryversion1 = $entrycopyright1 = $importtxt = '';
exit($entrydir1 . '/dzz_app_' . $entry.'_'.$entry1 . '.xml<br>');
if (file_exists($entrydir1 . '/dzz_app_' . $entry.'_'.$entry1 . '.xml')) {
$importtxt = @implode('', file($entrydir1 . '/dzz_app_' . $entry.'_'.$entry1 . '.xml'));
}
if ($importtxt) {
$pluginarray1 = getimportdata('Dzz! app', 0, 1);
if (!empty($pluginarray1['plugin']['name'])) {
$pluginarray1['plugin']['name'] = dhtmlspecialchars($pluginarray1['plugin']['name']);
$pluginarray1['plugin']['version'] = dhtmlspecialchars($pluginarray1['plugin']['version']);
$pluginarray1['plugin']['copyright'] = dhtmlspecialchars($pluginarray1['plugin']['copyright']);
}
$list[$entry.':'.$entry1] = $pluginarray1;
}
exit($entry);
}
}
}
if ($importtxt) {
$pluginarray = getimportdata('Dzz! app', 0, 1);

30
upload/admin/app/list.php
View File

@ -43,6 +43,36 @@ if ($do == 'available') {
if (file_exists($entrydir . '/dzz_app_' . $entry . '.xml')) {
//echo $entrydir.'/dzz_app_'.$entry.'.xml'.'<br>';
$importtxt = implode('', file($entrydir . '/dzz_app_' . $entry . '.xml'));
}else{
$plugindir1 = $entrydir;
$pluginsdir1 = dir($plugindir1);
while ($entry1 = $pluginsdir1 -> read()) {
if (!in_array($entry1, array('.', '..')) && is_dir($plugindir1 . '/' . $entry1) && !in_array($entry.':'.$entry1, $identifiers)) {
$entrydir1 = $entrydir.'/'. $entry1;
//$filemtime = filemtime($entrydir1);
$entrytitle1 = $entry1;
$entryversion1 = $entrycopyright1 = $importtxt = '';
if (file_exists($entrydir1 . '/dzz_app_' . $entry.'_'.$entry1 . '.xml')) {
$importtxt = @implode('', file($entrydir1 . '/dzz_app_' . $entry.'_'.$entry1 . '.xml'));
}
if ($importtxt) {
$apparray = getimportdata('Dzz! app', 0, 1, $importtxt);
$value = $apparray['app'];
if (!empty($value['appname'])) {
$value['appname'] = dhtmlspecialchars($value['appname']);
$value['identifier'] = dhtmlspecialchars($entry.':'.$entry1);
$value['version'] = dhtmlspecialchars($value['version']);
$value['vendor'] = dhtmlspecialchars($value['vendor']);
$value['grouptitle'] = $grouptitle[$value['group']];
$list[$entry.':'.$entry1] = $value;
}
}
}
}
}
if ($importtxt) {
$apparray = getimportdata('Dzz! app', 0, 1, $importtxt);

92
upload/admin/dzzofficefiles.md5
View File

@ -1,10 +1,10 @@
a3d0412af8b9a5fdaaedf3d4f55beb7f *admin/app/cp.php
7efeb0ea8123355ed651b40351f3f885 *admin/app/cp.php
8772746e6e2202f9746f6885d02928b8 *admin/app/default.php
e8a34a326d838359340176c73e97fad6 *admin/app/edit.php
e74c54d2d9fd923e2e7361cd111a8e3e *admin/app/extopen.php
a4752d26844e45a97ea7855557506029 *admin/app/import.php
f9687b1825ab33952e08b0e05f790300 *admin/app/import.php
133a1f7fa36548520ef93e4da5419818 *admin/app/index.php
b1762ea4b9779318089e500f915df42f *admin/app/list.php
6d5d8545fc56e3a11568c176ad75dd01 *admin/app/list.php
0a06d4dbefa6dd3f4a6cda77e549c66a *admin/app/template/app.htm
2d32c4fdd9df1bbdb374d2be873dbde7 *admin/app/template/appdefault.htm
f8f3b63eb8895155ac52b195667076f8 *admin/app/template/edit.htm
@ -44,7 +44,7 @@ f435aa43d76fe565971be63730f42433 *admin/cloud/template/spaceadd.htm
1afa7a4c5bd86ae72d2029903c14f7d6 *admin/filemanage/index.php
f84ffbec5dbc1897f4d588bb105b21ef *admin/filemanage/preview.php
60f4b9ada6a6f45033285947ef251a37 *admin/filemanage/template/main.htm
a63d52824ae7493407f4245ae1850142 *admin/function/function_admin.php
3d3e54df686a2222f07cf39a56592d14 *admin/function/function_admin.php
47dc8940eedd9b2d4a15f34af95ca1d7 *admin/icon/ajax.php
3ce7b7f807d0f663831f98c224a27079 *admin/icon/images/checkbox.png
edec89c5867e268244cd73394a86af0c *admin/icon/images/icon.css
@ -224,7 +224,7 @@ a6f73d37a2aee0fb174b2fec588e817c *core/class/class_image.php
fbc3b00ea49450d8438331f43d8ef401 *core/class/class_QRcode.php
6923f5827393e748358e641c6eeea84a *core/class/class_qyWechat.php
0580dc6f9f63fa14c68dd3afa352c758 *core/class/class_seccode.php
dbac82ae4b4a3c3cc307efbfdfe02bf9 *core/class/class_template.php
dfc1bbf53b2041e8ad1a099875b6de7a *core/class/class_template.php
12c1c33ca39d7582d1d562ce75983a52 *core/class/class_uploadhandler.php
707d3ad1748a53deb8d139c0d6f6cdfe *core/class/class_Wechat.php
e569bf1de139a7dce62d8442a5acc568 *core/class/class_xml.php
@ -245,7 +245,7 @@ d41d8cd98f00b204e9800998ecf8427e *core/class/db/index.htm
11aaf67bd946cdb055f4712490f12af0 *core/class/dzz/dzz_database.php
f9de066632bcdc0748a42bb67c6c44ba *core/class/dzz/dzz_error.php
65d70335954df978704c4429431c1d5b *core/class/dzz/dzz_ftp.php
84c08dc40f8d8011206309efbd2858f9 *core/class/dzz/dzz_io.php
eea45565f60c971b6922fdf23d593592 *core/class/dzz/dzz_io.php
ef217cab20e4391a31198ea4cb47ecbe *core/class/dzz/dzz_memory.php
eb5c167211bc5df07bcb8dad61c3649a *core/class/dzz/dzz_mime.php
6c9a2df51891633c75df9e8374693b57 *core/class/dzz/dzz_notification.php
@ -258,7 +258,7 @@ f076e75181a19fc4623cbfc9c5a3aa3c *core/class/dzz/dzz_table_archive.php
6dc4d8e4ca77b622eee6f9749ad2076a *core/class/dzz/dzz_upgrade.php
0d782dfddb8e05e8d7737634fdb36e61 *core/class/dzz/dzz_upload.php
d41d8cd98f00b204e9800998ecf8427e *core/class/dzz/index.htm
a3b595c5d93ad03e623ad8c4f23e261f *core/class/helper/helper_browser.php
1af997fc336881e5aa1a7bb3b5916e81 *core/class/helper/helper_browser.php
69bdb93a25987843f92cf86888fcedee *core/class/helper/helper_dbtool.php
03d001a775d61b78a731609a1a8cae05 *core/class/helper/helper_form.php
67d9cf172974c26c1574d025b4bbc998 *core/class/helper/helper_json.php
@ -270,15 +270,15 @@ a3b595c5d93ad03e623ad8c4f23e261f *core/class/helper/helper_browser.php
3439600362cb0d913ff506684e108985 *core/class/helper/helper_util.php
d41d8cd98f00b204e9800998ecf8427e *core/class/helper/index.htm
7215ee9c7d9dc229d2921a40e899ec5f *core/class/index.htm
7af9c99e18109ad0e494049ac5ed45ee *core/class/io/io_ALIOSS.php
0e9a1fd02f6f417709a6dc340f0167dd *core/class/io/io_ALIOSS.php
19791b917ad5b7eab111b7b36957b48c *core/class/io/io_api.php
c2fc577ca372b3ec20ebd708f66edb9c *core/class/io/io_baiduPCS.php
055999726d01fcd29d01e14a42343ce2 *core/class/io/io_disk.php
5c2076ce0974a018cf26f6c38ddb8713 *core/class/io/io_dzz.php
23b2838cce2a98af214bc7e21a8df32d *core/class/io/io_ftp.php
2abfcb383afe6049993c6311ec58389f *core/class/io/io_baiduPCS.php
e2a4e6999544ebf2ccee0441e0dbd85a *core/class/io/io_disk.php
632f43db9d01f8b7f1e28eabad79a505 *core/class/io/io_dzz.php
c272b22f58fe165904658aa44b93a794 *core/class/io/io_ftp.php
ca30847a8fb72e6dee5bd87ad954d258 *core/class/io/io_JSS.php
961e679f8375f26d766ea85cae3d2330 *core/class/io/io_OneDrive.php
2d13a6b7b38a5519641b0eb07a1b2709 *core/class/io/io_qiniu.php
c97a2a5c565c81a11966ad837cbcd3ad *core/class/io/io_OneDrive.php
49371875962bd7ce5254e9d3157bf6ee *core/class/io/io_qiniu.php
5dd04cbe294b62a7257a710a6978b1e1 *core/class/io/io_remote.php
d41d8cd98f00b204e9800998ecf8427e *core/class/memory/index.htm
2043a83f4174b5324560eb9b384dfaf5 *core/class/memory/memory_driver_apc.php
@ -287,7 +287,7 @@ d41d8cd98f00b204e9800998ecf8427e *core/class/memory/index.htm
b6f9d067bb2daa2c45c69548d163a013 *core/class/memory/memory_driver_redis.php
9171a62d7d35e654c2127fecca81a448 *core/class/memory/memory_driver_wincache.php
e4afa33b2dfc7d77d004b8fc0bca2a72 *core/class/memory/memory_driver_xcache.php
08e99d4899d13465436b82f2e668f4c4 *core/class/perm/perm_binPerm.php
211cbf161a2fa7871e5efb13a678bbea *core/class/perm/perm_binPerm.php
7b92c379e3677c787e8ffaa0cc49b63d *core/class/perm/perm_check.php
5d9e2b1a83b6a3a9c7e35b87b87171f3 *core/class/perm/perm_FileSPerm.php
143a33da3d4060b242a7e16042c8eb62 *core/class/perm/perm_FolderSPerm.php
@ -557,7 +557,7 @@ fa9c92993126482ca261226b11f2f80f *core/class/table/table_feed_at.php
9263fa4228fe969e3704e6f96e1c06a4 *core/class/table/table_feed_post.php
99ad675b3499be6ee5a24e38dbeaaf2b *core/class/table/table_feed_reply.php
cc20e52e401eab6a5df9b8664074f52c *core/class/table/table_feed_thread.php
cfa8fe9089f4484eaa7b6e3650d9bab9 *core/class/table/table_folder.php
2c8e191a5f8c6e2de627c02398a3ee9f *core/class/table/table_folder.php
711bed5d3de20aff6e476259c42eb2ac *core/class/table/table_folder_default.php
9f535b0fb3c7d29355f2ca12a5d820ec *core/class/table/table_icon.php
b04b6b407ca658549cdf211a21a53050 *core/class/table/table_iconview.php
@ -571,7 +571,7 @@ c71baa033e08eabf9ed83418ec05f073 *core/class/table/table_mailcron.php
331e68a091e59866fdab1a1ffe315860 *core/class/table/table_market_class.php
37d6220d3559f89e624dd629c34cba23 *core/class/table/table_market_developer.php
cab81ce9cdd9b5738566f5722fbe3665 *core/class/table/table_market_field.php
b07a37b2b1029450e951600439afdcce *core/class/table/table_notification.php
82c836a34e14e2213e0b6307e4499691 *core/class/table/table_notification.php
018c57fdf8e98caa2f3ec0ad514d0b0e *core/class/table/table_onlinetime.php
eae060815cc615476b7e430212ec0a71 *core/class/table/table_organization.php
6409810a592d0da4b54ba7d4aaa3973c *core/class/table/table_organization_admin.php
@ -619,7 +619,7 @@ ebf391291e92075c3ce7b7c285cf13c8 *core/class/table/table_vote.php
14ea64ba36379648a043c384dc9b0c50 *core/class/table/table_wx_app.php
372c6538e451b0438cc1369de6dd3840 *core/config/config_default.php
7215ee9c7d9dc229d2921a40e899ec5f *core/config/index.htm
ec36610c11001c0e9b476d5b728a1a22 *core/core_version.php
1b52449bcf8a6da053e02d248f22a82d *core/core_version.php
e5973e34787ad5bd32286eab3a9a758b *core/cron/cron_cache_cleanup_week.php
de1a00a4a6e57f158071538545df4c4d *core/cron/cron_clean_copys0_attachment_by_month.php
24a84f90b0839e8e6a3e697da7896f5d *core/cron/cron_clean_notification_month.php
@ -642,7 +642,7 @@ f2adbe22f5fae255c730024998283b74 *core/function/cache/cache_usergroups.php
76d1658764d98655606c1a67c68712bc *core/function/cache/cache_userstats.php
c45954908829db0f56f573948ccd3bef *core/function/function_cache.php
31a49b34a7111b244c064fde3ff79127 *core/function/function_code.php
0fb98e13800e492d04caa4501e8a8632 *core/function/function_core.php
bccc0a6fc38a0a958ea1e282845bb495 *core/function/function_core.php
df5deda83cec5b96ddcac30cf0459b48 *core/function/function_filesock.php
0c97b2967d924bbe3e88d1821e730fee *core/function/function_mail.php
432ca9e5ee3380d0c5247e167b3e374a *core/function/function_message.php
@ -651,7 +651,7 @@ df5deda83cec5b96ddcac30cf0459b48 *core/function/function_filesock.php
eae202687756c11c51cb9d972b04ccef *core/function/function_seccode.php
fb2092242775371cc2fd1ea2251c4e33 *core/function/function_security.php
d41d8cd98f00b204e9800998ecf8427e *core/function/index.htm
b8c35cc898853f7b5469c97d78723f6c *core/language/zh-cn/lang.php
c13a1ea3c6325c00664fbad78e111785 *core/language/zh-cn/lang.php
c29dba799dc987e98b67d3d522ce0104 *core/misc/misc_ajax.php
83d243c0ad245f9f804226c3ddbd59b7 *core/misc/misc_movetospace.php
77541133e2a4761dcd791d1913cf080f *core/misc/misc_seccode.php
@ -1551,7 +1551,7 @@ b4f89ee805d12b1a52a9ff9ba2d90bd5 *dzz/feed/template/edit_form.htm
7132fe734e791350ebfcbf4227e3ff5e *dzz/feed/template/feed.htm
8e678d94a27058f82f14b694fa93a388 *dzz/feed/template/feed_reply_item.htm
3e2ac7f979356fabec3fa9a4af881c45 *dzz/feed/template/feed_thread_item.htm
3e53d992de90f88c1a4f70ef5e5dcdd3 *dzz/feed/template/publish_home.htm
c5d37587a45e5a06e280c3dff4be75e4 *dzz/feed/template/publish_home.htm
2c5adf0da3ab265f3b9f8aa8f60c0d95 *dzz/feed/template/publish_reply.htm
cc9e9ab5cdb81584832e5889ebbf2e85 *dzz/feed/template/setting.htm
589c7e466757ed1178f26840f1768121 *dzz/feed/template/wxsetting.htm
@ -1582,7 +1582,7 @@ d104fcf119d40c51554ddb8b377142e5 *dzz/folder/images/sort_desc.gif
70049e8dc84a36cdea4802a9909f8a92 *dzz/folder/scripts/jquery.dzzthumb.js
ac74feaa72c438f8f8a8822b5f8a2b72 *dzz/folder/template/list.htm
2de475c97450e94d37de3a8ba1640aa4 *dzz/folder/template/list_item.htm
0be7c15f09707f95d6df62bcf614ac7e *dzz/function/dzz_core.php
b53be2a16881dd9d1da8dcd1ade05299 *dzz/function/dzz_core.php
17f08d0a5688ca4acc01e310d5679216 *dzz/function/function_video.php
10fabd322705311c8cde79c71a48e5c0 *dzz/hotkey/hotkey.htm
325472601571f31e1bf00674c368d335 *dzz/images/b.gif
@ -1905,25 +1905,25 @@ bfb61ace85768034ac9aeadde9451afb *dzz/images/taskicon/yingyong.png
f848fec0f801e5263f58a8d5a1afb825 *dzz/images/taskicon/zoho_sheet.png
6f251cd92e8dd08579305240482dc277 *dzz/images/taskicon/zoho_show.png
221437ef62b2f6739f675e1c60d4856c *dzz/images/taskicon/zoho_writer.png
fdcac45ef1a504ef978767f89e3632cb *dzz/images/taskicon/云下载.png
4b3619b5fc02951d10ac3ae0eea278c3 *dzz/images/taskicon/传输管理器.png
a49cb43dd0c71bc813e1d0662f9b83ad *dzz/images/taskicon/内部窗口.png
932bab7048d142d04dd6f69551ca584f *dzz/images/taskicon/应用管理.png
dbc9dca7783dd575609ddb8876f8a90f *dzz/images/taskicon/我的文档.png
3d40bdd8586385640bac57db6f8e2485 *dzz/images/taskicon/文档查看器.png
a4e25ba5b5af59fd29d53230babff642 *dzz/images/taskicon/文集.png
4706f16618b92222cdd0629672a8f0ab *dzz/images/taskicon/新窗口.png
88b14d895b330065a72e2669b217e2d2 *dzz/images/taskicon/用户管理.png
d726ab1ef0db77d88460dbc5c2e75c20 *dzz/images/taskicon/系统工具.png
bef427cd859768705aaf16a15d5ae0b6 *dzz/images/taskicon/系统设置.png
76b56dd973e7c4f6afd754b5ace8e135 *dzz/images/taskicon/组织架构.png
2aaa42f5b2fb9d4fd2b79c0344859fe7 *dzz/images/taskicon/组织架构1.png
fdcac45ef1a504ef978767f89e3632cb *dzz/images/taskicon/浜戜笅杞.png
4b3619b5fc02951d10ac3ae0eea278c3 *dzz/images/taskicon/浼犺緭绠＄悊鍣.png
a49cb43dd0c71bc813e1d0662f9b83ad *dzz/images/taskicon/鍐呴儴绐楀彛.png
932bab7048d142d04dd6f69551ca584f *dzz/images/taskicon/搴旂敤绠＄悊.png
dbc9dca7783dd575609ddb8876f8a90f *dzz/images/taskicon/鎴戠殑鏂囨。.png
3d40bdd8586385640bac57db6f8e2485 *dzz/images/taskicon/鏂囨。鏌ョ湅鍣.png
a4e25ba5b5af59fd29d53230babff642 *dzz/images/taskicon/鏂囬泦.png
4706f16618b92222cdd0629672a8f0ab *dzz/images/taskicon/鏂扮獥鍙.png
88b14d895b330065a72e2669b217e2d2 *dzz/images/taskicon/鐢ㄦ埛绠＄悊.png
d726ab1ef0db77d88460dbc5c2e75c20 *dzz/images/taskicon/绯荤粺宸ュ叿.png
bef427cd859768705aaf16a15d5ae0b6 *dzz/images/taskicon/绯荤粺璁剧疆.png
76b56dd973e7c4f6afd754b5ace8e135 *dzz/images/taskicon/缁勭粐鏋舵瀯.png
2aaa42f5b2fb9d4fd2b79c0344859fe7 *dzz/images/taskicon/缁勭粐鏋舵瀯1.png
37e9387dc6020660c4c36f37e4b802d1 *dzz/index.php
574b2434ac2a27ee5d529ba7dbbd1426 *dzz/io/download.php
ad75c35fea05c9dc036d6464877c69ef *dzz/io/getStream.php
2e6fe45698d56a394705fd0150446d22 *dzz/io/setStream.php
857da2bd825f020a1622e61aa5f05a5d *dzz/io/thumbnail.php
d51ec6ca1d6ed12c161e2909cf973157 *dzz/language/zh-cn/lang.php
2a7f7a18ce6aae2331ee54762206d304 *dzz/language/zh-cn/lang.php
574753a6f053a8cde7387f037b82c9d0 *dzz/market/index.php
307e3ec98b22ac4347d1839650c7dc9a *dzz/market/language/zh-cn/lang.php
1035df2ecbaa394ff87741a8a81a1325 *dzz/market/notice.php
@ -2050,7 +2050,7 @@ e4e251ff45e5bff262d9f31f34f0ecf7 *dzz/player/t5player/images/tooltip/volumeRail.
fc0bdda35b7a727e9995abcfc9245bf3 *dzz/player/t5player/images/tooltip/volumeRailCapBottom.png
1fb017c74795188db1154dad24c3ae74 *dzz/player/t5player/images/tooltip/volumeRailCapTop.png
4e40547931e65ea3de031c703da2e08a *dzz/player/t5player/images/tooltip/volumeThumb.png
cfd1770f52556b035b38d350c0b31f6a *dzz/player/t5player/images/图片信息参考文档.pdf
cfd1770f52556b035b38d350c0b31f6a *dzz/player/t5player/images/鍥剧墖淇℃伅鍙傝冩枃妗.pdf
f53a731a592273f88f4071ac06b7de7a *dzz/player/t5player/index.php
0012205050c997203383cbd80f19cb27 *dzz/player/t5player/js/cyberplayer.html5.min.js
6a61d5f6a2341f4743e17512d148349b *dzz/player/t5player/js/cyberplayer.min.js
@ -2060,7 +2060,7 @@ fd5743c66d4d44acb1f8daf3ae38f841 *dzz/player/t5player/language/zh-cn/lang.php
5b79dae98dcac0150c718b702a687724 *dzz/player/t5player/template/t5player.htm
102a8be1d962b1071f4160ccff694374 *dzz/scripts/calendar.js
98ba590353432c1a5c2c4ac89ed56ff8 *dzz/scripts/dzz.api.js
bb7459fa77238b7322f1049ee87a9f6a *dzz/scripts/dzz_min.js
b65aa8e7043ea9bc535a57955789f395 *dzz/scripts/dzz_min.js
fd6f4552cec69b6f70f49385068d6872 *dzz/scripts/fonteffect.js
69431f1ec831bacf31013dff2872cba0 *dzz/scripts/html5.js
605fcafebfeda41d0bc7147b98999c99 *dzz/scripts/jquery-1.10.2.min.js
@ -2112,7 +2112,7 @@ fc8d23101b640b340b8f097f312468ee *dzz/sound/index.php
8e0a3f7cbd9eb4c0e092af2f3f857b82 *dzz/sound/mp3/tweet.mp3
908f8dc7c918297fe3e9e4284740aca2 *dzz/sound/play.html
892a543f3abb54e8ec1ada55be3b0649 *dzz/sound/swfobject.js
1e800490d4485b2a3b74fee9c9cd5461 *dzz/sound/template/play.htm
9ff6fb25700be8c43a468f5ad63f2235 *dzz/sound/template/play.htm
c4fc91c7fa0cd667ec4d2333e4018648 *dzz/sound/_sound.js
2352874b5f636ca331fe9509a2f9bdd7 *dzz/styles/filemanage/window_jd/images/sort_asc.gif
d104fcf119d40c51554ddb8b377142e5 *dzz/styles/filemanage/window_jd/images/sort_desc.gif
@ -2173,7 +2173,7 @@ a1e367d693edb6cbad5532cc0a3b165c *dzz/styles/images/picwin/prev.png
1fac5431719a0ac1236a43096deebcc2 *dzz/styles/images/picwin/slider_btn_icon.png
b0d81792d31dc80cf716c8f98ccd5277 *dzz/styles/images/picwin/toolbar.png
ccdf6427343d99f6242a978ca5551742 *dzz/styles/images/uploadui.gif
cf5587864543ecdefefbbebe582255ba *dzz/styles/index.css
d27ef9d4d0a2fe2a90472af9d3f228d7 *dzz/styles/index.css
8a8d46c852e137917cb6f0d6c3988276 *dzz/styles/menu/default/images/icons.gif
a3eb71ed1cdb4911099b8ac05b715b30 *dzz/styles/menu/default/images/icons.png
ae128d5f3f3a39213f3d4e23aec8728f *dzz/styles/menu/default/images/menu.gif
@ -2289,7 +2289,7 @@ ca4eeb3bc883370c55ba49d1ed275d9b *dzz/styles/window/noborder/style.css
78d03ca0b39860dc6675af7aa30f1504 *dzz/styles/window/window_jd/images/ico.gif
960e7069b2b7c4463e04c35d08df413c *dzz/styles/window/window_jd/images/OK.png
2a4893f26083a60ab444ed310d928622 *dzz/styles/window/window_jd/style.css
9c4f3d6f88ceaf521e39f16e25e065ba *dzz/system/ajax.php
8cf7bc922003b9b6fe3b8bf4327539fc *dzz/system/ajax.php
dc531d0209bb2fca54d9914638e1332f *dzz/system/at.php
b35539166e3227dcaaa7974d23b9cfe8 *dzz/system/attachment.php
500e6879cd4487bf9373b1fd8403be70 *dzz/system/dzzcp.php
@ -2353,7 +2353,7 @@ d6f62e7edafae482fc8abda429e692ce *dzz/system/scripts/themes/default-rtl/d.png
d26c0f2c59237a6bdc1e9ca9a604075b *dzz/system/scripts/themes/default-rtl/style.css
7b9776076d5fceef4993b55c9383dedd *dzz/system/scripts/themes/default-rtl/throbber.gif
f6a41d99e2869656004e655c6406548a *dzz/system/template/orgtree.htm
bca0fbc5cbb3df2288eae5633471d35f *dzz/system/template/system_ajax.htm
77524835cb6e6b4d895abea9181773b2 *dzz/system/template/system_ajax.htm
f76251acf9a314912f04f1623b902ffd *dzz/system/ueditor/dialogs/anchor/anchor.html
18637ff2025925f1c8efcafcffc341a6 *dzz/system/ueditor/dialogs/attachment/attachment.css
104aa35791dd8dcf8cd298420be0af29 *dzz/system/ueditor/dialogs/attachment/attachment.html
@ -3039,7 +3039,7 @@ b0cf5f33718fca16bf0b9c1dde77a2b8 *dzz/system/ueditor/themes/iframe.css
ef4745a734dea7cc6cf5afb29974a933 *dzz/system/ueditor/third-party/codemirror/codemirror.css
caadadf17ad7a5372a9cdfa6a1d61d58 *dzz/system/ueditor/third-party/codemirror/codemirror.js
347521ac6f8fccb2290afd5d2bdc837e *dzz/system/ueditor/third-party/dzzattach/dzzattach.css
f403d9c1f2ee48c2650d82f89f993ece *dzz/system/ueditor/third-party/dzzattach/dzzattach.js
b2893a0ff9671382c776eb26a8b2d318 *dzz/system/ueditor/third-party/dzzattach/dzzattach.js
f0a697feea429c795a3405951d5f70d6 *dzz/system/ueditor/third-party/dzzattach/images/ico_feed.png
4cb37af1099b93a01f328671f37b8b2a *dzz/system/ueditor/third-party/dzzattach/images/tip_bottom.png
57171a556f08080e3143434016f2f549 *dzz/system/ueditor/third-party/dzzattach/images/tip_top.png
@ -3124,7 +3124,7 @@ cc114c6d12a97635096956aab117b4d4 *dzz/system/ueditor/third-party/zeroclipboard/Z
b58abee074812a05133b8cecdc06b49c *dzz/system/ueditor/ueditor.parse.min.js
1997baed351597d2dacb8bc921dcf61f *dzz/system/wxredirect.php
ab0852188312b7059fb7a78d213120ee *dzz/system/wxreply.php
8fba6e77f4f5d90ee28121b9db362555 *dzz/template/dzz_index.htm
e429bb92b85f2b607d8d9835e79f2652 *dzz/template/dzz_index.htm
3669948dc1bf951d3bd156918d672cfe *dzz/template/header_common.htm
76cb3446a0b470e067cd4c3f9068979c *dzz/test/cache/cache_test.php
32e34bbd897541ab0511fc8fb1ccee55 *dzz/test/class/class_test.php
@ -3813,7 +3813,7 @@ d8966f98b5488a40aae7352fe058d4dc *user/function/function_user.php
ddc9fcc5febab3bffe367bd2ba13dd6b *user/images/qq.png
2574683e8669992c253bc621af07c997 *user/images/user.css
d41d8cd98f00b204e9800998ecf8427e *user/index.htm
d5d0775b0de2b4e7f46f8366b938d793 *user/language/zh-cn/lang.php
ae6f8bb74967e63d4eb0121d150d8a25 *user/language/zh-cn/lang.php
a154bb56352271963f02ded25548a27e *user/scripts/hammer.js
dbfbf51750774d4fd974029ba5440b63 *user/scripts/jquery.cropbox.css
6ea230d704b460f9ac1c94cd139ea63d *user/scripts/jquery.cropbox.js
@ -3831,7 +3831,7 @@ bc94cd849995e8ad81a8fe906a5412e6 *user/template/login_qqcallback.htm
e30698729ed66da0c4cb48b8c2b9000e *user/template/password.htm
fcc433ec0ff6df46bdfc0eef0a151bf6 *user/template/profile.htm
728564a0902d1348f91f880ab2388f81 *user/template/qqcallback.htm
4e5436f8014bc8cfbfa3b440c9b50088 *user/template/register.htm
bcbf49e8ea1e0c2343a8778e2163ceb2 *user/template/register.htm
f39d4e27de49834bc1b0d0ccf1e58c7a *user/template/space.htm
fdb9dbb94fb93a924cd6a9ee37264176 *user/user_activate.php
07919bd2ea5703b01bf4b04398c03da8 *user/user_ajax.php

10
upload/admin/function/function_admin.php
View File

@ -51,11 +51,11 @@ function createtable($sql, $dbcharset) {
( " ENGINE=$type DEFAULT CHARSET=$dbcharset");
}
function cron_create($pluginid, $filename, $name, $weekday, $day, $hour, $minute) {
function cron_create($pluginid, $filename='', $name='', $weekday=-1, $day=-1, $hour=-1, $minute=-1) {
if(!ispluginkey($pluginid)) {
return false;
}
$dir = DZZ_ROOT.'./dzz/'.$pluginid.'/cron';
$dir = DZZ_ROOT.'./dzz/'.str_replace(':','/',$pluginid).'/cron';
if(!file_exists($dir)) {
return false;
}
@ -108,7 +108,7 @@ function cron_delete($pluginid) {
if(!ispluginkey($pluginid)) {
return false;
}
$dir = DZZ_ROOT.'./dzz/'.$pluginid.'/cron';
$dir = DZZ_ROOT.'./dzz/'.str_replace(':','/',$pluginid).'/cron';
if(!file_exists($dir)) {
return false;
}
@ -125,11 +125,11 @@ function cron_delete($pluginid) {
return $count;
}
function isplugindir($dir) {
return preg_match("/^[a-z]+[a-z0-9_]*\/$/", $dir);
return preg_match("/^[a-z]+[:a-z0-9_]*\/$/", $dir);
}
function ispluginkey($key) {
return preg_match("/^[a-z]+[a-z0-9_]*$/i", $key);
return preg_match("/^[a-z]+[a-z0-9_:]*$/i", $key);
}
function dir_writeable($dir) {

45
upload/core/class/class_template.php
View File

@ -5,7 +5,6 @@ if (!defined('IN_DZZ')) {
class template {
public $csscurmodules = '';
public $replacecode = array('search' => array(), 'replace' => array());
public $language = array();
public $file = '';
@ -201,10 +200,6 @@ class template {
}
function parse_template_callback_loadsubtemplate_2($matches) {
return $this -> loadsubtemplate($matches[2]);
}
function parse_template_callback_languagevar_1($matches) {
return $this -> languagevar($matches[1]);
}
@ -359,9 +354,8 @@ class template {
function languagevar1($var) {
$langvar = lang();
if (!isset($langvar[$var])) {
return '!'.$var.'!';
return "'".$var."'";
}
$jsonencode = json_encode($langvar[$var]);
if(is_array($langvar[$var])){
$jsonencode = json_encode($langvar[$var]);
}else{
@ -371,10 +365,10 @@ class template {
}
// img的src替换
function language_img($var) {
$var[3] = str_replace(' ','',$var[3]);
$str = strrchr(basename($var[3]),'.');
$var[3] = trim($var[3]);
$ext = strtolower(strrchr(basename($var[3]),'.'));
$arr = array('.png','.gif','.jpg','.jpeg','.bmp');
if(in_array($str, $arr)){
if(in_array($ext, $arr)){
$name = $this -> site_operation($var[3]);
$src = $this -> check_file_exists($name);
if($src){
@ -389,7 +383,7 @@ class template {
}
// url的地址替换
function language_url($var) {
$var = str_replace(' ','',$var);
$var = trim($var);
$name = $this -> site_operation($var);
$src = $this -> check_file_exists($name);
if($src){
@ -399,8 +393,8 @@ class template {
}
}
function language_linkurl($var) {
$var[3] = str_replace(' ','',$var[3]);
$link_src = str_replace('?{VERHASH}','',$var[3]);
$var[3] = trim($var[3]);
$link_src = preg_replace("/\?.*$/i",'',$var[3]);
$name = $this -> site_operation($link_src);
$src = $this -> check_file_exists($name);
if($src){
@ -470,17 +464,6 @@ class template {
return '{phpcode:' . $type . '/' . (count($this -> phpcode[$type]) - 1) . '}';
}
function loadsubtemplate($file) {
$tplfile = template($file, 0, '', 1);
$filename = DZZ_ROOT . $tplfile;
if (($content = @implode('', file($filename))) || ($content = $this -> getphptemplate(@implode('', file(substr($filename, 0, -4) . '.php'))))) {
$this -> subtemplates[] = $tplfile;
return $content;
} else {
return '<!-- ' . $file . ' -->';
}
}
function getphptemplate($content) {
$pos = strpos($content, "\n");
@ -488,20 +471,6 @@ class template {
}
function cssvtags($param, $content) {
global $_G;
$modules = explode(',', $param);
foreach ($modules as $module) {
$module .= '::';
//fix notice
list($b, $m) = explode('::', $module);
if ($b && $b == $_G['basescript'] && (!$m || $m == CURMODULE)) {
$this -> csscurmodules .= $content;
return;
}
}
return;
}
function transamp($str) {
$str = str_replace('&', '&amp;', $str);

18
upload/core/class/dzz/dzz_io.php
View File

@ -110,7 +110,7 @@ class dzz_io
//获取文件流；
//$path: 路径
public function getStream($path,$fop){
public function getStream($path,$fop=''){
$path=self::clean($path);
$io=self::initIO($path);
if($io) return $io->getStream($path,$fop);
@ -118,7 +118,7 @@ class dzz_io
}
//获取文件地址；
//$path: 路径
function getFileUri($path,$fop){
function getFileUri($path,$fop=''){
$path=self::clean($path);
if($io=self::initIO($path)) return $io->getFileUri($path,$fop);
else return $path;
@ -283,11 +283,21 @@ class dzz_io
public function download($paths,$filename=''){
$paths=(array)$paths;
$paths=self::clean($paths);
if($io=self::initIO($paths[0])) $io->download($paths,$filename);
else return false;
}
//获取目录的统计信息
/*
return array('size'=>$size,contain=array('filenum','foldersum'));
*/
public function getContains($path,$suborg=true){
$path=self::clean($path);
if($io=self::initIO($path)) return $io->getContains($path,$suborg);
else return false;
}
public function getCloud($bz){
$bzarr=explode(':',$bz);
$cloud=DB::fetch_first("select * from ".DB::table('connect')." where bz='{$bzarr[0]}'");
@ -409,5 +419,7 @@ class dzz_io
dmkdir($targetpath);
return $target.date('His').''.strtolower(random(16)).'.'.$ext;
}
}
?>

4
upload/core/class/helper/helper_browser.php
View File

@ -104,7 +104,9 @@ class helper_browser {
static function ismobile(){
$agent = strtolower($_SERVER['HTTP_USER_AGENT']);
if (preg_match("/MicroMessenger/i", $agent)){
if (preg_match("/WindowsWechat/i", $agent)){
return false;//'WindowsWechat';
}elseif (preg_match("/MicroMessenger/i", $agent)){
return 'wechat';
}elseif (preg_match("/iphone/i", $agent) && preg_match("/mac os/i", $agent)){
return 'iPhone';

14
upload/core/class/io/io_ALIOSS.php
View File

@ -632,6 +632,20 @@ class io_ALIOSS extends io_api
}
return $icosdata;
}
/*获取目录信息*/
public function getContains($path,$suborg=false,$contains=array('size'=>0,'contain'=>array(0,0))){
foreach(self::listFiles($path) as $value){
if($value['type']=='folder'){
$contains=self::getContains($value['path'],false,$contains);
$contains['contain'][1]+=1;
}else{
$contains['size']+=$value['size'];
$contains['contain'][0]+=1;
}
}
return $contains;
}
/*
*获取文件的meta数据
*返回标准的icosdata

22
upload/core/class/io/io_OneDrive.php
View File

@ -345,7 +345,7 @@ class io_OneDrive extends io_api
return true;
}
//获取缩略图
public function getThumb($path,$width,$height,$original=0,$returnurl){
public function getThumb($path,$width,$height,$original=0,$returnurl=false){
global $_G;
$enable_cache=true; //是否启用缓存
if($original || $width<1 || $height<1){
@ -399,7 +399,7 @@ class io_OneDrive extends io_api
}
if($data){
$targetpath = dirname($_G['setting']['attachurl'].'./'.$target);
dmkdir($targetpath,false);
dmkdir($targetpath);
if($enable_cache) file_put_contents($_G['setting']['attachdir'].'./'.$target,$data);
$file=$_G['setting']['attachdir'].'./'.$target;
@ -473,6 +473,20 @@ class io_OneDrive extends io_api
return array('error'=>$e->getMessage());
}
}
/*获取目录信息*/
public function getContains($path,$suborg=false,$contains=array('size'=>0,'contain'=>array(0,0))){
foreach(self::listFiles($path) as $value){
if($value['type']=='folder'){
$contains=self::getContains($value['path'],false,$contains);
$contains['contain'][1]+=1;
}else{
$contains['size']+=$value['size'];
$contains['contain'][0]+=1;
}
}
return $contains;
}
/*
*获取文件的meta数据
*返回标准的icosdata
@ -673,7 +687,7 @@ class io_OneDrive extends io_api
return $return;
}
//打包下载文件
public function zipdownload($paths,$filename){
public function zipdownload($paths,$filename=''){
global $_G;
$paths=(array)$paths;
set_time_limit(0);
@ -727,7 +741,7 @@ class io_OneDrive extends io_api
}
//下载文件
public function download($paths,$filename){
public function download($paths,$filename=''){
global $_G;
$paths=(array)$paths;
if(count($paths)>1){

13
upload/core/class/io/io_baiduPCS.php
View File

@ -570,6 +570,19 @@ class io_baiduPCS extends io_api
return array('error'=>$e->getMessage());
}
}
/*获取目录信息*/
public function getContains($path,$suborg=false,$contains=array('size'=>0,'contain'=>array(0,0))){
foreach(self::listFiles($path) as $value){
if($value['type']=='folder'){
$contains=self::getContains($value['path'],false,$contains);
$contains['contain'][1]+=1;
}else{
$contains['size']+=$value['size'];
$contains['contain'][0]+=1;
}
}
return $contains;
}
/*
*获取文件的meta数据
*返回标准的icosdata

36
upload/core/class/io/io_disk.php
View File

@ -31,7 +31,11 @@ class io_disk extends io_api
$did=trim($bzarr[1]);
if($config=DB::fetch_first("select * from ".DB::table(self::T)." where id='{$did}'")){
$this->_root='disk:'.$config['id'].':';
$this->encode=$config['charset'];
if(PHP_VERSION>=7.1){
$this->encode=CHARSET;
}else{
$this->encode=$config['charset'];
}
$this->_rootname=$config['cloudname'];
$this->attachdir=$config['attachdir'].DS;
@ -88,6 +92,19 @@ class io_disk extends io_api
}
return $folderarr;
}
/*获取目录信息*/
public function getContains($path,$suborg=false,$contains=array('size'=>0,'contain'=>array(0,0))){
foreach(self::listFiles($path) as $value){
if($value['type']=='folder'){
$contains=self::getContains($value['path'],false,$contains);
$contains['contain'][1]+=1;
}else{
$contains['size']+=$value['size'];
$contains['contain'][0]+=1;
}
}
return $contains;
}
private function checkdisk($config){//测试磁盘是否可以读写正常
$str='test read write';
$filename='新建文本文档__test.txt';
@ -423,17 +440,25 @@ class io_disk extends io_api
*/
function listFiles($path,$by='time',$order='desc',$limit='',$force=0){
if($this->error) return array('error'=>$this->error);
//echo $path;
$bzarr=self::parsePath($path);
//print_r($bzarr);
$filepath=$this->attachdir.($bzarr['path']?('./'.$bzarr['path']):'');
$icosdata=array();
foreach(new DirectoryIterator($filepath) as $file){
try{
$dirs=new DirectoryIterator($filepath);
}catch(Exception $e){
return array('error'=>$e->getMessage());
}
foreach($dirs as $file){
if ($file->isDot()) {
continue;
}
$filename=diconv($file->getFilename(),$this->encode,CHARSET);
/*if(PHP_VERSION>7.1){
$filename=$file->getFilename();
}else{*/
$filename=diconv($file->getFilename(),$this->encode,CHARSET);
//}
if($file->isDir()){
$fileinfo=array(
@ -485,6 +510,7 @@ class io_disk extends io_api
if(is_dir($file)){
$meta['type']='folder';
$meta['size']='-';
$meta['mtime']=filectime($file);
}else{
$meta['type']='file';
$meta['size']=filesize($file);

28
upload/core/class/io/io_dzz.php
View File

@ -41,6 +41,32 @@ class io_dzz extends io_api
}
return $data;
}
public function getContains($fid,$suborg=false,$contains=array('size'=>0,'contain'=>array(0,0))){
if(!$folder=C::t('folder')->fetch($fid)) return $contains;
$fids[]=$fid;
if($suborg && ($folder['flag']=='organization')){
foreach(DB::fetch_all("select fid from %t where flag='organization' and pfid=%d and isdelete<1",array('folder',$fid)) as $value){
$fids[]=$value['fid'];
}
}
if(empty($folder['default']) && $folder['flag']!='folder' && $folder['flag']!='organization'){//没有生成icos表的 单独查出来
foreach(DB::fetch_all("select fid,fname from %t where `default`='' and flag!='folder' and pfid=%d and isdelete<1",array('folder',$fid)) as $value){
$fids[]=$value['fid'];
}
}
foreach($fids as $fid){
foreach(C::t('icos')->fetch_all_by_pfid($fid) as $value){
if($value['type']=='folder'){
$contains=self::getContains($value['oid'],false,$contains);
$contains['contain'][1]+=1;
}else{
$contains['size']+=$value['size'];
$contains['contain'][0]+=1;
}
}
}
return $contains;
}
/**
* 获取空间配额信息
* @return string
@ -96,7 +122,7 @@ class io_dzz extends io_api
return $folderarr;
}
//获取文件流地址
public function getStream($path,$fop){
public function getStream($path,$fop=''){
global $_G;
if(strpos($path,'attach::')===0){
$attach=C::t('attachment')->fetch(intval(str_replace('attach::','',$path)));

16
upload/core/class/io/io_ftp.php
View File

@ -472,6 +472,19 @@ class io_ftp extends io_api
}
return $icosdata;
}
/*获取目录信息*/
public function getContains($path,$suborg=false,$contains=array('size'=>0,'contain'=>array(0,0))){
foreach(self::listFiles($path) as $value){
if($value['type']=='folder'){
$contains=self::getContains($value['path'],false,$contains);
$contains['contain'][1]+=1;
}else{
$contains['size']+=$value['size'];
$contains['contain'][0]+=1;
}
}
return $contains;
}
/*
*获取文件的meta数据
*返回标准的icosdata
@ -493,6 +506,7 @@ class io_ftp extends io_api
if($this->conn->ftp_isdir($bzarr['path'])){
$meta['type']='folder';
$meta['size']='-';
$meta['mtime']=$this->conn->ftp_mdtm($bzarr['path']);
}else{
$meta['type']='file';
$meta['size']=$this->conn->ftp_size($bzarr['path']);
@ -540,7 +554,7 @@ class io_ftp extends io_api
}else{
$pathinfo = pathinfo($meta['path']);
$ext = strtolower($pathinfo['extension']);
$ext = strtoupper($pathinfo['extension']);
if(in_array($ext,$imageexts)) $type='image';
elseif(in_array($ext,$documentexts)) $type='document';
else $type='attach';

15
upload/core/class/io/io_qiniu.php
View File

@ -318,7 +318,7 @@ class io_qiniu extends io_api
}
//获取文件流；
//$path: 路径
function getStream($path,$fop){
function getStream($path,$fop=''){
$arr=self::parsePath($path);
$client=self::init($path,1);
try{
@ -544,6 +544,19 @@ class io_qiniu extends io_api
}
return $icosdata;
}
/*获取目录信息*/
public function getContains($path,$suborg=false,$contains=array('size'=>0,'contain'=>array(0,0))){
foreach(self::listFiles($path) as $value){
if($value['type']=='folder'){
$contains=self::getContains($value['path'],false,$contains);
$contains['contain'][1]+=1;
}else{
$contains['size']+=$value['size'];
$contains['contain'][0]+=1;
}
}
return $contains;
}
/*
*获取文件的meta数据
*返回标准的icosdata

2
upload/core/class/perm/perm_binPerm.php
View File

@ -70,7 +70,7 @@ class perm_binPerm{
);
}
function getMyPower(){//获取用户桌面默认的权限
return self::getSumByAction(array('read1','read2','delete1','edit1','download1','download2','copy1','copy2','upload','newtype','folder','link','dzzdoc','video','shortcut','share'));
return self::getSumByAction(array('read1','read2','delete1','delete2','edit1','edit2','download1','download2','copy1','copy2','upload','newtype','folder','link','dzzdoc','video','shortcut','share'));
}
function groupPowerPack(){
$data= array('read' =>array('title' =>lang('read_only'), 'flag'=>'read', 'permitem'=>array('read1','read2'),'tip'=>lang('read_only_state')),

51
upload/core/class/table/table_folder.php
View File

@ -75,6 +75,18 @@ class table_folder extends dzz_table
}
return $fids;
}
public function getPathByPfid($pfid,$arr=array(),$count=0){
if($count>100) return $arr; //防止死循环；
else $count++;
if($value=DB::fetch_first("select pfid,fid,fname from ".DB::table('folder')." where fid='{$pfid}'")){
$arr[$value['fid']]=$value['fname'];
if($value['pfid']>0 && $value['pfid']!=$pfid) $arr=self::getPathByPfid($value['pfid'],$arr,$count);
}
//$arr=array_reverse($arr);
return $arr;
}
public function delete_by_fid($fid,$force){ //删除目录
$folder=self::fetch($fid);
if(!defined('IN_ADMIN') && $folder['flag']!='folder'){
@ -155,6 +167,45 @@ class table_folder extends dzz_table
else return DB::fetch_all("SELECT * FROM %t WHERE $wheresql",array($this->_table,$pfid),'fid');
}
//获取目录的信息(总大小，文件数和目录数);
public function getContainsByFid($fid,$suborg=false){
static $contains=array('size'=>0,'contain'=>array(0,0));
if(!$folder=parent::fetch($fid)) return $contains;
$fids[]=$fid;
if($suborg && ($folder['flag']=='organization')){
foreach(DB::fetch_all("select fid from %t where flag='organization' and pfid=%d ",array($this->_table,$fid)) as $value){
$fids[]=$value['fid'];
}
}
if(empty($folder['default']) && $folder['flag']!='organization'){//没有生成icos表的 单独查出来
foreach(DB::fetch_all("select fid from %t where `default`='' and pfid=%d ",array($this->_table,$fid)) as $value){
$fids[]=$value['fid'];
}
}
foreach($fids as $fid){
foreach(C::t('icos')->fetch_all_by_pfid($fid) as $value){
$contains['size']+=$value['size'];
if($value['type']=='folder'){
$contains['contain'][1]+=1;
self::getContainsByFid($value['oid']);
}else{
$contains['contain'][0]+=1;
}
}
}
return $contains;
}
//返回自己和上级目录fid数组；
public function getTopFid($fid,$i=0,$arr=array()){
$arr[]=$fid;
if($i>100) return $arr; //防止死循环；
else $i++;
if($pfid=DB::result_first("select pfid from ".DB::table('folder')." where fid='{$fid}'")){
if($pfid!=$fid) $arr=getTopFid($pfid,$i,$arr);
}
return $arr;
}
}
?>

2
upload/core/class/table/table_notification.php
View File

@ -79,7 +79,7 @@ class table_notification extends dzz_table
return DB::result_first("SELECT COUNT(*) FROM %t WHERE uid=%d %i %i %i", array($this->_table, $uid, $new, $category, $type));
}
public function fetch_all_by_uid($uid, $new, $type, $start, $perpage) {
public function fetch_all_by_uid($uid, $new=-1, $type='', $start=0, $perpage=20) {
$new = intval($new);
$type = $type ? ' AND '.DB::field('type', $type) : '';

6
upload/core/core_version.php
View File

@ -11,9 +11,9 @@ if(!defined('IN_DZZ')) {
}
if(!defined('CORE_VERSION')) {
define('CORE_VERSION', '1.3');
define('CORE_RELEASE', '20170410');
define('CORE_FIXBUG', '13000000');
define('CORE_VERSION', '1.3.1');
define('CORE_RELEASE', '20170505');
define('CORE_FIXBUG', '13100000');
}
?>

4
upload/core/function/function_core.php
View File

@ -214,7 +214,7 @@ function url_implode($gets) {
}
return implode('&', $arr);
}
function getstr($string, $length, $in_slashes=0, $out_slashes=0, $bbcode=0, $html=0) {
function getstr($string, $length=0, $in_slashes=0, $out_slashes=0, $bbcode=0, $html=0) {
global $_G;
$string = trim($string);
@ -429,7 +429,7 @@ function authcode($string, $operation = 'DECODE', $key = '', $expiry = 0,$ckey_l
//这种格式，加密时，需要把|分割的每个参数都带上，dzzencode($string,'1|'.getglobal('setting/authkey').'|管理员',$expiry);
//如果解密时，|隔开的部分使用getglobal函数获取不到值，将会使用原值，如index.php?mod=io&op=getStream&path=***&key=xxxxx|ppppp
//解密时的key会使用原值 xxxxx|ppppp ;
function dzzencode($string,$key,$expiry=0,$ckey_length=0){
function dzzencode($string,$key='',$expiry=0,$ckey_length=0){
$key = md5($key != '' ? $key : getglobal('setting/authkey'));
return base64_encode(authcode($string,'ENCODE',$key,$expiry,$ckey_length));
}

6
upload/core/language/zh-cn/lang.php
View File

@ -578,6 +578,8 @@ $lang = array (
'type_music'=>'音乐',
'type_attach'=>'文档',
'type_app'=>'应用',
'type_department'=>'部门文件夹',
'type_organization'=>'机构文件夹',
'video_typename_attach'=>'视频文件',
'typename_attach_lt'=>'文件小于',
'typename_attach_gt'=>'文件大于',
@ -749,7 +751,7 @@ $lang = array (
'register_activation_message' => '抱歉，您输入的用户名 "{username}" 已存在，请登录站点激活此帐号',
'profile_password_tooshort' => '密码太短了，至少要{pwlength}个字符',
'profile_required_info_invalid' => '抱歉，您尚未填写必填项目或必填项目格式不正确',
// 'profile_passwd_illegal'=>'请填写密码',
'profile_passwd_illegal'=>'请填写密码',
'register_email_verify' => '<p>感谢您注册 {sitename}</p><p>系统给您发送了一封激活邮件，快去登录邮箱激活账号吧</p><p><a href="index.php?open=password">重新接收验证邮件</a></p>',
'register_manual_verify' => '<p>感谢您的注册，站点开启了人工验证注册用户，请等待审核</p>',
'register_succeed' => '<p>感谢您注册 {sitename}，现在将以 {usergroup} 身份登录站点</p><p><a href="index.php?open=profile">现在去完善资料</a></p>',
@ -1210,7 +1212,7 @@ $_G[siteurl]',
'register_password_length_tips2' => '个字符',
'register_password_tips' => '请填写密码',
'register_repassword_tips' => '请再次输入密码',
'register_username_tips' => '用户名由 3 到 15 个字符组成',
'register_username_tips' => '姓名，注册后不允许修改',
'register_validate_email_tips' => '注册需要验证邮箱，请务必填写正确的邮箱，提交后请及时查收邮件。<br />您可能需要等待几分钟才能收到邮件，如果收件箱没有，请检查一下垃圾邮件箱。',
'rulemessage' => '网站服务条款',
'select_bucket_node_address'=>'请选择bucket和节点地址',

2
upload/dzz/feed/template/publish_home.htm
View File

@ -19,7 +19,7 @@
<div id="publish_action_0" class="action_cpsw">
<ul class="list_acpsw">
<li class="ament_lacpsw" style="position: relative; cursor: pointer;"><a id="upload_from_0" onclick="showMenu({'ctrlid':'upload_from_0'});" href="javascript:void(0);" title="" class="item_lacpsw">{lang typename_attach}/{lang photo}</a> </li>
<li class="emotion_lacpsw"><a href="javascript:;" class="item_lacpsw" id="message_0sml" onclick="showMenu({'ctrlid':this.id,'evt':'click','layer':2});return false;">{lang photo}</a></li>
<li class="emotion_lacpsw"><a href="javascript:;" class="item_lacpsw" id="message_0sml" onclick="showMenu({'ctrlid':this.id,'evt':'click','layer':2});return false;">{lang face}</a></li>
<script type="text/javascript" reload="1">smilies_show('message_0_sml_div', '{$_G[setting][smcols]}', 'message_0');</script>
<input id="votestatus_0" type="hidden" name="votestatus" value="0" />
<li class="vote_lacpsw"><a href="javascript:;" class="item_lacpsw" id="message_0_vote" onclick="feed_vote_switch();">{lang vote}</a></li>

8
upload/dzz/function/dzz_core.php
View File

@ -274,7 +274,7 @@ function topshowmessage($msg){
exit();
}
function SpaceSize($size,$gid,$isupdate=0,$uid){
function SpaceSize($size,$gid,$isupdate=0,$uid=0){
//size: 增加的话为正值，减少的话为负值；
//gid : 大于零位群组空间，否则为$_G['uid']的空间，
//isupdate: 为true，则实际改变空间，否则只是检查是否有空间
@ -1159,7 +1159,7 @@ function dzz_desktop_init(){
}
}
function getTxtAttachByMd5($message,$filename_title,$ext){
function getTxtAttachByMd5($message,$filename_title,$ext='dzzdoc'){
global $_G;
@set_time_limit(0);
$filename =date('His').''.strtolower(random(16));
@ -1234,7 +1234,7 @@ function getTxtAttachByMd5($message,$filename_title,$ext){
}
function checkCopy($icoid=0,$sourcetype='',$iscut=0,$obz,$tbz){
function checkCopy($icoid=0,$sourcetype='',$iscut=0,$obz='',$tbz=''){
global $_G;
$copy=1;
if($sourcetype=='uid'){
@ -1345,7 +1345,7 @@ function getDzzPath($attach){
return $url;
}
function geticonfromext($ext,$type){
function geticonfromext($ext,$type=''){
global $_G;
$img='dzz/images/extimg/'.strtolower($ext).'.png';
if(!is_file(DZZ_ROOT.$img)){

2
upload/dzz/language/zh-cn/lang.php
View File

@ -423,6 +423,8 @@ $lang=array (
'theme_layout' => '主题布局',
'theme_layout_tip' => '还原系统默认主题',
'theme_layout_tip1' => '还原系统默认桌面设置',
'custom_option_layout_1' => '拉伸',
'custom_option_layout_2' => '平铺',
'custom_option_layout_3' => '居中',
'send_pm' => '发送即时消息',
'visit_desktop' => '访问他的桌面',

2
upload/dzz/scripts/dzz_min.js
View File

File diff suppressed because one or more lines are too long

33
upload/dzz/sound/template/play.htm
View File

@ -1,36 +1,25 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<!DOCTYPE>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script src="dzz/sound/swfobject.js" type="text/javascript"></script>
<title>{lang simple_mp3_player}</title>
<style>
html,body {
width: 100%;
height: 100%;
width: 300px;
height: 32px;
overflow: hidden
}
audio{
height:32px;
width:300px;
}
</style>
<script type="text/javascript">
var autoplay = '$_GET[autoplay]' || 'yes';
var url = '$stream';
var flashvars = { autoplay: autoplay, foreColor: "#281ca", filename: encodeURIComponent(url) };
var params = {
menu: "false",
scale: "Scale",
allowFullscreen: "true",
wmode: "transparent",
allowScriptAccess: "always",
bgcolor: "#FFFFFF"
};
if(url != '') swfobject.embedSWF("dzz/sound/1bit.swf", "fileID", "100%", "100%", "9.0.0", "dzz/sound/expressInstall.swf ", flashvars, params);
</script>
</head>
<body>
<div id="fileID"></div>
<audio controls="controls" autoplay="true">
<source src="$stream" />
</audio>
</body>
</html>

2
upload/dzz/styles/index.css
View File

@ -51,11 +51,13 @@ height: expression(this.height > 50 && this.width<=this.height ? 50 : true);
left: 0;
top: 0;
width: 100%;
z-index:30001
}
#ajaxwaitid {
position: absolute;
right: 0;
top: 0;
z-index:30002
}
.MODAL {
background-color: #000;

347
upload/dzz/system/ajax.php
View File

@ -226,36 +226,168 @@ if($do=='newlink'){
}
}elseif($do=='property'){
$icoid=rawurldecode($_GET['icoid']);
$icoarr=IO::getMeta($icoid);
$perm=perm_check::checkperm('rename',$icoarr);
if($icoarr['error']) showmessage($icoarr['error']);
if(submitcheck('propertysubmit')){
$return=array();
if(!$icoarr['bz']){
$ret=0;
$name=str_replace('...','',getstr(io_dzz::name_filter($_GET['name']),80));
if($perm && $icoarr['name']!=$name){
C::t('icos')->update_by_name($icoid,$name);
$ret=1;
$icoid=rawurldecode($_GET['icoid']);
$flag='file';
$info=array();
if(strpos($icoid,'fid_')!==false){//目录属性
$path=trim(str_replace('fid_','',$icoid));
$fid=intval($path);
$flag='file';
if($icoid=DB::result_first("select icoid from %t where type='folder' and oid=%d",array('icos',$fid))){
$folder=C::t('folder')->fetch_by_fid($fid);
}elseif($fid){
$folder=C::t('folder')->fetch_by_fid($fid);
}else{
$icoarr=IO::getMeta($path);
$folder=IO::getFolderByIcosdata($icoarr);
}
$info['name']=getstr($folder['fname'],30);
$info['ftype']=getFileTypeName('folder','');
if($folder['flag']=='organization'){
if($folder['pfid']>0) $info['ftype']=lang('type_department');
else $info['ftype']=lang('type_organization');
}
//获取路径
if($folder['bz'] && $folder['bz']!='dzz'){
$bzarr=explode(':',$folder['path']);
$info['path']=$folder['path'];
$info['icon']='dzz/images/default/system/folder.png';
$contains=IO::getContains($folder['path']);
$info['size']=lang('property_info_size',array('fsize'=>formatsize($contains['size']),'size'=>$contains['size']));
$info['fdateline']=$folder['dateline']>0?dgmdate($folder['dateline'],'Y-m-d H:i:s'):'-';
$info['contain']=lang('property_info_contain',array('filenum'=>$contains['contain'][0],'foldernum'=>$contains['contain'][1]));
//$info['size']='';//lang('property_info_size',array('fsize'=>$icoarr['size']>0?formatsize($icoarr['size']):$icoarr['size'],'size'=>$icoarr['size']));
}else{
$arr=C::t('folder')->getPathByPfid($fid);
$patharr=array();
while($arr){
$patharr[]=array_pop($arr);
}
if($icoarr['type']=='folder' && $icoarr['gid']>0){
$ismoderator=0;
if((C::t('organization_admin')->ismoderator_by_uid_orgid($icoarr['gid'],$_G['uid']) || $_G['adminid']==1) ){//是部门管理员或系统管理员
$info['path']=implode('/',$patharr);
if($folder['gid']>0 && $folder['flag']=='folder'){
if((C::t('organization_admin')->ismoderator_by_uid_orgid($folder['gid'],$_G['uid']) || $_G['adminid']==1) ){//是部门管理员或系统管理员
$ismoderator=1;
}elseif(($pfolder=C::t('folder')->fetch_by_fid($icoarr['pfid'])) && (perm_binPerm::havePower('edit2',$pfolder['perm1']) || (perm_binPerm::havePower('edit1',$pfolder['perm1']) && $icoarr['uid']==$_G['uid']))){//上级目录
}elseif(($pfolder=C::t('folder')->fetch_by_fid($folder['pfid'])) && (perm_binPerm::havePower('edit2',$pfolder['perm1']) || (perm_binPerm::havePower('edit1',$pfolder['perm1']) && $folder['uid']==$_G['uid']))){//上级目录
$ismoderator=1;
}
if($ismoderator){
C::t('folder')->update($icoarr['fid'],array('perm'=>intval($_GET['perm'])));
$ret=1;
$folder=C::t('folder')->fetch($icoarr['oid']);
$permtitle=perm_binPerm::getGroupTitleByPower($icoarr['perm1']);
$permarr=perm_binPerm::groupPowerPack();
}
}
if($ret){
$return=C::t('icos')->fetch_by_icoid($icoid);
$return['msg']='success';
if($folder['gid']>0){
$permtitle=perm_binPerm::getGroupTitleByPower($folder['perm1']);
if(file_exists('dzz/images/default/system/folder-'.$permtitle['flag'].'.png')){
$folder['icon']='dzz/images/default/system/folder-'.$permtitle['flag'].'.png';
}else{
$folder['icon']='dzz/images/default/system/folder-read.png';
}
}else{
$folder['icon']='dzz/images/default/system/folder.png';
}
$info['icon']=$folder['icon'];
$contains=IO::getContains($fid);
$info['size']=lang('property_info_size',array('fsize'=>formatsize($contains['size']),'size'=>$contains['size']));
$info['contain']=lang('property_info_contain',array('filenum'=>$contains['contain'][0],'foldernum'=>$contains['contain'][1]));
}
$info['username']=$folder['username'];
$info['uid']=$folder['uid'];
$info['fdateline']=$folder['dateline']?dgmdate($folder['dateline'],'Y-m-d'):'';
}elseif(strpos($icoid,',')!==false){//多选属性
$flag='files';
$dpaths=explode(',',$icoid);
$icoids=array();
foreach($dpaths as $dpath){
$icoids[]=dzzdecode($dpath);
}
/*$icoarr=IO::getMeta($icoids[0]);
if($icoarr['error']) showmessage($icoarr['error']);*/
//获取路径
$size=0;
$contents=array(0,0);
$types=array();
foreach($icoids as $icoid){
if(!$icoarr=IO::getMeta($icoid)) continue;
switch($icoarr['type']){
case 'shortcut':
$contents[0]+=1;
break;
case 'folder':
$fid=(empty($icoarr['bz']) || $icoarr['bz']=='dzz')?intval($icoarr['oid']):$icoarr['path'];
$contains=IO::getContains($fid);
$size+=intval($contains['size']);
$contents[0]+=$contains['contain'][0];
$contents[1]+=$contains['contain'][1]+1;
break;
case 'dzzdoc':
$contents[0]+=1;
break;
case 'link':
$contents[0]+=1;
break;
case 'video':
$contents[0]+=1;
break;
case 'app':
$contents[0]+=1;
break;
default:
$size+=$icoarr['size'];
$contents[0]+=1;
break;
}
}
$info['size']=lang('property_info_size',array('fsize'=>formatsize($size),'size'=>$size));
$info['contain']=lang('property_info_contain',array('filenum'=>$contents[0],'foldernum'=>$contents[1]));
}else{ //单文件（目录）属性
$icoid=dzzdecode($_GET['icoid']);
$icoarr=IO::getMeta($icoid);
if($icoarr['error']) showmessage($icoarr['error']);
$perm=perm_check::checkperm('rename',$icoarr);
if(submitcheck('propertysubmit')){
$return=array();
if(empty($icoarr['bz']) || $icoarr['bz']=='dzz'){
$ret=0;
$name=str_replace('...','',getstr(io_dzz::name_filter($_GET['name']),80));
if($perm && $icoarr['name']!=$name){
C::t('icos')->update_by_name($icoid,$name);
$ret=1;
}
if($icoarr['type']=='folder' && $icoarr['gid']>0){
$ismoderator=0;
if((C::t('organization_admin')->ismoderator_by_uid_orgid($icoarr['gid'],$_G['uid']) || $_G['adminid']==1) ){//是部门管理员或系统管理员
$ismoderator=1;
}elseif(($pfolder=C::t('folder')->fetch_by_fid($icoarr['pfid'])) && (perm_binPerm::havePower('edit2',$pfolder['perm1']) || (perm_binPerm::havePower('edit1',$pfolder['perm1']) && $icoarr['uid']==$_G['uid']))){//上级目录
$ismoderator=1;
}
if($ismoderator){
C::t('folder')->update($icoarr['fid'],array('perm'=>intval($_GET['perm'])));
$ret=1;
}
}
if($ret){
$return=C::t('icos')->fetch_by_icoid($icoid);
$return['msg']='success';
}
}else{
$name=io_dzz::name_filter(trim($_GET['name']));
if($icoarr['name']!=$name){
@ -267,96 +399,105 @@ if($do=='newlink'){
}
}
}
showmessage('do_success',$refer.'',$return,array());
}else{
$info=array();
$info['icon']=$icoarr['img']?$icoarr['img']:geticonfromext($icoarr['ext'],$icoarr['type']);
$info['name']=getstr($icoarr['name'],30);
$info['ftype']=$icoarr['ftype'];
//获取路径
if($icoarr['bz']){
$bzarr=explode(':',$icoarr['path']);
$info['path']=$icoarr['path'];
$info['size']=lang('property_info_size',array('fsize'=>$icoarr['size']>0?formatsize($icoarr['size']):$icoarr['size'],'size'=>$icoarr['size']));
}else{
$info['icon']=$icoarr['img']?$icoarr['img']:geticonfromext($icoarr['ext'],$icoarr['type']);
$info['name']=getstr($icoarr['name'],30);
$info['ftype']=$icoarr['ftype'];
$arr=getPathByPfid($icoarr['pfid']);
$patharr=array();
while($arr){
$patharr[]=array_pop($arr);
}
$info['path']=implode('/',$patharr).'/'.$icoarr['name'];
switch($icoarr['type']){
case 'shortcut':
$icoarr['bz']=$icoarr['tdata']['bz'];
$icoarr['path']=$icoarr['tdata']['path'];
$info['path']=implode('/',$patharr).'/'.$icoarr['name'];
if($icoarr['bz']){
$info['path']=$icoarr['path'];
}else{
$arr1=getPathByPfid($icoarr['tdata']['pfid']);
//获取路径
if($icoarr['bz'] && $icoarr['bz']!='dzz'){
$bzarr=explode(':',$icoarr['path']);
$info['path']=$icoarr['path'];
$contains=IO::getContains($icoarr['path']);
if($icoarr['type']=='folder'){
$contains=IO::getContains($icoarr['path']);
}else{
$contains=array('size'=>$icoarr['size'],'contain'=>array(1,0));
}
$info['size']=lang('property_info_size',array('fsize'=>formatsize($contains['size']),'size'=>$contains['size']));
$info['contain']=lang('property_info_contain',array('filenum'=>$contains['contain'][0],'foldernum'=>$contains['contain'][1]));
}else{
$arr=C::t('folder')->getPathByPfid($icoarr['pfid']);
//print_r($arr);exit('ddd');
$patharr=array();
while($arr){
$patharr[]=array_pop($arr);
}
$info['path']=implode('/',$patharr).'/'.$icoarr['name'];
switch($icoarr['type']){
case 'shortcut':
$icoarr['bz']=$icoarr['tdata']['bz'];
$icoarr['path']=$icoarr['tdata']['path'];
$info['path']=implode('/',$patharr).'/'.$icoarr['name'];
if($icoarr['bz']){
$info['path']=$icoarr['path'];
}else{
$arr1=C::t('folder')->getPathByPfid($icoarr['tdata']['pfid']);
$patharr1=array();
while($arr1){
$patharr1[]=array_pop($arr1);
}
$info['path']=implode('/',$patharr1).'/'.$icoarr['tdata']['name'];
}
$info['size']='-';
if($icoarr['tdata']['type']=='folder'){
$info['icon']='dzz/images/default/system/folder.png';
}
break;
case 'folder':
if($icoarr['gid']>0){
if((C::t('organization_admin')->ismoderator_by_uid_orgid($icoarr['gid'],$_G['uid']) || $_G['adminid']==1) ){//是部门管理员或系统管理员
$ismoderator=1;
}elseif(($pfolder=C::t('folder')->fetch_by_fid($icoarr['pfid'])) && (perm_binPerm::havePower('edit2',$pfolder['perm1']) || (perm_binPerm::havePower('edit1',$pfolder['perm1']) && $icoarr['uid']==$_G['uid']))){//上级目录
$ismoderator=1;
}
if($ismoderator){
$folder=C::t('folder')->fetch($icoarr['oid']);
$permtitle=perm_binPerm::getGroupTitleByPower($icoarr['perm1']);
$permarr=perm_binPerm::groupPowerPack();
}
}
$patharr1=array();
while($arr1){
$patharr1[]=array_pop($arr1);
}
$info['path']=implode('/',$patharr1).'/'.$icoarr['tdata']['name'];
}
$info['size']='-';
if($icoarr['tdata']['type']=='folder'){
$info['icon']='dzz/images/default/system/folder.png';
}
break;
case 'folder':
if($icoarr['gid']>0){
if((C::t('organization_admin')->ismoderator_by_uid_orgid($icoarr['gid'],$_G['uid']) || $_G['adminid']==1) ){//是部门管理员或系统管理员
$ismoderator=1;
}elseif(($pfolder=C::t('folder')->fetch_by_fid($icoarr['pfid'])) && (perm_binPerm::havePower('edit2',$pfolder['perm1']) || (perm_binPerm::havePower('edit1',$pfolder['perm1']) && $icoarr['uid']==$_G['uid']))){//上级目录
$ismoderator=1;
}
if($ismoderator){
$folder=C::t('folder')->fetch($icoarr['oid']);
$permtitle=perm_binPerm::getGroupTitleByPower($icoarr['perm1']);
$permarr=perm_binPerm::groupPowerPack();
}
}
$info['icon']=$icoarr['img']?$icoarr['img']:'dzz/images/default/system/folder.png';
$contains=getContainsByFid($icoarr['oid']);
$info['size']=lang('property_info_size',array('fsize'=>formatsize($contains['size']),'size'=>$contains['size']));
$info['contain']=lang('property_info_contain',array('filenum'=>$contains['contain'][0],'foldernum'=>$contains['contain'][1]));
break;
case 'dzzdoc':
$info['path']=implode('/',$patharr).'/'.$icoarr['name'];
$info['size']=lang('property_info_size',array('fsize'=>formatsize($icoarr['size']),'size'=>$icoarr['size']));
break;
case 'link':
$info['path']=implode('/',$patharr).'/'.$icoarr['name'];
$info['size']='-';
break;
case 'video':
$info['path']=implode('/',$patharr).'/'.$icoarr['name'];
$info['size']='-';
break;
case 'app':
$info['path']=implode('/',$patharr).'/'.$icoarr['name'];
$info['size']='-';
break;
$info['icon']=$icoarr['img']?$icoarr['img']:'dzz/images/default/system/folder.png';
$contains=IO::getContains($icoarr['oid']);
$info['size']=lang('property_info_size',array('fsize'=>formatsize($contains['size']),'size'=>$contains['size']));
$info['contain']=lang('property_info_contain',array('filenum'=>$contains['contain'][0],'foldernum'=>$contains['contain'][1]));
break;
case 'dzzdoc':
$info['path']=implode('/',$patharr).'/'.$icoarr['name'];
$info['size']=lang('property_info_size',array('fsize'=>formatsize($icoarr['size']),'size'=>$icoarr['size']));
break;
case 'link':
$info['path']=implode('/',$patharr).'/'.$icoarr['name'];
$info['size']='-';
break;
case 'video':
$info['path']=implode('/',$patharr).'/'.$icoarr['name'];
$info['size']='-';
break;
case 'app':
$info['path']=implode('/',$patharr).'/'.$icoarr['name'];
$info['size']='-';
break;
default:
$info['path']=implode('/',$patharr).'/'.$icoarr['name'];
$info['size']=lang('property_info_size',array('fsize'=>formatsize($icoarr['size']),'size'=>$icoarr['size']));
default:
$info['path']=implode('/',$patharr).'/'.$icoarr['name'];
$info['size']=lang('property_info_size',array('fsize'=>formatsize($icoarr['size']),'size'=>$icoarr['size']));
}
}
$info['username']=$icoarr['username'];
$info['uid']=$icoarr['uid'];
$info['fdateline']=($icoarr['fdateline']);
}
$info['username']=$icoarr['username'];
$info['uid']=$icoarr['uid'];
$info['fdateline']=($icoarr['fdateline']);
}
}elseif($do=='chmod'){
$path=rawurldecode($_GET['path']);

17
upload/dzz/system/template/system_ajax.htm
View File

@ -219,16 +219,18 @@
<input type="hidden" name="refer" value="" />
<input type="hidden" name="formhash" value="{FORMHASH}" />
<input type="hidden" name="propertysubmit" value="true" />
<input type="hidden" name="icoid" value="$icoid" />
<input type="hidden" name="icoid" value="$_GET['icoid']" />
<!--{if $_G[inajax]}-->
<input type="hidden" name="handlekey" value="$_GET[handlekey]" />
<!--{/if}-->
<div class="m_c modal-body" style="padding:0;">
<!--{if $flag!='files' && $flag!='folder'}-->
<div class="c ctw">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr height="45"><td width="70" ><img class="icon_50_50" src="$info[icon]" /></td><td><input type="text" class="form-control focus" name="name" value="$icoarr[name]" <!--{if !$perm}-->disabled="desabled"<!--{/if}--> /></td></tr>
<tr height="45"><td width="70" ><img class="icon_50_50" src="$info[icon]" /></td><td><input type="text" class="form-control focus" name="name" value="$info[name]" <!--{if !$perm}-->disabled="desabled"<!--{/if}--> /></td></tr>
</table>
</div>
<!--{/if}-->
<!--{if $ismoderator}-->
<div class="c ctw">
<div class="foldertype clearfix" >
@ -238,7 +240,7 @@
<tr><td align="center">
<img src="dzz/images/default/system/folder-{$permtitle['flag']}.png" width="50">
</td></tr>
<tr><td align="center">{lang inherit}($permtitle['title'])</td></tr>
<tr><td align="center">继承($permtitle['title'])</td></tr>
</table>
</div>
@ -273,20 +275,25 @@
<!--{/if}-->
<!--{if $flag!='files'}-->
<div class="c ctw">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr height="30"><td width="70">{lang property_filetype}</td><td>$info[ftype]</td></tr>
<tr height="30"><td width="70">{lang property_position}</td><td><div style="text-align:left;height:30px;overflow:hidden"><input type="text" value="$info[path]" class="form-control input-sm" style="border:none;background:none;box-shadow:none;padding:0;margin:0;" /></div></td></tr>
</table>
</div>
</div>
<!--{/if}-->
<div class="c ctw">
<table cellpadding="0" cellspacing="0" border="0" >
<tr><td width="70">{lang property_size}</td><td><div style="text-align:left;height:30px;line-height:30px;overflow:hidden">$info[size]</div></td></tr>
<!--{if $info[contain]}--><tr><td width="70">{lang property_contain}</td><td><div style="text-align:left;height:30px;line-height:30px;overflow:hidden">$info[contain]</div></td></tr><!--{/if}-->
<!--{if $info['fdateline']}-->
<tr><td width="70">{lang property_filedate}</td><td><div style="text-align:left;height:30px;line-height:30px;overflow:hidden">$info[fdateline]</div></td></tr>
<!--{/if}-->
<!--{if $info['fdateline']}-->
<tr><td width="70">{lang property_creator}</td><td><div style="text-align:left;height:30px;line-height:30px;overflow:hidden">$info[username]</div></td></tr>
<!--{/if}-->
</table>
</div>
</div>

22
upload/dzz/system/ueditor/third-party/dzzattach/dzzattach.js vendored
View File

@ -411,11 +411,33 @@ dzzattach.showContent=function(){
var el1=jQuery('<img height="'+height+'" width="'+width+'" style="cursor: move; top: '+top+'px; transform: rotate(0deg); left: '+left+'px;" src="'+data.src+'" ws_property="1" onload="jQuery(\'#pre_loading\').fadeOut();jQuery(\'#previewer-photo\').show();" >').appendTo(el);
el1.get(0).onmousedown = function(event) {try{dragMenu(el1.get(0), event, 1);}catch(e){}};
el1.on('click',function(){return false});
jQuery.getScript('dzz/scripts/jquery.mousewheel.js',function(data){
el1.on('mousewheel',function(e,delta, deltaX, deltaY){
var dy=delta*100;
var dx=dy*ratio1;
dzzattach.thumb.pic_resize(dx,dy);
return false;
});
});
});
};
dzzattach.thumb.angle=0;
dzzattach.thumb.pic_resize=function(dx,dy){
var el=jQuery('#previewer-photo>img');
var pos=el.position();
var imgleft=pos.left;
var imgtop=pos.top;
var imgwidth=el.width();
var imgheight=el.height();
imgleft-=dx/2;
imgtop-=dy/2;
imgwidth+=dx;
imgheight+=dy;
el.css({left:imgleft,top:imgtop,width:imgwidth,height:imgheight,'max-width':'none'});
}
dzzattach.thumb.btnClick=function(btn){
switch(btn){
case "close":

17
upload/dzz/template/dzz_index.htm
View File

@ -241,8 +241,6 @@ function notice_image_resize(obj){
<div class="menu-item" onClick="_config.setback('_imageurl',3,'','backimg');jQuery('#right_contextmenu').hide();jQuery('#shadow').hide();return false;"><span class="menu-text">{lang custom_option_layout_3}</span></div>
</div>
</div>
<!--<div class="menu-item setwidget" onClick="_widget.setToWidget('_icoid');jQuery('#right_contextmenu').hide();jQuery('#shadow').hide();"><span class="menu-icon icon-setwidget"></span><span class="menu-text">{lang setwidget}</span></div>-->
<div class="menu-item realdelete" onClick="_ajax.delIco('_icoid');jQuery('#right_contextmenu').hide();jQuery('#shadow').hide();"><span class="menu-icon icon-delete"></span><span class="menu-text">{lang delete}</span></div>
<div class="menu-item empty" onClick="_ico.Empty('_oid');jQuery('#right_contextmenu').hide();jQuery('#shadow').hide();"><span class="menu-icon icon-empty"></span><span class="menu-text">{lang empty_recycle}</span></div>
<div class="menu-item property" onClick="_ico.property('_icoid');jQuery('#right_contextmenu').hide();jQuery('#shadow').hide();"><span class="menu-icon icon-property"></span><span class="menu-text">{lang property}</span></div>
@ -288,8 +286,8 @@ function notice_image_resize(obj){
</div>
<div class="menu-item upload" style="overflow:hidden" onClick="jQuery('#right_contextmenu').css('z-index',-99999999);jQuery('#shadow').hide();return true;"><span class="menu-icon icon-upload"></span><span class="menu-text">{lang uploading}</span></div>
<span class="menu-sep"></span>
<!--<div class="menu-item appmarket" onClick="_login.click('sys_market','_container');jQuery('#right_contextmenu').hide();jQuery('#shadow').hide();"><span class="menu-icon icon-appshop"></span><span class="menu-text">{lang appmarket}</span></div>-->
<div class="menu-item empty" onClick="_ico.Empty('_container');jQuery('#right_contextmenu').hide();jQuery('#shadow').hide();"><span class="menu-icon icon-empty"></span><span class="menu-text">{lang empty_recycle}</span></div>
<div class="menu-item property" onClick="_ico.property('_fid','folder');jQuery('#right_contextmenu').hide();jQuery('#shadow').hide();"><span class="menu-icon icon-property"></span><span class="menu-text">{lang property}</span></div>
</div>
<div id="right_body" class=" menu " style="position:absolute;display:none">
<div class="menu-item " ><span id="menu_icon_view" class="menu-icon icon-iconview"></span><span class="menu-text">{lang iconviev}</span><span class="menu-rightarrow"></span>
@ -318,14 +316,6 @@ function notice_image_resize(obj){
</div>
<span class="menu-shadow"></span>
</div>
<!--<div class="menu-item autolist" ><span class="menu-icon icon-autolist"></span><span class="menu-text">{lang autolist}</span><span class="menu-rightarrow"></span>
<div class=" menu " style="display:none">
<div class="menu-item" onClick="_ico.Arrange('0','_container','autolist')"><span pid="menu_icon_autolist_0" class="menu-icon icon-notselect menu-icon-autolist"></span><span class="menu-text">{lang autolist_0}</span></div>
<div class="menu-item" onClick="_ico.Arrange('1','_container','autolist')"><span pid="menu_icon_autolist_1" class="menu-icon icon-notselect menu-icon-autolist"></span><span class="menu-text">{lang autolist_1}</span></div>
</div>
<span class="menu-shadow"></span>
</div>-->
<span class="menu-sep"></span>
<div class="menu-item create" ><span class="menu-icon icon-create"></span><span class="menu-text">{lang create}</span><span class="menu-rightarrow"></span>
<div class=" menu " style="display:none">
@ -342,13 +332,8 @@ function notice_image_resize(obj){
</div>
<div class="menu-item upload" style="overflow:hidden" onClick="jQuery('#right_contextmenu').css('z-index',-99999999);jQuery('#shadow').hide();"><span class="menu-icon icon-upload"></span><span class="menu-text">{lang uploading}</span></div>
<div class="menu-item paste" onClick="_select.Paste('_container',XX,YY);jQuery('#right_contextmenu').hide();jQuery('#shadow').hide();"><span class="menu-icon icon-paste"></span><span class="menu-text">{lang paste}</span></div>
<!-- <div class="menu-item newwidget" onclick="_widget.New('_container');jQuery('#right_contextmenu').hide();jQuery('#shadow').hide();"><span class="menu-icon icon-setwidget"></span><span class="menu-text">{lang newwidget}</span></div>-->
<span class="menu-sep"></span>
<!--<div class="menu-item appmarket" onClick="_login.click('sys_market','_container');jQuery('#right_contextmenu').hide();jQuery('#shadow').hide();"><span class="menu-icon icon-appshop"></span><span class="menu-text">{lang appmarket}</span></div>-->
<!--<div class="menu-item widgetmarket" onClick="_login.click('sys_widget');jQuery('#right_contextmenu').hide();jQuery('#shadow').hide();"><span class="menu-icon icon-widget"></span><span class="menu-text">{lang widgetmarket}</span></div>-->
<div class="menu-item thame" onClick="_login.click('sys_theme');jQuery('#right_contextmenu').hide();jQuery('#shadow').hide();"><span class="menu-icon icon-zhuti"></span><span class="menu-text">{lang theme_config}</span></div>
<!--<div class="menu-item config" onClick="showWindow('sys_deskconfig','{DZZSCRIPT}?mod=dzzcp&ac=setdefault');jQuery('#right_contextmenu').hide();jQuery('#shadow').hide();"><span class="menu-icon icon-config"></span><span class="menu-text">{lang desk_config}</span></div>-->
</div>

2
upload/user/language/zh-cn/lang.php
View File

@ -12,6 +12,7 @@
$lang=array (
'username' => '姓名',
'nickname'=>'用户名',
'login_guest' => '没有帐号？<a href="user.php?mod={$_G[setting][regname]}">{$_G[setting][reglinkname]}</a>',
'faq' => '帮助',
'Modify_the_picture' => '修改头像',
@ -141,7 +142,6 @@ $lang=array (
'terms_service' => '服务条款',
'merge_bound' => '并绑定',
'edit_data' => '编辑资料',
'not_choose_agencies_departments' => '未选择机构和部门',
'user_change_lang'=>'更换语言需要重新加载，<a href="#" onclick="window.location.reload()">立即重新加载</a>',
);

2
upload/user/template/register.htm
View File

@ -115,7 +115,7 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-3" for="nickname">{lang username}</label>
<label class="control-label col-sm-3" for="nickname">{lang nickname}</label>
<div class="col-sm-5">
<input type="text" id="nickname" class="form-control" name="" autocomplete="off" placeholder="{lang login_username_placeholder}">
</div>