Applied patches from trunk

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.7@20537 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index 413bd91f58355e62b9adb3e838bba28e89a42e3e..60a4e65beb7f406ae4c0176f84346a9bd6c5da9b 100644 (file)
--- a/gosa-core/include/class_acl.inc
+++ b/gosa-core/include/class_acl.inc
@@ -252,7 +252,7 @@ class acl extends plugin
     $this->sectionList->setHeight("120px");
     $this->sectionList->setColspecs(array('200px','*'));
     $this->sectionList->setHeader(array(_("Section"),_("Description")));
-    $this->sectionList->setDefaultSortColumn(1);
+    $this->sectionList->setDefaultSortColumn(0);
     $this->sectionList->setAcl('rwcdm'); // All ACLs, we filter on our own here.
 
     $this->roleList = new sortableListing();

diff --git a/gosa-core/setup/class_setupStep_Checks.inc b/gosa-core/setup/class_setupStep_Checks.inc
index 85938910b00bf0a676ae7c1c2602f356fd740619..b3699d68b09bff84c8c7ee722c9aa6e0c7580190 100644 (file)
--- a/gosa-core/setup/class_setupStep_Checks.inc
+++ b/gosa-core/setup/class_setupStep_Checks.inc
@@ -86,6 +86,14 @@ class Step_Checks extends setup_step
     $M = TRUE;
     $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
 
+    /* Check for php5-curl support */
+    $N = msgPool::checkingFor("curl");
+    $D = _("GOsa requires this module to communicate with different types of servers and protocols.");
+    $S = msgPool::installPhpModule("php5-curl");
+    $R = is_callable("curl_init");
+    $M = TRUE;
+    $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
+
     /* Checing for iconv */
     $N = msgPool::checkingFor("inconv");
     $D = _("GOsa requires this module for the samba integration.");

diff --git a/gosa-core/setup/class_setupStep_Schema.inc b/gosa-core/setup/class_setupStep_Schema.inc
index 6353908c33d269ab427ac7c133b0a5d296d3e514..b58b9013705bc3c041af15b2153c0a4228efac2f 100644 (file)
--- a/gosa-core/setup/class_setupStep_Schema.inc
+++ b/gosa-core/setup/class_setupStep_Schema.inc
@@ -53,7 +53,7 @@ class Step_Schema extends setup_step
         // Detect Schema Info
         $ldap = new ldapMultiplexer($ldap_l);
         $ldap->cd($cv['base']);
-        $objectclasses = $ldap->get_objectclasses();
+        $objectclasses = $ldap->get_objectclasses(TRUE);
    
         // Check if we can find something
         $ldap->set_size_limit(1);