Skip to content

Commit

Permalink
- Fix blank configuration tab because missing config.php template fil…
Browse files Browse the repository at this point in the history
…e that was skipped on building process.

- Some PHP's opening tags were not well defined for PHP version 5.3.
- Modified some structure control blocks that were using short format and they were not compatible with PHP version 5.3.
  • Loading branch information
nuxsmin committed Nov 17, 2013
1 parent 2b87c81 commit e8c1478
Show file tree
Hide file tree
Showing 8 changed files with 117 additions and 117 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
=== ** v1.0.5 ** ===

* [BUG] Corregido error que no mostraba la configuración. El archivo de plantilla config.php no se encontraba por un error en el empaquetado.
* [MOD] Algunas etiquetas de apertura de PHP no estaban bien definidas para la versión 5.3 de PHP.
* [MOD] Modificados bloques de control que usaban el formato abreviado y no funcionaban la versión 5.0 de PHP.

=== ** v1.0.4 ** ===

* [MOD] Modificadas etiquetas de inicio de código php.
Expand Down Expand Up @@ -155,6 +161,12 @@

---

=== ** v1.0.5 ** ===

* [BUG] Fix blank configuration tab because missing config.php template file that was skipped on building process.
* [MOD] Some PHP's opening tags were not well defined for PHP version 5.3.
* [MOD] Modified some structure control blocks that were using short format and they were not compatible with PHP version 5.3.

=== ** v1.0.4 ** ===

* [MOD] Modified php short open tags for environments that have disabled them.
Expand Down
3 changes: 1 addition & 2 deletions inc/installer.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@ public static function install($options) {
return($error);
}

SP_Config::$arrConfigValue['version'] = SP_Util::getVersionString();
SP_Config::writeConfig(TRUE);
SP_Config::setConfigValue('version', implode('.', SP_Util::getVersion()));
SP_Config::setValue('installed', 1);
}

Expand Down
192 changes: 92 additions & 100 deletions inc/tpl/accounts.php

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions inc/tpl/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,9 @@
<td class="descField"><?php echo _('Idioma'); ?></td>
<td class="valField">
<select name="sitelang" id="sel-sitelang" size="1">
<?php foreach ( $arrLangAvailable as $langOption ):
$selected = ( SP_Config::getValue('sitelang') == $langOption ) ? "SELECTED" : "";
?>
<OPTION <?php echo $selected; ?>><?php echo $langOption; ?></OPTION>
<?php foreach ( $arrLangAvailable as $langOption ): ?>
<?php $selected = ( SP_Config::getValue('sitelang') == $langOption ) ? "SELECTED" : ""; ?>
<option <?php echo $selected; ?>><?php echo $langOption; ?></option>
<?php endforeach; ?>
</select>
</td>
Expand Down Expand Up @@ -141,7 +140,7 @@
<img src="imgs/delete.png" title="<?php echo _('Eliminar extensión'); ?>" class="inputImg" id="btnDelExt" OnClick="delSelOption('allowed_exts')" />
<br>
<select id="allowed_exts" name="allowed_exts[]" multiple="multiple" size="4">
<?
<?php
if ( SP_Config::getValue('allowed_exts') ){
$allowed_exts = explode(",", SP_Config::getValue('allowed_exts'));
sort($allowed_exts, SORT_STRING);
Expand Down
7 changes: 3 additions & 4 deletions inc/tpl/eventlog.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,9 @@
</tr>
</thead>
<tbody id="resSearch">
<?php foreach ( $resQuery as $log ):
$rowClass = ( $rowClass == "row_even" ) ? "row_odd" : "row_even";
$description = ( $isDemoMode === 0 ) ? utf8_decode($log->log_description) : preg_replace("/\d+\.\d+\.\d+\.\d+/", "*.*.*.*", utf8_decode($log->log_description));
?>
<?php foreach ( $resQuery as $log ): ?>
<?php $rowClass = ( $rowClass == "row_even" ) ? "row_odd" : "row_even"; ?>
<?php $description = ( $isDemoMode === 0 ) ? utf8_decode($log->log_description) : preg_replace("/\d+\.\d+\.\d+\.\d+/", "*.*.*.*", utf8_decode($log->log_description)); ?>

<tr class="<?php echo $rowClass ?>">
<td class="cell">
Expand Down
5 changes: 2 additions & 3 deletions inc/tpl/install.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,9 @@
}
echo '</ul>';
}
?>

if ($isCompleted == 0):
?>

<?php if ($isCompleted == 0): ?>
<fieldset id="adminaccount">
<legend><?php echo _('Crear cuenta de admin'); ?></legend>
<p>
Expand Down
2 changes: 1 addition & 1 deletion inc/tpl/search.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<input type="hidden" name="sorder" value="<?php echo SP_Common::parseParams('s', 'accountSearchOrder', 0); ?>" />
<input type="hidden" name="sk" value="<?php echo SP_Common::getSessionKey(TRUE); ?>">
<input type="hidden" name="is_ajax" value="1">
<?
<?php
SP_Html::printSelect(SP_Customer::getCustomers(), $customersSelProp);
SP_Html::printSelect(SP_Category::getCategories(), $categoriesSelProp);
?>
Expand Down
4 changes: 2 additions & 2 deletions inc/util.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,15 @@ public static function curlIsAvailable(){
* @return array con el número de versión
*/
public static function getVersion() {
return array(1, 00, 04);
return array(1, 00, 05);
}

/**
* @brief Devuelve la versión de sysPass
* @return string con la versión
*/
public static function getVersionString() {
return '1.0';
return '1.0-5';
}

/**
Expand Down

0 comments on commit e8c1478

Please sign in to comment.