diff --git a/gosa-core/include/class_SnapshotHandler.inc b/gosa-core/include/class_SnapshotHandler.inc
index d371db5fcdd3d0b142a28ac27612722598b8abf1..bc912bdbadbaab693e25699bb899c6f9eee834fa 100644 (file)
var $isEnabled= false;
var $snapshotBases= array();
var $isEnabled= false;
var $snapshotBases= array();
-
/* Create handler */
function SnapshotHandler(&$config)
{
$this->config = &$config;
$config = $this->config;
/* Create handler */
function SnapshotHandler(&$config)
{
$this->config = &$config;
$config = $this->config;
- if($config->get_cfg_value("enableSnapshots") == "true"){
+ if($config->get_cfg_value("core","enableSnapshots") == "true"){
/* Check if the snapshot_base is defined */
/* Check if the snapshot_base is defined */
- if ($config->get_cfg_value("snapshotBase") == ""){
+ if ($config->get_cfg_value("core","snapshotBase") == ""){
/* Send message if not done already */
if(!session::is_set("snapshotFailMessageSend")){
session::set("snapshotFailMessageSend",TRUE);
msg_dialog::display(_("Configuration error"),
/* Send message if not done already */
if(!session::is_set("snapshotFailMessageSend")){
session::set("snapshotFailMessageSend",TRUE);
msg_dialog::display(_("Configuration error"),
- sprintf(_("The snapshot functionality is enabled, but the required variable '%s' is not set."),
- "snapshotBase"), ERROR_DIALOG);
+ sprintf(_("The snapshot functionality is enabled but the required variable %s is not set!"),
+ bold("snapshotBase")), ERROR_DIALOG);
}
return;
}
}
return;
}
if(!session::is_set("snapshotFailMessageSend")){
session::set("snapshotFailMessageSend",TRUE);
msg_dialog::display(_("Configuration error"),
if(!session::is_set("snapshotFailMessageSend")){
session::set("snapshotFailMessageSend",TRUE);
msg_dialog::display(_("Configuration error"),
- sprintf(_("The snapshot functionality is enabled, but the required compression module is missing. Please install '%s'."),"php5-zip / php5-gzip"), ERROR_DIALOG);
+ sprintf(_("The snapshot functionality is enabled but the required PHP compression module is missing: %s!"), bold("php5-zip / php5-gzip")), ERROR_DIALOG);
}
return;
}
/* check if there are special server configurations for snapshots */
}
return;
}
/* check if there are special server configurations for snapshots */
- if ($config->get_cfg_value("snapshotURI") != ""){
+ if ($config->get_cfg_value("core","snapshotURI") != ""){
/* check if all required vars are available to create a new ldap connection */
$missing = "";
foreach(array("snapshotURI","snapshotAdminDn","snapshotAdminPassword","snapshotBase") as $var){
/* check if all required vars are available to create a new ldap connection */
$missing = "";
foreach(array("snapshotURI","snapshotAdminDn","snapshotAdminPassword","snapshotBase") as $var){
- if($config->get_cfg_value($var) == ""){
+ if($config->get_cfg_value("core",$var) == ""){
$missing .= $var." ";
/* Send message if not done already */
if(!session::is_set("snapshotFailMessageSend")){
session::set("snapshotFailMessageSend",TRUE);
msg_dialog::display(_("Configuration error"),
$missing .= $var." ";
/* Send message if not done already */
if(!session::is_set("snapshotFailMessageSend")){
session::set("snapshotFailMessageSend",TRUE);
msg_dialog::display(_("Configuration error"),
- sprintf(_("The snapshot functionality is enabled, but the required variable '%s' is not set."),
- $missing), ERROR_DIALOG);
+ sprintf(_("The snapshot functionality is enabled but the required variable %s is not set!"),
+ bold($missing)), ERROR_DIALOG);
}
return;
}
}
return;
}
$snapshotLdap= null;
/* check if there are special server configurations for snapshots */
$snapshotLdap= null;
/* check if there are special server configurations for snapshots */
- if($this->config->get_cfg_value("snapshotURI") != ""){
- $server= $this->config->get_cfg_value("snapshotURI");
- $user= $this->config->get_cfg_value("snapshotAdminDn");
- $password= $this->config->get_credentials($this->config->get_cfg_value("snapshotAdminPassword"));
+ if($this->config->get_cfg_value("core","snapshotURI") != ""){
+ $server= $this->config->get_cfg_value("core","snapshotURI");
+ $user= $this->config->get_cfg_value("core","snapshotAdminDn");
+ $password= $this->config->get_credentials($this->config->get_cfg_value("core","snapshotAdminPassword"));
$snapshotLdap= new ldapMultiplexer(new LDAP($user,$password, $server));
}
/* Prepare bases */
$snapshotLdap= new ldapMultiplexer(new LDAP($user,$password, $server));
}
/* Prepare bases */
- $this->snapshotLdapBase= $this->config->get_cfg_value("snapshotBase");
+ $this->snapshotLdapBase= $this->config->get_cfg_value("core","snapshotBase");
$snapshotLdap->cd($this->snapshotLdapBase);
if (!$snapshotLdap->success()){
msg_dialog::display(_("LDAP error"), msgPool::ldaperror($snapshotLdap->get_error(), $this->snapshotLdapBase, "", get_class()));
$snapshotLdap->cd($this->snapshotLdapBase);
if (!$snapshotLdap->success()){
msg_dialog::display(_("LDAP error"), msgPool::ldaperror($snapshotLdap->get_error(), $this->snapshotLdapBase, "", get_class()));
$ldap->cd($this->config->current['BASE']);
/* check if there are special server configurations for snapshots */
$ldap->cd($this->config->current['BASE']);
/* check if there are special server configurations for snapshots */
- if($config->get_cfg_value("snapshotURI") == ""){
+ if($config->get_cfg_value("core","snapshotURI") == ""){
/* Source and destination server are both the same, just copy source to dest obj */
$ldap_to = $ldap;
$snapldapbase = $this->config->current['BASE'];
}else{
/* Source and destination server are both the same, just copy source to dest obj */
$ldap_to = $ldap;
$snapldapbase = $this->config->current['BASE'];
}else{
- $server = $config->get_cfg_value("snapshotURI");
- $user = $config->get_cfg_value("snapshotAdminDn");
- $password = $this->config->get_credentials($config->get_cfg_value("snapshotAdminPassword"));
- $snapldapbase = $config->get_cfg_value("snapshotBase");
+ $server = $config->get_cfg_value("core","snapshotURI");
+ $user = $config->get_cfg_value("core","snapshotAdminDn");
+ $password = $this->config->get_credentials($config->get_cfg_value("core","snapshotAdminPassword"));
+ $snapldapbase = $config->get_cfg_value("core","snapshotBase");
$ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server));
$ldap_to -> cd($snapldapbase);
$ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server));
$ldap_to -> cd($snapldapbase);
/* Collect some infos */
$base = $this->config->current['BASE'];
/* Collect some infos */
$base = $this->config->current['BASE'];
- $snap_base = $config->get_cfg_value("snapshotBase");
+ $snap_base = $config->get_cfg_value("core","snapshotBase");
$base_of_object = preg_replace ('/^[^,]+,/i', '', $dn);
$new_base = preg_replace("/".preg_quote($base, '/')."$/","",$base_of_object).$snap_base;
/* Create object */
$base_of_object = preg_replace ('/^[^,]+,/i', '', $dn);
$new_base = preg_replace("/".preg_quote($base, '/')."$/","",$base_of_object).$snap_base;
/* Create object */
-#$data = preg_replace('/^dn:.*\n/', '', $ldap->gen_ldif($dn,"(!(objectClass=gosaDepartment))"));
- $data = $ldap->gen_ldif($dn,"(&(!(objectClass=gosaDepartment))(!(objectClass=FAIclass)))");
+ $data = $ldap->generateLdif(LDAP::fix($dn),
+ "(&(!(objectClass=gosaDepartment))(!(objectClass=FAIclass)))",array(),'base');
+
$newName = str_replace(".", "", $sec."-".$usec);
$target= array();
$target['objectClass'] = array("top", "gosaSnapshotObject");
$newName = str_replace(".", "", $sec."-".$usec);
$target= array();
$target['objectClass'] = array("top", "gosaSnapshotObject");
function remove_snapshot($dn)
{
$ui = get_userinfo();
function remove_snapshot($dn)
{
$ui = get_userinfo();
- $old_dn = $this->dn;
- $this->dn = $dn;
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
- $ldap->rmdir_recursive($this->dn);
+ $ldap->rmdir_recursive($dn);
if(!$ldap->success()){
if(!$ldap->success()){
- msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn));
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $dn));
}
}
- $this->dn = $old_dn;
}
/* returns true if snapshots are enabled, and false if it is disalbed
There will also be some errors psoted, if the configuration failed */
}
/* returns true if snapshots are enabled, and false if it is disalbed
There will also be some errors psoted, if the configuration failed */
$cfg= &$this->config->current;
/* check if there are special server configurations for snapshots */
$cfg= &$this->config->current;
/* check if there are special server configurations for snapshots */
- if($this->config->get_cfg_value("snapshotURI") == ""){
+ if($this->config->get_cfg_value("core","snapshotURI") == ""){
$ldap_to = $ldap;
}else{
$ldap_to = $ldap;
}else{
- $server = $this->config->get_cfg_value("snapshotURI");
- $user = $this->config->get_cfg_value("snapshotAdminDn");
- $password = $this->config->get_credentials($this->config->get_cfg_value("snapshotAdminPassword"));
- $snapldapbase = $this->config->get_cfg_value("snapshotBase");
+ $server = $this->config->get_cfg_value("core","snapshotURI");
+ $user = $this->config->get_cfg_value("core","snapshotAdminDn");
+ $password = $this->config->get_credentials($this->config->get_cfg_value("core","snapshotAdminPassword"));
+ $snapldapbase = $this->config->get_cfg_value("core","snapshotBase");
$ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server));
$ldap_to -> cd($snapldapbase);
if (!$ldap_to->success()){
$ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server));
$ldap_to -> cd($snapldapbase);
if (!$ldap_to->success()){
}
/* Prepare bases and some other infos */
$base = $this->config->current['BASE'];
}
/* Prepare bases and some other infos */
$base = $this->config->current['BASE'];
- $snap_base = $this->config->get_cfg_value("snapshotBase");
+ $snap_base = $this->config->get_cfg_value("core","snapshotBase");
$base_of_object = preg_replace ('/^[^,]+,/i', '', $dn);
$new_base = preg_replace("/".preg_quote($base, '/')."$/","",$base_of_object).$snap_base;
$tmp = array();
$base_of_object = preg_replace ('/^[^,]+,/i', '', $dn);
$new_base = preg_replace("/".preg_quote($base, '/')."$/","",$base_of_object).$snap_base;
$tmp = array();
$cfg= &$this->config->current;
/* check if there are special server configurations for snapshots */
$cfg= &$this->config->current;
/* check if there are special server configurations for snapshots */
- if($this->config->get_cfg_value("snapshotURI") == ""){
+ if($this->config->get_cfg_value("core","snapshotURI") == ""){
$ldap_to = $ldap;
}else{
$ldap_to = $ldap;
}else{
- $server = $this->config->get_cfg_value("snapshotURI");
- $user = $this->config->get_cfg_value("snapshotAdminDn");
- $password = $this->config->get_credentials($this->config->get_cfg_value("snapshotAdminPassword"));
- $snapldapbase = $this->config->get_cfg_value("snapshotBase");
+ $server = $this->config->get_cfg_value("core","snapshotURI");
+ $user = $this->config->get_cfg_value("core","snapshotAdminDn");
+ $password = $this->config->get_credentials($this->config->get_cfg_value("core","snapshotAdminPassword"));
+ $snapldapbase = $this->config->get_cfg_value("core","snapshotBase");
$ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server));
$ldap_to -> cd($snapldapbase);
if (!$ldap_to->success()){
$ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server));
$ldap_to -> cd($snapldapbase);
if (!$ldap_to->success()){
/* Prepare bases */
$base = $this->config->current['BASE'];
/* Prepare bases */
$base = $this->config->current['BASE'];
- $snap_base = $this->config->get_cfg_value("snapshotBase");
+ $snap_base = $this->config->get_cfg_value("core","snapshotBase");
$new_base = preg_replace("/".preg_quote($base, '/')."$/","",$base_of_object).$snap_base;
/* Fetch all objects and check if they do not exist anymore */
$ui = get_userinfo();
$new_base = preg_replace("/".preg_quote($base, '/')."$/","",$base_of_object).$snap_base;
/* Fetch all objects and check if they do not exist anymore */
$ui = get_userinfo();
$cfg= &$this->config->current;
/* check if there are special server configurations for snapshots */
$cfg= &$this->config->current;
/* check if there are special server configurations for snapshots */
- if($this->config->get_cfg_value("snapshotURI") == ""){
+ if($this->config->get_cfg_value("core","snapshotURI") == ""){
$ldap_to = $ldap;
}else{
$ldap_to = $ldap;
}else{
- $server = $this->config->get_cfg_value("snapshotURI");
- $user = $this->config->get_cfg_value("snapshotAdminDn");
- $password = $this->config->get_credentials($this->config->get_cfg_value("snapshotAdminPassword"));
- $snapldapbase = $this->config->get_cfg_value("snapshotBase");
+ $server = $this->config->get_cfg_value("core","snapshotURI");
+ $user = $this->config->get_cfg_value("core","snapshotAdminDn");
+ $password = $this->config->get_credentials($this->config->get_cfg_value("core","snapshotAdminPassword"));
+ $snapldapbase = $this->config->get_cfg_value("core","snapshotBase");
$ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server));
$ldap_to -> cd($snapldapbase);
if (!$ldap_to->success()){
$ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server));
$ldap_to -> cd($snapldapbase);
if (!$ldap_to->success()){