v4.25 release last.

2017-12-04 14:34:02 +08:00 · 2017-12-04 14:34:02 +08:00 · 0b88917b40
parent 7c53d60188
commit 0b88917b40
38 changed files with 81 additions and 73 deletions
--- a/app/controller/util.php
+++ b/app/controller/util.php
--- a/app/function/helper.function.php
+++ b/app/function/helper.function.php
@ -6,8 +6,16 @@ function checkExt($file){
 		return 0;
 	}
 	$notAllow = $GLOBALS['auth']['extNotAllow'];
+
+	//'php|phtml|phtm|pwml|asp|aspx|ascx|jsp|pl|htaccess|shtml|shtm'
 	if(strstr($notAllow,'php')){
-		$notAllow .= '|htm|html|php|phtml|pwml|asp|aspx|ascx|jsp|pl|htaccess|shtml|shtm|phtm';
+		$notAllow .= 'php|phtml|phtm|htaccess|pwml';
+	}
+	if( strstr($notAllow,'|htm') || strstr($notAllow,'htm|') ){
+		$notAllow .= 'html|htm|shtml|shtm';
+	}
+	if( strstr($notAllow,'asp')){
+		$notAllow .= 'asp|aspx|ascx|jsp|pl';
 	}	
 	$extArr = explode('|',$notAllow);
 	foreach ($extArr as $current) {
--- a/app/kod/.cache_data
+++ b/app/kod/.cache_data
--- a/app/template/desktop/index.html
+++ b/app/template/desktop/index.html
@ -5,8 +5,8 @@
 	
 </head>
 <body style="overflow: hidden;" oncontextmenu="return core.contextmenu();" id="page-desktop">
-	<?php echo '<style >.aero:before,.aero:after,.full-background{background-image:url('.$wall.')}</style>';?>
-	<div class="full-background desktop"><img class="background" /></div>
+	<?php echo '<style >.aero:before,.aero:after,.full-background-wall{background-image:url('.$wall.')}</style>';?>
+	<div class="full-background-wall desktop"><img class="background" /></div>

 	<?php include(TEMPLATE.'common/navbar.html');?>
 	<div class='bodymain drag-upload-box desktop'>
--- a/static/images/wall_page/5.jpg
+++ b/static/images/wall_page/5.jpg
--- a/static/images/wall_page/thumb/5.jpg
+++ b/static/images/wall_page/thumb/5.jpg
--- a/static/js/app/src/api/default/main.js
+++ b/static/js/app/src/api/default/main.js
--- a/static/js/app/src/api/view/main.js
+++ b/static/js/app/src/api/view/main.js
--- a/static/js/app/src/app/main.js
+++ b/static/js/app/src/app/main.js
--- a/static/js/app/src/desktop/main.js
+++ b/static/js/app/src/desktop/main.js
--- a/static/js/app/src/edit/main.js
+++ b/static/js/app/src/edit/main.js
--- a/static/js/app/src/editor/main.js
+++ b/static/js/app/src/editor/main.js
--- a/static/js/app/src/explorer/main.js
+++ b/static/js/app/src/explorer/main.js
--- a/static/js/app/src/explorerWap/main.js
+++ b/static/js/app/src/explorerWap/main.js
--- a/static/js/app/src/plugins/main.js
+++ b/static/js/app/src/plugins/main.js
--- a/static/js/app/src/plugins/tpl/main.js
+++ b/static/js/app/src/plugins/tpl/main.js
--- a/static/js/app/src/setting/main.js
+++ b/static/js/app/src/setting/main.js
--- a/static/js/app/src/shareEditor/main.js
+++ b/static/js/app/src/shareEditor/main.js
--- a/static/js/app/src/shareExplorer/main.js
+++ b/static/js/app/src/shareExplorer/main.js
--- a/static/js/app/src/shareIndex/main.js
+++ b/static/js/app/src/shareIndex/main.js
--- a/static/js/app/src/user/main.js
+++ b/static/js/app/src/user/main.js
--- a/static/style/skin/alpha_image.css
+++ b/static/style/skin/alpha_image.css
--- a/static/style/skin/alpha_image_sky.css
+++ b/static/style/skin/alpha_image_sky.css
--- a/static/style/skin/alpha_image_sun.css
+++ b/static/style/skin/alpha_image_sun.css
--- a/static/style/skin/base/app_code_edit.css
+++ b/static/style/skin/base/app_code_edit.css
--- a/static/style/skin/base/app_desktop.css
+++ b/static/style/skin/base/app_desktop.css
--- a/static/style/skin/base/app_editor.css
+++ b/static/style/skin/base/app_editor.css
--- a/static/style/skin/base/app_explorer.css
+++ b/static/style/skin/base/app_explorer.css
--- a/static/style/skin/base/app_setting.css
+++ b/static/style/skin/base/app_setting.css
--- a/static/style/skin/diy.css
+++ b/static/style/skin/diy.css
--- a/static/style/skin/mac.css
+++ b/static/style/skin/mac.css
--- a/static/style/skin/metro.css
+++ b/static/style/skin/metro.css
--- a/static/style/skin/metro_green.css
+++ b/static/style/skin/metro_green.css
--- a/static/style/skin/metro_orange.css
+++ b/static/style/skin/metro_orange.css
--- a/static/style/skin/metro_pink.css
+++ b/static/style/skin/metro_pink.css
--- a/static/style/skin/metro_purple.css
+++ b/static/style/skin/metro_purple.css
--- a/static/style/skin/win10.css
+++ b/static/style/skin/win10.css
--- a/static/style/skin/win7.css
+++ b/static/style/skin/win7.css