lp:~andy-freeborough/sahana-agasti/krakatoa

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:sahana-agasti/krakatoa

dot dot dot: Pending requested 2011-02-12

Diff: 1294 lines (+714/-259)

3 files modified

sahana-phase2/mod/cs/lib_cs_validate.inc (+2/-2)
sahana-phase2/mod/vm/model/dao.php (+410/-257)
sahana-phase2/www/xml.php (+302/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #632834: Fatal Error on Volunteer Management Module	Low	Won't Fix
Bug #633267: Aid Catalog Bug even if a unit/units is being selected	Undecided	Won't Fix

Link a bug report

Related blueprints

3817. By Andy Freeborough on 2011-02-12

Fixed a problem where you could not add aid item types to a catalog - the code was incorrectly handling the measurement unit as a string rather than an array. This fixes bug #633267.

3816. By Andy Freeborough on 2011-02-12

In mod/vm/model/dao.php I've wrapped all uses of a database query result object with a check to ensure that the result object isn't empty. This specifically addresses the issues reported in bug #632834 .

3815. By Andy Freeborough on 2011-02-12

I've removed the change to error reporting level as I'd used E_DEPRECATED which is a PHP 5.3.x feature. The warning doesn't actually break any functionality, it simply clutters XHR responses.

3814. By Andy Freeborough on 2011-02-12

Updated xml.php to use bound parameters when making database queries rather than building sql query strings containing the values. This removes all possibility of an sql injection attack from xml.php.

NOTE: Other areas of the system other than xml.php may still be vulnerable.

3813. By Andy Freeborough on 2011-02-12

There were several instances in xml.php where a variable was being used before it was declared. I've put declarations in place where this was the case.

3812. By Andy Freeborough on 2011-02-12

xml.php was incorrectly pointing to sysconfig.inc.php when it should be pointing to sysconfig.inc so I've updated all requires accordingly.

3811. By Andy Freeborough on 2011-02-12

Disabled reporting deprecated errors as ADODB was throwing many of these under PHP 5.3.5.

3810. By Andy Freeborough on 2011-02-12

/xml.php was removed when it's still being used so I've put it back in place exactly as it was.

3809. By dot dot dot on 2011-01-13

removed .svn

3808. By dot dot dot on 2011-01-13

new htmlpurifier added