Use !== and === in files_trashbin-app

diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
index 16c39ab385382507cdd4a6069c31a2d4cca66805..92361b65f63e01fc7120d0cf6a622c53e2671d71 100644 (file)
--- a/apps/files_trashbin/ajax/delete.php
+++ b/apps/files_trashbin/ajax/delete.php
@@ -13,7 +13,7 @@ $success = array();
 
 $i = 0;
 foreach ($list as $file) {
-       if ( $dirlisting=='0') {
+       if ( $dirlisting === '0') {
                $delimiter = strrpos($file, '.d');
                $filename = substr($file, 0, $delimiter);
                $timestamp =  substr($file, $delimiter+2);

diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index 9d78f166765b13f44344bfb1a3361cd8aec6f7d2..e39004cc0d54ee5758e6d6251d0690b82d1c7f68 100644 (file)
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -12,7 +12,7 @@ $success = array();
 
 $i = 0;
 foreach ($list as $file) {
-       if ( $dirlisting=='0') {
+       if ( $dirlisting === '0') {
                $delimiter = strrpos($file, '.d');
                $filename = substr($file, 0, $delimiter);
                $timestamp =  substr($file, $delimiter+2);

diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 6f1c364737e1939ba462bc7cfa9ace10ca3c68e7..7cb2832c9fe7b9e9c02fb737cddb71f9ede146b0 100644 (file)
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -24,7 +24,7 @@ if ($dir) {
        $dirContent = $view->opendir($dir);
        $i = 0;
        while($entryName = readdir($dirContent)) {
-               if ( $entryName != '.' && $entryName != '..' ) {
+               if ( $entryName !== '.' && $entryName !== '..' ) {
                        $pos = strpos($dir.'/', '/', 1);
                        $tmp = substr($dir, 0, $pos);
                        $pos = strrpos($tmp, '.d');
@@ -54,13 +54,13 @@ foreach ($result as $r) {
        $i['timestamp'] = $r['timestamp'];
        $i['mimetype'] = $r['mime'];
        $i['type'] = $r['type'];
-       if ($i['type'] == 'file') {
+       if ($i['type'] === 'file') {
                $fileinfo = pathinfo($r['id']);
                $i['basename'] = $fileinfo['filename'];
                $i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
        }
        $i['directory'] = $r['location'];
-       if ($i['directory'] == '/') {
+       if ($i['directory'] === '/') {
                $i['directory'] = '';
        }
        $i['permissions'] = OCP\PERMISSION_READ;
@@ -68,9 +68,9 @@ foreach ($result as $r) {
 }
 
 function fileCmp($a, $b) {
-       if ($a['type'] == 'dir' and $b['type'] != 'dir') {
+       if ($a['type'] === 'dir' and $b['type'] !== 'dir') {
                return -1;
-       } elseif ($a['type'] != 'dir' and $b['type'] == 'dir') {
+       } elseif ($a['type'] !== 'dir' and $b['type'] === 'dir') {
                return 1;
        } else {
                return strnatcasecmp($a['name'], $b['name']);
@@ -83,7 +83,7 @@ usort($files, "fileCmp");
 $pathtohere = '';
 $breadcrumb = array();
 foreach (explode('/', $dir) as $i) {
-       if ($i != '') {
+       if ($i !== '') {
                if ( preg_match('/^(.+)\.d[0-9]+$/', $i, $match) ) {
                        $name = $match[1];
                } else {

diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 87dfea491e76afd917c9ba0bcad616be57612b9f..295bc6951170cb5243af6c5e8d640fcf06da37a0 100644 (file)
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -15,7 +15,7 @@ $(document).ready(function() {
                                                var row = document.getElementById(result.data.success[i].filename);
                                                row.parentNode.removeChild(row);
                                        }
-                                       if (result.status != 'success') {
+                                       if (result.status !== 'success') {
                                                OC.dialogs.alert(result.data.message, t('core', 'Error'));
                                        }
                                });
@@ -42,7 +42,7 @@ $(document).ready(function() {
                                                var row = document.getElementById(result.data.success[i].filename);
                                                row.parentNode.removeChild(row);
                                        }
-                                       if (result.status != 'success') {
+                                       if (result.status !== 'success') {
                                                OC.dialogs.alert(result.data.message, t('core', 'Error'));
                                        }
                                });
@@ -72,7 +72,7 @@ $(document).ready(function() {
                                var rows = $(this).parent().parent().parent().children('tr');
                                for (var i = start; i < end; i++) {
                                        $(rows).each(function(index) {
-                                               if (index == i) {
+                                               if (index === i) {
                                                        var checkbox = $(this).children().children('input:checkbox');
                                                        $(checkbox).attr('checked', 'checked');
                                                        $(checkbox).parent().parent().addClass('selected');
@@ -111,7 +111,7 @@ $(document).ready(function() {
                                                        var row = document.getElementById(result.data.success[i].filename);
                                                        row.parentNode.removeChild(row);
                                                }
-                                               if (result.status != 'success') {
+                                               if (result.status !== 'success') {
                                                        OC.dialogs.alert(result.data.message, t('core', 'Error'));
                                                }
                                        });
@@ -137,7 +137,7 @@ $(document).ready(function() {
                                                        var row = document.getElementById(result.data.success[i].filename);
                                                        row.parentNode.removeChild(row);
                                                }
-                                               if (result.status != 'success') {
+                                               if (result.status !== 'success') {
                                                        OC.dialogs.alert(result.data.message, t('core', 'Error'));
                                                }
                                        });
@@ -170,9 +170,9 @@ $(document).ready(function() {
 
 function processSelection(){
        var selected=getSelectedFiles();
-       var selectedFiles=selected.filter(function(el){return el.type=='file'});
-       var selectedFolders=selected.filter(function(el){return el.type=='dir'});
-       if(selectedFiles.length==0 && selectedFolders.length==0) {
+       var selectedFiles=selected.filter(function(el){return el.type === 'file'});
+       var selectedFolders=selected.filter(function(el){return el.type === 'dir'});
+       if(selectedFiles.length === 0 && selectedFolders.length === 0) {
                $('#headerName>span.name').text(t('files','Name'));
                $('#modified').text(t('files','Deleted'));
                $('table').removeClass('multiselect');
@@ -182,7 +182,7 @@ function processSelection(){
                $('.selectedActions').show();
                var selection='';
                if(selectedFolders.length>0){
-                       if(selectedFolders.length==1){
+                       if(selectedFolders.length === 1){
                                selection+=t('files','1 folder');
                        }else{
                                selection+=t('files','{count} folders',{count: selectedFolders.length});
@@ -192,7 +192,7 @@ function processSelection(){
                        }
                }
                if(selectedFiles.length>0){
-                       if(selectedFiles.length==1){
+                       if(selectedFiles.length === 1){
                                selection+=t('files','1 file');
                        }else{
                                selection+=t('files','{count} files',{count: selectedFiles.length});

diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php
index b9d900dfab42b9b945c06fb0692fb2b54d7e4e3d..a74d03ea4c56831006dce811e9d467c297ebd467 100644 (file)
--- a/apps/files_trashbin/lib/trash.php
+++ b/apps/files_trashbin/lib/trash.php
@@ -262,14 +262,14 @@ class Trashbin {
                        $query = \OC_DB::prepare('SELECT `location`,`type` FROM `*PREFIX*files_trash`'
                                        . ' WHERE `user`=? AND `id`=? AND `timestamp`=?');
                        $result = $query->execute(array($user, $filename, $timestamp))->fetchAll();
-                       if (count($result) != 1) {
+                       if (count($result) !== 1) {
                                \OC_Log::write('files_trashbin', 'trash bin database inconsistent!', \OC_Log::ERROR);
                                return false;
                        }
 
                        // if location no longer exists, restore file in the root directory
                        $location = $result[0]['location'];
-                       if ($result[0]['location'] != '/' &&
+                       if ($result[0]['location'] !== '/' &&
                                (!$view->is_dir('files' . $result[0]['location']) ||
                                !$view->isUpdatable('files' . $result[0]['location']))) {
                                $location = '';

diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index 66ec36df867093975df8de6193669c5e5e7f3a77..371765fa69a658783cef13020e8d8d5d167fe531 100644 (file)
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -5,7 +5,7 @@
 </div>
 <div id='notification'></div>
 
-<?php if (isset($_['files']) && count($_['files'])==0 && $_['dirlisting'] == false):?>
+<?php if (isset($_['files']) && count($_['files']) === 0 && $_['dirlisting'] === false):?>
        <div id="emptyfolder"><?php p($l->t('Nothing in here. Your trash bin is empty!'))?></div>
 <?php endif; ?>
 

diff --git a/apps/files_trashbin/templates/part.breadcrumb.php b/apps/files_trashbin/templates/part.breadcrumb.php
index 85bb16ffa2d2822a90d3d9e315e45256ce9680f0..8ecab58e5c809c462580d8e31f28fe3ad393b994 100644 (file)
--- a/apps/files_trashbin/templates/part.breadcrumb.php
+++ b/apps/files_trashbin/templates/part.breadcrumb.php
@@ -12,7 +12,7 @@
 <?php for($i=0; $i<count($_["breadcrumb"]); $i++):
        $crumb = $_["breadcrumb"][$i];
        $dir = \OCP\Util::encodePath($crumb["dir"]); ?>
-       <div class="crumb <?php if($i == count($_["breadcrumb"])-1) p('last');?> svg"
+       <div class="crumb <?php if($i === count($_["breadcrumb"])-1) p('last');?> svg"
                 data-dir='<?php p($dir);?>'>
        <a href="<?php p($_['baseURL'].$dir); ?>"><?php p($crumb["name"]); ?></a>
        </div>

diff --git a/apps/files_trashbin/templates/part.list.php b/apps/files_trashbin/templates/part.list.php
index 94a8eec9515669533f9846edb6c77b6bd3c98ef2..254b08dd36a31e39d0a289ef35e7ded6547fa255 100644 (file)
--- a/apps/files_trashbin/templates/part.list.php
+++ b/apps/files_trashbin/templates/part.list.php
@@ -7,7 +7,7 @@
        $name = \OCP\Util::encodePath($file['name']);
        $directory = \OCP\Util::encodePath($file['directory']); ?>
        <tr data-filename="<?php p($file['name']);?>"
-               data-type="<?php ($file['type'] == 'dir')?p('dir'):p('file')?>"
+               data-type="<?php ($file['type'] === 'dir')?p('dir'):p('file')?>"
                data-mime="<?php p($file['mimetype'])?>"
                data-permissions='<?php p($file['permissions']); ?>'
                <?php if ( $_['dirlisting'] ): ?>
@@ -22,14 +22,14 @@
                data-dirlisting=0
                <?php endif; ?>>
                <td class="filename svg"
-               <?php if($file['type'] == 'dir'): ?>
+               <?php if($file['type'] === 'dir'): ?>
                        style="background-image:url(<?php print_unescaped(OCP\mimetype_icon('dir')); ?>)"
                <?php else: ?>
                        style="background-image:url(<?php print_unescaped(OCP\mimetype_icon($file['mimetype'])); ?>)"
                <?php endif; ?>
                        >
                <?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
-               <?php if($file['type'] == 'dir'): ?>
+               <?php if($file['type'] === 'dir'): ?>
                        <?php if( $_['dirlisting'] ): ?>
                                <a class="name" href="<?php p($_['baseURL'].'/'.$name); ?>" title="">
                        <?php else: ?>
@@ -43,14 +43,14 @@
                        <?php endif; ?>
                <?php endif; ?>
                        <span class="nametext">
-                               <?php if($file['type'] == 'dir'):?>
+                               <?php if($file['type'] === 'dir'):?>
                                        <?php print_unescaped(htmlspecialchars($file['name']));?>
                                <?php else:?>
                                        <?php print_unescaped(htmlspecialchars($file['basename']));?><span
                                                class='extension'><?php p($file['extension']);?></span>
                                <?php endif;?>
                        </span>
-                       <?php if($file['type'] == 'dir'):?>
+                       <?php if($file['type'] === 'dir'):?>
                                <span class="uploadtext" currentUploads="0">
                                </span>
                        <?php endif;?>