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

domci : commas should be followed by space

Browse Source 
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@5281 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
Dominique Fournier
2019-05-23 14:55:18 +00:00
parent 17168aaaef
commit f423229f94
20 changed files with 159 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
routeSQL.php
View File

@@ -59,7 +59,7 @@ class routeSQL
/** Chain multiple routeSQL. Wait for the foreign key */
public $chainedForeign = null;
/** Allow one or multiple links by entry in the list
The array must be of the form array ("linkname"=>,"icon"=>)
The array must be of the form array ("linkname"=>, "icon"=>)
icon is optional and the linkname is used if it is not provided */
public $internalLinks = array ();
/** The renderer class to use for HTML pages */
@@ -146,13 +146,13 @@ class routeSQL
switch ($flash[0])
{
case 4: $dataflash .= "alert-danger";
$alert = dgettext ("domframework","Error!");break;
$alert = dgettext ("domframework", "Error!");break;
case 3: $dataflash .= "alert-warning";
$alert = dgettext ("domframework","Warning!");break;
$alert = dgettext ("domframework", "Warning!");break;
case 2: $dataflash .= "alert-info";
$alert = dgettext ("domframework","Info:");break;
$alert = dgettext ("domframework", "Info:");break;
case 1: $dataflash .= "alert-success";
$alert = dgettext ("domframework","Success:");break;
$alert = dgettext ("domframework", "Success:");break;
}
$dataflash .= " alert-dismissable'>\n";
$dataflash .= "<strong>$alert</strong> ".$flash[1]."\n";
@@ -246,7 +246,7 @@ $content .= "</li>\n";
$route = new route ();
$content .= " <div class='actionExtern'>\n";
$content .= " <a href='".$route->baseURL().$this->url_prefix."/add'>"
.dgettext ("domframework","Add new entry")."</a>\n";
.dgettext ("domframework", "Add new entry")."</a>\n";
$content .= " </div>\n";
}
return $content;
@@ -266,7 +266,7 @@ $content .= "</li>\n";
$content .= " <form method='get' action='".$route->baseURL().
$this->url_prefix."'>\n";
$content .= " <select name='num' onchange='this.form.submit()' >\n";
$list = array (10,20,50,100,200,500,1000);
$list = array (10, 20, 50, 100, 200, 500, 1000);
foreach ($list as $element)
{
$content .= " <option ";
@@ -275,7 +275,7 @@ $content .= "</li>\n";
$content .= ">$element</option>\n";
}
$content .= " </select>\n";
$content .= " ".dgettext ("domframework","elements")."\n";
$content .= " ".dgettext ("domframework", "elements")."\n";
$content .= " </form>\n";
$content .= " </div>\n";
return $content;
@@ -294,7 +294,7 @@ $content .= "</li>\n";
$content .= " <div class='searchArea'>\n";
$content .= " <form method='get' action='".$route->baseURL().
$this->url_prefix."'>\n";
$content .= " ".dgettext ("domframework","Search:");
$content .= " ".dgettext ("domframework", "Search:");
$content .= " <input type='text' name='search' value='".
htmlentities ($search, ENT_QUOTES)."'/>\n";
$content .= " </form>\n";
@@ -372,8 +372,8 @@ $content .= "</li>\n";
if (!isset ($extension) || $extension === null || $extension === "")
$extension = reset ($this->extensionsAllowed);
if (!in_array ($extension, $this->extensionsAllowed))
throw new \Exception (dgettext ("domframework","Extension not allowed"),
403);
throw new \Exception (dgettext ("domframework",
"Extension not allowed"), 403);
$search = rawurldecode ($search);
$this->connect();
$titles = $this->objectDB->titles ();
@@ -424,9 +424,9 @@ $content .= "</li>\n";
{
if ($this->authREST["email"] === "anonymous")
throw new \Exception (dgettext ("domframework",
"Anonymous not allowed"), 401);
throw new \Exception (dgettext ("domframework","Access forbidden"),
403);
"Anonymous not allowed"), 401);
throw new \Exception (dgettext ("domframework", "Access forbidden"),
403);
}
$this->chained->connect();
// $chainedvalues are the information associated to the $chain
@@ -1017,7 +1017,7 @@ $content .= "</li>\n";
if ($this->readwriteAllowed && $this->displayActions)
$countTitles++;
$content .= " <tr><td colspan='$countTitles' class='noentry'>";
$content .= dgettext ("domframework","No entry available");
$content .= dgettext ("domframework", "No entry available");
$content .= "</td></tr>\n";
}
else
@@ -1110,7 +1110,7 @@ $content .= "</li>\n";
if ($this->authHTML["email"] === "anonymous")
throw new \Exception (dgettext ("domframework",
"Anonymous not allowed"), 401);
throw new \Exception (dgettext ("domframework","Access forbidden"),
throw new \Exception (dgettext ("domframework", "Access forbidden"),
403);
}
$this->chained->connect();
@@ -1173,9 +1173,9 @@ $content .= "</li>\n";
{
if ($this->authHTML["email"] === "anonymous")
throw new \Exception (dgettext ("domframework",
"Anonymous not allowed"), 401);
throw new \Exception (dgettext ("domframework","Access forbidden"),
403);
"Anonymous not allowed"), 401);
throw new \Exception (dgettext ("domframework", "Access forbidden"),
403);
}
$this->chained->connect();
// $chainedValues are the information associated to the $chain
@@ -1387,8 +1387,8 @@ $content .= "</li>\n";
}
$field = new formfield ("submit", dgettext ("domframework",
"Save the data"));
$field->defaults = dgettext ("domframework","Save the data");
"Save the data"));
$field->defaults = dgettext ("domframework", "Save the data");
$field->type = "submit";
$fields[] = $field;
unset ($field);
@@ -1407,9 +1407,9 @@ $content .= "</li>\n";
{
if ($this->authHTML["email"] === "anonymous")
throw new \Exception (dgettext ("domframework",
"Anonymous not allowed"), 401);
throw new \Exception (dgettext ("domframework","Access forbidden"),
403);
"Anonymous not allowed"), 401);
throw new \Exception (dgettext ("domframework", "Access forbidden"),
403);
}
$this->chained->connect();
// $chainedvalues are the information associated to the $chain
@@ -1492,9 +1492,9 @@ $content .= "</li>\n";
{
if ($this->authHTML["email"] === "anonymous")
throw new \Exception (dgettext ("domframework",
"Anonymous not allowed"), 401);
throw new \Exception (dgettext ("domframework","Access forbidden"),
403);
"Anonymous not allowed"), 401);
throw new \Exception (dgettext ("domframework", "Access forbidden"),
403);
}
$this->chained->connect();
// $chainedvalues are the information associated to the $chain
@@ -1710,8 +1710,8 @@ $content .= "</li>\n";
if ($readonly === false && $this->readwriteAllowed === true)
{
$field = new formfield ("submit", dgettext ("domframework",
"Save the data"));
$field->defaults = dgettext ("domframework","Save the data");
"Save the data"));
$field->defaults = dgettext ("domframework", "Save the data");
$field->type = "submit";
$fields[] = $field;
unset ($field);
@@ -1732,9 +1732,9 @@ $content .= "</li>\n";
{
if ($this->authHTML["email"] === "anonymous")
throw new \Exception (dgettext ("domframework",
"Anonymous not allowed"), 401);
throw new \Exception (dgettext ("domframework","Access forbidden"),
403);
"Anonymous not allowed"), 401);
throw new \Exception (dgettext ("domframework", "Access forbidden"),
403);
}
$this->chained->connect();
// $chainedvalues are the information associated to the $chain
@@ -1781,7 +1781,7 @@ $content .= "</li>\n";
$values[$this->chainedForeign] !== $chain)
$errorsChain[$this->chainedForeign] =
array ("error", dgettext ("domframework",
"Can not change the external key"));
"Can not change the external key"));
if ($this->chainedForeign !== null)
$values[$this->chainedForeign] = $chain;
$errors = $this->objectDB->verify ($values, $id);
@@ -1791,7 +1791,8 @@ $content .= "</li>\n";
{
$this->objectDB->update ($id, $values);
$renderer = new renderer ();
$renderer->flash ("SUCCESS", dgettext ("domframework","Update done"));
$renderer->flash ("SUCCESS", dgettext ("domframework",
"Update done"));
$route->redirect ("/".
str_replace ("{chain}", $chain, $this->url_prefix),
"");