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

6
authentication.php
View File

@@ -54,11 +54,11 @@ class authentication
/** The authentication servers configuration
* array ("authXXXX" => array (
* array ("ldapserver"=>"ldaps://annuaire.grenoble.cnrs.fr",
* array ("ldapserver" => "ldaps://server.domain.fr",
* "ldapport" => 636,
* "ldaptimeout" => 5,
* "ldapauth"=>"uid=annuaire,ou=people,dc=grenoble,dc=cnrs,dc=fr",
* "ldappwd"=>";authANNUAIRE2013",
* "ldapauth" => "uid=XXX,dc=domain,dc=fr",
* "ldappwd" => "XXX",
* "ldapbase" => "",
* "ldapfilter" => "(mail=%s)",
* "ldapfield" => "mail",

40
authzgroups.php
View File

@@ -169,8 +169,8 @@ class authzgroups
$object = "/$object";
$rc = $this->allow ($module, $user, "$object");
if ($this->debug)
trigger_error ("authzgroups : accessRight ('$module','$user','$object')".
"=$rc", E_USER_NOTICE);
trigger_error ("authzgroups : accessRight ('$module', '$user', ".
"'$object')=$rc", E_USER_NOTICE);
if ($rc !== "NO")
return TRUE;
if ($user === "anonymous")
@@ -204,8 +204,8 @@ class authzgroups
$object = "/$object";
$rc = $this->allow ($module, $user, $object);
if ($this->debug)
trigger_error ("authzgroups : accessWrite ('$module','$user','$object')".
"=$rc", E_USER_NOTICE);
trigger_error ("authzgroups : accessWrite ('$module', '$user', ".
"'$object')=$rc", E_USER_NOTICE);
if ($rc === "RW")
return TRUE;
if ($user === "anonymous")
@@ -276,14 +276,11 @@ class authzgroups
"comment" => array ("varchar", "255"));
$this->dbObject->primary = "idobject";
$this->dbObject->unique = array ("idobject", array ("object", "module"));
$this->dbObject->titles = array ("idobject"=>dgettext ("domframework",
"idobject"),
"module"=>dgettext ("domframework",
"Module"),
"object"=>dgettext ("domframework",
"Object"),
"comment"=>dgettext ("domframework",
"Comment"));
$this->dbObject->titles = array (
"idobject" => dgettext ("domframework", "idobject"),
"module" => dgettext ("domframework", "Module"),
"object" => dgettext ("domframework", "Object"),
"comment" => dgettext ("domframework", "Comment"));
$this->dbGroup = new dblayer ($dsn, $username, $password, $driver_options);
$this->dbGroup->debug = $this->debug;
@@ -296,14 +293,11 @@ class authzgroups
"comment" => array ("varchar", "255"));
$this->dbGroup->primary = "idgroup";
$this->dbGroup->unique = array ("idgroup", array ("module", "group"));
$this->dbGroup->titles = array ("idgroup"=>dgettext ("domframework",
"idgroup"),
"module"=>dgettext ("domframework",
"Module"),
"group"=>dgettext ("domframework",
"Group"),
"comment"=>dgettext ("domframework",
"Comment"));
$this->dbGroup->titles = array (
"idgroup" => dgettext ("domframework", "idgroup"),
"module" => dgettext ("domframework", "Module"),
"group" => dgettext ("domframework", "Group"),
"comment" => dgettext ("domframework", "Comment"));
$this->dbGroupMember = new dblayer ($dsn, $username, $password,
$driver_options);
@@ -505,7 +499,8 @@ class authzgroups
$select[] = array ("module", $module);
if ($object !== null)
$select[] = array ("object", $object);
return $this->dbObject->read ($select, null, array(array("object","ASC")));
return $this->dbObject->read ($select, null,
array (array ("object", "ASC")));
}
/** Return an array with all the available objects in the module, or only
@@ -743,8 +738,7 @@ class authzgroups
{
if ($this->dbGroupMember == null)
throw new Exception (dgettext ("domframework",
"DB for GroupMember is not connected"),
500);
"DB for GroupMember is not connected"), 500);
$groups = $this->groupReadByID ($module, $idgroup);
if (! isset ($groups[0]["idgroup"]))
throw new Exception (dgettext ("domframework",

8
authzgroupsoo.php
View File

@@ -191,8 +191,8 @@ class authzgroupsoo
$object = "/$object";
$rc = $this->allow ($module, $user, "$object");
if ($this->debug)
trigger_error ("authzgroups : accessRight ('$module','$user','$object')".
"=$rc", E_USER_NOTICE);
trigger_error ("authzgroups : accessRight ('$module', '$user', ".
"'$object')=$rc", E_USER_NOTICE);
if ($rc !== "NO")
return TRUE;
if ($user === "anonymous")
@@ -226,8 +226,8 @@ class authzgroupsoo
$object = "/$object";
$rc = $this->allow ($module, $user, $object);
if ($this->debug)
trigger_error ("authzgroups : accessWrite ('$module','$user','$object')".
"=$rc", E_USER_NOTICE);
trigger_error ("authzgroups : accessWrite ('$module', '$user', ".
"'$object')=$rc", E_USER_NOTICE);
if ($rc === "RW")
return TRUE;
if ($user === "anonymous")

2
file.php
View File

@@ -638,7 +638,7 @@ class file
$this->checkPathRW ($tmpdirname);
if ($recursive === false)
return @rmdir ($tmpdirname);
$files = array_diff (scandir ($tmpdirname), array('.','..'));
$files = array_diff (scandir ($tmpdirname), array(".", ".."));
foreach ($files as $file)
{
if (is_dir ("$tmpdirname/$file"))

6
outputhtml.php
View File

@@ -55,10 +55,8 @@ class outputhtml extends output
if (isset ($resView["title"]))
$title = $resView["title"];
if (! isset ($resView["content"]))
throw new \Exception (sprintf (
dgettext ("domframework",
"No data provided from view %s::%s"),
$viewClass,$viewMethod),
throw new \Exception (sprintf ( dgettext ("domframework",
"No data provided from view %s::%s"), $viewClass, $viewMethod),
500);
}
}

3
route.php
View File

@@ -262,8 +262,7 @@ class route
$this->error (new \Exception ("Redirect to myself", 400));
if (substr_count ($baseURL, "../") > 1+ substr_count ($destURL, "/"))
$this->error (new \Exception (
"Can't redirect outside this site (Base $baseURL)",
405));
"Can't redirect outside this site (Base $baseURL)", 405));
if ($this->debug)
{

7
routeSQL.php
View File

@@ -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 ();
@@ -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),
"");