Merge branch 'qkqpttgf:master' into master
						commit
						299ba8a85c
					
				| 
						 | 
					@ -21,7 +21,7 @@ $EnvConfigs = [
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    'admin'             => 0b000,
 | 
					    'admin'             => 0b000,
 | 
				
			||||||
    'adminloginpage'    => 0b010,
 | 
					    'adminloginpage'    => 0b010,
 | 
				
			||||||
    //'autoJumpFirstDisk' => 0b010,
 | 
					    'autoJumpFirstDisk' => 0b010,
 | 
				
			||||||
    'background'        => 0b011,
 | 
					    'background'        => 0b011,
 | 
				
			||||||
    'backgroundm'       => 0b011,
 | 
					    'backgroundm'       => 0b011,
 | 
				
			||||||
    'disableShowThumb'  => 0b010,
 | 
					    'disableShowThumb'  => 0b010,
 | 
				
			||||||
| 
						 | 
					@ -270,7 +270,7 @@ function main($path)
 | 
				
			||||||
                // return a json
 | 
					                // return a json
 | 
				
			||||||
                return output(json_encode($files), 200, ['Content-Type' => 'application/json']);
 | 
					                return output(json_encode($files), 200, ['Content-Type' => 'application/json']);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            //if (getConfig('autoJumpFirstDisk')) return output('', 302, [ 'Location' => path_format($_SERVER['base_path'].'/'.$disktags[0].'/') ]);
 | 
					            if (getConfig('autoJumpFirstDisk')) return output('', 302, [ 'Location' => path_format($_SERVER['base_path'].'/'.$disktags[0].'/') ]);
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
            $_SERVER['disktag'] = splitfirst( substr(path_format($path), 1), '/' )[0];
 | 
					            $_SERVER['disktag'] = splitfirst( substr(path_format($path), 1), '/' )[0];
 | 
				
			||||||
            //$pos = strpos($path, '/');
 | 
					            //$pos = strpos($path, '/');
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -107,7 +107,6 @@
 | 
				
			||||||
    <h1 class="title" id="title">
 | 
					    <h1 class="title" id="title">
 | 
				
			||||||
        <a href="<!--base_path-->"><!--Sitename--></a>
 | 
					        <a href="<!--base_path-->"><!--Sitename--></a>
 | 
				
			||||||
    </h1>
 | 
					    </h1>
 | 
				
			||||||
<!--
 | 
					 | 
				
			||||||
<!--MultiDiskAreaStart-->
 | 
					<!--MultiDiskAreaStart-->
 | 
				
			||||||
    <div class="list-wrapper" id="more-disk-div">
 | 
					    <div class="list-wrapper" id="more-disk-div">
 | 
				
			||||||
        <div class="list-container">
 | 
					        <div class="list-container">
 | 
				
			||||||
| 
						 | 
					@ -121,7 +120,6 @@
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
<!--MultiDiskAreaEnd-->
 | 
					<!--MultiDiskAreaEnd-->
 | 
				
			||||||
-->
 | 
					 | 
				
			||||||
<!--HeadomfStart-->
 | 
					<!--HeadomfStart-->
 | 
				
			||||||
    <div class="list-wrapper" id="head-om-div">
 | 
					    <div class="list-wrapper" id="head-om-div">
 | 
				
			||||||
        <div class="list-container">
 | 
					        <div class="list-container">
 | 
				
			||||||
| 
						 | 
					@ -652,7 +650,6 @@
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
<!--IspdfFileEnd-->
 | 
					<!--IspdfFileEnd-->
 | 
				
			||||||
<!--IsFileEnd-->
 | 
					<!--IsFileEnd-->
 | 
				
			||||||
<!--IsFolderStart-->
 | 
					 | 
				
			||||||
<!--HeadmdStart-->
 | 
					<!--HeadmdStart-->
 | 
				
			||||||
    var $head = document.getElementById('head');
 | 
					    var $head = document.getElementById('head');
 | 
				
			||||||
    if ($head) {
 | 
					    if ($head) {
 | 
				
			||||||
| 
						 | 
					@ -666,6 +663,7 @@
 | 
				
			||||||
        $readme.innerHTML = marked(document.getElementById('readme-md').innerText);
 | 
					        $readme.innerHTML = marked(document.getElementById('readme-md').innerText);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
<!--ReadmemdEnd-->
 | 
					<!--ReadmemdEnd-->
 | 
				
			||||||
 | 
					<!--IsFolderStart-->
 | 
				
			||||||
<!--ShowThumbnailsStart-->
 | 
					<!--ShowThumbnailsStart-->
 | 
				
			||||||
    function showthumbnails(obj) {
 | 
					    function showthumbnails(obj) {
 | 
				
			||||||
        images = [<!--ImgExts-->];
 | 
					        images = [<!--ImgExts-->];
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue