Merge pull request #1 from samerton/master

Default admin perms + minor fixes
sirhypernova · Dec 19, 2017 · 0f305c0 · 0f305c0
2 parents dbc10b0 + fd5336a
commit 0f305c0
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/init.php b/init.php
@@ -9,9 +9,23 @@
  */
 
 // Ensure module has been installed
+$cache->setCache('modulescache');
+
 $module_installed = $cache->retrieve('FileManager');
 if(!$module_installed){
-
+	// Update main admin group permissions
+	$group = $queries->getWhere('groups', array('id', '=', 2));
+	$group = $group[0];
+
+	$group_permissions = json_decode($group->permissions, TRUE);
+	$group_permissions['admincp.files'] = 1;
+	$group_permissions['files.view'] = 1;
+	$group_permissions['files.write'] = 1;
+
+	$group_permissions = json_encode($group_permissions);
+	$queries->update('groups', 2, array('permissions' => $group_permissions));
+
+	$cache->store('FileManager', 1);
 } else {
 	// Installed
 }

diff --git a/pages/main/includes/footer.php b/pages/main/includes/footer.php
@@ -24,7 +24,7 @@
             });
             var imgdata = null;
             var pdfdata = null;
-            <?php if (isset($_GET['medit']) && isset($edit) && is_a($edit,'File') || is_a($edit,'Folder')) { ?>
+            <?php if (isset($_GET['medit']) && (isset($edit) && is_a($edit,'File') || is_a($edit,'Folder'))) { ?>
                     $('#edit-modal').modal('open');
                     $('#edit-file-content').trigger('autoresize');
             <?php }

diff --git a/pages/main/index.php b/pages/main/index.php
@@ -52,14 +52,14 @@
 $filedir = FM_ROOT_DIR;
 $afiles = new Files (false,FM_ROOT_DIR,unserialize(FM_ALLOWED_EXTENSIONS),FM_MAX_SIZE);
 
-if (isset($_GET['delete']) && $user->hasPermission('files.write') || $user->data()->id == 1) {
+if (isset($_GET['delete']) && ($user->hasPermission('files.write') || $user->data()->id == 1)) {
     $file = $afiles->get($_GET['delete']);
     if ($file) {
         $file->delete();
     }
 }
 
-if (isset($_GET['edit']) && $user->hasPermission('files.write') || $user->data()->id == 1) {
+if (isset($_GET['edit']) && ($user->hasPermission('files.write') || $user->data()->id == 1)) {
     $file = $afiles->get($_GET['edit']);
     if ($file && isset($_POST['edit-file-sub']) && is_a($file,'File') && $file->editable) {
         $file->edit((isset($_POST['edit-file-content'])?$_POST['edit-file-content']:null),(isset($_POST['edit-file-name'])?$_POST['edit-file-name']:null));
@@ -70,21 +70,21 @@
     }
 }
 
-if (isset($_GET['rndir']) && $user->hasPermission('files.write') || $user->data()->id == 1) {
+if (isset($_GET['rndir']) && ($user->hasPermission('files.write') || $user->data()->id == 1)) {
     $dir = $afiles->get($_GET['rndir']);
     if ($dir && isset($_POST['edit-file-name']) && is_a($dir,'Folder')) {
         $dir->rename($_POST['edit-file-name']);
     }
 }
 
-if (isset($_GET['unzip']) && $user->hasPermission('files.write') || $user->data()->id == 1) {
+if (isset($_GET['unzip']) && ($user->hasPermission('files.write') || $user->data()->id == 1)) {
     $file = $afiles->get($_GET['unzip']);
     if ($file->ext == 'zip') {
         $file->unzip();
     }
 }
 
-if (isset($_POST['file-upload-sub']) && $user->hasPermission('files.write') || $user->data()->id == 1) {
+if (isset($_POST['file-upload-sub']) && ($user->hasPermission('files.write') || $user->data()->id == 1)) {
     if (isset($_GET['dir'])) {
         $dir = $afiles->get($_GET['dir']);
         $dir->upload($_FILES['file-upload']);
@@ -93,7 +93,7 @@
     }
 }
 
-if (isset($_POST['new-file-sub']) && $user->hasPermission('files.write') || $user->data()->id == 1) {
+if (isset($_POST['new-file-sub']) && ($user->hasPermission('files.write') || $user->data()->id == 1)) {
     if (!isset($_POST['new-file-type'])) {
         $type = 'file';
     } else {
@@ -126,7 +126,7 @@
     die();
 }
 
-if (isset($_GET['zip']) && $user->hasPermission('files.write') || $user->data()->id == 1) {
+if (isset($_GET['zip']) && ($user->hasPermission('files.write') || $user->data()->id == 1)) {
     $file = $afiles->get($_GET['zip']);
     if (is_a($file,'Folder')) {
         $lfile = $file->zip();
@@ -180,7 +180,6 @@
 <?php
     if (isset($_GET['medit'])) {
         $edit = $afiles->get($_GET['medit']);
-    }
 ?>
 <div class="modal" id="edit-modal">
     <form action="<?php echo (isset($_GET['medit'])?'?route=/files/&edit='.$_GET['medit']:null).(isset($_GET['dir'])?'&dir='.$_GET['dir']:null); ?>" method="POST" enctype="multipart/form-data">
@@ -203,6 +202,9 @@
         </div>
     </form>
 </div>
+<?php
+	}
+?>
 <div class="modal" id="new-modal">
     <form action="<?php echo (isset($_GET['dir'])?'?route=/files/&dir='.$_GET['dir']:null); ?>" method="POST" enctype="multipart/form-data">
         <div class="modal-content">