Merge remote-tracking branch 'origin/develop' into develop

pydio · Oct 27, 2015 · 789b087 · 789b087
2 parents 7ef656e + 0c76e0e
commit 789b087
Show file tree

Hide file tree

Showing 19 changed files with 34 additions and 24 deletions.
diff --git a/core/src/core/classes/class.AJXP_Utils.php b/core/src/core/classes/class.AJXP_Utils.php
@@ -991,7 +991,7 @@ public static function extractHooksToDoc()
      *
      * @return string Indented version of the original JSON string.
      */
-    public function prettyPrintJSON($json)
+    public static function prettyPrintJSON($json)
     {
         $result      = '';
         $pos         = 0;

diff --git a/core/src/core/classes/class.Repository.php b/core/src/core/classes/class.Repository.php
@@ -151,7 +151,7 @@ public function getContentFilter()
      * @param string $driver
      * @return void
      */
-    public function Repository($id, $display, $driver)
+    public function __construct($id, $display, $driver)
     {
         $this->setAccessType($driver);
         $this->setDisplay($display);

diff --git a/core/src/core/classes/class.UserSelection.php b/core/src/core/classes/class.UserSelection.php
@@ -50,7 +50,7 @@ class UserSelection
      * @param Repository|null $repository
      * @param array|null $httpVars
      */
-    public function UserSelection($repository = null, $httpVars = null)
+    public function __construct($repository = null, $httpVars = null)
     {
         $this->files = array();
         if(isSet($repository)){

diff --git a/core/src/core/classes/securimage/securimage.php b/core/src/core/classes/securimage/securimage.php
@@ -503,7 +503,7 @@ class Securimage
      * </code>
      *
      */
-    public function Securimage()
+    public function __construct()
     {
         // Initialize session or attach to existing
         if ( session_id() == '' ) { // no session has been started yet, which is needed for validation
@@ -1551,7 +1551,7 @@ class Securimage_Color
      * @param $green int Green component 0-255
      * @param $blue int Blue component 0-255
      */
-    public function Securimage_Color($red, $green = null, $blue = null)
+    public function __construct($red, $green = null, $blue = null)
     {
         if ($green == null && $blue == null && preg_match('/^#[a-f0-9]{3,6}$/i', $red)) {
             $col = substr($red, 1);

diff --git a/core/src/plugins/access.fs/test.fsAccess.php b/core/src/plugins/access.fs/test.fsAccess.php
@@ -28,7 +28,7 @@
  */
 class fsAccessTest extends AbstractTest
 {
-    public function fsAccessTest() { parent::__construct("Filesystem Plugin", ""); }
+    public function __construct() { parent::__construct("Filesystem Plugin", ""); }
 
     /**
      * Test Repository

diff --git a/core/src/plugins/access.ftp/test.ftpAccess.php b/core/src/plugins/access.ftp/test.ftpAccess.php
@@ -28,7 +28,7 @@
  */
 class ftpAccessTest extends AbstractTest
 {
-    public function ftpAccessTest() { parent::__construct("Remote FTP Filesystem Plugin", ""); }
+    public function __construct() { parent::__construct("Remote FTP Filesystem Plugin", ""); }
 
     public function doRepositoryTest($repo)
     {

diff --git a/core/src/plugins/access.sftp_psl/phpseclib/SSH2.php b/core/src/plugins/access.sftp_psl/phpseclib/SSH2.php
@@ -758,7 +758,7 @@ class Net_SSH2
      * @return Net_SSH2
      * @access public
      */
-    function Net_SSH2($host, $port = 22, $timeout = 10)
+    function __construct($host, $port = 22, $timeout = 10)
     {
         // Include Math_BigInteger
         // Used to do Diffie-Hellman key exchange and DSA/RSA signature verification.

diff --git a/core/src/plugins/action.share/res/i18n/conf/de.php b/core/src/plugins/action.share/res/i18n/conf/de.php
@@ -68,4 +68,6 @@
 "Minisites only" => "Nur als Miniseite",
 "Workspaces only" => "Nur als Arbeitsumgebung",
 "Disable Folder Sharing" => "Freigabe von Ordnern deaktivieren",
+"Set password mandatory" => "Passwort als Pflichtfeld",
+"Do not allow users to create public links, only private links (password-protected)" => "Es ist nicht mögich, öffentliche Links zu erstellen, sondern nur welche mit Passwortschutz.",
 );
diff --git a/core/src/plugins/action.share/res/i18n/conf/en.php b/core/src/plugins/action.share/res/i18n/conf/en.php
@@ -68,4 +68,6 @@
 "Minisites only" => "Minisites only",
 "Workspaces only" => "Workspaces only",
 "Disable Folder Sharing" => "Disable Folder Sharing",
+"Set password mandatory" => "Set password mandatory",
+"Do not allow users to create public links, only private links (password-protected)" => "Do not allow users to create public links, only private links (password-protected)",
 );
diff --git a/core/src/plugins/action.share/res/i18n/conf/fr.php b/core/src/plugins/action.share/res/i18n/conf/fr.php
@@ -77,4 +77,6 @@
 "Minisite" => "Minisite",
 "Minisite Logo" => "Logo du minisite",
 "Top-right logo displayed on minisite page" => "Logo affiché en haut à droite du minisite",
+"Set password mandatory" => "Set password mandatory",
+"Do not allow users to create public links, only private links (password-protected)" => "Do not allow users to create public links, only private links (password-protected)",
 );
diff --git a/core/src/plugins/action.share/res/i18n/conf/it.php b/core/src/plugins/action.share/res/i18n/conf/it.php
@@ -77,4 +77,6 @@
 "Minisite" => "Minisito",
 "Minisite Logo" => "Logo Minisito",
 "Top-right logo displayed on minisite page" => "Logo visualizzato in alto a destra nella pagina del minisito",
+"Set password mandatory" => "Set password mandatory",
+"Do not allow users to create public links, only private links (password-protected)" => "Do not allow users to create public links, only private links (password-protected)",
 );
diff --git a/core/src/plugins/action.share/res/i18n/conf/pt.php b/core/src/plugins/action.share/res/i18n/conf/pt.php
@@ -77,4 +77,6 @@
 "Minisite" => "Minisite",
 "Minisite Logo" => "Minisite Logo",
 "Top-right logo displayed on minisite page" => "Top-right logo displayed on minisite page",
+"Set password mandatory" => "Set password mandatory",
+"Do not allow users to create public links, only private links (password-protected)" => "Do not allow users to create public links, only private links (password-protected)",
 );
diff --git a/core/src/plugins/action.share/res/i18n/de.php b/core/src/plugins/action.share/res/i18n/de.php
@@ -21,7 +21,7 @@
 "18"=> "Ordner ist als neue Arbeitsumgebung freigegeben",
 "19"=> "Optionen der freigegebene Arbeitsumgebung wurden erfolgreich geändert",
 "20"=> "Ooops, die gesuchte Datei konnte nicht gefunden werden! Möglicherweise wurde die Datei bereits entfernt oder ist nicht mehr freigegeben.",
-"21"=> "Ungültig (Tagen): ",
+"21"=> "Gültigkeit (Tage): ",
 "22"=> "Erlaubte Downloads: ",
 "23"=> "Optionales Passwort: ",
 "24"=> "Setze eine Ablaufzeit und ein Passwort für den Dateizugriff. Klicke danach auf das <span class=\"icon-plus-sign\"></span> Zeichen um ein Weblink zu generieren. Es können mehrere Links generiert werden, um diese zu unterschiedlichen Nutzern zu senden.",
@@ -32,7 +32,7 @@
 "29"=> "Freigabe",
 "30"=> "Benutzerzugang",
 "31"=> "Lesen",
-"32"=> "Upload",
+"32"=> "Schreiben",
 "33"=> "Sehen",
 "34"=> "Existierende oder neuer Benutzer",
 "35"=> "Bezeichnung",
@@ -74,9 +74,9 @@
 "69r"=>"Miniseite Konfigurieren",
 "70r"=> "Kennzeichnung und Berechtigungen der Benutzer dieser Miniseite",
 "71" => "Berechtigungen",
-"72" => "Anschauen",
-"73" => "Downloaden",
-"74" => "Uploaden",
+"72" => "Ansehen",
+"73" => "Herunterladen",
+"74" => "Hochladen",
 "75"=> "Bitte verwenden Sie eine positive Zahl für die Verfall- und Downloadbegrenzung.",
 "76"=> "Bitte Cookies aktivieren um auf diese Anwendung zuzugreifen",
 "77"=> "Bitte JavaScript aktivieren um auf diese Anwendung zuzugreifen",
@@ -185,7 +185,7 @@
     "172" => "Dieser Link wird bereits genutzt. Wähle ein anderes Kürzel.",
     "173" => "Wenn Sie ein dauerhaften und ansehlichen Link möchten (z.B. https://.../mein-kuerzel), können Sie dieses Feld nutzen. Ansonsten wird das Kürzel zufällig generiert.",
     "174" => "Deaktiviere Passwort",
-    "175" => "Please set a password and make sure it's long enough!",
-    "176" => "(Mandatory)",
+    "175" => "Bitte ein ausreichend langes Passwort festlegen!",
+    "176" => "(Pflichtfeld)",
     "177" => "View parameters",
 );
diff --git a/core/src/plugins/conf.serial/class.AJXP_SerialUser.php b/core/src/plugins/conf.serial/class.AJXP_SerialUser.php
@@ -50,9 +50,9 @@ class AJXP_SerialUser extends AbstractAjxpUser
      * @param $id
      * @param serialConfDriver $storage
      */
-    public function AJXP_SerialUser($id, $storage=null)
+    public function __construct($id, $storage=null)
     {
-        parent::AbstractAjxpUser($id, $storage);
+        parent::__construct($id, $storage);
         $this->registerForSave = array();
     }
 

diff --git a/core/src/plugins/conf.sql/class.AJXP_SqlUser.php b/core/src/plugins/conf.sql/class.AJXP_SqlUser.php
@@ -96,9 +96,9 @@ class AJXP_SqlUser extends AbstractAjxpUser
      * @param $storage AbstractConfDriver User storage implementation.
      * @return AJXP_SqlUser
      */
-    public function AJXP_SqlUser($id, $storage=null, $debugEnabled = false)
+    public function __construct($id, $storage=null, $debugEnabled = false)
     {
-        parent::AbstractAjxpUser($id, $storage);
+        parent::__construct($id, $storage);
         //$this->debugEnabled = true;
 
         $this->log('Instantiating User');

diff --git a/core/src/plugins/core.conf/class.AbstractAjxpUser.php b/core/src/plugins/core.conf/class.AbstractAjxpUser.php
@@ -91,7 +91,7 @@ public function isHidden()
      */
     public $storage;
 
-    public function AbstractAjxpUser($id, $storage=null)
+    public function __construct($id, $storage=null)
     {
         $this->id = $id;
         if ($storage == null) {

diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/ajaxplorer.css
@@ -4929,7 +4929,7 @@ div.user_entry span.cbContainer
 {
     display: inline-block;
     padding: 0 2px;
-    width: 30px;
+    width: 40px;
     text-align: center;
     cursor: pointer;
 }
@@ -5009,7 +5009,7 @@ input.share_info_panel_link_expired{
 #share_folder_form div.dialogContentMainTitle{
     clear: left;
     margin-top: 10px;
-    margin-bottom: -4px;
+    margin-bottom: 0;
     padding: 10px 0 0;
     border-top: 1px dashed rgb(150,150,150);
     border-bottom: 0;

diff --git a/core/src/plugins/gui.ajax/res/themes/umbra/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/umbra/css/ajaxplorer.css
@@ -2836,7 +2836,7 @@ div.user_entry span.cbContainer
 {
     display: inline-block;
     padding: 0 2px;
-    width: 30px;
+    width: 40px;
     text-align: center;
     cursor: pointer;
 }

diff --git a/core/src/plugins/gui.ajax/res/themes/vision/css/ajaxplorer.css b/core/src/plugins/gui.ajax/res/themes/vision/css/ajaxplorer.css
@@ -3825,7 +3825,7 @@ div.user_entry span.cbContainer
 {
     display: inline-block;
     padding: 0 2px;
-    width: 30px;
+    width: 40px;
     text-align: center;
     cursor: pointer;
 }