summaryrefslogtreecommitdiff
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rw-r--r--inc/common.php4
-rw-r--r--inc/html.php20
-rw-r--r--inc/init.php5
-rw-r--r--inc/media.php4
-rw-r--r--inc/template.php2
-rw-r--r--inc/toolbar.php6
6 files changed, 23 insertions, 18 deletions
diff --git a/inc/common.php b/inc/common.php
index 3cacc8ec0..d224eae3c 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -733,7 +733,7 @@ function pageTemplate($data){
$tpl = str_replace('@USER@',$_SERVER['REMOTE_USER'],$tpl);
$tpl = str_replace('@NAME@',$INFO['userinfo']['name'],$tpl);
$tpl = str_replace('@MAIL@',$INFO['userinfo']['mail'],$tpl);
- $tpl = str_replace('@DATE@',date($conf['dformat']),$tpl);
+ $tpl = str_replace('@DATE@',$conf['dformat'],$tpl);
$tpl = strftime($tpl);
return $tpl;
}
@@ -932,7 +932,7 @@ function notify($id,$who,$rev='',$summary='',$minor=false,$replace=array()){
}
$ip = clientIP();
- $text = str_replace('@DATE@',date($conf['dformat']),$text);
+ $text = str_replace('@DATE@',strftime($conf['dformat']),$text);
$text = str_replace('@BROWSER@',$_SERVER['HTTP_USER_AGENT'],$text);
$text = str_replace('@IPADDRESS@',$ip,$text);
$text = str_replace('@HOSTNAME@',gethostsbyaddrs($ip),$text);
diff --git a/inc/html.php b/inc/html.php
index c4c334892..8d085c7a0 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -248,7 +248,7 @@ function html_draft(){
$form->addHidden('date', $draft['date']);
$form->addElement(form_makeWikiText($text, array('readonly'=>'readonly')));
$form->addElement(form_makeOpenTag('div', array('id'=>'draft__status')));
- $form->addElement($lang['draftdate'].' '. date($conf['dformat'],filemtime($INFO['draft'])));
+ $form->addElement($lang['draftdate'].' '. strftime($conf['dformat'],filemtime($INFO['draft'])));
$form->addElement(form_makeCloseTag('div'));
$form->addElement(form_makeButton('submit', 'recover', $lang['btn_recover'], array('tabindex'=>'1')));
$form->addElement(form_makeButton('submit', 'draftdel', $lang['btn_draftdel'], array('tabindex'=>'2')));
@@ -379,7 +379,7 @@ function html_locked(){
global $INFO;
$locktime = filemtime(wikiLockFN($ID));
- $expire = @date($conf['dformat'], $locktime + $conf['locktime'] );
+ $expire = @strftime($conf['dformat'], $locktime + $conf['locktime'] );
$min = round(($conf['locktime'] - (time() - $locktime) )/60);
print p_locale_xhtml('locked');
@@ -415,7 +415,7 @@ function html_revisions($first=0){
array_pop($revisions); // remove extra log entry
}
- $date = @date($conf['dformat'],$INFO['lastmod']);
+ $date = @strftime($conf['dformat'],$INFO['lastmod']);
print p_locale_xhtml('revisions');
print '<form action="'.wl($ID).'" method="post" id="page__revisions">';
@@ -443,7 +443,7 @@ function html_revisions($first=0){
}
foreach($revisions as $rev){
- $date = date($conf['dformat'],$rev);
+ $date = strftime($conf['dformat'],$rev);
$info = getRevisionInfo($ID,$rev,true);
$exists = page_exists($ID,$rev);
@@ -539,7 +539,7 @@ function html_recent($first=0){
print '<ul>';
foreach($recents as $recent){
- $date = date($conf['dformat'],$recent['date']);
+ $date = strftime($conf['dformat'],$recent['date']);
print ($recent['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) ? '<li class="minor">' : '<li>';
print '<div class="li">';
@@ -793,7 +793,7 @@ function html_diff($text='',$intro=true){
$l_rev = '';
$l_text = rawWiki($ID,'');
$l_head = '<a class="wikilink1" href="'.wl($ID).'">'.
- $ID.' '.date($conf['dformat'],@filemtime(wikiFN($ID))).'</a> '.
+ $ID.' '.strftime($conf['dformat'],@filemtime(wikiFN($ID))).'</a> '.
$lang['current'];
$r_rev = '';
@@ -822,14 +822,14 @@ function html_diff($text='',$intro=true){
$r_text = rawWiki($ID,$r_rev);
$l_head = '<a class="wikilink1" href="'.wl($ID,"rev=$l_rev").'">'.
- $ID.' '.date($conf['dformat'],$l_rev).'</a>';
+ $ID.' '.strftime($conf['dformat'],$l_rev).'</a>';
if($r_rev){
$r_head = '<a class="wikilink1" href="'.wl($ID,"rev=$r_rev").'">'.
- $ID.' '.date($conf['dformat'],$r_rev).'</a>';
+ $ID.' '.strftime($conf['dformat'],$r_rev).'</a>';
}else{
$r_head = '<a class="wikilink1" href="'.wl($ID).'">'.
- $ID.' '.date($conf['dformat'],@filemtime(wikiFN($ID))).'</a> '.
+ $ID.' '.strftime($conf['dformat'],@filemtime(wikiFN($ID))).'</a> '.
$lang['current'];
}
}
@@ -1044,7 +1044,7 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
<div style="width:99%;">
<div class="toolbar">
- <div id="draft__status"><?php if(!empty($INFO['draft'])) echo $lang['draftdate'].' '.date($conf['dformat']);?></div>
+ <div id="draft__status"><?php if(!empty($INFO['draft'])) echo $lang['draftdate'].' '.strftime($conf['dformat']);?></div>
<div id="tool__bar"><?php if($wr){?><a href="<?php echo DOKU_BASE?>lib/exe/mediamanager.php?ns=<?php echo $INFO['namespace']?>"
target="_blank"><?php echo $lang['mediaselect'] ?></a><?php }?></div>
diff --git a/inc/init.php b/inc/init.php
index a1e18d2df..22959cf16 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -128,6 +128,11 @@
$conf['compression'] = 0;
}
+ // fix dateformat for upgraders
+ if(strpos($conf['dformat'],'%') === false){
+ $conf['dformat'] = '%Y/%m/%d %H:%M';
+ }
+
// precalculate file creation modes
init_creationmodes();
diff --git a/inc/media.php b/inc/media.php
index 3622ea54e..efa200d4c 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -364,7 +364,7 @@ function media_notify($id,$file,$mime){
if(empty($conf['notify'])) return; //notify enabled?
$text = rawLocale('uploadmail');
- $text = str_replace('@DATE@',date($conf['dformat']),$text);
+ $text = str_replace('@DATE@',strftime($conf['dformat']),$text);
$text = str_replace('@BROWSER@',$_SERVER['HTTP_USER_AGENT'],$text);
$text = str_replace('@IPADDRESS@',$_SERVER['REMOTE_ADDR'],$text);
$text = str_replace('@HOSTNAME@',gethostbyaddr($_SERVER['REMOTE_ADDR']),$text);
@@ -494,7 +494,7 @@ function media_printfile($item,$auth,$jump){
$info .= (int) $item['meta']->getField('File.Height');
$info .= ' ';
}
- $info .= '<i>'.date($conf['dformat'],$item['mtime']).'</i>';
+ $info .= '<i>'.strftime($conf['dformat'],$item['mtime']).'</i>';
$info .= ' ';
$info .= filesize_h($item['size']);
diff --git a/inc/template.php b/inc/template.php
index d97558ed1..b0cb56c5b 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -865,7 +865,7 @@ function tpl_pageinfo(){
}
}
$fn = utf8_decodeFN($fn);
- $date = date($conf['dformat'],$INFO['lastmod']);
+ $date = strftime($conf['dformat'],$INFO['lastmod']);
// print it
if($INFO['exists']){
diff --git a/inc/toolbar.php b/inc/toolbar.php
index 06efe642d..00b7baefe 100644
--- a/inc/toolbar.php
+++ b/inc/toolbar.php
@@ -24,10 +24,10 @@ function toolbar_JSdefines($varname){
global $lang;
$menu = array();
-
+
$evt = new Doku_Event('TOOLBAR_DEFINE', $menu);
if ($evt->advise_before()){
-
+
// build button array
$menu = array_merge($menu, array(
array(
@@ -197,7 +197,7 @@ function toolbar_signature(){
$sig = str_replace('@USER@',$_SERVER['REMOTE_USER'],$sig);
$sig = str_replace('@NAME@',$INFO['userinfo']['name'],$sig);
$sig = str_replace('@MAIL@',$INFO['userinfo']['mail'],$sig);
- $sig = str_replace('@DATE@',date($conf['dformat']),$sig);
+ $sig = str_replace('@DATE@',strftime($conf['dformat']),$sig);
$sig = str_replace('\\\\n','\\n',addslashes($sig));
return $sig;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-09 14:45:01 +0000