diff --git a/src/export.php b/src/export.php index 97a6581..ef85fdf 100644 --- a/src/export.php +++ b/src/export.php @@ -32,7 +32,7 @@ while($r = $q->fetch_assoc($q)) $format = _get('format'); -if($format = 'ical') printICal($listData, $data); +if($format == 'ical') printICal($listData, $data); else printCSV($listData, $data); diff --git a/src/lang/class.default.php b/src/lang/class.default.php index 16a6f9f..f7b84b2 100644 --- a/src/lang/class.default.php +++ b/src/lang/class.default.php @@ -89,7 +89,9 @@ class DefaultLang 'list_showcompleted' => "Show completed tasks", 'list_clearcompleted' => "Clear completed tasks", 'list_select' => "Select list", - 'list_exportcsv' => "Export to CSV", + 'list_export' => "Export", + 'list_export_csv' => "CSV", + 'list_export_ical' => "iCalendar", 'list_rssfeed' => "RSS Feed", 'alltags' => "All tags:", 'alltags_show' => "Show all", diff --git a/src/lang/en.php b/src/lang/en.php index 668298b..c6679ed 100644 --- a/src/lang/en.php +++ b/src/lang/en.php @@ -6,8 +6,8 @@ Original name: English Author: Max Pozdeev Author Url: http://www.mytinytodo.net - AppVersion: v1.4 - Date: 2010-12-15 + AppVersion: v1.4b2 + Date: 2011-01-07 */ class Lang extends DefaultLang @@ -91,7 +91,9 @@ class Lang extends DefaultLang 'list_showcompleted' => "Show completed tasks", 'list_clearcompleted' => "Clear completed tasks", 'list_select' => "Select list", - 'list_exportcsv' => "Export to CSV", + 'list_export' => "Export", + 'list_export_csv' => "CSV", + 'list_export_ical' => "iCalendar", 'list_rssfeed' => "RSS Feed", 'alltags' => "All tags:", 'alltags_show' => "Show all", diff --git a/src/mytinytodo.js b/src/mytinytodo.js index 55efaba..142b275 100644 --- a/src/mytinytodo.js +++ b/src/mytinytodo.js @@ -1152,7 +1152,8 @@ function listMenuClick(el, menu) case 'btnRenameList': renameCurList(); break; case 'btnDeleteList': deleteCurList(); break; case 'btnPublish': publishCurList(); break; - case 'btnExportCSV': exportCurListToCSV(); break; + case 'btnExportCSV': exportCurList('csv'); break; + case 'btnExportICAL': exportCurList('ical'); break; case 'btnRssFeed': feedCurList(); break; case 'btnShowCompleted': showCompletedToggle(); break; case 'btnClearCompleted': clearCompleted(); break; @@ -1936,10 +1937,11 @@ function slmenuSelect(el, menu) }; -function exportCurListToCSV() +function exportCurList(format) { if(!curList) return; - window.location.href = _mtt.mttUrl + 'export.php?list='+curList.id +'&format=csv'; + if(!format.match(/^[a-z0-9-]+$/i)) return; + window.location.href = _mtt.mttUrl + 'export.php?list='+curList.id +'&format='+format; }; function feedCurList() diff --git a/src/themes/default/index.php b/src/themes/default/index.php index 63e8232..7f07245 100644 --- a/src/themes/default/index.php +++ b/src/themes/default/index.php @@ -220,7 +220,7 @@ $().ready(function(){
  • -
  • +
  • @@ -235,6 +235,13 @@ $().ready(function(){ + +