Implement patches from Stefan Baecker for german translation and ssl …

…for outcomes

admin/exportlib.php

@@ -69,6 +69,7 @@
 		if ($nonpriv) {
 			$query .= " AND userights>0";
 		}
+		$query .= " ORDER BY uniqueid";
 		$result = mysql_query($query) or die("Query failed : " . mysql_error());
 		while ($row = mysql_fetch_row($result)) {
 			if (!in_array($row[2],$rootlibs)) { //don't export children here
@@ -96,6 +97,7 @@ function getchildlibs($lib) {
 			if ($nonpriv) {
 				$query .= " AND userights>0";
 			}
+			$query .= " ORDER BY uniqueid";
 			$result = mysql_query($query) or die("Query failed : " . mysql_error());
 			if (mysql_num_rows($result)>0) {
 				while ($row = mysql_fetch_row($result)) {
@@ -191,6 +193,7 @@ function getchildlibs($lib) {
 		if ($nonpriv) {
 			$query .= " AND imas_questionset.userights>0";
 		}
+		$query .= " ORDER BY imas_questionset.uniqueid";
 		$result = mysql_query($query) or die("Query failed : $query" . mysql_error());
 		while ($line = mysql_fetch_array($result, MYSQL_ASSOC)) {
 			$line['control'] = preg_replace('/includecodefrom\((\d+)\)/e','"includecodefrom(UID".$includedbackref["\\1"].")"',$line['control']);

forms.php

@@ -31,7 +31,7 @@
 		echo "<span class=form><label for=\"SID\">$longloginprompt:</label></span> <input class=\"form\" type=\"text\" size=12 id=SID name=SID><BR class=\"form\">\n";
 		echo "<span class=\"form\"><label for=\"pw1\">Choose a password:</label></span><input class=\"form\" type=\"password\" size=20 id=pw1 name=pw1><BR class=\"form\">\n";
 		echo "<span class=\"form\"><label for=\"pw2\">Confirm password:</label></span> <input class=\"form\" type=\"password\" size=20 id=pw2 name=pw2><BR class=\"form\">\n";
-		echo "<span class=\"form\"><label for=\"firstname\">Enter First Name:</label></span> <input class=\"form\" type=\"text\" size=20 id=firstnam name=firstname><BR class=\"form\">\n";
+		echo "<span class=\"form\"><label for=\"firstname\">Enter First Name:</label></span> <input class=\"form\" type=\"text\" size=20 id=firstname name=firstname><BR class=\"form\">\n";
 		echo "<span class=\"form\"><label for=\"lastname\">Enter Last Name:</label></span> <input class=\"form\" type=\"text\" size=20 id=lastname name=lastname><BR class=\"form\">\n";
 		echo "<span class=\"form\"><label for=\"email\">Enter E-mail address:</label></span>  <input class=\"form\" type=\"text\" size=60 id=email name=email><BR class=\"form\">\n";
 		echo "<span class=form><label for=\"msgnot\">Notify me by email when I receive a new message:</label></span><span class=formright><input type=checkbox id=msgnot name=msgnot checked=\"checked\" /></span><BR class=form>\n";

i18n/de.po

@@ -2507,7 +2507,7 @@ msgstr "Beliebig viele Versuche"
 
 #: assessment/testutil.php:623
 msgid "Unlimited attempts."
-msgstr "Beliebig viele Versuche.s"
+msgstr "Beliebig viele Versuche."
 
 #: course/gradebook.php:490 course/gradebook.php:538 course/gradebook.php:605
 msgid "Unlock headers"

includes/ltioutcomes.php

@@ -82,7 +82,7 @@ function post_socket_xml($endpoint, $data, $moreheaders=false) {
   // echo("\n"); echo($headers); echo("\n");
     // echo("PORT=".$url['port']);
     try {
-      $fp = fsockopen($url['host'], $url['port'], $errno, $errstr, 30);
+      $fp = fsockopen((($url['scheme'] == 'https') ? 'ssl://':'').$url['host'], $url['port'], $errno, $errstr, 30);
       if($fp) {
         fputs($fp, $headers);
         $result = '';