[Fmsystem-commits] [15099] Syncromind: Merge 14936:15027 from trunk

[sigurdne]

Revision: 15099
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15099
Author:   sigurdne
Date:     2016-05-13 12:22:10 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk

Modified Paths:
--------------
    branches/dev-syncromind-2/property/inc/class.uiwo_hour.inc.php

Modified: branches/dev-syncromind-2/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/dev-syncromind-2/property/inc/class.uiwo_hour.inc.php      
2016-05-13 12:07:33 UTC (rev 15098)
+++ branches/dev-syncromind-2/property/inc/class.uiwo_hour.inc.php      
2016-05-13 12:22:10 UTC (rev 15099)
@@ -1338,6 +1338,30 @@
                                        unset($_ok);
                                }
 
+                               $criteria = array
+                                       (
+                                       'appname' => 'property',
+                                       'location' => 
'.project.workorder.transfer',
+                                       'allrows' => true
+                               );
+
+                               $custom_functions = 
$GLOBALS['phpgw']->custom_functions->find($criteria);
+
+                               foreach ($custom_functions as $entry)
+                               {
+                                       // prevent path traversal
+                                       if (preg_match('/\.\./', 
$entry['file_name']))
+                                       {
+                                               continue;
+                                       }
+
+                                       $file = PHPGW_SERVER_ROOT . 
"/property/inc/custom/{$GLOBALS['phpgw_info']['user']['domain']}/{$entry['file_name']}";
+                                       if ($entry['active'] && is_file($file) 
&& !$entry['client_side'] && !$entry['pre_commit'])
+                                       {
+                                               require $file;
+                                       }
+                               }
+
                                $_to = isset($workorder['mail_recipients'][0]) 
&& $workorder['mail_recipients'][0] ? implode(';', 
$workorder['mail_recipients']) : $to_email;
                                $email_data['use_yui_table'] = false;