|
[-]
[+]
|
Changed |
froxlor.changes
|
|
|
|
[-]
[+]
|
Changed |
froxlor.spec
^
|
|
|
|
[-]
[+]
|
Deleted |
froxlor-0.9.22.tar.bz2/cache/.gitignore
^
|
| @@ -1 +0,0 @@
-*
|
|
[-]
[+]
|
Deleted |
froxlor-0.9.22.tar.bz2/lib/.gitignore
^
|
| @@ -1 +0,0 @@
-userdata.inc.php
|
|
[-]
[+]
|
Deleted |
froxlor-0.9.22.tar.bz2/packages/.gitignore
^
|
| @@ -1 +0,0 @@
-*
|
|
[-]
[+]
|
Deleted |
froxlor-0.9.22.tar.bz2/temp/.gitignore
^
|
| @@ -1 +0,0 @@
-*
|
|
[-]
[+]
|
Deleted |
froxlor-0.9.22.tar.bz2/templates_c/.gitignore
^
|
| @@ -1 +0,0 @@
-*
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/install/froxlor.sql
^
|
| @@ -468,7 +468,7 @@
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'vmail_homedir', '/var/customers/mail/');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindconf_directory', '/etc/bind/');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindreload_command', '/etc/init.d/bind9 reload');
-INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.22');
+INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.23');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'hostname', 'SERVERNAME');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'maxloginattempts', '3');
INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'deactivatetime', '900');
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/install/updates/froxlor/0.9/update_0.9.inc.php
^
|
| @@ -1662,3 +1662,20 @@
updateToVersion('0.9.22');
}
+if(isFroxlorVersion('0.9.22'))
+{
+ showUpdateStep("Updating from 0.9.22 to 0.9.23-rc1");
+ lastStepStatus(0);
+
+ updateToVersion('0.9.23-rc1');
+}
+
+
+if(isFroxlorVersion('0.9.23-rc1'))
+{
+ showUpdateStep("Updating from 0.9.23-rc1 to 0.9.23");
+ lastStepStatus(0);
+
+ updateToVersion('0.9.23');
+}
+
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/classes/output/class.htmlform.php
^
|
| @@ -149,6 +149,9 @@
if(isset($data['size'])) {
$extras .= ' size="'.$data['size'].'"';
}
+ if(isset($data['autocomplete'])) {
+ $extras .= ' autocomplete="'.$data['autocomplete'].'"';
+ }
// add support to save reloaded forms
if (isset($data['value'])) {
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/classes/phpinterface/class.phpinterface_fpm.php
^
|
| @@ -105,7 +105,7 @@
$tmpdir = makeCorrectDir($this->_settings['phpfpm']['tmpdir'] . '/' . $this->_domain['loginname'] . '/');
if(!is_dir($tmpdir))
{
- safe_exec('mkdir -p ' . escapeshellarg($tmpdir));
+ $this->getTempDir();
}
//$slowlog = makeCorrectFile($this->_settings['system']['logfiles_directory'] . $this->_domain['loginname'] . '/php-fpm_slow.log');
@@ -173,9 +173,9 @@
/**
* fpm-config file
- *
+ *
* @param boolean $createifnotexists create the directory if it does not exist
- *
+ *
* @return string the full path to the file
*/
public function getConfigFile($createifnotexists = true)
@@ -193,9 +193,9 @@
/**
* return path of fpm-socket file
- *
+ *
* @param boolean $createifnotexists create the directory if it does not exist
- *
+ *
* @return string the full path to the socket
*/
public function getSocketFile($createifnotexists = true)
@@ -214,9 +214,9 @@
/**
* fpm-temp directory
- *
+ *
* @param boolean $createifnotexists create the directory if it does not exist
- *
+ *
* @return string the directory
*/
public function getTempDir($createifnotexists = true)
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/formfields/admin/admin/formfield.admin_add.php
^
|
| @@ -32,7 +32,8 @@
'admin_password' => array(
'label' => $lng['login']['password'],
'type' => 'password',
- 'mandatory' => true
+ 'mandatory' => true,
+ 'autocomplete' => 'off'
),
'admin_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/formfields/admin/admin/formfield.admin_edit.php
^
|
| @@ -41,6 +41,7 @@
'admin_password' => array(
'label' => $lng['login']['password'].' ('.$lng['panel']['emptyfornochanges'].')',
'type' => 'password',
+ 'autocomplete' => 'off',
'visible' => ($result['adminid'] == $userinfo['userid'] ? false : true)
),
'admin_password_suggestion' => array(
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/formfields/admin/customer/formfield.customer_add.php
^
|
| @@ -47,6 +47,7 @@
'new_customer_password' => array(
'label' => $lng['login']['password'],
'type' => 'password',
+ 'autocomplete' => 'off'
),
'new_customer_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/formfields/admin/customer/formfield.customer_edit.php
^
|
| @@ -52,7 +52,8 @@
),
'new_customer_password' => array(
'label' => $lng['login']['password'].' ('.$lng['panel']['emptyfornochanges'].')',
- 'type' => 'password'
+ 'type' => 'password',
+ 'autocomplete' => 'off'
),
'new_customer_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/formfields/customer/domains/formfield.domains_edit.php
^
|
| @@ -67,7 +67,7 @@
'values' => array(
array ('label' => $lng['panel']['yes'], 'value' => '1')
),
- 'value' => array()
+ 'value' => array($result['iswildcarddomain'])
),
'isemaildomain' => array(
'visible' => ((( $result['subcanemaildomain'] == '1' || $result['subcanemaildomain'] == '2' ) && $result['parentdomainid'] != '0') ? true : false),
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/formfields/customer/email/formfield.emails_accountchangepasswd.php
^
|
| @@ -31,7 +31,8 @@
),
'email_password' => array(
'label' => $lng['login']['password'],
- 'type' => 'password'
+ 'type' => 'password',
+ 'autocomplete' => 'off'
),
'email_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/formfields/customer/email/formfield.emails_add.php
^
|
| @@ -36,7 +36,7 @@
'type' => 'select',
'select_var' => $domains
),
- 'pathedit' => array(
+ 'iscatchall' => array(
'label' => $lng['emails']['iscatchall'],
'type' => 'checkbox',
'values' => array(
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/formfields/customer/email/formfield.emails_addaccount.php
^
|
| @@ -31,7 +31,8 @@
),
'email_password' => array(
'label' => $lng['login']['password'],
- 'type' => 'password'
+ 'type' => 'password',
+ 'autocomplete' => 'off'
),
'email_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/formfields/customer/ftp/formfield.ftp_add.php
^
|
| @@ -44,6 +44,7 @@
'ftp_password' => array(
'label' => $lng['login']['password'],
'type' => 'password',
+ 'autocomplete' => 'off'
),
'ftp_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/formfields/customer/ftp/formfield.ftp_edit.php
^
|
| @@ -39,6 +39,7 @@
'label' => $lng['login']['password'],
'desc' => $lng['ftp']['editpassdescription'],
'type' => 'password',
+ 'autocomplete' => 'off'
),
'ftp_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/formfields/customer/mysql/formfield.mysql_add.php
^
|
| @@ -36,6 +36,7 @@
'mysql_password' => array(
'label' => $lng['login']['password'],
'type' => 'password',
+ 'autocomplete' => 'off'
),
'mysql_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/formfields/customer/mysql/formfield.mysql_edit.php
^
|
| @@ -42,6 +42,7 @@
'mysql_password' => array(
'label' => $lng['changepassword']['new_password_ifnotempty'],
'type' => 'password',
+ 'autocomplete' => 'off'
),
'mysql_password_suggestion' => array(
'label' => $lng['customer']['generated_pwd'],
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/functions.php
^
|
| @@ -55,7 +55,7 @@
{
if($filename != '.' && $filename != '..' && $filename != '')
{
- if($filename == 'class.' . $classname . '.php' || $filename == 'abstract.' . $classname . '.php')
+ if($filename == 'class.' . $classname . '.php' || $filename == 'abstract.' . $classname . '.php' || $filename == 'interface.' . $classname . '.php')
{
include($dirname . $filename);
return;
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/lib/tables.inc.php
^
|
| @@ -73,6 +73,6 @@
// VERSION INFO
-$version = '0.9.22';
+$version = '0.9.23';
$dbversion = '2';
$branding = '';
|
|
|
Changed |
froxlor-0.9.23.tar.bz2/locales/de/LC_MESSAGES/default.mo
^
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/locales/de/LC_MESSAGES/default.po
^
|
| @@ -1,20 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
msgid ""
msgstr ""
"Project-Id-Version: Froxlor\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-23 10:46+0100\n"
-"PO-Revision-Date: 2011-06-23 13:30+0100\n"
+"POT-Creation-Date: 2011-07-16 10:06+0200\n"
+"PO-Revision-Date: 2011-07-16 10:12+0100\n"
"Last-Translator: Florian Aders <eleras@froxlor.org>\n"
"Language-Team: The Froxlor team <team@froxlor.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
-"X-Poedit-Basepath: /home/florian/froxlor\n"
-"X-Poedit-Language: DE\n"
-"X-Poedit-Country: Germany\n"
-"X-Poedit-SearchPath-0: .\n"
+"X-Poedit-Language: German\n"
+"X-Poedit-Country: GERMANY\n"
#: smarty.c:2
msgid "Froxlor Server Management Panel"
@@ -24,6 +26,9 @@
#: smarty.c:26
#: smarty.c:41
#: smarty.c:80
+#: smarty.c:50
+#: smarty.c:59
+#: smarty.c:152
msgid "Success"
msgstr "Erfolgreich"
@@ -31,6 +36,9 @@
#: smarty.c:29
#: smarty.c:44
#: smarty.c:83
+#: smarty.c:53
+#: smarty.c:62
+#: smarty.c:155
msgid "Error"
msgstr "Fehler"
@@ -51,25 +59,33 @@
msgstr "Login"
#: smarty.c:23
+#: smarty.c:56
msgid "Editing"
msgstr "Bearbeiten"
#: smarty.c:32
#: smarty.c:50
+#: smarty.c:65
+#: smarty.c:161
msgid "Save file"
msgstr "Datei speichern"
#: smarty.c:35
#: smarty.c:53
+#: smarty.c:68
+#: smarty.c:164
msgid "Cancel"
msgstr "Abbrechen"
#: smarty.c:38
+#: smarty.c:149
msgid "Creating a file in"
msgstr "Erstellt eine Datei in"
#: smarty.c:47
#: smarty.c:107
+#: smarty.c:77
+#: smarty.c:158
msgid "Filename"
msgstr "Dateiname"
@@ -77,122 +93,158 @@
#: smarty.c:62
#: smarty.c:71
#: smarty.c:146
+#: smarty.c:26
+#: smarty.c:32
+#: smarty.c:41
+#: smarty.c:134
msgid "Delete"
msgstr "Löschen"
#: smarty.c:59
#: smarty.c:65
#: smarty.c:74
+#: smarty.c:29
+#: smarty.c:35
+#: smarty.c:44
msgid "Rename"
msgstr "Umbenennen"
#: smarty.c:68
+#: smarty.c:47
msgid "Symbolic link to"
msgstr "Symlink nach"
#: smarty.c:77
+#: smarty.c:38
msgid "Edit"
msgstr "Bearbeiten"
#: smarty.c:86
+#: smarty.c:113
msgid "Basic operations"
msgstr "Standard Operationen"
#: smarty.c:89
+#: smarty.c:116
msgid "Change dir"
msgstr "Verzeichnis wechseln"
#: smarty.c:92
+#: smarty.c:119
msgid "Create dir"
msgstr "Verzeichnis erstellen"
#: smarty.c:95
+#: smarty.c:122
msgid "Create new file in current directory"
msgstr "Neue Datei in aktuellem Verzeichnis erstellen"
#: smarty.c:98
+#: smarty.c:125
msgid "Upload files"
msgstr "Dateien hochladen"
#: smarty.c:101
+#: smarty.c:128
msgid "Upload file(s)"
msgstr "Datei(en) hochladen"
#: smarty.c:104
+#: smarty.c:146
msgid "Rename / Move"
msgstr "Umbenennen / Verschieben"
#: smarty.c:110
+#: smarty.c:80
msgid "Size"
msgstr "Größe"
#: smarty.c:113
+#: smarty.c:83
msgid "Date"
msgstr "Datum"
#: smarty.c:116
+#: smarty.c:86
msgid "Permissions"
msgstr "Berechtigungen"
#: smarty.c:119
+#: smarty.c:89
msgid "User"
msgstr "Benutzer"
#: smarty.c:122
+#: smarty.c:92
msgid "Group"
msgstr "Gruppe"
#: smarty.c:125
+#: smarty.c:95
msgid "Options"
msgstr "Optionen"
#: smarty.c:128
+#: smarty.c:98
msgid "Files"
msgstr "Dateien"
#: smarty.c:131
+#: smarty.c:101
msgid "Complete filesize"
msgstr "Komplette Dateigröße"
#: smarty.c:134
+#: smarty.c:104
msgid "Symlinks"
msgstr "Symlinks"
#: smarty.c:137
+#: smarty.c:107
msgid "Directories"
msgstr "Verzeichnisse"
#: smarty.c:140
+#: smarty.c:110
msgid "Complete directorysize"
msgstr "Komplette Verzeichnisgröße"
#: smarty.c:143
+#: smarty.c:131
msgid "Selected file(s)"
msgstr "Markierte Datei(en)"
#: smarty.c:149
+#: smarty.c:137
msgid "Change permission to"
msgstr "Berechtigungen ändern zu"
#: smarty.c:152
+#: smarty.c:140
msgid "Move to"
msgstr "Verschieben nach"
#: smarty.c:155
+#: smarty.c:143
msgid "Do it"
msgstr "Tu es"
#: smarty.c:158
+#: smarty.c:23
msgid "the Froxlor Team"
msgstr "das Froxlor Team"
#: webftp.php:231
+#: webftp.php:177
msgid "Successfully logged out"
msgstr "Erfolgreich ausgeloggt"
#: webftp.php:343
#: webftp.php:350
#: webftp.php:430
+#: webftp.php:289
+#: webftp.php:296
+#: webftp.php:376
#, php-format
msgid "Directory change to '%1$s' failed!"
msgstr "Verzeichniswechsel nach '%1$s' fehlgeschlagen!"
@@ -201,6 +253,10 @@
#: webftp.php:369
#: webftp.php:375
#: webftp.php:426
+#: webftp.php:303
+#: webftp.php:315
+#: webftp.php:321
+#: webftp.php:372
#, php-format
msgid "current folder = [%1$s]"
msgstr "aktuelles Verzeichnis = [%1$s]"
@@ -243,26 +299,31 @@
msgstr "<br />'%1$s' konnt nicht gelöscht werden!"
#: webftp.php:522
+#: webftp.php:468
#, php-format
msgid "'%1$s' renamed to '%2$s'"
-msgstr "'%1$s' wurde umbenannt noch '%2$s'"
+msgstr "'%1$s' wurde umbenannt nach '%2$s'"
#: webftp.php:526
+#: webftp.php:472
#, php-format
msgid "'%1$s' couldn't be renamed to '%2$s'!"
-msgstr "'%1$s' konnt nicht nach '%2$s' umbenannt werden"
+msgstr "'%1$s' konnte nicht nach '%2$s' umbenannt werden"
#: webftp.php:531
+#: webftp.php:477
#, php-format
msgid "File '%1$s' rename/move to"
msgstr "Datei '%1$s' verschoben nach"
#: webftp.php:537
+#: webftp.php:483
#, php-format
msgid "Directory '%1$s' created"
msgstr "Verzeichnis '%1$s' erstellt"
#: webftp.php:541
+#: webftp.php:487
#, php-format
msgid "Directory '%1$s' couldn't be created!"
msgstr "Verzeichnis '%1$s' konnte nicht erstellt werden!"
@@ -296,21 +357,25 @@
msgstr "<br />Die Datei '%1$s' konnte nicht verschoben werden"
#: webftp.php:662
+#: webftp.php:608
#, php-format
msgid "The directory '%1$s' doesn't exist"
msgstr "Das Verzeichnis '%1$s' existiert nicht"
#: webftp.php:706
+#: webftp.php:652
#, php-format
msgid "File '%1$s' couldn't be downloaded!"
msgstr "Die Datei '%1$s' konnte nicht heruntergeladen werden!"
#: webftp.php:743
+#: webftp.php:689
#, php-format
msgid "File '%1$s' couldn't be saved!"
msgstr "Die Datei '%1$s' konnte nicht gespeichert werden!"
#: webftp.php:747
+#: webftp.php:693
#, php-format
msgid "File '%1$s' was saved succesfully!"
msgstr "Die Datei '%1$s' wurde erfolgreich gespeichert!"
@@ -321,45 +386,133 @@
msgstr "Dateien mit dieser Endung können nicht erstellt / bearbeitet werden!"
#: webftp.php:762
+#: webftp.php:708
msgid "Please enter a filename!"
msgstr "Bitte einen Dateinamen eingeben!"
#: webftp.php:912
+#: webftp.php:858
#, php-format
msgid "Connected to %1$s"
msgstr "Verbunden mit %1$s"
#: webftp.php:931
+#: webftp.php:877
msgid "Do you really want to delete the selected files?"
msgstr "Sollen die markierten Dateien wirklich gelöscht werden?"
#: webftp.php:935
+#: webftp.php:881
#, php-format
msgid "Do you really want to move the selected files to '%1$s'?"
msgstr "Sollen die markierten Dateien wirklich nach '%1$s' verschoben werden?"
#: webftp.php:940
+#: webftp.php:886
#, php-format
msgid "Do you really want to set the permission of the selected files to '%1$s'?"
msgstr "Sollen die Berechtigungen der markierten Dateien wirklich auf '%1$s' geändert werden?"
#: webftp.php:951
+#: webftp.php:897
msgid "Logout"
msgstr "Abmelden"
#: webftp.php:953
+#: webftp.php:899
msgid "Switch to BINARY mode"
msgstr "Auf BINARY - Modus wechseln"
#: webftp.php:955
+#: webftp.php:901
msgid "Switch to ASCII mode"
msgstr "Auf ASCII - Modus wechseln"
#: webftp.php:957
+#: webftp.php:903
msgid "Main"
msgstr "Hauptmenü"
#: webftp.php:963
+#: webftp.php:909
msgid "Login failed, please try again"
msgstr "Login fehlgeschlagen, bitte erneut versuchen"
+#: webftp.php:417
+#, php-format
+msgid "File '%1$s' is to big! (max. %2$u bytes)"
+msgstr "Die Datei '%1$s' ist zu groß! (Max. %2$u Bytes)"
+
+#: webftp.php:432
+#, php-format
+msgid "File '%1$s' couldn't be uploaded!"
+msgstr "Die Datei '%1$s' konnte nicht hochgeladen werden"
+
+#: webftp.php:436
+#, php-format
+msgid "File '%1$s' was successfully uploaded!"
+msgstr "Die Datei '%1$s' wurde erfolgreich hochgeladen!"
+
+#: webftp.php:446
+#, php-format
+msgid "Directory '%1$s' deleted!"
+msgstr "Das Verzeichnis '%1$s' wurde gelöscht!"
+
+#: webftp.php:450
+#, php-format
+msgid "Directory '%1$s' couldn't be deleted!"
+msgstr "Das Verzeichnis '%1$s' konnte nicht gelöscht werden!"
+
+#: webftp.php:456
+#: webftp.php:573
+#, php-format
+msgid "'%1$s' deleted!"
+msgstr "'%1$s' wurde gelöscht!"
+
+#: webftp.php:460
+#: webftp.php:577
+#, php-format
+msgid "'%1$s' couldn't be deleted!"
+msgstr "'%1$s' konnte nicht gelöscht werden!"
+
+#: webftp.php:502
+#: webftp.php:533
+#, php-format
+msgid "The permission '%1$s' you entered is not valid!"
+msgstr "Die eingegebene Berechtigung '%1$s' ist ungültig!"
+
+#: webftp.php:509
+#: webftp.php:544
+#, php-format
+msgid "The permission of '%1$s' is set to '%2$s'!"
+msgstr "Die Berechtigung von '%1$s' wurde auf '%2$s' gesetzt!"
+
+#: webftp.php:513
+#: webftp.php:548
+#, php-format
+msgid "The permission of '%1$s' couldn't be set to '%2$s'!"
+msgstr "Die Berechtigung von '%1$s' konnte nicht auf '%2$s' gesetzt werden!"
+
+#: webftp.php:597
+#, php-format
+msgid "File '%1$s' moved"
+msgstr "Die Datei '%1$s' wurde verschoben"
+
+#: webftp.php:601
+#, php-format
+msgid "File '%1$s' couldn't be moved"
+msgstr "Die Datei '%1$s' konnte nicht verschoben werden"
+
+#: webftp.php:700
+#, php-format
+msgid "Files with this extension can't be created/edited!"
+msgstr "Dateien mit dieser Endung können nicht erstellt / bearbeitet werden!"
+
+#: smarty.c:71
+msgid "Yes"
+msgstr "Ja"
+
+#: smarty.c:74
+msgid "No"
+msgstr "Nein"
+
|
|
[-]
[+]
|
Added |
froxlor-0.9.23.tar.bz2/locales/en
^
|
| +(directory)
|
|
[-]
[+]
|
Added |
froxlor-0.9.23.tar.bz2/locales/en/LC_MESSAGES
^
|
| +(directory)
|
|
[-]
[+]
|
Added |
froxlor-0.9.23.tar.bz2/locales/en/LC_MESSAGES/default.po
^
|
| @@ -0,0 +1,350 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-07-16 10:04+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: webftp.php:177
+msgid "Successfully logged out"
+msgstr ""
+
+#: webftp.php:289 webftp.php:296 webftp.php:376
+#, php-format
+msgid "Directory change to '%1$s' failed!"
+msgstr ""
+
+#: webftp.php:303 webftp.php:315 webftp.php:321 webftp.php:372
+#, php-format
+msgid "current folder = [%1$s]"
+msgstr ""
+
+#: webftp.php:417
+#, php-format
+msgid "File '%1$s' is to big! (max. %2$u bytes)"
+msgstr ""
+
+#: webftp.php:432
+#, php-format
+msgid "File '%1$s' couldn't be uploaded!"
+msgstr ""
+
+#: webftp.php:436
+#, php-format
+msgid "File '%1$s' was successfully uploaded!"
+msgstr ""
+
+#: webftp.php:446
+#, php-format
+msgid "Directory '%1$s' deleted!"
+msgstr ""
+
+#: webftp.php:450
+#, php-format
+msgid "Directory '%1$s' couldn't be deleted!"
+msgstr ""
+
+#: webftp.php:456 webftp.php:573
+#, php-format
+msgid "'%1$s' deleted!"
+msgstr ""
+
+#: webftp.php:460 webftp.php:577
+#, php-format
+msgid "'%1$s' couldn't be deleted!"
+msgstr ""
+
+#: webftp.php:468
+#, php-format
+msgid "'%1$s' renamed to '%2$s'"
+msgstr ""
+
+#: webftp.php:472
+#, php-format
+msgid "'%1$s' couldn't be renamed to '%2$s'!"
+msgstr ""
+
+#: webftp.php:477
+#, php-format
+msgid "File '%1$s' rename/move to"
+msgstr ""
+
+#: webftp.php:483
+#, php-format
+msgid "Directory '%1$s' created"
+msgstr ""
+
+#: webftp.php:487
+#, php-format
+msgid "Directory '%1$s' couldn't be created!"
+msgstr ""
+
+#: webftp.php:502 webftp.php:533
+#, php-format
+msgid "The permission '%1$s' you entered is not valid!"
+msgstr ""
+
+#: webftp.php:509 webftp.php:544
+#, php-format
+msgid "The permission of '%1$s' is set to '%2$s'!"
+msgstr ""
+
+#: webftp.php:513 webftp.php:548
+#, php-format
+msgid "The permission of '%1$s' couldn't be set to '%2$s'!"
+msgstr ""
+
+#: webftp.php:597
+#, php-format
+msgid "File '%1$s' moved"
+msgstr ""
+
+#: webftp.php:601
+#, php-format
+msgid "File '%1$s' couldn't be moved"
+msgstr ""
+
+#: webftp.php:608
+#, php-format
+msgid "The directory '%1$s' doesn't exist"
+msgstr ""
+
+#: webftp.php:652
+#, php-format
+msgid "File '%1$s' couldn't be downloaded!"
+msgstr ""
+
+#: webftp.php:689
+#, php-format
+msgid "File '%1$s' couldn't be saved!"
+msgstr ""
+
+#: webftp.php:693
+#, php-format
+msgid "File '%1$s' was saved succesfully!"
+msgstr ""
+
+#: webftp.php:700
+#, php-format
+msgid "Files with this extension can't be created/edited!"
+msgstr ""
+
+#: webftp.php:708
+msgid "Please enter a filename!"
+msgstr ""
+
+#: webftp.php:858
+#, php-format
+msgid "Connected to %1$s"
+msgstr ""
+
+#: webftp.php:877
+msgid "Do you really want to delete the selected files?"
+msgstr ""
+
+#: webftp.php:881
+#, php-format
+msgid "Do you really want to move the selected files to '%1$s'?"
+msgstr ""
+
+#: webftp.php:886
+#, php-format
+msgid ""
+"Do you really want to set the permission of the selected files to '%1$s'?"
+msgstr ""
+
+#: webftp.php:897
+msgid "Logout"
+msgstr ""
+
+#: webftp.php:899
+msgid "Switch to BINARY mode"
+msgstr ""
+
+#: webftp.php:901
+msgid "Switch to ASCII mode"
+msgstr ""
+
+#: webftp.php:903
+msgid "Main"
+msgstr ""
+
+#: webftp.php:909
+msgid "Login failed, please try again"
+msgstr ""
+
+#: smarty.c:2
+msgid "Froxlor Server Management Panel"
+msgstr ""
+
+#: smarty.c:5 smarty.c:50 smarty.c:59 smarty.c:152
+msgid "Success"
+msgstr ""
+
+#: smarty.c:8 smarty.c:53 smarty.c:62 smarty.c:155
+msgid "Error"
+msgstr ""
+
+#: smarty.c:11
+msgid "Froxlor - WebFTP - Login"
+msgstr ""
+
+#: smarty.c:14
+msgid "Username"
+msgstr ""
+
+#: smarty.c:17
+msgid "Password"
+msgstr ""
+
+#: smarty.c:20
+msgid "Login"
+msgstr ""
+
+#: smarty.c:23
+msgid "the Froxlor Team"
+msgstr ""
+
+#: smarty.c:26 smarty.c:32 smarty.c:41 smarty.c:134
+msgid "Delete"
+msgstr ""
+
+#: smarty.c:29 smarty.c:35 smarty.c:44
+msgid "Rename"
+msgstr ""
+
+#: smarty.c:38
+msgid "Edit"
+msgstr ""
+
+#: smarty.c:47
+msgid "Symbolic link to"
+msgstr ""
+
+#: smarty.c:56
+msgid "Editing"
+msgstr ""
+
+#: smarty.c:65 smarty.c:161
+msgid "Save file"
+msgstr ""
+
+#: smarty.c:68 smarty.c:164
+msgid "Cancel"
+msgstr ""
+
+#: smarty.c:71
+msgid "Yes"
+msgstr ""
+
+#: smarty.c:74
+msgid "No"
+msgstr ""
+
+#: smarty.c:77 smarty.c:158
+msgid "Filename"
+msgstr ""
+
+#: smarty.c:80
+msgid "Size"
+msgstr ""
+
+#: smarty.c:83
+msgid "Date"
+msgstr ""
+
+#: smarty.c:86
+msgid "Permissions"
+msgstr ""
+
+#: smarty.c:89
+msgid "User"
+msgstr ""
+
+#: smarty.c:92
+msgid "Group"
+msgstr ""
+
+#: smarty.c:95
+msgid "Options"
+msgstr ""
+
+#: smarty.c:98
+msgid "Files"
+msgstr ""
+
+#: smarty.c:101
+msgid "Complete filesize"
+msgstr ""
+
+#: smarty.c:104
+msgid "Symlinks"
+msgstr ""
+
+#: smarty.c:107
+msgid "Directories"
+msgstr ""
+
+#: smarty.c:110
+msgid "Complete directorysize"
+msgstr ""
+
+#: smarty.c:113
+msgid "Basic operations"
+msgstr ""
+
+#: smarty.c:116
+msgid "Change dir"
+msgstr ""
+
+#: smarty.c:119
+msgid "Create dir"
+msgstr ""
+
+#: smarty.c:122
+msgid "Create new file in current directory"
+msgstr ""
+
+#: smarty.c:125
+msgid "Upload files"
+msgstr ""
+
+#: smarty.c:128
+msgid "Upload file(s)"
+msgstr ""
+
+#: smarty.c:131
+msgid "Selected file(s)"
+msgstr ""
+
+#: smarty.c:137
+msgid "Change permission to"
+msgstr ""
+
+#: smarty.c:140
+msgid "Move to"
+msgstr ""
+
+#: smarty.c:143
+msgid "Do it"
+msgstr ""
+
+#: smarty.c:146
+msgid "Rename / Move"
+msgstr ""
+
+#: smarty.c:149
+msgid "Creating a file in"
+msgstr ""
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/scripts/jobs/cron_backup.php
^
|
| @@ -41,7 +41,7 @@
// create backup dir an set rights
if(!file_exists($row['documentroot'] . $settings['system']['backup_dir'])){
- safe_exec('install -d ' . escapeshellarg($settings['system']['backup_dir']) . $row['loginname'] . ' -o ' . escapeshellarg($ftp_row['uid']) . ' -g ' . escapeshellarg($ftp_row['gid']) . ' -m ' . '0500');
+ safe_exec('install -d ' . escapeshellarg($settings['system']['backup_dir']) . $row['loginname'] . ' -o ' . escapeshellarg($ftp_row['uid']) . ' -g ' . escapeshellarg($ftp_row['gid']) . ' -m ' . '0500');
}
// create customers html backup
@@ -51,7 +51,7 @@
$dbs_result = $db->query("SELECT databasename FROM `" . TABLE_PANEL_DATABASES . "` WHERE `customerid` = '" . $db->escape($row['customerid']) . "';");
while($dbs_row = $db->fetch_array($dbs_result)){
// create customers sql backup
- safe_exec(escapeshellarg($settings['system']['backup_mysqldump_path']) . ' --opt --allow-keywords -u ' . $sql_root[0]['user'] . ' -p' . $sql_root[0]['password'] . ' -h ' . $sql_root[0]['host'] . ' ' . escapeshellarg($dbs_row['databasename']) . ' -r ' . escapeshellarg($settings['system']['backup_dir']) . $row['loginname'] . '/' . escapeshellarg($dbs_row['databasename']) . '.sql' );
+ safe_exec(escapeshellarg($settings['system']['backup_mysqldump_path']) . ' --opt --force --allow-keywords -u ' . $sql_root[0]['user'] . ' -p' . $sql_root[0]['password'] . ' -h ' . $sql_root[0]['host'] . ' ' . escapeshellarg($dbs_row['databasename']) . ' -r ' . escapeshellarg($settings['system']['backup_dir']) . $row['loginname'] . '/' . escapeshellarg($dbs_row['databasename']) . '.sql' );
// compress sql backup
safe_exec('tar -C ' . escapeshellarg($settings['system']['backup_dir']) . $row['loginname'] . ' -c -z -f ' . escapeshellarg($settings['system']['backup_dir']) . $row['loginname'] . '/' . escapeshellarg($dbs_row['databasename']) . '.tar.gz ' . escapeshellarg($dbs_row['databasename']) . '.sql');
// remove uncompresed sql files
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/scripts/jobs/cron_tasks.php
^
|
| @@ -325,6 +325,20 @@
}
/*
+ * remove tmpdir if it exists
+ */
+ $tmpdir = makeCorrectDir($settings['system']['mod_fcgid_tmpdir'] . '/' . $row['data']['loginname'] . '/');
+
+ if (is_dir($tmpdir)
+ && $tmpdir != "/"
+ && $tmpdir != $settings['system']['mod_fcgid_tmpdir']
+ && substr($tmpdir, 0, strlen($settings['system']['mod_fcgid_tmpdir'])) == $settings['system']['mod_fcgid_tmpdir'])
+ {
+ $cronlog->logAction(CRON_ACTION, LOG_NOTICE, 'Running: rm -rf ' . escapeshellarg($tmpdir));
+ safe_exec('rm -rf '.escapeshellarg($tmpdir));
+ }
+
+ /*
* see if we have some php-fcgid leftovers if used
* and remove them, #200
*/
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/smarty.c
^
|
| @@ -1,159 +1,165 @@
-/* templates/Froxlor/login/login_ftp.tpl */
+/* templates//Froxlor/login/login_ftp.tpl */
gettext("Froxlor Server Management Panel");
-/* templates/Froxlor/login/login_ftp.tpl */
+/* templates//Froxlor/login/login_ftp.tpl */
gettext("Success");
-/* templates/Froxlor/login/login_ftp.tpl */
+/* templates//Froxlor/login/login_ftp.tpl */
gettext("Error");
-/* templates/Froxlor/login/login_ftp.tpl */
+/* templates//Froxlor/login/login_ftp.tpl */
gettext("Froxlor - WebFTP - Login");
-/* templates/Froxlor/login/login_ftp.tpl */
+/* templates//Froxlor/login/login_ftp.tpl */
gettext("Username");
-/* templates/Froxlor/login/login_ftp.tpl */
+/* templates//Froxlor/login/login_ftp.tpl */
gettext("Password");
-/* templates/Froxlor/login/login_ftp.tpl */
+/* templates//Froxlor/login/login_ftp.tpl */
gettext("Login");
-/* templates/Froxlor/webftp/webftp_edit.tpl */
-gettext("Editing");
-
-/* templates/Froxlor/webftp/webftp_edit.tpl */
-gettext("Success");
-
-/* templates/Froxlor/webftp/webftp_edit.tpl */
-gettext("Error");
-
-/* templates/Froxlor/webftp/webftp_edit.tpl */
-gettext("Save file");
-
-/* templates/Froxlor/webftp/webftp_edit.tpl */
-gettext("Cancel");
-
-/* templates/Froxlor/webftp/webftp_edit_new.tpl */
-gettext("Creating a file in");
-
-/* templates/Froxlor/webftp/webftp_edit_new.tpl */
-gettext("Success");
-
-/* templates/Froxlor/webftp/webftp_edit_new.tpl */
-gettext("Error");
-
-/* templates/Froxlor/webftp/webftp_edit_new.tpl */
-gettext("Filename");
-
-/* templates/Froxlor/webftp/webftp_edit_new.tpl */
-gettext("Save file");
-
-/* templates/Froxlor/webftp/webftp_edit_new.tpl */
-gettext("Cancel");
+/* templates//Froxlor/index.tpl */
+gettext("the Froxlor Team");
-/* templates/Froxlor/webftp/webftp_main_dir_row.tpl */
+/* templates//Froxlor/webftp/webftp_main_dir_row.tpl */
gettext("Delete");
-/* templates/Froxlor/webftp/webftp_main_dir_row.tpl */
+/* templates//Froxlor/webftp/webftp_main_dir_row.tpl */
gettext("Rename");
-/* templates/Froxlor/webftp/webftp_main_link_row.tpl */
+/* templates//Froxlor/webftp/webftp_main_file_row.tpl */
gettext("Delete");
-/* templates/Froxlor/webftp/webftp_main_link_row.tpl */
+/* templates//Froxlor/webftp/webftp_main_file_row.tpl */
gettext("Rename");
-/* templates/Froxlor/webftp/webftp_main_link_row.tpl */
-gettext("Symbolic link to");
+/* templates//Froxlor/webftp/webftp_main_file_row.tpl */
+gettext("Edit");
-/* templates/Froxlor/webftp/webftp_main_file_row.tpl */
+/* templates//Froxlor/webftp/webftp_main_link_row.tpl */
gettext("Delete");
-/* templates/Froxlor/webftp/webftp_main_file_row.tpl */
+/* templates//Froxlor/webftp/webftp_main_link_row.tpl */
gettext("Rename");
-/* templates/Froxlor/webftp/webftp_main_file_row.tpl */
-gettext("Edit");
+/* templates//Froxlor/webftp/webftp_main_link_row.tpl */
+gettext("Symbolic link to");
-/* templates/Froxlor/webftp/webftp_main_header.tpl */
+/* templates//Froxlor/webftp/webftp_main_header.tpl */
gettext("Success");
-/* templates/Froxlor/webftp/webftp_main_header.tpl */
+/* templates//Froxlor/webftp/webftp_main_header.tpl */
gettext("Error");
-/* templates/Froxlor/webftp/webftp_main_additional.tpl */
-gettext("Basic operations");
+/* templates//Froxlor/webftp/webftp_edit.tpl */
+gettext("Editing");
-/* templates/Froxlor/webftp/webftp_main_additional.tpl */
-gettext("Change dir");
+/* templates//Froxlor/webftp/webftp_edit.tpl */
+gettext("Success");
-/* templates/Froxlor/webftp/webftp_main_additional.tpl */
-gettext("Create dir");
+/* templates//Froxlor/webftp/webftp_edit.tpl */
+gettext("Error");
-/* templates/Froxlor/webftp/webftp_main_additional.tpl */
-gettext("Create new file in current directory");
+/* templates//Froxlor/webftp/webftp_edit.tpl */
+gettext("Save file");
-/* templates/Froxlor/webftp/webftp_main_additional.tpl */
-gettext("Upload files");
+/* templates//Froxlor/webftp/webftp_edit.tpl */
+gettext("Cancel");
-/* templates/Froxlor/webftp/webftp_main_additional.tpl */
-gettext("Upload file(s)");
+/* templates//Froxlor/webftp/webftp_main_prompt.tpl */
+gettext("Yes");
-/* templates/Froxlor/webftp/webftp_main_rename.tpl */
-gettext("Rename / Move");
+/* templates//Froxlor/webftp/webftp_main_prompt.tpl */
+gettext("No");
-/* templates/Froxlor/webftp/webftp_main.tpl */
+/* templates//Froxlor/webftp/webftp_main.tpl */
gettext("Filename");
-/* templates/Froxlor/webftp/webftp_main.tpl */
+/* templates//Froxlor/webftp/webftp_main.tpl */
gettext("Size");
-/* templates/Froxlor/webftp/webftp_main.tpl */
+/* templates//Froxlor/webftp/webftp_main.tpl */
gettext("Date");
-/* templates/Froxlor/webftp/webftp_main.tpl */
+/* templates//Froxlor/webftp/webftp_main.tpl */
gettext("Permissions");
-/* templates/Froxlor/webftp/webftp_main.tpl */
+/* templates//Froxlor/webftp/webftp_main.tpl */
gettext("User");
-/* templates/Froxlor/webftp/webftp_main.tpl */
+/* templates//Froxlor/webftp/webftp_main.tpl */
gettext("Group");
-/* templates/Froxlor/webftp/webftp_main.tpl */
+/* templates//Froxlor/webftp/webftp_main.tpl */
gettext("Options");
-/* templates/Froxlor/webftp/webftp_main.tpl */
+/* templates//Froxlor/webftp/webftp_main.tpl */
gettext("Files");
-/* templates/Froxlor/webftp/webftp_main.tpl */
+/* templates//Froxlor/webftp/webftp_main.tpl */
gettext("Complete filesize");
-/* templates/Froxlor/webftp/webftp_main.tpl */
+/* templates//Froxlor/webftp/webftp_main.tpl */
gettext("Symlinks");
-/* templates/Froxlor/webftp/webftp_main.tpl */
+/* templates//Froxlor/webftp/webftp_main.tpl */
gettext("Directories");
-/* templates/Froxlor/webftp/webftp_main.tpl */
+/* templates//Froxlor/webftp/webftp_main.tpl */
gettext("Complete directorysize");
-/* templates/Froxlor/webftp/webftp_main_multiple.tpl */
+/* templates//Froxlor/webftp/webftp_main_additional.tpl */
+gettext("Basic operations");
+
+/* templates//Froxlor/webftp/webftp_main_additional.tpl */
+gettext("Change dir");
+
+/* templates//Froxlor/webftp/webftp_main_additional.tpl */
+gettext("Create dir");
+
+/* templates//Froxlor/webftp/webftp_main_additional.tpl */
+gettext("Create new file in current directory");
+
+/* templates//Froxlor/webftp/webftp_main_additional.tpl */
+gettext("Upload files");
+
+/* templates//Froxlor/webftp/webftp_main_additional.tpl */
+gettext("Upload file(s)");
+
+/* templates//Froxlor/webftp/webftp_main_multiple.tpl */
gettext("Selected file(s)");
-/* templates/Froxlor/webftp/webftp_main_multiple.tpl */
+/* templates//Froxlor/webftp/webftp_main_multiple.tpl */
gettext("Delete");
-/* templates/Froxlor/webftp/webftp_main_multiple.tpl */
+/* templates//Froxlor/webftp/webftp_main_multiple.tpl */
gettext("Change permission to");
-/* templates/Froxlor/webftp/webftp_main_multiple.tpl */
+/* templates//Froxlor/webftp/webftp_main_multiple.tpl */
gettext("Move to");
-/* templates/Froxlor/webftp/webftp_main_multiple.tpl */
+/* templates//Froxlor/webftp/webftp_main_multiple.tpl */
gettext("Do it");
-/* templates/Froxlor/index.tpl */
-gettext("the Froxlor Team");
+/* templates//Froxlor/webftp/webftp_main_rename.tpl */
+gettext("Rename / Move");
+
+/* templates//Froxlor/webftp/webftp_edit_new.tpl */
+gettext("Creating a file in");
+
+/* templates//Froxlor/webftp/webftp_edit_new.tpl */
+gettext("Success");
+
+/* templates//Froxlor/webftp/webftp_edit_new.tpl */
+gettext("Error");
+
+/* templates//Froxlor/webftp/webftp_edit_new.tpl */
+gettext("Filename");
+
+/* templates//Froxlor/webftp/webftp_edit_new.tpl */
+gettext("Save file");
+
+/* templates//Froxlor/webftp/webftp_edit_new.tpl */
+gettext("Cancel");
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/templates/Froxlor/webftp/webftp_main_additional.tpl
^
|
| @@ -38,7 +38,7 @@
</section>
<section class="dboarditem bradiusodd">
<h2>{t}Upload files{/t}</h2>
- <form name="putForm" envtype="multipart/form-data" method="POST" action="webftp.php">
+ <form name="putForm" enctype="multipart/form-data" method="POST" action="webftp.php">
<input type="hidden" name="action" value="put" />
<input type="hidden" name="currentDir" value="{$currentDir}" />
<input type="hidden" name="mode" value="{$mode}" />
@@ -77,4 +77,4 @@
</form>
</section>
<br />
- <section class="dboarditemfull bradiusodd">
\ No newline at end of file
+ <section class="dboarditemfull bradiusodd">
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/templates/Froxlor/webftp/webftp_main_header.tpl
^
|
| @@ -8,12 +8,12 @@
{if isset($successmessage)}
<div class="successcontainer bradius">
<div class="successtitle">{t}Success{/t}</div>
- <div class="success">{$successmessage}</div>
+ <div class="success">{$successmessage|escape:'htmlall'|nl2br}</div>
</div>
{/if}
{if isset($errormessage)}
<div class="errorcontainer bradius">
<div class="errortitle">{t}Error{/t}</div>
- <div class="error">{$errormessage}</div>
+ <div class="error">{$errormessage|escape:'htmlall'|nl2br}</div>
</div>
{/if}
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/templates/Froxlor/webftp/webftp_main_prompt.tpl
^
|
| @@ -8,7 +8,7 @@
</style>
<table cellpadding="0" cellspacing="0">
<tr>
- <td colspan="10" align="left"><span class="Stil1">{$action_text}</span></td>
+ <td colspan="10" align="left"><span class="Stil1">{$action_text|escape:'htmlall'|nl2br}</span></td>
</tr>
<tr>
<td colspan="10" align="left">
@@ -19,9 +19,8 @@
</td>
</tr>
<tr>
- <td colspan="10" align="left"><input type="submit" NAME="yes" VALUE="$language[temp_prompt_yes]"><input type="submit" NAME="no" VALUE="$language[temp_prompt_no]">
- </td>
+ <td colspan="10" align="left"><input type="submit" name="yes" value="{t}Yes{/t}"><input type="submit" name="no" value="{t}No{/t}"></td>
</tr>
</tr>
</table>
-</form>
\ No newline at end of file
+</form>
|
|
[-]
[+]
|
Changed |
froxlor-0.9.23.tar.bz2/webftp.php
^
|
| @@ -17,6 +17,8 @@
// Configuration
// Server to connect to:
$server = 'localhost';
+// Connect to the FTP - server via SSL or not
+$useSsl = false;
// Temporary directory on the server (need write permissions)
$downloadDir = "/tmp/";
@@ -30,6 +32,8 @@
$default_mode = "FTP_BINARY";
// Max. uploadsize (0 = unlimited)
$MAX_FILE_SIZE = 1907300;
+// The color of a marked row
+$marked_color = '#FFC2CA';
header("Content-Type: text/html; charset=utf-8");
@@ -191,7 +195,14 @@
$_SESSION['password'] = $_POST['password'];
}
- $connection = @ftp_connect($_SESSION['server']);
+ if ($useSsl)
+ {
+ $connection = @ftp_ssl_connect($_SESSION['server']);
+ }
+ else
+ {
+ $connection = @ftp_connect($_SESSION['server']);
+ }
$loggedOn = @ftp_login($connection, $_SESSION['user'], $_SESSION['password']);
$systype = @ftp_systype($connection);
$pasv = @ftp_pasv($connection, false);
@@ -371,7 +382,7 @@
}
else
{
- $errormessage = sprintf(_('Directory change to \'%1$s\' failed!'), $file);
+ $errormessage = sprintf(_('Directory change to \'%1$s\' failed!') . "\n", $file);
}
break;
case "get": // Datei dwonload
@@ -412,7 +423,7 @@
{
if(file_exists($_FILES[$myFile]['tmp_name']) && ($_FILES[$myFile]['size'] > $MAX_FILE_SIZE && $MAX_FILE_SIZE!=0))
{
- $errormessage .= sprintf(_('<strong>File \'%1$s\' is to big!</strong> (max. %2$u bytes)<br />'), $_FILES[$myFile]['name'], $MAX_FILE_SIZE);
+ $errormessage .= sprintf(_('File \'%1$s\' is to big! (max. %2$u bytes)') . "\n", $_FILES[$myFile]['name'], $MAX_FILE_SIZE);
}
elseif(file_exists($_FILES[$myFile]['tmp_name']))
{
@@ -427,11 +438,11 @@
if(!$uploadStatus)
{
- $errormessage .= sprintf(_('<br />File \'%1$s\' couldn\'t be uploaded!'), $_FILES[$myFile]['name']);
+ $errormessage .= sprintf(_('File \'%1$s\' couldn\'t be uploaded!') . "\n", $_FILES[$myFile]['name']);
}
else
{
- $successmessage .= sprintf(_('<br />File \'%1$s\' was successfully uploaded!'), $_FILES[$myFile]['name']);
+ $successmessage .= sprintf(_('File \'%1$s\' was successfully uploaded!') . "\n", $_FILES[$myFile]['name']);
}
unlink($_FILES[$myFile]['tmp_name']);
@@ -441,21 +452,21 @@
case "deldir": // Ordner löschen
if(ftp_rmdir($connection, html_entity_decode($file)))
{
- $successmessage = sprintf(_('<br />Directory \'%1$s\' deleted!'), $file);
+ $successmessage = sprintf(_('Directory \'%1$s\' deleted!') . "\n", $file);
}
else
{
- $errormessage = sprintf(_('<br />Directory \'%1$s\' couldn\'t be deleted!'), $file);
+ $errormessage = sprintf(_('Directory \'%1$s\' couldn\'t be deleted!') . "\n", $file);
}
break;
case "delfile": // Datei löschen
if (@ftp_delete($connection, $file))
{
- $successmessage = sprintf(_('<br />\'%1$s\' deleted!'), $file);
+ $successmessage = sprintf(_('\'%1$s\' deleted!') . "\n", $file);
}
else
{
- $errormessage = sprintf(_('<br />\'%1$s\' couldn\'t be deleted!'), $file);
+ $errormessage = sprintf(_('\'%1$s\' couldn\'t be deleted!') . "\n", $file);
}
break;
case "rename": // Datei umbennenen
@@ -463,26 +474,26 @@
{
if (@ftp_rename($connection, $file, $_POST['file2']))
{
- $successmessage = sprintf(_('\'%1$s\' renamed to \'%2$s\''), $file, $_POST['file2']);
+ $successmessage = sprintf(_('\'%1$s\' renamed to \'%2$s\'') . "\n", $file, $_POST['file2']);
}
else
{
- $errormessage = sprintf(_('\'%1$s\' couldn\'t be renamed to \'%2$s\'!'), $file, $_POST['file2']);
+ $errormessage = sprintf(_('\'%1$s\' couldn\'t be renamed to \'%2$s\'!') . "\n", $file, $_POST['file2']);
}
}
elseif($_GET['op']=="show")
{
- $smarty->assign('rename_text', sprintf(_('File \'%1$s\' rename/move to'), $file));
+ $smarty->assign('rename_text', sprintf(_('File \'%1$s\' rename/move to') . "\n", $file));
}
break;
case "createdir": // neuen Ordner erstellen
if(@ftp_mkdir($connection, $file))
{
- $successmessage = sprintf(_('Directory \'%1$s\' created'), $file);
+ $successmessage = sprintf(_('Directory \'%1$s\' created') . "\n", $file);
}
else
{
- $errormessage = sprintf(_('Directory \'%1$s\' couldn\'t be created!'), $file);
+ $errormessage = sprintf(_('Directory \'%1$s\' couldn\'t be created!') . "\n", $file);
}
break;
case "chmod": // Berechtigungen setzen
@@ -497,18 +508,18 @@
}
if ($wrongchmod || strlen($_POST['chmod']) > 3)
{
- $errormessage = sprintf(_('<br />The permission \'%1$s\' you entered is not valid!'), $_POST['file2']);
+ $errormessage = sprintf(_('The permission \'%1$s\' you entered is not valid!') . "\n", $_POST['file2']);
}
else
{
$command = "chmod {$_POST['file2']} {$_POST['file']}";
if(!$wrongchmod && ftp_site($connection,$command))
{
- $successmessage = sprintf(_('<br />The permission of \'%1$s\' is set to \'%2$s\'!'), $file, $_POST['file2']);
+ $successmessage = sprintf(_('The permission of \'%1$s\' is set to \'%2$s\'!') . "\n", $file, $_POST['file2']);
}
else
{
- $errormessage = sprintf(_('<br />The permission of \'%1$s\' couldn\'t be set to \'%2$s\'!'), $file, $_POST['file2']);
+ $errormessage = sprintf(_('The permission of \'%1$s\' couldn\'t be set to \'%2$s\'!') . "\n", $file, $_POST['file2']);
}
}
break;
@@ -528,7 +539,7 @@
}
if($wrongchmod || strlen($_POST['chmod'])>3)
{
- $errormessage .= sprintf(_('<br />The permission \'%1$s\' you entered is not valid!'), $_POST['file2']);
+ $errormessage .= sprintf(_('The permission \'%1$s\' you entered is not valid!') . "\n", $_POST['file2']);
}
else
{
@@ -539,11 +550,11 @@
$command = "chmod $_POST[chmod] ".$myName;
if (ftp_site($connection,$command))
{
- $successmessage .= sprintf(_('<br />The permission of \'%1$s\' is set to \'%2$s\'!'), $myName, $_POST['chmod']);
+ $successmessage .= sprintf(_('The permission of \'%1$s\' is set to \'%2$s\'!') . "\n", $myName, $_POST['chmod']);
}
else
{
- $errormessage .= sprintf(_('<br />The permission of \'%1$s\' couldn\'t be set to \'%2$s\'!'), $myName, $_POST['chmod']);
+ $errormessage .= sprintf(_('The permission of \'%1$s\' couldn\'t be set to \'%2$s\'!') . "\n", $myName, $_POST['chmod']);
}
}
}
@@ -568,11 +579,11 @@
if($del_status)
{
- $successmessage .= sprintf(_('<br />\'%1$s\' deleted!'), $myName);
+ $successmessage .= sprintf(_('\'%1$s\' deleted!') . "\n", $myName);
}
else
{
- $errormessage .= sprintf(_('<br />\'%1$s\' couldn\'t be deleted!'), $myName);
+ $errormessage .= sprintf(_('\'%1$s\' couldn\'t be deleted!') . "\n", $myName);
}
}
}
@@ -592,18 +603,18 @@
{
if(ftp_rename($connection, $myName,$_POST['move_to'].$myName))
{
- $successmessage .= sprintf(_('<br />File \'%1$s\' moved'), $myName);
+ $successmessage .= sprintf(_('File \'%1$s\' moved') . "\n", $myName);
}
else
{
- $errormessage .= sprintf(_('<br />File \'%1$s\' couldn\'t be moved'), $myName);
+ $errormessage .= sprintf(_('File \'%1$s\' couldn\'t be moved') . "\n", $myName);
}
}
}
}
else
{
- $errormessage = sprintf(_('The directory \'%1$s\' doesn\'t exist'), $_POST['move_to']);
+ $errormessage = sprintf(_('The directory \'%1$s\' doesn\'t exist') . "\n", $_POST['move_to']);
}
}
}
@@ -647,7 +658,7 @@
if(!$downloadStatus)
{
fclose($fp);
- $errormessage = sprintf(_('File \'%1$s\' couldn\'t be downloaded!'), $file);
+ $errormessage = sprintf(_('File \'%1$s\' couldn\'t be downloaded!') . "\n", $file);
$myFileContent = '';
}
else
@@ -684,18 +695,18 @@
if(!$uploadStatus)
{
- $errormessage = sprintf(_('File \'%1$s\' couldn\'t be saved!'), $file);
+ $errormessage = sprintf(_('File \'%1$s\' couldn\'t be saved!') . "\n", $file);
}
else
{
- $successmessage = sprintf(_('File \'%1$s\' was saved succesfully!'), $file);
+ $successmessage = sprintf(_('File \'%1$s\' was saved succesfully!') . "\n", $file);
}
unlink($downloadDir . killslashes(html_entity_decode($file))."_".$s);
}
}
else
{
- $errormessage = sprintf(_('Files with these extension can\'t be created/edited!'), $file);
+ $errormessage = sprintf(_('Files with this extension can\'t be created/edited!') . "\n", $file);
}
if((isset($_GET['op']) && $_GET['op'] != "new") && (isset($_POST['op']) && $_POST['op'] != "new"))
@@ -703,7 +714,7 @@
if($file == "")
{
$editAble = false;
- $errormessage = _('Please enter a filename!');
+ $errormessage = _('Please enter a filename!') . "\n";
}
}
break;
@@ -766,7 +777,7 @@
$countArray['dirsize'] += $myDir['size'];
$fileAction = "cd";
$fileName = $myDir["name"];
- if(is_array($file) && val_in_array($fileName, $file))
+ if(is_array($file) && in_array($fileName, $file))
{
$smarty->assign('checked', 'checked');
$smarty->assign('checked_color', "bgcolor=\"".$marked_color."\"");
@@ -790,7 +801,7 @@
$countArray['link']++;
$fileAction = "cd";
$fileName = $myDir["target"];
- if (is_array($file) && val_in_array($fileName, $file))
+ if (is_array($file) && in_array($fileName, $file))
{
$smarty->assign('checked', 'checked');
$smarty->assign('checked_color', "bgcolor=\"".$marked_color."\"");
@@ -815,7 +826,7 @@
$countArray['filesize'] += $myDir['size'];
$fileAction = "get";
$fileName = $myDir["name"];
- if (is_array($file) && val_in_array($fileName, $file))
+ if (is_array($file) && in_array($fileName, $file))
{
$smarty->assign('checked', 'checked');
$smarty->assign('checked_color', "bgcolor=\"".$marked_color."\"");
@@ -872,16 +883,16 @@
{
if($_POST['op']=="delete")
{
- $smarty->assign('action_text', _('Do you really want to delete the selected files?'));
+ $smarty->assign('action_text', _('Do you really want to delete the selected files?') . "\n");
}
elseif($_POST['op']=="move")
{
- $smarty->assign('action_text', sprintf(_('Do you really want to move the selected files to \'%1$s\'?'), $_POST['move_to']));
+ $smarty->assign('action_text', sprintf(_('Do you really want to move the selected files to \'%1$s\'?') . "\n", $_POST['move_to']));
$smarty->assign('move_to', $_POST['move_to']);
}
elseif($_POST['op']=="chmod")
{
- $smarty->assign('action_text', sprintf(_('Do you really want to set the permission of the selected files to \'%1$s\'?'), $_POST['chmod']));
+ $smarty->assign('action_text', sprintf(_('Do you really want to set the permission of the selected files to \'%1$s\'?') . "\n", $_POST['chmod']));
$smarty->assign('chmod', $_POST['chmod']);
}
$smarty->assign('op', $_POST['op']);
@@ -904,7 +915,7 @@
}
else
{
- $smarty->assign('errormessage', _('Login failed, please try again'));
+ $smarty->assign('errormessage', _('Login failed, please try again') . "\n");
session_destroy();
$body = $smarty->fetch('login/login_ftp.tpl');
}
|
