Merge "Bug 1792638: Problem with ldap sync temp table"

htdocs/auth/ldap/lib.php

@@ -974,7 +974,7 @@ class AuthLdap extends Auth {
                             $todb->$dbfield = $ldaprec[$ldapfield][0];
                         }
                         else {
-                            log_warn("Ldap record contained no {$ldapfield} field to map to DB {$dbfield}");
+                            log_warn("Ldap record for {$todb->$columnname} contained no {$ldapfield} field to map to DB {$dbfield}", true, false);
                         }
                     }
 
@@ -1105,7 +1105,7 @@ class AuthLdap extends Auth {
 
         // Create a temp table to store the users, for better performance
         $temptable = new XMLDBTable('auth_ldap_extusers_temp');
-        $temptable->addFieldInfo('extusername', XMLDB_TYPE_CHAR, 64, null, false);
+        $temptable->addFieldInfo('extusername', XMLDB_TYPE_CHAR, 64, null, XMLDB_NOTNULL);
         $temptable->addFieldInfo('firstname', XMLDB_TYPE_TEXT);
         $temptable->addFieldInfo('lastname', XMLDB_TYPE_TEXT);
         $temptable->addFieldInfo('email', XMLDB_TYPE_CHAR, 255);

htdocs/lib/web.php

@@ -2141,9 +2141,12 @@ function set_cookie($name, $value='', $expires=0, $access=false) {
     if (!$domain = get_config('cookiedomain')) {
         $domain = $url['host'];
     }
-    setcookie($name, $value, $expires, $url['path'], $domain, is_https(), true);
-    if ($access) {  // View access cookies may be needed on this request
-        $_COOKIE[$name] = $value;
+    // If no headers are sent - to avoid CLI scripts calling logout() problems
+    if (!headers_sent()) {
+        setcookie($name, $value, $expires, $url['path'], $domain, is_https(), true);
+        if ($access) {  // View access cookies may be needed on this request
+            $_COOKIE[$name] = $value;
+        }
     }
 }