Add not enabled namespace on each file

auth.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** User authentication (abstract class) */
 class auth
 {

authentication.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/auth.php");
 require_once ("domframework/authparams.php");
 require_once ("domframework/authsession.php");

authhtpasswd.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/auth.php");
 
 /** User authentication against .htpasswd file

authimap.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/auth.php");
 require_once ("domframework/imap.php");
 

authjwt.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/jwt.php");
 require_once ("domframework/uuid.php");
 

authldap.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/auth.php");
 
 /** User authentication against LDAP server */

authorization.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** All the needed functions to authorize or deny access to an authenticated
     user */
 class authorization

authorizationdb.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 error_reporting (E_ALL);
 require_once ("domframework/dblayer.php");
 require_once ("domframework/authorization.php");

authparams.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Takes the email and the password of the user */
 class authparams
 {

authsession.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** User authentication against SESSION */
 class authsession extends auth
 {

authshibboleth.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/auth.php");
 
 /** User authentication against Shibboleth */

authsql.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/dblayer.php");
 require_once ("domframework/auth.php");
 

authsympa.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/auth.php");
 
 /** User authentication against SYMPA server

authzgroups.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/dblayer.php");
 
 /** All the needed functions to authorize or deny access to an authenticated

authzgroupsoo.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/dblayeroo.php");
 
 /** All the needed functions to authorize or deny access to an authenticated

backtrace.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Display the backtrace in HTML with clicks to display the content
   */
 class backtrace

cachefile.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** A cache manager in file
   */
 class cachefile

cacheoutput.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** This class permit to cache the ouptut of a code. If the cache is already
   * available, use it.
   * It resend the headers as the ouptut send them

certificationauthority.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** An certificate authority
   */
 class certificationauthority

cli.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Allow to interract with controllers and models from the CLI */
 class cli
 {

color.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Convert the name of colors to RGB
   */
 class color

config.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Manage the configurations of the module done by administrator in a config
   * file
   * It is based on the module configuration defaults

console.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Allow to manage a linux Console to have a minimal but working text interface
   * When using this class, you must use the $console::echo method and not
   * display directely on screen

convert.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Convert a format to another one
   */
 class convert

csrf.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** CSRF protection
   * By default, the CSRF protection is active if a SESSION is active too.
   * It can be disabled if needed. An Exception is raised if the form is send

daemon.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/fork.php");
 require_once ("domframework/file.php");
 

dbjson.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** DBJSON  : a NoSQL DB in JSON
   * Documentation
   * - A filter is an array containing the fields and the values to found

dblayer.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 // dblayer.php
 
 /* Documentation :

dblayerauthzgroups.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/dblayer.php");
 
 /** DBLayer with authorization

dblayeroo.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Permit abstraction on the differents SQL databases available
   */
 class dblayeroo

encrypt.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Allow to encrypt/decrypt data
   */
 class encrypt

file.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** The file method allow to manage files like PHP with a working chroot on all
   * plateforms, and a right management compatible with database
   * Don't follow links !

fork.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Manage the fork of children in Posix mode
   */
 class fork

form.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/csrf.php");
 
 /** This class permit to create easily some forms to HTML (or text mode in

fts.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** The Full Text Search
   * Analyze the provided search text (like a search engine), and create the
   * sql query to found the answer. It also allow to check if a sentence is valid

getopts.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/verify.php");
 
 /** Manage the options provided on the command line

graph.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/color.php");
 
 /** This class allow to generate an image which is a graphic. A graphic takes

http.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** HTTP Helper : understand the best choices provided by browser, the HTTP
   * codes
   */

httpclient.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/tcpclient.php");
 
 /** This programe allow to get a HTTP page from a site, and examine the content.

imap.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** IMAP connection abstraction
     In the IMAP terminology, "mailbox" is a folder in the mailbox of the user */
 class imap

inifile.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Manage .ini files like in php.ini
     Support the sections (or not) */
 class inifile

ipaddresses.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Manage the IP addresses conversions */
 class ipaddresses
 {

jwt.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/encrypt.php");
 
 /** Allow to manage the JSON Web Tokens

language.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Language class : change the messages
   */
 class language

lockfile.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** The lock management of files
   */
 class lockfile

logger.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** The logger class permit to log the information from the soft
   * It allow to debug too
   */

macaddresses.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Manage the MAC addresses
   * Based on :
   * https://www.stetsenko.net/2011/01/php-mac-address-validating-and-formatting/

mail.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** The class to create a complete email. Can read an email from a content
   */
 class mail

markdown.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Convert the Markdown text to html format
   */
 class markdown

module.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Module management
   */
 class module

output.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Class used to display data
   */
 class output

outputcsv.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/output.php");
 
 /** Display in CSV the data provided

outputdl.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** This class allow a program to download a specific file from the filesystem,
   * without using too much memory. In also allow to manage the resuming of a
   * paused transfert by getting the range of download.

outputhtml.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/output.php");
 
 /** Display in HTML the data provided, with the layout support

outputjson.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/output.php");
 
 /** Display in JSON the data provided

outputrest.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/output.php");
 require_once ("domframework/rest.php");
 

outputtxt.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/output.php");
 
 /** Display in Text the data provided

outputxml.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/output.php");
 
 /** Display in XML the data provided

password.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** A class to manage the password hashing, password generation
   */
 class password

queue.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Manage a queue in multiple storages
   * A process can add entries to the end of a queue
   * A process can get all the entries in a queue

queuefile.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/queue.php");
 require_once ("domframework/file.php");
 

ratelimit.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** The rate limit abstract class
   */
 class ratelimit

ratelimitfile.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/lockfile.php");
 require_once ("domframework/ratelimit.php");
 

renderer.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Display the data in HTML with a FLASH method to display the errors
   */
 class renderer

rest.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/http.php");
 
 /** Allow to manage the REST protocol by using the users output types

robotstxt.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** This class analyze the provided robots.txt file content and allow to
   * get the configured data for DomSearch.
   * It allow to examine an URL against the robots.txt file and return if the URL
@@ -74,6 +76,20 @@ class robotstxt
       $this->allow = array ("/");
       return $this;
     }
+
+    // The sitemaps are not restricted to the user-agent
+    foreach (preg_grep ("~Sitemap:\s+~i", $content) as $nb => $line)
+    {
+      $url = $this->getValueFromLine ($line);
+      if (!! filter_var ($url, FILTER_VALIDATE_URL) &&
+           (substr ($url, 0, 7) === "http://" ||
+            substr ($url, 0, 8) === "https://"))
+        $this->sitemaps[] = $url;
+      else
+        $this->errors[$nb] = dgettext ("domframework",
+          "Sitemap : Invalid URL provided");
+    }
+
     // Get the Allow and Disallow lines. The stop will arrive on first
     // User-Agent line arriving after a Allow/Disallow.
     // Comments and empty lines are removed
@@ -82,14 +98,9 @@ class robotstxt
       $line = trim ($content[$i]);
       if (stripos ($line, "Sitemap:") === 0)
       {
-        $url = $this->getValueFromLine ($line);
+        // Already managed in the general parser. Not needed in the specific
-        if (!! filter_var ($url, FILTER_VALIDATE_URL) &&
+        // user-agent parser. Must at least be catched to not generate an
-             (substr ($url, 0, 7) === "http://" ||
+        // error
-              substr ($url, 0, 8) === "https://"))
-          $this->sitemaps[] = $url;
-        else
-          $this->errors[$i] = dgettext ("domframework",
-            "Sitemap : Invalid URL provided");
       }
       elseif (stripos ($line, "Host:") === 0)
       {

route.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/http.php");
 require_once ("domframework/ratelimitfile.php");
 

routeSQL.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/route.php");
 require_once ("domframework/form.php");
 require_once ("domframework/renderer.php");

rss.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/verify.php");
 require_once ("domframework/convert.php");
 

sitemap.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** This class allow to read the sitemaps files available in websites, and give
   * the available URL and parameters
   */

smtp.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Allow to send mails by smtp
   */
 class smtp

spfcheck.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require ("domframework/ipaddresses.php");
 
 /** This class allow to get a SPF record for a domain and check an IP against

sse.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** This class allow to manage Server-Sent Events
   * The browser will be connected to a not ending loop. This loop will send
   * ping regularly. If the backend value change, it will be sent to the

tcpclient.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** TCP Client
   * Allow to create TCP connections to a server.
   * If both IPv6 and IPv4 are allowed by the server, try in IPv6 then back in

tcpserver.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** This class allow to start a TCP server and call a function each time a
   * client is connected on it. Each client is separated in a child, so the
   * server allow to have multiple simultaneous connections.

tools/sqlMigrate.php

@@ -14,6 +14,7 @@
   * informations will be stored. The file will be created if it doesn't exists.
   */
 
+require_once ("domframework/console.php");
 require_once ("domframework/dblayeroo.php");
 require_once ("domframework/getopts.php");
 require_once ("domframework/config.php");
@@ -56,13 +57,32 @@ class main
     */
   public function __construct ()
   {
-    global $argv;
+    // Manage the Getopts
-    if (! key_exists (1, $argv))
+    $getopts = new getopts ();
+    $getopts->add ("Help", "?h", array ("help"), "Help of the software");
+    $getopts->add ("Step", "", array ("step:"), "Restart at provided step",
+      "StepIdentifier");
+    $getopts->add ("Debug", "", array ("debug"), "Display the SQL requests");
+    $getopts->add ("Execute", "", array ("execute"),
+      "Execute the configuration without requesting data (start at step 5)");
+    if ($getopts->get ("Help"))
+      die ($getopts->help ());
+    if ($getopts->get ("Step"))
+    {
+      if (intval ($getopts->get ("Step")) < 0 ||
+          intval ($getopts->get ("Step")) > 6)
+        die ("Invalid Step provided (Must be between 0 and 6)\n");
+    }
+    if (empty ($getopts->restOfLine ()))
       throw new Exception ("No configuration file provided");
-    if (! file_exists ($argv[1]))
+    if (count ($getopts->restOfLine ()) > 1)
-      touch ($argv[1]);
+      throw new Exception ("Too much configuration file provided");
+    $configurationFile = current ($getopts->restOfLine ());
+    if (! file_exists ($configurationFile))
+      touch ($configurationFile);
     $config = new configuration ();
-    $config->confFile = $argv[1];
+    $config->confFile = $configurationFile;
+
     $db = $config->get ("db");
     $tables = $config->get ("tables");
     $tablesRel = $config->get ("tablesRel");
@@ -84,7 +104,11 @@ class main
     else
       $step = 6;
 
-    // TODO : Overload here the steps with the getopts
+    if ($getopts->get ("Step"))
+      $step = intval ($getopts->get ("Step"));
+    if ($getopts->get ("Execute"))
+      $step = 5;
+
     if ($step === 0)
     {
       // Step 0: ask the connection parameters
@@ -177,7 +201,10 @@ class main
       echo "# For each destination table, if a source table is provided,\n".
            "# for each field, provide the source SQL request (can be field,\n".
            "# CONCAT(), text between simple quotes, null...)\n";
-      $value = array ();
+      if ($config->get("fields"))
+        $value = $config->get("fields");
+      else
+        $value = array ();
       foreach ($tablesRel as $dstTable=>$srcTable)
       {
         echo "- Destination Table '$dstTable': ";
@@ -199,11 +226,14 @@ class main
             $value[$dstTable][$field] = "";
           while (1)
           {
-            $value[$dstTable][$field] = $this->ask (
+            $oldval = (isset ($config->get("fields")[$dstTable][$field])) ?
-              "Destination Table '$dstTable' field '$field'");
+               $config->get("fields")[$dstTable][$field] : "";
+            $answer = $this->ask (
+              "Destination Table '$dstTable' field '$field'", $oldval);
+            $value[$dstTable][$field] = $answer;
             if (trim ($value[$dstTable][$field]) !== "")
-              continue 2;
+              break;
-            // TODO : Check if the field is provided (think about function)
+            // TODO : Check if the field is valid (think about function)
             $this->error ("The field source must be defined !");
           }
         }
@@ -303,12 +333,15 @@ class main
         $dstDB->primary ($dstSchema["primary"]);
         foreach ($srcDB->directQuery ($sql) as $row)
         {
-          echo ".";
           //print_r ($row);
           $dstDB->clearRequest ();
           $dstDB->insert ()
-                ->setValues ($row)
+                ->setValues ($row);
-                ->execute ();
+          if (! $getopts->get ("Debug"))
+            echo ".";
+          else
+            echo $dstDB->getDisplayQuery ();
+          $dstDB->execute ();
         }
         echo "\n";
       }
@@ -322,12 +355,11 @@ class main
     * @param string $question the question message
     * @return string The answer
     */
-  public function ask ($question)
+  public function ask ($question, $proposal = "")
   {
-    echo "$question: ";
+    $console = new console ();
-    $fp = fopen ("php://stdin", "r");
+    $console->echo ("$question: ");
-    $rc = trim (fgets ($fp));
+    return trim ($console->readline ($proposal));
-    return $rc;
   }
 
   /** Display an error to the user

users.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** The abstraction class of the users
   * Allow to manage the users in multiple storages (SQL, HTPasswd, passwd file).
   * CRUD the users and allow to modify the password

userssql.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/dblayer.php");
 require_once ("domframework/users.php");
 

uuid.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Generate a UUID v4
   */
 class uuid

verify.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Permit to check the validity of fields
   */
 class verify

version.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** This is the version of DomFramework.
   * It can be used to test if the framework is uptodate for the application
   * with :

xdiff.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 /** Create a diff from two strings, array or files
   * The output is compatible with "patch" command.
   */

xmppclient.php

@@ -5,6 +5,8 @@
   * @license BSD
   */
 
+//namespace Domframework;
+
 require_once ("domframework/tcpclient.php");
 
 /** This class allow to send XMPP messages to a server.