From 77deb2bd910e85faaff21344b64dab9338b6f8ae Mon Sep 17 00:00:00 2001
From: pjmattal
Date: Thu, 16 Aug 2007 00:24:33 +0000
Subject: added GPL2 as our license this was an agreeable action to Simo,
Jason, and Paul we are the remaining principal authors
---
COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 339 insertions(+)
create mode 100644 COPYING
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d511905
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+
+ Copyright (C)
+
+ 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
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ 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.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ , 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
--
cgit v1.2.3-70-g09d2
From ac0f6b855e271c7a676cde008f172e26c68c630d Mon Sep 17 00:00:00 2001
From: pjmattal
Date: Thu, 16 Aug 2007 00:24:35 +0000
Subject: Added XSS patches from Joerie de Gram.
---
web/html/index.php | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/web/html/index.php b/web/html/index.php
index 2e697df..eddf3ed 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -14,10 +14,10 @@ $login_error = "";
if (isset($_REQUEST["user"]) || isset($_REQUEST["pass"])) {
# Attempting to log in
#
- if (!isset($_REQUEST['user'])) {
+ if (!isset($_REQUEST["user"])) {
$login_error = __("You must supply a username.");
}
- if (!isset($_REQUEST['pass'])) {
+ if (!isset($_REQUEST["pass"])) {
$login_error = __("You must supply a password.");
}
if (!$login_error) {
@@ -33,12 +33,12 @@ if (isset($_REQUEST["user"]) || isset($_REQUEST["pass"])) {
$result = db_query($q, $dbh);
if (!$result) {
$login_error = __("Error looking up username, %s.",
- array($_REQUEST["user"]));
+ array(htmlspecialchars($_REQUEST["user"])));
} else {
$row = mysql_fetch_row($result);
if (empty($row)) {
$login_error = __("Incorrect password for username, %s.",
- array($_REQUEST["user"]));
+ array(htmlspecialchars($_REQUEST["user"])));
} elseif ($row[1]) {
$login_error = __("Your account has been suspended.");
}
@@ -223,12 +223,12 @@ $safe_count = $row[0];
$user = username_from_sid($_COOKIE["AURSID"]);
if (!empty($user)) {
- $q = "SELECT count(*) FROM Packages,PackageLocations,Users WHERE Packages.MaintainerUID = Users.ID AND Packages.LocationID = PackageLocations.ID AND PackageLocations.Location = 'unsupported' AND Users.Username='$user'";
+ $q = "SELECT count(*) FROM Packages,PackageLocations,Users WHERE Packages.MaintainerUID = Users.ID AND Packages.LocationID = PackageLocations.ID AND PackageLocations.Location = 'unsupported' AND Users.Username='".mysql_real_escape_string($user)."'";
$result = db_query($q, $dbh);
$row = mysql_fetch_row($result);
$maintainer_unsupported_count = $row[0];
- $q = "SELECT count(*) FROM Packages,Users WHERE Packages.OutOfDate = 1 AND Packages.MaintainerUID = Users.ID AND Users.Username='$user'";
+ $q = "SELECT count(*) FROM Packages,Users WHERE Packages.OutOfDate = 1 AND Packages.MaintainerUID = Users.ID AND Users.Username='".mysql_real_escape_string($user)."'";
$result = db_query($q, $dbh);
$row = mysql_fetch_row($result);
$flagged_outdated = $row[0];
@@ -253,7 +253,7 @@ if (!empty($user)) {
$atype = account_from_sid($_COOKIE["AURSID"]);
if ($atype == 'Trusted User') {
- $q = "SELECT count(*) FROM Packages,PackageLocations,Users WHERE Packages.MaintainerUID = Users.ID AND Packages.LocationID = PackageLocations.ID AND PackageLocations.Location = 'community' AND Users.Username='$user'";
+ $q = "SELECT count(*) FROM Packages,PackageLocations,Users WHERE Packages.MaintainerUID = Users.ID AND Packages.LocationID = PackageLocations.ID AND PackageLocations.Location = 'community' AND Users.Username='".mysql_real_escape_string($user)."'";
$result = db_query($q, $dbh);
$row = mysql_fetch_row($result);
$maintainer_community_count = $row[0];
@@ -278,7 +278,7 @@ if (!empty($user)) {
print "
";
print "
";
if ($atype == 'Trusted User') {
- $q = "SELECT count(*) FROM Packages,Users WHERE Packages.Safe = 1 AND Packages.VerifiedBy = Users.ID AND Users.Username='$user'";
+ $q = "SELECT count(*) FROM Packages,Users WHERE Packages.Safe = 1 AND Packages.VerifiedBy = Users.ID AND Users.Username='".mysql_real_escape_string($user)."'";
$result = db_query($q, $dbh);
$row = mysql_fetch_row($result);
$flagged_safe = $row[0];
@@ -287,7 +287,7 @@ if (!empty($user)) {
}
else
{
- $q = "SELECT count(*) FROM Packages,Users WHERE Packages.Safe = 1 AND Packages.MaintainerUID = Users.ID AND Users.Username='$user'";
+ $q = "SELECT count(*) FROM Packages,Users WHERE Packages.Safe = 1 AND Packages.MaintainerUID = Users.ID AND Users.Username='".mysql_real_escape_string($user)."'";
$result = db_query($q, $dbh);
$row = mysql_fetch_row($result);
$flagged_safe = $row[0];
--
cgit v1.2.3-70-g09d2
From 1e9b3e2db08a02a877e06c00a9320e6493bbaf80 Mon Sep 17 00:00:00 2001
From: pjmattal
Date: Thu, 16 Aug 2007 00:24:37 +0000
Subject: committed old schema change from old version
---
support/schema/aur-schema.sql | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support/schema/aur-schema.sql b/support/schema/aur-schema.sql
index 6c601f1..7e3bf2d 100644
--- a/support/schema/aur-schema.sql
+++ b/support/schema/aur-schema.sql
@@ -106,7 +106,7 @@ INSERT INTO PackageLocations (Location) VALUES ('unstable');
--
CREATE TABLE Packages (
ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
- Name CHAR(32) NOT NULL,
+ Name CHAR(64) NOT NULL,
Version CHAR(32) NOT NULL DEFAULT '',
CategoryID TINYINT UNSIGNED NOT NULL DEFAULT 1,
Description CHAR(255) NOT NULL DEFAULT "An Arch Package",
--
cgit v1.2.3-70-g09d2
From fe84915465ac941356f50cc07925e3fd42615955 Mon Sep 17 00:00:00 2001
From: pjmattal
Date: Thu, 16 Aug 2007 00:24:43 +0000
Subject: added language for version 1.3.1
---
VERSIONS.txt | 1 +
web/html/index.php | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/VERSIONS.txt b/VERSIONS.txt
index f991a52..9b598fc 100644
--- a/VERSIONS.txt
+++ b/VERSIONS.txt
@@ -17,3 +17,4 @@ Version 1.2.8 = Revision 273 (01/04/05)
Version 1.2.9 = Revision 281 (06/09/06)
Version 1.2.10 = Revision 299 (08/09/06)
Version 1.3.0 = Revision 332 (02/22/07)
+Version 1.3.1 = Revision 360 (09/19/07)
diff --git a/web/html/index.php b/web/html/index.php
index eddf3ed..56c52a2 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -359,6 +359,6 @@ print "
\n";
print "\n";
# End Table 1
-html_footer("Version 1.3.0 \$Id$");
+html_footer("Version 1.3.1 \$Id$");
# vim: ts=2 sw=2 noet ft=php
?>
--
cgit v1.2.3-70-g09d2
From 14df0d4b8d95f4c0240c0bd98c6ce9b74706e3ca Mon Sep 17 00:00:00 2001
From: swiergot
Date: Thu, 16 Aug 2007 00:25:04 +0000
Subject: - Applied a patch from Loui to fix session removal. - Replaced all
occurences of mysql_escape_string() with mysql_real_escape_string().
---
web/html/account.php | 2 +-
web/html/index.php | 4 ++--
web/html/logout.php | 4 ++--
web/html/pkgedit.php | 2 +-
web/html/pkgsubmit.php | 46 +++++++++++++++++++++++-----------------------
web/lib/acctfuncs.inc | 36 ++++++++++++++++++------------------
web/lib/aur.inc | 22 +++++++++++-----------
web/lib/pkgfuncs.inc | 26 +++++++++++++-------------
8 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/web/html/account.php b/web/html/account.php
index eeb1e40..fba90dd 100644
--- a/web/html/account.php
+++ b/web/html/account.php
@@ -106,7 +106,7 @@ if (isset($_COOKIE["AURSID"])) {
$q.= "WHERE AccountTypes.ID = Users.AccountTypeID ";
$q.= "AND Users.ID = Sessions.UsersID ";
$q.= "AND Sessions.SessionID = '";
- $q.= mysql_escape_string($_COOKIE["AURSID"])."'";
+ $q.= mysql_real_escape_string($_COOKIE["AURSID"])."'";
$result = db_query($q, $dbh);
if (!mysql_num_rows($result)) {
print __("Could not retrieve information for the specified user.");
diff --git a/web/html/index.php b/web/html/index.php
index 56c52a2..3915483 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -28,8 +28,8 @@ if (isset($_REQUEST["user"]) || isset($_REQUEST["pass"])) {
$_REQUEST["pass"] = md5($_REQUEST["pass"]);
$dbh = db_connect();
$q = "SELECT ID, Suspended FROM Users ";
- $q.= "WHERE Username = '" . mysql_escape_string($_REQUEST["user"]) . "' ";
- $q.= "AND Passwd = '" . mysql_escape_string($_REQUEST["pass"]) . "'";
+ $q.= "WHERE Username = '" . mysql_real_escape_string($_REQUEST["user"]) . "' ";
+ $q.= "AND Passwd = '" . mysql_real_escape_string($_REQUEST["pass"]) . "'";
$result = db_query($q, $dbh);
if (!$result) {
$login_error = __("Error looking up username, %s.",
diff --git a/web/html/logout.php b/web/html/logout.php
index dac7831..be4027f 100644
--- a/web/html/logout.php
+++ b/web/html/logout.php
@@ -11,9 +11,9 @@ set_lang(); # this sets up the visitor's language
# sending any HTML output.
#
if (isset($_COOKIE["AURSID"])) {
- $q = "DELETE FROM Sessions WHERE SessionID = '";
- $q.= mysql_escape_string($_COOKIE["AURSID"]) . "'";
$dbh = db_connect();
+ $q = "DELETE FROM Sessions WHERE SessionID = '";
+ $q.= mysql_real_escape_string($_COOKIE["AURSID"]) . "'";
db_query($q, $dbh);
setcookie("AURSID", "", time() - (60*60*24*30), "/");
setcookie("AURLANG", "", time() - (60*60*24*30), "/");
diff --git a/web/html/pkgedit.php b/web/html/pkgedit.php
index bb19144..36befbb 100644
--- a/web/html/pkgedit.php
+++ b/web/html/pkgedit.php
@@ -73,7 +73,7 @@ if ($_REQUEST["add_Comment"]) {
$q = "INSERT INTO PackageComments ";
$q.= "(PackageID, UsersID, Comments, CommentTS) VALUES (";
$q.= intval($_REQUEST["ID"]).", ".uid_from_sid($_COOKIE["AURSID"]) . ", ";
- $q.= "'".mysql_escape_string($_REQUEST["comment"])."', ";
+ $q.= "'".mysql_real_escape_string($_REQUEST["comment"])."', ";
$q.= "UNIX_TIMESTAMP())";
db_query($q, $dbh);
print __("Comment has been added.")."
\n";
diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php
index 9f55e54..59b4183 100644
--- a/web/html/pkgsubmit.php
+++ b/web/html/pkgsubmit.php
@@ -374,7 +374,7 @@ if ($_COOKIE["AURSID"]) {
# purged.
#
$q = "SELECT * FROM Packages ";
- $q.= "WHERE Name = '".mysql_escape_string($new_pkgbuild['pkgname'])."'";
+ $q.= "WHERE Name = '".mysql_real_escape_string($new_pkgbuild['pkgname'])."'";
$result = db_query($q, $dbh);
$pdata = mysql_fetch_assoc($result);
@@ -402,13 +402,13 @@ if ($_COOKIE["AURSID"]) {
} else {
$q.="ModifiedTS = UNIX_TIMESTAMP(), ";
}
- $q.="Name='".mysql_escape_string($new_pkgbuild['pkgname'])."', ";
- $q.="Version='".mysql_escape_string($new_pkgbuild['pkgver'])."-".
- mysql_escape_string($new_pkgbuild['pkgrel'])."',";
- $q.="CategoryID=".mysql_escape_string($_REQUEST['category']).", ";
- $q.="License='".mysql_escape_string($new_pkgbuild['license'])."', ";
- $q.="Description='".mysql_escape_string($new_pkgbuild['pkgdesc'])."', ";
- $q.="URL='".mysql_escape_string($new_pkgbuild['url'])."', ";
+ $q.="Name='".mysql_real_escape_string($new_pkgbuild['pkgname'])."', ";
+ $q.="Version='".mysql_real_escape_string($new_pkgbuild['pkgver'])."-".
+ mysql_real_escape_string($new_pkgbuild['pkgrel'])."',";
+ $q.="CategoryID=".mysql_real_escape_string($_REQUEST['category']).", ";
+ $q.="License='".mysql_real_escape_string($new_pkgbuild['license'])."', ";
+ $q.="Description='".mysql_real_escape_string($new_pkgbuild['pkgdesc'])."', ";
+ $q.="URL='".mysql_real_escape_string($new_pkgbuild['url'])."', ";
$q.="LocationID=2, ";
if (account_from_sid($_COOKIE["AURSID"]) == "Trusted User" || account_from_sid($_COOKIE["AURSID"]) == "Developer") {
$q.="Safe=1, VerifiedBy=".uid_from_sid($_COOKIE["AURSID"]).", ";
@@ -416,9 +416,9 @@ if ($_COOKIE["AURSID"]) {
$q.="Safe=0, ";
}
$fspath=$INCOMING_DIR.$pkg_name."/".$_FILES["pfile"]["name"];
- $q.="FSPath='".mysql_escape_string($fspath)."', ";
+ $q.="FSPath='".mysql_real_escape_string($fspath)."', ";
$urlpath=$URL_DIR.$pkg_name."/".$_FILES["pfile"]["name"];
- $q.="URLPath='".mysql_escape_string($urlpath)."' ";
+ $q.="URLPath='".mysql_real_escape_string($urlpath)."' ";
$q.="WHERE ID = " . $pdata["ID"];
$result = db_query($q, $dbh);
@@ -461,7 +461,7 @@ if ($_COOKIE["AURSID"]) {
$sources = explode(" ", $new_pkgbuild['source']);
while (list($k, $v) = each($sources)) {
$q = "INSERT INTO PackageSources (PackageID, Source) VALUES (";
- $q .= $pdata["ID"].", '".mysql_escape_string($v)."')";
+ $q .= $pdata["ID"].", '".mysql_real_escape_string($v)."')";
db_query($q, $dbh);
}
@@ -470,7 +470,7 @@ if ($_COOKIE["AURSID"]) {
$q = "INSERT INTO PackageComments ";
$q.= "(PackageID, UsersID, Comments, CommentTS) VALUES (";
$q.= $pdata["ID"] . ", " . uid_from_sid($_COOKIE['AURSID']);
- $q.= ", '" . mysql_escape_string($_REQUEST["comments"]);
+ $q.= ", '" . mysql_real_escape_string($_REQUEST["comments"]);
$q.= "', UNIX_TIMESTAMP())";
db_query($q);
@@ -484,13 +484,13 @@ if ($_COOKIE["AURSID"]) {
}
$q.= " SubmittedTS, SubmitterUID, MaintainerUID, FSPath, URLPath) ";
$q.= "VALUES ('";
- $q.= mysql_escape_string($new_pkgbuild['pkgname'])."', '";
- $q.= mysql_escape_string($new_pkgbuild['license'])."', '";
- $q.= mysql_escape_string($new_pkgbuild['pkgver'])."-".
- mysql_escape_string($new_pkgbuild['pkgrel'])."', ";
- $q.= mysql_escape_string($_REQUEST['category']).", '";
- $q.= mysql_escape_string($new_pkgbuild['pkgdesc'])."', '";
- $q.= mysql_escape_string($new_pkgbuild['url']);
+ $q.= mysql_real_escape_string($new_pkgbuild['pkgname'])."', '";
+ $q.= mysql_real_escape_string($new_pkgbuild['license'])."', '";
+ $q.= mysql_real_escape_string($new_pkgbuild['pkgver'])."-".
+ mysql_real_escape_string($new_pkgbuild['pkgrel'])."', ";
+ $q.= mysql_real_escape_string($_REQUEST['category']).", '";
+ $q.= mysql_real_escape_string($new_pkgbuild['pkgdesc'])."', '";
+ $q.= mysql_real_escape_string($new_pkgbuild['url']);
$q.= "', 2, ";
if (account_from_sid($_COOKIE["AURSID"]) == "Trusted User" || account_from_sid($_COOKIE["AURSID"]) == "Developer") {
$q.= "1, ".uid_from_sid($_COOKIE["AURSID"]).", ";
@@ -499,9 +499,9 @@ if ($_COOKIE["AURSID"]) {
$q.= uid_from_sid($_COOKIE["AURSID"]).", ";
$q.= uid_from_sid($_COOKIE["AURSID"]).", '";
$fspath=$INCOMING_DIR.$pkg_name."/".$_FILES["pfile"]["name"];
- $q.= mysql_escape_string($fspath)."', '";
+ $q.= mysql_real_escape_string($fspath)."', '";
$urlpath=$URL_DIR.$pkg_name."/".$_FILES["pfile"]["name"];
- $q.= mysql_escape_string($urlpath)."')";
+ $q.= mysql_real_escape_string($urlpath)."')";
$result = db_query($q, $dbh);
# print $result . " ";
@@ -539,7 +539,7 @@ if ($_COOKIE["AURSID"]) {
$sources = explode(" ", $new_pkgbuild['source']);
while (list($k, $v) = each($sources)) {
$q = "INSERT INTO PackageSources (PackageID, Source) VALUES (";
- $q .= $packageID.", '".mysql_escape_string($v)."')";
+ $q .= $packageID.", '".mysql_real_escape_string($v)."')";
db_query($q, $dbh);
}
@@ -548,7 +548,7 @@ if ($_COOKIE["AURSID"]) {
$q = "INSERT INTO PackageComments ";
$q.= "(PackageID, UsersID, Comments, CommentTS) VALUES (";
$q.= $packageID . ", " . uid_from_sid($_COOKIE["AURSID"]) . ", '";
- $q.= mysql_escape_string($_REQUEST["comments"]);
+ $q.= mysql_real_escape_string($_REQUEST["comments"]);
$q.= "', UNIX_TIMESTAMP())";
db_query($q, $dbh);
}
diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc
index fe8aefb..fa6df45 100644
--- a/web/lib/acctfuncs.inc
+++ b/web/lib/acctfuncs.inc
@@ -206,7 +206,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
# NOTE: a race condition exists here if we care...
#
$q = "SELECT COUNT(*) AS CNT FROM Users ";
- $q.= "WHERE Username = '".mysql_escape_string($U)."'";
+ $q.= "WHERE Username = '".mysql_real_escape_string($U)."'";
if ($TYPE == "edit") {
$q.= " AND ID != ".intval($UID);
}
@@ -224,7 +224,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
# NOTE: a race condition exists here if we care...
#
$q = "SELECT COUNT(*) AS CNT FROM Users ";
- $q.= "WHERE Email = '".mysql_escape_string($E)."'";
+ $q.= "WHERE Email = '".mysql_real_escape_string($E)."'";
if ($TYPE == "edit") {
$q.= " AND ID != ".intval($UID);
}
@@ -250,12 +250,12 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
$P = md5($P);
$q = "INSERT INTO Users (AccountTypeID, Suspended, Username, Email, ";
$q.= "Passwd, RealName, LangPreference, IRCNick, NewPkgNotify) ";
- $q.= "VALUES (1, 0, '".mysql_escape_string($U)."'";
- $q.= ", '".mysql_escape_string($E)."'";
- $q.= ", '".mysql_escape_string($P)."'";
- $q.= ", '".mysql_escape_string($R)."'";
- $q.= ", '".mysql_escape_string($L)."'";
- $q.= ", '".mysql_escape_string($I)."'";
+ $q.= "VALUES (1, 0, '".mysql_real_escape_string($U)."'";
+ $q.= ", '".mysql_real_escape_string($E)."'";
+ $q.= ", '".mysql_real_escape_string($P)."'";
+ $q.= ", '".mysql_real_escape_string($R)."'";
+ $q.= ", '".mysql_real_escape_string($L)."'";
+ $q.= ", '".mysql_real_escape_string($I)."'";
if ($N) {
$q.= ", 1)";
} else {
@@ -281,7 +281,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
#md5 hash the password
$q = "UPDATE Users SET ";
- $q.= "Username = '".mysql_escape_string($U)."'";
+ $q.= "Username = '".mysql_real_escape_string($U)."'";
if ($T) {
$q.= ", AccountTypeID = ".intval($T);
}
@@ -290,13 +290,13 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="",
} else {
$q.= ", Suspended = 0";
}
- $q.= ", Email = '".mysql_escape_string($E)."'";
+ $q.= ", Email = '".mysql_real_escape_string($E)."'";
if ($P) {
- $q.= ", Passwd = '".mysql_escape_string(md5($P))."'";
+ $q.= ", Passwd = '".mysql_real_escape_string(md5($P))."'";
}
- $q.= ", RealName = '".mysql_escape_string($R)."'";
- $q.= ", LangPreference = '".mysql_escape_string($L)."'";
- $q.= ", IRCNick = '".mysql_escape_string($I)."'";
+ $q.= ", RealName = '".mysql_real_escape_string($R)."'";
+ $q.= ", LangPreference = '".mysql_real_escape_string($L)."'";
+ $q.= ", IRCNick = '".mysql_real_escape_string($I)."'";
$q.= ", NewPkgNotify = ";
if ($N) {
$q.= "1 ";
@@ -435,19 +435,19 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="",
$search_vars[] = "S";
}
if ($U) {
- $q.= "AND Username LIKE '%".mysql_escape_string($U)."%' ";
+ $q.= "AND Username LIKE '%".mysql_real_escape_string($U)."%' ";
$search_vars[] = "U";
}
if ($E) {
- $q.= "AND Email LIKE '%".mysql_escape_string($E)."%' ";
+ $q.= "AND Email LIKE '%".mysql_real_escape_string($E)."%' ";
$search_vars[] = "E";
}
if ($R) {
- $q.= "AND RealName LIKE '%".mysql_escape_string($R)."%' ";
+ $q.= "AND RealName LIKE '%".mysql_real_escape_string($R)."%' ";
$search_vars[] = "R";
}
if ($I) {
- $q.= "AND IRCNick LIKE '%".mysql_escape_string($I)."%' ";
+ $q.= "AND IRCNick LIKE '%".mysql_real_escape_string($I)."%' ";
$search_vars[] = "I";
}
switch ($SB) {
diff --git a/web/lib/aur.inc b/web/lib/aur.inc
index 4614631..063f903 100644
--- a/web/lib/aur.inc
+++ b/web/lib/aur.inc
@@ -93,7 +93,7 @@ function check_sid() {
#
$dbh = db_connect();
$q = "SELECT LastUpdateTS, UNIX_TIMESTAMP() FROM Sessions ";
- $q.= "WHERE SessionID = '" . mysql_escape_string($_COOKIE["AURSID"]) . "'";
+ $q.= "WHERE SessionID = '" . mysql_real_escape_string($_COOKIE["AURSID"]) . "'";
$result = db_query($q, $dbh);
if (!$result) {
# Invalid SessionID - hacker alert!
@@ -118,7 +118,7 @@ function check_sid() {
# the main page where they can log in again.
#
$q = "DELETE FROM Sessions WHERE SessionID = '";
- $q.= mysql_escape_string($_COOKIE["AURSID"]) . "'";
+ $q.= mysql_real_escape_string($_COOKIE["AURSID"]) . "'";
db_query($q, $dbh);
setcookie("AURSID", "", time() - (60*60*24*30), "/");
@@ -129,7 +129,7 @@ function check_sid() {
# and update the idle timestamp
#
$q = "UPDATE Sessions SET LastUpdateTS = UNIX_TIMESTAMP() ";
- $q.= "WHERE SessionID = '".mysql_escape_string($_COOKIE["AURSID"])."'";
+ $q.= "WHERE SessionID = '".mysql_real_escape_string($_COOKIE["AURSID"])."'";
db_query($q, $dbh);
}
}
@@ -172,7 +172,7 @@ function username_from_id($id="") {
return "";
}
$dbh = db_connect();
- $q = "SELECT Username FROM Users WHERE ID = " . mysql_escape_string($id);
+ $q = "SELECT Username FROM Users WHERE ID = " . mysql_real_escape_string($id);
$result = db_query($q, $dbh);
if (!$result) {
return "None";
@@ -193,7 +193,7 @@ function username_from_sid($sid="") {
$q = "SELECT Username ";
$q.= "FROM Users, Sessions ";
$q.= "WHERE Users.ID = Sessions.UsersID ";
- $q.= "AND Sessions.SessionID = '" . mysql_escape_string($sid) . "'";
+ $q.= "AND Sessions.SessionID = '" . mysql_real_escape_string($sid) . "'";
$result = db_query($q, $dbh);
if (!$result) {
return "";
@@ -213,7 +213,7 @@ function email_from_sid($sid="") {
$q = "SELECT Email ";
$q.= "FROM Users, Sessions ";
$q.= "WHERE Users.ID = Sessions.UsersID ";
- $q.= "AND Sessions.SessionID = '" . mysql_escape_string($sid) . "'";
+ $q.= "AND Sessions.SessionID = '" . mysql_real_escape_string($sid) . "'";
$result = db_query($q, $dbh);
if (!$result) {
return "";
@@ -235,7 +235,7 @@ function account_from_sid($sid="") {
$q.= "FROM Users, AccountTypes, Sessions ";
$q.= "WHERE Users.ID = Sessions.UsersID ";
$q.= "AND AccountTypes.ID = Users.AccountTypeID ";
- $q.= "AND Sessions.SessionID = '" . mysql_escape_string($sid) . "'";
+ $q.= "AND Sessions.SessionID = '" . mysql_real_escape_string($sid) . "'";
$result = db_query($q, $dbh);
if (!$result) {
return "";
@@ -255,7 +255,7 @@ function uid_from_sid($sid="") {
$q = "SELECT Users.ID ";
$q.= "FROM Users, Sessions ";
$q.= "WHERE Users.ID = Sessions.UsersID ";
- $q.= "AND Sessions.SessionID = '" . mysql_escape_string($sid) . "'";
+ $q.= "AND Sessions.SessionID = '" . mysql_real_escape_string($sid) . "'";
$result = db_query($q, $dbh);
if (!$result) {
return 0;
@@ -329,7 +329,7 @@ function set_lang() {
$q = "SELECT LangPreference FROM Users, Sessions ";
$q.= "WHERE Users.ID = Sessions.UsersID ";
$q.= "AND Sessions.SessionID = '";
- $q.= mysql_escape_string($_COOKIE["AURSID"])."'";
+ $q.= mysql_real_escape_string($_COOKIE["AURSID"])."'";
$result = db_query($q, $dbh);
if (!$result) {
$LANG = "en";
@@ -491,7 +491,7 @@ function can_overwrite_pkg($name="", $sid="") {
if (!$name || !$sid) {return 0;}
$dbh = db_connect();
$q = "SELECT SubmitterUID, MaintainerUID, AURMaintainerUID ";
- $q.= "FROM Packages WHERE Name = '".mysql_escape_string($name)."'";
+ $q.= "FROM Packages WHERE Name = '".mysql_real_escape_string($name)."'";
$result = db_query($q, $dbh);
if (!$result) {return 0;}
$row = mysql_fetch_row($result);
@@ -561,7 +561,7 @@ function uid_from_username($username="")
return "";
}
$dbh = db_connect();
- $q = "SELECT ID FROM Users WHERE Username = '".mysql_escape_string($username)
+ $q = "SELECT ID FROM Users WHERE Username = '".mysql_real_escape_string($username)
."'";
$result = db_query($q, $dbh);
if (!$result) {
diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc
index de2f16c..d1da9bc 100644
--- a/web/lib/pkgfuncs.inc
+++ b/web/lib/pkgfuncs.inc
@@ -125,7 +125,7 @@ function package_exists($name="") {
if (!$name) {return NULL;}
$dbh = db_connect();
$q = "SELECT ID FROM Packages ";
- $q.= "WHERE Name = '".mysql_escape_string($name)."' ";
+ $q.= "WHERE Name = '".mysql_real_escape_string($name)."' ";
$q.= "AND DummyPkg = 0";
$result = db_query($q, $dbh);
if (!$result) {return NULL;}
@@ -141,7 +141,7 @@ function package_dependencies($pkgid=0) {
$dbh = db_connect();
$q = "SELECT DepPkgID, Name, DummyPkg, DepCondition FROM PackageDepends, Packages ";
$q.= "WHERE PackageDepends.DepPkgID = Packages.ID ";
- $q.= "AND PackageDepends.PackageID = ".mysql_escape_string($pkgid);
+ $q.= "AND PackageDepends.PackageID = ".mysql_real_escape_string($pkgid);
$q.= " ORDER BY Name";
$result = db_query($q, $dbh);
if (!$result) {return array();}
@@ -161,14 +161,14 @@ function create_dummy($pname="", $sid="") {
if (!$uid) {return NULL;}
$dbh = db_connect();
$q = "SELECT ID FROM Packages WHERE Name = '";
- $q.= mysql_escape_string($pname)."'";
+ $q.= mysql_real_escape_string($pname)."'";
$result = db_query($q, $dbh);
if (!mysql_num_rows($result)) {
# Insert the dummy
#
$q = "INSERT INTO Packages (Name, Description, URL, SubmittedTS, ";
$q.= "SubmitterUID, DummyPkg) VALUES ('";
- $q.= mysql_escape_string($pname)."', 'A dummy package', '/#', ";
+ $q.= mysql_real_escape_string($pname)."', 'A dummy package', '/#', ";
$q.= "UNIX_TIMESTAMP(), ".$uid.", 1)";
$result = db_query($q, $dbh);
if (!$result) {
@@ -193,7 +193,7 @@ function package_comments($pkgid=0) {
$q = "SELECT PackageComments.ID, UserName, UsersID, Comments, CommentTS ";
$q.= "FROM PackageComments, Users ";
$q.= "WHERE PackageComments.UsersID = Users.ID";
- $q.= " AND PackageID = ".mysql_escape_string($pkgid);
+ $q.= " AND PackageID = ".mysql_real_escape_string($pkgid);
$q.= " AND DelUsersID = 0"; # only display non-deleted comments
$q.= " ORDER BY CommentTS DESC";
$result = db_query($q, $dbh);
@@ -212,7 +212,7 @@ function package_sources($pkgid=0) {
if ($pkgid) {
$dbh = db_connect();
$q = "SELECT Source FROM PackageSources ";
- $q.= "WHERE PackageID = ".mysql_escape_string($pkgid);
+ $q.= "WHERE PackageID = ".mysql_real_escape_string($pkgid);
$q.= " ORDER BY Source";
$result = db_query($q, $dbh);
if (!$result) {return array();}
@@ -234,7 +234,7 @@ function pkgvotes_from_sid($sid="") {
$q.= "FROM PackageVotes, Users, Sessions ";
$q.= "WHERE Users.ID = Sessions.UsersID ";
$q.= "AND Users.ID = PackageVotes.UsersID ";
- $q.= "AND Sessions.SessionID = '".mysql_escape_string($sid)."'";
+ $q.= "AND Sessions.SessionID = '".mysql_real_escape_string($sid)."'";
$result = db_query($q, $dbh);
if ($result) {
while ($row = mysql_fetch_row($result)) {
@@ -901,10 +901,10 @@ function pkg_search_page($SID="") {
#search by maintainer
if ($_REQUEST["SeB"] == "m"){
if (!$has_where) {
- $q.= "WHERE Username = '".mysql_escape_string($K)."' ";
+ $q.= "WHERE Username = '".mysql_real_escape_string($K)."' ";
$has_where = 1;
} else {
- $q.= "AND Username = '".mysql_escape_string($K)."' ";
+ $q.= "AND Username = '".mysql_real_escape_string($K)."' ";
}
} elseif ($_REQUEST["SeB"] == "s") {
if (!$has_where) {
@@ -916,12 +916,12 @@ function pkg_search_page($SID="") {
# the default behaivior, query the name/description
} else {
if (!$has_where) {
- $q.= "WHERE (Name LIKE '%".mysql_escape_string($K)."%' OR ";
- $q.= "Description LIKE '%".mysql_escape_string($K)."%') ";
+ $q.= "WHERE (Name LIKE '%".mysql_real_escape_string($K)."%' OR ";
+ $q.= "Description LIKE '%".mysql_real_escape_string($K)."%') ";
$has_where = 1;
} else {
- $q.= "AND (Name LIKE '%".mysql_escape_string($K)."%' OR ";
- $q.= "Description LIKE '%".mysql_escape_string($K)."%') ";
+ $q.= "AND (Name LIKE '%".mysql_real_escape_string($K)."%' OR ";
+ $q.= "Description LIKE '%".mysql_real_escape_string($K)."%') ";
}
}
}
--
cgit v1.2.3-70-g09d2
From 10f3445394f3994673b296a0e68a1caefade35e6 Mon Sep 17 00:00:00 2001
From: eliott
Date: Wed, 15 Aug 2007 21:01:54 -0700
Subject: Convert to
diff --git a/web/lang/ca/acctfuncs_po.inc b/web/lang/ca/acctfuncs_po.inc
index 81c2ee2..6770506 100644
--- a/web/lang/ca/acctfuncs_po.inc
+++ b/web/lang/ca/acctfuncs_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ca/aur_po.inc b/web/lang/ca/aur_po.inc
index 2b86971..2396b8b 100644
--- a/web/lang/ca/aur_po.inc
+++ b/web/lang/ca/aur_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ca/common_po.inc b/web/lang/ca/common_po.inc
index 81a7b58..150a61f 100644
--- a/web/lang/ca/common_po.inc
+++ b/web/lang/ca/common_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ca/hacker_po.inc b/web/lang/ca/hacker_po.inc
index 42bccb2..9be6019 100644
--- a/web/lang/ca/hacker_po.inc
+++ b/web/lang/ca/hacker_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ca/index_po.inc b/web/lang/ca/index_po.inc
index 60d976e..cd930a2 100644
--- a/web/lang/ca/index_po.inc
+++ b/web/lang/ca/index_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ca/logout_po.inc b/web/lang/ca/logout_po.inc
index b3901d3..b542de8 100644
--- a/web/lang/ca/logout_po.inc
+++ b/web/lang/ca/logout_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ca/pkgedit_po.inc b/web/lang/ca/pkgedit_po.inc
index fee271a..9de39a5 100644
--- a/web/lang/ca/pkgedit_po.inc
+++ b/web/lang/ca/pkgedit_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ca/pkgfuncs_po.inc b/web/lang/ca/pkgfuncs_po.inc
index a4fbdc3..c005ba6 100644
--- a/web/lang/ca/pkgfuncs_po.inc
+++ b/web/lang/ca/pkgfuncs_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ca/search_po.inc b/web/lang/ca/search_po.inc
index 9b58f9a..83641cc 100644
--- a/web/lang/ca/search_po.inc
+++ b/web/lang/ca/search_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ca/submit_po.inc b/web/lang/ca/submit_po.inc
index 5605a03..664b3e7 100644
--- a/web/lang/ca/submit_po.inc
+++ b/web/lang/ca/submit_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ca/template_po.inc b/web/lang/ca/template_po.inc
index 3bf261e..5ea5ee6 100644
--- a/web/lang/ca/template_po.inc
+++ b/web/lang/ca/template_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ca/test_po.inc b/web/lang/ca/test_po.inc
index 9d1105d..3f5ddad 100644
--- a/web/lang/ca/test_po.inc
+++ b/web/lang/ca/test_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ca/timeout_po.inc b/web/lang/ca/timeout_po.inc
index e815b2f..b5ea0b9 100644
--- a/web/lang/ca/timeout_po.inc
+++ b/web/lang/ca/timeout_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/common_po.inc b/web/lang/common_po.inc
index c9c371c..f4752ca 100644
--- a/web/lang/common_po.inc
+++ b/web/lang/common_po.inc
@@ -1,4 +1,4 @@
-
+, Matthias Gorissen , Lukas Kropatschek, Niclas Pfeifer
diff --git a/web/lang/de/acctfuncs_po.inc b/web/lang/de/acctfuncs_po.inc
index 763458c..e73fb74 100644
--- a/web/lang/de/acctfuncs_po.inc
+++ b/web/lang/de/acctfuncs_po.inc
@@ -1,4 +1,4 @@
-
+, Matthias Gorissen , Lukas Kropatschek, Niclas Pfeifer
diff --git a/web/lang/de/aur_po.inc b/web/lang/de/aur_po.inc
index df01f0a..32e6b95 100644
--- a/web/lang/de/aur_po.inc
+++ b/web/lang/de/aur_po.inc
@@ -1,4 +1,4 @@
-
+, Matthias Gorissen , Lukas Kropatschek, Niclas Pfeifer
diff --git a/web/lang/de/common_po.inc b/web/lang/de/common_po.inc
index fee9fc5..91faa2e 100644
--- a/web/lang/de/common_po.inc
+++ b/web/lang/de/common_po.inc
@@ -1,4 +1,4 @@
-
+, Matthias Gorissen , Lukas Kropatschek, Niclas Pfeifer
diff --git a/web/lang/de/hacker_po.inc b/web/lang/de/hacker_po.inc
index e16e311..e8298fa 100644
--- a/web/lang/de/hacker_po.inc
+++ b/web/lang/de/hacker_po.inc
@@ -1,4 +1,4 @@
-
+, Matthias Gorissen , Lukas Kropatschek, Niclas Pfeifer
diff --git a/web/lang/de/index_po.inc b/web/lang/de/index_po.inc
index 5075604..bbc4159 100644
--- a/web/lang/de/index_po.inc
+++ b/web/lang/de/index_po.inc
@@ -1,4 +1,4 @@
-
+, Matthias Gorissen , Lukas Kropatschek, Niclas Pfeifer
diff --git a/web/lang/de/logout_po.inc b/web/lang/de/logout_po.inc
index 12bb803..8a0ed37 100644
--- a/web/lang/de/logout_po.inc
+++ b/web/lang/de/logout_po.inc
@@ -1,4 +1,4 @@
-
+, Matthias Gorissen , Lukas Kropatschek, Niclas Pfeifer
diff --git a/web/lang/de/pkgedit_po.inc b/web/lang/de/pkgedit_po.inc
index 7efaf20..3d775c4 100644
--- a/web/lang/de/pkgedit_po.inc
+++ b/web/lang/de/pkgedit_po.inc
@@ -1,4 +1,4 @@
-
+, Matthias Gorissen , Lukas Kropatschek, Niclas Pfeifer
diff --git a/web/lang/de/pkgfuncs_po.inc b/web/lang/de/pkgfuncs_po.inc
index 3b7106e..78b2c86 100644
--- a/web/lang/de/pkgfuncs_po.inc
+++ b/web/lang/de/pkgfuncs_po.inc
@@ -1,4 +1,4 @@
-
+, Matthias Gorissen , Lukas Kropatschek, Niclas Pfeifer
diff --git a/web/lang/de/search_po.inc b/web/lang/de/search_po.inc
index 53b5cc1..dce8c72 100644
--- a/web/lang/de/search_po.inc
+++ b/web/lang/de/search_po.inc
@@ -1,4 +1,4 @@
-
+, Matthias Gorissen , Lukas Kropatschek, Niclas Pfeifer
diff --git a/web/lang/de/submit_po.inc b/web/lang/de/submit_po.inc
index a265ad4..e8355a0 100644
--- a/web/lang/de/submit_po.inc
+++ b/web/lang/de/submit_po.inc
@@ -1,4 +1,4 @@
-
+, Matthias Gorissen , Lukas Kropatschek, Niclas Pfeifer
diff --git a/web/lang/de/template_po.inc b/web/lang/de/template_po.inc
index 725d323..024d767 100644
--- a/web/lang/de/template_po.inc
+++ b/web/lang/de/template_po.inc
@@ -1,4 +1,4 @@
-
+, Matthias Gorissen , Lukas Kropatschek, Niclas Pfeifer
diff --git a/web/lang/de/test_po.inc b/web/lang/de/test_po.inc
index a9468c9..a957522 100644
--- a/web/lang/de/test_po.inc
+++ b/web/lang/de/test_po.inc
@@ -1,4 +1,4 @@
-
+, Matthias Gorissen , Lukas Kropatschek, Niclas Pfeifer
diff --git a/web/lang/de/timeout_po.inc b/web/lang/de/timeout_po.inc
index e7f51d6..49cb9bd 100644
--- a/web/lang/de/timeout_po.inc
+++ b/web/lang/de/timeout_po.inc
@@ -1,4 +1,4 @@
-
+, Matthias Gorissen , Lukas Kropatschek, Niclas Pfeifer
diff --git a/web/lang/en/account_po.inc b/web/lang/en/account_po.inc
index 3fec4eb..bb0af6d 100644
--- a/web/lang/en/account_po.inc
+++ b/web/lang/en/account_po.inc
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
+?>
diff --git a/web/lang/en/logout_po.inc b/web/lang/en/logout_po.inc
index 6ebdac5..cf91aa2 100644
--- a/web/lang/en/logout_po.inc
+++ b/web/lang/en/logout_po.inc
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
+?>
diff --git a/web/lang/en/pkgfuncs_po.inc b/web/lang/en/pkgfuncs_po.inc
index 592b696..220cdb3 100644
--- a/web/lang/en/pkgfuncs_po.inc
+++ b/web/lang/en/pkgfuncs_po.inc
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
+?>
diff --git a/web/lang/es/account_po.inc b/web/lang/es/account_po.inc
index e50b9d3..825274c 100644
--- a/web/lang/es/account_po.inc
+++ b/web/lang/es/account_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/es/acctfuncs_po.inc b/web/lang/es/acctfuncs_po.inc
index 4454a10..706740a 100644
--- a/web/lang/es/acctfuncs_po.inc
+++ b/web/lang/es/acctfuncs_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/es/aur_po.inc b/web/lang/es/aur_po.inc
index cbc3784..4410b1e 100644
--- a/web/lang/es/aur_po.inc
+++ b/web/lang/es/aur_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/es/common_po.inc b/web/lang/es/common_po.inc
index 8fb4540..68dad39 100644
--- a/web/lang/es/common_po.inc
+++ b/web/lang/es/common_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/es/hacker_po.inc b/web/lang/es/hacker_po.inc
index f75ca7b..046cbf5 100644
--- a/web/lang/es/hacker_po.inc
+++ b/web/lang/es/hacker_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/es/index_po.inc b/web/lang/es/index_po.inc
index a59744f..77e5ee9 100644
--- a/web/lang/es/index_po.inc
+++ b/web/lang/es/index_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/es/logout_po.inc b/web/lang/es/logout_po.inc
index c0f9b83..5bd5860 100644
--- a/web/lang/es/logout_po.inc
+++ b/web/lang/es/logout_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/es/pkgedit_po.inc b/web/lang/es/pkgedit_po.inc
index e944bbf..9787d3a 100644
--- a/web/lang/es/pkgedit_po.inc
+++ b/web/lang/es/pkgedit_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/es/pkgfuncs_po.inc b/web/lang/es/pkgfuncs_po.inc
index e1ab015..22e24e0 100644
--- a/web/lang/es/pkgfuncs_po.inc
+++ b/web/lang/es/pkgfuncs_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/es/search_po.inc b/web/lang/es/search_po.inc
index e54768a..d8dd957 100644
--- a/web/lang/es/search_po.inc
+++ b/web/lang/es/search_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/es/submit_po.inc b/web/lang/es/submit_po.inc
index 10eaa0e..53d728b 100644
--- a/web/lang/es/submit_po.inc
+++ b/web/lang/es/submit_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/es/template_po.inc b/web/lang/es/template_po.inc
index 6bd9b69..21e45fc 100644
--- a/web/lang/es/template_po.inc
+++ b/web/lang/es/template_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/es/test_po.inc b/web/lang/es/test_po.inc
index ba5b678..83bc7dc 100644
--- a/web/lang/es/test_po.inc
+++ b/web/lang/es/test_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/es/timeout_po.inc b/web/lang/es/timeout_po.inc
index 92b620e..3ed6d21 100644
--- a/web/lang/es/timeout_po.inc
+++ b/web/lang/es/timeout_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/fr/account_po.inc b/web/lang/fr/account_po.inc
index 43803c1..dea18d1 100644
--- a/web/lang/fr/account_po.inc
+++ b/web/lang/fr/account_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/fr/acctfuncs_po.inc b/web/lang/fr/acctfuncs_po.inc
index de47a4a..0c10757 100644
--- a/web/lang/fr/acctfuncs_po.inc
+++ b/web/lang/fr/acctfuncs_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/fr/aur_po.inc b/web/lang/fr/aur_po.inc
index f0f3d3c..491a1a6 100644
--- a/web/lang/fr/aur_po.inc
+++ b/web/lang/fr/aur_po.inc
@@ -1,4 +1,4 @@
-
+
@@ -21,4 +21,4 @@ $_t["fr"]["Home"] = "Accueil";
$_t["fr"]["Packages"] = "Paquets";
-?>
\ No newline at end of file
+?>
diff --git a/web/lang/fr/common_po.inc b/web/lang/fr/common_po.inc
index bf40bc1..e3b54a8 100644
--- a/web/lang/fr/common_po.inc
+++ b/web/lang/fr/common_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/fr/hacker_po.inc b/web/lang/fr/hacker_po.inc
index 0af11c1..d348e6a 100644
--- a/web/lang/fr/hacker_po.inc
+++ b/web/lang/fr/hacker_po.inc
@@ -1,4 +1,4 @@
-
+
@@ -9,4 +9,4 @@ $_t["fr"]["Your session id is invalid."] = "Votre identifiant de session n'est p
$_t["fr"]["If this problem persists, please contact the site administrator."] = "Si ce problème persiste, contactez s'il vous plaît l'administrateur du site.";
-?>
\ No newline at end of file
+?>
diff --git a/web/lang/fr/index_po.inc b/web/lang/fr/index_po.inc
index 0a9dbf0..7604978 100644
--- a/web/lang/fr/index_po.inc
+++ b/web/lang/fr/index_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/fr/pkgedit_po.inc b/web/lang/fr/pkgedit_po.inc
index 2a5f245..d3c977c 100644
--- a/web/lang/fr/pkgedit_po.inc
+++ b/web/lang/fr/pkgedit_po.inc
@@ -1,4 +1,4 @@
-
+
@@ -27,4 +27,4 @@ $_t["fr"]["Comment has been added."] = "Le commentaire a été ajouté.";
$_t["fr"]["Select new category"] = "Sélectionnez une nouvelle catégorie";
-?>
\ No newline at end of file
+?>
diff --git a/web/lang/fr/pkgfuncs_po.inc b/web/lang/fr/pkgfuncs_po.inc
index 8fad7aa..03ee808 100644
--- a/web/lang/fr/pkgfuncs_po.inc
+++ b/web/lang/fr/pkgfuncs_po.inc
@@ -1,4 +1,4 @@
-
+
@@ -159,4 +159,4 @@ $_t["fr"]["Unsafe"] = "Non sûr";
$_t["fr"]["unknown"] = "inconnu";
-?>
\ No newline at end of file
+?>
diff --git a/web/lang/fr/search_po.inc b/web/lang/fr/search_po.inc
index ec7f3cd..d3a0e26 100644
--- a/web/lang/fr/search_po.inc
+++ b/web/lang/fr/search_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/fr/submit_po.inc b/web/lang/fr/submit_po.inc
index 99e41d8..f348bd2 100644
--- a/web/lang/fr/submit_po.inc
+++ b/web/lang/fr/submit_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/fr/template_po.inc b/web/lang/fr/template_po.inc
index 93de467..c9a0466 100644
--- a/web/lang/fr/template_po.inc
+++ b/web/lang/fr/template_po.inc
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@ global $_t;
$_t["fr"]["Hi, this is worth reading!"] = "Salut, ceci vaut la peine d'être lu!";
-?>
\ No newline at end of file
+?>
diff --git a/web/lang/fr/test_po.inc b/web/lang/fr/test_po.inc
index 8089b7c..3a32cb6 100644
--- a/web/lang/fr/test_po.inc
+++ b/web/lang/fr/test_po.inc
@@ -1,4 +1,4 @@
-
+
@@ -13,4 +13,4 @@ $_t["fr"]["Hello, again!"] = "Salut encore!";
$_t["fr"]["My current language tag is: '%s'."] = "Mon choix actuel de langue est: '%s'.";
-?>
\ No newline at end of file
+?>
diff --git a/web/lang/fr/timeout_po.inc b/web/lang/fr/timeout_po.inc
index 77c1c2e..ee18018 100644
--- a/web/lang/fr/timeout_po.inc
+++ b/web/lang/fr/timeout_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/hacker_po.inc b/web/lang/hacker_po.inc
index 8e446a7..6788521 100644
--- a/web/lang/hacker_po.inc
+++ b/web/lang/hacker_po.inc
@@ -1,4 +1,4 @@
-
+ and Pierluigi Picciau
diff --git a/web/lang/it/acctfuncs_po.inc b/web/lang/it/acctfuncs_po.inc
index aaff645..26c4d4d 100644
--- a/web/lang/it/acctfuncs_po.inc
+++ b/web/lang/it/acctfuncs_po.inc
@@ -1,4 +1,4 @@
-
+ and Pierluigi Picciau
diff --git a/web/lang/it/aur_po.inc b/web/lang/it/aur_po.inc
index 4117b4c..87d0ebf 100644
--- a/web/lang/it/aur_po.inc
+++ b/web/lang/it/aur_po.inc
@@ -1,4 +1,4 @@
-
+ and Pierluigi Picciau
diff --git a/web/lang/it/common_po.inc b/web/lang/it/common_po.inc
index defdecf..861ae00 100644
--- a/web/lang/it/common_po.inc
+++ b/web/lang/it/common_po.inc
@@ -1,4 +1,4 @@
-
+ and Pierluigi Picciau
diff --git a/web/lang/it/hacker_po.inc b/web/lang/it/hacker_po.inc
index e0531a1..78c1f58 100644
--- a/web/lang/it/hacker_po.inc
+++ b/web/lang/it/hacker_po.inc
@@ -1,4 +1,4 @@
-
+ and Pierluigi Picciau
diff --git a/web/lang/it/index_po.inc b/web/lang/it/index_po.inc
index f5793b7..cef6e8c 100644
--- a/web/lang/it/index_po.inc
+++ b/web/lang/it/index_po.inc
@@ -1,4 +1,4 @@
-
+ and Pierluigi Picciau
diff --git a/web/lang/it/logout_po.inc b/web/lang/it/logout_po.inc
index a9ec8d8..2075be9 100644
--- a/web/lang/it/logout_po.inc
+++ b/web/lang/it/logout_po.inc
@@ -1,4 +1,4 @@
-
+ and Pierluigi Picciau
diff --git a/web/lang/it/pkgedit_po.inc b/web/lang/it/pkgedit_po.inc
index fdeb6cf..731904a 100644
--- a/web/lang/it/pkgedit_po.inc
+++ b/web/lang/it/pkgedit_po.inc
@@ -1,4 +1,4 @@
-
+ and Pierluigi Picciau
diff --git a/web/lang/it/pkgfuncs_po.inc b/web/lang/it/pkgfuncs_po.inc
index 7cdda1b..b674687 100644
--- a/web/lang/it/pkgfuncs_po.inc
+++ b/web/lang/it/pkgfuncs_po.inc
@@ -1,4 +1,4 @@
-
+ and Pierluigi Picciau
diff --git a/web/lang/it/search_po.inc b/web/lang/it/search_po.inc
index 4acd2e6..0c83ca5 100644
--- a/web/lang/it/search_po.inc
+++ b/web/lang/it/search_po.inc
@@ -1,4 +1,4 @@
-
+ and Pierluigi Picciau
diff --git a/web/lang/it/submit_po.inc b/web/lang/it/submit_po.inc
index 604f019..f2dc8e5 100644
--- a/web/lang/it/submit_po.inc
+++ b/web/lang/it/submit_po.inc
@@ -1,4 +1,4 @@
-
+ and Pierluigi Picciau
diff --git a/web/lang/it/template_po.inc b/web/lang/it/template_po.inc
index 4bde2ee..defe7ac 100644
--- a/web/lang/it/template_po.inc
+++ b/web/lang/it/template_po.inc
@@ -1,4 +1,4 @@
-
+ and Pierluigi Picciau
diff --git a/web/lang/it/test_po.inc b/web/lang/it/test_po.inc
index 26694d9..40be513 100644
--- a/web/lang/it/test_po.inc
+++ b/web/lang/it/test_po.inc
@@ -1,4 +1,4 @@
-
+ and Pierluigi Picciau
diff --git a/web/lang/it/timeout_po.inc b/web/lang/it/timeout_po.inc
index 8071faf..2d52bc8 100644
--- a/web/lang/it/timeout_po.inc
+++ b/web/lang/it/timeout_po.inc
@@ -1,4 +1,4 @@
-
+ and Pierluigi Picciau
diff --git a/web/lang/logout_po.inc b/web/lang/logout_po.inc
index 154f7e2..41adfc8 100644
--- a/web/lang/logout_po.inc
+++ b/web/lang/logout_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/pl/acctfuncs_po.inc b/web/lang/pl/acctfuncs_po.inc
index 1dc6cde..4b94e9d 100644
--- a/web/lang/pl/acctfuncs_po.inc
+++ b/web/lang/pl/acctfuncs_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/pl/aur_po.inc b/web/lang/pl/aur_po.inc
index 86a2762..0cfee72 100644
--- a/web/lang/pl/aur_po.inc
+++ b/web/lang/pl/aur_po.inc
@@ -1,4 +1,4 @@
-
+
@@ -27,4 +27,4 @@ $_t["pl"]["Bugs"] = "Błędy";
$_t["pl"]["My Packages"] = "Moje pakiety";
-?>
\ No newline at end of file
+?>
diff --git a/web/lang/pl/common_po.inc b/web/lang/pl/common_po.inc
index 4ac4c19..6797c39 100644
--- a/web/lang/pl/common_po.inc
+++ b/web/lang/pl/common_po.inc
@@ -1,4 +1,4 @@
-
+
@@ -17,4 +17,4 @@ $_t["pl"]["Less"] = "Poprzednie";
$_t["pl"]["More"] = "Następne";
$_t["pl"]["Username"] = "Użytkownik";
-?>
\ No newline at end of file
+?>
diff --git a/web/lang/pl/hacker_po.inc b/web/lang/pl/hacker_po.inc
index 4cb8781..92c1641 100644
--- a/web/lang/pl/hacker_po.inc
+++ b/web/lang/pl/hacker_po.inc
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@ global $_t;
$_t["pl"]["Your session id is invalid."] = "Twój identyfikator sesji jest nieprawidłowy.";
$_t["pl"]["If this problem persists, please contact the site administrator."] = "Jeżeli ten problem się powtarza, skontaktuj się z administratorem strony.";
-?>
\ No newline at end of file
+?>
diff --git a/web/lang/pl/index_po.inc b/web/lang/pl/index_po.inc
index 6eb6adb..c67215d 100644
--- a/web/lang/pl/index_po.inc
+++ b/web/lang/pl/index_po.inc
@@ -1,4 +1,4 @@
-
+
@@ -68,4 +68,4 @@ $_t["pl"]["Flagged as safe"] = "Oznaczonych jako bezpieczne";
$_t["pl"]["My Statistics"] = "Moje statystyki";
-?>
\ No newline at end of file
+?>
diff --git a/web/lang/pl/logout_po.inc b/web/lang/pl/logout_po.inc
index 1d5326f..5ac7a82 100644
--- a/web/lang/pl/logout_po.inc
+++ b/web/lang/pl/logout_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/pl/pkgedit_po.inc b/web/lang/pl/pkgedit_po.inc
index df8dc79..a506dc2 100644
--- a/web/lang/pl/pkgedit_po.inc
+++ b/web/lang/pl/pkgedit_po.inc
@@ -1,4 +1,4 @@
-
+
@@ -19,4 +19,4 @@ $_t["pl"]["Invalid category ID."] = "Nieprawidłowy identyfikator kategorii.";
$_t["pl"]["Select new category"] = "Wybierz nową kategorię";
$_t["pl"]["You've found a bug if you see this...."] = "Jeżeli to widzisz, to znalazłeś błąd...";
-?>
\ No newline at end of file
+?>
diff --git a/web/lang/pl/pkgfuncs_po.inc b/web/lang/pl/pkgfuncs_po.inc
index 63ccccf..34f8bca 100644
--- a/web/lang/pl/pkgfuncs_po.inc
+++ b/web/lang/pl/pkgfuncs_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/pl/search_po.inc b/web/lang/pl/search_po.inc
index 31838f1..2c4a634 100644
--- a/web/lang/pl/search_po.inc
+++ b/web/lang/pl/search_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/pl/submit_po.inc b/web/lang/pl/submit_po.inc
index 95258a5..bbcb301 100644
--- a/web/lang/pl/submit_po.inc
+++ b/web/lang/pl/submit_po.inc
@@ -1,4 +1,4 @@
-
+
@@ -56,4 +56,4 @@ $_t["pl"]["Missing license variable in PKGBUILD."] = "W pliku PKGBUILD brakuje z
$_t["pl"]["Missing arch variable in PKGBUILD."] = "W pliku PKGBUILD brakuje zmiennej arch.";
-?>
\ No newline at end of file
+?>
diff --git a/web/lang/pl/template_po.inc b/web/lang/pl/template_po.inc
index 6c61d37..266e421 100644
--- a/web/lang/pl/template_po.inc
+++ b/web/lang/pl/template_po.inc
@@ -1,4 +1,4 @@
-
+
@@ -7,4 +7,4 @@ global $_t;
$_t["pl"]["Hi, this is worth reading!"] = "Witaj, warto to przeczytać!";
-?>
\ No newline at end of file
+?>
diff --git a/web/lang/pl/test_po.inc b/web/lang/pl/test_po.inc
index b04cbd7..847a0ab 100644
--- a/web/lang/pl/test_po.inc
+++ b/web/lang/pl/test_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/pl/timeout_po.inc b/web/lang/pl/timeout_po.inc
index 8fbc2a6..867a8ef 100644
--- a/web/lang/pl/timeout_po.inc
+++ b/web/lang/pl/timeout_po.inc
@@ -1,4 +1,4 @@
-
+
@@ -8,4 +8,4 @@ global $_t;
$_t["pl"]["Click on the Home link above to log in."] = "Kliknij na linku Start powyżej aby się zalogować.";
$_t["pl"]["Your session has timed out. You must log in again."] = "Twoja sesja wygasła. Musisz zalogować się ponownie.";
-?>
\ No newline at end of file
+?>
diff --git a/web/lang/pt/account_po.inc b/web/lang/pt/account_po.inc
index da5e8ec..96dd237 100644
--- a/web/lang/pt/account_po.inc
+++ b/web/lang/pt/account_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ru/acctfuncs_po.inc b/web/lang/ru/acctfuncs_po.inc
index 76cac5c..8e02a90 100644
--- a/web/lang/ru/acctfuncs_po.inc
+++ b/web/lang/ru/acctfuncs_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ru/aur_po.inc b/web/lang/ru/aur_po.inc
index 70f1004..d7c6701 100644
--- a/web/lang/ru/aur_po.inc
+++ b/web/lang/ru/aur_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ru/common_po.inc b/web/lang/ru/common_po.inc
index 4d89aba..f5c7607 100644
--- a/web/lang/ru/common_po.inc
+++ b/web/lang/ru/common_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ru/hacker_po.inc b/web/lang/ru/hacker_po.inc
index 43c591a..5a167ca 100644
--- a/web/lang/ru/hacker_po.inc
+++ b/web/lang/ru/hacker_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ru/index_po.inc b/web/lang/ru/index_po.inc
index a42b8e4..653511a 100644
--- a/web/lang/ru/index_po.inc
+++ b/web/lang/ru/index_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ru/logout_po.inc b/web/lang/ru/logout_po.inc
index fcc885c..86d3eaf 100644
--- a/web/lang/ru/logout_po.inc
+++ b/web/lang/ru/logout_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ru/pkgedit_po.inc b/web/lang/ru/pkgedit_po.inc
index cc9e9b9..c2ed68a 100644
--- a/web/lang/ru/pkgedit_po.inc
+++ b/web/lang/ru/pkgedit_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ru/pkgfuncs_po.inc b/web/lang/ru/pkgfuncs_po.inc
index af188ad..c78157e 100644
--- a/web/lang/ru/pkgfuncs_po.inc
+++ b/web/lang/ru/pkgfuncs_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ru/search_po.inc b/web/lang/ru/search_po.inc
index 7462ed1..3dbec13 100644
--- a/web/lang/ru/search_po.inc
+++ b/web/lang/ru/search_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ru/submit_po.inc b/web/lang/ru/submit_po.inc
index 53694fe..02e472a 100644
--- a/web/lang/ru/submit_po.inc
+++ b/web/lang/ru/submit_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ru/template_po.inc b/web/lang/ru/template_po.inc
index 7fb86df..86c3e9b 100644
--- a/web/lang/ru/template_po.inc
+++ b/web/lang/ru/template_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ru/test_po.inc b/web/lang/ru/test_po.inc
index afead61..381abe3 100644
--- a/web/lang/ru/test_po.inc
+++ b/web/lang/ru/test_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/ru/timeout_po.inc b/web/lang/ru/timeout_po.inc
index 3f89977..8dce6bb 100644
--- a/web/lang/ru/timeout_po.inc
+++ b/web/lang/ru/timeout_po.inc
@@ -1,4 +1,4 @@
-
+
diff --git a/web/lang/search_po.inc b/web/lang/search_po.inc
index 32db9da..f9272b9 100644
--- a/web/lang/search_po.inc
+++ b/web/lang/search_po.inc
@@ -1,4 +1,4 @@
-
+
--
cgit v1.2.3-70-g09d2
From 8d11961ee75c5372d3cfd104ee83242127fcffa5 Mon Sep 17 00:00:00 2001
From: Paul Mattal
Date: Sat, 22 Sep 2007 08:06:20 -0400
Subject: Added Italian language patch 20070921 from Giovanni Scafora
---
web/lang/it/account_po.inc | 8 ++++----
web/lang/it/acctfuncs_po.inc | 6 +++---
web/lang/it/index_po.inc | 18 +++++++++---------
web/lang/it/pkgedit_po.inc | 6 +++---
web/lang/it/pkgfuncs_po.inc | 38 +++++++++++++++++++-------------------
web/lang/it/submit_po.inc | 6 +++---
web/lang/it/timeout_po.inc | 4 ++--
7 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/web/lang/it/account_po.inc b/web/lang/it/account_po.inc
index 8c65697..be2aa70 100644
--- a/web/lang/it/account_po.inc
+++ b/web/lang/it/account_po.inc
@@ -5,19 +5,19 @@
include_once("translator.inc");
global $_t;
-$_t["it"]["Use this form to update your account."] = "Utilizzare questo modulo per aggiornare un account.";
+$_t["it"]["Use this form to update your account."] = "Utilizza questo modulo per aggiornare un account.";
-$_t["it"]["Leave the password fields blank to keep your same password."] = "Lasciare vuoti i campi relativi alla password per mantenerla invariata.";
+$_t["it"]["Leave the password fields blank to keep your same password."] = "Lascia vuoti i campi relativi alla password per mantenerla invariata.";
$_t["it"]["You are not allowed to access this area."] = "Non si dispone dei permessi necessari per accedere.";
$_t["it"]["Could not retrieve information for the specified user."] = "Non è stato possibile trovare le informazioni sull'utente specificato.";
-$_t["it"]["Use this form to search existing accounts."] = "Utilizzare questo modulo per cercare account esistenti.";
+$_t["it"]["Use this form to search existing accounts."] = "Utilizza questo modulo per cercare account esistenti.";
$_t["it"]["You do not have permission to edit this account."] = "Non si dispone dei permessi necessari per modificare questo account.";
-$_t["it"]["Use this form to create an account."] = "Utilizzare questo modulo per creare un account.";
+$_t["it"]["Use this form to create an account."] = "Utilizza questo modulo per creare un account.";
$_t["it"]["You must log in to view user information."] = "Bisogna essere autenticati per poter visualizzare le informazioni sull'utente.";
diff --git a/web/lang/it/acctfuncs_po.inc b/web/lang/it/acctfuncs_po.inc
index 26c4d4d..e08d342 100644
--- a/web/lang/it/acctfuncs_po.inc
+++ b/web/lang/it/acctfuncs_po.inc
@@ -47,7 +47,7 @@ $_t["it"]["Last Voted"] = "Ultimo votato";
$_t["it"]["Real Name"] = "Nome reale";
-$_t["it"]["Edit Account"] = "Modificare l'account";
+$_t["it"]["Edit Account"] = "Modifica l'account";
$_t["it"]["Password fields do not match."] = "I campi password non corrispondono.";
@@ -61,11 +61,11 @@ $_t["it"]["No more results to display."] = "Non vi sono ulteriori risultati da v
$_t["it"]["Type"] = "Tipo";
-$_t["it"]["Click on the Home link above to login."] = "Fare clic su Inizio per autenticarsi.";
+$_t["it"]["Click on the Home link above to login."] = "Clicca su Inizio per autenticarti.";
$_t["it"]["Sort by"] = "Ordina per";
-$_t["it"]["Re-type password"] = "Riscrivere la password";
+$_t["it"]["Re-type password"] = "Riscrivi la password";
$_t["it"]["Language is not currently supported."] = "Lingua attualmente non supportata.";
diff --git a/web/lang/it/index_po.inc b/web/lang/it/index_po.inc
index cef6e8c..f316aea 100644
--- a/web/lang/it/index_po.inc
+++ b/web/lang/it/index_po.inc
@@ -5,9 +5,9 @@
include_once("translator.inc");
global $_t;
-$_t["it"]["You must supply a password."] = "E' necessario inserire una password.";
+$_t["it"]["You must supply a password."] = "È necessario inserire una password.";
-$_t["it"]["You must supply a username."] = "E' necessario inserire il nome utente.";
+$_t["it"]["You must supply a username."] = "È necessario inserire il nome utente.";
$_t["it"]["After that, this can be filled in with more meaningful text."] = "Dopotutto, questo potrebbe essere riempito con un messaggio più significativo.";
@@ -27,7 +27,7 @@ $_t["it"]["Error trying to generate session id."] = "Errore durante la generazio
$_t["it"]["For now, it's just a place holder."] = "Per adesso, è solo un segnaposto.";
-$_t["it"]["It's more important to get the login functionality finished."] = "E' più importante avere la funzionalità di autenticazione completata.";
+$_t["it"]["It's more important to get the login functionality finished."] = "È più importante avere la funzionalità di autenticazione completata.";
$_t["it"]["Error looking up username, %s."] = "Errore durante la ricerca del nome utente %s.";
@@ -47,13 +47,13 @@ $_t["it"]["Email discussion about the AUR takes place on the %sTUR Users List%s.
$_t["it"]["Recent Updates"] = "Aggiornamenti recenti";
-$_t["it"]["Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information. Contributed PKGBUILDs must conform to the %hArch Packaging Standards%h otherwise they will be deleted!"] = "Benvenuto in AUR! Per ottenere maggiori informazioni, leggere %hAUR User Guidelines%h e %hAUR TU Guidelines%h. I PKGBUILD inviati devono essere conformi agli %hArch Packaging Standards%h altrimenti saranno cancellati!";
+$_t["it"]["Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information. Contributed PKGBUILDs must conform to the %hArch Packaging Standards%h otherwise they will be deleted!"] = "Benvenuto in AUR! Per ottenere maggiori informazioni, leggi le %hAUR User Guidelines%h e %hAUR TU Guidelines%h. I PKGBUILD inviati devono essere conformi agli %hArch Packaging Standards%h altrimenti saranno cancellati!";
$_t["it"]["Community"] = "Community";
$_t["it"]["Package Counts"] = "Conteggio dei pacchetti";
-$_t["it"]["Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information."] = "Benvenuto in AUR! Per ottenere maggiori informazioni, leggere %hAUR User Guidelines%h e %hAUR TU Guidelines%h.";
+$_t["it"]["Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information."] = "Benvenuto in AUR! Per ottenere maggiori informazioni, leggi le %hAUR User Guidelines%h e %hAUR TU Guidelines%h.";
$_t["it"]["Unsupported"] = "Unsupported";
@@ -69,9 +69,9 @@ $_t["it"]["Packages in unsupported"] = "Pacchetti in unsupported";
$_t["it"]["Packages in [community]"] = "Pacchetti in [community]";
-$_t["it"]["Remember to vote for your favourite packages! The most popular packages are provided as binary packages in [community]."] = "Ricordate di votare i vostri pacchetti preferiti! I pacchetti più votati sono disponibili in [community] come precompilati.";
+$_t["it"]["Remember to vote for your favourite packages! The most popular packages are provided as binary packages in [community]."] = "Ricorda di votare i tuoi pacchetti preferiti! I pacchetti più votati saranno disponibili in [community] come precompilati.";
-$_t["it"]["Remember to vote for your favourite packages!"] = "Ricordate di votare i vostri pacchetti preferiti!";
+$_t["it"]["Remember to vote for your favourite packages!"] = "Ricorda di votare i tuoi pacchetti preferiti!";
$_t["it"]["The most popular packages will be provided as binary packages in [community]."] = "I pacchetti più votati saranno disponibili in [community] come precompilati.";
@@ -85,9 +85,9 @@ $_t["it"]["Out-of-date"] = "Non aggiornati";
$_t["it"]["User Statistics"] = "Statistiche dell'utente";
-$_t["it"]["Flagged as safe by me"] = "Segnato come sicuro da me";
+$_t["it"]["Flagged as safe by me"] = "Pacchetti verificati";
-$_t["it"]["Flagged as safe"] = "Segnato come sicuro";
+$_t["it"]["Flagged as safe"] = "Considerato sicuro";
$_t["it"]["My Statistics"] = "Le mie statistiche";
diff --git a/web/lang/it/pkgedit_po.inc b/web/lang/it/pkgedit_po.inc
index 731904a..9df8ebc 100644
--- a/web/lang/it/pkgedit_po.inc
+++ b/web/lang/it/pkgedit_po.inc
@@ -9,7 +9,7 @@ $_t["it"]["Missing package ID."] = "Manca l'ID del pacchetto.";
$_t["it"]["Invalid category ID."] = "ID della categoria non valido.";
-$_t["it"]["Enter your comment below."] = "Inserire un commento qui sotto.";
+$_t["it"]["Enter your comment below."] = "Inserisci un commento qui sotto.";
$_t["it"]["You are not allowed to delete this comment."] = "Non è possibile cancellare questo commento.";
@@ -23,8 +23,8 @@ $_t["it"]["Comment has been deleted."] = "Il commento è stato cancellato.";
$_t["it"]["You've found a bug if you see this...."] = "Se vedi questo, hai appena trovato un bug....";
-$_t["it"]["Comment has been added."] = "Il commento è stato aggiunto.";
+$_t["it"]["Comment has been added."] = "Il commento è stato inserito.";
-$_t["it"]["Select new category"] = "Selezionare una nuova categoria";
+$_t["it"]["Select new category"] = "Seleziona una nuova categoria";
?>
\ No newline at end of file
diff --git a/web/lang/it/pkgfuncs_po.inc b/web/lang/it/pkgfuncs_po.inc
index b674687..58668c3 100644
--- a/web/lang/it/pkgfuncs_po.inc
+++ b/web/lang/it/pkgfuncs_po.inc
@@ -13,15 +13,15 @@ $_t["it"]["Comment by: %h%s%h on %h%s%h"] = "Commento lasciato da: %h%s%h il %h%
$_t["it"]["Location"] = "Posizione";
-$_t["it"]["Delete comment"] = "Eliminare il commento";
+$_t["it"]["Delete comment"] = "Elimina il commento";
$_t["it"]["Go"] = "Cerca";
-$_t["it"]["Unflag Out-of-date"] = "Segnare come aggiornato";
+$_t["it"]["Unflag Out-of-date"] = "Pacchetto aggiornato";
-$_t["it"]["Go back to %hpackage details view%h."] = "Ritornare alla %hvista dettagli del pacchetto%h.";
+$_t["it"]["Go back to %hpackage details view%h."] = "Ritorna alla %hvista dettagli del pacchetto%h.";
-$_t["it"]["Error retrieving package details."] = "Errore nel recupero dei dettagli del pacchetto.";
+$_t["it"]["Error retrieving package details."] = "Si è verificato un errore durante il recupero dei dettagli del pacchetto.";
$_t["it"]["Description"] = "Descrizione";
@@ -31,13 +31,13 @@ $_t["it"]["Keywords"] = "Parola chiave";
$_t["it"]["Dependencies"] = "Dipendenze";
-$_t["it"]["Disown Packages"] = "Abbandonare i pacchetti";
+$_t["it"]["Disown Packages"] = "Abbandona i pacchetti";
$_t["it"]["Package details could not be found."] = "Impossibile trovare i dettagli del pacchetto.";
$_t["it"]["Package Details"] = "Dettagli del pacchetto";
-$_t["it"]["Error retrieving package list."] = "Errore nel recupero della lista dei pacchetti.";
+$_t["it"]["Error retrieving package list."] = "Si è verificato un errore durante il recupero della lista dei pacchetti.";
$_t["it"]["Files"] = "File";
@@ -47,7 +47,7 @@ $_t["it"]["Name"] = "Nome";
$_t["it"]["Per page"] = "Per pagina";
-$_t["it"]["Go back to %hsearch results%h."] = "Ritornare ai %hrisultati della ricerca%h.";
+$_t["it"]["Go back to %hsearch results%h."] = "Ritorna ai %hrisultati della ricerca%h.";
$_t["it"]["No packages matched your search criteria."] = "Nessun pacchetto corrisponde ai criteri della ricerca.";
@@ -55,21 +55,21 @@ $_t["it"]["O%hrphan"] = "O%hrfano";
$_t["it"]["orphan"] = "orfano";
-$_t["it"]["Un-Vote"] = "Rimuovere il voto";
+$_t["it"]["Un-Vote"] = "Rimuovi il voto";
-$_t["it"]["change category"] = "Cambiare categoria";
+$_t["it"]["change category"] = "Cambia categoria";
-$_t["it"]["UnNotify"] = "Togliere la notifica";
+$_t["it"]["UnNotify"] = "Togli la notifica";
-$_t["it"]["Delete Packages"] = "Eliminare i pacchetti";
+$_t["it"]["Delete Packages"] = "Elimina i pacchetti";
$_t["it"]["Maintainer"] = "Responsabile";
-$_t["it"]["Add Comment"] = "Aggiungere un commento";
+$_t["it"]["Add Comment"] = "Aggiungi un commento";
$_t["it"]["Tarball"] = "Archivio";
-$_t["it"]["Flag Out-of-date"] = "Segnare come non aggiornato";
+$_t["it"]["Flag Out-of-date"] = "Pacchetto non aggiornato";
$_t["it"]["Manage"] = "Organizza";
@@ -87,7 +87,7 @@ $_t["it"]["O%hut-of-Date"] = "N%hon aggiornato";
$_t["it"]["Vote"] = "Vota";
-$_t["it"]["Adopt Packages"] = "Adottare i pacchetti";
+$_t["it"]["Adopt Packages"] = "Adotta i pacchetti";
$_t["it"]["Yes"] = "Si";
@@ -101,7 +101,7 @@ $_t["it"]["Voted"] = "Votato";
$_t["it"]["No New Comment Notification"] = "Nessuna notifica di nuovo commento";
-$_t["it"]["New Comment Notification"] = "Notifica di nuovo commento";
+$_t["it"]["New Comment Notification"] = "Notifica di un nuovo commento";
$_t["it"]["Comments"] = "Commenti";
@@ -109,13 +109,13 @@ $_t["it"]["The above files have been verified (by %s) and are safe to use."] = "
$_t["it"]["Be careful! The above files may contain malicious code that can damage your system."] = "Attenzione! I file potrebbero contenere codice pericoloso in grado di danneggiare il vostro sistema.";
-$_t["it"]["Flag Safe"] = "Segnare come sicuro";
+$_t["it"]["Flag Safe"] = "Pacchetto sicuro";
-$_t["it"]["Flag Package Safe To Use"] = "Segnare il pacchetto come sicuro da utilizzare";
+$_t["it"]["Flag Package Safe To Use"] = "Pacchetto sicuro";
-$_t["it"]["Unflag Safe"] = "Segnare come non sicuro";
+$_t["it"]["Unflag Safe"] = "Pacchetto non sicuro";
-$_t["it"]["Unflag Package Safe To Use"] = "Segnare il pacchetto come non sicuro da utilizzare";
+$_t["it"]["Unflag Package Safe To Use"] = "Pacchetto non sicuro";
$_t["it"]["Safe"] = "Sicuri";
diff --git a/web/lang/it/submit_po.inc b/web/lang/it/submit_po.inc
index f2dc8e5..372c60d 100644
--- a/web/lang/it/submit_po.inc
+++ b/web/lang/it/submit_po.inc
@@ -21,7 +21,7 @@ $_t["it"]["You must create an account before you can upload packages."] = "Bisog
$_t["it"]["Package upload successful."] = "Invio completato con successo.";
-$_t["it"]["Overwrite existing package?"] = "Sovrascrivere il pacchetto esistente?";
+$_t["it"]["Overwrite existing package?"] = "Sovrascrivi il pacchetto esistente?";
$_t["it"]["You did not specify a package name."] = "Non è stato specificato un nome per il pacchetto.";
@@ -61,9 +61,9 @@ $_t["it"]["Error - No file uploaded"] = "Errore, nessun file inviato.";
$_t["it"]["You are not allowed to overwrite the %h%s%h package."] = "Non si dispone dei permessi per poter sovrascrivere il pacchetto %h%s%h.";
-$_t["it"]["Select Location"] = "Selezionare la posizione";
+$_t["it"]["Select Location"] = "Seleziona la posizione";
-$_t["it"]["Select Category"] = "Selezionare la categoria";
+$_t["it"]["Select Category"] = "Seleziona la categoria";
$_t["it"]["Comment"] = "Commento";
diff --git a/web/lang/it/timeout_po.inc b/web/lang/it/timeout_po.inc
index 2d52bc8..7b25780 100644
--- a/web/lang/it/timeout_po.inc
+++ b/web/lang/it/timeout_po.inc
@@ -5,8 +5,8 @@
include_once("translator.inc");
global $_t;
-$_t["it"]["Click on the Home link above to log in."] = "Fare clic su Inizio per autenticarsi.";
+$_t["it"]["Click on the Home link above to log in."] = "Clicca su Inizio per autenticarti.";
-$_t["it"]["Your session has timed out. You must log in again."] = "La sessione è scaduta. Autenticarsi di nuovo.";
+$_t["it"]["Your session has timed out. You must log in again."] = "La sessione è scaduta, autenticati di nuovo.";
?>
\ No newline at end of file
--
cgit v1.2.3-70-g09d2
From ac8291a5dcbfe9edf53d627be1139fe52708d4ce Mon Sep 17 00:00:00 2001
From: eliott
Date: Sat, 22 Sep 2007 12:09:00 -0700
Subject: Changes to bring the main arch site theme to the aur.
---
.gitignore | 3 +
web/html/css/arch.css | 449 +++++++++++++++++++++++++++++++++++++++++
web/html/images/logo.png | Bin 0 -> 15730 bytes
web/html/images/tab.png | Bin 0 -> 107 bytes
web/html/images/title.png | Bin 0 -> 6465 bytes
web/html/images/title_back.png | Bin 0 -> 168 bytes
web/lang/en/pkgfuncs_po.inc | 4 +-
web/lib/aur.inc | 166 +++++++--------
web/lib/pkgfuncs.inc | 360 ++++++++++++++-------------------
9 files changed, 676 insertions(+), 306 deletions(-)
create mode 100644 .gitignore
create mode 100644 web/html/css/arch.css
create mode 100644 web/html/images/logo.png
create mode 100644 web/html/images/tab.png
create mode 100644 web/html/images/title.png
create mode 100644 web/html/images/title_back.png
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9e572ce
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.swp
+web/lib/config.inc
+
diff --git a/web/html/css/arch.css b/web/html/css/arch.css
new file mode 100644
index 0000000..7d8f41f
--- /dev/null
+++ b/web/html/css/arch.css
@@ -0,0 +1,449 @@
+* { margin: 0; padding: 0; }
+* ul { padding: 20px; }
+body {
+ background: url("/images/title_back.png") repeat-x top left #fbf8f1;
+ padding: 0 30px;
+ color: #46494d;
+ font-family: Bitstream Vera Sans, Lucida Grande, Arial, sans-serif;
+}
+/*
+ * Divs
+ */
+#head_container {
+ height: 175px;
+}
+#main_nav ul {
+ list-style: none;
+ padding-right: 10px;
+ padding-top: 48px;
+}
+#main_nav ul li {
+ display: block;
+ float: right;
+ width: 67px;
+ height: 20px;
+ padding-top: 2px;
+ margin-left: 3px;
+ background: url("/images/tab.png") repeat-x bottom left #fbf8f1;
+ text-align: center;
+ font-size: 13px;
+}
+#main_nav ul li[class~=selected] {
+ background: #fbf8f1;
+}
+#main_nav ul li a {
+ text-decoration: none;
+}
+#sub_nav ul {
+ list-style: none;
+ padding-right: 10px;
+ padding-top: 5px;
+}
+#sub_nav ul li {
+ display: block;
+ float: right;
+ width: 87px;
+ height: 20px;
+ padding-top: 2px;
+ margin-left: 3px;
+ background: url("/images/tab.png") repeat-x bottom left #fbf8f1;
+ border: 1px solid #cccccc;
+ text-align: center;
+ font-size: 13px;
+}
+#sub_nav ul li[class~=selected] {
+ background: #fbf8f1;
+}
+#sub_nav ul li a {
+ text-decoration: none;
+}
+
+#lang_sub {
+ display: block;
+ position: absolute;
+ top: 0;
+ right: 20px;
+}
+#lang_sub ul {
+ list-style: none;
+}
+#lang_sub ul a {
+ text-decoration: none;
+ color: #000000;
+}
+#lang_sub ul a:hover {
+ color: #FF0000;
+}
+#lang_sub ul li {
+ display: block;
+ float: right;
+ margin-left: 6px;
+ font-size: 10px;
+ text-align: center;
+}
+
+#title {
+ height: 140px;
+ float: left;
+}
+#updates {
+ font-size: small;
+ /*position: relative;*/
+ top: 0px;
+ background: #f6efe0;
+ border: 1px solid #eee4cb;
+ padding: 10px;
+}
+#ads {
+ float: right;
+}
+#logo {
+ float: left;
+ width: 140px;
+ height: 140px;
+}
+#titleimg {
+ float: left;
+}
+#devlist {
+ width: 80%;
+ padding: 10px;
+ margin-left: auto;
+ margin-right: auto;
+ border-top: 1px dashed black;
+ border-bottom: 1px dashed black;
+ text-align: center;
+}
+.clear {
+ clear: both;
+ margin: 0;
+ padding: 0;
+}
+.right {
+ float: right;
+ width: 320px;
+ padding: 0 10px 10px 0;
+}
+.left {
+ padding: 10px;
+ margin: 0 360px 0 0;
+}
+.left p {
+ text-align: justify;
+ padding-bottom: 10px;
+}
+.box {
+ padding: 10px;
+ background: #e1e3e6;
+ border: 1px solid #8faecd;
+}
+.greybox {
+ padding: 10px;
+ background: #f6efe0;
+ border: 1px solid #eee4cb;
+}
+div.listing {
+ padding-right: 10px;
+ border-left: 1px solid #387cbf;
+}
+.error {
+ color: #dd0000;
+ font-size: small;
+}
+.foot {
+ clear: both;
+ text-align: center;
+ font-size: 0.8em;
+}
+#search {
+ float: right;
+ position: relative;
+ top: -2em;
+ font-size: 0.8em;
+}
+#search input {
+ background: #f6efe0;
+ border: 1px solid #eee4cb;
+}
+.smalltext {
+ text-align: right;
+ font-size: x-small;
+}
+/*
+ * Headers
+ */
+h2 {
+ margin: 20px 0 10px 0;
+}
+h2.title {
+ border-bottom: 1px solid #46494d;
+}
+h3 {
+ margin-bottom: 10px;
+}
+h3.title {
+ text-align: right;
+ border-bottom: 1px solid #46494d;
+}
+h4.title {
+ text-align: left;
+ border-bottom: 1px solid #46494d;
+}
+h4.news {
+ border-bottom: 1px dotted #8faecd;
+}
+div.listing h4 {
+ background: #d1d3d6;
+ border-top: 1px double #387cbf;
+ padding: 3px;
+}
+/*
+ * Paragraphs, Anchors, Images
+ */
+p {
+ padding-bottom: 20px;
+}
+p.news {
+ text-align: left;
+ font-size: small;
+}
+a {
+ color: #35526f;
+ font-weight: bold;
+ text-decoration: underline;
+}
+.news a {
+ text-decoration: none;
+}
+#about {
+ position: relative;
+ top: -9px;
+}
+#about a {
+ text-decoration: none;
+}
+.community a {
+ text-decoration: none;
+}
+ol {
+ padding-left: 45px;
+}
+ul.small {
+ list-style: none;
+ font-size: x-small;
+}
+ul.links {
+ list-style: none;
+ font-size: small;
+ padding: 0px 0px 20px 20px;
+}
+img {
+ border: none;
+}
+hr {
+ border: none;
+ border-top: 1px solid #46494d;
+}
+.greybox input, button, textarea, select {
+ background: #e1e3e6;
+ border: 1px solid #8faecd;
+}
+.box input, button {
+ padding: 2px;
+ background: #c1c3f6;
+ font-size: x-small;
+ border: 1px solid #8faecd;
+}
+button#f_trigger {
+ background: #e1e3e6;
+}
+/*
+ * Table stuff
+ */
+table.center {
+ margin-left: auto;
+ margin-right: auto;
+}
+table#releases {
+ font-size: small;
+ width: 100%;
+}
+table#releases td {
+ padding-right: 20px;
+}
+table#repolinks {
+ font-size: small;
+ width: 100%;
+}
+table#repolinks td {
+ text-align: right;
+}
+table#repolinks th {
+ text-align: left;
+}
+table#art {
+ text-align: center;
+ margin-left: auto;
+ margin-right: auto;
+}
+.devpic {
+ vertical-align: top;
+ padding-right: 15px;
+}
+table.deventry {
+ padding-bottom: 25px;
+}
+.deventry th {
+ text-align: left;
+ vertical-align: top;
+ white-space: nowrap;
+}
+.deventry td {
+ border-bottom: 1px solid black;
+ width: 100%;
+}
+table.results {
+ padding: 0px;
+ border-collapse: collapse;
+}
+.results th {
+ background: #e1e3e6;
+ border-bottom: 1px solid #46494d;
+ border-top: 1px solid #46494d;
+ text-align: left;
+ padding-top: 0px;
+ padding-bottom: 0px;
+ padding-right: 5px;
+}
+.results th>a {
+ text-decoration: none;
+ color: #46494d;
+}
+.results td {
+ padding-right: 5px;
+ vertical-align: top;
+ font-size: 0.8em;
+}
+.listing th {
+ background: #d1d3d6;
+ border-left: 1px solid #387cbf;
+ font-size: small;
+ vertical-align: top;
+ text-align: left;
+ padding: 2px;
+}
+.listing td {
+ font-size: small;
+ padding: 2px;
+}
+blockquote.code {
+ background: #c1c3f6;
+ border: 1px solid #8faecd;
+ margin-left: auto;
+ margin-right: auto;
+ white-space: nowrap;
+ padding: 5px;
+ font-family: Courier, Courier New, Monospace;
+}
+/*
+ * Wiki Styles
+ */
+h1.wiki {
+ border-bottom: 1px solid #46494d;
+}
+div.wikifoot_l {
+ font-size: x-small;
+ text-align: left;
+ padding-top: 25px;
+}
+div.wikifoot_r {
+ font-size: x-small;
+ text-align: right;
+ float: right;
+ padding-top: 25px;
+}
+.wikibody {
+ padding-top: 15px;
+}
+.wikibody ol {
+ padding-left: 28px;
+ padding-top: 0px;
+}
+.wikibody ul {
+ padding-left: 25px;
+ padding-top: 0px;
+}
+.wikibody dd {
+ padding-left: 30px;
+}
+.wikibody pre code {
+ background: #c1c3f6;
+ border: 1px solid #8faecd;
+ margin-left: auto;
+ margin-right: auto;
+ white-space: nowrap;
+ padding: 5px;
+ font-family: Courier, Courier New, Monospace;
+}
+.wikibody blockquote {
+ padding-left: 30px;
+}
+.wikibody td {
+ padding: 5px;
+ border: 1px solid black;
+}
+
+/* Used by Django's FormWrappers */
+textarea.vLargeTextField {
+ width: 450px;
+ height: 250px;
+}
+.pkgr2 {
+ background-color: #eee4cb;
+}
+#maincontent {
+ width: 100%;
+ text-align: left;
+}
+#maincontent > table {
+ width: 90%;
+ margin-left: 5%;
+ margin-right: 5%;
+}
+.pkgbox {
+ width: 90%;
+ margin-left: 5%;
+ margin-right: 5%;
+ background-color: #ffffff;
+ border-width: 2px;
+ border-color: #dddddd;
+ border-style: solid;
+ text-align: left;
+ padding: 3px;
+}
+.pkgboxtitle {
+ border-width: 2px;
+ border-style: solid;
+ border-color: #dddddd;
+ border-top-width: 1px;
+ border-top-color: #ffffff;
+ border-left-width: 1px;
+ border-left-color: #ffffff;
+ background-color: #f1f2f4;
+ text-align: right;
+ padding-top: 2px;
+ padding-bottom: 2px;
+ padding-right: 10px;
+}
+.pkgboxbody, .pkgboxbody-comment {
+ padding: 10px;
+}
+.pkgboxbody input {
+ margin-right: 10px;
+}
+
+.pkgboxbody-comment > table {
+ border-collapse: separate;
+ border-spacing: 0 15px;
+}
+
diff --git a/web/html/images/logo.png b/web/html/images/logo.png
new file mode 100644
index 0000000..b2b6d86
Binary files /dev/null and b/web/html/images/logo.png differ
diff --git a/web/html/images/tab.png b/web/html/images/tab.png
new file mode 100644
index 0000000..56d2e61
Binary files /dev/null and b/web/html/images/tab.png differ
diff --git a/web/html/images/title.png b/web/html/images/title.png
new file mode 100644
index 0000000..e16971a
Binary files /dev/null and b/web/html/images/title.png differ
diff --git a/web/html/images/title_back.png b/web/html/images/title_back.png
new file mode 100644
index 0000000..95c98d7
Binary files /dev/null and b/web/html/images/title_back.png differ
diff --git a/web/lang/en/pkgfuncs_po.inc b/web/lang/en/pkgfuncs_po.inc
index 220cdb3..dcd46f4 100644
--- a/web/lang/en/pkgfuncs_po.inc
+++ b/web/lang/en/pkgfuncs_po.inc
@@ -31,7 +31,7 @@ $_t["en"]["Error retrieving package details."] = "Error retrieving package detai
$_t["en"]["Description"] = "Description";
-$_t["en"]["My Packages"] = "My Packages";
+$_t["en"]["My Packages"] = "My Pkgs";
$_t["en"]["Keywords"] = "Keywords";
@@ -151,4 +151,4 @@ $_t["en"]["License"] = "License";
$_t["en"]["unknown"] = "unknown";
-?>
\ No newline at end of file
+?>
diff --git a/web/lib/aur.inc b/web/lib/aur.inc
index cce5384..ce662f7 100644
--- a/web/lib/aur.inc
+++ b/web/lib/aur.inc
@@ -359,100 +359,77 @@ function html_header() {
global $_SERVER;
global $_COOKIE;
global $LANG;
- print "\n";
- print "\n";
- print "\n";
- print "\n";
- print "AUR (".$LANG.")\n";
- print "\n";
- print "\n";
- print "\n";
- print "\n";
- print "\n";
- print "\n";
- print "\n";
- print "
+
+END1;
if ($_COOKIE["AURSID"]) {
- # Only display these items if the visitor is logged in. This should
- # be a safe check because check_sid() has been called prior to
- # html_header().
- #
- print " - ";
- print " ".__("Submit")." ";
+ # This is a usability change, so we can go to My Packages page
+ # with just one click
+ # Added by: dsa
+ echo '
";
if ($row["Safe"]) {
- print "".__("The above files have been verified (by %s) and are safe to use.", array(username_from_id($row["VerifiedBy"])))."
";
+ echo "".__("The above files have been verified (by %s) and are safe to use.", array(username_from_id($row["VerifiedBy"])))."";
} else {
- print "".__("Be careful! The above files may contain malicious code that can damage your system.")."";
- }
+ echo "".__("Be careful! The above files may contain malicious code that can damage your system.")."";
+ }
+ echo "
".__("Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information.", array('', '', '', ''))." ";
print __("Contributed PKGBUILDs must conform to the %hArch Packaging Standards%h otherwise they will be deleted!", array('', ''))."
";
-#print "
".__("If you have feedback about the AUR, please leave it in %hFlyspray%h.", array('', ''))." ";
-#print __("Email discussion about the AUR takes place on the %sTUR Users List%s.", array('', ''))."
";
print "
".__("Remember to vote for your favourite packages!")." ";
print __("The most popular packages will be provided as binary packages in [community].")."
";
-#print "
".__("Though we can't vouch for their contents, we provide a %hlist of user repositories%h for your convenience.", array('', ''))."
";
# MAIN: Top Right
print "
";
@@ -178,9 +178,6 @@ print "
";
print "
";
# End Table 2
-#print "
";
-#print "
\n";
-
# MAIN: Bottom Right
print "
";
print "
";
@@ -357,8 +354,10 @@ print "
";
print " ";
print "\n";
print "\n";
+echo "\n";
# End Table 1
-
+echo " ";
+echo "";
html_footer("Version 1.3.1 \$Id$");
# vim: ts=2 sw=2 noet ft=php
?>
diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php
index 89ecfa4..24aeea5 100644
--- a/web/html/pkgsubmit.php
+++ b/web/html/pkgsubmit.php
@@ -9,7 +9,9 @@ include("config.inc"); # configuration file with dir locations
set_lang(); # this sets up the visitor's language
check_sid(); # see if they're still logged in
html_header(); # print out the HTML header
-print "
\n";
+echo "
\n";
+echo "
".__("Submit")."
\n";
+echo "
\n";
# Debugging
$DBUG = 0;
@@ -665,8 +667,8 @@ if ($_COOKIE["AURSID"]) {
print __("You must create an account before you can upload packages.");
print " \n";
}
-
-print "\n";
+echo "
\n"; - print str_replace("\n", "
\n"; - print "", str_replace('"',""", htmlspecialchars(strip_tags(stripslashes($carr["Comments"]))))); - print "
\n"; + echo str_replace("\n", "
", str_replace('"',""", htmlspecialchars(strip_tags(stripslashes($carr["Comments"]))))); + echo "