*/
protected $linkDB;
+ /**
+ * @var ConfigManager $conf Configuration Manager instance.
+ */
+ protected $conf;
+
/**
* @var bool True if the user is logged in, false otherwise.
*/
/**
* Object constructor.
*
- * @param array $doneUpdates Updates which are already done.
- * @param LinkDB $linkDB LinkDB instance.
- * @param boolean $isLoggedIn True if the user is logged in.
+ * @param array $doneUpdates Updates which are already done.
+ * @param LinkDB $linkDB LinkDB instance.
+ * @param ConfigManager $conf Configuration Manager instance.
+ * @param boolean $isLoggedIn True if the user is logged in.
*/
- public function __construct($doneUpdates, $linkDB, $isLoggedIn)
+ public function __construct($doneUpdates, $linkDB, $conf, $isLoggedIn)
{
$this->doneUpdates = $doneUpdates;
$this->linkDB = $linkDB;
+ $this->conf = $conf;
$this->isLoggedIn = $isLoggedIn;
// Retrieve all update methods.
*/
public function updateMethodMergeDeprecatedConfigFile()
{
- $conf = ConfigManager::getInstance();
-
- if (is_file($conf->get('path.data_dir') . '/options.php')) {
- include $conf->get('path.data_dir') . '/options.php';
+ if (is_file($this->conf->get('resource.data_dir') . '/options.php')) {
+ include $this->conf->get('resource.data_dir') . '/options.php';
// Load GLOBALS into config
$allowedKeys = array_merge(ConfigPhp::$ROOT_KEYS);
$allowedKeys[] = 'config';
foreach ($GLOBALS as $key => $value) {
if (in_array($key, $allowedKeys)) {
- $conf->set($key, $value);
+ $this->conf->set($key, $value);
}
}
- $conf->write($this->isLoggedIn);
- unlink($conf->get('path.data_dir').'/options.php');
+ $this->conf->write($this->isLoggedIn);
+ unlink($this->conf->get('resource.data_dir').'/options.php');
}
return true;
*/
public function updateMethodRenameDashTags()
{
- $conf = ConfigManager::getInstance();
$linklist = $this->linkDB->filterSearch();
- foreach ($linklist as $link) {
+ foreach ($linklist as $key => $link) {
$link['tags'] = preg_replace('/(^| )\-/', '$1', $link['tags']);
$link['tags'] = implode(' ', array_unique(LinkFilter::tagsStrToArray($link['tags'], true)));
- $this->linkDB[$link['linkdate']] = $link;
+ $this->linkDB[$key] = $link;
}
- $this->linkDB->savedb($conf->get('path.page_cache'));
+ $this->linkDB->save($this->conf->get('resource.page_cache'));
return true;
}
*/
public function updateMethodConfigToJson()
{
- $conf = ConfigManager::getInstance();
-
// JSON config already exists, nothing to do.
- if ($conf->getConfigIO() instanceof ConfigJson) {
+ if ($this->conf->getConfigIO() instanceof ConfigJson) {
return true;
}
$configPhp = new ConfigPhp();
$configJson = new ConfigJson();
- $oldConfig = $configPhp->read($conf::$CONFIG_FILE . '.php');
- rename($conf->getConfigFile(), $conf::$CONFIG_FILE . '.save.php');
- $conf->setConfigIO($configJson);
- $conf->reload();
+ $oldConfig = $configPhp->read($this->conf->getConfigFile() . '.php');
+ rename($this->conf->getConfigFileExt(), $this->conf->getConfigFile() . '.save.php');
+ $this->conf->setConfigIO($configJson);
+ $this->conf->reload();
$legacyMap = array_flip(ConfigPhp::$LEGACY_KEYS_MAPPING);
foreach (ConfigPhp::$ROOT_KEYS as $key) {
- $conf->set($legacyMap[$key], $oldConfig[$key]);
+ $this->conf->set($legacyMap[$key], $oldConfig[$key]);
}
// Set sub config keys (config and plugins)
} else {
$configKey = $sub .'.'. $key;
}
- $conf->set($configKey, $value);
+ $this->conf->set($configKey, $value);
}
}
try{
- $conf->write($this->isLoggedIn);
+ $this->conf->write($this->isLoggedIn);
return true;
} catch (IOException $e) {
error_log($e->getMessage());
* Escape settings which have been manually escaped in every request in previous versions:
* - general.title
* - general.header_link
- * - extras.redirector
+ * - redirector.url
*
* @return bool true if the update is successful, false otherwise.
*/
- public function escapeUnescapedConfig()
+ public function updateMethodEscapeUnescapedConfig()
{
- $conf = ConfigManager::getInstance();
try {
- $conf->set('general.title', escape($conf->get('general.title')));
- $conf->set('general.header_link', escape($conf->get('general.header_link')));
- $conf->set('extras.redirector', escape($conf->get('extras.redirector')));
- $conf->write($this->isLoggedIn);
+ $this->conf->set('general.title', escape($this->conf->get('general.title')));
+ $this->conf->set('general.header_link', escape($this->conf->get('general.header_link')));
+ $this->conf->set('redirector.url', escape($this->conf->get('redirector.url')));
+ $this->conf->write($this->isLoggedIn);
} catch (Exception $e) {
error_log($e->getMessage());
return false;
}
return true;
}
+
+ /**
+ * Update the database to use the new ID system, which replaces linkdate primary keys.
+ * Also, creation and update dates are now DateTime objects.
+ *
+ * Since this update is very sensitve (changing the whole database), the datastore will be
+ * automatically backed up into the file datastore.<datetime>.php.
+ *
+ * @return bool true if the update is successful, false otherwise.
+ */
+ public function updateMethodDatastoreIds()
+ {
+ // up to date database
+ if (isset($this->linkDB[0])) {
+ return true;
+ }
+
+ $save = $this->conf->get('resource.data_dir') .'/datastore.'. date('YmdHis') .'.php';
+ copy($this->conf->get('resource.datastore'), $save);
+
+ $links = array();
+ foreach ($this->linkDB as $offset => $value) {
+ $links[] = $value;
+ unset($this->linkDB[$offset]);
+ }
+ $links = array_reverse($links);
+ $cpt = 0;
+ foreach ($links as $l) {
+ $l['created'] = DateTime::createFromFormat('Ymd_His', $l['linkdate']);
+ if (! empty($l['updated'])) {
+ $l['updated'] = DateTime::createFromFormat('Ymd_His', $l['updated']);
+ }
+ unset($l['linkdate']);
+ $l['id'] = $cpt;
+ $this->linkDB[$cpt++] = $l;
+ }
+
+ $this->linkDB->save($this->conf->get('resource.page_cache'));
+ $this->linkDB->reorder();
+
+ return true;
+ }
}
/**
projects / github / shaarli / Shaarli.git / blobdiff