cke plugin - black cat thirteen

This commit is contained in:
Ian 2016-05-17 16:57:54 +02:00
parent 0e4de59153
commit 5fc549d33f
6 changed files with 27 additions and 18 deletions

View file

@ -1,3 +1,8 @@
4.5.9.0:
-----
* Changed upgrade hint for lang files lang_<en> and lang_<de>
* Upgrade to CKEDITOR 4.5. Series, update 9 (http://ckeditor.com/whatsnew).
4.5.8.1:
-----
* Remove accidently added Thumbs.db file

View file

@ -1,8 +1,8 @@
<?php
/**
* @file UTF-8/lang_de.inc.php 1.4.13 2016-02-06 Ian
* @version 1.4.12
* @file UTF-8/lang_de.inc.php 1.4.14 2016-05-11 Ian
* @version 1.4.14
* @author Translator Name <yourmail@example.com>
* DE-Revision: Revision of UTF-8/lang_de.inc.php
*/
@ -27,7 +27,8 @@
<h3>Upgrading</h3>
<p>Dieses Plugin wird zeitnah selber Updates via Spartacus bereitstellen.</p>
<p>Es ist nicht zu raten, ein eigenes customized CKEDITOR release zu erstellen und herunterzuladen, da dies zu unerwünschten Nebenwirkungen in der Einbindung führt.</p>
<p>Bitte nutzen Sie keinen automatischen Bulk Updater, sofern in ihrer S9y Version schon vorhanden, sondern führen Sie das Upgrade des CKEditors einzeln durch, um für die internen ZIP-Installer Operationen in diese Konfiguration weiter geleitet zu werden.</p>
<p>Es ist generell abzuraten, ein eigenes "customized" CKEDITOR release zu erstellen und herunterzuladen, da dies zu unerwünschten Nebenwirkungen in der Einbindung führt.</p>
</div>');
@define('PLUGIN_EVENT_CKEDITOR_CONFIG', '');
@define('PLUGIN_EVENT_CKEDITOR_INSTALL_PLUGPATH', 'HTTP Pfad des S9y Plugins Verzeichnisses');

View file

@ -1,8 +1,8 @@
<?php
/**
* @file lang_de.inc.php 1.4.13 2016-02-06 Ian
* @version 1.4.12
* @file lang_de.inc.php 1.4.14 2016-05-11 Ian
* @version 1.4.14
* @author Translator Name <yourmail@example.com>
* DE-Revision: Revision of lang_de.inc.php
*/
@ -27,7 +27,8 @@
<h3>Upgrading</h3>
<p>Dieses Plugin wird zeitnah selber Updates via Spartacus bereitstellen.</p>
<p>Es ist nicht zu raten, ein eigenes customized CKEDITOR release zu erstellen und herunterzuladen, da dies zu unerwünschten Nebenwirkungen in der Einbindung führt.</p>
<p>Bitte nutzen Sie keinen automatischen Bulk Updater, sofern in ihrer S9y Version schon vorhanden, sondern führen Sie das Upgrade des CKEditors einzeln durch, um für die internen ZIP-Installer Operationen in diese Konfiguration weiter geleitet zu werden.</p>
<p>Es ist generell abzuraten, ein eigenes "customized" CKEDITOR release zu erstellen und herunterzuladen, da dies zu unerwünschten Nebenwirkungen in der Einbindung führt.</p>
</div>');
@define('PLUGIN_EVENT_CKEDITOR_CONFIG', '');
@define('PLUGIN_EVENT_CKEDITOR_INSTALL_PLUGPATH', 'HTTP Pfad des S9y Plugins Verzeichnisses');

View file

@ -1,8 +1,8 @@
<?php
/**
* @file lang_en.inc.php 1.4.13 2016-02-06 Ian
* @version 1.4.12
* @file lang_en.inc.php 1.4.14 2016-05-11 Ian
* @version 1.4.14
* @author Translator Name <yourmail@example.com>
* EN-Revision: Revision of lang_en.inc.php
*/
@ -27,7 +27,8 @@
<h3>Upgrading</h3>
<p>This Plugin will provide Updates via Spartacus close to new CKEDITOR releases.</p>
<p>It is not advised to use or install any customized CKEDITOR releases, since this will lead to undesirable side effects with this Plugins configuration.</p>
<p>Please do not use any automatic plugin bulk update, if already available with your S9y version. Upgrade the CKEditor plugin singulary in list, to allow the internal routines to immediately fall back into this configuration, to run and deflate the ZIP-installer operations.</p>
<p>It is generally not advised to use or install any "customized" CKEDITOR releases, since this will lead to undesirable side effects with this Plugins configuration.</p>
</div>');
@define('PLUGIN_EVENT_CKEDITOR_CONFIG', '');
@define('PLUGIN_EVENT_CKEDITOR_INSTALL_PLUGPATH', 'HTTP path to s9y plugins directory');

View file

@ -49,23 +49,23 @@ class serendipity_event_ckeditor extends serendipity_event
* @access protected
* @var string
*/
protected $cke_zipfile = 'ckeditor_4.5.8.1-plus.zip';
protected $cke_zipfile = 'ckeditor_4.5.9.0-plus.zip';
/**
* Access property checkUpdateVersion
* Verify release package versions - do update on upgrades!
* @var array
*/
protected $checkUpdateVersion = array('ckeditor:4.5.8.1');
protected $checkUpdateVersion = array('ckeditor:4.5.9.0');
/**
* Access property revisionPackage
* Note revisions of ckeditor and plugin additions to lang files
* @var array
*/
protected $revisionPackage = array('CKEditor 4.5.8 (revision c1fc9a9, full package, 2016-03-31)',
protected $revisionPackage = array('CKEditor 4.5.9 (revision a35abfe, full package, 2016-05-13)',
'CKEditor-Plugin: mediaembed, v. 0.6+ (https://github.com/frozeman/MediaEmbed, 2014-03-13)',
'CKEditor-Plugin: manually added codesnippet, fakeobjects, lineutils and widget plugins, 2016-03-31)',
'CKEditor-Plugin: manually added codesnippet, fakeobjects, lineutils and widget plugins, 2016-05-13)',
'CKEditor-Plugin: procurator, v. 1.6 (Serendipity placeholder Plugin, 2016-01-01)',
'CKEditor-Plugin: cheatsheet, v. 1.2 (Serendipity CKE-Cheatsheet Plugin, 2015-01-28)',
'CKEditor-S9yCustomConfig, cke_config.js, v. 2.5, 2016-01-01',
@ -118,8 +118,9 @@ class serendipity_event_ckeditor extends serendipity_event
@unlink($this->cke_path . '/UTF-8/documentation_cz.html');
@unlink($this->cke_path . '/UTF-8/lang_en.inc.php');
@unlink($this->cke_path . '/UTF-8/documentation_cs.html');
// purge accidently added Thumbs.db file with 4.5.8.0 throwing errors on unzip
// purge accidently added Thumbs.db file with 4.5.8.0/1 throwing errors on unzip
@unlink($this->cke_path . '/ckeditor/plugins/codesnippet/icons/hidpi/Thumbs.db');
@unlink($this->cke_path . '/ckeditor/plugins/procurator/images/Thumbs.db');
}
// remove widget/dev samples directory
if (is_file(dirname(__FILE__) . '/ckeditor/plugins/widget/dev/console.js')) {
@ -180,7 +181,7 @@ class serendipity_event_ckeditor extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_CKEDITOR_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Rustam Abdullaev, Ian');
$propbag->add('version', '4.5.8.1'); // is CKEDITOR Series 4.5.8 - and appended plugin revision .1
$propbag->add('version', '4.5.9.0'); // is CKEDITOR Series 4.5.9 - and appended plugin revision .0
$propbag->add('copyright', 'GPL or LGPL License');
$propbag->add('requirements', array(
'serendipity' => '1.7',
@ -357,7 +358,7 @@ class serendipity_event_ckeditor extends serendipity_event
WHERE plugin_class = '" . serendipity_db_escape_string('serendipity_event_ckeditor') . "'
LIMIT 1", true, 'assoc');
$versions = array('4.5.8.0', '4.5.8.1'); // keep prior and current version false check only
$versions = array($oldVersion, $newVersion); // keep prior and current versions false check
if (in_array($row['version'], $versions)) return false;
serendipity_db_query("UPDATE {$serendipity['dbPrefix']}pluginlist
@ -375,7 +376,7 @@ class serendipity_event_ckeditor extends serendipity_event
*/
private function updateTableZip()
{
$this->temporaryDowngrade('4.5.8.1', '4.5.8.0'); // temporary
$this->temporaryDowngrade('4.5.9.0', '4.5.8.1'); // temporary
foreach(array_values($this->checkUpdateVersion) AS $package) {
$match = explode(':', $package);
$this->set_config('last_'.$match[0].'_version', $match[1]);
@ -389,7 +390,7 @@ class serendipity_event_ckeditor extends serendipity_event
*/
private function checkUpdate()
{
$this->temporaryDowngrade('4.5.8.1', '4.5.8.0'); // temporary
$this->temporaryDowngrade('4.5.9.0', '4.5.8.1'); // temporary
$doupdate = false;
foreach(array_values($this->checkUpdateVersion) AS $package) {
$match = explode(':', $package);