[evolvis-commits] r17258: merge bm:taramir51/patches/xhtml-improvements

mirabilos at evolvis.org mirabilos at evolvis.org
Mon May 16 15:09:26 CEST 2011


Author: mirabilos
Date: 2011-05-16 15:09:26 +0200 (Mon, 16 May 2011)
New Revision: 17258

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/www/admin/trove/trove_cat_list.php
   trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php
   trunk/gforge_base/evolvisforge-5.1/src/www/include/trove.php
   trunk/gforge_base/evolvisforge-5.1/src/www/pm/calendar.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/add.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactHtml.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php
Log:
merge bm:taramir51/patches/xhtml-improvements

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/admin/trove/trove_cat_list.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/admin/trove/trove_cat_list.php	2011-05-16 13:09:22 UTC (rev 17257)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/admin/trove/trove_cat_list.php	2011-05-16 13:09:26 UTC (rev 17258)
@@ -47,7 +47,7 @@
 	}
 
 	print html_image('ic/cfolder15.png');
-	print ('  <span class="trove-nodes" title="'.$title.'">'.$text.'</span> ');
+	print ('  <span class="trove-nodes" title="'.util_html_secure($title).'">'.$text.'</span> ');
 	if ($nodeid == 0) {
 		print ('<a href="trove_cat_add.php?parent_trove_cat_id='.$nodeid.'">['._('Add').']</a> ');
 	} else {

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php	2011-05-16 13:09:22 UTC (rev 17257)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php	2011-05-16 13:09:26 UTC (rev 17258)
@@ -1058,7 +1058,7 @@
 			}
 		}
 		$return .= '/>
-			<input type="image" id="' . $id . '_submit" src="' . $this->imgbaseurl . $img_src . '" alt="' . $img_alt . '" title="' . $img_title . '"';
+			<input type="image" id="' . $id . '_submit" src="' . $this->imgbaseurl . $img_src . '" alt="' . util_html_secure($img_alt) . '" title="' . util_html_secure($img_title) . '"';
 		if (is_array($img_extra_params)) {
 			foreach ($img_extra_params as $key => $img_extra_params_value) {
 				$return .= $key . '="' . $img_extra_params_value . '" ';

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php	2011-05-16 13:09:22 UTC (rev 17257)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/include/html.php	2011-05-16 13:09:26 UTC (rev 17258)
@@ -407,7 +407,7 @@
 
 	$title = html_get_tooltip_description($select_name);
 	$return .= '
-		<select'.$id.' name="'.$select_name.'" title="'.$title.'">';
+		<select'.$id.' name="'.$select_name.'" title="'.util_html_secure($title).'">';
 
 	//we don't always want the default Any row shown
 	if ($show_any) {
@@ -627,7 +627,7 @@
  */
 function html_build_priority_select_box ($name='priority', $checked_val='3', $nochange=false) {
 ?>
-	<select id="tracker-<?php echo $name ?>" name="<?php echo $name; ?>" title="<?php echo html_get_tooltip_description($name) ?>">
+	<select id="tracker-<?php echo $name ?>" name="<?php echo $name; ?>" title="<?php echo util_html_secure(html_get_tooltip_description($name)) ?>">
 <?php if($nochange) { ?>
 	<option value="100"<?php if ($nochange) {echo " selected=\"selected\"";} ?>><?php echo _('No Change') ?></option>
 <?php }  ?>

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/include/trove.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/include/trove.php	2011-05-16 13:09:22 UTC (rev 17257)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/include/trove.php	2011-05-16 13:09:26 UTC (rev 17258)
@@ -225,7 +225,7 @@
  * @param		string	THe select-box name
  */
 function trove_catselectfull($node,$selected,$name, $title='') {
-	print "<br /><select class=\"trove-nodes\" name=\"$name\" title=\"$title\">";
+	print "<br /><select class=\"trove-nodes\" name=\"$name\" title=\"util_html_secure($title)\">";
 	print '  <option value="0">'._('None Selected')."</option>\n";
 	$res_cat = db_query_params ('
 		SELECT trove_cat_id,fullpath

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/calendar.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/calendar.php	2011-05-16 13:09:22 UTC (rev 17257)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/calendar.php	2011-05-16 13:09:26 UTC (rev 17258)
@@ -140,7 +140,7 @@
  */
 function make_task_link($task, $type) {
 	global $HTML, $group_id, $group_project_id;
-	return '<a title="'. sprintf(_('Task summary: %s'), $task->getSummary())
+	return '<a title="'. util_html_secure(sprintf(_('Task summary: %s'), $task->getSummary()))
 		. '" href="'.util_make_url ('/pm/task.php?func=detailtask&project_task_id=' . $task->getID() . '&group_id=' . $group_id . '&group_project_id=' .$group_project_id)
 		. '">' . ($type == 'begin' ?
 			  sprintf(_('Task %d begins'), $task->getID()) :

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/add.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/add.php	2011-05-16 13:09:22 UTC (rev 17257)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/add.php	2011-05-16 13:09:26 UTC (rev 17258)
@@ -71,14 +71,14 @@
 	?>
 	<tr>
 		<td colspan="2"><strong><?php echo _('Summary') ?><?php echo utils_requiredField(); ?>:</strong><br />
-		<input id="tracker-summary" type="text" name="summary" size="80" maxlength="255" title="<?php echo html_get_tooltip_description('summary') ?>" />
+		<input id="tracker-summary" type="text" name="summary" size="80" maxlength="255" title="<?php echo util_html_secure(html_get_tooltip_description('summary')) ?>" />
 		</td>
 	</tr>
 
 	<tr>
 		<td colspan="2">
 		<strong><?php echo _('Detailed description') ?><?php echo utils_requiredField(); ?>:</strong><?php echo notepad_button('document.forms.trackeraddform.details') ?><br /> 
-		<textarea id="tracker-description" name="details" rows="20" cols="79" title="<?php echo html_get_tooltip_description('description') ?>"></textarea>
+		<textarea id="tracker-description" name="details" rows="20" cols="79" title="<?php echo util_html_secure(html_get_tooltip_description('description')) ?>"></textarea>
 		</td>
 	</tr>
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php	2011-05-16 13:09:22 UTC (rev 17257)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/browse.php	2011-05-16 13:09:26 UTC (rev 17258)
@@ -586,7 +586,7 @@
 					if ($rest['status_id'] == 2) {
 						$title = '<strike>'.$title.'</strike>';
 					}
-					print $s.'<a href="'.$link.'" title="'.$rest['summary'].'">'.$title.'</a>';
+					print $s.'<a href="'.$link.'" title="'.util_html_secure($rest['summary']).'">'.$title.'</a>';
 					$s = ' ';
 				}
 				echo '</td>';

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php	2011-05-16 13:09:22 UTC (rev 17257)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php	2011-05-16 13:09:26 UTC (rev 17258)
@@ -53,7 +53,7 @@
 						$text=_('Monitor');
 					}
 					echo '
-					<a id="tracker-monitor" href="index.php?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor" title="'.html_get_tooltip_description('monitor').'"><strong>'.
+					<a id="tracker-monitor" href="index.php?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor" title="'.util_html_secure(html_get_tooltip_description('monitor')).'"><strong>'.
 						html_image('ic/'.$img.'','20','20').' '.$text.'</strong></a>';
 					?>
 			</td>

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactHtml.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactHtml.class.php	2011-05-16 13:09:22 UTC (rev 17257)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactHtml.class.php	2011-05-16 13:09:26 UTC (rev 17258)
@@ -187,7 +187,7 @@
 			}
 			$text = '[#'.$arr['artifact_id'].']';
 			$url = '/tracker/?func=detail&aid='.$arr['artifact_id'].'&group_id='.$arr['group_id'].'&atid='.$arr['group_artifact_id'];
-			$arg = 'title="'.$arr['summary'].'"' ;
+			$arg = 'title="'.util_html_secure($arr['summary']).'"' ;
 			if ($arr['status_id'] == 2) {
 				$arg .= 'class="artifact_closed"';
 			}

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php	2011-05-16 13:09:22 UTC (rev 17257)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php	2011-05-16 13:09:26 UTC (rev 17258)
@@ -59,7 +59,7 @@
 					$text=_('Monitor');
 				}
 				echo '
-				<a id="tracker-monitor" href="index.php?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor" title="'.html_get_tooltip_description('monitor').'"><strong>'.
+				<a id="tracker-monitor" href="index.php?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor" title="'.util_html_secure(html_get_tooltip_description('monitor')).'"><strong>'.
 					html_image('ic/'.$img.'','20','20').' '.$text.'</strong></a>';
 				?>
 			</td>
@@ -109,12 +109,12 @@
 
 	<tr>
 		<td><strong><?php echo _('Assigned to')?>:</strong><br />
-		<span id="tracker-assigned_to" title="<?php echo html_get_tooltip_description('assigned_to') ?>">
+		<span id="tracker-assigned_to" title="<?php echo util_html_secure(html_get_tooltip_description('assigned_to')) ?>">
 		<?php echo $ah->getAssignedRealName(); ?> (<?php echo $ah->getAssignedUnixName(); ?>)
 		</span></td>
 		<td>
 		<strong><?php echo _('Priority') ?>:</strong><br />
-		<span id="tracker-priority" title="<?php echo html_get_tooltip_description('priority') ?>">
+		<span id="tracker-priority" title="<?php echo util_html_secure(html_get_tooltip_description('priority')) ?>">
 		<?php echo $ah->getPriority(); ?>
 		</span></td>
 	</tr>
@@ -123,7 +123,7 @@
 		<td>
 		<?php if (!$ath->usesCustomStatuses()) { ?>
 			<strong><?php echo _('State') ?>:</strong><br />
-			<span id="tracker-status_id" title="<?php echo html_get_tooltip_description('status_id') ?>">
+			<span id="tracker-status_id" title="<?php echo util_html_secure(html_get_tooltip_description('status_id')) ?>">
 			<?php echo $ath->statusBox ('status_id', $ah->getStatusID() ); ?>
 			<span>
 		<?php } ?>
@@ -137,7 +137,7 @@
 	?>
 	<tr>
 		<td colspan="2"><strong><?php echo _('Summary')?><?php echo utils_requiredField(); ?>:</strong><br />
-			<span id="tracker-summary" title="<?php echo html_get_tooltip_description('summary') ?>">
+			<span id="tracker-summary" title="<?php echo util_html_secure(html_get_tooltip_description('summary')) ?>">
 			<?php echo $ah->getSummary(); ?>
 			<span>
 		</td>
@@ -153,7 +153,7 @@
 <table border="0" width="80%">
 	<tr><td colspan="2">
 		<br /><strong><?php echo _('OR Attach A Comment') ?>: <?php echo notepad_button('document.forms.trackermodlimitedform.details') ?></strong><br />
-		<textarea id="tracker-comment" name="details" rows="7" cols="60" title="<?php echo html_get_tooltip_description('comment') ?>"></textarea>
+		<textarea id="tracker-comment" name="details" rows="7" cols="60" title="<?php echo util_html_secure(html_get_tooltip_description('comment')) ?>"></textarea>
 		<p>
 		<h2><?php echo _('Followups: ') ;
 		if ($sort_comments_chronologically) {

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php	2011-05-16 13:09:22 UTC (rev 17257)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php	2011-05-16 13:09:26 UTC (rev 17258)
@@ -58,7 +58,7 @@
 					$text=_('Monitor');
 				}
 				echo '
-				<a id="tracker-monitor" href="index.php?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor" title="'.html_get_tooltip_description('monitor').'"><strong>'.
+				<a id="tracker-monitor" href="index.php?group_id='.$group_id.'&artifact_id='.$ah->getID().'&atid='.$ath->getID().'&func=monitor" title="'.util_html_secure(html_get_tooltip_description('monitor')).'"><strong>'.
 					html_image('ic/'.$img.'','20','20').' '.$text.'</strong></a>';
 				?>
 			</td>
@@ -170,7 +170,7 @@
 	?>
 	<tr>
 		<td><strong><?php echo _('Summary')?><?php echo utils_requiredField(); ?>:</strong><br />
-		<input id="tracker-summary" title="<?php echo _('The summary text-box represents a short tracker item summary. Useful when browsing through several tracker items.') ?>" type="text" name="summary" size="70" value="<?php
+		<input id="tracker-summary" title="<?php echo util_html_secure(_('The summary text-box represents a short tracker item summary. Useful when browsing through several tracker items.')) ?>" type="text" name="summary" size="70" value="<?php
 			echo $ah->getSummary(); 
 			?>" maxlength="255" />
 		</td>
@@ -181,7 +181,7 @@
 		<div id="edit" style="display:none;">
 		<strong><?php echo _('Detailed description') ?><?php echo utils_requiredField(); ?>: <?php echo notepad_button('document.forms.trackermodform.description') ?></strong>
 		<br />
-		<textarea id="tracker-description" name="description" rows="30" cols="79" title="<?php echo html_get_tooltip_description('description') ?>"><?php echo $ah->getDetails(); ?></textarea>
+		<textarea id="tracker-description" name="description" rows="30" cols="79" title="<?php echo util_html_secure(html_get_tooltip_description('description')) ?>"><?php echo $ah->getDetails(); ?></textarea>
 		</div>
 		<div id="show" style="display:block;">
 		<?php echo $ah->showDetails(true); ?>
@@ -199,7 +199,7 @@
 		?>
 		<p>
 		<strong><?php echo _('OR Attach A Comment') ?>:<?php echo notepad_button('document.forms.trackermodform.details') ?></strong><br />
-		<textarea id="tracker-comment" name="details" rows="7" cols="60" title="<?php echo html_get_tooltip_description('comment') ?>"></textarea></p>
+		<textarea id="tracker-comment" name="details" rows="7" cols="60" title="<?php echo util_html_secure(html_get_tooltip_description('comment')) ?>"></textarea></p>
 		<h2><?php echo _('Followups: ') ;
 		if ($sort_comments_chronologically) {
 			echo '<a href="' .



More information about the evolvis-commits mailing list