diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc
index 4b888535f708a2540b164e50f80fe295a2d2b9ba..84360939770a737ce0ad790f1d9d08abca7d9a89 100644 (file)
/* Root object classes */
var $rootOC_migrate_dialog = FALSE;
var $rootOC_details = array();
+ var $b_displayCheckbutton = TRUE;
function Step_Migrate()
{
$this->checks['permissions']['STATUS'] = FALSE;
$this->checks['permissions']['STATUS_MSG']= _("Failed");
$this->checks['permissions']['ERROR_MSG'] =
- sprintf(_("The specified user '%s' does not have full access to your ldap database."),$cv['admin']);
+ sprintf(_("The specified user '%s' does not have full access to your LDAP database."),$cv['admin']);
return(false);
}
$this->checks['permissions']['STATUS'] = FALSE;
$this->checks['permissions']['STATUS_MSG']= _("Failed");
$this->checks['permissions']['ERROR_MSG'] =
- sprintf(_("The specified user '%s' does not have full access to your ldap database."),$cv['admin']);
+ sprintf(_("The specified user '%s' does not have full access to your LDAP database."),$cv['admin']);
return(false);
}
/* Create & remove of dummy object was successful */
$this->checks['permissions']['STATUS'] = TRUE;
- $this->checks['permissions']['STATUS_MSG']= _("Ok");
+ $this->checks['permissions']['STATUS_MSG']= _("OK");
$this->checks['permissions']['ERROR_MSG'] = "";
return(true);
}
$this->checks['acls']['ERROR_MSG'] = _("Possibly the 'root object' is missing.");
}else{
$GOsa_26_found = false; // GOsa 2.6 Account found
- $GOsa_25_found = false; // GOsa 2.5 Account found, allow migration
$username = "";
$attrs = $ldap->fetch();
}
}
- /* Try to find an old GOsa 2.5 administrative account that may be migrated
- */
- if(!$GOsa_26_found){
- $valid_users = "";
- $valid_groups = "";
- $ldap->cd($cv['base']);
- $ldap->search("(&(objectClass=posixGroup)(gosaSubtreeACL=:all)(memberUid=*))",array("memberUid","cn"));
- while($p_group = $ldap->fetch()){
- $val_users = "";
- for($e = 0 ; $e < $p_group['memberUid']['count'] ; $e ++ ){
- $user = $p_group['memberUid'][$e];
- if(isset($rusers[$user])){
- $val_users .= $user.", ";
- }
- }
- if(!empty($val_users)){
- $valid_groups .= $groups[$p_group['dn']]."(<i>".trim($val_users,", ")."</i>), ";
- $GOsa_25_found = TRUE;
- }
- }
- }
-
-
- /* Print out results
- */
- if($GOsa_25_found){
- $str = "";
- if(!empty($valid_groups)){
- $str.= "<i>".sprintf(_("GOsa 2.5 administrative accounts found: %s"),trim($valid_groups,", "))."</i><br>";
- }
- $this->checks['acls']['STATUS'] = FALSE;
- $this->checks['acls']['STATUS_MSG']= _("Failed");
- $this->checks['acls']['ERROR_MSG'] = $str;
- $this->checks['acls']['ERROR_MSG'].= _("There is no valid GOsa 2.6 administrator account inside your LDAP.")." ";
- $this->checks['acls']['ERROR_MSG'].= "<input type='submit' name='migrate_acls' value='"._("Migrate")."'>";
- $this->checks['acls']['ERROR_MSG'].= "<input type='submit' name='create_acls' value='"._("Create")."'>";
- }elseif($GOsa_26_found){
+ if($GOsa_26_found){
$str = "";
if(!empty($valid_users)){
$str.= "<b>"._("Users")."</b>: ".trim($valid_users,", ")."<br>";
$str.= "<b>"._("Groups")."</b>: ".trim($valid_groups,", ")."<br>";
}
$this->checks['acls']['STATUS'] = TRUE;
- $this->checks['acls']['STATUS_MSG']= _("Ok");
+ $this->checks['acls']['STATUS_MSG']= _("OK");
$this->checks['acls']['ERROR_MSG'] = $str;
}else{
$this->checks['acls']['STATUS'] = FALSE;
$this->checks['acls']['STATUS_MSG']= _("Failed");
$this->checks['acls']['ERROR_MSG']= _("There is no GOsa administrator account inside your LDAP.")." ";
- $this->checks['acls']['ERROR_MSG'].= "<input type='submit' name='create_acls' value='"._("Create")."'>";
+ $this->checks['acls']['ERROR_MSG'].= "<button type='submit' name='create_acls'>"._("Create")."</button>";
}
}
$ldap->cd($cv['base']);
$ldap->search("(uid=".$uid.")");
if($ldap->count()){
- msg_dialog::display(_("Input error"),msgPool::duplicated(_("Uid")), ERROR_DIALOG);
+ msg_dialog::display(_("Input error"),msgPool::duplicated(_("UID")), ERROR_DIALOG);
return false;
}
function execute()
{
/* Initialise checks if this is the first call */
- if(!$this->checks_initialised || isset($_POST['reload'])){
+ if(!$this->checks_initialised || isset($_POST['test'])){
$this->initialize_checks();
$this->checks_initialised = TRUE;
}
$this->checks['root']['STATUS'] = FALSE;
$this->checks['root']['STATUS_MSG']= _("Failed");
$this->checks['root']['ERROR_MSG'] = _("The LDAP root object is missing. It is required to use your LDAP service.").' ';
- $this->checks['root']['ERROR_MSG'].= "<input type='submit' name='retry_root_create' value='"._("Try to create root object")."'>";
+ $this->checks['root']['ERROR_MSG'].= "<button type='submit' name='retry_root_create'>"._("Try to create root object")."</button>";
return(FALSE);
}else{
$this->checks['root']['STATUS'] = FALSE;
$this->checks['root']['STATUS_MSG']= _("Failed");
$this->checks['root']['ERROR_MSG'] = _("Root object couldn't be created, you should try it on your own.");
- $this->checks['root']['ERROR_MSG'].= " <input type='submit' name='retry_root_create' value='"._("Try to create root object")."'>";
+ $this->checks['root']['ERROR_MSG'].= " <button type='submit' name='retry_root_create'>"._("Try to create root object")."</button>";
return($res);;
}
}
/* Create & remove of dummy object was successful */
$this->checks['root']['STATUS'] = TRUE;
- $this->checks['root']['STATUS_MSG']= _("Ok");
+ $this->checks['root']['STATUS_MSG']= _("OK");
}
*/
$this->checks['rootOC']['STATUS'] = FALSE;
$this->checks['rootOC']['STATUS_MSG']= _("Failed");
- $this->checks['rootOC']['ERROR_MSG'] = " <input type='submit'
- name='root_add_objectclasses' value='"._("Migrate")."'>";
+ $this->checks['rootOC']['ERROR_MSG'] = " <button type='submit'
+ name='root_add_objectclasses'>"._("Migrate")."</button>";
return(FALSE);
}else{
/* Create & remove of dummy object was successful */
$this->checks['rootOC']['STATUS'] = TRUE;
- $this->checks['rootOC']['STATUS_MSG']= _("Ok");
+ $this->checks['rootOC']['STATUS_MSG']= _("OK");
$this->checks['rootOC']['ERROR_MSG'] = "";
}