openupload-svn-update Mailing List for Open Upload (Page 13)
Status: Beta
Brought to you by:
tsdogs
Menu
▾
▴
openupload-svn-update — tracks SVN commits
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(100) |
Nov
(72) |
Dec
(44) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(7) |
Feb
(47) |
Mar
(30) |
Apr
(11) |
May
(10) |
Jun
(8) |
Jul
(1) |
Aug
(22) |
Sep
|
Oct
|
Nov
(13) |
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
(17) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(10) |
Dec
(1) |
| 2011 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ts...@us...> - 2008-10-31 16:40:11
|
Revision: 96
http://openupload.svn.sourceforge.net/openupload/?rev=96&view=rev
Author: tsdogs
Date: 2008-10-31 16:40:01 +0000 (Fri, 31 Oct 2008)
Log Message:
-----------
fix registration bug for renamed functions
Modified Paths:
--------------
trunk/lib/modules/default/admin.inc.php
Modified: trunk/lib/modules/default/admin.inc.php
===================================================================
--- trunk/lib/modules/default/admin.inc.php 2008-10-31 16:39:45 UTC (rev 95)
+++ trunk/lib/modules/default/admin.inc.php 2008-10-31 16:40:01 UTC (rev 96)
@@ -264,7 +264,6 @@
$right['action']='*';
$right['access']='deny';
if (isset($_POST['addrightgroup'])) {
- $right['id']='';
$right['group_name']=$_POST['addrightgroup'];
$right['module']=$_POST['addrightmodule'];
$right['action']=$_POST['addrightaction'];
@@ -366,7 +365,6 @@
$this->tpl->assign('access',$access);
$plugin['access']='disable';
if (isset($_POST['addplugingroup'])) {
- $plugin['id']='';
$plugin['group_name']=$_POST['addplugingroup'];
$plugin['plugin']=$_POST['addpluginplugin'];
$plugin['access']=$_POST['addpluginaccess'];
@@ -441,7 +439,6 @@
$ban = app()->db->read('banned',array('ip' => $ip));
$ban = $ban[0];
if ($ban['ip']!=$ip) {
- $ban['id']='';
$ban['priority']='10'; /* maybe a bigger one is better */
$ban['ip']=$ip;
$ban['access']='deny';
@@ -459,7 +456,6 @@
$ban = app()->db->read('banned',array('ip' => $ip));
$ban = $ban[0];
if ($ban['ip']!=$ip) {
- $ban['id']='';
$ban['priority']=$_POST['addbannedpriority'];
$ban['ip']=$ip;
$ban['access']=$_POST['addbannedaccess'];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-31 16:39:49
|
Revision: 95
http://openupload.svn.sourceforge.net/openupload/?rev=95&view=rev
Author: tsdogs
Date: 2008-10-31 16:39:45 +0000 (Fri, 31 Oct 2008)
Log Message:
-----------
fix registration bug for renamed functions
Modified Paths:
--------------
trunk/lib/modules/auth/default.inc.php
Modified: trunk/lib/modules/auth/default.inc.php
===================================================================
--- trunk/lib/modules/auth/default.inc.php 2008-10-28 18:55:55 UTC (rev 94)
+++ trunk/lib/modules/auth/default.inc.php 2008-10-31 16:39:45 UTC (rev 95)
@@ -5,7 +5,7 @@
var $userfields;
function defaultAuth() {
- $this->userfields = array('id','login','password','name','group_name','email','lang','reg_date','regid','active');
+ $this->userfields = array('login','password','name','group_name','email','lang','reg_date','regid','active');
$this->features = array('useradmin' => 'yes', 'groupadmin' => 'yes');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-28 18:55:57
|
Revision: 94
http://openupload.svn.sourceforge.net/openupload/?rev=94&view=rev
Author: tsdogs
Date: 2008-10-28 18:55:55 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
Update for release
Modified Paths:
--------------
web/index.html
Modified: web/index.html
===================================================================
--- web/index.html 2008-10-28 18:48:42 UTC (rev 93)
+++ web/index.html 2008-10-28 18:55:55 UTC (rev 94)
@@ -139,7 +139,8 @@
</div>
<div id="section">
<div id="title">Download</div>
-<div id="text">No release is available for now, check out svn for an overview.</div>
+<div id="text">2008.10.28<br>It ain't perfect but I think it's pretty usable.<br>Release 0.3 is out.
+Click <a target="_new" href="http://sourceforge.net/project/showfiles.php?group_id=242018&package_id=294593&release_id=636546">here</a> to download.</div>
</div>
<div id="section">
<div id="title">Mailing lists</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-28 18:48:45
|
Revision: 93
http://openupload.svn.sourceforge.net/openupload/?rev=93&view=rev
Author: tsdogs
Date: 2008-10-28 18:48:42 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
Release
Modified Paths:
--------------
trunk/CHANGELOG
Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG 2008-10-28 18:31:29 UTC (rev 92)
+++ trunk/CHANGELOG 2008-10-28 18:48:42 UTC (rev 93)
@@ -1,4 +1,4 @@
-Changelog before release (0.3?) (updated on 2008.10.24).
+Changelog for release 0.3 (updated on 2008.10.28).
* General
- make sub www folders not accessible by default (some index.html files)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-28 18:31:31
|
Revision: 92
http://openupload.svn.sourceforge.net/openupload/?rev=92&view=rev
Author: tsdogs
Date: 2008-10-28 18:31:29 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
Preparing for release
Modified Paths:
--------------
trunk/CHANGELOG
trunk/TODO
Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG 2008-10-28 18:28:05 UTC (rev 91)
+++ trunk/CHANGELOG 2008-10-28 18:31:29 UTC (rev 92)
@@ -34,10 +34,13 @@
- Modules
- Plugins
+* Templates
+ - removed absolute paths from templates, to retrieve default template file if template file is not found
+
* Translations
- gettext module
- - array module
- - initial Italian translation
+ - phparray module
+ - initial Italian translation (admin templates need a review)
* Download
- Changed serve file method to not go over the memory php limit (disable output buffer)
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2008-10-28 18:28:05 UTC (rev 91)
+++ trunk/TODO 2008-10-28 18:31:29 UTC (rev 92)
@@ -1,16 +1,11 @@
TODO list not priority ordered.
-RELEASE: not until api and db are stable.
******* MUST BE DONE BEFORE RELEASE *******
-Translation
-- Update the translations
+All seems to be done.
-Templates
-- remove absolute paths from templates, to retrieve default template file if template file is not found
-
-******* WOULD LIKE IT TO BE IN RELEASE *******
+******* POSTPONED FOR NEXT RELEASE *******
Upload
-- Display upload progress
+- Display upload progress (a bit too triky and workarounds ain't really nice)
Database
- pgsql module
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-28 18:28:07
|
Revision: 91
http://openupload.svn.sourceforge.net/openupload/?rev=91&view=rev
Author: tsdogs
Date: 2008-10-28 18:28:05 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
Updated italian translation of template
Modified Paths:
--------------
trunk/templates/default/locale/it/LC_MESSAGES/template.mo
trunk/templates/default/locale/it/LC_MESSAGES/template.po
trunk/templates/default/locale/it.inc.php
Added Paths:
-----------
trunk/templates/default/locale/en.inc.php
Added: trunk/templates/default/locale/en.inc.php
===================================================================
--- trunk/templates/default/locale/en.inc.php (rev 0)
+++ trunk/templates/default/locale/en.inc.php 2008-10-28 18:28:05 UTC (rev 91)
@@ -0,0 +1,3 @@
+<?php
+// english is default, don't translate
+?>
\ No newline at end of file
Modified: trunk/templates/default/locale/it/LC_MESSAGES/template.mo
===================================================================
(Binary files differ)
Modified: trunk/templates/default/locale/it/LC_MESSAGES/template.po
===================================================================
--- trunk/templates/default/locale/it/LC_MESSAGES/template.po 2008-10-28 18:27:42 UTC (rev 90)
+++ trunk/templates/default/locale/it/LC_MESSAGES/template.po 2008-10-28 18:28:05 UTC (rev 91)
@@ -2,242 +2,478 @@
msgstr ""
"Project-Id-Version: OpenUpload default template\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-13 20:38+0100\n"
-"PO-Revision-Date: 2008-10-13 20:43+0100\n"
+"POT-Creation-Date: 2008-10-28 18:29+0100\n"
+"PO-Revision-Date: 2008-10-28 18:29+0100\n"
"Last-Translator: Alessandro Briosi <ts...@br...>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Italian\n"
"X-Poedit-Basepath: .\n"
-"X-Poedit-SearchPath-0: ../..\n"
+"X-Poedit-SearchPath-0: ../../..\n"
-#: ../../default.c:2
+#: ../../../default.c:2
+msgid "Your IP has been blocked!"
+msgstr "Il tuo IP è bloccato!"
+
+#: ../../../default.c:5
+msgid "You cannot use this site."
+msgstr "Non puoi utilizzare questo sito."
+
+#: ../../../default.c:8
+msgid "If you think this is a misconfiguration please send an email to the site owner"
+msgstr "Se pensi sia un errore di configurazione, invia una e-mail al proprietario del sito"
+
+#: ../../../default.c:11
msgid "Captcha code"
msgstr "Codice Captcha"
-#: ../../default.c:5
-#: ../../default.c:11
+#: ../../../default.c:14
+#: ../../../default.c:20
msgid "Reload Image"
msgstr "Ricarica immagine"
-#: ../../default.c:8
+#: ../../../default.c:17
msgid "Please enter the following captcha to proceed for the download"
msgstr "Prego inserire il seguente codice captch per procedere al download"
-#: ../../default.c:14
+#: ../../../default.c:23
msgid "Use Captcha"
msgstr "Utilizza Captcha"
-#: ../../default.c:17
+#: ../../../default.c:26
msgid "The download is password protected."
-msgstr "Il file \xE8 protetto da una password."
+msgstr "Il file è protetto da una password."
-#: ../../default.c:20
-#: ../../default.c:38
-#: ../../default.c:65
-#: ../../default.c:197
-#: ../../default.c:218
+#: ../../../default.c:29
+#: ../../../default.c:50
+#: ../../../default.c:80
+#: ../../../default.c:161
+#: ../../../default.c:287
+#: ../../../default.c:416
+#: ../../../default.c:467
msgid "Password"
msgstr "Password"
-#: ../../default.c:23
+#: ../../../default.c:32
msgid "Password protect"
msgstr "Password di protezione"
-#: ../../default.c:26
-#: ../../default.c:53
+#: ../../../default.c:35
+#: ../../../default.c:65
msgid "You are receiving this message because someone uploaded a file on our OpenUpload server for you."
-msgstr "Hai ricevuto questo messaggio perch\xE8 qualcuno ti ha inviato un file attraverso il nostro server OpenUpload."
+msgstr "Hai ricevuto questo messaggio perchè qualcuno ti ha inviato un file attraverso il nostro server OpenUpload."
-#: ../../default.c:29
-#: ../../default.c:56
-#: ../../default.c:110
-#: ../../default.c:155
-#: ../../default.c:167
-#: ../../default.c:185
+#: ../../../default.c:38
+#: ../../../default.c:68
+msgid "File ID"
+msgstr "ID File"
+
+#: ../../../default.c:41
+#: ../../../default.c:71
+#: ../../../default.c:326
+#: ../../../default.c:374
+#: ../../../default.c:386
+#: ../../../default.c:404
msgid "File name"
msgstr "Nome file"
-#: ../../default.c:32
-#: ../../default.c:59
-#: ../../default.c:113
-#: ../../default.c:158
-#: ../../default.c:170
-#: ../../default.c:188
+#: ../../../default.c:44
+#: ../../../default.c:74
+#: ../../../default.c:329
+#: ../../../default.c:377
+#: ../../../default.c:389
+#: ../../../default.c:407
msgid "File size"
msgstr "Dimensione"
-#: ../../default.c:35
-#: ../../default.c:62
-#: ../../default.c:173
+#: ../../../default.c:47
+#: ../../../default.c:77
+#: ../../../default.c:146
+#: ../../../default.c:314
+#: ../../../default.c:392
msgid "Description"
msgstr "Descrizione"
-#: ../../default.c:41
-#: ../../default.c:68
+#: ../../../default.c:53
+#: ../../../default.c:83
msgid "User message"
msgstr "Messaggio"
-#: ../../default.c:44
-#: ../../default.c:71
+#: ../../../default.c:56
+#: ../../../default.c:86
msgid "To download the file open the following link in a browser"
msgstr "Per scaricare il file apri il seguente link in un browser"
-#: ../../default.c:47
-#: ../../default.c:74
+#: ../../../default.c:59
+#: ../../../default.c:89
msgid "To remove the file from our server open the following link in a browser"
msgstr "Per rimuovere il file dai ns. server apri il link seguente in un browser"
-#: ../../default.c:50
-#: ../../default.c:77
+#: ../../../default.c:62
+#: ../../../default.c:92
+#: ../../../default.c:443
+#: ../../../default.c:458
msgid "For complains please send an email to"
msgstr "Per segnalazioni di abuso prego inviare una email a "
-#: ../../default.c:80
-#: ../../default.c:86
+#: ../../../default.c:95
+#: ../../../default.c:101
msgid "Send me an e-mail"
msgstr "Inviami una e-mail"
-#: ../../default.c:83
+#: ../../../default.c:98
msgid "Your e-mail address"
msgstr "Il tuo indirizzo e-mail"
-#: ../../default.c:89
+#: ../../../default.c:104
msgid "Send e-mail to"
msgstr "Invia e-mail a"
-#: ../../default.c:92
+#: ../../../default.c:107
msgid "Send remove link"
msgstr "Invia link per la rimozione"
-#: ../../default.c:95
+#: ../../../default.c:110
msgid "e-mail Subject"
msgstr "Oggetto e-mail"
-#: ../../default.c:98
+#: ../../../default.c:113
msgid "e-mail Message"
msgstr "Messaggio e-mail"
-#: ../../default.c:101
+#: ../../../default.c:116
msgid "Only the following mime types are allowed"
msgstr "Solo i seguenti tipi di files possono essere caricati"
-#: ../../default.c:104
+#: ../../../default.c:119
+#: ../../../default.c:233
+msgid "Plugin"
+msgstr "Plugin"
+
+#: ../../../default.c:122
+#: ../../../default.c:173
+#: ../../../default.c:185
+#: ../../../default.c:236
+#: ../../../default.c:269
+#: ../../../default.c:299
+msgid "Group"
+msgstr "Gruppo"
+
+#: ../../../default.c:125
+#: ../../../default.c:134
+#: ../../../default.c:194
+#: ../../../default.c:224
+#: ../../../default.c:239
+#: ../../../default.c:278
+msgid "Access"
+msgstr "Accesso"
+
+#: ../../../default.c:128
+#: ../../../default.c:197
+#: ../../../default.c:230
+#: ../../../default.c:308
+#: ../../../default.c:317
+msgid "Add"
+msgstr "Aggiungi"
+
+#: ../../../default.c:131
+#: ../../../default.c:221
+msgid "IP"
+msgstr "IP"
+
+#: ../../../default.c:137
+#: ../../../default.c:227
+msgid "Priority"
+msgstr "Priorità"
+
+#: ../../../default.c:140
+#: ../../../default.c:149
+#: ../../../default.c:182
+#: ../../../default.c:242
+#: ../../../default.c:281
+#: ../../../default.c:536
+msgid "Confirm"
+msgstr "Conferma"
+
+#: ../../../default.c:143
+#: ../../../default.c:311
+msgid "Name"
+msgstr "Nome Completo"
+
+#: ../../../default.c:152
+msgid "Plugins ACL"
+msgstr "ACL Plugins"
+
+#: ../../../default.c:155
+msgid "Plugins Options"
+msgstr "Opzioni Plugin"
+
+#: ../../../default.c:158
+#: ../../../default.c:284
+#: ../../../default.c:413
+#: ../../../default.c:485
+#: ../../../default.c:512
+msgid "Login name"
+msgstr "Nome utente"
+
+#: ../../../default.c:164
+#: ../../../default.c:290
+#: ../../../default.c:419
+msgid "Retype Password"
+msgstr "Reinserisci password"
+
+#: ../../../default.c:167
+#: ../../../default.c:293
+#: ../../../default.c:422
+#: ../../../default.c:488
+#: ../../../default.c:515
+msgid "Full Name"
+msgstr "Nome Completo"
+
+#: ../../../default.c:170
+#: ../../../default.c:296
+#: ../../../default.c:425
+#: ../../../default.c:491
+#: ../../../default.c:518
+msgid "e-mail"
+msgstr "E-mail"
+
+#: ../../../default.c:176
+#: ../../../default.c:302
+#: ../../../default.c:428
+#: ../../../default.c:521
+msgid "Preferred language"
+msgstr "Lingua"
+
+#: ../../../default.c:179
+#: ../../../default.c:305
+msgid "Active"
+msgstr "Attivo"
+
+#: ../../../default.c:188
+#: ../../../default.c:272
+msgid "Module"
+msgstr "Modulo"
+
+#: ../../../default.c:191
+#: ../../../default.c:275
+msgid "Action"
+msgstr "Azione"
+
+#: ../../../default.c:200
+#: ../../../default.c:248
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: ../../../default.c:203
+#: ../../../default.c:251
+msgid "Plugins"
+msgstr "Plugin"
+
+#: ../../../default.c:206
+#: ../../../default.c:254
+msgid "Files"
+msgstr "File"
+
+#: ../../../default.c:209
+#: ../../../default.c:257
+msgid "Users"
+msgstr "Utenti"
+
+#: ../../../default.c:212
+#: ../../../default.c:260
+msgid "Groups"
+msgstr "Gruppi"
+
+#: ../../../default.c:215
+#: ../../../default.c:263
+msgid "Rights"
+msgstr "Permessi"
+
+#: ../../../default.c:218
+msgid "Banned"
+msgstr "Bloccato"
+
+#: ../../../default.c:245
+msgid "Here you can administer"
+msgstr "In questa sezione puoi amministrare"
+
+#: ../../../default.c:266
+msgid "Banned IPs"
+msgstr "IP bloccati"
+
+#: ../../../default.c:320
msgid "You requested to remove the following file"
msgstr "Hai richiesto la rimozione del seguente file"
-#: ../../default.c:107
-#: ../../default.c:152
-#: ../../default.c:182
+#: ../../../default.c:323
+#: ../../../default.c:371
+#: ../../../default.c:401
msgid "File description"
msgstr "Descrizione"
-#: ../../default.c:116
-#: ../../default.c:161
-#: ../../default.c:191
+#: ../../../default.c:332
+#: ../../../default.c:380
+#: ../../../default.c:410
msgid "Uploaded on"
msgstr "Caricato il"
-#: ../../default.c:119
+#: ../../../default.c:335
msgid "Confirm removal"
msgstr "Conferma rimozione"
-#: ../../default.c:122
+#: ../../../default.c:338
msgid "Download link"
msgstr "Link per lo scaricamento"
-#: ../../default.c:125
+#: ../../../default.c:341
msgid "Remove link"
msgstr "Link per la rimozione"
-#: ../../default.c:128
+#: ../../../default.c:344
msgid "Upload a new file"
msgstr "Carica un nuovo file"
-#: ../../default.c:131
+#: ../../../default.c:347
msgid "Please enter the File Information requested"
msgstr "Prego inserire le informazioni sul File"
-#: ../../default.c:134
+#: ../../../default.c:350
msgid "File code"
msgstr "Codice file"
-#: ../../default.c:137
-#: ../../default.c:146
+#: ../../../default.c:353
+#: ../../../default.c:365
msgid "Proceed"
msgstr "Procedi"
-#: ../../default.c:140
+#: ../../../default.c:356
msgid "Select the file to be uploaded"
msgstr "Seleziona il file da caricare"
-#: ../../default.c:143
+#: ../../../default.c:359
+msgid "Maximum allowed upload size"
+msgstr "Dimensione massima di upload"
+
+#: ../../../default.c:362
msgid "Upload"
msgstr "Carica"
-#: ../../default.c:149
+#: ../../../default.c:368
msgid "You can now proceed downloading the file"
msgstr "Puoi ora procedere allo scaricamento del file"
-#: ../../default.c:164
+#: ../../../default.c:383
msgid "Download file"
msgstr "Scarica file"
-#: ../../default.c:176
+#: ../../../default.c:395
msgid "Complete upload"
msgstr "Completa caricamento"
-#: ../../default.c:179
+#: ../../../default.c:398
msgid "FILE HAS BEEN SUCCESSGULLY REMOVED"
msgstr "IL FILE E' STATO RIMOSSO CON SUCCESSO"
-#: ../../default.c:194
-msgid "Login name"
-msgstr "Nome utente"
+#: ../../../default.c:431
+#: ../../../default.c:446
+msgid "Dear "
+msgstr "Egregio"
-#: ../../default.c:200
-msgid "Retype Password"
-msgstr "Reinserisci password"
+#: ../../../default.c:434
+#: ../../../default.c:449
+msgid "This e-mail message is sent to you to confirm your account registration has a valid e-mail address."
+msgstr "Questo messaggio ti è stato inviato per confermare che il tuo account abbia un indirizzo e-mail valido"
-#: ../../default.c:203
-msgid "Full Name"
-msgstr "Nome Completo"
+#: ../../../default.c:437
+#: ../../../default.c:452
+msgid "Open the following link in a browser to confirm your account."
+msgstr "Apri il seguente indirizzo in un browser per confermare il tuo account."
-#: ../../default.c:206
-msgid "e-mail"
-msgstr "E-mail"
+#: ../../../default.c:440
+#: ../../../default.c:455
+msgid "Best regards"
+msgstr "Cordiali saluti"
-#: ../../default.c:209
-msgid "Preferred language"
-msgstr "Lingua"
-
-#: ../../default.c:212
+#: ../../../default.c:461
msgid "User login"
msgstr "Login utente"
-#: ../../default.c:215
+#: ../../../default.c:464
msgid "User name"
msgstr "Nome Utente"
-#: ../../default.c:221
+#: ../../../default.c:470
msgid "Login"
msgstr "Accedi"
-#: ../../default.c:224
+#: ../../../default.c:473
msgid "You don't have an account?"
msgstr "Non possiedi un account?"
-#: ../../default.c:227
+#: ../../../default.c:476
msgid "Register here"
msgstr "Registrati qui"
-#: ../../default.c:230
+#: ../../../default.c:479
msgid "or you can"
msgstr "oppure puoi"
-#: ../../default.c:233
+#: ../../../default.c:482
msgid "Login here"
msgstr "Accedere qui"
+#: ../../../default.c:494
+msgid "Language"
+msgstr "Lingua"
+
+#: ../../../default.c:497
+msgid "Change"
+msgstr "Modifica"
+
+#: ../../../default.c:500
+msgid "Registration succeded"
+msgstr "Registrazione avvenuta con successo"
+
+#: ../../../default.c:503
+msgid "An e-mail has been sent for the accout activation"
+msgstr "Un'email ti è stata inviata per confermare l'attivazione del tuo account"
+
+#: ../../../default.c:506
+msgid "Please follow the e-mail instructions to activate your account."
+msgstr "Segui le istruzioni dell'e-mail per attivare il tuo account."
+
+#: ../../../default.c:509
+msgid "back to home"
+msgstr "torna alla pagina principale"
+
+#: ../../../default.c:524
+msgid "Old password"
+msgstr "Vecchia Password"
+
+#: ../../../default.c:527
+msgid "New password"
+msgstr "Nuova Password"
+
+#: ../../../default.c:530
+msgid "Retype password"
+msgstr "Reinserisci password"
+
+#: ../../../default.c:533
+msgid "Cancel"
+msgstr "Annulla"
+
+#: ../../../default.c:539
+msgid "Your account registration has been confirmed."
+msgstr "La registrazione del tuo account ha avuto successo."
+
+#: ../../../default.c:542
+msgid "You can now proceed with the login"
+msgstr "Puoi ora procedere al login"
+
+#: ../../../default.c:545
+msgid "here"
+msgstr "quì"
+
Modified: trunk/templates/default/locale/it.inc.php
===================================================================
--- trunk/templates/default/locale/it.inc.php 2008-10-28 18:27:42 UTC (rev 90)
+++ trunk/templates/default/locale/it.inc.php 2008-10-28 18:28:05 UTC (rev 91)
@@ -1,49 +1,96 @@
<?php
-$tr['User login']='Accesso';
-$tr['User name']='Nome Utente';
-$tr['Password']='Password';
-$tr['Login']='Accedi';
-$tr['You don\'t have an account?']='Non possiedi un account?';
-$tr['Register here']='Registrati qui';
-$tr['or you can']='oppure puoi';
-$tr['Login here']='Accedere qui';
-$tr['Accedi']='Accedi';
-$tr['Only the following mime types are allowed']='Solo i seguenti tipi di file sono accettati';
-$tr['Select the file to be uploaded']='Seleziona il file da caricare';
-$tr['Upload']='Carica';
-$tr['Carica file']='Carica file';
-$tr['Captcha code']='Codice Captcha';
-$tr['Reload Image']='Ricarica immagine';
-$tr['Login name']='Nome utente';
-$tr['Retype Password']='Conferma Password';
-$tr['Full Name']='Nome Completo';
-$tr['e-mail']='e-mail';
-$tr['Preferred language']='Lingua';
-$tr['Registrazione utente']='Registrazione utente';
-$tr['Send me an e-mail']='Inviami una e-amil';
-$tr['Your e-mail address']='Il tuo indirizzo e-mail';
-$tr['Send e-mail to']='Invia una e-mail a';
-$tr['Send remove link']='Invia link di rimozione';
-$tr['e-mail Subject']='e-mail Oggetto';
-$tr['e-mail Message']='e-mail Messaggio';
-$tr['Password protect']='Password di protezione';
-$tr['Use Captcha']='Utilizza Captcha';
-$tr['File name']='Nome file';
-$tr['File size']='Dimensione file';
-$tr['Description']='Descrizione';
-$tr['Complete upload']='Conferma';
-$tr['You are receiving this message because someone uploaded a file on our OpenUpload server for you.']='Hai ricevuto questa e-mail perchè qualcuno ha utilizzato il ns. servizio OpenUpload per inviarti un file.';
-$tr['To download the file open the following link in a browser']='Per scaricare il file apri il link seguante in un browser';
-$tr['To remove the file from our server open the following link in a browser']='Per rimuovere il file dai ns. server apri il link seguente in un browser';
-$tr['Download link']='Link di download';
-$tr['Remove link']='Link di rimozione';
-$tr['Upload a new file']='Carica un nuovo file';
-$tr['The download is password protected.']='Il file è protetto da password.';
-$tr['Please enter the following captcha to proceed for the download']='Inserire il codice captcha per proseguire nello scaricamento';
-$tr['Proceed']='Procedi';
-$tr['Scarica file']='Scarica file';
-$tr['You can now proceed downloading the file']='Puoi ora procedere allo scaricamento del file';
-$tr['File description']='Descrizione';
-$tr['Uploaded on']='Caricato il';
-$tr['Download file']='Scarica file';
+$tr["Your IP has been blocked!"] = "Il tuo IP è bloccato!";
+$tr["You cannot use this site."] = "Non puoi utilizzare questo sito.";
+$tr["If you think this is a misconfiguration please send an email to the site owner"] = "Se pensi sia un errore di configurazione, invia una e-mail al proprietario del sito";
+$tr["Captcha code"] = "Codice Captcha";
+$tr["Reload Image"] = "Ricarica immagine";
+$tr["Please enter the following captcha to proceed for the download"] = "Prego inserire il seguente codice captch per procedere al download";
+$tr["Use Captcha"] = "Utilizza Captcha";
+$tr["The download is password protected."] = "Il file è protetto da una password.";
+$tr["Password"] = "Password";
+$tr["Password protect"] = "Password di protezione";
+$tr["You are receiving this message because someone uploaded a file on our OpenUpload server for you."] = "Hai ricevuto questo messaggio perchè qualcuno ti ha inviato un file attraverso il nostro server OpenUpload.";
+$tr["File ID"] = "ID File";
+$tr["File name"] = "Nome file";
+$tr["File size"] = "Dimensione";
+$tr["Description"] = "Descrizione";
+$tr["User message"] = "Messaggio";
+$tr["To download the file open the following link in a browser"] = "Per scaricare il file apri il seguente link in un browser";
+$tr["To remove the file from our server open the following link in a browser"] = "Per rimuovere il file dai ns. server apri il link seguente in un browser";
+$tr["For complains please send an email to"] = "Per segnalazioni di abuso prego inviare una email a ";
+$tr["Send me an e-mail"] = "Inviami una e-mail";
+$tr["Your e-mail address"] = "Il tuo indirizzo e-mail";
+$tr["Send e-mail to"] = "Invia e-mail a";
+$tr["Send remove link"] = "Invia link per la rimozione";
+$tr["e-mail Subject"] = "Oggetto e-mail";
+$tr["e-mail Message"] = "Messaggio e-mail";
+$tr["Only the following mime types are allowed"] = "Solo i seguenti tipi di files possono essere caricati";
+$tr["Plugin"] = "Plugin";
+$tr["Group"] = "Gruppo";
+$tr["Access"] = "Accesso";
+$tr["Add"] = "Aggiungi";
+$tr["IP"] = "IP";
+$tr["Priority"] = "Priorità";
+$tr["Confirm"] = "Conferma";
+$tr["Name"] = "Nome Completo";
+$tr["Plugins ACL"] = "ACL Plugins";
+$tr["Plugins Options"] = "Opzioni Plugin";
+$tr["Login name"] = "Nome utente";
+$tr["Retype Password"] = "Reinserisci password";
+$tr["Full Name"] = "Nome Completo";
+$tr["e-mail"] = "E-mail";
+$tr["Preferred language"] = "Lingua";
+$tr["Active"] = "Attivo";
+$tr["Module"] = "Modulo";
+$tr["Action"] = "Azione";
+$tr["Settings"] = "Impostazioni";
+$tr["Plugins"] = "Plugin";
+$tr["Files"] = "File";
+$tr["Users"] = "Utenti";
+$tr["Groups"] = "Gruppi";
+$tr["Rights"] = "Permessi";
+$tr["Banned"] = "Bloccato";
+$tr["Here you can administer"] = "In questa sezione puoi amministrare";
+$tr["Banned IPs"] = "IP bloccati";
+$tr["You requested to remove the following file"] = "Hai richiesto la rimozione del seguente file";
+$tr["File description"] = "Descrizione";
+$tr["Uploaded on"] = "Caricato il";
+$tr["Confirm removal"] = "Conferma rimozione";
+$tr["Download link"] = "Link per lo scaricamento";
+$tr["Remove link"] = "Link per la rimozione";
+$tr["Upload a new file"] = "Carica un nuovo file";
+$tr["Please enter the File Information requested"] = "Prego inserire le informazioni sul File";
+$tr["File code"] = "Codice file";
+$tr["Proceed"] = "Procedi";
+$tr["Select the file to be uploaded"] = "Seleziona il file da caricare";
+$tr["Maximum allowed upload size"] = "Dimensione massima di upload";
+$tr["Upload"] = "Carica";
+$tr["You can now proceed downloading the file"] = "Puoi ora procedere allo scaricamento del file";
+$tr["Download file"] = "Scarica file";
+$tr["Complete upload"] = "Completa caricamento";
+$tr["FILE HAS BEEN SUCCESSGULLY REMOVED"] = "IL FILE E' STATO RIMOSSO CON SUCCESSO";
+$tr["Dear "] = "Egregio";
+$tr["This e-mail message is sent to you to confirm your account registration has a valid e-mail address."] = "Questo messaggio ti è stato inviato per confermare che il tuo account abbia un indirizzo e-mail valido";
+$tr["Open the following link in a browser to confirm your account."] = "Apri il seguente indirizzo in un browser per confermare il tuo account.";
+$tr["Best regards"] = "Cordiali saluti";
+$tr["User login"] = "Login utente";
+$tr["User name"] = "Nome Utente";
+$tr["Login"] = "Accedi";
+$tr["You don't have an account?"] = "Non possiedi un account?";
+$tr["Register here"] = "Registrati qui";
+$tr["or you can"] = "oppure puoi";
+$tr["Login here"] = "Accedere qui";
+$tr["Language"] = "Lingua";
+$tr["Change"] = "Modifica";
+$tr["Registration succeded"] = "Registrazione avvenuta con successo";
+$tr["An e-mail has been sent for the accout activation"] = "Un'email ti è stata inviata per confermare l'attivazione del tuo account";
+$tr["Please follow the e-mail instructions to activate your account."] = "Segui le istruzioni dell'e-mail per attivare il tuo account.";
+$tr["back to home"] = "torna alla pagina principale";
+$tr["Old password"] = "Vecchia Password";
+$tr["New password"] = "Nuova Password";
+$tr["Retype password"] = "Reinserisci password";
+$tr["Cancel"] = "Annulla";
+$tr["Your account registration has been confirmed."] = "La registrazione del tuo account ha avuto successo.";
+$tr["You can now proceed with the login"] = "Puoi ora procedere al login";
+$tr["here"] = "quì";
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-28 18:27:45
|
Revision: 90
http://openupload.svn.sourceforge.net/openupload/?rev=90&view=rev
Author: tsdogs
Date: 2008-10-28 18:27:42 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
Updated italian translation of base
Modified Paths:
--------------
trunk/locale/it/LC_MESSAGES/openupload.mo
trunk/locale/it/LC_MESSAGES/openupload.po
trunk/locale/it.inc.php
Modified: trunk/locale/it/LC_MESSAGES/openupload.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/openupload.po
===================================================================
--- trunk/locale/it/LC_MESSAGES/openupload.po 2008-10-28 18:27:19 UTC (rev 89)
+++ trunk/locale/it/LC_MESSAGES/openupload.po 2008-10-28 18:27:42 UTC (rev 90)
@@ -2,8 +2,8 @@
msgstr ""
"Project-Id-Version: OpenUpload\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-14 17:16+0100\n"
-"PO-Revision-Date: 2008-10-14 17:17+0100\n"
+"POT-Creation-Date: 2008-10-27 13:16+0100\n"
+"PO-Revision-Date: 2008-10-27 19:33+0100\n"
"Last-Translator: Alessandro Briosi <ts...@br...>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,67 +15,130 @@
"X-Poedit-SearchPath-0: ../../../lib\n"
"X-Poedit-SearchPath-1: ../../../plugins\n"
-#: ../../../lib/classes.inc.php:129
+#: ../../../lib/user.inc.php:87
msgid "Login incorrect!"
msgstr "Login incorretto!"
-#: ../../../lib/main.inc.php:153
+#: ../../../lib/main.inc.php:194
msgid "plugin include file not found: %1"
msgstr "Il plugin non è stato trovato: %1"
-#: ../../../lib/modules/db/txt.inc.php:40
+#: ../../../lib/main.inc.php:373
+msgid "IP Banned"
+msgstr "IP Bloccato"
+
+#: ../../../lib/main.inc.php:398
+msgid "THERE HAS BEEN A PERMISSION ERROR. PLEASE TRY ONE OF THE ALLOWED OPTIONS!"
+msgstr "SI E' VERIFICATO UN PROBLEMA CON I PERMESSI. ACCESSO NEGATO. PROVARE CON UN'OPERAZIONE CONSENTITA!"
+
+#: ../../../lib/modules/db/txt.inc.php:114
msgid "ERROR: database folder not found!"
msgstr "ERRORE: Cartella database non trovata!"
-#: ../../../lib/modules/db/txt.inc.php:46
+#: ../../../lib/modules/db/txt.inc.php:120
msgid "ERROR: Could not create folder for %1 table!"
msgstr "ERRORE: Impossibile create cartella per la tabella %1!"
-#: ../../../lib/modules/db/mysql.inc.php:13
+#: ../../../lib/modules/db/txt.inc.php:131
+msgid "ERROR: Could not create file for %1 table!"
+msgstr "ERRORE: Impossibile create la cartella per la tabella %1!"
+
+#: ../../../lib/modules/db/mysql.inc.php:15
msgid "ERROR: connection to database failed!"
msgstr "ERRORE: Fallita connessione al database!"
-#: ../../../lib/modules/default/auth.inc.php:22
-#: ../../../lib/modules/default/auth.inc.php:32
+#: ../../../lib/modules/default/auth.inc.php:27
+#: ../../../lib/modules/default/auth.inc.php:40
msgid "Login"
msgstr "Accedi"
-#: ../../../lib/modules/default/auth.inc.php:25
+#: ../../../lib/modules/default/auth.inc.php:30
msgid "User registration"
msgstr "Registrazione utente"
-#: ../../../lib/modules/default/auth.inc.php:34
+#: ../../../lib/modules/default/auth.inc.php:33
+msgid "User options"
+msgstr "Opzioni utente"
+
+#: ../../../lib/modules/default/auth.inc.php:43
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: ../../../lib/modules/default/auth.inc.php:44
msgid "Logout"
msgstr "Esci"
-#: ../../../lib/modules/default/auth.inc.php:113
+#: ../../../lib/modules/default/auth.inc.php:92
+#: ../../../lib/modules/default/auth.inc.php:115
+#: ../../../lib/modules/default/auth.inc.php:200
+msgid "Registration is not supported by Auth Module"
+msgstr "La registrazione non è supportata dal modulo di Autenticazione"
+
+#: ../../../lib/modules/default/auth.inc.php:123
msgid "Username already taken, choose a new value"
msgstr "Nome utente già registrato, prova un'altro nome"
-#: ../../../lib/modules/default/auth.inc.php:117
+#: ../../../lib/modules/default/auth.inc.php:127
msgid "Login name must be at least 5 characters long!"
msgstr "Il nome utente deve essere lungo almeno 5 caratteri!"
-#: ../../../lib/modules/default/auth.inc.php:120
+#: ../../../lib/modules/default/auth.inc.php:131
+msgid "Login name contains an invalid character. Valid vharacters are %1"
+msgstr "Il login contiene caratteri non validi. I caratteri validi sono %1"
+
+#: ../../../lib/modules/default/auth.inc.php:135
msgid "Please insert Full Name"
msgstr "Inserire il Nome Completo"
-#: ../../../lib/modules/default/auth.inc.php:124
+#: ../../../lib/modules/default/auth.inc.php:139
msgid "Please insert a valid e-mail!"
msgstr "Inserire un indirizzo e-mail valido!"
-#: ../../../lib/modules/default/auth.inc.php:128
+#: ../../../lib/modules/default/auth.inc.php:143
msgid "Password must be at least 5 characters long!"
msgstr "La password deve essere lunga almento 5 caratteri!"
-#: ../../../lib/modules/default/auth.inc.php:132
+#: ../../../lib/modules/default/auth.inc.php:147
msgid "Passwords do not match! please retype."
msgstr "Le password non corrispondono! Riprova."
-#: ../../../lib/modules/default/auth.inc.php:156
+#: ../../../lib/modules/default/auth.inc.php:169
+msgid "[%1] User registration confirmation e-mail"
+msgstr "[%1] Registrazione utente e-mail di conferma"
+
+#: ../../../lib/modules/default/auth.inc.php:183
msgid "Registration completed successfully. Have fun!"
msgstr "Registrazione completata con successo. Buon divertimento!"
+#: ../../../lib/modules/default/auth.inc.php:219
+#: ../../../lib/modules/default/auth.inc.php:231
+msgid "User profile change not supported by Auth Module"
+msgstr "Modifica del profilo utente non supportata dal modulo di Autenticazione"
+
+#: ../../../lib/modules/default/auth.inc.php:238
+msgid "Full Name cannot be empty!"
+msgstr "Il Nome completo non può essere vuoto"
+
+#: ../../../lib/modules/default/auth.inc.php:243
+msgid "Please enter a valid e-mail address!"
+msgstr "Inserire un indirizzo e-mail valido!"
+
+#: ../../../lib/modules/default/auth.inc.php:251
+msgid "Password must be at least 5 charaters long!"
+msgstr "La password deve essere lunga almento 5 caratteri!"
+
+#: ../../../lib/modules/default/auth.inc.php:254
+msgid "Old password is wrong!"
+msgstr "La vecchia password è errata!"
+
+#: ../../../lib/modules/default/auth.inc.php:257
+msgid "New passwords do not match!"
+msgstr "Le password non corrispondono! Riprova."
+
+#: ../../../lib/modules/default/auth.inc.php:260
+msgid "Password has been changed!"
+msgstr "Password modificata con successo!"
+
#: ../../../lib/modules/default/files.inc.php:31
msgid "File upload"
msgstr "Carica file"
@@ -92,47 +155,146 @@
msgid "File Upload"
msgstr "Carica file"
-#: ../../../lib/modules/default/files.inc.php:181
+#: ../../../lib/modules/default/files.inc.php:69
+msgid "Maximum upload size for site wide configuration reached"
+msgstr "Dimensione massima per l'upload raggiunta"
+
+#: ../../../lib/modules/default/files.inc.php:70
+#: ../../../lib/modules/default/files.inc.php:81
+msgid "Maximum file size exceeded!"
+msgstr "File troppo grande!"
+
+#: ../../../lib/modules/default/files.inc.php:71
+msgid "Partial file transfer error!"
+msgstr "Errore, trasferimento parziale del file!"
+
+#: ../../../lib/modules/default/files.inc.php:72
+msgid "No file was uploaded!"
+msgstr "Nessun file caricato!"
+
+#: ../../../lib/modules/default/files.inc.php:73
+msgid "Missing temporary directory"
+msgstr "Manca la cartella per l'upload temporaneo"
+
+#: ../../../lib/modules/default/files.inc.php:74
+msgid "Can't write to temporary diretory!"
+msgstr "Impossibile scrivere nella cartella temporanea!"
+
+#: ../../../lib/modules/default/files.inc.php:75
+msgid "Upload blocked by extension!"
+msgstr "Upload bloccato da un'estensione!"
+
+#: ../../../lib/modules/default/files.inc.php:77
+msgid "Upload failed for Unknonw error code: %1"
+msgstr "Upload fallito per una ragione sconosciuta. codice errore: %1"
+
+#: ../../../lib/modules/default/files.inc.php:194
msgid "Requested file does not exsist!"
msgstr "Il file richiesto non esiste!"
-#: ../../../lib/modules/default/files.inc.php:260
-#: ../../../lib/modules/default/files.inc.php:263
-#: ../../../lib/modules/default/files.inc.php:274
+#: ../../../lib/modules/default/files.inc.php:280
+#: ../../../lib/modules/default/files.inc.php:283
+#: ../../../lib/modules/default/files.inc.php:294
msgid "Wrong file id!"
msgstr "ID del file errata!"
-#: ../../../plugins/mimetypes.inc.php:10
-#: ../../../plugins/mimetypes.inc.php:20
+#: ../../../lib/modules/default/admin.inc.php:59
+#: ../../../lib/modules/default/admin.inc.php:62
+msgid "Administration"
+msgstr "Amministrazione"
+
+#: ../../../lib/modules/default/admin.inc.php:80
+msgid "User administration not supported by Auth Module"
+msgstr "Amministrazione utenti non supportata dal modulo di Autenticazione"
+
+#: ../../../lib/modules/default/admin.inc.php:197
+msgid "Group administration not supported by Auth Module"
+msgstr "Amministrazione gruppi non supportata dal modulo di Autenticazione"
+
+#: ../../../lib/modules/default/admin.inc.php:211
+msgid "Please provide a valid group name!"
+msgstr "Inserire un nome di gruppo valido"
+
+#: ../../../lib/modules/default/admin.inc.php:259
+#: ../../../lib/modules/default/admin.inc.php:290
+#: ../../../lib/modules/default/admin.inc.php:474
+#: ../../../lib/modules/default/admin.inc.php:501
+msgid "Allow"
+msgstr "Consenti"
+
+#: ../../../lib/modules/default/admin.inc.php:260
+#: ../../../lib/modules/default/admin.inc.php:291
+#: ../../../lib/modules/default/admin.inc.php:474
+#: ../../../lib/modules/default/admin.inc.php:501
+msgid "Deny"
+msgstr "Nega"
+
+#: ../../../lib/modules/default/admin.inc.php:364
+#: ../../../lib/modules/default/admin.inc.php:389
+msgid "Enable"
+msgstr "Abilita"
+
+#: ../../../lib/modules/default/admin.inc.php:365
+#: ../../../lib/modules/default/admin.inc.php:390
+msgid "Disable"
+msgstr "Disabilita"
+
+#: ../../../lib/modules/default/admin.inc.php:449
+msgid "IP %1 has been banned!"
+msgstr "IP %1 è stato bloccato!"
+
+#: ../../../lib/modules/default/admin.inc.php:453
+#: ../../../lib/modules/default/admin.inc.php:469
+msgid "IP %1 was already in state: %2!"
+msgstr "IP %1 era già nello stato: %1"
+
+#: ../../../lib/modules/auth/ldap.inc.php:24
+msgid "LDAP connection failed!"
+msgstr "ERRORE: Fallita connessione LDAP!"
+
+#: ../../../plugins/mimetypes.inc.php:6
+msgid "Limit the mimetypes a user can upload"
+msgstr "Limita la tipologia dei file che un utente può caricare"
+
+#: ../../../plugins/mimetypes.inc.php:12
+#: ../../../plugins/mimetypes.inc.php:23
msgid "WARNING: no mime types defined. Plugin has been disabled!"
msgstr "ATTENZIONE: nessun tipo di file definito. Il plugin è stato disabilitato!"
-#: ../../../plugins/mimetypes.inc.php:22
+#: ../../../plugins/mimetypes.inc.php:25
msgid "This file type (%1) is not allowed on this site!"
msgstr "L'upload di questo tipo di file (%1) non è consentito!"
-#: ../../../plugins/captcha.inc.php:37
-#: ../../../plugins/captcha.inc.php:55
+#: ../../../plugins/captcha.inc.php:7
+msgid "Add captcha protection to file download and user registration"
+msgstr "Aggiunge la protezione captcha al download del file e alla registrazione utente"
+
+#: ../../../plugins/captcha.inc.php:40
+#: ../../../plugins/captcha.inc.php:58
msgid "Wrong captcha code! please try again."
msgstr "Captcha errato! Riprova."
-#: ../../../plugins/email.inc.php:27
+#: ../../../plugins/email.inc.php:30
msgid "Your e-mail address isn't valid!"
msgstr "Il tuo indirizzo e-mail non è valido!"
-#: ../../../plugins/email.inc.php:37
+#: ../../../plugins/email.inc.php:40
msgid "Destination e-mail address isn't valid!"
msgstr "L'indirizzo e-mail del destinatario non è valido!"
-#: ../../../plugins/email.inc.php:52
+#: ../../../plugins/email.inc.php:56
msgid "Information about your uploaded file: %1"
msgstr "Informazioni relative al tuo file: %1"
-#: ../../../plugins/email.inc.php:56
+#: ../../../plugins/email.inc.php:60
msgid "An upload was delivered to you"
msgstr "Ti è stato inviato un file"
-#: ../../../plugins/password.inc.php:41
+#: ../../../plugins/password.inc.php:7
+msgid "Option to add password protection for file download"
+msgstr "Opzione per aggiungere una password di protezione al download di un file"
+
+#: ../../../plugins/password.inc.php:42
msgid "Wrong password!"
msgstr "Password errata!"
Modified: trunk/locale/it.inc.php
===================================================================
--- trunk/locale/it.inc.php 2008-10-28 18:27:19 UTC (rev 89)
+++ trunk/locale/it.inc.php 2008-10-28 18:27:42 UTC (rev 90)
@@ -1,20 +1,68 @@
<?php
-$tr['Login']='Accedi';
-$tr['File upload']='Carica file';
-$tr['File download']='Scarica file';
-$tr['File Removal']='Rimuovi file';
-$tr['File Upload']='Carica file';
-$tr['User registration']='Registrazione utente';
-$tr['Carica file']='Carica file';
-$tr['Accedi']='Accedi';
-$tr['Login name must be at least 5 characters long!']='Il Nome utente deve essere lungo almeno 5 caratteri!';
-$tr['Please insert Full Name']='Inserire il nome completo';
-$tr['Please insert a valid e-mail!']='Inserire un indirizzo e-mail valido!';
-$tr['Password must be at least 5 characters long!']='La password deve essere lunga almeno 5 caratteri!';
-$tr['Wrong captcha code! please try again.']='Codice captcha errato! Prego riprovare.';
-$tr['Login incorrect!']='Login non valido!';
-$tr['Logout']='Esci';
-$tr['Your e-mail address isn\'t valid!']='L\'indirizzo e-mail non è valido!';
-$tr['Information about your uploaded file: %1']='Informazioni relative al file caricato: %1';
-$tr['Wrong password!']='Password errata!';
+$tr["Login incorrect!"] = "Login incorretto!";
+$tr["plugin include file not found: %1"] = "Il plugin non è stato trovato: %1";
+$tr["IP Banned"] = "IP Bloccato";
+$tr["THERE HAS BEEN A PERMISSION ERROR. PLEASE TRY ONE OF THE ALLOWED OPTIONS!"] = "SI E' VERIFICATO UN PROBLEMA CON I PERMESSI. ACCESSO NEGATO. PROVARE CON UN'OPERAZIONE CONSENTITA!";
+$tr["ERROR: database folder not found!"] = "ERRORE: Cartella database non trovata!";
+$tr["ERROR: Could not create folder for %1 table!"] = "ERRORE: Impossibile create cartella per la tabella %1!";
+$tr["ERROR: Could not create file for %1 table!"] = "ERRORE: Impossibile create la cartella per la tabella %1!";
+$tr["ERROR: connection to database failed!"] = "ERRORE: Fallita connessione al database!";
+$tr["Login"] = "Accedi";
+$tr["User registration"] = "Registrazione utente";
+$tr["User options"] = "Opzioni utente";
+$tr["Preferences"] = "Preferenze";
+$tr["Logout"] = "Esci";
+$tr["Registration is not supported by Auth Module"] = "La registrazione non è supportata dal modulo di Autenticazione";
+$tr["Username already taken, choose a new value"] = "Nome utente già registrato, prova un'altro nome";
+$tr["Login name must be at least 5 characters long!"] = "Il nome utente deve essere lungo almeno 5 caratteri!";
+$tr["Login name contains an invalid character. Valid vharacters are %1"] = "Il login contiene caratteri non validi. I caratteri validi sono %1";
+$tr["Please insert Full Name"] = "Inserire il Nome Completo";
+$tr["Please insert a valid e-mail!"] = "Inserire un indirizzo e-mail valido!";
+$tr["Password must be at least 5 characters long!"] = "La password deve essere lunga almento 5 caratteri!";
+$tr["Passwords do not match! please retype."] = "Le password non corrispondono! Riprova.";
+$tr["[%1] User registration confirmation e-mail"] = "[%1] Registrazione utente e-mail di conferma";
+$tr["Registration completed successfully. Have fun!"] = "Registrazione completata con successo. Buon divertimento!";
+$tr["User profile change not supported by Auth Module"] = "Modifica del profilo utente non supportata dal modulo di Autenticazione";
+$tr["Full Name cannot be empty!"] = "Il Nome completo non può essere vuoto";
+$tr["Please enter a valid e-mail address!"] = "Inserire un indirizzo e-mail valido!";
+$tr["Password must be at least 5 charaters long!"] = "La password deve essere lunga almento 5 caratteri!";
+$tr["Old password is wrong!"] = "La vecchia password è errata!";
+$tr["New passwords do not match!"] = "Le password non corrispondono! Riprova.";
+$tr["Password has been changed!"] = "Password modificata con successo!";
+$tr["File upload"] = "Carica file";
+$tr["File download"] = "Scarica file";
+$tr["File Removal"] = "Rimozione file";
+$tr["File Upload"] = "Carica file";
+$tr["Maximum upload size for site wide configuration reached"] = "Dimensione massima per l'upload raggiunta";
+$tr["Maximum file size exceeded!"] = "File troppo grande!";
+$tr["Partial file transfer error!"] = "Errore, trasferimento parziale del file!";
+$tr["No file was uploaded!"] = "Nessun file caricato!";
+$tr["Missing temporary directory"] = "Manca la cartella per l'upload temporaneo";
+$tr["Can't write to temporary diretory!"] = "Impossibile scrivere nella cartella temporanea!";
+$tr["Upload blocked by extension!"] = "Upload bloccato da un'estensione!";
+$tr["Upload failed for Unknonw error code: %1"] = "Upload fallito per una ragione sconosciuta. codice errore: %1";
+$tr["Requested file does not exsist!"] = "Il file richiesto non esiste!";
+$tr["Wrong file id!"] = "ID del file errata!";
+$tr["Administration"] = "Amministrazione";
+$tr["User administration not supported by Auth Module"] = "Amministrazione utenti non supportata dal modulo di Autenticazione";
+$tr["Group administration not supported by Auth Module"] = "Amministrazione gruppi non supportata dal modulo di Autenticazione";
+$tr["Please provide a valid group name!"] = "Inserire un nome di gruppo valido";
+$tr["Allow"] = "Consenti";
+$tr["Deny"] = "Nega";
+$tr["Enable"] = "Abilita";
+$tr["Disable"] = "Disabilita";
+$tr["IP %1 has been banned!"] = "IP %1 è stato bloccato!";
+$tr["IP %1 was already in state: %2!"] = "IP %1 era già nello stato: %1";
+$tr["LDAP connection failed!"] = "ERRORE: Fallita connessione LDAP!";
+$tr["Limit the mimetypes a user can upload"] = "Limita la tipologia dei file che un utente può caricare";
+$tr["WARNING: no mime types defined. Plugin has been disabled!"] = "ATTENZIONE: nessun tipo di file definito. Il plugin è stato disabilitato!";
+$tr["This file type (%1) is not allowed on this site!"] = "L'upload di questo tipo di file (%1) non è consentito!";
+$tr["Add captcha protection to file download and user registration"] = "Aggiunge la protezione captcha al download del file e alla registrazione utente";
+$tr["Wrong captcha code! please try again."] = "Captcha errato! Riprova.";
+$tr["Your e-mail address isn't valid!"] = "Il tuo indirizzo e-mail non è valido!";
+$tr["Destination e-mail address isn't valid!"] = "L'indirizzo e-mail del destinatario non è valido!";
+$tr["Information about your uploaded file: %1"] = "Informazioni relative al tuo file: %1";
+$tr["An upload was delivered to you"] = "Ti è stato inviato un file";
+$tr["Option to add password protection for file download"] = "Opzione per aggiungere una password di protezione al download di un file";
+$tr["Wrong password!"] = "Password errata!";
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-28 18:27:30
|
Revision: 89
http://openupload.svn.sourceforge.net/openupload/?rev=89&view=rev
Author: tsdogs
Date: 2008-10-28 18:27:19 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
Tool to convert from gettext to phparray
Added Paths:
-----------
trunk/locale/tools/po2php.php
Added: trunk/locale/tools/po2php.php
===================================================================
--- trunk/locale/tools/po2php.php (rev 0)
+++ trunk/locale/tools/po2php.php 2008-10-28 18:27:19 UTC (rev 89)
@@ -0,0 +1,37 @@
+#!/usr/bin/env php
+<?php
+
+$start = "msgid";
+$end = "msgstr";
+
+if ($_SERVER['argc'] != 3) {
+ echo "Usage: po2php.php <pofile> <phpfile>\n";
+ exit (-1);
+}
+
+$src = $_SERVER['argv'][1];
+$out = $_SERVER['argv'][2];
+
+$lines = file($src);
+$outlines = '<?php'."\n";
+$i=0;
+while ($i < count($lines)) {
+ if (strpos($lines[$i],$start)===0) {
+ $msg = substr($lines[$i],strlen($start)+1,strlen($lines[$i])-strlen($start)+1);
+ if (chop($msg) != '""') {
+ $i++;
+ while (strpos($lines[$i],$end)!==0 and $i<count($lines)) {
+ $i++;
+ }
+ if (strpos($lines[$i],$end)===0) {
+ $str = substr($lines[$i],strlen($start)+1,strlen($lines[$i])-strlen($start)+1);
+ $outlines.='$tr['.trim(chop($msg)).'] = '.trim(chop($str)).";\n";
+ }
+ }
+ }
+ $i++;
+}
+$outlines .= '?>'."\n";
+
+file_put_contents($out,$outlines);
+?>
Property changes on: trunk/locale/tools/po2php.php
___________________________________________________________________
Added: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-28 17:36:53
|
Revision: 88
http://openupload.svn.sourceforge.net/openupload/?rev=88&view=rev
Author: tsdogs
Date: 2008-10-28 17:36:43 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
Add translation config options
Modified Paths:
--------------
trunk/www/config.inc.php.example
Modified: trunk/www/config.inc.php.example
===================================================================
--- trunk/www/config.inc.php.example 2008-10-28 17:36:20 UTC (rev 87)
+++ trunk/www/config.inc.php.example 2008-10-28 17:36:43 UTC (rev 88)
@@ -44,6 +44,13 @@
# $CONFIG['auth'] = 'ldap';
$CONFIG['auth'] = 'default';
+
+/* TRANSLATION MODULE */
+//$CONFIG['translator']='gettext';
+$CONFIG['translator']='phparray';
+
+$CONFIG['defaultlang']='en';
+
/************************************************************
* LDAP detail configuration options *
************************************************************/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-28 17:36:30
|
Revision: 87
http://openupload.svn.sourceforge.net/openupload/?rev=87&view=rev
Author: tsdogs
Date: 2008-10-28 17:36:20 +0000 (Tue, 28 Oct 2008)
Log Message:
-----------
Rename php translator
Added Paths:
-----------
trunk/lib/modules/tr/phparray.inc.php
Removed Paths:
-------------
trunk/lib/modules/tr/array.inc.php
Deleted: trunk/lib/modules/tr/array.inc.php
===================================================================
--- trunk/lib/modules/tr/array.inc.php 2008-10-27 11:42:03 UTC (rev 86)
+++ trunk/lib/modules/tr/array.inc.php 2008-10-28 17:36:20 UTC (rev 87)
@@ -1,64 +0,0 @@
-<?php
-
-/* simple array translation */
-
-class ArrayTranslator extends translatorBase {
-var $update = false;
-var $TR;
-
- function ArrayTranslator() {
- }
-
- function init() {
- $locale = app()->user->info('lang');
- $lang = app()->langs[$locale];
- $tr = array();
- $this->files['openupload']=app()->config['INSTALL_ROOT'].'/locale/'.$lang['id'].'.inc.php';
- if (file_exists($this->files['openupload'])) {
- require_once($this->files['openupload']);
- $this->TR['openupload']=$tr;
- }
- $tr = array();
- $this->files['template']=app()->config['INSTALL_ROOT'].'/templates/'.app()->config['site']['template'].
- '/locale/'.$lang['id'].'.inc.php';
- if (file_exists($this->files['template'])) {
- require_once($this->files['template']);
- $this->TR['template']=$tr;
- } else { /* load default translation */
- $this->files['template']=app()->config['INSTALL_ROOT'].'/templates/'.
- 'default/locale/'.$lang['id'].'.inc.php';
- if (file_exists($this->files['template'])) {
- require_once($this->files['template']);
- $this->TR['template']=$tr;
- }
- }
- /* setup page encoding */
- if (isset($lang['charset']))
- header('Content-Type: text/html; charset='.$lang['charset']);
- }
-
-
- function translate($txt,$domain = 'openupload') {
-
- if (isset($this->TR[$domain][$txt])) {
- return $this->TR[$domain][$txt];
- } else {
- if ($this->update) {
- /* add the translation to the file */
- $f = @fopen($this->files[$domain],'w+');
- if ($f) {
- fwrite($f,'<?php'."\n");
- foreach ($this->TR[$domain] as $k => $v) {
- fwrite($f,'$tr[\''.str_replace("'","\'",$k).'\']=\''.str_replace("'","\'",$v).'\';'."\n");
- }
- fwrite($f,'$tr[\''.str_replace("'","\'",$txt).'\']=\''.str_replace("'","\'",$txt).'\';'."\n");
- fwrite($f,'?>');
- fclose($f);
- $this->TR[$domain][$txt]=$txt;
- }
- }
- return $txt;
- }
- }
-}
-?>
\ No newline at end of file
Added: trunk/lib/modules/tr/phparray.inc.php
===================================================================
--- trunk/lib/modules/tr/phparray.inc.php (rev 0)
+++ trunk/lib/modules/tr/phparray.inc.php 2008-10-28 17:36:20 UTC (rev 87)
@@ -0,0 +1,64 @@
+<?php
+
+/* simple array translation */
+
+class PhpArrayTranslator extends translatorBase {
+var $update = false;
+var $TR;
+
+ function PhpArrayTranslator() {
+ }
+
+ function init() {
+ $locale = app()->user->info('lang');
+ $lang = app()->langs[$locale];
+ $tr = array();
+ $this->files['openupload']=app()->config['INSTALL_ROOT'].'/locale/'.$lang['id'].'.inc.php';
+ if (file_exists($this->files['openupload'])) {
+ require_once($this->files['openupload']);
+ $this->TR['openupload']=$tr;
+ }
+ $tr = array();
+ $this->files['template']=app()->config['INSTALL_ROOT'].'/templates/'.app()->config['site']['template'].
+ '/locale/'.$lang['id'].'.inc.php';
+ if (file_exists($this->files['template'])) {
+ require_once($this->files['template']);
+ $this->TR['template']=$tr;
+ } else { /* load default translation */
+ $this->files['template']=app()->config['INSTALL_ROOT'].'/templates/'.
+ 'default/locale/'.$lang['id'].'.inc.php';
+ if (file_exists($this->files['template'])) {
+ require_once($this->files['template']);
+ $this->TR['template']=$tr;
+ }
+ }
+ /* setup page encoding */
+ if (isset($lang['charset']))
+ header('Content-Type: text/html; charset='.$lang['charset']);
+ }
+
+
+ function translate($txt,$domain = 'openupload') {
+
+ if (isset($this->TR[$domain][$txt])) {
+ return $this->TR[$domain][$txt];
+ } else {
+ if ($this->update) {
+ /* add the translation to the file */
+ $f = @fopen($this->files[$domain],'w+');
+ if ($f) {
+ fwrite($f,'<?php'."\n");
+ foreach ($this->TR[$domain] as $k => $v) {
+ fwrite($f,'$tr[\''.str_replace("'","\'",$k).'\']=\''.str_replace("'","\'",$v).'\';'."\n");
+ }
+ fwrite($f,'$tr[\''.str_replace("'","\'",$txt).'\']=\''.str_replace("'","\'",$txt).'\';'."\n");
+ fwrite($f,'?>');
+ fclose($f);
+ $this->TR[$domain][$txt]=$txt;
+ }
+ }
+ return $txt;
+ }
+ }
+}
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-27 12:22:01
|
Revision: 85
http://openupload.svn.sourceforge.net/openupload/?rev=85&view=rev
Author: tsdogs
Date: 2008-10-27 11:36:38 +0000 (Mon, 27 Oct 2008)
Log Message:
-----------
Remove template path in templates (for images and css)
Modified Paths:
--------------
trunk/lib/general.inc.php
trunk/lib/main.inc.php
trunk/lib/smarty/plugins/block.tr.php
trunk/templates/default/index.tpl
trunk/templates/default/modules/admin/admin.tpl
trunk/templates/default/modules/admin/banned.tpl
trunk/templates/default/modules/admin/files.tpl
trunk/templates/default/modules/admin/groups.tpl
trunk/templates/default/modules/admin/plugins.tpl
trunk/templates/default/modules/admin/pluginsacl.tpl
trunk/templates/default/modules/admin/rights.tpl
trunk/templates/default/modules/admin/users.tpl
trunk/templates/default/modules/files/downloadConfirm.tpl
trunk/templates/default/modules/files/uploadForm.tpl
Added Paths:
-----------
trunk/lib/smarty/plugins/function.tpl.php
Modified: trunk/lib/general.inc.php
===================================================================
--- trunk/lib/general.inc.php 2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/lib/general.inc.php 2008-10-27 11:36:38 UTC (rev 85)
@@ -82,6 +82,17 @@
return $txt;
}
+function template_file($file) {
+ global $CONFIG;
+
+
+ if ($file == '') return '';
+ if (file_exists($CONFIG['WEB_ROOT'].'/templates/'.$CONFIG['site']['template'].'/'.$file))
+ return $CONFIG['WWW_ROOT'].'/templates/'.$CONFIG['site']['template'].'/'.$file;
+ else
+ return $CONFIG['WWW_ROOT'].'/templates/default/'.$file;
+}
+
/**
Validate an email address.
Provide email address (raw input)
Modified: trunk/lib/main.inc.php
===================================================================
--- trunk/lib/main.inc.php 2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/lib/main.inc.php 2008-10-27 11:36:38 UTC (rev 85)
@@ -26,7 +26,7 @@
$this->tpl->config_dir = SMARTY_DIR.'/config';
$this->tpl->cache_dir = $this->config['INSTALL_ROOT'].'/cache';
$this->tpl->caching = $this->config['site']['caching'];
-
+
$this->page['template']= $this->config['WWW_ROOT'].'/templates/'.$this->config['site']['template'];
/* include the class first */
Modified: trunk/lib/smarty/plugins/block.tr.php
===================================================================
--- trunk/lib/smarty/plugins/block.tr.php 2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/lib/smarty/plugins/block.tr.php 2008-10-27 11:36:38 UTC (rev 85)
@@ -1,6 +1,24 @@
<?php
+/**
+ * Smarty plugin
+ * @package OpenUpload
+ * @subpackage plugins
+ */
+/**
+ * Smarty {tr} block plugin
+ *
+ * Type: block<br>
+ * Name: tr<br>
+ * Purpose: Translate contained text with a user defined function "translate"
+ * @author Alessandro Briosi
+ * @param array
+ * @param Smarty
+ * @return string
+ * @uses translate()
+ */
+
function smarty_block_tr($params, $content = null, &$smarty, &$repeat) {
if(!$repeat){
Added: trunk/lib/smarty/plugins/function.tpl.php
===================================================================
--- trunk/lib/smarty/plugins/function.tpl.php (rev 0)
+++ trunk/lib/smarty/plugins/function.tpl.php 2008-10-27 11:36:38 UTC (rev 85)
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Smarty plugin
+ * @package OpenUpload
+ * @subpackage plugins
+ */
+
+
+/**
+ * Smarty {tpl} function plugin
+ *
+ * Type: function<br>
+ * Name: tpl<br>
+ * Input:<br>
+ * - file (required) - string containing template sub file
+ * Purpose: Returns a file from the template folder, if it does not exsist
+ * it returns a file from the default template
+ * @author Alessandro Briosi
+ * @param array
+ * @param Smarty
+ * @return string
+ * @uses template_file
+ */
+
+function smarty_function_tpl($params, &$smarty)
+{
+ return template_file($params["file"]);
+
+}
+?>
\ No newline at end of file
Modified: trunk/templates/default/index.tpl
===================================================================
--- trunk/templates/default/index.tpl 2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/index.tpl 2008-10-27 11:36:38 UTC (rev 85)
@@ -1,12 +1,12 @@
<html>
<head>
<title>{$site.title} - {tr}{$page.title}{/tr}</title>
-<link rel="stylesheet" type="text/css" href='{$page.template}/main.css'>
+<link rel="stylesheet" type="text/css" href="{tpl file=/main.css}">
</head>
<body>
<!-- header -->
<div id="header">
-<div id="logo"><img src="{$page.template}/img/openupload.jpg" border="0"></div>
+<div id="logo"><img src="{tpl file=/img/openupload.jpg}" border="0"></div>
<div id="langs">
<ul>
{foreach from=$langs item=l name=c}
Modified: trunk/templates/default/modules/admin/admin.tpl
===================================================================
--- trunk/templates/default/modules/admin/admin.tpl 2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/admin.tpl 2008-10-27 11:36:38 UTC (rev 85)
@@ -1,18 +1,18 @@
{tr}Here you can administer{/tr}:<hr>
<table border="0" width="400" height="300">
<tr>
- <td align="center"><a href="{$script}?action=adminsettings"><img src="{$page.template}/img/admin/settings.png" border="0" ><br>{tr}Settings{/tr}</a></td>
- <td align="center"><a href="{$script}?action=adminplugins"><img src="{$page.template}/img/admin/plugins.png" border="0" align="center"><br>{tr}Plugins{/tr}</a></td>
- <td align="center"><a href="{$script}?action=adminfiles"><img src="{$page.template}/img/admin/files.png" border="0" ><br>{tr}Files{/tr}</a></td>
+ <td align="center"><a href="{$script}?action=adminsettings"><img src="{tpl file=/img/admin/settings.png}" border="0" ><br>{tr}Settings{/tr}</a></td>
+ <td align="center"><a href="{$script}?action=adminplugins"><img src="{tpl file=/img/admin/plugins.png}" border="0" align="center"><br>{tr}Plugins{/tr}</a></td>
+ <td align="center"><a href="{$script}?action=adminfiles"><img src="{tpl file=/img/admin/files.png}" border="0" ><br>{tr}Files{/tr}</a></td>
</tr>
<tr>
- <td align="center"><a href="{$script}?action=adminusers"><img src="{$page.template}/img/admin/users.png" border="0" ><br>{tr}Users{/tr}</a></td>
- <td align="center"><a href="{$script}?action=admingroups"><img src="{$page.template}/img/admin/groups.png" border="0" ><br>{tr}Groups{/tr}</a></td>
- <td align="center"><a href="{$script}?action=adminrights"><img src="{$page.template}/img/admin/rights.png" border="0" ><br>{tr}Rights{/tr}</a></td>
+ <td align="center"><a href="{$script}?action=adminusers"><img src="{tpl file=/img/admin/users.png}" border="0" ><br>{tr}Users{/tr}</a></td>
+ <td align="center"><a href="{$script}?action=admingroups"><img src="{tpl file=/img/admin/groups.png}" border="0" ><br>{tr}Groups{/tr}</a></td>
+ <td align="center"><a href="{$script}?action=adminrights"><img src="{tpl file=/img/admin/rights.png}" border="0" ><br>{tr}Rights{/tr}</a></td>
</tr>
<tr>
<td align="center"> </td>
- <td align="center"><a href="{$script}?action=adminbanned"><img src="{$page.template}/img/admin/banned.png" border="0" ><br>{tr}Banned IPs{/tr}</a></td>
+ <td align="center"><a href="{$script}?action=adminbanned"><img src="{tpl file=/img/admin/banned.png}" border="0" ><br>{tr}Banned IPs{/tr}</a></td>
<td align="center"> </td>
</tr>
{$plugins}
Modified: trunk/templates/default/modules/admin/banned.tpl
===================================================================
--- trunk/templates/default/modules/admin/banned.tpl 2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/banned.tpl 2008-10-27 11:36:38 UTC (rev 85)
@@ -1,7 +1,7 @@
{include file="default/modules/admin/adminmenu.tpl"}
<div id="toolbar">
-<a href="{$script}?action={$action}&step=2"><img src="{$page.template}/img/admin/tadd.png"></a>
-<img src="{$page.template}/img/admin/tdelete.png">
+<a href="{$script}?action={$action}&step=2"><img src="{tpl file=/img/admin/tadd.png}"></a>
+<img src="{tpl file=/img/admin/tdelete.png}">
</div>
<br>
{if $pages>2}
@@ -31,7 +31,7 @@
<td id="{$rid}">{$b.access}</td>
<td id="{$rid}">{$b.priority}</td>
<td id="{$rid}">
- <a title="delete" href="{$script}?action={$action}&step=4&id={$b.id}"><img src="{$page.template}/img/admin/delete.png"></a>
+ <a title="delete" href="{$script}?action={$action}&step=4&id={$b.id}"><img src="{tpl file=/img/admin/delete.png}"></a>
</td>
</tr>
{/foreach}
Modified: trunk/templates/default/modules/admin/files.tpl
===================================================================
--- trunk/templates/default/modules/admin/files.tpl 2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/files.tpl 2008-10-27 11:36:38 UTC (rev 85)
@@ -29,10 +29,10 @@
<td id="{$rid}">{$f.name}</td>
<td id="{$rid}">{$users[$f.user_id].login}</td>
<td id="{$rid}" style="text-align: left"><a title="ban IP {$f.ip}" href="{$script}?action=adminbanned&step=2&ip={$f.ip}&newaction={$action}">
- <img align="right" src="{$page.template}/img/admin/ban.png" ></a>{$f.ip} </td>
+ <img align="right" src="{tpl file=/img/admin/ban.png}" ></a>{$f.ip} </td>
<td id="{$rid}">{$f.upload_date}</td>
<td id="{$rid}">
- <a title="delete" href="{$script}?action={$action}&step=4&id={$f.id}"><img src="{$page.template}/img/admin/delete.png"></a></td>
+ <a title="delete" href="{$script}?action={$action}&step=4&id={$f.id}"><img src="{tpl file=/img/admin/delete.png}"></a></td>
</tr>
{/foreach}
</table>
\ No newline at end of file
Modified: trunk/templates/default/modules/admin/groups.tpl
===================================================================
--- trunk/templates/default/modules/admin/groups.tpl 2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/groups.tpl 2008-10-27 11:36:38 UTC (rev 85)
@@ -1,7 +1,7 @@
{include file="default/modules/admin/adminmenu.tpl"}
<div id="toolbar">
-<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{$page.template}/img/admin/tadd_group.png"></a>
-<img src="{$page.template}/img/admin/tdelete_group.png">
+<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{tpl file=/img/admin/tadd_group.png}"></a>
+<img src="{tpl file=/img/admin/tdelete_group.png}">
</div>
<br>
<table border="0" id="dbtable">
@@ -18,9 +18,9 @@
<td id="{$rid}" style="text-align:left"><a href="{$script}?action=admingroups&step=3&id={$g.name}">{$g.name}</a></td>
<td id="{$rid}">{$g.description}</td>
<td id="{$rid}">
- <a href="{$script}?action={$action}&step=3&id={$g.name}"><img src="{$page.template}/img/admin/edit_group.png"></a>
+ <a href="{$script}?action={$action}&step=3&id={$g.name}"><img src="{tpl file=/img/admin/edit_group.png}"></a>
- <a href="{$script}?action={$action}&step=4&id={$g.name}"><img src="{$page.template}/img/admin/delete_group.png"></a></td>
+ <a href="{$script}?action={$action}&step=4&id={$g.name}"><img src="{tpl file=/img/admin/delete_group.png}"></a></td>
</tr>
{/foreach}
</table>
\ No newline at end of file
Modified: trunk/templates/default/modules/admin/plugins.tpl
===================================================================
--- trunk/templates/default/modules/admin/plugins.tpl 2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/plugins.tpl 2008-10-27 11:36:38 UTC (rev 85)
@@ -2,8 +2,8 @@
<br>
<table border="0" width="400" height="200">
<tr>
- <td align="center"><a href="{$script}?action=adminpluginsacl"><img src="{$page.template}/img/admin/plugins.png" border="0" ><br>{tr}Plugins ACL{/tr}</a></td>
- <td align="center"><a href="{$script}?action=adminpluginsoptions"><img src="{$page.template}/img/admin/plugins.png" border="0" align="center"><br>{tr}Plugins Options{/tr}</a></td>
+ <td align="center"><a href="{$script}?action=adminpluginsacl"><img src="{tpl file=/img/admin/plugins.png}" border="0" ><br>{tr}Plugins ACL{/tr}</a></td>
+ <td align="center"><a href="{$script}?action=adminpluginsoptions"><img src="{tpl file=/img/admin/plugins.png}" border="0" align="center"><br>{tr}Plugins Options{/tr}</a></td>
</tr>
{$plugins}
</table>
\ No newline at end of file
Modified: trunk/templates/default/modules/admin/pluginsacl.tpl
===================================================================
--- trunk/templates/default/modules/admin/pluginsacl.tpl 2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/pluginsacl.tpl 2008-10-27 11:36:38 UTC (rev 85)
@@ -1,7 +1,7 @@
{include file="default/modules/admin/adminmenu.tpl"}
<div id="toolbar">
-<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{$page.template}/img/admin/plugins.png"></a>
-<img src="{$page.template}/img/admin/tdelete.png">
+<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{tpl file=/img/admin/plugins.png}"></a>
+<img src="{tpl file=/img/admin/tdelete.png}">
</div>
<br>
<table border="0" id="dbtable">
@@ -22,9 +22,9 @@
<td id="{$rid}">{$p.group_name}</td>
<td id="{$rid}">{$p.access}</td>
<td id="{$rid}">
- <a href="{$script}?action={$action}&step=3&id={$p.id}"><img src="{$page.template}/img/admin/edit_plugin.png"></a>
+ <a href="{$script}?action={$action}&step=3&id={$p.id}"><img src="{tpl file=/img/admin/edit_plugin.png}"></a>
- <a href="{$script}?action={$action}&step=4&id={$p.id}"><img src="{$page.template}/img/admin/delete.png"></a></td>
+ <a href="{$script}?action={$action}&step=4&id={$p.id}"><img src="{tpl file=/img/admin/delete.png}"></a></td>
</tr>
{/foreach}
</table>
\ No newline at end of file
Modified: trunk/templates/default/modules/admin/rights.tpl
===================================================================
--- trunk/templates/default/modules/admin/rights.tpl 2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/rights.tpl 2008-10-27 11:36:38 UTC (rev 85)
@@ -1,7 +1,7 @@
{include file="default/modules/admin/adminmenu.tpl"}
<div id="toolbar">
-<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{$page.template}/img/admin/tadd_right.png"></a>
-<img src="{$page.template}/img/admin/tdelete.png">
+<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{tpl file=/img/admin/tadd_right.png}"></a>
+<img src="{tpl file=/img/admin/tdelete.png}">
</div>
<br>
<table border="0" id="dbtable">
@@ -24,9 +24,9 @@
<td id="{$rid}">{$r.action}</td>
<td id="{$rid}">{$r.access}</td>
<td id="{$rid}">
- <a href="{$script}?action={$action}&step=3&id={$r.id}"><img src="{$page.template}/img/admin/edit_right.png"></a>
+ <a href="{$script}?action={$action}&step=3&id={$r.id}"><img src="{tpl file=/img/admin/edit_right.png}"></a>
- <a href="{$script}?action={$action}&step=4&id={$r.id}"><img src="{$page.template}/img/admin/delete.png"></a></td>
+ <a href="{$script}?action={$action}&step=4&id={$r.id}"><img src="{tpl file=/img/admin/delete.png}"></a></td>
</tr>
{/foreach}
</table>
\ No newline at end of file
Modified: trunk/templates/default/modules/admin/users.tpl
===================================================================
--- trunk/templates/default/modules/admin/users.tpl 2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/admin/users.tpl 2008-10-27 11:36:38 UTC (rev 85)
@@ -1,7 +1,7 @@
{include file="default/modules/admin/adminmenu.tpl"}
<div id="toolbar">
-<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{$page.template}/img/admin/tadd_user.png"></a>
-<img src="{$page.template}/img/admin/tdelete_user.png">
+<a href="{$script}?action={$action}&step=2&id={$u.id}"><img src="{tpl file=/img/admin/tadd_user.png}"></a>
+<img src="{tpl file=/img/admin/tdelete_user.png}">
</div>
<br>
<table border="0" id="dbtable">
@@ -23,13 +23,13 @@
<td id="{$rid}">{$u.group_name}</td>
<td id="{$rid}">{$u.email}</td>
<td id="{$rid}"><a href="{$script}?action={$action}&step=5&id={$u.login}&active={$u.active}">
- <img src="{$page.template}/img/admin/active{$u.active}.png">
+ <img src="{tpl file='/img/admin/active%s.png'|sprintf:$u.active}">
</a>
</td>
<td id="{$rid}">
- <a href="{$script}?action={$action}&step=3&id={$u.login}"><img src="{$page.template}/img/admin/edit_user.png"></a>
+ <a href="{$script}?action={$action}&step=3&id={$u.login}"><img src="{tpl file=/img/admin/edit_user.png}"></a>
- <a href="{$script}?action={$action}&step=4&id={$u.login}"><img src="{$page.template}/img/admin/delete_user.png"></a></td>
+ <a href="{$script}?action={$action}&step=4&id={$u.login}"><img src="{tpl file=/img/admin/delete_user.png}"></a></td>
</tr>
{/foreach}
</table>
\ No newline at end of file
Modified: trunk/templates/default/modules/files/downloadConfirm.tpl
===================================================================
--- trunk/templates/default/modules/files/downloadConfirm.tpl 2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/files/downloadConfirm.tpl 2008-10-27 11:36:38 UTC (rev 85)
@@ -8,7 +8,7 @@
</table>
<div id="downloadbutton"><br><center>
<a href="{$script}?action=g">
- <img src="{$page.template}/img/download.png" border="0"><br>
+ <img src="{tpl file=/img/download.png}" border="0"><br>
{tr}Download file{/tr}</a></center>
</div>
Modified: trunk/templates/default/modules/files/uploadForm.tpl
===================================================================
--- trunk/templates/default/modules/files/uploadForm.tpl 2008-10-27 10:34:11 UTC (rev 84)
+++ trunk/templates/default/modules/files/uploadForm.tpl 2008-10-27 11:36:38 UTC (rev 85)
@@ -21,7 +21,7 @@
{$plugins}
<div id="uploadbutton" style="visibility:hidden"><br>
<a href="{$script}" onclick="document.uploadform.submit();return false;">
- <img src="{$page.template}/img/upload.png" border="0"><br>
+ <img src="{tpl file=/img/upload.png}" border="0"><br>
{tr}Upload{/tr}</a>
</div>
</form>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-27 12:21:53
|
Revision: 86
http://openupload.svn.sourceforge.net/openupload/?rev=86&view=rev
Author: tsdogs
Date: 2008-10-27 11:42:03 +0000 (Mon, 27 Oct 2008)
Log Message:
-----------
Add the loading of default template translation in case the site template one does not exsist
Modified Paths:
--------------
trunk/lib/modules/tr/array.inc.php
trunk/lib/modules/tr/gettext.inc.php
Modified: trunk/lib/modules/tr/array.inc.php
===================================================================
--- trunk/lib/modules/tr/array.inc.php 2008-10-27 11:36:38 UTC (rev 85)
+++ trunk/lib/modules/tr/array.inc.php 2008-10-27 11:42:03 UTC (rev 86)
@@ -24,6 +24,13 @@
if (file_exists($this->files['template'])) {
require_once($this->files['template']);
$this->TR['template']=$tr;
+ } else { /* load default translation */
+ $this->files['template']=app()->config['INSTALL_ROOT'].'/templates/'.
+ 'default/locale/'.$lang['id'].'.inc.php';
+ if (file_exists($this->files['template'])) {
+ require_once($this->files['template']);
+ $this->TR['template']=$tr;
+ }
}
/* setup page encoding */
if (isset($lang['charset']))
Modified: trunk/lib/modules/tr/gettext.inc.php
===================================================================
--- trunk/lib/modules/tr/gettext.inc.php 2008-10-27 11:36:38 UTC (rev 85)
+++ trunk/lib/modules/tr/gettext.inc.php 2008-10-27 11:42:03 UTC (rev 86)
@@ -12,7 +12,11 @@
$lang = app()->langs[$locale];
putenv("LANG=".$lang['locale']);
bindtextdomain('openupload',app()->config['INSTALL_ROOT'].'/locale');
- bindtextdomain('template',app()->config['INSTALL_ROOT'].'/templates/'.app()->config['site']['template'].'/locale');
+ if (is_dir(app()->config['INSTALL_ROOT'].'/templates/'.app()->config['site']['template'].'/locale')) {
+ bindtextdomain('template',app()->config['INSTALL_ROOT'].'/templates/'.app()->config['site']['template'].'/locale');
+ } else {
+ bindtextdomain('template',app()->config['INSTALL_ROOT'].'/templates/default/locale');
+ }
setlocale(LC_ALL,$lang['locale']);
/* setup page encoding */
if (isset($lang['charset']))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-27 10:38:38
|
Revision: 84
http://openupload.svn.sourceforge.net/openupload/?rev=84&view=rev
Author: tsdogs
Date: 2008-10-27 10:34:11 +0000 (Mon, 27 Oct 2008)
Log Message:
-----------
fix css typo
Modified Paths:
--------------
trunk/www/templates/default/main.css
Modified: trunk/www/templates/default/main.css
===================================================================
--- trunk/www/templates/default/main.css 2008-10-24 14:54:51 UTC (rev 83)
+++ trunk/www/templates/default/main.css 2008-10-27 10:34:11 UTC (rev 84)
@@ -60,7 +60,7 @@
}
#wrapper {
clear: both;
- maring: 0 auto;
+ margin: 0 auto;
text-align: center;
padding-top: 50px;
}
@@ -169,11 +169,11 @@
padding: 2px;
background-color: #fafafa;
text-align: center;
- vertical-align: center;
+ vertical-align: middle;
}
#dbtable #row2 {
padding: 2px;
background-color: #ededed;
text-align: center;
- vertical-align: center;
+ vertical-align: middle;
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-24 14:54:53
|
Revision: 83
http://openupload.svn.sourceforge.net/openupload/?rev=83&view=rev
Author: tsdogs
Date: 2008-10-24 14:54:51 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
another update
Modified Paths:
--------------
trunk/INSTALL
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2008-10-24 14:44:10 UTC (rev 82)
+++ trunk/INSTALL 2008-10-24 14:54:51 UTC (rev 83)
@@ -8,6 +8,7 @@
This document describes the basic steps to install Open Upload.
Be sure to also read README file.
+ In this document there is also some documentation I suggest you to read.
INDEX
@@ -16,6 +17,7 @@
* Modes and Rights
* LDAP Authentication
* Multisite installation
+ * IP Blocking Feature
* Templates / Logo change
------------------------------------------------------------------------------
@@ -197,6 +199,31 @@
------------------------------------------------------------------------------
+IP BLOCKING FEATURE (actually allow/deny)
+
+ The IP blocking feature is pretty configurable, so you can allow only a set of specific networks
+ to access the site (i.e. VPN networks).
+ The ip can be specified with a subnet mask (i.e. 192.168.0.0/255.255.255.0) or with a subnet mask
+ number (i.e. 192.168.1.0/23)
+
+ Then you can decide wether this range accesses the site or not.
+ So you could block an entire range of IPs with only one line.
+
+ You can also secify a priority so let's say you want all the 192.168.0.0/16 networks to access,
+ but you want to block the specific 192.168.99.0/24 network.
+
+ IP | ACCESS | PRIORITY
+ 192.168.0.0/16 | allow | 8
+ 192.168.99.0/24 | deny | 7
+
+ The IP Banning feature will set a default value of 10 as the priority rule for the IP to be BANNED.
+
+ If you want to be sure that your network is not banned use a priority lower than that.
+
+ Please be carefull as you could lock yourself out :)
+
+ ------------------------------------------------------------------------------
+
TEMPLATES / LOGO CHANGES (Notes)
If you want to change something in the templates I'd suggest to create a site template and put
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-24 14:44:13
|
Revision: 82
http://openupload.svn.sourceforge.net/openupload/?rev=82&view=rev
Author: tsdogs
Date: 2008-10-24 14:44:10 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
update the documentation.
Modified Paths:
--------------
trunk/CHANGELOG
trunk/INSTALL
trunk/README
Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG 2008-10-24 11:37:17 UTC (rev 81)
+++ trunk/CHANGELOG 2008-10-24 14:44:10 UTC (rev 82)
@@ -1,4 +1,4 @@
-Changelog before release (0.3?) (updated on 2008.10.18).
+Changelog before release (0.3?) (updated on 2008.10.24).
* General
- make sub www folders not accessible by default (some index.html files)
@@ -26,10 +26,13 @@
- LDAP authentication for Openldap and AD support
* Database
-- Review DB module functions
-- Updated txtdb with basic api
+ - Review DB module functions
+ - Updated txtdb with basic api
+ - Prepared SQL structures.
-* Acl for modules and plugins
+* Acl
+ - Modules
+ - Plugins
* Translations
- gettext module
@@ -37,7 +40,7 @@
- initial Italian translation
* Download
- - Changeed serve file method to not go over the memory php limit (output buffer)
+ - Changed serve file method to not go over the memory php limit (disable output buffer)
- Make download timeout configurable.
* Web site
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2008-10-24 11:37:17 UTC (rev 81)
+++ trunk/INSTALL 2008-10-24 14:44:10 UTC (rev 82)
@@ -1,47 +1,209 @@
-This is a preliminary version of the notes
+ ------------------------------------------------------------------------------
+ OpenUpload installation notes
+ ------------------------------------------------------------------------------
+ Version: 0.3
+ Last updated: 2008-10-24
-Installation notes
+INTRODUCTION
-Multisite installation
-1. Download the source from http:/www.sf.net/projects/openupload
-2. Untar the file
- tar xzf <release>.tar.gz
-3. Copy all files to somewhere which is not accessible from the web (i.e. /usr/local/share/openupload)
-4. Copy the www/ files into the web server folder (i.e. /var/www/html) or create a web server alias to point to the www/ folder
-5. copy the www/config.inc.php.example and edit it to suit your installation
-6. Make sure the web server is able to write to the "data" directory
-7. Create the database
- see README for more information on mode and rights configuration
- mysql:
- - create the db and the user
- create database <database>;
- grant all privileges on <database>.* to '<user>'@'localhost' ideintified by '<password>';
- - import the database schema and default config options
- mysql <database> -u <user> -p < sql/mysql/1_schema.sql
- mysql <database> -u <user> -p < sql/mysql/2_base.sql
- - import the configuration mode (it is not required):
- mysql <database> -u <user> -p < sql/mysql/3_mode_<selected>.sql
- txt:
- - the txt is usable, but I would not suggest it unless it's a really low traffic site.
- - make sure the "rootdir" for the txtdb folder is writable by your apache user
- - copy the default files from sql/txt/*.txt to the "rootdir" folder
- - substitute the wanted mode configuration txt/modes/acl_<mode>.txt over the acl.txt
+ This document describes the basic steps to install Open Upload.
+ Be sure to also read README file.
-8. Point your browser to http://localhost/<wherever>
-9. Login with "admin" "admin"
-10. Go to Profile and change your admin e-mail and password
-11. Enjoy! :)
+INDEX
-N.B. If you want to change something in the templates I'd suggest to create a site template and put there the needed changed files,
- (templates/<yourtemplate> or www/templates/<yourtemplate>).
- The program will check for the exsistence of a file in the selected template folder, and if not found will go back to the default.
- This will avoid problems when updating the program to a new version.
+ * Requirements
+ * Quick Start
+ * Modes and Rights
+ * LDAP Authentication
+ * Multisite installation
+ * Templates / Logo change
-BIG FAT NOTE:
-The program will work even if you copy the whole folder into the web server root or a subdiretory.
-But:
-- You should make sure the files are not directly accessible via WEB
- More specifically:
- "data" directory where files are stored
- "txtdb" if a flat txt database is used
+ ------------------------------------------------------------------------------
+REQUIREMENTS
+
+ To be able to use this software you need:
+ - A running Web Server with PHP 5.x (version 4 has not been tested)
+ - Database (MySQL) (optional but raccomended)
+ - PHP and Web server must be configured to allow the file uploads
+ - PHP must be installed with the DATABASE backend you want to use,
+ and GD image extensions for captcha to work.
+ - Also the LDAP extension needs to be installed if you plan to use
+ LDAP/AD Authentcation.
+
+ ------------------------------------------------------------------------------
+
+QUICK START
+
+ * BIG FAT NOTE: This procedure is aimed to let you test the program functionality.
+ Once this program is right for you read the MULTISITE INSTALLATION to avoid
+ security issues.
+ You should make sure the files other than "www" are not directly accessible via WEB
+ More specifically this are the most important:
+ "data" directory where files are stored
+ "txtdb" if a flat txt database is used
+
+ * Download the source from http:/www.sf.net/projects/openupload
+ * Untar the file
+ tar xzf <release>.tar.gz
+ * Copy all files to somewhere which is accessible from the web (i.e. /var/www/html/openupload)
+ * Copy the www/config.inc.php.example and edit it to suit your installation
+ * Make sure the web server is able to write to the "data", "data/tmp" and "templates_c" directory
+ * Create the database
+ ( see MODES AND RIGHTS for more information on mode and rights configuration)
+ MYSQL:
+ - create the db and the user
+ create database <database>;
+ grant all privileges on <database>.* to '<user>'@'localhost' ideintified by '<password>';
+ - import the database schema and default config options
+ mysql <database> -u <user> -p < sql/mysql/1_schema.sql
+ mysql <database> -u <user> -p < sql/mysql/2_base.sql
+ - import the configuration mode (it is not required):
+ mysql <database> -u <user> -p < sql/mysql/3_mode_<selected>.sql
+ FLAT FILE (TXT):
+ - the txt is usable, but I would not suggest it unless it's a really low traffic site.
+ - make sure the "rootdir" for the txtdb folder is writable by your apache user
+ - copy the default files from sql/txt/*.txt to the "rootdir" folder
+ - substitute the wanted mode configuration txt/modes/acl_<mode>.txt over the acl.txt
+
+ * Point your browser to http://localhost/<wherever>
+ * Login with Username: admin Password: admin
+ * Go to Profile and change your admin e-mail and password
+ * Enjoy! :)
+
+ ------------------------------------------------------------------------------
+
+MODES AND RIGHTS
+
+ Application can be configured to achive different behavier depending on group rights.
+ It comes with a set of predefined rights so that it enables/disables features.
+ Mainly I think this are the most usefull modes one should require, but you are free to adapt
+ them after installation.
+
+ * Public
+ The site is completely public. No need for the user to login or register. It can upload and
+ download as it wishes. Still plugin limitations may apply.
+
+ * Service
+ The site is public for not registered users, but registered ones get more functionality (i.e.
+ less limitations, they can password protect the file, can send e-mails, etc).
+
+ * Restricted
+ The users to be able to upload need to register/login
+ The download is still public.
+
+ * Private
+ The users must login to upload and they are not able to register (the Admin adds the users).
+ The download is still available.
+ I think this is the best solution for a company or user which wants internal users to upload
+ files, but i.e. customers to download them freely.
+ IMHO this is the best configuration in conjunction with LDAP/AD Authentication.
+
+ * Internal use (which I do not provide, but might be needed)
+ This is a mode which could be used for some people, but unless needed you will need to
+ configure the rights yourself.
+ Mainly upload and download need a user to login.
+
+ Basically the rights are checked with this priority:
+
+ group / module / action
+ group / module / *
+ group / * / *
+ * / module / action
+ * / module / *
+ * / * / *
+
+ where * stands for any value.
+
+ With the LDAP authentication backend a user can be part of multiple groups.
+ The check is done for every group the user is part of, and if none of it are matched
+ the result is to deny the operation. (See LDAP AUTHENTICATION)
+
+ NOTE: Be carfull with rights as you might block yourself out
+
+ Also the plugins can be enabled and disabled based on the group a user is registered.
+ Probabaly you'll need to adapt it to suit your needs.
+ Plugins must be enabled / disabled on a group basis (this might change in the future),
+ there is no * for the group.
+
+ ------------------------------------------------------------------------------
+
+LDAP AUTHENTICATION
+
+ LDAP support is maily a company feature, where you want your internal users to be able to upload files,
+ and Customers to be able to download (without the need to login).
+
+ Supported (tested) infrastructures:
+ - Openldap (I test it against a Samba3 + Openldap structure).
+ - Active Directory (against a windows 2003 domain)
+
+ LDAP configuration can be quite triky so you'll need to undersand what the configuration options are:
+ - host : this is easy, the host to ask login requests (your LDAP / AD server)
+ - type : in case of Active Directory put 'AD' as value
+ - user : this is the user used to do LDAP/AD queries. I'd suggest to create a readonly user.
+ - password : the "readonly" user password
+ - domain : only for Active Directory, specifies the AD domain (i.e. yourdomain.local), it's used
+ for user authentication. (like Us...@yo...)
+ - basedn : this is the LDAP base DN
+ - userdn : the base dn for user searches. For LDAP it is also used for user authentication values
+ (i.e. uid=User,ou=Users,dc=yourdomain,dc=local), it's the ou=Users,dc=yourdomain,dc=local
+ - userckass : the objectClass associated to the users (leave user for AD)
+ - uid : the field that corresponds to the user login (could be cn, i.e. cn=admin,ou=Users,... )
+ - userfields : the list of correspondences between LDAP/AD attributes and the user fields
+ place particular attention to the group_id match, as it needs to match the main gid for
+ group name search.
+ - groupdn : Group base search path. Where groups are stored (could be the same as basedn)
+ - groupclass : The objectClass of a group (leave group for AD)
+ - gid : this is the value to be matched between the group_id in the user fields and the group)
+ - groupfields: this is a list of correspondence between LDAP/AD group attributes and the group fields
+ - sgid : Mainly needed for Openldap, the user might be part of other groups. this is the lookup
+ field for the login name to be a member of a group (not needed in AD)
+ - sgidfields : correpondence between ldap sub group attributes and group attributes (mainly it's the
+ same as groupfields) maybe I'll remove it, if I find out it's not needed.
+
+ Once you have configured this part you should make sure to be able to login as administrator and change rights.
+ It's probably a good idea to add a record with the Administrator group to be able to access anything.
+
+ I'd suggest to create a set of dedicated groups for the application (i.e. OpenUploadAdmin, OpenUploadUser),
+ in your LDAP/AD configuration, and manage rights for only this groups (obviously assign to them the
+ users you want to access the service)
+ Also I'm not really sure how it works if a user has more than 1 group with different rights (especially
+ on plugins)
+
+ If it's a simple company you can use the default "Domain Users" and "Domain Admins".
+
+ Please note that if LDAP is enabled you won't be able to manage users/groups from the Administration interface
+ (use the LDAP/AD for this)
+
+ I'd also suggest to assign your users an e-mail addess.
+
+ ------------------------------------------------------------------------------
+
+MULTISITE INSTALLATION
+
+ In the QUICK START you find out how to test the application.
+ For a better installation this are my suggestions:
+
+ Put the program somewhere which is not WEB accessible. (i.e. /usr/share/openupload)
+ You can then copy the www folder to the WEB server root (or subdirectory), or even better,
+ point the web server to the www folder if it's a single site configuration.
+
+ Make sure the "data", "data/tmp" and "templates_c" folders are writable by the web user.
+
+ Change the config.inc.php accordingly to your installation.
+
+ If you want a multisite be sure to have a different config.inc.php per site (and db or db prefix).
+ Create a template folder for every site (or maybe just 1 if you plan on changing only the logo).
+
+ ------------------------------------------------------------------------------
+
+TEMPLATES / LOGO CHANGES (Notes)
+
+ If you want to change something in the templates I'd suggest to create a site template and put
+ there the needed changed files,
+ (templates/<yourtemplate> or www/templates/<yourtemplate>).
+ The program will check for the exsistence of a file in the selected template folder, and if not
+ found will go back to the default.
+ This will avoid problems when updating the program to a new version.
+
+
Modified: trunk/README
===================================================================
--- trunk/README 2008-10-24 11:37:17 UTC (rev 81)
+++ trunk/README 2008-10-24 14:44:10 UTC (rev 82)
@@ -4,6 +4,7 @@
VERSION: 0.3
+
AUTHORS:
OpenUpload (http://openupload.sf.net/)
Copyright: 2008 Alessandro Briosi <ts...@br...>
@@ -27,10 +28,42 @@
It aims to be customizable/extendible.
It can be used inside enterprises for sharing files fast with customers.
+
INSTALLATION:
-
+
See INSTALL file for details.
+
+REPORTING BUGS / FEATURE REQUESTS / JOIN DEVELOPMENT:
+
+ There is a mailing list which can be used to report bugs and feature requests.
+ (see web site for detail)
+ I'd really apreciate any feedback.
+ As the project is in it's early stages the use of Track might be too much.
+ Maybe in the future...
+ Ho, and would really love to have somebody else work on the project.
+
+
+TRANSLATIONS:
+
+ Right now the program is only translated to Italian (sorry I only know Italian and Engligh)
+ Translating isn't that hard (at least the default template)
+ I have implemented 2 tranlsation modules, but I probably plan to have a tool which converts from
+ one to the other.
+ Right now you can choose to translate with a php array, or use gettext tools (like poedit), to
+ translate the app to your language.
+ It's divided in 2 parts. 1 is for the application, and 1 is for the template.
+ They are located in locale/* for the application and templates/default/locale for the 2nd.
+ Once your translation is ready please send it to me or the ML.
+
+
+RESTRICTIONS:
+
+ This program is released under the GPL license so be sure to follow it's restrictions.
+ You are encoraged to keep the link and copyright notice, but not oblied to.
+ So yes, you can remove the copyright notice. Don't replace it with yours though. :-)
+
+
COPYRIGHT:
Copyright (c) 2008 Alessandro Briosi. All rights reserved.
This software is released under the GNU General Public License.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-24 12:29:49
|
Revision: 78
http://openupload.svn.sourceforge.net/openupload/?rev=78&view=rev
Author: tsdogs
Date: 2008-10-24 11:07:40 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
Add Active Directory Authentication
Modified Paths:
--------------
trunk/lib/main.inc.php
trunk/lib/modules/auth/ldap.inc.php
Modified: trunk/lib/main.inc.php
===================================================================
--- trunk/lib/main.inc.php 2008-10-24 09:45:48 UTC (rev 77)
+++ trunk/lib/main.inc.php 2008-10-24 11:07:40 UTC (rev 78)
@@ -74,8 +74,6 @@
$user = $this->user->info();
$this->user->setInfo('lang',$lang);
}
-
-//unset($_SESSION['user']);
$this->tr->init();
$this->auth->init();
$this->user->init();
Modified: trunk/lib/modules/auth/ldap.inc.php
===================================================================
--- trunk/lib/modules/auth/ldap.inc.php 2008-10-24 09:45:48 UTC (rev 77)
+++ trunk/lib/modules/auth/ldap.inc.php 2008-10-24 11:07:40 UTC (rev 78)
@@ -18,12 +18,16 @@
$this->ds=@ldap_connect($this->config['host']);
if ($this->ds) {
@ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3);
+ @ldap_set_option($this->ds, LDAP_OPT_REFERRALS, 0);
return true;
+ } else {
+ app()->error(tr('LDAP connection failed!'));
}
return false;
}
function disconnect() {
+ @ldap_unbind($this->ds);
@ldap_close($this->ds);
}
@@ -35,7 +39,11 @@
function authenticate($login,$password) {
if ($this->connect()) {
- $uid = $this->ufield.'='.$login.','.$this->config['userdn'];
+ if ($this->config['type'] != 'AD') {
+ $uid = $this->ufield.'='.$login.','.$this->config['userdn'];
+ } else {
+ $uid = $login.'@'.$this->config['domain'];
+ }
if (@ldap_bind($this->ds, $uid, $password)) {
return true;
}
@@ -52,24 +60,47 @@
'(&('.$this->ufield.'='.$login.')(objectclass='.$this->config['userclass'].'))');
if ($r) {
$res = @ldap_get_entries($this->ds, $r);
- /* associate user fields */
+ /* associate user fields */echo '<pre>';
$res = $res[0];
foreach ($this->config['userfields'] as $n => $f) {
- $result[$f] = $res[$n][0];
+ if ($f == 'group_id') {
+ $result[$f] = $res[$n];
+ } else {
+ $result[$f] = $res[$n][0];
+ }
}
}
/* now retrieve the main group */
- $r = @ldap_search($this->ds, $this->config['groupdn'],
- '(&('.$this->gfield.'='.$result['group_id'].')(objectclass='.$this->config['groupclass'].'))');
- if ($r) {
- $res = @ldap_get_entries($this->ds, $r);
- /* associate user fields */
- $res = $res[0];
- foreach ($this->config['groupfields'] as $n => $f) {
- if ($f == 'name') {
- $result['group'] = $res[$n][0];
+ if (is_array($result['group_id'])) {
+ for ($g = 0; $g < $result['group_id']['count']; $g++) {
+ $r = @ldap_search($this->ds, $this->config['groupdn'],
+ '(&('.$this->gfield.'='.$result['group_id'][$g].')(objectclass='.$this->config['groupclass'].'))');
+ if ($r) {
+ $res = @ldap_get_entries($this->ds, $r);
+ /* associate user fields */
+ $res = $res[0];
+ foreach ($this->config['groupfields'] as $n => $f) {
+ if ($f == 'name' and $res[$n][0]!='') {
+ $result['group'][] = $res[$n][0];
+ }
+ }
}
}
+ } else {
+ $r = @ldap_search($this->ds, $this->config['groupdn'],
+ '(&('.$this->gfield.'='.$result['group_id'].')(objectclass='.$this->config['groupclass'].'))');
+ if ($r) {
+ $res = @ldap_get_entries($this->ds, $r);
+ /* associate user fields */
+ for ($i = 0; $i<$res['count']; $i++) {
+ $res = $res[0];
+ foreach ($this->config['groupfields'] as $n => $f) {
+ if ($f == 'name' and $res[$n][0]!='') {
+ $result['group'] = $res[$n][0];
+ }
+ }
+ }
+ }
}
if (isset($this->config['sgid'])) {
$result['group'] = array($result['group']);
@@ -79,7 +110,7 @@
$res = @ldap_get_entries($this->ds, $r);
for ($i = 0; $i<$res['count']; $i++) {
foreach ($this->config['sgroupfields'] as $n => $f) {
- if ($f == 'name') {
+ if ($f == 'name' and $res[$n][0]!='') {
$result['group'][] = $res[$i][$n][0];
}
}
@@ -105,7 +136,7 @@
$res = @ldap_get_entries($this->ds, $r);
/* associate user fields */
for ($i = 0; $i<$res['count']; $i++) {
- foreach ($this->config['sgroupfields'] as $n => $f) {
+ foreach ($this->config['groupfields'] as $n => $f) {
$result[$i][$f] = $res[$i][$n][0];
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-24 12:29:41
|
Revision: 81
http://openupload.svn.sourceforge.net/openupload/?rev=81&view=rev
Author: tsdogs
Date: 2008-10-24 11:37:17 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
Update some docs
Modified Paths:
--------------
trunk/CHANGELOG
trunk/README
trunk/TODO
Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG 2008-10-24 11:16:14 UTC (rev 80)
+++ trunk/CHANGELOG 2008-10-24 11:37:17 UTC (rev 81)
@@ -22,6 +22,9 @@
* User
- Manage profile (password/Name/E-Mail change)
+* Authentication
+ - LDAP authentication for Openldap and AD support
+
* Database
- Review DB module functions
- Updated txtdb with basic api
Modified: trunk/README
===================================================================
--- trunk/README 2008-10-24 11:16:14 UTC (rev 80)
+++ trunk/README 2008-10-24 11:37:17 UTC (rev 81)
@@ -27,6 +27,9 @@
It aims to be customizable/extendible.
It can be used inside enterprises for sharing files fast with customers.
+INSTALLATION:
+
+ See INSTALL file for details.
COPYRIGHT:
Copyright (c) 2008 Alessandro Briosi. All rights reserved.
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2008-10-24 11:16:14 UTC (rev 80)
+++ trunk/TODO 2008-10-24 11:37:17 UTC (rev 81)
@@ -9,9 +9,6 @@
- remove absolute paths from templates, to retrieve default template file if template file is not found
******* WOULD LIKE IT TO BE IN RELEASE *******
-Authentication
-- LDAP authentication for Openldap and AD support
-
Upload
- Display upload progress
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-24 11:16:27
|
Revision: 80
http://openupload.svn.sourceforge.net/openupload/?rev=80&view=rev
Author: tsdogs
Date: 2008-10-24 11:16:14 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
Fix ldap problems after AD was introduced
Modified Paths:
--------------
trunk/lib/modules/auth/ldap.inc.php
Modified: trunk/lib/modules/auth/ldap.inc.php
===================================================================
--- trunk/lib/modules/auth/ldap.inc.php 2008-10-24 11:08:04 UTC (rev 79)
+++ trunk/lib/modules/auth/ldap.inc.php 2008-10-24 11:16:14 UTC (rev 80)
@@ -71,46 +71,28 @@
}
}
/* now retrieve the main group */
- if (is_array($result['group_id'])) {
- for ($g = 0; $g < $result['group_id']['count']; $g++) {
- $r = @ldap_search($this->ds, $this->config['groupdn'],
- '(&('.$this->gfield.'='.$result['group_id'][$g].')(objectclass='.$this->config['groupclass'].'))');
- if ($r) {
- $res = @ldap_get_entries($this->ds, $r);
- /* associate user fields */
- $res = $res[0];
- foreach ($this->config['groupfields'] as $n => $f) {
- if ($f == 'name' and $res[$n][0]!='') {
- $result['group'][] = $res[$n][0];
- }
- }
- }
- }
- } else {
+ for ($g = 0; $g < $result['group_id']['count']; $g++) {
$r = @ldap_search($this->ds, $this->config['groupdn'],
- '(&('.$this->gfield.'='.$result['group_id'].')(objectclass='.$this->config['groupclass'].'))');
+ '(&('.$this->gfield.'='.$result['group_id'][$g].')(objectclass='.$this->config['groupclass'].'))');
if ($r) {
$res = @ldap_get_entries($this->ds, $r);
/* associate user fields */
- for ($i = 0; $i<$res['count']; $i++) {
- $res = $res[0];
- foreach ($this->config['groupfields'] as $n => $f) {
- if ($f == 'name' and $res[$n][0]!='') {
- $result['group'] = $res[$n][0];
- }
+ $res = $res[0];
+ foreach ($this->config['groupfields'] as $n => $f) {
+ if ($f == 'name' and $res[$n][0]!='') {
+ $result['group'][] = $res[$n][0];
}
}
}
}
if (isset($this->config['sgid'])) {
- $result['group'] = array($result['group']);
$r = @ldap_search($this->ds, $this->config['groupdn'],
'(&('.$this->config['sgid'].'='.$result['login'].')(objectclass='.$this->config['groupclass'].'))');
if ($r) {
$res = @ldap_get_entries($this->ds, $r);
for ($i = 0; $i<$res['count']; $i++) {
foreach ($this->config['sgroupfields'] as $n => $f) {
- if ($f == 'name' and $res[$n][0]!='') {
+ if ($f == 'name' and $res[$i][$n][0]!='') {
$result['group'][] = $res[$i][$n][0];
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-24 11:15:46
|
Revision: 75
http://openupload.svn.sourceforge.net/openupload/?rev=75&view=rev
Author: tsdogs
Date: 2008-10-24 09:19:12 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
if auth does not support user admin, disable registration / profile change
Modified Paths:
--------------
trunk/lib/modules/default/admin.inc.php
trunk/lib/modules/default/auth.inc.php
Modified: trunk/lib/modules/default/admin.inc.php
===================================================================
--- trunk/lib/modules/default/admin.inc.php 2008-10-24 09:13:19 UTC (rev 74)
+++ trunk/lib/modules/default/admin.inc.php 2008-10-24 09:19:12 UTC (rev 75)
@@ -140,7 +140,6 @@
if (isset($_GET['id'])) {
$active=$_GET['active']==1?0:1;
$user = app()->auth->userinfo($_GET['id']);
- $user = $user[0];
if ($user['login']==$_GET['id']) {
$user['active']=$active;
app()->auth->useredit($user,false);
Modified: trunk/lib/modules/default/auth.inc.php
===================================================================
--- trunk/lib/modules/default/auth.inc.php 2008-10-24 09:13:19 UTC (rev 74)
+++ trunk/lib/modules/default/auth.inc.php 2008-10-24 09:19:12 UTC (rev 75)
@@ -43,7 +43,8 @@
$this->menu['profile']=tr('Preferences');
$this->menu['logout']=tr('Logout');
}
- $this->tpl->assign('register',app()->checkACL(app()->user->group(),'auth','register')=='allow');
+ if (app()->auth->features['useradmin']=='yes')
+ $this->tpl->assign('register',app()->checkACL(app()->user->group(),'auth','register')=='allow');
}
@@ -87,6 +88,11 @@
global $_GET;
global $_POST;
+ if (app()->auth->features['useradmin']!='yes') {
+ app()->error(tr('Registration is not supported by Auth Module'));
+ redirect();
+ }
+
if (isset($_GET['regid'])) {
/* confirm registration */
$_SESSION['user']['regidconfirm']=$_GET['regid'];
@@ -104,6 +110,11 @@
function registerConfirm() {
global $_SESSION;
global $_POST;
+
+ if (app()->auth->features['useradmin']!='yes') {
+ app()->error(tr('Registration is not supported by Auth Module'));
+ redirect();
+ }
if (isset($_POST['registerlogin'])) {
/* check for the unique login */
@@ -184,6 +195,12 @@
function registerEnable() {
global $_SESSION;
+
+ if (app()->auth->features['useradmin']!='yes') {
+ app()->error(tr('Registration is not supported by Auth Module'));
+ redirect();
+ }
+
/* if everything is ok register the user */
if (isset($_SESSION['user']['regidconfirm'])) {
$user = app()->db->read('users',array('regid' => $_SESSION['user']['regidconfirm']));
@@ -197,12 +214,23 @@
}
function profile() {
+
+ if (app()->auth->features['useradmin']!='yes') {
+ app()->error(tr('User profile change not supported by Auth Module'));
+ redirect();
+ }
+
$user = app()->user->info();
$this->tpl->assign('puser',$user);
}
function profileedit() {
global $_POST;
+
+ if (app()->auth->features['useradmin']!='yes') {
+ app()->error(tr('User profile change not supported by Auth Module'));
+ redirect();
+ }
$user = app()->user->info();
if (isset($_POST['username'])) {
/* check for valid values*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-24 11:13:02
|
Revision: 79
http://openupload.svn.sourceforge.net/openupload/?rev=79&view=rev
Author: tsdogs
Date: 2008-10-24 11:08:04 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
Add Active Directory Authentication sample options
Modified Paths:
--------------
trunk/www/config.inc.php.example
Modified: trunk/www/config.inc.php.example
===================================================================
--- trunk/www/config.inc.php.example 2008-10-24 11:07:40 UTC (rev 78)
+++ trunk/www/config.inc.php.example 2008-10-24 11:08:04 UTC (rev 79)
@@ -78,7 +78,25 @@
/* other group field correspondence with application */
# $CONFIG['ldap']['sgroupfields'] = array ( 'cn' => 'name', 'description' => 'description' );
+/* Active Directory */
+# $CONFIG['ldap']['host'] = '127.0.0.1';
+/* specify that it is an Active directory */
+# $CONFIG['ldap']['type'] = 'AD';
+# $CONFIG['ldap']['user'] = 'rea...@ro...';
+# $CONFIG['ldap']['password'] = 'readonlypassword';
+/* DOMAIN for user login */
+# $CONFIG['ldap']['domain'] = 'yourdomain.local';
+# $CONFIG['ldap']['basedn'] = 'dc=yourdomain,dc=local';
+# $CONFIG['ldap']['userdn'] = 'dc=yourdomain,dc=local';
+# $CONFIG['ldap']['userclass']='user';
+# $CONFIG['ldap']['uid']='cn';
+# $CONFIG['ldap']['userfields'] = array ( 'cn' => 'login', 'name' => 'name', 'memberof' => 'group_id', 'mail' => 'email');
+# $CONFIG['ldap']['groupdn'] = 'dc=roverdom,dc=local';
+# $CONFIG['ldap']['groupclass']='group';
+# $CONFIG['ldap']['gid']='distinguishedname';
+# $CONFIG['ldap']['groupfields'] = array ( 'cn' => 'name', 'name' => 'description' );
+
/* PLUGINS: here you enable the plugins
* they will need to enable the functionality
* on a group basis
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-24 10:58:37
|
Revision: 74
http://openupload.svn.sourceforge.net/openupload/?rev=74&view=rev
Author: tsdogs
Date: 2008-10-24 09:13:19 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
fix user administration
Modified Paths:
--------------
trunk/lib/modules/default/admin.inc.php
trunk/lib/modules/default/auth.inc.php
Modified: trunk/lib/modules/default/admin.inc.php
===================================================================
--- trunk/lib/modules/default/admin.inc.php 2008-10-24 08:57:58 UTC (rev 73)
+++ trunk/lib/modules/default/admin.inc.php 2008-10-24 09:13:19 UTC (rev 74)
@@ -185,8 +185,7 @@
$this->nextStep(1);
}
} else {
- $user = app()->auth->info($_GET['id']);
- $user = $user[0];
+ $user = app()->auth->userinfo($_GET['id']);
}
$this->tpl->assign('edituser',$user);
}
Modified: trunk/lib/modules/default/auth.inc.php
===================================================================
--- trunk/lib/modules/default/auth.inc.php 2008-10-24 08:57:58 UTC (rev 73)
+++ trunk/lib/modules/default/auth.inc.php 2008-10-24 09:13:19 UTC (rev 74)
@@ -39,7 +39,7 @@
if (!app()->user->loggedin()) {
$this->menu['login']=tr('Login');
} else {
- if (app()->auth->features['adminusers']=='yes')
+ if (app()->auth->features['useradmin']=='yes')
$this->menu['profile']=tr('Preferences');
$this->menu['logout']=tr('Logout');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-24 09:48:29
|
Revision: 77
http://openupload.svn.sourceforge.net/openupload/?rev=77&view=rev
Author: tsdogs
Date: 2008-10-24 09:45:48 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
some normalization
Modified Paths:
--------------
trunk/lib/modules/auth/ldap.inc.php
Modified: trunk/lib/modules/auth/ldap.inc.php
===================================================================
--- trunk/lib/modules/auth/ldap.inc.php 2008-10-24 09:32:52 UTC (rev 76)
+++ trunk/lib/modules/auth/ldap.inc.php 2008-10-24 09:45:48 UTC (rev 77)
@@ -14,29 +14,44 @@
$this->features = array('useradmin' => 'no', 'groupadmin' => 'no');
}
+ function connect() {
+ $this->ds=@ldap_connect($this->config['host']);
+ if ($this->ds) {
+ @ldap_set_option($this->ds, LDAP_OPT_PROTOCOL_VERSION, 3);
+ return true;
+ }
+ return false;
+ }
+
+ function disconnect() {
+ @ldap_close($this->ds);
+ }
+
+ function bind() {
+ if (@ldap_bind($this->ds, $this->config['user'],$this->config['password']) )
+ return true;
+ return false;
+ }
+
function authenticate($login,$password) {
- $ds=ldap_connect($this->config['host']);
- if ($ds) {
+ if ($this->connect()) {
$uid = $this->ufield.'='.$login.','.$this->config['userdn'];
- if (ldap_bind($ds, $uid, $password) ) {
- /* authentication was successfull, save username and password for additional info */
- $this->uid = $uid;
- $this->password = $password;
+ if (@ldap_bind($this->ds, $uid, $password)) {
return true;
}
- ldap_close($ds);
+ $this->disconnect();
}
return false;
}
function userinfo($login) {
- $ds=@ldap_connect($this->config['host']);
+
$result = array();
- if (ldap_bind($ds, $this->config['user'],$this->config['password']) ) {
- $r = @ldap_search($ds, $this->config['userdn'],
+ if ($this->connect() and $this->bind()) {
+ $r = @ldap_search($this->ds, $this->config['userdn'],
'(&('.$this->ufield.'='.$login.')(objectclass='.$this->config['userclass'].'))');
if ($r) {
- $res = @ldap_get_entries($ds, $r);
+ $res = @ldap_get_entries($this->ds, $r);
/* associate user fields */
$res = $res[0];
foreach ($this->config['userfields'] as $n => $f) {
@@ -44,10 +59,10 @@
}
}
/* now retrieve the main group */
- $r = @ldap_search($ds, $this->config['groupdn'],
+ $r = @ldap_search($this->ds, $this->config['groupdn'],
'(&('.$this->gfield.'='.$result['group_id'].')(objectclass='.$this->config['groupclass'].'))');
if ($r) {
- $res = @ldap_get_entries($ds, $r);
+ $res = @ldap_get_entries($this->ds, $r);
/* associate user fields */
$res = $res[0];
foreach ($this->config['groupfields'] as $n => $f) {
@@ -58,10 +73,10 @@
}
if (isset($this->config['sgid'])) {
$result['group'] = array($result['group']);
- $r = @ldap_search($ds, $this->config['groupdn'],
+ $r = @ldap_search($this->ds, $this->config['groupdn'],
'(&('.$this->config['sgid'].'='.$result['login'].')(objectclass='.$this->config['groupclass'].'))');
if ($r) {
- $res = @ldap_get_entries($ds, $r);
+ $res = @ldap_get_entries($this->ds, $r);
for ($i = 0; $i<$res['count']; $i++) {
foreach ($this->config['sgroupfields'] as $n => $f) {
if ($f == 'name') {
@@ -72,30 +87,31 @@
}
}
}
- ldap_close($ds);
+ $this->disconnect();
return $result;
}
function groupinfo($group = '') {
- $ds=@ldap_connect($this->config['host']);
$result = array();
- @ldap_bind($ds, $this->config['user'], $this->config['password']);
- if (group != '') {
- $r = @ldap_search($ds, $this->config['groupdn'],'(objectclass='.$this->config['groupclass'].')');
- } else {
- $r = @ldap_search($ds, $this->config['groupdn'],
- '(&('.$this->gfield.'='.$group.')(objectclass='.$this->config['groupclass'].'))');
- }
- if ($r) {
- $res = @ldap_get_entries($ds, $r);
- /* associate user fields */
- for ($i = 0; $i<$res['count']; $i++) {
- foreach ($this->config['sgroupfields'] as $n => $f) {
- $result[$i][$f] = $res[$i][$n][0];
+ if ($this->connect()) {
+ $this->bind();
+ if (group != '') {
+ $r = @ldap_search($this->ds, $this->config['groupdn'],'(objectclass='.$this->config['groupclass'].')');
+ } else {
+ $r = @ldap_search($this->ds, $this->config['groupdn'],
+ '(&('.$this->gfield.'='.$group.')(objectclass='.$this->config['groupclass'].'))');
+ }
+ if ($r) {
+ $res = @ldap_get_entries($this->ds, $r);
+ /* associate user fields */
+ for ($i = 0; $i<$res['count']; $i++) {
+ foreach ($this->config['sgroupfields'] as $n => $f) {
+ $result[$i][$f] = $res[$i][$n][0];
+ }
}
}
+ $this->disconnect();
}
- ldap_close($ds);
return $result;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-24 09:37:14
|
Revision: 76
http://openupload.svn.sourceforge.net/openupload/?rev=76&view=rev
Author: tsdogs
Date: 2008-10-24 09:32:52 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
Add LDAP authentication configuration options
Modified Paths:
--------------
trunk/www/config.inc.php.example
Modified: trunk/www/config.inc.php.example
===================================================================
--- trunk/www/config.inc.php.example 2008-10-24 09:19:12 UTC (rev 75)
+++ trunk/www/config.inc.php.example 2008-10-24 09:32:52 UTC (rev 76)
@@ -33,12 +33,52 @@
$CONFIG['database']['name']='openupload';
/* TXT Database */
-//$CONFIG['database']['type']='txt';
-//$CONFIG['database']['rootdir']=$CONFIG['INSTALL_ROOT'].'/txtdb';
+# $CONFIG['database']['type']='txt';
+# $CONFIG['database']['rootdir']=$CONFIG['INSTALL_ROOT'].'/txtdb';
/* Table name prefix: should be common */
$CONFIG['database']['prefix']='';
+/* AUTHENTICATION MODULE */
+/* default uses the database table users */
+# $CONFIG['auth'] = 'ldap';
+$CONFIG['auth'] = 'default';
+
+/************************************************************
+ * LDAP detail configuration options *
+ ************************************************************/
+/* LDAP Host */
+# $CONFIG['ldap']['host'] = '127.0.0.1';
+/* Ldap bind user/password to get group and user information */
+# $CONFIG['ldap']['user'] = 'uid=readonly,ou=Users,dc=yourdomain,dc=com';
+# $CONFIG['ldap']['password'] = 'readonlypassword';
+/* BASE search DN */
+# $CONFIG['ldap']['basedn'] = 'dc=yourdomain,dc=com';
+
+/* users are part of this LDAP dn */
+# $CONFIG['ldap']['userdn'] = 'ou=Users,dc=yourdomain,dc=com';
+/* search objectClass for users */
+# $CONFIG['ldap']['userclass']='posixAccount';
+/* login corresponds to the 'uid' field */
+# $CONFIG['ldap']['uid']='uid';
+/* user field correspondence with application */
+# $CONFIG['ldap']['userfields'] = array ( 'uid' => 'login', 'displayname' => 'name', 'gidnumber' => 'group_id', 'mail' => 'email');
+
+/* Groups search base */
+# $CONFIG['ldap']['groupdn'] = 'ou=Groups,dc=yourdomain,dc=com';
+/* Group / SubGroup objectClass */
+# $CONFIG['ldap']['groupclass']='posixGroup';
+/* group id number which corresponds to main user group */
+# $CONFIG['ldap']['gid']='gidNumber';
+/* if the user can have more than 1 group search for other groups which contain the login in ther 'memberUid' */
+# $CONFIG['ldap']['sgid']='memberUid';
+
+/* group field correspondence with application */
+# $CONFIG['ldap']['groupfields'] = array ( 'cn' => 'name', 'description' => 'description' );
+/* other group field correspondence with application */
+# $CONFIG['ldap']['sgroupfields'] = array ( 'cn' => 'name', 'description' => 'description' );
+
+
/* PLUGINS: here you enable the plugins
* they will need to enable the functionality
* on a group basis
@@ -73,6 +113,7 @@
/* SITE STYLE */
$CONFIG['site']['template'] = 'default';
+
/* ENABLE OR DISABLE SMARTY CACHING
* if enabled make sure a cache folder exsists
* and that it is writable
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-24 09:02:19
|
Revision: 73
http://openupload.svn.sourceforge.net/openupload/?rev=73&view=rev
Author: tsdogs
Date: 2008-10-24 08:57:58 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
fix group selection on default authentication
Modified Paths:
--------------
trunk/lib/modules/auth/default.inc.php
Modified: trunk/lib/modules/auth/default.inc.php
===================================================================
--- trunk/lib/modules/auth/default.inc.php 2008-10-24 08:39:33 UTC (rev 72)
+++ trunk/lib/modules/auth/default.inc.php 2008-10-24 08:57:58 UTC (rev 73)
@@ -24,7 +24,7 @@
function userinfo($login) {
$result = $this->db->read('users',array('login' => $login));
- $result['group']=$result['group_name'];
+ $result[0]['group']=$result[0]['group_name'];
return $result[0];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ts...@us...> - 2008-10-24 08:43:54
|
Revision: 72
http://openupload.svn.sourceforge.net/openupload/?rev=72&view=rev
Author: tsdogs
Date: 2008-10-24 08:39:33 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
Update to new structure
Modified Paths:
--------------
trunk/sql/txt/acl.txt
trunk/sql/txt/files.txt
trunk/sql/txt/modes/acl_private.txt
trunk/sql/txt/modes/acl_public.txt
trunk/sql/txt/modes/acl_restricted.txt
trunk/sql/txt/modes/acl_service.txt
trunk/sql/txt/plugin_acl.txt
trunk/sql/txt/plugin_options.txt
trunk/sql/txt/users.txt
Modified: trunk/sql/txt/acl.txt
===================================================================
--- trunk/sql/txt/acl.txt 2008-10-24 08:37:53 UTC (rev 71)
+++ trunk/sql/txt/acl.txt 2008-10-24 08:39:33 UTC (rev 72)
@@ -1,4 +1,4 @@
-id|module|action|group_id|access
+id|module|action|group_name|access
1|*|*|admins|allow
2|admin|*|admins|allow
3|admin|*|*|deny
Modified: trunk/sql/txt/files.txt
===================================================================
--- trunk/sql/txt/files.txt 2008-10-24 08:37:53 UTC (rev 71)
+++ trunk/sql/txt/files.txt 2008-10-24 08:39:33 UTC (rev 72)
@@ -1 +1 @@
-id|name|mime|description|size|remove|user_id|ip|upload_date
+id|name|mime|description|size|remove|user_login|ip|upload_date
Modified: trunk/sql/txt/modes/acl_private.txt
===================================================================
--- trunk/sql/txt/modes/acl_private.txt 2008-10-24 08:37:53 UTC (rev 71)
+++ trunk/sql/txt/modes/acl_private.txt 2008-10-24 08:39:33 UTC (rev 72)
@@ -1,4 +1,4 @@
-id|module|action|group_id|access
+id|module|action|group_name|access
1|*|*|admins|allow
2|admin|*|admins|allow
3|admin|*|*|deny
Modified: trunk/sql/txt/modes/acl_public.txt
===================================================================
--- trunk/sql/txt/modes/acl_public.txt 2008-10-24 08:37:53 UTC (rev 71)
+++ trunk/sql/txt/modes/acl_public.txt 2008-10-24 08:39:33 UTC (rev 72)
@@ -1,4 +1,4 @@
-id|module|action|group_id|access
+id|module|action|group_name|access
1|*|*|admins|allow
2|admin|*|admins|allow
3|admin|*|*|deny
Modified: trunk/sql/txt/modes/acl_restricted.txt
===================================================================
--- trunk/sql/txt/modes/acl_restricted.txt 2008-10-24 08:37:53 UTC (rev 71)
+++ trunk/sql/txt/modes/acl_restricted.txt 2008-10-24 08:39:33 UTC (rev 72)
@@ -1,4 +1,4 @@
-id|module|action|group_id|access
+id|module|action|group_name|access
1|*|*|admins|allow
2|admin|*|admins|allow
3|admin|*|*|deny
Modified: trunk/sql/txt/modes/acl_service.txt
===================================================================
--- trunk/sql/txt/modes/acl_service.txt 2008-10-24 08:37:53 UTC (rev 71)
+++ trunk/sql/txt/modes/acl_service.txt 2008-10-24 08:39:33 UTC (rev 72)
@@ -1,4 +1,4 @@
-id|module|action|group_id|access
+id|module|action|group_name|access
1|*|*|admins|allow
2|admin|*|admins|allow
3|admin|*|*|deny
Modified: trunk/sql/txt/plugin_acl.txt
===================================================================
--- trunk/sql/txt/plugin_acl.txt 2008-10-24 08:37:53 UTC (rev 71)
+++ trunk/sql/txt/plugin_acl.txt 2008-10-24 08:39:33 UTC (rev 72)
@@ -1,4 +1,4 @@
-id|group_id|plugin|access
+id|group_name|plugin|access
1|admins|password|enable
2|admins|captcha|enable
3|admins|email|enable
Modified: trunk/sql/txt/plugin_options.txt
===================================================================
--- trunk/sql/txt/plugin_options.txt 2008-10-24 08:37:53 UTC (rev 71)
+++ trunk/sql/txt/plugin_options.txt 2008-10-24 08:39:33 UTC (rev 72)
@@ -1 +1 @@
-id|plugin|group_id|name|value
+id|plugin|group_name|name|value
Modified: trunk/sql/txt/users.txt
===================================================================
--- trunk/sql/txt/users.txt 2008-10-24 08:37:53 UTC (rev 71)
+++ trunk/sql/txt/users.txt 2008-10-24 08:39:33 UTC (rev 72)
@@ -1,2 +1,2 @@
-id|login|password|name|group_id|email|lang|reg_date|regid|active
+id|login|password|name|group_name|email|lang|reg_date|regid|active
1|admin|$1$sLCQ3aFR$rCIb4Owhgi3mIHgYnbA351|Administrator|admins|ope...@yo...|en|0000-00-00 00:00:00||1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
