[Fmsystem-commits] [16669] formatting

[sigurdne]

Revision: 16669
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16669
Author:   sigurdne
Date:     2017-05-02 05:09:11 -0400 (Tue, 02 May 2017)
Log Message:
-----------
formatting

Modified Paths:
--------------
    trunk/helpdesk/inc/class.botts.inc.php
    trunk/property/inc/class.botts.inc.php

Modified: trunk/helpdesk/inc/class.botts.inc.php
===================================================================
--- trunk/helpdesk/inc/class.botts.inc.php      2017-05-02 08:52:09 UTC (rev 
16668)
+++ trunk/helpdesk/inc/class.botts.inc.php      2017-05-02 09:09:11 UTC (rev 
16669)
@@ -811,7 +811,15 @@
 
                        //-----------from--------
                        // build body
-                       $body = '<a href ="http://' . 
$GLOBALS['phpgw_info']['server']['hostname'] . 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'helpdesk.uitts.view', 'id' => $id)).'">' . lang('Ticket').' #' .$id 
.'</a>'."\n";
+                       $request_scheme = empty($_SERVER['HTTPS']) || 
$_SERVER['HTTPS'] == 'off' ? 'http' : 'https';
+
+                       if($request_scheme == 'https')
+                       {
+                               $GLOBALS['phpgw_info']['server']['enforce_ssl'] 
= true;
+                       }
+                       $body = '<a href ="' . 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'helpdesk.uitts.view',
+                                       'id' => $id), false, true) . '">' . 
lang('Ticket') . ' #' . $id . '</a>' . "\n";
+
                        $body .= "<table>";
                        $body .= '<tr><td>'. lang('Date 
Opened').'</td><td>:&nbsp;'.$entry_date."</td></tr>";
                        $body .= '<tr><td>'. 
lang('Category').'</td><td>:&nbsp;'. 
$this->get_category_name($ticket['cat_id']) ."</td></tr>";
@@ -890,8 +898,7 @@
                                        $_note =  
stripslashes($value['new_value']);
                                        $table_content .= 
"<tr><td>{$i}</td><td>{$_date}</td><td>{$value['owner']}</td><td>{$_note}</td></tr>";
                                }
-                               $body.= "<table class='pure-table 
pure-table-bordered pure-table-striped'>{$table_content}</table>";
-
+                               $body.= "<table border='1' class='pure-table 
pure-table-bordered pure-table-striped'>{$table_content}</table>";
                                $subject .= "::{$i}";
                        }
 

Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php      2017-05-02 08:52:09 UTC (rev 
16668)
+++ trunk/property/inc/class.botts.inc.php      2017-05-02 09:09:11 UTC (rev 
16669)
@@ -1320,7 +1320,11 @@
                                                                
'get_single_function_input' => $attribute['get_single_function_input']
                                                                ),
                                                                $location_id);
-                                       $body .= '<tr><td>'. 
$attribute['input_text'].'</td><td>:&nbsp;'.$custom_value."</td></tr>";
+
+                                       if($custom_value)
+                                       {
+                                               $body .= '<tr><td>'. 
$attribute['input_text'].'</td><td>:&nbsp;'.$custom_value."</td></tr>";
+                                       }
                                }
                        }