[Fmsystem-commits] [8362] api: minor fix

[Sigurd Nes]

Revision: 8362
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8362
Author:   sigurdne
Date:     2011-12-18 21:56:17 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
api: minor fix

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.custom_functions.inc.php
    trunk/phpgwapi/inc/class.xslttemplates.inc.php

Modified: trunk/phpgwapi/inc/class.custom_functions.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.custom_functions.inc.php   2011-12-18 21:55:11 UTC 
(rev 8361)
+++ trunk/phpgwapi/inc/class.custom_functions.inc.php   2011-12-18 21:56:17 UTC 
(rev 8362)
@@ -339,7 +339,7 @@
                        $location = $this->_db->db_addslashes($location);
                        $id = (int)$id;
                        
-                       $sql = 'SELECT * FROM phpgw_cust_function '
+                       $sql = 'SELECT phpgw_cust_function.* FROM 
phpgw_cust_function '
                                . " {$this->_join} phpgw_locations ON 
phpgw_cust_function.location_id = phpgw_locations.location_id"
                                . " {$this->_join} phpgw_applications ON 
phpgw_applications.app_id = phpgw_locations.app_id"
                                . " WHERE phpgw_applications.app_name = 
'{$appname}'"

Modified: trunk/phpgwapi/inc/class.xslttemplates.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.xslttemplates.inc.php      2011-12-18 21:55:11 UTC 
(rev 8361)
+++ trunk/phpgwapi/inc/class.xslttemplates.inc.php      2011-12-18 21:56:17 UTC 
(rev 8362)
@@ -397,7 +397,7 @@
                        {
                                $message ='Systemfeil - kontakt adminstrator';
 
-                               
if(isset($GLOBALS['phpgw_info']['user']['apps']['admin']) && 
$GLOBALS['phpgw_info']['user']['apps']['admin'])
+                               
if(!isset($GLOBALS['phpgw_info']['user']['apps']['admin']) || 
!$GLOBALS['phpgw_info']['user']['apps']['admin'])
                                {
                                        phpgwapi_cache::message_set($message, 
'error');
                                }
@@ -408,15 +408,14 @@
                                        echo '<div class="error">';
                                        echo $message;
                                        echo '</div>';
+                                       _debug_array(libxml_get_last_error());
+                                       echo "<h2>xml-data</h2>";
+                                       $this->list_lineno($this->xmldata, 
true);
+
+                                       echo "<h2>xsl-data</h2>";
+                                       $this->list_lineno($this->xsldata);
                                }
-/*
-                               _debug_array(libxml_get_last_error());
-                               echo "<h2>xml-data</h2>";
-                               $this->list_lineno($this->xmldata, true);
 
-                               echo "<h2>xsl-data</h2>";
-                               $this->list_lineno($this->xsldata);
-*/
                                return '';
                        }
                        return preg_replace('/<!DOCTYPE([^>])+>/', '', $html);