Skip to content

Commit da8b3cc

Browse files
committed
Merge pull request #2411 from e3betht/closing_tags_dev
Closing tags on development branch
2 parents 4c01584 + 010a894 commit da8b3cc

File tree

122 files changed

+1
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+1
-158
lines changed

README.md

+1-1

cronjobs/blockupdate.php

-1
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,3 @@
8080
}
8181

8282
require_once('cron_end.inc.php');
83-
?>

cronjobs/cron_end.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,3 @@
2222
$monitoring->endCronjob($cron_name, 'OK', 0, false, false);
2323
$monitoring->setStatus($cron_name . "_runtime", "time", microtime(true) - $cron_start[$cron_name]);
2424
$monitoring->setStatus($cron_name . "_endtime", "date", time());
25-
?>

cronjobs/findblock.php

-1
Original file line numberDiff line numberDiff line change
@@ -178,4 +178,3 @@
178178
}
179179

180180
require_once('cron_end.inc.php');
181-
?>

cronjobs/notifications.php

-1
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,3 @@
7575
}
7676

7777
require_once('cron_end.inc.php');
78-
?>

cronjobs/pplns_payout.php

-1
Original file line numberDiff line numberDiff line change
@@ -289,4 +289,3 @@
289289
}
290290

291291
require_once('cron_end.inc.php');
292-
?>

cronjobs/pps_payout.php

-1
Original file line numberDiff line numberDiff line change
@@ -200,4 +200,3 @@
200200
$log->logInfo("Completed PPS Payout");
201201

202202
require_once('cron_end.inc.php');
203-
?>

cronjobs/proportional_payout.php

-1
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,3 @@
169169
}
170170

171171
require_once('cron_end.inc.php');
172-
?>

cronjobs/shared.inc.php

-2
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,3 @@ function cfip() { return (@defined('SECURITY')) ? 1 : 0; }
8787
$log->logFatal('Cronjob is currently disabled due to required upgrades. Import any outstanding SQL files and check your configuration file.');
8888
$monitoring->endCronjob($cron_name, 'E0075', 0, true, false);
8989
}
90-
91-
?>

cronjobs/statistics.php

-1
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,3 @@
5555
$log->logInfo(sprintf($strLogMask, 'getTopContributors(shares)', number_format(microtime(true) - $start, 3), $status));
5656

5757
require_once('cron_end.inc.php');
58-
?>

cronjobs/tables_cleanup.php

-1
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,3 @@
8989

9090
// Cron cleanup and monitoring
9191
require_once('cron_end.inc.php');
92-
?>

cronjobs/tickerupdate.php

-1
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,3 @@
7676
$log->logInfo(sprintf($strLogMask, 'Uptime Robot', 'n/a', number_format(microtime(true) - $start, 3), $status, $message));
7777

7878
require_once('cron_end.inc.php');
79-
?>

include/admin_checks.php

-2
Original file line numberDiff line numberDiff line change
@@ -148,5 +148,3 @@
148148
}
149149
}
150150
}
151-
152-
?>

include/autoloader.inc.php

-2
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,3 @@
8080
require_once(CLASS_DIR . '/api.class.php');
8181
require_once(INCLUDE_DIR . '/lib/Michelf/Markdown.php');
8282
require_once(INCLUDE_DIR . '/lib/scrypt.php');
83-
84-
?>

include/bootstrap.php

-2
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,3 @@
4343
// Load Classes, they name defines the $ variable used
4444
// We include all needed files here, even though our templates could load them themself
4545
require_once(INCLUDE_DIR . '/autoloader.inc.php');
46-
47-
?>

include/classes/base.class.php

-1
Original file line numberDiff line numberDiff line change
@@ -284,4 +284,3 @@ public function getParam() {
284284
return $array;
285285
}
286286
}
287-
?>

include/classes/coins/coin_base.class.php

-2
Original file line numberDiff line numberDiff line change
@@ -85,5 +85,3 @@ public function calcExpectedNextDifficulty($dDifficulty, $dNetworkHashrate) {
8585
}
8686
}
8787
}
88-
89-
?>

include/classes/coins/coin_scrypt.class.php

-2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,3 @@
99
class Coin extends CoinBase {
1010
protected $target_bits = 16;
1111
}
12-
13-
?>

include/classes/coins/coin_scryptn.class.php

-2
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,3 @@
1212
class Coin extends CoinBase {
1313
protected $target_bits = 16;
1414
}
15-
16-
?>

include/classes/coins/coin_sha256d.class.php

-2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ class Coin extends CoinBase {
1010
protected $target_bits = 32;
1111
protected $coin_value_precision = 20;
1212
}
13-
14-
?>

include/classes/coins/coin_x11.class.php

-2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ class Coin extends CoinBase {
1010
protected $target_bits = 24;
1111
protected $share_difficulty_precision = 4;
1212
}
13-
14-
?>

include/classes/csrftoken.class.php

-1
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,3 @@ private function getHash($string) {
104104
$csrftoken->setToken($oToken);
105105
$csrftoken->setConfig($config);
106106
$csrftoken->setErrorCodes($aErrorCodes);
107-
?>

include/classes/debug.class.php

-1
Original file line numberDiff line numberDiff line change
@@ -111,4 +111,3 @@ function printDebugInfo() {
111111

112112
// Instantiate this class
113113
$debug = new Debug($log, $config['DEBUG']);
114-
?>

include/classes/invitation.class.php

-1
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,3 @@ public function sendInvitation($account_id, $aData) {
139139
$invitation->setToken($oToken);
140140
$invitation->setConfig($config);
141141
$invitation->setErrorCodes($aErrorCodes);
142-
?>

include/classes/logger.class.php

-1
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,3 @@ public function log($strType, $strMessage) {
5757
}
5858
}
5959
$log = new Logger($config);
60-
?>

include/classes/mail.class.php

-1
Original file line numberDiff line numberDiff line change
@@ -117,4 +117,3 @@ public function sendMail($template, $aData, $throttle=false) {
117117
$mail->setConfig($config);
118118
$mail->setSetting($setting);
119119
$mail->setErrorCodes($aErrorCodes);
120-
?>

include/classes/memcache_ad.class.php

-2
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,3 @@ public function getRequestBase() {
8181
return $new;
8282
}
8383
}
84-
85-
?>

include/classes/news.class.php

-1
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,3 @@ public function addNews($account_id, $aData, $active=false) {
101101
$news->setMysql($mysqli);
102102
$news->setUser($user);
103103
$news->setErrorCodes($aErrorCodes);
104-
?>

include/classes/notification.class.php

-1
Original file line numberDiff line numberDiff line change
@@ -195,4 +195,3 @@ public function cleanupNotifications($days=7) {
195195
$notification->setConfig($config);
196196
$notification->setSetting($setting);
197197
$notification->setErrorCodes($aErrorCodes);
198-
?>

include/classes/payout.class.php

-2
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,3 @@ public function setProcessed($id) {
6767
$oPayout->setConfig($config);
6868
$oPayout->setToken($oToken);
6969
$oPayout->setErrorCodes($aErrorCodes);
70-
71-
?>

include/classes/statistics.class.php

-1
Original file line numberDiff line numberDiff line change
@@ -927,4 +927,3 @@ public function purgeUserStats($days = 1) {
927927
$statistics->setBitcoin($bitcoin);
928928
$statistics->setErrorCodes($aErrorCodes);
929929
$statistics->setCoin($coin);
930-
?>

include/classes/strict.class.php

-2
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,3 @@ public function bind_param($paramTypes) {
3535
}
3636
}
3737
}
38-
39-
?>

include/classes/transaction.class.php

-1
Original file line numberDiff line numberDiff line change
@@ -488,4 +488,3 @@ public function getMPQueue($limit=250) {
488488
$transaction->setUser($user);
489489
$transaction->setPayout($oPayout);
490490
$transaction->setErrorCodes($aErrorCodes);
491-
?>

include/classes/worker.class.php

-1
Original file line numberDiff line numberDiff line change
@@ -313,4 +313,3 @@ public function deleteWorker($account_id, $id) {
313313
$worker->setUser($user);
314314
$worker->setErrorCodes($aErrorCodes);
315315
$worker->setCoin($coin);
316-
?>

include/config/error_codes.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,3 @@
7878
$aErrorCodes['E0080'] = 'No new unaccounted shares since last run';
7979
$aErrorCodes['E0081'] = 'Failed to insert new block into database';
8080
$aErrorCodes['E0082'] = 'Block does not supply any usable confirmation information';
81-
?>

include/config/global.inc.dist.php

-2
Original file line numberDiff line numberDiff line change
@@ -298,5 +298,3 @@
298298
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-system-load
299299
**/
300300
$config['system']['load']['max'] = 10.0;
301-
302-
?>

include/config/memcache_keys.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44
define('STATISTICS_ALL_USER_SHARES', 'STATISTICS_ALL_USER_SHARES');
55
define('STATISTICS_ALL_USER_HASHRATES', 'STATISTICS_ALL_USER_HASHRATES');
66
define('STATISTICS_ROUND_SHARES', 'STATISTICS_ROUND_SHARES');
7-
?>

include/config/monitor_crons.inc.php

-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,3 @@
1111
}
1212

1313
$aMonitorCrons = array('statistics','tickerupdate','notifications','tables_cleanup','findblock',$sPayoutSystem,'blockupdate','payouts');
14-
15-
?>

include/config/security.inc.dist.php

-2
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,3 @@
5959
**/
6060
$config['maxfailed']['login'] = 3;
6161
$config['maxfailed']['pin'] = 3;
62-
63-
?>

include/database.inc.php

-2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,3 @@
1717
if (mysqli_connect_errno()) {
1818
die("Failed to connect to database");
1919
}
20-
21-
?>

include/lib/Michelf/Markdown.php

-1
Original file line numberDiff line numberDiff line change
@@ -3091,4 +3091,3 @@ protected function _doAbbreviations_callback($matches) {
30913091
}
30923092

30933093
}
3094-
?>

include/lib/Michelf/MarkdownExtra.php

-3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,3 @@ class MarkdownExtra extends \Michelf\_MarkdownExtra_TmpImpl {
3535
# See note above.
3636

3737
}
38-
39-
40-
?>

include/lib/recaptchalib.php

-3
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,3 @@ function recaptcha_mailhide_html($pubkey, $privkey, $email) {
272272
"' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
273273

274274
}
275-
276-
277-
?>

include/lib/scrypt.php

-2
Original file line numberDiff line numberDiff line change
@@ -532,5 +532,3 @@ function word_reverse($str) {
532532
}
533533
return $ret;
534534
}
535-
536-
?>

include/lib/smarty_plugins/function.acl.php

-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,3 @@ function check_acl_access($params, $smarty)
3131
break;
3232
}
3333
}
34-
?>

include/pages/about.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33

44
// Tempalte specifics
55
$smarty->assign("CONTENT", "default.tpl");
6-
?>

include/pages/about/pplns.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33

44
// Tempalte specifics
55
$smarty->assign("CONTENT", "default.tpl");
6-
?>

include/pages/account.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@
55
// Tempalte specifics
66
$smarty->assign("CONTENT", "default.tpl");
77
}
8-
?>

include/pages/account/earnings.inc.php

-2
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,3 @@
1919
} else {
2020
$smarty->assign('CONTENT', 'disabled.tpl');
2121
}
22-
23-
?>

include/pages/account/edit.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -206,4 +206,3 @@
206206

207207
// Tempalte specifics
208208
$smarty->assign("CONTENT", "default.tpl");
209-
?>

include/pages/account/invitations.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@
2424
}
2525
}
2626
$smarty->assign('CONTENT', 'default.tpl');
27-
?>

include/pages/account/notifications.inc.php

-2
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,3 @@
3535
$smarty->assign('CONTENT', 'default.tpl');
3636
}
3737
}
38-
39-
?>

include/pages/account/qrcode.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,3 @@
1212
$smarty->assign("CONTENT", "");
1313
break;
1414
}
15-
?>

include/pages/account/reset_failed.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@
1111
}
1212
// Somehow we still need to load this empty template
1313
$smarty->assign("CONTENT", "empty");
14-
?>

include/pages/account/transactions.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@
1515
$smarty->assign('DISABLE_TRANSACTIONSUMMARY', $setting->getValue('disable_transactionsummary'));
1616
}
1717
$smarty->assign('CONTENT', 'default.tpl');
18-
?>

include/pages/account/unlock.inc.php

-2
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,3 @@
1515
}
1616
}
1717
$smarty->assign('CONTENT', 'default.tpl');
18-
19-
?>

include/pages/account/workers.inc.php

-3
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,3 @@
5555
$smarty->assign('CONTENT', 'default.tpl');
5656
}
5757
}
58-
59-
60-
?>

include/pages/admin.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@
99

1010
// Tempalte specifics
1111
$smarty->assign("CONTENT", "");
12-
?>

include/pages/admin/earnings.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@
1818
}
1919

2020
$smarty->assign('CONTENT', 'default.tpl');
21-
?>

include/pages/admin/invitations.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,3 @@
2121

2222
// Tempalte specifics
2323
$smarty->assign("CONTENT", "default.tpl");
24-
?>

include/pages/admin/monitoring.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,3 @@
2626

2727
// Tempalte specifics
2828
$smarty->assign("CONTENT", "default.tpl");
29-
?>

include/pages/admin/news.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,3 @@
4646
}
4747
$smarty->assign("NEWS", $aNews);
4848
$smarty->assign("CONTENT", "default.tpl");
49-
?>

include/pages/admin/news_edit.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@
2424
$aNews = $news->getEntry($_REQUEST['id']);
2525
$smarty->assign("NEWS", $aNews);
2626
$smarty->assign("CONTENT", "default.tpl");
27-
?>

include/pages/admin/newsletter.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,3 @@
3838
}
3939
$smarty->assign("CONTENT", "default.tpl");
4040
}
41-
?>

include/pages/admin/poolworkers.inc.php

-2
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,3 @@
1919
$smarty->assign('LIMIT', $iLimit);
2020
$smarty->assign('WORKERS', $aWorkers);
2121
$smarty->assign('CONTENT', 'default.tpl');
22-
23-
?>

include/pages/admin/registrations.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@
1818

1919
// Tempalte specifics
2020
$smarty->assign("CONTENT", "default.tpl");
21-
?>

include/pages/admin/reports.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,3 @@
8181
} else {
8282
$smarty->assign("CONTENT", "empty");
8383
}
84-
?>

include/pages/admin/settings.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,3 @@
2727

2828
// Tempalte specifics
2929
$smarty->assign("CONTENT", "default.tpl");
30-
?>

include/pages/admin/transactions.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,3 @@
3737
$smarty->assign('FILTERS', $strFilters);
3838
}
3939
$smarty->assign('CONTENT', 'default.tpl');
40-
?>

include/pages/admin/user.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,3 @@
8383

8484
// Tempalte specifics
8585
$smarty->assign("CONTENT", "default.tpl");
86-
?>

include/pages/admin/userdetails.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,3 @@
2121
}
2222

2323
$smarty->assign('CONTENT', 'default.tpl');
24-
?>

include/pages/admin/wallet.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,3 @@
7171
}
7272

7373
$smarty->assign("CONTENT", "default.tpl");
74-
?>

include/pages/api.inc.php

-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@
99

1010
header('HTTP/1.1 400 Bad Request');
1111
die('400 Bad Request');
12-
?>

0 commit comments

Comments
 (0)