Menu
▾
▴
[Tikiwiki-cvs] tiki tiki-article_types.php,1.10,1.11 tiki-edit_article.php,1.38,1.39 tiki-edit_submission.php,1.36,1.37 tiki-read_article.php,1.23,1.24
|
From: <mo...@us...> - 2004-04-10 04:59:48
|
Update of /cvsroot/tikiwiki/tiki In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25675 Modified Files: tiki-article_types.php tiki-edit_article.php tiki-edit_submission.php tiki-read_article.php Log Message: added some fat to article (new fields) Index: tiki-article_types.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-article_types.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- tiki-article_types.php 31 Mar 2004 07:38:41 -0000 1.10 +++ tiki-article_types.php 10 Apr 2004 04:46:23 -0000 1.11 @@ -51,6 +51,11 @@ if (!isset($_REQUEST["show_expdate"][$this_type])) {$_REQUEST["show_expdate"][$this_type] = 'n';} if (!isset($_REQUEST["show_reads"][$this_type])) {$_REQUEST["show_reads"][$this_type] = 'n';} if (!isset($_REQUEST["show_size"][$this_type])) {$_REQUEST["show_size"][$this_type] = 'n';} + if (!isset($_REQUEST["show_topline"][$this_type])) {$_REQUEST["show_topline"][$this_type] = 'n';} + if (!isset($_REQUEST["show_subtitle"][$this_type])) {$_REQUEST["show_subtitle"][$this_type] = 'n';} + if (!isset($_REQUEST["show_image_caption"][$this_type])) {$_REQUEST["show_image_caption"][$this_type] = 'n';} + if (!isset($_REQUEST["show_linkto"][$this_type])) {$_REQUEST["show_linkto"][$this_type] = 'n';} + if (!isset($_REQUEST["show_lang"][$this_type])) {$_REQUEST["show_lang"][$this_type] = 'n';} if (!isset($_REQUEST["creator_edit"][$this_type])) {$_REQUEST["creator_edit"][$this_type] = 'n';} $artlib->edit_type($this_type, $_REQUEST["use_ratings"][$this_type], @@ -66,6 +71,11 @@ $_REQUEST["show_expdate"][$this_type], $_REQUEST["show_reads"][$this_type], $_REQUEST["show_size"][$this_type], + $_REQUEST["show_topline"][$this_type], + $_REQUEST["show_subtitle"][$this_type], + $_REQUEST["show_linkto"][$this_type], + $_REQUEST["show_image_caption"][$this_type], + $_REQUEST["show_lang"][$this_type], $_REQUEST["creator_edit"][$this_type]); } } Index: tiki-edit_article.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_article.php,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- tiki-edit_article.php 28 Mar 2004 07:32:23 -0000 1.38 +++ tiki-edit_article.php 10 Apr 2004 04:46:23 -0000 1.39 @@ -45,6 +45,11 @@ $expireDate = mktime ($cur_time["hours"], $cur_time["minutes"], 0, $cur_time["mon"], $cur_time["mday"]+365, $cur_time["year"]); $dc = &$tikilib->get_date_converter($user); $smarty->assign('title', ''); +$smarty->assign('topline', ''); +$smarty->assign('subtitle', ''); +$smarty->assign('linkto', ''); +$smarty->assign('image_caption', ''); +$smarty->assign('lang', ''); $authorName = $tikilib->get_user_preference($user,'realName',$user); $smarty->assign('authorName', $authorName); $smarty->assign('topicId', ''); @@ -74,6 +79,11 @@ $publishDate = $article_data["publishDate"]; $expireDate = $article_data["expireDate"]; $smarty->assign('title', $article_data["title"]); + $smarty->assign('topline', $article_data["topline"]); + $smarty->assign('subtitle', $article_data["subtitle"]); + $smarty->assign('linkto', $article_data["linkto"]); + $smarty->assign('image_caption', $article_data["image_caption"]); + $smarty->assign('lang', $article_data["lang"]); $smarty->assign('authorName', $article_data["authorName"]); $smarty->assign('topicId', $article_data["topicId"]); $smarty->assign('useImage', $article_data["useImage"]); @@ -140,10 +150,18 @@ // If we are in preview mode then preview it! if (isset($_REQUEST["preview"])) { # convert from the displayed 'site' time to 'server' time + if (isset($_REQUEST["publish_Hour"])) { $publishDate = $dc->getServerDateFromDisplayDate(mktime($_REQUEST["publish_Hour"], $_REQUEST["publish_Minute"], 0, $_REQUEST["publish_Month"], $_REQUEST["publish_Day"], $_REQUEST["publish_Year"])); + } else { + $publishDate = date('U'); + } + if (isset($_REQUEST["expire_Hour"])) { $expireDate = $dc->getServerDateFromDisplayDate(mktime($_REQUEST["expire_Hour"], $_REQUEST["expire_Minute"], 0, $_REQUEST["expire_Month"], $_REQUEST["expire_Day"], $_REQUEST["expire_Year"])); + } else { + $expireDate = $publishDate; + } $smarty->assign('reads', '0'); $smarty->assign('preview', 1); @@ -171,7 +189,17 @@ $hasImage = 'y'; } + if (!isset($_REQUEST["topline"])) $_REQUEST['topline'] = ''; + if (!isset($_REQUEST["subtitle"])) $_REQUEST['subtitle'] = ''; + if (!isset($_REQUEST["linkto"])) $_REQUEST['linkto'] = ''; + if (!isset($_REQUEST["image_caption"])) $_REQUEST['image_caption'] = ''; + if (!isset($_REQUEST["lang"])) $_REQUEST['lang'] = ''; + $smarty->assign('topline', $_REQUEST["topline"]); + $smarty->assign('subtitle', $_REQUEST["subtitle"]); + $smarty->assign('linkto', $_REQUEST["linkto"]); + $smarty->assign('image_caption', $_REQUEST["image_caption"]); + $smarty->assign('lang', $_REQUEST["lang"]); $smarty->assign('image_name', $_REQUEST["image_name"]); $smarty->assign('image_type', $_REQUEST["image_type"]); $smarty->assign('image_size', $_REQUEST["image_size"]); @@ -256,10 +284,18 @@ include_once ("lib/imagegals/imagegallib.php"); # convert from the displayed 'site' time to 'server' time + if (isset($_REQUEST["publish_Hour"])) { $publishDate = $dc->getServerDateFromDisplayDate(mktime($_REQUEST["publish_Hour"], $_REQUEST["publish_Minute"], 0, $_REQUEST["publish_Month"], $_REQUEST["publish_Day"], $_REQUEST["publish_Year"])); + } else { + $publishDate = date('U'); + } + if (isset($_REQUEST["expire_Hour"])) { $expireDate = $dc->getServerDateFromDisplayDate(mktime($_REQUEST["expire_Hour"], $_REQUEST["expire_Minute"], 0, $_REQUEST["expire_Month"], $_REQUEST["expire_Day"], $_REQUEST["expire_Year"])); + } else { + $expireDate = date('U'); + } if (isset($_REQUEST["allowhtml"]) && $_REQUEST["allowhtml"] == "on") { $body = $_REQUEST["body"]; @@ -308,14 +344,20 @@ $body = $imagegallib->capture_images($body); $heading = $imagegallib->capture_images($heading); - if (!isset($_REQUEST["rating"])) - $_REQUEST['rating'] = 0; - if (!isset($_REQUEST['topicId']) || $_REQUEST['topicId'] == '') $_REQUEST['topicId'] = 0; + if (!isset($_REQUEST["rating"])) $_REQUEST['rating'] = 0; + if (!isset($_REQUEST['topicId']) || $_REQUEST['topicId'] == '') $_REQUEST['topicId'] = 0; + + if (!isset($_REQUEST["topline"])) $_REQUEST['topline'] = ''; + if (!isset($_REQUEST["subtitle"])) $_REQUEST['subtitle'] = ''; + if (!isset($_REQUEST["linkto"])) $_REQUEST['linkto'] = ''; + if (!isset($_REQUEST["image_caption"])) $_REQUEST['image_caption'] = ''; + if (!isset($_REQUEST["lang"])) $_REQUEST['lang'] = ''; // If page exists $artid = $tikilib->replace_article(strip_tags($_REQUEST["title"], '<a><pre><p><img><hr><b><i>'), $_REQUEST["authorName"], $_REQUEST["topicId"], $useImage, $imgname, $imgsize, $imgtype, $imgdata, $heading, $body, $publishDate, $expireDate, $user, - $articleId, $_REQUEST["image_x"], $_REQUEST["image_y"], $_REQUEST["type"], $_REQUEST["rating"], $isfloat); + $articleId, $_REQUEST["image_x"], $_REQUEST["image_y"], $_REQUEST["type"], $_REQUEST["topline"], $_REQUEST["subtitle"], + $_REQUEST["linkto"], $_REQUEST["image_caption"], $_REQUEST["lang"], $_REQUEST["rating"], $isfloat); /* $links = $tikilib->get_links($body); @@ -347,9 +389,12 @@ if ($feature_cms_templates == 'y' && $tiki_p_use_content_templates == 'y') { $templates = $tikilib->list_templates('cms', 0, -1, 'name_asc', ''); } - $smarty->assign_by_ref('templates', $templates["data"]); +$languages = array(); +$languages = $tikilib->list_languages(); +$smarty->assign_by_ref('languages', $languages); + $cat_type = 'article'; $cat_objid = $articleId; include_once ("categorize_list.php"); Index: tiki-edit_submission.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_submission.php,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- tiki-edit_submission.php 28 Mar 2004 07:32:23 -0000 1.36 +++ tiki-edit_submission.php 10 Apr 2004 04:46:23 -0000 1.37 @@ -45,6 +45,11 @@ $expireDate = mktime (0,0,0,date("m"), date("d"), date("Y")+1); $dc = &$tikilib->get_date_converter($user); $smarty->assign('title', ''); +$smarty->assign('topline', ''); +$smarty->assign('subtitle', ''); +$smarty->assign('linkto', ''); +$smarty->assign('image_caption', ''); +$smarty->assign('lang', ''); $authorName = $tikilib->get_user_preference($user,'realName',$user); $smarty->assign('authorName', $authorName); $smarty->assign('topicId', ''); @@ -77,6 +82,11 @@ $publishDate = $article_data["publishDate"]; $expireDate = $article_data["expireDate"]; $smarty->assign('title', $article_data["title"]); + $smarty->assign('topline', $article_data["topline"]); + $smarty->assign('subtitle', $article_data["subtitle"]); + $smarty->assign('linkto', $article_data["linkto"]); + $smarty->assign('image_caption', $article_data["image_caption"]); + $smarty->assign('lang', $article_data["lang"]); $smarty->assign('authorName', $article_data["authorName"]); $smarty->assign('topicId', $article_data["topicId"]); $smarty->assign('useImage', $article_data["useImage"]); @@ -181,6 +191,17 @@ $hasImage = 'y'; } + if (!isset($_REQUEST["topline"])) $_REQUEST['topline'] = ''; + if (!isset($_REQUEST["subtitle"])) $_REQUEST['subtitle'] = ''; + if (!isset($_REQUEST["linkto"])) $_REQUEST['linkto'] = ''; + if (!isset($_REQUEST["image_caption"])) $_REQUEST['image_caption'] = ''; + if (!isset($_REQUEST["lang"])) $_REQUEST['lang'] = ''; + + $smarty->assign('topline', $_REQUEST["topline"]); + $smarty->assign('subtitle', $_REQUEST["subtitle"]); + $smarty->assign('linkto', $_REQUEST["linkto"]); + $smarty->assign('image_caption', $_REQUEST["image_caption"]); + $smarty->assign('lang', $_REQUEST["lang"]); $smarty->assign('image_name', $_REQUEST["image_name"]); $smarty->assign('image_type', $_REQUEST["image_type"]); $smarty->assign('image_size', $_REQUEST["image_size"]); @@ -333,9 +354,18 @@ $smarty->display("error.tpl"); die; } + if (!isset($_REQUEST["topline"])) $_REQUEST['topline'] = ''; + if (!isset($_REQUEST["subtitle"])) $_REQUEST['subtitle'] = ''; + if (!isset($_REQUEST["linkto"])) $_REQUEST['linkto'] = ''; + if (!isset($_REQUEST["image_caption"])) $_REQUEST['image_caption'] = ''; + if (!isset($_REQUEST["lang"])) $_REQUEST['lang'] = ''; - $subid = $artlib->replace_submission(strip_tags($_REQUEST["title"], '<a><pre><p><img><hr>'), $_REQUEST["authorName"], $_REQUEST["topicId"], $useImage, $imgname, $imgsize, $imgtype, $imgdata, $heading, $body, $publishDate, $expireDate, $user, $subId, $_REQUEST["image_x"], $_REQUEST["image_y"], $_REQUEST["type"], $_REQUEST["rating"], $isfloat); - /* + $subid = $artlib->replace_submission(strip_tags($_REQUEST["title"], '<a><pre><p><img><hr><b><i>'), + $_REQUEST["authorName"], $_REQUEST["topicId"], $useImage, $imgname, $imgsize, $imgtype, $imgdata, $heading, + $body, $publishDate, $expireDate, $user, $subId, $_REQUEST["image_x"], $_REQUEST["image_y"], $_REQUEST["type"], + $_REQUEST["rating"], $isfloat, $_REQUEST["topline"], $_REQUEST["subtitle"], $_REQUEST["linkto"], $_REQUEST["image_caption"], $_REQUEST["lang"]); + + /* $links = $tikilib->get_links($body); $notcachedlinks = $tikilib->get_links_nocache($body); $cachedlinks = array_diff($links, $notcachedlinks); Index: tiki-read_article.php =================================================================== RCS file: /cvsroot/tikiwiki/tiki/tiki-read_article.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- tiki-read_article.php 28 Mar 2004 07:32:23 -0000 1.23 +++ tiki-read_article.php 10 Apr 2004 04:46:23 -0000 1.24 @@ -62,6 +62,16 @@ } $smarty->assign('title', $article_data["title"]); + $smarty->assign('topline', $article_data["topline"]); + $smarty->assign('show_topline', $article_data["show_topline"]); + $smarty->assign('subtitle', $article_data["subtitle"]); + $smarty->assign('show_subtitle', $article_data["show_subtitle"]); + $smarty->assign('linkto', $article_data["linkto"]); + $smarty->assign('show_linkto', $article_data["show_linkto"]); + $smarty->assign('image_caption', $article_data["image_caption"]); + $smarty->assign('show_image_caption', $article_data["show_image_caption"]); + $smarty->assign('lang', $article_data["lang"]); + $smarty->assign('show_lang', $article_data["show_lang"]); $smarty->assign('authorName', $article_data["authorName"]); $smarty->assign('topicId', $article_data["topicId"]); $smarty->assign('type', $article_data["type"]); |