Merge branch 'master' into 192_dev

LimeSurvey · Jun 12, 2012 · 39a0c58 · 39a0c58
2 parents 98aec6c + 730e49e
commit 39a0c58
Show file tree

Hide file tree

Showing 19 changed files with 460 additions and 426 deletions.
diff --git a/admin/activate_functions.php b/admin/activate_functions.php
@@ -344,7 +344,11 @@ function activateSurvey($postsid,$surveyid, $scriptname='admin.php')
                 $createsurvey .= " X";
                 break;
             case "D":  //DATE
-                $createsurvey .= " D";
+                if ($databasetype=='odbc_mssql' || $databasetype=='odbtp' || $databasetype=='mssql_n' || $databasetype=='mssqlnative') {
+                    $createsurvey .= " T";
+                }
+                else
+                    $createsurvey .= " D";
                 break;
             case "5":  //5 Point Choice
             case "G":  //Gender

diff --git a/admin/admin.php b/admin/admin.php
@@ -266,7 +266,7 @@
     }
     elseif ($action == 'showlogicfile')
     {
-        if(bHasSurveyPermission($surveyid,'surveyactivation','read'))
+        if(bHasSurveyPermission($surveyid,'translations','read'))
         {
             $surveyid = sanitize_int($surveyid);
             $thissurvey  = getSurveyInfo($surveyid);

diff --git a/admin/assessments.php b/admin/assessments.php
@@ -171,10 +171,11 @@
 		$assessmentsoutput.= "<th>$head</th>\n";
 	}
 	$assessmentsoutput.= "<th>".$clang->gT("Title")."</th><th>".$clang->gT("Message")."</th>";
-	$assessmentsoutput.= "</tr></thead>\n<tbody>\n";
+	$assessmentsoutput.= "</tr></thead>\n";
 	$flipflop=true;
 	foreach($assessments as $assess) {
 		$flipflop=!$flipflop;
+		$assessmentsoutput.= "<tbody>\n";
 		if ($flipflop==true){$assessmentsoutput.= "<tr class='oddrow'>\n";}
 		else {$assessmentsoutput.= "<tr class='evenrow'>\n";}
 		$assessmentsoutput.= "<td>".$assess['id']."</td>\n";
@@ -226,32 +227,33 @@
 	    $assessmentsoutput.= "<br /><form method='post' class='form30' id='assessmentsform' name='assessmentsform' action='$scriptname?sid=$surveyid'><div class='header ui-widget-header'>\n";
 	    $assessmentsoutput.= "$actiontitle</div>\n";
 
-	    $assessmentsoutput.="<ul><li><label>".$clang->gT("Scope")."</label><input type='radio' id='radiototal' name='scope' value='T' ";
+	    $assessmentsoutput.="<ul>\n"
+	    ."<li><label>".$clang->gT("Scope")."</label><input type='radio' id='radiototal' name='scope' value='T' ";
 	    if (!isset($editdata) || $editdata['scope'] == "T") {$assessmentsoutput .= " checked='checked' ";}
 	    $assessmentsoutput.=" /><label for='radiototal'>".$clang->gT("Total")."</label>
                      <input type='radio' id='radiogroup' name='scope' value='G'";
 	    if (isset($editdata) && $editdata['scope'] == "G") {$assessmentsoutput .= " checked='checked' ";}
-	    $assessmentsoutput.="/><label for='radiogroup'>".$clang->gT("Group")."</label></li>";
-	    $assessmentsoutput.="<li><label for='gid'>".$clang->gT("Question group")."</label>$groupselect</li>"
+	    $assessmentsoutput.="/><label for='radiogroup'>".$clang->gT("Group")."</label></li>\n";
+	    $assessmentsoutput.="<li><label for='gid'>".$clang->gT("Question group")."</label>$groupselect</li>\n"
 	    ."<li><label for='minimum'>".$clang->gT("Minimum")."</label><input type='text' id='minimum' name='minimum' class='numbersonly'";
 	    if (isset($editdata)) {$assessmentsoutput .= " value='{$editdata['minimum']}' ";}
-	    $assessmentsoutput.="/></li>"
+	    $assessmentsoutput.="/></li>\n"
 	    ."<li><label for='maximum'>".$clang->gT("Maximum")."</label><input type='text' id='maximum' name='maximum' class='numbersonly'";
 	    if (isset($editdata)) {$assessmentsoutput .= " value='{$editdata['maximum']}' ";}
-	    $assessmentsoutput.="/></li>";
+	    $assessmentsoutput.="/></li>\n"
+	    ."</ul>";
 
 	    // start tabs
-	    $assessmentsoutput.= "<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n";
-	    $assessmentsoutput.='</table><div id="languagetabs">'
-	    .'<ul>';
+	    $assessmentsoutput.= "<div id=\"languagetabs\">"
+	    ."<ul>\n";
 	    foreach ($assessmentlangs as $assessmentlang)
 	    {
 		    $position=0;
 		    $assessmentsoutput .= '<li><a href="#tablang'.$assessmentlang.'"><span>'.getLanguageNameFromCode($assessmentlang, false);
 		    if ($assessmentlang==$baselang) {$assessmentsoutput .= ' ('.$clang->gT("Base language").')';}
-		    $assessmentsoutput .='</span></a></li>';
+		    $assessmentsoutput .="</span></a></li>\n";
 	    }
-	    $assessmentsoutput.= '</ul>';
+	    $assessmentsoutput.= "</ul>\n";
 	    foreach ($assessmentlangs as $assessmentlang)
 	    {
 		    $heading=''; $message='';
@@ -265,28 +267,29 @@
 			    $heading=htmlspecialchars($editdata['name'],ENT_QUOTES);
 			    $message=htmlspecialchars($editdata['message']);
 		    }
-		    $assessmentsoutput .= '<div id="tablang'.$assessmentlang.'">';
-		    $assessmentsoutput .= $clang->gT("Heading")."<br/>"
-		    ."<input type='text' name='name_$assessmentlang' size='80' value='$heading'/><br /><br />"
-		    .$clang->gT("Message")
-		    ."<textarea name='assessmentmessage_$assessmentlang' id='assessmentmessage_$assessmentlang' rows='10' cols='80'>$message</textarea >";
-
-		    $assessmentsoutput .='</div>';
+		    $assessmentsoutput .= "<div id=\"tablang".$assessmentlang."\">\n"
+			."\t<div class='settingrow'>\n"
+		    ."\t\t<span class=\"settingcaption\">".$clang->gT("Heading")."</span>\n"
+		    ."\t\t<span class=\"settingentry\"><input type='text' name='name_$assessmentlang' size='80' value='$heading'/></span>\n"
+			."\t</div>\n"
+			."\t<div class='settingrow'>\n"
+		    ."\t\t<span class=\"settingcaption\">".$clang->gT("Message")."</span>\n"
+		    ."\t\t<span class=\"settingentry\">\n\t\t\t<textarea name='assessmentmessage_$assessmentlang' id='assessmentmessage_$assessmentlang' rows='10' cols='80'>$message</textarea >\n";
+		    $assessmentsoutput.=getEditor("assessment-text","assessmentmessage_$assessmentlang", "[".$clang->gT("Message:", "js")."]",$surveyid,$gid,$qid,$action);
+			$assessmentsoutput .="</span>\n\t</div>\n"
+			."\t<div style='clear:both'></div>\n"
+			."</div>";
 	    }
 	    $assessmentsoutput .='</div>';
 
-
-	    $assessmentsoutput.= "<p><input type='submit' value='".$clang->gT("Save")."' />\n";
+	    $assessmentsoutput.= "<p>\n"
+	    ."<input type='submit' value='".$clang->gT("Save")."' />\n";
 	    if ($action == "assessmentedit") $assessmentsoutput.= "&nbsp;&nbsp;&nbsp;&nbsp;<input type='submit' value='".$clang->gT("Cancel")."' onclick=\"document.assessmentsform.action.value='assessments'\" />\n";
 	    $assessmentsoutput.= "<input type='hidden' name='sid' value='$surveyid' />\n"
 	    ."<input type='hidden' name='action' value='$actionvalue' />\n"
 	    ."<input type='hidden' name='id' value='$thisid' />\n"
-	    ."</div>\n"
+	    ."</p>\n"
 	    ."</form>\n";
-	    foreach ($assessmentlangs as $assessmentlang)
-	    {
-		    $assessmentsoutput.=getEditor("assessment-text","assessmentmessage_$assessmentlang", "[".$clang->gT("Message:", "js")."]",$surveyid,$gid,$qid,$action);
-	    }
     }
 }
 

diff --git a/admin/html.php b/admin/html.php
@@ -372,7 +372,7 @@
         }
 
         // QUALITY ASSURANCE BUTTON - SHOW LOGIC FILE
-        if(bHasSurveyPermission($surveyid,'surveyactivation','read'))
+        if(bHasSurveyPermission($surveyid,'translations','read'))
         {
             $icontext = $clang->gT("Survey  Logic File");
         }
@@ -982,7 +982,7 @@
         }
 
         // QUALITY ASSURANCE BUTTON - SHOW LOGIC FILE FOR THIS QUESTION GROUP
-        if(bHasSurveyPermission($surveyid,'surveyactivation','read'))
+        if(bHasSurveyPermission($surveyid,'translations','read'))
         {
             $groupsummary .= "<img src='$imageurl/seperator.gif' alt=''  />\n"
             . "<a href=\"#\" onclick=\"window.open('$scriptname?action=showlogicfile&amp;sid=$surveyid&amp;gid=$gid','_blank')\""
@@ -1217,7 +1217,7 @@
         }
 
         // QUALITY ASSURANCE BUTTON - SHOW LOGIC FILE FOR THIS QUESTION GROUP
-        if(bHasSurveyPermission($surveyid,'surveyactivation','read'))
+        if(bHasSurveyPermission($surveyid,'translations','read'))
         {
             $questionsummary .= "<img src='$imageurl/seperator.gif' alt=''  />\n"
             . "<a href=\"#\" onclick=\"window.open('$scriptname?action=showlogicfile&amp;sid=$surveyid&amp;gid=$gid&amp;qid=$qid','_blank')\""

diff --git a/admin/preview.php b/admin/preview.php
@@ -19,7 +19,6 @@
 
 include_once("login_check.php");
 require_once(dirname(__FILE__).'/sessioncontrol.php');
-require_once(dirname(__FILE__).'/../qanda.php');
 
 if (!isset($surveyid)) {$surveyid=returnglobal('sid');}
 if (!isset($qid)) {$qid=returnglobal('qid');}
@@ -41,6 +40,7 @@
 
 $thissurvey=getSurveyInfo($surveyid);
 $_SESSION['dateformats'] = getDateFormatData($thissurvey['surveyls_dateformat']);
+require_once(dirname(__FILE__).'/../qanda.php');
 
 $qquery = 'SELECT * FROM '.db_table_name('questions')." WHERE sid='$surveyid' AND qid='$qid' AND language='{$language}'";
 $qresult = db_execute_assoc($qquery);

diff --git a/admin/statistics_function.php b/admin/statistics_function.php
@@ -589,7 +589,7 @@ function generate_statistics($surveyid, $allfields, $q2show='all', $usegraph=0,
                 if ($total)
                 {
                     $percent=sprintf("%01.2f", ($results/$total)*100);
-                    $statisticsoutput .= "\t<tr><th align='right'>".$statlang->gT("Percentage of total:").'</th>'
+                    $statisticsoutput .= "\t<tr><th>".$statlang->gT("Percentage of total:").'</th>'
                     ."<td>$percent%</td></tr>\n";
                 }
                 $statisticsoutput .="</table>\n";

diff --git a/admin/styles/default/adminstyle.css b/admin/styles/default/adminstyle.css
@@ -390,6 +390,10 @@ span.settingcaption {
     color: #1D2D45;
 }
 
+#assessmentsform span.settingcaption {
+    width: 15%;
+}
+
 .settingentry {
     float: left;
     width: 660px;
@@ -402,6 +406,10 @@ span.settingcaption {
 	outline: 0 none;
 }
 
+#assessmentsform .settingentry {
+    width: 80%;
+}
+
 .settingentry span {
 	outline: 0 none;
 }
@@ -413,6 +421,10 @@ span.settingcaption {
     background-color: #F8F8FF;
 }
 
+#assessmentsform .settingrow {
+    width: 100%;
+}
+
 .settingrow .cke_skin_office2003,
 .settingrow .cke_skin_office2003 .cke_wrapper{
 	margin-bottom: 0;
@@ -699,6 +711,12 @@ a.optoutemail {
     margin:0 auto;
 }
 
+#assessmentsform #languagetabs {
+	min-width: 680px;
+    background-color: #F8F8FF;
+	background-image: none;
+}
+
 .answertable tr.highlight {
     background-color:#EAF2FF;
 }
@@ -1163,7 +1181,9 @@ textarea.updater-changelog {
     padding-bottom:5px;
 }
 
-
+#assessmentsform .ui-tabs-nav li {
+    clear: none;
+}
 
 #frmeditquestion li,
 #importquestion li {

diff --git a/index.php b/index.php
@@ -168,7 +168,7 @@
     {
         $list[]="<li class='surveytitle'>".$clang->gT("No available surveys")."</li>";
     }
-    
+
     if(!$surveyid)
     {
         $thissurvey['name']=$sitename;
@@ -1570,7 +1570,7 @@ function SendSubmitNotifications()
         $oMail = new PHPMailer;
         foreach ($aEmailNotificationTo as $sRecipient)
         {
-            if (!SendEmailMessage($oMail, $sMessage, $sSubject, $sRecipient, $sFrom, $sitename, $bIsHTML, getBounceEmail($surveyid)))
+            if (!SendEmailMessage($oMail, $sMessage, $sSubject, $sRecipient, $sFrom, $sitename, true, getBounceEmail($surveyid)))
             {
                 if ($debug>0)
                 {
@@ -1588,7 +1588,7 @@ function SendSubmitNotifications()
         $mail = new PHPMailer;
         foreach ($aEmailResponseTo as $sRecipient)
         {
-            if (!SendEmailMessage($mail,$sMessage, $sSubject, $sRecipient, $sFrom, $sitename, $bIsHTML, getBounceEmail($surveyid)))
+            if (!SendEmailMessage($mail,$sMessage, $sSubject, $sRecipient, $sFrom, $sitename, true, getBounceEmail($surveyid)))
             {
                 if ($debug>0)
                 {