- Alba-desarrollo - lists.ourproject.org

SVN Alba r6135 - in prosistem/alba/trunk/alba/lib/vendor/symfony: . lib/autoload lib/generator lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts
by commits＠pressenter.com.ar 27 Apr '09

27 Apr '09

Author: ftoledo Date: 2009-04-27 17:30:13 -0300 (Mon, 27 Apr 2009) New Revision: 6135 Modified: prosistem/alba/trunk/alba/lib/vendor/symfony/CHANGELOG prosistem/alba/trunk/alba/lib/vendor/symfony/lib/autoload/sfCoreAutoload.class.php prosistem/alba/trunk/alba/lib/vendor/symfony/lib/generator/sfModelGeneratorConfiguration.class.php prosistem/alba/trunk/alba/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/configuration.php prosistem/alba/trunk/alba/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/configuration.php Log: symfony 1.2.6 security fix Modified: prosistem/alba/trunk/alba/lib/vendor/symfony/CHANGELOG =================================================================== --- prosistem/alba/trunk/alba/lib/vendor/symfony/CHANGELOG 2009-04-27 20:03:19 UTC (rev 6134) +++ prosistem/alba/trunk/alba/lib/vendor/symfony/CHANGELOG 2009-04-27 20:30:13 UTC (rev 6135) @@ -1,10 +1,17 @@ -Version 1.2.5 -------------- See the UPGRADE_TO_1_1 for upgrading 1.0 projects first to 1.1. See the UPGRADE_TO_1_2 file for more information about upgrading your projects from 1.1 to 1.2. All the new features are documented in the What's new? tutorial (http://www.symfony-project.org/tutorial/1_2/whats-new) +Version 1.2.6 +------------- + +The 1.2.6 release is security release. +Please read http://www.symfony-project.org/blog/2009/04/27/symfony-1-2-6-security-fix for more information. + +Version 1.2.5 +------------- + * [16656]: fixed invalid assumption in cache:clear task (closes #6181) * [16587]: added CA translation for admin generator * [16555]: Removed extra slash from web debug image root Modified: prosistem/alba/trunk/alba/lib/vendor/symfony/lib/autoload/sfCoreAutoload.class.php =================================================================== --- prosistem/alba/trunk/alba/lib/vendor/symfony/lib/autoload/sfCoreAutoload.class.php 2009-04-27 20:03:19 UTC (rev 6134) +++ prosistem/alba/trunk/alba/lib/vendor/symfony/lib/autoload/sfCoreAutoload.class.php 2009-04-27 20:30:13 UTC (rev 6135) @@ -11,7 +11,7 @@ /** * The current symfony version. */ -define('SYMFONY_VERSION', '1.2.5'); +define('SYMFONY_VERSION', '1.2.6'); /** * sfCoreAutoload class. @@ -22,7 +22,7 @@ * @package symfony * @subpackage autoload * @author Fabien Potencier <fabien.potencier(a)symfony-project.com> - * @version SVN: $Id: sfCoreAutoload.class.php 16696 2009-03-28 16:46:30Z FabianLange $ + * @version SVN: $Id: sfCoreAutoload.class.php 17682 2009-04-27 15:24:21Z fabien $ */ class sfCoreAutoload { Modified: prosistem/alba/trunk/alba/lib/vendor/symfony/lib/generator/sfModelGeneratorConfiguration.class.php =================================================================== --- prosistem/alba/trunk/alba/lib/vendor/symfony/lib/generator/sfModelGeneratorConfiguration.class.php 2009-04-27 20:03:19 UTC (rev 6134) +++ prosistem/alba/trunk/alba/lib/vendor/symfony/lib/generator/sfModelGeneratorConfiguration.class.php 2009-04-27 20:30:13 UTC (rev 6135) @@ -6,7 +6,7 @@ * @package symfony * @subpackage generator * @author Fabien Potencier <fabien.potencier(a)symfony-project.com> - * @version SVN: $Id: sfModelGeneratorConfiguration.class.php 13653 2008-12-03 08:51:34Z fabien $ + * @version SVN: $Id: sfModelGeneratorConfiguration.class.php 17680 2009-04-27 15:19:58Z fabien $ */ class sfModelGeneratorConfiguration { @@ -383,6 +383,36 @@ return $default; } + /** + * Removes visible fields not included for display. + * + * @param sfForm $form + */ + protected function fixFormFields(sfForm $form) + { + $method = sprintf('get%sDisplay', $form->isNew() ? 'New' : 'Edit'); + if (!$display = $this->$method()) + { + $display = $this->getFormDisplay(); + } + + if ($display) + { + if (is_array(current($display))) + { + $display = call_user_func_array('array_merge', array_values($display)); + } + + foreach ($form as $name => $field) + { + if (!$field->isHidden() && !in_array($name, $display)) + { + unset($form[$name]); + } + } + } + } + protected function fixActionParameters($action, $parameters) { if (is_null($parameters)) Modified: prosistem/alba/trunk/alba/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/configuration.php =================================================================== --- prosistem/alba/trunk/alba/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/configuration.php 2009-04-27 20:03:19 UTC (rev 6134) +++ prosistem/alba/trunk/alba/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/configuration.php 2009-04-27 20:30:13 UTC (rev 6135) @@ -14,11 +14,22 @@ <?php include dirname(__FILE__).'/fieldsConfiguration.php' ?> + /** + * Gets a new form object. + * + * @param mixed $object + * + * @return sfForm + */ public function getForm($object = null) { $class = $this->getFormClass(); - return new $class($object, $this->getFormOptions()); + $form = new $class($object, $this->getFormOptions()); + + $this->fixFormFields($form); + + return $form; } /** Modified: prosistem/alba/trunk/alba/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/configuration.php =================================================================== --- prosistem/alba/trunk/alba/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/configuration.php 2009-04-27 20:03:19 UTC (rev 6134) +++ prosistem/alba/trunk/alba/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/configuration.php 2009-04-27 20:30:13 UTC (rev 6135) @@ -6,7 +6,7 @@ * @package ##PROJECT_NAME## * @subpackage <?php echo $this->getModuleName()."\n" ?> * @author ##AUTHOR_NAME## - * @version SVN: $Id: configuration.php 12831 2008-11-09 14:33:38Z fabien $ + * @version SVN: $Id: configuration.php 17680 2009-04-27 15:19:58Z fabien $ */ class Base<?php echo ucfirst($this->getModuleName()) ?>GeneratorConfiguration extends sfModelGeneratorConfiguration { @@ -14,11 +14,22 @@ <?php include dirname(__FILE__).'/fieldsConfiguration.php' ?> + /** + * Gets a new form object. + * + * @param mixed $object + * + * @return sfForm + */ public function getForm($object = null) { $class = $this->getFormClass(); - return new $class($object, $this->getFormOptions()); + $form = new $class($object, $this->getFormOptions()); + + $this->fixFormFields($form); + + return $form; } /**

1 0

[Pressenter - SVN Alba] #334: cash loan online
by Pressenter - SVN Alba 27 Apr '09

27 Apr '09

#334: cash loan online ------------------------------+--------------------------------------------- Reporter: cash loan online | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: version 1.0rc2 Component: alba | Version: 1.0rc Severity: normal | Keywords: ------------------------------+--------------------------------------------- Hi! http://www.dezinedepot.com/user/19214 cash loan online -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/334> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba - Sistema Informático Abierto de Gestión Unificada para Unidades Educacionales

1 0

[Pressenter - SVN Alba] #333: casino online
by Pressenter - SVN Alba 27 Apr '09

27 Apr '09

#333: casino online ---------------------------+------------------------------------------------ Reporter: casino online | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: version 1.0rc2 Component: alba | Version: 1.0rc Severity: normal | Keywords: ---------------------------+------------------------------------------------ Hi! http://www.dezinedepot.com/user/19215 casino online -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/333> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba - Sistema Informático Abierto de Gestión Unificada para Unidades Educacionales

1 0

[Pressenter - SVN Alba] #332: degree online
by Pressenter - SVN Alba 27 Apr '09

27 Apr '09

#332: degree online ---------------------------+------------------------------------------------ Reporter: degree online | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: version 1.0rc2 Component: alba | Version: 1.0rc Severity: normal | Keywords: ---------------------------+------------------------------------------------ Hi! http://www.dezinedepot.com/user/19213 degree online -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/332> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba - Sistema Informático Abierto de Gestión Unificada para Unidades Educacionales

1 0

SVN Alba r6134 - prosistem/alba/trunk/alba/apps/principal/i18n
by commits＠pressenter.com.ar 27 Apr '09

27 Apr '09

Author: josx Date: 2009-04-27 17:03:19 -0300 (Mon, 27 Apr 2009) New Revision: 6134 Modified: prosistem/alba/trunk/alba/apps/principal/i18n/messages.es.xml Log: Agregando texto a la traducci?\195?\179n Modified: prosistem/alba/trunk/alba/apps/principal/i18n/messages.es.xml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/i18n/messages.es.xml 2009-04-27 19:55:26 UTC (rev 6133) +++ prosistem/alba/trunk/alba/apps/principal/i18n/messages.es.xml 2009-04-27 20:03:19 UTC (rev 6134) @@ -82,6 +82,10 @@ <source>Associated</source> <target>Asociadas</target> </trans-unit> + <trans-unit id="21"> + <source>The form is not valid because it contains some errors.</source> + <target>El formulario contiene algunos errores</target> + </trans-unit> </body> </file> </xliff>

1 0

[Pressenter - SVN Alba] #331: buy soma
by Pressenter - SVN Alba 27 Apr '09

27 Apr '09

#331: buy soma ----------------------+----------------------------------------------------- Reporter: buy soma | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: version 1.0rc2 Component: alba | Version: 1.0rc Severity: normal | Keywords: ----------------------+----------------------------------------------------- Hi! http://www.dezinedepot.com/user/19210 buy soma -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/331> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba - Sistema Informático Abierto de Gestión Unificada para Unidades Educacionales

1 0

SVN Alba r6133 - prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates
by commits＠pressenter.com.ar 27 Apr '09

27 Apr '09

Author: josx Date: 2009-04-27 16:55:26 -0300 (Mon, 27 Apr 2009) New Revision: 6133 Modified: prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/verLegajoSuccess.php Log: Reemplazando /r/n por <br> en tooltip de legajopedagogico Modified: prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/verLegajoSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/verLegajoSuccess.php 2009-04-27 19:44:37 UTC (rev 6132) +++ prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/verLegajoSuccess.php 2009-04-27 19:55:26 UTC (rev 6133) @@ -51,7 +51,7 @@ <tr class="sf_admin_row_0"> <td><?php echo format_date($entradaLegajo->getFecha(), "dd/MM/yy")?></td> <td><?php echo $entradaLegajo->getTitulo()?></td> - <td onMouseOver="this.T_BGCOLOR='#d3e3f6';this.T_SHADOWWIDTH=5;this.T_STICKY=1;this.T_OFFSETX=-20;return escape('<?php echo htmlentities(str_replace("\n","<br />",$entradaLegajo->getTexto()), ENT_QUOTES)?>');"><?php echo $entradaLegajo->getResumen()?></td> + <td onMouseOver="this.T_BGCOLOR='#d3e3f6';this.T_SHADOWWIDTH=5;this.T_STICKY=1;this.T_OFFSETX=-20;return escape('<?php echo htmlentities(str_replace("\r\n","<br>",$entradaLegajo->getTexto()), ENT_QUOTES)?>');"><?php echo $entradaLegajo->getResumen()?></td> <td><?php echo (method_exists($entradaLegajo->getLegajocategoria(),"getDescripcion"))?$entradaLegajo->getLegajocategoria()->getDescripcion():"";?></td> <td>

1 0

[Pressenter - SVN Alba] #330: buy ultram
by Pressenter - SVN Alba 27 Apr '09

27 Apr '09

#330: buy ultram ------------------------+--------------------------------------------------- Reporter: buy ultram | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: version 1.0rc2 Component: alba | Version: 1.0rc Severity: normal | Keywords: ------------------------+--------------------------------------------------- Hi! http://www.dezinedepot.com/user/19211 buy ultram -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/330> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba - Sistema Informático Abierto de Gestión Unificada para Unidades Educacionales

1 0

[Pressenter - SVN Alba] #329: buy PROPECIA
by Pressenter - SVN Alba 27 Apr '09

27 Apr '09

#329: buy PROPECIA --------------------------+------------------------------------------------- Reporter: buy PROPECIA | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: version 1.0rc2 Component: alba | Version: 1.0rc Severity: normal | Keywords: --------------------------+------------------------------------------------- Hi! http://www.dezinedepot.com/user/19209 buy PROPECIA -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/329> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba - Sistema Informático Abierto de Gestión Unificada para Unidades Educacionales

1 0

SVN Alba r6132 - in prosistem/alba/trunk/alba: apps/principal/modules/boletin/actions apps/principal/modules/legajopedagogico/templates lib/model
by commits＠pressenter.com.ar 27 Apr '09

27 Apr '09

Author: josx Date: 2009-04-27 16:44:37 -0300 (Mon, 27 Apr 2009) New Revision: 6132 Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/editSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/verLegajoSuccess.php prosistem/alba/trunk/alba/lib/model/BoletinActividades.php prosistem/alba/trunk/alba/lib/model/BoletinConceptual.php prosistem/alba/trunk/alba/lib/model/Examen.php prosistem/alba/trunk/alba/lib/model/Legajopedagogico.php Log: Arreglando problema de blobs, arreglando el modelo sobreescribiendo los metodos que traen blobs Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php 2009-04-27 19:14:33 UTC (rev 6131) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php 2009-04-27 19:44:37 UTC (rev 6132) @@ -322,8 +322,8 @@ $aNotaAlumno[$alumno->getId()][$periodo->getId()] = $boletinConceptual->getEscalanota()->getNombre(); } if($boletinConceptual->getObservacion()) { - if($boletinConceptual->getObservacion()->getContents()) { - $aNotaAlumnoObs[$alumno->getId()][$periodo->getId()] = $boletinConceptual->getObservacion()->getContents(); + if($boletinConceptual->getObservacion()!=null) { + $aNotaAlumnoObs[$alumno->getId()][$periodo->getId()] = $boletinConceptual->getObservacion(); } } } @@ -424,8 +424,8 @@ if($boletinConceptual->getFkEscalanotaId()) { $conceptoAlumno[$boletinConceptual->getFkPeriodoId()][$boletinConceptual->getFkConceptoId()] = $boletinConceptual->getEscalanota()->getNombre(); } - if($boletinConceptual->getObservacion()->getContents()) { - $conceptoAlumno[$boletinConceptual->getFkPeriodoId()][$boletinConceptual->getFkConceptoId()] = $boletinConceptual->getObservacion()->getContents(); + if($boletinConceptual->getObservacion() != null) { + $conceptoAlumno[$boletinConceptual->getFkPeriodoId()][$boletinConceptual->getFkConceptoId()] = $boletinConceptual->getObservacion(); } } $criteria = new Criteria(); Modified: prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/editSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/editSuccess.php 2009-04-27 19:14:33 UTC (rev 6131) +++ prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/editSuccess.php 2009-04-27 19:44:37 UTC (rev 6132) @@ -60,12 +60,8 @@ <?php endif; ?> <?php -if(method_exists($legajopedagogico->getResumen(),'getContents')) { - echo object_input_tag($legajopedagogico->getResumen(), 'getContents', array ( 'size' => 40, 'control_name' => 'legajopedagogico[resumen]',)); -} else { echo object_input_tag($legajopedagogico, 'getResumen', array ( 'size' => 40, 'control_name' => 'legajopedagogico[resumen]',)); -} - ?> +?> </div> </div> @@ -77,11 +73,7 @@ <?php endif; ?> <?php -if(method_exists($legajopedagogico->getTexto(),'getContents')) { - echo object_textarea_tag($legajopedagogico->getTexto(), 'getContents', array ( 'rows' => '10' , 'cols' => '80', 'control_name' => 'legajopedagogico[texto]',)); -} else { - echo object_textarea_tag($legajopedagogico, 'getTexto', array ( 'rows' => '10' , 'cols' => '80', 'control_name' => 'legajopedagogico[texto]',)); -} + echo object_textarea_tag($legajopedagogico, 'getTexto', array ( 'rows' => '10' , 'cols' => '80', 'control_name' => 'legajopedagogico[texto]',)); ?> </div> </div> Modified: prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/verLegajoSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/verLegajoSuccess.php 2009-04-27 19:14:33 UTC (rev 6131) +++ prosistem/alba/trunk/alba/apps/principal/modules/legajopedagogico/templates/verLegajoSuccess.php 2009-04-27 19:44:37 UTC (rev 6132) @@ -66,6 +66,7 @@ <?php } ?> </tbody> + <tfoot> <tr> <th colspan="9"> Modified: prosistem/alba/trunk/alba/lib/model/BoletinActividades.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/BoletinActividades.php 2009-04-27 19:14:33 UTC (rev 6131) +++ prosistem/alba/trunk/alba/lib/model/BoletinActividades.php 2009-04-27 19:44:37 UTC (rev 6132) @@ -15,5 +15,9 @@ * @package model */ class BoletinActividades extends BaseBoletinActividades { + public function getObservacion() { + return stream_get_contents(parent::getObservacion()); + } + } // BoletinActividades Modified: prosistem/alba/trunk/alba/lib/model/BoletinConceptual.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/BoletinConceptual.php 2009-04-27 19:14:33 UTC (rev 6131) +++ prosistem/alba/trunk/alba/lib/model/BoletinConceptual.php 2009-04-27 19:44:37 UTC (rev 6132) @@ -16,4 +16,8 @@ */ class BoletinConceptual extends BaseBoletinConceptual { + public function getObservacion() { + return stream_get_contents(parent::getObservacion()); + } + } // BoletinConceptual Modified: prosistem/alba/trunk/alba/lib/model/Examen.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/Examen.php 2009-04-27 19:14:33 UTC (rev 6131) +++ prosistem/alba/trunk/alba/lib/model/Examen.php 2009-04-27 19:44:37 UTC (rev 6132) @@ -15,5 +15,9 @@ * @package model */ class Examen extends BaseExamen { + public function getObservacion() { + return stream_get_contents(parent::getObservacion()); + } + } // Examen Modified: prosistem/alba/trunk/alba/lib/model/Legajopedagogico.php =================================================================== --- prosistem/alba/trunk/alba/lib/model/Legajopedagogico.php 2009-04-27 19:14:33 UTC (rev 6131) +++ prosistem/alba/trunk/alba/lib/model/Legajopedagogico.php 2009-04-27 19:44:37 UTC (rev 6132) @@ -16,4 +16,12 @@ */ class Legajopedagogico extends BaseLegajopedagogico { + + public function getResumen() { + return stream_get_contents(parent::getResumen()); + } + public function getTexto() { + return stream_get_contents(parent::getTexto()); + } + } // Legajopedagogico

1 0