Changeset 3748

Timestamp:

Aug 18, 2009, 4:16:25 PM (15 years ago)

Author:

Criss

Message:

Add configuration option to define template variable or not

Location:

extensions/ContactForm

Files:

• admin/cf_config.tab.php (modified) (9 diffs)
• admin/cf_language.tab.php (modified) (3 diffs)
• admin/template/cf_config.tab.tpl (modified) (2 diffs)
• classes/cf_config.class.php (modified) (2 diffs)
• classes/cf_log.class.php (added)
• classes/cf_plugin.class.php (modified) (4 diffs)
• config.php (modified) (2 diffs)
• include/cf_common.inc.php (modified) (4 diffs)
• include/contactform.css (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (2 diffs)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)
• language/it_IT/plugin.lang.php (modified) (2 diffs)
• main.inc.php (modified) (2 diffs)
• obsolete.list (modified) (1 diff)
• template/cf_debug.tpl (added)

extensions/ContactForm/admin/cf_config.tab.php

@@ -1 +1 @@
 <?php
-/* $Id: cf_config.tab.php,v 1.1 2009/08/17 07:24:11 Criss Exp $ */
+/* $Id: cf_config.tab.php,v 1.2 2009/08/18 14:10:09 Criss Exp $ */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 check_status(ACCESS_ADMINISTRATOR);
@@ -6 +6 @@
 
 if (isset($_POST['submit'])) {
-  global $page;
   // Allow guest
   $new_value = false;
   if (isset($_POST['cf_guest_allowed'])) {
-      if ('1' == $_POST['cf_guest_allowed']) {
-          $new_value = true;
-      }
+    if ('1' == $_POST['cf_guest_allowed']) {
+      $new_value = true;
+    }
   }
   $cf_config->set_value(CF_CFG_ALLOW_GUEST, $new_value);
@@ -19 +18 @@
   $new_value = false;
   if (isset($_POST['cf_mandatory_name'])) {
-      if ('1' == $_POST['cf_mandatory_name']) {
-          $new_value = true;
-      }
+    if ('1' == $_POST['cf_mandatory_name']) {
+      $new_value = true;
+    }
   }
   $cf_config->set_value(CF_CFG_NAME_MANDATORY, $new_value);
@@ -28 +27 @@
   $new_value = false;
   if (isset($_POST['cf_mandatory_mail'])) {
-      if ('1' == $_POST['cf_mandatory_mail']) {
-          $new_value = true;
-      }
+    if ('1' == $_POST['cf_mandatory_mail']) {
+      $new_value = true;
+    }
   }
   $cf_config->set_value(CF_CFG_MAIL_MANDATORY, $new_value);
 
+  // Define link
+  $new_value = false;
+  if (isset($_POST['cf_define_link'])) {
+    if ('1' == $_POST['cf_define_link']) {
+      $new_value = true;
+    }
+  }
+  $cf_config->set_value(CF_CFG_DEFINE_LINK, $new_value);
+  
   // Link
   $new_value = '';
@@ -40 +48 @@
     $str_valid = preg_match_all('/\w{1}\w*/i', $new_value, $match);
     if (1 != $str_valid) {
-      array_push($page['errors'], l10n('cf_link_error'));
+      CF_Log::add_error(l10n('cf_link_error'));
     } else {
       $cf_config->set_value(CF_CFG_CONTACT_LINK, $new_value);
@@ -64 +72 @@
       $cf_config->set_value(CF_CFG_SEPARATOR_LEN, $new_value);
     } else {
-      array_push($page['errors'], l10n('cf_length_not_integer'));
+      CF_Log::add_error(l10n('cf_length_not_integer'));
     }
   }
@@ -74 +82 @@
       $cf_config->set_value(CF_CFG_REDIRECT_DELAY, $new_value);
     } else {
-      array_push($page['errors'], l10n('cf_delay_not_integer'));
+      CF_Log::add_error(l10n('cf_delay_not_integer'));
     }
   }
@@ -82 +90 @@
   $saved = $cf_config->save_config();
   if ($saved) {
-      array_push($page['infos'], l10n('cf_config_saved'));
+    CF_Log::add_message(l10n('cf_config_saved'));
   } else {
-      array_push($page['errors'], l10n('cf_config_saved_with_errors'));
+    CF_Log::add_error(l10n('cf_config_saved_with_errors'));
   }
   
@@ -100 +108 @@
     'SEPARATOR_LENGTH'  => $cf_config->get_value(CF_CFG_SEPARATOR_LEN),
     'REDIRECT_DELAY'    => $cf_config->get_value(CF_CFG_REDIRECT_DELAY),
+    'DEFINE_LINK'       => $cf_config->get_value(CF_CFG_DEFINE_LINK)?
+                              CF_CHECKED:'',
     'LINK'              => $cf_config->get_value(CF_CFG_CONTACT_LINK),
   );

extensions/ContactForm/admin/cf_language.tab.php

@@ -1 +1 @@
 <?php
-/* $Id: cf_language.tab.php,v 1.2 2009/08/17 14:53:42 Criss Exp $ */
+/* $Id: cf_language.tab.php,v 1.3 2009/08/18 14:10:09 Criss Exp $ */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 check_status(ACCESS_ADMINISTRATOR);
@@ -8 +8 @@
 $cf_item_selected='';
 if (isset($_POST['submit'])) {
-  global $page;
 
   if (isset($_POST['cf_item']) and is_array($_POST['cf_item'])) {
-    CF_Debug::add_debug($_POST['cf_item'], 'POST');
+    CF_Log::add_debug($_POST['cf_item'], 'POST');
     $cf_languages->mass_update($_POST['cf_item']);
   }
@@ -19 +18 @@
   $saved = $cf_config->save_config();
   if ($saved) {
-      array_push($page['infos'], l10n('cf_config_saved'));
+    CF_Log::add_message(l10n('cf_config_saved'));
   } else {
-      array_push($page['errors'], l10n('cf_config_saved_with_errors'));
+    CF_Log::add_error(l10n('cf_config_saved_with_errors'));
   }
   

extensions/ContactForm/admin/template/cf_config.tab.tpl

@@ -1 @@
-{* $Id: cf_config.tab.tpl,v 1.1 2009/08/17 07:24:11 Criss Exp $ *}
+{* $Id: cf_config.tab.tpl,v 1.2 2009/08/18 14:10:09 Criss Exp $ *}
 <div class="titrePage">
     <h2>{$CF.TITLE} [{$CF.VERSION}]<br>{'cf_config'|@translate}</h2>
@@ -24 +24 @@
         <input type="checkbox" name="cf_mandatory_mail" value="1" {$CF_CONFIG.NEED_MAIL} />
         {'cf_mandatory_mail'|@translate}
+      </label>
+    </li>
+  </ul>
+</fieldset>
+<fieldset>
+  <legend>{'cf_label_link'|@translate}</legend>
+  <ul>
+    <li>
+      <label>
+        <input type="checkbox" name="cf_define_link" value="1" {$CF_CONFIG.DEFINE_LINK} />
+        {'cf_define_link'|@translate}
       </label>
     </li>

extensions/ContactForm/classes/cf_config.class.php

@@ -88 +88 @@
       }
     }
-//    CF_Debug::add_debug($this->config_lang, 'CF_Config::load_config');
+//    CF_Log::add_debug($this->config_lang, 'CF_Config::load_config');
     $this->load_default_config();
   }
@@ -96 +96 @@
       $this->config_lang = new CF_Config_Lang();
       $this->config_values['config_lang'] = null;
-      CF_Debug::add_debug($this->config_lang,'CF_Config::load_default_config');
+      CF_Log::add_debug($this->config_lang,'CF_Config::load_default_config');
     }
     $this->config_lang->set_default_values();

extensions/ContactForm/classes/cf_plugin.class.php

@@ -22 +22 @@
     $this->config->load_config();
     $this->config->set_value(CF_CFG_COMMENT, CF_CFG_DB_COMMENT);
+    CF_Log::add_debug($this->config, 'CF_Plugin');
   }
   
@@ -40 +41 @@
   
   function loc_begin_page_header() {
+    if (!$this->config->get_value(CF_CFG_DEFINE_LINK)) {
+      return;
+    }
     global $template;
     $cf_values = array(
@@ -129 +133 @@
   
   function loc_end_page_tail() {
-    CF_Debug::show_debug();
+    CF_Log::show_debug();
   }
   
@@ -145 +149 @@
   
   function get_title() {
-    return $this->plugin_title;
+    // Include language advices
+    load_language('plugin.lang', CF_PATH);
+    
+    return l10n($this->plugin_title);
   }
   

extensions/ContactForm/config.php

@@ -1 +1 @@
 <?php
-/* $Id: config.php,v 1.1 2009/08/17 07:35:35 Criss Exp $ */
+/* $Id: config.php,v 1.2 2009/08/18 14:10:09 Criss Exp $ */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 check_status(ACCESS_ADMINISTRATOR);
 include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
+
+CF_Log::reset_messages();
 
 $config_tabs[]='config';
@@ -66 +68 @@
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
-
+CF_Log::show_messages();
 ?>

extensions/ContactForm/include/cf_common.inc.php

@@ -7 +7 @@
 
 // Version
-define('CF_VERSION',            '1.0.1');
-define('CF_TITLE',              'Contact Form');
+define('CF_VERSION',            '1.0.2');
+define('CF_TITLE',              'cf_plugin_name');
 
 // Directories
@@ -54 +54 @@
 define('CF_CFG_NAME_MANDATORY', 'cf_mandatory_name');
 define('CF_CFG_REDIRECT_DELAY', 'cf_redirect_delay');
+define('CF_CFG_DEFINE_LINK',    'cf_define_link');
 define('CF_CFG_CONTACT_LINK',   'cf_link');
 
@@ -64 +65 @@
 
 // Load class files
-cf_require_class("CF_Debug");
+cf_require_class("CF_Log");
 cf_require_class("CF_Config_Lang");
 cf_require_class("CF_Config");
@@ -81 +82 @@
 $cf_config_default[CF_CFG_NAME_MANDATORY] = true;
 $cf_config_default[CF_CFG_REDIRECT_DELAY] = CF_REDIRECT_DELAY;
+$cf_config_default[CF_CFG_DEFINE_LINK] = true;
 $cf_config_default[CF_CFG_CONTACT_LINK] = CF_DEFAULT_LINKNAME;
 CF_Config::$default_config = $cf_config_default;

extensions/ContactForm/include/contactform.css

@@ -28 +28 @@
   visibility: hidden;
 }
+.cf-log-infos, .cf-log-errors {
+        font-weight: bold;
+}

extensions/ContactForm/language/en_UK/plugin.lang.php

@@ -1 +1 @@
 <?php
-/* $Id: plugin.lang.php,v 1.6 2009/08/17 14:53:42 Criss Exp $ */
+/* $Id: plugin.lang.php,v 1.7 2009/08/18 14:10:09 Criss Exp $ */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 global $lang;
+
+$lang['cf_plugin_name'] = 'Contact Form';
+$lang['contact_form_debug'] = 'Display of debug information';
 
 // ==================================================================
@@ -56 +59 @@
 $lang['cf_mandatory_mail'] = 'E-mail address is mandatory';
 $lang['cf_redirect_delay'] = 'Pause delay of redirection';
+$lang['cf_label_link'] = 'Link management (outside menubar)';
+$lang['cf_define_link'] = 'Define link';
 $lang['cf_link'] = 'Name of the template variable containing the HTML link to the contact form';
 // Language tab

extensions/ContactForm/language/fr_FR/plugin.lang.php

@@ -1 +1 @@
 <?php
-/* $Id: plugin.lang.php,v 1.6 2009/08/17 14:53:42 Criss Exp $ */
+/* $Id: plugin.lang.php,v 1.7 2009/08/18 14:10:09 Criss Exp $ */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 global $lang;
+
+$lang['cf_plugin_name'] = 'Contact Form';
+$lang['contact_form_debug'] = 'Affichage des informations de debug';
 
 // ==================================================================
@@ -56 +59 @@
 $lang['cf_mandatory_mail'] = 'Présence de l\'e-mail obligatoire';
 $lang['cf_redirect_delay'] = 'Délai de pause de la redirection';
+$lang['cf_label_link'] = 'Gestion du lien (hors menu) vers le formulaire';
+$lang['cf_define_link'] = 'Définir le lien';
 $lang['cf_link'] = 'Nom de la variable de template contenant le lien HTML vers le formulaire de contact';
 // Language tab

extensions/ContactForm/language/it_IT/plugin.lang.php

@@ -1 +1 @@
 <?php
-/* $Id: plugin.lang.php,v 1.6 2009/08/17 14:53:42 Criss Exp $ */
+/* $Id: plugin.lang.php,v 1.7 2009/08/18 14:10:09 Criss Exp $ */
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 global $lang;
+
+$lang['cf_plugin_name'] = 'Contact Form';
+// TODO $lang['contact_form_debug'] = '';
 
 // ==================================================================
@@ -56 +59 @@
 // TODO $lang['cf_mandatory_mail'] = '';
 // TODO $lang['cf_redirect_delay'] = '';
+// TODO $lang['cf_label_link'] = '';
+// TODO $lang['cf_define_link'] = '';
 // TODO $lang['cf_link'] = '';
 // Language tab

extensions/ContactForm/main.inc.php

@@ -2 +2 @@
 /*
  Plugin Name: Contact Form
- Version: 1.0.1
+ Version: 1.0.2
  Description: Add a "Contact" item in the Menu block to offer a contact form to users
  Plugin URI: http://piwigo.org/ext/extension_view.php?eid=304
@@ -10 +10 @@
 
 /** History **
+
+  2009-08-18 1.0.2
+                    Add configuration option to define template variable or not
 
   2009-08-17 1.0.1

extensions/ContactForm/obsolete.list

@@ -1 +1 @@
 admin/template/cf_config.tpl
+classes/cf_debug.class.php