Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 4dc943c

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 1e6d742 + 6bfcb27 commit 4dc943c

File tree

28 files changed

+661
-56
lines changed

28 files changed

+661
-56
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ If you think you have found a bug and a way to fix it neatly in the code, use a
3333

3434
#### Writing new plugins
3535

36-
Please read the Developer doc located at https://pyd.io/documentation/developer, you will find here a bunch of useful information about the plugins architecture, how to create your own plugin, etc. The action.skeleton plugin is a perfect start for that.
36+
Please read the Developer doc located at https://pydio.com/en/docs/developer-guide, you will find here a bunch of useful information about the plugins architecture, how to create your own plugin, etc. The action.skeleton plugin is a perfect start for that.
3737

3838
New in latest build, in the Settings panel, you can find a new "Developer" node where all actions contributed by all plugins are listed. These can be called either by http, or via the CLI API. At the same location, you will find all "hooks" registered and triggered in the server, that are VERY useful when you want your plugin to be really sandboxed.
3939

4040
#### Signing the CLA
4141

42-
Please <a href="https://pydio.com/en/community/contribute/contributor-license-agreement-cla">sign the Contributor License Agreement</a> before contributing.
42+
Please [sign the Contributor License Agreement](https://pydio.com/en/community/contribute/contributor-license-agreement-cla) before contributing.

core/src/core/tests/test.PHP_APC.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,15 @@ public function __construct() { parent::__construct("PHP APC extension", "Pydio
3232
public function doTest()
3333
{
3434
$this->failedLevel = "warning";
35-
$v = @extension_loaded('apc');
36-
if (isSet($v) && (is_numeric($v) || strtolower($v) == "on")) {
35+
36+
if (extension_loaded('apc')) {
37+
$this->failedInfo = "PHP APC extension detected, this is good for better performances";
38+
$this->testedParams["PHP APC extension loaded"] = "Yes";
39+
return TRUE;
40+
} else {
3741
$this->testedParams["PHP APC extension loaded"] = "No";
38-
return FALSE;
39-
} else if (!isSet($v)) {
4042
$this->failedInfo = "Pydio framework loads a lot of PHP files at each query, and using a PHP accelerator is greatly recommanded.";
4143
return FALSE;
4244
}
43-
$this->failedInfo = "PHP APC extension detected, this is good for better performances";
44-
$this->testedParams["PHP APC extension loaded"] = "Yes";
45-
return TRUE;
4645
}
4746
}

core/src/core/tests/test.PHP_INTL.php

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?php
2+
/*
3+
* Copyright 2007-2016 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
4+
* This file is part of Pydio.
5+
*
6+
* Pydio is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Affero General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* Pydio is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU Affero General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Affero General Public License
17+
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
* The latest code can be found at <http://pyd.io/>.
20+
*/
21+
defined('AJXP_EXEC') or die( 'Access not allowed');
22+
require_once('../classes/class.AbstractTest.php');
23+
24+
/**
25+
* Check that intl is enabled
26+
* @package AjaXplorer
27+
* @subpackage Tests
28+
*/
29+
class PHP_INTL extends AbstractTest
30+
{
31+
public function __construct() { parent::__construct("PHP INTL extension", "Pydio used intl to localize month names."); }
32+
public function doTest()
33+
{
34+
$this->failedLevel = "warning";
35+
36+
if (extension_loaded('intl')) {
37+
$this->failedInfo = "PHP INTL extension detected. Month names can be localized depending on the users language.";
38+
$this->testedParams["PHP INTL extension loaded"] = "Yes";
39+
return TRUE;
40+
} else {
41+
$this->failedInfo = "PHP INTL extension missing. English month names will be used for all languages.";
42+
$this->testedParams["PHP INTL extension loaded"] = "No";
43+
return FALSE;
44+
}
45+
}
46+
}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
/*
3+
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
4+
* This file is part of Pydio.
5+
*
6+
* Pydio is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Affero General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* Pydio is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU Affero General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Affero General Public License
17+
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
* The latest code can be found at <http://pyd.io/>.
20+
*/
21+
$mess=array(
22+
"Cyphered Identifiers" => "Identificatori Cifrati",
23+
"Cyphered identifiers passed through GET, POST or HTTP Headers, using a private key shared by Pydio and Third-party application." => "Identificatori cifrati, passati via GET, POST o headers HTTP, che utilizzano chiavi private condivise da Pydio e le applicazioni di terze parti.",
24+
"Private Key" => "Chiave Privata",
25+
"Key used for hashing" => "Chiave usata per l' hashing",
26+
"Replay Check" => "Controllo Risposta",
27+
"Pass a unique, incrementing, integer on each query to make it impossible to replay twice. Better security." => "Passa un intero unico, incrementale, in ogni query per rendere impossibile il riutilizzo una seconda volta. Migliora la sicurezza.",
28+
"Order" => "Ordina",
29+
"Order this plugin with other auth frontends" => "Ordina il plugin rispetto agli altri frontend di autenticazione",
30+
"Protocol Type" => "Tipo Protocollo",
31+
"Enable/disable automatically based on the protocol used" => "Abilita/Disabilita automaticamente in base al protocollo usato",
32+
"Sessions Only" => "Solo Sessioni",
33+
"REST Only" => "Solo REST",
34+
"Session-based or Rest" => "Basato su sessioni o Rest",
35+
);
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?php
2+
/*
3+
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
4+
* This file is part of Pydio.
5+
*
6+
* Pydio is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Affero General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* Pydio is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU Affero General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Affero General Public License
17+
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
* The latest code can be found at <http://pyd.io/>.
20+
*/
21+
$mess=array(
22+
"Dual-form Authentication" => "Autenticazione Doppio-Form",
23+
"Dual-form authentication using the DuoSecurity web service" => "Autenticazione Doppio-Form che utilizza il servizio web DuoSecurity",
24+
"Order" => "Ordine",
25+
"Order this plugin with other auth frontends" => "Ordina il plugin rispetto agli altri frontend di autenticazione",
26+
"Protocol Type" => "Tipo Protocollo",
27+
"Enable/disable automatically based on the protocol used" => "Abilita/Disabilita automaticamente in base al protocollo in uso",
28+
"Sessions Only" => "Solo Sessioni",
29+
"REST Only" => "Solo REST",
30+
"Session-based or Rest" => "Basato su sessione o Rest",
31+
"DuoSecurity Config" => "Configurazione DuoSecurity",
32+
"Api Host" => "Host API",
33+
"DuoSecurity Host" => "Host DuoSecurity",
34+
"Integration Key" => "Chiave Integrazione",
35+
"DuoSecurity Integration Key" => "Chiave Integrazione DuoSecurity",
36+
"Secret Key" => "Chiave Segreta",
37+
"DuoSecurity Secret Key" => "Chiave Segreta DuoSecurity",
38+
"Application Key" => "Chiave Applicazione",
39+
"DuoSecurity Application Key (generate your own)" => "Chiave Applicazione DuoSecurity (generata da te)",
40+
"Dual-level Authentication" => "Autenticazione Doppio-Livello",
41+
"Duo Authentication Active" => "Doppia Autenticazione Attiva",
42+
"Active dual-form authentication" => "Attiva l'autenticazione Doppio-Form",
43+
"Request Signature (leave empty)" => "Firma Richiesta (lasciare vuoto)",
44+
"Used internally" => "Usato internamente",
45+
);
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?php
2+
3+
$mess = array(
4+
"1" => "Autenticazione Doppio-Form",
5+
"2" => "Autenticazione Doppio-Form",
6+
);
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php
2+
/*
3+
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
4+
* This file is part of Pydio.
5+
*
6+
* Pydio is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Affero General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* Pydio is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU Affero General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Affero General Public License
17+
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
* The latest code can be found at <http://pyd.io/>.
20+
*/
21+
$mess=array(
22+
"Basic Http FrontEnd" => "FrontEnd HTTP Basico",
23+
"Send a basic http request to the user" => "Invia una richiesta HTTP basica all'utente",
24+
"Order" => "Ordine",
25+
"Order this plugin with other auth frontends" => "Ordina il plugin rispetto agli altri frontend di autenticazione",
26+
"Protocol Type" => "Tipo Protocollo",
27+
"Enable/disable automatically based on the protocol used" => "Abilita/Disabilita automaticamente in base al protocollo in uso",
28+
"Sessions Only" => "Solo Sessioni",
29+
"REST Only" => "Solo REST",
30+
"Session-based or Rest" => "Basato su sessioni o Rest",
31+
);
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
/*
3+
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
4+
* This file is part of Pydio.
5+
*
6+
* Pydio is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Affero General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* Pydio is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU Affero General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Affero General Public License
17+
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
* The latest code can be found at <http://pyd.io/>.
20+
*/
21+
$mess=array(
22+
"Basic Http by Server" => "HTTP Basico dal Server",
23+
"Basic Http Auth performed by server (e.g. apache htaccess)" => "Autenticazione HTTP basica eseguita dal server (es. apache htaccess)",
24+
"Create User" => "Crea Utente",
25+
"Automatically create user if it does not already exists" => "Crea automaticamente l'utente se non esiste già",
26+
"Admin login" => "Login Amministratore",
27+
"Automatically set this login as pydio administrator" => "Imposta automaticamente questo login come l'amministratore del Pydio",
28+
"Order" => "Ordine",
29+
"Order this plugin with other auth frontends" => "Ordina questo plugin rispetto agli altri frontend di autenticazione",
30+
"Protocol Type" => "Tipo Protocollo",
31+
"Enable/disable automatically based on the protocol used" => "Abilita/Disabilita automaticamente in base al protocollo in uso",
32+
"Sessions Only" => "Solo Sessioni",
33+
"REST Only" => "Solo REST",
34+
"Session-based or Rest" => "Basato su sessioni o Rest",
35+
);
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php
2+
/*
3+
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
4+
* This file is part of Pydio.
5+
*
6+
* Pydio is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Affero General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* Pydio is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU Affero General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Affero General Public License
17+
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
* The latest code can be found at <http://pyd.io/>.
20+
*/
21+
$mess=array(
22+
"API Keystore" => "Portachiavi API",
23+
"Store API keys/token to simplify REST connection" => "Salva le chiavi e/o i token delle API per semplificare le connessioni REST",
24+
"Order" => "Ordine",
25+
"Order this plugin with other auth frontends" => "Ordina questo plugin rispetto agli altri frontend di autenticazione",
26+
"Protocol Type" => "Tipo Protocollo",
27+
"Enable/disable automatically based on the protocol used" => "Abilita/Disabilita automaticamente in base al protocollo in uso",
28+
"Sessions Only" => "Solo Sessioni",
29+
"REST Only" => "Solo REST",
30+
"Session-based or Rest" => "Basato su sessioni o Rest",
31+
);
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
/*
3+
* Copyright 2007-2014 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
4+
* This file is part of Pydio.
5+
*
6+
* Pydio is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Affero General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* Pydio is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU Affero General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Affero General Public License
17+
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
* The latest code can be found at <http://pyd.io/>.
20+
*/
21+
22+
$mess = array(
23+
"1" => "Chiavi API",
24+
"2" => "Gestisci le chiavi API create dai dispositivi client, come telefoni, client di sincronizzazione ecc...",
25+
"3" => "Genera una chiave",
26+
"4" => "Genera una coppia di chiavi API",
27+
"5" => "Revoca tutti gli accessi",
28+
"6" => "Invalida le chiavi API esistenti",
29+
"7" => "Sicuro di voler revocare questa/e chiave/i?",
30+
"8" => "Chiave/i rimossa/e correttamente!",
31+
"9" => "Dispositivi connessi al tuo account:",
32+
);

0 commit comments

Comments
 (0)