Dominique.Fournier/DomFramework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Update gettext : add spaces

Browse Source 
DomCi : remove line too longs on all the files


git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@5280 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
Dominique Fournier
2019-05-23 14:19:30 +00:00
parent a79b59685f
commit 17168aaaef
39 changed files with 588 additions and 565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
config.php
View File

@@ -106,12 +106,12 @@ class config
if (@file_put_contents ($this->confFile,
"<?php\r\n\$conf = array ();\r\n")
=== FALSE)
throw new Exception (sprintf (dgettext("domframework",
throw new Exception (sprintf (dgettext ("domframework",
"No configuration file '%s' available and it can't be created"),
$this->confFile), 500);
}
elseif (! is_readable ($this->confFile))
throw new Exception (sprintf ( dgettext("domframework",
throw new Exception (sprintf ( dgettext ("domframework",
"The configuration file '%s' is not readable"),
$this->confFile));
$conf = array ();
@@ -176,17 +176,17 @@ class config
}
elseif (! is_readable ($this->confFile))
throw new Exception (sprintf (
dgettext("domframework",
dgettext ("domframework",
"The configuration file '%s' is not readable"),
$this->confFile), 500);
if (!is_writeable ($this->confFile))
throw new Exception (sprintf (dgettext("domframework",
throw new Exception (sprintf (dgettext ("domframework",
"Configuration file '%s' is write protected"),
$this->confFile), 500);
$conf = array ();
$rc = include ($this->confFile);
if ($rc !== 1)
throw new Exception (dgettext("domframework",
throw new Exception (dgettext ("domframework",
"Error in configuration file"), 500);
$newconf = array_merge ($this->default, $conf, array ($param=>$value));
$txt = "<?php\r\n";
@@ -195,7 +195,7 @@ class config
$txt .= ");\r\n";
if (@file_put_contents ($this->confFile, $txt, LOCK_EX) === FALSE)
throw new Exception (sprintf (dgettext("domframework",
throw new Exception (sprintf (dgettext ("domframework",
"Can't save configuration file '%s'"),
$this->confFile), 500);
return TRUE;
@@ -232,7 +232,7 @@ class config
$phpcode .= "),\r\n";
}
else
throw new Exception (dgettext("domframework",
throw new Exception (dgettext ("domframework",
"Config : missing type ").gettype ($val), 500);
}
@@ -382,7 +382,7 @@ class config
var_export ($val, true).";\n";
}
if (file_put_contents ($this->confFile, $txt, LOCK_EX) === FALSE)
throw new \Exception (sprintf (dgettext("domframework",
throw new \Exception (sprintf (dgettext ("domframework",
"Can't save configuration file '%s'"),
$this->confFile), 500);
// The next command clear the include cache file and force the PHP to
@@ -428,10 +428,10 @@ class config
$reflector = new ReflectionClass (get_class ($this));
$modelFile = $reflector->getFileName();
if (! file_exists ($modelFile))
throw new \Exception (dgettext("domframework",
throw new \Exception (dgettext ("domframework",
"The configuration model file is missing"), 500);
if (! is_readable ($modelFile))
throw new \Exception (dgettext("domframework",
throw new \Exception (dgettext ("domframework",
"The configuration model file is not readable"),
500);
$filecontent = file_get_contents ($modelFile);
@@ -440,7 +440,7 @@ class config
$parenthesis = 0;
$params = array ();
$path = "";
$group = dgettext("domframework", "Default parameters");
$group = dgettext ("domframework", "Default parameters");
foreach ($tokens as $token)
{
if (is_array ($token))
@@ -474,7 +474,7 @@ class config
if (! isset ($data["param"]))
continue;
if (substr ($data["param"], 0, 1) !== "/")
throw new Exception (sprintf (dgettext("domframework",
throw new Exception (sprintf (dgettext ("domframework",
"Parameter '%s' doesn't start by slash"), $data["param"]), 500);
$data["depth"] = $parenthesis;
$data["group"] = $group;