Merge pull request #47 from tomvlk/f/refactor-timeelapsed-dbpassword
Reformat time_elapsed_string into camelcase. Database can be used with no password given
This commit is contained in:
commit
0397bd0006
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,4 +1,6 @@
|
||||
/.idea/
|
||||
.idea
|
||||
*.iml
|
||||
|
||||
/configs/server.xml
|
||||
/logs/
|
||||
/ManiaControl.log
|
||||
|
@ -30,6 +30,30 @@
|
||||
<option name="ALIGN_CLASS_CONSTANTS" value="true" />
|
||||
<option name="PHPDOC_USE_FQCN" value="true" />
|
||||
</PHPCodeStyleSettings>
|
||||
<DBN-PSQL>
|
||||
<case-options enabled="false">
|
||||
<option name="KEYWORD_CASE" value="lower" />
|
||||
<option name="FUNCTION_CASE" value="lower" />
|
||||
<option name="PARAMETER_CASE" value="lower" />
|
||||
<option name="DATATYPE_CASE" value="lower" />
|
||||
<option name="OBJECT_CASE" value="preserve" />
|
||||
</case-options>
|
||||
<formatting-settings enabled="false" />
|
||||
</DBN-PSQL>
|
||||
<DBN-SQL>
|
||||
<case-options enabled="false">
|
||||
<option name="KEYWORD_CASE" value="lower" />
|
||||
<option name="FUNCTION_CASE" value="lower" />
|
||||
<option name="PARAMETER_CASE" value="lower" />
|
||||
<option name="DATATYPE_CASE" value="lower" />
|
||||
<option name="OBJECT_CASE" value="preserve" />
|
||||
</case-options>
|
||||
<formatting-settings enabled="false">
|
||||
<option name="STATEMENT_SPACING" value="one_line" />
|
||||
<option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
|
||||
<option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
|
||||
</formatting-settings>
|
||||
</DBN-SQL>
|
||||
<XML>
|
||||
<option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
|
||||
</XML>
|
||||
|
@ -42,7 +42,7 @@ class Config {
|
||||
* @return bool
|
||||
*/
|
||||
public function validate() {
|
||||
if (!$this->host || !$this->port || !$this->user || !$this->pass || !$this->name) {
|
||||
if (!$this->host || !$this->port || !$this->user || !$this->name) {
|
||||
return false;
|
||||
}
|
||||
if ($this->user === 'mysql_user' || $this->pass === 'mysql_password') {
|
||||
|
@ -204,7 +204,7 @@ class ManiaExchangeList implements CallbackListener, ManialinkPageAnswerListener
|
||||
$lineQuad->setZ(0.001);
|
||||
}
|
||||
|
||||
$time = Formatter::time_elapsed_string(strtotime($map->updated));
|
||||
$time = Formatter::timeElapsedString(strtotime($map->updated));
|
||||
$array = array('$s' . $map->id => $posX + 3.5, '$s' . $map->name => $posX + 12.5, '$s' . $map->author => $posX + 59, '$s' . str_replace('Arena', '', $map->maptype) => $posX + 103, '$s' . $map->mood => $posX + 118, '$s' . $time => $posX + 130);
|
||||
$labels = $this->maniaControl->getManialinkManager()->labelLine($mapFrame, $array);
|
||||
$authorLabel = $labels[2];
|
||||
|
@ -48,24 +48,36 @@ abstract class Formatter {
|
||||
/**
|
||||
* Format an elapsed time String (2 days ago...) by a given timestamp
|
||||
*
|
||||
* @param int $ptime
|
||||
* @return string
|
||||
* @param int $time Input time
|
||||
* @param boolean $short Short version
|
||||
* @return string Formatted elapsed time string
|
||||
*/
|
||||
public static function time_elapsed_string($ptime) {
|
||||
// TODO: refactor code: camelCase!
|
||||
$etime = time() - $ptime;
|
||||
public static function timeElapsedString($time, $short = false) {
|
||||
$elapsedTime = time() - $time;
|
||||
|
||||
if ($etime < 1) {
|
||||
return '0 seconds';
|
||||
$second = $short ? 'sec.' : 'second';
|
||||
$minute = $short ? 'min.' : 'minute';
|
||||
$hour = $short ? 'h' : 'hour';
|
||||
$day = $short ? 'd' : 'day';
|
||||
$month = $short ? 'm' : 'month';
|
||||
$year = $short ? 'y' : 'year';
|
||||
|
||||
if ($elapsedTime < 1) {
|
||||
return $short ? '0 sec.' : '0 seconds';
|
||||
}
|
||||
|
||||
$a = array(12 * 30 * 24 * 60 * 60 => 'year', 30 * 24 * 60 * 60 => 'month', 24 * 60 * 60 => 'day', 60 * 60 => 'hour', 60 => 'minute', 1 => 'second');
|
||||
$calculateSeconds = array(12 * 30 * 24 * 60 * 60 => $year,
|
||||
30 * 24 * 60 * 60 => $month,
|
||||
24 * 60 * 60 => $day,
|
||||
60 * 60 => $hour,
|
||||
60 => $minute,
|
||||
1 => $second);
|
||||
|
||||
foreach ($a as $secs => $str) {
|
||||
$d = $etime / $secs;
|
||||
foreach ($calculateSeconds as $secs => $str) {
|
||||
$d = $elapsedTime / $secs;
|
||||
if ($d >= 1) {
|
||||
$r = round($d);
|
||||
return $r . ' ' . $str . ($r > 1 ? 's' : '') . ' ago';
|
||||
return $r . ' ' . $str . ($r > 1 ? (!$short ? 's' : '') : '') . ' ago';
|
||||
}
|
||||
}
|
||||
return '';
|
||||
|
Loading…
Reference in New Issue
Block a user