Commit 50021238 authored by michael_davey's avatar michael_davey

Instant-Auto-Merge from BRANCH-1-9 to HEAD

parent cde36a43
{* $Header: /cvsroot/tikiwiki/tiki/templates/map/tiki-map_download.tpl,v 1.8 2004-06-23 22:34:29 mose Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/map/tiki-map_download.tpl,v 1.9 2005-04-02 17:43:38 michael_davey Exp $ *}
<h3>{tr}Download Layer{/tr}</h3>
{if $nodownload}
{tr}<b>This layer has been set by the maps administrator to not be downloadable</b>{/tr}
{else}
<b>{$userwatch}</b>, {tr}you have requested to download the layer:{/tr}<b>{$layer}</b> {tr}from
the mapfile:{/tr}<b>{$mapfile}</b><br /><br />
{tr}Here are the files to download, do not forget to rename them:{/tr}<br />
......@@ -21,3 +24,4 @@ the mapfile:{/tr}<b>{$mapfile}</b><br /><br />
{/if}
{/section}
</table>
{/if}
\ No newline at end of file
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-edit_help.tpl,v 1.31 2005-03-12 16:50:42 mose Exp $ *}
{* $Header: /cvsroot/tikiwiki/tiki/templates/tiki-edit_help.tpl,v 1.32 2005-04-02 17:43:38 michael_davey Exp $ *}
{* Show wiki syntax and plugins help *}
{* TODO: Add links to add samples to edit form *}
......@@ -20,6 +20,9 @@
<tr><td width="20%"><strong>{tr}Emphasis{/tr}:</strong></td><td> '<strong></strong>' {tr}for{/tr} <em>{tr}italics{/tr}</em>, _<em></em>_ {tr}for{/tr} <strong>{tr}bold{/tr}</strong>, '<strong></strong>'_<em></em>_ {tr}for{/tr} <em><strong>{tr}both{/tr}</strong></em></td></tr>
<tr><td><strong>{tr}Lists{/tr}:</strong></td><td> * {tr}for bullet lists{/tr}, # {tr}for numbered lists{/tr}, ;{tr}term{/tr}:{tr}definition{/tr} {tr}for definiton lists{/tr}</td></tr>
<tr><td><strong>{tr}Wiki References{/tr}:</strong></td><td> {tr}JoinCapitalizedWords or use{/tr} (({tr}page{/tr})) {tr}or{/tr} (({tr}page|desc{/tr})) {tr}for wiki references{/tr}, )){tr}SomeName{/tr}(( {tr}prevents referencing{/tr}</td></tr>
{if $feature_drawings eq 'y'}
<tr><td><strong>{tr}Drawings{/tr}:</strong></td><td> {literal}{{/literal}draw name=foo} {tr}creates the editable drawing foo{/tr}</td></tr>
{/if}
<tr><td><strong>{tr}External links{/tr}:</strong></td><td> {tr}use square brackets for an external link: [URL] or [URL|link_description] or [URL|description|nocache] (that last form prevents the local Wiki from caching the page; please use that form for large pages!).{/tr}<br />{tr}For an external Wiki, use ExternalWikiName:PageName or ((External Wiki Name: Page Name)){/tr}</td></tr>
<tr><td><strong>{tr}Multi-page pages{/tr}:</strong></td><td>{tr}use ...page... to separate pages{/tr}</td></tr>
<tr><td><strong>{tr}Misc{/tr}:</strong></td><td> "!", "!!", "!!!" {tr}make_headings{/tr}, "-<em></em>-<em></em>-<em></em>-" {tr}makes a horizontal rule{/tr} "==={tr}text{/tr}===" {tr}underlines text{/tr} "%%%" {tr}make a line break{/tr}</td></tr>
......@@ -47,7 +50,7 @@
<tr><td><strong>{tr}Dynamic variables{/tr}:</strong></td><td> "%{tr}name{/tr}%" {tr}Inserts an editable variable{/tr}</td></tr>
<tr><td><strong>{tr}Insert Module Output{/tr}:</strong></td><td> {tr}{literal}{MODULE(module=>some_module)}text{MODULE}{/literal} can be used to insert the output of module "some_module" into your Wiki page. See <a href="{$helpurl}PluginModule">PluginModule</a> for more information. {/tr}</td></tr>
<tr><td><strong>{tr}Rendering Program Code{/tr}:</strong></td><td> {tr}{literal}{CODE()}some code{CODE} {/literal} will render "some code" as program code. This plugin has other options; see <a href="{$helpurl}PluginCode">PluginCode</a>.{/tr}</td></tr>
<tr><td><strong>{tr}Direction{/tr}:</strong></td><td>"{literal}{r2l}{/literal}", "{literal}{l2r}{/literal}", "{literal}{rm}{/literal}", "{literal}{lm}{/literal}"</td></tr>
<tr><td><strong>{tr}Direction{/tr}:</strong></td><td>"{literal}{r2l}{/literal}", "{literal}{l2r}{/literal}", "{literal}{rm}{/literal}", "{literal}{lm}{/literal}" Insert resp. right-to-left and left-to-right text direction DIV (up to end of text) and markers for langages as arabic or hebrew.</td></tr>
<tr><td><strong>{tr}Table of contents{/tr}</strong></td><td>{tr}"{literal}{toc}{/literal}", "{literal}{maketoc}{/literal}" prints out a table of contents for the current page based on structures (toc) or ! headings (maketoc){/tr}</td></tr>
<tr><td><strong>{tr}Misc{/tr}:</strong></td><td>"{literal}{cookie}{/literal}"</td></tr>
</table>
......
<?php
// $Header: /cvsroot/tikiwiki/tiki/tiki-map_download.phtml,v 1.9 2005-03-12 16:49:00 mose Exp $
// $Header: /cvsroot/tikiwiki/tiki/tiki-map_download.phtml,v 1.10 2005-04-02 17:43:38 michael_davey Exp $
// Copyright (c) 2002-2003, Luis Argerich, Garland Foster, Eduardo Polidor, et. al.
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
......@@ -89,17 +89,34 @@ $tempfile="TM".date("YmdHis");
$files = array();
$h = opendir($file_path);
//first check if there is not a file with NDL extension
// to stop download
$nodownload=FALSE;
while (($file = readdir($h)) !== false) {
$extension = array_pop(explode('.', basename($file)));
if (substr(basename($file), 0,"-" . (strlen($extension) + 1))==$file_name)
{
$files[] = $file;
copy($file_path."/".$file,"files/".$tempfile.".".$extension);
$dfiles[]=$tempfile.".".$extension;
if ($extension=="NDL") {
$nodownload=TRUE;
}
}
}
}
closedir ($h);
$smarty->assign('nodownload', $nodownload);
if (!$nodownload) {
$h = opendir($file_path);
while (($file = readdir($h)) !== false) {
$extension = array_pop(explode('.', basename($file)));
if (substr(basename($file), 0,"-" . (strlen($extension) + 1))==$file_name)
{
$files[] = $file;
copy($file_path."/".$file,"files/".$tempfile.".".$extension);
$dfiles[]=$tempfile.".".$extension;
}
}
closedir ($h);
}
//clean the files directory from old files
$h = opendir("files");
......@@ -120,6 +137,7 @@ $userid = $userlib->get_user_id($user);
//$query = "insert into tiki_download (object,userid,type,date,IP) values ('$file_name',$userid,'maps',".date("U").",'".$_SERVER["REMOTE_ADDR"]."')";
//$result = $userlib->query($query);
$smarty->assign('nodownload', $nodownload);
$smarty->assign_by_ref('files',$files);
$smarty->assign_by_ref('dfiles',$dfiles);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment