Menu
▾
▴
[Tikiwiki-cvs] tiki tiki-edit_banner.php, 1.24, 1.25 tiki-editpage.php, 1.162, 1.163 tiki-edit_programmed_content.php, 1.19, 1.20 tiki-edit_quiz.php, 1.21, 1.22 tiki-edit_submission.php, 1.57, 1.58 tiki-export_tracker.php, 1.8, 1.9 tiki-file_galleries_rss.php, 1.29, 1.30 tiki-file_gallery_rss.php, 1.30, 1.31 tiki-forum_rss.php, 1.23, 1.24 tiki-forums_rss.php, 1.24, 1.25 tiki-history_sheets.php, 1.7, 1.8 tiki-image_galleries_rss.php, 1.29, 1.30 tiki-image_gallery_rss.php, 1.28, 1.29 tiki-index.php, 1.175, 1.176 tiki-index_p.php, 1.24, 1.25
Update of /cvsroot/tikiwiki/tiki In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22373 Modified Files: tiki-edit_banner.php tiki-editpage.php tiki-edit_programmed_content.php tiki-edit_quiz.php tiki-edit_submission.php tiki-export_tracker.php tiki-file_galleries_rss.php tiki-file_gallery_rss.php tiki-forum_rss.php tiki-forums_rss.php tiki-history_sheets.php tiki-image_galleries_rss.php tiki-image_gallery_rss.php tiki-index.php tiki-index_p.php Log Message: [MOD] dates: more cleaning Index: tiki-edit_banner.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_banner.php,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- tiki-edit_banner.php 4 Feb 2007 20:09:32 -0000 1.24 +++ tiki-edit_banner.php 12 Feb 2007 11:47:58 -0000 1.25 @@ -94,9 +94,8 @@ } else { $smarty->assign('client', ''); $smarty->assign('maxImpressions', 1000); - $now = date("U"); - $smarty->assign('fromDate', $now); - $smarty->assign('toDate', $now + (365 * 24 * 3600)); + $smarty->assign('fromDate', $tikilib->now); + $smarty->assign('toDate', $tikilib->now + (365 * 24 * 3600)); $smarty->assign('useDates', 'n'); $smarty->assign('fromTime', '00:00'); $smarty->assign('toTime', '23:59'); Index: tiki-editpage.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-editpage.php,v retrieving revision 1.162 retrieving revision 1.163 diff -u -d -r1.162 -r1.163 --- tiki-editpage.php 5 Feb 2007 22:32:48 -0000 1.162 +++ tiki-editpage.php 12 Feb 2007 11:47:58 -0000 1.163 @@ -797,8 +797,7 @@ $cachedlinks = array_diff($links, $notcachedlinks); $tikilib->cache_links($cachedlinks); */ - $t = date("U"); - $tikilib->create_page($_REQUEST["page"], 0, $edit, $t, $_REQUEST["comment"],$user,$_SERVER["REMOTE_ADDR"],$description, $pageLang, $is_html, $lock_it, isset($_REQUEST['contributions'])? $_REQUEST['contributions']:''); + $tikilib->create_page($_REQUEST["page"], 0, $edit, $tikilib->now, $_REQUEST["comment"],$user,$_SERVER["REMOTE_ADDR"],$description, $pageLang, $is_html, $lock_it, isset($_REQUEST['contributions'])? $_REQUEST['contributions']:''); if ($wiki_watch_author == 'y') { $tikilib->add_user_watch($user,"wiki_page_changed",$_REQUEST["page"],'wiki page',$page,"tiki-index.php?page=$page"); } Index: tiki-edit_programmed_content.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_programmed_content.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- tiki-edit_programmed_content.php 4 Feb 2007 20:09:32 -0000 1.19 +++ tiki-edit_programmed_content.php 12 Feb 2007 11:47:58 -0000 1.20 @@ -51,9 +51,8 @@ } } -$now = date("U"); $smarty->assign('data', ''); -$smarty->assign('publishDate', $now); +$smarty->assign('publishDate', $tikilib->now); $smarty->assign('actual', ''); if (isset($_REQUEST["save"])) { Index: tiki-edit_quiz.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_quiz.php,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- tiki-edit_quiz.php 4 Feb 2007 20:09:32 -0000 1.21 +++ tiki-edit_quiz.php 12 Feb 2007 11:47:58 -0000 1.22 @@ -22,7 +22,6 @@ $_REQUEST["quizId"] = 0; } -$dc = &$tikilib->get_date_converter($user); $smarty->assign('quizId', $_REQUEST["quizId"]); @@ -62,9 +61,8 @@ $info = array(); $info["name"] = ''; $info["description"] = ''; -$info["publishDate"] = date("U"); -$cur_time = getdate(); -$info["expireDate"] = mktime ($cur_time["hours"], $cur_time["minutes"], 0, $cur_time["mon"], $cur_time["mday"]+365, $cur_time["year"]); +$info["publishDate"] = $tikilib->now; +$info["expireDate"] = $tikilib->now + 365*24*60*60; $info["canRepeat"] = 'n'; $info["storeResults"] = 'n'; $info["immediateFeedback"] = 'n'; @@ -87,10 +85,8 @@ # convert from the displayed 'site' time to 'server' time - $publishDate = $dc->getServerDateFromDisplayDate(mktime($_REQUEST["publish_Hour"], $_REQUEST["publish_Minute"], - 0, $_REQUEST["publish_Month"], $_REQUEST["publish_Day"], $_REQUEST["publish_Year"])); - $expireDate = $dc->getServerDateFromDisplayDate(mktime($_REQUEST["expire_Hour"], $_REQUEST["expire_Minute"], - 0, $_REQUEST["expire_Month"], $_REQUEST["expire_Day"], $_REQUEST["expire_Year"])); + $publishDate = $tikilib->make_time($_REQUEST["publish_Hour"], $_REQUEST["publish_Minute"], 0, $_REQUEST["publish_Month"], $_REQUEST["publish_Day"], $_REQUEST["publish_Year"])); + $expireDate = $tikilib->make_time($_REQUEST["expire_Hour"], $_REQUEST["expire_Minute"], 0, $_REQUEST["expire_Month"], $_REQUEST["expire_Day"], $_REQUEST["expire_Year"])); // print $publishDate."<br>"; // print $expireDate."<br>"; @@ -161,11 +157,10 @@ $info = $quizlib->get_quiz($_REQUEST["quizId"]); if (!isset($info["publishDate"])){ - $info["publishDate"] = date("U"); + $info["publishDate"] = $tikilib->now; } if (!isset($info["expireDate"])){ - $cur_time = getdate(); - $info["expireDate"] = mktime ($cur_time["hours"], $cur_time["minutes"], 0, $cur_time["mon"], $cur_time["mday"]+365, $cur_time["year"]); + $info["expireDate"] = $tikilib->now + 365*24*60*60; } } @@ -303,9 +298,9 @@ ask_ticket('edit-quiz'); $smarty->assign('publishDate', $info['publishDate']); -$smarty->assign('publishDateSite', $dc->getDisplayDateFromServerDate($info['publishDate'])); +$smarty->assign('publishDateSite', $info['publishDate']); $smarty->assign('expireDate', $info['expireDate']); -$smarty->assign('expireDateSite', $dc->getDisplayDateFromServerDate($info['expireDate'])); +$smarty->assign('expireDateSite', $info['expireDate']); // disallow robots to index page: $smarty->assign('metatag_robots', 'NOINDEX, NOFOLLOW'); Index: tiki-edit_submission.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_submission.php,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- tiki-edit_submission.php 6 Feb 2007 09:31:08 -0000 1.57 +++ tiki-edit_submission.php 12 Feb 2007 11:47:58 -0000 1.58 @@ -41,8 +41,8 @@ $smarty->assign('subId', $subId); $smarty->assign('articleId', $subId); $smarty->assign('allowhtml', 'y'); -$publishDate = date('U'); -$expireDate = TikiLib::make_time(0,0,0,date("m"), date("d"), date("Y")+1); +$publishDate = $tikilib->now; +$expireDate = $tikilib->make_time(0,0,0,$tikilib->date_format("%m"), $tikilib->date_format("%d"), $tikilib->date_format("%Y")+1); $smarty->assign('title', ''); $smarty->assign('topline', ''); $smarty->assign('subtitle', ''); @@ -398,7 +398,7 @@ } // Set date to today before it's too late -$_SESSION["thedate"] = date("U"); +$_SESSION["thedate"] = $tikilib->now; // Armar un select con los topics $topics = $artlib->list_topics(); Index: tiki-export_tracker.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-export_tracker.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- tiki-export_tracker.php 4 Feb 2007 20:09:32 -0000 1.8 +++ tiki-export_tracker.php 12 Feb 2007 11:47:58 -0000 1.9 @@ -190,7 +190,7 @@ $ins_fields["data"][$i]["value"] = mktime($_REQUEST["$ins_id" . "Hour"], $_REQUEST["$ins_id" . "Minute"], 0, $_REQUEST["$ins_id" . "Month"], $_REQUEST["$ins_id" . "Day"], $_REQUEST["$ins_id" . "Year"]); } else { - $ins_fields["data"][$i]["value"] = date("U"); + $ins_fields["data"][$i]["value"] = $tikilib->now; } } elseif ($fields["data"][$i]["type"] == 'e') { // category include_once('lib/categories/categlib.php'); Index: tiki-file_galleries_rss.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-file_galleries_rss.php,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- tiki-file_galleries_rss.php 4 Feb 2007 20:09:32 -0000 1.29 +++ tiki-file_galleries_rss.php 12 Feb 2007 11:47:58 -0000 1.30 @@ -26,7 +26,6 @@ if ($output["data"]=="EMPTY") { $title = (!empty($title_rss_file_galleries)) ? $title_rss_file_galleries : tra("Tiki RSS feed for file galleries"); $desc = (!empty($desc_rss_file_galleries)) ? $desc_rss_file_galleries : tra("Last files uploaded to the file galleries."); - $now = date("U"); $id = "fileId"; $descId = "description"; $dateId = "lastModif"; Index: tiki-file_gallery_rss.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-file_gallery_rss.php,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- tiki-file_gallery_rss.php 4 Feb 2007 20:09:32 -0000 1.30 +++ tiki-file_gallery_rss.php 12 Feb 2007 11:47:58 -0000 1.31 @@ -32,7 +32,6 @@ $tmp = $tikilib->get_file_gallery($_REQUEST["galleryId"]); $title = tra("Tiki RSS feed for the file gallery: ").$tmp["name"]; $desc = $tmp["description"]; - $now = date("U"); $id = "fileId"; $descId = "description"; $dateId = "lastModif"; Index: tiki-forum_rss.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-forum_rss.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- tiki-forum_rss.php 4 Feb 2007 20:09:32 -0000 1.23 +++ tiki-forum_rss.php 12 Feb 2007 11:47:58 -0000 1.24 @@ -38,7 +38,6 @@ $tmp = $commentslib->get_forum($_REQUEST["forumId"]); $title = tra("Tiki RSS feed for forum: ").$tmp["name"]; $desc = $tmp["description"]; - $now = date("U"); $param = "threadId"; $descId = "data"; $dateId = "commentDate"; Index: tiki-forums_rss.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-forums_rss.php,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- tiki-forums_rss.php 4 Feb 2007 20:09:32 -0000 1.24 +++ tiki-forums_rss.php 12 Feb 2007 11:47:58 -0000 1.25 @@ -26,7 +26,6 @@ if ($output["data"]=="EMPTY") { $title = (!empty($title_rss_forums)) ? $title_rss_forums : tra("Tiki RSS feed for forums"); $desc = (!empty($desc_rss_forums)) ? $desc_rss_forums : tra("Last topics in forums."); - $now = date("U"); $id = "forumId"; $param = "threadId"; $descId = "data"; Index: tiki-history_sheets.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-history_sheets.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- tiki-history_sheets.php 4 Feb 2007 20:09:32 -0000 1.7 +++ tiki-history_sheets.php 12 Feb 2007 11:47:58 -0000 1.8 @@ -42,7 +42,7 @@ $result = $tikilib->query( "SELECT DISTINCT `begin`, `user` FROM `tiki_sheet_values` WHERE `sheetId` = ? ORDER BY begin DESC", array( $_REQUEST['sheetId'] ) ); $data = array(); while( $row = $result->fetchRow() ) - $data[] = array( "stamp" =>$row['begin'], "string" => date( "Y-m-d H:i:s", $row['begin'] ), "user" => $row['user'] ); + $data[] = array( "stamp" =>$row['begin'], "string" => $tikilib->date_format( "%Y-%m-%d %H:%M:%S", $row['begin'] ), "user" => $row['user'] ); $smarty->assign_by_ref( 'history', $data ); Index: tiki-image_galleries_rss.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-image_galleries_rss.php,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- tiki-image_galleries_rss.php 4 Feb 2007 20:09:32 -0000 1.29 +++ tiki-image_galleries_rss.php 12 Feb 2007 11:47:58 -0000 1.30 @@ -28,7 +28,6 @@ $title = (!empty($title_rss_image_galleries)) ? $title_rss_image_galleries : tra("Tiki RSS feed for image galleries"); $desc = (!empty($desc_rss_image_galleries)) ? $desc_rss_image_galleries : tra("Last images uploaded to the image galleries."); - $now = date("U"); $id = "imageId"; $titleId = "name"; $descId = "description"; Index: tiki-image_gallery_rss.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-image_gallery_rss.php,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- tiki-image_gallery_rss.php 4 Feb 2007 20:09:32 -0000 1.28 +++ tiki-image_gallery_rss.php 12 Feb 2007 11:47:58 -0000 1.29 @@ -32,7 +32,6 @@ if ($output["data"]=="EMPTY") { $tmp = $imagegallib->get_gallery($_REQUEST["galleryId"]); $title = tra("Tiki RSS feed for the image gallery: ").$tmp["name"]; - $now = date("U"); $desc = $tmp["description"]; // TODO: make configurable $id = "imageId"; $titleId = "name"; Index: tiki-index.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-index.php,v retrieving revision 1.175 retrieving revision 1.176 diff -u -d -r1.175 -r1.176 --- tiki-index.php 4 Feb 2007 20:09:32 -0000 1.175 +++ tiki-index.php 12 Feb 2007 11:47:59 -0000 1.176 @@ -29,7 +29,7 @@ } if(!isset($_SESSION['thedate'])) { - $thedate = date('U'); + $thedate = $tikilib->now; } else { $thedate = $_SESSION['thedate']; } @@ -45,7 +45,7 @@ $_REQUEST['page'] = $userHomePage = $userlib->get_user_default_homepage2($user); // Create the HomePage if it doesn't exist if(!$tikilib->page_exists($wikiHomePage)) { - $tikilib->create_page($wikiHomePage,0,'',date('U'),'Tiki initialization'); + $tikilib->create_page($wikiHomePage,0,'',$tikilib->now,'Tiki initialization'); } header('Location: tiki-index.php?page='.$userHomePage); if ($feature_best_language == 'y') { @@ -377,7 +377,7 @@ $wikilib->remove_last_version($page); // If page was deleted then re-create if(!$tikilib->page_exists($page)) { - $tikilib->create_page($page,0,'',date('U'),'Tiki initialization'); + $tikilib->create_page($page,0,'',$tikilib->now,'Tiki initialization'); } // Restore page information $info = $tikilib->get_page_info($page); @@ -416,8 +416,7 @@ if(isset($info['wiki_cache'])) {$wiki_cache=$info['wiki_cache'];} if($wiki_cache>0) { $cache_info = $wikilib->get_cache_info($page); - $now = date('U'); - if($cache_info['cache_timestamp']+$wiki_cache > $now) { + if($cache_info['cache_timestamp']+$wiki_cache > $tikilib->now) { $pdata = $cache_info['cache']; $smarty->assign('cached_page','y'); } else { @@ -450,7 +449,6 @@ $smarty->assign('last_page',$pages); $smarty->assign('pagenum',$_REQUEST['pagenum']); -//$smarty->assign_by_ref('lastModif',date("l d of F, Y [H:i:s]",$info["lastModif"])); $smarty->assign_by_ref('lastVersion',$info["version"]); $smarty->assign_by_ref('lastModif',$info["lastModif"]); if(empty($info['user'])) { Index: tiki-index_p.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-index_p.php,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- tiki-index_p.php 4 Feb 2007 20:09:32 -0000 1.24 +++ tiki-index_p.php 12 Feb 2007 11:47:59 -0000 1.25 @@ -31,11 +31,11 @@ // Create the HomePage if it doesn't exist if (!$tikilib->page_exists($wikiHomePage)) { - $tikilib->create_page($wikiHomePage, 0, '', date("U"), 'Tiki initialization'); + $tikilib->create_page($wikiHomePage, 0, '', $tikilib->now, 'Tiki initialization'); } if (!isset($_SESSION["thedate"])) { - $thedate = date("U"); + $thedate = $tikilib->now; } else { $thedate = $_SESSION["thedate"]; } @@ -48,7 +48,7 @@ $smarty->assign('page', $page); if (!$tikilib->page_exists($wikiHomePage)) { - $tikilib->create_page($wikiHomePage, 0, '', date("U"), 'Tiki initialization'); + $tikilib->create_page($wikiHomePage, 0, '', $tikilib->now, 'Tiki initialization'); } require_once('tiki-pagesetup.php'); @@ -198,9 +198,7 @@ if ($wiki_cache > 0) { $cache_info = $wikilib->get_cache_info($page); - $now = date('U'); - - if ($cache_info['cache_timestamp'] + $wiki_cache > $now) { + if ($cache_info['cache_timestamp'] + $wiki_cache > $tikilib->now) { $pdata = $cache_info['cache']; $smarty->assign('cached_page', 'y'); @@ -244,7 +242,6 @@ $smarty->assign_by_ref('parsed', $pdata); -//$smarty->assign_by_ref('lastModif',date("l d of F, Y [H:i:s]",$info["lastModif"])); $smarty->assign_by_ref('lastModif', $info["lastModif"]); if (empty($info["user"])) { |