mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-08 15:46:44 +02:00
Code Issues Releases Wiki Activity

mislogic protection fixed - links can't be set as sublinks of their sublinks

Browse Source
This commit is contained in:
secretr
2012-01-13 11:47:39 +00:00
parent 9863be3a7a
commit 669324f66d
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_admin/links.php
View File

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (C) 2008-2011 e107 Inc (e107.org)
* Copyright (C) 2008-2012 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
@@ -126,18 +126,22 @@ class links_admin_ui extends e_admin_ui
);
}
public function handleListCategoryParentIdBatch($selected, $value)
public function handleListLinkParentBatch($selected, $value)
{
$field = 'link_parent';
$ui = $this->getUI();
$found = false;
foreach ($selected as $k => $id)
{
if($ui->_has_parent($id, $value, $this->getLinkArray()))
{var_dump($ui->_has_parent($value, $id, $this->getLinkArray()));
if($ui->_has_parent($value, $id, $this->getLinkArray()))
{
unset($selected[$k]);
$found = true;
}
}
if($found) e107::getMessage()->addWarning('Some selections omitted - you can\'t set Link as a Sublink of its Sublink.');
if(!$selected) return;
if(parent::handleListBatch($selected, $field, $value))
{
$this->_link_array = null; // reset batch/filters

3
e107_handlers/admin_ui.php
View File

@@ -2,7 +2,7 @@
/*
* e107 website system
*
* Copyright (C) 2008-2010 e107 Inc (e107.org)
* Copyright (C) 2008-2012 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
@@ -3427,6 +3427,7 @@ class e_admin_ui extends e_admin_controller_ui
$this->getTreeModel()->addMessageSuccess(sprintf(LAN_UI_BATCH_UPDATE_SUCCESS, $vttl, $cnt));
}
$this->getTreeModel()->setMessages();
return $cnt;
}
/**