X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Ffunctions.inc;h=7675ff23e7d502e8c01a834a67a6a615eb9915ef;hb=267e1e39976840e73256c8f0c5eec9a69371900e;hp=7cd830f5021191dc1e7a3e8a61964a8b3e9fc1a8;hpb=8e7ac286389669883b1a5684127b6d1e0a63b91f;p=gosa.git
diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 7cd830f50..7675ff23e 100644
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -1,7 +1,9 @@
"ae",
/* Class autoloader */
function __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");
+ exit;
+ }
+
if (isset($class_mapping[$class_name])){
require_once($BASE_DIR."/".$class_mapping[$class_name]);
} else {
- echo _("Fatal: cannot load class \"$class_name\" - execution aborted");
+ echo sprintf(_("Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"), $class_name, "update-gosa");
+ exit;
}
}
+
+/*! \brief Checks if a class is available.
+ * @param name String The class name.
+ * @return boolean True if class is available, else false.
+ */
+function class_available($name)
+{
+ global $class_mapping;
+ return(isset($class_mapping[$name]));
+}
+
+
+/* Check if plugin is avaliable */
+function plugin_available($plugin)
+{
+ global $class_mapping, $BASE_DIR;
+
+ if (!isset($class_mapping[$plugin])){
+ return false;
+ } else {
+ return is_readable($BASE_DIR."/".$class_mapping[$plugin]);
+ }
+}
+
+
/* Create seed with microseconds */
function make_seed() {
list($usec, $sec) = explode(' ', microtime());
@@ -111,7 +144,7 @@ function make_seed() {
/* Debug level action */
function DEBUG($level, $line, $function, $file, $data, $info="")
{
- if (get_global('DEBUGLEVEL') & $level){
+ if (session::get('DEBUGLEVEL') & $level){
$output= "DEBUG[$level] ";
if ($function != ""){
$output.= "($file:$function():$line) - $info: ";
@@ -166,10 +199,10 @@ function get_browser_language()
/* Rewrite ui object to another dn */
function change_ui_dn($dn, $newdn)
{
- $ui= get_global('ui');
+ $ui= session::get('ui');
if ($ui->dn == $dn){
$ui->dn= $newdn;
- register_global('ui',$ui);
+ session::set('ui',$ui);
}
}
@@ -193,7 +226,7 @@ function get_template_path($filename= '', $plugin= FALSE, $path= "")
/* Return plugin dir or root directory? */
if ($plugin){
if ($path == ""){
- $nf= preg_replace("!^".$BASE_DIR."/!", "", get_global('plugin_dir'));
+ $nf= preg_replace("!^".$BASE_DIR."/!", "", session::get('plugin_dir'));
} else {
$nf= preg_replace("!^".$BASE_DIR."/!", "", $path);
}
@@ -204,7 +237,7 @@ function get_template_path($filename= '', $plugin= FALSE, $path= "")
return ("$BASE_DIR/ihtml/themes/default/$nf/$filename");
}
if ($path == ""){
- return (get_global('plugin_dir')."/$filename");
+ return (session::get('plugin_dir')."/$filename");
} else {
return ($path."/$filename");
}
@@ -251,7 +284,6 @@ function gosa_array_merge($ar1,$ar2)
}
-
function gosa_log ($message)
{
global $ui;
@@ -281,7 +313,7 @@ function ldap_init ($server, $base, $binddn='', $pass='')
isset($config->current['TLS']) && $config->current['TLS'] == "true");
/* Sadly we've no proper return values here. Use the error message instead. */
- if (!preg_match("/Success/i", $ldap->error)){
+ if (!$ldap->success()){
echo sprintf(_("FATAL: Error when connecting the LDAP. Server said '%s'."), $ldap->get_error());
exit();
}
@@ -307,11 +339,11 @@ function process_htaccess ($username, $kerberos= FALSE)
/* Look for entry or realm */
$ldap= $config->get_ldap_link();
- if (!preg_match("/Success/i", $ldap->error)){
- print_red(sprintf(_("User login failed. LDAP server said '%s'."), $ldap->get_error()));
+ if (!$ldap->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), "", LDAP_AUTH, ERROR_DIALOG));
$smarty= get_smarty();
$smarty->display(get_template_path('headers.tpl'));
- echo "".get_global('errors')."