showing ssha as default and sorting it as top option

setup/inc/class.setup_cmd_config.inc.php

@@ -169,7 +169,7 @@ class setup_cmd_config extends setup_cmd
 		'--account-auth' => array(
 			array('name' => 'account_repository','allowed' => array('sql','ldap'),'default'=>'sql'),
 			array('name' => 'auth_type','allowed' => array('sql','ldap','mail','ads','http','sqlssl','nis','pam'),'default'=>'sql'),
-			array('name' => 'sql_encryption','allowed' => array('md5','blowfish_crypt','md5_crypt','crypt'),'default'=>'md5'),
+			array('name' => 'sql_encryption','allowed' => array('ssha','smd5','md5','blowfish_crypt','md5_crypt','crypt'),'default'=>'ssha'),
 			'check_save_password','allow_cookie_auth'),
 		'--ldap-host' => 'ldap_host',
 		'--ldap-root-dn' => 'ldap_root_dn',

setup/inc/hook_config.inc.php

@@ -148,12 +148,10 @@ function encryptmode($config)
 function passwdhashes($config,$return_hashes=false)
 {
 	$hashes = array(
-		'des' => 'des',
+		'ssha' => 'ssha'.' ('.lang('default').')',
-		'md5' => 'md5',
 		'smd5' => 'smd5',
 		'sha'  => 'sha',
-		'ssha' => 'ssha',
+		'des' => 'des',
-		'plain' => 'plain',
 	);
 	/* Check for available crypt methods based on what is defined by php */
 	if(@defined('CRYPT_BLOWFISH') && CRYPT_BLOWFISH == 1)
@@ -169,6 +167,11 @@ function passwdhashes($config,$return_hashes=false)
 		$hashes['ext_crypt'] = 'ext_crypt';
 	}
 
+	$hashes += array(
+		'md5' => 'md5',
+		'plain' => 'plain',
+	);
+
 	if ($return_hashes) return $hashes;
 
 	foreach($hashes as $key => $value)
@@ -191,7 +194,9 @@ function passwdhashes($config,$return_hashes=false)
 function sql_passwdhashes($config,$return_hashes=false)
 {
 	$hashes = array(
-		'md5' => 'md5'
+		'ssha' => 'ssha'.' ('.lang('default').')',
+		'smd5' => 'smd5',
+		'sha'  => 'sha',
 	);
 
 	/* Check for available crypt methods based on what is defined by php */
@@ -213,9 +218,7 @@ function sql_passwdhashes($config,$return_hashes=false)
 	}
 
 	$hashes += array(
-		'smd5' => 'smd5',
+		'md5' => 'md5',
-		'sha'  => 'sha',
-		'ssha' => 'ssha',
 		'plain' => 'plain',
 	);
 

setup/lang/egw_de.lang

@@ -26,7 +26,7 @@
 access denied: wrong username or password for manage-header !!!	setup	de	Zugriff verweigert: Falsche Benutzername oder Passwort für die Headerverwaltung !!!
 access denied: wrong username or password to configure the domain '%1(%2)' !!!	setup	de	Zugriff verweigert: Falsche Benutzername oder Passwort für Konfiguration der Domain '%1(%2)'  !!!
 account repository need to be set to the one you migrate to!	setup	de	Speicherort für Benutzerkonten muss auf den zu migrierenden gesetzt sein!
-account repository{sql(default) | ldap},[authentication{sql | ldap | mail | ads | http | ...}],[sql encrypttion{md5 | blowfish_crypt | md5_crypt | crypt}],[check save password{ (default)|true}],[allow cookie auth{ (default)|true}]	setup	de	Benutzer speichern{sql(Vorgabe) | ldap},[Authentifizierung{sql | ldap | mail | ads | http | ...}],[sql Verschlüsselung{md5 | blowfish_crypt | md5_crypt | crypt}],[überprüfe Passworte{ (Vorgabe) | True}],[erlaube Cookie Authtentifizierung{ (Vorgabe) | True}]
+account repository{sql(default) | ldap},[authentication{sql | ldap | mail | ads | http | ...}],[sql encrypttion{md5 | blowfish_crypt | md5_crypt | crypt}],[check save password{ (default)|true}],[allow cookie auth{ (default)|true}]	setup	de	Benutzer speichern{sql(Vorgabe) | ldap},[Authentifizierung{sql | ldap | mail | ads | http | ...}],[sql Verschlüsselung{ssha(Vorgabe) | smd5 | md5 | blowfish_crypt | md5_crypt | crypt}],[überprüfe Passworte{ (Vorgabe) | True}],[erlaube Cookie Authtentifizierung{ (Vorgabe) | True}]
 accounts existing	setup	de	Benutzerkonten existieren
 actions	setup	de	Aktionen
 activate safe password check	setup	de	Aktiviere die "sichere Passwort" Überprüfung
@@ -539,7 +539,7 @@ smtp server hostname or ip address	setup	de	SMTP Server Hostname oder IP Adresse
 smtp server port	setup	de	SMTP Server Port
 some or all of its tables are missing	setup	de	Einige oder alle Tabellen fehlen
 sources deleted/missing	setup	de	Quellen gelöscht/fehlen
-sql encryption type	setup	de	SQL-Verschlüsselungstyp für das Passwort (Vorgabe MD5)
+sql encryption type	setup	de	SQL-Verschlüsselungstyp für das Passwort (Vorgabe SSHA)
 ssl validation:	setup	de	SSL Validierung:
 standard (login-name identical to egroupware user-name)	setup	de	Standard (Loginname identisch zu eGroupWare Benutzername)
 standard mailserver settings (used for mail authentication too)	setup	de	Standard Mailserver Einstellungen (werden auch für die Mail Authentifizierung benutzt)

setup/lang/egw_en.lang

@@ -26,7 +26,7 @@
 access denied: wrong username or password for manage-header !!!	setup	en	Access denied: wrong username or password for manage-header !!!
 access denied: wrong username or password to configure the domain '%1(%2)' !!!	setup	en	Access denied: wrong username or password to configure the domain '%1(%2)' !!!
 account repository need to be set to the one you migrate to!	setup	en	Account repository need to be set to the one you migrate to!
-account repository{sql(default) | ldap},[authentication{sql | ldap | mail | ads | http | ...}],[sql encrypttion{md5 | blowfish_crypt | md5_crypt | crypt}],[check save password{ (default)|true}],[allow cookie auth{ (default)|true}]	setup	en	account repository{sql(default) | ldap},[authentication{sql | ldap | mail | ads | http | ...}],[sql encrypttion{md5 | blowfish_crypt | md5_crypt | crypt}],[check save password{ (default)|True}],[allow cookie auth{ (default)|True}]
+account repository{sql(default) | ldap},[authentication{sql | ldap | mail | ads | http | ...}],[sql encrypttion{md5 | blowfish_crypt | md5_crypt | crypt}],[check save password{ (default)|true}],[allow cookie auth{ (default)|true}]	setup	en	account repository{sql(default) | ldap},[authentication{sql | ldap | mail | ads | http | ...}],[sql encrypttion{ssha(default) | smd5 | md5 | blowfish_crypt | md5_crypt | crypt}],[check save password{ (default)|True}],[allow cookie auth{ (default)|True}]
 accounts existing	setup	en	Accounts existing
 actions	setup	en	Actions
 activate safe password check	setup	en	Activate safe password check
@@ -540,7 +540,7 @@ smtp server hostname or ip address	setup	en	SMTP server hostname or IP address
 smtp server port	setup	en	SMTP server port
 some or all of its tables are missing	setup	en	Some or all of its tables are missing
 sources deleted/missing	setup	en	Sources deleted/missing
-sql encryption type	setup	en	SQL encryption type for passwords (default - md5)
+sql encryption type	setup	en	SQL encryption type for passwords (default SSHA)
 ssl validation:	setup	en	SSL validation:
 standard (login-name identical to egroupware user-name)	setup	en	standard (login-name identical to eGroupWare user-name)
 standard mailserver settings (used for mail authentication too)	setup	en	Standard mailserver settings (used for Mail authentication too)

setup/lang/egw_no.lang

@@ -394,7 +394,7 @@ setup/config admin login	setup	no	Sätt upp/Konfigurera Admin login
 show 'powered by' logo on	setup	no	Vis "Powered by"-logo
 size	setup	no	Str.
 some or all of its tables are missing	setup	no	Några eller samtliga av dess tabeller saknas
-sql encryption type	setup	no	SQL krypteringstyp för Lösenord (default: MD5)
+sql encryption type	setup	no	SQL krypteringstyp för Lösenord (default: SSHA)
 start the postmaster	setup	no	Starta postmaster
 status	setup	no	Status
 step %1 - admin account	setup	no	Steg %1 - Adminkontot

setup/lang/egw_sl.lang

@@ -509,7 +509,7 @@ smtp server hostname or ip address	setup	sl	Ime ali naslov IP strežnika SMTP
 smtp server port	setup	sl	Vrata strežnika SMTP
 some or all of its tables are missing	setup	sl	Manjka nekaj ali vse njene tabele
 sources deleted/missing	setup	sl	Izvor je izbrisan/manjka.
-sql encryption type	setup	sl	Enkripcija za SQL geslo (privzeta je MD5)
+sql encryption type	setup	sl	Enkripcija za SQL geslo (privzeta je SSHA)
 ssl validation:	setup	sl	Preverjanje SSL:
 standard (login-name identical to egroupware user-name)	setup	sl	Standardno (uporabniško ime enako uuporabniškemu imenu eGroupWare)
 standard mailserver settings (used for mail authentication too)	setup	sl	Standardne nastavitve poštnega strežnika (uporabljeno je tudi za  avtentikacijo pošte)

setup/lang/egw_sv.lang

@@ -483,7 +483,7 @@ skip the installation tests (not recommended)	setup	sv	Hoppa över installations
 smtp server hostname or ip address	setup	sv	SMTP server värdnamn eller IP adress
 smtp server port	setup	sv	SMTP server port
 some or all of its tables are missing	setup	sv	Några eller samtliga av dess tabeller saknas
-sql encryption type	setup	sv	SQL kryptering för lösenord (standard: MD5)
+sql encryption type	setup	sv	SQL kryptering för lösenord (standard: SSHA)
 standard (login-name identical to egroupware user-name)	setup	sv	Standard (inloggningsnamn identiskt med eGroupWare användarnamn)
 standard mailserver settings (used for mail authentication too)	setup	sv	Standard e-postserver inställningar (används även för e-post autenticering
 start the postmaster	setup	sv	Starta postmaster

setup/templates/default/config.tpl

@@ -68,9 +68,9 @@
     <td>{lang_Image_type_selection_order}:</td>
     <td>
      <select name="newsettings[image_type]">
-      <option value="">GIF->JPG->PNG</option>
+      <option value="">GIF-&gt;JPG-&gt;PNG</option>
-      <option value="1"{selected_image_type_1}>PNG->JPG->GIF</option>
+      <option value="1"{selected_image_type_1}>PNG-&gt;JPG-&gt;GIF</option>
-      <option value="2"{selected_image_type_2}>PNG->JPG</option>
+      <option value="2"{selected_image_type_2}>PNG-&gt;JPG</option>
      </select>
     </td>
    </tr>