From 65353b74e64b4741631004bc303e818890df61b5 Mon Sep 17 00:00:00 2001
From: alvaro <alvaro@alia.(none)>
Date: Sun, 21 Oct 2012 04:55:57 -0700
Subject: [PATCH] Escaping eventual single quotes in visualizations that may be
affected
---
lib/Haanga/lib/Haanga/Extension/Filter/Googlevizbarchart.php | 2 +-
.../lib/Haanga/Extension/Filter/Googlevizcolumnchart.php | 2 +-
lib/Haanga/lib/Haanga/Extension/Filter/Googlevizlinechart.php | 2 +-
lib/Haanga/lib/Haanga/Extension/Filter/Googlevizpiechart.php | 4 ++--
lib/Haanga/lib/Haanga/Extension/Filter/Googleviztable.php | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizbarchart.php b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizbarchart.php
index 0095861d..9f41728a 100644
--- a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizbarchart.php
+++ b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizbarchart.php
@@ -37,7 +37,7 @@ class Haanga_Extension_Filter_GoogleVizBarChart{
foreach($varList as $v){
$name = $v['name'];
$val = $v['value'];
- $value = ($j==0)?"'".$k->$name->$val."'":$k->$name->$val;
+ $value = ($j==0)?"'".str_replace("'", "\'",$k->$name->$val)."'":$k->$name->$val;
$data .=" data.setCell($i, $j, ".$value.");\n";
$j++;
}
diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizcolumnchart.php b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizcolumnchart.php
index 9daaf3f0..9b0b3e1b 100644
--- a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizcolumnchart.php
+++ b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizcolumnchart.php
@@ -42,7 +42,7 @@ class Haanga_Extension_Filter_GoogleVizColumnChart{
foreach($varList as $v){
$name = $v['name'];
$val = $v['value'];
- $value = ($j==0)?"'".$k->$name->$val."'":$k->$name->$val;
+ $value = ($j==0)?"'".str_replace("'", "\'",$k->$name->$val)."'":$k->$name->$val;
$data .=" data.setCell($i, $j, ".$value.");\n";
$j++;
}
diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizlinechart.php b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizlinechart.php
index db2b07e4..a7976607 100644
--- a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizlinechart.php
+++ b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizlinechart.php
@@ -37,7 +37,7 @@ class Haanga_Extension_Filter_GoogleVizLineChart{
foreach($varList as $v){
$name = $v['name'];
$val = $v['value'];
- $value = ($j==0)?"'".$k->$name->$val."'":$k->$name->$val;
+ $value = ($j==0)?"'".str_replace("'", "\'",$k->$name->$val)."'":$k->$name->$val;
$data .=" data.setCell($i, $j, ".$value.");\n";
$j++;
}
diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizpiechart.php b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizpiechart.php
index a8517eb0..5118ccaf 100644
--- a/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizpiechart.php
+++ b/lib/Haanga/lib/Haanga/Extension/Filter/Googlevizpiechart.php
@@ -43,8 +43,8 @@ class Haanga_Extension_Filter_GoogleVizPieChart{
foreach($varList as $v){
$name = $v['name'];
$val = $v['value'];
- $value = ($j==0)?"'".$k->$name->$val."'":$k->$name->$val;
- $data .=" data.setCell($i, $j, ".$value.");\n";
+ $value = ($j==0)?"'".str_replace("'", "\'",$k->$name->$val)."'":$k->$name->$val;
+ $data .=" data.setCell($i, $j, ".str_replace("'", "\'",$value).");\n";
$j++;
}
$i++;
diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Googleviztable.php b/lib/Haanga/lib/Haanga/Extension/Filter/Googleviztable.php
index 029da5b1..61f19ab2 100644
--- a/lib/Haanga/lib/Haanga/Extension/Filter/Googleviztable.php
+++ b/lib/Haanga/lib/Haanga/Extension/Filter/Googleviztable.php
@@ -26,7 +26,7 @@ class Haanga_Extension_Filter_GoogleVizTable{
foreach($varList as $v){
$name = $v['name'];
$val = $v['value'];
- $data .=" data.setCell($i, $j, '".$k->$name->$val."');\n";
+ $data .=" data.setCell($i, $j, '".str_replace("'", "\'",$k->$name->$val)."');\n";
$j++;
}
$i++;
--
GitLab