Merge pull request #2411 from e3betht/closing_tags_dev

Closing tags on development branch
This commit is contained in:
Sebastian Grewe 2015-04-27 06:44:19 +02:00
commit da8b3cc0e8
122 changed files with 1 additions and 158 deletions

View File

@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/MPOS/php-mpos.png?branch=master)](https://travis-ci.org/MPOS/php-mpos) [![Code Coverage](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=master) master<br />
[![Build Status](https://travis-ci.org/MPOS/php-mpos.png?branch=master)](https://travis-ci.org/MPOS/php-mpos) [![Code Climate](https://codeclimate.com/github/MPOS/php-mpos/badges/gpa.svg)](https://codeclimate.com/github/MPOS/php-mpos) [![Code Coverage](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=master) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=master) master<br />
[![Build Status](https://travis-ci.org/MPOS/php-mpos.png?branch=development)](https://travis-ci.org/MPOS/php-mpos) [![Code Coverage](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/coverage.png?b=development)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=development) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/MPOS/php-mpos/badges/quality-score.png?b=development)](https://scrutinizer-ci.com/g/MPOS/php-mpos/?branch=development) development

View File

@ -80,4 +80,3 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
}
require_once('cron_end.inc.php');
?>

View File

@ -22,4 +22,3 @@ limitations under the License.
$monitoring->endCronjob($cron_name, 'OK', 0, false, false);
$monitoring->setStatus($cron_name . "_runtime", "time", microtime(true) - $cron_start[$cron_name]);
$monitoring->setStatus($cron_name . "_endtime", "date", time());
?>

View File

@ -178,4 +178,3 @@ if (empty($aAllBlocks)) {
}
require_once('cron_end.inc.php');
?>

View File

@ -75,4 +75,3 @@ if ($setting->getValue('notifications_disable_idle_worker') != 1) {
}
require_once('cron_end.inc.php');
?>

View File

@ -289,4 +289,3 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
}
require_once('cron_end.inc.php');
?>

View File

@ -200,4 +200,3 @@ if ($aAllBlocks = $block->getAllUnaccounted('ASC')) {
$log->logInfo("Completed PPS Payout");
require_once('cron_end.inc.php');
?>

View File

@ -169,4 +169,3 @@ foreach ($aAllBlocks as $iIndex => $aBlock) {
}
require_once('cron_end.inc.php');
?>

View File

@ -87,5 +87,3 @@ if ($setting->getValue('DB_VERSION') != DB_VERSION || $config['version'] != CONF
$log->logFatal('Cronjob is currently disabled due to required upgrades. Import any outstanding SQL files and check your configuration file.');
$monitoring->endCronjob($cron_name, 'E0075', 0, true, false);
}
?>

View File

@ -55,4 +55,3 @@ $statistics->getCurrentHashrate() ? $status = 'OK' : $status = 'ERROR';
$log->logInfo(sprintf($strLogMask, 'getTopContributors(shares)', number_format(microtime(true) - $start, 3), $status));
require_once('cron_end.inc.php');
?>

View File

@ -89,4 +89,3 @@ $log->logInfo(sprintf($strLogMask, 'purgeUserStats', $affected, number_format(mi
// Cron cleanup and monitoring
require_once('cron_end.inc.php');
?>

View File

@ -76,4 +76,3 @@ if ($api_keys = $setting->getValue('monitoring_uptimerobot_api_keys')) {
$log->logInfo(sprintf($strLogMask, 'Uptime Robot', 'n/a', number_format(microtime(true) - $start, 3), $status, $message));
require_once('cron_end.inc.php');
?>

View File

@ -148,5 +148,3 @@ if (@$_SESSION['USERDATA']['is_admin'] && $user->isAdmin(@$_SESSION['USERDATA'][
}
}
}
?>

View File

@ -80,5 +80,3 @@ require_once(CLASS_DIR . '/news.class.php');
require_once(CLASS_DIR . '/api.class.php');
require_once(INCLUDE_DIR . '/lib/Michelf/Markdown.php');
require_once(INCLUDE_DIR . '/lib/scrypt.php');
?>

View File

@ -43,5 +43,3 @@ $master_template = 'master.tpl';
// Load Classes, they name defines the $ variable used
// We include all needed files here, even though our templates could load them themself
require_once(INCLUDE_DIR . '/autoloader.inc.php');
?>

View File

@ -284,4 +284,3 @@ class Base {
return $array;
}
}
?>

View File

@ -85,5 +85,3 @@ class CoinBase extends Base {
}
}
}
?>

View File

@ -9,5 +9,3 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
class Coin extends CoinBase {
protected $target_bits = 16;
}
?>

View File

@ -12,5 +12,3 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
class Coin extends CoinBase {
protected $target_bits = 16;
}
?>

View File

@ -10,5 +10,3 @@ class Coin extends CoinBase {
protected $target_bits = 32;
protected $coin_value_precision = 20;
}
?>

View File

@ -10,5 +10,3 @@ class Coin extends CoinBase {
protected $target_bits = 24;
protected $share_difficulty_precision = 4;
}
?>

View File

@ -104,4 +104,3 @@ $csrftoken->setUser($user);
$csrftoken->setToken($oToken);
$csrftoken->setConfig($config);
$csrftoken->setErrorCodes($aErrorCodes);
?>

View File

@ -111,4 +111,3 @@ class Debug {
// Instantiate this class
$debug = new Debug($log, $config['DEBUG']);
?>

View File

@ -139,4 +139,3 @@ $invitation->setUser($user);
$invitation->setToken($oToken);
$invitation->setConfig($config);
$invitation->setErrorCodes($aErrorCodes);
?>

View File

@ -57,4 +57,3 @@ class Logger {
}
}
$log = new Logger($config);
?>

View File

@ -117,4 +117,3 @@ $mail->setSmarty($smarty);
$mail->setConfig($config);
$mail->setSetting($setting);
$mail->setErrorCodes($aErrorCodes);
?>

View File

@ -81,5 +81,3 @@ class MemcacheAntiDos
return $new;
}
}
?>

View File

@ -101,4 +101,3 @@ $news->setDebug($debug);
$news->setMysql($mysqli);
$news->setUser($user);
$news->setErrorCodes($aErrorCodes);
?>

View File

@ -195,4 +195,3 @@ $notification->setSmarty($smarty);
$notification->setConfig($config);
$notification->setSetting($setting);
$notification->setErrorCodes($aErrorCodes);
?>

View File

@ -67,5 +67,3 @@ $oPayout->setMysql($mysqli);
$oPayout->setConfig($config);
$oPayout->setToken($oToken);
$oPayout->setErrorCodes($aErrorCodes);
?>

View File

@ -927,4 +927,3 @@ $statistics->setConfig($config);
$statistics->setBitcoin($bitcoin);
$statistics->setErrorCodes($aErrorCodes);
$statistics->setCoin($coin);
?>

View File

@ -35,5 +35,3 @@ class mysqli_strict extends mysqli {
}
}
}
?>

View File

@ -488,4 +488,3 @@ $transaction->setBlock($block);
$transaction->setUser($user);
$transaction->setPayout($oPayout);
$transaction->setErrorCodes($aErrorCodes);
?>

View File

@ -313,4 +313,3 @@ $worker->setShare($share);
$worker->setUser($user);
$worker->setErrorCodes($aErrorCodes);
$worker->setCoin($coin);
?>

View File

@ -78,4 +78,3 @@ $aErrorCodes['E0079'] = 'Wallet does not cover payouts total amount';
$aErrorCodes['E0080'] = 'No new unaccounted shares since last run';
$aErrorCodes['E0081'] = 'Failed to insert new block into database';
$aErrorCodes['E0082'] = 'Block does not supply any usable confirmation information';
?>

View File

@ -298,5 +298,3 @@ $config['smarty']['cache_lifetime'] = 30;
* https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-system-load
**/
$config['system']['load']['max'] = 10.0;
?>

View File

@ -4,4 +4,3 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
define('STATISTICS_ALL_USER_SHARES', 'STATISTICS_ALL_USER_SHARES');
define('STATISTICS_ALL_USER_HASHRATES', 'STATISTICS_ALL_USER_HASHRATES');
define('STATISTICS_ROUND_SHARES', 'STATISTICS_ROUND_SHARES');
?>

View File

@ -11,5 +11,3 @@ switch ($config['payout_system']) {
}
$aMonitorCrons = array('statistics','tickerupdate','notifications','tables_cleanup','findblock',$sPayoutSystem,'blockupdate','payouts');
?>

View File

@ -59,5 +59,3 @@ $config['twofactor']['options']['changepw'] = true;
**/
$config['maxfailed']['login'] = 3;
$config['maxfailed']['pin'] = 3;
?>

View File

@ -17,5 +17,3 @@ if ($mysqli->query('/* MYSQLND_MS_MASTER_SWITCH */SELECT @@global.read_only AS r
if (mysqli_connect_errno()) {
die("Failed to connect to database");
}
?>

View File

@ -3091,4 +3091,3 @@ class _MarkdownExtra_TmpImpl extends \Michelf\Markdown {
}
}
?>

View File

@ -35,6 +35,3 @@ class MarkdownExtra extends \Michelf\_MarkdownExtra_TmpImpl {
# See note above.
}
?>

View File

@ -272,6 +272,3 @@ function recaptcha_mailhide_html($pubkey, $privkey, $email) {
"' 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]);
}
?>

View File

@ -532,5 +532,3 @@ function word_reverse($str) {
}
return $ret;
}
?>

View File

@ -31,4 +31,3 @@ function check_acl_access($params, $smarty)
break;
}
}
?>

View File

@ -3,4 +3,3 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
// Tempalte specifics
$smarty->assign("CONTENT", "default.tpl");
?>

View File

@ -3,4 +3,3 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
// Tempalte specifics
$smarty->assign("CONTENT", "default.tpl");
?>

View File

@ -5,4 +5,3 @@ if ($user->isAuthenticated()) {
// Tempalte specifics
$smarty->assign("CONTENT", "default.tpl");
}
?>

View File

@ -19,5 +19,3 @@ if ($user->isAuthenticated() AND !$setting->getValue('disable_transactionsummary
} else {
$smarty->assign('CONTENT', 'disabled.tpl');
}
?>

View File

@ -206,4 +206,3 @@ $smarty->assign("DONATE_THRESHOLD", $config['donate_threshold']);
// Tempalte specifics
$smarty->assign("CONTENT", "default.tpl");
?>

View File

@ -24,4 +24,3 @@ if ($user->isAuthenticated()) {
}
}
$smarty->assign('CONTENT', 'default.tpl');
?>

View File

@ -35,5 +35,3 @@ if ($user->isAuthenticated()) {
$smarty->assign('CONTENT', 'default.tpl');
}
}
?>

View File

@ -12,4 +12,3 @@ case '1':
$smarty->assign("CONTENT", "");
break;
}
?>

View File

@ -11,4 +11,3 @@ if ($user->isAuthenticated()) {
}
// Somehow we still need to load this empty template
$smarty->assign("CONTENT", "empty");
?>

View File

@ -15,4 +15,3 @@ if ($user->isAuthenticated()) {
$smarty->assign('DISABLE_TRANSACTIONSUMMARY', $setting->getValue('disable_transactionsummary'));
}
$smarty->assign('CONTENT', 'default.tpl');
?>

View File

@ -15,5 +15,3 @@ if (!isset($_GET['token']) || empty($_GET['token'])) {
}
}
$smarty->assign('CONTENT', 'default.tpl');
?>

View File

@ -55,6 +55,3 @@ if ($user->isAuthenticated()) {
$smarty->assign('CONTENT', 'default.tpl');
}
}
?>

View File

@ -9,4 +9,3 @@ if (!$user->isAuthenticated() || !$user->isAdmin($_SESSION['USERDATA']['id'])) {
// Tempalte specifics
$smarty->assign("CONTENT", "");
?>

View File

@ -18,4 +18,3 @@ if ($user->isAuthenticated()) {
}
$smarty->assign('CONTENT', 'default.tpl');
?>

View File

@ -21,4 +21,3 @@ if (!$setting->getValue('disable_invitations')) {
// Tempalte specifics
$smarty->assign("CONTENT", "default.tpl");
?>

View File

@ -26,4 +26,3 @@ $smarty->assign("CRONSTATUS", $aCronStatus);
// Tempalte specifics
$smarty->assign("CONTENT", "default.tpl");
?>

View File

@ -46,4 +46,3 @@ foreach ($aNews as $key => $aData) {
}
$smarty->assign("NEWS", $aNews);
$smarty->assign("CONTENT", "default.tpl");
?>

View File

@ -24,4 +24,3 @@ if (!$config['csrf']['enabled'] || $config['csrf']['enabled'] && $csrftoken->val
$aNews = $news->getEntry($_REQUEST['id']);
$smarty->assign("NEWS", $aNews);
$smarty->assign("CONTENT", "default.tpl");
?>

View File

@ -38,4 +38,3 @@ if ($setting->getValue('notifications_disable_pool_newsletter', 0) == 1) {
}
$smarty->assign("CONTENT", "default.tpl");
}
?>

View File

@ -19,5 +19,3 @@ $smarty->assign('DISABLE_IDLEWORKERNOTIFICATIONS', $setting->getValue('notificat
$smarty->assign('LIMIT', $iLimit);
$smarty->assign('WORKERS', $aWorkers);
$smarty->assign('CONTENT', 'default.tpl');
?>

View File

@ -18,4 +18,3 @@ $smarty->assign("LASTREGISTEREDUSERS", $aLastRegisteredUsers);
// Tempalte specifics
$smarty->assign("CONTENT", "default.tpl");
?>

View File

@ -81,4 +81,3 @@ if ($user->isAuthenticated(false)) {
} else {
$smarty->assign("CONTENT", "empty");
}
?>

View File

@ -27,4 +27,3 @@ $smarty->assign("SETTINGS", $aSettings);
// Tempalte specifics
$smarty->assign("CONTENT", "default.tpl");
?>

View File

@ -37,4 +37,3 @@ if (isset($_REQUEST['filter'])) {
$smarty->assign('FILTERS', $strFilters);
}
$smarty->assign('CONTENT', 'default.tpl');
?>

View File

@ -83,4 +83,3 @@ if (isset($_REQUEST['filter'])) {
// Tempalte specifics
$smarty->assign("CONTENT", "default.tpl");
?>

View File

@ -21,4 +21,3 @@ if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
}
$smarty->assign('CONTENT', 'default.tpl');
?>

View File

@ -71,4 +71,3 @@ if (!$smarty->isCached('master.tpl', $smarty_cache_key)) {
}
$smarty->assign("CONTENT", "default.tpl");
?>

View File

@ -9,4 +9,3 @@ $id = $user->checkApiKey(@$_REQUEST['api_key']);
header('HTTP/1.1 400 Bad Request');
die('400 Bad Request');
?>

View File

@ -18,4 +18,3 @@ echo $api->get_json($iBlock);
// Supress master template
$supress_master = 1;
?>

View File

@ -24,4 +24,3 @@ echo $api->get_json($aBlocks);
// Supress master template
$supress_master = 1;
?>

View File

@ -14,4 +14,3 @@ echo $api->get_json($blocks);
// Supress master template
$supress_master = 1;
?>

View File

@ -43,5 +43,3 @@ echo $api->get_json($aCronStatus);
// Supress master template
$supress_master = 1;
?>

View File

@ -12,4 +12,3 @@ echo $api->get_json($worker->getCountAllActiveWorkers());
// Supress master template
$supress_master = 1;
?>

View File

@ -119,4 +119,3 @@ $data = array(
);
echo $api->get_json($data);
?>

View File

@ -15,4 +15,3 @@ echo $api->get_json($dDifficulty);
// Supress master template
$supress_master = 1;
?>

View File

@ -16,4 +16,3 @@ echo $api->get_json($dEstimatedTime);
// Supress master template
$supress_master = 1;
?>

View File

@ -18,4 +18,3 @@ echo $api->get_json($data);
// Supress master template
$supress_master = 1;
?>

View File

@ -19,4 +19,3 @@ echo $api->get_json($dPoolHashrate);
// Supress master template
$supress_master = 1;
?>

View File

@ -36,4 +36,3 @@ echo $api->get_json($data);
// Supress master template
$supress_master = 1;
?>

View File

@ -15,4 +15,3 @@ echo json_encode(array('getpoolsharerate' => $statistics->getCurrentShareRate())
// Supress master template
$supress_master = 1;
?>

View File

@ -66,4 +66,3 @@ echo $api->get_json($data);
// Supress master template
$supress_master = 1;
?>

View File

@ -19,4 +19,3 @@ echo $api->get_json($dTimeSinceLast);
// Supress master template
$supress_master = 1;
?>

View File

@ -60,4 +60,3 @@ echo $api->get_json($data);
// Supress master template
$supress_master = 1;
?>

View File

@ -12,4 +12,3 @@ echo $api->get_json($transaction->getBalance($user_id));
// Supress master template
$supress_master = 1;
?>

View File

@ -22,4 +22,3 @@ echo $api->get_json($hashrate);
// Supress master template
$supress_master = 1;
?>

View File

@ -22,4 +22,3 @@ echo $api->get_json($sharerate);
// Supress master template
$supress_master = 1;
?>

View File

@ -28,4 +28,3 @@ echo $api->get_json($data);
// Supress master template
$supress_master = 1;
?>

View File

@ -27,4 +27,3 @@ echo $api->get_json($data);
// Supress master template
$supress_master = 1;
?>

View File

@ -15,4 +15,3 @@ echo $api->get_json($worker->getWorkers($user_id, $interval));
// Supress master template
$supress_master = 1;
?>

View File

@ -27,4 +27,3 @@ echo json_encode(
// Supress master template
$supress_master = 1;
?>

View File

@ -15,4 +15,3 @@ if ($setting->getValue('acl_contactform') == 2) {
// Tempalte specifics
$smarty->assign("CONTENT", "default.tpl");
}
?>

View File

@ -32,5 +32,3 @@ if ($setting->getValue('acl_contactform') == 2) {
// Tempalte specifics
$smarty->assign("CONTENT", "default.tpl");
?>

View File

@ -59,5 +59,3 @@ if ($user->isAuthenticated()) {
$smarty->assign('INTERVAL', $interval / 60);
$smarty->assign('CONTENT', 'default.tpl');
}
?>

View File

@ -3,4 +3,3 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
// Tempalte specifics
$smarty->assign("CONTENT", "default.tpl");
?>

View File

@ -3,4 +3,3 @@ $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
// Tempalte specifics
$smarty->assign("CONTENT", "default.tpl");
?>

Some files were not shown because too many files have changed in this diff Show More