Skip to content

Commit

Permalink
Changed all dates format
Browse files Browse the repository at this point in the history
  • Loading branch information
iopietro committed May 19, 2018
1 parent b752e4c commit 68f9282
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Templates/Alliance/Forum/forum_2.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ foreach($forumcat as $arr){
if($database->CheckLastTopic($arr['id'])){
//If there are no posts yet, show the topic
if($database->CheckLastPost($las['id']) == 0){
$lpost = date('m/d/y H:i a', $las['date']);
$lpost = date('d.m.y H:i a', $las['date']);
$owner = $database->getUserArray($las['owner'], 1);
}else{
foreach($lpos as $pos){
$lpost = date('m/d/y H:i a', $pos['date']);
$lpost = date('d.m.y H:i a', $pos['date']);
$owner = $database->getUserArray($pos['owner'], 1);
}
}
Expand Down
4 changes: 2 additions & 2 deletions Templates/Alliance/Forum/forum_4.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ if($ChckTopic){
foreach($lposts as $post) {
}
if($database->CheckLastPost($arrs['id'])){
$post_dates = date('m/d/y, H:i a',$post['date']);
$post_dates = date('d.m.y, H:i a',$post['date']);
$owner_topics = $database->getUserArray($post['owner'],1);
}else{
$post_dates = date('m/d/y, H:i a',$arrs['date']);
$post_dates = date('d.m.y, H:i a',$arrs['date']);
$owner_topics = $database->getUserArray($arrs['owner'],1);
}

Expand Down
4 changes: 2 additions & 2 deletions Templates/Alliance/Forum/forum_6.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ foreach($topics as $arr){
$CatName = stripslashes($forumData['forum_name']);
$allianceinfo = $database->getAlliance($owner['alliance']);
}
$date = date('m/d/y H:i a', $arr['date']);
$date = date('d.m.y H:i a', $arr['date']);
$varray = $database->getProfileVillages($arr['owner']);

$totalpop = 0;
Expand Down Expand Up @@ -149,7 +149,7 @@ foreach($posts as $po){
$checkArray = ['aid' => $aid, 'alliance' => $topic['alliance'], 'forum_perm' => $opt['opt5'],
'owner' => $po['owner'], 'admin' => $_GET['admin'], 'forum_owner' => $forumData['owner']];
$date = date('m/d/y H:i a', $po['date']);
$date = date('d.m.y H:i a', $po['date']);
$countAu = $database->CountTopic($po['owner']);
$varray = $database->getProfileVillages($po['owner']);
$totalpop = 0;
Expand Down
2 changes: 1 addition & 1 deletion Templates/Alliance/forum.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ if(isset($_POST['newtopic']) && isset($_POST['thema']) && isset($_POST['text'])
$ends_date = $_POST['month']."/".$_POST['day']."/".$_POST['year'];
if($_POST['meridiem'] == 1) $_POST['hour'] += 12;
$ends_time = $_POST['hour'].":".$_POST['minute'];
$ends = strtotime($ends_date) - strtotime(date('m/d/Y')) + strtotime($ends_time);
$ends = strtotime($ends_date) - strtotime(date('d.m.y')) + strtotime($ends_time);
}

for($i = 1; $i <= 8; $i++) if(isset($_POST['option_'.$i]) && !empty($_POST['option_'.$i])) $survey = true;
Expand Down
6 changes: 3 additions & 3 deletions Templates/activate/activate.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ The email will be sent to following address: <span class="important"><?php echo
</p>
</div>
</div>
<?php if(START_DATE > date('m/d/Y') or START_DATE == date('m/d/Y') && START_TIME <= date('H:i')){ ?>
<?php if(START_DATE > date('d.m.y') || START_DATE == date('d.m.y') && START_TIME <= date('H:i')){ ?>
<br/><center><big>Activation Availble in: </big></center>
<script language="JavaScript">
<script>
TargetDate = "<?php echo START_DATE; ?> <?php echo START_TIME; ?>";
CountActive = true;
CountStepper = -1;
Expand Down Expand Up @@ -117,7 +117,7 @@ CountBack(gsecs);
<?php }}else{ ?>
<p>
<?php
if(START_DATE > date('m/d/Y') or START_DATE == date('m/d/Y') && START_TIME <= date('H:i')){
if(START_DATE > date('d.m.y') || START_DATE == date('d.m.y') && START_TIME <= date('H:i')){
?>
<br/><center><big>Activation Availble in: </big></center>
<script language="JavaScript">
Expand Down
2 changes: 1 addition & 1 deletion activate.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<div id="content" class="activate">
<?php

if(isset($_GET['e']) && (START_DATE < date('m/d/Y') or START_DATE == date('m/d/Y') && START_TIME <= date('H:i')))
if(isset($_GET['e']) && (START_DATE < date('d.m.y') || START_DATE == date('d.m.y') && START_TIME <= date('H:i')))
{
switch($_GET['e'])
{
Expand Down
2 changes: 1 addition & 1 deletion login.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<h5><img class="img_u04" src="img/x.gif" alt="login" /></h5>
<p><?php echo COOKIES; ?></p>
<?php
$stime = strtotime(START_DATE)-strtotime(date('m/d/Y'))+strtotime(START_TIME);
$stime = strtotime(START_DATE) - strtotime(date('d.m.y')) + strtotime(START_TIME);
if($stime > time()){
?>
<br/><div style="text-align: center"><big>Server will start in: </big></div>
Expand Down
2 changes: 1 addition & 1 deletion tools/escape_function_parameters.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function return_link() {
function register($username, $password, $email, $tribe, $act) {
$time = time();
$stime = strtotime(START_DATE)-strtotime(date(\'m/d/Y\'))+strtotime(START_TIME);
$stime = strtotime(START_DATE)-strtotime(date(\'d.m.y\'))+strtotime(START_TIME);
if($stime > time()){
$time = $stime;
}
Expand Down

2 comments on commit 68f9282

@velhbxtyrj
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is perfectly :)

@ZZJHONS
Copy link

@ZZJHONS ZZJHONS commented on 68f9282 May 20, 2018 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.