From 77deb2bd910e85faaff21344b64dab9338b6f8ae Mon Sep 17 00:00:00 2001 From: pjmattal Date: Thu, 16 Aug 2007 00:24:33 +0000 Subject: [PATCH 01/18] 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 00000000..d511905c --- /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. From ac0f6b855e271c7a676cde008f172e26c68c630d Mon Sep 17 00:00:00 2001 From: pjmattal Date: Thu, 16 Aug 2007 00:24:35 +0000 Subject: [PATCH 02/18] 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 2e697df6..eddf3eda 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]; From 1e9b3e2db08a02a877e06c00a9320e6493bbaf80 Mon Sep 17 00:00:00 2001 From: pjmattal Date: Thu, 16 Aug 2007 00:24:37 +0000 Subject: [PATCH 03/18] 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 6c601f13..7e3bf2d3 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", From fe84915465ac941356f50cc07925e3fd42615955 Mon Sep 17 00:00:00 2001 From: pjmattal Date: Thu, 16 Aug 2007 00:24:43 +0000 Subject: [PATCH 04/18] 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 f991a52b..9b598fc7 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 eddf3eda..56c52a2f 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 ?> From 14df0d4b8d95f4c0240c0bd98c6ce9b74706e3ca Mon Sep 17 00:00:00 2001 From: swiergot Date: Thu, 16 Aug 2007 00:25:04 +0000 Subject: [PATCH 05/18] - 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 eeb1e407..fba90dd6 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 56c52a2f..39154833 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 dac7831b..be4027f7 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 bb19144e..36befbb9 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 9f55e542..59b41837 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 fe8aefbd..fa6df458 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 46146318..063f9037 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 de2f16cc..d1da9bc6 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)."%') "; } } } From 10f3445394f3994673b296a0e68a1caefade35e6 Mon Sep 17 00:00:00 2001 From: eliott Date: Wed, 15 Aug 2007 21:01:54 -0700 Subject: [PATCH 06/18] Convert diff --git a/web/lang/ca/acctfuncs_po.inc b/web/lang/ca/acctfuncs_po.inc index 81c2ee25..67705068 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 2b869719..2396b8bf 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 81a7b587..150a61fe 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 42bccb28..9be6019b 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 60d976e0..cd930a29 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 b3901d32..b542de81 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 fee271af..9de39a58 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 a4fbdc3e..c005ba6b 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 9b58f9a2..83641cc4 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 5605a037..664b3e7a 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 3bf261e8..5ea5ee69 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 9d1105dc..3f5ddadd 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 e815b2fb..b5ea0b9b 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 c9c371c0..f4752ca6 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 763458ce..e73fb74a 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 df01f0a9..32e6b95f 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 fee9fc5f..91faa2e4 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 e16e311b..e8298faf 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 5075604c..bbc4159a 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 12bb8035..8a0ed371 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 7efaf20e..3d775c4f 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 3b7106e9..78b2c861 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 53b5cc14..dce8c725 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 a265ad44..e8355a09 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 725d323c..024d7673 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 a9468c9d..a957522b 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 e7f51d6f..49cb9bda 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 3fec4eb3..bb0af6d1 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 6ebdac57..cf91aa27 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 592b6969..220cdb37 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 e50b9d34..825274c1 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 4454a10a..706740a3 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 cbc37845..4410b1ea 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 8fb45408..68dad396 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 f75ca7b4..046cbf5c 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 a59744ff..77e5ee95 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 c0f9b83d..5bd5860b 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 e944bbfc..9787d3a7 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 e1ab015a..22e24e01 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 e54768a9..d8dd957d 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 10eaa0e9..53d728be 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 6bd9b69e..21e45fce 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 ba5b678a..83bc7dcf 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 92b620e8..3ed6d218 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 43803c15..dea18d1b 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 de47a4a6..0c107571 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 f0f3d3cb..491a1a6c 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 bf40bc1f..e3b54a8a 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 0af11c19..d348e6a4 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 0a9dbf02..7604978d 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 2a5f245a..d3c977c6 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 8fad7aae..03ee808a 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 ec7f3cd5..d3a0e268 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 99e41d82..f348bd2c 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 93de4675..c9a04664 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 8089b7cf..3a32cb63 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 77c1c2e5..ee180183 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 8e446a7e..67885215 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 aaff6458..26c4d4d2 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 4117b4c5..87d0ebf3 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 defdecfa..861ae006 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 e0531a10..78c1f581 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 f5793b74..cef6e8ce 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 a9ec8d88..2075be9d 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 fdeb6cfe..731904ad 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 7cdda1b5..b6746874 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 4acd2e62..0c83ca5c 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 604f019f..f2dc8e54 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 4bde2ee5..defe7ac5 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 26694d9c..40be5138 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 8071faf0..2d52bc88 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 154f7e2a..41adfc8b 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 1dc6cdeb..4b94e9d5 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 86a27628..0cfee727 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 4ac4c19f..6797c394 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 4cb87814..92c16410 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 6eb6adbd..c67215de 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 1d5326fa..5ac7a826 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 df8dc79a..a506dc20 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 63ccccfa..34f8bca5 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 31838f11..2c4a6344 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 95258a5d..bbcb301d 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 6c61d378..266e4212 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 b04cbd7c..847a0abf 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 8fbc2a62..867a8ef1 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 da5e8ec2..96dd2373 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 76cac5c3..8e02a907 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 70f10048..d7c67015 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 4d89abaf..f5c76073 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 43c591a3..5a167ca8 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 a42b8e4f..653511a9 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 fcc885c4..86d3eaf7 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 cc9e9b99..c2ed68ae 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 af188ade..c78157e3 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 7462ed19..3dbec130 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 53694fe9..02e472a6 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 7fb86df8..86c3e9b2 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 afead61c..381abe32 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 3f899770..8dce6bb8 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 32db9dae..f9272b99 100644 --- a/web/lang/search_po.inc +++ b/web/lang/search_po.inc @@ -1,4 +1,4 @@ - From 8d11961ee75c5372d3cfd104ee83242127fcffa5 Mon Sep 17 00:00:00 2001 From: Paul Mattal Date: Sat, 22 Sep 2007 08:06:20 -0400 Subject: [PATCH 07/18] 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 8c656975..be2aa703 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 26c4d4d2..e08d342d 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 cef6e8ce..f316aea5 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 731904ad..9df8ebcc 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 b6746874..58668c31 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 f2dc8e54..372c60d0 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 2d52bc88..7b257801 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 From ac8291a5dcbfe9edf53d627be1139fe52708d4ce Mon Sep 17 00:00:00 2001 From: eliott Date: Sat, 22 Sep 2007 12:09:00 -0700 Subject: [PATCH 08/18] 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 | 164 +++++------- web/lib/pkgfuncs.inc | 358 +++++++++++--------------- 9 files changed, 674 insertions(+), 304 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 00000000..9e572cee --- /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 00000000..7d8f41f3 --- /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 0000000000000000000000000000000000000000..b2b6d863403fecd0fc6459f43bdefefaf1933b4b GIT binary patch literal 15730 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 literal 0 HcmV?d00001 diff --git a/web/html/images/tab.png b/web/html/images/tab.png new file mode 100644 index 0000000000000000000000000000000000000000..56d2e6172a1876ffc6d7ef7bdf0d0ba6615e4807 GIT binary patch literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^j6lr7!3HG#Z-iO_Db50q$YKTtZeb8+WSBKa0w^f! z>Eal|aXtCRzo&2Om#vTAZ)9Lw|8Y{|%WrS3c^KLpc-VEyw#@@7WbkzLb6Mw<&;$U# C@f`2~ literal 0 HcmV?d00001 diff --git a/web/html/images/title.png b/web/html/images/title.png new file mode 100644 index 0000000000000000000000000000000000000000..e16971a17379bf87d2365465a66cb3463ff82b39 GIT binary patch literal 6465 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 literal 0 HcmV?d00001 diff --git a/web/html/images/title_back.png b/web/html/images/title_back.png new file mode 100644 index 0000000000000000000000000000000000000000..95c98d7a253572a13eaa47415f8de2594864339a GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^j6m$h!2~3mv@$^woCO|{#S9GG!XV7ZFl&wkP%z5V z#W6(Ua&F&2-Ub66X65(#8#!ki2$kDNc?tfRWAS{)w!a>kQxaS`grc<@A6nNg{+Hb$ zW#ZuFE_d#)ws8EN7Z20>m(7y?8&kFR|NNNKb8N%E7d}<5e*V2T=JW02js6_pp8{=R N@O1TaS?83{1OR_#Ij{f# literal 0 HcmV?d00001 diff --git a/web/lang/en/pkgfuncs_po.inc b/web/lang/en/pkgfuncs_po.inc index 220cdb37..dcd46f4f 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 cce53848..ce662f7b 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 "\n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - - # Menu items - # - print " \n"; - print " "; - print " "; - print " \n"; - print " \n"; - print " \n"; - print "
"; - print __("%s: %sAn ArchLinux project%s", array("AUR", "", "")); - print "
\n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print "
"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "AUR (".$LANG.")\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo << +
+ +
Arch Linux
+
+
+
+ + 		"; - print "ArchLinux User-community Repository
"; - - # XXX CSS help - a:link, a:visited, etc are defined, but I don't want to - # use the defaults. Is this the way to override them? - # - print "English "; - print "Polski "; - print "Italiano "; - print "Català "; - print "Português "; - print "Español "; - print "Deutsch "; - print "Français"; - print "Русский"; - print "
\n"; - print "
"; - print " .:"; - print " ".__("Home")." "; - print " - "; - print " ".__("Accounts")." "; - print " - "; - print " ".__("Packages")." "; +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 '
  • '.__("Logout")."
    • \n"; + echo '
  • '.__("Submit")."
    • \n"; + echo '
  • '.__("My Packages")."
    • \n"; } - print " - "; - print " ".__("Bugs")." "; - print " - "; - print " ".__("Discussion")." "; - if ($_COOKIE["AURSID"]) { - # This is a usability change, so we can go to My Packages page - # with just one click - # Added by: dsa - print " - "; - print " ".__("My Packages")." "; - - print " - "; - print " ".__("Logout")." "; - } - print " :.    "; - print "
    \n"; - print "  
    \n"; - print "\n\n"; - - return; + echo '
  • '.__("Discussion")."
    • \n"; + echo '
  • '.__("Bugs")."
    • \n"; + echo '
  • '.__("Packages")."
    • \n"; + echo '
  • '.__("Accounts")."
    • \n"; + echo '
  • AUR-'.__("Home")."
    • \n"; + echo " \n"; + echo " \n"; + echo '
    '."\n"; + echo "
      \n"; + echo "
    • RU
      • \n"; + echo "
    • FR
      • \n"; + echo "
    • DE
      • \n"; + echo "
    • ES
      • \n"; + echo "
    • PT
      • \n"; + echo "
    • CA
      • \n"; + echo "
    • IT
      • \n"; + echo "
    • PL
      • \n"; + echo "
    • EN
      • \n"; + echo "
    • Lang:
      • \n"; + echo "
    \n"; + echo "
    \n"; + echo "\n"; + echo "
    \n"; + echo "\n\n"; + return; } @@ -461,9 +438,6 @@ function html_header() { function html_footer($ver="") { print "\n\n\n"; print "
    \n"; - print "
    \n"; if ($ver) { print "

    \n"; print "\n"; @@ -471,7 +445,7 @@ function html_footer($ver="") { print "
    \n"; print "

    \n"; } - print "
    \n"; + print "\n"; print "\n"; return; } diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index b9ad0d4a..de1dc5fa 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -268,36 +268,19 @@ function package_details($id=0, $SID="") { } else { # print out package details - # - print "
    \n"; - print "
    \n"; - print "\n"; - print "\n"; - print " \n"; - print "\n"; - print "\n"; - print "
    "; - print "".__("Package Details")."
    \n"; - print "
    \n"; - print "\n"; - print "\n"; - print " \n"; - print "\n"; - print "\n"; - print " \n"; - print "\n"; - print "\n"; - print " \n"; - print "\n"; - print "\n"; - print " "; - print "\n"; - - print "\n"; - print " \n"; + echo " \n"; + echo "
    "; - print $row["Name"] . " " . $row["Version"]."
    "; - print "".$row["URL"]."
    ".$row["Description"]; - print "
    "; + # + echo "
    \n"; + echo "
    ".__("Package Details")."
    \n"; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " "; - - print "\n"; - print "\n"; - print " \n"; + echo " "; + echo ""; + echo $maintainer . ""; } else { - print $maintainer . ""; + echo $maintainer . ""; } } else { $maintainer = "None"; - print $maintainer . ""; + echo $maintainer . ""; } - print "\n"; - - print "\n"; - print " "; - print "\n"; + echo " \n"; + echo " \n"; # In case of wanting to put a custom message $msg = __("unknown"); $license = $row["License"] == "" ? $msg : $row["License"]; - print "\n"; - print " \n"; - print "\n"; - - print "\n"; - print " "; - print "\n"; + echo " \n"; + echo " \n"; # Print the timestamps for last updates $updated_time = ($row["ModifiedTS"] == 0) ? "(unknown)" : gmdate("r", intval($row["ModifiedTS"])); $submitted_time = ($row["SubmittedTS"] == 0) ? "(unknown)" : gmdate("r", intval($row["SubmittedTS"])); - print "\n"; - print " \n"; - print "\n"; - - print "\n"; - print " "; - print "\n"; - print "\n"; - print " \n"; + echo " \n"; + echo " "; + echo "".__("Tarball")." :: ".__("Files")." :: PKGBUILD"; } elseif ($row["LocationID"] == 3) { - print "CVS"; + echo "CVS"; } - print "\n"; + echo "\n"; if ($row["LocationID"] == 2) { - print "\n"; - print " "; + 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 " \n"; } - print "\n"; - print " "; - print "\n"; - print "\n"; - print " \n"; - print "\n"; + echo "\n"; + echo "
    "; + echo $row["Name"] . " " . $row["Version"]."
    "; + echo "".$row["URL"]."
    ".$row["Description"]; + echo "
    "; if ($row["Location"] == "unsupported" and ( uid_from_sid($SID) == $row["MaintainerUID"] or (account_from_sid($SID) == "Developer" or @@ -309,87 +292,65 @@ function package_details($id=0, $SID="") { } else { $edit_cat = $row["Category"]; } - print $row["Location"]." :: ".$edit_cat."
    ".__("Maintainer").": "; + echo $row["Location"]." :: ".$edit_cat."
    ".__("Maintainer").": "; if ($row["MaintainerUID"]) { $maintainer = username_from_id($row["MaintainerUID"]); if ($SID) { - print ""; - print $maintainer . "
    ".__("Votes").": "; - print $row["NumVotes"] . "
    ".__("Votes").": "; + echo $row["NumVotes"] . "

    ".__("License").": ".$license; - print "

    ".__("License").": ".$license; + echo "
    "; - print ""; - print __("Last Updated").": ".$updated_time."
    "; - print __("First Submitted").": ".$submitted_time; - print "    "; - print "
    "; + echo "
    "; + echo __("Last Updated").": ".$updated_time."
    "; + echo __("First Submitted").": ".$submitted_time."
    "; if ($row["LocationID"] == 2) { global $URL_DIR; $urlpath = $URL_DIR.$row["Name"]."/".$row["Name"]; - print "".__("Tarball")." :: ".__("Files")." :: PKGBUILD
    "; + echo "
    "; if ($row["Safe"]) { - print "".__("The above files have been verified (by %s) and are safe to use.", array(username_from_id($row["VerifiedBy"])))."
    "; - print ""; - print "\n"; - print "\n"; + echo " \n"; + echo " "; - - print " \n"; + echo " "; - print "\n"; - print "\n"; - print " \n"; - print "
    "; - print __("Dependencies")."
    "; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; - print "
    "; + echo __("Dependencies")."
    "; $deps = package_dependencies($row["ID"]); # $deps[0] = array('id','name', 'dummy'); while (list($k, $darr) = each($deps)) { $url = "".$darr[1].$darr[3]."
    \n"; - else print "".$darr[1].$darr[3]."
    \n"; + if ($darr[2] == 0) echo $url."'>".$darr[1].$darr[3]."
    \n"; + else echo "".$darr[1].$darr[3]."
    \n"; } - print "
    		"; - print ""; - print "\n"; - print "\n"; + echo "
    "; - print __("Sources")."
    "; + echo "
    \n"; + echo "     		\n"; + echo " \n"; + echo " \n"; + echo " \n"; - print "
    "; + echo __("Sources")."
    "; $sources = package_sources($row["ID"]); # $sources[0] = 'src'; while (list($k, $src) = each($sources)) { $parsed_url = parse_url($src); if ($parsed_url['scheme']) { //It is an external source - print "".$src."
    \n"; + echo "".$src."
    \n"; } else { //It is presumably an internal source if ($row["LocationID"] == 2) { - print "".$src."
    \n"; + echo "".$src."
    \n"; } elseif ($row["LocationID"] == 3) { - print ""; - print $src."
    \n"; + echo ""; + echo $src."
    \n"; } } } - print "
    "; - print "
    \n"; - print "\n"; - print "
    \n"; + echo "
    \n"; + echo " \n"; + echo "\n\n"; + echo "
    \n\n"; - print "

    \n"; # Actions Bar # if ($SID) { - print "\n"; - print "\n"; - print "\n"; - print "\n"; - print "
    ".__("Actions")."
    \n"; - print "\n"; - print "\n"; + echo "
    \n"; + echo "
    ".__("Actions")."
    \n"; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; # Voting Button # $q = "SELECT * FROM PackageVotes WHERE UsersID = ".uid_from_sid($SID); $q.= " AND PackageID = ".$row["ID"]; if (!mysql_num_rows(db_query($q, $dbh))) { - print ""; + echo " "; } else { - print ""; + echo ""; } # Comment Nofify Button # $q = "SELECT * FROM CommentNotify WHERE UserID = ".uid_from_sid($SID); $q.= " AND PkgID = ".$row["ID"]; if (!mysql_num_rows(db_query($q, $dbh))) { - print ""; + echo ""; } else { - print ""; + echo ""; } # Flag Safe Button # - if ($row["LocationID"] == 2 && (account_from_sid($SID) == "Trusted User" || account_from_sid($SID) == "Developer")) - { - if ($row["Safe"] == 0) - { - print ""; - } - else - { - print ""; + if ($row["LocationID"] == 2 && (account_from_sid($SID) == "Trusted User" || account_from_sid($SID) == "Developer")) { + if ($row["Safe"] == 0) { + echo ""; + } else { + echo ""; } + } + + if ($row["OutOfDate"] == 0) { + echo "\n"; + } else { + echo "\n"; } - if ($row["OutOfDate"] == 0) - { - print "\n"; - } - else - { - print "\n"; - } - if ($row["AURMaintainerUID"] == 0 && $row["MaintainerUID"] == 0) - { - print "\n"; - } + if ($row["AURMaintainerUID"] == 0 && $row["MaintainerUID"] == 0) { + echo "\n"; + } - if ($row["MaintainerUID"] == uid_from_sid($SID)) - { - print "\n"; - } + if ($row["MaintainerUID"] == uid_from_sid($SID)) { + echo "\n"; + } - if ($row["MaintainerUID"] == uid_from_sid($SID) || - account_from_sid($SID) == "Trusted User" || - account_from_sid($SID) == "Developer") - { - print "\n"; - } + if ($row["MaintainerUID"] == uid_from_sid($SID) || + account_from_sid($SID) == "Trusted User" || + account_from_sid($SID) == "Developer") { + echo "\n"; + } - print "

    \n"; + echo " \n"; + echo " \n"; + echo "\n"; + echo "\n
    \n\n"; } # Comments # - print "\n"; - print "\n"; - print "\n"; - print "
    ".__("Comments")."
    "; - - print "\n"; + echo "
    \n"; + echo "
    ".__("Comments")."
    \n"; + echo "
    \n"; + echo "
    \n"; $comments = package_comments($row["ID"]); if (!empty($comments)) { while (list($indx, $carr) = each($comments)) { - print "\n"; - print " \n"; - print "\n"; - print " \n"; + echo " \n"; } } - print "\n"; - print " \n"; - print "\n"; - print " "; - print "\n"; - - print "
    "; - print "
    "; - print ""; - print "\n"; + echo " \n"; - print "\n"; + echo "\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
    "; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; - print "
    "; if (canDeleteComment($carr["ID"], account_from_sid($SID), $SID)) { $durl = ""; - print $durl . "  "; + echo $durl . "  "; } if ($SID) { - print __("Comment by: %h%s%h on %h%s%h", + echo __("Comment by: %h%s%h on %h%s%h", array("",$carr["UserName"],"", "",gmdate("Ymd [H:i:s]",$carr["CommentTS"]),"")); } else { - print __("Comment by: %h%s%h on %h%s%h", + echo __("Comment by: %h%s%h on %h%s%h", array("",$carr["UserName"],"", "",gmdate("Ymd [H:i:s]",$carr["CommentTS"]),"")); } - print ""; - print "
    "; - print "\n"; - print str_replace("\n", "
    ", str_replace('"',""", htmlspecialchars(strip_tags(stripslashes($carr["Comments"]))))); - print "    \n"; - print "
    \n"; - print "
    "; + echo "\n"; + echo str_replace("\n", "
    ", str_replace('"',""", htmlspecialchars(strip_tags(stripslashes($carr["Comments"]))))); + echo "
    \n"; + echo "
    "; - print "
    "; - print "
    \n"; - print "\n"; - print ""; - print "
    \n"; - print "
    \n"; - - - print "
    \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo "
    \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "\n"; } } From 6a39da70fb9cfd6050deb1016fe0183157d8fb46 Mon Sep 17 00:00:00 2001 From: tardo Date: Sat, 22 Sep 2007 17:01:40 -0400 Subject: [PATCH 09/18] Incomplete comment patch. FS 7968, 5128, 7383. Properly parse comments from database. Thanks to Thralas for input. Signed-off-by: tardo --- web/lib/pkgfuncs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index b9ad0d4a..cd339c1f 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -568,7 +568,7 @@ function package_details($id=0, $SID="") { print ""; print ""; print "\n"; - print str_replace("\n", "
    ", str_replace('"',""", htmlspecialchars(strip_tags(stripslashes($carr["Comments"]))))); + print nl2br(htmlspecialchars($carr["Comments"])); print "    \n"; print "\n"; print "\n"; From 61ddbc18e7836a3b2e334b23ea637a2a0eea9006 Mon Sep 17 00:00:00 2001 From: tardo Date: Sat, 22 Sep 2007 17:09:26 -0400 Subject: [PATCH 10/18] Reverse dependency lookup. FS 4556, 5269. Ugly hack, could use beautification. Also includes english translation addition. If url sources are too long, page could ugly... Signed-off-by: tardo --- web/lang/en/pkgfuncs_po.inc | 4 +++- web/lib/pkgfuncs.inc | 45 +++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/web/lang/en/pkgfuncs_po.inc b/web/lang/en/pkgfuncs_po.inc index 220cdb37..b6a704bb 100644 --- a/web/lang/en/pkgfuncs_po.inc +++ b/web/lang/en/pkgfuncs_po.inc @@ -151,4 +151,6 @@ $_t["en"]["License"] = "License"; $_t["en"]["unknown"] = "unknown"; -?> \ No newline at end of file +$_t["en"]["Required by"] = "Required by"; + +?> diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index cd339c1f..395200b1 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -152,6 +152,25 @@ function package_dependencies($pkgid=0) { return $deps; } +# reverse deps by tardo +# +function package_required($pkgid=0) { + $deps = array(); + if ($pkgid) { + $dbh = db_connect(); + $q = "SELECT PackageID, Name, DummyPkg from PackageDepends, Packages "; + $q.= "WHERE PackageDepends.PackageID = Packages.ID "; + $q.= "AND PackageDepends.DepPkgID = "; + $q.= mysql_real_escape_string($pkgid); + $result = db_query($q, $dbh); + if (!$result) {return array();} + while ($row = mysql_fetch_row($result)) { + $deps[] = $row; + } + } + return $deps; +} + # create a dummy package and return it's Packages.ID if it already exists, # return the existing ID # @@ -402,6 +421,32 @@ function package_details($id=0, $SID="") { } reset($pkgsearch_vars); + // $darr[3] is the DepCondition + + if ($darr[2] == 0) print $url."'>".$darr[1].$darr[3]."
    \n"; + else print "".$darr[1].$darr[3]."
    \n"; + } + print "\n"; + print ""; + + # reverse-deps by tardo - could use some beautification + print " "; + print ""; + print "\n"; + print "\n"; print " "; + print "".__("The above files have been verified (by %h%s%h) 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.").""; } From 4548b0d08b592180bd4cd66ec127d0069f27c792 Mon Sep 17 00:00:00 2001 From: tardo Date: Sat, 22 Sep 2007 18:08:14 -0400 Subject: [PATCH 12/18] Notify by email when package is flagged out of date. FS 3231. In addition to the above, it does not notify if the user that flags package out of date is the same as the owner of the package. The body of the email could use work as well I suppose. Signed-off-by: tardo --- web/html/packages.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/web/html/packages.php b/web/html/packages.php index 4cb8c478..0559060c 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -66,6 +66,27 @@ if (isset($_REQUEST["do_Flag"])) { print "

    \n"; print __("The selected packages have been flagged out-of-date."); print "

    \n"; + + # notification by tardo. + $f_name = username_from_sid($_COOKIE['AURSID']); + $f_email = email_from_sid($_COOKIE['AURSID']); + $f_uid = uid_from_sid($_COOKIE['AURSID']); + $q = "SELECT Packages.Name, Users.Email, Packages.ID "; + $q.= "FROM Packages, Users "; + $q.= "WHERE Packages.ID IN (" . $flag .") "; + $q.= "AND Users.ID = Packages.MaintainerUID "; + $q.= "AND Users.ID != " . $f_uid; + $result = db_query($q, $dbh); + if (mysql_num_rows($result)) { + while ($row = mysql_fetch_assoc($result)) { + # construct email + $body = "Your package " . $row['Name'] . " has been flagged out of date by " . $f_name . ". You may view your package at:\nhttp://aur.archlinux.org/packages.php?do_Details=1&ID=" . $row['ID']; + $body = wordwrap($body, 70); + $headers = "To: ".$row['Email']."\nReply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; + @mail(' ', "AUR Out-of-date Notification for ".$row['Name'], $body, $headers); + } + } + } else { print "

    \n"; print __("You did not select any packages to flag."); From 9cba3937d0847d1065b3da7322ffe7ea22108319 Mon Sep 17 00:00:00 2001 From: tardo Date: Sat, 22 Sep 2007 18:30:28 -0400 Subject: [PATCH 13/18] Cosmetic: Show flagged out of date on package page. Add a simple warning under "Tarball :: Files :: PKGBUILD" if package is out of date. Signed-off-by: tardo --- web/lang/en/pkgfuncs_po.inc | 2 ++ web/lib/pkgfuncs.inc | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/web/lang/en/pkgfuncs_po.inc b/web/lang/en/pkgfuncs_po.inc index 4ab3cd60..13950620 100644 --- a/web/lang/en/pkgfuncs_po.inc +++ b/web/lang/en/pkgfuncs_po.inc @@ -155,4 +155,6 @@ $_t["en"]["Required by"] = "Required by"; $_t["en"]["The above files have been verified (by %h%s%h) and are safe to use."] = "The above files have been verified (by %h%s%h) and are safe to use."; +$_t["en"]["This package has been flagged out of date."] = "This package has been flagged out of date."; + ?> diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 3bbfcb77..5cab8422 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -400,6 +400,10 @@ function package_details($id=0, $SID="") { print "".__("Be careful! The above files may contain malicious code that can damage your system.").""; } } + if ($row["OutOfDate"] == 1) { + print "\n

    "; + } print "\n"; print " "; print "\n"; From aebdd21b58046f647c7c500dde5152ba774303ab Mon Sep 17 00:00:00 2001 From: eliott Date: Mon, 24 Sep 2007 07:57:35 -0700 Subject: [PATCH 14/18] More changes to page styles. --- web/html/account.php | 7 +++++++ web/html/css/arch.css | 20 +++++++++++++++----- web/html/index.php | 17 ++++++++--------- web/html/pkgsubmit.php | 8 +++++--- web/lib/pkgfuncs.inc | 18 +++++++++--------- 5 files changed, 44 insertions(+), 26 deletions(-) diff --git a/web/html/account.php b/web/html/account.php index fd9cc617..3d981715 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -13,6 +13,10 @@ html_header(); # print out the HTML header # Main page processing here # +echo "
    \n"; +echo "
    ".__("Accounts")."
    \n"; +echo "
    \n"; + if (isset($_COOKIE["AURSID"])) { # visitor is logged in # @@ -148,6 +152,9 @@ if (isset($_COOKIE["AURSID"])) { } } +echo "
    "; +echo "
    "; + html_footer("\$Id$"); # vim: ts=2 sw=2 noet ft=php ?> diff --git a/web/html/css/arch.css b/web/html/css/arch.css index 7d8f41f3..65f3cff4 100644 --- a/web/html/css/arch.css +++ b/web/html/css/arch.css @@ -410,7 +410,7 @@ textarea.vLargeTextField { margin-left: 5%; margin-right: 5%; } -.pkgbox { +.pgbox { width: 90%; margin-left: 5%; margin-right: 5%; @@ -421,7 +421,17 @@ textarea.vLargeTextField { text-align: left; padding: 3px; } -.pkgboxtitle { +.frontpgboxbody { + padding: 10px; +} +.frontpgboxbody > table { + width: 100%; +} +.boxSoftTitle { + text-align: right; +} + +.pgboxtitle { border-width: 2px; border-style: solid; border-color: #dddddd; @@ -435,14 +445,14 @@ textarea.vLargeTextField { padding-bottom: 2px; padding-right: 10px; } -.pkgboxbody, .pkgboxbody-comment { +.pgboxbody, .pgboxbody-comment { padding: 10px; } -.pkgboxbody input { +.pgboxbody input { margin-right: 10px; } -.pkgboxbody-comment > table { +.pgboxbody-comment > table { border-collapse: separate; border-spacing: 0 15px; } diff --git a/web/html/index.php b/web/html/index.php index 7d28d75e..d76d13d7 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -79,19 +79,19 @@ if (isset($_REQUEST["user"]) || isset($_REQUEST["pass"])) { html_header(); # Big Top Level Table (Table 1) -print "
    "; + print __("Required by")."
    "; + $deps = package_required($row["ID"]); + while (list($k, $darr) = each($deps)) { + $url = "".$darr[1].$darr[3]."
    \n"; From adafc112f6f14a5ab7249a622da5d74a8f52a3ed Mon Sep 17 00:00:00 2001 From: tardo Date: Sat, 22 Sep 2007 17:14:14 -0400 Subject: [PATCH 11/18] Add link to TU's homepage in "Flagged safe by". FS 4138. Simple feature request. Not sure what purpose it serves. Signed-off-by: tardo --- web/lang/en/pkgfuncs_po.inc | 2 ++ web/lib/pkgfuncs.inc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web/lang/en/pkgfuncs_po.inc b/web/lang/en/pkgfuncs_po.inc index b6a704bb..4ab3cd60 100644 --- a/web/lang/en/pkgfuncs_po.inc +++ b/web/lang/en/pkgfuncs_po.inc @@ -153,4 +153,6 @@ $_t["en"]["unknown"] = "unknown"; $_t["en"]["Required by"] = "Required by"; +$_t["en"]["The above files have been verified (by %h%s%h) and are safe to use."] = "The above files have been verified (by %h%s%h) and are safe to use."; + ?> diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 395200b1..3bbfcb77 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -395,7 +395,7 @@ function package_details($id=0, $SID="") { print "
    "; if ($row["Safe"]) { - print "".__("The above files have been verified (by %s) and are safe to use.", array(username_from_id($row["VerifiedBy"])))."
    "; + print "".__("This package has been flagged out of date.")."
    \n"; -print "\n"; +echo "
    \n"; +echo "
    AUR-".__("Home")."
    \n"; +echo "
    \n"; +echo "
    \n"; +echo "\n"; # MAIN: Top Left print ""; @@ -178,9 +178,6 @@ print ""; print "
    "; print "

    ".__("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 "
    "; # 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 89ecfa44..24aeea5c 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"; +echo "\n"; html_footer("\$Id$"); # vim: ts=2 sw=2 noet ft=php ?> diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index de1dc5fa..3089ccb5 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -269,9 +269,9 @@ function package_details($id=0, $SID="") { # print out package details # - echo "
    \n"; - echo "
    ".__("Package Details")."
    \n"; - echo "
    \n"; + echo "
    \n"; + echo "
    ".__("Package Details")."
    \n"; + echo "
    \n"; echo " \n"; echo " \n"; @@ -409,9 +409,9 @@ function package_details($id=0, $SID="") { # Actions Bar # if ($SID) { - echo "
    \n"; - echo "
    ".__("Actions")."
    \n"; - echo "
    \n"; + echo "
    \n"; + echo "
    ".__("Actions")."
    \n"; + echo "
    \n"; echo "
    \n"; echo " \n"; echo " \n"; @@ -482,9 +482,9 @@ function package_details($id=0, $SID="") { # Comments # - echo "
    \n"; - echo "
    ".__("Comments")."
    \n"; - echo "
    \n"; + echo "
    \n"; + echo "
    ".__("Comments")."
    \n"; + echo "
    \n"; echo "
    "; echo $row["Name"] . " " . $row["Version"]."
    \n"; $comments = package_comments($row["ID"]); if (!empty($comments)) { From 4e4f2728c1c4e4bf030b579dc41b530b06166271 Mon Sep 17 00:00:00 2001 From: eliott Date: Mon, 24 Sep 2007 09:23:41 -0700 Subject: [PATCH 15/18] Phrakture requested fonts to be more similar to main arch site. Added css to make it similar. --- web/html/css/containers.css | 5 +---- web/html/css/fonts.css | 9 +-------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/web/html/css/containers.css b/web/html/css/containers.css index 2a0a0e4b..006c4ff7 100644 --- a/web/html/css/containers.css +++ b/web/html/css/containers.css @@ -3,7 +3,6 @@ border: 0px; margin: 0px; padding: 0px; - font-family: arial,verdana,tahoma; } /* Main Wrapper Data Format */ @@ -182,7 +181,6 @@ td.text { color: #000; - font-family: verdana; font-size: 12px; } th @@ -198,7 +196,7 @@ input,textarea,select { background-color: rgb(108,131,176); - font-family: courier; + font-family: monospace; font-size: 12px; background-color: #ccc; border: #000000 1px solid; @@ -210,6 +208,5 @@ background-color: #fff; color: rgb(108,131,176); border: 1px dashed rgb(108,131,176); - font-family: trebuchet ms, tahoma, verdana; font-size: 12px; } diff --git a/web/html/css/fonts.css b/web/html/css/fonts.css index 8a60e05d..fdeddbed 100644 --- a/web/html/css/fonts.css +++ b/web/html/css/fonts.css @@ -2,11 +2,10 @@ span /* Applicable by default in all fonts */ { color: #666; - font-family: verdana, trebuchet ms, tahoma, luxi sans; + font-family: Bitstream Vera Sans, Lucida Grande, Arial, sans-serif; } span.f1 /* Important */ { - font-family: verdana; font-size: 20px; letter-spacing: 1px; } @@ -25,13 +24,11 @@ span.f4 /* Content Text */ { color: #444; - font-family: verdana; font-size: 12px; } span.f5 /* Content Small */ { color: #333; - font-family: trebuchet ms, tahoma, verdana; font-size: 11px; } span.f6 /* Red Message */ @@ -55,13 +52,11 @@ span.error /* Content Text */ { color: #900; - font-family: verdana; font-size: 12px; } span.warning /* Content Text */ { color: #C0C000; - font-family: verdana; font-size: 12px; } @@ -95,7 +90,6 @@ color: rgb( 201, 209, 226 ); font-weight: bold; font-size: 11px; - font-family: tahoma, trebuchet ms, verdana; padding-right: 8px; word-spacing: 8px; } @@ -104,7 +98,6 @@ color: #fff; font-weight: bold; font-size: 11px; - font-family: tahoma, trebuchet ms, verdana; padding-right: 8px; } From cb7cec5028316bc235574258bb73af8f9f643bef Mon Sep 17 00:00:00 2001 From: Paul Mattal Date: Tue, 25 Sep 2007 10:19:12 -0400 Subject: [PATCH 16/18] Regression to front page "Flagged as safe by me" language Developers should be treated the same as TUs --- web/html/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/html/index.php b/web/html/index.php index d76d13d7..4e38e1e1 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -274,7 +274,7 @@ if (!empty($user)) { # Number of safe packages print ""; print "
    "; - if ($atype == 'Trusted User') { + if ($atype == 'Trusted User' || $atype == 'Developer') { $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); From 7c7685ce82f1779f6f991533df7f5e6d6ac8fe21 Mon Sep 17 00:00:00 2001 From: Paul Mattal Date: Tue, 25 Sep 2007 10:44:04 -0400 Subject: [PATCH 17/18] AUR Italian Translation patch 20070925 from Giovanni Scafora --- web/lang/it/index_po.inc | 2 ++ web/lang/it/pkgfuncs_po.inc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/web/lang/it/index_po.inc b/web/lang/it/index_po.inc index f316aea5..e3e7a8c9 100644 --- a/web/lang/it/index_po.inc +++ b/web/lang/it/index_po.inc @@ -91,4 +91,6 @@ $_t["it"]["Flagged as safe"] = "Considerato sicuro"; $_t["it"]["My Statistics"] = "Le mie statistiche"; +$_t["it"]["Home"] = "Inizio"; + ?> \ No newline at end of file diff --git a/web/lang/it/pkgfuncs_po.inc b/web/lang/it/pkgfuncs_po.inc index 58668c31..87508915 100644 --- a/web/lang/it/pkgfuncs_po.inc +++ b/web/lang/it/pkgfuncs_po.inc @@ -163,4 +163,6 @@ $_t["it"]["All"] = "Tutti"; $_t["it"]["Unsafe"] = "Non sicuri"; +$_t["it"]["Accounts"] = "Account"; + ?> \ No newline at end of file From d1c9422095b9981f608b75f0b78e412983ba7aff Mon Sep 17 00:00:00 2001 From: Paul Mattal Date: Wed, 26 Sep 2007 08:19:34 -0400 Subject: [PATCH 18/18] italian_20070926.diff patch from Giovanni Scafora --- web/lang/it/pkgfuncs_po.inc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/web/lang/it/pkgfuncs_po.inc b/web/lang/it/pkgfuncs_po.inc index 87508915..b13aabcf 100644 --- a/web/lang/it/pkgfuncs_po.inc +++ b/web/lang/it/pkgfuncs_po.inc @@ -135,23 +135,23 @@ $_t["it"]["Search by"] = "Cerca per"; $_t["it"]["Submitter"] = "Contributore"; -$_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 have been successfully logged out."] = "Disconnesso."; -$_t["it"]["You must log in to view user information."] = "Bisogna autenticarsi per visualizzare queste informazioni."; +$_t["it"]["You must log in to view user information."] = "Devi autenticarti per visualizzare queste informazioni."; $_t["it"]["Could not retrieve information for the specified user."] = "Non è stato possibile trovare le informazioni sull'utente specificato."; -$_t["it"]["You do not have permission to edit this account."] = "Non si dispone dei permessi necessari per modificare questo account."; +$_t["it"]["You do not have permission to edit this account."] = "Non disponi dei permessi necessari per modificare questo account."; -$_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"]["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"]["Use this form to update your account."] = "Utilizzare questo modulo per aggiornare il vostro account."; +$_t["it"]["Use this form to update your account."] = "Utilizza questo modulo per aggiornare il vostro account."; -$_t["it"]["You are not allowed to access this area."] = "Non si dispone dei permessi necessari per accedere."; +$_t["it"]["You are not allowed to access this area."] = "Non disponi dei permessi necessari per accedere."; $_t["it"]["Status"] = "Stato"; @@ -165,4 +165,10 @@ $_t["it"]["Unsafe"] = "Non sicuri"; $_t["it"]["Accounts"] = "Account"; +$_t["it"]["This package has been flagged out of date."] = "Questo pacchetto è stato segnato come non aggiornato."; + +$_t["it"]["The above files have been verified (by %h%s%h) and are safe to use."] = "I file sono stati verificati (da %h%s%h) ed il loro utilizzo è da considerarsi sicuro."; + +$_t["it"]["Required by"] = "Richiesto da"; + ?> \ No newline at end of file