diff --git a/admin/exportlib.php b/admin/exportlib.php index d77c1cb498..5ec45e9171 100644 --- a/admin/exportlib.php +++ b/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']); diff --git a/forms.php b/forms.php index 5f8d1ef08c..0198d47414 100644 --- a/forms.php +++ b/forms.php @@ -31,7 +31,7 @@ echo "
\n"; echo "
\n"; echo "
\n"; - echo "
\n"; + echo "
\n"; echo "
\n"; echo "
\n"; echo "
\n"; diff --git a/i18n/de.po b/i18n/de.po index 73f29eea26..b814a06664 100644 --- a/i18n/de.po +++ b/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" diff --git a/includes/ltioutcomes.php b/includes/ltioutcomes.php index 7ad8eb8186..10aedd77c7 100644 --- a/includes/ltioutcomes.php +++ b/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 = '';