--- .gitignore | 1 + TRANSLATING | 2 +- web/README | 4 ++-- web/html/account.php | 4 ++-- web/html/addvote.php | 2 +- web/html/index.php | 4 ++-- web/html/logout.php | 4 ++-- web/html/packages.php | 8 ++++---- web/html/passreset.php | 2 +- web/html/pkgsubmit.php | 6 +++--- web/html/rss.php | 2 +- web/html/tu.php | 2 +- web/html/voters.php | 4 ++-- web/lib/{acctfuncs.inc => acctfuncs.inc.php} | 0 web/lib/{aur.inc => aur.inc.php} | 8 ++++---- web/lib/aurjson.class.php | 2 +- web/lib/{config.inc.proto => config.inc.php.proto} | 0 web/lib/{pkgfuncs.inc => pkgfuncs.inc.php} | 2 +- web/lib/{stats.inc => stats.inc.php} | 2 +- web/lib/{translator.inc => translator.inc.php} | 2 +- web/lib/{version.inc => version.inc.php} | 0 web/template/pkg_search_form.php | 2 +- web/template/template.phps | 4 ++-- 23 files changed, 34 insertions(+), 33 deletions(-) rename web/lib/{acctfuncs.inc => acctfuncs.inc.php} (100%) rename web/lib/{aur.inc => aur.inc.php} (99%) rename web/lib/{config.inc.proto => config.inc.php.proto} (100%) rename web/lib/{pkgfuncs.inc => pkgfuncs.inc.php} (99%) rename web/lib/{stats.inc => stats.inc.php} (98%) rename web/lib/{translator.inc => translator.inc.php} (97%) rename web/lib/{version.inc => version.inc.php} (100%) diff --git a/.gitignore b/.gitignore index b1fb977..11e9b7e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ robots.txt *.swp web/lib/config.inc +web/lib/config.inc.php *.DS_Store web/html/xml/*.xml dummy-data.sql* diff --git a/TRANSLATING b/TRANSLATING index 56b3383..d8f1bd4 100644 --- a/TRANSLATING +++ b/TRANSLATING @@ -38,7 +38,7 @@ $ msginit -l <locale> -o <locale>.po -i aur.pot $ poedit <locale>.po 5. If you have a working AUR setup, add a line for the new translation in - "web/lib/config.inc.proto" and test if everything looks right. + "web/lib/config.inc.php.proto" and test if everything looks right. 6. Upload the newly created ".po" file to Transifex. If you don't like the web interface, you can also use transifex-client to do that (see below). diff --git a/web/README b/web/README index 9bd3ecb..b8d1b72 100644 --- a/web/README +++ b/web/README @@ -97,9 +97,9 @@ Setup on Arch Linux: can insert garbage addresses with: mysql> UPDATE Users SET Email = RAND() * RAND(); -7) Copy the config.inc.proto file to config.inc. Modify as needed. +7) Copy the config.inc.php.proto file to config.inc.php. Modify as needed. # cd ~/aur/web/lib/ - # cp config.inc.proto config.inc + # cp config.inc.php.proto config.inc.php 8) Point your browser to http://aur diff --git a/web/html/account.php b/web/html/account.php index afb0d7c..ca05d1a 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -2,8 +2,8 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include_once('aur.inc'); # access AUR common functions -include_once('acctfuncs.inc'); # access Account specific functions +include_once('aur.inc.php'); # access AUR common functions +include_once('acctfuncs.inc.php'); # access Account specific functions set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in diff --git a/web/html/addvote.php b/web/html/addvote.php index a459610..fe3037d 100644 --- a/web/html/addvote.php +++ b/web/html/addvote.php @@ -2,7 +2,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include_once("aur.inc"); +include_once("aur.inc.php"); set_lang(); check_sid(); html_header(); diff --git a/web/html/index.php b/web/html/index.php index 33c39eb..ffc5f00 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -2,11 +2,11 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include_once("aur.inc"); +include_once("aur.inc.php"); set_lang(); check_sid(); -include_once('stats.inc'); +include_once('stats.inc.php'); html_header( __("Home") ); diff --git a/web/html/logout.php b/web/html/logout.php index 95cf460..dee6456 100644 --- a/web/html/logout.php +++ b/web/html/logout.php @@ -2,8 +2,8 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include_once("aur.inc"); # access AUR common functions -include_once("acctfuncs.inc"); # access AUR common functions +include_once("aur.inc.php"); # access AUR common functions +include_once("acctfuncs.inc.php"); # access AUR common functions # if they've got a cookie, log them out - need to do this before diff --git a/web/html/packages.php b/web/html/packages.php index abc6637..4a1fa88 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -2,10 +2,10 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include_once("aur.inc"); # access AUR common functions -set_lang(); # this sets up the visitor's language -include_once('pkgfuncs.inc'); # package specific functions -check_sid(); # see if they're still logged in +include_once("aur.inc.php"); # access AUR common functions +set_lang(); # this sets up the visitor's language +include_once('pkgfuncs.inc.php'); # package specific functions +check_sid(); # see if they're still logged in # Set the title to the current query if required if (isset($_GET['ID']) && ($pkgname = pkgname_from_id($_GET['ID']))) { diff --git a/web/html/passreset.php b/web/html/passreset.php index 0ce6f7d..ed5d4d3 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -2,7 +2,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include_once("aur.inc"); # access AUR common functions +include_once("aur.inc.php"); # access AUR common functions set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 26608ea..b5fe3b7 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -1,12 +1,12 @@ <?php set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include_once("config.inc"); +include_once("config.inc.php"); require_once('Archive/Tar.php'); -include_once("aur.inc"); # access AUR common functions -include_once("pkgfuncs.inc"); # package functions +include_once("aur.inc.php"); # access AUR common functions +include_once("pkgfuncs.inc.php"); # package functions set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in diff --git a/web/html/rss.php b/web/html/rss.php index 1f808b6..c7de4c6 100644 --- a/web/html/rss.php +++ b/web/html/rss.php @@ -1,7 +1,7 @@ <?php set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR . '../lang'); -include_once("aur.inc"); +include_once("aur.inc.php"); include_once("feedcreator.class.php"); #detect prefix diff --git a/web/html/tu.php b/web/html/tu.php index 6ab8ae9..6e202c8 100644 --- a/web/html/tu.php +++ b/web/html/tu.php @@ -2,7 +2,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include_once("aur.inc"); +include_once("aur.inc.php"); set_lang(); check_sid(); html_header(); diff --git a/web/html/voters.php b/web/html/voters.php index 6a16818..aa2aa50 100644 --- a/web/html/voters.php +++ b/web/html/voters.php @@ -1,7 +1,7 @@ <?php set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include('aur.inc'); -include('pkgfuncs.inc'); +include('aur.inc.php'); +include('pkgfuncs.inc.php'); function getvotes($pkgid) { $dbh = db_connect(); diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc.php similarity index 100% rename from web/lib/acctfuncs.inc rename to web/lib/acctfuncs.inc.php diff --git a/web/lib/aur.inc b/web/lib/aur.inc.php similarity index 99% rename from web/lib/aur.inc rename to web/lib/aur.inc.php index c31c3e9..7cf43e6 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc.php @@ -7,12 +7,12 @@ header('Pragma: no-cache'); date_default_timezone_set('UTC'); -include_once('translator.inc'); +include_once('translator.inc.php'); set_lang(); -include_once("config.inc"); -include_once("version.inc"); -include_once("acctfuncs.inc"); +include_once("config.inc.php"); +include_once("version.inc.php"); +include_once("acctfuncs.inc.php"); # Check if APC extension is loaded, and set cache prefix if it is if (!defined('EXTENSION_LOADED_APC')) { diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 0f8e2fa..5d15b89 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -4,7 +4,7 @@ * * This file contains the AurRPC remote handling class **/ -include_once("aur.inc"); +include_once("aur.inc.php"); /** * This class defines a remote interface for fetching data diff --git a/web/lib/config.inc.proto b/web/lib/config.inc.php.proto similarity index 100% rename from web/lib/config.inc.proto rename to web/lib/config.inc.php.proto diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc.php similarity index 99% rename from web/lib/pkgfuncs.inc rename to web/lib/pkgfuncs.inc.php index 2024aeb..7d46541 100644 --- a/web/lib/pkgfuncs.inc +++ b/web/lib/pkgfuncs.inc.php @@ -1,5 +1,5 @@ <?php -include_once("config.inc"); +include_once("config.inc.php"); # Make sure this visitor can delete the requested package comment # They can delete if they were the comment submitter, or if they are a TU/Dev diff --git a/web/lib/stats.inc b/web/lib/stats.inc.php similarity index 98% rename from web/lib/stats.inc rename to web/lib/stats.inc.php index 67fbdca..2690a5c 100644 --- a/web/lib/stats.inc +++ b/web/lib/stats.inc.php @@ -1,6 +1,6 @@ <?php -include_once('aur.inc'); +include_once('aur.inc.php'); function updates_table($dbh) { diff --git a/web/lib/translator.inc b/web/lib/translator.inc.php similarity index 97% rename from web/lib/translator.inc rename to web/lib/translator.inc.php index 903b061..44c87bd 100644 --- a/web/lib/translator.inc +++ b/web/lib/translator.inc.php @@ -12,7 +12,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib' . PATH_SEPARATOR # print __("%s has %s apples.", "Bill", "5"); # print __("This is a %hmajor%h problem!", "<b>", "</b>"); -include_once('config.inc'); +include_once('config.inc.php'); include_once('gettext.php'); include_once('streams.php'); diff --git a/web/lib/version.inc b/web/lib/version.inc.php similarity index 100% rename from web/lib/version.inc rename to web/lib/version.inc.php diff --git a/web/template/pkg_search_form.php b/web/template/pkg_search_form.php index 281cdc3..53d34fe 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -1,4 +1,4 @@ -<?php include_once('pkgfuncs.inc') ?> +<?php include_once('pkgfuncs.inc.php') ?> <div class='pgbox'> <form action='packages.php' method='get'> diff --git a/web/template/template.phps b/web/template/template.phps index 591a03c..841277b 100644 --- a/web/template/template.phps +++ b/web/template/template.phps @@ -4,14 +4,14 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); -include("aur.inc"); # access AUR common functions +include("aur.inc.php"); # access AUR common functions 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 # Any text you print out to the visitor, use the __() function -# for i18n support. See web/lib/translator.inc for more info. +# for i18n support. See web/lib/translator.inc.php for more info. # print __("Hi, this is worth reading!")."<br />\n"; -- 1.7.2.5