From: cajus Date: Mon, 26 Apr 2010 08:38:12 +0000 (+0000) Subject: Moved to bold X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8773ce7598843d3216569e541f4ef32f74866234;p=gosa.git Moved to bold git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17830 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/include/class_CopyPasteHandler.inc b/gosa-core/include/class_CopyPasteHandler.inc index 4d6fb1ddb..2a9bea409 100644 --- a/gosa-core/include/class_CopyPasteHandler.inc +++ b/gosa-core/include/class_CopyPasteHandler.inc @@ -64,17 +64,17 @@ class CopyPasteHandler { function add_to_queue($dn,$action,$tab_class,$tab_object,$tab_acl_category,&$parent = NULL) { if(!class_available($tab_class)){ - trigger_error(sprintf("Specified class object '%s' does not exists.",$tab_class)); + trigger_error(sprintf("Specified class object %s does not exists.", bold($tab_class))); return(FALSE); } if(!isset($this->config->data['TABS'][$tab_object])){ - trigger_error(sprintf("Specified tab object '%s' does not exists.",$tab_object)); + trigger_error(sprintf("Specified tab object %s does not exists.", bold($tab_object))); return(FALSE); } if(!in_array($action,array("cut","copy"))){ - trigger_error(sprintf("Specified action '%s' does not exists for copy & paste.",$action)); + trigger_error(sprintf("Specified action %s does not exists for copy & paste.", bold($action))); return(FALSE); } @@ -115,7 +115,7 @@ class CopyPasteHandler { /* Update folder permissions */ if(!@chmod(LDAP_DUMP_PATH,0700)){ - $msg= sprintf(_("Copy and paste failed!")."

"._("Error").": "._("Cannot set permission for '%s'")."" ,LDAP_DUMP_PATH); + $msg= sprintf(_("Copy and paste failed!")."

"._("Error").": "._("Cannot set permission for %s"), bold(LDAP_DUMP_PATH)); msg_dialog::display(_("Configuration error"), $msg, ERROR_DIALOG); new log("copy","all/all","copy & paste, event queue.",array(), $msg); return(FALSE); @@ -156,7 +156,7 @@ class CopyPasteHandler { /* Check if given dn is valid and ldap search was succesfull */ if(!$res){ - $msg= sprintf(_("Copy and paste failed!")."

"._("Error").": "._("'%s' is no vaild LDAP object"), LDAP::fix($dn)); + $msg= sprintf(_("Copy and paste failed!")."

"._("Error").": "._("'%s' is no vaild LDAP object"), bold(LDAP::fix($dn))); msg_dialog::display(_("Internal error"), $msg, ERROR_DIALOG); new log("copy","all/all",$dn,array(), $msg); return(FALSE); @@ -173,7 +173,7 @@ class CopyPasteHandler { /* check if we are able to create a new file the given directory */ if(!is_writeable($path)){ - $msg= sprintf(_("Copy and paste failed!")."

"._("Error").": "._("No write permission in '%s'"),LDAP_DUMP_PATH); + $msg= sprintf(_("Copy and paste failed!")."

"._("Error").": "._("No write permission in '%s'"), bold(LDAP_DUMP_PATH)); msg_dialog::display(_("Configuration error"), $msg, ERROR_DIALOG); new log("copy","all/all",$dn,array(), $msg); return(FALSE); @@ -190,7 +190,7 @@ class CopyPasteHandler { /* Update folder permissions */ if(!@chmod($path."/".$filename,0700)){ - $msg= sprintf(_("Copy and paste failed!")."

"._("Error").": "._("Cannot set permission for '%s'"),LDAP_DUMP_PATH); + $msg= sprintf(_("Copy and paste failed!")."

"._("Error").": "._("Cannot set permission for '%s'"), bold(LDAP_DUMP_PATH)); msg_dialog::display(_("Configuration error"), $msg, ERROR_DIALOG); new log("copy","all/all","copy & paste, event queue.",array(), $msg); return(FALSE); @@ -415,7 +415,7 @@ class CopyPasteHandler { $smarty->assign("AttributesToFix",$this->generateAttributesToFix()); $smarty->assign("SubDialog",$this->current['object']->SubDialog); $smarty->assign("objectDN",$this->current['source_data']['dn']); - $smarty->assign("message", sprintf(_("This object will be pasted: %s"), "

".$this->current['source_data']['dn'])); + $smarty->assign("message", sprintf(_("This object will be pasted: %s"), "

".bold($this->current['source_data']['dn']))); return($smarty->fetch(get_template_path("copyPasteDialog.tpl",FALSE))); } } diff --git a/gosa-core/include/class_SnapShotDialog.inc b/gosa-core/include/class_SnapShotDialog.inc index 8ef45f59a..0c56e49bd 100644 --- a/gosa-core/include/class_SnapShotDialog.inc +++ b/gosa-core/include/class_SnapShotDialog.inc @@ -90,7 +90,7 @@ class SnapShotDialog extends plugin if($found){ $this->del_dn = $entry; $smarty= get_smarty(); - $smarty->assign("info", sprintf(_("You are about to delete the snapshot '%s'."), LDAP::fix($this->del_dn))); + $smarty->assign("info", sprintf(_("You are about to delete the snapshot %s."), bold(LDAP::fix($this->del_dn)))); return($smarty->fetch (get_template_path('removeEntries.tpl'))); } } diff --git a/gosa-core/include/class_SnapshotHandler.inc b/gosa-core/include/class_SnapshotHandler.inc index 7842e1b91..732b3d270 100644 --- a/gosa-core/include/class_SnapshotHandler.inc +++ b/gosa-core/include/class_SnapshotHandler.inc @@ -43,8 +43,8 @@ class SnapshotHandler { 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; } @@ -56,7 +56,7 @@ class SnapshotHandler { if(!session::is_set("snapshotFailMessageSend")){ session::set("snapshotFailMessageSend",TRUE); msg_dialog::display(_("Configuration error"), - sprintf(_("The snapshot functionality is enabled but the required PHP compression module is missing: %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; } @@ -74,8 +74,8 @@ class SnapshotHandler { 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; } diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc index 96a18940a..07e915256 100644 --- a/gosa-core/include/class_config.inc +++ b/gosa-core/include/class_config.inc @@ -150,8 +150,8 @@ class config { fclose($fh); if(!xml_parse($this->parser, chop($xmldata))){ $msg = sprintf(_("XML error in gosa.conf: %s at line %d"), - xml_error_string(xml_get_error_code($this->parser)), - xml_get_current_line_number($this->parser)); + bold(xml_error_string(xml_get_error_code($this->parser))), + bold(xml_get_current_line_number($this->parser))); msg_dialog::display(_("Configuration error"), $msg, FATAL_ERROR_DIALOG); exit; } @@ -1151,8 +1151,8 @@ class config { 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(FALSE); } @@ -1164,7 +1164,7 @@ class config { 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 compression module is missing. Please install %s."), bold("php5-zip / php5-gzip")), ERROR_DIALOG); } return(FALSE); } @@ -1182,8 +1182,8 @@ class config { 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(FALSE); } diff --git a/gosa-core/include/class_gosaSupportDaemon.inc b/gosa-core/include/class_gosaSupportDaemon.inc index 3a7d09ce4..bcb62fd9e 100644 --- a/gosa-core/include/class_gosaSupportDaemon.inc +++ b/gosa-core/include/class_gosaSupportDaemon.inc @@ -1181,7 +1181,7 @@ class gosaSupportDaemon $tmp->add_targets(array($mac)); $tmp->set_type(TRIGGERED_EVENT); if(!$this->append($tmp)){ - msg_dialog::display(_("Error"), sprintf(_("Cannot send abort event for entry %s!"),$entry['ID']) , ERROR_DIALOG); + msg_dialog::display(_("Error"), sprintf(_("Cannot send abort event for entry %s!"), bold($entry['ID'])) , ERROR_DIALOG); new log("debug","DaemonEvent ", "gosaSupportDaemon::clean_queue_from_mac()", array($mac => $mac), "FAILED, could not send 'DaemonEvent_faireboot' for entry ID (".$entry['ID'].") - ".$this->get_error()); }else{ @@ -1201,7 +1201,7 @@ class gosaSupportDaemon * Failed or waiting events, can be removed without any trouble. */ if(!$this->remove_entries(array($entry['ID']))){ - msg_dialog::display(_("Error"), sprintf(_("Cannot remove entry %s!"),$entry['ID']) , ERROR_DIALOG); + msg_dialog::display(_("Error"), sprintf(_("Cannot remove entry %s!"), bold($entry['ID'])) , ERROR_DIALOG); } ;break; } diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc index 3d6649cc7..75901c780 100644 --- a/gosa-core/include/class_ldap.inc +++ b/gosa-core/include/class_ldap.inc @@ -690,7 +690,7 @@ class LDAP{ /* Bail out, if we've nothing to do... */ if ($ocname == ""){ - msg_dialog::display(_("Internal error"), sprintf(_("Cannot automatically create subtrees with RDN '%s': no object class found"),$type), FATAL_ERROR_DIALOG); + msg_dialog::display(_("Internal error"), sprintf(_("Cannot automatically create subtrees with RDN %s: no object class found"), bold($type)), FATAL_ERROR_DIALOG); exit(); } @@ -741,7 +741,7 @@ class LDAP{ $na["dc"]= $param; break; default: - msg_dialog::display(_("Internal error"), sprintf(_("Cannot automatically create subtrees with RDN '%s': not supported"),$type), FATAL_ERROR_DIALOG); + msg_dialog::display(_("Internal error"), sprintf(_("Cannot automatically create subtrees with RDN %s: not supported"), bold($type)), FATAL_ERROR_DIALOG); exit(); } @@ -828,9 +828,9 @@ class LDAP{ } else { $adderror= $this->get_additional_error(); if ($adderror != ""){ - $error= $this->error." (".$this->get_additional_error().", ".sprintf(_("while operating on %s using LDAP server %s"), "".$this->basedn."", "".$this->hostname."").")"; + $error= $this->error." (".$this->get_additional_error().", ".sprintf(_("while operating on %s using LDAP server %s"), bold($this->basedn), bold($this->hostname)).")"; } else { - $error= $this->error." (".sprintf(_("while operating on LDAP server %s"), "".$this->hostname."").")"; + $error= $this->error." (".sprintf(_("while operating on LDAP server %s"), bold($this->hostname)).")"; } return $error; } @@ -1052,7 +1052,7 @@ class LDAP{ /* Every block must begin with a dn */ if($dn != "dn") { - $error= sprintf(_("Invalid DN '%s': block to be imported should start with 'dn: ...' in line %s"), $line, "".$current_line.""); + $error= sprintf(_("Invalid DN %s: block to be imported should start with 'dn: ...' in line %s"), bold($line), bold($current_line)); return -2; } @@ -1081,7 +1081,7 @@ class LDAP{ /* If we can't Import, return with a file error */ if(!$this->import_single_entry($srp, $single,$usemodify,$usermdir) ) { - $error= sprintf(_("Error while importing DN '%s': please check LDIF from line %s on!"), $line, + $error= sprintf(_("Error while importing DN %s: please check LDIF from line %s on!"), bold($line), $current_line); return UNKNOWN_TOKEN_IN_LDIF_FILE; } } diff --git a/gosa-core/include/class_log.inc b/gosa-core/include/class_log.inc index fad74e450..13a128a74 100644 --- a/gosa-core/include/class_log.inc +++ b/gosa-core/include/class_log.inc @@ -99,7 +99,7 @@ class log { $msgs = array(); if(!isset($entry['action']) || !in_array($entry['action'],array("modify","create","remove","copy","snapshot","view","security","debug"))){ - $msgs[] = sprintf(_("Invalid option '%s' specified!"), $entry['action']); + $msgs[] = sprintf(_("Invalid option %s specified!"), bold($entry['action'])); } if(!isset($entry['objecttype']) || empty($entry['objecttype'])){ diff --git a/gosa-core/include/class_management.inc b/gosa-core/include/class_management.inc index 6915a6e0d..4bfc64edf 100644 --- a/gosa-core/include/class_management.inc +++ b/gosa-core/include/class_management.inc @@ -457,7 +457,7 @@ class management $this->dialogObject->parent = &$this; }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to create a snapshot for %s!"),$entry), + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to create a snapshot for %s!"), bold($entry)), ERROR_DIALOG); } } @@ -504,7 +504,7 @@ class management @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$this->dn,"Snaptshot restored!"); $this->closeDialogs(); }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"),$entry), + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"), bold($entry)), ERROR_DIALOG); } } @@ -541,7 +541,7 @@ class management $this->dialogObject->display_restore_dialog = true; $this->dialogObject->parent = &$this; }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"),$entry), + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"), bold($entry)), ERROR_DIALOG); } }else{ @@ -555,7 +555,7 @@ class management $this->dialogObject->display_restore_dialog = true; $this->dialogObject->parent = &$this; }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"),$entry), + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"), bold($entry)), ERROR_DIALOG); } } @@ -614,7 +614,7 @@ class management $this->tabObject->parent = &$this; @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__,$this->dn,"Create new entry initiated!"); } else { - msg_dialog::display(_("Error"), sprintf(_("No tab definition for '%s' found in configuration file: cannot create plugin instance!"), $tabType), ERROR_DIALOG); + msg_dialog::display(_("Error"), sprintf(_("No tab definition for %s found in configuration file: cannot create plugin instance!"), bold($tabType)), ERROR_DIALOG); } } } @@ -996,7 +996,7 @@ class management function handle_post_events($mode, $addAttrs= array()) { if(!in_array($mode, array('add','remove','modify'))){ - trigger_error(sprintf("Invalid post event type given '%s'! Valid types are [add,modify,remove].", $mode)); + trigger_error(sprintf("Invalid post event type given %s! Valid types are [add,modify,remove].", bold($mode))); return; } switch ($mode){ diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc index 267e22c9e..6724418d5 100644 --- a/gosa-core/include/class_plugin.inc +++ b/gosa-core/include/class_plugin.inc @@ -913,7 +913,7 @@ class plugin $ldap->cd($entry['dn']); $ldap->modify($update); if(!$ldap->success()){ - trigger_error(sprintf("Failed to update manager for '%s', error was '%s'", $entry['dn'], $ldap->get_error())); + trigger_error(sprintf("Failed to update manager for %s: %s", bold($entry['dn']), $ldap->get_error())); } } @@ -1430,7 +1430,7 @@ class plugin if(!empty($entry) && $ui->allow_snapshot_create($entry,$this->parent->acl_module)){ $this->snapDialog = new SnapShotDialog($this->config,$entry,$this); }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to create a snapshot for %s!"),$entry),ERROR_DIALOG); + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to create a snapshot for %s!"), bold($entry)),ERROR_DIALOG); } } @@ -1442,7 +1442,7 @@ class plugin $this->snapDialog = new SnapShotDialog($this->config,$entry,$this); $this->snapDialog->display_restore_dialog = true; }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"),$entry),ERROR_DIALOG); + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"), bold($entry)),ERROR_DIALOG); } } @@ -1457,7 +1457,7 @@ class plugin $this->snapDialog->display_restore_dialog = true; $this->snapDialog->display_all_removed_objects = true; }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"),$base),ERROR_DIALOG); + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"), bold($base)),ERROR_DIALOG); } } @@ -1470,7 +1470,7 @@ class plugin $this->restore_snapshot($entry); $this->snapDialog = NULL; }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"),$entry),ERROR_DIALOG); + msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s!"), bold($entry)),ERROR_DIALOG); } } } @@ -1686,7 +1686,7 @@ class plugin /* Acls for this object must be adjusted */ if($found){ - $debug_info= sprintf(_("Changing ACL DN from %s to %s"), "".$old_dn."", "".$new_dn.""); + $debug_info= sprintf(_("Changing ACL DN from %s to %s"), bold($old_dn), bold($new_dn)); @DEBUG (DEBUG_ACL, __LINE__, __FUNCTION__, __FILE__,$debug_info,"ACL"); $update[$attrs['dn']] =array(); @@ -1994,7 +1994,7 @@ class plugin function handle_post_events($mode, $addAttrs= array()) { if(!in_array($mode, array('add','remove','modify'))){ - trigger_error(sprintf("Invalid post event type given '%s'! Valid types are [add,modify,remove].", $mode)); + trigger_error(sprintf("Invalid post event type given %s! Valid types are [add,modify,remove].", bold($mode))); return; } switch ($mode){ diff --git a/gosa-core/include/class_socketClient.inc b/gosa-core/include/class_socketClient.inc index 90e2a6ced..fa3e488d9 100644 --- a/gosa-core/include/class_socketClient.inc +++ b/gosa-core/include/class_socketClient.inc @@ -105,7 +105,7 @@ class Socket_Client $this->handle = @fsockopen($this->host, $this->port, $this->errno, $this->errstr, $this->timeout); if(!$this->handle){ $this->handle = NULL; - $this->set_error(sprintf(_("Socket connection to '%s:%s' failed: %s"),$this->host,$this->port,$this->errstr)); + $this->set_error(sprintf(_("Socket connection to %s:%s failed: %s"), bold($this->host), bold($this->port), $this->errstr)); }else{ $this->b_data_send = TRUE; @@ -188,7 +188,7 @@ class Socket_Client } } if((microtime(TRUE) - $start) > $this->timeout ){ - $this->set_error(sprintf(_("Socket timeout of %s seconds reached!"),$this->timeout)); + $this->set_error(sprintf(_("Socket timeout of %s seconds reached!"), bold($this->timeout))); break; } } diff --git a/gosa-core/include/class_tabs.inc b/gosa-core/include/class_tabs.inc index ac772eeef..6d1b5e871 100644 --- a/gosa-core/include/class_tabs.inc +++ b/gosa-core/include/class_tabs.inc @@ -54,7 +54,7 @@ class tabs if(!count($data)) { $data[] = array("CLASS" => 'plugin',"NAME" => 'Error'); msg_dialog::display(_("Error"), - sprintf(_("No plugin definition for '%s' found: please check the configuration file!"),get_class($this)), + sprintf(_("No plugin definition for %s found: please check the configuration file!"), bold(get_class($this))), "ERROR_DIALOG"); } @@ -63,7 +63,7 @@ class tabs foreach ($data as &$tab){ if (!plugin_available($tab['CLASS'])){ - trigger_error(sprintf("Unknown class '%s'!", $tab['CLASS'])); + trigger_error(sprintf("Unknown class %s!", bold($tab['CLASS']))); continue; } if ($this->current == "") $this->current= $tab['CLASS']; @@ -246,7 +246,7 @@ class tabs foreach (array_reverse($this->by_object) as $key => $obj){ $reason= $obj->allow_remove(); if ($reason != ""){ - msg_dialog::display(_("Warning"), sprintf(_("Delete process has been canceled by plugin '%s': %s"), $key, $reason), WARNING_DIALOG); + msg_dialog::display(_("Warning"), sprintf(_("Delete process has been canceled by plugin %s: %s"), bold($key), $reason), WARNING_DIALOG); return; } } diff --git a/gosa-core/include/class_userFilterEditor.inc b/gosa-core/include/class_userFilterEditor.inc index 00f34f9cf..a14215d7d 100644 --- a/gosa-core/include/class_userFilterEditor.inc +++ b/gosa-core/include/class_userFilterEditor.inc @@ -248,7 +248,7 @@ class userFilterEditor extends plugin $o = substr_count($f, '('); $c = substr_count($f, ')'); if($o != $c){ - $msgs[] = sprintf(_("Error in filter #%s: %s opening and %s closing brackets detected!"), ($key+1),$o, $c); + $msgs[] = sprintf(_("Error in filter #%s: %s opening and %s closing brackets detected!"), bold($key+1), bold($o), bold($c)); } } diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc index 12d832cca..6ec34cd1f 100644 --- a/gosa-core/include/functions.inc +++ b/gosa-core/include/functions.inc @@ -124,14 +124,14 @@ function __gosa_autoload($class_name) { global $class_mapping, $BASE_DIR; if ($class_mapping === NULL){ - echo sprintf(_("Fatal error: no class locations defined - please run '%s' to fix this"), "update-gosa"); + echo sprintf(_("Fatal error: no class locations defined - please run %s to fix this"), bold("update-gosa")); exit; } if (isset($class_mapping["$class_name"])){ require_once($BASE_DIR."/".$class_mapping["$class_name"]); } else { - echo sprintf(_("Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"), $class_name, "update-gosa"); + echo sprintf(_("Fatal error: cannot instantiate class %s - try running %s to fix this"), bold($class_name), bold("update-gosa")); exit; } } @@ -1051,7 +1051,7 @@ function get_sub_list($filter, $category,$sub_deps, $base= "", $attributes= arra // log($action,$objecttype,$object,$changes_array = array(),$result = "") new log("debug","all",__FILE__,$attributes, sprintf("get_sub_list(): Falling back to get_list(), due to empty sub_bases parameter.". - " This may slow down GOsa. Search was: '%s'",$filter)); + " This may slow down GOsa. Used filter: %s", $filter)); } $tmp = get_list($filter, $category,$base,$attributes,$flags); return($tmp); @@ -2218,7 +2218,7 @@ function get_gosa_version() /* Release or development? */ if (preg_match('%/gosa/trunk/%', $svn_path)){ - return (sprintf(_("GOsa development snapshot (Rev %s)"), $revision)); + return (sprintf(_("GOsa development snapshot (Rev %s)"), bold($revision))); } else { $release= preg_replace('%^.*/([^/]+)/include/functions.inc.*$%', '\1', $svn_path); return (sprintf(_("GOsa $release"), $revision)); @@ -2315,7 +2315,7 @@ function clean_smarty_compile_dir($directory) is_writable($directory."/".$file)) { // delete file if(!unlink($directory."/".$file)) { - msg_dialog::display(_("Internal error"), sprintf(_("File '%s' cannot be deleted!"), $directory."/".$file), ERROR_DIALOG); + msg_dialog::display(_("Internal error"), sprintf(_("File %s cannot be deleted!"), bold($directory."/".$file)), ERROR_DIALOG); // This should never be reached } } elseif(is_dir($directory."/".$file) && @@ -2752,15 +2752,15 @@ function check_schema($cfg,$rfc2307bis = FALSE) if(!isset($objectclasses[$name])){ if($value['IS_MUST_HAVE']){ $checks[$name]['STATUS'] = FALSE; - $checks[$name]['MSG'] = sprintf(_("Required object class '%s' is missing!"),$class); + $checks[$name]['MSG'] = sprintf(_("Required object class %s is missing!"), bold($class)); } else { $checks[$name]['STATUS'] = TRUE; - $checks[$name]['MSG'] = sprintf(_("Optional object class '%s' is missing!"),$class); + $checks[$name]['MSG'] = sprintf(_("Optional object class %s is missing!"), bold($class)); } }elseif(!check_schema_version($objectclasses[$name],$value['REQUIRED_VERSION'])){ $checks[$name]['STATUS'] = FALSE; - $checks[$name]['MSG'] = sprintf(_("Wrong version of required object class '%s' (!=%s) detected!"), $class, $value['REQUIRED_VERSION']); + $checks[$name]['MSG'] = sprintf(_("Wrong version of required object class %s (!=%s) detected!"), bold($class), bold($value['REQUIRED_VERSION'])); }else{ $checks[$name]['STATUS'] = TRUE; $checks[$name]['MSG'] = sprintf(_("Class available")); @@ -3022,7 +3022,7 @@ function change_password ($dn, $password, $mode=0, $hash= "") @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute"); exec($command); } else { - $message= sprintf(_("Command '%s' specified as post modify action for plugin '%s' does not exist!"), $command, "password"); + $message= sprintf(_("Command %s specified as post modify action for plugin %s does not exist!"), bold($command), bold("password")); msg_dialog::display(_("Configuration error"), $message, ERROR_DIALOG); } } @@ -3068,7 +3068,7 @@ function generate_smb_nt_hash($password) $hash= current($ar); if ($hash == "") { - msg_dialog::display(_("Configuration error"), sprintf(_("Generating SAMBA hash by running '%s' failed: check 'sambaHashHook'!"),$config->get_cfg_value('sambaHashHook')), ERROR_DIALOG); + msg_dialog::display(_("Configuration error"), sprintf(_("Generating SAMBA hash by running %s failed: check %s!"), bold($config->get_cfg_value('sambaHashHook'), bold("sambaHashHook"))), ERROR_DIALOG); return (""); } } @@ -3363,7 +3363,7 @@ function get_next_id_pool($attrib) { /* Sanity check */ if ($min >= $max) { - msg_dialog::display(_("Error"), _("Cannot allocate free ID:")." ".sprintf(_("%sPoolMin >= %sPoolMax!"), $attrib, $attrib), ERROR_DIALOG); + msg_dialog::display(_("Error"), _("Cannot allocate free ID:")." ".sprintf(_("%sPoolMin >= %sPoolMax!"), bold($attrib), bold($attrib)), ERROR_DIALOG); return null; } diff --git a/gosa-core/include/functions_helpviewer.inc b/gosa-core/include/functions_helpviewer.inc index 8bb1dcdd6..437ffe12e 100644 --- a/gosa-core/include/functions_helpviewer.inc +++ b/gosa-core/include/functions_helpviewer.inc @@ -42,9 +42,9 @@ class parseXml $xmldata= fread($fh, 100000); fclose($fh); if(!xml_parse($this->parser, chop($xmldata))){ - print(sprintf(_("XML error in guide.xml: %s at line %d"), - xml_error_string(xml_get_error_code($this->parser)), - xml_get_current_line_number($this->parser))); + print(sprintf(_("XML error in guide.xml: %s at line %s"), + bold(xml_error_string(xml_get_error_code($this->parser))), + bold(xml_get_current_line_number($this->parser)))); exit; } return($this->entries); @@ -386,8 +386,8 @@ function searchlist($arr,$res,$maxresults) /* appending footer message for resultlist */ $ret.= "
".sprintf(_("%s results for your search with the keyword %s"), - "".count($topten)."", - "".session::get('parsed_search_keyword').""); + bold(count($topten)), + bold(session::get('parsed_search_keyword'))); $ret.="

"; return($ret); @@ -458,9 +458,7 @@ function createResultEntry($entry,$res,$name,$max) - - ".(sprintf(_("%s%% hit rate in file %s"),$percentage,$name))." - + ".(sprintf(_("%s%% hit rate in file %s"), bold($percentage), bold($name)))."