diff --git a/serendipity_event_downloadmanager/ChangeLog b/serendipity_event_downloadmanager/ChangeLog index 29d5ec66..b395e6f2 100644 --- a/serendipity_event_downloadmanager/ChangeLog +++ b/serendipity_event_downloadmanager/ChangeLog @@ -1,20 +1,62 @@ ChangeLog: """""""""" +0.37: +---- + + * Optimize URI args load + +[Version 0.36 2016/08/22] by Ian +-------------------------------- + * Fix some frontend styles mainly for 2k11 + +[Version 0.35 2016/08/06] by Ian +-------------------------------- + * Fix category purge and hide showing up + +[Version 0.34 2016/07/26] by Ian +-------------------------------- + * Add genpage hook for nice url rewriting + +[Version 0.33 2016/07/20] by Ian +-------------------------------- + * Set basename() to md_basename() because of locale-aware PHP bug + +[Version 0.32 2016/07/18] by Ian +-------------------------------- + * Improved filedir read iteration to PHP SPL Iterator, because of errors. + * In ISO-8859-1 to UTF-8 (recommended) environments we now support encoded filenames. + * Some more fixes related to these changes and other false or unconsistent usage. + * Some more minor 2.0 enhancements. + * Remove conversion to new archives location with version 0.24. Six years is enough! + (Improved some lang constant vars for this.) + +[Version 0.31 2016/05/09] by Ian +-------------------------------- + * Replaced the old method for generating random strings, which was broken with current PHP versions + * Some Serendipity 2.0x optimizing - changed requirement version + * Set Plugin consistencies + * Use lang API - extends required version + * Append CSS, not prepend + +-------------------------------- Propagate $smarty.env.staticpage_pagetitle (and the others) so that it can be used in entries.tpl latest: Smarty3 forward compatibility -[Version 0.26 2011/02/15] by Ian (Timbalu) +[Version 0.26 2011/02/15] by Ian +-------------------------------- - changed smarty->fetch method call to be less strict to support smarty 2 to smarty3 parameter order change - removed param 4 - added restrict backend functionality and administration sidebar link to admin only - fixed show Data for registered Users only in frontent tpls if set to true in config - added serendipity_db_bool() to $this->get_config('registered_only') -[Version 0.25.1 2010/10/20] by Ian (Timbalu) +[Version 0.25.1 2010/10/20] by Ian +-------------------------------- - fixed Call-time pass-by-reference has been deprecated since PHP 5.3.x - added @silencer to mkdir and xhtml to
tag in if($coname == 'absincomingpath') echo '
'; -[Version 0.25 2010/09/23] by Ian (Timbalu) +[Version 0.25 2010/09/23] by Ian +-------------------------------- - fixed wrong path error, when copying a file from a s9y media library subfolder to selected category (0.25b only) - changed minor details in lang files and frontend filelist.tpl and filedetails.tpl - added rename file ability in backends single file edit page (this added a new Constant to lang files too) @@ -27,7 +69,8 @@ latest: Smarty3 forward compatibility - added a complete smarty template to backend, which caused multiple changes in plugins code -[Version 0.24 2010/08/26] by Ian (Timbalu) +[Version 0.24 2010/08/26] by Ian +-------------------------------- - added new config setting: 'intro', to have some more introduction text before frontend content (optional) - added ics mime icon - changed frontend templates, frontend.css and download mime icons to show up refreshed in a new contemporary look (designed by YellowLed, thank you!) @@ -53,10 +96,12 @@ latest: Smarty3 forward compatibility - added mark and move all selected files in income folder to current folder - added mark and erase all selected files in category and move them to the income (ftp/trash) folder to avoid unintentional destroying -[Version 0.23.1 2010/08/16] - - Version bump to support belatedly added files (v.0.23) in CVS spartacus download. (Timbalu) +[Version 0.23.1 2010/08/16] by Ian +-------------------------------- + - Version bump to support belatedly added files (v.0.23) in CVS spartacus download. -[Version 0.23 2010/08/11] by Ian (Timbalu) +[Version 0.23 2010/08/11] by Ian +-------------------------------- - added root level file appearance in backend (fixed: moved files to root level did not show up) The frontend did/does not show root level files, which isn't really a bug, while it is a feature (by now) ;-) - changed dlm file work behaviour to support root level files too (please report, if you experience some unusual behaviour) @@ -70,10 +115,12 @@ latest: Smarty3 forward compatibility - added dlm_functions.js to support future dlm backend javascript - using foldable div containers by now - added some missing closing divs - hopefully all of them at the right place -[Version 0.221 2010/08/09] - - Fix: Wrong fallback-dir when no config was set. (Timbalu) +[Version 0.221 2010/08/09] by Ian +-------------------------------- + - Fix: Wrong fallback-dir when no config was set. -[Version 0.22 2010/08/08] by Ian (Timbalu) +[Version 0.22 2010/08/08] by Ian +-------------------------------- - changed upload folder to 'serendipity/uploads/dlmanager/incoming' (effects new installations only!) - changed download folder to 'serendipity/templates_c/.dlmanager/files' (effects new installations only!) - added missing mkdir of directories using the recursive mkdir function added with PHP 5.0.0 diff --git a/serendipity_event_downloadmanager/UTF-8/lang_cs.inc.php b/serendipity_event_downloadmanager/UTF-8/lang_cs.inc.php index 01474cf0..3b9bba55 100644 --- a/serendipity_event_downloadmanager/UTF-8/lang_cs.inc.php +++ b/serendipity_event_downloadmanager/UTF-8/lang_cs.inc.php @@ -18,11 +18,11 @@ @define('PLUGIN_DOWNLOADMANAGER_PAGEURL', 'Statická URL adresa'); @define('PLUGIN_DOWNLOADMANAGER_PAGEURL_BLAHBLAH', 'Definuje URL, pod kterou je download manažer přístupný (index.php?serendipity[subpage]=zde_zadané_jméno)'); @define('PLUGIN_DOWNLOADMANAGER_PERMALINK', 'Permalink (stálý odkaz)'); -@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', 'Definuje stálou zkratku, která může být kratší a srozumitelnější než statická URL adresa (nastavené výše). Je třeba zadat absolutní HTTP cestu, navíc musí končit .htm nebo .html! (Výchozí nastavení: [http://vas_blog.cz/]downloads.html]'); +@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', 'Definuje stálou zkratku, která může být kratší a srozumitelnější než statická URL adresa (nastavené výše). Je třeba zadat absolutní HTTP cestu, navíc musí končit .htm nebo .html. (Výchozí nastavení: "%s")'); @define('PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH', 'Cesta pro příchozí data'); -@define('PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH', 'Plná absolutní cesta k adresáři, do kterého nahráváte soubory. Plugin pracuje tak, že do tohoto adresáře se nahrají soubory a teprve pak určíte, které mají být nabízené ke stažení. Ty si pak plugin přemístí do adresáře s downloady. (Adresář musí být vytvořen a webserver do něj musí mít právo zápisu!)'); +@define('PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH', 'Plná absolutní cesta k adresáři, do kterého nahráváte soubory. Plugin pracuje tak, že do tohoto adresáře se nahrají soubory a teprve pak určíte, které mají být nabízené ke stažení. Ty si pak plugin přemístí do adresáře s downloady.'); @define('PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH', 'Absolutní cesta adresáře s downloady'); -@define('PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH', 'Plná absolutní cesta k adresáři, do kterého si bude downloadmanager umísťovat soubory, které pak budou přístupné z blogu. (Adresář musí být vytvořen a webserver do něj musí mít právo zápisu!)'); +@define('PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH', 'Plná absolutní cesta k adresáři, do kterého si bude downloadmanager umísťovat soubory, které pak budou přístupné z blogu.'); @define('PLUGIN_DOWNLOADMANAGER_HTTPPATH', 'HTTP cesta k pluginu'); @define('PLUGIN_DOWNLOADMANAGER_HTTPPATH_BLAHBLAH', 'aboslutní http cesta k pluginu (obvykle "/plugins/serendipity_event_downloadmanager").'); @define('PLUGIN_DOWNLOADMANAGER_DATEFORMAT', 'Formát data, podle pravidel PHP funkce date(). (výchozí: "Y/m/d, h:ia")'); @@ -74,7 +74,14 @@ @define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_INCOMING_NOT_ALLOWED', 'Webserver nemá dostatek oprávnění pro smazání souboru z příchozího adresáře! Smažte prosím soubor ručně a potom pozměňte přístupová práva, aby to od příště šlo.'); @define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED', 'Webserver nemá dostatek oprávnění pro smazání souboru z adresáře downloadů! Pozměňte přístupová práva, pak opakujte pokus o smazání.'); @define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE', 'Příchozí adresář:'); -@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'Nahrajte soubor do tohoto adresáře pomocí FTP, pokud Vám nejde nahrát pomocí funkce php-upload. To se může stát např. pokud je soubor příliš velký. Php má totiž omezení na max. velikost uploadovaného souboru - nastavení v php.ini.
Aktuální adresář: '); +#@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'Nahrajte soubor do tohoto adresáře pomocí FTP, pokud Vám nejde nahrát pomocí funkce php-upload. To se může stát např. pokud je soubor příliš velký. Php má totiž omezení na max. velikost uploadovaného souboru - nastavení v php.ini.
Aktuální adresář: '); +@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'This directory "%s" +'); @define('PLUGIN_DOWNLOADMANAGER_THIS_FILE', 'Vybraný soubor'); @define('PLUGIN_DOWNLOADMANAGER_EDIT_FILE', 'Editovat soubor'); @define('PLUGIN_DOWNLOADMANAGER_MOVE_TO_CAT', 'Přesunout do'); @@ -116,10 +123,10 @@ @define('PLUGIN_DOWNLOADMANAGER_REGISTERED_ONLY_ERROR', 'Soubory ke stažení jsou přístupné pouze registrovaným uživatelům!'); @define('PLUGIN_DOWNLOADMANAGER_ROOTLEVEL_TITLE', 'soubory v kořenovém adresáři (v přehledu schované, neviditelné!)'); @define('PLUGIN_DOWNLOADMANAGER_ERRORS_UPGRADE_NOTCOPIED', 'Omlouváme se, vyskytla se chyba. Soubory z
%s
nemohly být přesunuty do
%s.

Přesuňte je proím ručně a klikněte na tento odkaz, abyste o přesunu informovali plugin!
Kromě toho odstraňte ručně také staré adresáře.
'); -@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPIED_NEWDIR', 'Protože jste aktualizovali plugin downloadmanager na verzi 0.24, byly všechny soubory ke stažený zkopírovány do nových podadresářů \'/.dlm/files\' a \'/.dlm/ftpin\' v adresáři \'/archives\', aby se zamezilo konfliktu s cestami ke starým složkám.

Nastavení bylo změněno, aby ukazovalo na nové adresáře a dále nelze měnit.
Odstraňte prosím ručně staré adresáře.
'); -@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPY_NEWDIR_REMEMBER', 'Úspěšně jste změnili plugin, aby nově pracoval pouze s novými adresáři.

Nezapomeňte prosím ručně přesunout soubory do nových adresářů \'archives/.dlm/files\' a \'archives/.dlm/ftpin\'!
Také ručně odstraňte staré adresáře.
'); +#@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPIED_NEWDIR', 'Protože jste aktualizovali plugin downloadmanager na verzi 0.24, byly všechny soubory ke stažený zkopírovány do nových podadresářů \'/.dlm/files\' a \'/.dlm/ftpin\' v adresáři \'/archives\', aby se zamezilo konfliktu s cestami ke starým složkám.

Nastavení bylo změněno, aby ukazovalo na nové adresáře a dále nelze měnit.
Odstraňte prosím ručně staré adresáře.
'); +#@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPY_NEWDIR_REMEMBER', 'Úspěšně jste změnili plugin, aby nově pracoval pouze s novými adresáři.

Nezapomeňte prosím ručně přesunout soubory do nových adresářů \'archives/.dlm/files\' a \'archives/.dlm/ftpin\'!
Také ručně odstraňte staré adresáře.
'); @define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK', 'označit/odznačit vše'); -@define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK_TITLE', 'smazat všechny označené'); +@define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK_TITLE', 'smazat všechny označené to ftp/trash'); @define('PLUGIN_DOWNLOADMANAGER_BUTTON_MOVE_TITLE', 'přesunout všechny označené do kategorie'); @define('PLUGIN_DOWNLOADMANAGER_CLEAR_TRASH', 'Vymazat bin v adresáři ftp/koš'); @define('PLUGIN_DOWNLOADMANAGER_NO_TRASH', 'Žádné soubory k vymazání v adresáři ftp/koš'); @@ -136,4 +143,5 @@ @define('PLUGIN_DOWNLOADMANAGER_BACK_ROOT', 'Kořenová kategorie'); @define('PLUGIN_DOWNLOADMANAGER_BACK_CURRENT', 'Aktuální kategorie'); @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_FF_CHANGE', 'Změnit jméno souboru pod soubor-odkaz editovat-podstránka.'); -@define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_LFTP', 'Nahrát soubory pomocí ftp do adresáře /serendipity/archives/.dlm/ftpin folder.'); \ No newline at end of file +@define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_LFTP', 'Nahrát soubory pomocí ftp do adresáře /serendipity/archives/.dlm/ftpin folder.'); + diff --git a/serendipity_event_downloadmanager/UTF-8/lang_cz.inc.php b/serendipity_event_downloadmanager/UTF-8/lang_cz.inc.php index 01474cf0..3b9bba55 100644 --- a/serendipity_event_downloadmanager/UTF-8/lang_cz.inc.php +++ b/serendipity_event_downloadmanager/UTF-8/lang_cz.inc.php @@ -18,11 +18,11 @@ @define('PLUGIN_DOWNLOADMANAGER_PAGEURL', 'Statická URL adresa'); @define('PLUGIN_DOWNLOADMANAGER_PAGEURL_BLAHBLAH', 'Definuje URL, pod kterou je download manažer přístupný (index.php?serendipity[subpage]=zde_zadané_jméno)'); @define('PLUGIN_DOWNLOADMANAGER_PERMALINK', 'Permalink (stálý odkaz)'); -@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', 'Definuje stálou zkratku, která může být kratší a srozumitelnější než statická URL adresa (nastavené výše). Je třeba zadat absolutní HTTP cestu, navíc musí končit .htm nebo .html! (Výchozí nastavení: [http://vas_blog.cz/]downloads.html]'); +@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', 'Definuje stálou zkratku, která může být kratší a srozumitelnější než statická URL adresa (nastavené výše). Je třeba zadat absolutní HTTP cestu, navíc musí končit .htm nebo .html. (Výchozí nastavení: "%s")'); @define('PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH', 'Cesta pro příchozí data'); -@define('PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH', 'Plná absolutní cesta k adresáři, do kterého nahráváte soubory. Plugin pracuje tak, že do tohoto adresáře se nahrají soubory a teprve pak určíte, které mají být nabízené ke stažení. Ty si pak plugin přemístí do adresáře s downloady. (Adresář musí být vytvořen a webserver do něj musí mít právo zápisu!)'); +@define('PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH', 'Plná absolutní cesta k adresáři, do kterého nahráváte soubory. Plugin pracuje tak, že do tohoto adresáře se nahrají soubory a teprve pak určíte, které mají být nabízené ke stažení. Ty si pak plugin přemístí do adresáře s downloady.'); @define('PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH', 'Absolutní cesta adresáře s downloady'); -@define('PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH', 'Plná absolutní cesta k adresáři, do kterého si bude downloadmanager umísťovat soubory, které pak budou přístupné z blogu. (Adresář musí být vytvořen a webserver do něj musí mít právo zápisu!)'); +@define('PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH', 'Plná absolutní cesta k adresáři, do kterého si bude downloadmanager umísťovat soubory, které pak budou přístupné z blogu.'); @define('PLUGIN_DOWNLOADMANAGER_HTTPPATH', 'HTTP cesta k pluginu'); @define('PLUGIN_DOWNLOADMANAGER_HTTPPATH_BLAHBLAH', 'aboslutní http cesta k pluginu (obvykle "/plugins/serendipity_event_downloadmanager").'); @define('PLUGIN_DOWNLOADMANAGER_DATEFORMAT', 'Formát data, podle pravidel PHP funkce date(). (výchozí: "Y/m/d, h:ia")'); @@ -74,7 +74,14 @@ @define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_INCOMING_NOT_ALLOWED', 'Webserver nemá dostatek oprávnění pro smazání souboru z příchozího adresáře! Smažte prosím soubor ručně a potom pozměňte přístupová práva, aby to od příště šlo.'); @define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED', 'Webserver nemá dostatek oprávnění pro smazání souboru z adresáře downloadů! Pozměňte přístupová práva, pak opakujte pokus o smazání.'); @define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE', 'Příchozí adresář:'); -@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'Nahrajte soubor do tohoto adresáře pomocí FTP, pokud Vám nejde nahrát pomocí funkce php-upload. To se může stát např. pokud je soubor příliš velký. Php má totiž omezení na max. velikost uploadovaného souboru - nastavení v php.ini.
Aktuální adresář: '); +#@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'Nahrajte soubor do tohoto adresáře pomocí FTP, pokud Vám nejde nahrát pomocí funkce php-upload. To se může stát např. pokud je soubor příliš velký. Php má totiž omezení na max. velikost uploadovaného souboru - nastavení v php.ini.
Aktuální adresář: '); +@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'This directory "%s" +'); @define('PLUGIN_DOWNLOADMANAGER_THIS_FILE', 'Vybraný soubor'); @define('PLUGIN_DOWNLOADMANAGER_EDIT_FILE', 'Editovat soubor'); @define('PLUGIN_DOWNLOADMANAGER_MOVE_TO_CAT', 'Přesunout do'); @@ -116,10 +123,10 @@ @define('PLUGIN_DOWNLOADMANAGER_REGISTERED_ONLY_ERROR', 'Soubory ke stažení jsou přístupné pouze registrovaným uživatelům!'); @define('PLUGIN_DOWNLOADMANAGER_ROOTLEVEL_TITLE', 'soubory v kořenovém adresáři (v přehledu schované, neviditelné!)'); @define('PLUGIN_DOWNLOADMANAGER_ERRORS_UPGRADE_NOTCOPIED', 'Omlouváme se, vyskytla se chyba. Soubory z
%s
nemohly být přesunuty do
%s.

Přesuňte je proím ručně a klikněte na tento odkaz, abyste o přesunu informovali plugin!
Kromě toho odstraňte ručně také staré adresáře.
'); -@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPIED_NEWDIR', 'Protože jste aktualizovali plugin downloadmanager na verzi 0.24, byly všechny soubory ke stažený zkopírovány do nových podadresářů \'/.dlm/files\' a \'/.dlm/ftpin\' v adresáři \'/archives\', aby se zamezilo konfliktu s cestami ke starým složkám.

Nastavení bylo změněno, aby ukazovalo na nové adresáře a dále nelze měnit.
Odstraňte prosím ručně staré adresáře.
'); -@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPY_NEWDIR_REMEMBER', 'Úspěšně jste změnili plugin, aby nově pracoval pouze s novými adresáři.

Nezapomeňte prosím ručně přesunout soubory do nových adresářů \'archives/.dlm/files\' a \'archives/.dlm/ftpin\'!
Také ručně odstraňte staré adresáře.
'); +#@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPIED_NEWDIR', 'Protože jste aktualizovali plugin downloadmanager na verzi 0.24, byly všechny soubory ke stažený zkopírovány do nových podadresářů \'/.dlm/files\' a \'/.dlm/ftpin\' v adresáři \'/archives\', aby se zamezilo konfliktu s cestami ke starým složkám.

Nastavení bylo změněno, aby ukazovalo na nové adresáře a dále nelze měnit.
Odstraňte prosím ručně staré adresáře.
'); +#@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPY_NEWDIR_REMEMBER', 'Úspěšně jste změnili plugin, aby nově pracoval pouze s novými adresáři.

Nezapomeňte prosím ručně přesunout soubory do nových adresářů \'archives/.dlm/files\' a \'archives/.dlm/ftpin\'!
Také ručně odstraňte staré adresáře.
'); @define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK', 'označit/odznačit vše'); -@define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK_TITLE', 'smazat všechny označené'); +@define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK_TITLE', 'smazat všechny označené to ftp/trash'); @define('PLUGIN_DOWNLOADMANAGER_BUTTON_MOVE_TITLE', 'přesunout všechny označené do kategorie'); @define('PLUGIN_DOWNLOADMANAGER_CLEAR_TRASH', 'Vymazat bin v adresáři ftp/koš'); @define('PLUGIN_DOWNLOADMANAGER_NO_TRASH', 'Žádné soubory k vymazání v adresáři ftp/koš'); @@ -136,4 +143,5 @@ @define('PLUGIN_DOWNLOADMANAGER_BACK_ROOT', 'Kořenová kategorie'); @define('PLUGIN_DOWNLOADMANAGER_BACK_CURRENT', 'Aktuální kategorie'); @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_FF_CHANGE', 'Změnit jméno souboru pod soubor-odkaz editovat-podstránka.'); -@define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_LFTP', 'Nahrát soubory pomocí ftp do adresáře /serendipity/archives/.dlm/ftpin folder.'); \ No newline at end of file +@define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_LFTP', 'Nahrát soubory pomocí ftp do adresáře /serendipity/archives/.dlm/ftpin folder.'); + diff --git a/serendipity_event_downloadmanager/UTF-8/lang_de.inc.php b/serendipity_event_downloadmanager/UTF-8/lang_de.inc.php index d61e9bcc..1de93661 100644 --- a/serendipity_event_downloadmanager/UTF-8/lang_de.inc.php +++ b/serendipity_event_downloadmanager/UTF-8/lang_de.inc.php @@ -1,4 +1,4 @@ -Dies kann passieren, wenn der SAFE_MODE aktiviert ist
Bitte SAFE_MODE in der php.ini deaktivieren!'); -@define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_INCOMING_NOT_ALLOWED', 'Konnte die Datei im import-Verzeichnis nicht löschen, da keine Schreibberechtigung bestand.
Bitte Berechtigungen ändern!'); -@define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED', 'Konnte die Datei im download-Verzeichnis nicht löschen, da keine Schreibberechtigung bestand.
Bitte Berechtigungen ändern!'); +@define('PLUGIN_DOWNLOADMANAGER_COPY_NOT_ALLOWED', 'Konnte Datei nicht in das Download-Verzeichnis kopieren!
Dies kann zB. passieren, wenn das encoding nicht stimmt. oder wenn der SAFE_MODE aktiviert ist
Bitte SAFE_MODE in der php.ini deaktivieren!'); +@define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_INCOMING_NOT_ALLOWED', 'Konnte die Datei im Import-Verzeichnis nicht löschen, da keine Schreibberechtigung bestand.
Bitte Berechtigungen ändern!'); +@define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED', 'Konnte die Datei im Download-Verzeichnis nicht löschen, da keine Schreibberechtigung bestand.
Bitte Berechtigungen ändern!'); /*@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE', 'incoming Verzeichnis:');*/ -@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'Dies ermöglicht den Import von per FTP hochgeladenen Dateien oder die vollständige Löschung aller hierhin verschobener Dateien (siehe blaues Trash Symbol).
Current directory: '); +@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'Dieses Verzeichnis "%s" +'); @define('PLUGIN_DOWNLOADMANAGER_THIS_FILE', 'Gewählte Datei'); @define('PLUGIN_DOWNLOADMANAGER_EDIT_FILE', 'Diese Datei ändern'); @define('PLUGIN_DOWNLOADMANAGER_MOVE_TO_CAT', 'Diese Datei verschieben nach'); @@ -90,10 +96,10 @@ @define('PLUGIN_DOWNLOADMANAGER_UNHIDE_TREE', 'Diese Kategorie und alle Unterkategorien wieder zeigen...'); @define('PLUGIN_DOWNLOADMANAGER_OPEN_CAT', 'Klicken um die Kategorie zu öffnen um Dateien hochzuladen oder zu modifizieren...'); -@define('PLUGIN_DOWNLOADMANAGER_SHOWDESC_INLIST', 'Dateibeischreibungen in der Dateiliste'); +@define('PLUGIN_DOWNLOADMANAGER_SHOWDESC_INLIST', 'Dateibeschreibungen in der Dateiliste'); @define('PLUGIN_DOWNLOADMANAGER_SHOWDESC_INLIST_DESC', 'Wenn Sie eine kompakte Liste wollen, so schalten Sie dies aus. Wenn Sie dem Benutzer viele Informationen geben wollen, schalten Sie diese Option an.'); @define('PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST', 'Dateien direkt in der Dateiliste herunter laden'); -@define('PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST_DESC', 'Normaler Weise wird dem Besucher immer eine Informationsseite angezeigt, bevor er die Datei herunter laden kann. Hier können Sie einstellen, dass man bei einem Klick auf das Icon, den Namen oder beides direkt den Download startet.'); +@define('PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST_DESC', 'Normalerweise wird dem Besucher immer eine Informationsseite angezeigt, bevor er die Datei herunter laden kann. Hier können Sie einstellen, dass man bei einem Klick auf das Icon, den Namen oder beides direkt den Download startet.'); @define('PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST_NO', 'Immer Infoseite anzeigen'); @define('PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST_ICON', 'Download über Icon'); @define('PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST_NAME', 'Download über Dateiname'); @@ -114,15 +120,16 @@ @define('PLUGIN_DOWNLOADMANAGER_REGISTERED_ONLY_ERROR', 'Die Downloads stehen nur registrierten Benutzern dieses Blogs zur Verfügung!'); @define('PLUGIN_DOWNLOADMANAGER_ROOTLEVEL_TITLE', 'Dateien auf der Rootebene (versteckt im Frontend!)'); @define('PLUGIN_DOWNLOADMANAGER_ERRORS_UPGRADE_NOTCOPIED', 'Entschuldigung! Ein Fehler trat während des upgrade Prozesses auf. Die Dateien aus
%s
konnten nicht nach
%s
verschoben werden.

Bitte verschieben Sie sie manuell und drücken sie diesen Link, um das Plugin darüber zu informieren!
Löschen Sie die alten Verzeichnisse ebenfalls manuell.
'); -@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPIED_NEWDIR', 'Da Sie das Downloadmanager Plugin auf v.0.24 hochgestuft haben, wurden alle alten Dateien in das neue \'/.dlm/files\' und \'/.dlm/ftpin\' Verzeichnis im Serendipity \'/archives\' Verzeichnis verschoben, um Konflikte mit dem alten Pfad zu vermeiden.

Die Config Einstellungen wurden auf die neuen Pfade angepasst und sind künftig nicht mehr veränderbar.
Löschen Sie die alten Verzeichnisse manuell.
'); -@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPY_NEWDIR_REMEMBER', 'Sie haben dem Plugin erfolgreich mitgeteilt, nur noch die neuen Pfade zu akzeptieren.

Bitte denken Sie daran, ihre Dateien manuell in das neue \'archives/.dlm/files\' und \'archives/.dlm/ftpin\' Verzeichnis zu verschieben!
Löschen Sie die alten Verzeichnisse ebenfalls manuell.
'); +#@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPIED_NEWDIR', 'Da Sie das Downloadmanager Plugin auf v.0.24 hochgestuft haben, wurden alle alten Dateien in das neue \'/.dlm/files\' und \'/.dlm/ftpin\' Verzeichnis im Serendipity \'/archives\' Verzeichnis verschoben, um Konflikte mit dem alten Pfad zu vermeiden.

Die Config Einstellungen wurden auf die neuen Pfade angepasst und sind künftig nicht mehr veränderbar.
Löschen Sie die alten Verzeichnisse manuell.
'); +#@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPY_NEWDIR_REMEMBER', 'Sie haben dem Plugin erfolgreich mitgeteilt, nur noch die neuen Pfade zu akzeptieren.

Bitte denken Sie daran, ihre Dateien manuell in das neue \'archives/.dlm/files\' und \'archives/.dlm/ftpin\' Verzeichnis zu verschieben!
Löschen Sie die alten Verzeichnisse ebenfalls manuell.
'); @define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK', 'alle markieren / unmarkieren'); -@define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK_TITLE', 'markierte löschen'); +@define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK_TITLE', 'markierte löschen nach ftp/trash'); @define('PLUGIN_DOWNLOADMANAGER_BUTTON_MOVE_TITLE', 'markierte in Kategorie verschieben'); @define('PLUGIN_DOWNLOADMANAGER_CLEAR_TRASH', 'Lösche alle Dateien im ftp/trash Verzeichnis'); @define('PLUGIN_DOWNLOADMANAGER_NO_TRASH', 'Kein Müll im ftp/trash Verzeichnis'); @define('PLUGIN_DOWNLOADMANAGER_EDIT_FILE_RENAME', 'Datei umbenennen in'); /* HELPTIP_CF = category folder; HELPTIP_IF = incoming folder; HELPTIP_FF = file folder; HELPTIP_MF = s9y media library folder; */ +@define('PLUGIN_DOWNLOADMANAGER_HELPTIP_CF_START', 'Start: Erstellen Sie eine Kategorie, um Dateien hochzuladen.'); @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_CF_CHANGE', 'Kategorie Name im Feld selbst ändern / Enter'); @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_VIEW', 'Um das ftp/trash Verzeichnis zu sehen, wählen sie einen Subordner von root.'); @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_FF_MULTI', 'Alle Dateien im ftp/trash Verzeichnis werden sofort gelöscht!'); @@ -142,4 +149,5 @@ // Next lines were translated on 2011/11/22 @define('PLUGIN_DOWNLOADMANAGER_BACK_ROOT', 'Wurzel-Kategorie'); -@define('PLUGIN_DOWNLOADMANAGER_BACK_CURRENT', 'Aktuelle Kategorie'); \ No newline at end of file +@define('PLUGIN_DOWNLOADMANAGER_BACK_CURRENT', 'Aktuelle Kategorie'); + diff --git a/serendipity_event_downloadmanager/UTF-8/lang_it.inc.php b/serendipity_event_downloadmanager/UTF-8/lang_it.inc.php index 15ad67c6..77edb161 100644 --- a/serendipity_event_downloadmanager/UTF-8/lang_it.inc.php +++ b/serendipity_event_downloadmanager/UTF-8/lang_it.inc.php @@ -1,4 +1,4 @@ - # Contact me on IRC in #linux-stats, #archlinux, #archlinux.de, #s9y on irc.freenode.net @@ -15,11 +15,11 @@ @define('PLUGIN_DOWNLOADMANAGER_PAGEURL', 'URL Statico'); @define('PLUGIN_DOWNLOADMANAGER_PAGEURL_BLAHBLAH', "Definisce l'URL della pagina (index.php?serendipity[subpage]=name)"); @define('PLUGIN_DOWNLOADMANAGER_PERMALINK', 'Permalink'); -@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', "Definisce un permalink per l'URL che puo' essere piu' corto dell'URL statico. Deve essere un path HTTP assoluto e finire con .htm o .html! (defaults [http://blog/]downloads.html)"); +@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', 'Definisce un permalink per l\'URL che puo\' essere piu\' corto dell\'URL statico. Deve essere un path HTTP assoluto e finire con .htm o .html. (Default: "%s")'); @define("PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH", "Path di upload"); -@define("PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH", "Indirizzo completo e assoluto della directory di upload. (L'indirizzo deve esistere ed essere scrivibile dal server!)"); +@define("PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH", "Indirizzo completo e assoluto della directory di upload."); @define("PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH", "Path di download"); -@define("PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH", "Indirizzo completo e assoluto della directory di download. (L'indirizzo deve esistere ed essere scrivibile dal server!)"); +@define("PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH", "Indirizzo completo e assoluto della directory di download."); @define("PLUGIN_DOWNLOADMANAGER_DATEFORMAT", "Formato della data, utilizza la sintassi di PHP date(). (Italiana: \"d/m/Y, h:ia\")"); @define("PLUGIN_DOWNLOADMANAGER_SHOWFILEDATE", "Visualizza la data del file"); @define("PLUGIN_DOWNLOADMANAGER_SHOWFILEDATE_BLAHBLAH", "Visualizzare la data del file nell'elenco?"); @@ -69,7 +69,14 @@ @define("PLUGIN_DOWNLOADMANAGER_DELETE_IN_INCOMING_NOT_ALLOWED", "Impossibile eliminare il file dalla directory di upload! Elimina il file manualmente e configura i permessi per permettere l'eliminazione dei file."); @define("PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED", "Impossibile eliminare il file dalla directory di download! Configura i permessi per permettere l'eliminazione dea file."); @define("PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE", "Directory di upload:"); -@define("PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH", "Utilizza questa directory per caricare i file via FTP se non hai i diritti di caricare i file via php-upload. Il file potrebbe essere piu' grande del massimo valore settato in php.ini o se file_uploads sono disattivati nel php.ini.
Current directory: "); +#@define("PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH", "Utilizza questa directory per caricare i file via FTP se non hai i diritti di caricare i file via php-upload. Il file potrebbe essere piu' grande del massimo valore settato in php.ini o se file_uploads sono disattivati nel php.ini.
Current directory: "); +@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'This directory "%s" +'); @define("PLUGIN_DOWNLOADMANAGER_THIS_FILE", "File selezionato"); @define("PLUGIN_DOWNLOADMANAGER_EDIT_FILE", "Modifica questo file"); @define("PLUGIN_DOWNLOADMANAGER_MOVE_TO_CAT", "Muovi in"); @@ -89,5 +96,3 @@ @define("PLUGIN_DOWNLOADMANAGER_UNHIDE_TREE", "Visualizza questa categoria e tutte le sotto-categorie contenute..."); @define("PLUGIN_DOWNLOADMANAGER_OPEN_CAT", "Clicca per aprire questa categoria per caricare e modificare i file..."); - -?> \ No newline at end of file diff --git a/serendipity_event_downloadmanager/UTF-8/lang_ja.inc.php b/serendipity_event_downloadmanager/UTF-8/lang_ja.inc.php index 1e6ffea1..90513389 100644 --- a/serendipity_event_downloadmanager/UTF-8/lang_ja.inc.php +++ b/serendipity_event_downloadmanager/UTF-8/lang_ja.inc.php @@ -1,4 +1,4 @@ - # Contact me on IRC in #linux-stats, #archlinux, #archlinux.de, #s9y on irc.freenode.net @@ -21,11 +21,11 @@ s9yに十分なダウンロードマネージャーの能力を提供します @define('PLUGIN_DOWNLOADMANAGER_PAGEURL', '静的 URL'); @define('PLUGIN_DOWNLOADMANAGER_PAGEURL_BLAHBLAH', 'ページの URL を定義します (index.php?serendipity[subpage]=name)'); @define('PLUGIN_DOWNLOADMANAGER_PERMALINK', '固定リンク'); -@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', 'Defines a custom permalink for the URL which can be much shorter than the Static URL. 絶対 HTTP パスの必要があり、最後に「.htm」か「.html」が必要です! (デフォルト: [http://blog/]downloads.html)'); +@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', 'Defines a custom permalink for the URL which can be much shorter than the Static URL. 絶対 HTTP パスの必要があり、最後に「.htm」か「.html」が必要です! (デフォルト: "%s")'); @define("PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH", "受付データのパス"); -@define("PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH", "Full and absolute path to the directory in which you can upload bigger files to import them into your downloadmanager. (path must exist and be writeable for the server!)"); +@define('PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH', 'Full and absolute path to the directory in which you can (FTP)-upload bigger files to import them into your downloadmanager.'); @define("PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH", "絶対ダウンロードデータパス"); -@define("PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH", "Full and absolute path to the directory in which the uploaded (and downloadable) files will be stored. (path must exist and be writeable for the server!)"); +@define("PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH", "Full and absolute path to the directory in which the files are stored."); @define("PLUGIN_DOWNLOADMANAGER_DATEFORMAT", "エントリの実際の日付の書式です、PHP の date() 関数の値を用います (デフォルト: \"Y/m/d, h:ia\")"); @define("PLUGIN_DOWNLOADMANAGER_SHOWFILEDATE", "ファイルの日付を表示する"); @define("PLUGIN_DOWNLOADMANAGER_SHOWFILEDATE_BLAHBLAH", "項目一覧でファイルの日付を表示すべきですか?"); @@ -75,7 +75,13 @@ s9yに十分なダウンロードマネージャーの能力を提供します @define("PLUGIN_DOWNLOADMANAGER_DELETE_IN_INCOMING_NOT_ALLOWED", "I'm not allowed to delete the file from your incoming directory! Please delete this one file manually and then set the file permissions that I can delete all further files for you."); @define("PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED", "I'm not allowed to delete the file from your download directory! Please set the file permissions that I can delete this file."); @define("PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE", "受け付けディレクトリ:"); -@define("PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH", "Use this directory to upload files via FTP if you are not allowed to upload this file with the php-upload feature. This can happen if your file is too big than the maximum value in your php.ini or if file_uploads are deactivated in your php.ini.
現在のディレクトリ: "); +@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'This directory "%s" +'); @define("PLUGIN_DOWNLOADMANAGER_THIS_FILE", "選択済ファイル"); @define("PLUGIN_DOWNLOADMANAGER_EDIT_FILE", "このファイルを編集する"); @define("PLUGIN_DOWNLOADMANAGER_MOVE_TO_CAT", "次にファイルを移動する:"); @@ -95,4 +101,3 @@ s9yに十分なダウンロードマネージャーの能力を提供します @define("PLUGIN_DOWNLOADMANAGER_UNHIDE_TREE", "Unhide this and the complete subtree below this category..."); @define("PLUGIN_DOWNLOADMANAGER_OPEN_CAT", "ファイルのアップロードか修正するこのカテゴリを開くためにクリックしてください..."); -?> diff --git a/serendipity_event_downloadmanager/backend.dlm.index.tpl b/serendipity_event_downloadmanager/backend.dlm.index.tpl index b562aae2..cce5b7cc 100644 --- a/serendipity_event_downloadmanager/backend.dlm.index.tpl +++ b/serendipity_event_downloadmanager/backend.dlm.index.tpl @@ -1,8 +1,8 @@ -{* backend.dlm.index.tpl last modified 2010-09-22 *} +{* backend.dlm.index.tpl last modified 2016-07-06 *} {* PLEASE READ CAREFULLY: The DownLoadManagers (dlm) backend template vars have their own array name to be unique in global context of Serendipity blog. - + 1. GloBaL = $dlmgbl : Global vars we need everywhere - set in function ADMIN_showDownloads() 2. AddCaT = $dlmact : The addcategory array in backend function 3. UpLoadForm = $dlmulf : The uploadform array in backend function @@ -22,21 +22,25 @@ var dlm_minus = '{serendipity_getFile file="img/minus.png"}'; - +
{if $dlmerr.thiserror === true} -
+ <{$div|default:'span'} id="dlm_messages"> {if $dlmerr.errormsg} {foreach from=$dlmerr.errormsg item="msg"} -

{$msg}

+ <{$tag|default:'span'} class="serendipityAdminMsgError msg_error"> {$msg} + {/foreach} + {elseif $dlmerr.successmsg} + {foreach from=$dlmerr.successmsg item="msg"} + <{$tag|default:'span'} class="serendipityAdminMsgNotice msg_success"> {$msg} {/foreach} {elseif $dlmerr.statusmsg} {foreach from=$dlmerr.statusmsg item="msg"} -

{$msg}

+ <{$tag|default:'span'} class="serendipityAdminMsgNotice msg_notice"> {$msg} {/foreach} {/if} -
+ {/if} {if !$dlmefe.thistype && !$dlmulf.thistype}

+/- {$CONST.TOGGLE_ALL}

@@ -54,27 +58,28 @@ {if true === ( $dlmcfs.catfiles || $dlmtfp.thisftp || $dlmtsl.thissml || $dlmhcs.hascats || $dlmapx.appendix )} {* header section page 2 normally *}
-

{$CONST.PLUGIN_DOWNLOADMANAGER_BACK_ROOT}… {$CONST.PLUGIN_DOWNLOADMANAGER_BACK}…

- +
{$CONST.BACK}… {$CONST.BACK}
+

{$CONST.PLUGIN_DOWNLOADMANAGER_CATEGORY}: {$dlmgbl[0].cat.payload}

- +
{* include div body part of page 2, which includes the header, the files in category, the ftp/trash files, the Serendipity media library files, the subcats of root and section the appendix (helptip and cleartrash) section *} {include file="$path/backend.dlm.subpage.tpl" title="Downloadmanager Sub Page 2"} {/if} - + {if $dlmulf.thistype == 'uploadform'} {* header section page 2 uploaddform *}
-

{$CONST.PLUGIN_DOWNLOADMANAGER_BACK_ROOT}… {$CONST.PLUGIN_DOWNLOADMANAGER_BACK}…

- +
{$CONST.BACK}… {$CONST.BACK}
+

{$CONST.PLUGIN_DOWNLOADMANAGER_CATEGORY}: {$dlmgbl[0].cat.payload}

- -

{$CONST.PLUGIN_DOWNLOADMANAGER_BACK_CURRENT}… {$CONST.PLUGIN_DOWNLOADMANAGER_BACK}…

- + +
{$CONST.PLUGIN_DOWNLOADMANAGER_BACK_CURRENT}… {$CONST.PLUGIN_DOWNLOADMANAGER_BACK_CURRENT}
+
- + {/if} {if $dlmgbl.thispage == 1 && $dlmcfs.catfiles === true} @@ -41,7 +41,7 @@ - + @@ -82,7 +82,7 @@
{$dlmgbl.filename_field}{$dlmgbl.filename_field} {$dlmgbl.filenums_field} {$dlmgbl.filesize_field} {$dlmgbl.filedate_field}
-{if $dlmcfs.ddiv === false}{/if} +{if $dlmcfs.ddiv === false}{/if} {/if} {if $dlmgbl.thispage == 1 && $dlmhcs.hascats === true} @@ -101,31 +101,31 @@ - + {section name="cat" loop=$dlmhcs.catlist} {* exclude cat[payload] = root being generated here! *} - {if $dlmhcs.catlist[cat].cat.payload != 'root'} + {if $dlmhcs.catlist[cat].cat.payload != 'root'}
{$CONST.PLUGIN_DOWNLOADMANAGER_CATEGORIES}{$CONST.PLUGIN_DOWNLOADMANAGER_CATEGORIES} {$CONST.PLUGIN_DOWNLOADMANAGER_NUMBER_OF_DOWNLOADS}
{if $dlmhcs.catlist[cat].cat.subcats <= 0} - {$CONST.PLUGIN_DOWNLOADMANAGER_DEL_CAT} + {$CONST.PLUGIN_DOWNLOADMANAGER_DEL_CAT} {else} {$CONST.PLUGIN_DOWNLOADMANAGER_DEL_CAT_NOT_ALLOWD} {/if} {if $dlmhcs.catlist[cat].cat.hidden != 1} - {$CONST.PLUGIN_DOWNLOADMANAGER_HIDE_TREE} + {$CONST.PLUGIN_DOWNLOADMANAGER_HIDE_TREE} {else} - {$CONST.PLUGIN_DOWNLOADMANAGER_UNHIDE_TREE} + {$CONST.PLUGIN_DOWNLOADMANAGER_UNHIDE_TREE} {/if} {foreach from=$dlmhcs.catlist[cat].imgname item="s"}tree {/foreach} - {if $dlmhcs.catlist[cat].cat.hidden != 1} - {$CONST.PLUGIN_DOWNLOADMANAGER_OPEN_CAT} + {if $dlmhcs.catlist[cat].cat.hidden != 1} + {$CONST.PLUGIN_DOWNLOADMANAGER_OPEN_CAT} {else} - {$CONST.PLUGIN_DOWNLOADMANAGER_OPEN_CAT} + {$CONST.PLUGIN_DOWNLOADMANAGER_OPEN_CAT} {/if} {* this input element changes the catname on the fly *} @@ -146,7 +146,7 @@

{$CONST.PLUGIN_DOWNLOADMANAGER_NO_CATS_FOUND}

{/if} -{if $dlmhcs.ddiv === false}{/if} +{if $dlmhcs.ddiv === false}{/if} {/if} {if $dlmgbl.thispage == 1 && $dlmapx.appendix === true} @@ -173,5 +173,5 @@ - + {/if} diff --git a/serendipity_event_downloadmanager/backend.dlm.subpage.tpl b/serendipity_event_downloadmanager/backend.dlm.subpage.tpl index 4d0cb9f6..895339ea 100644 --- a/serendipity_event_downloadmanager/backend.dlm.subpage.tpl +++ b/serendipity_event_downloadmanager/backend.dlm.subpage.tpl @@ -1,4 +1,4 @@ -{* backend.dlm.subpage.tpl last modified 2010-09-23 *} +{* backend.dlm.subpage.tpl last modified 2016-08-06 *} {if $dlmgbl.thispage == 2 && $dlmcfs.catfiles === true} {* Show all files in category *}

+/- {$CONST.PLUGIN_DOWNLOADMANAGER_DLS_IN_THIS_CAT}[ {$dlmgbl[0].cat.payload} ]: {$dlmgbl[0].cat.num}

@@ -8,7 +8,7 @@ - + @@ -49,12 +49,12 @@
{$dlmgbl.filename_field}{$dlmgbl.filename_field} {$dlmgbl.filenums_field} {$dlmgbl.filesize_field} {$dlmgbl.filedate_field}
-{if $dlmcfs.ddiv === false}{/if} +{if $dlmcfs.ddiv === false}{/if} {/if} {if $dlmgbl.thispage == 2 && $dlmtfp.thisftp === true} {* Show all ftp/trash files in income dir *} -

+/- {$CONST.PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE} {$dlmtfp.ftpfiles|@count}

+

+/- {$CONST.PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE} {$dlmtfp.ftpfiles.f_arr|@count}

@@ -65,31 +65,33 @@
{/if} - {* this info text constant contains brs while there are 3 lines of information to understand *} -

{$CONST.PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH} {$dlmtfp.ftppath}

- + {* this info text constant contains linebreaks while there are 3 lines of information to understand *} + {$CONST.PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH|sprintf:$dlmtfp.ftppath:$dlmgbl[0].cat.payload} + - {if is_array( $dlmtfp.ftpfiles )} + {if is_array($dlmtfp.ftpfiles)} - + {foreach from=$dlmtfp.ftpfiles item="ifile"} + {if !empty($ifile.filename)}{* remove to subarrays d_arr and f_arr *} + {/if} {/foreach} @@ -111,7 +113,7 @@
{$dlmgbl.filename_field}{$dlmgbl.filename_field} {$dlmgbl.filesize_field} {$dlmgbl.filedate_field}
- {$CONST.PLUGIN_DOWNLOADMANAGER_DEL_FILE} - {$CONST.PLUGIN_DOWNLOADMANAGER_IMPORT_FILE} + {$CONST.PLUGIN_DOWNLOADMANAGER_DEL_FILE} + {$CONST.PLUGIN_DOWNLOADMANAGER_IMPORT_FILE} {$ifile.filemime.TYPE} {$ifile.filename} {$ifile.filesize} {$ifile.filedate}
-{if $dlmtfp.ddiv === false}{/if} +{if $dlmtfp.ddiv === false}{/if} {/if} {if $dlmgbl.thispage == 2 && $dlmtsl.thissml === true} @@ -119,24 +121,23 @@

+/- {$CONST.PLUGIN_DOWNLOADMANAGER_MEDIA_LIBRARY}

- {* Erm ... shouldn't this be a form?!? No, this is single file movement only! We do not need multi file movement in media library. *} -

{$CONST.PLUGIN_DOWNLOADMANAGER_MEDIA_LIBRARY_BLAHBLAH} {$dlmtsl.smlpath}

- + {* Erm ... shouldn't this be a form?!? No, this is a single file movement only! We do not need multi file movement in media library. *} + {$CONST.PLUGIN_DOWNLOADMANAGER_MEDIA_LIBRARY_BLAHBLAH} {$dlmtsl.smlpath} + - {if $dlmtsl.issmlarr === true} + {if $dlmtsl.issmlarr === true} - + {* header of serendipity directories in media library *} - {if !empty( $dlmtsl.extrapath )} + {if !empty($dlmtsl.extrapath)} @@ -146,7 +147,6 @@ {foreach from=$dlmtsl.smldirs item="smlda"} @@ -156,7 +156,7 @@ {foreach from=$dlmtsl.smlfiles item="smlfa"} @@ -179,7 +179,7 @@ {/if}
{$dlmgbl.filename_field}{$dlmgbl.filename_field} {$dlmgbl.filesize_field} {$dlmgbl.filedate_field}
- {$CONST.PLUGIN_DOWNLOADMANAGER_BACK}
- {$smlda.filename}
- {$CONST.PLUGIN_DOWNLOADMANAGER_IMPORT_FILE} + {$CONST.PLUGIN_DOWNLOADMANAGER_IMPORT_FILE} {$smlfa.filemime.TYPE} {$smlfa.filename}
-{if $dlmtsl.ddiv === false}{/if} +{if $dlmtsl.ddiv === false}{/if} {/if} {if $dlmgbl.thispage == 2 && $dlmhcs.hascats === true} @@ -197,31 +197,31 @@ - + {section name="cat" loop=$dlmhcs.catlist} {* exclude cat[payload] = root being generated here! *} - {if $dlmhcs.catlist[cat].cat.payload != 'root'} + {if $dlmhcs.catlist[cat].cat.payload != 'root'}
{$CONST.PLUGIN_DOWNLOADMANAGER_CATEGORIES}{$CONST.PLUGIN_DOWNLOADMANAGER_CATEGORIES} {$CONST.PLUGIN_DOWNLOADMANAGER_NUMBER_OF_DOWNLOADS}
{if $dlmhcs.catlist[cat].cat.subcats <= 0} - {$CONST.PLUGIN_DOWNLOADMANAGER_DEL_CAT} + {$CONST.PLUGIN_DOWNLOADMANAGER_DEL_CAT} {else} {$CONST.PLUGIN_DOWNLOADMANAGER_DEL_CAT_NOT_ALLOWD} {/if} {if $dlmhcs.catlist[cat].cat.hidden != 1} - {$CONST.PLUGIN_DOWNLOADMANAGER_HIDE_TREE} + {$CONST.PLUGIN_DOWNLOADMANAGER_HIDE_TREE} {else} - {$CONST.PLUGIN_DOWNLOADMANAGER_UNHIDE_TREE} + {$CONST.PLUGIN_DOWNLOADMANAGER_UNHIDE_TREE} {/if} {foreach from=$dlmhcs.catlist[cat].imgname item="s"}tree {/foreach} - {if $dlmhcs.catlist[cat].cat.hidden != 1} - {$CONST.PLUGIN_DOWNLOADMANAGER_OPEN_CAT} + {if $dlmhcs.catlist[cat].cat.hidden != 1} + {$CONST.PLUGIN_DOWNLOADMANAGER_OPEN_CAT} {else} - {$CONST.PLUGIN_DOWNLOADMANAGER_OPEN_CAT} + {$CONST.PLUGIN_DOWNLOADMANAGER_OPEN_CAT} {/if} {* this input element changes the catname on the fly *} @@ -242,7 +242,7 @@

{$CONST.PLUGIN_DOWNLOADMANAGER_NO_CATS_FOUND}

{/if} -{if $dlmhcs.ddiv === false}{/if} +{if $dlmhcs.ddiv === false}{/if} {/if} {if $dlmgbl.thispage == 2 && $dlmapx.appendix === true} @@ -268,5 +268,5 @@ - + {/if} diff --git a/serendipity_event_downloadmanager/backend.dlm.upload.tpl b/serendipity_event_downloadmanager/backend.dlm.upload.tpl index 1f317a3c..74eda6da 100644 --- a/serendipity_event_downloadmanager/backend.dlm.upload.tpl +++ b/serendipity_event_downloadmanager/backend.dlm.upload.tpl @@ -1,4 +1,4 @@ -{* backend.dlm.upload.tpl last modified 2010-09-06 *} +{* backend.dlm.upload.tpl last modified 2016-07-11 *}
{if !empty( $dlmulf.file_uploads ) && ( $dlmulf.file_uploads == 1 || $dlmulf.file_uploads == true || $dlmulf.file_uploads == 'On' )}
@@ -13,9 +13,9 @@

{$CONST.PLUGIN_DOWNLOADMANAGER_UPLOAD_FILE}

{section name=formloop start=1 loop=6 step=1}
-
+
- +
diff --git a/serendipity_event_downloadmanager/dlmanager.catlist.tpl b/serendipity_event_downloadmanager/dlmanager.catlist.tpl index 82ed78aa..9d76252e 100644 --- a/serendipity_event_downloadmanager/dlmanager.catlist.tpl +++ b/serendipity_event_downloadmanager/dlmanager.catlist.tpl @@ -1,13 +1,13 @@ -{* dlmanager.catlist.tpl last modified 2011-02-15 *} +{* dlmanager.catlist.tpl last modified 2016-07-06 *}

{$pagetitle}

{$headline}

{if !empty($dlm_intro)}
{$dlm_intro}
{/if} - + {if $dlm_is_registered == false || $is_logged_in} {if $categories_found} - + @@ -17,7 +17,7 @@ {section name="cat" loop=$catlist} - + @@ -26,7 +26,7 @@
{foreach from=$catlist[cat].imgname item="s"}{/foreach}{$CONST.CATEGORY} {$catlist[cat].cat.payload}{* $catlist[cat].catname *} {$catlist[cat].filenum}
{else} -
{$CONST.PLUGIN_DOWNLOADMANAGER_NO_CATS_FOUND}
+
{$CONST.PLUGIN_DOWNLOADMANAGER_NO_CATS_FOUND}
{/if} {else}
{$CONST.PLUGIN_DOWNLOADMANAGER_REGISTERED_ONLY_ERROR}
diff --git a/serendipity_event_downloadmanager/dlmanager.filedetails.tpl b/serendipity_event_downloadmanager/dlmanager.filedetails.tpl index bb6eaa27..6271a851 100644 --- a/serendipity_event_downloadmanager/dlmanager.filedetails.tpl +++ b/serendipity_event_downloadmanager/dlmanager.filedetails.tpl @@ -1,23 +1,23 @@ -{* dlmanager.filedetails.tpl last modified 2011-02-15 *} +{* dlmanager.filedetails.tpl last modified 2016-07-06 *}

{$pagetitle}

{$headline}

{if !empty($dlm_intro)}
{$dlm_intro}
{/if} - + {if $dlm_is_registered == false || $is_logged_in} {if $showfile} - +
  • {$CONST.PLUGIN_DOWNLOADMANAGER_CATEGORY}: {$catname} [{$CONST.PLUGIN_DOWNLOADMANAGER_BACK}…]
  • {$CONST.PLUGIN_DOWNLOADMANAGER_SUBCATEGORIES}: {$num_subcats}
  • {$CONST.PLUGIN_DOWNLOADMANAGER_DLS_IN_THIS_CAT}: {$num_files}
- +
{$CONST.PLUGIN_DOWNLOADMANAGER_THIS_FILE}:
{* $thisfile is a single array without index - no need for loops *} {if is_array($thisfile)} - +
{$thisfile.icontype} {$thisfile.filename}
{$CONST.PLUGIN_DOWNLOADMANAGER_EDIT_FILE_DESC}: {$thisfile.description|strip_tags}
@@ -25,16 +25,16 @@
{$thisfile.filesize_field}: {$thisfile.filesize}
{$thisfile.filedate_field}: {$thisfile.filedate}
- +
{$CONST.PLUGIN_DOWNLOADMANAGER_DOWNLOAD_FILE}
Download
{/if} {/if} {else} - +
{$CONST.PLUGIN_DOWNLOADMANAGER_REGISTERED_ONLY_ERROR}
{/if} - +
diff --git a/serendipity_event_downloadmanager/dlmanager.filelist.tpl b/serendipity_event_downloadmanager/dlmanager.filelist.tpl index 2354cdba..39082c1e 100644 --- a/serendipity_event_downloadmanager/dlmanager.filelist.tpl +++ b/serendipity_event_downloadmanager/dlmanager.filelist.tpl @@ -1,19 +1,19 @@ -{* dlmanager.filelist.tpl last modified 2011-02-15 *} +{* dlmanager.filelist.tpl last modified 2016-07-14 *}

{$pagetitle}

{$headline}

{if !empty($dlm_intro)}
{$dlm_intro}
{/if} - + {if $dlm_is_registered == false || $is_logged_in} - +
  • {$CONST.PLUGIN_DOWNLOADMANAGER_CATEGORY}: {$catname} [{$CONST.PLUGIN_DOWNLOADMANAGER_BACK}…]
  • {$CONST.PLUGIN_DOWNLOADMANAGER_SUBCATEGORIES}: {$numsubcats}
  • {$CONST.PLUGIN_DOWNLOADMANAGER_DLS_IN_THIS_CAT}: {$numdls}
{if $has_subcats} - + @@ -24,70 +24,70 @@ {section name="cat" loop=$sclist}{* 
{$sclist[cat]|print_r}
*} - + {/section} - +
{$sclist[cat].subcat.payload} {$sclist[cat].subcat.subcats} {$sclist[cat].num}
{/if} - + {if $filename_field} - + {/if} {if $dls_field} - + {/if} {if $filesize_field} - + {/if} {if $filedate_field} - + {/if} - + {section name="file" loop=$fltable} - + {if $fltable[file].is.showdownloads} - + {/if} {if $fltable[file].is.showfilesize} - + {/if} {if $fltable[file].is.showdate} - + {/if} - + {/section} - +
{$filename_field}{$dls_field} {$filesize_field} {$filedate_field}
- {$fltable[file].info.icontype}{if $fltable[file].is.showfilename} {$fltable[file].file.realfilename}{/if}{if $fltable[file].is.showdesc_inlist && $fltable[file].info.file_desc} {$fltable[file].info.file_desc}{/if} - + {$fltable[file].info.icontype}{if $fltable[file].is.showfilename} {$fltable[file].file.realfilename}{/if}{if $fltable[file].is.showdesc_inlist && $fltable[file].info.file_desc} {$fltable[file].info.file_desc}{/if} + {$fltable[file].file.dlcount}{$fltable[file].info.filesize}{$fltable[file].info.filedate}
{else} - +
{$CONST.PLUGIN_DOWNLOADMANAGER_REGISTERED_ONLY_ERROR}
{/if} - +
diff --git a/serendipity_event_downloadmanager/documentation_cs.html b/serendipity_event_downloadmanager/documentation_cs.html index d9f55944..d4c044c9 100644 --- a/serendipity_event_downloadmanager/documentation_cs.html +++ b/serendipity_event_downloadmanager/documentation_cs.html @@ -1,20 +1,20 @@ - - + + - Dokumentace: Downloadmanager + Dokumentace: Downloadmanager + } +

Dokumentace k pluginu 'Downloadmanager'
(serendipity_event_downloadmanager)

-

Dokumentaci k tomuto pluginu peloil do etiny Vladimr Ajgl (vlada [zavinac] ajgl [tecka] cz) dne 21.8.2011. Od t doby mohl bt plugin pozmnn nebo mohly bt rozen jeho funkce. Zkontrolujte pro jistotu i aktuln anglick ChangeLog. +

Dokumentaci k tomuto pluginu peloil do etiny Vladimr Ajgl (vlada [zavinac] ajgl [tecka] cz) dne 21.8.2011. Od t doby mohl bt plugin pozmnn nebo mohly bt rozen jeho funkce. Zkontrolujte pro jistotu i aktuln anglick ChangeLog.

Popis pluginu

@@ -218,7 +218,7 @@
  • Zatek vytven pluginu downloadmanager pro Serendipity
- + diff --git a/serendipity_event_downloadmanager/documentation_cz.html b/serendipity_event_downloadmanager/documentation_cz.html index a3ab3a2d..7bc4f2d6 100644 --- a/serendipity_event_downloadmanager/documentation_cz.html +++ b/serendipity_event_downloadmanager/documentation_cz.html @@ -1,20 +1,20 @@ - - + + - Dokumentace: Downloadmanager + Dokumentace: Downloadmanager + } +

Dokumentace k pluginu 'Downloadmanager'
(serendipity_event_downloadmanager)

-

Dokumentaci k tomuto pluginu peloil do etiny Vladimr Ajgl (vlada [zavinac] ajgl [tecka] cz) dne 21.8.2011. Od t doby mohl bt plugin pozmnn nebo mohly bt rozen jeho funkce. Zkontrolujte pro jistotu i aktuln anglick ChangeLog. +

Dokumentaci k tomuto pluginu peloil do etiny Vladimr Ajgl (vlada [zavinac] ajgl [tecka] cz) dne 21.8.2011. Od t doby mohl bt plugin pozmnn nebo mohly bt rozen jeho funkce. Zkontrolujte pro jistotu i aktuln anglick ChangeLog.

Popis pluginu

@@ -218,7 +218,7 @@
  • Zatek vytven pluginu downloadmanager pro Serendipity
- + diff --git a/serendipity_event_downloadmanager/lang_cs.inc.php b/serendipity_event_downloadmanager/lang_cs.inc.php index 2eb5373f..0cd2277f 100644 --- a/serendipity_event_downloadmanager/lang_cs.inc.php +++ b/serendipity_event_downloadmanager/lang_cs.inc.php @@ -18,11 +18,11 @@ @define('PLUGIN_DOWNLOADMANAGER_PAGEURL', 'Statick URL adresa'); @define('PLUGIN_DOWNLOADMANAGER_PAGEURL_BLAHBLAH', 'Definuje URL, pod kterou je download manaer pstupn (index.php?serendipity[subpage]=zde_zadan_jmno)'); @define('PLUGIN_DOWNLOADMANAGER_PERMALINK', 'Permalink (stl odkaz)'); -@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', 'Definuje stlou zkratku, kter me bt krat a srozumitelnj ne statick URL adresa (nastaven ve). Je teba zadat absolutn HTTP cestu, navc mus konit .htm nebo .html! (Vchoz nastaven: [http://vas_blog.cz/]downloads.html]'); +@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', 'Definuje stlou zkratku, kter me bt krat a srozumitelnj ne statick URL adresa (nastaven ve). Je teba zadat absolutn HTTP cestu, navc mus konit .htm nebo .html. (Vchoz nastaven: "%s")'); @define('PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH', 'Cesta pro pchoz data'); -@define('PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH', 'Pln absolutn cesta k adresi, do kterho nahrvte soubory. Plugin pracuje tak, e do tohoto adrese se nahraj soubory a teprve pak urte, kter maj bt nabzen ke staen. Ty si pak plugin pemst do adrese s downloady. (Adres mus bt vytvoen a webserver do nj mus mt prvo zpisu!)'); +@define('PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH', 'Pln absolutn cesta k adresi, do kterho nahrvte soubory. Plugin pracuje tak, e do tohoto adrese se nahraj soubory a teprve pak urte, kter maj bt nabzen ke staen. Ty si pak plugin pemst do adrese s downloady.'); @define('PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH', 'Absolutn cesta adrese s downloady'); -@define('PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH', 'Pln absolutn cesta k adresi, do kterho si bude downloadmanager umsovat soubory, kter pak budou pstupn z blogu. (Adres mus bt vytvoen a webserver do nj mus mt prvo zpisu!)'); +@define('PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH', 'Pln absolutn cesta k adresi, do kterho si bude downloadmanager umsovat soubory, kter pak budou pstupn z blogu.'); @define('PLUGIN_DOWNLOADMANAGER_HTTPPATH', 'HTTP cesta k pluginu'); @define('PLUGIN_DOWNLOADMANAGER_HTTPPATH_BLAHBLAH', 'aboslutn http cesta k pluginu (obvykle "/plugins/serendipity_event_downloadmanager").'); @define('PLUGIN_DOWNLOADMANAGER_DATEFORMAT', 'Formt data, podle pravidel PHP funkce date(). (vchoz: "Y/m/d, h:ia")'); @@ -74,7 +74,14 @@ @define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_INCOMING_NOT_ALLOWED', 'Webserver nem dostatek oprvnn pro smazn souboru z pchozho adrese! Smate prosm soubor run a potom pozmte pstupov prva, aby to od pt lo.'); @define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED', 'Webserver nem dostatek oprvnn pro smazn souboru z adrese download! Pozmte pstupov prva, pak opakujte pokus o smazn.'); @define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE', 'Pchoz adres:'); -@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'Nahrajte soubor do tohoto adrese pomoc FTP, pokud Vm nejde nahrt pomoc funkce php-upload. To se me stt nap. pokud je soubor pli velk. Php m toti omezen na max. velikost uploadovanho souboru - nastaven v php.ini.
Aktuln adres: '); +#@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'Nahrajte soubor do tohoto adrese pomoc FTP, pokud Vm nejde nahrt pomoc funkce php-upload. To se me stt nap. pokud je soubor pli velk. Php m toti omezen na max. velikost uploadovanho souboru - nastaven v php.ini.
Aktuln adres: '); +@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'This directory "%s" +
    +
  • allows to import files via FTP upload to the current category "%s"
    • +
  • is used as a temporary(!) directory for delete and/or for moving files between categories.
    • +
  • On the other hand you should not keep files in here and always erase stored files completly (see blue trash symbol link).
    • +
  • For keeping and hiding files in the longer term please use the root directory. See DLM Help box.
    • +
'); @define('PLUGIN_DOWNLOADMANAGER_THIS_FILE', 'Vybran soubor'); @define('PLUGIN_DOWNLOADMANAGER_EDIT_FILE', 'Editovat soubor'); @define('PLUGIN_DOWNLOADMANAGER_MOVE_TO_CAT', 'Pesunout do'); @@ -116,10 +123,10 @@ @define('PLUGIN_DOWNLOADMANAGER_REGISTERED_ONLY_ERROR', 'Soubory ke staen jsou pstupn pouze registrovanm uivatelm!'); @define('PLUGIN_DOWNLOADMANAGER_ROOTLEVEL_TITLE', 'soubory v koenovm adresi (v pehledu schovan, neviditeln!)'); @define('PLUGIN_DOWNLOADMANAGER_ERRORS_UPGRADE_NOTCOPIED', 'Omlouvme se, vyskytla se chyba. Soubory z
%s
nemohly bt pesunuty do
%s.

Pesute je prom run a kliknte na tento odkaz, abyste o pesunu informovali plugin!
Krom toho odstrate run tak star adrese.
'); -@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPIED_NEWDIR', 'Protoe jste aktualizovali plugin downloadmanager na verzi 0.24, byly vechny soubory ke staen zkoprovny do novch podadres \'/.dlm/files\' a \'/.dlm/ftpin\' v adresi \'/archives\', aby se zamezilo konfliktu s cestami ke starm slokm.

Nastaven bylo zmnno, aby ukazovalo na nov adrese a dle nelze mnit.
Odstrate prosm run star adrese.
'); -@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPY_NEWDIR_REMEMBER', 'spn jste zmnili plugin, aby nov pracoval pouze s novmi adresi.

Nezapomete prosm run pesunout soubory do novch adres \'archives/.dlm/files\' a \'archives/.dlm/ftpin\'!
Tak run odstrate star adrese.
'); +#@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPIED_NEWDIR', 'Protoe jste aktualizovali plugin downloadmanager na verzi 0.24, byly vechny soubory ke staen zkoprovny do novch podadres \'/.dlm/files\' a \'/.dlm/ftpin\' v adresi \'/archives\', aby se zamezilo konfliktu s cestami ke starm slokm.

Nastaven bylo zmnno, aby ukazovalo na nov adrese a dle nelze mnit.
Odstrate prosm run star adrese.
'); +#@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPY_NEWDIR_REMEMBER', 'spn jste zmnili plugin, aby nov pracoval pouze s novmi adresi.

Nezapomete prosm run pesunout soubory do novch adres \'archives/.dlm/files\' a \'archives/.dlm/ftpin\'!
Tak run odstrate star adrese.
'); @define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK', 'oznait/odznait ve'); -@define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK_TITLE', 'smazat vechny oznaen'); +@define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK_TITLE', 'smazat vechny oznaen to ftp/trash'); @define('PLUGIN_DOWNLOADMANAGER_BUTTON_MOVE_TITLE', 'pesunout vechny oznaen do kategorie'); @define('PLUGIN_DOWNLOADMANAGER_CLEAR_TRASH', 'Vymazat bin v adresi ftp/ko'); @define('PLUGIN_DOWNLOADMANAGER_NO_TRASH', 'dn soubory k vymazn v adresi ftp/ko'); @@ -136,4 +143,5 @@ @define('PLUGIN_DOWNLOADMANAGER_BACK_ROOT', 'Koenov kategorie'); @define('PLUGIN_DOWNLOADMANAGER_BACK_CURRENT', 'Aktuln kategorie'); @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_FF_CHANGE', 'Zmnit jmno souboru pod soubor-odkaz editovat-podstrnka.'); -@define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_LFTP', 'Nahrt soubory pomoc ftp do adrese /serendipity/archives/.dlm/ftpin folder.'); \ No newline at end of file +@define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_LFTP', 'Nahrt soubory pomoc ftp do adrese /serendipity/archives/.dlm/ftpin folder.'); + diff --git a/serendipity_event_downloadmanager/lang_cz.inc.php b/serendipity_event_downloadmanager/lang_cz.inc.php index ed718aa9..cf8540a4 100644 --- a/serendipity_event_downloadmanager/lang_cz.inc.php +++ b/serendipity_event_downloadmanager/lang_cz.inc.php @@ -18,11 +18,11 @@ @define('PLUGIN_DOWNLOADMANAGER_PAGEURL', 'Statick URL adresa'); @define('PLUGIN_DOWNLOADMANAGER_PAGEURL_BLAHBLAH', 'Definuje URL, pod kterou je download manaer pstupn (index.php?serendipity[subpage]=zde_zadan_jmno)'); @define('PLUGIN_DOWNLOADMANAGER_PERMALINK', 'Permalink (stl odkaz)'); -@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', 'Definuje stlou zkratku, kter me bt krat a srozumitelnj ne statick URL adresa (nastaven ve). Je teba zadat absolutn HTTP cestu, navc mus konit .htm nebo .html! (Vchoz nastaven: [http://vas_blog.cz/]downloads.html]'); +@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', 'Definuje stlou zkratku, kter me bt krat a srozumitelnj ne statick URL adresa (nastaven ve). Je teba zadat absolutn HTTP cestu, navc mus konit .htm nebo .html. (Vchoz nastaven: "%s")'); @define('PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH', 'Cesta pro pchoz data'); -@define('PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH', 'Pln absolutn cesta k adresi, do kterho nahrvte soubory. Plugin pracuje tak, e do tohoto adrese se nahraj soubory a teprve pak urte, kter maj bt nabzen ke staen. Ty si pak plugin pemst do adrese s downloady. (Adres mus bt vytvoen a webserver do nj mus mt prvo zpisu!)'); +@define('PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH', 'Pln absolutn cesta k adresi, do kterho nahrvte soubory. Plugin pracuje tak, e do tohoto adrese se nahraj soubory a teprve pak urte, kter maj bt nabzen ke staen. Ty si pak plugin pemst do adrese s downloady.'); @define('PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH', 'Absolutn cesta adrese s downloady'); -@define('PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH', 'Pln absolutn cesta k adresi, do kterho si bude downloadmanager umsovat soubory, kter pak budou pstupn z blogu. (Adres mus bt vytvoen a webserver do nj mus mt prvo zpisu!)'); +@define('PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH', 'Pln absolutn cesta k adresi, do kterho si bude downloadmanager umsovat soubory, kter pak budou pstupn z blogu.'); @define('PLUGIN_DOWNLOADMANAGER_HTTPPATH', 'HTTP cesta k pluginu'); @define('PLUGIN_DOWNLOADMANAGER_HTTPPATH_BLAHBLAH', 'aboslutn http cesta k pluginu (obvykle "/plugins/serendipity_event_downloadmanager").'); @define('PLUGIN_DOWNLOADMANAGER_DATEFORMAT', 'Formt data, podle pravidel PHP funkce date(). (vchoz: "Y/m/d, h:ia")'); @@ -74,7 +74,14 @@ @define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_INCOMING_NOT_ALLOWED', 'Webserver nem dostatek oprvnn pro smazn souboru z pchozho adrese! Smate prosm soubor run a potom pozmte pstupov prva, aby to od pt lo.'); @define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED', 'Webserver nem dostatek oprvnn pro smazn souboru z adrese download! Pozmte pstupov prva, pak opakujte pokus o smazn.'); @define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE', 'Pchoz adres:'); -@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'Nahrajte soubor do tohoto adrese pomoc FTP, pokud Vm nejde nahrt pomoc funkce php-upload. To se me stt nap. pokud je soubor pli velk. Php m toti omezen na max. velikost uploadovanho souboru - nastaven v php.ini.
Aktuln adres: '); +#@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'Nahrajte soubor do tohoto adrese pomoc FTP, pokud Vm nejde nahrt pomoc funkce php-upload. To se me stt nap. pokud je soubor pli velk. Php m toti omezen na max. velikost uploadovanho souboru - nastaven v php.ini.
Aktuln adres: '); +@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'This directory "%s" +
    +
  • allows to import files via FTP upload to the current category "%s"
    • +
  • is used as a temporary(!) directory for delete and/or for moving files between categories.
    • +
  • On the other hand you should not keep files in here and always erase stored files completly (see blue trash symbol link).
    • +
  • For keeping and hiding files in the longer term please use the root directory. See DLM Help box.
    • +
'); @define('PLUGIN_DOWNLOADMANAGER_THIS_FILE', 'Vybran soubor'); @define('PLUGIN_DOWNLOADMANAGER_EDIT_FILE', 'Editovat soubor'); @define('PLUGIN_DOWNLOADMANAGER_MOVE_TO_CAT', 'Pesunout do'); @@ -116,10 +123,10 @@ @define('PLUGIN_DOWNLOADMANAGER_REGISTERED_ONLY_ERROR', 'Soubory ke staen jsou pstupn pouze registrovanm uivatelm!'); @define('PLUGIN_DOWNLOADMANAGER_ROOTLEVEL_TITLE', 'soubory v koenovm adresi (v pehledu schovan, neviditeln!)'); @define('PLUGIN_DOWNLOADMANAGER_ERRORS_UPGRADE_NOTCOPIED', 'Omlouvme se, vyskytla se chyba. Soubory z
%s
nemohly bt pesunuty do
%s.

Pesute je prom run a kliknte na tento odkaz, abyste o pesunu informovali plugin!
Krom toho odstrate run tak star adrese.
'); -@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPIED_NEWDIR', 'Protoe jste aktualizovali plugin downloadmanager na verzi 0.24, byly vechny soubory ke staen zkoprovny do novch podadres \'/.dlm/files\' a \'/.dlm/ftpin\' v adresi \'/archives\', aby se zamezilo konfliktu s cestami ke starm slokm.

Nastaven bylo zmnno, aby ukazovalo na nov adrese a dle nelze mnit.
Odstrate prosm run star adrese.
'); -@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPY_NEWDIR_REMEMBER', 'spn jste zmnili plugin, aby nov pracoval pouze s novmi adresi.

Nezapomete prosm run pesunout soubory do novch adres \'archives/.dlm/files\' a \'archives/.dlm/ftpin\'!
Tak run odstrate star adrese.
'); +#@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPIED_NEWDIR', 'Protoe jste aktualizovali plugin downloadmanager na verzi 0.24, byly vechny soubory ke staen zkoprovny do novch podadres \'/.dlm/files\' a \'/.dlm/ftpin\' v adresi \'/archives\', aby se zamezilo konfliktu s cestami ke starm slokm.

Nastaven bylo zmnno, aby ukazovalo na nov adrese a dle nelze mnit.
Odstrate prosm run star adrese.
'); +#@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPY_NEWDIR_REMEMBER', 'spn jste zmnili plugin, aby nov pracoval pouze s novmi adresi.

Nezapomete prosm run pesunout soubory do novch adres \'archives/.dlm/files\' a \'archives/.dlm/ftpin\'!
Tak run odstrate star adrese.
'); @define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK', 'oznait/odznait ve'); -@define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK_TITLE', 'smazat vechny oznaen'); +@define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK_TITLE', 'smazat vechny oznaen to ftp/trash'); @define('PLUGIN_DOWNLOADMANAGER_BUTTON_MOVE_TITLE', 'pesunout vechny oznaen do kategorie'); @define('PLUGIN_DOWNLOADMANAGER_CLEAR_TRASH', 'Vymazat bin v adresi ftp/ko'); @define('PLUGIN_DOWNLOADMANAGER_NO_TRASH', 'dn soubory k vymazn v adresi ftp/ko'); @@ -136,4 +143,5 @@ @define('PLUGIN_DOWNLOADMANAGER_BACK_ROOT', 'Koenov kategorie'); @define('PLUGIN_DOWNLOADMANAGER_BACK_CURRENT', 'Aktuln kategorie'); @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_FF_CHANGE', 'Zmnit jmno souboru pod soubor-odkaz editovat-podstrnka.'); -@define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_LFTP', 'Nahrt soubory pomoc ftp do adrese /serendipity/archives/.dlm/ftpin folder.'); \ No newline at end of file +@define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_LFTP', 'Nahrt soubory pomoc ftp do adrese /serendipity/archives/.dlm/ftpin folder.'); + diff --git a/serendipity_event_downloadmanager/lang_de.inc.php b/serendipity_event_downloadmanager/lang_de.inc.php index 8e0b1096..ed1e9649 100644 --- a/serendipity_event_downloadmanager/lang_de.inc.php +++ b/serendipity_event_downloadmanager/lang_de.inc.php @@ -1,4 +1,4 @@ -Dies kann passieren, wenn der SAFE_MODE aktiviert ist
Bitte SAFE_MODE in der php.ini deaktivieren!'); -@define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_INCOMING_NOT_ALLOWED', 'Konnte die Datei im import-Verzeichnis nicht lschen, da keine Schreibberechtigung bestand.
Bitte Berechtigungen ndern!'); -@define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED', 'Konnte die Datei im download-Verzeichnis nicht lschen, da keine Schreibberechtigung bestand.
Bitte Berechtigungen ndern!'); +@define('PLUGIN_DOWNLOADMANAGER_COPY_NOT_ALLOWED', 'Konnte Datei nicht in das Download-Verzeichnis kopieren!
Dies kann zB. passieren, wenn das encoding nicht stimmt, oder wenn der SAFE_MODE aktiviert ist
Bitte SAFE_MODE in der php.ini deaktivieren!'); +@define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_INCOMING_NOT_ALLOWED', 'Konnte die Datei im Import-Verzeichnis nicht lschen, da keine Schreibberechtigung bestand.
Bitte Berechtigungen ndern!'); +@define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED', 'Konnte die Datei im Download-Verzeichnis nicht lschen, da keine Schreibberechtigung bestand.
Bitte Berechtigungen ndern!'); /*@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE', 'incoming Verzeichnis:');*/ -@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'Dies ermglicht den Import von per FTP hochgeladenen Dateien oder die vollstndige Lschung aller hierhin verschobener Dateien (siehe blaues Trash Symbol).
Current directory: '); +@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'Dieses Verzeichnis "%s" +
    +
  • ermglicht den Import von per FTP hochgeladenen Dateien in die aktuelle Kategorie "%s"
    • +
  • fungiert als ein temporres(!) Zwischenverzeichnis fr zu verschiebene oder gelschte Dateien und
    • +
  • erlaubt die vollstndige Lschung aller hier befindlichen Dateien (ber das blaue Trash Symbol).
    • +
  • Um Dateien lngerfristig zu verstecken nutzen Sie das Stamm-Verzeichnis. Siehe DLM Help Box.
    • +
'); @define('PLUGIN_DOWNLOADMANAGER_THIS_FILE', 'Gewhlte Datei'); @define('PLUGIN_DOWNLOADMANAGER_EDIT_FILE', 'Diese Datei ndern'); @define('PLUGIN_DOWNLOADMANAGER_MOVE_TO_CAT', 'Diese Datei verschieben nach'); @@ -90,10 +96,10 @@ @define('PLUGIN_DOWNLOADMANAGER_UNHIDE_TREE', 'Diese Kategorie und alle Unterkategorien wieder zeigen...'); @define('PLUGIN_DOWNLOADMANAGER_OPEN_CAT', 'Klicken um die Kategorie zu ffnen um Dateien hochzuladen oder zu modifizieren...'); -@define('PLUGIN_DOWNLOADMANAGER_SHOWDESC_INLIST', 'Dateibeischreibungen in der Dateiliste'); +@define('PLUGIN_DOWNLOADMANAGER_SHOWDESC_INLIST', 'Dateibeschreibungen in der Dateiliste'); @define('PLUGIN_DOWNLOADMANAGER_SHOWDESC_INLIST_DESC', 'Wenn Sie eine kompakte Liste wollen, so schalten Sie dies aus. Wenn Sie dem Benutzer viele Informationen geben wollen, schalten Sie diese Option an.'); @define('PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST', 'Dateien direkt in der Dateiliste herunter laden'); -@define('PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST_DESC', 'Normaler Weise wird dem Besucher immer eine Informationsseite angezeigt, bevor er die Datei herunter laden kann. Hier knnen Sie einstellen, dass man bei einem Klick auf das Icon, den Namen oder beides direkt den Download startet.'); +@define('PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST_DESC', 'Normalerweise wird dem Besucher immer eine Informationsseite angezeigt, bevor er die Datei herunter laden kann. Hier knnen Sie einstellen, dass man bei einem Klick auf das Icon, den Namen oder beides direkt den Download startet.'); @define('PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST_NO', 'Immer Infoseite anzeigen'); @define('PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST_ICON', 'Download ber Icon'); @define('PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST_NAME', 'Download ber Dateiname'); @@ -114,15 +120,16 @@ @define('PLUGIN_DOWNLOADMANAGER_REGISTERED_ONLY_ERROR', 'Die Downloads stehen nur registrierten Benutzern dieses Blogs zur Verfgung!'); @define('PLUGIN_DOWNLOADMANAGER_ROOTLEVEL_TITLE', 'Dateien auf der Rootebene (versteckt im Frontend!)'); @define('PLUGIN_DOWNLOADMANAGER_ERRORS_UPGRADE_NOTCOPIED', 'Entschuldigung! Ein Fehler trat whrend des upgrade Prozesses auf. Die Dateien aus
%s
konnten nicht nach
%s
verschoben werden.

Bitte verschieben Sie sie manuell und drcken sie diesen Link, um das Plugin darber zu informieren!
Lschen Sie die alten Verzeichnisse ebenfalls manuell.
'); -@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPIED_NEWDIR', 'Da Sie das Downloadmanager Plugin auf v.0.24 hochgestuft haben, wurden alle alten Dateien in das neue \'/.dlm/files\' und \'/.dlm/ftpin\' Verzeichnis im Serendipity \'/archives\' Verzeichnis verschoben, um Konflikte mit dem alten Pfad zu vermeiden.

Die Config Einstellungen wurden auf die neuen Pfade angepasst und sind knftig nicht mehr vernderbar.
Lschen Sie die alten Verzeichnisse manuell.
'); -@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPY_NEWDIR_REMEMBER', 'Sie haben dem Plugin erfolgreich mitgeteilt, nur noch die neuen Pfade zu akzeptieren.

Bitte denken Sie daran, ihre Dateien manuell in das neue \'archives/.dlm/files\' und \'archives/.dlm/ftpin\' Verzeichnis zu verschieben!
Lschen Sie die alten Verzeichnisse ebenfalls manuell.
'); +#@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPIED_NEWDIR', 'Da Sie das Downloadmanager Plugin auf v.0.24 hochgestuft haben, wurden alle alten Dateien in das neue \'/.dlm/files\' und \'/.dlm/ftpin\' Verzeichnis im Serendipity \'/archives\' Verzeichnis verschoben, um Konflikte mit dem alten Pfad zu vermeiden.

Die Config Einstellungen wurden auf die neuen Pfade angepasst und sind knftig nicht mehr vernderbar.
Lschen Sie die alten Verzeichnisse manuell.
'); +#@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPY_NEWDIR_REMEMBER', 'Sie haben dem Plugin erfolgreich mitgeteilt, nur noch die neuen Pfade zu akzeptieren.

Bitte denken Sie daran, ihre Dateien manuell in das neue \'archives/.dlm/files\' und \'archives/.dlm/ftpin\' Verzeichnis zu verschieben!
Lschen Sie die alten Verzeichnisse ebenfalls manuell.
'); @define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK', 'alle markieren / unmarkieren'); -@define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK_TITLE', 'markierte lschen'); +@define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK_TITLE', 'markierte lschen nach ftp/trash'); @define('PLUGIN_DOWNLOADMANAGER_BUTTON_MOVE_TITLE', 'markierte in Kategorie verschieben'); @define('PLUGIN_DOWNLOADMANAGER_CLEAR_TRASH', 'Lsche alle Dateien im ftp/trash Verzeichnis'); @define('PLUGIN_DOWNLOADMANAGER_NO_TRASH', 'Kein Mll im ftp/trash Verzeichnis'); @define('PLUGIN_DOWNLOADMANAGER_EDIT_FILE_RENAME', 'Datei umbenennen in'); /* HELPTIP_CF = category folder; HELPTIP_IF = incoming folder; HELPTIP_FF = file folder; HELPTIP_MF = s9y media library folder; */ +@define('PLUGIN_DOWNLOADMANAGER_HELPTIP_CF_START', 'Start: Erstellen Sie eine Kategorie, um Dateien hochzuladen.'); @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_CF_CHANGE', 'Kategorie Name im Feld selbst ndern / Enter'); @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_VIEW', 'Um das ftp/trash Verzeichnis zu sehen, whlen sie einen Subordner von root.'); @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_FF_MULTI', 'Alle Dateien im ftp/trash Verzeichnis werden sofort gelscht!'); @@ -137,9 +144,9 @@ /* @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_VIEW', ''); @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_VIEW', ''); -@define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_VIEW', ''); */ // Next lines were translated on 2011/11/22 @define('PLUGIN_DOWNLOADMANAGER_BACK_ROOT', 'Wurzel-Kategorie'); -@define('PLUGIN_DOWNLOADMANAGER_BACK_CURRENT', 'Aktuelle Kategorie'); \ No newline at end of file +@define('PLUGIN_DOWNLOADMANAGER_BACK_CURRENT', 'Aktuelle Kategorie'); + diff --git a/serendipity_event_downloadmanager/lang_en.inc.php b/serendipity_event_downloadmanager/lang_en.inc.php index 3c5d3a1b..a6d84182 100644 --- a/serendipity_event_downloadmanager/lang_en.inc.php +++ b/serendipity_event_downloadmanager/lang_en.inc.php @@ -1,4 +1,4 @@ -This could happen if there is safe_mode activated in your php.ini.
Please deactivate the php safe_mode to use this feature!'); +@define('PLUGIN_DOWNLOADMANAGER_COPY_NOT_ALLOWED', 'Not able to copy the new file from your incoming directory to the download directory!
This can happen for example, if the file encoding is wrong, or when safe_mode is activated in your php.ini.
Please deactivate the php safe_mode to use this feature!'); @define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_INCOMING_NOT_ALLOWED', 'I\'m not allowed to delete the file from your incoming directory! Please delete this one file manually and then set the file permissions that I can delete all further files for you.'); @define('PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED', 'I\'m not allowed to delete the file from your download directory! Please set the file permissions that I can delete this file.'); /*@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE', 'Incoming directory:');*/ -@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'Use this directory to upload files via FTP if you are not allowed to upload this file with the php-upload feature. This can happen if your file is too big than the maximum value in your php.ini or if file_uploads are deactivated in your php.ini. On the other hand you can erase all moved files completly (see blue trash symbol).
Current directory: '); +@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'This directory "%s" +
    +
  • allows to import files via FTP upload to the current category "%s"
    • +
  • is used as a temporary(!) directory for delete and/or for moving files between categories.
    • +
  • On the other hand you should not keep files in here and always erase stored files completly (see blue trash symbol link).
    • +
  • For keeping and hiding files in the longer term please use the root directory. See DLM Help box.
    • +
'); @define('PLUGIN_DOWNLOADMANAGER_THIS_FILE', 'Selected file'); @define('PLUGIN_DOWNLOADMANAGER_EDIT_FILE', 'Edit this file'); @define('PLUGIN_DOWNLOADMANAGER_MOVE_TO_CAT', 'Move file to'); @@ -109,10 +115,10 @@ @define('PLUGIN_DOWNLOADMANAGER_REGISTERED_ONLY_ERROR', 'The downloads are available only to this blogs registered users!'); @define('PLUGIN_DOWNLOADMANAGER_ROOTLEVEL_TITLE', 'files at root level (hidden in frontend!)'); @define('PLUGIN_DOWNLOADMANAGER_ERRORS_UPGRADE_NOTCOPIED', 'We are sorry! An error occured. The files of
%s
could not be moved to
%s.

Please move them manually and press this link, to inform this plugin about it!
Additionally remove the old directories manually too.
'); -@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPIED_NEWDIR', 'Since you upgraded your downloadmanager plugin to v.0.24, all you files were copied to the new \'/.dlm/files\' and \'/.dlm/ftpin\' directories in serendipities \'/archives\' folder to avoid oldpath conflicts.

The config settings were set to hold the new path strings and are not alterable any more in future.
Please remove the old directories manually.
'); -@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPY_NEWDIR_REMEMBER', 'You have successfull changed this plugin to accept the new path settings only.

Please remember, to move your files manually to the new \'archives/.dlm/files\' and \'archives/.dlm/ftpin\' directories!
Additionally remove the old directories manually too.
'); +#@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPIED_NEWDIR', 'Since you upgraded your downloadmanager plugin to v.0.24, all you files were copied to the new \'/.dlm/files\' and \'/.dlm/ftpin\' directories in serendipities \'/archives\' folder to avoid oldpath conflicts.

The config settings were set to hold the new path strings and are not alterable any more in future.
Please remove the old directories manually.
'); +#@define('PLUGIN_DOWNLOADMANAGER_ALLFILES_COPY_NEWDIR_REMEMBER', 'You have successfully changed this plugin to accept the new path settings only.

Please remember, to move your files manually to the new \'archives/.dlm/files\' and \'archives/.dlm/ftpin\' directories!
Additionally remove the old directories manually too.
'); @define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK', 'mark all / unmark'); -@define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK_TITLE', 'erase all marked'); +@define('PLUGIN_DOWNLOADMANAGER_BUTTON_MARK_TITLE', 'erase all marked to ftp/trash'); @define('PLUGIN_DOWNLOADMANAGER_BUTTON_MOVE_TITLE', 'move all marked to category'); @define('PLUGIN_DOWNLOADMANAGER_CLEAR_TRASH', 'Clear bin in ftp/trash folder'); @define('PLUGIN_DOWNLOADMANAGER_NO_TRASH', 'No files to destroy in ftp/trash folder'); @@ -120,6 +126,7 @@ @define('PLUGIN_DOWNLOADMANAGER_BACK_ROOT', 'Root category'); @define('PLUGIN_DOWNLOADMANAGER_BACK_CURRENT', 'Current category'); /* HELPTIP_CF = category folder; HELPTIP_IF = incoming folder; HELPTIP_FF = file folder; HELPTIP_MF = s9y media library folder; */ +@define('PLUGIN_DOWNLOADMANAGER_HELPTIP_CF_START', 'Start: Create a category to upload files.'); @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_CF_CHANGE', 'Change category name in cat field directly / Enter'); @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_VIEW', 'To view and handle ftp/trash folder, choose subcategory of root.'); @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_FF_MULTI', 'All file erasing in ftp/trash folder will happen immediately!'); @@ -136,3 +143,6 @@ @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_VIEW', ''); @define('PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_VIEW', ''); */ + +@define('PLUGIN_DOWNLOADMANAGER_PHPMB_ERROR', 'PHP mb_* functions not available. Please use ASCII filenames only!'); + diff --git a/serendipity_event_downloadmanager/lang_it.inc.php b/serendipity_event_downloadmanager/lang_it.inc.php index 51148438..3d74cfb9 100644 --- a/serendipity_event_downloadmanager/lang_it.inc.php +++ b/serendipity_event_downloadmanager/lang_it.inc.php @@ -1,12 +1,10 @@ - # Contact me on IRC in #linux-stats, #archlinux, #archlinux.de, #s9y on irc.freenode.net # italian language file - - @define("PLUGIN_DOWNLOADMANAGER_TITLE", "Downloadmanager"); @define("PLUGIN_DOWNLOADMANAGER_DESC", "Aggiunge le funzionalita' di downloadmanager a s9y. Quando viene disinstallato, tutte le tabelle vengono eliminate!"); @define('PLUGIN_DOWNLOADMANAGER_PAGETITLE', 'Titolo della pagina'); @@ -16,11 +14,11 @@ @define('PLUGIN_DOWNLOADMANAGER_PAGEURL', 'URL Statico'); @define('PLUGIN_DOWNLOADMANAGER_PAGEURL_BLAHBLAH', "Definisce l'URL della pagina (index.php?serendipity[subpage]=name)"); @define('PLUGIN_DOWNLOADMANAGER_PERMALINK', 'Permalink'); -@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', "Definisce un permalink per l'URL che puo' essere piu' corto dell'URL statico. Deve essere un path HTTP assoluto e finire con .htm o .html! (defaults [http://blog/]downloads.html)"); +@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', 'Definisce un permalink per l\'URL che puo\' essere piu\' corto dell\'URL statico. Deve essere un path HTTP assoluto e finire con .htm o .html. (Default: "%s")'); @define("PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH", "Path di upload"); -@define("PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH", "Indirizzo completo e assoluto della directory di upload. (L'indirizzo deve esistere ed essere scrivibile dal server!)"); +@define("PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH", "Indirizzo completo e assoluto della directory di upload."); @define("PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH", "Path di download"); -@define("PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH", "Indirizzo completo e assoluto della directory di download. (L'indirizzo deve esistere ed essere scrivibile dal server!)"); +@define("PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH", "Indirizzo completo e assoluto della directory di download."); @define("PLUGIN_DOWNLOADMANAGER_HTTPPATH", "http path to plugin"); @define("PLUGIN_DOWNLOADMANAGER_HTTPPATH_BLAHBLAH", "absolute http path to plugin (usually \"/plugins/serendipity_event_downloadmanager\")."); @define("PLUGIN_DOWNLOADMANAGER_DATEFORMAT", "Formato della data, utilizza la sintassi di PHP date(). (Italiana: \"d/m/Y, h:ia\")"); @@ -72,7 +70,14 @@ @define("PLUGIN_DOWNLOADMANAGER_DELETE_IN_INCOMING_NOT_ALLOWED", "Impossibile eliminare il file dalla directory di upload! Elimina il file manualmente e configura i permessi per permettere l'eliminazione dei file."); @define("PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED", "Impossibile eliminare il file dalla directory di download! Configura i permessi per permettere l'eliminazione dea file."); @define("PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE", "Directory di upload:"); -@define("PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH", "Utilizza questa directory per caricare i file via FTP se non hai i diritti di caricare i file via php-upload. Il file potrebbe essere piu' grande del massimo valore settato in php.ini o se file_uploads sono disattivati nel php.ini.
Current directory: "); +#@define("PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH", "Utilizza questa directory per caricare i file via FTP se non hai i diritti di caricare i file via php-upload. Il file potrebbe essere piu' grande del massimo valore settato in php.ini o se file_uploads sono disattivati nel php.ini.
Current directory: "); +@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'This directory "%s" +
    +
  • allows to import files via FTP upload to the current category "%s"
    • +
  • is used as a temporary(!) directory for delete and/or for moving files between categories.
    • +
  • On the other hand you should not keep files in here and always erase stored files completly (see blue trash symbol link).
    • +
  • For keeping and hiding files in the longer term please use the root directory. See DLM Help box.
    • +
'); @define("PLUGIN_DOWNLOADMANAGER_THIS_FILE", "File selezionato"); @define("PLUGIN_DOWNLOADMANAGER_EDIT_FILE", "Modifica questo file"); @define("PLUGIN_DOWNLOADMANAGER_MOVE_TO_CAT", "Muovi in"); @@ -92,5 +97,3 @@ @define("PLUGIN_DOWNLOADMANAGER_UNHIDE_TREE", "Visualizza questa categoria e tutte le sotto-categorie contenute..."); @define("PLUGIN_DOWNLOADMANAGER_OPEN_CAT", "Clicca per aprire questa categoria per caricare e modificare i file..."); - -?> diff --git a/serendipity_event_downloadmanager/lang_ja.inc.php b/serendipity_event_downloadmanager/lang_ja.inc.php index 0179e275..0c6c10e3 100644 --- a/serendipity_event_downloadmanager/lang_ja.inc.php +++ b/serendipity_event_downloadmanager/lang_ja.inc.php @@ -1,4 +1,4 @@ - # Contact me on IRC in #linux-stats, #archlinux, #archlinux.de, #s9y on irc.freenode.net @@ -21,11 +21,11 @@ s9yに十分なダウンロードマネージャーの能力を提供します @define('PLUGIN_DOWNLOADMANAGER_PAGEURL', '静的 URL'); @define('PLUGIN_DOWNLOADMANAGER_PAGEURL_BLAHBLAH', 'ページの URL を定義します (index.php?serendipity[subpage]=name)'); @define('PLUGIN_DOWNLOADMANAGER_PERMALINK', '固定リンク'); -@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', 'Defines a custom permalink for the URL which can be much shorter than the Static URL. 絶対 HTTP パスの必要があり、最後に「.htm」か「.html」が必要です! (デフォルト: [http://blog/]downloads.html)'); +@define('PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH', 'Defines a custom permalink for the URL which can be much shorter than the Static URL. 絶対 HTTP パスの必要があり、最後に「.htm」か「.html」が必要です. (デフォルト: "%s")'); @define("PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH", "受付データのパス"); -@define("PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH", "Full and absolute path to the directory in which you can upload bigger files to import them into your downloadmanager. (path must exist and be writeable for the server!)"); +@define('PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH', 'Full and absolute path to the directory in which you can (FTP)-upload bigger files to import them into your downloadmanager.'); @define("PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH", "絶対ダウンロードデータパス"); -@define("PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH", "Full and absolute path to the directory in which the uploaded (and downloadable) files will be stored. (path must exist and be writeable for the server!)"); +@define("PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH", "Full and absolute path to the directory in which the files are stored."); @define("PLUGIN_DOWNLOADMANAGER_HTTPPATH", "http path to plugin"); @define("PLUGIN_DOWNLOADMANAGER_HTTPPATH_BLAHBLAH", "absolute http path to plugin (usually \"/plugins/serendipity_event_downloadmanager\")."); @define("PLUGIN_DOWNLOADMANAGER_DATEFORMAT", "エントリの実際の日付の書式です、PHP の date() 関数の値を用います (デフォルト: \"Y/m/d, h:ia\")"); @@ -77,7 +77,13 @@ s9yに十分なダウンロードマネージャーの能力を提供します @define("PLUGIN_DOWNLOADMANAGER_DELETE_IN_INCOMING_NOT_ALLOWED", "I'm not allowed to delete the file from your incoming directory! Please delete this one file manually and then set the file permissions that I can delete all further files for you."); @define("PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED", "I'm not allowed to delete the file from your download directory! Please set the file permissions that I can delete this file."); @define("PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE", "受け付けディレクトリ:"); -@define("PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH", "Use this directory to upload files via FTP if you are not allowed to upload this file with the php-upload feature. This can happen if your file is too big than the maximum value in your php.ini or if file_uploads are deactivated in your php.ini.
現在のディレクトリ: "); +@define('PLUGIN_DOWNLOADMANAGER_INCOMINGTABLE_BLAHBLAH', 'This directory "%s" +
    +
  • allows to import files via FTP upload to the current category "%s"
    • +
  • is used as a temporary(!) directory for delete and/or for moving files between categories.
    • +
  • On the other hand you should not keep files in here and always erase stored files completly (see blue trash symbol link).
    • +
  • For keeping and hiding files in the longer term please use the root directory. See DLM Help box.
    • +
'); @define("PLUGIN_DOWNLOADMANAGER_THIS_FILE", "選択済ファイル"); @define("PLUGIN_DOWNLOADMANAGER_EDIT_FILE", "このファイルを編集する"); @define("PLUGIN_DOWNLOADMANAGER_MOVE_TO_CAT", "次にファイルを移動する:"); @@ -97,4 +103,3 @@ s9yに十分なダウンロードマネージャーの能力を提供します @define("PLUGIN_DOWNLOADMANAGER_UNHIDE_TREE", "Unhide this and the complete subtree below this category..."); @define("PLUGIN_DOWNLOADMANAGER_OPEN_CAT", "ファイルのアップロードか修正するこのカテゴリを開くためにクリックしてください..."); -?> diff --git a/serendipity_event_downloadmanager/serendipity_event_downloadmanager.php b/serendipity_event_downloadmanager/serendipity_event_downloadmanager.php index cb81b5de..97ab7c64 100755 --- a/serendipity_event_downloadmanager/serendipity_event_downloadmanager.php +++ b/serendipity_event_downloadmanager/serendipity_event_downloadmanager.php @@ -1,66 +1,54 @@ pluginglobs(); $propbag->add('name', PLUGIN_DOWNLOADMANAGER_TITLE); $propbag->add('description', PLUGIN_DOWNLOADMANAGER_DESC); $propbag->add('requirements', array( - 'serendipity' => '1.3', + 'serendipity' => '1.6', 'smarty' => '2.6.7', - 'php' => '5.0.0' + 'php' => '5.3.0' )); - $propbag->add('version', '0.30'); - $propbag->add('author', 'Alexander \'dma147\' Mieland, Grischa Brockhaus, Ian (Timbalu)'); + $propbag->add('version', '0.37'); + $propbag->add('author', 'Alexander \'dma147\' Mieland, Grischa Brockhaus, Ian'); $propbag->add('stackable', false); $propbag->add('event_hooks', array( 'entries_header' => true, 'entry_display' => true, + 'genpage' => true, 'external_plugin' => true, 'css' => true, 'css_backend' => true, 'backend_sidebar_entries' => true, - 'backend_dlm_filecopy' => true, + 'backend_sidebar_admin_appearance' => true, 'backend_sidebar_entries_event_display_downloadmanager' => true ) ); @@ -70,6 +58,7 @@ class serendipity_event_downloadmanager extends serendipity_event { 'intro', 'pageurl', 'permalink', + 'separator', 'absincomingpath', 'absdownloadspath', 'httppath', @@ -95,154 +84,143 @@ class serendipity_event_downloadmanager extends serendipity_event { $this->dependencies = array('serendipity_event_entryproperties' => 'keep'); } + /** + * introspect_config_item API + */ function introspect_config_item($name, &$propbag) { global $serendipity; switch($name) { case 'pagetitle' : - $propbag->add('type', 'string'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_PAGETITLE); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_PAGETITLE_BLAHBLAH); - $propbag->add('default', 'My downloads'); - + $propbag->add('type', 'string'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_PAGETITLE); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_PAGETITLE_BLAHBLAH); + $propbag->add('default', 'My downloads'); break; case 'headline' : - $propbag->add('type', 'string'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_HEADLINE); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_HEADLINE_BLAHBLAH); - $propbag->add('default', 'Here you can find some useful downloads'); - + $propbag->add('type', 'string'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_HEADLINE); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_HEADLINE_BLAHBLAH); + $propbag->add('default', 'Here you can find some useful downloads'); break; case 'intro': - $propbag->add('type', ($serendipity['wysiwyg'] === true ? 'html' : 'text')); - $propbag->add('rows', 3); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_INTRO); - $propbag->add('description', ''); - $propbag->add('default', ''); + $propbag->add('type', ($serendipity['wysiwyg'] === true ? 'html' : 'text')); + $propbag->add('rows', 3); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_INTRO); + $propbag->add('description',''); + $propbag->add('default', ''); break; case 'pageurl' : - $propbag->add('type', 'string'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_PAGEURL); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_PAGEURL_BLAHBLAH); - $propbag->add('default', 'downloadmanager'); - + $propbag->add('type', 'string'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_PAGEURL); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_PAGEURL_BLAHBLAH); + $propbag->add('default', 'downloadmanager'); break; case 'permalink': - $propbag->add('type', 'string'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_PERMALINK); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH); - $propbag->add('default', $serendipity['rewrite'] != 'none' - ? $serendipity['serendipityHTTPPath'] . 'downloads.html' - : $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?/downloads.html'); + $propbag->add('type', 'string'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_PERMALINK); + $propbag->add('description',sprintf(PLUGIN_DOWNLOADMANAGER_PERMALINK_BLAHBLAH, $serendipity['serendipityHTTPPath'] . 'downloads.html')); + $propbag->add('default', $serendipity['rewrite'] != 'none' + ? $serendipity['serendipityHTTPPath'] . 'downloads.html' + : $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?/downloads.html'); break; - case 'absincomingpath': - $propbag->add('type', ( serendipity_db_bool($this->get_config('chg2archivespath')) ? 'hidden' : 'string')); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH); - $propbag->add('default', $serendipity['serendipityPath'] . 'archives/.dlm/ftpin'); + case 'separator': + $propbag->add('type', 'separator'); + break; + // Remember, the chg2archivespath variable was here to indicate the upgrade to DLM Version 0.24+ had run through + // and files got merged to the new location, which should not be configurable any more, so be a 'content' information! + case 'absincomingpath': + $propbag->add('type', 'content'); + $propbag->add('default', ''.PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH . ': ' . $serendipity['serendipityPath'] . 'archives/.dlm/ftpin' . '
' . PLUGIN_DOWNLOADMANAGER_ABSINCOMINGPATH_BLAHBLAH); break; case 'absdownloadspath': - $propbag->add('type', ( serendipity_db_bool($this->get_config('chg2archivespath')) ? 'hidden' : 'string')); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH); - $propbag->add('default', $serendipity['serendipityPath'] . 'archives/.dlm/files'); - + $propbag->add('type', 'content'); + $propbag->add('default', ''.PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH . ': ' . $serendipity['serendipityPath'] . 'archives/.dlm/files' . '
' . PLUGIN_DOWNLOADMANAGER_ABSDOWNLOADPATH_BLAHBLAH); break; case 'httppath': - $propbag->add('type', 'string'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_HTTPPATH); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_HTTPPATH_BLAHBLAH); - $propbag->add('default', $serendipity['serendipityHTTPPath'] . 'plugins/serendipity_event_downloadmanager/'); - + $propbag->add('type', 'string'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_HTTPPATH); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_HTTPPATH_BLAHBLAH); + $propbag->add('default', $serendipity['serendipityHTTPPath'] . 'plugins/serendipity_event_downloadmanager/'); break; case 'iconwidth': - $propbag->add('type', 'string'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_ICONWIDTH); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_ICONWIDTHBLAH); - $propbag->add('default', '18'); - + $propbag->add('type', 'string'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_ICONWIDTH); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_ICONWIDTHBLAH); + $propbag->add('default', '18'); break; case 'iconheight': - $propbag->add('type', 'string'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_ICONHEIGHT); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_ICONHEIGHT_BLAHBLAH); - $propbag->add('default', '20'); - + $propbag->add('type', 'string'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_ICONHEIGHT); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_ICONHEIGHT_BLAHBLAH); + $propbag->add('default', '20'); break; case 'dateformat': - $propbag->add('type', 'string'); - $propbag->add('name', GENERAL_PLUGIN_DATEFORMAT); - $propbag->add('description', sprintf(PLUGIN_DOWNLOADMANAGER_DATEFORMAT, 'Y/m/d, h:ia')); - $propbag->add('default', 'Y/m/d, h:ia'); - + $propbag->add('type', 'string'); + $propbag->add('name', GENERAL_PLUGIN_DATEFORMAT); + $propbag->add('description',sprintf(PLUGIN_DOWNLOADMANAGER_DATEFORMAT, 'Y/m/d, h:ia')); + $propbag->add('default', 'Y/m/d, h:ia'); break; case 'showhidden_registered': - $propbag->add('type', 'boolean'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_SHOWHIDDEN_REGISTERED); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_SHOWHIDDEN_REGISTERED_BLAHBLAH); - $propbag->add('default', 'false'); - + $propbag->add('type', 'boolean'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_SHOWHIDDEN_REGISTERED); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_SHOWHIDDEN_REGISTERED_BLAHBLAH); + $propbag->add('default', 'false'); break; case 'registered_only': - $propbag->add('type', 'boolean'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_REGISTERED_ONLY); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_REGISTERED_ONLY_BLAHBLAH); - $propbag->add('default', 'false'); - + $propbag->add('type', 'boolean'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_REGISTERED_ONLY); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_REGISTERED_ONLY_BLAHBLAH); + $propbag->add('default', 'false'); break; case 'showfilename': - $propbag->add('type', 'boolean'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_SHOWFILENAME); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_SHOWFILENAME_BLAHBLAH); - $propbag->add('default', 'true'); - + $propbag->add('type', 'boolean'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_SHOWFILENAME); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_SHOWFILENAME_BLAHBLAH); + $propbag->add('default', 'true'); break; case 'showdownloads': - $propbag->add('type', 'boolean'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_SHOWDOWNLOADS); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_SHOWDOWNLOADS_BLAHBLAH); - $propbag->add('default', 'true'); - + $propbag->add('type', 'boolean'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_SHOWDOWNLOADS); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_SHOWDOWNLOADS_BLAHBLAH); + $propbag->add('default', 'true'); break; case 'showfilesize': - $propbag->add('type', 'boolean'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_SHOWFILESIZE); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_SHOWFILESIZE_BLAHBLAH); - $propbag->add('default', 'true'); - + $propbag->add('type', 'boolean'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_SHOWFILESIZE); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_SHOWFILESIZE_BLAHBLAH); + $propbag->add('default', 'true'); break; case 'showdate': - $propbag->add('type', 'boolean'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_SHOWFILEDATE); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_SHOWFILEDATE_BLAHBLAH); - $propbag->add('default', 'false'); - + $propbag->add('type', 'boolean'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_SHOWFILEDATE); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_SHOWFILEDATE_BLAHBLAH); + $propbag->add('default', 'false'); break; case 'showdesc_inlist': - $propbag->add('type', 'boolean'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_SHOWDESC_INLIST); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_SHOWDESC_INLIST_DESC); - $propbag->add('default', 'false'); - + $propbag->add('type', 'boolean'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_SHOWDESC_INLIST); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_SHOWDESC_INLIST_DESC); + $propbag->add('default', 'false'); break; case 'directdl_inlist': @@ -252,12 +230,11 @@ class serendipity_event_downloadmanager extends serendipity_event { 'name' => PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST_NAME, 'both' => PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST_BOTH, ); - $propbag->add('type', 'select'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST_DESC); - $propbag->add('default', 'no'); - $propbag->add('select_values', $listdl_types); - + $propbag->add('type', 'select'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST); + $propbag->add('description', PLUGIN_DOWNLOADMANAGER_DOWNLOAD_INLIST_DESC); + $propbag->add('default', 'no'); + $propbag->add('select_values', $listdl_types); break; case 'add_existing_file': @@ -265,44 +242,39 @@ class serendipity_event_downloadmanager extends serendipity_event { 'insert' => PLUGIN_DOWNLOADMANAGER_ADD_EXISTING_INSERT, 'update' => PLUGIN_DOWNLOADMANAGER_ADD_EXISTING_UPDATE, ); - $propbag->add('type', 'select'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_ADD_EXISTING); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_ADD_EXISTING_DESC); - $propbag->add('default', 'insert'); - $propbag->add('select_values', $existing_types); - + $propbag->add('type', 'select'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_ADD_EXISTING); + $propbag->add('description', PLUGIN_DOWNLOADMANAGER_ADD_EXISTING_DESC); + $propbag->add('default', 'insert'); + $propbag->add('select_values', $existing_types); break; case 'filename_field' : - $propbag->add('type', 'string'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_FILENAME_FIELD); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_FILENAME_FIELD_BLAHBLAH); - $propbag->add('default', PLUGIN_DOWNLOADMANAGER_FILENAME); - + $propbag->add('type', 'string'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_FILENAME_FIELD); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_FILENAME_FIELD_BLAHBLAH); + $propbag->add('default', PLUGIN_DOWNLOADMANAGER_FILENAME); break; case 'filesize_field' : - $propbag->add('type', 'string'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_FILESIZE_FIELD); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_FILESIZE_FIELD_BLAHBLAH); - $propbag->add('default', PLUGIN_DOWNLOADMANAGER_FILESIZE); - + $propbag->add('type', 'string'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_FILESIZE_FIELD); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_FILESIZE_FIELD_BLAHBLAH); + $propbag->add('default', PLUGIN_DOWNLOADMANAGER_FILESIZE); break; case 'filedate_field' : - $propbag->add('type', 'string'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_FILEDATE_FIELD); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_FILEDATE_FIELD_BLAHBLAH); - $propbag->add('default', PLUGIN_DOWNLOADMANAGER_FILEDATE); - + $propbag->add('type', 'string'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_FILEDATE_FIELD); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_FILEDATE_FIELD_BLAHBLAH); + $propbag->add('default', PLUGIN_DOWNLOADMANAGER_FILEDATE); break; case 'dls_field' : - $propbag->add('type', 'string'); - $propbag->add('name', PLUGIN_DOWNLOADMANAGER_DLS_FIELD); - $propbag->add('description', PLUGIN_DOWNLOADMANAGER_DLS_FIELD_BLAHBLAH); - $propbag->add('default', PLUGIN_DOWNLOADMANAGER_NUM_DOWNLOADS); - + $propbag->add('type', 'string'); + $propbag->add('name', PLUGIN_DOWNLOADMANAGER_DLS_FIELD); + $propbag->add('description',PLUGIN_DOWNLOADMANAGER_DLS_FIELD_BLAHBLAH); + $propbag->add('default', PLUGIN_DOWNLOADMANAGER_NUM_DOWNLOADS); break; default: @@ -312,7 +284,11 @@ class serendipity_event_downloadmanager extends serendipity_event { } - function show() { + /** + * show + */ + function show() + { global $serendipity; if ($this->selected()) { @@ -321,16 +297,26 @@ class serendipity_event_downloadmanager extends serendipity_event { header('Status: 200 OK'); } - serendipity_smarty_init(); + if (!is_object($serendipity['smarty'])) { + serendipity_smarty_init(); + } $_ENV['staticpage_pagetitle'] = preg_replace('@[^a-z0-9]@i', '_',$this->get_config('pagetitle')); $serendipity['smarty']->assign('staticpage_pagetitle', $_ENV['staticpage_pagetitle']); $this->showShoutPage(); } } - function selected() { + /** + * This method is a plugin API standard starter + */ + function selected() + { global $serendipity; + if (!empty($serendipity['POST']['subpage'])) { + $serendipity['GET']['subpage'] = $serendipity['POST']['subpage']; + } + if ($serendipity['GET']['subpage'] == $this->get_config('pageurl') || preg_match('@^' . preg_quote($this->get_config('permalink')) . '@i', $serendipity['GET']['subpage'])) { return true; @@ -339,15 +325,19 @@ class serendipity_event_downloadmanager extends serendipity_event { return false; } - function setupDB() { + /** + * setup database + */ + function setupDB() + { global $serendipity; $built = $this->get_config('dl_db_built', null); if (empty($built) && !defined('DLMANAGER_UPGRADE_DONE')) { $q = "CREATE TABLE {$serendipity['dbPrefix']}dma_downloadmanager_files ( - id {AUTOINCREMENT} {PRIMARY}, + id {AUTOINCREMENT} {PRIMARY}, catid int(10) NOT NULL default '0', - timestamp int(10) NOT NULL default '0', + timestamp int(10) NOT NULL default '0', systemfilename varchar(32), realfilename varchar(150), description text, @@ -365,15 +355,17 @@ class serendipity_event_downloadmanager extends serendipity_event { $sql = serendipity_db_schema_import($q); - $sql = "SELECT * FROM {$serendipity['dbPrefix']}dma_downloadmanager_categories WHERE payload = 'root'"; + $sql = "SELECT * + FROM {$serendipity['dbPrefix']}dma_downloadmanager_categories + WHERE payload = 'root'"; $root = serendipity_db_query($sql); - if(intval($root[0]['node_id']) != 1) { + if (intval($root[0]['node_id']) != 1) { serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}dma_downloadmanager_categories (payload, lft, rgt ) - VALUES ('root', 1, 2 )"); + VALUES ('root', 1, 2 )"); $last_insert_id = serendipity_db_insert_id('dma_downloadmanager_categories', 'node_id'); serendipity_db_query("UPDATE {$serendipity['dbPrefix']}dma_downloadmanager_categories - SET root_id = $last_insert_id - WHERE node_id = $last_insert_id"); + SET root_id = $last_insert_id + WHERE node_id = $last_insert_id"); } $this->set_config('dl_db_built', '1'); @@ -417,7 +409,11 @@ class serendipity_event_downloadmanager extends serendipity_event { } - function uninstall(&$propbag) { + /** + * uninstall API + */ + function uninstall(&$propbag) + { global $serendipity; serendipity_db_query("DROP TABLE {$serendipity['dbPrefix']}dma_downloadmanager_files"); @@ -425,18 +421,19 @@ class serendipity_event_downloadmanager extends serendipity_event { } - - - /** dlm sql db function set - * @param type string and db vars - * @return result - * - * serendipity_db_query [ sql, single(true, false), arrtype(both, assoc, num), dberror(true, false), string(array key name), string(array field name) ... ] - **/ - function dlm_sql_db($type=NULL, $whe=NULL) { + /** + * dlm sql db function set + * + * @param type string and db vars + * @return result + * + * serendipity_db_query [ sql, single(true, false), arrtype(both, assoc, num), dberror(true, false), string(array key name), string(array field name) ... ] + */ + function dlm_sql_db($type=NULL, $whe=NULL) + { global $serendipity; - - switch($type) { + + switch($type) { case 'DLM_BE_UPDATE': // approve events $sql = "UPDATE {$serendipity['dbPrefix']}dma_downloadmanager_files SET $whe"; @@ -475,98 +472,132 @@ class serendipity_event_downloadmanager extends serendipity_event { $result = serendipity_db_query($sql, false, 'assoc', true); break; } - + return $result; - } /** - * create plugins global array + * create plugins global array + * * @access private */ - function pluginglobs() { + function pluginglobs() + { global $serendipity; $this->globs = array( - 'dateformat' => ((!$dateformat || strlen($dateformat) < 1) ? 'Y/m/d, h:ia' : $this->get_config('dateformat')), - 'ftppath' => (!$this->get_config('absincomingpath') + 'dateformat' => $this->get_config('dateformat', 'Y-m-d H:i'), + 'ftppath' => (!$this->get_config('absincomingpath') ? $serendipity['serendipityPath'] . 'archives/.dlm/ftpin' : $this->get_config('absincomingpath')), - 'dlmpath' => (!$this->get_config('absdownloadspath') + 'dlmpath' => (!$this->get_config('absdownloadspath') ? $serendipity['serendipityPath'] . 'archives/.dlm/files' : $this->get_config('absdownloadspath')), - 'attention' => '' + 'attention' => (($serendipity['version'][0] < 2) + ? '' + : ' ') ); } - function getRelPath() { + /** + * Avoids "bug" on 64-bit PHP systems cutting off utf8 encoded first chars + * @see https://bugs.php.net/bug.php?id=62119 + * @see https://evertpot.com/271/ + * Thanks to: http://php.net/manual/de/function.basename.php#85369 + */ + function mb_basename($file) + { + return end(explode('/',$file)); + } + + /** + * get relative path + */ + function getRelPath() + { global $serendipity; $c_path = dirname(__FILE__); $b_path = $serendipity['serendipityPath']; - if ($b_path[(strlen($b_path)-1)] == "/") + if ($b_path[(strlen($b_path)-1)] == '/') { $b_path = substr($b_path, 0, strlen($b_path)-1); - $r_path = ".".str_replace($b_path, "", $c_path); + } + $r_path = '.' . str_replace($b_path, '', $c_path); return $r_path; } - - function ERRMSG($msg, $type='error') { + /** + * error message redirector and Smarty assigning + */ + function ERRMSG($msg, $type='error') + { global $serendipity; - - if($type == 'error') { - // assign files of categeory to smarty + + if (!is_object($serendipity['smarty'])) { + serendipity_smarty_init(); + } + if ($serendipity['version'][0] < 2) { + $serendipity['smarty']->assign(array('div' => 'div', 'tag' => 'p')); + } + if ($type == 'error') { + // assign files of category to smarty $serendipity['smarty']->assign('dlmerr', array('thiserror' => true, 'errormsg' => $msg)); - } elseif( $type == 'status') { - // assign files of categeory to smarty + } elseif ( $type == 'success') { + // assign files of category to smarty + $serendipity['smarty']->assign('dlmerr', array('thiserror' => true, 'successmsg' => $msg)); + } elseif ( $type == 'status') { + // assign files of category to smarty $serendipity['smarty']->assign('dlmerr', array('thiserror' => true, 'statusmsg' => $msg)); } } - /** * Fetch all Categories in Frontend and Backend inclusive root level + * * @param Boolean BackEndCall (default false) * @return array **/ - function GetAllCats($bec=false) { + function GetAllCats($bec=false) + { global $serendipity; $sql = " - SELECT node1.node_id AS node_id, - node1.root_id AS root_id, - node1.payload AS payload, - node1.lft AS lft, - node1.rgt AS rgt, - node1.hidden AS hidden, - round((node1.rgt-node1.lft-1)/2,0) AS subcats, - ((min(node2.rgt)-node1.rgt-(node1.lft>1))/2) > 0 AS lower, - (( (node1.lft-max(node2.lft)>1) )) AS upper, - COUNT(*) AS level - FROM {$serendipity['dbPrefix']}dma_downloadmanager_categories AS node1, - {$serendipity['dbPrefix']}dma_downloadmanager_categories AS node2 - WHERE node1.lft BETWEEN node2.lft AND node2.rgt - AND (node2.root_id = node1.root_id) - AND (node2.node_id != node1.node_id OR node1.lft = 1) - AND (node2.root_id = 1)"; - $sql .= ($bec === false) ? ((serendipity_db_bool($this->get_config('showhidden_registered')) && serendipity_userLoggedIn()) ? '' : " AND (node1.hidden != 1) AND (node2.hidden != 1) ") : ''; + SELECT node1.node_id AS node_id, + node1.root_id AS root_id, + node1.payload AS payload, + node1.lft AS lft, + node1.rgt AS rgt, + node1.hidden AS hidden, + round((node1.rgt-node1.lft-1)/2,0) AS subcats, + ((min(node2.rgt)-node1.rgt-(node1.lft>1))/2) > 0 AS lower, + (( (node1.lft-max(node2.lft)>1) )) AS upper, + COUNT(*) AS level + FROM {$serendipity['dbPrefix']}dma_downloadmanager_categories AS node1, + {$serendipity['dbPrefix']}dma_downloadmanager_categories AS node2 + WHERE node1.lft BETWEEN node2.lft AND node2.rgt + AND (node2.root_id = node1.root_id) + AND (node2.node_id != node1.node_id OR node1.lft = 1) + AND (node2.root_id = 1)"; + $sql .= ($bec === false) ? ((serendipity_db_bool($this->get_config('showhidden_registered', 'false')) && serendipity_userLoggedIn()) ? '' : " AND (node1.hidden != 1) AND (node2.hidden != 1) ") : ''; $sql .= " GROUP BY node1.lft, node1.rgt, node1.node_id, node1.root_id, node1.payload"; $cats = serendipity_db_query($sql, false, 'assoc', true); - + if (!is_array($cats)) { $cats = array(); } - + return $cats; } - - - function GetSubCats($node_id, $user=0) { + /** + * get sub categories + */ + function GetSubCats($node_id, $user=0) + { global $serendipity; $node_id = intval($node_id); - $sql = "SELECT node1.node_id AS node_id, + $sql = "SELECT node1.node_id AS node_id, node1.payload AS payload, node1.lft AS lft, node1.rgt AS rgt, @@ -574,14 +605,14 @@ class serendipity_event_downloadmanager extends serendipity_event { round((node1.rgt-node1.lft-1)/2,0) AS subcats, COUNT(*) AS level FROM {$serendipity['dbPrefix']}dma_downloadmanager_categories AS node1, - {$serendipity['dbPrefix']}dma_downloadmanager_categories AS node2, - {$serendipity['dbPrefix']}dma_downloadmanager_categories AS node3 + {$serendipity['dbPrefix']}dma_downloadmanager_categories AS node2, + {$serendipity['dbPrefix']}dma_downloadmanager_categories AS node3 WHERE node1.lft BETWEEN node2.lft AND node2.rgt AND node1.lft BETWEEN node3.lft AND node3.rgt AND node2.root_id = 1 AND node3.node_id = $node_id"; if ($user == 1) { - if (serendipity_db_bool($this->get_config('showhidden_registered')) && serendipity_userLoggedIn()) + if (serendipity_db_bool($this->get_config('showhidden_registered', 'false')) && serendipity_userLoggedIn()) $sql .= ""; else $sql .= " AND (node1.hidden != 1) "; @@ -592,8 +623,11 @@ class serendipity_event_downloadmanager extends serendipity_event { return $cats; } - - function calcFilesize($filesize) { + /** + * calculate file size + */ + function calcFilesize($filesize) + { $array = array( 'YB' => 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024, 'ZB' => 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024, @@ -604,21 +638,22 @@ class serendipity_event_downloadmanager extends serendipity_event { 'MB' => 1024 * 1024, 'KB' => 1024, ); - if($filesize <= 1024) { + if ($filesize <= 1024) { $filesize = $filesize . ' Bytes'; } foreach($array AS $name => $size) { - if($filesize > $size || $filesize == $size) { + if ($filesize > $size || $filesize == $size) { $filesize = round((round($filesize / $size * 100) / 100), 2) . ' ' . $name; } } return $filesize; } - - - - function getMime($filename) { + /** + * get mime application + */ + function getMime($filename) + { static $mimetypes = array( "ez" => "application/andrew-inset", "hqx" => "application/mac-binhex40", @@ -763,52 +798,54 @@ class serendipity_event_downloadmanager extends serendipity_event { $MIMETYPE = array(); - $filename = basename($filename); + $filename = $this->mb_basename($filename); $fileparts = explode(".", $filename); $EXTENSION = $fileparts[(count($fileparts) - 1)]; - if (file_exists(dirname(__FILE__) . "/img/dlicons/".$EXTENSION.".png")) + if (file_exists(dirname(__FILE__) . "/img/dlicons/".$EXTENSION.".png")) { $MIMETYPE['ICON'] = $this->get_config('httppath')."img/dlicons/".$EXTENSION.".png"; - else + } else { $MIMETYPE['ICON'] = $this->get_config('httppath')."img/dlicons/unknown_small.png"; - - if (!empty($mimetypes[$EXTENSION]) && trim($mimetypes[$EXTENSION]) != "") + } + if (!empty($mimetypes[$EXTENSION]) && trim($mimetypes[$EXTENSION]) != '') { $MIMETYPE['TYPE'] = $mimetypes[$EXTENSION]; - else + } else { $MIMETYPE['TYPE'] = "application/octet-stream"; - + } return $MIMETYPE; } - - - - - function showShoutPage() { + /** + * showShoutPage + */ + function showShoutPage() + { global $serendipity; - if (!headers_sent()) + if (!headers_sent()) { header('HTTP/1.0 200'); header('Status: 200 OK'); - - if (!is_object($serendipity['smarty'])) - serendipity_smarty_init(); - - if(!serendipity_db_bool($this->get_config('unhideroot'))) { - // with dlm version 0.25, we set payload.root to be unhidden.0 to get the expected results in frontend - $result = $this->dlm_sql_db('DLM_UPDATE', "hidden = '0' WHERE payload = 'root' AND node_id = '1'"); - if($result) $this->set_config('unhideroot', true); } - // assign to smarty and all 3 frontend pages + if (!is_object($serendipity['smarty'])) { + serendipity_smarty_init(); + } + + if (!serendipity_db_bool($this->get_config('unhideroot'))) { + // with DLM version 0.25 we set payload.root to be unhidden.0, to get the expected results in frontend + $result = $this->dlm_sql_db('DLM_UPDATE', "hidden = '0' WHERE payload = 'root' AND node_id = '1'"); + if ($result) $this->set_config('unhideroot', 'true'); + } + + // assign to smarty and all 3 frontend pages $serendipity['smarty']->assign( array( 'httppath' => $this->get_config('httppath'), 'pagetitle' => $this->get_config('pagetitle'), 'headline' => $this->get_config('headline'), 'dlm_intro' => $this->get_config('intro'), - 'dlm_is_registered' => serendipity_db_bool($this->get_config('registered_only')) - ) + 'dlm_is_registered' => serendipity_db_bool($this->get_config('registered_only', 'false')) + ) ); if (isset($_GET['file']) && intval($_GET['file']) >= 1) { @@ -820,17 +857,17 @@ class serendipity_event_downloadmanager extends serendipity_event { $id = intval($_GET['file']); $catid = intval($_GET['thiscat']); - $sqlfe = (serendipity_db_bool($this->get_config('showhidden_registered')) && serendipity_userLoggedIn()) ? '' : " AND hidden != 1 "; + $sqlfe = (serendipity_db_bool($this->get_config('showhidden_registered', 'false')) && serendipity_userLoggedIn()) ? '' : " AND hidden != 1 "; $cat = $this->dlm_sql_db('DLM_SUBCATS', "node_id = $catid" . $sqlfe); - - if(is_array($cat) && !empty($cat)) { - + + if (is_array($cat) && !empty($cat)) { + $serendipity['smarty']->assign('showfile', true); // get subcats of cat $ret1 = $this->dlm_sql_db('DLM_COUNT', "catid = $catid"); - + $serendipity['smarty']->assign( array( 'catname' => $cat['payload'], @@ -846,15 +883,15 @@ class serendipity_event_downloadmanager extends serendipity_event { // else take DLM_SELECT_ARRAY and add $file[0] here - remember smarty switches arrays back -1 level in templates! $file = $this->dlm_sql_db('DLM_SELECT', "id = $id"); $mime = $this->getMime($file['realfilename']); - + if (is_array($file) && !empty($file)) { $temp_array = array('comment' => stripslashes($file['description'])); serendipity_plugin_api::hook_event('frontend_display', $temp_array); // push the file array to hold everything needed - $file['id'] = ''; // obfuscating - do not tell tpl to much - $file['systemfilename'] = ''; // obfuscating - do not tell tpl to much + $file['id'] = ''; // obfuscated + $file['systemfilename'] = ''; // obfuscated $file['iconfile'] = $mime['ICON']; $file['icontype'] = $mime['TYPE']; $file['iconwidth'] = $this->get_config('iconwidth'); @@ -866,8 +903,8 @@ class serendipity_event_downloadmanager extends serendipity_event { $file['filesize'] = $this->calcFilesize($file['filesize']); $file['filedate'] = date($this->globs['dateformat'], $file['timestamp']); $file['description'] = $temp_array['comment']; - $file['dlurl'] = $serendipity['baseURL'] . ($serendipity['rewrite'] == "none" ? $serendipity['indexFile'] . "?/" : "") . "plugin/dlfile_".$id; - + $file['dlurl'] = $serendipity['baseURL'] . ($serendipity['rewrite'] == "none" ? $serendipity['indexFile'] . '?/' : '') . 'plugin/dlfile_'.$id; + $serendipity['smarty']->assign('thisfile', $file); } unset($cat); @@ -879,27 +916,27 @@ class serendipity_event_downloadmanager extends serendipity_event { // FRONTEND PAGE 2: FILELIST OF CATEGORY if (empty($filename) || $filename == 'none.html') $filename = 'dlmanager.filelist.tpl'; - + $id = intval($_GET['thiscat']); $level = intval($_GET['level']); - - $sqlfe = (serendipity_db_bool($this->get_config('showhidden_registered')) && serendipity_userLoggedIn()) ? '' : " AND hidden != 1 "; + + $sqlfe = (serendipity_db_bool($this->get_config('showhidden_registered', 'false')) && serendipity_userLoggedIn()) ? '' : " AND hidden != 1 "; $cat = $this->dlm_sql_db('DLM_SUBCATS', "node_id = $id" . $sqlfe); - if(is_array($cat)) { + if (is_array($cat)) { $ret1 = $this->dlm_sql_db('DLM_COUNT', "catid = $id"); - + $num_dls = intval($ret1['num']); $serendipity['smarty']->assign( array( - 'catname' => $cat['payload'], - 'numsubcats' => $cat['subcats'], - 'pageurl' => $this->get_config('pageurl'), - 'numdls' => intval($num_dls), - 'basepage' => $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] + 'catname' => $cat['payload'], + 'numsubcats' => $cat['subcats'], + 'pageurl' => $this->get_config('pageurl'), + 'numdls' => intval($num_dls), + 'basepage' => $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] ) ); @@ -909,15 +946,15 @@ class serendipity_event_downloadmanager extends serendipity_event { if (is_array($subcats) && count($subcats) >= 2) { $serendipity['smarty']->assign('has_subcats', true); - foreach($subcats as $subcat) { + foreach($subcats AS $subcat) { if ($level == 1) { $sublvl = 2; } else { $sublvl = 2; } if ($subcat['level'] == ($level + $sublvl)) { $ret = $this->dlm_sql_db('DLM_COUNT', "catid = ".$subcat['node_id']); - + $num_dls = intval($ret['num']); - $nodetb = array('f' => $this->get_config('httppath').'img/f.gif', - 'e' => $this->get_config('httppath').'img/e.gif', + $nodetb = array('f' => $this->get_config('httppath').'img/f.gif', + 'e' => $this->get_config('httppath').'img/e.gif', 'path' => $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . "?serendipity[subpage]=".$this->get_config('pageurl')."&level=".($subcat['level']-1)."&thiscat=".$subcat['node_id'] ); // construct the smarty template array @@ -930,45 +967,45 @@ class serendipity_event_downloadmanager extends serendipity_event { if (is_array($files)) { - if (serendipity_db_bool($this->get_config('showfilename'))) + if (serendipity_db_bool($this->get_config('showfilename', 'true'))) $serendipity['smarty']->assign('filename_field', $this->get_config('filename_field')); - if (serendipity_db_bool($this->get_config('showdownloads'))) + if (serendipity_db_bool($this->get_config('showdownloads', 'true'))) $serendipity['smarty']->assign('dls_field', $this->get_config('dls_field')); - if (serendipity_db_bool($this->get_config('showfilesize'))) + if (serendipity_db_bool($this->get_config('showfilesize', 'true'))) $serendipity['smarty']->assign('filesize_field', $this->get_config('filesize_field')); - if (serendipity_db_bool($this->get_config('showdate'))) + if (serendipity_db_bool($this->get_config('showdate', 'false'))) $serendipity['smarty']->assign('filedate_field', $this->get_config('filedate_field')); - + $nis = array(); $colspan = 0; - if (serendipity_db_bool($this->get_config('showfilename'))) { + if (serendipity_db_bool($this->get_config('showfilename', 'true'))) { ++$colspan; $nis['showfilename'] = true; } - if (serendipity_db_bool($this->get_config('showdownloads'))) { + if (serendipity_db_bool($this->get_config('showdownloads', 'true'))) { ++$colspan; $nis['showdownloads'] = true; } - if (serendipity_db_bool($this->get_config('showfilesize'))) { + if (serendipity_db_bool($this->get_config('showfilesize', 'true'))) { ++$colspan; $nis['showfilesize'] = true; } - if (serendipity_db_bool($this->get_config('showdate'))) { + if (serendipity_db_bool($this->get_config('showdate', 'false'))) { ++$colspan; $nis['showdate'] = true; } - if (serendipity_db_bool($this->get_config('showdesc_inlist'))) { + if (serendipity_db_bool($this->get_config('showdesc_inlist', 'false'))) { $nis['showdesc_inlist'] = true; } - foreach($files as $file) { - + foreach($files AS $file) { + $infourl = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . "?serendipity[subpage]=".$this->get_config('pageurl')."&thiscat=".$id."&file=".$file['id']; - $dlurl = $serendipity['baseURL'] . ($serendipity['rewrite'] == "none" ? $serendipity['indexFile'] . "?/" : "") . "plugin/dlfile_" . $file['id']; + $dlurl = $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/dlfile_' . $file['id']; $mime = $this->getMime($file['realfilename']); - + $fileinfo = array('file_desc' => str_replace(array("\r\n","\n","\r"),array("
","
","
"), $file['description']), 'filedate' => date($this->globs['dateformat'], $file['timestamp']), 'filesize' => $this->calcFilesize($file['filesize']), @@ -995,11 +1032,11 @@ class serendipity_event_downloadmanager extends serendipity_event { // FRONTEND PAGE 1: SUBCATLIST OF ROOT CATEGORY if (empty($filename) || $filename == 'none.html') $filename = 'dlmanager.catlist.tpl'; - + // build the frontend category array list (in backend = false and as call array (default: false) - * @return array - **/ - function buildCategoriesList($admin=false, $seca=false) { - + * @return array + */ + function buildCategoriesList($admin=false, $seca=false) + { $cats = array(); $cats = $this->GetAllCats($admin); - - foreach($cats as $cat) { + + foreach($cats AS $cat) { if (($cat['level'] == 1)) { $parent = array(); } @@ -1082,9 +1163,9 @@ class serendipity_event_downloadmanager extends serendipity_event { if ( ($cat['level'] >= $last['level'])) $parent[$last['level']] = $last; - if($seca === false) { + if ($seca === false) { // the frontend and backend category call - if ($cat['payload'] != 'root') { + if ($cat['payload'] != 'root') { $clt[] = $this->buildCat($cat, $parent); } } else { @@ -1093,90 +1174,92 @@ class serendipity_event_downloadmanager extends serendipity_event { } $last = $cat; } - + unset($last); unset($cat); unset($parent); unset($cats); - + return $clt; } - - - - /** build the category array + + /** + * build the category array + * * @param array A referenced array of this category * @param array A referenced array of the interating last cat array * @param boolean is backend has no need of filenum in cat - + $tl = array(); // build tab list $cl = array(); // build cat list // build the category level (image/select) array - for ($i=2; $i<$cat['level']; ++$i) { - if ($parent[$i]['lower']) { + for ($i=2; $i<$cat['level']; ++$i) { + if ($parent[$i]['lower']) { $tl[] = 'l'; - } else { + } else { $tl[] = 'e'; } } - if ( ($cat['level'] > 1) ) { - if ($cat['lower']) { + if ( ($cat['level'] > 1) ) { + if ($cat['lower']) { $tl[] = 'b'; - } else { + } else { $tl[] = 'nb'; } } - - $path = ($_GET['serendipity']['adminAction'] == 'downloadmanager') - ? '' - : $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . "?serendipity[subpage]=".$this->get_config('pageurl')."&level=".$cat['level']."&thiscat=".$cat['node_id']; + + $path = ($_GET['serendipity']['adminAction'] == 'downloadmanager') + ? '' + : $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?serendipity[subpage]='.$this->get_config('pageurl').'&level='.$cat['level'].'&thiscat='.$cat['node_id']; // construct the smarty template array (no need of catname, while sending full cat array, used here, as long as defined in other function) - $cl = array( 'cat' => $cat, - 'catname' => $cat['payload'], - 'imgname' => $tl, - 'filenum' => $fnum, + $cl = array( 'cat' => $cat, + 'catname' => $cat['payload'], + 'imgname' => $tl, + 'filenum' => $fnum, 'path' => $path ); - + return $cl; } - - - - function delCat($node_id) { + + /** + * delete categoey + */ + function delCat($node_id) + { global $serendipity; $id = intval($node_id); - $sql = " SELECT - node1.root_id, - node1.lft, - node1.rgt, - round((node1.rgt-node1.lft-1)/2,0) AS subcats - FROM {$serendipity['dbPrefix']}dma_downloadmanager_categories AS node1 - WHERE node_id = $id"; + $sql = "SELECT node1.root_id, node1.lft, node1.rgt, + round((node1.rgt-node1.lft-1)/2,0) AS subcats + FROM {$serendipity['dbPrefix']}dma_downloadmanager_categories AS node1 + WHERE node_id = $id"; $node = serendipity_db_query($sql); - if(is_array($node)) { + if (is_array($node)) { - if($node[0]['subcats']>=1) { + if ($node[0]['subcats']>=1) { $this->ERRMSG(PLUGIN_DOWNLOADMANAGER_DELETE_NOT_ALLOWED); } else { $files_deleted = 0; - $sql = "SELECT systemfilename FROM {$serendipity['dbPrefix']}dma_downloadmanager_files WHERE catid = ".$id; + $sql = "SELECT systemfilename + FROM {$serendipity['dbPrefix']}dma_downloadmanager_files + WHERE catid = $id"; $files = serendipity_db_query($sql); - + if (is_array($files)) { - foreach($files as $file) { + foreach($files AS $file) { if (file_exists($this->globs['dlmpath']."/".$file['systemfilename']) && !@unlink($this->globs['dlmpath']."/".$file['systemfilename'])) { $this->ERRMSG(PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED); @@ -1186,20 +1269,19 @@ class serendipity_event_downloadmanager extends serendipity_event { } } } else { $files_deleted = 1; } - + if ($files_deleted == 1) { @serendipity_db_query("LOCK TABLES {$serendipity['dbPrefix']}dma_downloadmanager_categories WRITE"); - serendipity_db_query("UPDATE {$serendipity['dbPrefix']}dma_downloadmanager_categories - SET lft=lft-2 - WHERE lft > ".$node[0]['lft']." - AND root_id = ".$node[0]['root_id']); - serendipity_db_query("UPDATE {$serendipity['dbPrefix']}dma_downloadmanager_categories - SET rgt=rgt-2 - WHERE rgt > ".$node[0]['rgt']." - AND root_id = ".$node[0]['root_id']); - serendipity_db_query("DELETE - FROM {$serendipity['dbPrefix']}dma_downloadmanager_categories - WHERE node_id = ".$id); + serendipity_db_query("UPDATE {$serendipity['dbPrefix']}dma_downloadmanager_categories + SET lft=lft-2 + WHERE lft > ".$node[0]['lft']." + AND root_id = ".$node[0]['root_id']); + serendipity_db_query("UPDATE {$serendipity['dbPrefix']}dma_downloadmanager_categories + SET rgt=rgt-2 + WHERE rgt > ".$node[0]['rgt']." + AND root_id = ".$node[0]['root_id']); + serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}dma_downloadmanager_categories + WHERE node_id = ".$id); @serendipity_db_query("UNLOCK TABLES"); } } @@ -1207,52 +1289,84 @@ class serendipity_event_downloadmanager extends serendipity_event { return true; } - - function hideCat($catid, $hide) { + /** + * hide category + */ + function hideCat($catid, $hide) + { global $serendipity; - $sql = " SELECT - node1.root_id, - node1.lft, - node1.rgt, - round((node1.rgt-node1.lft-1)/2,0) AS subcats - FROM {$serendipity['dbPrefix']}dma_downloadmanager_categories AS node1 - WHERE node_id = $catid"; + $sql = "SELECT node1.root_id, node1.lft, node1.rgt, + round((node1.rgt-node1.lft-1)/2,0) AS subcats + FROM {$serendipity['dbPrefix']}dma_downloadmanager_categories AS node1 + WHERE node_id = $catid"; $node = serendipity_db_query($sql); - if(is_array($node)) { + if (is_array($node)) { @serendipity_db_query("LOCK TABLES {$serendipity['dbPrefix']}dma_downloadmanager_categories WRITE"); serendipity_db_query("UPDATE {$serendipity['dbPrefix']}dma_downloadmanager_categories - SET hidden = ".intval($hide)." - WHERE node_id = ".$catid); + SET hidden = ".$hide." + WHERE node_id = ".$catid); serendipity_db_query("UPDATE {$serendipity['dbPrefix']}dma_downloadmanager_categories - SET hidden = ".intval($hide)." - WHERE lft BETWEEN ".$node[0]['lft']." AND ".$node[0]['rgt']); + SET hidden = ".$hide." + WHERE lft BETWEEN ".$node[0]['lft']." AND ".$node[0]['rgt']); @serendipity_db_query("UNLOCK TABLES"); } } - - function renameCats($catnames) { + /** + * rename categories + */ + function renameCats($catnames) + { global $serendipity; - + if (!is_array($catnames)) { return false; } @serendipity_db_query("LOCK TABLES {$serendipity['dbPrefix']}dma_downloadmanager_categories WRITE"); foreach ($catnames AS $id => $name) { serendipity_db_query("UPDATE {$serendipity['dbPrefix']}dma_downloadmanager_categories - SET payload = '".serendipity_db_escape_string($name)."' - WHERE node_id = ".intval($id)); + SET payload = '".serendipity_db_escape_string($name)."' + WHERE node_id = ".intval($id)); } @serendipity_db_query("UNLOCK TABLES"); } + /** + * delete possible empty ftp directories + */ + function delEmptyDir() + { + $_dir = $this->globs['ftppath']; + try { + $_ftpDirs = new RecursiveDirectoryIterator($_dir); + // NOTE: UnexpectedValueException thrown for PHP >= 5.3 + } + catch (Exception $e) { + return 0; + } + $_files = new RecursiveIteratorIterator($_ftpDirs, RecursiveIteratorIterator::CHILD_FIRST); + foreach ($_files AS $_file) { + if ($_file->isDir()) { + if (!$_files->isDot()) { + // delete folder if empty, non-empty are skipped + @rmdir($_file->getPathname()); + } + } + } + } - function delFile($file_id) { + /** + * delete file + */ + function delFile($file_id) + { global $serendipity; - $id = intval($file_id); - $ret = serendipity_db_query("SELECT systemfilename FROM {$serendipity['dbPrefix']}dma_downloadmanager_files WHERE id = ".$id); + $id = intval($file_id); + $ret = serendipity_db_query("SELECT systemfilename + FROM {$serendipity['dbPrefix']}dma_downloadmanager_files + WHERE id = $id"); if (file_exists($this->globs['dlmpath']."/".$ret[0]['systemfilename']) && !@unlink($this->globs['dlmpath']."/".$ret[0]['systemfilename'])) { $this->ERRMSG(PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED); } else { @@ -1261,50 +1375,97 @@ class serendipity_event_downloadmanager extends serendipity_event { return true; } - - function delIncomingFile($file) { - if (file_exists($this->globs['ftppath']."/".$file) && !@unlink($this->globs['ftppath']."/".$file)) { + /** + * delete incoming file + */ + function delIncomingFile($file) + { + // removed $this->globs['ftppath']."/".$file to $file, since new iterator fetch is using fullpath already, put to delinfile + if (file_exists($file) && !@unlink($file)) { $this->ERRMSG(PLUGIN_DOWNLOADMANAGER_DELETE_IN_INCOMING_NOT_ALLOWED); - } else { + } else { return true; } } + /** + * WIN OS filename encodings for read, handle, write in case of LANG_CHARSET == UTF-8 + * - decodes to ISO-8859-1 for file properties stats reading checks + * - converts to UTF-8 in case of POSTing arrays, sending single filenames via GET and storing to the database tables + * + * @param string + * @return string + */ + function encodeToUTF($name, $reverse=false) + { + if ($this->isWIN === null) { + // Windows does not have UTF-8 locales. + $this->isWIN = (LANG_CHARSET == 'UTF-8' && (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' ? true : false)); + } + if ($this->debug) echo "NAME ".$this->mb_basename($name)." is: ".mb_detect_encoding($name, 'UTF-8, ISO-8859-1', true)."
\n"; + // if WIN decode for stats + if ($this->isWIN) { + if (!$reverse) { + $name = utf8_decode($name); + if ($this->debug) echo 'NAME return for file props internally UTF-8 decoded: '.$this->mb_basename($name)."
\n"; + if ($this->debug) echo "NAME detected as: ".mb_detect_encoding($name, 'UTF-8, ISO-8859-1', true)."

\n"; + } else { + // ASCII filenames only! + if (!function_exists('mb_convert_encoding')) { + $this->ERRMSG(PLUGIN_DOWNLOADMANAGER_PHPMB_ERROR, 'status'); + } + if (mb_detect_encoding($name, 'UTF-8', false)) { + if ($this->debug) echo "NAME return mb_convert_encoding back to UTF-8 for file prop stats reading: "; + $name = mb_convert_encoding($name, 'UTF-8', 'ISO-8859-1'); + if ($this->debug) echo "".mb_detect_encoding($name, 'UTF-8, ISO-8859-1', true)."

\n"; + } + } + } + return $name; + } - function importFile($file, $catid) { + /** + * import file + */ + function importFile($filedir, $catid) + { global $serendipity; - $catid = intval($catid); - $file = basename($file); - + $catid = intval($catid); + $filedir = $this->encodeToUTF($filedir); // OK for copy + // Avoid basename cutting Umlaut UTF-8 Chars on 1st char, eg rgerlich.pdf uploaded as rgerlich.pdf + // this may be some kind of PHP bug (https://bugs.php.net/bug.php?id=62119) or is locale-aware, or be, while encoded chars start with a slash; + // Anyway we just check if we are inside a dir with a DS, which avoids this - (false === (strpos($filedir, '/'))) ? $filedir : basename($filedir); + $file = $this->mb_basename($filedir); // end(explode...) is doing the same... though + $file = $this->encodeToUTF($file, true); // to UTF-8 while searched in DB where we have utf8 + // Check if file is already existing in category: $file_update = false; - if ($this->get_config('add_existing_file','insert')=='update') { - $sql = "SELECT systemfilename FROM {$serendipity['dbPrefix']}dma_downloadmanager_files WHERE realfilename = '".serendipity_db_escape_string($file)."' AND catid = '".$catid."' ORDER BY timestamp DESC"; - $dbfilelist = serendipity_db_query($sql); - $file_update = is_array($dbfilelist); - } - - if ($file_update) { - $sysfilename = $dbfilelist[0]['systemfilename']; - } - else { - $sysfilename = $this->genCryptString(); + if ($this->get_config('add_existing_file', 'insert') == 'update') { + $sql = "SELECT systemfilename + FROM {$serendipity['dbPrefix']}dma_downloadmanager_files + WHERE realfilename = '".serendipity_db_escape_string($file)."' + AND catid = $catid + ORDER BY timestamp DESC"; + $dbfilelist = serendipity_db_query($sql); + $file_update = is_array($dbfilelist); } - if (@copy($this->globs['ftppath']."/".$file, $this->globs['dlmpath']."/".$sysfilename)) { + $sysfilename = $file_update ? $dbfilelist[0]['systemfilename'] : $this->random_text('alnum', 32); + + if (@copy($this->globs['ftppath']."/".$filedir, $this->globs['dlmpath']."/".$sysfilename)) { + + $timestamp = @filemtime($this->globs['dlmpath']."/".$sysfilename); + $filesize = @filesize($this->globs['dlmpath']."/".$sysfilename); - $timestamp = filemtime($this->globs['dlmpath']."/".$sysfilename); - $filesize = filesize($this->globs['dlmpath']."/".$sysfilename); - if ($file_update) { serendipity_db_query("UPDATE {$serendipity['dbPrefix']}dma_downloadmanager_files - SET timestamp = '$timestamp', - filesize = '$filesize' - WHERE - catid = '$catid' AND - realfilename = '".serendipity_db_escape_string($file)."'"); - + SET timestamp = '$timestamp', + filesize = '$filesize' + WHERE + catid = '$catid' AND + realfilename = '".serendipity_db_escape_string($file)."'"); + } else { serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}dma_downloadmanager_files ( @@ -1322,30 +1483,36 @@ class serendipity_event_downloadmanager extends serendipity_event { )"); } @chmod($this->globs['dlmpath']."/".$sysfilename, 0666); - if (file_exists($this->globs['ftppath']."/".$file) && !@unlink($this->globs['ftppath']."/".$file)) { + + if (file_exists($this->globs['ftppath']."/".$filedir) && !@unlink($this->globs['ftppath']."/".$filedir)) { $this->ERRMSG(PLUGIN_DOWNLOADMANAGER_DELETE_IN_INCOMING_NOT_ALLOWED); } + } else { $this->ERRMSG(PLUGIN_DOWNLOADMANAGER_COPY_NOT_ALLOWED); } } - - function importMLFile($file, $path, $catid) { + /** + * import MediaLibrary file + */ + function importMLFile($file, $path, $catid) + { global $serendipity; - - $catid = intval($catid); - $sysfilename = $this->genCryptString(); - if (isset($path) && trim($path) != "" && !preg_match("@\.\./@", $path)) { + $catid = intval($catid); + $sysfilename = $this->random_text('alnum', 32); + + if (isset($path) && trim($path) != '' && !preg_match("@\.\./@", $path)) { $extrapath = trim($path); } else { - $extrapath = ""; + $extrapath = ''; } $uploadPath = $serendipity['serendipityPath'].$serendipity['uploadPath']; - if ($uploadPath[(strlen($uploadPath)-1)] == "/") + if ($uploadPath[(strlen($uploadPath)-1)] == '/') { $uploadPath = substr($uploadPath, 0, (strlen($uploadPath)-1)); + } $uploadPath .= $extrapath; if (@copy($uploadPath."/".$file, $this->globs['dlmpath']."/".$sysfilename)) { @@ -1372,22 +1539,29 @@ class serendipity_event_downloadmanager extends serendipity_event { } } - - function editFile($fileid, $oldcatid, $newcatid, $rename, $description) { + /** + * edit file + */ + function editFile($fileid, $oldcatid, $newcatid, $rename, $description) + { global $serendipity; - serendipity_db_query("UPDATE {$serendipity['dbPrefix']}dma_downloadmanager_files SET - catid='".$newcatid."', - realfilename='".serendipity_db_escape_string($rename)."', - description='".serendipity_db_escape_string($description)."' - WHERE id = ".$fileid); + serendipity_db_query("UPDATE {$serendipity['dbPrefix']}dma_downloadmanager_files + SET catid='".$newcatid."', + realfilename='".serendipity_db_escape_string($rename)."', + description='".serendipity_db_escape_string($description)."' + WHERE id = ".$fileid); - $this->ERRMSG(PLUGIN_DOWNLOADMANAGER_FILE_EDITED, 'status'); + $this->ERRMSG(PLUGIN_DOWNLOADMANAGER_FILE_EDITED, 'success'); $_GET['thiscat'] = $newcatid; $_GET['editfile'] = $fileid; } - function uploadFiles() { + /** + * upload files + */ + function uploadFiles() + { global $serendipity; $upload_max_filesize = ini_get('upload_max_filesize'); @@ -1408,18 +1582,22 @@ class serendipity_event_downloadmanager extends serendipity_event { // Check, if file already exists in database $file_update = false; - if ($this->get_config('add_existing_file','insert')=='update') { - $sql = "SELECT systemfilename FROM {$serendipity['dbPrefix']}dma_downloadmanager_files WHERE realfilename = '".$fname."' AND catid = '".$catid."' ORDER BY timestamp DESC"; + if ($this->get_config('add_existing_file', 'insert') == 'update') { + $sql = "SELECT systemfilename + FROM {$serendipity['dbPrefix']}dma_downloadmanager_files + WHERE realfilename = $fname + AND catid = $catid + ORDER BY timestamp DESC"; $dbfilelist = serendipity_db_query($sql); - $file_update = is_array($dbfilelist); + $file_update = is_array($dbfilelist); } if ($file_update) { $SERVERFILENAME = $dbfilelist[0]['systemfilename']; - } else { - $SERVERFILENAME = $this->genCryptString(); + } else { + $SERVERFILENAME = $this->random_text('alnum', 32); } - + if (!move_uploaded_file($_FILES['file']['tmp_name'][$ulnum], $this->globs['dlmpath']."/".$SERVERFILENAME)) { $NOTCOPIED[] = $_FILES['file']['name'][$ulnum]; } else { @@ -1428,8 +1606,8 @@ class serendipity_event_downloadmanager extends serendipity_event { serendipity_db_query("UPDATE {$serendipity['dbPrefix']}dma_downloadmanager_files SET timestamp = '".time()."', filesize = '$FILESIZE' ". - (!empty($fdesc)? ",description='$fdesc'":''). - " WHERE + (!empty($fdesc) ? ",description='$fdesc'" : ''). + " WHERE catid = '$catid' AND realfilename = '".$fname."'"); } else { @@ -1468,28 +1646,23 @@ class serendipity_event_downloadmanager extends serendipity_event { $_GET['thiscat'] = intval($serendipity['POST']['catid']); } - - function ADMIN_showDownloads() { + /** + * show downloads + */ + function ADMIN_showDownloads() + { global $serendipity; - + // forbid entry if not admin - if(serendipity_userLoggedIn() && $_SESSION['serendipityAuthedUser'] === true && $_SESSION['serendipityUserlevel'] == '255') { - $ddiv = false; - - // return GET value of 0.24 upgrade hook - if (isset($_GET['cpdone'])) { - if( intval($_GET['cpdone']) == 1) { - $this->ERRMSG($this->globs['attention'] . ' ' . PLUGIN_DOWNLOADMANAGER_ALLFILES_COPIED_NEWDIR); - } - if( intval($_GET['cpdone']) == 0) { - $this->ERRMSG($this->globs['attention'] . ' ' . PLUGIN_DOWNLOADMANAGER_ALLFILES_COPY_NEWDIR_REMEMBER); - } + if (!serendipity_userLoggedIn() && $_SESSION['serendipityAuthedUser'] !== true && $_SESSION['serendipityUserlevel'] != '255') { + return false; } + $ddiv = false; if (!is_dir($this->globs['ftppath'])) { @mkdir($this->globs['ftppath'], 0777, true); } - + if (!is_dir($this->globs['dlmpath'])) { @mkdir($this->globs['dlmpath'], 0777, true); } @@ -1520,11 +1693,13 @@ class serendipity_event_downloadmanager extends serendipity_event { $this->delFile(intval($_GET['delfile'])); } - if (!empty($_GET['delifile']) && trim($_GET['delifile']) != "") { - $this->delIncomingFile($_GET['delifile']); + if (!empty($_GET['delinfile']) && trim($_GET['delinfile']) != '') { + if ($this->delIncomingFile($this->globs['ftppath']."/".$_GET['delinfile'])) { + $this->delEmptyDir(); + } } - if (!empty($_GET['importfile']) && trim($_GET['importfile']) != "") { + if (!empty($_GET['importfile']) && trim($_GET['importfile']) != '') { $this->importFile($_GET['importfile'], intval($_GET['thiscat'])); } @@ -1534,13 +1709,13 @@ class serendipity_event_downloadmanager extends serendipity_event { $page = 1; $divnum = 3; - if($_GET['editfile']) { $page = 3; } - if($_GET['thiscat']) { $page = 2; $divnum = 4; } - - // assign some global backend vars as 'dlmgbl' array to smarty backend index template + if ($_GET['editfile']) { $page = 3; } + if ($_GET['thiscat']) { $page = 2; $divnum = 4; } + + // assign some global backend vars as 'dlmgbl' array to smarty backend index template // strip last character / in string 'thispath' is $string = substr($string, 0, -1); else in smarty as modifier $string|substr:0:-1 - $serendipity['smarty']->assign('dlmgbl', - array( + $serendipity['smarty']->assign('dlmgbl', + array( 'httppath' => $this->get_config('httppath'), 'filename_field' => $this->get_config('filename_field'), 'filenums_field' => $this->get_config('dls_field'), @@ -1552,25 +1727,25 @@ class serendipity_event_downloadmanager extends serendipity_event { 'thispage' => $page ) ); - + if (!empty($_GET['thiscat']) && intval($_GET['thiscat']) >= 1) { //!= 1, this didn't get root level files to move etc, but now the back button of page 3 (file details) returns two root levels, one like a sublevel and one as the dlm startpage which isn't too confusing - - /* BACKEND PAGE 2 SECTION - - edit (single file move and file description), - - upload form, - - files in selected category, - - ftp/trash folderfiles, - - Serendipities media library files with subcats, - - subcategories of root, + + /* BACKEND PAGE 2 SECTION + - edit (single file move and file description), + - upload form, + - files in selected category, + - ftp/trash folderfiles, + - Serendipities media library files with subcats, + - subcategories of root, - the appendix (including the helptip and the clear trash button) */ - + $id = intval($_GET['thiscat']); $cat = $this->dlm_sql_db('DLM_SUBCATS', "node_id = $id"); - - if(is_array($cat)) { + + if (is_array($cat)) { $ret1 = $this->dlm_sql_db('DLM_COUNT', "catid = $id"); - + $num_dls = intval($ret1['num']); $cat['num'] = $num_dls; @@ -1583,19 +1758,19 @@ class serendipity_event_downloadmanager extends serendipity_event { $this->backend_dlm_edit_file($cat, intval($_GET['editfile']), $id); } else { - - if (!empty($_GET['upload']) && intval($_GET['upload']) >= 1) { + + if (!empty($_GET['upload']) && intval($_GET['upload']) >= 1) { // generate the upload form - PAGE 2 $this->backend_dlm_build_uploadform($id); - + } else { if (count($this->UPLOAD_TOOBIG) >= 1 || count($this->UPLOAD_NOTCOPIED) >= 1) { $ERRMSG = PLUGIN_DOWNLOADMANAGER_ERRORS_OCCOURED."
"; if (count($this->UPLOAD_TOOBIG) >= 1) { $ERRMSG .= "
".PLUGIN_DOWNLOADMANAGER_ERRORS_TOOBIG."
"; - for ($a=0;$aUPLOAD_TOOBIG);++$a) { + for ($a=0; $aUPLOAD_TOOBIG); ++$a) { $ERRMSG .= $this->UPLOAD_TOOBIG[$a]."
"; } } @@ -1609,171 +1784,170 @@ class serendipity_event_downloadmanager extends serendipity_event { } $ct = (isset($_GET['dlmftpdir']) && (intval($_GET['dlmftpdir']) == 1) ? true : false); - + $files = $this->dlm_sql_db('DLM_SELECT_ARRAY', "catid = ".$id." ORDER BY timestamp DESC"); $ddiv = ($_GET['thiscat'] && $num_dls > 0) ? true : false; - + // generate file table content here - DIV 1 @ PAGE 2 $this->backend_dlm_build_filetable($files, (($ct) ? false : $ddiv), $this->globs['ftppath'], $this->globs['dlmpath'], $this->globs['dateformat'], $num_dls, intval($_GET['thiscat']), 1, 2); - // generate ftp/trash folder table content here - DIV 2 @ PAGE 2 $this->backend_dlm_build_ftptable($ct, $this->globs['ftppath'], intval($_GET['thiscat']), 2, 2); - - // generate media library folder table content here - DIV 3 @ PAGE 2 + // generate media library folder table content here - DIV 3 @ PAGE 2 $this->backend_dlm_build_s9ml_table($this->globs['dateformat'], $serendipity['serendipityPath'] . $serendipity['uploadPath'], 3, 2); - - if( !is_array($cats) ) { + + if (!is_array($cats)) { $cats = array(); $cats = $this->GetAllCats(true); - + if (is_array($cats) && sizeof($cats) >= 1) { unset($cat); } } // new: generate categories table - DIV 4 (permanently open = true) @ PAGE 2 $this->backend_dlm_build_categories($cats, (($ct) ? false : true), $this->globs['ftppath'], intval($_GET['thiscat']), 4, 2); - + // generate appendix trash & helptip $this->backend_dlm_appendix($this->globs['ftppath'], intval($_GET['thiscat']), 5, 2); - + } } } else { $this->ERRMSG(PLUGIN_DOWNLOADMANAGER_CAT_NOT_FOUND); } } else { - /* BACKEND PAGE 1 ROOT SECTION + /* BACKEND PAGE 1 ROOT SECTION - add subcategories to root or selected category - - files in selected category, - - subcategories of root, + - files in selected category, + - subcategories of root, - the appendix (including the helptip and the clear trash button) */ - - if(!$_GET['thiscat'] || empty($_GET['thiscat'])) $_GET['thiscat'] = 1; + + if (!$_GET['thiscat'] || empty($_GET['thiscat'])) $_GET['thiscat'] = 1; // generate categories add table - DIV 1 @PAGE 1 == startpage $this->backend_dlm_add_categories($cats, 1, 1); $files = $this->dlm_sql_db('DLM_SELECT_ARRAY', "catid = 1 ORDER BY timestamp DESC"); - + $fnum = (is_array($files) ? count($files) : 0); - + // new: generate file table content here - DIV 2 @ PAGE 1 == startpage $this->backend_dlm_build_filetable($files, $ddiv, $this->globs['ftppath'], $this->globs['dlmpath'], $this->globs['dateformat'], $fnum, intval($_GET['thiscat']), 2, 1); - if( !is_array($cats) ) { + if (!is_array($cats)) { $cats = array(); $cats = $this->GetAllCats(true); - + if (is_array($cats) && sizeof($cats) >= 1) { unset($files); } } - + // generate categories table - DIV 3 (permanently open = true) @ PAGE 1 == startpage $this->backend_dlm_build_categories($cats, true, $this->globs['ftppath'], intval($_GET['thiscat']), 3, 1); - + // generate appendix trash & helptip $this->backend_dlm_appendix($this->globs['ftppath'], intval($_GET['thiscat']), 4, 1); - + } - + /* get the backend dlm index template file */ echo $this->parseTemplate('backend.dlm.index.tpl'); - - } // logged-in end + } - - function generate_content(&$title) { + /** + * generate content API + */ + function generate_content(&$title) + { $title = PLUGIN_DOWNLOADMANAGER_TITLE.' ('.$this->get_config('pageurl').')'; } - function install() { + /** + * install API + */ + function install() + { $this->setupDB(); } - function event_hook($event, &$bag, &$eventData, $addData = null) { + /** + * event_ hook API + */ + function event_hook($event, &$bag, &$eventData, $addData = null) + { global $serendipity; $hooks = &$bag->get('event_hooks'); - + $serendipity['plugin_dlm_version'] = &$bag->get('version'); - + if (isset($hooks[$event])) { + switch($event) { + + case 'genpage': + if ($serendipity['rewrite'] != 'none') { + $nice_url = $serendipity['serendipityHTTPPath'] . $addData['uriargs']; + } else { + $nice_url = $serendipity['serendipityHTTPPath'] . $serendipity['indexFile'] . '?/' . $addData['uriargs']; + } + $oldsubpage = $serendipity['GET']['subpage']; + if (empty($serendipity['GET']['subpage'])) { + $serendipity['GET']['subpage'] = $nice_url; + } + if ($this->selected()) { + $serendipity['head_title'] = $this->get_config('pagetitle'); + $serendipity['head_subtitle'] = (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['blogTitle']) : htmlspecialchars($serendipity['blogTitle'], ENT_COMPAT, LANG_CHARSET)); + } else { + // Put subpage back so staticpage plugin will work + $serendipity['GET']['subpage'] = $oldsubpage; + } + break; + case 'entry_display' : if ($this->selected()) { + // This is important to not display an entry list! if (is_array($eventData)) { $eventData['clean_page'] = true; } else { - $eventData = array ('clean_page' => true); + $eventData = array('clean_page' => true); } } - return true; - break; case 'backend_sidebar_entries': $this->setupDB(); // forbid entry if not admin - if(serendipity_userLoggedIn() && $_SESSION['serendipityAuthedUser'] === true && $_SESSION['serendipityUserlevel'] == '255') { - ?> -
    • - ' . PLUGIN_DOWNLOADMANAGER_TITLE . ''."\n"; } - break; - case 'backend_dlm_filecopy': - - if( !serendipity_db_bool($this->get_config('chg2archivespath')) ) { - - $oldfilepath = ($this->get_config('absdownloadspath') ? $this->get_config('absdownloadspath') : $serendipity['serendipityPath'] . 'templates_c/.dlmanager/files'); - $newfilepath = $serendipity['serendipityPath'] . 'archives/.dlm/files'; - - // upgrade the old encoded files to new dir - $updown = $this->backend_dlm_upgrade($oldfilepath, $newfilepath, 'absdownloadspath'); - - $oldinpath = ($this->get_config('absincomingpath') ? $this->get_config('absincomingpath') : $serendipity['serendipityPath'] . $serendipity['uploadPath'] . '.dlmanager/incoming'); - $newinpath = $serendipity['serendipityPath'] . 'archives/.dlm/ftpin'; - - // upgrade the old incoming ftp/trash files to new dir - $upin = $this->backend_dlm_upgrade($oldinpath, $newinpath, 'absincomingpath'); - - if(true === ($updown || $upin)) { - $this->set_config('chg2archivespath', true); - $url = $_SERVER['PHP_SELF'] . '?serendipity[adminModule]=event_display&serendipity[adminAction]=downloadmanager&cpdone=1'; - $this->backend_dlm_refresh($url); - } + case 'backend_sidebar_admin_appearance': + $this->setupDB(); + // forbid entry if not admin + if (!serendipity_userLoggedIn() && $_SESSION['serendipityAuthedUser'] !== true && $_SESSION['serendipityUserlevel'] != '255') { + break; + } + if ($serendipity['version'][0] > 1) { + echo "\n".'
  • ' . PLUGIN_DOWNLOADMANAGER_TITLE . '
    • '."\n"; } - break; - - case 'backend_sidebar_entries_event_display_downloadmanager': - - $serendipity['dlm']['stopadminprocess'] = false; - if (!is_object(isset($serendipity['smarty']))) { - serendipity_smarty_init(); // if not set to avoid member function assign() on a non-object error, start Smarty templating + case 'backend_sidebar_entries_event_display_downloadmanager': + + if (!is_object($serendipity['smarty'])) { + serendipity_smarty_init(); } - // load the 0.24 upgrade hook - if (version_compare($serendipity['plugin_dlm_version'], '0.24', '<=')) { - serendipity_plugin_api::hook_event('backend_dlm_filecopy', $addData); - } else { - if(!serendipity_db_bool($this->get_config('chg2archivespath'))) $this->set_config('chg2archivespath', true); - } - if(intval($_GET['cpdone']) == 0) $this->set_config('chg2archivespath', true); - - if( intval(isset($_GET['cpdone'])) || $serendipity['dlm']['stopadminprocess'] === false ) { - - $this->ADMIN_showDownloads(); - - } - + $this->ADMIN_showDownloads(); break; case 'external_plugin': @@ -1790,12 +1964,11 @@ class serendipity_event_downloadmanager extends serendipity_event { } } - - $parts = explode('_', $uri_parts[0]); + $parts = explode('_', $uri_parts[0]); if (!empty($parts[1])) { - $param = (int) $parts[1]; + $param = (int) $parts[1]; } else { - $param = null; + $param = null; } switch($parts[0]) { @@ -1803,14 +1976,18 @@ class serendipity_event_downloadmanager extends serendipity_event { $fileid = intval($parts[1]); - serendipity_db_query("UPDATE {$serendipity['dbPrefix']}dma_downloadmanager_files SET dlcount = dlcount+1 WHERE id = " . $fileid); + $q = "UPDATE {$serendipity['dbPrefix']}dma_downloadmanager_files + SET dlcount = dlcount+1 + WHERE id = $fileid"; + serendipity_db_query($q); - $sql = "SELECT * FROM {$serendipity['dbPrefix']}dma_downloadmanager_files WHERE id = ".$fileid; + $sql = "SELECT * + FROM {$serendipity['dbPrefix']}dma_downloadmanager_files + WHERE id = $fileid"; $file = serendipity_db_query($sql); $mime = $this->getMime($file[0]['realfilename']); $contenttype = $mime['TYPE']; - $filename = $file[0]['realfilename']; $filename = str_replace(' ', '_', $filename); $path = $this->globs['dlmpath']; @@ -1877,66 +2054,71 @@ class serendipity_event_downloadmanager extends serendipity_event { break; } - - return true; break; /* put here all your css stuff you need for the downloadmanagers plugin frontend output */ case 'css': - - if (stristr($eventData, '#downloadmanager')) { + + if (stristr($eventData, '#downloadmanager')) { // class exists in CSS, so a user has customized it and we don't need default return true; } - + $dlm_css = ''; + $tfile = serendipity_getTemplateFile('style_dlmanager_frontend.css', 'serendipityPath'); - if($tfile) echo @file_get_contents($tfile); - - if (!$tfile || $tfile == 'style_dlmanager_frontend.css') { - $tfile = dirname(__FILE__) . '/style_dlmanager_frontend.css'; - echo @file_get_contents($tfile); + if ($tfile) { + $dlm_css = @file_get_contents($tfile); } - - return true; + + if (!$tfile || $tfile == 'style_dlmanager_frontend.css') { + $tfile = dirname(__FILE__) . '/style_dlmanager_frontend.css'; + $dlm_css = @file_get_contents($tfile); + } + $eventData .= $dlm_css; // append CSS break; - + /* put here all you css stuff you need for the backend of dlm */ case 'css_backend': - if (stristr($eventData, '#backend_downloadmanager')) { + if (stristr($eventData, '#backend_downloadmanager')) { // class exists in CSS, so a user has customized it and we don't need default return true; } $tfile = serendipity_getTemplateFile('style_dlmanager_backend.css', 'serendipityPath'); - if($tfile) { + if ($tfile) { $tfilecontent = @file_get_contents($tfile); } - if ( (!$tfile || $tfile == 'style_dlmanager_backend.css') && !$tfilecontent ) { + if ( (!$tfile || $tfile == 'style_dlmanager_backend.css') && !$tfilecontent ) { $tfile = dirname(__FILE__) . '/style_dlmanager_backend.css'; $tfilecontent = @file_get_contents($tfile); } - + if (!empty($tfilecontent) && $serendipity['version'][0] < 2) { + $tfilecontent .= ' +#dlm_messages { + margin: 16px 0; + padding: 4px; + text-align: center; +} + +'; + } // add replaced css content to the end of serendipity_admin.css - if(!empty($tfilecontent)) $this->backend_dlm_css($eventData, $tfilecontent); - - return true; + if (!empty($tfilecontent)) $this->backend_dlm_css($eventData, $tfilecontent); break; case 'entries_header' : //this shows our page and not an empty one $this->show(); - - return true; break; default: return false; - break; - - } // switch end - } - return true; + } + return true; + } else { + return false; + } } /*************************************************** @@ -1944,19 +2126,24 @@ class serendipity_event_downloadmanager extends serendipity_event { **************************************************/ /* add backend css to serendipity_admin.css */ - function backend_dlm_css(&$eventData, &$becss) { + function backend_dlm_css(&$eventData, &$becss) + { $eventData .= $becss; } - /** helptip array - * HELPTIP_CF = (sub)category folder; - * HELPTIP_FF = file folder; - * HELPTIP_IF = incoming ftp/trash folder; + /** + * helptip array + * + * HELPTIP_CF = (sub)category folder; + * HELPTIP_FF = file folder; + * HELPTIP_IF = incoming ftp/trash folder; * HELPTIP_MF = s9y media library folder; */ - function backend_dlm_helptip() { + function backend_dlm_helptip() + { return array( - 'htp[1]' => PLUGIN_DOWNLOADMANAGER_HELPTIP_CF_CHANGE, + 'hlp[0]' => PLUGIN_DOWNLOADMANAGER_HELPTIP_CF_START, + 'hlp[1]' => PLUGIN_DOWNLOADMANAGER_HELPTIP_CF_CHANGE, 'hlp[2]' => PLUGIN_DOWNLOADMANAGER_HELPTIP_FF_CHANGE, 'hlp[3]' => PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_VIEW, 'hlp[4]' => PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_ERASE, @@ -1968,24 +2155,25 @@ class serendipity_event_downloadmanager extends serendipity_event { 'hlp[10]' => PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_LFTP, 'hlp[11]' => PLUGIN_DOWNLOADMANAGER_HELPTIP_DESC /* - 'htp[3]' => PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_S9ML, + 'hlp[3]' => PLUGIN_DOWNLOADMANAGER_HELPTIP_IF_S9ML, 'hlp[]' => PLUGIN_DOWNLOADMANAGER_HELPTIP_, */ ); } - + /** * refresh a page to show correct values directly after move, erase, clean etc (mostly done on page 2) * order by header(), Javascript, HTML (meta refresh) - * + * * @param string request url - + * @return false exit page */ - function backend_dlm_refresh($url) { - if($url && !headers_sent()) { - if(header('Location: http://' . $_SERVER['HTTP_HOST'] . $url)) exit; - } else { + function backend_dlm_refresh($url) + { + if ($url && !headers_sent()) { + if (header('Location: http://' . $_SERVER['HTTP_HOST'] . $url)) exit; + } else { echo ''; @@ -1995,152 +2183,118 @@ class serendipity_event_downloadmanager extends serendipity_event { exit; } } - - + /** - * upgrade files with v.0,24 to /archives/.dlm/files and /archives/.dlm/ftpin folder - * - * @param string oldpath - * @param string newpath - * @param string config name set - * - * @return true or false - */ - function backend_dlm_upgrade($old, $new, $coname) { - global $serendipity; - - if (!is_dir($new)) { - @mkdir($new, 0777, true); - } - - // fetch the files (encoded or normal) of old path as an array - $files = $this->backend_dlm_fetch_pathfiles($old); - - if(is_array($files['f_arr']) && !empty($files['f_arr']) ) { - - foreach($files['f_arr'] as $k => $v) { - // This does not rename the files, as you might assume, instead, it moves them physically! - if(!@rename ($old.'/'.$v, $new.'/'.$v)) { - // void - } else { - $result[] = array($v => true); - } - } - - if( is_array($result) && !empty($result) ){ - unset($files); - unset($result); - $this->set_config($coname, $new); - return true; - } else { - if($coname == 'absincomingpath') echo '
    '; - $url = $_SERVER['PHP_SELF'] . '?serendipity[adminModule]=event_display&serendipity[adminAction]=downloadmanager&cpdone=0'; - $this->ERRMSG($this->globs['attention'] . ' ' . sprintf(PLUGIN_DOWNLOADMANAGER_ERRORS_UPGRADE_NOTCOPIED, $old, $new, $url)); - $serendipity['dlm']['stopadminprocess'] = true; - return false; - } - } else { - // nada in old path - set config and return true to continue - $this->set_config($coname, $new); - return true; - } - } - - - /*** * fetch dlm backend pathfiles table content * - * @param string The path to the s9y media library + * @param string The path to iterate + * @param boolean If path is Serendipity MediaLibrary (default false) * * @return array */ - function backend_dlm_fetch_pathfiles($path) { - - $fa['d_arr'] = array(); $d = 0; - $fa['f_arr'] = array(); $f = 0; + function backend_dlm_fetch_pathfiles($path, $ml=false) + { + $fa = array(); + $fa['d_arr'] = array(); + $fa['f_arr'] = array(); + $d = 0; + $f = 0; - if( is_dir( $path ) ) { - if( $handle = opendir( $path ) ) { - while( false !== ( $file = readdir( $handle ) ) ) { - if( $file != "." && $file != ".." && $file[0] != "." ) { - if( is_dir( $path . "/" . $file ) ) - $fa['d_arr'][++$d] = $file; - else - $fa['f_arr'][++$f] = $file; - } + if (!is_dir($path)) return; + try { + $_dir = new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::SKIP_DOTS); + // NOTE: UnexpectedValueException thrown for PHP >= 5.3 + } catch (Exception $e) { + echo "Error: " . $e->getMessage();#return; + } + if ($ml) { + $iterator = new RecursiveIteratorIterator($_dir, RecursiveIteratorIterator::SELF_FIRST); + } else { + $iterator = new RecursiveIteratorIterator($_dir, RecursiveIteratorIterator::CHILD_FIRST); + } + + foreach ($iterator AS $file) { + $_bfname = $this->mb_basename($file); + $_mdepth = $ml ? $iterator->getDepth() : 0; // allows to avoid recursive file iteration in ML since we have the dir structure to navigate + if ($file->isFile() && $_mdepth == 0 && $_bfname != '.empty' && (false === (strpos($_bfname, '.serendipityThumb')))) { + $filename = $this->encodeToUTF($file->getPathname(), true); // OK + $fa['f_arr'][++$f] = str_replace("\\", "/", $filename); + } else { + // do we need to do this encoding stuff for dir path too? + if ($file->isDir()) { + $fa['d_arr'][++$d] = str_replace("\\", "/", $file->__toString()); } } } - - if( is_dir( $path ) ) closedir( $handle ); - + #echo '
    ';debug_print_backtrace();echo '
    '; + #echo '
    ' . print_r($fa, true) . '
    '; return $fa; } - - + /** * recursive str_replaces in files array, happens to special keys only, used by smarty files array to set filesize, mime array and filedate - * + * * @param array the array data * @param string/boolean use with date() replacement funktion too * @param string/boolean search in specific key only = string (optional) - * @param string/boolean new keyname, use with different replacement funktion only (optional) - * + * @param string/boolean new keyname, use with different replacement funktion only (optional) + * * @return array **/ - function backend_str_replace_recursive(&$data, $p=false, $skey=false, $nkey=false) { - if(is_array($data)) { - foreach($data as $key => $value) { - if (is_array($value) ) { + function backend_str_replace_recursive(&$data, $p=false, $skey=false, $nkey=false) + { + if (is_array($data)) { + foreach($data AS $key => $value) { + if (is_array($value) ) { $this->backend_str_replace_recursive($data[$key], $p, $skey, $nkey); } else { - if($key == $skey) { - if(!$nkey) $data[$key] = ($p ? date($p, $value) : $this->calcFilesize($value)); + if ($key == $skey) { + if (!$nkey) $data[$key] = ($p ? date($p, $value) : $this->calcFilesize($value)); elseif ($p === false) $data[$nkey] = $this->getMime($value); else $data[$nkey] = ($p ? date($p, $value) : $this->calcFilesize($value)); } } } - } + } return isset($data) ? $data : false; } /* see function backend_str_replace_recursive() - this one is for categories only */ - function backend_str_replace_recursive_cat(&$data, $p=false, $skey=false, $nkey=false) { - if(is_array($data)) { - foreach($data as $key => $value) { - if (is_array($value) ) { + function backend_str_replace_recursive_cat(&$data, $p=false, $skey=false, $nkey=false) + { + if (is_array($data)) { + foreach($data AS $key => $value) { + if (is_array($value) ) { $this->backend_str_replace_recursive_cat($data[$key], $p, $skey, $nkey); } else { - if($key === $skey) $data[$nkey] = (550 - (20 * $value)); + if ($key === $skey) $data[$nkey] = (550 - (20 * $value)); } } - } + } return isset($data) ? $data : false; } - - /** generate backend appendix trash & helptip + /** + * generate and assign backend appendix trash & helptip * * @param string The configs absincomepath - * @param int The category id number + * @param int The category id number * @param int The div number (standard=3) * @param int The page number * * @return string */ - function backend_dlm_appendix($absinth='', $cn=1, $dn=0, $pn=0) { + function backend_dlm_appendix($absinth='', $cn=1, $dn=0, $pn=0) + { global $serendipity; - - $attention = $this->globs['attention']; // fetch all physically files in incoming ftp or trash table - $ifiles = $this->backend_dlm_fetch_pathfiles($absinth); + $ifiles = $this->backend_dlm_fetch_pathfiles($absinth); // is 3rd and last run in workflow $ifn = count($ifiles['f_arr']); unset($ifiles); // assign the backend appendix vars to smarty template page section 'appendix' - $serendipity['smarty']->assign('dlmapx', + $serendipity['smarty']->assign('dlmapx', array( 'appendix' => true, 'cleanme' => ($ifn >= 1) ? true : false, @@ -2149,15 +2303,12 @@ class serendipity_event_downloadmanager extends serendipity_event { ); // view all smarty template vars - #echo '
    ';
-        #print_r( $serendipity['smarty']->get_template_vars() );
-        #echo '
    '; - + #echo '
    ' . print_r( $serendipity['smarty']->get_template_vars(), true ) . '
    '; + return; } - - - /*** + + /** * build the dlm backend add categories table * * @param array A referenced array of categories @@ -2166,14 +2317,15 @@ class serendipity_event_downloadmanager extends serendipity_event { * * @return string */ - function backend_dlm_add_categories($cats, $dn=0, $pn=0) { + function backend_dlm_add_categories($cats, $dn=0, $pn=0) + { global $serendipity; // build the category list in backend => true and as call list => false $catlist = $this->buildCategoriesList(true, false); - + // set value of key filesize to something readable $catlist = $this->backend_str_replace_recursive_cat($catlist, false, 'level', 'inputsize'); - + // assign the backend category vars to smarty template page section 'hascats' - $serendipity['smarty']->assign('dlmhcs', + $serendipity['smarty']->assign('dlmhcs', array( 'hascats' => true, 'ddiv' => $ddiv, @@ -2218,103 +2371,105 @@ class serendipity_event_downloadmanager extends serendipity_event { 'cn' => $cn ) ); - } + } unset($cats); unset($catlist); return; } - - /*** + + /** * build dlm backend file table content * * @param array A referenced array of files - * @param boolean Default value foldable divs (permanently open = true) + * @param boolean Default value foldable divs (permanently open = true) * @param string The configs absincomepath * @param string The configs absdownloadspath * @param string The configs Dateformat - * @param int This dirs total file count number - * @param int The category id number + * @param int This dirs total file count number + * @param int The category id number * @param int The div number * @param int The page number * * @return string */ - function backend_dlm_build_filetable($files, $ddiv=false, $absinth='', $absdoth='', $dateformat='Y-m-d H:i', $fn=0, $catid=1, $dn=0, $pn=0) { + function backend_dlm_build_filetable($files, $ddiv=false, $absinth='', $absdoth='', $dateformat='Y-m-d H:i', $fn=0, $catid=1, $dn=0, $pn=0) + { global $serendipity; - + $moved = false; /* reject multiple files being marked to erase */ - if(isset($_POST['Reject_Selected']) || isset($_POST['Reject_Selected_x']) || isset($_POST['Reject_Selected_y'])) { - if(is_array($_POST['dlm']['files'])) { - + if (isset($_POST['Reject_Selected']) || isset($_POST['Reject_Selected_x']) || isset($_POST['Reject_Selected_y'])) { + if (is_array($_POST['dlm']['files'])) { + // build new array - fetch file names by id $dfile = array(); - foreach ($_POST['dlm']['files'] AS $k => $v) { - foreach($files as $file) { - if( $file['id'] == $v ) { - // build the correct path from($this->globs['dlmpath']) -> where($this->globs['ftppath']) by new array - $dfile[] = array( 'id' => $file['id'], - 'cat' => $file['catid'], - 'sfn' => $absdoth.'/'.$file['systemfilename'], + foreach ($_POST['dlm']['files'] AS $k => $v) { + foreach($files AS $file) { + if ($file['id'] == $v) { + $file['realfilename'] = $this->encodeToUTF($file['realfilename']); // OK + // build the correct path from($this->globs['dlmpath']) -> to($this->globs['ftppath']) by new array + $dfile[] = array( 'id' => $file['id'], + 'cat' => $file['catid'], + 'sfn' => $absdoth.'/'.$file['systemfilename'], 'rfn' => $absinth.'/'.$file['realfilename'] ); } } } - if ( is_array($dfile) && !empty($dfile) ) { - + if ( is_array($dfile) && !empty($dfile) ) { + $realcatid = $dfile[0]['cat']; - - foreach($dfile as $movit) { + + foreach($dfile AS $movit) { // This does not rename the file, as you might assume, instead, it moves the file physically! - if(!@rename ($movit['sfn'], $movit['rfn'])) { + if (!@rename ($movit['sfn'], $movit['rfn'])) { $this->ERRMSG(PLUGIN_DOWNLOADMANAGER_DELETE_IN_DOWNLOADDIR_NOT_ALLOWED); - } else { + } else { $result = $this->dlm_sql_db('DLM_BE_DELETE_FILE', "id = ".$movit['id']); } } - if($result) { + if ($result) { unset($movit); $moved = true; } } } } - - if($moved === true) { + + if ($moved === true) { $url = $_SERVER['PHP_SELF'] . '?serendipity[adminModule]=event_display&serendipity[adminAction]=downloadmanager&thiscat=' . ($realcatid ? $realcatid : $catid) . '&dlmftpdir=1'; - if(is_array($dfile)) unset($dfile); - if(is_array($_POST)) unset($_POST); + if (is_array($dfile)) unset($dfile); + if (is_array($_POST)) unset($_POST); $this->backend_dlm_refresh($url); } - - if (is_array($files) && !empty($files)) { + + if (is_array($files) && !empty($files)) { // set value of key filesize to something readable $files = $this->backend_str_replace_recursive($files, false, 'filesize'); - + // set value of key timestamp as new key/value pair to something readable defined by our config setting $this->get_config('dateformat') $files = $this->backend_str_replace_recursive($files, $dateformat, 'timestamp', 'filedate'); - + // set value of key realfilename as new key/value pair to collect mime values as array by file $files = $this->backend_str_replace_recursive($files, false, 'realfilename', 'mime'); - + } // assign the backend filetable vars to smarty template page section 'catfiles' - $serendipity['smarty']->assign('dlmcfs', + $serendipity['smarty']->assign('dlmcfs', array( 'catfiles' => true, 'ddiv' => $ddiv, 'filelist' => $files, - 'downloadpath' => $serendipity['baseURL'] . ($serendipity['rewrite'] == "none" ? $serendipity['indexFile'] . "?/" : "") . "plugin/dlfile_" + 'downloadpath' => $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/dlfile_' ) ); return; } - - /*** + + /** * build dlm backend s9y media gallery file table content * * @param string The configs Dateformat @@ -2324,25 +2479,23 @@ class serendipity_event_downloadmanager extends serendipity_event { * * @return string */ - function backend_dlm_build_s9ml_table($dateformat='Y-m-d H:i', $path='', $dn=0, $pn=0) { + function backend_dlm_build_s9ml_table($dateformat='Y-m-d H:i', $path='', $dn=0, $pn=0) + { global $serendipity; - + if (isset($_GET['smlpath']) && trim($_GET['smlpath']) != '' && !preg_match("@\.\./@", $_GET['smlpath'])) { $extrapath = trim($_GET['smlpath']); } else { $extrapath = ''; } - - if ($path[(strlen($path)-1)] == "/") + if ($path[(strlen($path)-1)] == "/") { $path = substr($path, 0, (strlen($path)-1)); - $path .= $extrapath; + } + $path .= str_replace("\\", "/", $extrapath); - // fetch all physically files in current category - $files = $this->backend_dlm_fetch_pathfiles($path); - - // sort by name descending - asort( $files['d_arr'] ); reset( $files['d_arr'] ); - asort( $files['f_arr'] ); reset( $files['f_arr'] ); + $files = array(); + // fetch all allowed physically files and dirs in current category + $files = $this->backend_dlm_fetch_pathfiles($path, true); // only fetch files by directory - is 2cd in workflow if (count($files['d_arr']) <= 0 && count($files['f_arr']) <= 0) { $sml_arr = false; @@ -2350,38 +2503,35 @@ class serendipity_event_downloadmanager extends serendipity_event { $sml_arr = true; if (!empty($extrapath)) { - $backpath = preg_replace("`\/[^\/]*$`i", "", $extrapath); + $backpath = preg_replace("`\/[^\/]*$`i", '', $extrapath); } - foreach($files['d_arr'] as $key => $val) { + foreach($files['d_arr'] AS $key => $val) { $smldirs[] = array( - 'filename' => $val, + 'filename' => str_replace($serendipity['serendipityPath'] . $serendipity['uploadPath'], '', $val), 'expath' => $extrapath ); } - foreach($files['f_arr'] as $key => $val) { - if( ($files['f_arr'] != '.' && $files['f_arr'] != '..') && (false === (strpos($val, 'serendipityThumb'))) ) { - $mime = $this->getMime($val); - - $filedate = date($dateformat, filemtime($path."/".$val)); - $filesize = filesize($path."/".$val); - $filesize = $this->calcFilesize($filesize); - - $smlfiles[] = array( - 'filename' => $val, - 'filesize' => $filesize, - 'filedate' => $filedate, - 'filemime' => $mime, - 'expath' => $extrapath - ); - } + foreach($files['f_arr'] AS $key => $val) { + $mime = $this->getMime($val); + + $filedate = date($dateformat, filemtime($val)); + $filesize = filesize($val); + $filesize = $this->calcFilesize($filesize); + + $smlfiles[] = array( + 'filename' => str_replace($serendipity['serendipityPath'] . $serendipity['uploadPath'], '', $val), + 'filesize' => $filesize, + 'filedate' => $filedate, + 'filemime' => $mime, + 'expath' => $extrapath + ); } } - // assign as array('sml') the S9y media library files to smarty tpl page 2 'thissml' section - $serendipity['smarty']->assign('dlmtsl', + $serendipity['smarty']->assign('dlmtsl', array( 'thissml' => true, 'ddiv' => (isset($_GET['smlpath']) && !empty($_GET['smlpath'])) ? true : false, @@ -2395,12 +2545,11 @@ class serendipity_event_downloadmanager extends serendipity_event { ); return; } - - + /** * generate page 2 incoming folder table content here - DLM 2 @ PAGE 2 * - * @param boolean Default value foldable divs (permanently open = true) + * @param boolean Default value foldable divs (permanently open = true) * @param string The full path incoming FTP folder * @param int The category id number * @param int The div number @@ -2408,68 +2557,67 @@ class serendipity_event_downloadmanager extends serendipity_event { * * @return string **/ - function backend_dlm_build_ftptable($ddiv=false, $absinth='', $catid=1, $dn=0, $pn=0) { + function backend_dlm_build_ftptable($ddiv=false, $absinth='', $catid=1, $dn=0, $pn=0) + { global $serendipity; // fetch all physically files in incoming ftp or trash table - $files = $this->backend_dlm_fetch_pathfiles($absinth); + $files = $this->backend_dlm_fetch_pathfiles($absinth); // is first run in workflow + $fn = count($files['f_arr']); $ct = ($fn >= 1) ? true : false; /* clean trash = incoming folder by blue trash box */ - if($ct && (intval($_GET['cleantrash']) == 1 && intval($_POST['dlm']['cleartrash']) == 1) - && !(isset($_POST['Move_Selected']) || isset($_POST['Move_Selected_x']) || isset($_POST['Move_Selected_y'])) ) { - foreach($files['f_arr'] as $file) { - $this->delIncomingFile($file); - $deinfi = true; + if ($ct && (intval($_GET['cleantrash']) == 1 && intval($_POST['dlm']['cleartrash']) == 1) + && !(isset($_POST['Move_Selected']) || isset($_POST['Move_Selected_x']) || isset($_POST['Move_Selected_y'])) ) { + foreach($files['f_arr'] AS $file) { + $ctfile = $this->delIncomingFile($file); // already as fullpath + #$ctfile = true; } - if($deinfi === true) { - if(is_array($_POST)) unset($_POST); - if(is_array($files)) unset($files); + if ($ctfile === true) { + if (is_array($_POST)) unset($_POST); + if (is_array($files)) unset($files); $url = $_SERVER['PHP_SELF'] . '?serendipity[adminModule]=event_display&serendipity[adminAction]=downloadmanager&thiscat=' . $catid; $this->backend_dlm_refresh($url); } } - - if(is_array($files)) unset($files); - + + if ($ctfile === true && is_array($files)) unset($files); // when does this ever happen? + /* move multiple files being marked to move to a new directory */ - if( isset($_POST['Move_Selected']) || isset($_POST['Move_Selected_x']) || isset($_POST['Move_Selected_y']) ) { - if(is_array($_POST['dlm']['ifiles'])) { - foreach ($_POST['dlm']['ifiles'] AS $ifile) { + if ( isset($_POST['Move_Selected']) || isset($_POST['Move_Selected_x']) || isset($_POST['Move_Selected_y']) ) { + + if (is_array($_POST['dlm']['ifiles']) && !empty($_POST['dlm']['ifiles'])) { + foreach ($_POST['dlm']['ifiles'] AS $ifile) { $this->importFile($ifile, $catid); } + // remove possible empty directories + $this->delEmptyDir(); } - if(is_array($_POST)) unset($_POST); + if (is_array($_POST)) unset($_POST); $url = $_SERVER['PHP_SELF'] . '?serendipity[adminModule]=event_display&serendipity[adminAction]=downloadmanager&thiscat=' . $catid; $this->backend_dlm_refresh($url); } - $fp = opendir($absinth); - $cf = 0; - while ($file = readdir($fp)) { - if ($file != "." && $file != "..") { - - $mime = $this->getMime($file); - - $filedate = date($this->globs['dateformat'], filemtime($absinth."/".$file)); - $filesize = filesize($absinth."/".$file); - $filesize = $this->calcFilesize($filesize); - - $files[] = array( - 'filename' => $file, - 'filesize' => $filesize, - 'filedate' => $filedate, - 'filemime' => $mime - ); - - ++$cf; - } + foreach($files['f_arr'] AS $key => $val) { + $mime = $this->getMime($val); + $_val = $this->encodeToUTF($val); // OK win decode for stats + // otherwise thrown Warning: filemtime(): and filesize(): stat failed warning on LINUX + // are thrown for the lowered permissions - which is actually want we want in ftpdir + $filedate = date($this->globs['dateformat'], @filemtime($_val)); + $filesize = @filesize($_val); + $filesize = $this->calcFilesize($filesize); + #$val = serendipity_specialchars($val); + $files[] = array( + 'filename' => str_replace($absinth.'/', '', $val), + 'filesize' => $filesize, + 'filedate' => $filedate, + 'filemime' => $mime + ); } - closedir($fp); - + // assign the backend ftp/trash vars to smarty template page section 'thisftp' - $serendipity['smarty']->assign('dlmtfp', + $serendipity['smarty']->assign('dlmtfp', array( 'thisftp' => true, 'ddiv' => $ddiv, @@ -2481,20 +2629,21 @@ class serendipity_event_downloadmanager extends serendipity_event { ); return; } - + /** - * doc and need of id??? - **/ - function backend_dlm_build_uploadform($id) { + * build upload form + */ + function backend_dlm_build_uploadform($id) + { global $serendipity; - + $upload_max_filesize = ini_get('upload_max_filesize'); $upload_max_filesize = preg_replace('/M/', '000000', $upload_max_filesize); $MAX_FILE_SIZE = intval($upload_max_filesize); $MAX_SIZE_PER_FILE = ($MAX_FILE_SIZE / 1000000)." MB"; // assign the backend uploadform vars to smarty template page section 'uploadform' - $serendipity['smarty']->assign('dlmulf', + $serendipity['smarty']->assign('dlmulf', array( 'thistype' => 'uploadform', 'file_uploads' => ini_get('file_uploads'), @@ -2505,8 +2654,8 @@ class serendipity_event_downloadmanager extends serendipity_event { return; } - - /*** + + /** * build dlm backend file table content * * @param array A referenced array of this category @@ -2515,18 +2664,19 @@ class serendipity_event_downloadmanager extends serendipity_event { * * @return string */ - function backend_dlm_edit_file($cat, $id, $catid) { + function backend_dlm_edit_file($cat, $id, $catid) + { global $serendipity; - + // get all specific information about file $file = $this->dlm_sql_db('DLM_SELECT', "id = $id"); $mime = $this->getMime($file['realfilename']); - + // build the category list in backend => true and as