Xibo

Merge lp:~dangarner/xibo/395881 into lp:xibo/1.0

  1. 395881
  2. Merge into halley
Proposed by Dan Garner
Status: Merged
Merged at revision: not available
Proposed branch: lp:~dangarner/xibo/395881
Merge into: lp:xibo/1.0
Diff against target: None lines
To merge this branch: bzr merge lp:~dangarner/xibo/395881
Reviewer Review Type Date Requested Status
Xibo Maintainters Pending
Review via email: mp+8341@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'client/dotNET/Region.cs'
2--- client/dotNET/Region.cs 2009-06-20 10:05:53 +0000
3+++ client/dotNET/Region.cs 2009-07-05 20:56:48 +0000
4@@ -284,7 +284,7 @@
5 System.Diagnostics.Trace.WriteLine("Non integer scrollSpeed in XLF", "Region - SetNextMediaNode");
6 }
7 }
8- else if (option.Name == "updateInverval")
9+ else if (option.Name == "updateInterval")
10 {
11 try
12 {
13
14=== modified file 'client/dotNET/Rss.cs'
15--- client/dotNET/Rss.cs 2009-06-20 10:39:40 +0000
16+++ client/dotNET/Rss.cs 2009-07-07 06:05:50 +0000
17@@ -102,9 +102,10 @@
18 try
19 {
20 wc = new System.Net.WebClient();
21- wc.Encoding = System.Text.Encoding.UTF8;
22+
23+ //wc.Encoding = System.Text.Encoding.UTF8;
24
25- System.Diagnostics.Debug.WriteLine("Created at WebClient and set the Encoding to UTF8", "RSS - Refresh local RSS");
26+ System.Diagnostics.Debug.WriteLine("Created at WebClient", "RSS - Refresh local RSS");
27
28 wc.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(wc_OpenReadCompleted);
29
30@@ -119,6 +120,7 @@
31 void wc_OpenReadCompleted(object sender, System.Net.OpenReadCompletedEventArgs e)
32 {
33 String rssContents;
34+ System.Net.WebClient wc = (System.Net.WebClient) sender;
35
36 if (e.Error != null)
37 {
38@@ -133,10 +135,10 @@
39
40 try
41 {
42- System.IO.StreamReader sr = new System.IO.StreamReader(data, Encoding.UTF8);
43+ System.IO.StreamReader sr = new System.IO.StreamReader(data, wc.Encoding);
44 rssContents = sr.ReadToEnd();
45
46- StreamWriter sw = new StreamWriter(File.Open(rssFilePath, FileMode.Create, FileAccess.Write, FileShare.Read));
47+ StreamWriter sw = new StreamWriter(File.Open(rssFilePath, FileMode.Create, FileAccess.Write, FileShare.Read), wc.Encoding);
48
49 System.Diagnostics.Debug.WriteLine("Retrieved RSS - about to write it", "RSS - wc_OpenReadCompleted");
50
51
52=== modified file 'client/dotNET/RssReader.cs'
53--- client/dotNET/RssReader.cs 2008-12-19 23:34:13 +0000
54+++ client/dotNET/RssReader.cs 2009-07-07 06:05:50 +0000
55@@ -85,11 +85,8 @@
56 throw new ArgumentException("You must provide a feed URL");
57 }
58
59- //start the parsing process
60- XmlReader reader = XmlReader.Create(Url);
61-
62 XmlDocument xmlDoc = new XmlDocument();
63- xmlDoc.Load(reader);
64+ xmlDoc.Load(Url);
65
66 //parse the items of the feed
67 ParseDocElements(xmlDoc.SelectSingleNode("//channel"), "title", ref feedTitle);
68@@ -97,8 +94,6 @@
69
70 ParseRssItems(xmlDoc);
71
72- reader.Close();
73-
74 //return the feed items
75 return feedItems;
76 }
77
78=== modified file 'client/dotNET/bin/Release/XiboClient.XmlSerializers.dll'
79Binary files client/dotNET/bin/Release/XiboClient.XmlSerializers.dll 2009-06-20 10:39:40 +0000 and client/dotNET/bin/Release/XiboClient.XmlSerializers.dll 2009-07-07 06:05:50 +0000 differ
80=== modified file 'client/dotNET/bin/Release/XiboClient.exe'
81Binary files client/dotNET/bin/Release/XiboClient.exe 2009-06-20 10:39:40 +0000 and client/dotNET/bin/Release/XiboClient.exe 2009-07-07 06:05:50 +0000 differ
82=== modified file 'client/dotNET/bin/Release/XiboClient.pdb'
83Binary files client/dotNET/bin/Release/XiboClient.pdb 2009-06-20 10:39:40 +0000 and client/dotNET/bin/Release/XiboClient.pdb 2009-07-07 06:05:50 +0000 differ
84=== modified file 'server/lib/modules/module.class.php'
85--- server/lib/modules/module.class.php 2009-04-27 19:28:08 +0000
86+++ server/lib/modules/module.class.php 2009-07-05 20:56:48 +0000
87@@ -262,7 +262,10 @@
88 */
89 final protected function SetOption($name, $value)
90 {
91- if ($name == '' || $value == '') return;
92+ $db =& $this->db;
93+ if ($name == '') return;
94+
95+ Debug::LogEntry($db, 'audit', sprintf('IN with Name=%s and value=%s', $name, $value), 'module', 'Set Option');
96
97 // Get the options node from this document
98 $optionNodes = $this->xml->getElementsByTagName('options');
99@@ -272,6 +275,7 @@
100 // Create a new option node
101 $newNode = $this->xml->createElement($name, $value);
102
103+ Debug::LogEntry($db, 'audit', sprintf('Created a new Option Node with Name=%s and value=%s', $name, $value), 'module', 'Set Option');
104
105 // Check to see if we already have this option or not
106 $xpath = new DOMXPath($this->xml);
107
108=== modified file 'server/modules/flash.module.php'
109--- server/modules/flash.module.php 2009-05-24 09:59:49 +0000
110+++ server/modules/flash.module.php 2009-06-28 10:47:06 +0000
111@@ -784,8 +784,11 @@
112 // Editing the existing record
113 $new_mediaid = $mediaid;
114
115- $SQL = "UPDATE media SET name = '$name', duration = '$duration', permissionID = $permissionid";
116- $SQL .= " WHERE mediaID = $mediaid ";
117+ $SQL = "UPDATE media SET name = '%s', duration = %d, permissionID = %d";
118+ $SQL .= " WHERE mediaID = %d ";
119+ $SQL = sprintf($SQL, $db->escape_string($name), $duration, $permissionid, $mediaid);
120+
121+ Debug::LogEntry($db, 'audit', $SQL);
122
123 if (!$db->query($SQL))
124 {
125
126=== modified file 'server/modules/image.module.php'
127--- server/modules/image.module.php 2009-05-24 09:59:49 +0000
128+++ server/modules/image.module.php 2009-06-28 10:47:06 +0000
129@@ -794,8 +794,11 @@
130 // Editing the existing record
131 $new_mediaid = $mediaid;
132
133- $SQL = "UPDATE media SET name = '$name', duration = '$duration', permissionID = $permissionid";
134- $SQL .= " WHERE mediaID = $mediaid ";
135+ $SQL = "UPDATE media SET name = '%s', duration = %d, permissionID = %d";
136+ $SQL .= " WHERE mediaID = %d ";
137+ $SQL = sprintf($SQL, $db->escape_string($name), $duration, $permissionid, $mediaid);
138+
139+ Debug::LogEntry($db, 'audit', $SQL);
140
141 if (!$db->query($SQL))
142 {
143
144=== modified file 'server/modules/powerpoint.module.php'
145--- server/modules/powerpoint.module.php 2009-05-24 09:59:49 +0000
146+++ server/modules/powerpoint.module.php 2009-06-28 10:47:06 +0000
147@@ -784,8 +784,11 @@
148 // Editing the existing record
149 $new_mediaid = $mediaid;
150
151- $SQL = "UPDATE media SET name = '$name', duration = '$duration', permissionID = $permissionid";
152- $SQL .= " WHERE mediaID = $mediaid ";
153+ $SQL = "UPDATE media SET name = '%s', duration = %d, permissionID = %d";
154+ $SQL .= " WHERE mediaID = %d ";
155+ $SQL = sprintf($SQL, $db->escape_string($name), $duration, $permissionid, $mediaid);
156+
157+ Debug::LogEntry($db, 'audit', $SQL);
158
159 if (!$db->query($SQL))
160 {
161
162=== modified file 'server/modules/ticker.module.php'
163--- server/modules/ticker.module.php 2009-06-18 18:36:21 +0000
164+++ server/modules/ticker.module.php 2009-07-05 20:56:48 +0000
165@@ -272,7 +272,7 @@
166 $copyright = Kit::GetParam('copyright', _POST, _STRING);
167
168 $url = "index.php?p=layout&layoutid=$layoutid&regionid=$regionid&q=RegionOptions";
169-
170+
171 //validation
172 if ($text == '')
173 {
174
175=== modified file 'server/modules/video.module.php'
176--- server/modules/video.module.php 2009-05-24 09:59:49 +0000
177+++ server/modules/video.module.php 2009-06-28 10:47:06 +0000
178@@ -771,8 +771,11 @@
179 // Editing the existing record
180 $new_mediaid = $mediaid;
181
182- $SQL = "UPDATE media SET name = '$name', duration = '$duration', permissionID = $permissionid";
183- $SQL .= " WHERE mediaID = $mediaid ";
184+ $SQL = "UPDATE media SET name = '%s', duration = %d, permissionID = %d";
185+ $SQL .= " WHERE mediaID = %d ";
186+ $SQL = sprintf($SQL, $db->escape_string($name), $duration, $permissionid, $mediaid);
187+
188+ Debug::LogEntry($db, 'audit', $SQL);
189
190 if (!$db->query($SQL))
191 {

Subscribers

People subscribed via source and target branches