v4.25 release last.

kalcaddle · Dec 4, 2017 · 0b88917 · 0b88917
1 parent 7c53d60
commit 0b88917
Show file tree

Hide file tree

Showing 38 changed files with 81 additions and 73 deletions.
diff --git a/app/controller/util.php b/app/controller/util.php
diff --git a/app/function/helper.function.php b/app/function/helper.function.php
@@ -6,9 +6,17 @@ 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) {
 		if ($current !== '' && stristr($file,'.'.$current)){//含有扩展名

diff --git a/app/kod/.cache_data b/app/kod/.cache_data
diff --git 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'>

diff --git a/static/images/wall_page/5.jpg b/static/images/wall_page/5.jpg
diff --git a/static/images/wall_page/thumb/5.jpg b/static/images/wall_page/thumb/5.jpg
diff --git a/static/js/app/src/api/default/main.js b/static/js/app/src/api/default/main.js
diff --git a/static/js/app/src/api/view/main.js b/static/js/app/src/api/view/main.js
diff --git a/static/js/app/src/app/main.js b/static/js/app/src/app/main.js
diff --git a/static/js/app/src/desktop/main.js b/static/js/app/src/desktop/main.js
diff --git a/static/js/app/src/edit/main.js b/static/js/app/src/edit/main.js
diff --git a/static/js/app/src/editor/main.js b/static/js/app/src/editor/main.js
diff --git a/static/js/app/src/explorer/main.js b/static/js/app/src/explorer/main.js
diff --git a/static/js/app/src/explorerWap/main.js b/static/js/app/src/explorerWap/main.js
diff --git a/static/js/app/src/plugins/main.js b/static/js/app/src/plugins/main.js
diff --git a/static/js/app/src/plugins/tpl/main.js b/static/js/app/src/plugins/tpl/main.js
diff --git a/static/js/app/src/setting/main.js b/static/js/app/src/setting/main.js
diff --git a/static/js/app/src/shareEditor/main.js b/static/js/app/src/shareEditor/main.js
diff --git a/static/js/app/src/shareExplorer/main.js b/static/js/app/src/shareExplorer/main.js
diff --git a/static/js/app/src/shareIndex/main.js b/static/js/app/src/shareIndex/main.js
diff --git a/static/js/app/src/user/main.js b/static/js/app/src/user/main.js
diff --git a/static/style/skin/alpha_image.css b/static/style/skin/alpha_image.css
diff --git a/static/style/skin/alpha_image_sky.css b/static/style/skin/alpha_image_sky.css
diff --git a/static/style/skin/alpha_image_sun.css b/static/style/skin/alpha_image_sun.css
diff --git a/static/style/skin/base/app_code_edit.css b/static/style/skin/base/app_code_edit.css
diff --git a/static/style/skin/base/app_desktop.css b/static/style/skin/base/app_desktop.css
diff --git a/static/style/skin/base/app_editor.css b/static/style/skin/base/app_editor.css
diff --git a/static/style/skin/base/app_explorer.css b/static/style/skin/base/app_explorer.css
diff --git a/static/style/skin/base/app_setting.css b/static/style/skin/base/app_setting.css
diff --git a/static/style/skin/diy.css b/static/style/skin/diy.css