December 2008 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Remove success messages after package functions
by Callan Barrett 20 Dec '08

20 Dec '08

Just displays message at the top of the page of what happened (errors or not) and goes back to the same page Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/css/fonts.css | 4 +++ web/html/packages.php | 53 +++++++++++++++++++----------------------------- web/lib/pkgfuncs.inc | 14 ++++++------ 3 files changed, 32 insertions(+), 39 deletions(-) diff --git a/web/html/css/fonts.css b/web/html/css/fonts.css index baa7560..bf5268f 100644 --- a/web/html/css/fonts.css +++ b/web/html/css/fonts.css @@ -104,4 +104,8 @@ h1, h2, h3, h4 { font-weight: bold; color: #f00; } +.pkgoutput { + font-weight: bold; + text-align: center; +} diff --git a/web/html/packages.php b/web/html/packages.php index eb5f664..2452991 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -32,54 +32,43 @@ if (isset($_POST['IDs'])) { } } -html_header($title); - # Determine what action to do +$output = ""; if ($_POST['action'] == "do_Flag" || isset($_POST['do_Flag'])) { - print "<p>"; - print pkg_flag($atype, $ids, True); - print "</p>"; + $output = pkg_flag($atype, $ids, True); } elseif ($_POST['action'] == "do_UnFlag" || isset($_POST['do_UnFlag'])) { - print "<p>"; - print pkg_flag($atype, $ids, False); - print "</p>"; + $output = pkg_flag($atype, $ids, False); } elseif ($_POST['action'] == "do_Adopt" || isset($_POST['do_Adopt'])) { - print "<p>"; - print pkg_adopt($atype, $ids, True); - print "</p>"; + $output = pkg_adopt($atype, $ids, True); } elseif ($_POST['action'] == "do_Disown" || isset($_POST['do_Disown'])) { - print "<p>"; - print pkg_adopt($atype, $ids, False); - print "</p>"; + $output = pkg_adopt($atype, $ids, False); } elseif ($_POST['action'] == "do_Vote" || isset($_POST['do_Vote'])) { - print "<p>"; - print pkg_vote($atype, $ids, True); - print "</p>"; + $output = pkg_vote($atype, $ids, True); } elseif ($_POST['action'] == "do_UnVote" || isset($_POST['do_UnVote'])) { - print "<p>"; - print pkg_vote($atype, $ids, False); - print "</p>"; + $output = pkg_vote($atype, $ids, False); } elseif ($_POST['action'] == "do_Delete" || isset($_POST['do_Delete'])) { - print "<p>"; - print pkg_delete($atype, $ids); - print "</p>"; + $output = pkg_delete($atype, $ids); + unset($_GET['ID']); } elseif ($_POST['action'] == "do_Notify" || isset($_POST['do_Notify'])) { - print "<p>"; - print pkg_notify($atype, $ids); - print "</p>"; + $output = pkg_notify($atype, $ids); } elseif ($_POST['action'] == "do_UnNotify" || isset($_POST['do_UnNotify'])) { - print "<p>"; - print pkg_notify($atype, $ids, False); - print "</p>"; -} elseif (isset($_GET["ID"])) { + $output = pkg_notify($atype, $ids, False); +} + +html_header($title); + +if ($output): +?> +<div class="pkgoutput"><?php print $output ?></div><br /> +<?php +endif; +if (isset($_GET["ID"])) { if (!intval($_GET["ID"])) { print __("Error trying to retrieve package details.")."<br />\n"; - } else { package_details($_GET["ID"], $_COOKIE["AURSID"]); } - } else { pkg_search_page($_COOKIE["AURSID"]); } diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 2b3cece..f99810a 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -290,9 +290,9 @@ function package_details($id=0, $SID="") { # print out package details # - echo "<div class=\"pgbox\">\n"; - echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Package Details")."</span></div>\n"; - echo " <div class=\"pgboxbody\">\n"; + echo "<div class=\"pgbox\">\n"; + echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Package Details")."</span></div>\n"; + echo " <div class=\"pgboxbody\">\n"; echo " <table>\n"; echo " <tr><td class='boxSoft' colspan='2'><span class='f2'>"; echo $row["Name"] . " " . $row["Version"]."</span></td></tr>\n"; @@ -364,8 +364,8 @@ function package_details($id=0, $SID="") { $deps = package_dependencies($row["ID"]); # $deps[0] = array('id','name', 'dummy'); if (count($deps) > 0) { - echo " <tr>\n"; - echo " <td valign='top' style='padding-right: 10'>\n"; + echo " <tr>\n"; + echo " <td valign='top' style='padding-right: 10'>\n"; echo " <table class='boxSoft' style='width: 200px'>\n"; echo " <tr><td class='boxSoftTitle'><span class='f3'>"; echo __("Dependencies")."</span></td></tr>\n"; @@ -473,7 +473,7 @@ function package_details($id=0, $SID="") { echo "<div class=\"pgbox\">\n"; echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Actions")."</span></div>\n"; echo " <div class=\"pgboxbody\">\n"; - echo " <form action='/packages.php' method='post'>\n"; + echo " <form action='/packages.php?ID=".$row['ID']."' method='post'>\n"; echo " <input type='hidden' name='IDs[".$row["ID"]."]' value='1'>\n"; echo " <input type='hidden' name='ID' value='".$row["ID"]."'>\n"; # Voting Button @@ -767,7 +767,7 @@ function pkg_search_page($SID="") { $result = db_query($q, $dbh); $total = mysql_result(db_query('SELECT FOUND_ROWS() AS Total', $dbh), 0); - print "<form action='/packages.php' method='post'>\n"; + print "<form action='/packages.php?".$_SERVER['QUERY_STRING']."' method='post'>\n"; print "<center>\n"; print "<table cellspacing='3' class='boxSoft'>\n"; print "<tr>\n"; -- 1.6.0.2

2 1

[aur-dev] [PATCH] Change behaviour of package functions to accept normal arrays
by Callan Barrett 20 Dec '08

20 Dec '08

Package functions use a normal array of pkgids now and packages.php has been changed to accomodate for it Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/packages.php | 10 ++++++---- web/lib/pkgfuncs.inc | 27 +++++++++++---------------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index ca2b26a..eb5f664 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -25,10 +25,12 @@ if (isset($_COOKIE["AURSID"])) { } # Grab the list of Package IDs to be operated on -# -# TODO: Convert this to a normal array of IDs to operate on and convert the -# functions to use this format -isset($_POST["IDs"]) ? $ids = $_POST["IDs"] : $ids = array(); +$ids = array(); +if (isset($_POST['IDs'])) { + foreach ($_POST['IDs'] as $id => $i) { + $ids[] = $id; + } +} html_header($title); diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index d383536..2b3cece 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -988,8 +988,7 @@ function pkg_search_page($SID="") { * Flag and un-flag packages out-of-date * * @param string $atype Account type, output of account_from_sid - * @param array $ids Array of package IDs to flag/unflag, formatted as - * $package_id => $useless_crap + * @param array $ids Array of package IDs to flag/unflag * @param boolean $action True flags out-of-date, false un-flags. Flags by * default * @@ -1012,7 +1011,7 @@ function pkg_flag ($atype, $ids, $action = True) { } } - foreach ($ids as $pid => $v) { + foreach ($ids as $pid) { if (!is_numeric($pid)) { if ($action) { return __("You did not select any packages to flag."); @@ -1025,7 +1024,7 @@ function pkg_flag ($atype, $ids, $action = True) { $dbh = db_connect(); $first = 1; - foreach ($ids as $pid => $v) { + foreach ($ids as $pid) { if ($first) { $first = 0; $flag = $pid; @@ -1073,8 +1072,7 @@ function pkg_flag ($atype, $ids, $action = True) { * Delete packages * * @param string $atype Account type, output of account_from_sid - * @param array $ids Array of package IDs to delete, formatted as - * $package_id => $useless_crap + * @param array $ids Array of package IDs to delete * * @return string Translated error or success message */ @@ -1094,7 +1092,7 @@ function pkg_delete ($atype, $ids) { # Delete the packages in $ids array # $first = 1; - foreach ($ids as $pid => $v) { + foreach ($ids as $pid) { if ($first) { $first = 0; $delete = $pid; @@ -1155,8 +1153,7 @@ function pkg_delete ($atype, $ids) { * Adopt or disown packages * * @param string $atype Account type, output of account_from_sid - * @param array $ids Array of package IDs to adopt/disown, formatted as - * $package_id => $whatever + * @param array $ids Array of package IDs to adopt/disown * @param boolean $action Adopts if true, disowns if false. Adopts by default * * @return string Translated error or success message @@ -1181,7 +1178,7 @@ function pkg_adopt ($atype, $ids, $action = True) { $dbh = db_connect(); $first = 1; - foreach ($ids as $pid => $v) { + foreach ($ids as $pid) { if ($first) { $first = 0; $pkg = $pid; @@ -1223,8 +1220,7 @@ function pkg_adopt ($atype, $ids, $action = True) { * Vote and un-vote for packages * * @param string $atype Account type, output of account_from_sid - * @param array $ids Array of package IDs to vote/un-vote, formatted as - * $package_id => $useless + * @param array $ids Array of package IDs to vote/un-vote * @param boolean $action Votes if true, un-votes if false. Votes by default * * @return string Translated error or success message @@ -1251,7 +1247,7 @@ function pkg_vote ($atype, $ids, $action = True) { $uid = uid_from_sid($_COOKIE["AURSID"]); $first = 1; - foreach ($ids as $pid => $v) { + foreach ($ids as $pid) { if ($action) { $check = !isset($my_votes[$pid]); } else { @@ -1310,8 +1306,7 @@ function pkg_vote ($atype, $ids, $action = True) { * Toggle notification of packages * * @param string $atype Account type, output of account_from_sid - * @param array $ids Array of package IDs to toggle, formatted as $package_id => $crap - * + * @param array $ids Array of package IDs to toggle, formatted as $package_id * @return string Translated error or success message */ function pkg_notify ($atype, $ids, $action = True) { @@ -1333,7 +1328,7 @@ function pkg_notify ($atype, $ids, $action = True) { # There currently shouldn't be multiple requests here, but the # format in which it's sent requires this. - foreach ($ids as $pid => $v) { + foreach ($ids as $pid) { $q = "SELECT Name FROM Packages WHERE ID = $pid"; $pkgname = mysql_result(db_query($q, $dbh), 0); -- 1.6.0.2

2 2

[aur-dev] [PATCH] Add error checking to chmod on package submission
by Callan Barrett 20 Dec '08

20 Dec '08

Try submitting an empty form to the aur Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/html/pkgsubmit.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 4446648..93d4456 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -241,7 +241,7 @@ if ($_COOKIE["AURSID"]): } # Chmod files after everything has been done. - if (!chmod_group($incoming_pkgdir)) { + if (!error && !chmod_group($incoming_pkgdir)) { $error = __("Could not chmod directory %s.", $incoming_pkgdir); } -- 1.6.0.2

2 1

[aur-dev] [PATCH] Remove the english includes from the main translation files
by Callan Barrett 20 Dec '08

20 Dec '08

Is that what they're called? I have no idea I'm not good with computers Signed-off-by: Callan Barrett <wizzomafizzo(a)gmail.com> --- web/lang/account_po.inc | 2 -- web/lang/acctfuncs_po.inc | 2 -- web/lang/aur_po.inc | 2 -- web/lang/common_po.inc | 2 -- web/lang/index_po.inc | 2 -- web/lang/logout_po.inc | 2 -- web/lang/pkgedit_po.inc | 2 -- web/lang/pkgfuncs_po.inc | 2 -- web/lang/search_po.inc | 2 -- web/lang/submit_po.inc | 2 -- 10 files changed, 0 insertions(+), 20 deletions(-) diff --git a/web/lang/account_po.inc b/web/lang/account_po.inc index 81a8e7f..fc23194 100644 --- a/web/lang/account_po.inc +++ b/web/lang/account_po.inc @@ -11,8 +11,6 @@ include_once("translator.inc"); global $_t; -include_once("en/account_po.inc"); - include_once("pl/account_po.inc"); include_once("it/account_po.inc"); diff --git a/web/lang/acctfuncs_po.inc b/web/lang/acctfuncs_po.inc index 73c9421..5bfbf0a 100644 --- a/web/lang/acctfuncs_po.inc +++ b/web/lang/acctfuncs_po.inc @@ -11,8 +11,6 @@ include_once("translator.inc"); global $_t; -include_once("en/acctfuncs_po.inc"); - include_once("pl/acctfuncs_po.inc"); include_once("it/acctfuncs_po.inc"); diff --git a/web/lang/aur_po.inc b/web/lang/aur_po.inc index 5ea6a41..b08e241 100644 --- a/web/lang/aur_po.inc +++ b/web/lang/aur_po.inc @@ -11,8 +11,6 @@ include_once("translator.inc"); global $_t; -include_once("en/aur_po.inc"); - include_once("pl/aur_po.inc"); include_once("it/aur_po.inc"); diff --git a/web/lang/common_po.inc b/web/lang/common_po.inc index d458b34..43237c2 100644 --- a/web/lang/common_po.inc +++ b/web/lang/common_po.inc @@ -11,8 +11,6 @@ include_once("translator.inc"); global $_t; -include_once("en/common_po.inc"); - include_once("pl/common_po.inc"); include_once("it/common_po.inc"); diff --git a/web/lang/index_po.inc b/web/lang/index_po.inc index 606c6a3..5e783a7 100644 --- a/web/lang/index_po.inc +++ b/web/lang/index_po.inc @@ -11,8 +11,6 @@ include_once("translator.inc"); global $_t; -include_once("en/index_po.inc"); - include_once("pl/index_po.inc"); include_once("it/index_po.inc"); diff --git a/web/lang/logout_po.inc b/web/lang/logout_po.inc index a34be70..471f53e 100644 --- a/web/lang/logout_po.inc +++ b/web/lang/logout_po.inc @@ -11,8 +11,6 @@ include_once("translator.inc"); global $_t; -include_once("en/logout_po.inc"); - include_once("pl/logout_po.inc"); include_once("it/logout_po.inc"); diff --git a/web/lang/pkgedit_po.inc b/web/lang/pkgedit_po.inc index c5fb9ce..b471d9b 100644 --- a/web/lang/pkgedit_po.inc +++ b/web/lang/pkgedit_po.inc @@ -11,8 +11,6 @@ include_once("translator.inc"); global $_t; -include_once("en/pkgedit_po.inc"); - include_once("pl/pkgedit_po.inc"); include_once("it/pkgedit_po.inc"); diff --git a/web/lang/pkgfuncs_po.inc b/web/lang/pkgfuncs_po.inc index 566d31d..5868f45 100644 --- a/web/lang/pkgfuncs_po.inc +++ b/web/lang/pkgfuncs_po.inc @@ -11,8 +11,6 @@ include_once("translator.inc"); global $_t; -include_once("en/pkgfuncs_po.inc"); - include_once("pl/pkgfuncs_po.inc"); include_once("it/pkgfuncs_po.inc"); diff --git a/web/lang/search_po.inc b/web/lang/search_po.inc index e2108e7..92c9589 100644 --- a/web/lang/search_po.inc +++ b/web/lang/search_po.inc @@ -11,8 +11,6 @@ include_once("translator.inc"); global $_t; -include_once("en/search_po.inc"); - include_once("pl/search_po.inc"); include_once("it/search_po.inc"); diff --git a/web/lang/submit_po.inc b/web/lang/submit_po.inc index 2f9ddb6..60a2041 100644 --- a/web/lang/submit_po.inc +++ b/web/lang/submit_po.inc @@ -11,8 +11,6 @@ include_once("translator.inc"); global $_t; -include_once("en/submit_po.inc"); - include_once("pl/submit_po.inc"); include_once("it/submit_po.inc"); -- 1.6.0.2

2 1

[aur-dev] [PATCH] Revert "Move call to try_login to login_form."
by Callan Barrett 20 Dec '08

20 Dec '08

This reverts commit 77d93c4946fabcda417b6a5672d881c64e11fb78. --- web/lib/aur.inc | 3 +++ web/template/login_form.php | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/web/lib/aur.inc b/web/lib/aur.inc index 3d0f3e0..e43ddf6 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -343,6 +343,9 @@ function html_header($title="") { global $LANG; global $SUPPORTED_LANGS; + $login = try_login(); + $login_error = $login['error']; + $title = htmlspecialchars($title, ENT_QUOTES); include('header.php'); diff --git a/web/template/login_form.php b/web/template/login_form.php index e1192c0..70c24c7 100644 --- a/web/template/login_form.php +++ b/web/template/login_form.php @@ -1,9 +1,3 @@ -<?php -include_once('acctfuncs.inc'); -$login = try_login(); -$login_error = $login['error']; -?> - <span id="login_bar"> <?php if (isset($_COOKIE["AURSID"])) { -- 1.6.0.2

2 2

[aur-dev] [PATCH] Rename 'Un-Vote' and 'Unflag' buttons.
by Nathan Jones 20 Dec '08

20 Dec '08

This is to be consistent with 'UnNotify'. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- web/lib/pkgfuncs.inc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc index 1517cfc..d383536 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc @@ -485,7 +485,7 @@ function package_details($id=0, $SID="") { echo " value='".__("Vote")."'>"; } else { echo "<input type='submit' class='button' name='do_UnVote'"; - echo " value='".__("Un-Vote")."'>"; + echo " value='".__("UnVote")."'>"; } # Comment Nofify Button # @@ -504,7 +504,7 @@ function package_details($id=0, $SID="") { echo " value='".__("Flag Out-of-date")."'>\n"; } else { echo "<input type='submit' class='button' name='do_UnFlag'"; - echo " value='".__("Unflag Out-of-date")."'>\n"; + echo " value='".__("UnFlag Out-of-date")."'>\n"; } if ($row["MaintainerUID"] == 0) { -- 1.6.0.4

3 8

[aur-dev] Ready to release 1.5.3
by Loui Chang 17 Dec '08

17 Dec '08

I believe 1.5.3 is ready for tag and release. Does anyone have anything to add?

3 4

[aur-dev] [PATCH] Added italian translation to the tu_po.inc file
by Giovanni Scafora 12 Dec '08

12 Dec '08

Hi guys, there's a patch for adding italian translation to the tu_po.inc file. Please, push it. -- Arch Linux Developer (voidnull) AUR & Pacman Italian Translations Microdia Developer http://www.archlinux.it

2 1

[aur-dev] [PATCH] Updated french translation
by Cilyan Olowen 12 Dec '08

12 Dec '08

Hello, Here is an update for the french translation of Aur. I had the following messages at the end of translation_tool, don't know if it's important : Warning: common entry 'Update' is only used once. Warning: common entry 'Password' is only used once. Warning: common entry 'Create' is only used once. Warning: unused common entry 'Clear'. Regards Cilyan

2 1

[aur-dev] [PATCH] Italian translation: small fixes and improvements
by Giovanni Scafora 11 Dec '08

11 Dec '08

Hi guys, please push this patch. Thanks. -- Arch Linux Developer (voidnull) AUR & Pacman Italian Translations Microdia Developer http://www.archlinux.it

2 1