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

Change all the "new class" by "new Class"

Browse Source
This commit is contained in:
Dominique Fournier
2021-05-07 13:10:37 +02:00
parent c8d275be31
commit c09fa961cd
39 changed files with 430 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/RouteSQL.php
View File

@@ -177,7 +177,7 @@ class RouteSQL
{
// The maximum of links available in the paginator
$maxClickPaginator = 10;
$route = new route ();
$route = new Route ();
$prePage = false;
$postPage = false;
$content = " <div class='paginatorArea'>\n";
@@ -242,7 +242,7 @@ $content .= "</li>\n";
$content = "";
if ($this->displayActions && $this->readwriteAllowed)
{
$route = new route ();
$route = new Route ();
$content .= " <div class='actionExtern'>\n";
$content .= " <a href='".$route->baseURL().$this->url_prefix."/add'>"
.dgettext ("domframework", "Add new entry")."</a>\n";
@@ -259,7 +259,7 @@ $content .= "</li>\n";
*/
private function numberEntryByDisplayArea ($nbentries, $page, $num, $search)
{
$route = new route ();
$route = new Route ();
$content = "";
$content .= " <div class='numberEntryByDisplayArea'>\n";
$content .= " <form method='get' action='".$route->baseURL().
@@ -288,7 +288,7 @@ $content .= "</li>\n";
*/
private function searchArea ($nbentries, $page, $num, $search)
{
$route = new route ();
$route = new Route ();
$content = "";
$content .= " <div class='searchArea'>\n";
$content .= " <form method='get' action='".$route->baseURL().
@@ -330,7 +330,7 @@ $content .= "</li>\n";
/** Create the routes for REST pages and the associated actions */
public function routesREST ()
{
$route = new route ();
$route = new Route ();
$route->debug = $this->debug;;
$route->allowSlashes=false;
$route->get ("rest/".$this->url_prefix."(\.{extension})?".
@@ -431,7 +431,7 @@ $content .= "</li>\n";
// $chainedvalues are the information associated to the $chain
$chainedvalues = $this->chained->keyexists ($chain);
if ($chainedvalues === false)
throw new exception (dgettext ("domframework",
throw new \Exception (dgettext ("domframework",
"Object not found"), 404);
}
if ($this->accessright ($this->authREST["email"]) !== TRUE)
@@ -502,7 +502,7 @@ $content .= "</li>\n";
// $chainedvalues are the information associated to the $chain
$chainedvalues = $this->chained->keyexists ($chain);
if ($chainedvalues === false)
throw new exception (dgettext ("domframework",
throw new \Exception (dgettext ("domframework",
"Object not found"), 404);
}
if ($this->accessright ($this->authREST["email"]) !== TRUE)
@@ -624,7 +624,7 @@ $content .= "</li>\n";
$this->url_prefix;
}
/** Add HTML routes */
$route = new route ();
$route = new Route ();
$route->debug = $this->debug;;
$route->allowSlashes=false;
$route->get ($this->url_prefix."/", function ($chain=null) use ($route)
@@ -704,7 +704,7 @@ $content .= "</li>\n";
//echo "SEARCH=$search\n";
//$route->debug=$this->debug;
$this->connect();
$csrf = new csrf ();
$csrf = new Csrf ();
$token = $csrf->createToken ();
$titles = $this->objectDB->titles ();
unset ($titles[$this->chainedForeign]);
@@ -1140,9 +1140,9 @@ $content .= "</li>\n";
403);
$this->connect();
$csrf = new csrf ();
$renderer = new renderer ();
$route = new route ();
$csrf = new Csrf ();
$renderer = new Renderer ();
$route = new Route ();
try
{
$csrf->checkToken ($token);
@@ -1356,11 +1356,11 @@ $content .= "</li>\n";
// CSS is in edit an id too !
}
$f = new form ();
$f = new Form ();
$fields = array ();
foreach ($titles as $key=>$val)
{
$field = new formfield ($key, $val);
$field = new Formfield ($key, $val);
if (! isset ($this->objectDB->fields[$key]))
throw new \Exception (sprintf (dgettext ("domframework",
"Field '%s' (defined in titles) not found in fields"),
@@ -1385,7 +1385,7 @@ $content .= "</li>\n";
unset ($field);
}
$field = new formfield ("submit", dgettext ("domframework",
$field = new Formfield ("submit", dgettext ("domframework",
"Save the data"));
$field->defaults = dgettext ("domframework", "Save the data");
$field->type = "submit";
@@ -1414,7 +1414,7 @@ $content .= "</li>\n";
// $chainedvalues are the information associated to the $chain
$chainedvalues = $this->chained->keyexists ($chain);
if ($chainedvalues === false)
throw new exception (dgettext ("domframework",
throw new \Exception (dgettext ("domframework",
"Object not found"), 404);
}
if ($this->accessright ($this->authHTML["email"]) !== TRUE)
@@ -1438,7 +1438,7 @@ $content .= "</li>\n";
403);
$this->connect();
$f = new form ();
$f = new Form ();
$values = $f->values ();
$errorsChain = array ();
if ($this->chainedForeign !== null &&
@@ -1453,7 +1453,7 @@ $content .= "</li>\n";
try
{
$this->objectDB->insert ($values);
$renderer = new renderer ();
$renderer = new Renderer ();
$renderer->flash ("SUCCESS", dgettext ("domframework",
"Creation done"));
$route->redirect ("/".
@@ -1462,13 +1462,13 @@ $content .= "</li>\n";
}
catch (\Exception $e)
{
$renderer = new renderer ();
$renderer = new Renderer ();
$renderer->flash ("ERROR", $e->getMessage ());
}
}
else
{
$renderer = new renderer ();
$renderer = new Renderer ();
foreach ($errorsChain as $error)
$renderer->flash (strtoupper ($error[0]), $error[1]);
}
@@ -1499,7 +1499,7 @@ $content .= "</li>\n";
// $chainedvalues are the information associated to the $chain
$chainedvalues = $this->chained->keyexists ($chain);
if ($chainedvalues === false)
throw new exception (dgettext ("domframework",
throw new \Exception (dgettext ("domframework",
"Object not found"), 404);
}
if ($this->accessright ($this->authHTML["email"], $id) !== TRUE)
@@ -1675,11 +1675,11 @@ $content .= "</li>\n";
// CSS is in add too !
}
$f = new form ();
$f = new Form ();
$fields = array ();
foreach ($titles as $key=>$val)
{
$field = new formfield ($key, $val);
$field = new Formfield ($key, $val);
if (! isset ($this->objectDB->fields[$key]))
throw new \Exception (sprintf (dgettext ("domframework",
"Field '%s' (defined in titles) not found in fields"),
@@ -1708,7 +1708,7 @@ $content .= "</li>\n";
if ($readonly === false && $this->readwriteAllowed === true)
{
$field = new formfield ("submit", dgettext ("domframework",
$field = new Formfield ("submit", dgettext ("domframework",
"Save the data"));
$field->defaults = dgettext ("domframework", "Save the data");
$field->type = "submit";
@@ -1739,7 +1739,7 @@ $content .= "</li>\n";
// $chainedvalues are the information associated to the $chain
$chainedvalues = $this->chained->keyexists ($chain);
if ($chainedvalues === false)
throw new exception (dgettext ("domframework",
throw new \Exception (dgettext ("domframework",
"Object not found"), 404);
}
if ($this->accessright ($this->authHTML["email"], $id) !== TRUE)
@@ -1769,7 +1769,7 @@ $content .= "</li>\n";
throw new \Exception (dgettext ("domframework", "Object not found"),
404);
$oldvalues = $oldvalues[0];
$f = new form ();
$f = new Form ();
$values = $f->values ();
if ($values[$this->objectDB->primary] !== $id)
throw new \Exception (dgettext ("domframework",
@@ -1789,7 +1789,7 @@ $content .= "</li>\n";
try
{
$this->objectDB->update ($id, $values);
$renderer = new renderer ();
$renderer = new Renderer ();
$renderer->flash ("SUCCESS", dgettext ("domframework",
"Update done"));
$route->redirect ("/".
@@ -1798,13 +1798,13 @@ $content .= "</li>\n";
}
catch (\Exception $e)
{
$renderer = new renderer ();
$renderer = new Renderer ();
$renderer->flash ("ERROR", $e->getMessage ());
}
}
else
{
$renderer = new renderer ();
$renderer = new Renderer ();
foreach ($errorsChain as $error)
$renderer->flash (strtoupper ($error[0]), $error[1]);
}
@@ -1897,9 +1897,9 @@ $content .= "</li>\n";
*/
private function rendererhtml ($data)
{
$route = new route ();
$route = new Route ();
$html = new outputhtml ();
$html = new Outputhtml ();
$replacement = array ("{baseurl}"=>$route->baseURL ());
if ($this->rendererHTMLlayout === false)
{
@@ -1929,11 +1929,10 @@ $content .= "</li>\n";
*/
private function renderrest ($extension, $data, $getCode=200)
{
require_once ("domframework/output$extension.php");
$http = new http ();
$http = new Http ();
@header ($_SERVER["SERVER_PROTOCOL"]." $getCode ".
$http->codetext ($getCode));
$class = "output$extension";
$class = "Output$extension";
$result = new $class ();
echo $result->out ($data)."\n";
exit;