[Php-blog-plugin-cvs] additional_plugins/serendipity_event_ckeditor ckeditor_4.2.3.3_standard-plus.
A reliable, secure & extensible PHP blog | Not mainstream since 2002
Brought to you by:
garvinhicking,
jhermanns
Menu
▾
▴
[Php-blog-plugin-cvs] additional_plugins/serendipity_event_ckeditor ckeditor_4.2.3.3_standard-plus.zip, NONE, 1.1 ChangeLog, 1.10, 1.11 lang_de.inc.php, 1.9, 1.10 lang_en.inc.php, 1.9, 1.10 serendipity_event_ckeditor.php, 1.14, 1.15 ckeditor_4.2.3.2_standard-plus.zip, 1.1, NONE
|
From: Garvin H. <gar...@us...> - 2013-12-10 01:32:19
|
Update of /cvsroot/php-blog/additional_plugins/serendipity_event_ckeditor In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16228/serendipity_event_ckeditor Modified Files: ChangeLog lang_de.inc.php lang_en.inc.php serendipity_event_ckeditor.php Added Files: ckeditor_4.2.3.3_standard-plus.zip Removed Files: ckeditor_4.2.3.2_standard-plus.zip Log Message: gitclone.sh autocommit Index: lang_de.inc.php =================================================================== RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_ckeditor/lang_de.inc.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- lang_de.inc.php 9 Dec 2013 01:33:12 -0000 1.9 +++ lang_de.inc.php 10 Dec 2013 01:32:16 -0000 1.10 @@ -1,8 +1,8 @@ <?php # /** - * @file UTF-8/lang_de.inc.php 1.4.3 2013-12-08 Ian - * @version 1.4.3 + * @file UTF-8/lang_de.inc.php 1.4.4 2013-12-09 Ian + * @version 1.4.4 * @author Translator Name <you...@ex...> * DE-Revision: Revision of lang_de.inc.php */ @@ -12,24 +12,23 @@ @define('PLUGIN_EVENT_CKEDITOR_REVISION_TITLE', '<h3>Das Plugin enthält:</h3>'); @define('PLUGIN_EVENT_CKEDITOR_INSTALL', '<h2>Installation</h2> <ol style="line-height: 1.6"> -<li>Um anderen Plugins Zugriff auf das Plugin oder dessen Hook zu gewähren, plaziere das (CKEditor) Plugin nahe dem Ende deiner Pluginliste.</li> -<li>Versichere dich, dass der WYSIWYG Modus in den "Persönlichen Einstellungen" eingeschaltet ist.</li> -</ol> - -<h3>Manuelle Erweiterungen mit anderen CKEDITOR Plugins</h3> -<ol style="line-height: 1.6"> -<li>Definiere manuell hinzugefügte Plugins (analog zu <em>{ name: \'mediaembed\' },</em>) in der custom cke_config.js, in der <em>CKEDITOR.config.toolbarGroups = [...]</em> Definition.</li> -<li>Außerdem füge den neuen Pluginnamen (analog zu mediaembed) der <em>var extraPluginList = \'...\'</em> Definition in der cke_plugin.js Datei hinzu.</li> + <li>Um anderen Plugins Zugriff auf das Plugin oder dessen Hook zu gewähren, plaziere das (CKEditor) Plugin nahe dem Ende deiner Pluginliste.</li> + <li>Versichere dich, dass der WYSIWYG Modus in den "Persönlichen Einstellungen" eingeschaltet ist.</li> </ol> +<div class="cke_config_block"> + <h3>Manuelle Erweiterungen mit anderen CKEDITOR Plugins</h3> + <ol style="line-height: 1.6"> + <li>Definiere manuell hinzugefügte Plugins (analog zu <em>{ name: \'mediaembed\' },</em>) in der custom cke_config.js, in der <em>CKEDITOR.config.toolbarGroups = [...]</em> Definition.</li> + <li>Außerdem füge den neuen Pluginnamen (analog zu mediaembed) der <em>var extraPluginList = \'...\'</em> Definition in der cke_plugin.js Datei hinzu.</li> + </ol> -<h3>Upgrading</h3> -<p>Dieses Plugin wird von Zeit zu Zeit selber Updates via Spartacus bereitstellen.<hr> -Wenn jemals ein manuelles oder persönliches Update des mitgelieferten CKEditor Paketes benötigt wird: -<ol style="line-height: 1.6"> -<li><a href="http://ckeditor.com/download" target="_blank">Download CKEditor</a></li> -<li>Extrahiere nach: <em>' . realpath(dirname(__FILE__) . '/..') . '</em> (dies sollte das <em>"ckeditor"</em> Sub-Verzeichnis automatisch erstellen)</li> -</ol> -</p>'); + <h3>Upgrading</h3> + <p>Dieses Plugin wird von Zeit zu Zeit selber Updates via Spartacus bereitstellen.<hr>Wenn jemals ein manuelles oder persönliches Update des mitgelieferten CKEditor Paketes benötigt wird:</p> + <ol style="line-height: 1.6"> + <li><a href="http://ckeditor.com/download" target="_blank">Download CKEditor</a></li> + <li>Extrahiere nach: <em>' . realpath(dirname(__FILE__) . '/..') . '</em> (dies sollte das <em>"ckeditor"</em> Sub-Verzeichnis automatisch erstellen)</li> + </ol> +</div>'); @define('PLUGIN_EVENT_CKEDITOR_CONFIG', ''); @define('PLUGIN_EVENT_CKEDITOR_INSTALL_PLUGPATH', 'HTTP Pfad des S9y Plugins Verzeichnisses'); @define('PLUGIN_EVENT_CKEDITOR_CKEACF_OPTION', 'Stelle Advanced-Content-Filter (ACF) ab?'); @@ -40,5 +39,5 @@ @define('PLUGIN_EVENT_CKEDITOR_PRETTIFY_OPTION_BLAHBLAH', 'Erweitert "code toolbar button" Option, um lokal geladene prettify.js und prettify.ccs Dateien (code by Google) im Frontend.'); @define('PLUGIN_EVENT_CKEDITOR_OPTION_BLAHBLAH', 'Normalerweise: '); -@define('PLUGIN_EVENT_CKEDITOR_FORCEINSTALL_OPTION', 'Entpacke Zip Datei'); -@define('PLUGIN_EVENT_CKEDITOR_FORCEINSTALL_OPTION_BLAHBLAH', 'Bei upgrade Fehlern: Entpacke augenblicklich die mitgelieferte '); +@define('PLUGIN_EVENT_CKEDITOR_FORCEINSTALL_OPTION', 'Entpacke Zip Datei (im Notfall)'); +@define('PLUGIN_EVENT_CKEDITOR_FORCEINSTALL_OPTION_BLAHBLAH', 'Nur bei upgrade Fehlern: Entpacke augenblicklich die mitgelieferte '); Index: ChangeLog =================================================================== RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_ckeditor/ChangeLog,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChangeLog 9 Dec 2013 01:33:10 -0000 1.10 +++ ChangeLog 10 Dec 2013 01:32:15 -0000 1.11 @@ -1,3 +1,17 @@ +2.3.3: +----- + * Some tweaks to en, de lang files. + * Fixed force_install to set new values to database config table. + * Fixed Spartacus upgrade 'plugin_to_conf' again, by using 'external_plugin' hook, + which now forces a real HTTP request and falls down to plugins instance config. + The previous (2.3.2) 'install_plugin' did do, but created another plugin instance. + If you were hit by this, please just purge other ckeditor instances in your plugin list. + To push to "all" upgraders, the zip version num was bumped to force a deflate. + + [PLEASE NOTE: For Upgraders coming from 2.3.1 and earlier, the upgrade zip effect + may possibly happen on next future upgrade only, thus force the zip upgrade by the + new 'force_install' emergency option, if not happen automatically.] + 2.3.2: ----- * Added config option to force zip install on demand, Index: lang_en.inc.php =================================================================== RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_ckeditor/lang_en.inc.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- lang_en.inc.php 9 Dec 2013 01:33:12 -0000 1.9 +++ lang_en.inc.php 10 Dec 2013 01:32:16 -0000 1.10 @@ -1,8 +1,8 @@ <?php # /** - * @file lang_en.inc.php 1.4.3 2013-12-08 Ian - * @version 1.4.3 + * @file lang_en.inc.php 1.4.4 2013-12-09 Ian + * @version 1.4.4 * @author Translator Name <you...@ex...> * EN-Revision: Revision of lang_en.inc.php */ @@ -12,24 +12,23 @@ @define('PLUGIN_EVENT_CKEDITOR_REVISION_TITLE', '<h3>This Plugin includes:</h3>'); @define('PLUGIN_EVENT_CKEDITOR_INSTALL', '<h2>Installation</h2> <ol style="line-height: 1.6"> -<li>To allow other plugins to use or hook into the editor, place this (CKEditor) plugin near the end of your plugin list.</li> -<li>Make sure to enable WYSIWYG mode in your personal preferences.</li> -</ol> - -<h3>Manually extending with CKEDITOR Plugins</h3> -<ol style="line-height: 1.6"> -<li>Define manually added Plugins (analog to <em>{ name: \'mediaembed\' },</em>) to the <em>CKEDITOR.config.toolbarGroups = [...]</em> definition, in the cke_config.js.</li> -<li>Add (append) the plugin name (analog to mediaembed) to <em>var extraPluginList = \'...\'</em> definition, in the cke_plugin.js.</li> + <li>To allow other plugins to use or hook into the editor, place this (CKEditor) plugin near the end of your plugin list.</li> + <li>Make sure to enable WYSIWYG mode in your personal preferences.</li> </ol> +<div class="cke_config_block"> + <h3>Manually extending with CKEDITOR Plugins</h3> + <ol style="line-height: 1.6"> + <li>Define manually added Plugins (analog to <em>{ name: \'mediaembed\' },</em>) to the <em>CKEDITOR.config.toolbarGroups = [...]</em> definition, in the cke_config.js.</li> + <li>Add (append) the plugin name (analog to mediaembed) to <em>var extraPluginList = \'...\'</em> definition, in the cke_plugin.js.</li> + </ol> -<h3>Upgrading</h3> -<p>This Plugin will provide Updates via Spartacus from time to time.<hr> -If you - in follow - ever need to manually upgrade the delivered CKEditor package to a personal package (*), please: -<ol style="line-height: 1.6"> -<li><a href="http://ckeditor.com/download" target="_blank">Download CKEditor</a></li> -<li>Extract to: <em>' . realpath(dirname(__FILE__) . '/..') . '</em> (should create <em>"ckeditor"</em> subdirectory)</li> -</ol> -</p>'); + <h3>Upgrading</h3> + <p>This Plugin will provide Updates via Spartacus from time to time.<hr>If you - in follow - ever need to manually upgrade the delivered CKEditor package to a personal package (*), please:</p> + <ol style="line-height: 1.6"> + <li><a href="http://ckeditor.com/download" target="_blank">Download CKEditor</a></li> + <li>Extract to: <em>' . realpath(dirname(__FILE__) . '/..') . '</em> (should create <em>"ckeditor"</em> subdirectory)</li> + </ol> +</div>'); @define('PLUGIN_EVENT_CKEDITOR_CONFIG', ''); @define('PLUGIN_EVENT_CKEDITOR_INSTALL_PLUGPATH', 'HTTP path to s9y plugins directory'); @define('PLUGIN_EVENT_CKEDITOR_CKEACF_OPTION', 'Disable Advanced-Content-Filter (ACF)?'); @@ -40,5 +39,5 @@ @define('PLUGIN_EVENT_CKEDITOR_PRETTIFY_OPTION_BLAHBLAH', 'Extends to "allowed code button" option. Adds locally loaded prettify.js and prettify.ccs (code by Google) to frontend.'); @define('PLUGIN_EVENT_CKEDITOR_OPTION_BLAHBLAH', 'Usually: '); -@define('PLUGIN_EVENT_CKEDITOR_FORCEINSTALL_OPTION', 'Force install process'); -@define('PLUGIN_EVENT_CKEDITOR_FORCEINSTALL_OPTION_BLAHBLAH', 'On upgrade errors: Force the immediate zip deflation of '); +@define('PLUGIN_EVENT_CKEDITOR_FORCEINSTALL_OPTION', 'Force install process (in emergencies)'); +@define('PLUGIN_EVENT_CKEDITOR_FORCEINSTALL_OPTION_BLAHBLAH', 'Only on upgrade failures: Force the immediate zip deflation of '); --- ckeditor_4.2.3.2_standard-plus.zip DELETED --- Index: serendipity_event_ckeditor.php =================================================================== RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_ckeditor/serendipity_event_ckeditor.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- serendipity_event_ckeditor.php 9 Dec 2013 01:33:12 -0000 1.14 +++ serendipity_event_ckeditor.php 10 Dec 2013 01:32:16 -0000 1.15 @@ -48,14 +48,14 @@ * @access protected * @var string */ - protected $cke_zipfile = 'ckeditor_4.2.3.2_standard-plus.zip'; + protected $cke_zipfile = 'ckeditor_4.2.3.3_standard-plus.zip'; /** * Access property checkUpdateVersion * Verify release package versions - do update on upgrades! * @var array */ - protected $checkUpdateVersion = array('ckeditor:4.2.3.2', 'kcfinder:2.52-2'); + protected $checkUpdateVersion = array('ckeditor:4.2.3.3', 'kcfinder:2.52-2'); /** * Access property revisionPackage @@ -66,7 +66,7 @@ 'KCFinder 2.52-dev (http://kcfinder.sunhater.com/ git package, 2013-05-04)', 'CKEditor-Plugin: mediaembed, v. 0.5+ (https://github.com/frozeman/MediaEmbed, 2013-09-12)', 'CKEditor-Plugin: pbckcode, v. 1.1.0 (https://github.com/prbaron/PBCKCode, 2013-09-06)', - 'CKEditor-Plugin: procurator, v. 1.2 (Serendipity placeholder Plugin, 2013-12-08)'); + 'CKEditor-Plugin: procurator, v. 1.2 (Serendipity placeholder Plugin, 2013-12-06)'); function install($force=false) { @@ -120,6 +120,10 @@ return true; } + function uninstall() { + // todo? uninstall old instances which may be in there caused by a duplicating bug using installer fallback without right instance + } + function introspect(&$propbag) { global $serendipity; @@ -128,7 +132,7 @@ $propbag->add('description', PLUGIN_EVENT_CKEDITOR_DESC); $propbag->add('stackable', false); $propbag->add('author', 'Rustam Abdullaev, Ian'); - $propbag->add('version', '2.3.2'); // is CKEDITOR Series 4 (hidden) - revision .2.3 - and appended serendipity_event_ckeditor revision .2 + $propbag->add('version', '2.3.3'); // is CKEDITOR Series 4 (hidden) - revision .2.3 - and appended serendipity_event_ckeditor revision .3 $propbag->add('copyright', 'GPL or LGPL License'); $propbag->add('requirements', array( 'serendipity' => '1.7', @@ -219,6 +223,11 @@ if (serendipity_db_bool($this->get_config('force_install'))) { $this->install(true); $this->set_config('force_install', 'false'); + // install(true) forces to surround the checkUpdate function, thus we set config database table to keep track + foreach(array_values($this->checkUpdateVersion) AS $package) { + $match = explode(':', $package); + $this->set_config('last_'.$match[0].'_version', $match[1]); + } } $installer = $this->get_config('installer'); // Can't use method return value in write context in '' with substr(), get_config() and isset() @@ -368,10 +377,12 @@ case 'css_backend': // do not use in 2.0 versions - if ($serendipity['version'][0] == '1') { ?> -/* BACKEND MESSAGES +/* CKE BACKEND MESSAGES ----------------------------------------------------------------- */ +<?php + if ($serendipity['version'][0] == '1') { +?> .msg_error, .msg_success, .msg_notice, @@ -406,6 +417,19 @@ } <?php } +?> + +.cke_config_block { + opacity: 0.7; + background: none repeat scroll 0% 0% rgb(238, 238, 238); + padding: 0.5em; + font-size: smaller; + border: 1px dashed; +} + +/* CKE end ----------------------------------------------------------------- */ + +<?php break; @@ -413,8 +437,7 @@ switch($eventData) { case 'triggerckeinstall': if ($this->install()) { - //echo 'CKEDITOR update check and/or deflation complete!'; - header('Location: ' . $serendipity['baseURL'] . 'serendipity_admin.php?serendipity[adminModule]=plugins&serendipity[pluginPath]=serendipity_event_ckeditor&serendipity[install_plugin]=serendipity_event_ckeditor'); + header('Location: ' . $serendipity['baseURL'] . 'serendipity_admin.php?serendipity[adminModule]=plugins&serendipity[plugin_to_conf]='.urlencode($this->instance)); } else { header('Location: ' . $serendipity['baseURL'] . 'serendipity_admin.php?serendipity[adminModule]=plugins&serendipity[adminAction]=addnew&serendipity[only_group]=UPGRADE&serendipity[type]=event'); } @@ -423,8 +446,10 @@ case 'backend_plugins_update': - // make sure a spartacus update really falls down to plugins config, when an update deflating zip has returned true - header('Location: ' . $serendipity['baseURL'] . 'serendipity_admin.php?serendipity[adminModule]=plugins&serendipity[pluginPath]=serendipity_event_ckeditor&serendipity[install_plugin]=serendipity_event_ckeditor'); + // Make sure a Spartacus update really falls down to plugins config, for the need to deflate the zip, if necessary. + // This needs a *real* new HTTP request! Using plugin_to_conf:instance (see above) would not do here!! + // A request to ...&serendipity[install_plugin]=serendipity_event_ckeditor would force a deflate, but would install another plugin instance! + header('Location: ' . $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/triggerckeinstall'); break; --- NEW FILE: ckeditor_4.2.3.3_standard-plus.zip --- (This appears to be a binary file; contents omitted.) |