Changeset 2319:abe2702e1585

Timestamp:

10/09/13 08:37:56 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

default

Message:

Move ex-daInstaller settings to core and install and upgrade

Files:

• admin/blog_theme.php (modified) (1 diff)
• admin/install/index.php (modified) (1 diff)
• admin/plugins.php (modified) (2 diffs)
• inc/core/class.dc.store.reader.php (modified) (1 diff)
• inc/dbschema/upgrade.php (modified) (3 diffs)
• inc/prepend.php (modified) (1 diff)

admin/blog_theme.php

@@ -15 +15 @@
 dcPage::check('admin');
 
-# -- "First time" settings setup --
-if ($core->blog->settings->system->store_theme_url === null) {
-     $core->blog->settings->system->put(
-          'store_theme_url', 'http://update.dotaddict.org/dc2/themes.xml', 'string', 'Themes XML feed location', true, true
-     );
-}
-
 # -- Loading themes --
 $core->themes = new dcThemes($core);

admin/install/index.php

@@ -162 +162 @@
           $blog_settings->system->put('date_formats',serialize($date_formats),'string','Date formats examples',true);
           $blog_settings->system->put('time_formats',serialize($time_formats),'string','Time formats examples',true);
-
+          
+          # Add repository URL for themes and plugins
+          $blog_settings->system->put('store_plugin_url','http://update.dotaddict.org/dc2/plugins.xml','string','Plugins XML feed location',true);
+          $blog_settings->system->put('store_theme_url','http://update.dotaddict.org/dc2/themes.xml','string','Themes XML feed location',true);
+          
           # Add Dotclear version
           $cur = $core->con->openCursor($core->prefix.'version');

admin/plugins.php

@@ -15 +15 @@
 dcPage::check('admin');
 
-# -- "First time" settings setup --
-if ($core->blog->settings->system->plugins_allow_multi_install === null) {
-     $core->blog->settings->system->put(
-          'plugins_allow_multi_install', false, 'boolean', 'Allow multi-installation for plugins', true, true
-     );
-}
-if ($core->blog->settings->system->store_plugin_url === null) {
-     $core->blog->settings->system->put(
-          'store_plugin_url', 'http://update.dotaddict.org/dc2/plugins.xml', 'string', 'Plugins XML feed location', true, true
-     );
-}
-
 # -- Page helper --
 $list = new adminModulesList(
@@ -34 +22 @@
 );
 
-adminModulesList::$allow_multi_install = $core->blog->settings->system->plugins_allow_multi_install;
+adminModulesList::$allow_multi_install = (boolean) DC_ALLOW_MULTI_MODULES;
 adminModulesList::$distributed_modules = explode(',', DC_DISTRIB_PLUGINS);
 

inc/core/class.dc.store.reader.php

@@ -148 +148 @@
           $this->setAuthorization($user, $pass);
 
-          return $this->get($path);
+          try {
+               return $this->get($path);
+          }
+          catch(Exception $e) {
+               // @todo Log error when repository query fail
+               return false;
+          }
      }
 

inc/dbschema/upgrade.php

@@ -361 +361 @@
                     }
 
-                    # add new settings for date and time formats
+                    # Some settings change, prepare db queries
+                    $strReqFormat = 'INSERT INTO '.$core->prefix.'setting';
+                    $strReqFormat .= ' (setting_id,setting_ns,setting_value,setting_type,setting_label)';
+                    $strReqFormat .= ' VALUES(\'%s\',\'system\',\'%s\',\'string\',\'%s\')';
+
+                    $strReqSelect = 'SELECT count(1) FROM '.$core->prefix.'setting';
+                    $strReqSelect .= ' WHERE setting_id = \'%s\'';
+                    $strReqSelect .= ' AND setting_ns = \'system\'';
+                    $strReqSelect .= ' AND blog_id IS NULL';
+
+                    # Add date and time formats
                     $date_formats = array('%Y-%m-%d','%m/%d/%Y','%d/%m/%Y','%Y/%m/%d','%d.%m.%Y','%b %e %Y','%e %b %Y','%Y %b %e',
                     '%a, %Y-%m-%d','%a, %m/%d/%Y','%a, %d/%m/%Y','%a, %Y/%m/%d','%B %e, %Y','%e %B, %Y','%Y, %B %e','%e. %B %Y',
@@ -372 +382 @@
                     }
 
-                    $strReqFormat = 'INSERT INTO '.$core->prefix.'setting';
-                    $strReqFormat .= ' (setting_id,setting_ns,setting_value,setting_type,setting_label)';
-                    $strReqFormat .= ' VALUES(\'%s\',\'system\',\'%s\',\'string\',\'%s\')';
-                    
-                    $strReqSelect = 'SELECT count(1) FROM '.$core->prefix.'setting';
-                    $strReqSelect .= ' WHERE setting_id = \'%s\'';
-                    $strReqSelect .= ' AND setting_ns = \'system\'';
-                    $strReqSelect .= ' AND blog_id IS NULL';
-
                     $rs = $core->con->select(sprintf($strReqSelect,'date_formats'));
                     if ($rs->f(0)==0) {
@@ -390 +391 @@
                          $strReq = sprintf($strReqFormat,'time_formats',serialize($time_formats),'Time formats examples');
                          $core->con->execute($strReq);
+                    }
+
+                    # Add repository URL for themes and plugins as daInstaller move to core
+                    $rs = $core->con->select(sprintf($strReqSelect,'store_plugin_url'));
+                    if ($rs->f(0)==0) {
+                         $strReq = sprintf($strReqFormat,'store_plugin_url','http://update.dotaddict.org/dc2/plugins.xml','Plugins XML feed location');
+                         $core->con->execute($strReq);                      
+                    }
+                    $rs = $core->con->select(sprintf($strReqSelect,'store_theme_url'));
+                    if ($rs->f(0)==0) {
+                         $strReq = sprintf($strReqFormat,'store_theme_url','http://update.dotaddict.org/dc2/themes.xml','Themes XML feed location');
+                         $core->con->execute($strReq);                      
                     }
                }

inc/prepend.php

@@ -167 +167 @@
 if (!defined('DC_UPDATE_VERSION')) {
      define('DC_UPDATE_VERSION','stable');
+}
+
+if (!defined('DC_ALLOW_MULTI_MODULES')) {
+     define('DC_ALLOW_MULTI_MODULES',false);
 }