Changeset 28883

Timestamp:

Jul 1, 2014, 11:23:45 AM (10 years ago)

Author:

mistic100

Message:

add menu_link parameter, add identifier for menu link

Location:

extensions/GuestBook

Files:

• admin/config.php (modified) (2 diffs)
• admin/template/config.tpl (modified) (5 diffs)
• include/events.inc.php (modified) (1 diff)
• language/ar_SA/plugin.lang.php (modified) (1 diff)
• language/bg_BG/plugin.lang.php (modified) (1 diff)
• language/ca_ES/plugin.lang.php (modified) (1 diff)
• language/cs_CZ/plugin.lang.php (modified) (1 diff)
• language/da_DK/plugin.lang.php (modified) (1 diff)
• language/de_DE/plugin.lang.php (modified) (1 diff)
• language/el_GR/plugin.lang.php (modified) (1 diff)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/eo_EO/plugin.lang.php (modified) (1 diff)
• language/es_ES/plugin.lang.php (modified) (1 diff)
• language/et_EE/plugin.lang.php (modified) (1 diff)
• language/fa_IR/plugin.lang.php (modified) (1 diff)
• language/fi_FI/plugin.lang.php (modified) (1 diff)
• language/fr_CA/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• language/gl_ES/plugin.lang.php (modified) (1 diff)
• language/hu_HU/plugin.lang.php (modified) (1 diff)
• language/it_IT/plugin.lang.php (modified) (1 diff)
• language/lv_LV/plugin.lang.php (modified) (1 diff)
• language/nb_NO/plugin.lang.php (modified) (1 diff)
• language/nl_NL/plugin.lang.php (modified) (1 diff)
• language/nn_NO/plugin.lang.php (modified) (1 diff)
• language/pl_PL/plugin.lang.php (modified) (1 diff)
• language/pt_BR/plugin.lang.php (modified) (1 diff)
• language/pt_PT/plugin.lang.php (modified) (1 diff)
• language/ro_RO/plugin.lang.php (modified) (1 diff)
• language/ru_RU/plugin.lang.php (modified) (1 diff)
• language/sk_SK/plugin.lang.php (modified) (1 diff)
• language/sl_SI/plugin.lang.php (modified) (1 diff)
• language/sv_SE/plugin.lang.php (modified) (1 diff)
• language/th_TH/plugin.lang.php (modified) (1 diff)
• language/tr_TR/plugin.lang.php (modified) (1 diff)
• language/uk_UA/plugin.lang.php (modified) (1 diff)
• language/vi_VN/plugin.lang.php (modified) (1 diff)
• language/zh_CN/plugin.lang.php (modified) (1 diff)
• language/zh_HK/plugin.lang.php (modified) (1 diff)
• language/zh_TW/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (3 diffs)
• maintain.class.php (modified) (2 diffs)

extensions/GuestBook/admin/config.php

@@ -5 +5 @@
 {
   $conf['guestbook'] = array(
-    'comments_validation' => isset($_POST['comments_validation']),
+    'comments_validation' =>    isset($_POST['comments_validation']),
     'email_admin_on_comment' => isset($_POST['email_admin_on_comment']),
     'email_admin_on_comment_validation' => isset($_POST['email_admin_on_comment_validation']),
-    'nb_comment_page' => $_POST['nb_comment_page'],
-    'activate_rating' => isset($_POST['activate_rating']),
-    'guest_can_view' => isset($_POST['guest_can_view']),
-    'guest_can_add' => isset($_POST['guest_can_add']),
+    'nb_comment_page' =>        $_POST['nb_comment_page'],
+    'activate_rating' =>        isset($_POST['activate_rating']),
+    'guest_can_view' =>         isset($_POST['guest_can_view']),
+    'guest_can_add' =>          isset($_POST['guest_can_add']),
+    'menu_link' =>              isset($_POST['menu_link']),
     );
     
@@ -18 +19 @@
 }
 
-$template->assign($conf['guestbook']);
+$template->assign('gb', $conf['guestbook']);
 
 $template->set_filename('guestbook', realpath(GUESTBOOK_PATH . 'admin/template/config.tpl'));

extensions/GuestBook/admin/template/config.tpl

@@ -24 +24 @@
     <li>
       <label>
+        <input type="checkbox" name="menu_link" value="1" {if $gb.menu_link}checked="checked"{/if}>
+        {'Add link in menu'|translate}
+      </label>
+    </li>
+      
+    <li>
+      <label>
         <b>{'Number of comments per page'|translate}</b>
-        <input type="text" size="3" maxlength="4" name="nb_comment_page" id="nb_comment_page" value="{$nb_comment_page}">
+        <input type="text" size="3" maxlength="4" name="nb_comment_page" value="{$gb.nb_comment_page}">
       </label>
     </li>
@@ -31 +38 @@
     <li>
       <label>
-        <input type="checkbox" name="activate_rating" {if ($activate_rating)}checked="checked"{/if}>
+        <input type="checkbox" name="activate_rating" {if ($gb.activate_rating)}checked="checked"{/if}>
         <b>{'Activate rating'|translate}</b>
       </label>
@@ -38 +45 @@
     <li>
       <label>
-        <input type="checkbox" name="comments_validation" {if ($comments_validation)}checked="checked"{/if}>
+        <input type="checkbox" name="comments_validation" {if ($gb.comments_validation)}checked="checked"{/if}>
         <b>{'Validation'|translate}</b>
       </label>
@@ -47 +54 @@
 
       <label>
-        <input type="checkbox" name="email_admin_on_comment" {if ($email_admin_on_comment)}checked="checked"{/if}> {'added'|translate}
+        <input type="checkbox" name="email_admin_on_comment" {if ($gb.email_admin_on_comment)}checked="checked"{/if}> {'added'|translate}
       </label>
 
       <label id="email_admin_on_comment_validation">
-        <input type="checkbox" name="email_admin_on_comment_validation" {if ($email_admin_on_comment_validation)}checked="checked"{/if}> {'pending validation'|translate}
+        <input type="checkbox" name="email_admin_on_comment_validation" {if ($gb.email_admin_on_comment_validation)}checked="checked"{/if}> {'pending validation'|translate}
       </label>
     </li>
@@ -59 +66 @@
 
       <label>
-        <input type="checkbox" name="guest_can_view" {if ($guest_can_view)}checked="checked"{/if}> {'view comments'|translate}
+        <input type="checkbox" name="guest_can_view" {if ($gb.guest_can_view)}checked="checked"{/if}> {'view comments'|translate}
       </label>
 
       <label id="guest_can_add">
-        <input type="checkbox" name="guest_can_add" {if ($guest_can_add)}checked="checked"{/if}> {'add comment'|translate}
+        <input type="checkbox" name="guest_can_add" {if ($gb.guest_can_add)}checked="checked"{/if}> {'add comment'|translate}
       </label>
     </li>

extensions/GuestBook/include/events.inc.php

@@ -22 +22 @@
   $menu = &$menu_ref_arr[0];
   
-  if ( ($block = $menu->get_block('mbMenu')) != null )
+  if (($block = $menu->get_block('mbMenu')) != null)
   {
-    $block->data[] = array(
+    $block->data['guestbook'] = array(
       'URL' => GUESTBOOK_URL,
       'TITLE' => l10n('GuestBook'),

extensions/GuestBook/language/ar_SA/plugin.lang.php

@@ -36 +36 @@
 $lang['add comment'] = 'إضافة تعليق';
 $lang['view comments'] = 'مشاهدة التعليقات';
-?>
+$lang['Add link in menu'] = 'اضف رابط في القائمة';

extensions/GuestBook/language/bg_BG/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'Оценка';
 $lang['Send'] = 'Изпращане';
+$lang['Add link in menu'] = 'Добави линк в менюто';

extensions/GuestBook/language/ca_ES/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'Valora';
 $lang['Send'] = 'Envia';
+$lang['Add link in menu'] = 'Afegeix un enllaç al menú';

extensions/GuestBook/language/cs_CZ/plugin.lang.php

@@ -36 +36 @@
 $lang['add comment'] = 'přidat komentář';
 $lang['Guests (not registered) permissions :'] = 'Oprávnění hostů (neregistrovaných uživatelů):';
-?>
+$lang['Add link in menu'] = 'Vložit odkaz do menu';

extensions/GuestBook/language/da_DK/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'Bedøm';
 $lang['Send'] = 'Send';
+$lang['Add link in menu'] = 'Tilføj link i menu';

extensions/GuestBook/language/de_DE/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'Rate';
 $lang['Send'] = 'Senden';
+$lang['Add link in menu'] = 'Füge einen Link im Menü hinzu';

extensions/GuestBook/language/el_GR/plugin.lang.php

@@ -38 +38 @@
 $lang['Send'] = 'Αποστολή';
 $lang['Rate'] = 'Βαθμολόγιση';
+$lang['Add link in menu'] = 'Προσθέστε ένα σύνδεσμο στο μενού';

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

@@ -18 +18 @@
 $lang['Send'] = 'Send';
 $lang['Rate'] = 'Rate';
-
-?>
+$lang['Add link in menu'] = 'Add link in menu';

extensions/GuestBook/language/eo_EO/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'Takso';
 $lang['Send'] = 'Sendi';
+$lang['Add link in menu'] = 'Aldoni ligilon en menuon';

extensions/GuestBook/language/es_ES/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'Puntuar';
 $lang['Send'] = 'Enviar';
+$lang['Add link in menu'] = 'Añadir el lazo en el menú';

extensions/GuestBook/language/et_EE/plugin.lang.php

@@ -38 +38 @@
 $lang['Send'] = 'Saada';
 $lang['Rate'] = 'Hinda';
+$lang['Add link in menu'] = 'Lisa menüüsse link';

extensions/GuestBook/language/fa_IR/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'رتبه';
 $lang['Send'] = 'فرستادن';
+$lang['Add link in menu'] = 'افزودن یک پیوند در منو';

extensions/GuestBook/language/fi_FI/plugin.lang.php

@@ -36 +36 @@
 $lang['add comment'] = 'kommentoi';
 $lang['view comments'] = 'näytä kommentit';
-?>
+$lang['Add link in menu'] = 'Lisää linkki valikkoon';

extensions/GuestBook/language/fr_CA/plugin.lang.php

@@ -13 +13 @@
 $lang['Activate rating'] = 'Activer la notation';
 $lang['%s says on %s :'] = '%s a dit le %s :';
-
 $lang['Guests (not registered) permissions :'] = 'Droits des visiteurs (non enregistrés) :';
 $lang['add comment'] = 'ajouter un commentaire';
 $lang['view comments'] = 'voir les commentaires';
-?>
+$lang['Add link in menu'] = 'Ajouter le lien dans le menu';

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

@@ -18 +18 @@
 $lang['Send'] = 'Envoyer';
 $lang['Rate'] = 'Note';
-
-?>
+$lang['Add link in menu'] = 'Ajouter le lien dans le menu';

extensions/GuestBook/language/gl_ES/plugin.lang.php

@@ -38 +38 @@
 $lang['add comment'] = 'engadir comentario';
 $lang['view comments'] = 'visualizar comentarios';
+$lang['Add link in menu'] = 'Engadir ligazón ó menú';

extensions/GuestBook/language/hu_HU/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'Értékelés';
 $lang['Send'] = 'Küldés';
+$lang['Add link in menu'] = 'Kapcsolat elem hozzáadása a menühöz';

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

@@ -38 +38 @@
 $lang['Rate'] = 'Voto';
 $lang['Send'] = 'Invia';
+$lang['Add link in menu'] = 'Aggiungere un link nel menu';

extensions/GuestBook/language/lv_LV/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'likme';
 $lang['Send'] = 'Sūtīt';
+$lang['Add link in menu'] = 'Pievienot saiti izvēlnē';

extensions/GuestBook/language/nb_NO/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'Vurder';
 $lang['Send'] = 'Send';
+$lang['Add link in menu'] = 'Legg til link i menyen';

extensions/GuestBook/language/nl_NL/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'Waarderen';
 $lang['Send'] = 'Verstuur';
+$lang['Add link in menu'] = 'Voeg link aan menu toe';

extensions/GuestBook/language/nn_NO/plugin.lang.php

@@ -36 +36 @@
 $lang['add comment'] = 'legg til kommentar';
 $lang['view comments'] = 'vis kommentar';
-?>
+$lang['Add link in menu'] = 'Legg lenke til meny';

extensions/GuestBook/language/pl_PL/plugin.lang.php

@@ -36 +36 @@
 $lang['add comment'] = 'dodawanie komentarzy';
 $lang['view comments'] = 'oglądanie komentarzy';
-?>
+$lang['Add link in menu'] = 'Dodaj link do menu';

extensions/GuestBook/language/pt_BR/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'avaliar';
 $lang['Send'] = 'enviar';
+$lang['Add link in menu'] = 'Adicionar link ao menu';

extensions/GuestBook/language/pt_PT/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'Câmbio';
 $lang['Send'] = 'Enviar';
+$lang['Add link in menu'] = 'Adicionar link no menú';

extensions/GuestBook/language/ro_RO/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'Evaluează';
 $lang['Send'] = 'Trimite';
+$lang['Add link in menu'] = 'Adaugă legătură în meniu';

extensions/GuestBook/language/ru_RU/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'Rate';
 $lang['Send'] = 'Отправить';
+$lang['Add link in menu'] = 'Добавить ссылку в меню';

extensions/GuestBook/language/sk_SK/plugin.lang.php

@@ -38 +38 @@
 $lang['Send'] = 'Poslať';
 $lang['Rate'] = 'Hodnotenie';
+$lang['Add link in menu'] = 'Pridať link do menu';

extensions/GuestBook/language/sl_SI/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'Oceni';
 $lang['Send'] = 'Pošlji';
+$lang['Add link in menu'] = 'Dodaj povezavo v meni';

extensions/GuestBook/language/sv_SE/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'Betyg';
 $lang['Send'] = 'Skicka';
+$lang['Add link in menu'] = 'Inkludera länk i menyn';

extensions/GuestBook/language/th_TH/plugin.lang.php

@@ -33 +33 @@
 $lang['Please enter a message'] = 'กรุณากรอกข้อความก่อนทำการส่ง';
 $lang['Please enter your e-mail'] = 'กรุณากรอกอีเมลของคุณ';
-?>
+$lang['Add link in menu'] = 'เพิ่มลิงค์ในเมนู';

extensions/GuestBook/language/tr_TR/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = 'Değerlendir';
 $lang['Send'] = 'Gönder';
+$lang['Add link in menu'] = 'Menüye bağlantı ekle';

extensions/GuestBook/language/uk_UA/plugin.lang.php

@@ -36 +36 @@
 $lang['add comment'] = 'додайте коментар';
 $lang['view comments'] = 'перегляньте коментарі';
-?>
+$lang['Add link in menu'] = 'Додати посилання в меню';

extensions/GuestBook/language/vi_VN/plugin.lang.php

@@ -36 +36 @@
 $lang['add comment'] = 'thêm bình luận';
 $lang['view comments'] = 'xem bình luận';
-?>
+$lang['Add link in menu'] = 'Thêm liên kết vào trình đơn';

extensions/GuestBook/language/zh_CN/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = '评分';
 $lang['Send'] = '发送';
+$lang['Add link in menu'] = '在菜单中添加链接';

extensions/GuestBook/language/zh_HK/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = '比率';
 $lang['Send'] = '發送';
+$lang['Add link in menu'] = '在功能表添加連結';

extensions/GuestBook/language/zh_TW/plugin.lang.php

@@ -38 +38 @@
 $lang['Rate'] = '評級';
 $lang['Send'] = '發送';
+$lang['Add link in menu'] = '選單中新增連結';

extensions/GuestBook/main.inc.php

@@ -12 +12 @@
 
 // TODO akismet
-global $prefixeTable;
+global $conf, $prefixeTable;
 
 define('GUESTBOOK_ID',      basename(dirname(__FILE__)));
@@ -19 +19 @@
 define('GUESTBOOK_ADMIN',   get_root_url().'admin.php?page=plugin-' . GUESTBOOK_ID);
 define('GUESTBOOK_URL',     get_absolute_root_url() . make_index_url(array('section' => 'guestbook')));
+
+$conf['guestbook'] = safe_unserialize($conf['guestbook']);
 
 include_once(GUESTBOOK_PATH . 'include/events.inc.php');
@@ -29 +31 @@
   add_event_handler('get_admin_plugin_menu_links', 'gb_admin_menu');
 }
+else
+{
+  add_event_handler('loc_end_section_init', 'gb_section_init');
+  add_event_handler('loc_end_index', 'gb_index');
+}
 
-add_event_handler('blockmanager_apply', 'gb_menubar_apply', EVENT_HANDLER_PRIORITY_NEUTRAL+10);
-
-add_event_handler('loc_end_section_init', 'gb_section_init');
-add_event_handler('loc_end_index', 'gb_index');
+if ($conf['guestbook']['menu_link'])
+{
+  add_event_handler('blockmanager_apply', 'gb_menubar_apply', EVENT_HANDLER_PRIORITY_NEUTRAL+10);
+}
 
 
 function guestbook_init()
 {
-  global $conf;
-  $conf['guestbook'] = safe_unserialize($conf['guestbook']);
-  
   load_language('plugin.lang', GUESTBOOK_PATH);
 }

extensions/GuestBook/maintain.class.php

@@ -14 +14 @@
     'guest_can_view' => true,
     'guest_can_add' => true,
+    'menu_link' => true,
     );
   
@@ -40 +41 @@
         $old_conf['guest_can_view'] = true;
         $old_conf['guest_can_add'] = true;
+      }
+      if (!isset($old_conf['menu_link']))
+      {
+        $old_conf['menu_link'] = true;
       }