[Gemstracker-svn] SF.net SVN: gemstracker:[1027] trunk/library/classes

[<gem...@li...>]

Revision: 1027
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1027&view=rev
Author:   matijsdejong
Date:     2012-11-21 19:09:32 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
tokenanswerspersistence is now required in LimeSurvey surveys
Removed debugging code from DatabaseModelAbstract.php

Modified Paths:
--------------
    trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9Database.php
    trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php

Modified: trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9Database.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9Database.php	2012-11-21 16:03:11 UTC (rev 1026)
+++ trunk/library/classes/Gems/Tracker/Source/LimeSurvey1m9Database.php	2012-11-21 19:09:32 UTC (rev 1027)
@@ -380,7 +380,7 @@
 
             // SELECT sid, surveyls_title AS short_title, surveyls_description AS description, active, datestamp, ' . $this->_anonymizedField . '
             $select = $lsDb->select();
-            $select->from($this->_getSurveysTableName(), array('active', 'datestamp', $this->_anonymizedField))
+            $select->from($this->_getSurveysTableName(), array('active', 'datestamp', 'tokenanswerspersistence', $this->_anonymizedField))
                     ->joinInner(
                             $this->_getSurveyLanguagesTableName(),
                             'sid = surveyls_survey_id AND language = surveyls_language',
@@ -414,6 +414,11 @@
                 $surveyor_status .= 'Not date stamped. ';
             }
 
+            // DATESTAMP
+            if ($lsSurvey['tokenanswerspersistence'] == 'N') {
+                $surveyor_status .= 'Token-based persistence is disabled. ';
+            }
+
             // IS ACTIVE
             if ($lsSurvey['active'] == 'Y') {
                 $surveyor_active = true;

Modified: trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php
===================================================================
--- trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php	2012-11-21 16:03:11 UTC (rev 1026)
+++ trunk/library/classes/MUtil/Model/DatabaseModelAbstract.php	2012-11-21 19:09:32 UTC (rev 1027)
@@ -477,7 +477,7 @@
         // Check for actual values for this table to save.
         // MUtil_Echo::track($newValues);
         if ($returnValues = $this->_filterDataFor($table_name, $newValues, ! $update)) {
-            if (true || MUtil_Model::$verbose) {
+            if (MUtil_Model::$verbose) {
                 MUtil_Echo::r($returnValues, 'Return');
             }
             // MUtil_Echo::track($returnValues);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.