From 5a25e8901aa2931e26098f03eb8f97a80c2f2677 Mon Sep 17 00:00:00 2001
From: Jim Hu <jimhu@users.sourceforge.net>
Date: Fri, 18 May 2007 21:18:00 +0000
Subject: Month location display again

---
 README                            | 5 +++++
 functions/template.php            | 7 ++++---
 templates/default/month_large.tpl | 3 ---
 templates/green/month_large.tpl   | 3 ---
 templates/grey/month_large.tpl    | 3 ---
 templates/red/month_large.tpl     | 3 ---
 templates/tan/month_large.tpl     | 3 ---
 7 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/README b/README
index 0dc85ad..29b1da0 100644
--- a/README
+++ b/README
@@ -81,6 +81,11 @@ COPYING for more information about our license.
 
 Changes:
 --------
+cvs
+	Fix location display in months
+	Fix polish language file
+	Sanitizer bug fixes
+	Fix status bug for publish.php
 2.23
 	New language files
 	Add input sanitizer - important for blocking XSS attacks
diff --git a/functions/template.php b/functions/template.php
index da13ce0..62c9edc 100644
--- a/functions/template.php
+++ b/functions/template.php
@@ -928,6 +928,7 @@ class Page {
 								if ($type == 'large') {
 									$switch['ALLDAY'] .= '<div class="V10"><img src="templates/'.$template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />';
  									$switch['ALLDAY'] .= openevent($daylink, $cal_time, $uid, $val, $month_event_lines, 15, 'psf');
+ 									$switch['ALLDAY'] .= (isset($val['location']) && $val['location'] != '') ? $val['location']."<br />" : '';
 									$switch['ALLDAY'] .= '</div>';
 								} else {
 									$switch['ALLDAY'] .= '<img src="templates/'.$template.'/images/allday_dot.gif" alt=" " width="11" height="10" border="0" />';
@@ -936,13 +937,13 @@ class Page {
 								$start2		 = date($timeFormat_small, $val['start_unixtime']);
 								if ($type == 'large') {
 									$switch['EVENT'] .= '<div class="V9"><img src="templates/'.$template.'/images/monthdot_'.$event_calno.'.gif" alt="" width="9" height="9" border="0" />';
- 									$switch['EVENT'] .= openevent($daylink, $cal_time, $uid, $val, $month_event_lines, 10, 'ps3', "$start2 ").'<br />';
+ 									$switch['EVENT'] .= openevent($daylink, $cal_time, $uid, $val, $month_event_lines, 10, 'ps3', "$start2 ").'';
+ 									$switch['EVENT'] .= (isset($val['location']) && $val['location'] != '') ? "<br />".$val['location']."<br />" : '';
 									$switch['EVENT'] .= '</div>';
 								} else {
 									$switch['EVENT'] = '<img src="templates/'.$template.'/images/event_dot.gif" alt=" " width="11" height="10" border="0" />';
 								}
 							}
-							$switch['LOCATION'] = (isset($val['location'])) ? "<span class='V9G'>".$val['location']."</span>" : '';
 						}
 					}
 				}
@@ -951,7 +952,7 @@ class Page {
 			$switch['EVENT'] = (isset($switch['EVENT'])) ? $switch['EVENT'] : '';
 			$switch['ALLDAY'] = (isset($switch['ALLDAY'])) ? $switch['ALLDAY'] : '';
 			
-			#print_r($switch);
+			#echo "<pre>";print_r($switch);echo "</pre>";
 			
 			foreach ($switch as $tag => $data) {
 				$temp = str_replace('{'.$tag.'}', $data, $temp);
diff --git a/templates/default/month_large.tpl b/templates/default/month_large.tpl
index ff65ceb..ca3d3d3 100644
--- a/templates/default/month_large.tpl
+++ b/templates/default/month_large.tpl
@@ -16,7 +16,6 @@
 			</div>
 			{ALLDAY}
 			{EVENT}	
-			{LOCATION}
 		</td>
 		<!-- switch notthismonth off -->
 		<!-- switch istoday on -->
@@ -26,7 +25,6 @@
 			</div>
 			{ALLDAY}
 			{EVENT}	
-			{LOCATION}
 		</td>
 		<!-- switch istoday off -->
 		<!-- switch ismonth on -->
@@ -36,7 +34,6 @@
 			</div>
 			{ALLDAY}
 			{EVENT}	
-			{LOCATION}
 		</td>
 		<!-- switch ismonth off -->
 		<!-- loop monthdays off -->
diff --git a/templates/green/month_large.tpl b/templates/green/month_large.tpl
index ff65ceb..ca3d3d3 100644
--- a/templates/green/month_large.tpl
+++ b/templates/green/month_large.tpl
@@ -16,7 +16,6 @@
 			</div>
 			{ALLDAY}
 			{EVENT}	
-			{LOCATION}
 		</td>
 		<!-- switch notthismonth off -->
 		<!-- switch istoday on -->
@@ -26,7 +25,6 @@
 			</div>
 			{ALLDAY}
 			{EVENT}	
-			{LOCATION}
 		</td>
 		<!-- switch istoday off -->
 		<!-- switch ismonth on -->
@@ -36,7 +34,6 @@
 			</div>
 			{ALLDAY}
 			{EVENT}	
-			{LOCATION}
 		</td>
 		<!-- switch ismonth off -->
 		<!-- loop monthdays off -->
diff --git a/templates/grey/month_large.tpl b/templates/grey/month_large.tpl
index ff65ceb..ca3d3d3 100644
--- a/templates/grey/month_large.tpl
+++ b/templates/grey/month_large.tpl
@@ -16,7 +16,6 @@
 			</div>
 			{ALLDAY}
 			{EVENT}	
-			{LOCATION}
 		</td>
 		<!-- switch notthismonth off -->
 		<!-- switch istoday on -->
@@ -26,7 +25,6 @@
 			</div>
 			{ALLDAY}
 			{EVENT}	
-			{LOCATION}
 		</td>
 		<!-- switch istoday off -->
 		<!-- switch ismonth on -->
@@ -36,7 +34,6 @@
 			</div>
 			{ALLDAY}
 			{EVENT}	
-			{LOCATION}
 		</td>
 		<!-- switch ismonth off -->
 		<!-- loop monthdays off -->
diff --git a/templates/red/month_large.tpl b/templates/red/month_large.tpl
index ff65ceb..ca3d3d3 100644
--- a/templates/red/month_large.tpl
+++ b/templates/red/month_large.tpl
@@ -16,7 +16,6 @@
 			</div>
 			{ALLDAY}
 			{EVENT}	
-			{LOCATION}
 		</td>
 		<!-- switch notthismonth off -->
 		<!-- switch istoday on -->
@@ -26,7 +25,6 @@
 			</div>
 			{ALLDAY}
 			{EVENT}	
-			{LOCATION}
 		</td>
 		<!-- switch istoday off -->
 		<!-- switch ismonth on -->
@@ -36,7 +34,6 @@
 			</div>
 			{ALLDAY}
 			{EVENT}	
-			{LOCATION}
 		</td>
 		<!-- switch ismonth off -->
 		<!-- loop monthdays off -->
diff --git a/templates/tan/month_large.tpl b/templates/tan/month_large.tpl
index ff65ceb..ca3d3d3 100644
--- a/templates/tan/month_large.tpl
+++ b/templates/tan/month_large.tpl
@@ -16,7 +16,6 @@
 			</div>
 			{ALLDAY}
 			{EVENT}	
-			{LOCATION}
 		</td>
 		<!-- switch notthismonth off -->
 		<!-- switch istoday on -->
@@ -26,7 +25,6 @@
 			</div>
 			{ALLDAY}
 			{EVENT}	
-			{LOCATION}
 		</td>
 		<!-- switch istoday off -->
 		<!-- switch ismonth on -->
@@ -36,7 +34,6 @@
 			</div>
 			{ALLDAY}
 			{EVENT}	
-			{LOCATION}
 		</td>
 		<!-- switch ismonth off -->
 		<!-- loop monthdays off -->
-- 
cgit v1.2.3