From e720bce160ba1bae73ccd5c8de76e307025867b3 Mon Sep 17 00:00:00 2001 From: Marco Dickert Date: Fri, 28 Jul 2017 15:36:33 +0200 Subject: [PATCH 01/11] added server-side search function --- build/libifm.php | 120 +++++++++++++++++++++++++++------------------ ifm.php | 120 +++++++++++++++++++++++++++------------------ src/main.php | 124 +++++++++++++++++++++++++++++------------------ 3 files changed, 226 insertions(+), 138 deletions(-) diff --git a/build/libifm.php b/build/libifm.php index 26010dd..8aafba3 100644 --- a/build/libifm.php +++ b/build/libifm.php @@ -2206,6 +2206,7 @@ function IFM( params ) { case "zipnload": $this->zipnload( $_REQUEST); break; case "remoteUpload": $this->remoteUpload( $_REQUEST ); break; case "multidelete": $this->deleteMultipleFiles( $_REQUEST ); break; + case "searchItems": $this->searchItems( $_REQUEST ); break; case "getFolderTree": $this->getFolderTree( $_REQUEST ); break; default: echo json_encode( array( "status" => "ERROR", "message" => "Invalid api action given" ) ); @@ -2253,52 +2254,8 @@ function IFM( params ) { elseif( $result == "." ) {} elseif( $result != ".." && substr( $result, 0, 1 ) == "." && $this->config['showhiddenfiles'] != 1 ) {} else { - $item = array(); - $item["name"] = $result; - if( is_dir( $result ) ) { - $item["type"] = "dir"; - if( $result == ".." ) - $item["icon"] = "icon icon-up-open"; - else - $item["icon"] = "icon icon-folder-empty"; - } else { - $item["type"] = "file"; - if( in_array( substr( $result, -7 ), array( ".tar.gz", ".tar.xz" ) ) ) - $type = substr( $result, -6 ); - elseif( substr( $result, -8 ) == ".tar.bz2" ) - $type = "tar.bz2"; - else - $type = substr( strrchr( $result, "." ), 1 ); - $item["icon"] = $this->getTypeIcon( $type ); - $item["ext"] = strtolower($type); - } - if( $this->config['showlastmodified'] == 1 ) { $item["lastmodified"] = date( "d.m.Y, G:i e", filemtime( $result ) ); } - if( $this->config['showfilesize'] == 1 ) { - $item["size"] = filesize( $result ); - if( $item["size"] > 1073741824 ) $item["size"] = round( ( $item["size"]/1073741824 ), 2 ) . " GB"; - elseif($item["size"]>1048576)$item["size"] = round( ( $item["size"]/1048576 ), 2 ) . " MB"; - elseif($item["size"]>1024)$item["size"] = round( ( $item["size"]/1024 ), 2 ) . " KB"; - else $item["size"] = $item["size"] . " Byte"; - } - if( $this->config['showpermissions'] > 0 ) { - if( $this->config['showpermissions'] == 1 ) $item["fileperms"] = substr( decoct( fileperms( $result ) ), -3 ); - elseif( $this->config['showpermissions'] == 2 ) $item["fileperms"] = $this->filePermsDecode( fileperms( $result ) ); - if( $item["fileperms"] == "" ) $item["fileperms"] = " "; - $item["filepermmode"] = ( $this->config['showpermissions'] == 1 ) ? "short" : "long"; - } - if( $this->config['showowner'] == 1 ) { - if ( function_exists( "posix_getpwuid" ) && fileowner($result) !== false ) { - $ownerarr = posix_getpwuid( fileowner( $result ) ); - $item["owner"] = $ownerarr['name']; - } else $item["owner"] = false; - } - if( $this->config['showgroup'] == 1 ) { - if( function_exists( "posix_getgrgid" ) && filegroup( $result ) !== false ) { - $grouparr = posix_getgrgid( filegroup( $result ) ); - $item["group"] = $grouparr['name']; - } else $item["group"] = false; - } - if( is_dir( $result ) ) $dirs[] = $item; + $item = $this->getItemInformation( $result ); + if( $item['type'] == "dir" ) $dirs[] = $item; else $files[] = $item; } } @@ -2309,6 +2266,55 @@ function IFM( params ) { echo json_encode( array_merge( $dirs, $files ) ); } + private function getItemInformation( $name ) { + $item = array(); + $item["name"] = $name; + if( is_dir( $name ) ) { + $item["type"] = "dir"; + if( $name == ".." ) + $item["icon"] = "icon icon-up-open"; + else + $item["icon"] = "icon icon-folder-empty"; + } else { + $item["type"] = "file"; + if( in_array( substr( $name, -7 ), array( ".tar.gz", ".tar.xz" ) ) ) + $type = substr( $name, -6 ); + elseif( substr( $name, -8 ) == ".tar.bz2" ) + $type = "tar.bz2"; + else + $type = substr( strrchr( $name, "." ), 1 ); + $item["icon"] = $this->getTypeIcon( $type ); + $item["ext"] = strtolower($type); + } + if( $this->config['showlastmodified'] == 1 ) { $item["lastmodified"] = date( "d.m.Y, G:i e", filemtime( $name ) ); } + if( $this->config['showfilesize'] == 1 ) { + $item["size"] = filesize( $name ); + if( $item["size"] > 1073741824 ) $item["size"] = round( ( $item["size"]/1073741824 ), 2 ) . " GB"; + elseif($item["size"]>1048576)$item["size"] = round( ( $item["size"]/1048576 ), 2 ) . " MB"; + elseif($item["size"]>1024)$item["size"] = round( ( $item["size"]/1024 ), 2 ) . " KB"; + else $item["size"] = $item["size"] . " Byte"; + } + if( $this->config['showpermissions'] > 0 ) { + if( $this->config['showpermissions'] == 1 ) $item["fileperms"] = substr( decoct( fileperms( $name ) ), -3 ); + elseif( $this->config['showpermissions'] == 2 ) $item["fileperms"] = $this->filePermsDecode( fileperms( $name ) ); + if( $item["fileperms"] == "" ) $item["fileperms"] = " "; + $item["filepermmode"] = ( $this->config['showpermissions'] == 1 ) ? "short" : "long"; + } + if( $this->config['showowner'] == 1 ) { + if ( function_exists( "posix_getpwuid" ) && fileowner($name) !== false ) { + $ownerarr = posix_getpwuid( fileowner( $name ) ); + $item["owner"] = $ownerarr['name']; + } else $item["owner"] = false; + } + if( $this->config['showgroup'] == 1 ) { + if( function_exists( "posix_getgrgid" ) && filegroup( $name ) !== false ) { + $grouparr = posix_getgrgid( filegroup( $name ) ); + $item["group"] = $grouparr['name']; + } else $item["group"] = false; + } + return $item; + } + private function getConfig() { $ret = $this->config; $ret['inline'] = ( $this->mode == "inline" ) ? true : false; @@ -2345,6 +2351,28 @@ function IFM( params ) { } } + private function searchItems( $d ) { + $this->chDirIfNecessary( $d['dir'] ); + try { + $results = $this->searchItemsRecursive( $d['pattern'] ); + echo json_encode( $results ); + } catch( Exception $e ) { + echo json_encode( array( "status" => "ERROR", "message" => $e->getMessage() ) ); + } + } + + private function searchItemsRecursive( $pattern, $dir="" ) { + $items = array(); + $dir = $dir ? $dir : '.'; + foreach( glob( $this->pathCombine( $dir, $pattern ) ) as $result ) { + array_push( $items, $this->getItemInformation( $result ) ); + } + foreach( glob( $this->pathCombine( $dir, '*') , GLOB_ONLYDIR ) as $subdir ) { + $items = array_merge( $items, $this->searchItemsRecursive( $pattern, $subdir ) ); + } + return $items; + } + private function getFolderTree( $d ) { echo json_encode( array_merge( diff --git a/ifm.php b/ifm.php index fac3357..6d390d2 100644 --- a/ifm.php +++ b/ifm.php @@ -2206,6 +2206,7 @@ function IFM( params ) { case "zipnload": $this->zipnload( $_REQUEST); break; case "remoteUpload": $this->remoteUpload( $_REQUEST ); break; case "multidelete": $this->deleteMultipleFiles( $_REQUEST ); break; + case "searchItems": $this->searchItems( $_REQUEST ); break; case "getFolderTree": $this->getFolderTree( $_REQUEST ); break; default: echo json_encode( array( "status" => "ERROR", "message" => "Invalid api action given" ) ); @@ -2253,52 +2254,8 @@ function IFM( params ) { elseif( $result == "." ) {} elseif( $result != ".." && substr( $result, 0, 1 ) == "." && $this->config['showhiddenfiles'] != 1 ) {} else { - $item = array(); - $item["name"] = $result; - if( is_dir( $result ) ) { - $item["type"] = "dir"; - if( $result == ".." ) - $item["icon"] = "icon icon-up-open"; - else - $item["icon"] = "icon icon-folder-empty"; - } else { - $item["type"] = "file"; - if( in_array( substr( $result, -7 ), array( ".tar.gz", ".tar.xz" ) ) ) - $type = substr( $result, -6 ); - elseif( substr( $result, -8 ) == ".tar.bz2" ) - $type = "tar.bz2"; - else - $type = substr( strrchr( $result, "." ), 1 ); - $item["icon"] = $this->getTypeIcon( $type ); - $item["ext"] = strtolower($type); - } - if( $this->config['showlastmodified'] == 1 ) { $item["lastmodified"] = date( "d.m.Y, G:i e", filemtime( $result ) ); } - if( $this->config['showfilesize'] == 1 ) { - $item["size"] = filesize( $result ); - if( $item["size"] > 1073741824 ) $item["size"] = round( ( $item["size"]/1073741824 ), 2 ) . " GB"; - elseif($item["size"]>1048576)$item["size"] = round( ( $item["size"]/1048576 ), 2 ) . " MB"; - elseif($item["size"]>1024)$item["size"] = round( ( $item["size"]/1024 ), 2 ) . " KB"; - else $item["size"] = $item["size"] . " Byte"; - } - if( $this->config['showpermissions'] > 0 ) { - if( $this->config['showpermissions'] == 1 ) $item["fileperms"] = substr( decoct( fileperms( $result ) ), -3 ); - elseif( $this->config['showpermissions'] == 2 ) $item["fileperms"] = $this->filePermsDecode( fileperms( $result ) ); - if( $item["fileperms"] == "" ) $item["fileperms"] = " "; - $item["filepermmode"] = ( $this->config['showpermissions'] == 1 ) ? "short" : "long"; - } - if( $this->config['showowner'] == 1 ) { - if ( function_exists( "posix_getpwuid" ) && fileowner($result) !== false ) { - $ownerarr = posix_getpwuid( fileowner( $result ) ); - $item["owner"] = $ownerarr['name']; - } else $item["owner"] = false; - } - if( $this->config['showgroup'] == 1 ) { - if( function_exists( "posix_getgrgid" ) && filegroup( $result ) !== false ) { - $grouparr = posix_getgrgid( filegroup( $result ) ); - $item["group"] = $grouparr['name']; - } else $item["group"] = false; - } - if( is_dir( $result ) ) $dirs[] = $item; + $item = $this->getItemInformation( $result ); + if( $item['type'] == "dir" ) $dirs[] = $item; else $files[] = $item; } } @@ -2309,6 +2266,55 @@ function IFM( params ) { echo json_encode( array_merge( $dirs, $files ) ); } + private function getItemInformation( $name ) { + $item = array(); + $item["name"] = $name; + if( is_dir( $name ) ) { + $item["type"] = "dir"; + if( $name == ".." ) + $item["icon"] = "icon icon-up-open"; + else + $item["icon"] = "icon icon-folder-empty"; + } else { + $item["type"] = "file"; + if( in_array( substr( $name, -7 ), array( ".tar.gz", ".tar.xz" ) ) ) + $type = substr( $name, -6 ); + elseif( substr( $name, -8 ) == ".tar.bz2" ) + $type = "tar.bz2"; + else + $type = substr( strrchr( $name, "." ), 1 ); + $item["icon"] = $this->getTypeIcon( $type ); + $item["ext"] = strtolower($type); + } + if( $this->config['showlastmodified'] == 1 ) { $item["lastmodified"] = date( "d.m.Y, G:i e", filemtime( $name ) ); } + if( $this->config['showfilesize'] == 1 ) { + $item["size"] = filesize( $name ); + if( $item["size"] > 1073741824 ) $item["size"] = round( ( $item["size"]/1073741824 ), 2 ) . " GB"; + elseif($item["size"]>1048576)$item["size"] = round( ( $item["size"]/1048576 ), 2 ) . " MB"; + elseif($item["size"]>1024)$item["size"] = round( ( $item["size"]/1024 ), 2 ) . " KB"; + else $item["size"] = $item["size"] . " Byte"; + } + if( $this->config['showpermissions'] > 0 ) { + if( $this->config['showpermissions'] == 1 ) $item["fileperms"] = substr( decoct( fileperms( $name ) ), -3 ); + elseif( $this->config['showpermissions'] == 2 ) $item["fileperms"] = $this->filePermsDecode( fileperms( $name ) ); + if( $item["fileperms"] == "" ) $item["fileperms"] = " "; + $item["filepermmode"] = ( $this->config['showpermissions'] == 1 ) ? "short" : "long"; + } + if( $this->config['showowner'] == 1 ) { + if ( function_exists( "posix_getpwuid" ) && fileowner($name) !== false ) { + $ownerarr = posix_getpwuid( fileowner( $name ) ); + $item["owner"] = $ownerarr['name']; + } else $item["owner"] = false; + } + if( $this->config['showgroup'] == 1 ) { + if( function_exists( "posix_getgrgid" ) && filegroup( $name ) !== false ) { + $grouparr = posix_getgrgid( filegroup( $name ) ); + $item["group"] = $grouparr['name']; + } else $item["group"] = false; + } + return $item; + } + private function getConfig() { $ret = $this->config; $ret['inline'] = ( $this->mode == "inline" ) ? true : false; @@ -2345,6 +2351,28 @@ function IFM( params ) { } } + private function searchItems( $d ) { + $this->chDirIfNecessary( $d['dir'] ); + try { + $results = $this->searchItemsRecursive( $d['pattern'] ); + echo json_encode( $results ); + } catch( Exception $e ) { + echo json_encode( array( "status" => "ERROR", "message" => $e->getMessage() ) ); + } + } + + private function searchItemsRecursive( $pattern, $dir="" ) { + $items = array(); + $dir = $dir ? $dir : '.'; + foreach( glob( $this->pathCombine( $dir, $pattern ) ) as $result ) { + array_push( $items, $this->getItemInformation( $result ) ); + } + foreach( glob( $this->pathCombine( $dir, '*') , GLOB_ONLYDIR ) as $subdir ) { + $items = array_merge( $items, $this->searchItemsRecursive( $pattern, $subdir ) ); + } + return $items; + } + private function getFolderTree( $d ) { echo json_encode( array_merge( diff --git a/src/main.php b/src/main.php index 68e2f32..58b3c99 100644 --- a/src/main.php +++ b/src/main.php @@ -243,6 +243,7 @@ f00bar; case "zipnload": $this->zipnload( $_REQUEST); break; case "remoteUpload": $this->remoteUpload( $_REQUEST ); break; case "multidelete": $this->deleteMultipleFiles( $_REQUEST ); break; + case "searchItems": $this->searchItems( $_REQUEST ); break; case "getFolderTree": $this->getFolderTree( $_REQUEST ); break; default: echo json_encode( array( "status" => "ERROR", "message" => "Invalid api action given" ) ); @@ -290,52 +291,8 @@ f00bar; elseif( $result == "." ) {} elseif( $result != ".." && substr( $result, 0, 1 ) == "." && $this->config['showhiddenfiles'] != 1 ) {} else { - $item = array(); - $item["name"] = $result; - if( is_dir( $result ) ) { - $item["type"] = "dir"; - if( $result == ".." ) - $item["icon"] = "icon icon-up-open"; - else - $item["icon"] = "icon icon-folder-empty"; - } else { - $item["type"] = "file"; - if( in_array( substr( $result, -7 ), array( ".tar.gz", ".tar.xz" ) ) ) - $type = substr( $result, -6 ); - elseif( substr( $result, -8 ) == ".tar.bz2" ) - $type = "tar.bz2"; - else - $type = substr( strrchr( $result, "." ), 1 ); - $item["icon"] = $this->getTypeIcon( $type ); - $item["ext"] = strtolower($type); - } - if( $this->config['showlastmodified'] == 1 ) { $item["lastmodified"] = date( "d.m.Y, G:i e", filemtime( $result ) ); } - if( $this->config['showfilesize'] == 1 ) { - $item["size"] = filesize( $result ); - if( $item["size"] > 1073741824 ) $item["size"] = round( ( $item["size"]/1073741824 ), 2 ) . " GB"; - elseif($item["size"]>1048576)$item["size"] = round( ( $item["size"]/1048576 ), 2 ) . " MB"; - elseif($item["size"]>1024)$item["size"] = round( ( $item["size"]/1024 ), 2 ) . " KB"; - else $item["size"] = $item["size"] . " Byte"; - } - if( $this->config['showpermissions'] > 0 ) { - if( $this->config['showpermissions'] == 1 ) $item["fileperms"] = substr( decoct( fileperms( $result ) ), -3 ); - elseif( $this->config['showpermissions'] == 2 ) $item["fileperms"] = $this->filePermsDecode( fileperms( $result ) ); - if( $item["fileperms"] == "" ) $item["fileperms"] = " "; - $item["filepermmode"] = ( $this->config['showpermissions'] == 1 ) ? "short" : "long"; - } - if( $this->config['showowner'] == 1 ) { - if ( function_exists( "posix_getpwuid" ) && fileowner($result) !== false ) { - $ownerarr = posix_getpwuid( fileowner( $result ) ); - $item["owner"] = $ownerarr['name']; - } else $item["owner"] = false; - } - if( $this->config['showgroup'] == 1 ) { - if( function_exists( "posix_getgrgid" ) && filegroup( $result ) !== false ) { - $grouparr = posix_getgrgid( filegroup( $result ) ); - $item["group"] = $grouparr['name']; - } else $item["group"] = false; - } - if( is_dir( $result ) ) $dirs[] = $item; + $item = $this->getItemInformation( $result ); + if( $item['type'] == "dir" ) $dirs[] = $item; else $files[] = $item; } } @@ -346,6 +303,55 @@ f00bar; echo json_encode( array_merge( $dirs, $files ) ); } + private function getItemInformation( $name ) { + $item = array(); + $item["name"] = $name; + if( is_dir( $name ) ) { + $item["type"] = "dir"; + if( $name == ".." ) + $item["icon"] = "icon icon-up-open"; + else + $item["icon"] = "icon icon-folder-empty"; + } else { + $item["type"] = "file"; + if( in_array( substr( $name, -7 ), array( ".tar.gz", ".tar.xz" ) ) ) + $type = substr( $name, -6 ); + elseif( substr( $name, -8 ) == ".tar.bz2" ) + $type = "tar.bz2"; + else + $type = substr( strrchr( $name, "." ), 1 ); + $item["icon"] = $this->getTypeIcon( $type ); + $item["ext"] = strtolower($type); + } + if( $this->config['showlastmodified'] == 1 ) { $item["lastmodified"] = date( "d.m.Y, G:i e", filemtime( $name ) ); } + if( $this->config['showfilesize'] == 1 ) { + $item["size"] = filesize( $name ); + if( $item["size"] > 1073741824 ) $item["size"] = round( ( $item["size"]/1073741824 ), 2 ) . " GB"; + elseif($item["size"]>1048576)$item["size"] = round( ( $item["size"]/1048576 ), 2 ) . " MB"; + elseif($item["size"]>1024)$item["size"] = round( ( $item["size"]/1024 ), 2 ) . " KB"; + else $item["size"] = $item["size"] . " Byte"; + } + if( $this->config['showpermissions'] > 0 ) { + if( $this->config['showpermissions'] == 1 ) $item["fileperms"] = substr( decoct( fileperms( $name ) ), -3 ); + elseif( $this->config['showpermissions'] == 2 ) $item["fileperms"] = $this->filePermsDecode( fileperms( $name ) ); + if( $item["fileperms"] == "" ) $item["fileperms"] = " "; + $item["filepermmode"] = ( $this->config['showpermissions'] == 1 ) ? "short" : "long"; + } + if( $this->config['showowner'] == 1 ) { + if ( function_exists( "posix_getpwuid" ) && fileowner($name) !== false ) { + $ownerarr = posix_getpwuid( fileowner( $name ) ); + $item["owner"] = $ownerarr['name']; + } else $item["owner"] = false; + } + if( $this->config['showgroup'] == 1 ) { + if( function_exists( "posix_getgrgid" ) && filegroup( $name ) !== false ) { + $grouparr = posix_getgrgid( filegroup( $name ) ); + $item["group"] = $grouparr['name']; + } else $item["group"] = false; + } + return $item; + } + private function getConfig() { $ret = $this->config; $ret['inline'] = ( $this->mode == "inline" ) ? true : false; @@ -382,6 +388,32 @@ f00bar; } } + private function searchItems( $d ) { + $this->chDirIfNecessary( $d['dir'] ); + if( strpos( $d['pattern'], '/' ) !== false ) { + echo json_decode( array( "status" => "ERROR", "message" => "Pattern must not contain slashes" ) ); + exit( 1 ); + } + try { + $results = $this->searchItemsRecursive( $d['pattern'] ); + echo json_encode( $results ); + } catch( Exception $e ) { + echo json_encode( array( "status" => "ERROR", "message" => $e->getMessage() ) ); + } + } + + private function searchItemsRecursive( $pattern, $dir="" ) { + $items = array(); + $dir = $dir ? $dir : '.'; + foreach( glob( $this->pathCombine( $dir, $pattern ) ) as $result ) { + array_push( $items, $this->getItemInformation( $result ) ); + } + foreach( glob( $this->pathCombine( $dir, '*') , GLOB_ONLYDIR ) as $subdir ) { + $items = array_merge( $items, $this->searchItemsRecursive( $pattern, $subdir ) ); + } + return $items; + } + private function getFolderTree( $d ) { echo json_encode( array_merge( From 18c48c806bd38b72a4736367f309fcde289bc926 Mon Sep 17 00:00:00 2001 From: Marco Dickert Date: Sun, 30 Jul 2017 05:20:07 +0200 Subject: [PATCH 02/11] added search function to the frontend; fixed some bugs --- build/libifm.php | 148 ++++++++++++++++++++++++- ifm.php | 148 ++++++++++++++++++++++++- src/ifm.js | 56 ++++++++++ src/main.php | 60 +++++++++- src/templates/modal.search.html | 10 ++ src/templates/modal.searchresults.html | 11 ++ 6 files changed, 419 insertions(+), 14 deletions(-) create mode 100644 src/templates/modal.search.html create mode 100644 src/templates/modal.searchresults.html diff --git a/build/libifm.php b/build/libifm.php index 8aafba3..facc4d1 100644 --- a/build/libifm.php +++ b/build/libifm.php @@ -478,6 +478,33 @@ f00bar; +f00bar; + $templates['search'] = <<<'f00bar' +
+
+
+ +
+ +
+
+
+
+ +f00bar; + $templates['searchresults'] = <<<'f00bar' + +{{#items}} + + + + {{linkname}} ({{folder}}) + + + +{{/items}} + + f00bar; $templates['uploadfile'] = <<<'f00bar'
@@ -786,6 +813,7 @@ function IFM( params ) { this.fileChanged = false; // flag for check if file was changed already this.currentDir = ""; // this is the global variable for the current directory; it is used for AJAX requests this.rootElement = ""; + this.search = {}; /** * Shows a bootstrap modal @@ -840,7 +868,9 @@ function IFM( params ) { dir: self.currentDir }, dataType: "json", - success: self.rebuildFileTable, + success: function( data ) { + self.rebuildFileTable( data ); + }, error: function( response ) { self.showMessage( "General error occured: No or broken response", "e" ); }, complete: function() { self.task_done( id ); } }); @@ -852,6 +882,13 @@ function IFM( params ) { * @param object data - object with items */ this.rebuildFileTable = function( data ) { + if( data.status == "ERROR" ) { + this.showMessage( data.message, "e" ); + return; + } else if ( ! Array.isArray( data ) ) { + this.showMessage( "Invalid data from server", "e" ); + return; + } data.forEach( function( item ) { item.guid = self.generateGuid(); item.linkname = ( item.name == ".." ) ? "[ up ]" : item.name; @@ -1622,6 +1659,50 @@ function IFM( params ) { }); }; + this.showSearchDialog = function() { + self.showModal( Mustache.render( self.templates.search, { lastSearch: self.search.lastSearch } ) ); + $( '#searchResults tbody' ).remove(); + $( '#searchResults' ).append( Mustache.render( self.templates.searchresults, { items: self.search.data } ) ); + $( '#searchPattern' ).on( 'keypress', function( e ) { + if( e.keyCode == 13 ) { + e.preventDefault(); + e.stopPropagation(); + self.search.lastSearch = e.target.value; + $.ajax({ + url: self.api, + type: "POST", + data: { + api: "searchItems", + dir: self.currentDir, + pattern: e.target.value + }, + dataType: "json", + success: function( data ) { + data.forEach( function(e) { + e.folder = e.name.substr( 0, e.name.lastIndexOf( '/' ) ); + e.linkname = e.name.substr( e.name.lastIndexOf( '/' ) + 1 ); + }); + self.search.data = data; + $('#searchResults').html( Mustache.render( self.templates.searchresults, { items: data } ) ); + } + }); + } + }); + $( document ).on( 'click', 'a.searchitem', function( e ) { + console.log( e ); + e.preventDefault(); + e.stopPropagation(); + self.changeDirectory( e.target.dataset.folder || e.target.parentNode.dataset.folder, { absolute: true } ); + self.hideModal(); + }); + $( document ).on( 'keypress', 'a.searchitem', function( e ) { + console.log( e ); + e.preventDefault(); + if( e.key == "Enter" ) + e.target.click(); + }); + } + // -------------------- // helper functions // -------------------- @@ -1871,6 +1952,10 @@ function IFM( params ) { return; switch( e.key ) { + case '/': + e.preventDefault(); + self.showSearchDialog(); + break; case 'g': e.preventDefault(); $('#currentDir').focus(); @@ -2242,7 +2327,7 @@ function IFM( params ) { */ private function getFiles( $dir ) { - $dir = $this->getValidDir( $dir ); + $this->log( '$dir: '.$dir ); $this->chDirIfNecessary( $dir ); unset( $files ); unset( $dirs ); $files = array(); $dirs = array(); @@ -2263,7 +2348,10 @@ function IFM( params ) { } usort( $dirs, array( $this, "sortByName" ) ); usort( $files, array( $this, "sortByName" ) ); - echo json_encode( array_merge( $dirs, $files ) ); + + $this->log( '$files: '.print_r($files, true ) ); + $this->log( '$dirs: '.print_r($dirs, true ) ); + $this->jsonResponse( array_merge( $dirs, $files ) ); } private function getItemInformation( $name ) { @@ -2353,6 +2441,10 @@ function IFM( params ) { private function searchItems( $d ) { $this->chDirIfNecessary( $d['dir'] ); + if( strpos( $d['pattern'], '/' ) !== false ) { + echo json_decode( array( "status" => "ERROR", "message" => "Pattern must not contain slashes" ) ); + exit( 1 ); + } try { $results = $this->searchItemsRecursive( $d['pattern'] ); echo json_encode( $results ); @@ -2788,12 +2880,58 @@ function IFM( params ) { echo json_encode( array( "status" => "error", "message" => "Corrupt parameter data" ) ); } - //apis - /* help functions */ + private function log( $string ) { + file_put_contents( $this->pathCombine( $this->getRootDir(), "debug.ifm.log" ), $string, FILE_APPEND ); + } + + private function jsonResponse( $array ) { + $this->convertToUTF8( $array ); + $json = json_encode( $array ); + if( $json === false ) { + switch(json_last_error()) { + case JSON_ERROR_NONE: + $err = ' - Keine Fehler'; + break; + case JSON_ERROR_DEPTH: + $err = ' - Maximale Stacktiefe überschritten'; + break; + case JSON_ERROR_STATE_MISMATCH: + $err = ' - Unterlauf oder Nichtübereinstimmung der Modi'; + break; + case JSON_ERROR_CTRL_CHAR: + $err = ' - Unerwartetes Steuerzeichen gefunden'; + break; + case JSON_ERROR_SYNTAX: + $err = ' - Syntaxfehler, ungültiges JSON'; + break; + case JSON_ERROR_UTF8: + $err = ' - Missgestaltete UTF-8 Zeichen, möglicherweise fehlerhaft kodiert'; + break; + default: + $err = ' - Unbekannter Fehler'; + break; + } + + $this->jsonResponse( array( "status" => "ERROR", "message" => $err ) ); + } else { + echo $json; + } + } + + private function convertToUTF8( &$item ) { + if( is_array( $item ) ) + array_walk( + $item, + array( $this, 'convertToUTF8' ) + ); + else + $item = utf8_encode( $item ); + } + public function checkAuth() { if( $this->config['auth'] == 1 && ( ! isset( $_SESSION['auth'] ) || $_SESSION['auth'] !== true ) ) { $login_failed = false; diff --git a/ifm.php b/ifm.php index 6d390d2..ffeb78f 100644 --- a/ifm.php +++ b/ifm.php @@ -478,6 +478,33 @@ f00bar;
+f00bar; + $templates['search'] = <<<'f00bar' +
+
+
+ +
+ +
+
+
+
+ +f00bar; + $templates['searchresults'] = <<<'f00bar' + +{{#items}} + + + + {{linkname}} ({{folder}}) + + + +{{/items}} + + f00bar; $templates['uploadfile'] = <<<'f00bar'
@@ -786,6 +813,7 @@ function IFM( params ) { this.fileChanged = false; // flag for check if file was changed already this.currentDir = ""; // this is the global variable for the current directory; it is used for AJAX requests this.rootElement = ""; + this.search = {}; /** * Shows a bootstrap modal @@ -840,7 +868,9 @@ function IFM( params ) { dir: self.currentDir }, dataType: "json", - success: self.rebuildFileTable, + success: function( data ) { + self.rebuildFileTable( data ); + }, error: function( response ) { self.showMessage( "General error occured: No or broken response", "e" ); }, complete: function() { self.task_done( id ); } }); @@ -852,6 +882,13 @@ function IFM( params ) { * @param object data - object with items */ this.rebuildFileTable = function( data ) { + if( data.status == "ERROR" ) { + this.showMessage( data.message, "e" ); + return; + } else if ( ! Array.isArray( data ) ) { + this.showMessage( "Invalid data from server", "e" ); + return; + } data.forEach( function( item ) { item.guid = self.generateGuid(); item.linkname = ( item.name == ".." ) ? "[ up ]" : item.name; @@ -1622,6 +1659,50 @@ function IFM( params ) { }); }; + this.showSearchDialog = function() { + self.showModal( Mustache.render( self.templates.search, { lastSearch: self.search.lastSearch } ) ); + $( '#searchResults tbody' ).remove(); + $( '#searchResults' ).append( Mustache.render( self.templates.searchresults, { items: self.search.data } ) ); + $( '#searchPattern' ).on( 'keypress', function( e ) { + if( e.keyCode == 13 ) { + e.preventDefault(); + e.stopPropagation(); + self.search.lastSearch = e.target.value; + $.ajax({ + url: self.api, + type: "POST", + data: { + api: "searchItems", + dir: self.currentDir, + pattern: e.target.value + }, + dataType: "json", + success: function( data ) { + data.forEach( function(e) { + e.folder = e.name.substr( 0, e.name.lastIndexOf( '/' ) ); + e.linkname = e.name.substr( e.name.lastIndexOf( '/' ) + 1 ); + }); + self.search.data = data; + $('#searchResults').html( Mustache.render( self.templates.searchresults, { items: data } ) ); + } + }); + } + }); + $( document ).on( 'click', 'a.searchitem', function( e ) { + console.log( e ); + e.preventDefault(); + e.stopPropagation(); + self.changeDirectory( e.target.dataset.folder || e.target.parentNode.dataset.folder, { absolute: true } ); + self.hideModal(); + }); + $( document ).on( 'keypress', 'a.searchitem', function( e ) { + console.log( e ); + e.preventDefault(); + if( e.key == "Enter" ) + e.target.click(); + }); + } + // -------------------- // helper functions // -------------------- @@ -1871,6 +1952,10 @@ function IFM( params ) { return; switch( e.key ) { + case '/': + e.preventDefault(); + self.showSearchDialog(); + break; case 'g': e.preventDefault(); $('#currentDir').focus(); @@ -2242,7 +2327,7 @@ function IFM( params ) { */ private function getFiles( $dir ) { - $dir = $this->getValidDir( $dir ); + $this->log( '$dir: '.$dir ); $this->chDirIfNecessary( $dir ); unset( $files ); unset( $dirs ); $files = array(); $dirs = array(); @@ -2263,7 +2348,10 @@ function IFM( params ) { } usort( $dirs, array( $this, "sortByName" ) ); usort( $files, array( $this, "sortByName" ) ); - echo json_encode( array_merge( $dirs, $files ) ); + + $this->log( '$files: '.print_r($files, true ) ); + $this->log( '$dirs: '.print_r($dirs, true ) ); + $this->jsonResponse( array_merge( $dirs, $files ) ); } private function getItemInformation( $name ) { @@ -2353,6 +2441,10 @@ function IFM( params ) { private function searchItems( $d ) { $this->chDirIfNecessary( $d['dir'] ); + if( strpos( $d['pattern'], '/' ) !== false ) { + echo json_decode( array( "status" => "ERROR", "message" => "Pattern must not contain slashes" ) ); + exit( 1 ); + } try { $results = $this->searchItemsRecursive( $d['pattern'] ); echo json_encode( $results ); @@ -2788,12 +2880,58 @@ function IFM( params ) { echo json_encode( array( "status" => "error", "message" => "Corrupt parameter data" ) ); } - //apis - /* help functions */ + private function log( $string ) { + file_put_contents( $this->pathCombine( $this->getRootDir(), "debug.ifm.log" ), $string, FILE_APPEND ); + } + + private function jsonResponse( $array ) { + $this->convertToUTF8( $array ); + $json = json_encode( $array ); + if( $json === false ) { + switch(json_last_error()) { + case JSON_ERROR_NONE: + $err = ' - Keine Fehler'; + break; + case JSON_ERROR_DEPTH: + $err = ' - Maximale Stacktiefe überschritten'; + break; + case JSON_ERROR_STATE_MISMATCH: + $err = ' - Unterlauf oder Nichtübereinstimmung der Modi'; + break; + case JSON_ERROR_CTRL_CHAR: + $err = ' - Unerwartetes Steuerzeichen gefunden'; + break; + case JSON_ERROR_SYNTAX: + $err = ' - Syntaxfehler, ungültiges JSON'; + break; + case JSON_ERROR_UTF8: + $err = ' - Missgestaltete UTF-8 Zeichen, möglicherweise fehlerhaft kodiert'; + break; + default: + $err = ' - Unbekannter Fehler'; + break; + } + + $this->jsonResponse( array( "status" => "ERROR", "message" => $err ) ); + } else { + echo $json; + } + } + + private function convertToUTF8( &$item ) { + if( is_array( $item ) ) + array_walk( + $item, + array( $this, 'convertToUTF8' ) + ); + else + $item = utf8_encode( $item ); + } + public function checkAuth() { if( $this->config['auth'] == 1 && ( ! isset( $_SESSION['auth'] ) || $_SESSION['auth'] !== true ) ) { $login_failed = false; diff --git a/src/ifm.js b/src/ifm.js index 4dddb86..041b532 100644 --- a/src/ifm.js +++ b/src/ifm.js @@ -14,6 +14,7 @@ function IFM( params ) { this.fileChanged = false; // flag for check if file was changed already this.currentDir = ""; // this is the global variable for the current directory; it is used for AJAX requests this.rootElement = ""; + this.search = {}; /** * Shows a bootstrap modal @@ -80,6 +81,13 @@ function IFM( params ) { * @param object data - object with items */ this.rebuildFileTable = function( data ) { + if( data.status == "ERROR" ) { + this.showMessage( data.message, "e" ); + return; + } else if ( ! Array.isArray( data ) ) { + this.showMessage( "Invalid data from server", "e" ); + return; + } data.forEach( function( item ) { item.guid = self.generateGuid(); item.linkname = ( item.name == ".." ) ? "[ up ]" : item.name; @@ -850,6 +858,50 @@ function IFM( params ) { }); }; + this.showSearchDialog = function() { + self.showModal( Mustache.render( self.templates.search, { lastSearch: self.search.lastSearch } ) ); + $( '#searchResults tbody' ).remove(); + $( '#searchResults' ).append( Mustache.render( self.templates.searchresults, { items: self.search.data } ) ); + $( '#searchPattern' ).on( 'keypress', function( e ) { + if( e.keyCode == 13 ) { + e.preventDefault(); + e.stopPropagation(); + self.search.lastSearch = e.target.value; + $.ajax({ + url: self.api, + type: "POST", + data: { + api: "searchItems", + dir: self.currentDir, + pattern: e.target.value + }, + dataType: "json", + success: function( data ) { + data.forEach( function(e) { + e.folder = e.name.substr( 0, e.name.lastIndexOf( '/' ) ); + e.linkname = e.name.substr( e.name.lastIndexOf( '/' ) + 1 ); + }); + self.search.data = data; + $('#searchResults').html( Mustache.render( self.templates.searchresults, { items: data } ) ); + } + }); + } + }); + $( document ).on( 'click', 'a.searchitem', function( e ) { + console.log( e ); + e.preventDefault(); + e.stopPropagation(); + self.changeDirectory( e.target.dataset.folder || e.target.parentNode.dataset.folder, { absolute: true } ); + self.hideModal(); + }); + $( document ).on( 'keypress', 'a.searchitem', function( e ) { + console.log( e ); + e.preventDefault(); + if( e.key == "Enter" ) + e.target.click(); + }); + } + // -------------------- // helper functions // -------------------- @@ -1099,6 +1151,10 @@ function IFM( params ) { return; switch( e.key ) { + case '/': + e.preventDefault(); + self.showSearchDialog(); + break; case 'g': e.preventDefault(); $('#currentDir').focus(); diff --git a/src/main.php b/src/main.php index 58b3c99..3364a0a 100644 --- a/src/main.php +++ b/src/main.php @@ -136,6 +136,12 @@ f00bar; f00bar; $templates['renamefile'] = <<<'f00bar' @@@src/templates/modal.renamefile.html@@@ +f00bar; + $templates['search'] = <<<'f00bar' +@@@src/templates/modal.search.html@@@ +f00bar; + $templates['searchresults'] = <<<'f00bar' +@@@src/templates/modal.searchresults.html@@@ f00bar; $templates['uploadfile'] = <<<'f00bar' @@@src/templates/modal.uploadfile.html@@@ @@ -279,7 +285,6 @@ f00bar; */ private function getFiles( $dir ) { - $dir = $this->getValidDir( $dir ); $this->chDirIfNecessary( $dir ); unset( $files ); unset( $dirs ); $files = array(); $dirs = array(); @@ -300,7 +305,8 @@ f00bar; } usort( $dirs, array( $this, "sortByName" ) ); usort( $files, array( $this, "sortByName" ) ); - echo json_encode( array_merge( $dirs, $files ) ); + + $this->jsonResponse( array_merge( $dirs, $files ) ); } private function getItemInformation( $name ) { @@ -829,12 +835,58 @@ f00bar; echo json_encode( array( "status" => "error", "message" => "Corrupt parameter data" ) ); } - //apis - /* help functions */ + private function log( $d ) { + file_put_contents( $this->pathCombine( $this->getRootDir(), "debug.ifm.log" ), ( is_array( $d ) ? print_r( $d, true ) : $d ), FILE_APPEND ); + } + + private function jsonResponse( $array ) { + $this->convertToUTF8( $array ); + $json = json_encode( $array ); + if( $json === false ) { + switch(json_last_error()) { + case JSON_ERROR_NONE: + echo ' - No errors'; + break; + case JSON_ERROR_DEPTH: + echo ' - Maximum stack depth exceeded'; + break; + case JSON_ERROR_STATE_MISMATCH: + echo ' - Underflow or the modes mismatch'; + break; + case JSON_ERROR_CTRL_CHAR: + echo ' - Unexpected control character found'; + break; + case JSON_ERROR_SYNTAX: + echo ' - Syntax error, malformed JSON'; + break; + case JSON_ERROR_UTF8: + echo ' - Malformed UTF-8 characters, possibly incorrectly encoded'; + break; + default: + echo ' - Unknown error'; + break; + } + + $this->jsonResponse( array( "status" => "ERROR", "message" => "Could not encode json: " . $err ) ); + } else { + echo $json; + } + } + + private function convertToUTF8( &$item ) { + if( is_array( $item ) ) + array_walk( + $item, + array( $this, 'convertToUTF8' ) + ); + else + $item = utf8_encode( $item ); + } + public function checkAuth() { if( $this->config['auth'] == 1 && ( ! isset( $_SESSION['auth'] ) || $_SESSION['auth'] !== true ) ) { $login_failed = false; diff --git a/src/templates/modal.search.html b/src/templates/modal.search.html new file mode 100644 index 0000000..469ffda --- /dev/null +++ b/src/templates/modal.search.html @@ -0,0 +1,10 @@ + +
+
+ +
+ +
+
+
+
diff --git a/src/templates/modal.searchresults.html b/src/templates/modal.searchresults.html new file mode 100644 index 0000000..486d9dd --- /dev/null +++ b/src/templates/modal.searchresults.html @@ -0,0 +1,11 @@ + +{{#items}} + + + + {{linkname}} ({{folder}}) + + + +{{/items}} + From bfbee57fee8c9772d74e9a3ab6915a3d09a19beb Mon Sep 17 00:00:00 2001 From: Marco Dickert Date: Sun, 30 Jul 2017 05:24:34 +0200 Subject: [PATCH 03/11] new builds --- build/libifm.php | 29 ++++++++++++----------------- ifm.php | 29 ++++++++++++----------------- 2 files changed, 24 insertions(+), 34 deletions(-) diff --git a/build/libifm.php b/build/libifm.php index facc4d1..ee23154 100644 --- a/build/libifm.php +++ b/build/libifm.php @@ -868,9 +868,7 @@ function IFM( params ) { dir: self.currentDir }, dataType: "json", - success: function( data ) { - self.rebuildFileTable( data ); - }, + success: self.rebuildFileTable, error: function( response ) { self.showMessage( "General error occured: No or broken response", "e" ); }, complete: function() { self.task_done( id ); } }); @@ -2327,7 +2325,6 @@ function IFM( params ) { */ private function getFiles( $dir ) { - $this->log( '$dir: '.$dir ); $this->chDirIfNecessary( $dir ); unset( $files ); unset( $dirs ); $files = array(); $dirs = array(); @@ -2349,8 +2346,6 @@ function IFM( params ) { usort( $dirs, array( $this, "sortByName" ) ); usort( $files, array( $this, "sortByName" ) ); - $this->log( '$files: '.print_r($files, true ) ); - $this->log( '$dirs: '.print_r($dirs, true ) ); $this->jsonResponse( array_merge( $dirs, $files ) ); } @@ -2884,8 +2879,8 @@ function IFM( params ) { help functions */ - private function log( $string ) { - file_put_contents( $this->pathCombine( $this->getRootDir(), "debug.ifm.log" ), $string, FILE_APPEND ); + private function log( $d ) { + file_put_contents( $this->pathCombine( $this->getRootDir(), "debug.ifm.log" ), ( is_array( $d ) ? print_r( $d, true ) : $d ), FILE_APPEND ); } private function jsonResponse( $array ) { @@ -2894,29 +2889,29 @@ function IFM( params ) { if( $json === false ) { switch(json_last_error()) { case JSON_ERROR_NONE: - $err = ' - Keine Fehler'; + echo ' - No errors'; break; case JSON_ERROR_DEPTH: - $err = ' - Maximale Stacktiefe überschritten'; + echo ' - Maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH: - $err = ' - Unterlauf oder Nichtübereinstimmung der Modi'; + echo ' - Underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR: - $err = ' - Unerwartetes Steuerzeichen gefunden'; + echo ' - Unexpected control character found'; break; case JSON_ERROR_SYNTAX: - $err = ' - Syntaxfehler, ungültiges JSON'; + echo ' - Syntax error, malformed JSON'; break; case JSON_ERROR_UTF8: - $err = ' - Missgestaltete UTF-8 Zeichen, möglicherweise fehlerhaft kodiert'; + echo ' - Malformed UTF-8 characters, possibly incorrectly encoded'; break; default: - $err = ' - Unbekannter Fehler'; + echo ' - Unknown error'; break; } - - $this->jsonResponse( array( "status" => "ERROR", "message" => $err ) ); + + $this->jsonResponse( array( "status" => "ERROR", "message" => "Could not encode json: " . $err ) ); } else { echo $json; } diff --git a/ifm.php b/ifm.php index ffeb78f..62a82b9 100644 --- a/ifm.php +++ b/ifm.php @@ -868,9 +868,7 @@ function IFM( params ) { dir: self.currentDir }, dataType: "json", - success: function( data ) { - self.rebuildFileTable( data ); - }, + success: self.rebuildFileTable, error: function( response ) { self.showMessage( "General error occured: No or broken response", "e" ); }, complete: function() { self.task_done( id ); } }); @@ -2327,7 +2325,6 @@ function IFM( params ) { */ private function getFiles( $dir ) { - $this->log( '$dir: '.$dir ); $this->chDirIfNecessary( $dir ); unset( $files ); unset( $dirs ); $files = array(); $dirs = array(); @@ -2349,8 +2346,6 @@ function IFM( params ) { usort( $dirs, array( $this, "sortByName" ) ); usort( $files, array( $this, "sortByName" ) ); - $this->log( '$files: '.print_r($files, true ) ); - $this->log( '$dirs: '.print_r($dirs, true ) ); $this->jsonResponse( array_merge( $dirs, $files ) ); } @@ -2884,8 +2879,8 @@ function IFM( params ) { help functions */ - private function log( $string ) { - file_put_contents( $this->pathCombine( $this->getRootDir(), "debug.ifm.log" ), $string, FILE_APPEND ); + private function log( $d ) { + file_put_contents( $this->pathCombine( $this->getRootDir(), "debug.ifm.log" ), ( is_array( $d ) ? print_r( $d, true ) : $d ), FILE_APPEND ); } private function jsonResponse( $array ) { @@ -2894,29 +2889,29 @@ function IFM( params ) { if( $json === false ) { switch(json_last_error()) { case JSON_ERROR_NONE: - $err = ' - Keine Fehler'; + echo ' - No errors'; break; case JSON_ERROR_DEPTH: - $err = ' - Maximale Stacktiefe überschritten'; + echo ' - Maximum stack depth exceeded'; break; case JSON_ERROR_STATE_MISMATCH: - $err = ' - Unterlauf oder Nichtübereinstimmung der Modi'; + echo ' - Underflow or the modes mismatch'; break; case JSON_ERROR_CTRL_CHAR: - $err = ' - Unerwartetes Steuerzeichen gefunden'; + echo ' - Unexpected control character found'; break; case JSON_ERROR_SYNTAX: - $err = ' - Syntaxfehler, ungültiges JSON'; + echo ' - Syntax error, malformed JSON'; break; case JSON_ERROR_UTF8: - $err = ' - Missgestaltete UTF-8 Zeichen, möglicherweise fehlerhaft kodiert'; + echo ' - Malformed UTF-8 characters, possibly incorrectly encoded'; break; default: - $err = ' - Unbekannter Fehler'; + echo ' - Unknown error'; break; } - - $this->jsonResponse( array( "status" => "ERROR", "message" => $err ) ); + + $this->jsonResponse( array( "status" => "ERROR", "message" => "Could not encode json: " . $err ) ); } else { echo $json; } From 524a01b5df9a7688b36a4c2d314e19b5a18d6cab Mon Sep 17 00:00:00 2001 From: Marco Dickert Date: Mon, 31 Jul 2017 00:18:16 +0200 Subject: [PATCH 04/11] Added basic context menu, like requested in #47. Still a lot functions missing. --- build/libifm.php | 36 +++++++++++++++++++++++++++++++++++- ifm.php | 36 +++++++++++++++++++++++++++++++++++- src/ifm.js | 19 ++++++++++++++++++- src/main.php | 2 ++ 4 files changed, 90 insertions(+), 3 deletions(-) diff --git a/build/libifm.php b/build/libifm.php index ee23154..0ae52fd 100644 --- a/build/libifm.php +++ b/build/libifm.php @@ -49,6 +49,7 @@ class IFM { "showhtdocs" => 0, "showhiddenfiles" => 1, "showpath" => 0, + "contextmenu" => 1 ); private $config = array(); @@ -795,6 +796,22 @@ if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires j this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.7",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.7",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return e=a-d&&"bottom"},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery); + + + '; From 2d9ceb7f6b5aac8604a741b45a1dc75620873eb9 Mon Sep 17 00:00:00 2001 From: Marco Dickert Date: Mon, 31 Jul 2017 09:03:51 +0200 Subject: [PATCH 05/11] added missing bootstrap menu library --- src/includes/BootstrapMenu.min.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/includes/BootstrapMenu.min.js diff --git a/src/includes/BootstrapMenu.min.js b/src/includes/BootstrapMenu.min.js new file mode 100644 index 0000000..4934a19 --- /dev/null +++ b/src/includes/BootstrapMenu.min.js @@ -0,0 +1,16 @@ +!function(t){function n(e){if(o[e])return o[e].exports;var i=o[e]={exports:{},id:e,loaded:!1};return t[e].call(i.exports,i,i.exports,n),i.loaded=!0,i.exports}var o={};return n.m=t,n.c=o,n.p="",n(0)}([function(t,n,o){window.BootstrapMenu=o(1)},function(t,n,o){"use strict";function e(t){var n=f('
'),o=f('
    '),e=[];e[0]=[],p.each(t.options.actionsGroups,function(t,n){e[n+1]=[]});var i=!1;p.each(t.options.actions,function(n,o){var r=!1;p.each(t.options.actionsGroups,function(t,n){p.contains(t,o)&&(e[n+1].push(o),r=!0)}),r===!1&&e[0].push(o),"undefined"!=typeof n.iconClass&&(i=!0)});var r=!0;return p.each(e,function(n){0!=n.length&&(r===!1&&o.append('
  • '),r=!1,p.each(n,function(n){var e=t.options.actions[n];i===!0?o.append('
    • '):o.append('
    • ')}),o.append('"))}),n.append(o)}function i(t){var n=null;switch(t.options.menuEvent){case"click":n="click";break;case"right-click":n="contextmenu";break;case"hover":n="mouseenter";break;default:throw new Error("Unknown BootstrapMenu 'menuEvent' option")}t.$container.on(n+t.namespace,t.selector,function(n){var o=f(this);return t.open(o,n),!1})}function r(t){t.$container.off(t.namespace)}function s(t){var n=t.options._actionSelectEvent+t.namespace;t.$menu.on(n,function(n){n.preventDefault(),n.stopPropagation();var o=f(n.target),e=o.closest("[data-action]");if(e&&e.length&&!e.is(".disabled")){var i=e.data("action"),r=t.options.fetchElementData(t.$openTarget);t.options.actions[i].onClick(r),t.close()}})}function c(t){t.$menu.off(t.namespace)}function a(t){switch(t.options.menuEvent){case"click":break;case"right-click":break;case"hover":var n=t.$openTarget.add(t.$menu);n.on("mouseleave"+t.closeNamespace,function(o){var e=o.toElement||o.relatedTarget;t.$openTarget.is(e)||t.$menu.is(e)||(n.off(t.closeNamespace),t.close())});break;default:throw new Error("Unknown BootstrapMenu 'menuEvent' option")}t.$container.on("click"+t.closeNamespace,function(){t.close()})}function u(t){t.$container.off(t.closeNamespace)}var l=o(2),f=o(3);o(4);var p=function(){throw new Error("Custom lodash build for BootstrapMenu. lodash chaining is not included")};p.noop=o(6),p.each=o(7),p.contains=o(34),p.extend=o(42),p.uniqueId=o(49),p.isFunction=o(19);var h={container:"body",fetchElementData:p.noop,menuSource:"mouse",menuPosition:"belowLeft",menuEvent:"right-click",actionsGroups:[],noActionsMessage:"No available actions",_actionSelectEvent:"click"},d=function(t,n){this.selector=t,this.options=p.extend({},h,n),this.namespace=p.uniqueId(".BootstrapMenu_"),this.closeNamespace=p.uniqueId(".BootstrapMenuClose_"),this.init()},v=[];d.prototype.init=function(){this.$container=f(this.options.container),this.$menu=e(this),this.$menuList=this.$menu.children(),this.$menu.hide().appendTo(this.$container),this.$openTarget=null,this.openEvent=null,i(this),s(this),v.push(this)},d.prototype.updatePosition=function(){var t=null,n=null,o=null;switch(this.options.menuSource){case"element":n=this.$openTarget;break;case"mouse":n=this.openEvent;break;default:throw new Error("Unknown BootstrapMenu 'menuSource' option")}switch(this.options.menuPosition){case"belowRight":t="right top",o="right bottom";break;case"belowLeft":t="left top",o="left bottom";break;case"aboveRight":t="right bottom",o="right top";break;case"aboveLeft":t="left bottom",o="left top";break;default:throw new Error("Unknown BootstrapMenu 'menuPosition' option")}this.$menu.css({display:"block"}),this.$menu.css({height:this.$menuList.height(),width:this.$menuList.width()}),this.$menu.position({my:t,at:o,of:n})},d.prototype.open=function(t,n){var o=this;d.closeAll(),this.$openTarget=t,this.openEvent=n;var e=o.options.fetchElementData(o.$openTarget),i=this.$menu.find("[data-action]"),r=this.$menu.find(".noActionsMessage");i.show(),r.hide();var s=0;i.each(function(){var t=f(this),n=t.data("action"),i=o.options.actions[n],r=i.classNames||null;return r&&p.isFunction(r)&&(r=r(e)),t.attr("class",l(r||"")),i.isShown&&i.isShown(e)===!1?void t.hide():(s++,t.find(".actionName").html(p.isFunction(i.name)&&i.name(e)||i.name),void(i.isEnabled&&i.isEnabled(e)===!1&&t.addClass("disabled")))}),0===s&&r.show(),this.updatePosition(),this.$menu.show(),a(this)},d.prototype.close=function(){this.$menu.hide(),u(this)},d.prototype.destroy=function(){this.close(),r(this),c(this)},d.closeAll=function(){p.each(v,function(t){t.close()})},t.exports=d},function(t,n,o){var e,i;/*! + Copyright (c) 2016 Jed Watson. + Licensed under the MIT License (MIT), see + http://jedwatson.github.io/classnames + */ +!function(){"use strict";function o(){for(var t=[],n=0;n").css("position","absolute").appendTo("body").offset({top:1.5,left:1.5}),o=1.5===n.offset().top;return n.remove(),r=function(){return o},o},t.position={scrollbarWidth:function(){if(void 0!==i)return i;var n,o,e=t("
    "),r=e.children()[0];return t("body").append(e),n=r.offsetWidth,e.css("overflow","scroll"),o=r.offsetWidth,n===o&&(o=e[0].clientWidth),e.remove(),i=n-o},getScrollInfo:function(n){var o=n.isWindow||n.isDocument?"":n.element.css("overflow-x"),e=n.isWindow||n.isDocument?"":n.element.css("overflow-y"),i="scroll"===o||"auto"===o&&n.width0?"right":"center",vertical:r<0?"top":e>0?"bottom":"middle"};vs(c(e),c(r))?a.important="horizontal":a.important="vertical",i.using.call(this,t,a)}),l.offset(t.extend(j,{using:u}))})},t.ui.position={fit:{left:function(t,n){var o,e=n.within,i=e.isWindow?e.scrollLeft:e.offset.left,r=e.width,c=t.left-n.collisionPosition.marginLeft,a=i-c,u=c+n.collisionWidth-r-i;n.collisionWidth>r?a>0&&u<=0?(o=t.left+a+n.collisionWidth-r-i,t.left+=a-o):u>0&&a<=0?t.left=i:a>u?t.left=i+r-n.collisionWidth:t.left=i:a>0?t.left+=a:u>0?t.left-=u:t.left=s(t.left-c,t.left)},top:function(t,n){var o,e=n.within,i=e.isWindow?e.scrollTop:e.offset.top,r=n.within.height,c=t.top-n.collisionPosition.marginTop,a=i-c,u=c+n.collisionHeight-r-i;n.collisionHeight>r?a>0&&u<=0?(o=t.top+a+n.collisionHeight-r-i,t.top+=a-o):u>0&&a<=0?t.top=i:a>u?t.top=i+r-n.collisionHeight:t.top=i:a>0?t.top+=a:u>0?t.top-=u:t.top=s(t.top-c,t.top)}},flip:{left:function(t,n){var o,e,i=n.within,r=i.offset.left+i.scrollLeft,s=i.width,a=i.isWindow?i.scrollLeft:i.offset.left,u=t.left-n.collisionPosition.marginLeft,l=u-a,f=u+n.collisionWidth-s-a,p="left"===n.my[0]?-n.elemWidth:"right"===n.my[0]?n.elemWidth:0,h="left"===n.at[0]?n.targetWidth:"right"===n.at[0]?-n.targetWidth:0,d=-2*n.offset[0];l<0?(o=t.left+p+h+d+n.collisionWidth-s-r,(o<0||o0&&(e=t.left-n.collisionPosition.marginLeft+p+h+d-a,(e>0||c(e)0&&(o=t.top-n.collisionPosition.marginTop+h+d+v-a,(o>0||c(o)-1&&t%1==0&&t<=e}var e=9007199254740991;t.exports=o},function(t,n,o){function e(t){for(var n=a(t),o=n.length,e=o&&t.length,u=!!e&&c(e)&&(r(t)||i(t)),f=-1,p=[];++f-1&&t%1==0&&t0;++e-1:!!p&&i(t,n,o)>-1}var i=o(36),r=o(22),s=o(27),c=o(38),a=o(24),u=o(39),l=o(40),f=Math.max;t.exports=e},function(t,n,o){function e(t,n,o){if(n!==n)return i(t,o);for(var e=o-1,r=t.length;++e2?o[s-2]:void 0,a=s>2?o[2]:void 0,u=s>1?o[s-1]:void 0;for("function"==typeof c?(c=i(c,u,5),s-=2):(c="function"==typeof u?u:void 0,s-=c?1:0),a&&r(o[0],o[1],a)&&(c=s<3?void 0:c,s=1);++e Date: Mon, 31 Jul 2017 11:34:07 +0200 Subject: [PATCH 06/11] reworked the compiler --- build/libifm.php | 1 - compiler.php | 40 ++++++++++++++++---------------- ifm.php | 1 - src/main.php | 60 ++++++++++++++++++++++++------------------------ 4 files changed, 50 insertions(+), 52 deletions(-) diff --git a/build/libifm.php b/build/libifm.php index 0ae52fd..061fa74 100644 --- a/build/libifm.php +++ b/build/libifm.php @@ -1,5 +1,4 @@ "src/main.php", + 1 => "src/ifmarchive.php", + 2 => "src/htpasswd.php" +); $IFM_BUILD_STANDALONE = "ifm.php"; -$IFM_BUILD_STANDALONE_COMPRESSED = "ifm.min.php"; +$IFM_BUILD_STANDALONE_COMPRESSED = "build/ifm.min.php"; $IFM_BUILD_LIB_PHP = "build/libifm.php"; /** - * Prepare main script + * Concat PHP Files */ -$main = file_get_contents( $IFM_SRC_MAIN ); -$includes = NULL; -preg_match_all( "/\@\@\@([^\@]+)\@\@\@/", $main, $includes, PREG_SET_ORDER ); -foreach( $includes as $file ) { - $main = str_replace( $file[0], file_get_contents( $file[1] ), $main ); +$compiled = array( "run(); /** * Build library */ -file_put_contents( $IFM_BUILD_LIB_PHP, $main ); -file_put_contents( $IFM_BUILD_LIB_PHP, $phpincludes, FILE_APPEND ); +file_put_contents( $IFM_BUILD_LIB_PHP, $compiled ); diff --git a/ifm.php b/ifm.php index 0101a57..812b58f 100644 --- a/ifm.php +++ b/ifm.php @@ -1,5 +1,4 @@ templates = $templates; } @@ -169,24 +169,24 @@ f00bar; public function getCSS() { print ' - - - - - + + + + + '; } public function getJS() { print ' - - - - - - - - + + + + + + + + '; } From 053c9074f897dade3030e98464da10a232a05fb6 Mon Sep 17 00:00:00 2001 From: Marco Dickert Date: Mon, 31 Jul 2017 16:29:28 +0200 Subject: [PATCH 07/11] fixed error when encoding the json response --- build/libifm.php | 3 ++- ifm.php | 3 ++- src/main.php | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build/libifm.php b/build/libifm.php index 061fa74..234352c 100644 --- a/build/libifm.php +++ b/build/libifm.php @@ -2957,7 +2957,8 @@ function IFM( params ) { array( $this, 'convertToUTF8' ) ); else - $item = utf8_encode( $item ); + if( function_exists( "mb_check_encoding" ) && ! mb_check_encoding( $item, "UTF-8" ) ) + $item = utf8_encode( $item ); } public function checkAuth() { diff --git a/ifm.php b/ifm.php index 812b58f..35cd228 100644 --- a/ifm.php +++ b/ifm.php @@ -2957,7 +2957,8 @@ function IFM( params ) { array( $this, 'convertToUTF8' ) ); else - $item = utf8_encode( $item ); + if( function_exists( "mb_check_encoding" ) && ! mb_check_encoding( $item, "UTF-8" ) ) + $item = utf8_encode( $item ); } public function checkAuth() { diff --git a/src/main.php b/src/main.php index 73ecc0b..620fc05 100644 --- a/src/main.php +++ b/src/main.php @@ -886,7 +886,8 @@ f00bar; array( $this, 'convertToUTF8' ) ); else - $item = utf8_encode( $item ); + if( function_exists( "mb_check_encoding" ) && ! mb_check_encoding( $item, "UTF-8" ) ) + $item = utf8_encode( $item ); } public function checkAuth() { From b24dfe68a5d9a7e836f24492bd832915d3f1ea39 Mon Sep 17 00:00:00 2001 From: Jannis Rondorf Date: Thu, 27 Jul 2017 09:34:33 +0200 Subject: [PATCH 08/11] I18N test --- build/libifm.php | 52 ++++++++++++++++++++++++++++++++++++++---- ifm.php | 52 ++++++++++++++++++++++++++++++++++++++---- src/i18n/de.json | 5 ++++ src/i18n/en.json | 5 ++++ src/ifm.js | 25 ++++++++++++++++++-- src/main.php | 15 ++++++++++++ src/templates/app.html | 4 ++-- 7 files changed, 146 insertions(+), 12 deletions(-) create mode 100644 src/i18n/de.json create mode 100644 src/i18n/en.json diff --git a/build/libifm.php b/build/libifm.php index 234352c..d3f5e0b 100644 --- a/build/libifm.php +++ b/build/libifm.php @@ -23,6 +23,7 @@ class IFM { "tmp_dir" => "", "defaulttimezone" => "Europe/Berlin", "forbiddenChars" => array(), + "locale" => "en", // api controls "ajaxrequest" => 1, @@ -53,6 +54,7 @@ class IFM { private $config = array(); private $templates = array(); + private $i18n = array(); public $mode = ""; public function __construct( $config=array() ) { @@ -121,9 +123,9 @@ class IFM {
    -
  • refresh
    • +
  • {{i18n.refresh}}
    • {{#config.upload}} -
  • upload
    • +
  • {{i18n.upload}}
    • {{/config.upload}} {{#config.createfile}}
  • new file
    • @@ -524,6 +526,25 @@ f00bar; f00bar; $this->templates = $templates; + + $i18n = array(); + $i18n['en'] = <<<'f00bar' +{ + "refresh": "Refresh", + "upload": "Upload", + "file_edit_success": "File successfully edited / created." +} +f00bar; + $i18n['en'] = json_decode($i18n['en'], true); + $i18n['de'] = <<<'f00bar' +{ + "refresh": "Auffrischen", + "upload": "Hochladen", + "file_edit_success": "Datei erfolgreich geändert / angelegt." +} +f00bar; + $i18n['de'] = json_decode($i18n['de'], true); + $this->i18n = $i18n; } /** @@ -1143,7 +1164,7 @@ function IFM( params ) { dataType: "json", success: function( data ) { if( data.status == "OK" ) { - self.showMessage( "File successfully edited/created.", "s" ); + self.showMessage( self.i18n.file_edit_success, "s" ); self.refreshFileTable(); } else self.showMessage( "File could not be edited/created:" + data.message, "e" ); }, @@ -2172,13 +2193,33 @@ function IFM( params ) { success: function(d) { self.templates = d; self.log( "templates loaded" ); - self.initApplication(); + self.initLoadI18N(); }, error: function() { throw new Error( "IFM: could not load templates" ); } }); }; + + this.initLoadI18N = function() { + // load I18N from the backend + $.ajax({ + url: self.api, + type: "POST", + data: { + api: "getI18N" + }, + dataType: "json", + success: function(d) { + self.i18n = d; + self.log( "I18N loaded" ); + self.initApplication(); + }, + error: function() { + throw new Error( "IFM: could not load I18N" ); + } + }); + }; this.initApplication = function() { self.rootElement.html( @@ -2187,6 +2228,7 @@ function IFM( params ) { { showpath: "/", config: self.config, + i18n: self.i18n, ftbuttons: function(){ return ( self.config.edit || self.config.rename || self.config.delete || self.config.zipnload || self.config.extract ); } @@ -2301,6 +2343,8 @@ function IFM( params ) { $this->getFolders( $_REQUEST ); } elseif( $_REQUEST["api"] == "getTemplates" ) { echo json_encode( $this->templates ); + } elseif( $_REQUEST["api"] == "getI18N" ) { + echo json_encode( $this->i18n[$this->config[locale]] ); } elseif( $_REQUEST["api"] == "logout" ) { unset( $_SESSION ); session_destroy(); diff --git a/ifm.php b/ifm.php index 35cd228..02e884a 100644 --- a/ifm.php +++ b/ifm.php @@ -23,6 +23,7 @@ class IFM { "tmp_dir" => "", "defaulttimezone" => "Europe/Berlin", "forbiddenChars" => array(), + "locale" => "en", // api controls "ajaxrequest" => 1, @@ -53,6 +54,7 @@ class IFM { private $config = array(); private $templates = array(); + private $i18n = array(); public $mode = ""; public function __construct( $config=array() ) { @@ -121,9 +123,9 @@ class IFM {
      -
    • refresh
      • +
    • {{i18n.refresh}}
      • {{#config.upload}} -
    • upload
      • +
    • {{i18n.upload}}
      • {{/config.upload}} {{#config.createfile}}
    • new file
      • @@ -524,6 +526,25 @@ f00bar; f00bar; $this->templates = $templates; + + $i18n = array(); + $i18n['en'] = <<<'f00bar' +{ + "refresh": "Refresh", + "upload": "Upload", + "file_edit_success": "File successfully edited / created." +} +f00bar; + $i18n['en'] = json_decode($i18n['en'], true); + $i18n['de'] = <<<'f00bar' +{ + "refresh": "Auffrischen", + "upload": "Hochladen", + "file_edit_success": "Datei erfolgreich geändert / angelegt." +} +f00bar; + $i18n['de'] = json_decode($i18n['de'], true); + $this->i18n = $i18n; } /** @@ -1143,7 +1164,7 @@ function IFM( params ) { dataType: "json", success: function( data ) { if( data.status == "OK" ) { - self.showMessage( "File successfully edited/created.", "s" ); + self.showMessage( self.i18n.file_edit_success, "s" ); self.refreshFileTable(); } else self.showMessage( "File could not be edited/created:" + data.message, "e" ); }, @@ -2172,13 +2193,33 @@ function IFM( params ) { success: function(d) { self.templates = d; self.log( "templates loaded" ); - self.initApplication(); + self.initLoadI18N(); }, error: function() { throw new Error( "IFM: could not load templates" ); } }); }; + + this.initLoadI18N = function() { + // load I18N from the backend + $.ajax({ + url: self.api, + type: "POST", + data: { + api: "getI18N" + }, + dataType: "json", + success: function(d) { + self.i18n = d; + self.log( "I18N loaded" ); + self.initApplication(); + }, + error: function() { + throw new Error( "IFM: could not load I18N" ); + } + }); + }; this.initApplication = function() { self.rootElement.html( @@ -2187,6 +2228,7 @@ function IFM( params ) { { showpath: "/", config: self.config, + i18n: self.i18n, ftbuttons: function(){ return ( self.config.edit || self.config.rename || self.config.delete || self.config.zipnload || self.config.extract ); } @@ -2301,6 +2343,8 @@ function IFM( params ) { $this->getFolders( $_REQUEST ); } elseif( $_REQUEST["api"] == "getTemplates" ) { echo json_encode( $this->templates ); + } elseif( $_REQUEST["api"] == "getI18N" ) { + echo json_encode( $this->i18n[$this->config[locale]] ); } elseif( $_REQUEST["api"] == "logout" ) { unset( $_SESSION ); session_destroy(); diff --git a/src/i18n/de.json b/src/i18n/de.json new file mode 100644 index 0000000..f744028 --- /dev/null +++ b/src/i18n/de.json @@ -0,0 +1,5 @@ +{ + "refresh": "Auffrischen", + "upload": "Hochladen", + "file_edit_success": "Datei erfolgreich geändert / angelegt." +} \ No newline at end of file diff --git a/src/i18n/en.json b/src/i18n/en.json new file mode 100644 index 0000000..2655689 --- /dev/null +++ b/src/i18n/en.json @@ -0,0 +1,5 @@ +{ + "refresh": "Refresh", + "upload": "Upload", + "file_edit_success": "File successfully edited / created." +} \ No newline at end of file diff --git a/src/ifm.js b/src/ifm.js index fb84397..f0a769f 100644 --- a/src/ifm.js +++ b/src/ifm.js @@ -328,7 +328,7 @@ function IFM( params ) { dataType: "json", success: function( data ) { if( data.status == "OK" ) { - self.showMessage( "File successfully edited/created.", "s" ); + self.showMessage( self.i18n.file_edit_success, "s" ); self.refreshFileTable(); } else self.showMessage( "File could not be edited/created:" + data.message, "e" ); }, @@ -1357,13 +1357,33 @@ function IFM( params ) { success: function(d) { self.templates = d; self.log( "templates loaded" ); - self.initApplication(); + self.initLoadI18N(); }, error: function() { throw new Error( "IFM: could not load templates" ); } }); }; + + this.initLoadI18N = function() { + // load I18N from the backend + $.ajax({ + url: self.api, + type: "POST", + data: { + api: "getI18N" + }, + dataType: "json", + success: function(d) { + self.i18n = d; + self.log( "I18N loaded" ); + self.initApplication(); + }, + error: function() { + throw new Error( "IFM: could not load I18N" ); + } + }); + }; this.initApplication = function() { self.rootElement.html( @@ -1372,6 +1392,7 @@ function IFM( params ) { { showpath: "/", config: self.config, + i18n: self.i18n, ftbuttons: function(){ return ( self.config.edit || self.config.rename || self.config.delete || self.config.zipnload || self.config.extract ); } diff --git a/src/main.php b/src/main.php index 620fc05..ebaee5f 100644 --- a/src/main.php +++ b/src/main.php @@ -24,6 +24,7 @@ class IFM { "tmp_dir" => "", "defaulttimezone" => "Europe/Berlin", "forbiddenChars" => array(), + "locale" => "en", // api controls "ajaxrequest" => 1, @@ -54,6 +55,7 @@ class IFM { private $config = array(); private $templates = array(); + private $i18n = array(); public $mode = ""; public function __construct( $config=array() ) { @@ -148,6 +150,17 @@ f00bar; @@@file:src/templates/modal.uploadfile.html@@@ f00bar; $this->templates = $templates; + + $i18n = array(); + $i18n['en'] = <<<'f00bar' +@@@src/i18n/en.json@@@ +f00bar; + $i18n['en'] = json_decode($i18n['en'], true); + $i18n['de'] = <<<'f00bar' +@@@src/i18n/de.json@@@ +f00bar; + $i18n['de'] = json_decode($i18n['de'], true); + $this->i18n = $i18n; } /** @@ -230,6 +243,8 @@ f00bar; $this->getFolders( $_REQUEST ); } elseif( $_REQUEST["api"] == "getTemplates" ) { echo json_encode( $this->templates ); + } elseif( $_REQUEST["api"] == "getI18N" ) { + echo json_encode( $this->i18n[$this->config[locale]] ); } elseif( $_REQUEST["api"] == "logout" ) { unset( $_SESSION ); session_destroy(); diff --git a/src/templates/app.html b/src/templates/app.html index d304656..230a83b 100644 --- a/src/templates/app.html +++ b/src/templates/app.html @@ -23,9 +23,9 @@
        -
      • refresh
        • +
      • {{i18n.refresh}}
        • {{#config.upload}} -
      • upload
        • +
      • {{i18n.upload}}
        • {{/config.upload}} {{#config.createfile}}
      • new file
        • From 57ee73c1153995236203470c21bc9d584af44f0a Mon Sep 17 00:00:00 2001 From: Jannis Rondorf Date: Fri, 28 Jul 2017 15:12:06 +0200 Subject: [PATCH 09/11] Additional translations --- build/libifm.php | 106 ++++++++++++++++++++-------- ifm.php | 106 ++++++++++++++++++++-------- src/i18n/de.json | 25 ++++++- src/i18n/en.json | 25 ++++++- src/main.php | 4 +- src/templates/app.html | 30 ++++---- src/templates/footer.html | 2 +- src/templates/login.html | 12 ++-- src/templates/modal.uploadfile.html | 8 +-- 9 files changed, 228 insertions(+), 90 deletions(-) diff --git a/build/libifm.php b/build/libifm.php index d3f5e0b..70b9976 100644 --- a/build/libifm.php +++ b/build/libifm.php @@ -23,7 +23,7 @@ class IFM { "tmp_dir" => "", "defaulttimezone" => "Europe/Berlin", "forbiddenChars" => array(), - "locale" => "en", + "language" => "en", // api controls "ajaxrequest" => 1, @@ -107,7 +107,7 @@ class IFM {
        IFM
        -
        Drop files to upload
        +
        {{i18n.upload_drop}}
        - + {{#config.download}} {{/config.download}} {{#config.showlastmodified}} - + {{/config.showlastmodified}} {{#config.showfilesize}} - + {{/config.showfilesize}} {{#config.showpermissions}} - + {{/config.showpermissions}} {{#config.showowner}} - + {{/config.showowner}} {{#config.showgroup}} - + {{/config.showgroup}} @@ -184,7 +184,7 @@ class IFM {
        Filename{{i18n.filename}}last modified{{i18n.last_modified}}size{{i18n.size}}
        -
        IFM - improved file manager | ifm.php hidden | Visit the project on GitHub
        +
        {{i18n.footer}} {{i18n.github}}
        f00bar; @@ -234,13 +234,13 @@ body {
        - + {{error}} - - - - - + + + + +
        @@ -305,7 +305,7 @@ f00bar;
        - Tasks 1 + {{i18n.tasks}} 1
        @@ -512,15 +512,15 @@ f00bar;
        -
        +

        - +
        - - + +
        @@ -532,7 +532,30 @@ f00bar; { "refresh": "Refresh", "upload": "Upload", - "file_edit_success": "File successfully edited / created." + "file_edit_success": "File successfully edited / created.", + "toggle_nav": "Toggle navigation", + "path_content": "Content of", + "file_new": "New File", + "folder_new": "New Folder", + "upload_remote": "Remote Upload", + "ajax_request": "AJAX Request", + "logout": "Log Off", + "upload_drop": "Drop files to upload", + "filename": "Filename", + "size": "Size", + "last_modified": "Last Modified", + "permissions": "Permissions", + "owner": "Owner", + "group": "Group", + "footer": "IFM - improved file manager | ifm.php hidden |", + "github": "Visit the project on GitHub", + "tasks": "Tasks", + "login": "Login", + "username": "username", + "password": "Password", + "upload_file": "Upload File", + "filename_new": "New Filename", + "cancel": "Cancel" } f00bar; $i18n['en'] = json_decode($i18n['en'], true); @@ -540,7 +563,30 @@ f00bar; { "refresh": "Auffrischen", "upload": "Hochladen", - "file_edit_success": "Datei erfolgreich geändert / angelegt." + "file_edit_success": "Datei erfolgreich geändert / angelegt.", + "toggle_nav": "Navigation umschalten", + "path_content": "Inhalt von", + "file_new": "Neue Datei", + "folder_new": "Neue Ordner", + "upload_remote": "Hochladen von draussen", + "ajax_request": "AJAX Request", + "logout": "Abmelden", + "upload_drop": "Dateien zum hochladen hier hinziehen", + "filename": "Dateiname", + "size": "Größe", + "last_modified": "Zuletzt geändert", + "permissions": "Berechtigungen", + "owner": "Besitzer", + "group": "Gruppe", + "footer": "IFM - verbesserter file manager | ifm.php versteckt |", + "github": "Besuche das Projekt auf GitHub", + "tasks": "Aufgaben", + "login": "Anmeldung", + "username": "Benutzername", + "password": "Passwort", + "upload_file": "Datei hochladen", + "filename_new": "Neuer Dateiname", + "cancel": "Abbrechen" } f00bar; $i18n['de'] = json_decode($i18n['de'], true); @@ -2344,7 +2390,7 @@ function IFM( params ) { } elseif( $_REQUEST["api"] == "getTemplates" ) { echo json_encode( $this->templates ); } elseif( $_REQUEST["api"] == "getI18N" ) { - echo json_encode( $this->i18n[$this->config[locale]] ); + echo json_encode( $this->i18n[$this->config['language']] ); } elseif( $_REQUEST["api"] == "logout" ) { unset( $_SESSION ); session_destroy(); diff --git a/ifm.php b/ifm.php index 02e884a..abaf3f8 100644 --- a/ifm.php +++ b/ifm.php @@ -23,7 +23,7 @@ class IFM { "tmp_dir" => "", "defaulttimezone" => "Europe/Berlin", "forbiddenChars" => array(), - "locale" => "en", + "language" => "en", // api controls "ajaxrequest" => 1, @@ -107,7 +107,7 @@ class IFM {
        IFM
        -
        Drop files to upload
        +
        {{i18n.upload_drop}}
        - + {{#config.download}} {{/config.download}} {{#config.showlastmodified}} - + {{/config.showlastmodified}} {{#config.showfilesize}} - + {{/config.showfilesize}} {{#config.showpermissions}} - + {{/config.showpermissions}} {{#config.showowner}} - + {{/config.showowner}} {{#config.showgroup}} - + {{/config.showgroup}} @@ -184,7 +184,7 @@ class IFM {
        Filename{{i18n.filename}}last modified{{i18n.last_modified}}size{{i18n.size}}
        -
        IFM - improved file manager | ifm.php hidden | Visit the project on GitHub
        +
        {{i18n.footer}} {{i18n.github}}
        f00bar; @@ -234,13 +234,13 @@ body {
        - + {{error}} - - - - - + + + + +
        @@ -305,7 +305,7 @@ f00bar;
        - Tasks 1 + {{i18n.tasks}} 1
        @@ -512,15 +512,15 @@ f00bar;
        -
        +

        - +
        - - + +
        @@ -532,7 +532,30 @@ f00bar; { "refresh": "Refresh", "upload": "Upload", - "file_edit_success": "File successfully edited / created." + "file_edit_success": "File successfully edited / created.", + "toggle_nav": "Toggle navigation", + "path_content": "Content of", + "file_new": "New File", + "folder_new": "New Folder", + "upload_remote": "Remote Upload", + "ajax_request": "AJAX Request", + "logout": "Log Off", + "upload_drop": "Drop files to upload", + "filename": "Filename", + "size": "Size", + "last_modified": "Last Modified", + "permissions": "Permissions", + "owner": "Owner", + "group": "Group", + "footer": "IFM - improved file manager | ifm.php hidden |", + "github": "Visit the project on GitHub", + "tasks": "Tasks", + "login": "Login", + "username": "username", + "password": "Password", + "upload_file": "Upload File", + "filename_new": "New Filename", + "cancel": "Cancel" } f00bar; $i18n['en'] = json_decode($i18n['en'], true); @@ -540,7 +563,30 @@ f00bar; { "refresh": "Auffrischen", "upload": "Hochladen", - "file_edit_success": "Datei erfolgreich geändert / angelegt." + "file_edit_success": "Datei erfolgreich geändert / angelegt.", + "toggle_nav": "Navigation umschalten", + "path_content": "Inhalt von", + "file_new": "Neue Datei", + "folder_new": "Neue Ordner", + "upload_remote": "Hochladen von draussen", + "ajax_request": "AJAX Request", + "logout": "Abmelden", + "upload_drop": "Dateien zum hochladen hier hinziehen", + "filename": "Dateiname", + "size": "Größe", + "last_modified": "Zuletzt geändert", + "permissions": "Berechtigungen", + "owner": "Besitzer", + "group": "Gruppe", + "footer": "IFM - verbesserter file manager | ifm.php versteckt |", + "github": "Besuche das Projekt auf GitHub", + "tasks": "Aufgaben", + "login": "Anmeldung", + "username": "Benutzername", + "password": "Passwort", + "upload_file": "Datei hochladen", + "filename_new": "Neuer Dateiname", + "cancel": "Abbrechen" } f00bar; $i18n['de'] = json_decode($i18n['de'], true); @@ -2344,7 +2390,7 @@ function IFM( params ) { } elseif( $_REQUEST["api"] == "getTemplates" ) { echo json_encode( $this->templates ); } elseif( $_REQUEST["api"] == "getI18N" ) { - echo json_encode( $this->i18n[$this->config[locale]] ); + echo json_encode( $this->i18n[$this->config['language']] ); } elseif( $_REQUEST["api"] == "logout" ) { unset( $_SESSION ); session_destroy(); diff --git a/src/i18n/de.json b/src/i18n/de.json index f744028..35ccb1c 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -1,5 +1,28 @@ { "refresh": "Auffrischen", "upload": "Hochladen", - "file_edit_success": "Datei erfolgreich geändert / angelegt." + "file_edit_success": "Datei erfolgreich geändert / angelegt.", + "toggle_nav": "Navigation umschalten", + "path_content": "Inhalt von", + "file_new": "Neue Datei", + "folder_new": "Neue Ordner", + "upload_remote": "Hochladen von draussen", + "ajax_request": "AJAX Request", + "logout": "Abmelden", + "upload_drop": "Dateien zum hochladen hier hinziehen", + "filename": "Dateiname", + "size": "Größe", + "last_modified": "Zuletzt geändert", + "permissions": "Berechtigungen", + "owner": "Besitzer", + "group": "Gruppe", + "footer": "IFM - verbesserter file manager | ifm.php versteckt |", + "github": "Besuche das Projekt auf GitHub", + "tasks": "Aufgaben", + "login": "Anmeldung", + "username": "Benutzername", + "password": "Passwort", + "upload_file": "Datei hochladen", + "filename_new": "Neuer Dateiname", + "cancel": "Abbrechen" } \ No newline at end of file diff --git a/src/i18n/en.json b/src/i18n/en.json index 2655689..95e62c9 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -1,5 +1,28 @@ { "refresh": "Refresh", "upload": "Upload", - "file_edit_success": "File successfully edited / created." + "file_edit_success": "File successfully edited / created.", + "toggle_nav": "Toggle navigation", + "path_content": "Content of", + "file_new": "New File", + "folder_new": "New Folder", + "upload_remote": "Remote Upload", + "ajax_request": "AJAX Request", + "logout": "Log Off", + "upload_drop": "Drop files to upload", + "filename": "Filename", + "size": "Size", + "last_modified": "Last Modified", + "permissions": "Permissions", + "owner": "Owner", + "group": "Group", + "footer": "IFM - improved file manager | ifm.php hidden |", + "github": "Visit the project on GitHub", + "tasks": "Tasks", + "login": "Login", + "username": "username", + "password": "Password", + "upload_file": "Upload File", + "filename_new": "New Filename", + "cancel": "Cancel" } \ No newline at end of file diff --git a/src/main.php b/src/main.php index ebaee5f..a1c01b3 100644 --- a/src/main.php +++ b/src/main.php @@ -24,7 +24,7 @@ class IFM { "tmp_dir" => "", "defaulttimezone" => "Europe/Berlin", "forbiddenChars" => array(), - "locale" => "en", + "language" => "en", // api controls "ajaxrequest" => 1, @@ -244,7 +244,7 @@ f00bar; } elseif( $_REQUEST["api"] == "getTemplates" ) { echo json_encode( $this->templates ); } elseif( $_REQUEST["api"] == "getI18N" ) { - echo json_encode( $this->i18n[$this->config[locale]] ); + echo json_encode( $this->i18n[$this->config['language']] ); } elseif( $_REQUEST["api"] == "logout" ) { unset( $_SESSION ); session_destroy(); diff --git a/src/templates/app.html b/src/templates/app.html index 230a83b..d9fd8b7 100644 --- a/src/templates/app.html +++ b/src/templates/app.html @@ -7,7 +7,7 @@
        IFM
        -
        Drop files to upload
        +
        {{i18n.upload_drop}}
        - + {{#config.download}} {{/config.download}} {{#config.showlastmodified}} - + {{/config.showlastmodified}} {{#config.showfilesize}} - + {{/config.showfilesize}} {{#config.showpermissions}} - + {{/config.showpermissions}} {{#config.showowner}} - + {{/config.showowner}} {{#config.showgroup}} - + {{/config.showgroup}} @@ -84,5 +84,5 @@
        Filename{{i18n.filename}}last modified{{i18n.last_modified}}size{{i18n.size}}
        -
        IFM - improved file manager | ifm.php hidden | Visit the project on GitHub
        +
        {{i18n.footer}} {{i18n.github}}
        diff --git a/src/templates/footer.html b/src/templates/footer.html index 2100bd3..7065c30 100644 --- a/src/templates/footer.html +++ b/src/templates/footer.html @@ -2,7 +2,7 @@
        - Tasks 1 + {{i18n.tasks}} 1
        diff --git a/src/templates/login.html b/src/templates/login.html index b1ca338..4b97bc2 100644 --- a/src/templates/login.html +++ b/src/templates/login.html @@ -43,12 +43,12 @@ body {
        - + {{error}} - - - - - + + + + +
        diff --git a/src/templates/modal.uploadfile.html b/src/templates/modal.uploadfile.html index 8e25510..b209892 100644 --- a/src/templates/modal.uploadfile.html +++ b/src/templates/modal.uploadfile.html @@ -1,14 +1,14 @@
        -
        +

        - +
        - - + +
        From 94149de0e76772057014bff013fe92c6cdffc6b0 Mon Sep 17 00:00:00 2001 From: Marco Dickert Date: Fri, 28 Jul 2017 16:07:58 +0200 Subject: [PATCH 10/11] render all modals via mustache --- build/libifm.php | 20 ++++++++++---------- ifm.php | 20 ++++++++++---------- src/ifm.js | 20 ++++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/build/libifm.php b/build/libifm.php index 70b9976..de6a859 100644 --- a/build/libifm.php +++ b/build/libifm.php @@ -1146,7 +1146,7 @@ function IFM( params ) { this.showFileDialog = function () { var filename = arguments.length > 0 ? arguments[0] : "newfile.txt"; var content = arguments.length > 1 ? arguments[1] : ""; - self.showModal( Mustache.render( self.templates.file, { filename: filename } ), { large: true } ); + self.showModal( Mustache.render( self.templates.file, { filename: filename, i18n: self.i18n } ), { large: true } ); var form = $('#formFile'); form.find('input[name="filename"]').on( 'keypress', self.preventEnter ); form.find('#buttonSave').on( 'click', function() { @@ -1251,7 +1251,7 @@ function IFM( params ) { * Shows the create directory dialog */ this.showCreateDirDialog = function() { - self.showModal( self.templates.createdir ); + self.showModal( Mustache.render( self.templates.createdir, { i18n: self.i18n } ) ); var form = $( '#formCreateDir' ); form.find( 'input[name=dirname]' ).on( 'keypress', self.preventEnter ); form.find( '#buttonSave' ).on( 'click', function() { @@ -1298,7 +1298,7 @@ function IFM( params ) { * @param string name - name of the file */ this.showDeleteFileDialog = function( filename ) { - self.showModal( Mustache.render( self.templates.deletefile, { filename: name } ) ); + self.showModal( Mustache.render( self.templates.deletefile, { filename: name, i18n: self.i18n } ) ); var form = $( '#formDeleteFile' ); form.find( '#buttonYes' ).on( 'click', function() { self.deleteFile( filename ); @@ -1342,7 +1342,7 @@ function IFM( params ) { * @params string name - name of the file */ this.showRenameFileDialog = function( filename ) { - self.showModal( Mustache.render( self.templates.renamefile, { filename: filename } ) ); + self.showModal( Mustache.render( self.templates.renamefile, { filename: filename, i18n: self.i18n } ) ); var form = $( '#formRenameFile' ); form.find( 'input[name=newname]' ).on( 'keypress', self.preventEnter ); form.find( '#buttonRename' ).on( 'click', function() { @@ -1388,7 +1388,7 @@ function IFM( params ) { * @params string name - name of the file */ this.showCopyMoveDialog = function( name ) { - self.showModal( self.templates.copymove ); + self.showModal( Mustache.render( self.templates.copymove, { i18n: self.i18n } ) ); $.ajax({ url: self.api, type: "POST", @@ -1482,7 +1482,7 @@ function IFM( params ) { if( filename.lastIndexOf( '.' ) > 1 ) targetDirSuggestion = filename.substr( 0, filename.lastIndexOf( '.' ) ); else targetDirSuggestion = filename; - self.showModal( Mustache.render( self.templates.extractfile, { filename: filename, destination: targetDirSuggestion } ) ); + self.showModal( Mustache.render( self.templates.extractfile, { filename: filename, destination: targetDirSuggestion, i18n: self.i18n } ) ); var form = $('#formExtractFile'); form.find('#buttonExtract').on( 'click', function() { var t = form.find('input[name=extractTargetLocation]:checked').val(); @@ -1531,7 +1531,7 @@ function IFM( params ) { * Shows the upload file dialog */ this.showUploadFileDialog = function() { - self.showModal( self.templates.uploadfile ); + self.showModal( Mustache.render( self.templates.uploadfile, { i18n: self.i18n } ) ); var form = $('#formUploadFile'); form.find( 'input[name=newfilename]' ).on( 'keypress', self.preventEnter ); form.find( 'input[name=files]' ).on( 'change', function( e ) { @@ -1628,7 +1628,7 @@ function IFM( params ) { * Show the remote upload dialog */ this.showRemoteUploadDialog = function() { - self.showModal( self.templates.remoteupload ); + self.showModal( Mustache.render( self.templates.remoteupload, { i18n: self.i18n } ) ); var form = $('#formRemoteUpload'); form.find( '#url' ) .on( 'keypress', self.preventEnter ) @@ -1682,7 +1682,7 @@ function IFM( params ) { * Shows the ajax request dialog */ this.showAjaxRequestDialog = function() { - self.showModal( self.templates.ajaxrequest ); + self.showModal( Mustache.render( self.templates.ajaxrequest, { i18n: self.i18n } ) ); var form = $('#formAjaxRequest'); form.find( '#ajaxurl' ).on( 'keypress', self.preventEnter ); form.find( '#buttonRequest' ).on( 'click', function() { @@ -1713,7 +1713,7 @@ function IFM( params ) { * Shows the delete dialog for multiple files */ this.showMultiDeleteDialog = function() { - self.showModal( Mustache.render( self.templates.multidelete, { count: $('#filetable tr.selectedItem').length } ) ); + self.showModal( Mustache.render( self.templates.multidelete, { count: $('#filetable tr.selectedItem').length, i18n: self.i18n } ) ); var form = $('#formDeleteFiles'); form.find( '#buttonYes' ).on( 'click', function() { self.multiDelete(); diff --git a/ifm.php b/ifm.php index abaf3f8..3373e6a 100644 --- a/ifm.php +++ b/ifm.php @@ -1146,7 +1146,7 @@ function IFM( params ) { this.showFileDialog = function () { var filename = arguments.length > 0 ? arguments[0] : "newfile.txt"; var content = arguments.length > 1 ? arguments[1] : ""; - self.showModal( Mustache.render( self.templates.file, { filename: filename } ), { large: true } ); + self.showModal( Mustache.render( self.templates.file, { filename: filename, i18n: self.i18n } ), { large: true } ); var form = $('#formFile'); form.find('input[name="filename"]').on( 'keypress', self.preventEnter ); form.find('#buttonSave').on( 'click', function() { @@ -1251,7 +1251,7 @@ function IFM( params ) { * Shows the create directory dialog */ this.showCreateDirDialog = function() { - self.showModal( self.templates.createdir ); + self.showModal( Mustache.render( self.templates.createdir, { i18n: self.i18n } ) ); var form = $( '#formCreateDir' ); form.find( 'input[name=dirname]' ).on( 'keypress', self.preventEnter ); form.find( '#buttonSave' ).on( 'click', function() { @@ -1298,7 +1298,7 @@ function IFM( params ) { * @param string name - name of the file */ this.showDeleteFileDialog = function( filename ) { - self.showModal( Mustache.render( self.templates.deletefile, { filename: name } ) ); + self.showModal( Mustache.render( self.templates.deletefile, { filename: name, i18n: self.i18n } ) ); var form = $( '#formDeleteFile' ); form.find( '#buttonYes' ).on( 'click', function() { self.deleteFile( filename ); @@ -1342,7 +1342,7 @@ function IFM( params ) { * @params string name - name of the file */ this.showRenameFileDialog = function( filename ) { - self.showModal( Mustache.render( self.templates.renamefile, { filename: filename } ) ); + self.showModal( Mustache.render( self.templates.renamefile, { filename: filename, i18n: self.i18n } ) ); var form = $( '#formRenameFile' ); form.find( 'input[name=newname]' ).on( 'keypress', self.preventEnter ); form.find( '#buttonRename' ).on( 'click', function() { @@ -1388,7 +1388,7 @@ function IFM( params ) { * @params string name - name of the file */ this.showCopyMoveDialog = function( name ) { - self.showModal( self.templates.copymove ); + self.showModal( Mustache.render( self.templates.copymove, { i18n: self.i18n } ) ); $.ajax({ url: self.api, type: "POST", @@ -1482,7 +1482,7 @@ function IFM( params ) { if( filename.lastIndexOf( '.' ) > 1 ) targetDirSuggestion = filename.substr( 0, filename.lastIndexOf( '.' ) ); else targetDirSuggestion = filename; - self.showModal( Mustache.render( self.templates.extractfile, { filename: filename, destination: targetDirSuggestion } ) ); + self.showModal( Mustache.render( self.templates.extractfile, { filename: filename, destination: targetDirSuggestion, i18n: self.i18n } ) ); var form = $('#formExtractFile'); form.find('#buttonExtract').on( 'click', function() { var t = form.find('input[name=extractTargetLocation]:checked').val(); @@ -1531,7 +1531,7 @@ function IFM( params ) { * Shows the upload file dialog */ this.showUploadFileDialog = function() { - self.showModal( self.templates.uploadfile ); + self.showModal( Mustache.render( self.templates.uploadfile, { i18n: self.i18n } ) ); var form = $('#formUploadFile'); form.find( 'input[name=newfilename]' ).on( 'keypress', self.preventEnter ); form.find( 'input[name=files]' ).on( 'change', function( e ) { @@ -1628,7 +1628,7 @@ function IFM( params ) { * Show the remote upload dialog */ this.showRemoteUploadDialog = function() { - self.showModal( self.templates.remoteupload ); + self.showModal( Mustache.render( self.templates.remoteupload, { i18n: self.i18n } ) ); var form = $('#formRemoteUpload'); form.find( '#url' ) .on( 'keypress', self.preventEnter ) @@ -1682,7 +1682,7 @@ function IFM( params ) { * Shows the ajax request dialog */ this.showAjaxRequestDialog = function() { - self.showModal( self.templates.ajaxrequest ); + self.showModal( Mustache.render( self.templates.ajaxrequest, { i18n: self.i18n } ) ); var form = $('#formAjaxRequest'); form.find( '#ajaxurl' ).on( 'keypress', self.preventEnter ); form.find( '#buttonRequest' ).on( 'click', function() { @@ -1713,7 +1713,7 @@ function IFM( params ) { * Shows the delete dialog for multiple files */ this.showMultiDeleteDialog = function() { - self.showModal( Mustache.render( self.templates.multidelete, { count: $('#filetable tr.selectedItem').length } ) ); + self.showModal( Mustache.render( self.templates.multidelete, { count: $('#filetable tr.selectedItem').length, i18n: self.i18n } ) ); var form = $('#formDeleteFiles'); form.find( '#buttonYes' ).on( 'click', function() { self.multiDelete(); diff --git a/src/ifm.js b/src/ifm.js index f0a769f..0f8f0ba 100644 --- a/src/ifm.js +++ b/src/ifm.js @@ -264,7 +264,7 @@ function IFM( params ) { this.showFileDialog = function () { var filename = arguments.length > 0 ? arguments[0] : "newfile.txt"; var content = arguments.length > 1 ? arguments[1] : ""; - self.showModal( Mustache.render( self.templates.file, { filename: filename } ), { large: true } ); + self.showModal( Mustache.render( self.templates.file, { filename: filename, i18n: self.i18n } ), { large: true } ); var form = $('#formFile'); form.find('input[name="filename"]').on( 'keypress', self.preventEnter ); form.find('#buttonSave').on( 'click', function() { @@ -369,7 +369,7 @@ function IFM( params ) { * Shows the create directory dialog */ this.showCreateDirDialog = function() { - self.showModal( self.templates.createdir ); + self.showModal( Mustache.render( self.templates.createdir, { i18n: self.i18n } ) ); var form = $( '#formCreateDir' ); form.find( 'input[name=dirname]' ).on( 'keypress', self.preventEnter ); form.find( '#buttonSave' ).on( 'click', function() { @@ -416,7 +416,7 @@ function IFM( params ) { * @param string name - name of the file */ this.showDeleteFileDialog = function( filename ) { - self.showModal( Mustache.render( self.templates.deletefile, { filename: name } ) ); + self.showModal( Mustache.render( self.templates.deletefile, { filename: name, i18n: self.i18n } ) ); var form = $( '#formDeleteFile' ); form.find( '#buttonYes' ).on( 'click', function() { self.deleteFile( filename ); @@ -460,7 +460,7 @@ function IFM( params ) { * @params string name - name of the file */ this.showRenameFileDialog = function( filename ) { - self.showModal( Mustache.render( self.templates.renamefile, { filename: filename } ) ); + self.showModal( Mustache.render( self.templates.renamefile, { filename: filename, i18n: self.i18n } ) ); var form = $( '#formRenameFile' ); form.find( 'input[name=newname]' ).on( 'keypress', self.preventEnter ); form.find( '#buttonRename' ).on( 'click', function() { @@ -506,7 +506,7 @@ function IFM( params ) { * @params string name - name of the file */ this.showCopyMoveDialog = function( name ) { - self.showModal( self.templates.copymove ); + self.showModal( Mustache.render( self.templates.copymove, { i18n: self.i18n } ) ); $.ajax({ url: self.api, type: "POST", @@ -600,7 +600,7 @@ function IFM( params ) { if( filename.lastIndexOf( '.' ) > 1 ) targetDirSuggestion = filename.substr( 0, filename.lastIndexOf( '.' ) ); else targetDirSuggestion = filename; - self.showModal( Mustache.render( self.templates.extractfile, { filename: filename, destination: targetDirSuggestion } ) ); + self.showModal( Mustache.render( self.templates.extractfile, { filename: filename, destination: targetDirSuggestion, i18n: self.i18n } ) ); var form = $('#formExtractFile'); form.find('#buttonExtract').on( 'click', function() { var t = form.find('input[name=extractTargetLocation]:checked').val(); @@ -649,7 +649,7 @@ function IFM( params ) { * Shows the upload file dialog */ this.showUploadFileDialog = function() { - self.showModal( self.templates.uploadfile ); + self.showModal( Mustache.render( self.templates.uploadfile, { i18n: self.i18n } ) ); var form = $('#formUploadFile'); form.find( 'input[name=newfilename]' ).on( 'keypress', self.preventEnter ); form.find( 'input[name=files]' ).on( 'change', function( e ) { @@ -746,7 +746,7 @@ function IFM( params ) { * Show the remote upload dialog */ this.showRemoteUploadDialog = function() { - self.showModal( self.templates.remoteupload ); + self.showModal( Mustache.render( self.templates.remoteupload, { i18n: self.i18n } ) ); var form = $('#formRemoteUpload'); form.find( '#url' ) .on( 'keypress', self.preventEnter ) @@ -800,7 +800,7 @@ function IFM( params ) { * Shows the ajax request dialog */ this.showAjaxRequestDialog = function() { - self.showModal( self.templates.ajaxrequest ); + self.showModal( Mustache.render( self.templates.ajaxrequest, { i18n: self.i18n } ) ); var form = $('#formAjaxRequest'); form.find( '#ajaxurl' ).on( 'keypress', self.preventEnter ); form.find( '#buttonRequest' ).on( 'click', function() { @@ -831,7 +831,7 @@ function IFM( params ) { * Shows the delete dialog for multiple files */ this.showMultiDeleteDialog = function() { - self.showModal( Mustache.render( self.templates.multidelete, { count: $('#filetable tr.selectedItem').length } ) ); + self.showModal( Mustache.render( self.templates.multidelete, { count: $('#filetable tr.selectedItem').length, i18n: self.i18n } ) ); var form = $('#formDeleteFiles'); form.find( '#buttonYes' ).on( 'click', function() { self.multiDelete(); From dee0a6a7bc1ef522f8d61729fac6b76b017e31bd Mon Sep 17 00:00:00 2001 From: Marco Dickert Date: Mon, 31 Jul 2017 09:20:36 +0200 Subject: [PATCH 11/11] manually replace i18n placeholders in login form --- build/libifm.php | 6 +++++- ifm.php | 6 +++++- src/main.php | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/build/libifm.php b/build/libifm.php index de6a859..8af65ab 100644 --- a/build/libifm.php +++ b/build/libifm.php @@ -3129,7 +3129,11 @@ function IFM( params ) { if( $loginFailed ) $err = '
        Login failed.
        '; $this->getHTMLHeader(); - print str_replace( "{{error}}", $err, $this->templates['login'] ); + $html = str_replace( "{{error}}", $err, $this->templates['login'] ); + $html = str_replace( "{{i18n.username}}", $this->i18n[$this->config['language']]['username'], $html ); + $html = str_replace( "{{i18n.password}}", $this->i18n[$this->config['language']]['password'], $html ); + $html = str_replace( "{{i18n.login}}", $this->i18n[$this->config['language']]['login'], $html ); + print $html; $this->getHTMLFooter(); } diff --git a/ifm.php b/ifm.php index 3373e6a..0426fd3 100644 --- a/ifm.php +++ b/ifm.php @@ -3129,7 +3129,11 @@ function IFM( params ) { if( $loginFailed ) $err = '
        Login failed.
        '; $this->getHTMLHeader(); - print str_replace( "{{error}}", $err, $this->templates['login'] ); + $html = str_replace( "{{error}}", $err, $this->templates['login'] ); + $html = str_replace( "{{i18n.username}}", $this->i18n[$this->config['language']]['username'], $html ); + $html = str_replace( "{{i18n.password}}", $this->i18n[$this->config['language']]['password'], $html ); + $html = str_replace( "{{i18n.login}}", $this->i18n[$this->config['language']]['login'], $html ); + print $html; $this->getHTMLFooter(); } diff --git a/src/main.php b/src/main.php index a1c01b3..6acb9ee 100644 --- a/src/main.php +++ b/src/main.php @@ -983,7 +983,11 @@ f00bar; if( $loginFailed ) $err = '
        Login failed.
        '; $this->getHTMLHeader(); - print str_replace( "{{error}}", $err, $this->templates['login'] ); + $html = str_replace( "{{error}}", $err, $this->templates['login'] ); + $html = str_replace( "{{i18n.username}}", $this->i18n[$this->config['language']]['username'], $html ); + $html = str_replace( "{{i18n.password}}", $this->i18n[$this->config['language']]['password'], $html ); + $html = str_replace( "{{i18n.login}}", $this->i18n[$this->config['language']]['login'], $html ); + print $html; $this->getHTMLFooter(); }