From 6102759b7cb9fd23f4e7fa5f12137334ff30a410 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Fri, 21 Sep 2012 08:57:29 +0200 Subject: Use echo shortcut syntax Replace all occurrences of " --- UPGRADING | 2 + web/html/addvote.php | 20 +++---- web/html/home.php | 16 ++--- web/html/login.php | 24 ++++---- web/html/packages.php | 2 +- web/html/passreset.php | 18 +++--- web/html/pkgsubmit.php | 18 +++--- web/html/tu.php | 6 +- web/html/voters.php | 4 +- web/template/account_details.php | 28 ++++----- web/template/account_edit_form.php | 58 +++++++++--------- web/template/account_search_results.php | 42 ++++++------- web/template/actions_form.php | 26 ++++---- web/template/footer.php | 4 +- web/template/header.php | 30 +++++----- web/template/pkg_comment_form.php | 12 ++-- web/template/pkg_comments.php | 18 +++--- web/template/pkg_details.php | 96 +++++++++++++++--------------- web/template/pkg_search_form.php | 50 ++++++++-------- web/template/pkg_search_results.php | 80 ++++++++++++------------- web/template/search_accounts_form.php | 38 ++++++------ web/template/stats/general_stats_table.php | 34 +++++------ web/template/stats/updates_table.php | 8 +-- web/template/stats/user_table.php | 12 ++-- web/template/tu_details.php | 52 ++++++++-------- web/template/tu_list.php | 36 +++++------ 26 files changed, 368 insertions(+), 366 deletions(-) diff --git a/UPGRADING b/UPGRADING index f1d43f1..1d7d5cf 100644 --- a/UPGRADING +++ b/UPGRADING @@ -17,6 +17,8 @@ ALTER TABLE Users ADD COLUMN PGPKey VARCHAR(40) NULL DEFAULT NULL; 4. Enable the PDO MySQL extension (pdo_mysql.so) in "php.ini". +5. Upgrade to PHP>=5.4.0 or enable "short_open_tag" in "php.ini". + From 1.9.0 to 1.9.1 ------------------- diff --git a/web/html/addvote.php b/web/html/addvote.php index d1cd809..5575031 100644 --- a/web/html/addvote.php +++ b/web/html/addvote.php @@ -62,29 +62,29 @@ if ($atype == "Trusted User" || $atype == "Developer") { ?> -

+

-

+

-
+

- + - +

- + - +

-
+

- - " /> + + " />

diff --git a/web/html/home.php b/web/html/home.php index 8fecfd4..3050bd1 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -17,7 +17,7 @@ $dbh = db_connect();
-

AUR

+

AUR

- - + +

-

+

-

+

- : + :
- +
@@ -91,7 +91,7 @@ $dbh = db_connect();
-
+
diff --git a/web/html/login.php b/web/html/login.php index 9c6a546..ed323f8 100644 --- a/web/html/login.php +++ b/web/html/login.php @@ -13,34 +13,34 @@ if (!$DISABLE_HTTP_LOGIN || (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'])) { html_header('AUR ' . __("Login")); ?>
-

AUR

+

AUR

- ' . username_from_sid($_COOKIE["AURSID"]) . ''); ?> - [] + ' . username_from_sid($_COOKIE["AURSID"]) . ''); ?> + []

- +
- + -
+

- - + +

- - + +

- +

" /> - [] + []

diff --git a/web/html/packages.php b/web/html/packages.php index 3478ab9..094c221 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -97,7 +97,7 @@ html_header($title); ?> -

+

-

+

-

+

- + - + - +

- + -

', ''); ?>

-

+

- +
diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index b2a26f7..ffbc1c9 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -436,12 +436,12 @@ html_header("Submit"); ?> -

+

-

-

+

+

-
+
- +

- +

- " /> + " />

diff --git a/web/html/tu.php b/web/html/tu.php index 084a223..5e85e78 100644 --- a/web/html/tu.php +++ b/web/html/tu.php @@ -116,17 +116,17 @@ if ($atype == "Trusted User" || $atype == "Developer") { $nextresult = proposal_count(); ?>
-

+

- ?off=&by='> + ?off=&by='> - +
diff --git a/web/html/voters.php b/web/html/voters.php index 41c9d6f..9cedeef 100644 --- a/web/html/voters.php +++ b/web/html/voters.php @@ -15,11 +15,11 @@ if ($atype == 'Trusted User' || $atype== 'Developer'): ?>
-

Votes for

+

Votes for

    -
  • +
diff --git a/web/template/account_details.php b/web/template/account_details.php index 8551533..082a3f7 100644 --- a/web/template/account_details.php +++ b/web/template/account_details.php @@ -4,12 +4,12 @@ - - + + - + - - "> + + "> - - + + - - + + - - + + - + - + - + diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index b1cb749..a1887eb 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -1,13 +1,13 @@ -
+ - +
- + - - + +
@@ -16,26 +16,26 @@ - - + + - + - + - - + + - + - + - + - + - + - + diff --git a/web/template/account_search_results.php b/web/template/account_search_results.php index f67cc6a..ae7c112 100644 --- a/web/template/account_search_results.php +++ b/web/template/account_search_results.php @@ -7,14 +7,14 @@ else:
: (): ()
::
:: @@ -61,14 +61,14 @@
: (): ()
:: - + @@ -76,9 +76,9 @@
:: - + @@ -86,28 +86,28 @@
:: - +
:: - +
:: - +
:: - " />   + " />   - " />   + " />   - " /> + " />
- - - - - - - - + + + + + + + + - - - + + + @@ -63,32 +63,32 @@ else:
">
"> - "> + ">
@@ -96,7 +96,7 @@ else:
- +
- + - + - " /> + " />
-
+
- + - + - -->" /> + -->" />

- +

diff --git a/web/template/actions_form.php b/web/template/actions_form.php index d687f50..650c6c6 100644 --- a/web/template/actions_form.php +++ b/web/template/actions_form.php @@ -1,38 +1,38 @@
-
+
- - - + + + - " /> + " /> - " /> + " /> - " title="" /> + " title="" /> - " title="" /> + " title="" /> - " /> + " /> - " /> + " /> - " /> - + " /> + - +
diff --git a/web/template/footer.php b/web/template/footer.php index 1b1b1d2..857211e 100644 --- a/web/template/footer.php +++ b/web/template/footer.php @@ -3,10 +3,10 @@
diff --git a/web/template/header.php b/web/template/header.php index d87ddfe..3179a53 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -1,14 +1,14 @@ -'; ?> +'; ?> + xml:lang="" lang=""> - AUR (<?php print htmlspecialchars($LANG); ?>)<?php if ($title != "") { print " - " . htmlspecialchars($title); } ?> + AUR (<?= htmlspecialchars($LANG); ?>)<?php if ($title != "") { print " - " . htmlspecialchars($title); } ?> - ' /> + ' /> @@ -29,7 +29,7 @@
- "> + ">
- + +

- +

- " /> + " />

diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index b0aada2..997b9ca 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -5,7 +5,7 @@ $pkgname = $row['Name']; ?>

- +

@@ -15,21 +15,21 @@ $pkgname = $row['Name']; endif; ?>

-
+
- - - + + +
- +

-

+

- +

@@ -38,7 +38,7 @@ $pkgname = $row['Name']; 10 && !isset($_GET['comments'])): ?>

- +

diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index a4cd347..4e9e073 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -29,46 +29,46 @@ $requiredby = package_required($row["Name"]); $sources = package_sources($row["ID"]); ?>
-

+