Project

General

Profile

« Previous | Next » 

Revision 6c07db48

Added by Phil Davis about 10 years ago

Code spacing

and other random stuff I noticed.
I think this finishes messing with code style. The codebase should match
the developer style guide closely enough that 99.9% of changes will not
feel the need to also massage the formatting.

View differences:

usr/local/www/pkg_mgr_installed.php
50 50

  
51 51
/* if upgrade in progress, alert user */
52 52
if (is_subsystem_dirty('packagelock')) {
53
	$pgtitle = array(gettext("System"),gettext("Package Manager"));
53
	$pgtitle = array(gettext("System"), gettext("Package Manager"));
54 54
	include("head.inc");
55 55
	echo "<body link=\"#0000CC\" vlink=\"#0000CC\" alink=\"#0000CC\">\n";
56 56
	include("fbegin.inc");
......
63 63

  
64 64
function domTT_title($title_msg, $return="echo") {
65 65
	if (!empty($title_msg)) {
66
		$title_msg=preg_replace("/\s+/"," ",$title_msg);
67
		$title_msg=preg_replace("/'/","\'",$title_msg);
66
		$title_msg = preg_replace("/\s+/", " ", $title_msg);
67
		$title_msg = preg_replace("/'/", "\'", $title_msg);
68 68
		$title= "onmouseout=\"this.style.color = ''; domTT_mouseout(this, event);\" onmouseover=\"domTT_activate(this, event, 'content', '{$title_msg}', 'trail', true, 'delay', 0, 'fade', 'both', 'fadeMax', 93, 'styleClass', 'niceTitle');\"";
69 69
		if ($return =="echo") {
70 70
			echo $title;
......
77 77
	foreach ($config['installedpackages']['package'] as $instpkg) {
78 78
		$tocheck[] = $instpkg['name'];
79 79
	}
80
	$currentvers = get_pkg_info($tocheck, array('version', 'xmlver', 'pkginfolink','descr'));
80
	$currentvers = get_pkg_info($tocheck, array('version', 'xmlver', 'pkginfolink', 'descr'));
81 81
}
82 82
$closehead = false;
83
$pgtitle = array(gettext("System"),gettext("Package Manager"));
83
$pgtitle = array(gettext("System"), gettext("Package Manager"));
84 84
include("head.inc");
85 85

  
86 86
?>
......
148 148
									}
149 149

  
150 150
									// get history/changelog git dir
151
									$commit_dir=explode("/",$pkg['config_file']);
152
									$changeloglink ="https://github.com/pfsense/pfsense-packages/commits/master/config/".$commit_dir[(count($commit_dir)-2)];
151
									$commit_dir = explode("/", $pkg['config_file']);
152
									$changeloglink = "https://github.com/pfsense/pfsense-packages/commits/master/config/" . $commit_dir[(count($commit_dir)-2)];
153 153
									#check package version
154 154
									$latest_package = $currentvers[$pkg['name']]['version'];
155 155
									if ($latest_package) {
......
157 157
										if (strcmp($pkg['version'], $latest_package) > 0) {
158 158
											$tdclass = "listbggrey";
159 159
											if ($g['disablepackagehistory']) {
160
												$pkgver  = "<a>".gettext("Available") .": ". $latest_package . "<br />";
160
												$pkgver = "<a>" . gettext("Available") . ": " . $latest_package . "<br />";
161 161
											} else {
162
												$pkgver  = "<a target='_blank' href='$changeloglink'>".gettext("Available") .": ". $latest_package . "<br />";
162
												$pkgver = "<a target='_blank' href='$changeloglink'>" . gettext("Available") . ": " . $latest_package . "<br />";
163 163
											}
164
											$pkgver .= gettext("Installed") .": ". $pkg['version']. "</a>";
164
											$pkgver .= gettext("Installed") . ": " . $pkg['version'] . "</a>";
165 165
										}
166 166
										// we're running an older version of the package
167 167
										if (strcmp($pkg['version'], $latest_package) < 0) {
168 168
											$tdclass = "listbg";
169 169
											if ($g['disablepackagehistory']) {
170
												$pkgver  = "<a><font color='#ffffff'>" . gettext("Available") .": ". $latest_package . "</font><br />";
170
												$pkgver = "<a><font color='#ffffff'>" . gettext("Available") . ": " . $latest_package . "</font><br />";
171 171
											} else {
172
												$pkgver  = "<a target='_blank' href='$changeloglink'><font color='#ffffff'>" . gettext("Available") .": ". $latest_package . "<br />";
172
												$pkgver = "<a target='_blank' href='$changeloglink'><font color='#ffffff'>" . gettext("Available") . ": " . $latest_package . "<br />";
173 173
											}
174
											$pkgver .= gettext("Installed") .": ". $pkg['version']."</font></a>";
174
											$pkgver .= gettext("Installed") . ": " . $pkg['version'] . "</font></a>";
175 175
										}
176 176
										// we're running the current version
177 177
										if (!strcmp($pkg['version'], $latest_package)) {
......
187 187
										// unknown available package version
188 188
										$tdclass = "listbg";
189 189
										if ($g['disablepackagehistory']) {
190
											$pkgver = "<a><font color='#ffffff'>" . gettext("Latest") .": ". gettext("N/A") . "</font><br />";
190
											$pkgver = "<a><font color='#ffffff'>" . gettext("Latest") . ": " . gettext("N/A") . "</font><br />";
191 191
										} else {
192
											$pkgver = "<a target='_blank' href='$changeloglink'><font color='#ffffff'>" . gettext("Latest") .": ". gettext("N/A") . "<br />";
192
											$pkgver = "<a target='_blank' href='$changeloglink'><font color='#ffffff'>" . gettext("Latest") . ": " . gettext("N/A") . "<br />";
193 193
										}
194
										$pkgver .= gettext("Installed") .": ". $pkg['version']."</font></a>";
194
										$pkgver .= gettext("Installed") . ": " . $pkg['version'] . "</font></a>";
195 195
										$pkgdescr = $pkg['descr'];
196 196
									}
197 197
									/* Check package info link */
......
215 215
							if (isset($g['disablepackagehistory'])) {
216 216
								echo "<td class='{$tdclass}'>{$pkgver}</td>";
217 217
							} else {
218
								echo "<td class='{$tdclass}' ".domTT_title(gettext("Click on ".ucfirst($pkg['name'])." version to check its change log."),"return").">{$pkgver}</td>";
218
								echo "<td class='{$tdclass}' " . domTT_title(gettext("Click on " . ucfirst($pkg['name']) . " version to check its change log."), "return").">{$pkgver}</td>";
219 219
							}
220 220
							?>
221
							<td class="listbg" style="overflow:hidden; text-align:justify;" <?=domTT_title(gettext("Click package info for more details about ".ucfirst($pkg['name'])." package."))?>>
221
							<td class="listbg" style="overflow:hidden; text-align:justify;" <?=domTT_title(gettext("Click package info for more details about " . ucfirst($pkg['name']) . " package."))?>>
222 222
								<?=$pkgdescr;?>
223 223
							<?php if (!$g['disablepackageinfo']): ?>
224 224
								<br /><br />
......
227 227
							</td>
228 228
							<td valign="middle" class="list nowrap">
229 229
								<a href="pkg_mgr_install.php?mode=delete&amp;pkg=<?= $pkg['name']; ?>">
230
									<img <?=domTT_title(gettext("Remove ".ucfirst($pkg['name'])." package."))?> src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" />
230
									<img <?=domTT_title(gettext("Remove " . ucfirst($pkg['name']) . " package."))?> src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="delete" />
231 231
								</a>
232 232
								<br />
233 233
								<a href="pkg_mgr_install.php?mode=reinstallpkg&amp;pkg=<?= $pkg['name']; ?>">
234
									<img <?=domTT_title(gettext("Reinstall ".ucfirst($pkg['name'])." package."));?> src="./themes/<?= $g['theme']; ?>/images/icons/icon_reinstall_pkg.gif" width="17" height="17" border="0" alt="reinstall" />
234
									<img <?=domTT_title(gettext("Reinstall " . ucfirst($pkg['name']) . " package."));?> src="./themes/<?= $g['theme']; ?>/images/icons/icon_reinstall_pkg.gif" width="17" height="17" border="0" alt="reinstall" />
235 235
								</a>
236 236
								<a href="pkg_mgr_install.php?mode=reinstallxml&amp;pkg=<?= $pkg['name']; ?>">
237
									<img <?=domTT_title(gettext("Reinstall ".ucfirst($pkg['name'])."'s GUI components."));?> src="./themes/<?= $g['theme']; ?>/images/icons/icon_reinstall_xml.gif" width="17" height="17" border="0" alt="reinstall" />
237
									<img <?=domTT_title(gettext("Reinstall " . ucfirst($pkg['name']) . "'s GUI components."));?> src="./themes/<?= $g['theme']; ?>/images/icons/icon_reinstall_xml.gif" width="17" height="17" border="0" alt="reinstall" />
238 238
								</a>
239 239
							</td>
240 240
						</tr>

Also available in: Unified diff