[Frugalware-git] homepage-ng: fwng: removed trailing spaces

Krisztian VASAS iron at frugalware.org
Tue Aug 31 15:59:29 CEST 2010


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=homepage-ng.git;a=commitdiff;h=d19835de5327b8c6162b991b9f616e61bcd0a3cf

commit d19835de5327b8c6162b991b9f616e61bcd0a3cf
Author: Krisztian VASAS <iron at frugalware.org>
Date:   Tue Aug 31 15:59:07 2010 +0200

fwng: removed trailing spaces

diff --git a/frugalware/about.php b/frugalware/about.php
index 3304804..5501ebe 100644
--- a/frugalware/about.php
+++ b/frugalware/about.php
@@ -35,11 +35,11 @@ set_locale($llang, $domain);

$fwshortabout = gettext("Frugalware is a general purpose linux distribution, designed for intermediate users (who are not afraid of text mode).");
$fwabout= array (
-	array (gettext("What branches does Frugalware have?"),
-		gettext("We have a <i>current</i> and a <i>stable</i> branch. The <i>current</i> branch is updated daily, and we update our <i>stable</i> branch around every 6 months.")),
+	array (gettext("What branches does Frugalware have?"),
+		gettext("We have a <i>current</i> and a <i>stable</i> branch. The <i>current</i> branch is updated daily, and we update our <i>stable</i> branch around every 6 months.")),
array (gettext("What is &quot;The Frugalware Philosophy&quot; about?"),
gettext("Briefly: simplicity, multimedia, design. We try to make Frugalware as simple as possible while not forgetting to keep it comfortable for the user. We try to ship fresh and stable software, as close to the original source as possible, because in our opinion most software is the best as is, and doesn't need patching.")),
-	array (gettext("What is the license of Frugalware?"),
+	array (gettext("What is the license of Frugalware?"),
gettext("That's two questions. Most software included in Frugalware have a GPL or BSD compatible license, for more information about a license of a specific package, refer to the LICENSE or COPYRIGHT file in the source tarball of the package. On the other hand, the part written by our team (FrugalBuild scripts, setup, homepage, etc) is released under GPL license. To make it even more complicated, some parts of the setup and init scripts are written by Patrick J. Volkerding. We GPL our additions, but Patrick J. Volkerding's code is still under the BSD license. For more information, refer to the COPYRIGHT file in the root directory of the FST (Frugalware Source Tree).")),
array (gettext("What package manager does Frugalware use?"),
gettext("We don't have our own package manager, we use Judd Vinet's great work, the <a href=\"http://www.archlinux.org/pacman\">pacman</a> package manager. It's a tar.bz2 based package manager, similar to Slackware's .tgz. Our packages' extension is .fpm to differentiate them from regular tarballs. Unlike Slackware's scripts, pacman is written in C, so it's much faster.")),
diff --git a/frugalware/config.inc.php b/frugalware/config.inc.php
index ed58fb8..c750403 100644
--- a/frugalware/config.inc.php
+++ b/frugalware/config.inc.php
@@ -92,19 +92,19 @@ else
}
$langcontent = '<div class="imgcontent">
<a href="' . $langpage . 'en"><img alt="' . gettext( 'Change language' ) . '" title="' . gettext( 'Change language' ) . '" src="' . $fwng_root . 'images/english.gif" border="0" /></a>
-	  |
+	  |
<a href="' . $langpage . 'hu"><img alt="' . gettext( 'Change language' ) . '" title="' . gettext( 'Change language' ) . '" src="' . $fwng_root . 'images/hungarian.gif" border="0" /></a>
-	  |
+	  |
<a href="' . $langpage . 'fr"><img alt="' . gettext( 'Change language' ) . '" title="' . gettext( 'Change language' ) . '" src="' . $fwng_root . 'images/french.gif" border="0" /></a>
-	  |
+	  |
<a href="' . $langpage . 'sk"><img alt="' . gettext( 'Change language' ) . '" title="' . gettext( 'Change language' ) . '" src="' . $fwng_root . 'images/slovak.gif" border="0" /></a>
-	  |
+	  |
<a href="' . $langpage . 'ru"><img alt="' . gettext( 'Change language' ) . '" title="' . gettext( 'Change language' ) . '" src="' . $fwng_root . 'images/russian.gif" border="0" /></a>
-	  |
+	  |
<a href="' . $langpage . 'da"><img alt="' . gettext( 'Change language' ) . '" title="' . gettext( 'Change language' ) . '" src="' . $fwng_root . 'images/danish.gif" border="0" /></a>
-	  |
+	  |
<a href="' . $langpage . 'cs"><img alt="' . gettext( 'Change language' ) . '" title="' . gettext( 'Change language' ) . '" src="' . $fwng_root . 'images/czech.gif" border="0" /></a>
-	<!--  |
+	<!--  |
<a href="' . $langpage . 'tr"><img alt="' . gettext( 'Change language' ) . '" title="' . gettext( 'Change language' ) . '" src="' . $fwng_root . 'images/turkish.gif" border="0" /></a> -->
</div>';
/*
diff --git a/frugalware/media.php b/frugalware/media.php
index ed0e17e..596e270 100644
--- a/frugalware/media.php
+++ b/frugalware/media.php
@@ -42,11 +42,11 @@ if (file_exists('xml/media.xml'))
else
$xmlfile = $docs_path.'xml/media.xml';
if (!file_exists($xmlfile)) {
-
+
echo(gettext('Sorry, a media file has not been written yet.'));
include('footer.php');
die();
-
+
}

fwmiddlebox(gettext('Frugalware in the press'),
@@ -59,18 +59,18 @@ $media = $parser->document->article;

// The parser creates too long and unuseful object hierarchy, so create a better-readable one.
for ( $i = 0; $i < count($media); $i++) {
-
+
$articles[$i][date] = $media[$i]->date[0]->tagData;
$articles[$i][language] = $media[$i]->language[0]->tagData;
$articles[$i][where] = $media[$i]->where[0]->tagData;
$articles[$i][title] = $media[$i]->title[0]->tagData;
$articles[$i][link] = $media[$i]->link[0]->tagData;
-
+
}

// Let's write out details of each article in a separate box
for( $i = 0; $i < count($articles); $i++ ) {
-
+
fwmiddlebox($articles[$i][where] . ' - ' . $articles[$i][title],
'<table width="100%">
<tr><td width="30%">' . gettext('Title') . ':</td><td width="70%">' . $articles[$i][title] . '</td></tr>
@@ -78,7 +78,7 @@ for( $i = 0; $i < count($articles); $i++ ) {
<tr><td>' . gettext('Date') . ':</td><td>' . $articles[$i][date] . '</td></tr>
<tr><td>' . gettext('Language') . ':</td><td>' . $articles[$i][language] . '</td></tr>
<tr><td>' . gettext('Link') . ':</td><td><a href="' . htmlentities($articles[$i][link]) . '">' . htmlentities($articles[$i][link]) . '</a></td></tr></table>');
-
+
}

include("footer.php");
diff --git a/frugalware/packages.php b/frugalware/packages.php
index 5bff920..ac9865f 100644
--- a/frugalware/packages.php
+++ b/frugalware/packages.php
@@ -188,7 +188,7 @@ function search_pkg()
$db->doClose();
res_show($res_set, 'p', $search);
}
-	elseif ( $res == -1 )
+	elseif ( $res == -1 )
{
print '<h3>' . gettext( 'Error in the query, please change the searching conditions' ) . '</h3>';
$db->doClose();
@@ -208,8 +208,8 @@ function search_file()
$arch = addslashes($_GET['arch']);
$fwver = addslashes($_GET['ver']);
// XXX: no regexp search here
-	$query = "select packages.id, packages.pkgname, packages.pkgver,
-		packages.fwver, packages.arch from packages, files where
+	$query = "select packages.id, packages.pkgname, packages.pkgver,
+		packages.fwver, packages.arch from packages, files where
packages.id = files.pkg_id and files.file like '%$search%'";
if ($arch != "" && $arch != "all")
{
diff --git a/frugalware/rewrite.php b/frugalware/rewrite.php
index 3eda4d9..efd47f0 100644
--- a/frugalware/rewrite.php
+++ b/frugalware/rewrite.php
@@ -1,9 +1,9 @@
<?
/*
*  rewrite.php for homepage
- *
+ *
*  Copyright (c) 2006 by Miklos Vajna <vmiklos at frugalware.org>
- *
+ *
*  This program is free software; you can redistribute it and/or modify
*  it under the terms of the GNU General Public License as published by
*  the Free Software Foundation; either version 2 of the License, or
@@ -16,7 +16,7 @@
*
*  You should have received a copy of the GNU General Public License
*  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
*  USA.
*/

diff --git a/frugalware/roadmap.php b/frugalware/roadmap.php
index 487b595..4cffc6b 100644
--- a/frugalware/roadmap.php
+++ b/frugalware/roadmap.php
@@ -47,11 +47,11 @@ if (file_exists('xml/roadmap.xml'))
else
$xmlfile = $docs_path.'xml/roadmap.xml';
if (!file_exists($xmlfile)) {
-
+
echo(gettext('Sorry, a roadmap has not been written yet.'));
include('footer.php');
die();
-
+
}

$xml = file_get_contents($xmlfile);
@@ -61,7 +61,7 @@ $roadmap = $parser->document->release;

// The parser creates a too long and unuseful object hierarchy so create a better-readable one.
for ( $i = 0; $i < count($roadmap); $i++) {
-
+
$releases[$i][name] = $roadmap[$i]->name[0]->tagData;
$releases[$i][definition] = $roadmap[$i]->definition[0]->tagData;
$releases[$i][version] = $roadmap[$i]->version[0]->tagData;
@@ -70,35 +70,35 @@ for ( $i = 0; $i < count($roadmap); $i++) {
$releases[$i][status] = gettext('done');
else
$releases[$i][status] = gettext('pending');
-
+
for ( $j=0; $j < count($roadmap[$i]->prerelease); $j++ ) {
-
+
$releases[$i][prerelease][$j][preversion] = $roadmap[$i]->prerelease[$j]->preversion[0]->tagData;
$releases[$i][prerelease][$j][predate] = $roadmap[$i]->prerelease[$j]->predate[0]->tagData;
if ($roadmap[$i]->prerelease[$j]->prestatus[0]->tagData == 1)
$releases[$i][prerelease][$j][prestatus] = gettext('done');
else
$releases[$i][prerelease][$j][prestatus] = gettext('pending');
-
+
}
-
+
}

for( $i=0; $i < count($releases); $i++ ) {
-
+
$content = '<table width="100%">
<tr><td width="30%">' . $releases[$i][date] . '</td><td width="30%">' . $releases[$i][version] . '</td><td width="30%"><i>' . $releases[$i][status] . '</i></td></tr>';
-
+
for ( $j=0; $j < count($releases[$i][prerelease]); $j++ ) {
-
+
$content .= '<tr><td>' . $releases[$i][prerelease][$j][predate] . '</td><td>' . $releases[$i][version] . $releases[$i][prerelease][$j][preversion] . '</td><td><i>' . $releases[$i][prerelease][$j][prestatus] . '</i></td></tr>';
-
+
}
-
+
$content .= '</table>';
fwmiddlebox($releases[$i][version] . ' (<acronym title="' . $releases[$i][definition] . '">' . $releases[$i][name] . '</acronym>)',
$content);
-
+
}

include("footer.php");
diff --git a/frugalware/rss.php b/frugalware/rss.php
index f0d2747..ffee0c6 100644
--- a/frugalware/rss.php
+++ b/frugalware/rss.php
@@ -60,14 +60,14 @@ switch($_GET['type'])
for ( $i=0; $i < count($releases); $i++)
{
if ($releases[$i]->status[0]->tagData == '1') {
-
+
$handle['items'][] = array(
"title" => 'frugalware-' . $releases[$i]->version[0]->tagData,
"link" => 'http://www.frugalware.org/news/' . $releases[$i]->newsid[0]->tagData,
"desc" => '',
"pubDate" => date(DATE_RFC2822, strtotime($releases[$i]->date[0]->tagData)),
);
-
+
}
}
break;
diff --git a/frugalware/security.php b/frugalware/security.php
index 9e1fdf4..62bf9bd 100644
--- a/frugalware/security.php
+++ b/frugalware/security.php
@@ -42,11 +42,11 @@ if (file_exists('xml/security.xml'))
else
$xmlfile = $docs_path.'xml/security.xml';
if (!file_exists($xmlfile)) {
-
+
echo(gettext('Sorry, a security file has not been written yet.'));
include('footer.php');
die();
-
+
}

if ( $_GET['id'] != "" )
@@ -65,7 +65,7 @@ $security = $parser->document->fsa;

// The parser creates too long and unuseful object hierarchy, so create a better-readable one.
for ( $i = 0; $i < count($security); $i++) {
-
+
$fsas[$i][id] = $security[$i]->id[0]->tagData;
$fsas[$i][date] = $security[$i]->date[0]->tagData;
$fsas[$i][author] = $security[$i]->author[0]->tagData;
@@ -75,7 +75,7 @@ for ( $i = 0; $i < count($security); $i++) {
$fsas[$i][bts] = $security[$i]->bts[0]->tagData;
$fsas[$i][cve] = $security[$i]->cve[0]->tagData;
$fsas[$i][desc] = $security[$i]->desc[0]->tagData;
-
+
}

// Let's write out details of each FSA in a separate box
@@ -93,7 +93,7 @@ for( $i = 0; $i < count($fsas); $i++ ) {
<tr><td>' . gettext('CVEs') . ':</td><td>' . $fsas[$i][cve] . '</td></tr>
<tr><td>' . gettext('Description') . ':</td><td>' . $fsas[$i][desc] . '</td></tr></table>');
}
-
+
}

include("footer.php");


More information about the Frugalware-git mailing list