From 2b87c81d7010b418abf2e7f2248afe4195310cf7 Mon Sep 17 00:00:00 2001 From: nuxsmin Date: Fri, 15 Nov 2013 00:26:44 +0100 Subject: [PATCH] Modified php short open tags for environments that have disabled them. Visual improvements on search bar. Filter icon is not shown if not using it. If browser language does not have translation, or language not set, or is not a spanish variant, english is used. Show maximum allowed file size for upload on edit account. --- CHANGELOG | 16 ++ ajax/ajax_getFiles.php | 20 +- ajax/ajax_usrpass.php | 20 +- config/config.php.sample | 34 ++++ css/styles.css | 9 +- inc/init.php | 13 +- inc/locales/en_US/LC_MESSAGES/messages.mo | Bin 37299 -> 37183 bytes inc/tpl/accounts.php | 218 +++++++++++----------- inc/tpl/backup.php | 20 +- inc/tpl/categories.php | 36 ++-- inc/tpl/config.php | 168 ++++++++--------- inc/tpl/editpass.php | 32 ++-- inc/tpl/error.php | 6 +- inc/tpl/eventlog.php | 30 +-- inc/tpl/groups.php | 16 +- inc/tpl/login.php | 6 +- inc/tpl/masterpass.php | 38 ++-- inc/tpl/migrate.php | 28 +-- inc/tpl/profiles.php | 84 ++++----- inc/tpl/search.php | 18 +- inc/tpl/users.php | 78 ++++---- inc/util.class.php | 2 +- 22 files changed, 475 insertions(+), 417 deletions(-) create mode 100644 config/config.php.sample diff --git a/CHANGELOG b/CHANGELOG index 06c0cc5c3..80fa2c69f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +=== ** v1.0.4 ** === + +* [MOD] Modificadas etiquetas de inicio de código php. +* [MOD] Ajustes de visualización de barra de búsquedas. +* [MOD] No se muestra el icono de filtro de orden si no se usa. +* [MOD] Si el lenguaje del navegador no tiene traducción, ni está configurado en la aplicación, ni es ninguna varinte del español, se utiliza inglés. +* [MOD] Mostrar tamaño máximo de archivo permitido para subir al editar cuenta. + === ** v1.0.3 ** === * [BUG] Corregido fallo al guardar filtro de búsqueda en la sesión. @@ -147,6 +155,14 @@ --- +=== ** v1.0.4 ** === + +* [MOD] Modified php short open tags for environments that have disabled them. +* [MOD] Visual improvements on search bar. +* [MOD] Filter icon is not shown if not using it. +* [MOD] If browser language does not have translation, or language not set, or is not a spanish variant, english is used. +* [MOD] Show maximum allowed file size for upload on edit account. + === ** v1.0.3 ** === * [BUG] Fixed error on saving search filters in session. diff --git a/ajax/ajax_getFiles.php b/ajax/ajax_getFiles.php index 3d4344fe3..fbdb4c61e 100644 --- a/ajax/ajax_getFiles.php +++ b/ajax/ajax_getFiles.php @@ -55,18 +55,18 @@
- - + +
- download - View - - Delete - + download + View + + Delete +
\ No newline at end of file diff --git a/ajax/ajax_usrpass.php b/ajax/ajax_usrpass.php index ef475bd3e..221bc0891 100644 --- a/ajax/ajax_usrpass.php +++ b/ajax/ajax_usrpass.php @@ -45,41 +45,41 @@ ?>
-

+

+
- + - - + +
- - +
- + - +
- +

  • - <? echo _('Guardar'); ?> + <?php echo _('Guardar'); ?>
diff --git a/config/config.php.sample b/config/config.php.sample new file mode 100644 index 000000000..9f4726efa --- /dev/null +++ b/config/config.php.sample @@ -0,0 +1,34 @@ + '68a77aa997d934d1259e729607233a', + 'version' => '1.0.3', + 'dbhost' => 'localhost', + 'dbname' => 'syspass', + 'debug' => 0, + 'logenabled' => 1, + 'ldapenabled' => 0, + 'mailenabled' => 0, + 'dbuser' => 'sp_admin', + 'dbpass' => 'mydb_secret_pass', + 'installed' => 0, + 'wikienabled' => 0, + 'demoenabled' => 0, + 'allowed_exts' => 'BAK,CSV,DOC,DOCX,GIF,JPG,ODS,ODT,PDF,PNG,TXT,VSD,XLS,XSL', + 'allowed_size' => 1024, + 'wikisearchurl' => 'http://wiki.foobar.com/wiki/doku.php/start?do=search&id=', + 'wikipageurl' => 'http://wiki.foobar.com/doku.php/', + 'wikifilter' => 'srv-', + 'ldapserver' => '', + 'ldapbase' => '', + 'ldapgroup' => '', + 'ldapuserattr' => '', + 'mailserver' => 'mail.foobar.com', + 'mailfrom' => 'syspass@foobar.com', + 'session_timeout' => 600, + 'account_link' => 1, + 'account_count' => 10, + 'sitelang' => 'en_US', + 'maintenance' => 0, + 'checkupdates' => 1, + 'filesenabled' => 1 +); \ No newline at end of file diff --git a/css/styles.css b/css/styles.css index 5ab4e623e..148d7bef7 100644 --- a/css/styles.css +++ b/css/styles.css @@ -374,7 +374,7 @@ A:focus {text-decoration: none; color: #FF0000;} color: #696969; } #content .data-header li a{color: #777;} -#content .data-header li img{width: 24px; height: 24px; vertical-align: middle;} +#content .data-header li img{float: right; width: 24px; height: 24px; vertical-align: middle;} #content .data-rows ul{ display: table; @@ -432,16 +432,17 @@ A:focus {text-decoration: none; color: #FF0000;} #content #resEventLog .cell{text-align: center;} #content #resEventLog .cell-description{width: 60%;} -#content #tblTools SELECT, #tblTools INPUT{margin-left: 15px;} #content #tblTools div.chosen-container{margin: 0 5px;} -#content #tblTools select {width: 210px;} -#content #tblTools #txtSearch{width:30%;} +#content #tblTools #txtSearch, +#content #tblTools select {width: 220px;} #content #tblTools LABEL{margin-left:15px; color: #999;} #content #tblTools IMG{margin-left:0.5em;} #content #tblTools #toolsLeft{text-align: left; width: 80%;} #content #tblTools #toolsRight{text-align: right; width: 5%;} #content #tblTools #toolsRight input{margin-left: 15px; text-align: center;} #content #tblTools .custom-combobox{margin-left: 25px;} +#content #tblTools #btnClear{opacity: 0.35;filter:alpha(opacity=35);} +#content #tblTools #btnClear:hover{opacity: 1;filter:alpha(opacity=100);} #content #tabs>DIV{min-height: 475px;} #content #tabs.ui-widget-content {border: none; background-color: transparent;} diff --git a/inc/init.php b/inc/init.php index 9c06dc6f7..26b94cc92 100644 --- a/inc/init.php +++ b/inc/init.php @@ -391,14 +391,21 @@ public static function initError($str, $hint = ''){ * @brief Establece el lenguaje de la aplicación * @returns none * - * Esta función establece el lenguaje según esté definidi en la configuración o en el navegador. + * Esta función establece el lenguaje según esté definido en la configuración o en el navegador. */ private static function selectLang(){ $browserLang = str_replace("-","_",substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 5)); $configLang = SP_Config::getValue('sitelang'); - self::$LANG = ( $configLang ) ? $configLang : $browserLang; - + // Establecer a en_US si no existe la traducción o no es español + if ( ! file_exists( self::$SERVERROOT.'/inc/locales/'.$browserLang) + && ! preg_match('/^es_.*/i',$browserLang) + && ! $configLang ){ + self::$LANG = 'en_US'; + } else{ + self::$LANG = ( $configLang ) ? $configLang : $browserLang; + } + putenv("LANG=".self::$LANG); setlocale(LC_MESSAGES, self::$LANG); setlocale(LC_ALL, self::$LANG); diff --git a/inc/locales/en_US/LC_MESSAGES/messages.mo b/inc/locales/en_US/LC_MESSAGES/messages.mo index a96f804be87130cbca7f93a86610c1ebcc66c151..8ec5177cfd5a43999244497cc6d0406b5bbc7204 100644 GIT binary patch delta 11402 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 TdgzGE+!ON?0&?#z*c|vjk99~S delta 11527 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 diff --git a/inc/tpl/accounts.php b/inc/tpl/accounts.php index dbba89beb..99dbc955b 100644 --- a/inc/tpl/accounts.php +++ b/inc/tpl/accounts.php @@ -131,20 +131,20 @@ $skey = SP_Common::getSessionKey(TRUE); ?> -
- +
+
- -accountIsHistory): ?> + +accountIsHistory): ?> - +
- + - + - + - + - + - + - + - + - + - - + + - + - + - + - - - - - - + + + + + + - + - + - + - + - + - - + + - - + + - - + + - - + + - 0): ?> + 0): ?> - + - - + + - - + + - - + + - - + + - + - + - + - + - - accountUserEditName): ?> - - + + accountUserEditName): ?> + + - +
- - + + accountName; @@ -153,12 +153,12 @@
- - + +

- + accountCustomerName; @@ -167,7 +167,7 @@
- - + + accountUrl; @@ -191,10 +191,10 @@
- - + + accountLogin; @@ -202,27 +202,27 @@ ?>
- +    - +
- +
- +
- accountIsHistory): ?> - - - - + accountIsHistory): ?> + + + +
- + - - + + - +
- - + +
accountNumView . "(" . $account->accountNumViewDecrypt . ")"; ?>accountNumView . "(" . $account->accountNumViewDecrypt . ")"; ?>
accountDateAdd ?>accountDateAdd ?>
accountUserName; ?>accountUserName; ?>
accountUserGroupName; ?>accountUserGroupName; ?>
$groupId) { @@ -319,21 +319,21 @@ ?>
accountDateEdit; ?>
accountDateEdit; ?>
accountUserEditName; ?>accountUserEditName; ?>
"historyId", @@ -348,78 +348,78 @@ SP_Html::printSelect($account->getAccountHistoryList(), $arrSelectProp); ?> - +
accountDateEdit; ?> accountUserEditName; ?>accountDateEdit; ?> accountUserEditName; ?>
  • - accountIsHistory): ?> - - - - + accountIsHistory): ?> + + + +
    • - +
  • - +
    • - + - +
  • - +
    • - + - +
  • - +
    • - + - +
  • - +
    • - + - +
  • - +
    • - +
- + - \ No newline at end of file + \ No newline at end of file diff --git a/inc/tpl/backup.php b/inc/tpl/backup.php index a129bb48d..bbfd6dce9 100644 --- a/inc/tpl/backup.php +++ b/inc/tpl/backup.php @@ -43,22 +43,22 @@ @@ -103,11 +103,11 @@ \ No newline at end of file diff --git a/inc/tpl/config.php b/inc/tpl/config.php index d92914810..49538f059 100644 --- a/inc/tpl/config.php +++ b/inc/tpl/config.php @@ -49,7 +49,7 @@ ?>
- +
@@ -57,88 +57,88 @@
- + - +
- + - - Backup BBDD + + Backup BBDD - - Backup - ">Backup +
- + - +
  • - +
\ No newline at end of file diff --git a/inc/tpl/categories.php b/inc/tpl/categories.php index 64eeef0aa..5bd85b662 100644 --- a/inc/tpl/categories.php +++ b/inc/tpl/categories.php @@ -56,46 +56,46 @@
- +
- - + + - +
- +
- +

- + - - + +
- +
- - + + - - + +
- +
- + - /> + />
- - + + - /> + />
- - + + - /> + />
- - + + - /> + />
- - + + - /> + />
- - + + - /> + />
- - + + - /> + />
- + - - + +
- - + + - /> + />
- - + + - log_description) : preg_replace("/\d+\.\d+\.\d+\.\d+/", "*.*.*.*", utf8_decode($log->log_description)); ?> - + - +
- - + + - /> + />
- - + + - +
- - + + - +
- - + + - - + +
- + - + - +
- - + + - /> + />
- - + + - +
- - + + - +
- - + + - +
- - + + - +
- - + + - +
- +
- +
- + - /> + />
- + - +
- + - +
- + - + - + - +
  • + >
diff --git a/inc/tpl/editpass.php b/inc/tpl/editpass.php index e2a7e209f..3d37f3e3e 100644 --- a/inc/tpl/editpass.php +++ b/inc/tpl/editpass.php @@ -34,53 +34,53 @@ } ?> -
+
- + - + - - + + - - + + - + - +
accountName; ?>accountName; ?>
accountCustomerName; ?>accountCustomerName; ?>
accountUrl; ?>accountUrl; ?>
accountLogin; ?>accountLogin; ?>
- +    - +
- +
- - + +
  • - +
  • - +
diff --git a/inc/tpl/error.php b/inc/tpl/error.php index 993fdb870..fdbd6bb32 100644 --- a/inc/tpl/error.php +++ b/inc/tpl/error.php @@ -27,11 +27,11 @@
- + - +
- +
-'._('ERROR EN LA CONSULTA').'
'); } @@ -65,43 +65,43 @@
- + - + - + - + - +
- log_id; ?> + log_id; ?> - date; ?> + date; ?> - log_action); ?> + log_action); ?> - log_login); ?> + log_login); ?> -
diff --git a/inc/tpl/groups.php b/inc/tpl/groups.php index 7fef77030..6c3dd8acf 100644 --- a/inc/tpl/groups.php +++ b/inc/tpl/groups.php @@ -35,25 +35,25 @@ - + - - +
- " /> + " />
" /> + " />
- - " /> - " /> + + " /> + " /> - +
diff --git a/inc/tpl/login.php b/inc/tpl/login.php index 6d56178e1..a97e027d2 100644 --- a/inc/tpl/login.php +++ b/inc/tpl/login.php @@ -49,7 +49,7 @@ - -
+ +
- \ No newline at end of file + \ No newline at end of file diff --git a/inc/tpl/masterpass.php b/inc/tpl/masterpass.php index 9ba8a94fa..216ec036c 100644 --- a/inc/tpl/masterpass.php +++ b/inc/tpl/masterpass.php @@ -35,19 +35,19 @@
- 0 ): ?> + 0 ): ?> - +
- + - +
- + @@ -55,7 +55,7 @@
- + @@ -63,7 +63,7 @@
- + @@ -71,8 +71,8 @@
- - + + @@ -80,30 +80,30 @@
- + - <? echo _('Atención'); ?> - + <?php echo _('Atención'); ?> +
- <? echo _('Atención'); ?> - + <?php echo _('Atención'); ?> +
- <? echo _('Atención'); ?> - + <?php echo _('Atención'); ?> +
- + - +
  • - +
diff --git a/inc/tpl/migrate.php b/inc/tpl/migrate.php index 3535d36dc..38630fa7a 100644 --- a/inc/tpl/migrate.php +++ b/inc/tpl/migrate.php @@ -30,15 +30,15 @@ ?>
- +
- - + + @@ -46,7 +46,7 @@
- + @@ -54,8 +54,8 @@
- - + + @@ -63,8 +63,8 @@
- - + + @@ -72,26 +72,26 @@
- +
- <? echo _('Atención'); ?> - + <?php echo _('Atención'); ?> +
- + - +
  • - +
\ No newline at end of file diff --git a/inc/tpl/profiles.php b/inc/tpl/profiles.php index ae2626c3e..d56a449e0 100644 --- a/inc/tpl/profiles.php +++ b/inc/tpl/profiles.php @@ -35,85 +35,85 @@ - + - + - + - + - +
- +
- - /> - - /> + + /> + + />
- - /> - - /> + + /> + + />
- - /> - - /> + + /> + + />
- - /> - - /> + + /> + + />
- - /> - - /> + + /> + + />
- - /> - - /> + + /> + + />
- - /> - - /> + + /> + + />
- - /> + + />
- - /> + + />
- - - " /> + + + " /> - + \ No newline at end of file diff --git a/inc/util.class.php b/inc/util.class.php index 31aeba6a3..80a539dd6 100644 --- a/inc/util.class.php +++ b/inc/util.class.php @@ -169,7 +169,7 @@ public static function curlIsAvailable(){ * @return array con el número de versión */ public static function getVersion() { - return array(1, 00, 03); + return array(1, 00, 04); } /**