- Update to 1.0

PR:		ports/104461
Submitted by:	Janos Mohacsi <janos.mohacsi at bsd.hu> (maintainer)

8 files changed, 630 insertions, 88 deletions

diff --git a/www/limesurvey/Makefile b/www/limesurvey/Makefile
index 1cf89dc53f3..fa36a335377 100644
--- a/www/limesurvey/Makefile
+++ b/www/limesurvey/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	phpsurveyor
-PORTVERSION=	0.98
+PORTVERSION=	1.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-0_98_final
+DISTNAME=	${PORTNAME}-1_00
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	A PHP-based survey building and runing system
diff --git a/www/limesurvey/distinfo b/www/limesurvey/distinfo
index d7b5d4e3be3..3f6d9490dfd 100644
--- a/www/limesurvey/distinfo
+++ b/www/limesurvey/distinfo
@@ -1,3 +1,3 @@
-MD5 (phpsurveyor-0_98_final.zip) = 39521a28f5445d11c31448682301925a
-SHA256 (phpsurveyor-0_98_final.zip) = fc348fc18f4283e9f7812b43dd5f73f1db06071cf56f03222e9252a7e036346d
-SIZE (phpsurveyor-0_98_final.zip) = 620334
+MD5 (phpsurveyor-1_00.zip) = bc3f429a0047da1fc38de5a4c568af32
+SHA256 (phpsurveyor-1_00.zip) = 6f29e37eec4789a2cfc3c6df9c2f38584f8d43b5a780039fa7feac2ef60a58f9
+SIZE (phpsurveyor-1_00.zip) = 1454161
diff --git a/www/limesurvey/pkg-message b/www/limesurvey/pkg-message
index 82e95862a4a..bf36d56604e 100644
--- a/www/limesurvey/pkg-message
+++ b/www/limesurvey/pkg-message
@@ -5,7 +5,7 @@ You have to ensure that you have a mysql server installed and configured.
 Further information on these installation procedures may 
 be found in:
 
-  %%PREFIX%%/%%PHPSURVEYORDIR%%/admin/instructions.html
+  %%PREFIX%%/%%PHPSURVEYORDIR%%/admin/manual.html
 
 Once these steps have been taken, you may connect to the following URL to
 configure your installation of phpsurveyor:
diff --git a/www/limesurvey/pkg-plist b/www/limesurvey/pkg-plist
index 52f54c88550..57632310960 100644
--- a/www/limesurvey/pkg-plist
+++ b/www/limesurvey/pkg-plist
@@ -1,16 +1,44 @@
-%%PHPSURVEYORDIR%%/Cut.gif
 %%PHPSURVEYORDIR%%/admin/activate.php
 %%PHPSURVEYORDIR%%/admin/admin.php
+%%PHPSURVEYORDIR%%/admin/adminstyle.css
+%%PHPSURVEYORDIR%%/admin/assessments.php
 %%PHPSURVEYORDIR%%/admin/browse.php
 %%PHPSURVEYORDIR%%/admin/checkfields.php
-%%PHPSURVEYORDIR%%/admin/classes/phpzip.inc.php
-%%PHPSURVEYORDIR%%/admin/common.php
+%%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer.php
+%%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/BIFFwriter.php
+%%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/Format.php
+%%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/Parser.php
+%%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/Validator.php
+%%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/Workbook.php
+%%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/Worksheet.php
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/activefolder.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/branch.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/branchbottom.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/branchtop.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/document.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/folder.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/line.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/linebottom.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/minus.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/minusbottom.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/minustop.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/plus.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/plusbottom.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/plustop.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TreeMenu.css
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TreeMenu.js
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TreeMenu.php
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TreeMenuXL.php
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/ccBrowserInfo.php
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/ccSiteStyle.css.php
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/xMenu1.js
+%%PHPSURVEYORDIR%%/admin/classes/phpzip/phpzip.inc.php
 %%PHPSURVEYORDIR%%/admin/conditions.php
-%%PHPSURVEYORDIR%%/admin/config.php
 %%PHPSURVEYORDIR%%/admin/createdb.php
 %%PHPSURVEYORDIR%%/admin/database.php
 %%PHPSURVEYORDIR%%/admin/dataentry.php
 %%PHPSURVEYORDIR%%/admin/dbchecker.php
+%%PHPSURVEYORDIR%%/admin/dbedit.php
 %%PHPSURVEYORDIR%%/admin/deactivate.php
 %%PHPSURVEYORDIR%%/admin/deletesurvey.php
 %%PHPSURVEYORDIR%%/admin/dumpdb.php
@@ -19,13 +47,15 @@
 %%PHPSURVEYORDIR%%/admin/dumpquestion.php
 %%PHPSURVEYORDIR%%/admin/dumpsurvey.php
 %%PHPSURVEYORDIR%%/admin/export.php
+%%PHPSURVEYORDIR%%/admin/favicon.ico
 %%PHPSURVEYORDIR%%/admin/html.php
 %%PHPSURVEYORDIR%%/admin/images/DownArrow.gif
-%%PHPSURVEYORDIR%%/admin/images/Thumbs.db
 %%PHPSURVEYORDIR%%/admin/images/activate.gif
 %%PHPSURVEYORDIR%%/admin/images/active.gif
 %%PHPSURVEYORDIR%%/admin/images/add.gif
+%%PHPSURVEYORDIR%%/admin/images/admincrnr.png
 %%PHPSURVEYORDIR%%/admin/images/answers.gif
+%%PHPSURVEYORDIR%%/admin/images/assessments.gif
 %%PHPSURVEYORDIR%%/admin/images/badsecurity.gif
 %%PHPSURVEYORDIR%%/admin/images/blank.gif
 %%PHPSURVEYORDIR%%/admin/images/browse.gif
@@ -44,8 +74,11 @@
 %%PHPSURVEYORDIR%%/admin/images/delete.gif
 %%PHPSURVEYORDIR%%/admin/images/do.gif
 %%PHPSURVEYORDIR%%/admin/images/document.gif
+%%PHPSURVEYORDIR%%/admin/images/donate.gif
+%%PHPSURVEYORDIR%%/admin/images/down.gif
 %%PHPSURVEYORDIR%%/admin/images/edit.gif
 %%PHPSURVEYORDIR%%/admin/images/export.gif
+%%PHPSURVEYORDIR%%/admin/images/export2.gif
 %%PHPSURVEYORDIR%%/admin/images/help.gif
 %%PHPSURVEYORDIR%%/admin/images/home.gif
 %%PHPSURVEYORDIR%%/admin/images/import.gif
@@ -54,11 +87,13 @@
 %%PHPSURVEYORDIR%%/admin/images/invite.gif
 %%PHPSURVEYORDIR%%/admin/images/labels.gif
 %%PHPSURVEYORDIR%%/admin/images/minus.gif
+%%PHPSURVEYORDIR%%/admin/images/phpslogo.png
 %%PHPSURVEYORDIR%%/admin/images/phpsurveyor_logo.jpg
 %%PHPSURVEYORDIR%%/admin/images/plus.gif
 %%PHPSURVEYORDIR%%/admin/images/print.gif
 %%PHPSURVEYORDIR%%/admin/images/remind.gif
 %%PHPSURVEYORDIR%%/admin/images/save.gif
+%%PHPSURVEYORDIR%%/admin/images/saved.gif
 %%PHPSURVEYORDIR%%/admin/images/security.gif
 %%PHPSURVEYORDIR%%/admin/images/seperator.gif
 %%PHPSURVEYORDIR%%/admin/images/showhelp.gif
@@ -71,15 +106,19 @@
 %%PHPSURVEYORDIR%%/admin/images/trafficgreen.gif
 %%PHPSURVEYORDIR%%/admin/images/trafficred.gif
 %%PHPSURVEYORDIR%%/admin/images/viewlast.gif
+%%PHPSURVEYORDIR%%/admin/images/vvexport.gif
+%%PHPSURVEYORDIR%%/admin/images/vvimport.gif
 %%PHPSURVEYORDIR%%/admin/importgroup.php
 %%PHPSURVEYORDIR%%/admin/importlabel.php
+%%PHPSURVEYORDIR%%/admin/importoldresponses.php
 %%PHPSURVEYORDIR%%/admin/importquestion.php
 %%PHPSURVEYORDIR%%/admin/importsurvey.php
-%%PHPSURVEYORDIR%%/admin/instructions.html
+%%PHPSURVEYORDIR%%/admin/index.php
 %%PHPSURVEYORDIR%%/admin/labels.php
 %%PHPSURVEYORDIR%%/admin/lang/chinese/admin.html
 %%PHPSURVEYORDIR%%/admin/lang/chinese/answer.html
 %%PHPSURVEYORDIR%%/admin/lang/chinese/group.html
+%%PHPSURVEYORDIR%%/admin/lang/chinese/instructions.html
 %%PHPSURVEYORDIR%%/admin/lang/chinese/labels.html
 %%PHPSURVEYORDIR%%/admin/lang/chinese/labelsets.html
 %%PHPSURVEYORDIR%%/admin/lang/chinese/messages.php
@@ -87,29 +126,34 @@
 %%PHPSURVEYORDIR%%/admin/lang/chinese/survey.html
 %%PHPSURVEYORDIR%%/admin/lang/chinese/tokens.html
 %%PHPSURVEYORDIR%%/admin/lang/chinese/users.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/admin.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/answer.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/group.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/labels.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/labelsets.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/messages.php
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/question.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/survey.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/tokens.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/users.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/admin.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/answer.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/group.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/instructions.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/labels.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/labelsets.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/messages.php
+%%PHPSURVEYORDIR%%/admin/lang/dutch/question.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/survey.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/tokens.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/users.html
 %%PHPSURVEYORDIR%%/admin/lang/english/admin.html
 %%PHPSURVEYORDIR%%/admin/lang/english/answer.html
 %%PHPSURVEYORDIR%%/admin/lang/english/group.html
+%%PHPSURVEYORDIR%%/admin/lang/english/installation_on_os2warp.html
+%%PHPSURVEYORDIR%%/admin/lang/english/instructions.html
 %%PHPSURVEYORDIR%%/admin/lang/english/labels.html
 %%PHPSURVEYORDIR%%/admin/lang/english/labelsets.html
 %%PHPSURVEYORDIR%%/admin/lang/english/messages.php
 %%PHPSURVEYORDIR%%/admin/lang/english/question.html
 %%PHPSURVEYORDIR%%/admin/lang/english/survey.html
+%%PHPSURVEYORDIR%%/admin/lang/english/templates.html
 %%PHPSURVEYORDIR%%/admin/lang/english/tokens.html
 %%PHPSURVEYORDIR%%/admin/lang/english/users.html
 %%PHPSURVEYORDIR%%/admin/lang/french/admin.html
 %%PHPSURVEYORDIR%%/admin/lang/french/answer.html
 %%PHPSURVEYORDIR%%/admin/lang/french/group.html
+%%PHPSURVEYORDIR%%/admin/lang/french/instructions.html
 %%PHPSURVEYORDIR%%/admin/lang/french/labels.html
 %%PHPSURVEYORDIR%%/admin/lang/french/labelsets.html
 %%PHPSURVEYORDIR%%/admin/lang/french/messages.php
@@ -117,9 +161,21 @@
 %%PHPSURVEYORDIR%%/admin/lang/french/survey.html
 %%PHPSURVEYORDIR%%/admin/lang/french/tokens.html
 %%PHPSURVEYORDIR%%/admin/lang/french/users.html
+%%PHPSURVEYORDIR%%/admin/lang/german/admin.html
+%%PHPSURVEYORDIR%%/admin/lang/german/answer.html
+%%PHPSURVEYORDIR%%/admin/lang/german/group.html
+%%PHPSURVEYORDIR%%/admin/lang/german/instructions.html
+%%PHPSURVEYORDIR%%/admin/lang/german/labels.html
+%%PHPSURVEYORDIR%%/admin/lang/german/labelsets.html
+%%PHPSURVEYORDIR%%/admin/lang/german/messages.php
+%%PHPSURVEYORDIR%%/admin/lang/german/question.html
+%%PHPSURVEYORDIR%%/admin/lang/german/survey.html
+%%PHPSURVEYORDIR%%/admin/lang/german/tokens.html
+%%PHPSURVEYORDIR%%/admin/lang/german/users.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/admin.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/answer.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/group.html
+%%PHPSURVEYORDIR%%/admin/lang/italian/instructions.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/labels.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/labelsets.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/messages.php
@@ -127,19 +183,32 @@
 %%PHPSURVEYORDIR%%/admin/lang/italian/survey.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/tokens.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/users.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/admin.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/answer.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/group.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/labels.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/labelsets.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/messages.php
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/question.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/survey.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/tokens.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/users.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/admin.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/answer.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/group.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/instructions.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/labels.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/labelsets.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/messages.php
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/question.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/survey.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/tokens.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/users.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/admin.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/answer.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/group.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/instructions.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/labels.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/labelsets.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/messages.php
+%%PHPSURVEYORDIR%%/admin/lang/russian/question.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/survey.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/tokens.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/users.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/admin.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/answer.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/group.html
+%%PHPSURVEYORDIR%%/admin/lang/spanish/instructions.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/labels.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/labelsets.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/messages.php
@@ -147,90 +216,204 @@
 %%PHPSURVEYORDIR%%/admin/lang/spanish/survey.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/tokens.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/users.html
-%%PHPSURVEYORDIR%%/admin/license.txt
+%%PHPSURVEYORDIR%%/admin/lang/swedish/admin.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/answer.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/group.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/installation_on_os2warp.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/instructions.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/labels.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/labelsets.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/messages.php
+%%PHPSURVEYORDIR%%/admin/lang/swedish/question.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/survey.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/templates.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/tokens.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/users.html
 %%PHPSURVEYORDIR%%/admin/listcolumn.php
-%%PHPSURVEYORDIR%%/admin/maketables.sql
+%%PHPSURVEYORDIR%%/admin/manual.html
+%%PHPSURVEYORDIR%%/admin/navigator.php
+%%PHPSURVEYORDIR%%/admin/phpsurveyor.css
 %%PHPSURVEYORDIR%%/admin/printablesurvey.php
+%%PHPSURVEYORDIR%%/admin/results.php
 %%PHPSURVEYORDIR%%/admin/resultsdump.php
-%%PHPSURVEYORDIR%%/admin/sample_survey.sql
+%%PHPSURVEYORDIR%%/admin/saved.php
 %%PHPSURVEYORDIR%%/admin/sessioncontrol.php
 %%PHPSURVEYORDIR%%/admin/spss.php
 %%PHPSURVEYORDIR%%/admin/statistics.php
-%%PHPSURVEYORDIR%%/admin/summary.txt
-%%PHPSURVEYORDIR%%/admin/templates.html
 %%PHPSURVEYORDIR%%/admin/templates.php
 %%PHPSURVEYORDIR%%/admin/tokens.php
 %%PHPSURVEYORDIR%%/admin/usercontrol.php
+%%PHPSURVEYORDIR%%/admin/vvexport.php
+%%PHPSURVEYORDIR%%/admin/vvimport.php
 %%PHPSURVEYORDIR%%/chart.jpg
+%%PHPSURVEYORDIR%%/classes/XPertMailer/CHANGELOG
+%%PHPSURVEYORDIR%%/classes/XPertMailer/DOCUMENTATION
+%%PHPSURVEYORDIR%%/classes/XPertMailer/HOWTO
+%%PHPSURVEYORDIR%%/classes/XPertMailer/XPertMailer.php
+%%PHPSURVEYORDIR%%/classes/slider/handle.horizontal.png
+%%PHPSURVEYORDIR%%/classes/slider/handle.vertical.png
+%%PHPSURVEYORDIR%%/classes/slider/range.js
+%%PHPSURVEYORDIR%%/classes/slider/slider.js
+%%PHPSURVEYORDIR%%/classes/slider/slider/handle.horizontal.png
+%%PHPSURVEYORDIR%%/classes/slider/slider/handle.vertical.png
+%%PHPSURVEYORDIR%%/classes/slider/slider/range.js
+%%PHPSURVEYORDIR%%/classes/slider/slider/slider.js
+%%PHPSURVEYORDIR%%/classes/slider/slider/swing.css
+%%PHPSURVEYORDIR%%/classes/slider/slider/timer.js
+%%PHPSURVEYORDIR%%/classes/slider/swing.css
+%%PHPSURVEYORDIR%%/classes/slider/timer.js
+%%PHPSURVEYORDIR%%/common.php
+%%PHPSURVEYORDIR%%/config.php
+%%PHPSURVEYORDIR%%/cut.gif
+%%PHPSURVEYORDIR%%/docs/license.txt
+%%PHPSURVEYORDIR%%/docs/maketables.sql
+%%PHPSURVEYORDIR%%/docs/manual.html
+%%PHPSURVEYORDIR%%/docs/release_notes_and_upgrade_instructions.txt
+%%PHPSURVEYORDIR%%/docs/sample_survey.sql
+%%PHPSURVEYORDIR%%/docs/summary.txt
 %%PHPSURVEYORDIR%%/group.php
 %%PHPSURVEYORDIR%%/help.gif
 %%PHPSURVEYORDIR%%/index.php
-%%PHPSURVEYORDIR%%/lang/chinese.lang.php
+%%PHPSURVEYORDIR%%/lang/bulgarian.lang.php
+%%PHPSURVEYORDIR%%/lang/chinese-simplified.lang.php
+%%PHPSURVEYORDIR%%/lang/chinese-traditional.lang.php
+%%PHPSURVEYORDIR%%/lang/croatian.lang.php
 %%PHPSURVEYORDIR%%/lang/danish.lang.php
-%%PHPSURVEYORDIR%%/lang/deutsch.lang.php
+%%PHPSURVEYORDIR%%/lang/dutch.lang.php
 %%PHPSURVEYORDIR%%/lang/english.lang.php
 %%PHPSURVEYORDIR%%/lang/french.lang.php
+%%PHPSURVEYORDIR%%/lang/german-informal.lang.php
+%%PHPSURVEYORDIR%%/lang/german.lang.php
+%%PHPSURVEYORDIR%%/lang/greek.lang.php
 %%PHPSURVEYORDIR%%/lang/hungarian.lang.php
 %%PHPSURVEYORDIR%%/lang/italian.lang.php
-%%PHPSURVEYORDIR%%/lang/nederlands.lang.php
+%%PHPSURVEYORDIR%%/lang/japanese.lang.php
+%%PHPSURVEYORDIR%%/lang/lithuanian.lang.php
 %%PHPSURVEYORDIR%%/lang/norwegian.lang.php
-%%PHPSURVEYORDIR%%/lang/simplified-chinese.lang.php
+%%PHPSURVEYORDIR%%/lang/portuguese.lang.php
+%%PHPSURVEYORDIR%%/lang/romanian.lang.php
+%%PHPSURVEYORDIR%%/lang/russian.lang.php
 %%PHPSURVEYORDIR%%/lang/slovenian.lang.php
 %%PHPSURVEYORDIR%%/lang/spanish.lang.php
 %%PHPSURVEYORDIR%%/lang/swedish.lang.php
+%%PHPSURVEYORDIR%%/load.php
 %%PHPSURVEYORDIR%%/pkg-message
 %%PHPSURVEYORDIR%%/qanda.php
 %%PHPSURVEYORDIR%%/question.php
 %%PHPSURVEYORDIR%%/register.php
+%%PHPSURVEYORDIR%%/save.php
 %%PHPSURVEYORDIR%%/survey.php
+%%PHPSURVEYORDIR%%/templates/basic/assessment.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/chart.jpg
 %%PHPSURVEYORDIR%%/templates/basic/clearall.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/completed.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/endgroup.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/endpage.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/basic/load.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/logo.gif
 %%PHPSURVEYORDIR%%/templates/basic/navigator.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/privacy.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/question.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/readme.txt
 %%PHPSURVEYORDIR%%/templates/basic/register.pstpl
+%%PHPSURVEYORDIR%%/templates/basic/save.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/startgroup.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/startpage.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/submit.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/survey.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/assessment.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/chart.jpg
+%%PHPSURVEYORDIR%%/templates/blue_heaven/clearall.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/completed.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/endgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/endpage.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/load.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/navigator.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/privacy.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/question.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/register.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/save.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/startgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/startpage.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/submit.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/survey.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/assessment.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/chart.jpg
+%%PHPSURVEYORDIR%%/templates/bluengrey/clearall.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/completed.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/endgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/endpage.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/load.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/navigator.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/privacy.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/question.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/register.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/save.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/startgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/startpage.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/submit.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/survey.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/bubblegum/assessment.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/chart.jpg
 %%PHPSURVEYORDIR%%/templates/bubblegum/clearall.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/completed.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/endgroup.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/endpage.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/bubblegum/load.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/navigator.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/privacy.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/question.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/register.pstpl
+%%PHPSURVEYORDIR%%/templates/bubblegum/save.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/startgroup.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/startpage.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/submit.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/survey.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/assessment.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/chart.jpg
+%%PHPSURVEYORDIR%%/templates/business_grey/clearall.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/completed.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/endgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/endpage.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/load.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/navigator.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/privacy.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/question.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/register.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/save.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/startgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/startpage.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/submit.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/survey.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/default/assessment.pstpl
 %%PHPSURVEYORDIR%%/templates/default/chart.jpg
 %%PHPSURVEYORDIR%%/templates/default/clearall.pstpl
 %%PHPSURVEYORDIR%%/templates/default/completed.pstpl
 %%PHPSURVEYORDIR%%/templates/default/endgroup.pstpl
 %%PHPSURVEYORDIR%%/templates/default/endpage.pstpl
 %%PHPSURVEYORDIR%%/templates/default/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/default/load.pstpl
 %%PHPSURVEYORDIR%%/templates/default/navigator.pstpl
 %%PHPSURVEYORDIR%%/templates/default/privacy.pstpl
 %%PHPSURVEYORDIR%%/templates/default/question.pstpl
 %%PHPSURVEYORDIR%%/templates/default/register.pstpl
+%%PHPSURVEYORDIR%%/templates/default/save.pstpl
 %%PHPSURVEYORDIR%%/templates/default/startgroup.pstpl
 %%PHPSURVEYORDIR%%/templates/default/startpage.pstpl
 %%PHPSURVEYORDIR%%/templates/default/submit.pstpl
 %%PHPSURVEYORDIR%%/templates/default/survey.pstpl
 %%PHPSURVEYORDIR%%/templates/default/welcome.pstpl
-%%PHPSURVEYORDIR%%/templates/edgyblue/Thumbs.db
+%%PHPSURVEYORDIR%%/templates/edgyblue/assessment.pstpl
 %%PHPSURVEYORDIR%%/templates/edgyblue/bot_bord.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/botleft_bord.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/botright_bord.gif
@@ -247,6 +430,7 @@
 %%PHPSURVEYORDIR%%/templates/edgyblue/head_topleft.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/head_topright.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/left_bord.gif
+%%PHPSURVEYORDIR%%/templates/edgyblue/load.pstpl
 %%PHPSURVEYORDIR%%/templates/edgyblue/navigator.pstpl
 %%PHPSURVEYORDIR%%/templates/edgyblue/orange2_bot.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/orange2_botleft.gif
@@ -268,6 +452,7 @@
 %%PHPSURVEYORDIR%%/templates/edgyblue/question.pstpl
 %%PHPSURVEYORDIR%%/templates/edgyblue/register.pstpl
 %%PHPSURVEYORDIR%%/templates/edgyblue/right_bord.gif
+%%PHPSURVEYORDIR%%/templates/edgyblue/save.pstpl
 %%PHPSURVEYORDIR%%/templates/edgyblue/single_bot.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/single_botleft.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/single_botright.gif
@@ -284,22 +469,108 @@
 %%PHPSURVEYORDIR%%/templates/edgyblue/topleft_bord.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/topright_bord.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/assessment.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/chart.jpg
+%%PHPSURVEYORDIR%%/templates/eirenicon/clearall.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/completed.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/endgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/endpage.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/load.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/navigator.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/privacy.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/question.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/readme.txt
+%%PHPSURVEYORDIR%%/templates/eirenicon/register.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/save.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/startgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/startpage.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/submit.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/survey.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/assessment.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/botcurve.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/botcurve2.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/chart.jpg
+%%PHPSURVEYORDIR%%/templates/softgreencurves/clearall.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/completed.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/contgrid.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/endgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/endpage.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/headleft.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/headright.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/load.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/navigator.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/privacy.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/question.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/register.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/save.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/smallgrid.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/smallgrid2.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/startgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/startpage.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/submit.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/survey.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/topcurve.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/topcurve2.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/assessment.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/chart.jpg
+%%PHPSURVEYORDIR%%/templates/vallendar/clearall.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/completed.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/endgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/endpage.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/load.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/logo.jpg
+%%PHPSURVEYORDIR%%/templates/vallendar/navigator.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/privacy.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/question.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/readme.txt
+%%PHPSURVEYORDIR%%/templates/vallendar/register.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/save.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/startgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/startpage.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/submit.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/survey.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/welcome.pstpl
 @dirrm %%PHPSURVEYORDIR%%/tmp
+@dirrm %%PHPSURVEYORDIR%%/templates/vallendar
+@dirrm %%PHPSURVEYORDIR%%/templates/softgreencurves
+@dirrm %%PHPSURVEYORDIR%%/templates/eirenicon
 @dirrm %%PHPSURVEYORDIR%%/templates/edgyblue
 @dirrm %%PHPSURVEYORDIR%%/templates/default
+@dirrm %%PHPSURVEYORDIR%%/templates/business_grey
 @dirrm %%PHPSURVEYORDIR%%/templates/bubblegum
+@dirrm %%PHPSURVEYORDIR%%/templates/bluengrey
+@dirrm %%PHPSURVEYORDIR%%/templates/blue_heaven
 @dirrm %%PHPSURVEYORDIR%%/templates/basic
 @dirrm %%PHPSURVEYORDIR%%/templates
 @dirrm %%PHPSURVEYORDIR%%/lang
+@dirrm %%PHPSURVEYORDIR%%/docs
+@dirrm %%PHPSURVEYORDIR%%/classes/slider/slider
+@dirrm %%PHPSURVEYORDIR%%/classes/slider
+@dirrm %%PHPSURVEYORDIR%%/classes/XPertMailer
+@dirrm %%PHPSURVEYORDIR%%/classes
+@dirrm %%PHPSURVEYORDIR%%/admin/lang/swedish
 @dirrm %%PHPSURVEYORDIR%%/admin/lang/spanish
-@dirrm %%PHPSURVEYORDIR%%/admin/lang/nederlands
+@dirrm %%PHPSURVEYORDIR%%/admin/lang/russian
+@dirrm %%PHPSURVEYORDIR%%/admin/lang/portuguese
 @dirrm %%PHPSURVEYORDIR%%/admin/lang/italian
+@dirrm %%PHPSURVEYORDIR%%/admin/lang/german
 @dirrm %%PHPSURVEYORDIR%%/admin/lang/french
 @dirrm %%PHPSURVEYORDIR%%/admin/lang/english
-@dirrm %%PHPSURVEYORDIR%%/admin/lang/deutsch
+@dirrm %%PHPSURVEYORDIR%%/admin/lang/dutch
 @dirrm %%PHPSURVEYORDIR%%/admin/lang/chinese
 @dirrm %%PHPSURVEYORDIR%%/admin/lang
 @dirrm %%PHPSURVEYORDIR%%/admin/images
+@dirrm %%PHPSURVEYORDIR%%/admin/classes/phpzip
+@dirrm %%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages
+@dirrm %%PHPSURVEYORDIR%%/admin/classes/TreeMenu
+@dirrm %%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer
+@dirrm %%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer
+@dirrm %%PHPSURVEYORDIR%%/admin/classes/PEAR
 @dirrm %%PHPSURVEYORDIR%%/admin/classes
 @dirrm %%PHPSURVEYORDIR%%/admin
 @dirrm %%PHPSURVEYORDIR%%
diff --git a/www/phpsurveyor/Makefile b/www/phpsurveyor/Makefile
index 1cf89dc53f3..fa36a335377 100644
--- a/www/phpsurveyor/Makefile
+++ b/www/phpsurveyor/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	phpsurveyor
-PORTVERSION=	0.98
+PORTVERSION=	1.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-0_98_final
+DISTNAME=	${PORTNAME}-1_00
 
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	A PHP-based survey building and runing system
diff --git a/www/phpsurveyor/distinfo b/www/phpsurveyor/distinfo
index d7b5d4e3be3..3f6d9490dfd 100644
--- a/www/phpsurveyor/distinfo
+++ b/www/phpsurveyor/distinfo
@@ -1,3 +1,3 @@
-MD5 (phpsurveyor-0_98_final.zip) = 39521a28f5445d11c31448682301925a
-SHA256 (phpsurveyor-0_98_final.zip) = fc348fc18f4283e9f7812b43dd5f73f1db06071cf56f03222e9252a7e036346d
-SIZE (phpsurveyor-0_98_final.zip) = 620334
+MD5 (phpsurveyor-1_00.zip) = bc3f429a0047da1fc38de5a4c568af32
+SHA256 (phpsurveyor-1_00.zip) = 6f29e37eec4789a2cfc3c6df9c2f38584f8d43b5a780039fa7feac2ef60a58f9
+SIZE (phpsurveyor-1_00.zip) = 1454161
diff --git a/www/phpsurveyor/pkg-message b/www/phpsurveyor/pkg-message
index 82e95862a4a..bf36d56604e 100644
--- a/www/phpsurveyor/pkg-message
+++ b/www/phpsurveyor/pkg-message
@@ -5,7 +5,7 @@ You have to ensure that you have a mysql server installed and configured.
 Further information on these installation procedures may 
 be found in:
 
-  %%PREFIX%%/%%PHPSURVEYORDIR%%/admin/instructions.html
+  %%PREFIX%%/%%PHPSURVEYORDIR%%/admin/manual.html
 
 Once these steps have been taken, you may connect to the following URL to
 configure your installation of phpsurveyor:
diff --git a/www/phpsurveyor/pkg-plist b/www/phpsurveyor/pkg-plist
index 52f54c88550..57632310960 100644
--- a/www/phpsurveyor/pkg-plist
+++ b/www/phpsurveyor/pkg-plist
@@ -1,16 +1,44 @@
-%%PHPSURVEYORDIR%%/Cut.gif
 %%PHPSURVEYORDIR%%/admin/activate.php
 %%PHPSURVEYORDIR%%/admin/admin.php
+%%PHPSURVEYORDIR%%/admin/adminstyle.css
+%%PHPSURVEYORDIR%%/admin/assessments.php
 %%PHPSURVEYORDIR%%/admin/browse.php
 %%PHPSURVEYORDIR%%/admin/checkfields.php
-%%PHPSURVEYORDIR%%/admin/classes/phpzip.inc.php
-%%PHPSURVEYORDIR%%/admin/common.php
+%%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer.php
+%%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/BIFFwriter.php
+%%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/Format.php
+%%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/Parser.php
+%%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/Validator.php
+%%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/Workbook.php
+%%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer/Worksheet.php
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/activefolder.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/branch.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/branchbottom.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/branchtop.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/document.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/folder.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/line.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/linebottom.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/minus.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/minusbottom.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/minustop.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/plus.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/plusbottom.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages/plustop.gif
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TreeMenu.css
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TreeMenu.js
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TreeMenu.php
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TreeMenuXL.php
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/ccBrowserInfo.php
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/ccSiteStyle.css.php
+%%PHPSURVEYORDIR%%/admin/classes/TreeMenu/xMenu1.js
+%%PHPSURVEYORDIR%%/admin/classes/phpzip/phpzip.inc.php
 %%PHPSURVEYORDIR%%/admin/conditions.php
-%%PHPSURVEYORDIR%%/admin/config.php
 %%PHPSURVEYORDIR%%/admin/createdb.php
 %%PHPSURVEYORDIR%%/admin/database.php
 %%PHPSURVEYORDIR%%/admin/dataentry.php
 %%PHPSURVEYORDIR%%/admin/dbchecker.php
+%%PHPSURVEYORDIR%%/admin/dbedit.php
 %%PHPSURVEYORDIR%%/admin/deactivate.php
 %%PHPSURVEYORDIR%%/admin/deletesurvey.php
 %%PHPSURVEYORDIR%%/admin/dumpdb.php
@@ -19,13 +47,15 @@
 %%PHPSURVEYORDIR%%/admin/dumpquestion.php
 %%PHPSURVEYORDIR%%/admin/dumpsurvey.php
 %%PHPSURVEYORDIR%%/admin/export.php
+%%PHPSURVEYORDIR%%/admin/favicon.ico
 %%PHPSURVEYORDIR%%/admin/html.php
 %%PHPSURVEYORDIR%%/admin/images/DownArrow.gif
-%%PHPSURVEYORDIR%%/admin/images/Thumbs.db
 %%PHPSURVEYORDIR%%/admin/images/activate.gif
 %%PHPSURVEYORDIR%%/admin/images/active.gif
 %%PHPSURVEYORDIR%%/admin/images/add.gif
+%%PHPSURVEYORDIR%%/admin/images/admincrnr.png
 %%PHPSURVEYORDIR%%/admin/images/answers.gif
+%%PHPSURVEYORDIR%%/admin/images/assessments.gif
 %%PHPSURVEYORDIR%%/admin/images/badsecurity.gif
 %%PHPSURVEYORDIR%%/admin/images/blank.gif
 %%PHPSURVEYORDIR%%/admin/images/browse.gif
@@ -44,8 +74,11 @@
 %%PHPSURVEYORDIR%%/admin/images/delete.gif
 %%PHPSURVEYORDIR%%/admin/images/do.gif
 %%PHPSURVEYORDIR%%/admin/images/document.gif
+%%PHPSURVEYORDIR%%/admin/images/donate.gif
+%%PHPSURVEYORDIR%%/admin/images/down.gif
 %%PHPSURVEYORDIR%%/admin/images/edit.gif
 %%PHPSURVEYORDIR%%/admin/images/export.gif
+%%PHPSURVEYORDIR%%/admin/images/export2.gif
 %%PHPSURVEYORDIR%%/admin/images/help.gif
 %%PHPSURVEYORDIR%%/admin/images/home.gif
 %%PHPSURVEYORDIR%%/admin/images/import.gif
@@ -54,11 +87,13 @@
 %%PHPSURVEYORDIR%%/admin/images/invite.gif
 %%PHPSURVEYORDIR%%/admin/images/labels.gif
 %%PHPSURVEYORDIR%%/admin/images/minus.gif
+%%PHPSURVEYORDIR%%/admin/images/phpslogo.png
 %%PHPSURVEYORDIR%%/admin/images/phpsurveyor_logo.jpg
 %%PHPSURVEYORDIR%%/admin/images/plus.gif
 %%PHPSURVEYORDIR%%/admin/images/print.gif
 %%PHPSURVEYORDIR%%/admin/images/remind.gif
 %%PHPSURVEYORDIR%%/admin/images/save.gif
+%%PHPSURVEYORDIR%%/admin/images/saved.gif
 %%PHPSURVEYORDIR%%/admin/images/security.gif
 %%PHPSURVEYORDIR%%/admin/images/seperator.gif
 %%PHPSURVEYORDIR%%/admin/images/showhelp.gif
@@ -71,15 +106,19 @@
 %%PHPSURVEYORDIR%%/admin/images/trafficgreen.gif
 %%PHPSURVEYORDIR%%/admin/images/trafficred.gif
 %%PHPSURVEYORDIR%%/admin/images/viewlast.gif
+%%PHPSURVEYORDIR%%/admin/images/vvexport.gif
+%%PHPSURVEYORDIR%%/admin/images/vvimport.gif
 %%PHPSURVEYORDIR%%/admin/importgroup.php
 %%PHPSURVEYORDIR%%/admin/importlabel.php
+%%PHPSURVEYORDIR%%/admin/importoldresponses.php
 %%PHPSURVEYORDIR%%/admin/importquestion.php
 %%PHPSURVEYORDIR%%/admin/importsurvey.php
-%%PHPSURVEYORDIR%%/admin/instructions.html
+%%PHPSURVEYORDIR%%/admin/index.php
 %%PHPSURVEYORDIR%%/admin/labels.php
 %%PHPSURVEYORDIR%%/admin/lang/chinese/admin.html
 %%PHPSURVEYORDIR%%/admin/lang/chinese/answer.html
 %%PHPSURVEYORDIR%%/admin/lang/chinese/group.html
+%%PHPSURVEYORDIR%%/admin/lang/chinese/instructions.html
 %%PHPSURVEYORDIR%%/admin/lang/chinese/labels.html
 %%PHPSURVEYORDIR%%/admin/lang/chinese/labelsets.html
 %%PHPSURVEYORDIR%%/admin/lang/chinese/messages.php
@@ -87,29 +126,34 @@
 %%PHPSURVEYORDIR%%/admin/lang/chinese/survey.html
 %%PHPSURVEYORDIR%%/admin/lang/chinese/tokens.html
 %%PHPSURVEYORDIR%%/admin/lang/chinese/users.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/admin.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/answer.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/group.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/labels.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/labelsets.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/messages.php
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/question.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/survey.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/tokens.html
-%%PHPSURVEYORDIR%%/admin/lang/deutsch/users.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/admin.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/answer.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/group.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/instructions.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/labels.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/labelsets.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/messages.php
+%%PHPSURVEYORDIR%%/admin/lang/dutch/question.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/survey.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/tokens.html
+%%PHPSURVEYORDIR%%/admin/lang/dutch/users.html
 %%PHPSURVEYORDIR%%/admin/lang/english/admin.html
 %%PHPSURVEYORDIR%%/admin/lang/english/answer.html
 %%PHPSURVEYORDIR%%/admin/lang/english/group.html
+%%PHPSURVEYORDIR%%/admin/lang/english/installation_on_os2warp.html
+%%PHPSURVEYORDIR%%/admin/lang/english/instructions.html
 %%PHPSURVEYORDIR%%/admin/lang/english/labels.html
 %%PHPSURVEYORDIR%%/admin/lang/english/labelsets.html
 %%PHPSURVEYORDIR%%/admin/lang/english/messages.php
 %%PHPSURVEYORDIR%%/admin/lang/english/question.html
 %%PHPSURVEYORDIR%%/admin/lang/english/survey.html
+%%PHPSURVEYORDIR%%/admin/lang/english/templates.html
 %%PHPSURVEYORDIR%%/admin/lang/english/tokens.html
 %%PHPSURVEYORDIR%%/admin/lang/english/users.html
 %%PHPSURVEYORDIR%%/admin/lang/french/admin.html
 %%PHPSURVEYORDIR%%/admin/lang/french/answer.html
 %%PHPSURVEYORDIR%%/admin/lang/french/group.html
+%%PHPSURVEYORDIR%%/admin/lang/french/instructions.html
 %%PHPSURVEYORDIR%%/admin/lang/french/labels.html
 %%PHPSURVEYORDIR%%/admin/lang/french/labelsets.html
 %%PHPSURVEYORDIR%%/admin/lang/french/messages.php
@@ -117,9 +161,21 @@
 %%PHPSURVEYORDIR%%/admin/lang/french/survey.html
 %%PHPSURVEYORDIR%%/admin/lang/french/tokens.html
 %%PHPSURVEYORDIR%%/admin/lang/french/users.html
+%%PHPSURVEYORDIR%%/admin/lang/german/admin.html
+%%PHPSURVEYORDIR%%/admin/lang/german/answer.html
+%%PHPSURVEYORDIR%%/admin/lang/german/group.html
+%%PHPSURVEYORDIR%%/admin/lang/german/instructions.html
+%%PHPSURVEYORDIR%%/admin/lang/german/labels.html
+%%PHPSURVEYORDIR%%/admin/lang/german/labelsets.html
+%%PHPSURVEYORDIR%%/admin/lang/german/messages.php
+%%PHPSURVEYORDIR%%/admin/lang/german/question.html
+%%PHPSURVEYORDIR%%/admin/lang/german/survey.html
+%%PHPSURVEYORDIR%%/admin/lang/german/tokens.html
+%%PHPSURVEYORDIR%%/admin/lang/german/users.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/admin.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/answer.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/group.html
+%%PHPSURVEYORDIR%%/admin/lang/italian/instructions.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/labels.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/labelsets.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/messages.php
@@ -127,19 +183,32 @@
 %%PHPSURVEYORDIR%%/admin/lang/italian/survey.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/tokens.html
 %%PHPSURVEYORDIR%%/admin/lang/italian/users.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/admin.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/answer.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/group.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/labels.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/labelsets.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/messages.php
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/question.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/survey.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/tokens.html
-%%PHPSURVEYORDIR%%/admin/lang/nederlands/users.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/admin.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/answer.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/group.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/instructions.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/labels.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/labelsets.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/messages.php
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/question.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/survey.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/tokens.html
+%%PHPSURVEYORDIR%%/admin/lang/portuguese/users.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/admin.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/answer.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/group.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/instructions.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/labels.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/labelsets.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/messages.php
+%%PHPSURVEYORDIR%%/admin/lang/russian/question.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/survey.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/tokens.html
+%%PHPSURVEYORDIR%%/admin/lang/russian/users.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/admin.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/answer.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/group.html
+%%PHPSURVEYORDIR%%/admin/lang/spanish/instructions.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/labels.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/labelsets.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/messages.php
@@ -147,90 +216,204 @@
 %%PHPSURVEYORDIR%%/admin/lang/spanish/survey.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/tokens.html
 %%PHPSURVEYORDIR%%/admin/lang/spanish/users.html
-%%PHPSURVEYORDIR%%/admin/license.txt
+%%PHPSURVEYORDIR%%/admin/lang/swedish/admin.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/answer.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/group.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/installation_on_os2warp.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/instructions.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/labels.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/labelsets.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/messages.php
+%%PHPSURVEYORDIR%%/admin/lang/swedish/question.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/survey.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/templates.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/tokens.html
+%%PHPSURVEYORDIR%%/admin/lang/swedish/users.html
 %%PHPSURVEYORDIR%%/admin/listcolumn.php
-%%PHPSURVEYORDIR%%/admin/maketables.sql
+%%PHPSURVEYORDIR%%/admin/manual.html
+%%PHPSURVEYORDIR%%/admin/navigator.php
+%%PHPSURVEYORDIR%%/admin/phpsurveyor.css
 %%PHPSURVEYORDIR%%/admin/printablesurvey.php
+%%PHPSURVEYORDIR%%/admin/results.php
 %%PHPSURVEYORDIR%%/admin/resultsdump.php
-%%PHPSURVEYORDIR%%/admin/sample_survey.sql
+%%PHPSURVEYORDIR%%/admin/saved.php
 %%PHPSURVEYORDIR%%/admin/sessioncontrol.php
 %%PHPSURVEYORDIR%%/admin/spss.php
 %%PHPSURVEYORDIR%%/admin/statistics.php
-%%PHPSURVEYORDIR%%/admin/summary.txt
-%%PHPSURVEYORDIR%%/admin/templates.html
 %%PHPSURVEYORDIR%%/admin/templates.php
 %%PHPSURVEYORDIR%%/admin/tokens.php
 %%PHPSURVEYORDIR%%/admin/usercontrol.php
+%%PHPSURVEYORDIR%%/admin/vvexport.php
+%%PHPSURVEYORDIR%%/admin/vvimport.php
 %%PHPSURVEYORDIR%%/chart.jpg
+%%PHPSURVEYORDIR%%/classes/XPertMailer/CHANGELOG
+%%PHPSURVEYORDIR%%/classes/XPertMailer/DOCUMENTATION
+%%PHPSURVEYORDIR%%/classes/XPertMailer/HOWTO
+%%PHPSURVEYORDIR%%/classes/XPertMailer/XPertMailer.php
+%%PHPSURVEYORDIR%%/classes/slider/handle.horizontal.png
+%%PHPSURVEYORDIR%%/classes/slider/handle.vertical.png
+%%PHPSURVEYORDIR%%/classes/slider/range.js
+%%PHPSURVEYORDIR%%/classes/slider/slider.js
+%%PHPSURVEYORDIR%%/classes/slider/slider/handle.horizontal.png
+%%PHPSURVEYORDIR%%/classes/slider/slider/handle.vertical.png
+%%PHPSURVEYORDIR%%/classes/slider/slider/range.js
+%%PHPSURVEYORDIR%%/classes/slider/slider/slider.js
+%%PHPSURVEYORDIR%%/classes/slider/slider/swing.css
+%%PHPSURVEYORDIR%%/classes/slider/slider/timer.js
+%%PHPSURVEYORDIR%%/classes/slider/swing.css
+%%PHPSURVEYORDIR%%/classes/slider/timer.js
+%%PHPSURVEYORDIR%%/common.php
+%%PHPSURVEYORDIR%%/config.php
+%%PHPSURVEYORDIR%%/cut.gif
+%%PHPSURVEYORDIR%%/docs/license.txt
+%%PHPSURVEYORDIR%%/docs/maketables.sql
+%%PHPSURVEYORDIR%%/docs/manual.html
+%%PHPSURVEYORDIR%%/docs/release_notes_and_upgrade_instructions.txt
+%%PHPSURVEYORDIR%%/docs/sample_survey.sql
+%%PHPSURVEYORDIR%%/docs/summary.txt
 %%PHPSURVEYORDIR%%/group.php
 %%PHPSURVEYORDIR%%/help.gif
 %%PHPSURVEYORDIR%%/index.php
-%%PHPSURVEYORDIR%%/lang/chinese.lang.php
+%%PHPSURVEYORDIR%%/lang/bulgarian.lang.php
+%%PHPSURVEYORDIR%%/lang/chinese-simplified.lang.php
+%%PHPSURVEYORDIR%%/lang/chinese-traditional.lang.php
+%%PHPSURVEYORDIR%%/lang/croatian.lang.php
 %%PHPSURVEYORDIR%%/lang/danish.lang.php
-%%PHPSURVEYORDIR%%/lang/deutsch.lang.php
+%%PHPSURVEYORDIR%%/lang/dutch.lang.php
 %%PHPSURVEYORDIR%%/lang/english.lang.php
 %%PHPSURVEYORDIR%%/lang/french.lang.php
+%%PHPSURVEYORDIR%%/lang/german-informal.lang.php
+%%PHPSURVEYORDIR%%/lang/german.lang.php
+%%PHPSURVEYORDIR%%/lang/greek.lang.php
 %%PHPSURVEYORDIR%%/lang/hungarian.lang.php
 %%PHPSURVEYORDIR%%/lang/italian.lang.php
-%%PHPSURVEYORDIR%%/lang/nederlands.lang.php
+%%PHPSURVEYORDIR%%/lang/japanese.lang.php
+%%PHPSURVEYORDIR%%/lang/lithuanian.lang.php
 %%PHPSURVEYORDIR%%/lang/norwegian.lang.php
-%%PHPSURVEYORDIR%%/lang/simplified-chinese.lang.php
+%%PHPSURVEYORDIR%%/lang/portuguese.lang.php
+%%PHPSURVEYORDIR%%/lang/romanian.lang.php
+%%PHPSURVEYORDIR%%/lang/russian.lang.php
 %%PHPSURVEYORDIR%%/lang/slovenian.lang.php
 %%PHPSURVEYORDIR%%/lang/spanish.lang.php
 %%PHPSURVEYORDIR%%/lang/swedish.lang.php
+%%PHPSURVEYORDIR%%/load.php
 %%PHPSURVEYORDIR%%/pkg-message
 %%PHPSURVEYORDIR%%/qanda.php
 %%PHPSURVEYORDIR%%/question.php
 %%PHPSURVEYORDIR%%/register.php
+%%PHPSURVEYORDIR%%/save.php
 %%PHPSURVEYORDIR%%/survey.php
+%%PHPSURVEYORDIR%%/templates/basic/assessment.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/chart.jpg
 %%PHPSURVEYORDIR%%/templates/basic/clearall.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/completed.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/endgroup.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/endpage.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/basic/load.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/logo.gif
 %%PHPSURVEYORDIR%%/templates/basic/navigator.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/privacy.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/question.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/readme.txt
 %%PHPSURVEYORDIR%%/templates/basic/register.pstpl
+%%PHPSURVEYORDIR%%/templates/basic/save.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/startgroup.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/startpage.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/submit.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/survey.pstpl
 %%PHPSURVEYORDIR%%/templates/basic/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/assessment.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/chart.jpg
+%%PHPSURVEYORDIR%%/templates/blue_heaven/clearall.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/completed.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/endgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/endpage.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/load.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/navigator.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/privacy.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/question.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/register.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/save.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/startgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/startpage.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/submit.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/survey.pstpl
+%%PHPSURVEYORDIR%%/templates/blue_heaven/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/assessment.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/chart.jpg
+%%PHPSURVEYORDIR%%/templates/bluengrey/clearall.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/completed.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/endgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/endpage.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/load.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/navigator.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/privacy.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/question.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/register.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/save.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/startgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/startpage.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/submit.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/survey.pstpl
+%%PHPSURVEYORDIR%%/templates/bluengrey/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/bubblegum/assessment.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/chart.jpg
 %%PHPSURVEYORDIR%%/templates/bubblegum/clearall.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/completed.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/endgroup.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/endpage.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/bubblegum/load.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/navigator.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/privacy.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/question.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/register.pstpl
+%%PHPSURVEYORDIR%%/templates/bubblegum/save.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/startgroup.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/startpage.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/submit.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/survey.pstpl
 %%PHPSURVEYORDIR%%/templates/bubblegum/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/assessment.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/chart.jpg
+%%PHPSURVEYORDIR%%/templates/business_grey/clearall.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/completed.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/endgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/endpage.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/load.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/navigator.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/privacy.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/question.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/register.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/save.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/startgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/startpage.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/submit.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/survey.pstpl
+%%PHPSURVEYORDIR%%/templates/business_grey/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/default/assessment.pstpl
 %%PHPSURVEYORDIR%%/templates/default/chart.jpg
 %%PHPSURVEYORDIR%%/templates/default/clearall.pstpl
 %%PHPSURVEYORDIR%%/templates/default/completed.pstpl
 %%PHPSURVEYORDIR%%/templates/default/endgroup.pstpl
 %%PHPSURVEYORDIR%%/templates/default/endpage.pstpl
 %%PHPSURVEYORDIR%%/templates/default/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/default/load.pstpl
 %%PHPSURVEYORDIR%%/templates/default/navigator.pstpl
 %%PHPSURVEYORDIR%%/templates/default/privacy.pstpl
 %%PHPSURVEYORDIR%%/templates/default/question.pstpl
 %%PHPSURVEYORDIR%%/templates/default/register.pstpl
+%%PHPSURVEYORDIR%%/templates/default/save.pstpl
 %%PHPSURVEYORDIR%%/templates/default/startgroup.pstpl
 %%PHPSURVEYORDIR%%/templates/default/startpage.pstpl
 %%PHPSURVEYORDIR%%/templates/default/submit.pstpl
 %%PHPSURVEYORDIR%%/templates/default/survey.pstpl
 %%PHPSURVEYORDIR%%/templates/default/welcome.pstpl
-%%PHPSURVEYORDIR%%/templates/edgyblue/Thumbs.db
+%%PHPSURVEYORDIR%%/templates/edgyblue/assessment.pstpl
 %%PHPSURVEYORDIR%%/templates/edgyblue/bot_bord.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/botleft_bord.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/botright_bord.gif
@@ -247,6 +430,7 @@
 %%PHPSURVEYORDIR%%/templates/edgyblue/head_topleft.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/head_topright.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/left_bord.gif
+%%PHPSURVEYORDIR%%/templates/edgyblue/load.pstpl
 %%PHPSURVEYORDIR%%/templates/edgyblue/navigator.pstpl
 %%PHPSURVEYORDIR%%/templates/edgyblue/orange2_bot.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/orange2_botleft.gif
@@ -268,6 +452,7 @@
 %%PHPSURVEYORDIR%%/templates/edgyblue/question.pstpl
 %%PHPSURVEYORDIR%%/templates/edgyblue/register.pstpl
 %%PHPSURVEYORDIR%%/templates/edgyblue/right_bord.gif
+%%PHPSURVEYORDIR%%/templates/edgyblue/save.pstpl
 %%PHPSURVEYORDIR%%/templates/edgyblue/single_bot.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/single_botleft.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/single_botright.gif
@@ -284,22 +469,108 @@
 %%PHPSURVEYORDIR%%/templates/edgyblue/topleft_bord.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/topright_bord.gif
 %%PHPSURVEYORDIR%%/templates/edgyblue/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/assessment.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/chart.jpg
+%%PHPSURVEYORDIR%%/templates/eirenicon/clearall.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/completed.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/endgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/endpage.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/load.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/navigator.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/privacy.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/question.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/readme.txt
+%%PHPSURVEYORDIR%%/templates/eirenicon/register.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/save.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/startgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/startpage.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/submit.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/survey.pstpl
+%%PHPSURVEYORDIR%%/templates/eirenicon/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/assessment.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/botcurve.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/botcurve2.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/chart.jpg
+%%PHPSURVEYORDIR%%/templates/softgreencurves/clearall.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/completed.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/contgrid.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/endgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/endpage.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/headleft.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/headright.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/load.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/navigator.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/privacy.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/question.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/register.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/save.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/smallgrid.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/smallgrid2.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/startgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/startpage.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/submit.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/survey.pstpl
+%%PHPSURVEYORDIR%%/templates/softgreencurves/topcurve.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/topcurve2.gif
+%%PHPSURVEYORDIR%%/templates/softgreencurves/welcome.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/assessment.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/chart.jpg
+%%PHPSURVEYORDIR%%/templates/vallendar/clearall.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/completed.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/endgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/endpage.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/groupdescription.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/load.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/logo.jpg
+%%PHPSURVEYORDIR%%/templates/vallendar/navigator.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/privacy.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/question.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/readme.txt
+%%PHPSURVEYORDIR%%/templates/vallendar/register.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/save.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/startgroup.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/startpage.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/submit.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/survey.pstpl
+%%PHPSURVEYORDIR%%/templates/vallendar/welcome.pstpl
 @dirrm %%PHPSURVEYORDIR%%/tmp
+@dirrm %%PHPSURVEYORDIR%%/templates/vallendar
+@dirrm %%PHPSURVEYORDIR%%/templates/softgreencurves
+@dirrm %%PHPSURVEYORDIR%%/templates/eirenicon
 @dirrm %%PHPSURVEYORDIR%%/templates/edgyblue
 @dirrm %%PHPSURVEYORDIR%%/templates/default
+@dirrm %%PHPSURVEYORDIR%%/templates/business_grey
 @dirrm %%PHPSURVEYORDIR%%/templates/bubblegum
+@dirrm %%PHPSURVEYORDIR%%/templates/bluengrey
+@dirrm %%PHPSURVEYORDIR%%/templates/blue_heaven
 @dirrm %%PHPSURVEYORDIR%%/templates/basic
 @dirrm %%PHPSURVEYORDIR%%/templates
 @dirrm %%PHPSURVEYORDIR%%/lang
+@dirrm %%PHPSURVEYORDIR%%/docs
+@dirrm %%PHPSURVEYORDIR%%/classes/slider/slider
+@dirrm %%PHPSURVEYORDIR%%/classes/slider
+@dirrm %%PHPSURVEYORDIR%%/classes/XPertMailer
+@dirrm %%PHPSURVEYORDIR%%/classes
+@dirrm %%PHPSURVEYORDIR%%/admin/lang/swedish
 @dirrm %%PHPSURVEYORDIR%%/admin/lang/spanish
-@dirrm %%PHPSURVEYORDIR%%/admin/lang/nederlands
+@dirrm %%PHPSURVEYORDIR%%/admin/lang/russian
+@dirrm %%PHPSURVEYORDIR%%/admin/lang/portuguese
 @dirrm %%PHPSURVEYORDIR%%/admin/lang/italian
+@dirrm %%PHPSURVEYORDIR%%/admin/lang/german
 @dirrm %%PHPSURVEYORDIR%%/admin/lang/french
 @dirrm %%PHPSURVEYORDIR%%/admin/lang/english
-@dirrm %%PHPSURVEYORDIR%%/admin/lang/deutsch
+@dirrm %%PHPSURVEYORDIR%%/admin/lang/dutch
 @dirrm %%PHPSURVEYORDIR%%/admin/lang/chinese
 @dirrm %%PHPSURVEYORDIR%%/admin/lang
 @dirrm %%PHPSURVEYORDIR%%/admin/images
+@dirrm %%PHPSURVEYORDIR%%/admin/classes/phpzip
+@dirrm %%PHPSURVEYORDIR%%/admin/classes/TreeMenu/TMimages
+@dirrm %%PHPSURVEYORDIR%%/admin/classes/TreeMenu
+@dirrm %%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer
+@dirrm %%PHPSURVEYORDIR%%/admin/classes/PEAR/Spreadsheet_Excel_Writer
+@dirrm %%PHPSURVEYORDIR%%/admin/classes/PEAR
 @dirrm %%PHPSURVEYORDIR%%/admin/classes
 @dirrm %%PHPSURVEYORDIR%%/admin
 @dirrm %%PHPSURVEYORDIR%%