Changeset 3129 for plugins/licenseBootstrap

Timestamp:

05/13/13 02:11:56 (10 years ago)

Author:

JcDenis

Message:

• Fixed page title and messages and contents

Location:

plugins/licenseBootstrap

Files:

• _admin.php (modified) (1 diff)
• _define.php (modified) (2 diffs)
• _install.php (modified) (2 diffs)
• _prepend.php (modified) (2 diffs)
• _uninstall.php (modified) (1 diff)
• inc/class.license.bootstrap.php (modified) (5 diffs)
• inc/lib.license.bootstrap.index.php (modified) (2 diffs)
• index.php (modified) (4 diffs)
• js (deleted)
• release.txt (modified) (1 diff)

plugins/licenseBootstrap/_admin.php

@@ -1 +1 @@
 <?php
 # -- BEGIN LICENSE BLOCK ----------------------------------
+#
 # This file is part of licenseBootstrap, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009-2010 JC Denis and contributors
-# jcdenis@gdwd.com
+# Copyright (c) 2009-2013 Jean-Christian Denis and contributors
+# contact@jcdenis.fr
 # 
 # Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
 # -- END LICENSE BLOCK ------------------------------------
 
 if (!defined('DC_CONTEXT_ADMIN')){return;}
 
-# Admin menu
 $_menu['Plugins']->addItem(
      __('License bootstrap'),
-     'plugin.php?p=licenseBootstrap','index.php?pf=licenseBootstrap/icon.png',
+     'plugin.php?p=licenseBootstrap',
+     'index.php?pf=licenseBootstrap/icon.png',
      preg_match('/plugin.php\?p=licenseBootstrap(&.*)?$/',$_SERVER['REQUEST_URI']),
-     $core->auth->check('admin',$core->blog->id)
+     $core->auth->isSuperAdmin()
 );
 ?>

plugins/licenseBootstrap/_define.php

@@ -1 +1 @@
 <?php
 # -- BEGIN LICENSE BLOCK ----------------------------------
+#
 # This file is part of licenseBootstrap, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009-2010 JC Denis and contributors
-# jcdenis@gdwd.com
+# Copyright (c) 2009-2013 Jean-Christian Denis and contributors
+# contact@jcdenis.fr
 # 
 # Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
 # -- END LICENSE BLOCK ------------------------------------
 
@@ -16 +18 @@
      /* Name */               "License bootstrap",
      /* Description*/         "Add license to your plugins and themes",
-     /* Author */        "JC Denis",
-     /* Version */       '0.3',
+     /* Author */             "JC Denis",
+     /* Version */            '2013.05.11',
      /* Permissions */        null
 );
-     /* date */          #20100604
 ?>

plugins/licenseBootstrap/_install.php

@@ -1 +1 @@
 <?php
 # -- BEGIN LICENSE BLOCK ----------------------------------
+#
 # This file is part of licenseBootstrap, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009-2010 JC Denis and contributors
-# jcdenis@gdwd.com
+# Copyright (c) 2009-2013 Jean-Christian Denis and contributors
+# contact@jcdenis.fr
 # 
 # Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
 # -- END LICENSE BLOCK ------------------------------------
 
 if (!defined('DC_CONTEXT_ADMIN')){return;}
 
+$rdc_version = '2.5-alpha';
 $new_version = $core->plugins->moduleInfo('licenseBootstrap','version');
 $old_version = $core->getVersion('licenseBootstrap');
@@ -20 +23 @@
 try
 {
-     if (version_compare(DC_VERSION,'2.2-beta','<'))
-     {
-          throw new Exception('licenseBootstrap plugin requires Dotclear 2.2');
+     if (version_compare(str_replace("-r","-p",DC_VERSION),$rdc_version,'<')) {
+          throw new Exception(sprintf('%s requires Dotclear %s','licenseBootstrap',$rdc_version));
      }
+     
      $default_license = 'gpl2';
      $default_exts = licenseBootstrap::getDefaultExtensions();

plugins/licenseBootstrap/_prepend.php

@@ -1 +1 @@
 <?php
 # -- BEGIN LICENSE BLOCK ----------------------------------
+#
 # This file is part of licenseBootstrap, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009-2010 JC Denis and contributors
-# jcdenis@gdwd.com
+# Copyright (c) 2009-2013 Jean-Christian Denis and contributors
+# contact@jcdenis.fr
 # 
 # Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
 # -- END LICENSE BLOCK ------------------------------------
 
@@ -15 +17 @@
 global $__autoload,$core;
 
+if ($core->blog === null) return;
+
 $__autoload['licenseBootstrap'] = dirname(__FILE__).'/inc/class.license.bootstrap.php';
 $__autoload['libLicenseBootstrap'] = dirname(__FILE__).'/inc/lib.license.bootstrap.index.php';
 
-$core->blog->settings->addNamespace('licenseBootstrap');
-if ($core->blog->settings->licenseBootstrap->licensebootstrap_packman_behavior)
-{
-     $core->addBehavior('packmanBeforeCreatePackage',array('licenseBootstrap','packmanBeforeCreatePackage'));
-}
-if ($core->blog->settings->licenseBootstrap->licensebootstrap_translater_behavior)
-{
-     $core->addBehavior('dcTranslaterAfterWriteLangFile',array('licenseBootstrap','dcTranslaterAfterWriteLangFile'));
-}
+$core->addBehavior('packmanBeforeCreatePackage',array('licenseBootstrap','packmanBeforeCreatePackage'));
+$core->addBehavior('dcTranslaterAfterWriteLangFile',array('licenseBootstrap','dcTranslaterAfterWriteLangFile'));
 ?>

plugins/licenseBootstrap/_uninstall.php

@@ -1 +1 @@
 <?php
 # -- BEGIN LICENSE BLOCK ----------------------------------
+#
 # This file is part of licenseBootstrap, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009-2010 JC Denis and contributors
-# jcdenis@gdwd.com
+# Copyright (c) 2009-2013 Jean-Christian Denis and contributors
+# contact@jcdenis.fr
 # 
 # Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
 # -- END LICENSE BLOCK ------------------------------------
 

plugins/licenseBootstrap/inc/class.license.bootstrap.php

@@ -1 +1 @@
 <?php
 # -- BEGIN LICENSE BLOCK ----------------------------------
+#
 # This file is part of licenseBootstrap, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009-2010 JC Denis and contributors
-# jcdenis@gdwd.com
+# Copyright (c) 2009-2013 Jean-Christian Denis and contributors
+# contact@jcdenis.fr
 # 
 # Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
 # -- END LICENSE BLOCK ------------------------------------
 
@@ -241 +243 @@
           global $core;
           
-          $core->blog->settings->addNamespace('licenseBootstrap');
+          if (!$core->blog->settings->licenseBootstrap->licensebootstrap_packman_behavior) {
+               return;
+          }
           
           $addfull = (boolean) $core->blog->settings->licenseBootstrap->licensebootstrap_addfull;
@@ -265 +269 @@
           
           global $core;
+          
+          if (!$core->blog->settings->licenseBootstrap->licensebootstrap_translater_behavior) {
+               return;
+          }
           
           $id = '';
@@ -346 +354 @@
           $block = 
           "\r\n# -- BEGIN LICENSE BLOCK ----------------------------------\r\n".
+          "#\r\n".
           '# '.str_replace("\n","\n# ",$license).
+          "\r\n#".
           "\r\n# -- END LICENSE BLOCK ------------------------------------\r\n";
 
@@ -362 +372 @@
           $block = 
           "/* -- BEGIN LICENSE BLOCK ----------------------------------\r\n".
+          " *\r\n".
           ' * '.str_replace("\n","\n * ",$license).
+          "\r\n *".
           "\r\n * -- END LICENSE BLOCK ------------------------------------*/\r\n\r\n";
 

plugins/licenseBootstrap/inc/lib.license.bootstrap.index.php

@@ -1 +1 @@
 <?php
 # -- BEGIN LICENSE BLOCK ----------------------------------
+#
 # This file is part of licenseBootstrap, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009-2010 JC Denis and contributors
-# jcdenis@gdwd.com
+# Copyright (c) 2009-2013 Jean-Christian Denis and contributors
+# contact@jcdenis.fr
 # 
 # Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
 # -- END LICENSE BLOCK ------------------------------------
 
@@ -19 +21 @@
           if (!in_array($type,array('theme','plugin'))) return;
           
-          echo '<div>'.
-          '<h3>'.($type == 'theme' ? __('Themes') : __('Extensions')).'</h3>';
-          
           if (isset($_REQUEST['done']) && $_REQUEST['tab'] == $type)
           {
-               echo '<p class="message">'.__('License successfully included').'</p>';
+               dcPage::message(__('License successfully included'));
           }
+          
+          echo '<div id="licenseBootstrap-'.$type.'">';
           
           if (!empty($modules) && is_array($modules))

plugins/licenseBootstrap/index.php

@@ -1 +1 @@
 <?php
 # -- BEGIN LICENSE BLOCK ----------------------------------
+#
 # This file is part of licenseBootstrap, a plugin for Dotclear 2.
 # 
-# Copyright (c) 2009-2010 JC Denis and contributors
-# jcdenis@gdwd.com
+# Copyright (c) 2009-2013 Jean-Christian Denis and contributors
+# contact@jcdenis.fr
 # 
 # Licensed under the GPL version 2.0 license.
 # A copy of this license is available in LICENSE file or at
 # http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+#
 # -- END LICENSE BLOCK ------------------------------------
 
@@ -106 +108 @@
 }
 
+$title = '';
+if ($default_tab == 'plugin') {
+     $title = __('Plugins');
+}
+elseif ($default_tab == 'theme') {
+     $title = __('Theme');
+}
+elseif ($default_tab == 'setting') {
+     $title = __('Settings');
+}
+$title = html::escapeHTML($title);
+
 # Display
 echo 
-'<html><head><title>'.__('License bootstrap').'</title>'.
-dcPage::jsLoad('index.php?pf=licenseBootstrap/js/main.js').
-'<script type="text/javascript">'."\n//<![CDATA[\n".
-dcPage::jsVar('jcToolsBox.prototype.text_wait',__('Please wait')).
-dcPage::jsVar('jcToolsBox.prototype.section',$section).
-"\n//]]>\n</script>\n".
-'</head><body>'.
-'<h2>'.__('License bootstrap').
+'<html><head><title>'.__('License bootstrap');
+if (!empty($title)) {
+     echo ' - '.$title;
+}
+echo 
+'</title></head><body>'.
+'<h2>'.__('License bootstrap');
+if (!empty($title)) {
+     echo ' &rsaquo; <span class="page-title">'.$title.'</span>';
+}
+echo 
 ' - <a class="button" href="'.$p_url.'&amp;tab=plugin">'.__('Plugins').'</a>'.
 ' - <a class="button" href="'.$p_url.'&amp;tab=theme">'.__('Themes').'</a>'.
-'</h2><hr class="clear" />';
+'</h2>';
 
 if ($default_tab == 'plugin')
@@ -132 +149 @@
 elseif ($default_tab == 'setting')
 {
-     echo '<div><h3>'. __('Settings').'</h3>';
-     
      if (isset($_REQUEST['done']))
      {
-          echo '<p class="message">'.__('Configuration successfully saved').'</p>';
-     }
+          dcPage::message(__('Configuration successfully saved'));
+     }
+     echo '<form id="setting-form" method="post" action="'.$p_url.'">';
+     
+     if ($core->plugins->moduleExists('pacKman') || $core->plugins->moduleExists('translater'))
+     {
+          echo '<fieldset id="settingbehavior"><legend>'.__('Behaviors').'</legend>';
+          
+          if ($core->plugins->moduleExists('pacKman'))
+          {
+               echo '
+               <p><label class="classic">'.
+               form::checkbox(array('packman_behavior'),'1',$packman_behavior).' '.
+               __('Add license before create package with plugin pacKman').'</label></p>';
+          }
+          if ($core->plugins->moduleExists('translater'))
+          {
+               echo '
+               <p><label class="classic">'.
+               form::checkbox(array('translater_behavior'),'1',$translater_behavior).' '.
+               __('Add license after create lang file with plugin translater').'</label></p>';
+          }
+          echo '</fieldset>';
+     }
+     
      echo '
-     <form id="setting-form" method="post" action="'.$p_url.'">
      <fieldset id="settingfile"><legend>'.__('Files').'</legend>
      <p><label class="classic">'.
@@ -177 +214 @@
      }
      echo '</fieldset>';
-     
-     if ($core->plugins->moduleExists('pacKman') || $core->plugins->moduleExists('translater'))
-     {
-          echo '<fieldset id="settingbehavior"><legend>'.__('Behaviors').'</legend>';
-          
-          if ($core->plugins->moduleExists('pacKman'))
-          {
-               echo '
-               <p><label class="classic">'.
-               form::checkbox(array('packman_behavior'),'1',$packman_behavior).' '.
-               __('Add license before create package with plugin pacKman').'</label></p>';
-          }
-          if ($core->plugins->moduleExists('translater'))
-          {
-               echo '
-               <p><label class="classic">'.
-               form::checkbox(array('translater_behavior'),'1',$translater_behavior).' '.
-               __('Add license after create lang file with plugin translater').'</label></p>';
-          }
-          echo '</fieldset>';
-     }
      
      echo '

plugins/licenseBootstrap/release.txt

@@ +1 @@
+2013.05.11
+ * Fixed page title and messages and contents
+
 0.3 20100605
  * Switched to DC 2.2