Index: branches/5.2.x/core/units/helpers/permissions_helper.php =================================================================== diff -u -N -r14870 -r14989 --- branches/5.2.x/core/units/helpers/permissions_helper.php (.../permissions_helper.php) (revision 14870) +++ branches/5.2.x/core/units/helpers/permissions_helper.php (.../permissions_helper.php) (revision 14989) @@ -1,6 +1,6 @@ getEventParam('top_prefix'); - $event_handler =& $this->Application->recallObject($event->Prefix.'_EventHandler'); + $event_handler =& $this->Application->recallObject($event->Prefix . '_EventHandler'); /* @var $event_handler kCatDBEventHandler */ $raise_warnings = $event->getEventParam('raise_warnings'); $event->setEventParam('raise_warnings', 0); - if ($event->Prefix != $top_prefix) { - $top_event = new kEvent($top_prefix.':'.$event->Name); + if ( $event->Prefix != $top_prefix ) { + $top_event = new kEvent($top_prefix . ':' . $event->Name); $id = $event_handler->getPassedID($top_event); } else { @@ -200,19 +200,19 @@ $event->setEventParam('raise_warnings', $raise_warnings); $owner_id = USER_ROOT; // owner is root if not detected - if (!$id) { + if ( !$id ) { // item being created -> check by current (before editing started, saved in OnPreCreate event) category permissions // note: category in session is placed on catalog data import start $category_id = $this->Application->isAdmin ? $this->Application->RecallVar('m_cat_id') : $this->Application->GetVar('m_cat_id'); } - elseif ($top_prefix == 'c' || $top_prefix == 'st') { + elseif ( $top_prefix == 'c' || $top_prefix == 'st' ) { $category_id = $id; } else { // item being edited -> check by it's primary category permissions $items_info = $this->GetCategoryItemData($top_prefix, $id); - if ($items_info) { + if ( $items_info ) { $category_id = $items_info[$id]['CategoryId']; $owner_id = $items_info[$id]['CreatedById']; } @@ -224,7 +224,7 @@ // specific permission check for pending & owner permissions: begin $uploader_events = Array ('OnUploadFile', 'OnDeleteFile', 'OnViewFile'); - if (in_array($event->Name, $uploader_events)) { + if ( in_array($event->Name, $uploader_events) ) { // don't recall target object during uploader-related, because OnItemLoad will use incorrect // $user_id in Firefox (during Flash problems session will be used from Internet Exploere) $new_item = false; @@ -234,36 +234,36 @@ $check_status = $this->checkCombinedPermissions($event, $owner_id, (int)$category_id, $new_item); } - if (isset($check_status)) { + if ( isset($check_status) ) { return $this->finalizePermissionCheck($event, $check_status); } // specific permission check for pending & owner permissions: end $perm_status = false; $check_perms = $this->getPermissionByEvent($event, $event_perm_mapping); - if ($check_perms === true) { + if ( $check_perms === true ) { // event is defined in mapping but is not checked by permissions return true; } $item_prefix = $this->Application->getUnitOption($top_prefix, 'PermItemPrefix'); foreach ($check_perms as $perm_name) { // check if at least one of required permissions is set - if (!isset($perm_mapping[$perm_name])) { + if ( !isset($perm_mapping[$perm_name]) ) { // not mapped permission (e.g. advanced:approve) -> skip continue; } - if ($perm_name == 'debug' && $this->Application->isDebugMode(false)) { + if ( $perm_name == 'debug' && $this->Application->isDebugMode(false) ) { // universal "debug" permission return true; } - $perm_name = $item_prefix.'.'.$perm_mapping[$perm_name]; + $perm_name = $item_prefix . '.' . $perm_mapping[$perm_name]; $perm_status = $this->CheckPermission($perm_name, 0, (int)$category_id); - if ($perm_status) { + if ( $perm_status ) { return $perm_status; } } @@ -437,9 +437,9 @@ } elseif ($perm_event) { // check permission by event name - list ($prefix, $event) = explode(':', $perm_event); + list ($prefix, ) = explode(':', $perm_event); - $event_handler =& $this->Application->recallObject($prefix.'_EventHandler'); + $event_handler =& $this->Application->recallObject($prefix . '_EventHandler'); /* @var $event_handler kEventHandler */ return $event_handler->CheckPermission( new kEvent($perm_event) );