From: hickert Date: Thu, 8 Feb 2007 11:37:00 +0000 (+0000) Subject: Updated setup X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=abccdff98c2451015c9351c0e37483c71d275b15;p=gosa.git Updated setup git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5707 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/html/themes/default/style.css b/html/themes/default/style.css index 6f6b88c3d..9a3cba5e0 100644 --- a/html/themes/default/style.css +++ b/html/themes/default/style.css @@ -788,7 +788,6 @@ body.setup_body { background-image: none; background-color: #979797; margin: 10px; - min-width:920px; } /* The setup complete setup dialog */ @@ -796,6 +795,10 @@ div.setup_dialog { background-color: #F0F0F0; border-right: solid 2px #444444; border-bottom: solid 2px #666666; + border-top: solid 1px #666; + border-left: solid 1px #666; + text-align: left; + width:980px; } /* Header col */ @@ -966,13 +969,13 @@ h2.step2_container_title { /* Container for name and status */ div.step2_entry_container { - width:300px; + width:350px; cursor:default; } /* Container for name and status, when status is failed */ div.step2_entry_container_info { - width:300px; + width:350px; background: #DDDDFF; cursor:default; } @@ -1020,3 +1023,38 @@ div.step2_warning_text{ background-repeat: no-repeat; padding-left: 35px; } + + +/* + Setup step 4 styles +*/ + +div.step4_name { + vertical-align: middle; + float:left; + overflow: hidden; + width:200px; + height:2.0em; +} + +div.step4_value { + float:left; + width:200px; + overflow: hidden; + vertical-align: middle; + height:2.0em; +} + +div.step4_status { + text-align:right; + vertical-align: middle; + overflow: hidden; + height:2.0em; +} + + +div.step4_container { + border: solid 1px #CCC; + width:500px; + height:2.0em; +} diff --git a/setup/class_setupStep.inc b/setup/class_setupStep.inc index 52cfbdc79..a873094e3 100644 --- a/setup/class_setupStep.inc +++ b/setup/class_setupStep.inc @@ -31,6 +31,11 @@ class setup_step extends plugin var $attributes = array(); + function save_object() + { + /* Do not call plugin::save_object. This causes acl trouble */ + } + function get_title() { return($this->s_title); diff --git a/setup/class_setupStep3.inc b/setup/class_setupStep3.inc index 18550e454..814770647 100644 --- a/setup/class_setupStep3.inc +++ b/setup/class_setupStep3.inc @@ -46,8 +46,9 @@ class setup_step_3 extends setup_step function execute() { $smarty = get_smarty(); - $smarty -> assign("License",$this->License); + $smarty -> assign("License",nl2br($this->License)); $smarty -> assign("license_found",$this->license_found); + $this->is_completed = true; return($smarty -> fetch (get_template_path("../setup/setup_step3.tpl"))); } diff --git a/setup/class_setupStep4.inc b/setup/class_setupStep4.inc index 860aedb0d..720686fe8 100644 --- a/setup/class_setupStep4.inc +++ b/setup/class_setupStep4.inc @@ -22,17 +22,76 @@ class setup_step_4 extends setup_step { + var $connection = "ldap://localhost:389"; + var $location = "default"; + var $admin = ""; + var $password = ""; + var $base = ""; + var $peopleou = "ou=people,"; + var $peopledn = "cn"; + var $groupou = "ou=groups,"; + var $uidbase = 1000; + var $encryption = "crypt"; + var $mail = "kolab"; + var $errors = TRUE; + + var $crypt_methods = array(); + var $mail_methods = array(); + + var $attributes = array("connection","location","admin","password","base","peopleou","peopledn","groupou", + "uidbase","encryption","mail","errors"); function setup_step_4() { + $this->s_title = _("Ldap settings"); + $this->s_title_long = _("Ldap connection setup"); + $this->s_info = _("This dialog allows the basic configuration of GOsa's behaviour and properties in your main configuration."); + $tmp = @passwordMethod::get_available_methods_if_not_loaded(); + $this->crypt_methods = $tmp['name']; + $tmp = $this->get_available_mail_classes(); + $this->mail_methods = $tmp['name']; } function execute() { - return("plug1"); + $smarty = get_smarty(); + + foreach($this->attributes as $attr){ + $smarty->assign($attr,$this->$attr); + } + + $smarty->assign("peopledns",array("uid","cn")); + $smarty->assign("crypt_methods",$this->crypt_methods); + $smarty->assign("mail_methods",$this->mail_methods); + + return($smarty -> fetch (get_template_path("../setup/setup_step4.tpl"))); + } + /* Returns the classnames auf the mail classes */ + function get_available_mail_classes() + { + $dir = opendir( "../include"); + $methods = array(); + $suffix = "class_mail-methods-"; + $lensuf = strlen($suffix); + $prefix = ".inc"; + $lenpre = strlen($prefix); + $i = 0; + while (($file = readdir($dir)) !== false){ + + if(stristr($file,$suffix)) { + $lenfile = strlen($file); + $methods['name'][$i] = substr($file,$lensuf,($lenfile-$lensuf)-$lenpre); + $methods['file'][$i] = $file; + $methods[$i]['file'] = $file; + $methods[$i]['name'] = substr($file,$lensuf,($lenfile-$lensuf)-$lenpre); + $i++; + } + } + return($methods); + } } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/setup/setup_frame.tpl b/setup/setup_frame.tpl index d03c9baa3..5d893ab5c 100644 --- a/setup/setup_frame.tpl +++ b/setup/setup_frame.tpl @@ -1,4 +1,5 @@ +
{$php_errors}
@@ -31,6 +32,6 @@
-
+
diff --git a/setup/setup_step2.tpl b/setup/setup_step2.tpl index 6a09c2480..833e0fb27 100644 --- a/setup/setup_step2.tpl +++ b/setup/setup_step2.tpl @@ -1,7 +1,7 @@ -
+
diff --git a/setup/setup_step3.tpl b/setup/setup_step3.tpl index 37e5b7e83..931b18772 100644 --- a/setup/setup_step3.tpl +++ b/setup/setup_step3.tpl @@ -1,3 +1,3 @@ -
+
{$License}
diff --git a/setup/setup_step4.tpl b/setup/setup_step4.tpl new file mode 100644 index 000000000..1d4cfb88a --- /dev/null +++ b/setup/setup_step4.tpl @@ -0,0 +1,159 @@ +

{t}ldap connection{/t}

+
+
+
{t}Connection url{/t}
+
+
+ +
+
+ sad +
+
+ +
+
+ {t}Location description{/t} +
+
+ +
+
+ asd +
+
+ +
+
+ {t}Admin DN{/t} +
+
+ +
+
+ asd +
+
+ +
+
+ {t}Admin password{/t} +
+
+ +
+
+ asd +
+
+ +
+
+ {t}Base{/t} +
+
+ +
+
+ asd +
+
+ +
+
+ {t}People storage ou{/t} +
+
+ +
+
+ asd +
+
+ +
+
+ {t}People dn attribute{/t} +
+
+ +
+
+ asd +
+
+ +
+
+ {t}Group storage ou{/t} +
+
+ +
+
+ asd +
+
+ +
+
+ {t}ID base for users/groups{/t} +
+
+ +
+
+ asd +
+
+ +
+
+ {t}Encryption algorithm{/t} +
+
+ +
+
+ asd +
+
+ +
+
+ {t}Mail method{/t} +
+
+ +
+
+ asd +
+
+ +
+
+ {t}Display PHP errors{/t} +
+
+ +
+
+ asd +
+
+