From 888db089c515270fd5cd9a9bedd217110f43bc4c Mon Sep 17 00:00:00 2001 From: elij Date: Sun, 29 May 2011 14:33:37 -0700 Subject: [PATCH] rename *.inc files to *.inc.php and adjust imports and references Lukas: Add note to "UPGRADING". Signed-off-by: Lukas Fleischer --- .gitignore | 1 + TRANSLATING | 2 +- UPGRADING | 4 +++- 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 ++-- 24 files changed, 37 insertions(+), 34 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 b1fb977e..11e9b7e7 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 56b33831..d8f1bd44 100644 --- a/TRANSLATING +++ b/TRANSLATING @@ -38,7 +38,7 @@ $ msginit -l -o .po -i aur.pot $ poedit .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/UPGRADING b/UPGRADING index 813f87f4..ad7ad96c 100644 --- a/UPGRADING +++ b/UPGRADING @@ -13,7 +13,9 @@ each AUR upgrade by running `make install` in the "po/" directory. ALTER TABLE Users DROP COLUMN NewPkgNotify; ---- -3. Merge "web/lib/config.inc.proto" with "web/lib/config.inc". +3. Rename "web/lib/config.inc" to "web/lib/config.inc.php". + +4. Merge "web/lib/config.inc.php.proto" with "web/lib/config.inc.php". From 1.8.1 to 1.8.2 ------------------- diff --git a/web/README b/web/README index 9bd3ecb9..b8d1b72f 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 afb0d7cc..ca05d1ac 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 a4596105..fe3037d5 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 33c39eb7..ffc5f008 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 95cf4600..dee6456a 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 abc66377..4a1fa881 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 0ce6f7da..ed5d4d31 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 26608ead..b5fe3b7e 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -1,12 +1,12 @@ ", ""); -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 281cdc3f..53d34fe3 100644 --- a/web/template/pkg_search_form.php +++ b/web/template/pkg_search_form.php @@ -1,4 +1,4 @@ - +
diff --git a/web/template/template.phps b/web/template/template.phps index 591a03ca..841277b8 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!")."
\n";