[Fmsystem-commits] [15808] update

[sigurdne]

Revision: 15808
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15808
Author:   sigurdne
Date:     2016-10-10 18:24:13 +0000 (Mon, 10 Oct 2016)
Log Message:
-----------
update

Modified Paths:
--------------
    trunk/admin/inc/class.uiconfig2.inc.php
    trunk/phpgwapi/templates/base/attributes_form.xsl
    trunk/property/inc/class.soinvoice.inc.php
    trunk/property/inc/class.uiasync.inc.php

Modified: trunk/admin/inc/class.uiconfig2.inc.php
===================================================================
--- trunk/admin/inc/class.uiconfig2.inc.php     2016-10-10 18:22:55 UTC (rev 
15807)
+++ trunk/admin/inc/class.uiconfig2.inc.php     2016-10-10 18:24:13 UTC (rev 
15808)
@@ -735,7 +735,7 @@
                        $section_id     = phpgw::get_var('section_id', 'int');
                        $attrib_id      = phpgw::get_var('attrib_id', 'int');
                        $id                     = phpgw::get_var('id', 'int');
-                       $values         = phpgw::get_var('values');
+                       $values         = phpgw::get_var('values', 'raw');
 
                        $GLOBALS['phpgw']->xslttpl->add_file(array('config'));
 

Modified: trunk/phpgwapi/templates/base/attributes_form.xsl
===================================================================
--- trunk/phpgwapi/templates/base/attributes_form.xsl   2016-10-10 18:22:55 UTC 
(rev 15807)
+++ trunk/phpgwapi/templates/base/attributes_form.xsl   2016-10-10 18:24:13 UTC 
(rev 15808)
@@ -765,8 +765,7 @@
 <!-- New template-->
 <xsl:template name="choice">
        <xsl:param name="input_type" />
-
-       <xsl:variable name="id">
+       <xsl:variable name="attrib_id">
                <xsl:value-of select="id"/>
        </xsl:variable>
        <xsl:variable name="name">
@@ -776,10 +775,10 @@
                <xsl:for-each select="choice">
                        <xsl:choose>
                                <xsl:when test="selected='1'">
-                                       <input id="id_{$name}_{id}" 
type="{$input_type}" name="values_attribute[{$id}][value][]" value="{id}" 
checked="checked"/>
+                                       <input id="id_{$name}_{id}" 
type="{$input_type}" name="values_attribute[{$attrib_id}][value][]" 
value="{id}" checked="checked"/>
                                </xsl:when>
                                <xsl:otherwise>
-                                       <input id="id_{$name}_{id}" 
type="{$input_type}" name="values_attribute[{$id}][value][]" value="{id}"/>
+                                       <input id="id_{$name}_{id}" 
type="{$input_type}" name="values_attribute[{$attrib_id}][value][]" 
value="{id}"/>
                                </xsl:otherwise>
                        </xsl:choose>
                        <xsl:value-of select="value"/>

Modified: trunk/property/inc/class.soinvoice.inc.php
===================================================================
--- trunk/property/inc/class.soinvoice.inc.php  2016-10-10 18:22:55 UTC (rev 
15807)
+++ trunk/property/inc/class.soinvoice.inc.php  2016-10-10 18:24:13 UTC (rev 
15808)
@@ -584,10 +584,15 @@
                                $where = 'AND';
                        }
 
+                       $join_project = '';
                        if ($project_id)
                        {
                                $filtermethod .= " {$where} fm_project.id = 
'{$project_id}'";
                                $where = 'AND';
+                               $join_project = ""
+                       //              . " {$this->join} fm_ecoart ON 
fm_ecoart.id = $table.artid"
+                                       . " {$this->join} fm_workorder ON 
fm_workorder.id = $table.pmwrkord_code"
+                                       . " {$this->join} fm_project ON 
fm_workorder.project_id = fm_project.id";
                        }
 
                        if ($year)
@@ -606,10 +611,7 @@
 
                        $sql = "SELECT DISTINCT 
pmwrkord_code,bilagsnr,bilagsnr_ut,fakturanr,sum(belop) as belop, 
sum(godkjentbelop) as godkjentbelop,"
                                . " 
currency,budsjettansvarligid,org_name,periode,periodization,periodization_start,external_voucher_id"
-                               . " FROM {$table}"
-//                             . " {$this->join} fm_ecoart ON fm_ecoart.id = 
$table.artid"
-//                             . " {$this->join} fm_workorder ON 
fm_workorder.id = $table.pmwrkord_code"
-//                             . " {$this->join} fm_project ON 
fm_workorder.project_id = fm_project.id"
+                               . " FROM {$table}{$join_project}"
                                . " {$this->join} fm_vendor ON 
{$table}.spvend_code = fm_vendor.id {$filtermethod} {$groupmethod}";
 
                        $this->db->query($sql . $ordermethod, __LINE__, 
__FILE__);

Modified: trunk/property/inc/class.uiasync.inc.php
===================================================================
--- trunk/property/inc/class.uiasync.inc.php    2016-10-10 18:22:55 UTC (rev 
15807)
+++ trunk/property/inc/class.uiasync.inc.php    2016-10-10 18:24:13 UTC (rev 
15808)
@@ -100,6 +100,10 @@
 
                function index()
                {
+                       if(!$this->acl_read)
+                       {
+                               phpgw::no_access();
+                       }
 
                        if (phpgw::get_var('phpgw_return_as') == 'json')
                        {
@@ -330,6 +334,11 @@
                                return $this->edit();
                        }
 
+                       if(!$this->acl_edit)
+                       {
+                               phpgw::no_access();
+                       }
+
                        $id = phpgw::get_var('id', 'int');
                        $values = phpgw::get_var('values');
 
@@ -345,7 +354,7 @@
                        }
 
                        $data = str_replace(' ', '', 
stripslashes($values['data']));
-                       $data = stripslashes($values['data']);
+                       $data = 
html_entity_decode(stripslashes($values['data']));
 
                        $data = explode(",", $data);
 
@@ -389,9 +398,11 @@
 
                function edit()
                {
+                       if(!$this->acl_edit)
+                       {
+                               phpgw::no_access();
+                       }
                        $id = phpgw::get_var('id', 'int');
-                       $values = phpgw::get_var('values');
-
                        $tabs = array();
                        $tabs['general'] = array('label' => lang('general'), 
'link' => '#general');
                        $active_tab = 'general';