From f8ac4407a8817d9513ffb7fd491f929b6232f487 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Fri, 15 May 2015 17:47:00 +0545 Subject: Code style WWW pkg The syntax of these all seems good. Because the 2.3-DEVELOPMENT master does not currently have get_pkg_info implemented, the available packages tab always says "Unable to retrieve package info...". But I don't think I broke any code. This is integrated with the little changes for startdisplayingat var in pkg.php --- usr/local/www/pkg_mgr_installed.php | 154 +++++++++++++++++++----------------- 1 file changed, 83 insertions(+), 71 deletions(-) (limited to 'usr/local/www/pkg_mgr_installed.php') diff --git a/usr/local/www/pkg_mgr_installed.php b/usr/local/www/pkg_mgr_installed.php index cd86295..119df9c 100644 --- a/usr/local/www/pkg_mgr_installed.php +++ b/usr/local/www/pkg_mgr_installed.php @@ -1,31 +1,31 @@ - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. + pkg_mgr_installed.php + Copyright (C) 2013-2015 Electric Sheep Fencing, LP + Copyright (C) 2004-2012 Scott Ullrich + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. */ /* pfSense_MODULE: pkgs @@ -42,13 +42,14 @@ require_once("guiconfig.inc"); require_once("pkg-utils.inc"); $timezone = $config['system']['timezone']; -if (!$timezone) +if (!$timezone) { $timezone = "Etc/UTC"; +} date_default_timezone_set($timezone); /* if upgrade in progress, alert user */ -if(is_subsystem_dirty('packagelock')) { +if (is_subsystem_dirty('packagelock')) { $pgtitle = array(gettext("System"),gettext("Package Manager")); include("head.inc"); echo "\n"; @@ -60,19 +61,20 @@ if(is_subsystem_dirty('packagelock')) { exit; } -function domTT_title($title_msg, $return="echo"){ - if (!empty($title_msg)){ +function domTT_title($title_msg, $return="echo") { + if (!empty($title_msg)) { $title_msg=preg_replace("/\s+/"," ",$title_msg); - $title_msg=preg_replace("/'/","\'",$title_msg); - $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');\""; - if ($return =="echo") - echo $title; - else - return $title; + $title_msg=preg_replace("/'/","\'",$title_msg); + $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');\""; + if ($return =="echo") { + echo $title; + } else { + return $title; + } } } -if(is_array($config['installedpackages']['package'])) { - foreach($config['installedpackages']['package'] as $instpkg) { +if (is_array($config['installedpackages']['package'])) { + foreach ($config['installedpackages']['package'] as $instpkg) { $tocheck[] = $instpkg['name']; } $currentvers = get_pkg_info($tocheck, array('version', 'xmlver', 'pkginfolink','descr')); @@ -90,15 +92,18 @@ include("head.inc"); - + if (check_package_server_ssl() === false) { + print_info_box(package_server_ssl_failure_message()); + } +?> @@ -127,10 +132,10 @@ include("head.inc"); $pkgname): $pkg = $config['installedpackages']['package'][$index]; - if(!$pkg['name']) + if (!$pkg['name']) { continue; + } // get history/changelog git dir $commit_dir=explode("/",$pkg['config_file']); - $changeloglink ="https://github.com/pfsense/pfsense-packages/commits/master/config/".$commit_dir[(count($commit_dir)-2)]; + $changeloglink ="https://github.com/pfsense/pfsense-packages/commits/master/config/".$commit_dir[(count($commit_dir)-2)]; #check package version $latest_package = $currentvers[$pkg['name']]['version']; if ($latest_package) { // we're running a newer version of the package - if(strcmp($pkg['version'], $latest_package) > 0) { + if (strcmp($pkg['version'], $latest_package) > 0) { $tdclass = "listbggrey"; - if ($g['disablepackagehistory']) + if ($g['disablepackagehistory']) { $pkgver = "".gettext("Available") .": ". $latest_package . "
"; - else + } else { $pkgver = "".gettext("Available") .": ". $latest_package . "
"; + } $pkgver .= gettext("Installed") .": ". $pkg['version']. ""; } // we're running an older version of the package - if(strcmp($pkg['version'], $latest_package) < 0) { + if (strcmp($pkg['version'], $latest_package) < 0) { $tdclass = "listbg"; - if ($g['disablepackagehistory']) + if ($g['disablepackagehistory']) { $pkgver = "" . gettext("Available") .": ". $latest_package . "
"; - else + } else { $pkgver = "" . gettext("Available") .": ". $latest_package . "
"; + } $pkgver .= gettext("Installed") .": ". $pkg['version'].""; } // we're running the current version - if(!strcmp($pkg['version'], $latest_package)) { + if (!strcmp($pkg['version'], $latest_package)) { $tdclass = "listr"; - if ($g['disablepackagehistory']) + if ($g['disablepackagehistory']) { $pkgver = "{$pkg['version']}"; - else + } else { $pkgver = "{$pkg['version']}"; + } } $pkgdescr = $currentvers[$pkg['name']]['descr']; } else { // unknown available package version $tdclass = "listbg"; - if ($g['disablepackagehistory']) + if ($g['disablepackagehistory']) { $pkgver = "" . gettext("Latest") .": ". gettext("N/A") . "
"; - else + } else { $pkgver = "" . gettext("Latest") .": ". gettext("N/A") . "
"; + } $pkgver .= gettext("Installed") .": ". $pkg['version'].""; $pkgdescr = $pkg['descr']; } /* Check package info link */ - if($pkg['pkginfolink']){ + if ($pkg['pkginfolink']) { $pkginfolink = $pkg['pkginfolink']; $pkginfo=gettext("Package info"); - } - else{ + } else { $pkginfolink = "https://forum.pfsense.org/index.php/board,15.0.html"; $pkginfo=gettext("No package info, check the forum"); - } - + } + ?> - {$pkgver}"; - else - echo ""; + {$pkgver}"; + } else { + echo ""; + } ?> - +
 
@@ -202,17 +211,18 @@ include("head.inc"); {$pkgver}{$pkgver}> - - -

- + + +

+ 		@@ -237,7 +247,9 @@ include("head.inc");
-- cgit v1.1