From: hickert Date: Fri, 10 Dec 2010 14:12:13 +0000 (+0000) Subject: Applied patches from trunk X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1c3d06912a767fe17590969850a88eb4ec006545;p=gosa.git 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 413bd91f5..60a4e65be 100644 --- 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 85938910b..b3699d68b 100644 --- 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 6353908c3..b58b90137 100644 --- 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);