Update of /cvsroot/tikiwiki/tiki In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2483 Modified Files: tiki-list_articles.php tiki-list_submissions.php tiki-mailin-code.php xmlrpc.php tiki-xmlrpc_services.php tiki-wiki_rss.php tiki-view_tracker.php tiki-view_tracker_item.php tiki-view_blog_post.php tiki-view_blog.php tiki-view_articles.php tiki-user_tasks.php Log Message: [MOD] dates: more cleaning Index: tiki-list_articles.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_articles.php,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- tiki-list_articles.php 4 Feb 2007 20:09:32 -0000 1.28 +++ tiki-list_articles.php 12 Feb 2007 12:14:14 -0000 1.29 @@ -76,19 +76,18 @@ $smarty->assign_by_ref('offset', $offset); -$now = date("U"); if( ($tiki_p_admin == 'y') || ($tiki_p_admin_cms == 'y') ) { $pdate = ''; } elseif(isset($_SESSION["thedate"])) { - if($_SESSION["thedate"]<$now) { + if($_SESSION["thedate"]<$tikilib->now) { // If the session is older then set it to today // so you can list articles - $pdate = $now; + $pdate = $tikilib->now; } else { $pdate = $_SESSION["thedate"]; } } else { - $pdate = $now; + $pdate = $tikilib->now; } if (isset($_REQUEST["find"])) { Index: tiki-list_submissions.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-list_submissions.php,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- tiki-list_submissions.php 4 Feb 2007 20:09:32 -0000 1.18 +++ tiki-list_submissions.php 12 Feb 2007 12:14:14 -0000 1.19 @@ -83,17 +83,16 @@ $smarty->assign_by_ref('offset', $offset); -$now = date("U"); if( ($tiki_p_admin == 'y') || ($tiki_p_admin_cms == 'y') ) { $pdate = ''; } elseif(isset($_SESSION["thedate"])) { - if($_SESSION["thedate"]<$now) { + if($_SESSION["thedate"]<$tikilib->now) { $pdate = $_SESSION["thedate"]; } else { - $pdate = $now; + $pdate = $tikilib->now; } } else { - $pdate = $now; + $pdate = $tikilib->now; } if (isset($_REQUEST["find"])) { Index: tiki-mailin-code.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-mailin-code.php,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- tiki-mailin-code.php 4 Feb 2007 20:09:32 -0000 1.20 +++ tiki-mailin-code.php 12 Feb 2007 12:14:14 -0000 1.21 @@ -130,8 +130,8 @@ $user = $aux['sender']['user']; $authorName = $user; $body = ''; - $publishDate = date('U'); - $expireDate = mktime (0,0,0,date("m"), date("d"), date("Y")+1); + $publishDate = $tikilib->now; + $expireDate = $tikilib->now + 365*24*60*60; $subId = 0; $type = $acc['article_type']; $useImage = 'n'; @@ -217,8 +217,7 @@ if (!$tikilib->page_exists($page)) { $content .= "Page: $page has been created<br />"; - $tikilib->create_page($page, - 0, $body, date('U'), "Created from " . $acc["account"], $aux["sender"]["user"], '0.0.0.0', ''); + $tikilib->create_page($page, 0, $body, $tikilib->now, "Created from " . $acc["account"], $aux["sender"]["user"], '0.0.0.0', ''); } else { $tikilib->update_page($page, $body, "Created from " . $acc["account"], $aux["sender"]["user"], '0.0.0.0', ''); @@ -241,8 +240,7 @@ if (!$tikilib->page_exists($page)) { $content .= "Page: $page has been created<br />"; - $tikilib->create_page($page, - 0, $body, date('U'), "Created from " . $acc["account"], $aux["sender"]["user"], '0.0.0.0', ''); + $tikilib->create_page($page, 0, $body, $tikilib->now, "Created from " . $acc["account"], $aux["sender"]["user"], '0.0.0.0', ''); } else { $info = $tikilib->get_page_info($page); if ($acc['type'] == 'wiki-append' || $acc['type'] == 'wiki' && $method == "APPEND") Index: xmlrpc.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/xmlrpc.php,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- xmlrpc.php 4 Feb 2007 20:09:34 -0000 1.28 +++ xmlrpc.php 12 Feb 2007 12:14:15 -0000 1.29 @@ -98,8 +98,6 @@ } // User ok and can submit then submit the post - $now=date("U"); - $id = $bloglib->blog_post($blogid,$content,$username, $title); return new XML_RPC_Response(new XML_RPC_Value("$id")); @@ -144,7 +142,6 @@ } } - $now=date("U"); $id = $bloglib->update_post($postid,$blogid,$content,$username,$title); return new XML_RPC_Response(new XML_RPC_Value(1,"boolean")); } @@ -175,8 +172,6 @@ } } - - $now=date("U"); $id = $bloglib->remove_post($postid); return new XML_RPC_Response(new XML_RPC_Value(1,"boolean")); } @@ -210,7 +205,6 @@ if(!$post_data) { return new XML_RPC_Response(0, 101, "Post not found"); } -# $dateCreated=date("Ymd",$post_data["created"])."T".date("h:i:s",$post_data["created"]); $dateCreated=$tikilib->get_iso8601_datetime($post_data["created"]); // added dateTime type for blogger compliant xml tag Joerg Knobloch <jo...@ha...> $myStruct=new XML_RPC_Value(array("userid" => new XML_RPC_Value($username), @@ -255,7 +249,6 @@ $arrayval = Array(); foreach($posts["data"] as $post) { -# $dateCreated=date("Ymd",$post["created"])."T".date("h:i:s",$post["created"]); $dateCreated=$tikilib->get_iso8601_datetime($post["created"]); $myStruct=new XML_RPC_Value(array("userid" => new XML_RPC_Value($username), "dateCreated" => new XML_RPC_Value($dateCreated, "dateTime.iso8601"), Index: tiki-xmlrpc_services.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-xmlrpc_services.php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- tiki-xmlrpc_services.php 4 Feb 2007 20:09:34 -0000 1.15 +++ tiki-xmlrpc_services.php 12 Feb 2007 12:14:15 -0000 1.16 @@ -128,8 +128,6 @@ } // User ok and can submit then submit the post - $now = date("U"); - $id = $bloglib->blog_post($blogid, $content, $username); return new XML_RPC_Response(new XML_RPC_Value("$id")); @@ -180,7 +178,6 @@ } } - $now = date("U"); $id = $bloglib->update_post($postid, $blogid, $content, $username); return new XML_RPC_Response(new XML_RPC_Value(1, "boolean")); } @@ -219,7 +216,6 @@ } } - $now = date("U"); $id = $bloglib->remove_post($postid); return new XML_RPC_Response(new XML_RPC_Value(1, "boolean")); } @@ -266,7 +262,6 @@ return new XML_RPC_Response(0, 101, "Post not found"); } - # $dateCreated=date("Ymd",$post_data["created"])."T".date("h:i:s",$post_data["created"]); $dateCreated = $tikilib->get_iso8601_datetime($post_data["created"]); // added dateTime type for blogger compliant xml tag Joerg Knobloch <jo...@ha...> $myStruct = new XML_RPC_Value(array( @@ -320,7 +315,6 @@ $arrayval = array(); foreach ($posts["data"] as $post) { - # $dateCreated=date("Ymd",$post["created"])."T".date("h:i:s",$post["created"]); $dateCreated = $tikilib->get_iso8601_datetime($post["created"]); $myStruct = new XML_RPC_Value(array( Index: tiki-wiki_rss.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-wiki_rss.php,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- tiki-wiki_rss.php 4 Feb 2007 20:09:34 -0000 1.40 +++ tiki-wiki_rss.php 12 Feb 2007 12:14:15 -0000 1.41 @@ -27,7 +27,6 @@ if ($output["data"]=="EMPTY") { $title = (!empty($title_rss_wiki)) ? $title_rss_wiki : tra("Tiki RSS feed for the wiki pages"); $desc = (!empty($desc_rss_wiki)) ? $desc_rss_wiki : tra("Last modifications to the Wiki."); - $now = date("U"); $id = "pageName"; $titleId = "pageName"; $descId = "data"; @@ -94,4 +93,4 @@ header("Content-type: ".$output["content-type"]); print $output["data"]; -?> \ No newline at end of file +?> Index: tiki-view_tracker.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_tracker.php,v retrieving revision 1.118 retrieving revision 1.119 diff -u -d -r1.118 -r1.119 --- tiki-view_tracker.php 8 Feb 2007 13:51:20 -0000 1.118 +++ tiki-view_tracker.php 12 Feb 2007 12:14:15 -0000 1.119 @@ -122,13 +122,13 @@ $tracker_info = array_merge($tracker_info,$t); if ($tiki_p_create_tracker_items == 'y' && !empty($t['start'])) { - if (date('U') < $t['start']) { + if ($tikilib->now < $t['start']) { $tiki_p_create_tracker_items = 'n'; $smarty->assign('tiki_p_create_tracker_items', 'n'); } } if ($tiki_p_create_tracker_items == 'y' && !empty($t['end'])) { - if (date('U') > $t['end']) { + if ($tikilib->now > $t['end']) { $tiki_p_create_tracker_items = 'n'; $smarty->assign('tiki_p_create_tracker_items', 'n'); } @@ -254,7 +254,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-view_tracker_item.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_tracker_item.php,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- tiki-view_tracker_item.php 8 Feb 2007 13:51:20 -0000 1.114 +++ tiki-view_tracker_item.php 12 Feb 2007 12:14:15 -0000 1.115 @@ -292,7 +292,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') { Index: tiki-view_blog_post.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_blog_post.php,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- tiki-view_blog_post.php 4 Feb 2007 20:09:33 -0000 1.42 +++ tiki-view_blog_post.php 12 Feb 2007 12:14:15 -0000 1.43 @@ -175,8 +175,7 @@ if ($user && $tiki_p_notepad == 'y' && $feature_notepad == 'y' && isset($_REQUEST['savenotepad'])) { check_ticket('view-blog-post'); - $tikilib->replace_note($user, - 0, $post_info['title'] ? $post_info['title'] : date("d/m/Y [h:i]", $post_info['created']), $post_info['data']); + $tikilib->replace_note($user, 0, $post_info['title'] ? $post_info['title'] : $tikilib->date_format("%d/%m/%Y [%H:%M]", $post_info['created']), $post_info['data']); } if ($feature_mobile == 'y' && isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'mobile') { Index: tiki-view_blog.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_blog.php,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- tiki-view_blog.php 4 Feb 2007 20:09:33 -0000 1.57 +++ tiki-view_blog.php 12 Feb 2007 12:14:15 -0000 1.58 @@ -177,8 +177,6 @@ $smarty->assign_by_ref('offset', $offset); -$now = date("U"); - if (isset($_REQUEST["find"])) { $find = $_REQUEST["find"]; } else { @@ -188,7 +186,7 @@ $smarty->assign('find', $find); // Get a list of last changes to the blog database -$listpages = $bloglib->list_blog_posts($_REQUEST["blogId"], $offset, $blog_data["maxPosts"], $sort_mode, $find, $now); +$listpages = $bloglib->list_blog_posts($_REQUEST["blogId"], $offset, $blog_data["maxPosts"], $sort_mode, $find, $tikilib->now); $temp_max = count($listpages["data"]); for ($i = 0; $i < $temp_max; $i++) { @@ -246,7 +244,7 @@ $post_info = $bloglib->get_post($_REQUEST['savenotepad']); $tikilib->replace_note($user, - 0, $post_info['title'] ? $post_info['title'] : date("d/m/Y [h:i]", $post_info['created']), $post_info['data']); + 0, $post_info['title'] ? $post_info['title'] : $tikilib->date_format("%d/%m/%Y [%H:%M]", $post_info['created']), $post_info['data']); } if ($feature_user_watches == 'y') { Index: tiki-view_articles.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-view_articles.php,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- tiki-view_articles.php 4 Feb 2007 20:09:33 -0000 1.35 +++ tiki-view_articles.php 12 Feb 2007 12:14:16 -0000 1.36 @@ -77,20 +77,18 @@ $smarty->assign_by_ref('offset', $offset); -$now = date("U"); - if (isset($_SESSION["thedate"])) { - if ($_SESSION["thedate"] < $now) { + if ($_SESSION["thedate"] < $tikilib->now) { $pdate = $_SESSION["thedate"]; } else { if ($tiki_p_admin == 'y' || $tiki_p_admin_cms == 'y') { $pdate = $_SESSION["thedate"]; } else { - $pdate = $now; + $pdate = $tikilib->now; } } } else { - $pdate = $now; + $pdate = $tikilib->now; } if (isset($_REQUEST["find"])) { Index: tiki-user_tasks.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-user_tasks.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- tiki-user_tasks.php 4 Feb 2007 20:09:33 -0000 1.23 +++ tiki-user_tasks.php 12 Feb 2007 12:14:16 -0000 1.24 @@ -348,7 +348,6 @@ if ((isset($_REQUEST['save'])) || (isset($_REQUEST['preview']))) { $dc = $tikilib->get_date_converter($user); - $now = date("U"); $auto_accepted_status = true; $save = array(); $save_head = array(); @@ -367,12 +366,7 @@ isset($_REQUEST['start_Month']) and isset($_REQUEST['start_Day']) and isset($_REQUEST['start_Year'])){ - $start_date = $dc->getServerDateFromDisplayDate(mktime( $_REQUEST['start_Hour'], - $_REQUEST['start_Minute'], - 0, - $_REQUEST['start_Month'], - $_REQUEST['start_Day'], - $_REQUEST['start_Year'])); + $start_date = $tikilib->make_time($_REQUEST['start_Hour'], $_REQUEST['start_Minute'], 0, $_REQUEST['start_Month'], $_REQUEST['start_Day'], $_REQUEST['start_Year']); } else $start_date = null; if( isset($_REQUEST['use_end_date']) and @@ -381,12 +375,7 @@ isset($_REQUEST['end_Month']) and isset($_REQUEST['end_Day']) and isset($_REQUEST['end_Year'])){ - $end_date = $dc->getServerDateFromDisplayDate(mktime( $_REQUEST['end_Hour'], - $_REQUEST['end_Minute'], - 0, - $_REQUEST['end_Month'], - $_REQUEST['end_Day'], - $_REQUEST['end_Year'])); + $end_date = $tikilib->make_time($_REQUEST['end_Hour'], $_REQUEST['end_Minute'], 0, $_REQUEST['end_Month'], $_REQUEST['end_Day'], $_REQUEST['end_Year']); } else $end_date = null; if(isset($_REQUEST['task_user'])){ @@ -444,17 +433,17 @@ $save['start'] = $start_date; $msg_changes .= tra('Start').": "; if($info['start'] != null) { - $msg_changes .= date("l dS of F Y H:i:s", $info['start']).' --> '; + $msg_changes .= $tikilib->date_format("$short_date_format $long_time_format", $info['start']).' --> '; } - $msg_changes .= date("l dS of F Y H:i:s", $save['start']) ."\n"; + $msg_changes .= $tikilib->date_format("$short_date_format $long_time_format", $save['start']) ."\n"; } if(isset($_REQUEST['use_end_date']) and $info['end'] != $end_date){ $save['end'] = $end_date; $msg_changes .= tra('END').": "; if($info['end'] != null) { - $msg_changes .= date("l dS of F Y H:i:s", $info['end']).' --> '; + $msg_changes .= $tikilib->date_format("$short_date_format $long_time_format", $info['end']).' --> '; } - $msg_changes .= date("l dS of F Y H:i:s", $save['end']) ."\n"; + $msg_changes .= $tikilib->date_format("$short_date_format $long_time_format", $save['end']) ."\n"; } if(isset($_REQUEST['priority']) and $info['priority'] != $_REQUEST['priority']){ $save['priority'] = $_REQUEST['priority']; @@ -467,7 +456,7 @@ $msg_changes .= tra('Status').': '.$info['status'].' --> '. $save['status']."\n"; if($save['status'] == 'c'){ $_REQUEST['percentage'] = 100; - $save['completed'] = $now; + $save['completed'] = $tikilib->now; } } else { unset($save['status']); @@ -532,19 +521,12 @@ $info['creator'] = $_REQUEST['creator'];; $info['public_for_group'] = $_REQUEST['public_for_group']; $info['rights_by_creator'] = (isset($_REQUEST['rights_by_creator']))? $_REQUEST['rights_by_creator'] : NULL; - // $task['deleted'] = (isset($_REQUEST['deleted']))? $_REQUEST['deleted'] :NULL; - $info['created'] = (isset($_REQUEST['created']))? $_REQUEST['created'] :date("U"); - /*--history --*/ - // $task['belongs_to'] = (isset($_REQUEST['belongs_to']))? :; - // $task['lasteditor'] = (isset($_REQUEST['lasteditor']))? :; - // $task['lastchanges'] = date("U"); - /*--*/ + $info['created'] = (isset($_REQUEST['created']))? $_REQUEST['created'] : $tikilib->now; $info['percentage_null'] = ($_REQUEST['percentage'] == 'w'); if ((isset($_REQUEST['status'])) && ($_REQUEST['status'] != 'w')) { $info['status'] = $_REQUEST['status']; - } - else{ + } else { $info['status'] = null; } $info['info'] = (isset($_REQUEST['task_info_message']))? $_REQUEST['task_info_message']:''; @@ -582,7 +564,7 @@ ($userlib->user_has_permission($_REQUEST['task_user'],'tiki_p_tasks_receive') and $userlib->user_has_permission($user,'tiki_p_tasks_send'))) { - $taskId = $tasklib->new_task($_REQUEST['task_user'], $user, $public_for_group, $rights_by_creator, $now, $save); + $taskId = $tasklib->new_task($_REQUEST['task_user'], $user, $public_for_group, $rights_by_creator, $tikilib->now, $save); } else{ @@ -638,10 +620,10 @@ } $mail_data .= ".\n\n"; if ($info['start'] !== NULL){ - $mail_data .= tra("You've to start your work at least on").": ".date("j.M.Y - H:i",$info['end'])."\n"; + $mail_data .= tra("You've to start your work at least on").": ".$tikilib->date_format("$short_date_format $short_time_format",$info['end'])."\n"; } if ($info['end'] !== NULL){ - $mail_data .= tra("You've to finish your work on").": ".date("j.M.Y - H:i",$info['end'])."\n"; + $mail_data .= tra("You've to finish your work on").": ". $tikilib->date_format("$short_date_format $short_time_format",$info['end'])."\n"; } $mail_data .= "\n".tra("Login and click the link below")."\n"; @@ -686,14 +668,14 @@ $smarty->assign('taskId', $_REQUEST['taskId']); $smarty->assign('info', $info); -$smarty->assign('created_Month', date('m', $info['created'])); -$smarty->assign('created_Day', date('d', $info['created'])); -$smarty->assign('created_Year', date('Y', $info['created'])); -$smarty->assign('created_Hour', date('H', $info['created'])); -$smarty->assign('created_Minute', date('M', $info['created'])); +$smarty->assign('created_Month', $tikilib->date_format('%m', $info['created'])); +$smarty->assign('created_Day', $tikilib->date_format('%d', $info['created'])); +$smarty->assign('created_Year', $tikilib->date_format('%Y', $info['created'])); +$smarty->assign('created_Hour', $tikilib->date_format('%H', $info['created'])); +$smarty->assign('created_Minute', $tikilib->date_format('%M', $info['created'])); if ((!isset($info['start'])) || ($info['start'] == null)) { - $info['start'] = date("U"); + $info['start'] = $tikilib->now; $smarty->assign('start_date', $info['start'] ); } else { |