[Fmsystem-commits] [6644] Property: link to dokuments at company network

[Sigurd Nes]

Revision: 6644
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6644
Author:   sigurdne
Date:     2010-11-26 07:37:56 +0000 (Fri, 26 Nov 2010)
Log Message:
-----------
Property: link to dokuments at company network

Modified Paths:
--------------
    trunk/property/inc/class.uidocument.inc.php

Modified: trunk/property/inc/class.uidocument.inc.php
===================================================================
--- trunk/property/inc/class.uidocument.inc.php 2010-11-25 22:50:42 UTC (rev 
6643)
+++ trunk/property/inc/class.uidocument.inc.php 2010-11-26 07:37:56 UTC (rev 
6644)
@@ -408,7 +408,8 @@
                        );
 
                                // values for datatable
-                       if(isset($datatable['rows']['row']) && 
is_array($datatable['rows']['row'])){
+                       if(isset($datatable['rows']['row']) && 
is_array($datatable['rows']['row']))
+                       {
                                foreach( $datatable['rows']['row'] as $row )
                                {
                                        $json_row = array();
@@ -416,12 +417,13 @@
                                        {
                                                if(isset($column['format']) && 
$column['format']== "link" && $column['java_link']==true)
                                                {
-                                                       
$json_row[$column['name']] = "<a href='#' id='".$column['link']."' 
onclick='javascript:filter_data(this.id);'>" .$column['value']."</a>";
+                                                       
$json_row[$column['name']] = "<a href='#' id='{$column['link']}' 
onclick='javascript:filter_data(this.id);'>{$column['value']}</a>";
                                                }
-                                               elseif(isset($column['format']) 
&& $column['format']== "link")
+                                               else 
if(isset($column['format']) && $column['format']== "link")
                                                {
-                                                 $json_row[$column['name']] = 
"<a href='".$column['link']."'>" .$column['value']."</a>";
-                                               }else
+                                                 $json_row[$column['name']] = 
"<a href='{$column['link']}'>{$column['value']}</a>";
+                                               }
+                                               else
                                                {
                                                  $json_row[$column['name']] = 
$column['value'];
                                                }
@@ -928,7 +930,8 @@
                        );
 
                                // values for datatable
-                       if(isset($datatable['rows']['row']) && 
is_array($datatable['rows']['row'])){
+                       if(isset($datatable['rows']['row']) && 
is_array($datatable['rows']['row']))
+                       {
                                foreach( $datatable['rows']['row'] as $row )
                                {
                                        $json_row = array();
@@ -936,12 +939,13 @@
                                        {
                                                if(isset($column['format']) && 
$column['format']== "link" && $column['java_link']==true)
                                                {
-                                                       
$json_row[$column['name']] = "<a href='#' id='".$column['link']."' 
onclick='javascript:filter_data(this.id);'>" .$column['value']."</a>";
+                                                       
$json_row[$column['name']] = "<a href='#' id='{$column['link']} 
onclick='javascript:filter_data(this.id);'>{$column['value']}</a>";
                                                }
-                                               elseif(isset($column['format']) 
&& $column['format']== "link")
+                                               else 
if(isset($column['format']) && $column['format']== "link")
                                                {
-                                                 $json_row[$column['name']] = 
"<a href='".$column['link']."'>" .$column['value']."</a>";
-                                               }else
+                                                 $json_row[$column['name']] = 
"<a href='{$column['link']}' target = '_blank'>{$column['value']}</a>";
+                                               }
+                                               else
                                                {
                                                  $json_row[$column['name']] = 
$column['value'];
                                                }