R48611 - in /trunk/projectmanager/inc: class.projectmanager_elements_ui.inc.php class.projectmanager_ui.inc.php

Old eGW-svn
1

Author: ralfbecker
New Revision: 48611

URL: http://svn.stylite.de/viewvc/egroupware?rev=48611&view=rev
Log:
not sending budget data to client, if user has no rights to see them

Modified:
trunk/projectmanager/inc/class.projectmanager_elements_ui.inc.php
trunk/projectmanager/inc/class.projectmanager_ui.inc.php

Modified: trunk/projectmanager/inc/class.projectmanager_elements_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/projectmanager/inc/class.projectmanager_elements_ui.inc.php?rev=48611&r1=48610&r2=48611&view=diff

— trunk/projectmanager/inc/class.projectmanager_elements_ui.inc.php (original)
+++ trunk/projectmanager/inc/class.projectmanager_elements_ui.inc.php Wed Sep 10 21:11:47 2014
@@ -419,6 +419,8 @@
{
$readonlys[$key] = true;
}

  •   	unset($content['pe_planned_budget']);

  •   	unset($content['pe_used_budget']);
  }
  if ($view)
  {

@@ -527,6 +529,7 @@
$total++;

	$readonlys = array();

  •   $budget_rights = $this->project->check_acl(EGW_ACL_BUDGET);
  foreach($rows as $n => &$row)
  {
  	if ($n && !$this->check_acl(EGW_ACL_EDIT,$row))

@@ -536,6 +539,11 @@
if ($n && !$this->check_acl(EGW_ACL_DELETE,$row))
{
$row[‘class’] .= ’ rowNoDelete’;

  •   	}

  •   	if (!$budget_rights)

  •   	{

  •   		unset($row['pe_used_budget']);

  •   		unset($row['pe_planned_budget']);
  	}
  	if ($n)
  	{

@@ -652,7 +660,10 @@
$totals = $this->summary(null,$query[‘col_filter’]);
foreach($totals as $field => $value)
{

  •   		$rows['total_' . $field] = $value;

  •   		if ($budget_rights || !in_array($field, array('pe_planned_budget', 'pe_used_budget')))

  •   		{

  •   			$rows['total_' . $field] = $value;

  •   		}
  	}
  }
  if ((int)$this->debug >= 2 || $this->debug == 'get_rows')

Modified: trunk/projectmanager/inc/class.projectmanager_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/projectmanager/inc/class.projectmanager_ui.inc.php?rev=48611&r1=48610&r2=48611&view=diff

— trunk/projectmanager/inc/class.projectmanager_ui.inc.php (original)
+++ trunk/projectmanager/inc/class.projectmanager_ui.inc.php Wed Sep 10 21:11:47 2014
@@ -380,6 +380,10 @@
if (!$this->check_acl(EGW_ACL_EDIT_BUDGET))
{
$readonlys[‘pm_planned_budget’] = $readonlys[‘pm_used_budget’] = true;

  •   	unset($content['pm_planned_budget']);

  •   	unset($content['pm_used_budget']);

  •   	unset($content['ds']['pe_planned_budget']);

  •   	unset($content['ds']['pe_used_budget']);
  }
  $n = 2;
  foreach((array)$this->data['pm_members'] as $uid => $data)

Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs