Changeset 1801340

Timestamp:

01/11/2018 06:36:11 PM (8 years ago)

Author:

Daschmi

Message:

• Layout Changes
• IIS Kompatibilität

Location:

dsdownloadlist

Files:

• tags/1.3 (added)
• tags/1.3/classes (added)
• tags/1.3/classes/Action.class.php (added)
• tags/1.3/classes/DownloadList.class.php (added)
• tags/1.3/classes/Renderer.class.php (added)
• tags/1.3/classes/Shortcode.class.php (added)
• tags/1.3/dsdownloadlist.php (added)
• tags/1.3/readme.txt (added)
• tags/1.3/views (added)
• tags/1.3/views/css (added)
• tags/1.3/views/css/dsdownloadlist.css (added)
• tags/1.3/views/js (added)
• tags/1.3/views/js/dsdownloadlist.js (added)
• tags/1.3/views/list.phtml (added)
• trunk/classes/Action.class.php (modified) (2 diffs)
• trunk/classes/DownloadList.class.php (modified) (2 diffs)
• trunk/classes/Shortcode.class.php (modified) (1 diff)
• trunk/dsdownloadlist.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)
• trunk/views/css/dsdownloadlist.css (modified) (2 diffs)
• trunk/views/js/dsdownloadlist.js (modified) (1 diff)
• trunk/views/list.phtml (modified) (4 diffs)

dsdownloadlist/trunk/classes/Action.class.php

@@ -24 +24 @@
             $atts = @unserialize(base64_decode($_REQUEST['atts']));
 
-            $path = DownloadList::clearPath(WP_CONTENT_DIR.'/'.$atts['root'].'/'.$_REQUEST['path']);
+            $arPath = array_merge(DownloadList::explodePath(WP_CONTENT_DIR.'/'.@$atts['root']), DownloadList::explodePath($_REQUEST['path']));
+            $PrePath = implode('/', array_slice($arPath, 0, sizeof($arPath) - 1)); 
+            $RootPath = implode('/', DownloadList::explodePath(WP_CONTENT_DIR.'/'.$atts['root']));
 
-            if (substr($path, 0, strlen(WP_CONTENT_DIR)) != WP_CONTENT_DIR) die(__('Access denied!', 'dsdl'));
-
+            $PrePath = substr($PrePath, strlen($RootPath));
+            if ($PrePath === "") $PrePath = '/';
+            
+            $path = implode(DIRECTORY_SEPARATOR, $arPath);
+            
             $arFiles = downloadlist::getFiles($path, $atts);
 
@@ -34 +39 @@
             $oRenderer->view['arFiles'] = $arFiles;
             $oRenderer->view['isRoot'] = ((DownloadList::clearPath($atts['root'].'/'.$_REQUEST['path']) != DownloadList::clearPath($atts['root']))?false:true);
-            $oRenderer->view['PrePath'] = DownloadList::clearPath($_REQUEST['path'].'../');
+            $oRenderer->view['PrePath'] = $PrePath;
             $oRenderer->view['path'] = DownloadList::clearPath($_REQUEST['path']);
             $oRenderer->view['atts'] = $atts;

dsdownloadlist/trunk/classes/DownloadList.class.php

@@ -12 +12 @@
     {
 
+        public static function explodePath($path)
+        {
+            
+            $path = \wp_normalize_path($path);
+            
+            $arPath = explode('/', $path);
+            
+            foreach ($arPath as $k => $v) if (trim($v) === '') unset($arPath[$k]);
+            
+            return $arPath;
+            
+        }
+        
         public static function clearPath($path)
         {
-
+ 
+            $path = \wp_normalize_path($path);
+             
             $path = preg_replace("/\/+/", "/", '/'.$path.'/');
 
@@ -43 +58 @@
         public static function getFiles($path, $atts)
         {
-
-            $root = DownloadList::clearPath(WP_CONTENT_DIR.'/'.$atts['root']);
-            
-            $arFiles = scandir($path);
+             
+            $arFiles = scandir(DownloadList::clearPath($path).'/');
             $arReturn = array();
-
+             
             foreach ($arFiles as $f)
             {
 
                 if (!in_array($f, array('.', '..')))
-                {
-
-                    $file_path = DownloadList::clearPath($path.'/'.$f);
-
+                { 
+                     
+                    // Real Path
+                    $real_path = implode('/', DownloadList::explodePath($path.'/'.$f));
+                    $root_path = implode('/', DownloadList::explodePath(WP_CONTENT_DIR.'/'.$atts['root']));
+                     
                     $arReturn[] = array(
                         'filename' => $f,
                         'abspath' => $path.'/'.$f,
-                        'path' => substr($file_path, strlen($root)),
+                        'path' => substr($real_path, strlen($root_path)),
                         'filesize' => ((is_file($path.'/'.$f))?filesize($path.'/'.$f):0),
                         'type' => ((is_file($path.'/'.$f))?'file':'dir')

dsdownloadlist/trunk/classes/Shortcode.class.php

@@ -15 +15 @@
         {
 
+            if (!is_array($atts)) $atts = array();
+            
             $atts = array_merge(array(
-                'root' => '/',
+                'root' => '',
                 'dateformat' => 'Y-m-d H:i:s'
             ), $atts);
-
-            $root = DownloadList::clearPath(WP_CONTENT_DIR.$atts['root']);
-
-            if (substr($root, 0, strlen(WP_CONTENT_DIR)) == WP_CONTENT_DIR)
-            {
-
-                $arFiles = downloadlist::getFiles($root, $atts);
-
-            }
-            else
-            {
-
-                return __('DsDownloadList: Ungültiges Wurzelverzeichnis gesetzt.', 'dsdl');
-
-            }
+            
+            $arPath = downloadList::explodePath(WP_CONTENT_DIR.DIRECTORY_SEPARATOR.$atts['root']);        
+            $arFiles = downloadlist::getFiles(implode(DIRECTORY_SEPARATOR, $arPath), $atts);
 
             $oRenderer = new Renderer();
+            
             $oRenderer->view['arFiles'] = $arFiles;
             $oRenderer->view['isRoot'] = true;

dsdownloadlist/trunk/dsdownloadlist.php

@@ -9 +9 @@
      * Plugin URI: https://daschmi.de/dsdownloadlist/
      * Description: Downloadlist from Shortcode
-     * Version: 1.2
+     * Version: 1.3
      * Author: Daniel Schmitzer
      * Author URI: https://daschmi.de/

dsdownloadlist/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.0.1
 Tested up to: 4.9
-Stable tag: 1.2
+Stable tag: 1.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -39 +39 @@
 = 1.2 =
 * Added rootline path
+
+= 1.3 =
+* Layout changes

dsdownloadlist/trunk/views/css/dsdownloadlist.css

@@ -1 +1 @@
 .dsdownloadlist { width:100%; font-family:monospace; margin-bottom:30px; }
 .dsdownloadlist .head { background-color:#F6F6F6; font-size:1rem; padding:5px 15px; }
+.dsdownloadlist .head .separator:before { content:'/'; margin-left:2px; margin-right:2px; }
 .dsdownloadlist table { table-layout:auto; width:100%; border-collapse:collapse; border:0px; border-spacing:0px; margin:0px; }
 .dsdownloadlist table tr > * { padding-left:15px; }
-.dsdownloadlist table tr > *.icon { width:35px; padding-right:0px; }
-.dsdownloadlist table tr > *.icon img { max-width:100%; height:auto; }
+.dsdownloadlist table tr > *.td_icon { width:35px; padding-right:0px; }
+.dsdownloadlist table tr > *.td_icon img { max-width:100%; height:auto; }
 .dsdownloadlist table tr > *.size { width:125px; }
 .dsdownloadlist table tr > *.mtime { width:100px; text-align:left; white-space: nowrap; }
@@ -11 +12 @@
 .dsdownloadlist .dsdl_loading { margin:-15px; box-sizing:content-box; padding:15px; position:absolute; width:100%; height:100%; left:0px; top:0px; background-color:rgba(0, 0, 0, 0.5); }
 .dsdownloadlist .dsdl_loading img {
-    max-width:100px; height:auto; position:absolute; left:50%; top:50%; margin-left:-50px; margin-top:-50px;
+    max-width:50px !important; height:auto; position:absolute; left:50%; top:50%; margin-left:-50px; margin-top:-50px;
     -webkit-animation:spin 1s linear infinite;
     -moz-animation:spin 1s linear infinite;

dsdownloadlist/trunk/views/js/dsdownloadlist.js

@@ -16 +16 @@
 function dsdl_finishloading(jqSel, data)
 {
-
+    
     jqSel.find('.dsdl_loading').remove();
     jqSel.attr("style", "");

dsdownloadlist/trunk/views/list.phtml

@@ -15 +15 @@
     <div class="head"><?php
 
-        $arPath = explode(DIRECTORY_SEPARATOR, DownloadList::clearPath($this->view['path']));
-        $arCurrentPath = array();
-
-        foreach ($arPath as $k => $v) if (trim($v) === '') unset($arPath[$k]);
-
+        $arPath = DownloadList::explodePath($this->view['path'])
+         
         ?><a href="#" data-atts="<?php echo base64_encode(serialize($this->view['atts'])); ?>" onclick="return dsdl_changeDir(jQuery(this), '<?php echo DownloadList::clearPath(implode(DIRECTORY_SEPARATOR, $arCurrentPath)); ?>');"><?php echo preg_replace('/^\/|\/$/', '', $this->view['atts']['root']); ?></a><?php
 
-        echo DIRECTORY_SEPARATOR;
+        echo '<span class="separator"></span>';
 
         $i = 0; foreach ($arPath as $p)
         {
 
-            $arCurrentPath[] = $p;
-
             ?><a href="#" data-atts="<?php echo base64_encode(serialize($this->view['atts'])); ?>" onclick="return dsdl_changeDir(jQuery(this), '<?php echo DownloadList::clearPath(implode(DIRECTORY_SEPARATOR, $arCurrentPath)); ?>');"><?php echo $p; ?></a><?php
 
-            echo DIRECTORY_SEPARATOR;
+            echo '<span class="separator"></span>';
 
             $i ++;
@@ -45 +40 @@
             <thead>
                 <tr>
-                    <th class="icon"></th>
+                    <th class="td_icon"></th>
                     <th class="filename"><?php echo __('Filename', 'dsdl'); ?></th>
                     <th class="size"><?php echo __('Size', 'dsdl'); ?></th>
@@ -56 +51 @@
                 <?php if ($this->view['isRoot'] != true) { ?>
                 <tr>
-                    <td class="icon">
+                    <td class="td_icon">
                         <img src="data:image/svg+xml;utf8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iaXNvLTg4NTktMSI/Pgo8IS0tIEdlbmVyYXRvcjogQWRvYmUgSWxsdXN0cmF0b3IgMTkuMC4wLCBTVkcgRXhwb3J0IFBsdWctSW4gLiBTVkcgVmVyc2lvbjogNi4wMCBCdWlsZCAwKSAgLS0+CjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgdmVyc2lvbj0iMS4xIiBpZD0iQ2FwYV8xIiB4PSIwcHgiIHk9IjBweCIgdmlld0JveD0iMCAwIDYwIDYwIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA2MCA2MDsiIHhtbDpzcGFjZT0icHJlc2VydmUiIHdpZHRoPSI1MTJweCIgaGVpZ2h0PSI1MTJweCI+CjxwYXRoIGQ9Ik01Ny40OSwyMS41SDU0di02LjI2OGMwLTEuNTA3LTEuMjI2LTIuNzMyLTIuNzMyLTIuNzMySDI2LjUxNWwtNS03SDIuNzMyQzEuMjI2LDUuNSwwLDYuNzI2LDAsOC4yMzJ2NDMuNjg3bDAuMDA2LDAgIGMtMC4wMDUsMC41NjMsMC4xNywxLjExNCwwLjUyMiwxLjU3NUMxLjAxOCw1NC4xMzQsMS43Niw1NC41LDIuNTY1LDU0LjVoNDQuNzU5YzEuMTU2LDAsMi4xNzQtMC43NzksMi40NS0xLjgxM0w2MCwyNC42NDl2LTAuMTc3ICBDNjAsMjIuNzUsNTguOTQ0LDIxLjUsNTcuNDksMjEuNXogTTIsOC4yMzJDMiw3LjgyOCwyLjMyOSw3LjUsMi43MzIsNy41aDE3Ljc1M2w1LDdoMjUuNzgyYzAuNDA0LDAsMC43MzIsMC4zMjgsMC43MzIsMC43MzJWMjEuNSAgSDEyLjczMWMtMC4xNDQsMC0wLjI4NywwLjAxMi0wLjQyNiwwLjAzNmMtMC45NzMsMC4xNjMtMS43ODIsMC44NzMtMi4wMjMsMS43NzZMMiw0NS44OTlWOC4yMzJ6IE00Ny44NjksNTIuMDgzICBjLTAuMDY2LDAuMjQ1LTAuMjkxLDAuNDE3LTAuNTQ1LDAuNDE3SDIuNTY1Yy0wLjI0MywwLTAuMzg1LTAuMTM5LTAuNDQ4LTAuMjIyYy0wLjA2My0wLjA4Mi0wLjE2LTAuMjU2LTAuMTIzLTAuNDA4bDEwLjE5MS0yNy45NTMgIGMwLjA2Ni0wLjI0NSwwLjI5MS0wLjQxNywwLjU0NS0wLjQxN0g1NGgzLjQ5YzAuMzgsMCwwLjQ3NywwLjU0NiwwLjUwMiwwLjgxOUw0Ny44NjksNTIuMDgzeiIgZmlsbD0iIzAwMDAwMCIvPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8Zz4KPC9nPgo8L3N2Zz4K" />
                     </td>
@@ -69 +64 @@
                 <?php foreach ($this->view['arFiles'] as $f) { ?>
                 <tr>
-                    <td class="icon">
+                    <td class="td_icon">
 
                         <?php if ($f['type'] === 'dir') { ?>