Simplify use of WYSIWYG editor

cms/includes/edit.inc.php

@@ -5,23 +5,9 @@ if(isset($_SESSION[$settings['session_prefix'].'user_id']))
  {
   $action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'main';
 
-  if($settings['wysiwyg_editor'] && isset($_SESSION[$settings['session_prefix'].'wysiwyg']) && $_SESSION[$settings['session_prefix'].'wysiwyg']==1)
-   {
-    $wysiwyg_opt = true;
-    $wysiwyg = true;
-   }
-  elseif(!empty($settings['wysiwyg_editor']))
-   {
-    $wysiwyg_opt = true;
-    $wysiwyg = false;
-   }
-  else
-   {
-    $wysiwyg_opt = false;
-    $wysiwyg = false;
-   }
+  if(isset($_SESSION[$settings['session_prefix'].'wysiwyg']) && $_SESSION[$settings['session_prefix'].'wysiwyg']==1) $wysiwyg = true;
 
-  if($wysiwyg_opt && isset($_REQUEST['enable_wysiwyg']))
+  if(isset($_REQUEST['enable_wysiwyg']))
    {
     $wysiwyg = true;
     $dbr = Database::$userdata->prepare("UPDATE ".Database::$db_settings['userdata_table']." SET wysiwyg=1 WHERE id=:id");
@@ -29,19 +15,16 @@ if(isset($_SESSION[$settings['session_prefix'].'user_id']))
     $dbr->execute();
     $_SESSION[$settings['session_prefix'].'wysiwyg'] = 1;
    }
-  if($wysiwyg_opt && isset($_REQUEST['disable_wysiwyg']))
+  if(isset($_REQUEST['disable_wysiwyg']))
    {
-    $wysiwyg = false;
+    unset($wysiwyg);
     $dbr = Database::$userdata->prepare("UPDATE ".Database::$db_settings['userdata_table']." SET wysiwyg=0 WHERE id=:id");
     $dbr->bindParam(':id', $_SESSION[$settings['session_prefix'].'user_id'], PDO::PARAM_INT);
     $dbr->execute();
     $_SESSION[$settings['session_prefix'].'wysiwyg'] = 0;
    }
-
-  $template->assign('wysiwyg_opt',$wysiwyg_opt);
-  $template->assign('wysiwyg',$wysiwyg);
-
-  #if($wysiwyg) include('./modules/fckeditor/fckeditor.php');
+   
+  if(isset($wysiwyg)) $template->assign('wysiwyg', true);
 
   include(BASE_PATH.'cms/config/page_types.conf.php');
   $template->assign('page_types',$page_types);

cms/index.php

@@ -3,24 +3,32 @@
  * phpSQLiteCMS - a simple and lightweight PHP web content management system
  * based on PHP and SQLite
  *
- * @author Mark Alexander Hoschek <alex at phpsqlitecms dot net>
- * @copyright 2006-2010 Mark Alexander Hoschek
- * @version 2.0.5
+ * @author Mark Hoschek < mail at mark-hoschek dot de >
+ * @copyright Mark Hoschek 2014
+ * @version 3.x
  * @link http://phpsqlitecms.net/
  * @package phpSQLiteCMS
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * The MIT License (MIT)
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * Copyright (c) 2014 Mark Hoschek
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 try

cms/lang/bulgarian.admin.lang.php

@@ -58,6 +58,7 @@ $lang['login_password'] =                'Парола:';
 $lang['login_submit'] =                  'Вход';
 
 # content
+$lang['wysiwyg_label'] =                 'WYSIWYG';
 $lang['enable_wysiwyg_editor'] =         'WYSIWYG режим';
 $lang['disable_wysiwyg_editor'] =        'Text режим';
 $lang['change_edit_mode_notice'] =       'Внимание! Настоящите промени няма да бъдат съхранени при смяна на режима на редактиране!';
@@ -435,8 +436,6 @@ $lang['settings_index_page'] =           'Начална страница';
 $lang['settings_error_page'] =           'Error страница';
 $lang['default_page_language'] =         'Език по подразбиране на страниците';
 $lang['admin_language'] =                'Език на административната част';
-$lang['wysiwyg_editor'] =                'WYSIWYG редактор';
-$lang['wysiwyg_editor_enabled'] =        'WYSIWYG редакторът е разрешен';
 $lang['settings_caching'] =              'Кеширане';
 $lang['settings_caching_enabled'] =      'кеширането е разрешено';
 $lang['settings_name'] =                 'Име';

cms/lang/english.admin.lang.php

@@ -53,8 +53,9 @@ $lang['login_password'] =                'Password:';
 $lang['login_submit'] =                  'Log in';
 
 # content
-$lang['enable_wysiwyg_editor'] =         'WYSIWYG editor';
-$lang['disable_wysiwyg_editor'] =        'Source code';
+$lang['wysiwyg_label'] =                 'WYSIWYG';
+$lang['enable_wysiwyg_editor'] =         'Enable WYSIWYG editor';
+$lang['disable_wysiwyg_editor'] =        'Disable WYSIWYG editor';
 $lang['change_edit_mode_notice'] =       'Caution! Current changes will not be saved when switching edit mode!';
 $lang['values_comma_separated'] =        'several values separated by comma';
 $lang['page_overview'] =                 'Page overview';
@@ -430,8 +431,6 @@ $lang['settings_index_page'] =           'Main page';
 $lang['settings_error_page'] =           'Error page';
 $lang['default_page_language'] =         'Default page language';
 $lang['admin_language'] =                'Administration language';
-$lang['wysiwyg_editor'] =                'WYSIWYG editor';
-$lang['wysiwyg_editor_enabled'] =        'WYSIWYG editor enabled';
 $lang['settings_caching'] =              'Caching';
 $lang['settings_caching_enabled'] =      'caching enabled';
 $lang['settings_name'] =                 'Name';

cms/lang/german.admin.lang.php

@@ -53,8 +53,9 @@ $lang['login_password'] =                'Passwort:';
 $lang['login_submit'] =                  'Login';
 
 # content
-$lang['enable_wysiwyg_editor'] =         'WYSIWYG-Editor';
-$lang['disable_wysiwyg_editor'] =        'Quelltext';
+$lang['wysiwyg_label'] =                 'WYSIWYG';
+$lang['enable_wysiwyg_editor'] =         'WYSIWYG-Editor aktivieren';
+$lang['disable_wysiwyg_editor'] =        'WYSIWYG-Editor deaktivieren';
 $lang['change_edit_mode_notice'] =       'Achtung! Aktuelle Änderungen werden beim Umschalten nicht übernommen!';
 $lang['values_comma_separated'] =        'mehrere Werte durch Komma getrennt';
 $lang['page_overview'] =                 'Seitenübersicht';
@@ -430,8 +431,6 @@ $lang['settings_index_page'] =           'Hauptseite';
 $lang['settings_error_page'] =           'Fehlerseite';
 $lang['default_page_language'] =         'Standard-Sprache für Seiten';
 $lang['admin_language'] =                'Administrations-Sprache';
-$lang['wysiwyg_editor'] =                'WYSIWYG-Editor';
-$lang['wysiwyg_editor_enabled'] =        'WYSIWYG-Editor aktiviert';
 $lang['settings_caching'] =              'Caching';
 $lang['settings_caching_enabled'] =      'Caching aktiviert';
 $lang['settings_name'] =                 'Name';

cms/lang/russian.admin.lang.php

@@ -57,8 +57,9 @@ $lang['login_password'] =                'Пароль:';
 $lang['login_submit'] =                  'Войти';
 
 # content
-$lang['enable_wysiwyg_editor'] =         'WYSIWYG';
-$lang['disable_wysiwyg_editor'] =        'Text';
+$lang['wysiwyg_label'] =                 'WYSIWYG';
+$lang['enable_wysiwyg_editor'] =         'Включить визуальный редактор';
+$lang['disable_wysiwyg_editor'] =        'Отключить визуальный редактор';
 $lang['change_edit_mode_notice'] =       'Внимание! При смене режима все несохранённые изменения будут потеряны!';
 $lang['values_comma_separated'] =        'Перечислите значения через запятую';
 $lang['page_overview'] =                 'Страницы';
@@ -434,8 +435,6 @@ $lang['settings_index_page'] =           'Главная страница';
 $lang['settings_error_page'] =           'Страница ошибок';
 $lang['default_page_language'] =         'Язык по умолчанию';
 $lang['admin_language'] =                'Язык Админ-центра';
-$lang['wysiwyg_editor'] =                'Визуальный редактор';
-$lang['wysiwyg_editor_enabled'] =        'Визуальный редактор разрешён';
 $lang['settings_caching'] =              'Кэширование';
 $lang['settings_caching_enabled'] =      'Кэширование разрешено';
 $lang['settings_name'] =                 'Имя';

cms/lang/spanish.admin.lang.php

@@ -55,8 +55,9 @@ $lang['login_password'] =                'Contraseña:';
 $lang['login_submit'] =                  'iniciar sesión';
 
 # content
-$lang['enable_wysiwyg_editor'] =         'Modo WYSIWYG';
-$lang['disable_wysiwyg_editor'] =        'Modo texto';
+$lang['wysiwyg_label'] =                 'WYSIWYG';
+$lang['enable_wysiwyg_editor'] =         'Activar editor WYSIWYG';
+$lang['disable_wysiwyg_editor'] =        'Desactivar editor WYSIWYG';
 $lang['change_edit_mode_notice'] =       '¡Atención! ¡Los cambios actuales no se grabarán al cambiar el modo de edición!';
 $lang['values_comma_separated'] =        'varios valores separados por comas';
 $lang['page_overview'] =                 'Relación de páginas';
@@ -433,8 +434,6 @@ $lang['settings_index_page'] =           'Página principal';
 $lang['settings_error_page'] =           'Página de error';
 $lang['default_page_language'] =         'Idioma por defecto para las páginas';
 $lang['admin_language'] =                'Idioma de la interfaz de administración';
-$lang['wysiwyg_editor'] =                'Editor WYSIWYG';
-$lang['wysiwyg_editor_enabled'] =        'Editor WYSIWYG activado';
 $lang['settings_caching'] =              'Cacheo';
 $lang['settings_caching_enabled'] =      'Cacheo activado';
 $lang['settings_name'] =                 'Nombre';

cms/templates/admin/main.tpl

@@ -46,7 +46,7 @@
 <script src="<?php echo JQUERY; ?>"></script>
 <script src="<?php echo JQUERY_UI; ?>"></script>
 <script src="<?php echo BOOTSTRAP; ?>"></script>
-<?php if($settings['wysiwyg_editor'] && !empty($wysiwyg)): ?>
+<?php if(isset($wysiwyg)): ?>
 <script src="<?php echo WYSIWYG_EDITOR; ?>"></script>
 <script src="<?php echo WYSIWYG_EDITOR_INIT; ?>"></script>
 <?php endif; ?>

cms/templates/admin/subtemplates/edit.inc.tpl

@@ -52,32 +52,21 @@
 </div>
 </div>
 
-<?php /*if(!$wysiwyg): ?>
-<div class="form-group">
-<label for="headline" class="col-lg-1 control-label control-label-left"><?php echo $lang['edit_headline_marking']; ?></label>
-<div class="col-lg-11">
-<input id="headline" type="text" name="headline" value="<?php if(isset($page_data['headline'])) echo $page_data['headline']; ?>" size="50" class="form-control" />
-</div>
-</div>
-<?php endif;*/ ?>
-
 <div class="form-group">
 <div class="col-lg-12">
 <label for="content"><?php echo $lang['edit_content_marking']; ?></label>
 
-<?php if($wysiwyg_opt): ?>
-<?php if($wysiwyg): ?>
-<a id="wysiwyg-toggle" class="btn btn-default btn-xs pull-right" href="index.php?mode=edit<?php if(isset($page_data['id'])): ?>&amp;id=<?php echo $page_data['id']; ?><?php endif; ?>&amp;disable_wysiwyg=true" title="<?php echo $lang['disable_wysiwyg_editor']; ?>" data-confirm-link="<?php echo rawurlencode($lang['change_edit_mode_notice']); ?>"><span class="glyphicon glyphicon-chevron-left"></span><span class="glyphicon glyphicon-chevron-right"></span></a>
+<?php if(isset($wysiwyg)): ?>
+<a id="wysiwyg-toggle" class="btn btn-default btn-xs active pull-right" href="index.php?mode=edit<?php if(isset($page_data['id'])): ?>&amp;id=<?php echo $page_data['id']; ?><?php endif; ?>&amp;disable_wysiwyg=true" title="<?php echo $lang['disable_wysiwyg_editor']; ?>" data-confirm-link="<?php echo rawurlencode($lang['change_edit_mode_notice']); ?>"><?php echo $lang['wysiwyg_label']; ?></a>
 <?php else: ?>
-<a id="wysiwyg-toggle" class="btn btn-info btn-xs pull-right" href="index.php?mode=edit<?php if(isset($page_data['id'])): ?>&amp;id=<?php echo $page_data['id']; ?><?php endif; ?>&amp;enable_wysiwyg=true" title="<?php echo $lang['enable_wysiwyg_editor']; ?>" data-confirm-link="<?php echo rawurlencode($lang['change_edit_mode_notice']); ?>"><span class="glyphicon glyphicon-chevron-left"></span><span class="glyphicon glyphicon-chevron-right"></span></a>
-<?php endif; ?>
+<a id="wysiwyg-toggle" class="btn btn-default btn-xs pull-right" href="index.php?mode=edit<?php if(isset($page_data['id'])): ?>&amp;id=<?php echo $page_data['id']; ?><?php endif; ?>&amp;enable_wysiwyg=true" title="<?php echo $lang['enable_wysiwyg_editor']; ?>" data-confirm-link="<?php echo rawurlencode($lang['change_edit_mode_notice']); ?>"><?php echo $lang['wysiwyg_label']; ?></a>
 <?php endif; ?>
 
 <textarea id="content" name="content" cols="100" rows="28" class="form-control html"><?php if(isset($page_data['content'])) echo $page_data['content']; ?></textarea>
 </div>
 </div>
 
-<?php if(!$wysiwyg): ?>
+<?php if(empty($wysiwyg)): ?>
 <div class="form-group">
 <div class="col-lg-12">
 <a class="btn btn-default btn-xs" href="index.php?mode=modal&amp;action=insert_image" data-toggle="modal" data-target="#modal_image" data-insert="#content" title="<?php echo $lang['insert_image_label']; ?>"><span class="glyphicon glyphicon-picture"></span></a>
@@ -109,11 +98,6 @@
 <textarea id="sidebar_2" name="sidebar_2" cols="70" rows="13" class="form-control html"><?php if(isset($page_data['sidebar_1'])) echo $page_data['sidebar_2']; ?></textarea>
 </div>
 </div>
-<!--<div class="checkbox">
-<label for="sidebar_2_formatting">
-<input id="sidebar_2_formatting" type="checkbox" name="sidebar_2_formatting" value="1"<?php if(isset($page_data['sidebar_2_formatting']) && $page_data['sidebar_2_formatting']==1): ?> checked="checked"'<?php endif; ?> /> <?php echo $lang['edit_formatting']; ?>
-</label>
-</div>-->
 
 <div class="form-group">
 <div class="col-lg-12">
@@ -121,16 +105,9 @@
 <textarea id="sidebar_3" name="sidebar_3" cols="70" rows="13" class="form-control html"><?php if(isset($page_data['sidebar_1'])) echo $page_data['sidebar_3']; ?></textarea>
 </div>
 </div>
-<!--<div class="checkbox">
-<label for="sidebar_3_formatting">
-<input id="sidebar_3_formatting" type="checkbox" name="sidebar_3_formatting" value="1"<?php if(isset($page_data['sidebar_3_formatting']) && $page_data['sidebar_3_formatting']==1): ?> checked="checked"'<?php endif; ?> /> <?php echo $lang['edit_formatting']; ?>
-</label>
-</div>-->
 
 </div>
 
-
-
 <div class="tab-pane fade" id="properties">
 
 <div class="form-group">
@@ -383,13 +360,6 @@
 <label for="teaser" class="col-lg-2 control-label"><?php echo $lang['edit_teaser_marking']; ?></label>
 <div class="col-lg-9">
 <textarea id="teaser" name="teaser" cols="75" rows="13" class="form-control"><?php if(isset($page_data['teaser'])) echo $page_data['teaser']; ?></textarea>
-<?php /*
-<div class="checkbox">
-<label for="teaser_formatting">
-<input id="teaser_formatting" type="checkbox" name="teaser_formatting" value="1"<?php if(isset($page_data['teaser_formatting']) && $page_data['teaser_formatting']==1): ?> checked<?php endif; ?>> <?php echo $lang['edit_formatting']; ?>
-</label>
-</div>
-*/ ?>
 </div>
 </div>
 
@@ -428,7 +398,6 @@
 </div>     
 
 </div>
-     
 
 <div class="row">
 <div class="col-md-10">

cms/templates/admin/subtemplates/settings.inc.tpl

@@ -84,11 +84,6 @@
 
 <div class="form-group">
 <div class="col-md-offset-2 col-md-6">
-<div class="checkbox">
-<label for="wysiwyg_editor">
-<input id="wysiwyg_editor" type="checkbox" name="wysiwyg_editor" value="1"<?php if($settings['wysiwyg_editor']): ?> checked<?php endif; ?>> <?php echo $lang['wysiwyg_editor_enabled']; ?>
-</label>
-</div>
 
 <div class="checkbox">
 <label for="caching">
@@ -109,7 +104,7 @@
 
 <div class="form-group">
 <div class="col-md-offset-2 col-md-6">
-<button type="submit" class="btn btn-primary btn-strong" /><?php echo $lang['submit_button_ok']; ?></button>
+<button type="submit" class="btn btn-primary btn-strong"><?php echo $lang['submit_button_ok']; ?></button>
 <a class="btn btn-default" href="index.php?mode=settings&amp;action=advanced_settings"><?php echo $lang['advanced_settings']; ?></a>
 </div>
 </div>

index.php

@@ -3,9 +3,9 @@
  * phpSQLiteCMS - a simple and lightweight PHP web content management system
  * based on PHP and SQLite
  *
- * @author Mark Hoschek <alex at phpsqlitecms dot net>
- * @copyright Mark Hoschek 2013
- * @version 3
+ * @author Mark Hoschek < mail at mark-hoschek dot de >
+ * @copyright Mark Hoschek 2014
+ * @version 3.x
  * @link http://phpsqlitecms.net/
  * @package phpSQLiteCMS
  *