- Aur-dev - lists.archlinux.org

[aur-dev] dummy-data.sql
by Marcel Korpel 11 Dec '12

11 Dec '12

Hi, As FS#32986 isn't resolved yet, I can't test my typeahead-suggest script. Can someone please send me (off-list) a correct version of dummy-data.sql? Regards, Marcel

3 5

[aur-dev] [PATCH] Changed 'Dutch' to 'Nederlands'
by Marcel Korpel 09 Dec '12

09 Dec '12

AFAIK all languages are called in their own language. Only Dutch is in English. Changing Dutch to Dutch. --- web/lib/translator.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/translator.inc.php b/web/lib/translator.inc.php index 2093cf7..1477b17 100644 --- a/web/lib/translator.inc.php +++ b/web/lib/translator.inc.php @@ -33,7 +33,7 @@ $SUPPORTED_LANGS = array( "hu" => "Magyar", "it" => "Italiano", "nb" => "Norsk", - "nl" => "Dutch", + "nl" => "Nederlands", "pl" => "Polski", "pt_BR" => "Português (Brasil)", "pt_PT" => "Português (Portugal)", -- 1.8.0.1

2 1

[aur-dev] [PATCH] INSTALL: Allow access to home directory
by Marcel Korpel 07 Dec '12

07 Dec '12

--- INSTALL | 3 +++ 1 file changed, 3 insertions(+) diff --git a/INSTALL b/INSTALL index 76df42b..d682eda 100644 --- a/INSTALL +++ b/INSTALL @@ -69,6 +69,9 @@ Setup on Arch Linux: $ mysql -uaur -p AUR < ~/aur/support/schema/aur-schema.sql (give password 'aur' at the prompt) + - Allow access to home directory (otherwise you'll get a 403 Forbidden error) + $ chmod o+x $HOME + - Optionally load some test data for development purposes. # pacman -S words fortune-mod $ cd ~/aur/support/schema/ -- 1.8.0.1

3 3

[aur-dev] [PATCH] INSTALL: Change # to $ where possible
by Marcel Korpel 07 Dec '12

07 Dec '12

This overrides my earlier patch 'INSTALL: Added MYUSER (needed from root)' --- INSTALL | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/INSTALL b/INSTALL index 91aa3da..76df42b 100644 --- a/INSTALL +++ b/INSTALL @@ -57,24 +57,24 @@ Setup on Arch Linux: # mysqladmin -p create AUR - Connect to the mysql client - # mysql -uroot -p AUR + $ mysql -uroot -p AUR - Issue the following commands to the mysql client mysql> GRANT ALL PRIVILEGES ON AUR.* to aur@localhost - > identified by 'aur'; + -> identified by 'aur'; mysql> FLUSH PRIVILEGES; mysql> quit - Load the schema file - # mysql -uaur -p AUR < ~/aur/support/schema/aur-schema.sql + $ mysql -uaur -p AUR < ~/aur/support/schema/aur-schema.sql (give password 'aur' at the prompt) - Optionally load some test data for development purposes. # pacman -S words fortune-mod - # cd ~/aur/support/schema/ - # python gendummydata.py dummy-data.sql - # bzip2 dummy-data.sql - # bzcat dummy-data.sql.bz2 | mysql -uaur -p AUR + $ cd ~/aur/support/schema/ + $ python gendummydata.py dummy-data.sql + $ bzip2 dummy-data.sql + $ bzcat dummy-data.sql.bz2 | mysql -uaur -p AUR (give password 'aur' at the prompt) If your test data consists of real people and real email addresses consider @@ -83,7 +83,7 @@ Setup on Arch Linux: mysql> UPDATE Users SET Email = RAND() * RAND(); 7) Copy the config.inc.php.proto file to config.inc.php. Modify as needed. - # cd ~/aur/web/lib/ - # cp config.inc.php.proto config.inc.php + $ cd ~/aur/web/lib/ + $ cp config.inc.php.proto config.inc.php 8) Point your browser to http://aur -- 1.8.0.1

3 2

[aur-dev] [PATCH] INSTALL: Current PHP has JSON support without extension
by Marcel Korpel 07 Dec '12

07 Dec '12

--- INSTALL | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/INSTALL b/INSTALL index a26dce9..3bc25d8 100644 --- a/INSTALL +++ b/INSTALL @@ -44,12 +44,10 @@ Setup on Arch Linux: 5) Configure PHP Make sure you have mysql and json enabled in PHP. - - Edit php.ini and uncomment/add these lines: + - Edit php.ini and uncomment/add this line: extension=pdo_mysql.so - extension=json.so - If those php extensions are separate packages on your system, install - them. + If this PHP extension is a separate package on your system, install it. 6) Configure MySQL - Start the MySQL service. Example: -- 1.8.0.1

2 1

[aur-dev] [PATCH] INSTALL: Update required dummy data packages
by canyonknight 07 Dec '12

07 Dec '12

Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 1a41066..047cfc4 100644 --- a/INSTALL +++ b/INSTALL @@ -72,7 +72,7 @@ Setup on Arch Linux: (give password 'aur' at the prompt) - Optionally load some test data for development purposes. - # pacman -S words mysql-python + # pacman -S words fortune-mod # cd ~/aur/support/schema/ # python gendummydata.py dummy-data.sql # bzip2 dummy-data.sql -- 1.8.0.1

2 1

[aur-dev] [PATCH] systemd compatibility
by Marcel Korpel 07 Dec '12

07 Dec '12

--- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index afab274..1a41066 100644 --- a/INSTALL +++ b/INSTALL @@ -53,7 +53,7 @@ Setup on Arch Linux: 6) Configure MySQL - Start the MySQL service. Example: - # /etc/rc.d/mysqld start + # systemctl start mysqld - Create database # mysqladmin -p create AUR -- 1.8.0.1

2 1

[aur-dev] Some issues after installing AUR locally
by Marcel Korpel 07 Dec '12

07 Dec '12

Hi all, After following the instructions and giving Apache access to my home directory, I managed to go to the local AUR home page. However, apart from not having dummy data, I have some issues: 1) There's a message above the page saying "Notice: Undefined index: PATH_INFO in /home/mk/archdev/aur/web/html/index.php on line 7". I checked with a php_info() command and it's indeed not present. 2) http://aur/packages/, aur/register/, and aur/login/ are not available (though packages.php is). Should I set some option in my config files? 3) Now http://aur and http://localhost point to the same page (the AUR home page). Is there a method to be able to point http://localhost back to /srv/http (without losing http://aur)? Thanks in advance! Regards, Marcel

2 3

[aur-dev] [PATCH] Split package flagging and unflagging into separate functions
by canyonknight 06 Dec '12

06 Dec '12

Currently, package flagging and unflagging takes place within the pkg_flag() function. A bool is set to true or false depending on the action. Create new pkg_unflag() function with sole purpose of unflagging and keep pkg_flag() in place. This split will be useful in the overhaul of the notification system. Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/html/packages.php | 4 +-- web/lib/pkgfuncs.inc.php | 74 ++++++++++++++++++++++++++++-------------------- 2 files changed, 45 insertions(+), 33 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 094c221..6182550 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -51,9 +51,9 @@ if (isset($_POST['IDs'])) { $output = ""; if (check_token()) { if (current_action("do_Flag")) { - $output = pkg_flag($atype, $ids, true); + $output = pkg_flag($atype, $ids); } elseif (current_action("do_UnFlag")) { - $output = pkg_flag($atype, $ids, False); + $output = pkg_unflag($atype, $ids); } elseif (current_action("do_Adopt")) { $output = pkg_adopt($atype, $ids, true); } elseif (current_action("do_Disown")) { diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index cfdd9a7..c00c33d 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -772,33 +772,24 @@ function sanitize_ids($ids) { } /** - * Flag and un-flag packages out-of-date + * Flag package(s) as out-of-date * * @global string $AUR_LOCATION The AUR's URL used for notification e-mails * @param string $atype Account type, output of account_from_sid * @param array $ids Array of package IDs to flag/unflag - * @param bool $action true flags out-of-date, false un-flags. Flags by default * * @return string Translated success or error messages */ -function pkg_flag ($atype, $ids, $action=true, $dbh=NULL) { +function pkg_flag($atype, $ids, $dbh=NULL) { global $AUR_LOCATION; if (!$atype) { - if ($action) { - return __("You must be logged in before you can flag packages."); - } else { - return __("You must be logged in before you can unflag packages."); - } + return __("You must be logged in before you can flag packages."); } $ids = sanitize_ids($ids); if (empty($ids)) { - if ($action) { - return __("You did not select any packages to flag."); - } else { - return __("You did not select any packages to unflag."); - } + return __("You did not select any packages to flag."); } if(!$dbh) { @@ -806,25 +797,13 @@ function pkg_flag ($atype, $ids, $action=true, $dbh=NULL) { } $q = "UPDATE Packages SET"; - if ($action) { - $q.= " OutOfDateTS = UNIX_TIMESTAMP()"; - } - else { - $q.= " OutOfDateTS = NULL"; - } + $q.= " OutOfDateTS = UNIX_TIMESTAMP()"; $q.= " WHERE ID IN (" . implode(",", $ids) . ")"; - - if (!$action && ($atype != "Trusted User" && $atype != "Developer")) { - $q.= "AND MaintainerUID = " . uid_from_sid($_COOKIE["AURSID"], $dbh); - } - - if ($action) { - $q.= " AND OutOfDateTS IS NULL"; - } + $q.= " AND OutOfDateTS IS NULL"; $affected_pkgs = $dbh->exec($q); - if ($action && $affected_pkgs > 0) { + if ($affected_pkgs > 0) { # Notify of flagging by email $f_name = username_from_sid($_COOKIE['AURSID'], $dbh); $f_email = email_from_sid($_COOKIE['AURSID'], $dbh); @@ -846,9 +825,42 @@ function pkg_flag ($atype, $ids, $action=true, $dbh=NULL) { } } - if ($action) { - return __("The selected packages have been flagged out-of-date."); - } else { + return __("The selected packages have been flagged out-of-date."); +} + +/** + * Unflag package(s) as out-of-date + * + * @param string $atype Account type, output of account_from_sid + * @param array $ids Array of package IDs to flag/unflag + * + * @return string Translated success or error messages + */ +function pkg_unflag($atype, $ids, $dbh=NULL) { + if (!$atype) { + return __("You must be logged in before you can unflag packages."); + } + + $ids = sanitize_ids($ids); + if (empty($ids)) { + return __("You did not select any packages to unflag."); + } + + if(!$dbh) { + $dbh = db_connect(); + } + + $q = "UPDATE Packages SET "; + $q.= "OutOfDateTS = NULL "; + $q.= "WHERE ID IN (" . implode(",", $ids) . ") "; + + if ($atype != "Trusted User" && $atype != "Developer") { + $q.= "AND MaintainerUID = " . uid_from_sid($_COOKIE["AURSID"], $dbh); + } + + $result = $dbh->exec($q); + + if ($result) { return __("The selected packages have been unflagged."); } } -- 1.8.0.1

1 0

[aur-dev] INSTALL: Added MYUSER (needed from root)
by Marcel Korpel 05 Dec '12

05 Dec '12

--- INSTALL | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index 1a41066..a26dce9 100644 --- a/INSTALL +++ b/INSTALL @@ -63,17 +63,17 @@ Setup on Arch Linux: - Issue the following commands to the mysql client mysql> GRANT ALL PRIVILEGES ON AUR.* to aur@localhost - > identified by 'aur'; + -> identified by 'aur'; mysql> FLUSH PRIVILEGES; mysql> quit - Load the schema file - # mysql -uaur -p AUR < ~/aur/support/schema/aur-schema.sql + # mysql -uaur -p AUR < ~MYUSER/aur/support/schema/aur-schema.sql (give password 'aur' at the prompt) - Optionally load some test data for development purposes. - # pacman -S words mysql-python - # cd ~/aur/support/schema/ + # pacman -S words fortune-mod + # cd ~MYUSER/aur/support/schema/ # python gendummydata.py dummy-data.sql # bzip2 dummy-data.sql # bzcat dummy-data.sql.bz2 | mysql -uaur -p AUR @@ -85,7 +85,7 @@ Setup on Arch Linux: mysql> UPDATE Users SET Email = RAND() * RAND(); 7) Copy the config.inc.php.proto file to config.inc.php. Modify as needed. - # cd ~/aur/web/lib/ + # cd ~MYUSER/aur/web/lib/ # cp config.inc.php.proto config.inc.php 8) Point your browser to http://aur -- 1.8.0.1

2 2