Skip to content

Commit

Permalink
delete fileset over ride
Browse files Browse the repository at this point in the history
  • Loading branch information
acliss19xx committed Sep 25, 2014
1 parent 4dfb2ca commit 700db28
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 99 deletions.
35 changes: 2 additions & 33 deletions web/concrete/controllers/dashboard/files/add_set.php
@@ -1,37 +1,6 @@
<?
defined('C5_EXECUTE') or die("Access Denied.");
class DashboardFilesAddSetController extends Concrete5_Controller_Dashboard_Files_AddSet {
public function do_add() {
extract($this->getHelperObjects());
Loader::model('file_set');

if (!$validation_token->validate("file_sets_add")) {
$this->set('error', array($validation_token->getErrorMessage()));
return;
}

if (!trim($this->post('file_set_name'))) {
$this->set('error', array(t('Please Enter a Name')));
return;
}
$setName = trim($this->post('file_set_name'));
if (!Loader::helper('validation/strings')->multiLingualName($setName, true)) {
$this->set('error', array(t('Set Names must only include alphanumerics and spaces.')));
return;
}

//print('<pre>');print_r(get_included_files());print('</pre>');
$u = new User();
$file_set = new FileSet();
//AS: Adodb Active record is complaining a ?/value array mismatch unless
//we explicatly set the primary key ID field to null
$file_set->fsID = null;
$file_set->fsName = $setName;
$file_set->fsType = FileSet::TYPE_PUBLIC;
$file_set->uID = $u->getUserID();
$file_set->fsOverrideGlobalPermissions = ($this->post('fsOverrideGlobalPermissions') == 1) ? 1 : 0;
$file_set->save();
$this->redirect('/dashboard/files/sets', 'file_set_added');
}



}
67 changes: 1 addition & 66 deletions web/concrete/controllers/dashboard/files/sets.php
@@ -1,70 +1,5 @@
<?
defined('C5_EXECUTE') or die("Access Denied.");
class DashboardFilesSetsController extends Concrete5_Controller_Dashboard_Files_Sets {
public function file_sets_edit(){
extract($this->getHelperObjects());
Loader::model('file_set');
//do my editing
if (!$validation_token->validate("file_sets_edit")) {
$this->set('error', array($validation_token->getErrorMessage()));
$this->view();
return;
}

if(!$this->post('fsID')){
$this->set('error', array(t('Invalid ID')));
$this->view();
return;
}
$setName = trim($this->post('file_set_name'));
if (!$setName) {
$this->set('error', array(t('Please Enter a Name')));
$this->view();
return;
}
if (!Loader::helper('validation/strings')->multiLingualName($setName, true, true)) {
$this->set('error', array(t('Set Names must only include alphanumerics and spaces.')));
$this->view();
return;
}

$file_set = new FileSet();
$file_set->Load('fsID = ?', $this->post('fsID'));
$file_set->fsName = $setName;
$copyPermissionsFromBase = false;
if ($file_set->fsOverrideGlobalPermissions == 0 && $this->post('fsOverrideGlobalPermissions') == 1) {
// we are checking the checkbox for the first time
$copyPermissionsFromBase = true;
}
if ($file_set->fsOverrideGlobalPermissions) {
$permissions = PermissionKey::getList('file_set');
foreach($permissions as $pk) {
$pk->setPermissionObject($file_set);
$pt = $pk->getPermissionAssignmentObject();
$paID = $_POST['pkID'][$pk->getPermissionKeyID()];
$pt->clearPermissionAssignment();
if ($paID > 0) {
$pa = PermissionAccess::getByID($paID, $pk);
if (is_object($pa)) {
$pt->assignPermissionAccess($pa);
}
}
}
}
$file_set->fsOverrideGlobalPermissions = ($this->post('fsOverrideGlobalPermissions') == 1) ? 1 : 0;
$file_set->save();

parse_str($this->post('fsDisplayOrder'));
$file_set->updateFileSetDisplayOrder($fID);

if ($file_set->fsOverrideGlobalPermissions == 0) {
$file_set->resetPermissions();
}
if ($copyPermissionsFromBase) {
$file_set->acquireBaseFileSetPermissions();
}

$this->redirect("/dashboard/files/sets", 'view_detail', $this->post('fsID'), 'file_set_updated');
}

}
}

0 comments on commit 700db28

Please sign in to comment.