Refactor

lizmap/modules/admin/controllers/maps.classic.php

@@ -547,7 +547,7 @@ public function removeSection()
     public function removeCache()
     {
         $repository = $this->param('repository');
-        $repoKey = lizmapProxy::clearCache($repository);
+        $repoKey = \Lizmap\Request\Proxy::clearCache(lizmap::getRepository($repository));
         if ($repoKey) {
             jMessage::add(jLocale::get('admin~admin.cache.repository.removed', array($repoKey)));
         }
@@ -595,7 +595,7 @@ public function removeLayerCache()
             $lproj->clearCache();
 
             // Remove the cache for the layer
-            lizmapProxy::clearLayerCache($repository, $project, $layer);
+            \Lizmap\Request\Proxy::clearLayerCache($repository, $project, $layer);
 
             jMessage::add(jLocale::get('admin~admin.cache.layer.removed', array($layer)));
 

lizmap/modules/admin/templates/maps.tpl

@@ -21,7 +21,7 @@
                 <dd>
                     <table class="table">
                         {assign $section = 'repository:'.$repo->getKey()}
-                        {assign $properties = $repo->getRepoProperties()}
+                        {assign $properties = $repo->getProperties()}
                         {foreach $properties as $prop}
                             <tr>
                                 {if $prop == 'path' && $rootRepositories != ''}

lizmap/modules/dataviz/classes/datavizPlot.class.php

@@ -450,7 +450,7 @@ public function fetchData($method = 'wfs', $exp_filter = '')
                 $wfsparams['EXP_FILTER'] = $exp_filter;
             }
 
-            $wfsrequest = new lizmapWFSRequest($this->lproj, $wfsparams);
+            $wfsrequest = new \Lizmap\Request\WFSRequest($this->lproj, $wfsparams, lizmap::getServices(), lizmap::getAppContext());
             $wfsresponse = $wfsrequest->getfeature();
             $features = null;
 

lizmap/modules/dynamicLayers/controllers/map.classic.php

@@ -49,7 +49,7 @@ public function index()
         $querystring = $url.$rparams;
 
         // Get remote data
-        list($data, $mime, $code) = lizmapProxy::getRemoteData($querystring);
+        list($data, $mime, $code) = \Lizmap\Request\Proxy::getRemoteData($querystring);
 
         // Get returned response and redirect to appropriate project page
         $json = json_decode($data);

lizmap/modules/lizmap/classes/lizmap.class.php

@@ -9,6 +9,12 @@
  *
  * @license Mozilla Public License : http://www.mozilla.org/MPL/
  */
+
+use Lizmap\Logger as Log;
+
+/**
+ * @deprecated
+ */
 class UnknownLizmapProjectException extends Exception
 {
 }
@@ -29,12 +35,21 @@ class lizmap
      */
     protected static $repositoryInstances = array();
 
-    // lizmapServices instance
+    /**
+     * @var lizmapServices The lizmapServices instance for the singleton
+     */
     protected static $lizmapServicesInstance = null;
 
-    // lizmapLogConfigInstance
+    /**
+     * @var lizmapLogConfig The lizmapLogConfig instance for the singleton
+     */
     protected static $lizmapLogConfigInstance = null;
 
+    /**
+     * @var lizmapJelixContext The jelixContext instance for the singleton
+     */
+    protected static $appContext = null;
+
     /**
      * this is a static class, so private constructor.
      */
@@ -52,12 +67,21 @@ public static function getServices()
             $globalConfig = jApp::config();
             $ldapEnabled = jApp::isModuleEnabled('ldapdao');
             $varPath = jApp::varPath();
-            self::$lizmapServicesInstance = new lizmapServices($lizmapConfigTab, $globalConfig, $ldapEnabled, $varPath);
+            self::$lizmapServicesInstance = new lizmapServices($lizmapConfigTab, $globalConfig, $ldapEnabled, $varPath, self::getAppContext());
         }
 
         return self::$lizmapServicesInstance;
     }
 
+    public static function getAppContext()
+    {
+        if (!self::$appContext) {
+            self::$appContext = new \Lizmap\App\JelixContext();
+        }
+
+        return self::$appContext;
+    }
+
     public static function saveServices()
     {
         $ini = new jIniFileModifier(jApp::configPath('lizmapConfig.ini.php'));
@@ -149,7 +173,7 @@ public static function constructRepositoryForm($rep, $form)
         }
 
         // reconstruct form fields based on repositoryPropertyList
-        $propertiesOptions = lizmapRepository::getPropertiesOptions();
+        $propertiesOptions = lizmapRepository::getRepoProperties();
 
         foreach (lizmapRepository::getProperties() as $k) {
             $ctrl = null;
@@ -359,7 +383,7 @@ public static function getLogConfig()
     {
         if (!self::$lizmapLogConfigInstance) {
             $readConfigPath = parse_ini_file(jApp::varPath().self::$lizmapLogConfig, true);
-            self::$lizmapLogConfigInstance = new lizmapLogConfig($readConfigPath);
+            self::$lizmapLogConfigInstance = new Log\Config($readConfigPath, self::getAppContext(), jApp::configPath('lizmapLogConfig.ini.php'));
         }
 
         return self::$lizmapLogConfigInstance;
@@ -372,7 +396,7 @@ public static function getLogConfig()
      */
     public static function getLogItemProperties()
     {
-        return lizmapLogItem::getSProperties();
+        return Log\Item::getSProperties();
     }
 
     /**

lizmap/modules/lizmap/classes/lizmapLog.listener.php

@@ -78,7 +78,7 @@ public function addLog($key, $data)
 
             // user who modified the line
             if (!array_key_exists('user', $data)) {
-                $juser = jAuth::getUserSession();
+                $juser = \jAuth::getUserSession();
                 $data['user'] = $juser->login;
             }
 

lizmap/modules/lizmap/classes/lizmapLogConfig.class.php

@@ -9,59 +9,39 @@
  *
  * @license Mozilla Public License : http://www.mozilla.org/MPL/
  */
-class lizmapLogConfig
-{
-    // Lizmap log configuration data
-    private $data = array();
-
-    // general properties
-    private $properties = array(
-        'active',
-        'profile',
-    );
 
-    // list of the logItems of the ini file
-    protected $logItems = array();
-    // If the log is active globally or not
-    private $active = '';
+use Lizmap\Logger as Log;
 
-    // database profile
-    private $profile = '';
+/**
+ * @deprecated
+ */
+class lizmapLogConfig
+{
+    /**
+     * @var Log\Config;
+     */
+    protected $config;
 
-    public function __construct($readConfigPath)
+    public function __construct($readConfigPath, $appContext, $iniFile)
     {
-        $this->data = $readConfigPath;
-
-        // set generic parameters
-        foreach ($this->properties as $prop) {
-            if (isset($readConfigPath['general'][$prop])) {
-                $this->{$prop} = $readConfigPath['general'][$prop];
-            }
-        }
+        $this->config = new Log\Config($readConfigPath, $appContext, $iniFile);
     }
 
     public function getProperties()
     {
-        return $this->properties;
+        return $this->config->getProperties();
     }
 
     /**
      * Get a log item.
      *
      * @param string $key Key of the log item to get
      *
-     * @return lizmapLogItem
+     * @return lizmapLogItem|Log\Item
      */
     public function getLogItem($key)
     {
-        if (!key_exists($key, $this->logItems)) {
-            if (!key_exists('item:'.$key, $this->data)) {
-                return null;
-            }
-            $this->logItems[$key] = new lizmapLogItem($key, $this->data['item:'.$key]);
-        }
-
-        return $this->logItems[$key];
+        return $this->config->getLogItem($key);
     }
 
     /**
@@ -71,16 +51,7 @@ public function getLogItem($key)
      */
     public function getLogItemList()
     {
-        $logItemList = array();
-
-        foreach ($this->data as $section => $data) {
-            $match = preg_match('#(^item:)#', $section, $matches);
-            if (isset($matches[0])) {
-                $logItemList[] = str_replace($matches[0], '', $section);
-            }
-        }
-
-        return $logItemList;
+        return $this->config->getLogItemList();
     }
 
     /**
@@ -90,19 +61,7 @@ public function getLogItemList()
      */
     public function modify($data)
     {
-        $modified = false;
-        if (!$data) {
-            return $modified;
-        }
-        foreach ($data as $k => $v) {
-            if (in_array($k, $this->properties)) {
-                $this->data['general'][$k] = $v;
-                $this->{$k} = $v;
-                $modified = true;
-            }
-        }
-
-        return $modified;
+        return $this->config->modify($data);
     }
 
     /**
@@ -113,12 +72,7 @@ public function modify($data)
      */
     public function update($data, $ini = null)
     {
-        $modified = $this->modify($data);
-        if ($modified) {
-            $modified = $this->save($ini);
-        }
-
-        return $modified;
+        return $this->config->update($data, $ini);
     }
 
     /**
@@ -128,21 +82,6 @@ public function update($data, $ini = null)
      */
     public function save($ini = null)
     {
-        if (!$ini) {
-            $iniFile = jApp::configPath('lizmapLogConfig.ini.php');
-            $ini = new jIniFileModifier($iniFile);
-        }
-        foreach ($this->properties as $prop) {
-            if ($this->{$prop} !== '' && $this->{$prop} !== null) {
-                $ini->setValue($prop, $this->{$prop}, 'general');
-            } else {
-                $ini->removeValue($prop, 'general');
-            }
-        }
-
-        // Save the ini file
-        $ini->save();
-
-        return $ini->isModified();
+        return $this->config->save($ini);
     }
 }